MCL/sf/os/cellularsrv: changeset 20:07a122eea281

--- a/basebandabstraction/basebandchanneladaptor/Test/TE_BCA/group/TE_Bca.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-"\sf\os\cellularsrv\basebandabstraction\basebandchanneladaptor\Test\TE_BCA\scripts\TE_BcaUnit.script"-"c:\testdata\scripts\TE_BcaUnit.script"

Binary file basebandabstraction/basebandchanneladaptor/doc_pub/NIF_BCA_interface_design.doc has changed

--- a/basebandabstraction/basebandchanneladaptor/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ b/basebandabstraction/basebandchanneladaptor/group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 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"
@@ -33,3 +33,6 @@
 ../Inc/bca2.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(networking/bca2.h)
 ../Inc/Bca2Factory.h              SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(networking/bca2factory.h)
 #endif
+
+PRJ_TESTMMPFILES
+#include "../Test/TE_BCA/group/bld.inf"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/bwins/c32bca2u.def	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,3 @@
+EXPORTS
+	NewBcaFactoryL @ 1 NONAME
+

--- a/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/bwins/c32bca2u.def	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	NewBcaFactoryL @ 1 NONAME
-

--- a/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/eabi/c32bca2u.def	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-EXPORTS
-	NewBcaFactoryL @ 1 NONAME
-	_ZTIN26BasebandChannelAdaptation210C32BcaShim7CSenderE @ 2 NONAME
-	_ZTIN26BasebandChannelAdaptation210C32BcaShim9CReceiverE @ 3 NONAME
-	_ZTVN26BasebandChannelAdaptation210C32BcaShim7CSenderE @ 4 NONAME
-	_ZTVN26BasebandChannelAdaptation210C32BcaShim9CReceiverE @ 5 NONAME
-

--- a/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/group/C32Bca2.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-// Copyright (c) 2004-2010 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 
-// Baseband Channel Adaptor for C32 component.
-// 
-//
-
-TARGET		c32bca2.dll
-TARGETTYPE	dll
-UID		0x1000008D 0x10287032
-VENDORID	0x70000001
-
-SOURCEPATH	../src
-SOURCE		C32Bca.cpp
-SOURCE		C32BcaFactory.cpp
-SOURCE		C32BcaDllMain.cpp
-SOURCE		MBca2Impl.cpp
-
-USERINCLUDE	../inc
-USERINCLUDE	../traces
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY     euser.lib
-LIBRARY     c32.lib
-LIBRARY     commsdat.lib
-LIBRARY     commsbufs.lib
-
-// Do not add the non-callable exports to the DEF files
-// Remove this line temporarily if we need to add new exports
-//NOEXPORTLIBRARY
-
-CAPABILITY All -Tcb
-
-UNPAGED
-SMPSAFE

--- a/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-// Copyright (c) 2004-2010 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:
-// Baseband Channel Adaptor for C32 component. 
-// 
-//
-
-/**
- @file
-*/
-
-PRJ_MMPFILES
-
-C32Bca2.mmp

--- a/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/inc/C32Bca.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/inc/C32Bca.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -29,6 +29,7 @@
 #include <e32def.h>
 #include <commsdattypesv1_1.h>
 using namespace CommsDat;
+#include <comms-infras/commsdebugutility.h>
 
 /** This namespace includes the BCA component names.*/
 namespace BasebandChannelAdaptation
@@ -94,6 +95,9 @@
 			/**
 			Serial port we service for the iUser */
 			RComm& iPort;
+	
+			/** CommsDebug logger  */
+			__FLOG_DECLARATION_MEMBER;			
 		};
 	
 	/**
@@ -188,6 +192,10 @@
 		virtual void CommWriteComplete(TInt aErr);
 		virtual void CommLinkDown(TInt aErr);
 				
+#ifdef __FLOG_ACTIVE
+		void LogCommConfig(TCommConfig& c);
+#endif // __FLOG_ACTIVE
+
 	private:
 		void CloseCommPort();	
 	
@@ -234,6 +242,8 @@
 		/** Should the next write be errored with this error  code? */
 		TInt iErrorOnNextWrite;
 		
+		/** Comms Debug Utility logger. */
+		__FLOG_DECLARATION_MEMBER;
 		};
 	/**
 	* C32BCA Panic.

--- a/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/src/C32Bca.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/src/C32Bca.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -21,12 +21,6 @@
  @internalComponent
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "C32BcaTraces.h"
-#endif
-
 #include "C32Bca.h"
 #include <cdbcols.h>
 #include <commsdat_partner.h>
@@ -50,12 +44,14 @@
 	iPort(aPort)
 	{
 	CActiveScheduler::Add(this);
+	__FLOG_OPEN(KC32BcaLogFolder, KC32BcaLogFile); // Connect to the BCA logger			
 	}
 		
 /**
 C++ destructor */		
 CCommBase::~CCommBase()
 	{
+	__FLOG_CLOSE;
 	}
 
 /**
@@ -177,7 +173,7 @@
 void CCommLinkMonitor::Setup(TUint32 aMask)
 	{
 	iNotifyChangeSignalMask = aMask;	
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_SETUP1_1, "CommLinkMonitor setup: Notify on signal mask [0x%X]",iNotifyChangeSignalMask);
+	__FLOG_1(_L8("CommLinkMonitor setup: Notify on signal mask [0x%X]"),iNotifyChangeSignalMask);
 	}
 
 /**
@@ -193,7 +189,7 @@
 	iSavedSignalState = iPort.Signals(iNotifyChangeSignalMask) & iNotifyChangeSignalMask;
 	iPort.NotifySignalChange(iStatus, iSignals, iNotifyChangeSignalMask);
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_NOTIFYLINKDOWN1_1, "CommLinkMonitor::NotifyLinkDown: initial signals: [0x%X]", iSavedSignalState);
+	__FLOG_1(_L8("CommLinkMonitor::NotifyLinkDown: initial signals: [0x%X]"), iSavedSignalState);
 	
 	SetActive();
 	}
@@ -203,7 +199,7 @@
 */
 void CCommLinkMonitor::RunL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_RUNL1_1, "CommLinkMonitor::RunL: Signals changed [0x%X]; new signals [0x%X]", iSignals & (~0x1F), iSignals & 0x1F);
+	__FLOG_2(_L8("CommLinkMonitor::RunL: Signals changed [0x%X]; new signals [0x%X]"), iSignals & (~0x1F), iSignals & 0x1F);
 	
 	// We report link failure if and only if a monitored line went from high to low.
 	// Method: mask the saved signals using inverted monitored bits in the signal bitmask,
@@ -224,7 +220,7 @@
 Cancels notification request of link failure */	
 void CCommLinkMonitor::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_DOCANCEL1_1, "CommLinkMonitor::DoCancel: Cancelling signal change notification.");
+	__FLOG(_L8("CommLinkMonitor::DoCancel: Cancelling signal change notification."));
 	iPort.NotifySignalChangeCancel();
 	}
 	
@@ -237,7 +233,8 @@
 */
 CC32Bca::CC32Bca()	
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CTOR1_1, "====== CC32Bca::CC32Bca: Shim BCA for C32 [Vesion: major= %d minor= %d] Constructed. ======", KC32BcaMajorVersionNumber, KC32BcaMinorVersionNumber);
+	__FLOG_OPEN(KC32BcaLogFolder,KC32BcaLogFile);
+	__FLOG_2(_L8("====== CC32Bca::CC32Bca: Shim BCA for C32 [Vesion: major= %d minor= %d] Constructed. ======"), KC32BcaMajorVersionNumber, KC32BcaMinorVersionNumber);
 	}
 
 /**
@@ -263,7 +260,7 @@
 CC32Bca::~CC32Bca()
 	
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_DTOR1_1, "CC32Bca::~CC32Bca: releasing resources...");
+	__FLOG(_L8("CC32Bca::~CC32Bca: releasing resources..."));
 		
 	CloseCommDbConnection(); 
 	CloseCommPort(); 	// Cancels reader / writer / monitor
@@ -275,13 +272,14 @@
 	delete iWriter;
 	delete iLinkMonitor; // Note: may have never been created.
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_DTOR1_2, "CC32Bca::~CC32Bca: CC32Bca destroyed.");
+	__FLOG(_L8("CC32Bca::~CC32Bca: CC32Bca destroyed."));
+	__FLOG_CLOSE;
 	}
 	
 /** This method deletes the BCA itself.*/
 void CC32Bca::Release()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_RELEASE1_1, "CC32Bca::Release");
+	__FLOG(_L8("CC32Bca::Release"));
 	delete this;
 	}
 	
@@ -301,7 +299,7 @@
 	TRequestStatus* ptrStatus = &aStatus;
 	if(iCommPortOpen)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_1, "Warning: C32Bca is already Opened.");
+		__FLOG(_L8("Warning: C32Bca is already Opened."));
 	
 		User::RequestComplete(ptrStatus,KErrNone);
 		return;	
@@ -322,12 +320,12 @@
 		// So, we just log a warning.
 		if(KErrNone == commPortErr && iCommPort.Size() == 0)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_2, "Warning: Null string read from CommDB. Will try to open Comm Port anyway.");
+			__FLOG(_L8("Warning: Null string read from CommDB. Will try to open Comm Port anyway."));
 			}		
 		
 		if(KErrNone != commPortErr) // Fatal: we do not have a port name. Can't open RComm.
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_3, "Error: Failed to get C32 PortName from CommDB ");
+			__FLOG(_L8("Error: Failed to get C32 PortName from CommDB "));
 			CloseCommDbConnection();
 			User::RequestComplete(ptrStatus, commPortErr);
 			return;
@@ -340,7 +338,7 @@
 
 		if (len1 < KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_4, "** ERROR: No :: (Double Colon) in aChannelId **");
+			__FLOG(_L8("** ERROR: No :: (Double Colon) in aChannelId **"));
 			User::RequestComplete(ptrStatus, KErrBadName);
 			return;	
 			}
@@ -371,7 +369,7 @@
 			{
 			// We do not use a hardcoded value (e.g. ECUART), because the client code or the environment are
 			// confused - it is better to fail them, rather than mask their problems.
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_5, "Error: Failed to get CSY name from CommDB ");
+			__FLOG(_L8("Error: Failed to get CSY name from CommDB "));
 			CloseCommDbConnection();
 			User::RequestComplete(ptrStatus,getCsyErr);
 			return;
@@ -401,13 +399,13 @@
 	TInt ret = iCommServ.Connect();
 	if(ret)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_6, "Open: C32 Server connection error %d", ret);
+		__FLOG_1(_L8("Open: C32 Server connection error %d"), ret);
 		User::RequestComplete(ptrStatus,ret);
 		return;
 		}
 	ret = iCommServ.LoadCommModule(iCsyName);
 	
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_7, "Open: CSY module [%S] loaded with error %d", iCsyName, ret);
+	__FLOG_2(_L16("Open: CSY module [%S] loaded with error %d"), &iCsyName, ret);
 		
 	if(ret)
 		{
@@ -424,7 +422,7 @@
 		ret = iComm.Open(iCommServ, iCommPort, ECommShared, iCommRole);	
 		}
 	
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_8, "Open: C32 port [%S] opened with error %d", iCommPort, ret);
+	__FLOG_2(_L16("Open: C32 port [%S] opened with error %d"), &iCommPort, ret);
 					
 	if(ret)
 		{
@@ -462,7 +460,7 @@
 	
 	TRequestStatus* request = &aStatus;
 	User::RequestComplete(request, KErrNone);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_SHUTDOWN1_1, "C32Bca::Shutdown: BCA shut down with error %d", KErrNone);
+	__FLOG_1(_L8("C32Bca::Shutdown: BCA shut down with error %d"), KErrNone);
 	}
 
 /**
@@ -472,7 +470,7 @@
 void CC32Bca::Close()
 	{
 	CloseCommPort();
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CLOSE1_1, "C32Bca::Close:Close: BCA closed with error %d", KErrNone);
+	__FLOG_1(_L8("C32Bca::Close:Close: BCA closed with error %d"), KErrNone);
 	}
 
 /**
@@ -527,7 +525,7 @@
 void CC32Bca:: CancelRead()
 	
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CANCELREAD_1, "CancelRead: Read is cancelled by client.");
+	__FLOG(_L8("CancelRead: Read is cancelled by client."));
 	iReader->Cancel();
 
 	if(iReadRequest != NULL)
@@ -542,7 +540,7 @@
 void CC32Bca::CancelWrite()
 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CANCELWRITE1_1, "CancelWrite: Write is cancelled by client.");
+    __FLOG(_L8("CancelWrite: Write is cancelled by client."));
 
     iWriter->Cancel();
 
@@ -554,7 +552,7 @@
     
 
 // Debug dumps:
-#ifdef OST_TRACE_COMPILER_IN_USE
+#ifdef __FLOG_ACTIVE
 
 _LIT8(KLitOptLevelGeneric,    "KBcaOptLevelGeneric");
 _LIT8(KLitOptLevelExtSerial,   "KBcaOptLevelExtSerial");
@@ -639,9 +637,22 @@
 			return KLitOptNameUnsupported;		
 		}
 	}
-#endif // OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG
+#endif // __FLOG_ACTIVE
 
 
+#ifdef __FLOG_ACTIVE
+/**
+Print debug output of the TCommComfig parameters.
+
+@param The configuration whose parameters should be logged.
+*/
+void CC32Bca::LogCommConfig(TCommConfig& c)
+	{
+	__FLOG_5(_L8("Rate[%d] DataBits[%d] StopBits[%d] Parity[%d] Handshake[0x%x]"), c().iRate, c().iDataBits, c().iStopBits, c().iParity, c().iHandshake);	
+	__FLOG_4(_L8("ParityError[%d] Fifo[%d] SpecialRate[%d] terminatorCount[%d]"), c().iParityError, c().iFifo, c().iSpecialRate, c().iTerminatorCount);	
+	__FLOG_1(_L8("Terminator[0x%x]"), c().iTerminator);	
+	}
+#endif // __FLOG_ACTIVE
 
 
 /**
@@ -655,7 +666,7 @@
 void CC32Bca::Ioctl(TRequestStatus& aStatus, TUint aOptLevel, TUint aOptName, TDes8& aOpt)
 
 	{
-	OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_1, "Ioctl: Level[%s](0x%X) Name[%s](0x%X).", IoctlOptLevelStr(aOptLevel), aOptLevel, IoctlOptNameStr(aOptName), aOptName);
+	__FLOG_4(_L8("Ioctl: Level[%S](0x%X) Name[%S](0x%X)."), &IoctlOptLevelStr(aOptLevel), aOptLevel, &IoctlOptNameStr(aOptName), aOptName);	
 	
 	aStatus = KRequestPending;
 	
@@ -685,7 +696,7 @@
 				{
 				TUint32 tempIapId = *(reinterpret_cast<const TUint32*>(aOpt.Ptr()));
 				
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_2, "Ioctl: IAP ID [%d] specified.",tempIapId);
+				__FLOG_1(_L8("Ioctl: IAP ID [%d] specified."),tempIapId);	
 				
 				if(tempIapId < 1 )
 					{
@@ -734,15 +745,14 @@
 			
 		case KSerialConfig:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_3, "Ioctl: KSerialConfig");
+			__FLOG(_L8("Ioctl: KSerialConfig"));	
 
 			TCommConfig cfg;
 			iComm.Config(cfg);
 
-		    OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_4, "Rate[%d] DataBits[%d] StopBits[%d]", cfg().iRate, cfg().iDataBits, cfg().iStopBits);
-		    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_5, "Parity[%d] Handshake[0x%x]", cfg().iParity, cfg().iHandshake);
-		    OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_6, "ParityError[%d] Fifo[%d] SpecialRate[%d] terminatorCount[%d]", cfg().iParityError, cfg().iFifo, cfg().iSpecialRate, cfg().iTerminatorCount);
-		    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_7, "Terminator[0x%x]", cfg().iTerminator);
+#ifdef __FLOG_ACTIVE
+			LogCommConfig(cfg);
+#endif // __FLOG_ACTIVE
 
 			TPckgBuf<TCommConfig> cfgBuf(cfg);
 			aOpt.Copy(cfgBuf);
@@ -751,15 +761,13 @@
 
 		case KSerialSetConfig:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_8, "Ioctl: KSerialSetConfig");
+			__FLOG(_L8("Ioctl: KSerialSetConfig"));	
 
 			TCommConfig cfg(*(reinterpret_cast<const TCommConfig*>(aOpt.Ptr())));
 
-            OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_9, "Rate[%d] DataBits[%d] StopBits[%d]", cfg().iRate, cfg().iDataBits, cfg().iStopBits);
-            OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_10, "Parity[%d] Handshake[0x%x]", cfg().iParity, cfg().iHandshake);
-            OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_11, "ParityError[%d] Fifo[%d] SpecialRate[%d] terminatorCount[%d]", cfg().iParityError, cfg().iFifo, cfg().iSpecialRate, cfg().iTerminatorCount);
-	        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_12, "Terminator[0x%x]", cfg().iTerminator);
-
+#ifdef __FLOG_ACTIVE
+			LogCommConfig(cfg);
+#endif // __FLOG_ACTIVE
 
 			ret = iComm.SetConfig(cfg);
 			break;
@@ -779,11 +787,11 @@
 			   				reinterpret_cast<const TName*>(aOpt.Ptr())
 			   				));
 				iCsyNameOverride = ETrue;
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_13, "Ioctl: CSY Name set to [%S]", iCsyName);
+				__FLOG_1(_L8("Ioctl: CSY Name set to [%S]"), &iCsyName);	
 				}
 			else
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_14, "Ioctl: Warning: Cannot set the CSY name because the Comm Port is already open.");
+				__FLOG(_L8("Ioctl: Warning: Cannot set the CSY name because the Comm Port is already open."));
 				ret = KErrAlreadyExists;
 				}
 			
@@ -796,11 +804,11 @@
 				{
 				iCommRole = *(reinterpret_cast<const TCommRole*>(aOpt.Ptr()));
 				iCommRoleOverride = ETrue;
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_15, "Ioctl: Comm Role set to [%d]", iCommRole);
+				__FLOG_1(_L8("Ioctl: Comm Role set to [%d]"), iCommRole);	
 				}
 			else
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_16, "Ioctl: Warning: Cannot set Comm Role because the Comm Port is already open.");
+				__FLOG(_L8("Ioctl: Warning: Cannot set Comm Role because the Comm Port is already open."));
 				ret = KErrAlreadyExists;
 				}
 			break;	
@@ -809,7 +817,7 @@
 		case KSerialSetTxRxBufferSize:
 			{
 			TInt bufSize = *(reinterpret_cast<const TInt*>(aOpt.Ptr()));
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_17, "Ioctl: Setting Rx Tx buffer size to [%d]", bufSize);
+			__FLOG_1(_L8("Ioctl: Setting Rx Tx buffer size to [%d]"), bufSize); 
 			
 			iComm.SetReceiveBufferLength(bufSize);
 			break;
@@ -830,7 +838,7 @@
 			else
 				{
 				const TSerialSetControlLines& lines = *(reinterpret_cast<const TSerialSetControlLines*>(aOpt.Ptr()));
-				OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_18, "Ioctl: Setting/clearing control lines %x/%x", lines.iSetMask, lines.iClearMask);
+				__FLOG_2(_L8("Ioctl: Setting/clearing control lines %x/%x"), lines.iSetMask, lines.iClearMask); 
 				iComm.SetSignals(lines.iSetMask, lines.iClearMask);
 				ret = KErrNone;
 				}
@@ -847,7 +855,7 @@
 		}
 		
 	
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_19, "Ioctl completed with error %d", ret);
+	__FLOG_1(_L8("Ioctl completed with error %d"), ret);			
 	
 	TRequestStatus* ptrStatus = &aStatus;
 	User::RequestComplete(ptrStatus, ret);
@@ -863,7 +871,7 @@
 */
 void CC32Bca::MonitorControlLinesL(TUint32 aArgMask)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL1_1, "Ioctl: argument bitmask = [0x%X] ", aArgMask);
+	__FLOG_1(_L8("Ioctl: argument bitmask = [0x%X] "), aArgMask);	
 			
 	if(iLinkMonitor) // We may have never started...  
 			{
@@ -873,12 +881,12 @@
 	
 	if(KMonitorOff == aArgMask) // Stop monitoring:
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL1_2, "MonitorControlLinesL: Stopping Control Lines monitoring.");
+		__FLOG(_L8("MonitorControlLinesL: Stopping Control Lines monitoring."));
 		// We either never started, or we just cancelled above.
 		}
 	else // Start Monitoring, or change the monitored lines.
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL1_3, "MonitorControlLinesL: Starting to monitor Control Lines.");
+		__FLOG(_L8("MonitorControlLinesL: Starting to monitor Control Lines."));	
 		
 		if(!iLinkMonitor) // We are starting to monitor for the first time 
 			{			
@@ -927,7 +935,7 @@
 		iLinkMonitor->Setup(lineMask);
 		iLinkMonitor->NotifyLinkDown();
 		
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL1_4, "MonitorControlLinesL: Control Lines monitoring started.");
+		__FLOG(_L8("MonitorControlLinesL: Control Lines monitoring started."));	
 		}				
 	}
 
@@ -945,7 +953,7 @@
 @leave if the value could not be read */
 void CC32Bca::ReadCommPortFromCommDbL(TDes& aPortName)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMPORTFROMCOMMDBL1_1, "CC32Bca::ReadCommPortFromCommDbL()");
+	__FLOG(_L8("CC32Bca::ReadCommPortFromCommDbL()"));
 	ConnectToCommDbBearerRecordL();
 
 	TInt ret(0);
@@ -958,7 +966,7 @@
 
 	if(ret!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMPORTFROMCOMMDBL1_2, "portField->LoadL(*iCommsDat) left with[%d] ", ret);
+		__FLOG_1(_L8("portField->LoadL(*iCommsDat) left with[%d] "), ret);
 		User::Leave(ret);	
 		}
 
@@ -972,7 +980,7 @@
 @leave if the value could not be read */
 void CC32Bca::ReadCsyNameFromCommDbL(TDes& aCsyName)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCSYNAMEFROMCOMMDBL1_1, "CC32Bca::ReadCsyNameFromCommDbL()");
+	__FLOG(_L8("CC32Bca::ReadCsyNameFromCommDbL()"));
 	ConnectToCommDbBearerRecordL();
 
 	TInt ret(0);
@@ -985,7 +993,7 @@
 
 	if(ret!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCSYNAMEFROMCOMMDBL1_2, "csyField->LoadL(*iCommsDat) left with[%d] ", ret);
+		__FLOG_1(_L8("csyField->LoadL(*iCommsDat) left with[%d] "), ret);
 		User::Leave(ret);	
 		}
 
@@ -1000,7 +1008,7 @@
 @leave if the value could not be read */	
 void CC32Bca::ReadCommRoleFromCommDbL(TCommRole& aCommRole)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMROLEFROMCOMMDBL1_1, "CC32Bca::ReadCommRoleFromCommDbL()");
+	__FLOG(_L8("CC32Bca::ReadCommRoleFromCommDbL()"));
 	ConnectToCommDbBearerRecordL();
 	TUint32 role(0);
 
@@ -1013,7 +1021,7 @@
 
 	if(ret!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMROLEFROMCOMMDBL1_2, "roleField->LoadL(*iCommsDat) left with[%d] ", ret);
+		__FLOG_1(_L8("roleField->LoadL(*iCommsDat) left with[%d] "), ret);
 		User::Leave(ret);	
 		}
 
@@ -1031,7 +1039,7 @@
 */
 void CC32Bca::ConnectToCommDbBearerRecordL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_1, "CC32Bca::ConnectToCommDbBearerRecordL()");
+	__FLOG(_L8("CC32Bca::ConnectToCommDbBearerRecordL()"));
 	if(iCommsDat != NULL) // CommDB is already open, we don't need to do anything
 		{
 		return;	
@@ -1039,7 +1047,7 @@
 	
 	if(iIapId < 1) // Can't access CommDB if IAP ID is unknown
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_2, "iIapId[%d] is unknown", iIapId);
+		__FLOG_1(_L8("iIapId[%d] is unknown"), iIapId);
 		User::Leave(KErrNotReady);	
 		}
 
@@ -1072,7 +1080,7 @@
   	TRAPD(ret,iapRecord->LoadL(*iCommsDat));
 	if (ret != KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_3, "iapRecord->LoadL(*iCommsDat) left with[%d] ", ret);
+		__FLOG_1(_L8("iapRecord->LoadL(*iCommsDat) left with[%d] "), ret);
 		User::Leave(ret);
 		}    
     
@@ -1092,7 +1100,7 @@
 	
 	if(iModemId == 0) // ID not found.
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_4, "iModemId[%d] is not found", iModemId);
+		__FLOG_1(_L8("iModemId[%d] is not found"), iModemId);
 		User::Leave(KErrNotFound);	
 		}
 	}
@@ -1101,7 +1109,7 @@
 /** Cancels an outstanding Ioctl, if any. */
 void CC32Bca::CancelIoctl()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CANCELIOCTL1_1, "CancelIoctl(): Ioctl cancel request. No Ioctl to cancel.");
+	__FLOG(_L8("CancelIoctl(): Ioctl cancel request. No Ioctl to cancel."));
 	}
 	
 
@@ -1128,7 +1136,7 @@
 		iCommServ.Close();	
 		iCommPortOpen = EFalse;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CLOSECOMMPORT1_1, "CloseCommPort(): Session with C32 & RComm closed.");
+	__FLOG(_L8("CloseCommPort(): Session with C32 & RComm closed."));
 	}
 
 /**
@@ -1137,7 +1145,7 @@
 */		
 void C32Bca::Panic(TC32BcaPanic aPanic)
 	{
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_PANIC1_1, "%S Panic %d", KC32BcaPanic(), aPanic);
+	__FLOG_STATIC2(KC32BcaLogFolder,KC32BcaLogFile,_L8("%S Panic %d"), &KC32BcaPanic(), aPanic);
 	User::Panic(KC32BcaPanic, aPanic);
 	}
 	
@@ -1165,7 +1173,7 @@
 // Upcall from the link monitor: Link has gone down.	
 void CC32Bca::CommLinkDown(TInt aErr)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_COMMLINKDOWN1_1, "CommLinkDown: Warning: serial link has gone down with error[%d]. Erroring the outstanding Read & Write.", aErr);
+	__FLOG_1(_L8("CommLinkDown: Warning: serial link has gone down with error[%d]. Erroring the outstanding Read & Write."), aErr);
 	
 	__ASSERT_DEBUG(KErrNone != aErr, Panic(EGeneralLogicError)); // If KErrNone, use has no way to know that the read has failed.
 	if(iReader->IsActive())

--- a/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CANCELIOCTL1_1=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CANCELREAD_1=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CANCELWRITE1_1=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CLOSE1_1=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CLOSECOMMPORT1_1=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_COMMLINKDOWN1_1=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_1=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_2=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_3=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_4=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CTOR1_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_DTOR1_1=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_DTOR1_2=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_1=0x15
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_10=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_11=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_12=0x20
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_13=0x21
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_14=0x22
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_15=0x23
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_16=0x24
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_17=0x25
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_18=0x26
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_19=0x27
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_2=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_3=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_4=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_5=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_6=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_7=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_8=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_9=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL1_1=0x28
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL1_2=0x29
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL1_3=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL1_4=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_1=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_2=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_3=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_4=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_5=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_6=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_7=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_8=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_PANIC1_1=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMPORTFROMCOMMDBL1_1=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMPORTFROMCOMMDBL1_2=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMROLEFROMCOMMDBL1_1=0x30
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMROLEFROMCOMMDBL1_2=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCSYNAMEFROMCOMMDBL1_1=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCSYNAMEFROMCOMMDBL1_2=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_RELEASE1_1=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_SHUTDOWN1_1=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_DOCANCEL1_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_NOTIFYLINKDOWN1_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_RUNL1_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_SETUP1_1=0x1

Binary file basebandadaptationplugins/basebandchanneladaptorforc32/doc_pub/C32BCA_design has changed

--- a/basebandadaptationplugins/basebandchanneladaptorforc32/group/C32Bca.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/group/C32Bca.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -27,7 +27,6 @@
 SOURCE		C32BcaDllMain.cpp
 
 USERINCLUDE	../inc
-USERINCLUDE	../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
@@ -35,6 +34,8 @@
 LIBRARY     c32.lib
 LIBRARY     commsdat.lib
 
+#include <comms-infras/commsdebugutility.mmh>
+
 // Do not add the non-callable exports to the DEF files
 // Remove this line temporarily if we need to add new exports
 //NOEXPORTLIBRARY

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/group/C32Bca2.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,48 @@
+// Copyright (c) 2004-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 
+// Baseband Channel Adaptor for C32 component.
+// 
+//
+
+TARGET		c32bca2.dll
+TARGETTYPE	dll
+UID		0x1000008D 0x10287032
+VENDORID	0x70000001
+
+SOURCEPATH	../c32bca2/src
+SOURCE		C32Bca.cpp
+SOURCE		C32BcaFactory.cpp
+SOURCE		C32BcaDllMain.cpp
+SOURCE		MBca2Impl.cpp
+
+USERINCLUDE	../c32bca2/inc
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY     euser.lib
+LIBRARY     c32.lib
+LIBRARY     commsdat.lib
+LIBRARY     commsbufs.lib
+
+#include <comms-infras/commsdebugutility.mmh>
+
+// Do not add the non-callable exports to the DEF files
+// Remove this line temporarily if we need to add new exports
+//NOEXPORTLIBRARY
+
+CAPABILITY All -Tcb
+
+UNPAGED
+SMPSAFE

--- a/basebandadaptationplugins/basebandchanneladaptorforc32/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -33,7 +33,7 @@
 C32Bca.mmp
 
 #ifdef SYMBIAN_ZERO_COPY_NETWORKING
-#include "../c32bca2/group/bld.inf"
+C32Bca2.mmp
 #endif

--- a/basebandadaptationplugins/basebandchanneladaptorforc32/inc/C32Bca.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/inc/C32Bca.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -29,6 +29,7 @@
 #include <e32def.h>
 #include <commsdattypesv1_1.h>
 using namespace CommsDat;
+#include <comms-infras/commsdebugutility.h>
 
 /** This namespace includes the BCA component names.*/
 namespace BasebandChannelAdaptation
@@ -41,7 +42,9 @@
 	
 	_LIT(KChannelIdNotOverridden, "");
 	
-		
+	_LIT8(KC32BcaLogFolder, "C32Bca");
+	_LIT8(KC32BcaLogFile, "C32Bca.txt");
+	
 		
 	
 	
@@ -93,7 +96,8 @@
 			Serial port we service for the iUser */
 			RComm& iPort;
 	
-	
+			/** CommsDebug logger  */
+			__FLOG_DECLARATION_MEMBER;			
 		};
 	
 	/**
@@ -188,6 +192,10 @@
 		virtual void CommWriteComplete(TInt aErr);
 		virtual void CommLinkDown(TInt aErr);
 				
+#ifdef __FLOG_ACTIVE
+		void LogCommConfig(TCommConfig& c);
+#endif // __FLOG_ACTIVE
+
 	private:
 		void CloseCommPort();	
 	
@@ -234,6 +242,8 @@
 		/** Should the next write be errored with this error  code? */
 		TInt iErrorOnNextWrite;
 		
+		/** Comms Debug Utility logger. */
+		__FLOG_DECLARATION_MEMBER;
 		};
 	/**
 	* C32BCA Panic.

--- a/basebandadaptationplugins/basebandchanneladaptorforc32/src/C32Bca.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/src/C32Bca.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -21,12 +21,6 @@
  @internalComponent
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "C32BcaTraces.h"
-#endif
-
 #include "C32Bca.h"
 #include <cdbcols.h>
 #include <commsdat_partner.h>
@@ -50,12 +44,14 @@
 	iPort(aPort)
 	{
 	CActiveScheduler::Add(this);
+	__FLOG_OPEN(KC32BcaLogFolder, KC32BcaLogFile); // Connect to the BCA logger			
 	}
 		
 /**
 C++ destructor */		
 CCommBase::~CCommBase()
 	{
+	__FLOG_CLOSE;
 	}
 
 /**
@@ -177,7 +173,7 @@
 void CCommLinkMonitor::Setup(TUint32 aMask)
 	{
 	iNotifyChangeSignalMask = aMask;	
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_SETUP_1, "CommLinkMonitor setup: Notify on signal mask [0x%X]",iNotifyChangeSignalMask);
+	__FLOG_1(_L8("CommLinkMonitor setup: Notify on signal mask [0x%X]"),iNotifyChangeSignalMask);
 	}
 
 /**
@@ -193,7 +189,7 @@
 	iSavedSignalState = iPort.Signals(iNotifyChangeSignalMask) & iNotifyChangeSignalMask;
 	iPort.NotifySignalChange(iStatus, iSignals, iNotifyChangeSignalMask);
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_NOTIFYLINKDOWN_1, "CommLinkMonitor::NotifyLinkDown: initial signals: [0x%X]", iSavedSignalState);
+	__FLOG_1(_L8("CommLinkMonitor::NotifyLinkDown: initial signals: [0x%X]"), iSavedSignalState);
 	
 	SetActive();
 	}
@@ -203,7 +199,7 @@
 */
 void CCommLinkMonitor::RunL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_RUNL_1, "CommLinkMonitor::RunL: Signals changed [0x%X]; new signals [0x%X]", iSignals & (~0x1F), iSignals & 0x1F);
+	__FLOG_2(_L8("CommLinkMonitor::RunL: Signals changed [0x%X]; new signals [0x%X]"), iSignals & (~0x1F), iSignals & 0x1F);
 	
 	// We report link failure if and only if a monitored line went from high to low.
 	// Method: mask the saved signals using inverted monitored bits in the signal bitmask,
@@ -224,7 +220,7 @@
 Cancels notification request of link failure */	
 void CCommLinkMonitor::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_DOCANCEL_1, "CommLinkMonitor::DoCancel: Cancelling signal change notification.");
+	__FLOG(_L8("CommLinkMonitor::DoCancel: Cancelling signal change notification."));
 	iPort.NotifySignalChangeCancel();
 	}
 	
@@ -237,7 +233,8 @@
 */
 CC32Bca::CC32Bca()	
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CTOR_1, "====== CC32Bca::CC32Bca: Shim BCA for C32 [Vesion: major= %d minor= %d] Constructed. ======", KC32BcaMajorVersionNumber, KC32BcaMinorVersionNumber);
+	__FLOG_OPEN(KC32BcaLogFolder,KC32BcaLogFile);
+	__FLOG_2(_L8("====== CC32Bca::CC32Bca: Shim BCA for C32 [Vesion: major= %d minor= %d] Constructed. ======"), KC32BcaMajorVersionNumber, KC32BcaMinorVersionNumber);
 	}
 
 /**
@@ -263,7 +260,7 @@
 CC32Bca::~CC32Bca()
 	
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_DTOR_1, "CC32Bca::~CC32Bca: releasing resources...");
+	__FLOG(_L8("CC32Bca::~CC32Bca: releasing resources..."));
 		
 	CloseCommDbConnection(); 
 	CloseCommPort(); 	// Cancels reader / writer / monitor
@@ -275,13 +272,14 @@
 	delete iWriter;
 	delete iLinkMonitor; // Note: may have never been created.
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_DTOR_2, "CC32Bca::~CC32Bca: CC32Bca destroyed.");
+	__FLOG(_L8("CC32Bca::~CC32Bca: CC32Bca destroyed."));
+	__FLOG_CLOSE;
 	}
 	
 /** This method deletes the BCA itself.*/
 void CC32Bca::Release()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_RELEASE_1, "CC32Bca::Release");
+	__FLOG(_L8("CC32Bca::Release"));
 	delete this;
 	}
 	
@@ -301,7 +299,7 @@
 	TRequestStatus* ptrStatus = &aStatus;
 	if(iCommPortOpen)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_1, "Warning: C32Bca is already Opened.");
+		__FLOG(_L8("Warning: C32Bca is already Opened."));
 	
 		User::RequestComplete(ptrStatus,KErrNone);
 		return;	
@@ -322,12 +320,12 @@
 		// So, we just log a warning.
 		if(KErrNone == commPortErr && iCommPort.Size() == 0)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_2, "Warning: Null string read from CommDB. Will try to open Comm Port anyway.");
+			__FLOG(_L8("Warning: Null string read from CommDB. Will try to open Comm Port anyway."));
 			}		
 		
 		if(KErrNone != commPortErr) // Fatal: we do not have a port name. Can't open RComm.
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_3, "Error: Failed to get C32 PortName from CommDB ");
+			__FLOG(_L8("Error: Failed to get C32 PortName from CommDB "));
 			CloseCommDbConnection();
 			User::RequestComplete(ptrStatus, commPortErr);
 			return;
@@ -340,7 +338,7 @@
 
 		if (len1 < KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_4, "** ERROR: No :: (Double Colon) in aChannelId **");
+			__FLOG(_L8("** ERROR: No :: (Double Colon) in aChannelId **"));
 			User::RequestComplete(ptrStatus, KErrBadName);
 			return;	
 			}
@@ -371,7 +369,7 @@
 			{
 			// We do not use a hardcoded value (e.g. ECUART), because the client code or the environment are
 			// confused - it is better to fail them, rather than mask their problems.
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_5, "Error: Failed to get CSY name from CommDB ");
+			__FLOG(_L8("Error: Failed to get CSY name from CommDB "));
 			CloseCommDbConnection();
 			User::RequestComplete(ptrStatus,getCsyErr);
 			return;
@@ -401,13 +399,13 @@
 	TInt ret = iCommServ.Connect();
 	if(ret)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_6, "Open: C32 Server connection error %d", ret);
+		__FLOG_1(_L8("Open: C32 Server connection error %d"), ret);
 		User::RequestComplete(ptrStatus,ret);
 		return;
 		}
 	ret = iCommServ.LoadCommModule(iCsyName);
 	
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_7,"Open: CSY module [%S] loaded with error %d", iCsyName, ret);
+	__FLOG_2(_L16("Open: CSY module [%S] loaded with error %d"), &iCsyName, ret);
 		
 	if(ret)
 		{
@@ -424,7 +422,7 @@
 		ret = iComm.Open(iCommServ, iCommPort, ECommShared, iCommRole);	
 		}
 	
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_8,"Open: C32 port [%S] opened with error %d", iCommPort, ret);
+	__FLOG_2(_L16("Open: C32 port [%S] opened with error %d"), &iCommPort, ret);
 					
 	if(ret)
 		{
@@ -462,7 +460,7 @@
 	
 	TRequestStatus* request = &aStatus;
 	User::RequestComplete(request, KErrNone);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_SHUTDOWN_1, "C32Bca::Shutdown: BCA shut down with error %d", KErrNone);
+	__FLOG_1(_L8("C32Bca::Shutdown: BCA shut down with error %d"), KErrNone);
 	}
 
 /**
@@ -472,7 +470,7 @@
 void CC32Bca::Close()
 	{
 	CloseCommPort();
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CLOSE_1, "C32Bca::Close:Close: BCA closed with error %d", KErrNone);
+	__FLOG_1(_L8("C32Bca::Close:Close: BCA closed with error %d"), KErrNone);
 	}
 
 /**
@@ -527,7 +525,7 @@
 void CC32Bca:: CancelRead()
 	
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CANCELREAD_1, "CancelRead: Read is cancelled by client.");
+	__FLOG(_L8("CancelRead: Read is cancelled by client."));
 	iReader->Cancel();
 
 	if(iReadRequest != NULL)
@@ -542,7 +540,7 @@
 void CC32Bca::CancelWrite()
 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CANCELWRITE_1, "CancelWrite: Write is cancelled by client.");
+    __FLOG(_L8("CancelWrite: Write is cancelled by client."));
 
     iWriter->Cancel();
 
@@ -554,7 +552,7 @@
     
 
 // Debug dumps:
-#ifdef OST_TRACE_COMPILER_IN_USE
+#ifdef __FLOG_ACTIVE
 
 _LIT8(KLitOptLevelGeneric,    "KBcaOptLevelGeneric");
 _LIT8(KLitOptLevelExtSerial,   "KBcaOptLevelExtSerial");
@@ -639,11 +637,22 @@
 			return KLitOptNameUnsupported;		
 		}
 	}
-#endif // OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG
+#endif // __FLOG_ACTIVE
 
 
+#ifdef __FLOG_ACTIVE
+/**
+Print debug output of the TCommComfig parameters.
 
-
+@param The configuration whose parameters should be logged.
+*/
+void CC32Bca::LogCommConfig(TCommConfig& c)
+	{
+	__FLOG_5(_L8("Rate[%d] DataBits[%d] StopBits[%d] Parity[%d] Handshake[0x%x]"), c().iRate, c().iDataBits, c().iStopBits, c().iParity, c().iHandshake);	
+	__FLOG_4(_L8("ParityError[%d] Fifo[%d] SpecialRate[%d] terminatorCount[%d]"), c().iParityError, c().iFifo, c().iSpecialRate, c().iTerminatorCount);	
+	__FLOG_1(_L8("Terminator[0x%x]"), c().iTerminator);	
+	}
+#endif // __FLOG_ACTIVE
 
 
 /**
@@ -657,7 +666,7 @@
 void CC32Bca::Ioctl(TRequestStatus& aStatus, TUint aOptLevel, TUint aOptName, TDes8& aOpt)
 
 	{
-	OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_1, "Ioctl: Level[%s](0x%X) Name[%s](0x%X).", IoctlOptLevelStr(aOptLevel), aOptLevel, IoctlOptNameStr(aOptName), aOptName);
+	__FLOG_4(_L8("Ioctl: Level[%S](0x%X) Name[%S](0x%X)."), &IoctlOptLevelStr(aOptLevel), aOptLevel, &IoctlOptNameStr(aOptName), aOptName);	
 	
 	aStatus = KRequestPending;
 	
@@ -687,7 +696,7 @@
 				{
 				TUint32 tempIapId = *(reinterpret_cast<const TUint32*>(aOpt.Ptr()));
 				
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_2, "Ioctl: IAP ID [%d] specified.",tempIapId);
+				__FLOG_1(_L8("Ioctl: IAP ID [%d] specified."),tempIapId);	
 				
 				if(tempIapId < 1 )
 					{
@@ -736,15 +745,14 @@
 			
 		case KSerialConfig:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_3, "Ioctl: KSerialConfig");
+			__FLOG(_L8("Ioctl: KSerialConfig"));	
 
 			TCommConfig cfg;
 			iComm.Config(cfg);
 
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_4, "Rate[%d] DataBits[%d] StopBits[%d]", cfg().iRate, cfg().iDataBits, cfg().iStopBits);
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_5, "Parity[%d] Handshake[0x%x]", cfg().iParity, cfg().iHandshake);
-			OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_6, "ParityError[%d] Fifo[%d] SpecialRate[%d] terminatorCount[%d]", cfg().iParityError, cfg().iFifo, cfg().iSpecialRate, cfg().iTerminatorCount);
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_7, "Terminator[0x%x]", cfg().iTerminator);
+#ifdef __FLOG_ACTIVE
+			LogCommConfig(cfg);
+#endif // __FLOG_ACTIVE
 
 			TPckgBuf<TCommConfig> cfgBuf(cfg);
 			aOpt.Copy(cfgBuf);
@@ -753,15 +761,14 @@
 
 		case KSerialSetConfig:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_8, "Ioctl: KSerialSetConfig");
+			__FLOG(_L8("Ioctl: KSerialSetConfig"));	
 
 			TCommConfig cfg(*(reinterpret_cast<const TCommConfig*>(aOpt.Ptr())));
 
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_9, "Rate[%d] DataBits[%d] StopBits[%d]", cfg().iRate, cfg().iDataBits, cfg().iStopBits);
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_10, "Parity[%d] Handshake[0x%x]", cfg().iParity, cfg().iHandshake);
-			OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_11, "ParityError[%d] Fifo[%d] SpecialRate[%d] terminatorCount[%d]", cfg().iParityError, cfg().iFifo, cfg().iSpecialRate, cfg().iTerminatorCount);
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_12, "Terminator[0x%x]", cfg().iTerminator);
-			
+#ifdef __FLOG_ACTIVE
+			LogCommConfig(cfg);
+#endif // __FLOG_ACTIVE
+
 			ret = iComm.SetConfig(cfg);
 			break;
 			}
@@ -780,11 +787,11 @@
 			   				reinterpret_cast<const TName*>(aOpt.Ptr())
 			   				));
 				iCsyNameOverride = ETrue;
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_13, "Ioctl: CSY Name set to [%S]", iCsyName);
+				__FLOG_1(_L8("Ioctl: CSY Name set to [%S]"), &iCsyName);	
 				}
 			else
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_14, "Ioctl: Warning: Cannot set the CSY name because the Comm Port is already open.");
+				__FLOG(_L8("Ioctl: Warning: Cannot set the CSY name because the Comm Port is already open."));
 				ret = KErrAlreadyExists;
 				}
 			
@@ -797,11 +804,11 @@
 				{
 				iCommRole = *(reinterpret_cast<const TCommRole*>(aOpt.Ptr()));
 				iCommRoleOverride = ETrue;
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_15, "Ioctl: Comm Role set to [%d]", iCommRole);
+				__FLOG_1(_L8("Ioctl: Comm Role set to [%d]"), iCommRole);	
 				}
 			else
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_16, "Ioctl: Warning: Cannot set Comm Role because the Comm Port is already open.");
+				__FLOG(_L8("Ioctl: Warning: Cannot set Comm Role because the Comm Port is already open."));
 				ret = KErrAlreadyExists;
 				}
 			break;	
@@ -810,7 +817,7 @@
 		case KSerialSetTxRxBufferSize:
 			{
 			TInt bufSize = *(reinterpret_cast<const TInt*>(aOpt.Ptr()));
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_17, "Ioctl: Setting Rx Tx buffer size to [%d]", bufSize);
+			__FLOG_1(_L8("Ioctl: Setting Rx Tx buffer size to [%d]"), bufSize); 
 			
 			iComm.SetReceiveBufferLength(bufSize);
 			break;
@@ -831,7 +838,7 @@
 			else
 				{
 				const TSerialSetControlLines& lines = *(reinterpret_cast<const TSerialSetControlLines*>(aOpt.Ptr()));
-				OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_18, "Ioctl: Setting/clearing control lines %x/%x", lines.iSetMask, lines.iClearMask);
+				__FLOG_2(_L8("Ioctl: Setting/clearing control lines %x/%x"), lines.iSetMask, lines.iClearMask); 
 				iComm.SetSignals(lines.iSetMask, lines.iClearMask);
 				ret = KErrNone;
 				}
@@ -848,7 +855,7 @@
 		}
 		
 	
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_19, "Ioctl completed with error %d", ret);
+	__FLOG_1(_L8("Ioctl completed with error %d"), ret);			
 	
 	TRequestStatus* ptrStatus = &aStatus;
 	User::RequestComplete(ptrStatus, ret);
@@ -864,7 +871,7 @@
 */
 void CC32Bca::MonitorControlLinesL(TUint32 aArgMask)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL_1, "Ioctl: argument bitmask = [0x%X] ", aArgMask);
+	__FLOG_1(_L8("Ioctl: argument bitmask = [0x%X] "), aArgMask);	
 			
 	if(iLinkMonitor) // We may have never started...  
 			{
@@ -874,12 +881,12 @@
 	
 	if(KMonitorOff == aArgMask) // Stop monitoring:
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL_2, "MonitorControlLinesL: Stopping Control Lines monitoring.");
+		__FLOG(_L8("MonitorControlLinesL: Stopping Control Lines monitoring."));
 		// We either never started, or we just cancelled above.
 		}
 	else // Start Monitoring, or change the monitored lines.
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL_3, "MonitorControlLinesL: Starting to monitor Control Lines.");
+		__FLOG(_L8("MonitorControlLinesL: Starting to monitor Control Lines."));	
 		
 		if(!iLinkMonitor) // We are starting to monitor for the first time 
 			{			
@@ -928,7 +935,7 @@
 		iLinkMonitor->Setup(lineMask);
 		iLinkMonitor->NotifyLinkDown();
 		
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL_4, "MonitorControlLinesL: Control Lines monitoring started.");
+		__FLOG(_L8("MonitorControlLinesL: Control Lines monitoring started."));	
 		}				
 	}
 
@@ -946,7 +953,7 @@
 @leave if the value could not be read */
 void CC32Bca::ReadCommPortFromCommDbL(TDes& aPortName)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMPORTFROMCOMMDBL_1, "CC32Bca::ReadCommPortFromCommDbL()");
+	__FLOG(_L8("CC32Bca::ReadCommPortFromCommDbL()"));
 	ConnectToCommDbBearerRecordL();
 
 	TInt ret(0);
@@ -959,7 +966,7 @@
 
 	if(ret!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMPORTFROMCOMMDBL_2, "portField->LoadL(*iCommsDat) left with[%d] ", ret);
+		__FLOG_1(_L8("portField->LoadL(*iCommsDat) left with[%d] "), ret);
 		User::Leave(ret);	
 		}
 
@@ -973,7 +980,7 @@
 @leave if the value could not be read */
 void CC32Bca::ReadCsyNameFromCommDbL(TDes& aCsyName)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCSYNAMEFROMCOMMDBL_1, "CC32Bca::ReadCsyNameFromCommDbL()");
+	__FLOG(_L8("CC32Bca::ReadCsyNameFromCommDbL()"));
 	ConnectToCommDbBearerRecordL();
 
 	TInt ret(0);
@@ -986,7 +993,7 @@
 
 	if(ret!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCSYNAMEFROMCOMMDBL_2, "csyField->LoadL(*iCommsDat) left with[%d] ", ret);
+		__FLOG_1(_L8("csyField->LoadL(*iCommsDat) left with[%d] "), ret);
 		User::Leave(ret);	
 		}
 
@@ -1001,7 +1008,7 @@
 @leave if the value could not be read */	
 void CC32Bca::ReadCommRoleFromCommDbL(TCommRole& aCommRole)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMROLEFROMCOMMDBL_1, "CC32Bca::ReadCommRoleFromCommDbL()");
+	__FLOG(_L8("CC32Bca::ReadCommRoleFromCommDbL()"));
 	ConnectToCommDbBearerRecordL();
 	TUint32 role(0);
 
@@ -1014,7 +1021,7 @@
 
 	if(ret!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMROLEFROMCOMMDBL_2, "roleField->LoadL(*iCommsDat) left with[%d] ", ret);
+		__FLOG_1(_L8("roleField->LoadL(*iCommsDat) left with[%d] "), ret);
 		User::Leave(ret);	
 		}
 
@@ -1032,7 +1039,7 @@
 */
 void CC32Bca::ConnectToCommDbBearerRecordL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_1, "CC32Bca::ConnectToCommDbBearerRecordL()");
+	__FLOG(_L8("CC32Bca::ConnectToCommDbBearerRecordL()"));
 	if(iCommsDat != NULL) // CommDB is already open, we don't need to do anything
 		{
 		return;	
@@ -1040,7 +1047,7 @@
 	
 	if(iIapId < 1) // Can't access CommDB if IAP ID is unknown
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_2, "iIapId[%d] is unknown", iIapId);
+		__FLOG_1(_L8("iIapId[%d] is unknown"), iIapId);
 		User::Leave(KErrNotReady);	
 		}
 
@@ -1073,7 +1080,7 @@
   	TRAPD(ret,iapRecord->LoadL(*iCommsDat));
 	if (ret != KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_3, "iapRecord->LoadL(*iCommsDat) left with[%d] ", ret);
+		__FLOG_1(_L8("iapRecord->LoadL(*iCommsDat) left with[%d] "), ret);
 		User::Leave(ret);
 		}    
     
@@ -1093,7 +1100,7 @@
 	
 	if(iModemId == 0) // ID not found.
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_4, "iModemId[%d] is not found", iModemId);
+		__FLOG_1(_L8("iModemId[%d] is not found"), iModemId);
 		User::Leave(KErrNotFound);	
 		}
 	}
@@ -1102,7 +1109,7 @@
 /** Cancels an outstanding Ioctl, if any. */
 void CC32Bca::CancelIoctl()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CANCELIOCTL_1, "CancelIoctl(): Ioctl cancel request. No Ioctl to cancel.");
+	__FLOG(_L8("CancelIoctl(): Ioctl cancel request. No Ioctl to cancel."));
 	}
 	
 
@@ -1129,7 +1136,7 @@
 		iCommServ.Close();	
 		iCommPortOpen = EFalse;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CLOSECOMMPORT_1, "CloseCommPort(): Session with C32 & RComm closed.");
+	__FLOG(_L8("CloseCommPort(): Session with C32 & RComm closed."));
 	}
 
 /**
@@ -1138,7 +1145,7 @@
 */		
 void C32Bca::Panic(TC32BcaPanic aPanic)
 	{
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_PANIC_1, "%S Panic %d", KC32BcaPanic(), aPanic);
+	__FLOG_STATIC2(KC32BcaLogFolder,KC32BcaLogFile,_L8("%S Panic %d"), &KC32BcaPanic(), aPanic);
 	User::Panic(KC32BcaPanic, aPanic);
 	}
 	
@@ -1166,7 +1173,7 @@
 // Upcall from the link monitor: Link has gone down.	
 void CC32Bca::CommLinkDown(TInt aErr)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_COMMLINKDOWN_1, "CommLinkDown: Warning: serial link has gone down with error[%d]. Erroring the outstanding Read & Write.", aErr);
+	__FLOG_1(_L8("CommLinkDown: Warning: serial link has gone down with error[%d]. Erroring the outstanding Read & Write."), aErr);
 	
 	__ASSERT_DEBUG(KErrNone != aErr, Panic(EGeneralLogicError)); // If KErrNone, use has no way to know that the read has failed.
 	if(iReader->IsActive())

--- a/basebandadaptationplugins/basebandchanneladaptorforc32/te_c32bca/group/TE_C32Bca.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-"\sf\os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32\te_c32bca\scripts\TE_C32BcaUnit.script"-"c:\testdata\scripts\TE_C32BcaUnit.script"

--- a/basebandadaptationplugins/basebandchanneladaptorforc32/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/basebandadaptationplugins/basebandchanneladaptorforc32/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CANCELIOCTL_1=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CANCELREAD_1=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CANCELWRITE_1=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CLOSECOMMPORT_1=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CLOSE_1=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_COMMLINKDOWN_1=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_1=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_2=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_3=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_4=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CTOR_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_DTOR_1=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_DTOR_2=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_1=0x15
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_10=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_11=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_12=0x20
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_13=0x21
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_14=0x22
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_15=0x23
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_16=0x24
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_17=0x25
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_18=0x26
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_19=0x27
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_2=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_3=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_4=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_5=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_6=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_7=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_8=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_9=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL_1=0x28
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL_2=0x29
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL_3=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL_4=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_1=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_2=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_3=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_4=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_5=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_6=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_7=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_8=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_PANIC_1=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMPORTFROMCOMMDBL_1=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMPORTFROMCOMMDBL_2=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMROLEFROMCOMMDBL_1=0x30
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMROLEFROMCOMMDBL_2=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCSYNAMEFROMCOMMDBL_1=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCSYNAMEFROMCOMMDBL_2=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_RELEASE_1=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_SHUTDOWN_1=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_DOCANCEL_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_NOTIFYLINKDOWN_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_RUNL_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_SETUP_1=0x1

--- a/build.config.xml	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
-  <!ENTITY layer_real_source_path "sf/os/cellularsrv" >
-]>
-
-<SystemDefinition name="cellularsrv" schema="1.4.0">
-  <systemModel>
-    <layer name="os_layer">
-      <module name="cellularsrv">
-        <unit unitID="cbsdo.cellularsrv" mrp="" bldFile="&layer_real_source_path;/group" name="cellularsrv" />
-      </module>
-    </layer>
-	<layer name="api_test_layer">
-      <module name="cellularsrv_test">
-        <unit unitID="cbsdo.cellularsrv.test" mrp="" bldFile="&layer_real_source_path;/group" name="cellularsrv" />
-      </module>
-    </layer>
-  </systemModel>
-</SystemDefinition>

--- a/cbsref/csyrefplugins/csy27010/.cproject	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?fileVersion 4.0.0?>
-
-<cproject>
-<storageModule buildFromInf="true" buildingTestComps="true" cleanLevel="0" concurrentBuildJobs="4" defaultMMPChangedAction="0" infBuildComponents="" infFileLocation="group\BLD.INF" macrosFile="" makeEngineToUse="make" manageDependencies="true" moduleId="com.nokia.carbide.cdt.builder.carbideCPPBuilder" overrideMakeEngine="false" overrideWorkspaceSettings="false" promptForMMPChangedAction="true" useConcurrentBuilding="true" useDebugMode="false" useIncrementalBuilder="false" useKeepGoing="false" useMMPMacros="true"/>
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="Emulator Debug (WINSCW) [cenrep]">
-<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Emulator Debug (WINSCW) [cenrep]" moduleId="org.eclipse.cdt.core.settings" name="Emulator Debug (WINSCW) [cenrep]">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.cdt.debug.cw.symbian.SymbianE32" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakeDefErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.SBSv2ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MWLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MWCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.CarbideMakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RCOMPErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="CarbideConfigurationDataProvider">
-<ENV_VAR_DATA_ID/>
-<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
-<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="G:\epoc32\rom\"/>
-</storageModule>
-<storageModule filesCache="G:\Csy27010\group\Csy27010.mmp;G:\Csy27010\test\Csy27010UnitTest.mmp;G:\Csy27010\group\BLD.INF;" includesCache="G:/Csy27010/inc[LOCAL];G:/Csy27010/test[LOCAL];G:/Csy27010/test/unit_test_base[LOCAL];G:/epoc32/include;" macrosCache="__WINSCW__;__SUPPORT_CPP_EXCEPTIONS__;__SYMBIAN32__;_UNICODE;_DEBUG;__WINS__;__CW32__;" moduleId="configDataCache" sourcesCache="/Csy27010/inc;/Csy27010/src;/Csy27010/test;/Csy27010/test/unit_test_base;" timestampCache="1258543787458" useMmpMacrosCache="true"/>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-</cconfiguration>
-<cconfiguration id="Emulator Release (WINSCW) [cenrep]">
-<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Emulator Release (WINSCW) [cenrep]" moduleId="org.eclipse.cdt.core.settings" name="Emulator Release (WINSCW) [cenrep]">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.cdt.debug.cw.symbian.SymbianE32" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakeDefErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.SBSv2ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MWLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MWCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.CarbideMakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RCOMPErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="CarbideConfigurationDataProvider">
-<ENV_VAR_DATA_ID/>
-<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
-<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="G:\epoc32\rom\"/>
-</storageModule>
-<storageModule filesCache="G:\Csy27010\group\Csy27010.mmp;G:\Csy27010\test\Csy27010UnitTest.mmp;G:\Csy27010\group\BLD.INF;" includesCache="G:/Csy27010/inc[LOCAL];G:/Csy27010/test[LOCAL];G:/Csy27010/test/unit_test_base[LOCAL];G:/epoc32/include;" macrosCache="__WINSCW__;__SUPPORT_CPP_EXCEPTIONS__;__SYMBIAN32__;_UNICODE;NDEBUG;__WINS__;__CW32__;" moduleId="configDataCache" sourcesCache="/Csy27010/inc;/Csy27010/src;/Csy27010/test;/Csy27010/test/unit_test_base;" timestampCache="1258543787489" useMmpMacrosCache="true"/>
-</cconfiguration>
-<cconfiguration id="Phone Debug (ARMV5) [cenrep]">
-<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Debug (ARMV5) [cenrep]" moduleId="org.eclipse.cdt.core.settings" name="Phone Debug (ARMV5) [cenrep]">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.cdt.debug.cw.symbian.SymbianE32" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTCompilerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakeDefErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.SBSv2ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTLinkerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.CarbideMakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RCOMPErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.Elf2E32ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="CarbideConfigurationDataProvider">
-<ENV_VAR_DATA_ID/>
-<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
-<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="G:\epoc32\rom\"/>
-</storageModule>
-<storageModule filesCache="G:\Csy27010\group\Csy27010.mmp;G:\Csy27010\test\Csy27010UnitTest.mmp;G:\Csy27010\group\BLD.INF;" includesCache="G:/Csy27010/inc[LOCAL];G:/Csy27010/test[LOCAL];G:/Csy27010/test/unit_test_base[LOCAL];G:/epoc32/include;" macrosCache="__GENERIC_MARM__;__SUPPORT_CPP_EXCEPTIONS__;__SYMBIAN32__;_UNICODE;__ARMCC_2_2__;__EPOC32__;__ARMCC_2__;__EABI__;_DEBUG;__MARM_ARMV5__;__ARMCC__;__MARM__;" moduleId="configDataCache" sourcesCache="/Csy27010/inc;/Csy27010/src;/Csy27010/test;/Csy27010/test/unit_test_base;" timestampCache="1258543787520" useMmpMacrosCache="true"/>
-</cconfiguration>
-<cconfiguration id="Phone Release (ARMV5) [cenrep]">
-<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Release (ARMV5) [cenrep]" moduleId="org.eclipse.cdt.core.settings" name="Phone Release (ARMV5) [cenrep]">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.cdt.debug.cw.symbian.SymbianE32" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTCompilerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakeDefErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.SBSv2ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTLinkerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.CarbideMakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RCOMPErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.Elf2E32ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="CarbideConfigurationDataProvider">
-<ENV_VAR_DATA_ID/>
-<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
-<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="G:\epoc32\rom\"/>
-</storageModule>
-<storageModule filesCache="G:\Csy27010\group\Csy27010.mmp;G:\Csy27010\test\Csy27010UnitTest.mmp;G:\Csy27010\group\BLD.INF;" includesCache="G:/Csy27010/inc[LOCAL];G:/Csy27010/test[LOCAL];G:/Csy27010/test/unit_test_base[LOCAL];G:/epoc32/include;" macrosCache="__GENERIC_MARM__;__SUPPORT_CPP_EXCEPTIONS__;__SYMBIAN32__;_UNICODE;__ARMCC_2_2__;__EPOC32__;__ARMCC_2__;__EABI__;__MARM_ARMV5__;NDEBUG;__ARMCC__;__MARM__;" moduleId="configDataCache" sourcesCache="/Csy27010/inc;/Csy27010/src;/Csy27010/test;/Csy27010/test/unit_test_base;" timestampCache="1258543787551" useMmpMacrosCache="true"/>
-</cconfiguration>
-<cconfiguration id="Phone Debug (ARMV6) [cenrep]">
-<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Debug (ARMV6) [cenrep]" moduleId="org.eclipse.cdt.core.settings" name="Phone Debug (ARMV6) [cenrep]">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.cdt.debug.cw.symbian.SymbianE32" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTCompilerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakeDefErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.SBSv2ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTLinkerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.CarbideMakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RCOMPErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.Elf2E32ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="CarbideConfigurationDataProvider">
-<ENV_VAR_DATA_ID/>
-<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
-<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="G:\epoc32\rom\"/>
-</storageModule>
-<storageModule filesCache="G:\Csy27010\group\Csy27010.mmp;G:\Csy27010\test\Csy27010UnitTest.mmp;G:\Csy27010\group\BLD.INF;" includesCache="G:/Csy27010/inc[LOCAL];G:/Csy27010/test[LOCAL];G:/Csy27010/test/unit_test_base[LOCAL];G:/epoc32/include;" macrosCache="__GENERIC_MARM__;__SYMBIAN32__;__SUPPORT_CPP_EXCEPTIONS__;__EPOC32__;__EABI__;__ARMCC_2__;__ARMCC__;__MARM__;__ARMCC_2_2__;_UNICODE;_DEBUG;__ARMV6__;__MARM_ARMV5__;" moduleId="configDataCache" sourcesCache="/Csy27010/inc;/Csy27010/src;/Csy27010/test;/Csy27010/test/unit_test_base;" timestampCache="1258543787583" useMmpMacrosCache="true"/>
-</cconfiguration>
-<cconfiguration id="Phone Release (ARMV6) [cenrep]">
-<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Release (ARMV6) [cenrep]" moduleId="org.eclipse.cdt.core.settings" name="Phone Release (ARMV6) [cenrep]">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.cdt.debug.cw.symbian.SymbianE32" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTCompilerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakeDefErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.SBSv2ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTLinkerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.CarbideMakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RCOMPErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.Elf2E32ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="CarbideConfigurationDataProvider">
-<ENV_VAR_DATA_ID/>
-<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
-<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="G:\epoc32\rom\"/>
-</storageModule>
-<storageModule filesCache="G:\Csy27010\group\Csy27010.mmp;G:\Csy27010\test\Csy27010UnitTest.mmp;G:\Csy27010\group\BLD.INF;" includesCache="G:/Csy27010/inc[LOCAL];G:/Csy27010/test[LOCAL];G:/Csy27010/test/unit_test_base[LOCAL];G:/epoc32/include;" macrosCache="__GENERIC_MARM__;__SYMBIAN32__;__SUPPORT_CPP_EXCEPTIONS__;__EPOC32__;__EABI__;__ARMCC_2__;NDEBUG;__ARMCC__;__MARM__;__ARMCC_2_2__;_UNICODE;__ARMV6__;__MARM_ARMV5__;" moduleId="configDataCache" sourcesCache="/Csy27010/inc;/Csy27010/src;/Csy27010/test;/Csy27010/test/unit_test_base;" timestampCache="1258543787614" useMmpMacrosCache="true"/>
-</cconfiguration>
-<cconfiguration id="Phone Debug (ARMV7) [cenrep]">
-<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Debug (ARMV7) [cenrep]" moduleId="org.eclipse.cdt.core.settings" name="Phone Debug (ARMV7) [cenrep]">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.cdt.debug.cw.symbian.SymbianE32" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTCompilerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakeDefErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.SBSv2ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTLinkerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.CarbideMakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RCOMPErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.Elf2E32ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="CarbideConfigurationDataProvider">
-<ENV_VAR_DATA_ID/>
-<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
-<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="G:\epoc32\rom\"/>
-</storageModule>
-<storageModule filesCache="G:\Csy27010\group\Csy27010.mmp;G:\Csy27010\test\Csy27010UnitTest.mmp;G:\Csy27010\group\BLD.INF;" includesCache="G:/Csy27010/inc[LOCAL];G:/Csy27010/test[LOCAL];G:/Csy27010/test/unit_test_base[LOCAL];G:/epoc32/include;" macrosCache="__GENERIC_MARM__;__ARMV7__;__SYMBIAN32__;__SUPPORT_CPP_EXCEPTIONS__;__EPOC32__;__EABI__;__ARMCC_2__;__ARMCC__;__MARM__;__ARMCC_2_2__;_UNICODE;_DEBUG;__MARM_ARMV5__;" moduleId="configDataCache" sourcesCache="/Csy27010/inc;/Csy27010/src;/Csy27010/test;/Csy27010/test/unit_test_base;" timestampCache="1258543787645" useMmpMacrosCache="true"/>
-</cconfiguration>
-<cconfiguration id="Phone Release (ARMV7) [cenrep]">
-<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Release (ARMV7) [cenrep]" moduleId="org.eclipse.cdt.core.settings" name="Phone Release (ARMV7) [cenrep]">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.cdt.debug.cw.symbian.SymbianE32" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTCompilerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakeDefErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.SBSv2ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTLinkerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.CarbideMakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RCOMPErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.Elf2E32ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="CarbideConfigurationDataProvider">
-<ENV_VAR_DATA_ID/>
-<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
-<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="G:\epoc32\rom\"/>
-</storageModule>
-<storageModule filesCache="G:\Csy27010\group\Csy27010.mmp;G:\Csy27010\test\Csy27010UnitTest.mmp;G:\Csy27010\group\BLD.INF;" includesCache="G:/Csy27010/inc[LOCAL];G:/Csy27010/test[LOCAL];G:/Csy27010/test/unit_test_base[LOCAL];G:/epoc32/include;" macrosCache="__GENERIC_MARM__;__ARMV7__;__SYMBIAN32__;__SUPPORT_CPP_EXCEPTIONS__;__EPOC32__;__EABI__;__ARMCC_2__;NDEBUG;__ARMCC__;__MARM__;__ARMCC_2_2__;_UNICODE;__MARM_ARMV5__;" moduleId="configDataCache" sourcesCache="/Csy27010/inc;/Csy27010/src;/Csy27010/test;/Csy27010/test/unit_test_base;" timestampCache="1258543787676" useMmpMacrosCache="true"/>
-</cconfiguration>
-<cconfiguration id="Phone Debug (ARMV9E) [cenrep]">
-<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Debug (ARMV9E) [cenrep]" moduleId="org.eclipse.cdt.core.settings" name="Phone Debug (ARMV9E) [cenrep]">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.cdt.debug.cw.symbian.SymbianE32" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTCompilerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakeDefErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.SBSv2ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTLinkerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.CarbideMakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RCOMPErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.Elf2E32ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="CarbideConfigurationDataProvider">
-<ENV_VAR_DATA_ID/>
-<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
-<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="G:\epoc32\rom\"/>
-</storageModule>
-<storageModule filesCache="G:\Csy27010\group\Csy27010.mmp;G:\Csy27010\test\Csy27010UnitTest.mmp;G:\Csy27010\group\BLD.INF;" includesCache="G:/Csy27010/inc[LOCAL];G:/Csy27010/test[LOCAL];G:/Csy27010/test/unit_test_base[LOCAL];G:/epoc32/include;" macrosCache="__SUPPORT_CPP_EXCEPTIONS__;__SYMBIAN32__;_UNICODE;_DEBUG;" moduleId="configDataCache" sourcesCache="/Csy27010/inc;/Csy27010/src;/Csy27010/test;/Csy27010/test/unit_test_base;" timestampCache="1258543787708" useMmpMacrosCache="true"/>
-</cconfiguration>
-<cconfiguration id="Phone Release (ARMV9E) [cenrep]">
-<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Release (ARMV9E) [cenrep]" moduleId="org.eclipse.cdt.core.settings" name="Phone Release (ARMV9E) [cenrep]">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.cdt.debug.cw.symbian.SymbianE32" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTCompilerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakeDefErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.SBSv2ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RVCTLinkerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.CarbideMakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.RCOMPErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.Elf2E32ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="com.nokia.carbide.cdt.builder.MakmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="CarbideConfigurationDataProvider">
-<ENV_VAR_DATA_ID/>
-<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
-<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="G:\epoc32\rom\"/>
-</storageModule>
-<storageModule filesCache="G:\Csy27010\group\Csy27010.mmp;G:\Csy27010\test\Csy27010UnitTest.mmp;G:\Csy27010\group\BLD.INF;" includesCache="G:/Csy27010/inc[LOCAL];G:/Csy27010/test[LOCAL];G:/Csy27010/test/unit_test_base[LOCAL];G:/epoc32/include;" macrosCache="__SUPPORT_CPP_EXCEPTIONS__;__SYMBIAN32__;_UNICODE;NDEBUG;" moduleId="configDataCache" sourcesCache="/Csy27010/inc;/Csy27010/src;/Csy27010/test;/Csy27010/test/unit_test_base;" timestampCache="1258543787739" useMmpMacrosCache="true"/>
-</cconfiguration>
-</storageModule>
-</cproject>

--- a/cbsref/csyrefplugins/csy27010/.project	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Csy27010</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.nokia.carbide.cdt.builder.carbideCPPBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>com.nokia.carbide.cdt.builder.carbideCPPBuilderNature</nature>
-		<nature>com.nokia.carbide.cdt.builder.carbideSBSv2BuilderNature</nature>
-	</natures>
-</projectDescription>

--- a/cbsref/csyrefplugins/csy27010/Bmarm/GSM0710U.def	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-EXPORTS
-; NEW:
-	LibEntry__Fv @ 1 NONAME R3UNUSED ; LibEntry(void)
-

--- a/cbsref/csyrefplugins/csy27010/Bwins/GSM0710U.def	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntry@@YAPAVCSerial@@XZ @ 1 NONAME ; class CSerial * __cdecl LibEntry(void)
-

--- a/cbsref/csyrefplugins/csy27010/Bwins/csy27010u.def	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntry@@YAPAVCSerial@@XZ @ 1 NONAME ; class CSerial * LibEntry(void)
-

--- a/cbsref/csyrefplugins/csy27010/group/Csy27010.iby	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#ifndef __CSY27010_IBY__
-#define __CSY27010_IBY__
-
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:
-//
-// CSY 3GPP 27.010
-
-// #include <c32.iby>
-
-file=ABI_DIR\BUILD_DIR\GSM0710.CSY			System\Libs\GSM0710.CSY
-
-#endif
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/group/Csy27010.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description: Top-level project file for CSY 3GPP 27.010
-//
-
-/** @Csy27010.mmp
- *
- * Top-level project file for CSY 3GPP 27.010
- *
- */
-
-TARGET			csy27010.csy
-TARGETTYPE		dll
-
-UID			0x10005054 0x10202903
-VENDORID 0x70000001
-
-CAPABILITY PowerMgmt CommDD ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
-
-// Do not add the non-callable exports to the DEF files
-// Remove this line temporarily if we need to add new exports
-NOEXPORTLIBRARY
-
-SOURCEPATH		../src
-SOURCE			DllMain.cpp
-SOURCE			PortFactory.cpp
-SOURCE			PortC32InterfaceBase.cpp
-SOURCE			PortC32Interface.cpp
-SOURCE			PortC32InterfaceIp.cpp
-SOURCE			CsyMsgBufBpFrame.cpp
-SOURCE			Mux0710Protocol.cpp
-SOURCE			ChannelMgrBase.cpp
-SOURCE			ChannelMgrCtrl.cpp
-SOURCE			ChannelMgrCmdData.cpp
-SOURCE			CommReadWriteBaseAo.cpp
-SOURCE			CommFrameWriterAo.cpp
-SOURCE			CommFrameReaderAo.cpp
-SOURCE			CsyDebugLogger.cpp
-SOURCE			timeouter.cpp
-
-
-USERINCLUDE		../inc
-
-SYSTEMINCLUDE	/epoc32/include
-
-LIBRARY			euser.lib  c32.lib  efsrv.lib
-DEBUGLIBRARY		flogger.lib
-
-LIBRARY		commsdat.lib
-
-START WINS
-	BASEADDRESS   0x47D00000
-END

--- a/cbsref/csyrefplugins/csy27010/group/Csy27010UnitTest.iby	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-#ifndef __CSY27010UNITTEST_IBY__
-#define __CSY27010UNITTEST_IBY__
-
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description: CSY 3GPP 27.010 Unit Test
-//
-
-file=ABI_DIR\BUILD_DIR\Csy0710UnitTest.Exe			System\Programs\Csy0710UnitTest.Exe
-
-#endif
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/group/GSM0710.UID.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-// Makmake-generated uid source file
-#include <E32STD.H>
-#pragma data_seg(".E32_UID")
-__WINS_UID(0x10000079,0x10005054,0x00000000)
-#pragma data_seg()

--- a/cbsref/csyrefplugins/csy27010/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-// BLD.INF
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:
-//
-
-PRJ_EXPORTS
-
-../group/Csy27010.iby	/epoc32/rom/include/csy27010.iby
-
-PRJ_MMPFILES
-
-../group/Csy27010.mmp
-
-PRJ_TESTMMPFILES
-
-../test/Csy27010UnitTest.mmp

--- a/cbsref/csyrefplugins/csy27010/inc/ChannelMgrBase.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,219 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description: This file contains the declaration for class CChannelMgrBase.
-// *              Class CChannelMgrBase is an abstract class that is inherted by
-// *              classes that define a single 3GPP 27.010 based logical channel (DLC).
-// *              Derived classes are either control, command and data channels.
-//
-
-// ChannelMgrBase.h
-
-/** @file ChannelMgrBase.h
- *
- * This file contains the declaration for class CChannelMgrBase.
- * Class CChannelMgrBase is an abstract class that is inherted by
- * classes that define a single 3GPP 27.010 based logical channel (DLC).
- * Derived classes are either control, command and data channels.
- */
-
-#ifndef _CHANNELMGRBASE_H_
-#define _CHANNELMGRBASE_H_
-
-#include <e32base.h>
-#include <c32comm.h>
-#include "CsyGlobals.h"
-#include "timeouter.h"
-
-class CPortFactory;
-class CMux0710Protocol;
-class CPortC32InterfaceBase;
-class CPortC32Interface;
-class CFrameToBPQueue;
-class CFrameToClientQueue;
-class CChannelObserverAo;
-class CCsyMsgBufBpFrame;
-
-/** 
- *  CChannelMgrBase is an abstract class that is inherted by
- *  classes that define a single 3GPP 27.010 based logical channel (DLC).
- *  Derived classes are either control or cmd/data channels.
- */
-class CChannelMgrBase : public CBase, public MTimeoutObserver
-	{
-public:
-	enum TCsyChannelState
-		{
-		ECsyChannelStateDisconnected,    // Channel is Disconnected
-		ECsyChannelStateParameterNegotiating, // Channel was disconnected and has sent Parameter Negotiation
-		ECsyChannelStateConnecting,      // Channel was disconnected and has sent a SABM to be connected
-		ECsyChannelStateMSCsent,         
-		ECsyChannelStateWaitingForChannelReady, 
-		ECsyChannelStateConnected,       // Channel is Connected, Data can be transmitted
-		ECsyChannelStateDisconnecting,   // Channel was connected and is now waiting to be disconnected
-		ECsyChannelStateFlowControlOff,  // Channel has been Xoff'd by the baseband
-		ECsyChannelStateTransmitError    // Not receive after timeout and retransmite, Link error
-		};
-
-public:
-    CChannelMgrBase(const TUint8 aDlcNum,
-					CPortFactory& aPortFactory, 
-					CMux0710Protocol& aMux0710Protocol);
-
-    virtual ~CChannelMgrBase();
-
-    TInt Connect();
-    TInt Disconnect();
-	TInt ParameterNegotiate();
-
-	void ProcessRecvFrame(CCsyMsgBufBpFrame* aBpFrame);
-	
-	TDes8& RefToMsgBuffer();
-
-	TUint8 GetDlcNumber() const;
-	TCsyChannelState GetChannelState() const;
-
-	void WaitForChannelReady();
-	void NotifyChannelReady();
-
-	CPortC32InterfaceBase* GetC32Port() const;
-
-	void MscReceived(TUint8 aV24Signals);
-	TInt SendMscCommand(TUint8 aV24Signals);
-
-	void ModemAndCsyToClientFlowCtrl(const TFlowControl aFlowControl);
-	void ReceivedV24Signals(const TUint8 aV24Signals);
-
-	inline TFlowControl CsyToModemFlowControl();
-	TInt SetCsyToModemFlowControl(TFlowControl aFlowControl);
-
-	TInt PlaceOnOutboundQueue();
-	void WriteCancel();
-
-	inline TFlowControl GetModemAndCsyToClientFlowControl();
-
-public://From MTimeoutObserver
-	void TimedOut();
-
-protected:
-	void ConstructL();
-
-	void IssueNotificationRequest();
-
-	virtual void ProcessRecvUihFrame(CCsyMsgBufBpFrame* aBpFrame) = 0;
-	void ProcessNonUihRecvFrame(CCsyMsgBufBpFrame* aBpFrame);
-
-protected:
-
-	TUint8					iV24Signals;
-
-    const TUint8			iDlcNum;
-
-    TCsyChannelState		iChannelState;
-    CPortFactory&			iPortFactory;
-	CPortC32InterfaceBase*	iPortC32Interface;
-	CMux0710Protocol&		iMux0710Protocol;
-
-    TBuf8<KMaxIpPacketSize>	iDataToSendToModem;
-
-	TBool					iChannelReady;
-	TBool					iInitFinished;
-
-	TInt					iTimeoutVal;
-	TInt					iTxCountLimit;
-	TInt					iTxCount;
-
-	CChannelObserverAo*		iChannelObserverAo;
-	CActiveTimeouter*		iTimeouter;
-
-	TBool					iMscReplyExpected;
-
-	// modem -> csy flow control - controls the CSY sending frames to the modem
-	TFlowControl			iCsyAllowedToSendFrames;
-
-	// csy -> modem flow control - controls the modem sending frames to the CSY
-	TFlowControl			iModemAllowedToSendFrames;
-	TBool					iDelayedWriteToModem;
-
-	};
-
-// Inline methods
-
-inline TFlowControl CChannelMgrBase::CsyToModemFlowControl()
-/**
- * Return the current CSY to modem flow control status for this channel.
- */
-	{
-	return iModemAllowedToSendFrames;
-	}
-
-inline TUint8 CChannelMgrBase::GetDlcNumber() const
-/**
- * Return the DLC number of the channel manager object.
- *
- * @return DLC number
- */
-	{
-	return iDlcNum;
-	}
-
-inline CChannelMgrBase::TCsyChannelState CChannelMgrBase::GetChannelState() const
-/**
- * Return the channel state.
- *
- * @return Channel state
- */
-	{
-	return iChannelState;
-	}
-
-inline CPortC32InterfaceBase* CChannelMgrBase::GetC32Port() const
-/**
- * Return a pointer to the C32 port associated with this channel manager object.
- *
- * @return Pointer to the C32 port associated with this channel manager object
- */
-	{
-	return iPortC32Interface;
-	}
-
-inline TFlowControl CChannelMgrBase::GetModemAndCsyToClientFlowControl()
-/**
- * Return the current flow control state of the channel.
- *
- * @return Flow control state
- */
-	{
-	return iCsyAllowedToSendFrames;
-	}
-
-/* CChannelObserverAo use to block until channel init is finished
- */
-class CChannelObserverAo :public CActive
-	{
-public:
-	static CChannelObserverAo* NewL();
-	~CChannelObserverAo();
-
- 	void StartWait();
-	void ChannelReady();
-
-protected:// from CActive
-    void RunL();
-    void DoCancel();
-
-private:
-	CChannelObserverAo();
-	};
-
-#endif  // _CHANNELMGRBASE_H_
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/inc/ChannelMgrCmdData.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description: This file contains the declaration for class CChannelMgrCmdData.
-// *              This class contains the behavior for a single 3GPP 27.010 logical
-// *              channel (DLC) for either a command or and data channel.
-// *
-//
-
-// ChannelMgrCmdData.h
-
-/** @file CChannelMgrCmdData.h
- *
- * .
- */
-
-#ifndef _CHANNELMGRCMDDATA_H_
-#define _CHANNELMGRCMDDATA_H_
-
-#include "CsyGlobals.h"
-#include "ChannelMgrBase.h"
-#include "Mux0710Protocol.h"
-
-class CPortFactory;
-class CCsyMsgBufBpFrame;
-
-/** @class CChannelMgrCmdData ChannelMgrCmdData.h "ChannelMgrCmdData.h"
- *  @brief Class CChannelMgrCmdData contains the behavior for a single
- *  3GPP 27.010 logical channel (DLC) for a command/data channel.
- *  This includes methods to open, close, initialize, configure
- *  and use the channel to transmit frames.
- */
-class CChannelMgrCmdData : public CChannelMgrBase
-	{
-public:
-	static CChannelMgrCmdData* NewL(const TUint8 aDlcNum,
-									CPortFactory& aPortFactory,
-									CMux0710Protocol& aMux0710Protocol);
-    virtual ~CChannelMgrCmdData();
-
-	void Open(CPortC32InterfaceBase* aPort);
-	void Close(CPortC32InterfaceBase* aPort);
-	void SetOwner(CPortC32InterfaceBase* aPort);
-
-	// link for our parent's (port factory) single linked list
-	TSglQueLink iLink;
-
-private:
-    CChannelMgrCmdData(const TUint8 aDlcNum, 
-					   CPortFactory& aPortFactory,
-					   CMux0710Protocol& aMux0710Protocol);
-	void ConstructL();
-
-	void ProcessRecvUihFrame(CCsyMsgBufBpFrame* aBpFrame);
-	void SetupCmdChannelsForATCmdsL();
-
-private:
-
-	TUint8 iCount; 
-	RArray<CPortC32InterfaceBase*> iPortArray;
-
-	};
-
-
-#endif  // _CHANNELMGRCMDDATA_H_
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/inc/ChannelMgrCtrl.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description: This file contains the declaration for class CChannelMgrCtrl.
-// *              Class CChannelMgrCtrl defines a 3GPP 27.010 control channel.
-// *              A control channel is used to initialize the multiplexer and to
-// *              create/monitor DLC's. There is one instance of the control channel.
-// *
-//
-
-// ChannelMgrCtrl.h
-
-/** @file ChannelMgrCtrl.h
- *
- * 
- */
-
-#ifndef _CCHANNELMGRCTRL_H_
-#define _CCHANNELMGRCTRL_H_
-
-#include "ChannelMgrBase.h"
-
-class CPortFactory;
-class CMux0710Protocol;
-class CCsyMsgBufBpFrame;
-
-/** @class CChannelMgrCtrl ChannelMgrCtrl.h "ChannelMgrCtrl.h"
- *  @brief Class CChannelMgrCtrl defines a 3GPP 27.010 control channel.
- *  A control channel is used to initialize the multiplexer and to
- *  create/monitor DLC's. There is one instance of the control channel.
- */
-class CChannelMgrCtrl : public CChannelMgrBase
-    {
-public:
-    static CChannelMgrCtrl* NewL(CPortFactory& aPortFactory,
-								 CMux0710Protocol& iMux0710Protocol);
-    virtual ~CChannelMgrCtrl();
-	inline TBool GetChannelReady() const;
-
-private:
-    CChannelMgrCtrl(CPortFactory& aPortFactory,
-					CMux0710Protocol& aMux0710Protocol);
-
-    void ConstructL();
-
-	void ProcessRecvUihFrame(CCsyMsgBufBpFrame* aBpFrame);
-	void ConfirmCtrlFrame(CCsyMsgBufBpFrame* aBpFrame);
-	};
-
-
-inline TBool CChannelMgrCtrl::GetChannelReady() const
-/**
- * Return the channel ready
- *
- * @return Channel ready
- */
-	{
-	return iChannelReady;
-	}
-
-#endif // _CCHANNELMGRCTRL_H_
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/inc/CommFrameReaderAo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description: This file contains the declaration for class CCommFrameReaderAo.
-// *              Class CCommFrameReaderAo is used to request a read from the serial port LDD.
-// *              Class CommFrameReaderAo is an active object and is run by the active
-// *              scheduler when the LDD has completed the CSY's read request.
-// *
-//
-
-// CommFrameReader.h
-
-/** @file CommFrameReaderAo.h
- *
- * 
- */
-
-#ifndef _CCOMMFRAMEREADERAO_H_
-#define _CCOMMFRAMEREADERAO_H_
-
-#include "CommReadWriteBaseAo.h"
-#include "CsyGlobals.h"
-
-class CCsyMsgBufBpFrame;
-
-/** @class CCommFrameReaderAo CommFrameReaderAo.h "CommFrameReaderAo.h"
- *  @brief Class CCommFrameReaderAo is used to request a read from 
- *  the serial port LDD. Class CommFrameReaderAo is an active object
- *  and is run by the active scheduler when the LDD has completed
- *  the CSY's read request. There is one instance of CCommFrameReaderAo.
- */
-class CCommFrameReaderAo : public CCommReadWriteBaseAo
-	{
-public:
-	enum TCsyFrameReaderState
-		{
-		ECsyWaitingForStartFlag  = 0,
-		ECsyWaitingForFrameStart = 1,
-		ECsyWaitingForFrameData  = 2,
-		ECsyWaitingForEndOfFrame = 3
-		};
-
-	static CCommFrameReaderAo* NewL(CPortFactory* aParent, CMux0710Protocol* aMux0710Protocol);
-	~CCommFrameReaderAo();
-
-	void Read();
-	void ReadCancel();
-
-public:// from CActive
-	virtual void DoCancel();
-	virtual void RunL();
-
-private:
-	CCommFrameReaderAo(CPortFactory* aParent, CMux0710Protocol* aMux0710Protocol);
-	void ConstructL();
-
-	void NonMuxed();
-	void BasicOption();
-	void AdvancedOption();
- 
-	TBool CheckFCS(TDes8& aBuffer, TInt aLen, TUint8 aSuppliedChecksum);
-
-	void AddToReceivedFramesList(CCsyMsgBufBpFrame* aBpFrame);
-
-private:
-	TCsyFrameReaderState	iFrameReaderState;
-	CCsyMsgBufBpFrame*		iFrameBuf;
-
-	TBool iESCRecved;
-
-	};
-
-#endif  //_CCOMMFRAMEREADERAO_H_
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/inc/CommFrameWriterAo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description: This file contains the declaration for class CCommFrameWriterAo.
-// *              Class CCommFrameWriterAo is used to perform write operations to
-// *              the serial port logical device driver. Class CommFrameWriteterAo
-// *              is an active object and is run by the active scheduler when the
-// *              LDD has completed the CSY's write request.
-// *
-//
-
-// CommFrameWriterAo.h
-
-/** @file CommFrameWriterAo.h
- *
- * 
- */
-
-#ifndef _COMMFRAMEWRITERAO_H_
-#define _COMMFRAMEWRITERAO_H_
-
-#include "CommReadWriteBaseAo.h"
-
-class CPortFactory;
-class CCsyMsgBufBpFrame;
-
-/** @class CCommFrameWriterAo CommFrameWriterAo.h "CommFrameWriterAo.h"
- *  @brief Class CCommFrameWriterAo is used to perform write operations
- *  to the serial port logical device driver. Class CommFrameWriteterAo
- *  is an active object and is run by the active scheduler when the
- *  LDD has completed the CSY's write request. There is one instance 
- *  of CCommFrameWriterAo.
- */
-class CCommFrameWriterAo : public CCommReadWriteBaseAo
-    {
-public:
-    static CCommFrameWriterAo* NewL(CPortFactory* aParent, CMux0710Protocol* aMux0710Protocol);
-    ~CCommFrameWriterAo();
-
-    TInt Write(CCsyMsgBufBpFrame* aBpFrame,
-		TBool aHighPriority = EFalse);
-    void WriteCancel();
-
-	void RemoveAnyDlcFramesOnWriteList(TUint8 aDlcNum, TBool aPlaceOnWaitList = ETrue);
-	void RemoveAnyDlcFramesFromWaitList(TUint8 aDlcNum, TBool aPlaceOnWriteList = ETrue);
-
-public:// from CActive
-    virtual void DoCancel();
-    virtual void RunL();
-
-private:
-    CCommFrameWriterAo(CPortFactory* aParent, CMux0710Protocol* aMux0710Protocol);
-    void ConstructL();
-
-	TInt WriteFrame(CCsyMsgBufBpFrame* aBpFrame);
-	void CompleteWrite(const TUint8 aDlcNum, TInt aStatus);
-
-	CCsyMsgBufBpFrame* GetFrameToWrite();
-	void AddToWaitingToSendList(CCsyMsgBufBpFrame* aBpFrame, TBool aHighPriority = EFalse);
-
-private:
-	TUint8	iDlcNum;
-	TBool	iCompleteWhenSent;
-
-	// Write Frame Buffer Lists
-	TSglQue<CCsyMsgBufBpFrame>		iWriteFrameBufList;
-	TSglQueIter<CCsyMsgBufBpFrame>	iWriteFrameBufIter;
-
-	TSglQue<CCsyMsgBufBpFrame>		iWaitingForFcOffList;
-	TSglQueIter<CCsyMsgBufBpFrame>	iWaitingForFcOffIter;
-
-	};
-
-#endif  //_COMMFRAMEWRITERAO_H_
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/inc/CommReadWriteBaseAo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description: This file declares the base class CCommReadWriteBaseAo. 
-//                Class CCommReadWriteBaseAo contains the common elements for derived 
-//                Frame Reader and Frame Writer classes using a serial comm port.
-//
-
-// CommReadWriteBaseAo.h
-
-/** @file CommReadWriteBaseAo.h
- *
- * The file declares the base class CCommReadWriteBaseAo. This class
- * holds the common elements for derived Frame Reader and Frame Writer
- * classes using a serial comm port.
- */
-
-#ifndef _CCOMMREADWRITEBASEAO_H_
-#define _CCOMMREADWRITEBASEAO_H_
-
-#include "cs_port.h"
-#include <d32comm.h>
-#include <c32comm.h>
-#include <e32hal.h>
-
-
-class CPortFactory;
-class CMux0710Protocol;
-
-class CCommReadWriteBaseAo : public CActive
-    {
-public:
-    CCommReadWriteBaseAo(CPortFactory* aParent, CMux0710Protocol* aMux0710Protocol,
-		TInt aPriority = EPriorityStandard);
-    ~CCommReadWriteBaseAo();
-
-    TInt SetServerConfig(TCommServerConfig& aConfig);
-    void GetServerConfig(TCommServerConfig& aConfig) const;
-    void FreeMemory();
-
-    inline void SetRole(TCommRole aRole){iRole=aRole;};
-
-protected:
-    void SetBuffersL();
-
-	// attributes
-    HBufC8*				iBuffer;	// pointer to the Tx/Rx buffer
-    TPtr8*				iBuf;		// pointer to a TPtr8 that points to the current buffer
-
-    TUint				iBufFlags;	// contains buffer flags e.g for partial read/write
-    TInt				iBufSize;	// size of the Tx/Rx buffer
-
-    TCommRole			iRole;		// DTE or DCE role for this port unit
-
-    CPortFactory*		iParent;	// pointer to the CPortC32Interface object
-	CMux0710Protocol*	iMux0710Protocol;
-	RBusDevComm*		iCommPort;  // pointer to LDD comm port
-
-    };
-
-#endif  // _CCOMMREADWRITEBASEAO_H_
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/inc/CsyDebugLogger.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description: This file defines the CCsyDebugLogger class for the CSY and the macros
-// *              to use for logging debug messages to either a serial port or a log file.
-//
-
-// CsyDebugLogger.h
-
-/** @file CsyDebugLogger.h
- *
- */
-
-#ifndef __CSYDEBUGLOGGER_H__
-#define __CSYDEBUGLOGGER_H__
-
-#ifdef _DEBUG
-
-// To reduce debugging - comment out one or more of these defines
-
-#define __DEBUGLEVELCRITICAL__  // Critical logging (erroneous conditions)
-#define __DEBUGLEVELMAJOR__     // Major (important data used in the Csy)
-#define __DEBUGLEVELMINOR__     // Minor (important conditions)
-#define __DEBUGLEVELDETAILED__  // Detailed (comments & func >> << logging)
-
-// Route for logging - select one of these
-#define __DEBUGLOGFILE__
-//#define __DEBUGSERIALPORT__
-
-#define LOGHEADER()							CCsyDebugLogger::WriteHeader()
-#else
-#define LOGHEADER()
-#endif
-
-#ifdef __DEBUGLEVELCRITICAL__
-#define _LOG_L1C1(AAA)						CCsyDebugLogger::Write(_L8(AAA))
-#define _LOG_L1C2(AAA, BBB)					CCsyDebugLogger::WriteFormat(_L8(AAA),BBB)
-#define _LOG_L1C3(AAA, BBB, CCC)			CCsyDebugLogger::WriteFormat(_L8(AAA),BBB,CCC)
-#else
-#define _LOG_L1C1(AAA)
-#define _LOG_L1C2(AAA, BBB)					(void) BBB;
-#define _LOG_L1C3(AAA, BBB, CCC)			(void) BBB; (void) CCC;
-#endif
-
-#ifdef __DEBUGLEVELMAJOR__
-#define _LOG_L2C1(AAA)						CCsyDebugLogger::Write(_L8(AAA))
-#define _LOG_L2C2(AAA, BBB)					CCsyDebugLogger::WriteFormat(_L8(AAA),BBB)
-#define _LOG_L2C3(AAA, BBB, CCC)			CCsyDebugLogger::WriteFormat(_L8(AAA),BBB,CCC)
-#else
-#define _LOG_L2C1(AAA)
-#define _LOG_L2C2(AAA, BBB)					(void) BBB;
-#define _LOG_L2C3(AAA, BBB, CCC)			(void) BBB; (void) CCC;
-#endif
-
-#ifdef __DEBUGLEVELMINOR__
-#define _LOG_L3C1(AAA)						CCsyDebugLogger::Write(_L8(AAA))
-#define _LOG_L3C2(AAA, BBB)					CCsyDebugLogger::WriteFormat(_L8(AAA),BBB)
-#define _LOG_L3C3(AAA, BBB, CCC)			CCsyDebugLogger::WriteFormat(_L8(AAA),BBB,CCC)
-#else
-#define _LOG_L3C1(AAA)
-#define _LOG_L3C2(AAA, BBB)					(void) BBB;
-#define _LOG_L3C3(AAA, BBB, CCC)			(void) BBB; (void) CCC;
-#endif
-
-#ifdef __DEBUGLEVELDETAILED__
-#define _LOG_L4C1(AAA)						CCsyDebugLogger::Write(_L8(AAA))
-#define _LOG_L4C2(AAA, BBB)					CCsyDebugLogger::WriteFormat(_L8(AAA),BBB)
-#define _LOG_L4C3(AAA, BBB, CCC)			CCsyDebugLogger::WriteFormat(_L8(AAA),BBB,CCC)
-#else
-#define _LOG_L4C1(AAA)
-#define _LOG_L4C2(AAA, BBB)					(void) BBB;
-#define _LOG_L4C3(AAA, BBB, CCC)			(void) BBB; (void) CCC;
-#endif
-
-
-
-// The following logging macros are the same as those above with the following exception:
-// The arguments are removed from the code when the logging is removed.
-// This is needed to remove warnings where otherwise unused variables are logged.
-
-#ifdef __DEBUGLEVELCRITICAL__
-#define _LOG_L1C1E(AAA)						CCsyDebugLogger::Write(_L8(AAA))
-#define _LOG_L1C2E(AAA, BBB)				CCsyDebugLogger::WriteFormat(_L8(AAA),BBB)
-#define _LOG_L1C3E(AAA, BBB, CCC)			CCsyDebugLogger::WriteFormat(_L8(AAA),BBB,CCC)
-#else
-#define _LOG_L1C1E(AAA)
-#define _LOG_L1C2E(AAA, BBB)
-#define _LOG_L1C3E(AAA, BBB, CCC)
-#endif
-
-#ifdef __DEBUGLEVELMAJOR__
-#define _LOG_L2C1E(AAA)						CCsyDebugLogger::Write(_L8(AAA))
-#define _LOG_L2C2E(AAA, BBB)				CCsyDebugLogger::WriteFormat(_L8(AAA),BBB)
-#define _LOG_L2C3E(AAA, BBB, CCC)			CCsyDebugLogger::WriteFormat(_L8(AAA),BBB,CCC)
-#else
-#define _LOG_L2C1E(AAA)
-#define _LOG_L2C2E(AAA, BBB)
-#define _LOG_L2C3E(AAA, BBB, CCC)
-#endif
-
-#ifdef __DEBUGLEVELMINOR__
-#define _LOG_L3C1E(AAA)						CCsyDebugLogger::Write(_L8(AAA))
-#define _LOG_L3C2E(AAA, BBB)				CCsyDebugLogger::WriteFormat(_L8(AAA),BBB)
-#define _LOG_L3C3E(AAA, BBB, CCC)			CCsyDebugLogger::WriteFormat(_L8(AAA),BBB,CCC)
-#else
-#define _LOG_L3C1E(AAA)
-#define _LOG_L3C2E(AAA, BBB)
-#define _LOG_L3C3E(AAA, BBB, CCC)
-#endif
-
-#ifdef __DEBUGLEVELDETAILED__
-#define _LOG_L4C1E(AAA)						CCsyDebugLogger::Write(_L8(AAA))
-#define _LOG_L4C2E(AAA, BBB)				CCsyDebugLogger::WriteFormat(_L8(AAA),BBB)
-#define _LOG_L4C3E(AAA, BBB, CCC)			CCsyDebugLogger::WriteFormat(_L8(AAA),BBB,CCC)
-#else
-#define _LOG_L4C1E(AAA)
-#define _LOG_L4C2E(AAA, BBB)
-#define _LOG_L4C3E(AAA, BBB, CCC)
-#endif
-
-#include <flogger.h>
-
-class CCsyDebugLogger : public CBase
-	{
-public:
-	static void WriteHeader();
-	static void Write(const TDesC8& aText);
-	static void WriteFormat(TRefByValue<const TDesC8> aFmt, ...);
-	};
-
-#endif	// __CSYDEBUGLOGGER_H__
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/inc/CsyGlobals.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,229 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description: This include file contains the global definitions for the CSY.
-//
-
-// CsyGlobals.h
-
-/** @file CsyGlobals.h
- *
- */
-
-#ifndef _CSYGLOBALS_H_
-#define _CSYGLOBALS_H_
-
-#include <e32std.h>
-
-
-#if defined DSAMPLE || defined P2SAMPLE || defined H2
-#define _27010ADVANCEOPTION
-_LIT8(KATInitialised,"AT-Command Interpreter ready");
-_LIT8(KATCmdSetup,"ATE0Q0V1%CPRI=0\r");  // echo off, quiet off, verbose on
-#else
-_LIT8(KATInitialised,"OK");
-_LIT8(KATCmdSetup,"ATE0Q0V1\r");  // echo off, quiet off, verbose on
-#endif
-
-
-// CSY name
-_LIT(KCSY_Gsm0710ServerName, "CSY27010");
-_LIT(KCSY_Description, "Csy27010::CSY");
-
-// Version information.
-const TUint KCSY_Gsm0710MajorVersionNumber = 1;
-const TUint KCSY_Gsm0710MinorVersionNumber = 0;
-const TUint KCSY_Gsm0710BuildVersionNumber = 0;  // MAF put mainline num here on release
-
-// Serial Info
-const TUint KCSY_Gsm0710LowUnit =	1;
-const TUint KCSY_Gsm0710HighUnit =	100;
-
-const TInt	KCsyDefaultMaxDLCChannels = 10;
-
-// Buffer size for LDD
-const TUint KDefaultTxRxBufSize = 512;
-
-
-// LDD/PDD configuration
-#if !defined P2SAMPLE
-_LIT8(KCsyDefaultPDDNameComm1, "EUART1");
-_LIT8(KCsyDefaultPDDNameComm2, "EUART2");
-#else
-_LIT8(KCsyDefaultPDDNameComm1, "EUARTCSMI");
-_LIT8(KCsyDefaultPDDNameComm2, "EUART1");
-#endif
-
-// AT Command need to put the baseband into Mux mode
-#ifdef _27010ADVANCEOPTION
-_LIT8(KCsyDefaultATEnterMuxModeCmd, "AT+CMUX=1,0,5\r");
-#else
-_LIT8(KCsyDefaultATEnterMuxModeCmd, "AT+CMUX=0,0,5\r");
-#endif
-
-// C32 Port number offsets
-const TInt KCOMMP_CSD_PPP_NUMBER = 6;  // 6 - reserved for CSD PPP
-const TInt KCOMMP_IP_NIF_OFFSET  = 16; // 16 and above - Raw IP
-
-// Factor by which to increase the size of the receive buffer in the LDD.
-const TInt KCSY_ReceiveBufferSizeIncreaseFactor = 10;
-
-// Basic sizes
-const TUint KMaxFrameSize    = 127;
-const TUint KMaxIpPacketSize = 1502;
-
-const TUint KMaxAdvFrameSize = KMaxFrameSize + 8;
-
-// --------------------------------------------------------
-
-// Constants for enforcing when the modem is allowed to send to the CSY
-
-// FC enforced when we are starting to run out of frames to put data in
-// or when a particular client is slow at reading
-
-// Maximum frames and flow control thresholds
-const TUint KMaxFreeFrames = 75;    // <- should be enough for 3 contexts at max throughput each way
-const TUint KStopDataDlcsThreshold = 10;
-const TUint KStartDataDlcsThreshold = 40;
-
-// Slow read by client
-const TUint KMaxPacketsOutstandingForC32Client = 5;
-
-// At Response timeout
-const TInt	KAtResponseTimeoutLimit = 5;
-
-// --------------------------------------------------------
-
-// active object priorities
-const TInt KFrameReaderAoPriority = 100;
-const TInt KFrameWriterAoPriority = KFrameReaderAoPriority;
-
-// Magic numbers
-const TUint8 KSingleFrame      = 0x03;	// Only Frame of Message
-const TUint8 KStartMultiFrame  = 0x01;	// Start  MultiFrame
-const TUint8 KMiddleMultiFrame = 0x00;	// Middle MultiFrame
-const TUint8 KEndMultiFrame    = 0x02;	// Ending MultiFrame
-
-const TInt KAdvOptionNumOfNonDataOctets = 4;
-const TInt KAdvOptionType4StartOfMessageData = 3;
-const TInt KAdvOptionType4FrameControl = 2;
-
-// Ignoring start/end flags ..
-// Advanced format: address | control | data | checksum
-const TInt KAdvOptionHeaderSize	= 2;
-const TInt KAdvOptionControl = 1;
-const TInt KAdvOptionAddress = 0;
-
-const TInt KChecksumSize = 1;
-
-const TInt KBasicOptionHeaderSize	= 3;
-const TInt KBasicOptionLength		= 2;
-const TInt KBasicOptionControl		= 1;
-const TInt KBasicOptionAddress		= 0;
-
-// Ctrl(dlc 0) commands
-// adv option:   address | control | CtrlType   | LengthData | Value(s)
-// basic option: address | control | length | CtrlType  | LengthData | Value(s)
-const TInt KBasicOptionCtrlStart = KBasicOptionHeaderSize;
-const TInt KAdvOptionCtrlStart   = KAdvOptionHeaderSize;
-
-// CtrlType  | LengthData | Value(s)
-const TInt KPositionOfValueFieldInCtrlData  = 2;
-const TInt KPositionOfLengthFieldInCtrlData = 1;
-
-const TUint8 KCtrlChannelDlcNum = 0;
-
-// Timeouts
-const TInt KOneSecond  = 1000000;
-const TInt KTwoSeconds = 2000000;
-
-
-// Frame Start/Stop Flag
-
-
-const TUint8 KCsy0710StartEndFlag	= 0x7E;
-const TUint8 KCsy0710EscapeByte		= 0x7D;
-
-const TUint8 KPNFrameType			= 0x00;
-const TUint8 KPNClBits				= 0x03;
-const TUint8 KPNDlcPriority			= 0x07;
-const TUint8 KPNAckTimer			= 0x0A; // 10ms resolution
-const TUint8 KPNMaxFrameSize		= 0x00ff & KMaxFrameSize;
-const TUint8 KPNMaxRetransmissions	= 0x03;
-const TUint8 KPNWindowSize			= 0x00;
-
-
-// Control Field Constants
-const TUint8 KCsy0710CTLSABM		= 0x2F;    
-const TUint8 KCsy0710CTLUA			= 0x63;	 
-const TUint8 KCsy0710CTLDM			= 0x0F;
-const TUint8 KCsy0710CTLDISC		= 0x43;
-const TUint8 KCsy0710CTLUIH			= 0xEF;
-const TUint8 KCsy0710CTLUI			= 0x03;
-
-const TUint KCsy0710EA				= 0x01;
-const TUint KCsy0710CRBit			= 0x02;
-const TUint KCsy0710PollFinal		= 0x10;
-
-// Message Types for UIH frames received by the CSY on DLC 0 (control channel)
-//     The EA (bit 0) and C/R (bit 1) bits are both assumed to be set
-const TUint8 KCsy0710CTLUIH_DlcParamNegotiate   = 0x83;
-const TUint8 KCsy0710CTLUIH_DlcParamNegotiateRsp = 0x81;
-const TUint8 KCsy0710CTLUIH_PowerSaveCtl        = 0x43;
-const TUint8 KCsy0710CTLUIH_MultCloseDown       = 0xC3;
-const TUint8 KCsy0710CTLUIH_TestCmd             = 0x23;
-const TUint8 KCsy0710CTLUIH_FlowControlOn       = 0xA3;
-const TUint8 KCsy0710CTLUIH_FlowControlOff      = 0x63;
-const TUint8 KCsy0710CTLUIH_ModemStatusCmd      = 0xE3;
-const TUint8 KCsy0710CTLUIH_ModemStatusRsp      = 0xE1;
-const TUint8 KCsy0710CTLUIH_NonSupportedCmdResp = 0x13;
-const TUint8 KCsy0710CTLUIH_RemotePortNegotiate = 0x93;
-const TUint8 KCsy0710CTLUIH_RemoteLineStatus    = 0x53;
-const TUint8 KCsy0710CTLUIH_ServiceNegotiate    = 0xD3;
-
-
-// The CRC Table as defined in 27.010
-const TUint8 crctable[256] = 
-	{ //reversed, 8-bit, poly=0x07
-	0x00, 0x91, 0xE3, 0x72, 0x07, 0x96, 0xE4, 0x75, 0x0E, 0x9F, 0xED, 0x7C, 0x09, 0x98,0xEA, 0x7B,
-	0x1C, 0x8D, 0xFF, 0x6E, 0x1B, 0x8A, 0xF8, 0x69, 0x12, 0x83, 0xF1, 0x60, 0x15, 0x84,0xF6, 0x67,
-	0x38, 0xA9, 0xDB, 0x4A, 0x3F, 0xAE, 0xDC, 0x4D, 0x36, 0xA7, 0xD5, 0x44, 0x31, 0xA0,0xD2, 0x43,
-	0x24, 0xB5, 0xC7, 0x56, 0x23, 0xB2, 0xC0, 0x51, 0x2A, 0xBB, 0xC9, 0x58, 0x2D, 0xBC,0xCE, 0x5F,
-	0x70, 0xE1, 0x93, 0x02, 0x77, 0xE6, 0x94, 0x05, 0x7E, 0xEF, 0x9D, 0x0C, 0x79, 0xE8,0x9A, 0x0B,
-	0x6C, 0xFD, 0x8F, 0x1E, 0x6B, 0xFA, 0x88, 0x19, 0x62, 0xF3, 0x81, 0x10, 0x65, 0xF4,0x86, 0x17,
-	0x48, 0xD9, 0xAB, 0x3A, 0x4F, 0xDE, 0xAC, 0x3D, 0x46, 0xD7, 0xA5, 0x34, 0x41, 0xD0,0xA2, 0x33,
-	0x54, 0xC5, 0xB7, 0x26, 0x53, 0xC2, 0xB0, 0x21, 0x5A, 0xCB, 0xB9, 0x28, 0x5D, 0xCC,0xBE, 0x2F,
-	0xE0, 0x71, 0x03, 0x92, 0xE7, 0x76, 0x04, 0x95, 0xEE, 0x7F, 0x0D, 0x9C, 0xE9, 0x78,0x0A, 0x9B,
-	0xFC, 0x6D, 0x1F, 0x8E, 0xFB, 0x6A, 0x18, 0x89, 0xF2, 0x63, 0x11, 0x80, 0xF5, 0x64,0x16, 0x87,
-	0xD8, 0x49, 0x3B, 0xAA, 0xDF, 0x4E, 0x3C, 0xAD, 0xD6, 0x47, 0x35, 0xA4, 0xD1, 0x40,0x32, 0xA3,
-	0xC4, 0x55, 0x27, 0xB6, 0xC3, 0x52, 0x20, 0xB1, 0xCA, 0x5B, 0x29, 0xB8, 0xCD, 0x5C,0x2E, 0xBF,
-	0x90, 0x01, 0x73, 0xE2, 0x97, 0x06, 0x74, 0xE5, 0x9E, 0x0F, 0x7D, 0xEC, 0x99, 0x08,0x7A, 0xEB,
-	0x8C, 0x1D, 0x6F, 0xFE, 0x8B, 0x1A, 0x68, 0xF9, 0x82, 0x13, 0x61, 0xF0, 0x85, 0x14,0x66, 0xF7,
-	0xA8, 0x39, 0x4B, 0xDA, 0xAF, 0x3E, 0x4C, 0xDD, 0xA6, 0x37, 0x45, 0xD4, 0xA1, 0x30,0x42, 0xD3,
-	0xB4, 0x25, 0x57, 0xC6, 0xB3, 0x22, 0x50, 0xC1, 0xBA, 0x2B, 0x59, 0xC8, 0xBD, 0x2C,0x5E, 0xCF
-	};
-
-//v24 signals
-const TUint KV24SignalRTC = 0x04;
-const TUint KV24SignalRTR = 0x08;
-const TUint KV24SignalIC  = 0x40;
-const TUint KV24SignalDV  = 0x80;
-
-// Logging
-
-_LIT(KCsyLogDir,  "TRP\\CSY" );
-_LIT(KCsyLogFile, "csy27010.txt");
-_LIT(KCsyLogLine, "---------- CSY 3GPP 27.010 Log ----------");
-
-
-#endif  // _CSYGLOBALS_H_

--- a/cbsref/csyrefplugins/csy27010/inc/CsyMsgBufBPFrame.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description: This file defines the CCsyMsgBufBpFrame class.
-// *              This class is used to hold frame messages that the CSY sends to and 
-// *              receives from the BP multiplexer.
-//
-
-// CsyMsgBufBpFrame.h
-
-/** @file CsyMsgBufBpFrame.h
- *
- */
-
-#ifndef _CSYMSGBUFBPFRAME_H_
-#define _CSYMSGBUFBPFRAME_H_
-
-#include <e32base.h>
-#include "CsyGlobals.h"
-
-/** @class CCsyMsgBufBpFrame CsyMsgBufBpFrame.h "CsyMsgBufBpFrame.h"
- *  @brief Class CCsyMsgBufBpFrame is used to hold frame messages 
- *  that the CSY sends to and receives from the BP multiplexer.
- */
-class CCsyMsgBufBpFrame : public CBase
-	{
-public:
-	static CCsyMsgBufBpFrame* NewL();
-	virtual ~CCsyMsgBufBpFrame();
-
-	TUint8 GetDlcNum() const;
-	TUint8 GetFrameType() const;
-	TUint8 GetType4FrameSequence() const;
-
-	TBuf8<KMaxAdvFrameSize> iMsg;
-
-	inline TUint8& CCsyMsgBufBpFrame::MsgDlc();
-	inline TBool& CCsyMsgBufBpFrame::CompleteWhenSent();
-
-public:
-	TSglQueLink iMsgLink;
-
-private:
-	CCsyMsgBufBpFrame();
-	void ConstructL();
-
-private:
-	TUint8	iCsyMsgDlc;
-	TBool	iCompleteWhenSent;
-
-	};
-
-inline TUint8& CCsyMsgBufBpFrame::MsgDlc()
-	{
-	return iCsyMsgDlc;
-	}
-
-inline TBool& CCsyMsgBufBpFrame::CompleteWhenSent()
-	{
-	return iCompleteWhenSent;
-	}
-
-#endif  //_CSYMSGBUFBPFRAME_H_
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/inc/Mux0710Protocol.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file defines the CMux0710Protocol class.  This class
-//                 performs the 3GPP2 protocol specific behavior for 27.010.
-//                 This file also includes CRC table.
-//
-
-// CMux0710Protocol.h
-
-/** @file CMux0710Protocol.h
- *
- */
-
-#ifndef _MUX0710PROTOCOL_H_
-#define _MUX0710PROTOCOL_H_
-
-#include <e32base.h>
-#include "CsyGlobals.h"
-#include "timeouter.h"
-
-
-class CCsyMsgBufBase;
-class CCsyMsgBufFrame;
-class CPortFactory;
-class CCsyMsgBufBpFrame;
-class CCommFrameWriterAo;
-class CCommFrameReaderAo;
-
-class CMux0710Protocol : public CBase, public MTimeoutObserver
-	{
-public:
-
-	// Frame Types used in 27.010 Protocol
-	enum TCsyFrameType
-		{
-		ESABM, // Set asynchronous balanced mode
-		EUA,   // Unnumbered Acknowledgement
-		EDM,   // Disconnected Mode
-		EDISC, // Disconnect
-		EUIH,  // Unnumbered information with header check
-		EUI,   // Unnumberd information
-		EUNKNOWN 
-		};
-
-	enum TCsyCtrlCommand
-		{
-		EParamNeg, // Parameter Negotiation
-		EMSC	   // Modem status command
-		};
-
-public:
-	static CMux0710Protocol* NewL(CPortFactory& aPortFactory);
-	virtual ~CMux0710Protocol();
-
-	void SetCommWriter(CCommFrameWriterAo* aCommWriter);
-
-	TBool IsMuxModeEnabled() const;
-	TInt SwitchToMuxMode();
-	TInt ParseATResponse(TDes8& aResp);
-
-	CCsyMsgBufBpFrame* GetFreeFrameBuf(TBool aCheckFlowControlThresholds = ETrue);
-	void AddFrameFreeQ(CCsyMsgBufBpFrame* aBpFrame);
-
-    TInt Create0710DataFrames(TDesC8& aMsgBuf, const TUint8 aDlcNum);
-	TInt Create0710ControlFrame(TCsyFrameType aFrameType, TUint8 aDlcNum,
-		TCsyCtrlCommand aType = EParamNeg, TUint8 aV24Signals = 0);
-
-	inline TUint8 PreviousNegotiateDlcNum() const;
-    inline TBool MaxRetriesReached() const;
-    
-public:// from MTimeoutObserver
-	void TimedOut();
-
-private:
-	enum TCsyMuxMgrState
-		{
-		ECsyWaitingForAttentionResp,
-		ECsyWaitingForEchoDisableResp,
-		ECsyWaitingForCmuxResp,
-		ECsyMuxEnabled,
-		ECsyWaitingForFlushResp,
-#ifdef USE_TI_CONDAT_STACK
-		ECsyWaitingForResetResp,
-		ECsyWaitingForSleepResp
-#endif
-		};
-	
-private:
-	CMux0710Protocol(CPortFactory& aPortFactory);
-	void ConstructL();
-
-	void Create0710UIHFrameFromMsg(TDesC8& aMsgBuf, TInt aOffset,
-								   CCsyMsgBufBpFrame* aFrameBuf,
-								   TInt aLength, TUint8 aDlcNum);
-
-	void Create0710UIHLayer4FrameFromMsg(TDesC8& aMsgBuf, 
-										 TInt aOffset, 
-										 CCsyMsgBufBpFrame* aFrameBuf, 
-										 TInt aLength, TUint8 aDlcNum, 
-										 TBool aLayer4Begin, 
-										 TBool aLayer4End);
-
-	void ProcessControlChannelRecvUihFrame(CCsyMsgBufBpFrame* aBpFrame);
-
-	TUint8 CalcFCS(TUint8* aBuffer, TInt aLen);
-
-	void DumpFrame(CCsyMsgBufBpFrame* aFrameBuf);
-
-private:
-	CActiveTimeouter*               iTimeouter;
-
-	CPortFactory&                   iPortFactory;
-
-	TCsyMuxMgrState                 iMuxMgrState;
-
-	CCommFrameWriterAo*             iCommWriter;
-
-	// Free Frame Buf List
-	TSglQue<CCsyMsgBufBpFrame>      iFreeFrameBufList;
-	TSglQueIter<CCsyMsgBufBpFrame>  iFreeFrameBufIter;
-	TUint                           iFreeFrameCount;
-
-	TBool iEnforcingFlowControl;
-
-	TBool iModemRequestedToStop;
-
-	TUint8 iParamNegotiateDlcNum;
-
-	TUint8 iAtResponseTimeout;
-
-	TBool iMaxRetriesReached;
-	TBuf8<100> iResponseStr; 
-	TInt iRetryCount;
-	};
-
-// inline methods
-
-/**
-Set the comm writer to the specified object pointer.
-
-@param aCommWriter Pointer to the comm writer
-*/
-inline void CMux0710Protocol::SetCommWriter(CCommFrameWriterAo* aCommWriter)
-	{
-	iCommWriter = aCommWriter;
-	}
-
-/**
-Return True if multiplexing mode is enabled, else return False.
-*/
-inline TBool CMux0710Protocol::IsMuxModeEnabled() const
-	{
-	if (iMuxMgrState == ECsyMuxEnabled)
-		{
-		return (ETrue);
-		}
-	else
-		{
-		return (EFalse);
-		}
-	}
-
-/**
-Return dlc that parameter negotiate command was sent for.
-*/
-inline TUint8 CMux0710Protocol::PreviousNegotiateDlcNum() const
-	{
-	return iParamNegotiateDlcNum;
-	}
-
-/**
-Return whether the max connection retries has been reached.
-*/
-inline TBool CMux0710Protocol::MaxRetriesReached() const
-	{
-	return iMaxRetriesReached;
-	}
-
-#endif // _MUX0710PROTOCOL_H_

--- a/cbsref/csyrefplugins/csy27010/inc/PortC32Interface.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file defines the CPortC32Interface class.  This class
-// *               is equivalent to client RComm subsessions. This is derived 
-// *               from the C32 base class for ports CPort.
-//
-
-// CPortC32Interface.h
-
-/** @file CPortC32Interface.h
- *
- * PortC32Interface:
- * - Equivalent to client RComm subsessions. This is derived 
- *   from the C32 base class for ports CPort.
- */
-
-#ifndef _PORTC32INTERFACE_H__
-#define _PORTC32INTERFACE_H__
-
-#include <cs_port.h>
-#include "PortC32InterfaceBase.h"
-
-class CPortC32Interface : public CPortC32InterfaceBase
-	{
-public:
-	static CPortC32Interface* NewL(CPortFactory& aPortFactory, 
-								   CPortFactory::TC32PortInfo& aPortInfo);
-
-	virtual ~CPortC32Interface();
-	void SendFrameToClient(CCsyMsgBufBpFrame* aFrame);
-
-protected:
-	virtual TBool ReadFromBufOrQueue();
-
-private:
-	CPortC32Interface(CPortFactory& aPortFactory,
-					  CPortFactory::TC32PortInfo& aPortInfo);
-	void ConstructL();
-
-	virtual TInt QueryReceiveBuffer(TInt& aLength) const;
-	virtual void ResetBuffers(TUint aFlags);
-
-private:
-	TBuf8<KMaxAdvFrameSize>	iPartialReadBuf;
-
-	CCsyMsgBufBpFrame* iReadBuf;
-	};
-
-#endif  // _PORTC32INTERFACE_H__
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/inc/PortC32InterfaceBase.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,191 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file defines the CPortC32Interface class.  This class
-// *               is equivalent to client RComm subsessions. This is derived 
-// *               from the C32 base class for ports CPort.
-//
-
-// CPortC32InterfaceBase.h
-/** @file
- *
- * PortC32InterfaceBase:
- * - Equivalent to client RComm subsessions. This is base class 
- *   derived from the C32 base class for ports CPort.
- */
-
-#ifndef _PORTC32INTERFACEBASE_H__
-#define _PORTC32INTERFACEBASE_H__
-
-#include <cs_port.h>
-#include "CsyGlobals.h"
-#include "Portfactory.h"
-
-class CChannelMgrCmdData;
-class CCsyMsgBufBpFrame;
-
-class CPortC32InterfaceBase : public CPort
-	{
-public:
-	virtual ~CPortC32InterfaceBase();
-
-	// from CPort
-	virtual void Destruct();
-	virtual void StartRead(const TAny* aClientBuffer, TInt aLength);
-	virtual void ReadCancel();
-	virtual void NotifySignalChange(TUint aSignalMask);
-	virtual void NotifySignalChangeCancel();
-	virtual void StartWrite(const TAny* aClientBuffer, TInt aLength);
-	virtual TInt SetConfig(const TDesC8& aPackage);
-
-	// message passing
-	void CompleteWriteRequest(TInt aStatus);
-	virtual void SendFrameToClient(CCsyMsgBufBpFrame* aFrame) = 0;
-
-
-	// utility methods
-	void SetMuxChannel(CChannelMgrCmdData* aMuxChannel);
-	CChannelMgrCmdData* GetMuxChannel() const;
-	TInt GetPortNumber() const;
-	CPortFactory::TC32ClientType GetClientType() const;
-
-	void ModemAndCsyToClientFlowCtrl(const TFlowControl aFlowControl);
-	void ReceivedV24Signals(const TUint8 aV24Signals);
-	TInt SetV24Signals(const TUint aRs232Signals);
-
-	void IncRefCount();
-	void CompleteOutstandingRequest();
-
-	// link for parent CPortFactory
-	TSglQueLink iLink;
-
-protected:
-	CPortC32InterfaceBase(CPortFactory& aPortFactory,
-		CPortFactory::TC32PortInfo& aPortInfo);
-	void ConstructL();
-	void SetDataAvailable();
-
-	void CompleteReadRequest(TInt aStatus);
-	virtual TBool ReadFromBufOrQueue() = 0;
-
-	// utility
-	void RemoveWaitingAllFrames(TBool aAddToFreeList = ETrue);
-	void Shutdown();
-	
-
-	// from CPort, but not all are supported by the CSY
-	virtual TInt QueryReceiveBuffer(TInt& aLength) const = 0;
-	virtual void ResetBuffers(TUint aFlags) = 0;
-	virtual void Break(TInt aTime);
-	virtual void BreakCancel();
-	virtual void WriteCancel();
-	virtual TInt GetConfig(TDes8& aPackage) const;
-	virtual TInt SetServerConfig(const TDesC8& aPackage);
-	virtual TInt GetServerConfig(TDes8& aPackage);
-	virtual TInt GetCaps(TDes8& aPackage);
-	virtual TInt GetSignals(TUint& aSignals);
-	virtual TInt SetSignalsToMark(TUint aSignals);
-	virtual TInt SetSignalsToSpace(TUint aSignals);
-	virtual TInt GetReceiveBufferLength(TInt& aLength) const;
-	virtual TInt SetReceiveBufferLength(TInt aLength);
-	virtual void FreeMemory(); 
-	virtual void NotifyDataAvailable();
-	virtual void NotifyDataAvailableCancel();
-	virtual void NotifyConfigChange();
-	virtual void NotifyConfigChangeCancel();
-	virtual void NotifyFlowControlChange();
-	virtual void NotifyFlowControlChangeCancel();
-	virtual void NotifyBreak();
-	virtual void NotifyBreakCancel();
-	virtual void NotifyOutputEmpty();
-	virtual void NotifyOutputEmptyCancel();
-	virtual TInt GetFlowControlStatus(TFlowControl& aFlowControl);
-	virtual TInt GetRole(TCommRole& aRole);
-	virtual TInt SetRole(TCommRole aRole);
-
-protected:
-
-	// List of frames waiting to be read by the client
-	TSglQue<CCsyMsgBufBpFrame>		iFramesWaitingToBeReadList;
-	TSglQueIter<CCsyMsgBufBpFrame>	iFramesWaitingToBeReadIter;
-
-	// attributes
-	TCommRole						iRole;
-	TCommConfigV01					iConfig;
-	CPortFactory&					iPortFactory;
-
-	CPortFactory::TC32PortInfo		iPortInfo;
-	CChannelMgrCmdData*				iMuxChannel;
-
-	// Pointer to client's read buffer when there is a read outstanding.
-	// (This is the way C32 transfers messages from clients to CSYs.)
-	TAny*							iClientBuffer;
-	TInt							iClientLength;
-	TInt							iPos;
-	TBool							iOneOrMore;
-
-	TFlowControl					iCsyAllowedToSendFrames;
-	TBool							iFlowControlNotifyPending;
-
-	TUint							iSignals;
-	TUint							iSentSignals;
-	TUint							iSignalMask;
-	TBool							iSignalChangeNotifyPending;
-
-	TBool							iDataAvailableNotifyPending;
-
-	TBool							iIsWriteInProgress;
-	TBool							iIsReadInProgress;
-	};
-
-
-// Inline methods
-inline CChannelMgrCmdData* CPortC32InterfaceBase::GetMuxChannel() const
-/**
- * Return a pointer to the mux channel associated with this C32 port.
- *
- * @return Pointer to the mux channel associated with this C32 port
- */
-	{
-	return iMuxChannel;
-	}
-
-inline CPortFactory::TC32ClientType CPortC32InterfaceBase::GetClientType() const
-/**
- * Return the client type (command or data) for this C32 port.
- *
- * @return Client type command or data
- */
-	{
-	return iPortInfo.iClientType;
-	}
-
-inline TInt CPortC32InterfaceBase::GetPortNumber() const
-/**
- * Return the port number for this C32 port.
- *
- * @return Port number
- */
-	{
-	return iPortInfo.iPortNumber;
-	}
-
-inline void CPortC32InterfaceBase::IncRefCount()
-/**
- * Increment the reference count for this object.
- */
-	{
-	Inc();
-	};
-
-#endif  // _PORTC32INTERFACEBASE_H__

--- a/cbsref/csyrefplugins/csy27010/inc/PortC32InterfaceIp.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file defines the CPortC32InterfaceIp class.  This class
-// *               is equivalent to client RComm subsessions. This is derived 
-// *               from the C32 base class for ports CPort.
-//
-
-// CPortC32InterfaceIp.h
-
-/** @file CPortC32InterfaceIp.h
-*/
-#ifndef _PORTC32INTERFACEIP_H__
-#define _PORTC32INTERFACEIP_H__
-
-#include <cs_port.h>
-#include "PortC32InterfaceBase.h"
-
-class CChannelMgrCmdData;
-class CCsyMsgBufBpFrame;
-
-class CPortC32InterfaceIp : public CPortC32InterfaceBase
-	{
-public:
-	static CPortC32InterfaceIp* NewL(CPortFactory& aPortFactory, 
-								   CPortFactory::TC32PortInfo& aPortInfo);
-	virtual ~CPortC32InterfaceIp();
-
-	void SendFrameToClient(CCsyMsgBufBpFrame* aFrame);
-
-protected:
-	virtual TBool ReadFromBufOrQueue();
-
-private:
-	CPortC32InterfaceIp(CPortFactory& aPortFactory,
-					  CPortFactory::TC32PortInfo& aPortInfo);
-	void ConstructL();
-
-	virtual TInt QueryReceiveBuffer(TInt& aLength) const;
-	virtual void ResetBuffers(TUint aFlags);
-	
-	void PlaceIpPacketFramesOntoFreeList();
-	void PlaceIpPacketFramesOntoReadList();
-	TBool CreateIpPacketFromFrames();
-
-private:
-	//TBuf8<KMaxIpPacketSize>	iPartialReadBuf;
-
-	TUint							iNumberOfPacketsWaiting;
-
-	TSglQue<CCsyMsgBufBpFrame>		iFramesReceivedForIpPacket;
-	TSglQueIter<CCsyMsgBufBpFrame>	iFramesReceivedForIpPacketIter;
-	TUint							iCurrentIpPacketLength;
-
-	TBuf8<KMaxIpPacketSize>			iIpPacket;
-	};
-
-
-#endif  // _PORTC32INTERFACEIP_H__

--- a/cbsref/csyrefplugins/csy27010/inc/Portfactory.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,207 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file is the root of the module. This file contains the 
-// *               declarations for the CPortFactory class and is derived from 
-// *               C32's CSerial.
-//
-
-// PortFactory.h
-
-/** @file PortFactory.h
- *
- */
-
-#ifndef _PORTFACTORY_H__
-#define _PORTFACTORY_H__
-
-#include <e32std.h>
-#include <e32hal.h>
-#include <c32comm.h>
-#include <d32comm.h>
-#include <cs_port.h>
-#include <cdblen.h>
-#include "CsyGlobals.h"
-
-class CPortC32Interface;
-class CPortC32InterfaceBase;
-class CChannelMgrBase;
-class CChannelMgrCtrl;
-class CChannelMgrCmdData;
-class CMux0710Protocol;
-class CCommFrameWriterAo;
-class CCommFrameReaderAo;
-
-/** @class CPortFactory PortFactory.h "PortFactory.h"
- *  @brief  This class provides the factory object which is used to
- *  construct port objects in the CSY. There is only one instance of
- *  this class in the CSY. CPortFactory is derived from C32's CSerial
- *  base class. CPortFactory is also responsible for allocating the
- *  CSY's multiplexer objects and LDD interface objects.
- */
-class CPortFactory : public CSerial  
-	{
-public:
-	enum TC32ClientType
-		{
-		EC32ClientUndefined,
-		EC32ClientTsy,
-		EC32ClientNif,
-		EC32ClientIpNif
-		};
-
-	struct TC32PortInfo
-		{
-		TC32ClientType iClientType;
-		TInt           iPortNumber;
-		};
-
-public:
-	static CPortFactory* NewL();
-
-	~CPortFactory();
-
-	static void CloseObject(TAny* aObject);
-
-	inline TBool IsMultiplexerCreated();
-
-	TC32ClientType GetClientType(TInt aPortNum);
-
-	inline CCommFrameWriterAo* GetCommWriterAo() const;
-	inline CCommFrameReaderAo* GetCommReaderAo() const;
-	
-	RBusDevComm* DTEPort();  // LDD
-
-	void ConnectControlChannel();
-	void DisconnectControlChannel();
-	void ChannelCtrlDoCancel();
-	
-	CPortC32InterfaceBase* FindPortC32Interface(const TUint8 aDlcNum);
-	CChannelMgrCmdData* FindChannelMgrByDlcNum(const TUint8 aDlcNum);
-
-	inline CMux0710Protocol* GetMux0710Protocol() const;
-
-	inline CChannelMgrCtrl* GetControlChannel() const;
-
-	void RemoveC32Port(CPortC32InterfaceBase* aPort);
-
-	void ConnectIpNifPort(const TUint8 aDlcNum);
-
-	TSecurityPolicy PortPlatSecCapability(TUint aPort) const;
-
-	TBool FindDlcToEnable();
-	void FindActiveDataDlcToStop();
-	void StopAnyDlc();
-	TBool DecrementNumOfOpenPorts();
-	
-
-
-private:
-	CPortFactory();	
-	void ConstructL();
-
-	void CreateCsyObjectsL();
-
-	// from CSerial
-	virtual CPort* NewPortL(const TUint aUnit);
-	virtual void Info(TSerialInfo& aSerialInfo);
-
-	// utility methods
-	CChannelMgrCmdData* FindChannelMgr(const TUint aC32PortNum);
-
-	TInt ConfigurePhysicalCommPortL();
-
-private:
-	// attributes
-	TBool							iMuxObjectsCreated;
-
-	// C32 interface ports
-	TSglQue<CPortC32InterfaceBase>		iPortC32InterfaceList;
-	TSglQueIter<CPortC32InterfaceBase>	iPortC32InterfaceIter;	
-
-	// multiplexer framer
- 	CMux0710Protocol*				iMux0710Protocol;
-
-	// multiplexer Control channel
-	CChannelMgrCtrl*				iChannelCtrl;
-
-	// multiplexer Command channels
-	TSglQue<CChannelMgrCmdData>		iDataChannelList;
-	TSglQueIter<CChannelMgrCmdData>	iDataChannelIter;
-
-	// interface to the serial port logical device driver
-	RBusDevComm						iCommPort;
-	CCommFrameWriterAo*				iCommWriterAo;
-	CCommFrameReaderAo*				iCommReaderAo;
-
-	TBool iDisconnectInProgress;
-
-	TUint iLastDlcNum;
-	TUint iNumOfOpenPorts;
-	
-	TBool iOpenPortFailed;
-	};
-
-
-// Inline Methods
-inline CCommFrameWriterAo* CPortFactory::GetCommWriterAo() const
-/**
- * Return a pointer to the CSY's comm writer object.
- * @param void
- * @return Pointer to the CSY's comm writer object
- */
-	{ 
- 	return iCommWriterAo; 
-	}
-
-inline CCommFrameReaderAo* CPortFactory::GetCommReaderAo() const
-/**
- * Return a pointer to the CSY's comm reader object.
- * @param void
- * @return Pointer to the CSY's comm reader object
- */
-	{ 
- 	return iCommReaderAo; 
-	}
-
-inline RBusDevComm* CPortFactory::DTEPort()
-/**
- * Return a pointer to the CSY's LDD port interface object.
- * @param void
- * @return Pointer to the CSY's LDD port interface object
- */
-	 { 
- 	return (&iCommPort);
-	 }
-
-inline CMux0710Protocol* CPortFactory::GetMux0710Protocol() const
-/**
- * Return a pointer to the CSY's mux protocol object.
- * @param void
- * @return Pointer to the CSY's mux protocol object
- */
-	{
-	return iMux0710Protocol;
-	}
-
-inline CChannelMgrCtrl* CPortFactory::GetControlChannel() const
-/**
- * Return a pointer to the CSY's control channel object.
- * @param void
- * @return Pointer to the CSY's control channel object
- */
-	{
-	return iChannelCtrl;
-	}
-
-#endif  // _PORTFACTORY_H__
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/inc/etools.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description: This file defines a tool for putting a name to the class
-// *              when a memory leak occurs, you can trace it back by looking 
-//                at the memory space.
-//
-
-// etools.h
-
-/** @file etools.h
- *
- */
-
-#ifndef ETOOLS_H__
-#define ETOOLS_H__
-
-#include <e32std.h>
-#include <e32panic.h>
-#include <e32svr.h>
-
-// Tool for putting a name to the class
-// when a memory leak occurs, you can trace it back
-// by looking at the memory space!
-// the for(;;) is a bit awkward
-#define CLASSNAMEDECL(a) char __iName[sizeof(#a)];
-
-#ifdef _DEBUG
-#define CLASSNAMEINIT(a) \
-	char tmp[] = #a; \
-	for(TUint _i_##a=0;_i_##a<sizeof(tmp);_i_##a++) __iName[_i_##a] = tmp[_i_##a]; 
-#define CLASSNAME this->__iName
-#else
-#define CLASSNAMEINIT(a)
-#define CLASSNAME "?"
-#endif
-
-//
-// put this in your constructor/destructor to see the memory usage
-//
-#if defined __DEBUGLOGFILE__
-#define CTOR(a)	\
-	_LOGF4("+++ object created at 0x%08x (%d bytes)\t%s ", this, sizeof(a) - __Align8(sizeof(__iName)), #a );
-#define DTOR(a)	\
-	_LOGF4("--- object deleted at 0x%08x (%d bytes)\t%s", this, sizeof(a) - (4+(sizeof(__iName) & ~0x03)), #a );
-#else
-#define CTOR(a)
-#define DTOR(a)
-#endif
-
-//
-// size of arrays
-//
-
-#ifndef ELEM_SIZE
-#define ELEM_SIZE(t) (sizeof(t)/sizeof(t[0]))
-#endif
-
-#endif // ETOOLS_H__

--- a/cbsref/csyrefplugins/csy27010/inc/timeouter.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file defines CActiveTimeouter, a very simple timeout class. 
-// *               It is an active timeout-class used by clients to get asynchronous timeouts.
-// *               The observer derives from the MTimeoutObserver class	and calls the Start 
-// *               function to start the timer. When and if the timeout occurs the TimedOut 
-// *               function on the observer will be called.
-// *               MTimeoutObserver is an abstract mixin class implemented by a class that is 
-// *               interested in timeouts generated by CActiveTimeouter.
-//
-
-// timeouter.h
-
-/** @file timeouter.h
- *
- */
-
-#ifndef TIMEOUTER_H__
-#define TIMEOUTER_H__
-
-#include <e32base.h>
-#include "etools.h"
-
-
-class MTimeoutObserver
-	{
-public:
-	// called by CActiveTimeouter when the timeout happens
-	virtual void TimedOut() = 0;
-	};
-
-/** @class CActiveTimeouter Timeouter.h "Timeouter.h"
- *  @brief  Class CActiveTimeouter is an active object that is used
- *  to detect and report a timeout condition.
- */
-class CActiveTimeouter : public CTimer
-	{
-public:
-	static CActiveTimeouter* NewL(MTimeoutObserver& aObserver);
-	~CActiveTimeouter();
-	void Start(const TTimeIntervalMicroSeconds32& aTimeIntervalMicroSeconds32);
-	void Stop();
-
-private:
-	CActiveTimeouter(MTimeoutObserver& aObserver);
-
-private: // from CTimer
-	void RunL();
-
-private: // owned
-	CLASSNAMEDECL(CActiveTimeouter)          
-
-private: // unowned
-	MTimeoutObserver& iTheTimeoutObserver;    
-	};
-
-#endif // TIMEOUTER_H__

--- a/cbsref/csyrefplugins/csy27010/src/ChannelMgrBase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,818 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  The CChannelMgrBase class defines a single 3GPP 27.010 based logical channel
-// *               called DLC. This base class is inherited by derived control and data channel
-// *               classes which add specific channel type behavior.
-//
-
-// ChannelMgrBase.cpp
-
-/** @file ChannelMgrBase.cpp
- *
- */
-
-#include "ChannelMgrBase.h"
-#include "CsyMsgBufBpFrame.h"
-#include "PortC32Interface.h"
-#include "Mux0710Protocol.h"
-#include "CsyDebugLogger.h"
-#include "CommFrameWriterAo.h"
-
-CChannelMgrBase::CChannelMgrBase(const TUint8 aDlcNum,
-								 CPortFactory& aPortFactory,
-								 CMux0710Protocol& aMux0710Protocol)
-: iV24Signals(0x0D),
-  iDlcNum(aDlcNum),
-#ifndef __CSY_PROTOTYPE__
-  iChannelState(ECsyChannelStateDisconnected),
-#else
-  iChannelState(ECsyChannelStateConnected),
-#endif
-  iPortFactory(aPortFactory),
-  iPortC32Interface(NULL),
-#ifndef __CSY_PROTOTYPE__
-  iMux0710Protocol(aMux0710Protocol),
-#else
-  iMux0710Protocol(aMux0710Protocol),
-  iChannelReady(ETrue),
-  iInitFinished(ETrue),
-#endif
-  iModemAllowedToSendFrames(EFlowControlOff)
-/**
- * Constructor.
- * @param aDlcNum - DLC number for the channel
- * @param aPortFactory - Reference to port factory
- * @param aMux0710Protocol - Reference to the Mux 27.010 object
- */
- 	{
-	}
-
-CChannelMgrBase::~CChannelMgrBase()
-/**
- * Destructor. Delete all resources and memory allocated by this object.
- */
-	{
-	_LOG_L4C1("CChannelMgrBase::~CChannelMgrBase");
-
-	delete iChannelObserverAo;
-	delete iTimeouter;
-	}
-
-void CChannelMgrBase::ConstructL()
-/**
- * Create any instances and allocate any memory used by this object.
- */
- 	{
-	_LOG_L4C1("CChannelMgrBase::ConstructL");
-
-	iChannelObserverAo = CChannelObserverAo::NewL();
-	CActiveScheduler::Add(iChannelObserverAo); 
-
-	iTimeouter = CActiveTimeouter::NewL(*this);
-	iTimeoutVal = KOneSecond;
-	iTxCountLimit = 10;
-	}
-
-TDes8& CChannelMgrBase::RefToMsgBuffer()
-/**
- * This method returns a pointer to the message buffer to use
- * to format a message to send to the baseband.
- *
- * @return pointer
- */
-	{
-	// only one buffer is available for messages to the baseband
-	return iDataToSendToModem;
-	}
-
-void CChannelMgrBase::ProcessRecvFrame(CCsyMsgBufBpFrame* aBpFrame)
-/**
- * This method is called to process a frame that was received
- *
- * @param aBpFrame - Pointer to the frame buffer
- */
-	{
-	if (aBpFrame->GetFrameType() != KCsy0710CTLUIH)
-		ProcessNonUihRecvFrame(aBpFrame);
-	else
-		ProcessRecvUihFrame(aBpFrame);
-	}
-
-TInt CChannelMgrBase::PlaceOnOutboundQueue()
-/**
- * This method is called to process the "to baseband Message Q" event
- * for the channel. This event indicates that there is a message
- * that needs to be sent to the baseband.
- */
-	{
-	_LOG_L4C2(">>CChannelMgrBase::PlaceOnOutboundQueue [iDlcNum=%d]",iDlcNum);
-
-	TInt ret = KErrNone;
-
-	if (iCsyAllowedToSendFrames == EFlowControlOn)
-		{
-		_LOG_L4C1("Csy -> modem flow control = ON");
-		iDelayedWriteToModem = ETrue;
-
-		// We cannot fragment and place it on the write queue yet since
-		// flow control in the direction of Csy to modem is set to ON.
-		
-		_LOG_L4C1("<<CChannelMgrBase::PlaceOnOutboundQueue - write delayed");
-		return KErrNone;	
-		}
-
-	if (iChannelState != ECsyChannelStateConnected)
-		{
-		// this should not happen (should be caught by flow control above)
-		// MAF __ASSERT_DEBUG(EFalse,PANIC(KPanicIllegalState));
-		_LOG_L4C1("<<CChannelMgrBase::PlaceOnOutboundQueue - write ignored");
-		return KErrNone;	
-		}
-
-	ret = iMux0710Protocol.Create0710DataFrames(iDataToSendToModem, iDlcNum);
-
-	_LOG_L4C2("<<CChannelMgrBase::PlaceOnOutboundQueue [ret=%d]",ret);
-	return ret;
-	}
-
-void CChannelMgrBase::WriteCancel()
-/**
- * The client has requested the write by this DLC be cancelled.
- */
-	{
-	_LOG_L4C1(">>CChannelMgrBase::WriteCancel");
-
-	if (iDelayedWriteToModem)
-		{
-		_LOG_L4C1("Delayed write has been cancelled");
-		iDelayedWriteToModem = EFalse;
-		}
-
-	_LOG_L4C1("Remove any frames on write queue");
-
-	// remove any frames (if any exist) from the writer Ao and
-	// place them on the free queue
-	
-	CCommFrameWriterAo* writer = iPortFactory.GetCommWriterAo();
-
-	writer->RemoveAnyDlcFramesOnWriteList(iDlcNum, EFalse);
-	writer->RemoveAnyDlcFramesFromWaitList(iDlcNum, EFalse);
-
-	_LOG_L4C1("<<CChannelMgrBase::WriteCancel");
-	}
-
-TInt CChannelMgrBase::Connect()
-/**
- * Request to connect the channel. If the channel state is not "Connected"
- * then issue a SABM frame and change the channel state to "Connecting".
- *
- * @return KErrNone or KErrGeneral
- */
-    {
-    _LOG_L4C3(">>CChannelMgrBase::Connect [iDlcNum=%d,iChannelState=%d]",
-		iDlcNum,iChannelState);
-
-	TInt ret = KErrNone;
-	if (iChannelState != ECsyChannelStateConnected)
-		{
-		_LOG_L4C1("Dlc is not currently connected");
-		ret = iMux0710Protocol.Create0710ControlFrame(CMux0710Protocol::ESABM, iDlcNum);
-		if (ret == KErrNone)
-			{
-			iChannelState = ECsyChannelStateConnecting;
-			iInitFinished = EFalse;
-			iTimeouter->Stop();
-			iTimeouter->Start(iTimeoutVal);
-			iTxCount = iTxCountLimit;
-			}
-		else
-			{
-			_LOG_L1C1("** Cannot send SABM **");
-			}
-		}
-	else
-		{
-		_LOG_L2C1("** Ignored Connect **");
-		ret = KErrGeneral;
-		}
-
-    _LOG_L4C2("<<CChannelMgrBase::Connect [ret=%d]",ret);
-	return ret;
-	}
-
-TInt CChannelMgrBase::ParameterNegotiate()
-/**
- * Request to parameter negotiation for the channel. If the channel state is not 
- * "Connected" then issue a UIH frame and with the parameter negotiation.
- *
- * @return KErrNone or KErrGeneral
- */
-    {
-    _LOG_L4C3(">>CChannelMgrBase::ParameterNegotiate [iDlcNum=%d,iChannelState=%d]",
-		iDlcNum,iChannelState);
-
-	TInt ret = KErrNone;
-	if (iChannelState != ECsyChannelStateConnected) 
-		{
-		_LOG_L4C1("Dlc is not currently connected");
-		if (iMux0710Protocol.Create0710ControlFrame(CMux0710Protocol::EUIH, iDlcNum) == KErrNone)
-			{
-			iChannelState = ECsyChannelStateParameterNegotiating;
-			iTimeouter->Stop();
-			iTimeouter->Start(iTimeoutVal);
-			iTxCount = iTxCountLimit;
-			}
-		else
-			{
-			_LOG_L1C1("** Cannot send EUIH Param Neg. **");
-			ret = KErrGeneral;
-			}
-		}
-	else
-		{
-		_LOG_L2C1("** Ignored ParameterNegotiate **");
-		}
-
-    _LOG_L4C2("<<CChannelMgrBase::ParameterNegotiate [ret=%d]",ret);
-	return ret;
-	}
-
-TInt CChannelMgrBase::Disconnect()
-/**
- * Request to disconnect the channel. If the channel is not "Disconnected"
- * then issue a DISC frame and change the channel state to "Disconnecting".
- *
- * @return KErrNone or error code
- */
-    {
-    _LOG_L4C3(">>CChannelMgrBase::Disconnect [iDlcNum=%d,iChannelState=%d]",
-		iDlcNum,iChannelState);
-		
-	TInt ret = KErrNone;
-	if (iChannelState == ECsyChannelStateConnected)
-		{
-		_LOG_L4C1("Dlc is currently connected");
-		if (iMux0710Protocol.Create0710ControlFrame(CMux0710Protocol::EDISC, iDlcNum) == KErrNone)
-			{
-			iChannelState = ECsyChannelStateDisconnecting;
-			_LOG_L1C2("** Setting Channel Ready to False for DLC %d **",iDlcNum);
-			iChannelReady = EFalse;
-			iTimeouter->Stop();
-			
-			// Allow time for the channel to disconnect...
-			User::After(1);
-			}
-		else
-			{
-			_LOG_L1C1("** Cannot send EDISC **");
-			ret = KErrGeneral;
-			}
-		}
-	else if (iChannelState == ECsyChannelStateTransmitError)
-		{
-		_LOG_L2C1("** Disconnect request for channel with transmit error **");
-		ret = KErrNone;
-		}
-	else
-		{
-		_LOG_L2C1("** Ignored disconnect **");
-		ret = KErrGeneral;
-		}
-
-    _LOG_L4C2("<<CChannelMgrBase::Disconnect [ret=%d]",ret);
-	return ret;
-	}
-
-void CChannelMgrBase::ProcessNonUihRecvFrame(CCsyMsgBufBpFrame* aBpFrame)
-/**
- * This method is called to process a Non-UIH frame which the channel
- * has received from the baseband for the channel.
- *
- * @param aBpFrame - Pointer to the received Non-UIH frame
- */
-	{
-	_LOG_L4C2(">>CChannelMgrBase::ProcessNonUihRecvFrame [iDlcNum=%d]", iDlcNum);
-
-	TUint8 frameType = aBpFrame->GetFrameType();
-	iMux0710Protocol.AddFrameFreeQ(aBpFrame);
-
-	switch (frameType)
-		{
-	case KCsy0710CTLSABM:
-		_LOG_L4C1("SABM");
-		// MAF we should respond to this
-		break;
-
-	case KCsy0710CTLUA:
-		{
-		_LOG_L4C1("UA");
-		iTimeouter->Stop();
-
-		if (iChannelState == ECsyChannelStateConnecting)
-			{
-			_LOG_L4C1("SABM received by remote end - send MSC command");
-			if (SendMscCommand(iV24Signals) == KErrNone)
-				iChannelState = ECsyChannelStateMSCsent;
-			}
-		else if (iChannelState == ECsyChannelStateDisconnecting)
-			{
-			_LOG_L4C2("Channel disconnected %d", iDlcNum);
-			iChannelState = ECsyChannelStateDisconnected;
-
-			if (iPortFactory.DecrementNumOfOpenPorts())
-				{
-				NotifyChannelReady();
-				}
-			}
-		}
-		break;
-
-	case KCsy0710CTLDM:    // 0x0F
-		_LOG_L4C1("DM");
-		break;
-
-	case KCsy0710CTLDISC:  // 0x43
-		_LOG_L4C1("DISC");
-		// MAF we should respond to this
-		break;
-
-	case KCsy0710CTLUIH:
-	case KCsy0710CTLUI:
-		// MAF __ASSERT_DEBUG(EFalse,PANIC(KPanicIllegalState)); here
-		break;
-	
-	default:
-		_LOG_L1C2("** Unknown FrameType = 0x%02x **", frameType);
-		break;
-		}
-
-	_LOG_L4C1("<<CChannelMgrBase::ProcessNonUihRecvFrame");
-	}
-
-TInt CChannelMgrBase::SendMscCommand(TUint8 aV24Signals)
-/**
- * Sends an MSC command
- *
- * @param aV24Signals
- * @return error if failed to send
- */
-	{
-	_LOG_L4C2(">>CChannelMgrBase::SendMscCommand [aV24Signals=0x%02x]",
-		aV24Signals);
-
-	if (iMscReplyExpected)
-		{
-		_LOG_L4C1("<<CChannelMgrBase::SendMscCommand - already doing MSC");
-		return KErrNotReady;
-		}
-
-	// Keep the signals in case of resend
-	iV24Signals = aV24Signals;
-	TInt ret = iMux0710Protocol.Create0710ControlFrame(
-		CMux0710Protocol::EUIH, iDlcNum, CMux0710Protocol::EMSC, iV24Signals);
-	
-	if (ret != KErrNone)
-		{
-		_LOG_L1C1("** Could not send MSC command **");
-		}
-	else
-		{
-		iTimeouter->Stop();
-		iTimeouter->Start(iTimeoutVal);
-		iTxCount = iTxCountLimit;
-		iMscReplyExpected = ETrue;
-		}
-
-	_LOG_L4C2("<<CChannelMgrBase::SendMscCommand [ret=%d]",ret);
-	return ret;
-	}
-
-void CChannelMgrBase::MscReceived(TUint8 aV24Signals)
-/**
- * Processes a received MSC command
- *
- * @param aV24Signals
- */
-	{
-	_LOG_L4C2(">>CChannelMgrBase::MscReceived [aV24Signals=0x%x]",
-		aV24Signals);
-
-	if (!iMscReplyExpected)
-		{
-		_LOG_L2C1("*** Not expecting MscReceived? ***");
-		return;
-		}
-
-	iMscReplyExpected = EFalse;
-	iTimeouter->Stop();
-
-	if (iChannelState == ECsyChannelStateMSCsent)
-		{
-		_LOG_L4C1("MSC cmd part of start up sequence");
-		iChannelState = ECsyChannelStateWaitingForChannelReady;
-
-		//different type of channel may need different init process.
-		if (iPortC32Interface)
-			{
-#ifdef _27010ADVANCEOPTION
-			if (iPortC32Interface->GetClientType() == CPortFactory::EC32ClientIpNif)
-				{
-				_LOG_L4C1(" IpNif Channel Initialized");
-				// Don't need to wait for AT command interpreter ready since not AT
-				iChannelState = ECsyChannelStateConnected;
-				NotifyChannelReady();
-				ModemAndCsyToClientFlowCtrl(EFlowControlOff);
-				}
-#endif
-			}
-		else
-			{
-			// Command channel
-			iChannelState = ECsyChannelStateConnected;
-			NotifyChannelReady();
-			}
-		}
-
-	if ((iDlcNum)&&(iV24Signals != aV24Signals))
-		{
-		_LOG_L4C3("Data Dlc - Response different to sent [%x != %x]",
-			iV24Signals, aV24Signals);
-
-		ReceivedV24Signals(aV24Signals);
-		}
-
-	_LOG_L4C1("<<CChannelMgrBase::MscReceived");
-	}
-
-void CChannelMgrBase::ModemAndCsyToClientFlowCtrl(const TFlowControl aFlowControl)
-/**
- * Set the channel's flow control to the specified value.
- * Update the associate port object's flow control if the port object 
- * exists.
- *
- * @param aFlowControl - New flow control state
- */
- 	{
-	_LOG_L4C3(">>CChannelMgrBase::ModemAndCsyToClientFlowCtrl [aFlowControl=%d,iDlcNum=%d]", 
-		aFlowControl,iDlcNum);
-
-	iCsyAllowedToSendFrames = aFlowControl;
-	if ((aFlowControl == EFlowControlOff)&&(iDelayedWriteToModem))
-		{
-		_LOG_L4C1("Flow control now OFF - delayed frame to send");
-
-		TInt ret = iMux0710Protocol.Create0710DataFrames(iDataToSendToModem, iDlcNum);
-		if (ret)
-			{
-			_LOG_L1C2("** Fragmentation failed [ret=%d] **",ret);
-			}
-		else
-			{
-			_LOG_L4C1("Delayed write placed on write queue");
-			iDelayedWriteToModem = EFalse;
-			}
-		}
-
-	CPortC32InterfaceBase* port = GetC32Port();
-	if (port)
-		port->ModemAndCsyToClientFlowCtrl(aFlowControl);
-	else
-		{
-		_LOG_L2C1("** GetC32Port() returned NULL **");
-		}
-
-	_LOG_L4C1("<<CChannelMgrBase::ModemAndCsyToClientFlowCtrl");
-	}
-
-void CChannelMgrBase::ReceivedV24Signals(const TUint8 aV24Signals)
-/**
- * Set the channel's signals to the specified value.
- * Update the associate port object's flow control if the port object 
- * exists.
- *
- * @param aSignals - new signal state
- */
- 	{
-	_LOG_L4C3(">>CChannelMgrBase::ReceivedV24Signals [aV24Signals=0x%x,iDlcNum=%d]", 
-		aV24Signals,iDlcNum);
-
-	CPortC32InterfaceBase* port = GetC32Port();
-	if (port)
-		{
-		// Flow control
-		TFlowControl flowControl = EFlowControlOff;
-
-		// FC (bit 2)
-		if (aV24Signals & 0x02)
-			{
-			_LOG_L4C2("FC=1 - modem dlc %d unable to accept frames",iDlcNum);
-			flowControl = EFlowControlOn;
-			_LOG_L4C1("flowControl On  (i.e stop flow)");
-
-			// move frames for this dlc from write list to wait list
-			iPortFactory.GetCommWriterAo()->RemoveAnyDlcFramesOnWriteList(iDlcNum);
-			}
-		else
-			{
-			// move any frames for this dlc from wait to write list
-			iPortFactory.GetCommWriterAo()->RemoveAnyDlcFramesFromWaitList(iDlcNum);
-			}
-
-		ModemAndCsyToClientFlowCtrl(flowControl);
-
-		port->ReceivedV24Signals(aV24Signals);
-		}
-	else
-		{
-		_LOG_L2C1("** GetC32Port() returned NULL **");
-		}
-
-	_LOG_L4C1("<<CChannelMgrBase::ReceivedV24Signals");
-	}
-
-void CChannelMgrBase::WaitForChannelReady()
-/**
- * This method starts an active object and waits for the channel ready
- * call back signal.
- */
-	{
-	_LOG_L4C1(">>CChannelMgrBase::WaitForChannelReady");
-
-	if (iMux0710Protocol.MaxRetriesReached())
-		{
-		_LOG_L4C1("Mux Max Retries reached - so skip Channel Ready");
-		}
-	else
-		{
-		// kick off an active object and wait for channel ready call back
-		if (iChannelReady)
-			{
-			_LOG_L4C2("iChannelReady=%d",iChannelReady);
-			}
-		else if (!iChannelObserverAo->IsActive())
-			{
-			// start the active object. CSY will wait here until channel is ready
-			// nest active scheduler is used here as we did not want to block whole thread (reading/writing)
-
-			iChannelObserverAo->StartWait();
-
-			// start a nested scheduling; blocks until CActiveScheduler::Stop() 
-			// is called in DoCancel()
-
-			// MAF look at use CActiveSchedulerWait instead of this
-
-			// One basic assumption here is that CSY will process port open request one by one
-			// (although there may be mutiple port open requests from clients, c32 will call PortFactory::NewPortL
-			// one by one.) This assumption should be valid as it is only one thread for c32
-			// if this assumption does not hold, headache follows.
-			_LOG_L4C1("Start wait for channel ready");
-
-			CActiveScheduler::Start();
-			_LOG_L4C1("End wait for channel ready");
-			}
-		else
-			{
-			_LOG_L4C1("We are here only when others are already waiting");
-			}
-		}
-	_LOG_L4C1("<<CChannelMgrBase::WaitForChannelReady");
-	}
-
-void CChannelMgrBase::TimedOut()
-/**
- * This method will be called when we have a timeout During receive a reply.
- * It will retransmit if needed.
- */
-	{
-	_LOG_L4C1(">>CChannelMgrBase::TimedOut");
-
-	iTxCount--;
-	if (iTxCount > 0)  // retransmit
-		{
-		_LOG_L4C2("iTxCount=%d",iTxCount);
-
-		TInt ret = KErrNone;
-		if (iMscReplyExpected)
-			{
-			iMscReplyExpected = EFalse;
-			ret = SendMscCommand(iV24Signals);
-			}
-		else
-			{
-			switch(iChannelState)
-				{
-			case ECsyChannelStateParameterNegotiating:
-				ret = iMux0710Protocol.Create0710ControlFrame(
-					CMux0710Protocol::EUIH, iDlcNum, CMux0710Protocol::EParamNeg);
-				break;
-			case ECsyChannelStateConnecting:
-				ret = iMux0710Protocol.Create0710ControlFrame(
-					CMux0710Protocol::ESABM, iDlcNum);
-				break;
-			case ECsyChannelStateDisconnecting:
-				ret = iMux0710Protocol.Create0710ControlFrame(
-					CMux0710Protocol::EDISC, iDlcNum);
-				break;
-			default:
-				// should never reach here
-				_LOG_L1C1("** unexpected receiving timeout **");
-				}
-			}
-		if (ret)
-			{
-			// Error sending - we shall just wait until the timeout and try again
-			_LOG_L1C2("** Error sending on dlc 0 [ret=%d] **",ret);
-			}
-		iTimeouter->Stop();
-		iTimeouter->Start(iTimeoutVal);
-		}
-	else
-		{
-		_LOG_L1C1("** Retries expired **");
-		if (iMscReplyExpected)
-			{
-			_LOG_L1C1("** Retries expired for MSC command **");
-			iMscReplyExpected = EFalse;
-			}
-
-		// we have problem communication, may need to reset?
-		iChannelState = ECsyChannelStateTransmitError;
-		NotifyChannelReady();
-		}
-
-	_LOG_L4C1("<<CChannelMgrBase::TimedOut");
-	}
-
-void CChannelMgrBase::NotifyChannelReady()
-/**
- * This method stops the waiting for a channel.
- */
-	{
-	_LOG_L4C1("CChannelMgrBase::NotifyChannelReady");
-
-	iChannelReady = ETrue;
-	iInitFinished = ETrue;
-
-	// complete the active object if it is running
-	if (iChannelObserverAo->IsActive())
-		{
-		iChannelObserverAo->ChannelReady();
-		}
-	}
-
-TInt CChannelMgrBase::SetCsyToModemFlowControl(TFlowControl aFlowControl)
-/**
- * 
- */
-	{
-	_LOG_L4C3(">>CChannelMgrBase::SetCsyToModemFlowControl [aFlowControl=%d,iDlcNum=%d]",
-		aFlowControl,iDlcNum);
-
-	TInt ret = KErrNone;
-	if (aFlowControl != iModemAllowedToSendFrames)
-		{
-		TUint8 v24Signals = iV24Signals;
-		TBool sendCommand = EFalse;
-		if (aFlowControl == EFlowControlOn)
-			{
-			_LOG_L4C1("aFlowControl = ON");
-			if (v24Signals & 0x02)
-				{
-				_LOG_L4C1("** Flow control already set **");
-				}
-			else
-				{
-				v24Signals |= 0x02;
-				sendCommand = ETrue;
-				}
-			}
-		else
-			{
-			_LOG_L4C1("aFlowControl = OFF");
-			if (v24Signals & 0x02)
-				{
-				v24Signals ^= 0x02;
-				sendCommand = ETrue;
-				}
-			else
-				{
-				_LOG_L4C1("Flow control already off");
-				}
-			}
-		if (sendCommand)
-			{
-			ret = SendMscCommand(v24Signals);
-			if (ret)
-				{
-				_LOG_L4C1("SendMscCommand failed");
-				}
-			else
-				{
-				_LOG_L4C3("Csy to modem flow control changed %d -> %d",
-					iModemAllowedToSendFrames,aFlowControl);
-				iModemAllowedToSendFrames = aFlowControl;
-				}
-			}
-		}
-
-	_LOG_L4C2("<<CChannelMgrBase::SetCsyToModemFlowControl [ret=%d]",ret);
-	return ret;
-	}
-
-//
-// class CChannelObserverAo
-//
-
-CChannelObserverAo::CChannelObserverAo()
-: CActive(CActive::EPriorityStandard)
-/**
- * Constructor.  Pass priority of active object to base class.
- *
- */
-	{}
-
-CChannelObserverAo* CChannelObserverAo::NewL()
-/**
- * This method uses two phase construction and the cleanup stack
- * to create an instance of class CChannelObserverAo.
- *
- * @return Pointer to the created instance
- */
-	{
-	_LOG_L4C1("CChannelObserverAo::NewL");
-	return new (ELeave) CChannelObserverAo();
-	}
-
-CChannelObserverAo::~CChannelObserverAo()
-/**
- * Destructor. Cancel any outstanding request.
- */
-	{	
-	if (IsActive())
-		Cancel();
-	}
-
-void CChannelObserverAo::RunL()
-/**
- * This method should not be called. Request of this 
- * active object will only be canceled.
- */
-	{
-	// MAF __ASSERT_DEBUG(EFalse,PANIC(KPanicIllegalState));
-	_LOG_L1C1("** CChannelObserverAo::RunL() - should not be called **");
-	}
-
-void CChannelObserverAo::DoCancel()
-/**
- * Cancel an outstanding request. This will complete request
- * with KErrCancel and stop waiting.
- */
-	{
-	_LOG_L4C1("CChannelObserverAo::DoCancel");
-
-	iStatus = KErrCancel;
-	TRequestStatus* temp = &iStatus;
-	User::RequestComplete(temp, KErrCancel);
-
-	_LOG_L4C1("CChannelObserverAo stop scheduler");
-	CActiveScheduler::Stop();
-	}
-
-void CChannelObserverAo::StartWait()
-/**
- * Set active and start waiting.
- */
-	{
-	_LOG_L4C1("CChannelObserverAo::StartWait");
-	if (!IsActive())
-		{
-		iStatus = KRequestPending;
-		SetActive();
-		}
-	}
-
-void CChannelObserverAo::ChannelReady()
-/**
- * Called when expected event occured to stop waiting. 
- */
-	{
-	_LOG_L4C1("CChannelObserverAo::ChannelReady");
-
-	// complete current request
-	if (IsActive())
-		{
-		_LOG_L4C1("CChannelObserverAo Active");
-		Cancel();
-		}
-	}

--- a/cbsref/csyrefplugins/csy27010/src/ChannelMgrCmdData.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,282 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  The CChannelMgrCmdData class defines a single 3GPP 27.010 based logical channel
-// *               called DLC. Derived control and data channel add specific behavior.
-//
-
-// ChannelMgrCmdData.cpp
-
-/** @file ChannelMgrCmdData.cpp
- *
- */
-
-#include "ChannelMgrCmdData.h"
-#include "PortC32InterfaceBase.h"
-#include "PortC32Interface.h"
-#include "CsyMsgBufBPFrame.h"
-#include "CsyDebugLogger.h"
-
-CChannelMgrCmdData* CChannelMgrCmdData::NewL(const TUint8 aDlcNum,
-											 CPortFactory& aPortFactory,
-											 CMux0710Protocol& aMux0710Protocol)
-/**
- * This methods uses two phase construction and the cleanup stack to create
- * an instance of class CChannelMgrCmd.
- * @param aDlcNum - DLC number of this channel
- * @param aPortFactory - Reference to the port factory
- * @param aMux0710Protocol - Pointer to the 27.010 mux protocol
- * @return Pointer to the created instance
- */
-    {
-	_LOG_L4C2("CChannelMgrCmdData::NewL [aDlcNum=%d]", aDlcNum);
-
-    CChannelMgrCmdData* p = new(ELeave) CChannelMgrCmdData(aDlcNum, aPortFactory,
-														   aMux0710Protocol);
- 	CleanupStack::PushL(p);
- 	p->ConstructL();
-	CleanupStack::Pop(p);
- 	return p;
-	}
-
-CChannelMgrCmdData::~CChannelMgrCmdData()
-/**
- * Destructor. Delete all resources and memory allocated by this object.
- * Disconnect the channel from the multiplexer.
- */
-	{
-    _LOG_L4C1("CChannelMgrData::~CChannelMgrCmdData");
-	}
-
-
-CChannelMgrCmdData::CChannelMgrCmdData(const TUint8 aDlcNum,
-									   CPortFactory& aPortFactory,
-									   CMux0710Protocol& aMux0710Protocol)
-: CChannelMgrBase(aDlcNum, aPortFactory, aMux0710Protocol),
-  iCount(0)
-/**
- * Constructor.
- * @param aDlcNum - DLC number of this channel
- * @param aPortFactory - Reference to the port factory
- * @param aMux0710Protocol - Reference to the 27.010 mux protocol
- */
- 	{
-	iCsyAllowedToSendFrames = EFlowControlOn;
-	}
-
-void CChannelMgrCmdData::ConstructL()
-/**
- * Create any instances and allocate any memory used by this object.
- */
- 	{
-	CChannelMgrBase::ConstructL();
-	}
-
-void CChannelMgrCmdData::Open(CPortC32InterfaceBase* aPort)
-/**
- * Open the port
- *
- * @param aPort - Pointer to CPortC32Interface
- */
-	{
-	_LOG_L4C2(">>CChannelMgrCmdData::Open [aPort=0x%x]",aPort);
-	
-	iCount++;
-	if (iCount == 1)
-		{
-		_LOG_L4C1("First client of port");
-		
-		if (aPort->GetClientType() == CPortFactory::EC32ClientIpNif)
-			{
-			ParameterNegotiate();
-			}
-		else
-			{
-			TInt err = Connect();
-			if (err != KErrNone)
-				_LOG_L4C2("Open Connect error =%d",err);				
-			}
-	}
-	iPortArray.Insert(aPort,0);
-	SetOwner(aPort);
-
-	_LOG_L4C2("<<CChannelMgrCmdData::Open [iCount=%d]",iCount);
-	}
-
-void CChannelMgrCmdData::Close(CPortC32InterfaceBase* aPort)
-/**
- * Close the port
- *
- * @param aPort - Pointer to CPortC32Interface
- */
-	{
-	_LOG_L4C2(">>CChannelMgrCmdData::Close [aPort=%d]",aPort->GetPortNumber());
-
-	iCount--;
-	if (iCount < 1)
-		{
-		_LOG_L4C1("Last client of port");
-		Disconnect();
-		iCount = 0; // reset counter
-		iChannelReady = EFalse;
-		}
-
-	// remove port from the port list, set next port in the queue to be the port owner
-	TInt index;
-	index = iPortArray.Find(aPort);
-	if (index == KErrNotFound)
-		{
-		_LOG_L1C2("** Close() - Port %d not found **", aPort);
-		}
-	else
-		{
-		iPortArray.Remove(index);
-		if (iPortC32Interface == aPort)
-			{
-			// close the current owner of the channel, set owership to the first one in the port list
-			// if there are one
-			if (iPortArray.Count() > 0)
-				SetOwner(iPortArray[0]);
-			else
-				SetOwner(NULL);
-			}
-		}
-
-	_LOG_L4C2("<<CChannelMgrCmdData::Close [iCount=%d]",iCount);
-	}
-
-void CChannelMgrCmdData::SetOwner(CPortC32InterfaceBase* aPort)
-/**
- * Set owner to the pointer
- * @param aPort - Pointer to new owner, which is a CPortC32Interface instance
- */
-	{
-	_LOG_L4C1(">>CChannelMgrCmdData::SetOwner");
-	
-	if (iPortC32Interface == aPort)
-		return;
-
-	if (iPortC32Interface != NULL)
-		iPortC32Interface->CompleteOutstandingRequest();
-
-	if (aPort == NULL)
-		{
-		iPortC32Interface = aPort;
-		_LOG_L4C1("<<CChannelMgrCmdData::SetOwner aPort was Null");
-		return;
-		}
-
-	TInt index;
-	index = iPortArray.Find(aPort);
-	if (index == KErrNotFound)
-		{
-		_LOG_L1C2("** Port %d not found **", aPort);
-		}
-	else
-		{
-		iPortC32Interface = aPort;
-		}
-
-	_LOG_L4C1("<<CChannelMgrCmdData::SetOwner");
-	}
-
-void CChannelMgrCmdData::SetupCmdChannelsForATCmdsL()
-/**
- * Set up and prepare the ports for AT commands
- */
-	{
-	_LOG_L4C1("CChannelMgrCmdData::SetupCmdChannelsForATCmdsL");
-#if defined DSAMPLE || defined H2
-	_LOG_L4C1("Setting up for DSample/H2 (or P2Sample on Wins)");
-#endif
-#ifdef P2SAMPLE
-	_LOG_L4C1("Setting up for P2Sample on TARGET");
-#endif
-
-	TBuf8<20> temp;
-	temp.Copy(KATCmdSetup);
-	iMux0710Protocol.Create0710DataFrames(temp, (TInt8)GetDlcNumber());
-	}
-
-void CChannelMgrCmdData::ProcessRecvUihFrame(CCsyMsgBufBpFrame* aBpFrame)
-/**
- * Process a received UIH frame. Set flow control off if an "ok" is received
- * and we are still initializing.
- *
- * @param aBpFrame - Pointer to the frame received from the baseband
- */
-	{
-#ifdef _DEBUG
-	// The dlcNum is only needed for logging when _DEBUG is set.
-	// Otherwise we get a warning for ARM v5
-	TInt dlcNum;
-	dlcNum = aBpFrame->GetDlcNum();
-#endif
-
-	if(!iInitFinished)
-		{
-		if (iChannelState != ECsyChannelStateConnected)
-			{
-			_LOG_L4C1("Waiting for AT interpreter");
-			if (aBpFrame->iMsg.Find(KATInitialised) != KErrNotFound)
-				{
-				_LOG_L3C2E("AT interpreter ready [dlcNum=%d]", dlcNum);
-				iChannelState = ECsyChannelStateConnected;
-				// Send initial AT command
-				TRAP_IGNORE(SetupCmdChannelsForATCmdsL());
-				}
-			else
-				{
-				_LOG_L3C2E("Throw away unexpected response dlcNum=%d", dlcNum);
-				}
-			}
-		else
-			{
-			_LOG_L4C1("Waiting for response to initial AT command");
-			if (aBpFrame->iMsg.Find(_L8("OK")) != KErrNotFound)
-				{
-				_LOG_L1C2E("**** Init completed [dlcNum=%d] ****", dlcNum);
-				NotifyChannelReady();
-				ModemAndCsyToClientFlowCtrl(EFlowControlOff);
-				}
-			/*else if (aBpFrame->iMsg.Find(_L8("ERROR")) != KErrNotFound)
-				{
-				_LOG_L1C2E("**** Init completed [dlcNum=%d] ****ERROR****", dlcNum);
-				NotifyChannelReady();
-				ModemAndCsyToClientFlowCtrl(EFlowControlOff);
-				}
-			*/
-			else
-				{
-				_LOG_L3C2E("Throw away unexpected response dlcNum=%d", dlcNum);
-				}
-			}
-		iMux0710Protocol.AddFrameFreeQ(aBpFrame);
-		}
-	else if (iPortC32Interface)
-		{
-		// don't need to add to the mux's queue if we are not defragging messages
-		// simply add to the port object's queue
-		// send frame to client
-		iPortC32Interface->SendFrameToClient(aBpFrame);
-		}
-	else
-		{
-		_LOG_L1C2E("** NULL C32 PORT ** dlcNum=%d", dlcNum);
-		iMux0710Protocol.AddFrameFreeQ(aBpFrame);
-		// MAF __ASSERT_DEBUG(EFalse, PANIC(KPanicIllegalState));
-		}
-	}
-
-
-

--- a/cbsref/csyrefplugins/csy27010/src/ChannelMgrCtrl.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,356 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  The file contains the implementation for class CChannelMgrCtrl.
-// *               Class CChannelMgrCtrl implements a 3GPP 27.010 control channel (DLC).
-// *               A control channel is used to initialize the multiplexer and to
-// *               create/monitor DLC's.
-//
-
-// ChannelMgrCtrl.cpp
-
-/** @file ChannelMgrCtrl.cpp
- *
- * The file contains the implementation for class CChannelMgrCtrl.
- * Class CChannelMgrCtrl implements a 3GPP 27.010 control channel (DLC).
- * A control channel is used to initialize the multiplexer and to
- * create/monitor DLC's.
- */
-
-#include "ChannelMgrCtrl.h"
-#include "Portfactory.h"
-#include "Mux0710Protocol.h"
-#include "CsyMsgBufBPFrame.h"
-#include "CommFrameWriterAo.h"
-#include "CsyDebugLogger.h"
-#include "ChannelMgrBase.h"
-#include "PortC32InterfaceBase.h"
-#include "PortC32Interface.h"
-#include "ChannelMgrCmdData.h"
-#include "CsyGlobals.h"
-#include "d32comm.h"
-
-CChannelMgrCtrl* CChannelMgrCtrl::NewL(CPortFactory& aPortFactory,
-									   CMux0710Protocol& aMux0710Protocol)
-/**
- * This methods uses two phase construction and the cleanup stack to create
- * an instance of class CChannelMgrCtrl.
- *
- * @param aPortFactory - Refrence to the port factory
- * @param aMux0710Protocol - Reference to the Mux 27.010 object
- * @return Pointer to the created instance
- */
-    {
-	_LOG_L4C1("CChannelMgrCtrl::NewL");
-
-    CChannelMgrCtrl* p = new(ELeave) CChannelMgrCtrl(aPortFactory, aMux0710Protocol);
- 	CleanupStack::PushL(p);
- 	p->ConstructL();
-	CleanupStack::Pop(p);
- 	return p;
-	}
-
-CChannelMgrCtrl::~CChannelMgrCtrl()
-/**
- * Destructor. Delete all resources and memory allocated by this object.
- */
-	{
-	_LOG_L4C1("CChannelMgrCtrl::~CChannelMgrCtrl");
-
-	// Disconnect the DLC Control Channel 
-	Disconnect();
-	}
-
-CChannelMgrCtrl::CChannelMgrCtrl(CPortFactory& aPortFactory,
-								 CMux0710Protocol& aMux0710Protocol)
-: CChannelMgrBase(KCtrlChannelDlcNum, aPortFactory, aMux0710Protocol)
-/**
- * Constructor.
- *
- * @param aPortFactory - Reference to the port factory
- * @param aMux0710Protocol - Reference to the 27.010 mux protocol
- */
- 	{
-	}
-
-void CChannelMgrCtrl::ConstructL()
-/**
- * This method initializes the memory and data used by this object.
- */
-	{
-	_LOG_L4C1("CChannelMgrCtrl::ConstructL");
-	CChannelMgrBase::ConstructL();
-	}
-
-void CChannelMgrCtrl::ProcessRecvUihFrame(CCsyMsgBufBpFrame* aBpFrame)
-/**
- * This method is called to process a UIH frame that was received
- * on the control channel.  Based on the message type and contents
- * the channel state machine is updated and a response is issued back
- * to the baseband.
- *
- * @param aBpFrame - Pointer to the frame buffer
- */
-	{
-	_LOG_L4C2(">>CChannelMgrCtrl::ProcessRecvUihFrame [aBpFrame=0x%x]",
-		aBpFrame);
-
-	// adv option:   address | control | Type   | LengthData | Value(s)
-	// basic option: address | control | length | Type  | LengthData | Value(s)
-
-	TUint8 ctrlTypeField;
-
-#ifdef _27010ADVANCEOPTION
-	ctrlTypeField = KAdvOptionCtrlStart;   // 2
-#else
-	ctrlTypeField = KBasicOptionCtrlStart; // 3
-#endif
-
-	TUint8 frameLength = (TUint8) aBpFrame->iMsg.Length();
-	if (frameLength <= ctrlTypeField)
-		{
-		_LOG_L1C3("** Frame length %d <= minimum ctrl frame length %d **",
-			frameLength,ctrlTypeField);
-		_LOG_L4C1("<<CChannelMgrCtrl::ProcessRecvUihFrame - bad frame");
-		return;
-		}
-
-	TBool confirmBack = ETrue;
-	switch (aBpFrame->iMsg[ctrlTypeField])
-		{
-	case KCsy0710CTLUIH_DlcParamNegotiate:
-		_LOG_L4C1( "DlcParamNegotiate");
-		break;
-	case KCsy0710CTLUIH_DlcParamNegotiateRsp:
-		{
-		_LOG_L3C1("DlcParamNegotiate response");
-		confirmBack = EFalse; // No response to send back
-
-		// The position of the values field in the ctrl data
-		TUint8 firstValueFieldIndex  =
-			(TUint8) (ctrlTypeField + KPositionOfValueFieldInCtrlData);
-
-		if (frameLength > firstValueFieldIndex)
-			{
-			const TAny* msgValue =
-				reinterpret_cast<const TAny*> (&(aBpFrame->iMsg.Ptr()[firstValueFieldIndex]));
-
-			typedef struct TPnMsgValue
-				{
-				TUint8 iDlci:6;
-				TUint8 iRes1:2;
-				TUint8 iFrameType:4;
-				TUint8 iCreditFlow:4;
-				TUint8 iPrior:6;
-				TUint8 iRes2:2;
-				TUint8 iAckTimer;
-				TUint16 iFrameSize;
-				TUint8 iMaxNbrofRetrans;
-				TUint8 iCredits;
-				} TPnMsgValue;
-
-			const TPnMsgValue* pnMsgValue =
-				reinterpret_cast<const TPnMsgValue*> (msgValue);
-
-			// now we should be able to use pnMsgValue.iDlci, etc
-			if ((pnMsgValue->iDlci            == iMux0710Protocol.PreviousNegotiateDlcNum())  &&
-				(pnMsgValue->iFrameType       == KPNFrameType)          &&
-				(pnMsgValue->iCreditFlow      == KPNClBits)             &&
-				(pnMsgValue->iPrior           == KPNDlcPriority)        &&
-				(pnMsgValue->iAckTimer        == KPNAckTimer)           &&
-				(pnMsgValue->iFrameSize       == KPNMaxFrameSize)       &&
-				(pnMsgValue->iMaxNbrofRetrans == KPNMaxRetransmissions) &&
-				(pnMsgValue->iCredits         == KPNWindowSize))
-				{
-				_LOG_L3C1("ParamNegotiate passed");
-
-				TUint8 dlcNum = pnMsgValue->iDlci;
-				iPortFactory.ConnectIpNifPort(dlcNum);
-				}
-			else
-				{
-				// MAF If this fails try again or forget trying PN.
-				_LOG_L3C1("ParamNegotiate Failed");
-				}
-			}
-		else
-			{
-			_LOG_L1C3("** Frame length %d <= first ctrl value %d **",
-				frameLength,firstValueFieldIndex);
-			}
-		}
-		break;
-	case KCsy0710CTLUIH_PowerSaveCtl:
-		_LOG_L3C1("PowerSaveCtrl");
-		break;
-	case KCsy0710CTLUIH_MultCloseDown:
-		_LOG_L3C1("MultCloseDown");
-		break;
-	case KCsy0710CTLUIH_TestCmd:
-		_LOG_L3C1("TestCmd");
-		break;
-	case KCsy0710CTLUIH_FlowControlOn:
-		_LOG_L3C1("FlowControlOn");
-		break;
-	case KCsy0710CTLUIH_FlowControlOff:
-		_LOG_L3C1("FlowControlOff");
-		break;
-	case KCsy0710CTLUIH_ModemStatusRsp:
-		{
-		_LOG_L3C1("MSC response");
-		confirmBack = EFalse; // No response to send back
-
-		// From 27.010
-		// RTC	DTR	108/2	DSR	107
-		// RTR	RFR (note)	133	CTS	106
-		// IC	always 0-	-	RI	125
-		// DV	always 1-	-	DCD	109
-		// NOTE	Circuit 133, RFR (Ready for Receiving) is commonly assigned to the connector pin that is alternatively used for circuit 105, RTS. It is sometimes referred to by that name.
-
-		// The position of the values field in the ctrl data
-		TUint8 firstValueFieldIndex  =
-			(TUint8) (ctrlTypeField + KPositionOfValueFieldInCtrlData);
-		TUint8 secondValueIndex = (TUint8) (firstValueFieldIndex + 1);
-
-		if (frameLength > secondValueIndex)
-			{
-			TUint8 dlcNum = (TUint8) (((TUint8) aBpFrame->iMsg[firstValueFieldIndex]) >> 2); // remove EA and CR
-			_LOG_L4C2("dlcNum=%d", dlcNum);
-
-			TUint8 v24signals = (TUint8) aBpFrame->iMsg[secondValueIndex];
-			_LOG_L4C2("V24 Signals=0x%x", v24signals);
-
-			if (dlcNum)
-				{
-				_LOG_L3C1("For a data DLC");
-				CChannelMgrCmdData* channel = iPortFactory.FindChannelMgrByDlcNum(dlcNum);
-				channel->MscReceived(v24signals);
-				}
-			else
-				MscReceived(v24signals);
-			}
-		else
-			{
-			_LOG_L1C3("** Frame length %d <= second ctrl value %d **",
-				frameLength,secondValueIndex);
-			}
-		}
-		break;
-	case KCsy0710CTLUIH_ModemStatusCmd:
-		{
-		// The modem side has informed us of its state
-		_LOG_L3C1("MSC command");
-
-		// The position of the values field in the ctrl data
-		TUint8 firstValueFieldIndex  =
-			(TUint8) (ctrlTypeField + KPositionOfValueFieldInCtrlData);
-
-		TUint8 secondValueIndex = (TUint8) (firstValueFieldIndex + 1);
-
-		if (frameLength > secondValueIndex)
-			{
-			TUint8 dlcNum = (TUint8) (((TUint8) aBpFrame->iMsg[firstValueFieldIndex]) >> 2); // remove EA and CR
-			_LOG_L4C2("dlcNum=%d", dlcNum);
-
-			TUint8 v24signals = (TUint8) aBpFrame->iMsg[secondValueIndex];
-			_LOG_L4C2("V24 Signals=0x%x", v24signals);
-
-			if (dlcNum)
-				{
-				_LOG_L3C1( "For a data DLC");
-				CChannelMgrCmdData* channel = iPortFactory.FindChannelMgrByDlcNum(dlcNum);
-				channel->ReceivedV24Signals(v24signals);
-				}
-			else
-				{
-				_LOG_L3C1( "FC & v24 signals ignored for Ctrl Channel");
-				}
-			}
-		else
-			{
-			_LOG_L1C3("** Frame length %d <= second ctrl value %d **",
-				frameLength,secondValueIndex);
-			confirmBack = EFalse;
-			}
-		}
-		break;
-	case KCsy0710CTLUIH_NonSupportedCmdResp:
-		confirmBack = EFalse;
-		_LOG_L3C1("NonSupportedCmdResp");
-		break;
-	case KCsy0710CTLUIH_RemotePortNegotiate:
-		_LOG_L3C1("RemotePortNegotiate");
-		break;
-	case KCsy0710CTLUIH_RemoteLineStatus:
-		_LOG_L3C1("RemoteLineStatus");
-		break;
-	case KCsy0710CTLUIH_ServiceNegotiate:
-		_LOG_L3C1("ServiceNegotiate");
-		break;
-	default:
-		_LOG_L1C2("** Unknown ctrltype 0x%02x **", aBpFrame->iMsg[ctrlTypeField]);
-		break;
-		}
-
-	if (confirmBack)
-		{
-		_LOG_L3C1( "Send a response ...");
-		ConfirmCtrlFrame(aBpFrame);
-		// MAF what if send of response fails
-		}
-	else
-		{
-		iMux0710Protocol.AddFrameFreeQ(aBpFrame);
-		}
-
-	_LOG_L4C1("<<CChannelMgrCtrl::ProcessRecvUihFrame");
-	}
-
-void CChannelMgrCtrl::ConfirmCtrlFrame(CCsyMsgBufBpFrame* aBpFrame)
-/**
- * This method initializes the control channel.
- * @param a pointer to the Frame
- */
-	{
-	_LOG_L4C2(">>CChannelMgrCtrl::ConfirmCtrlFrame [aBpFrame=0x%x]",
-		aBpFrame);
-
-	// echo the UIH frame back to the BP, except clear the C/R bit (bit 1)
-    // the checksum is unchanged
-	// we must also insert a start flag and end flag
-	TBuf8<4> flag;
-	flag.SetLength(1);
-	flag[0] = KCsy0710StartEndFlag;
-	aBpFrame->iMsg.Insert(0, flag);
-	TInt length = aBpFrame->iMsg.Length();
-	aBpFrame->iMsg.SetLength(length + 1);
-	aBpFrame->iMsg[length] = KCsy0710StartEndFlag;
-
-	// clear the C/R bit in the msg type field, not the frame type field
-#ifdef _27010ADVANCEOPTION
-	aBpFrame->iMsg[3] &= ~KCsy0710CRBit;
-#else
-	aBpFrame->iMsg[4] &= ~KCsy0710CRBit;
-#endif
-
-	// put the frame at the front of the baseband's queue
-	aBpFrame->CompleteWhenSent() = ETrue;
-	TInt ret = iPortFactory.GetCommWriterAo()->Write(aBpFrame, ETrue);
-	if (ret)
-		{
-		// MAF what to do here
-		_LOG_L1C2("** Failed to send response [ret=%d] **",ret);
-		}
-
-	_LOG_L4C1("<<CChannelMgrCtrl::ConfirmCtrlFrame");
-	}

--- a/cbsref/csyrefplugins/csy27010/src/CommFrameReaderAo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,594 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file contains the implementation for class CCommFrameReaderAo.
-// *               Class CCommFrameReaderAo is used to request a read from the serial port LDD.
-// *               Class CommFrameReaderAo is an active object and is run by the active
-// *               scheduler when the LDD has completed the read request.
-//
-
-// CommFrameReaderAo.cpp
-
-/** @file CommFrameReaderAo.cpp
- *
- * The file contains the implementation for class CCommFrameReaderAo.
- * Class CCommFrameReaderAo is used to request a read from the serial port LDD.
- * Class CommFrameReaderAo is an active object and is run by the active
- * scheduler when the LDD has completed the read request
- */
-
-// Need to add code to package together a frame and then send the
-// complete frame to the Mux object for defragmentation into a client msg.
-
-#include "CommFrameReaderAo.h"
-#include "Portfactory.h"
-#include "CsyMsgBufBPFrame.h"
-#include "Mux0710Protocol.h"
-#include "CsyDebugLogger.h"
-#include "ChannelMgrCtrl.h"
-#include "ChannelMgrCmdData.h"
-
-CCommFrameReaderAo* CCommFrameReaderAo::NewL(CPortFactory* aParent, CMux0710Protocol* aMux0710Protocol)
-/**
- * This methods uses two phase construction and the cleanup stack to create
- * an instance of class CCommFrameReaderAo.
- * @param aParent - Pointer to parent
- * @param aMux0710Protocol - Pointer to Mux 27.010 object
- * @return Pointer to the created instance
- */
-	{
-	_LOG_L4C1("CCommFrameReaderAo::NewL");
-
-	CCommFrameReaderAo* c = new (ELeave) CCommFrameReaderAo(aParent, aMux0710Protocol);
-	CleanupStack::PushL(c);
-	c->ConstructL();
-	CleanupStack::Pop();
-	return c;
-	}
-
-CCommFrameReaderAo::~CCommFrameReaderAo()
-/**
- * Destructor. Cancel any outstanding request.
- */
-	{
-	_LOG_L4C1("CCommFrameReaderAo::~CCommFrameReaderAo");
-	Cancel();
-	}
-
-CCommFrameReaderAo::CCommFrameReaderAo(CPortFactory* aParent, CMux0710Protocol* aMux0710Protocol)
-/**
- * Constructor.  Pass priority of active object to base class.
- * @param aParent - Pointer to parent
- * @param aMux0710Protocol - Pointer to Mux 27.010 object
- */
-: CCommReadWriteBaseAo(aParent, aMux0710Protocol, KFrameReaderAoPriority),
-  iFrameReaderState(ECsyWaitingForStartFlag)
-	{
-	}
-
-void CCommFrameReaderAo::ConstructL()
-/**
- * Retrieve a pointer to the LDD comm port.
- */
-    {
-	_LOG_L4C1("CCommFrameReaderAo::ConstructL");
-	SetBuffersL();
-	}
-
-void CCommFrameReaderAo::DoCancel()
-/**
- * Cancel an outstanding request.
- * @param void
- */
-	{
-	_LOG_L4C1("CCommFrameReaderAo::DoCancel");
-
-	iCommPort->ReadCancel();
-	}
-
-void CCommFrameReaderAo::BasicOption()
-/**
- * Basic option frames
- * Note this has not been tested since DSample/P2 do not use basic option
- */
-	{
-	TUint octet;
-	TBool frameData = EFalse;
-
-	TInt len = iBuf->Length();
-	TPtr8 ptr = iBuffer->Des();
-	_LOG_L3C2("Received %d bytes",len);
-
-	for (TInt loop = 0; loop < len; loop++)
-		{
-		octet = ptr[loop];
-
-		if (octet == KCsy0710StartEndFlag)
-			{
-			// Control bit
-			switch(iFrameReaderState)
-				{
-			case ECsyWaitingForStartFlag:
-				{
-				_LOG_L3C2("[0x%02x] Got start flag",octet);
-				iFrameReaderState = ECsyWaitingForFrameStart;
-
-				if (iFrameBuf == NULL)
-					{
-					// There is data to process - get a new frame
-					iFrameBuf = iMux0710Protocol->GetFreeFrameBuf();
-					if (iFrameBuf == NULL)
-						{
-						_LOG_L1C1("** No free frame buffer ** - ignoring frame");
-						break;
-						}
-					}
-				}
-				break;
-			case ECsyWaitingForFrameStart:
-				{
-				// disregard additional flag
-				}
-				break;
-			case ECsyWaitingForFrameData:
-				{
-				iFrameReaderState = ECsyWaitingForStartFlag;
-
-				// must be the end flag
-				_LOG_L3C2("[0x%02x] End of frame",octet);
-				if (iFrameBuf)
-					{
-					if(iFrameBuf->iMsg.Length())
-						{
-						// Frame holds something
-						AddToReceivedFramesList(iFrameBuf);
-						iFrameBuf = NULL;
-						}
-					else
-						{
-						_LOG_L1C1("** zero length frame **");
-						// MAF __ASSERT_DEBUG(EFalse, PANIC(KPanicIllegalState));
-						}
-					}
-				else
-					{
-					_LOG_L3C1("** no frame buffer! **");
-					}
-				}
-				break;
-			default:
-				// MAF __ASSERT_DEBUG(EFalse, PANIC(KPanicIllegalState));
-				_LOG_L1C2("** unexpected flag ** [iFrameReaderState=%d]",iFrameReaderState);
-				break;
-				}
-			}
-		else
-			{
-			if (iFrameReaderState == ECsyWaitingForFrameStart)
-				{
-				iFrameReaderState = ECsyWaitingForFrameData;
-				iFrameBuf->iMsg.Append(octet);
-				
-				#ifdef _DEBUG
-				// This variable should only be set if it debug
-				// Otherwise we get warnings when compiling with ARM v5
-				TUint dlcNum = octet >> 2;
-				#endif
-
-				_LOG_L3C3E("[0x%02x] dlcNum=%d", octet, dlcNum);
-				}
-			else
-				{
-				_LOG_L3C2("[0x%02x]",octet);
-				frameData = ETrue;
-				}
-			}
-
-		if (frameData)
-			{
-			// MAF __ASSERT_DEBUG((iFrameReaderState == ECsyWaitingForFrameData),PANIC(KPanicIllegalState));
-
-			TUint frameLen = (TUint) (iFrameBuf->iMsg.Length() + 1);
-			if (frameLen > KMaxAdvFrameSize)
-				{
-				_LOG_L1C3("** length %d will exceed max length %d **",
-					frameLen,KMaxFrameSize);
-				iFrameBuf->iMsg.Zero();		
-				iFrameReaderState = ECsyWaitingForStartFlag;
-				break;
-				}
-
-			frameData = EFalse;
-			iFrameBuf->iMsg.Append(octet);
-			}
-		}
-	}
-
-void CCommFrameReaderAo::AdvancedOption()
-/**
- * Advanced option frames
- */
-	{
-	TUint octet = 0;
-	TBool frameData = EFalse;
-
-	TInt len = iBuf->Length();
-	TPtr8 ptr = iBuffer->Des();
-	_LOG_L3C2("Received %d bytes",len);
-
-	TInt startVal = 0;
-
-	// Check processing (helps when we have lost sync with data due to read error)
-	if ((iFrameReaderState == ECsyWaitingForStartFlag)&&(len))
-		{
-		// We are on the hunt for the start flag
-		if (iESCRecved)
-			{
-			_LOG_L2C1("Escape flag set - ignore first octet");
-			iESCRecved = EFalse;
-			}
-		else
-			octet = ptr[0];
-
-		if (octet != KCsy0710StartEndFlag)
-			{
-			_LOG_L3C2("[0x%02x]",octet);
-			_LOG_L2C1("* Looking for the start flag *");
-			do
-				{
-				startVal++;
-				if (startVal == len)
-					break;
-
-				octet = ptr[startVal];
-
-				if (iESCRecved)
-					{
-					iESCRecved = EFalse;
-					continue;
-					}
-
-				if (octet == KCsy0710EscapeByte)
-					iESCRecved = ETrue;
-				}
-			while (octet != KCsy0710StartEndFlag);
-
-			_LOG_L2C2("Disregarded %d bytes",startVal);
-			}
-		}
-
-	// Do processing of the received buffer
-	for (TInt loop = startVal; loop < len; loop++)
-		{
-		octet = ptr[loop];
-
-		if (iESCRecved)
-			{
-			_LOG_L3C2("[0x%02x] - Recv ESC before, change this char",octet);
-			octet = (TUint8) (octet^(1<<5));
-			_LOG_L3C2("Changed to [0x%02x]",octet);
-			iESCRecved = EFalse;
-			frameData = ETrue;
-			}
-		else
-			{
-			if (octet == KCsy0710EscapeByte)
-				{
-				_LOG_L3C1("KCsy0710EscapeByte");
-				iESCRecved = ETrue;
-				}
-			else if (octet == KCsy0710StartEndFlag)
-				{
-				// Control bit
-				switch(iFrameReaderState)
-					{
-				case ECsyWaitingForFrameData:
-					{
-					iFrameReaderState = ECsyWaitingForStartFlag;
-					
-					if (iFrameBuf)
-						{
-						TInt frameLen = iFrameBuf->iMsg.Length();
-						if(frameLen > KAdvOptionHeaderSize)
-							{
-							TUint8 checkSum = iFrameBuf->iMsg[frameLen-1];
-							if (CheckFCS(iFrameBuf->iMsg,KAdvOptionHeaderSize,checkSum))
-								{
-								// must be the end flag
-								_LOG_L3C2("[0x%02x] End of frame",octet);
-								// Frame holds something
-								AddToReceivedFramesList(iFrameBuf);
-								iFrameBuf = NULL;
-								}
-							else
-								{
-								_LOG_L1C1("** checksum is incorrect - rejecting frame **");
-								iFrameBuf->iMsg.Zero();		
-								}
-							}
-						else
-							{
-							_LOG_L1C2("** Rejected incorrect length frame %d **",frameLen);
-							iFrameBuf->iMsg.Zero();		
-							}
-						}
-					else
-						{
-						_LOG_L3C1("** no frame buffer! **");
-						}
-
-					TInt check = loop+1;
-					if (check == len)
-						break;
-
-					// There are more bytes in this buffer to process
-					octet = ptr[check];
-					if (octet != KCsy0710StartEndFlag)
-						{
-						// Frames are back to back
-						_LOG_L2C1("* No start flag - assuming frames back to back *");
-						octet = KCsy0710StartEndFlag;
-						}
-					}
-					// deliberate fall through
-				case ECsyWaitingForStartFlag:
-					{
-					_LOG_L3C2("[0x%02x] Got start flag",octet);
-					iFrameReaderState = ECsyWaitingForFrameStart;
-
-					if (iFrameBuf == NULL)
-						{
-						// There is data to process - get a new frame
-						iFrameBuf = iMux0710Protocol->GetFreeFrameBuf();
-						if (iFrameBuf == NULL)
-							{
-							_LOG_L1C1("** No free frame buffer ** - ignoring frame");
-							// Note: GetFreeFrameBuf handles the flow control
-							break;
-							}
-						}
-					}
-					break;
-				case ECsyWaitingForFrameStart:
-					{
-					// disregard additional flag
-					}
-					break;
-				default:
-					_LOG_L1C2("** unexpected flag ** [iFrameReaderState=%d]",iFrameReaderState);
-					// MAF __ASSERT_DEBUG(EFalse, PANIC(KPanicIllegalState));
-					break;
-					}
-				}
-			else
-				{
-				if (iFrameReaderState == ECsyWaitingForFrameStart)
-					iFrameReaderState = ECsyWaitingForFrameData;
-
-				_LOG_L3C2("[0x%02x]",octet);
-				frameData = ETrue;
-				}
-			}
-
-		if (frameData)
-			{
-			frameData = EFalse;
-
-			// MAF __ASSERT_DEBUG((iFrameReaderState == ECsyWaitingForFrameData),PANIC(KPanicIllegalState));
-
-			if (iFrameBuf)
-				{
-				TUint frameLen = (TUint) (iFrameBuf->iMsg.Length() + 1);
-				if (frameLen > KMaxAdvFrameSize)
-					{
-					_LOG_L1C2("** length will exceed max length %d **",
-						KMaxFrameSize);
-					iFrameBuf->iMsg.Zero();		
-					iFrameReaderState = ECsyWaitingForStartFlag;
-					break;
-					}
-
-				iFrameBuf->iMsg.Append(octet);
-				}
-			else
-				{
-				// it should not be possible to enter this condition
-
-				_LOG_L1C2("** No frame buffer allocated for frame ** [iFrameReaderState=%d]",iFrameReaderState);
-				// MAF __ASSERT_DEBUG(EFalse,PANIC(KPanicIllegalState));
-				}
-			}
-		}
-	}
-
-void CCommFrameReaderAo::NonMuxed()
-	{
-	if (iMux0710Protocol->ParseATResponse(*iBuf) == KErrNone)
-		{
-		iFrameReaderState = ECsyWaitingForStartFlag;
-		_LOG_L3C1("ParseATResponse returned KErrNone");
-		}
-	}
-
-void CCommFrameReaderAo::RunL()
-/**
- * This method is invoked by the active scheduler when the read request
- * to the LDD has completed.
- */
-    {
-	if (iStatus.Int())
-		{
-		_LOG_L3C1(" "); // please leave separator in
-		_LOG_L1C2("** CCommFrameReaderAo::RunL [iStatus %d] **",iStatus.Int());
-
-		// assumption here, whatever the error we will be able to repost
-		// another request to readoneormore from the serial device driver.
-
-		if (iFrameBuf)
-			{
-			iMux0710Protocol->AddFrameFreeQ(iFrameBuf);
-			iFrameBuf = NULL;
-			}
-
-		//reset state
-		iESCRecved = EFalse;
-		iFrameReaderState = ECsyWaitingForStartFlag;
-
-		iStatus = KRequestPending;
- 		SetActive();
-		iCommPort->ReadOneOrMore(iStatus, *iBuf);
-		return;
-		}
-
-	if (iFrameBuf == NULL)
-		{
-		// Only show this log if start of a new frame
-		_LOG_L3C1(" "); // please leave separator in
-		_LOG_L3C1("CCommFrameReaderAo::RunL - start of read");
-		}
-
-	if (!iMux0710Protocol->IsMuxModeEnabled())
-		{
-		NonMuxed();
-		}
-	else
-		{
-		// mux mode is enabled
-		// process recv data according to our current state
-
-#ifndef _27010ADVANCEOPTION
-
-		BasicOption();
-
-#else
-		AdvancedOption();
-
-#endif
-		}
-
-	if (!IsActive())
-		{
-		iStatus = KRequestPending;
- 		SetActive();
-		iCommPort->ReadOneOrMore(iStatus, *iBuf);
-		}
-	}
-
-void CCommFrameReaderAo::Read()
-/**
- * This method is called to start the process to read an ascii string
- * (e.g. response to initial AT+CMUX=0,0,5 command) or a frame from 
- * the serial port LDD. 
- * Note that this method will only be called once and then the RunL
- * will handle the reading of the comm port.
- */
-	{
-	_LOG_L4C1(">>CCommFrameReaderAo::Read");
-
-	if (!IsActive())
-		{
-		_LOG_L3C1("Read not active");
-
-		// Set the object active
-		iStatus = KRequestPending;
- 		SetActive();
-		iCommPort->ReadOneOrMore(iStatus, *iBuf);
-		}
-	else
-		{
-		_LOG_L2C1("** Already active **");
-		}
-
-	_LOG_L4C1("<<CCommFrameReaderAo::Read");
-    }
-
-void CCommFrameReaderAo::ReadCancel()
-/**
- * Cancel a read request.
- */
-	{
-	_LOG_L4C1(">>CCommFrameReaderAo::ReadCancel");
-
-	iCommPort->ReadCancel();
-	if (iFrameBuf)
-		{
-		// return buffer to free frame queue
-		iMux0710Protocol->AddFrameFreeQ(iFrameBuf);
-		iFrameBuf = NULL;
-		}
-
-	_LOG_L4C1("<<CCommFrameReaderAo::ReadCancel");
-	}
-
-TBool CCommFrameReaderAo::CheckFCS(TDes8& aBuffer, TInt aLen, TUint8 aSuppliedChecksum)
-/**
- * This method checks the checksum for the specified buffer with the 
- * specified length.
- *
- * @param aBuffer - Data 
- * @param aLen    - Number of bytes in the Buffer for which CheckSum to be calculated
- * @return ETrue if checksum is okay
- */
-	{
-	TUint8 frameCheckSum = 0xFF;
-
-	for (TInt i=0; i < aLen; i++)
-		{
-		frameCheckSum = crctable[(frameCheckSum ^ aBuffer[i])];
-		}
-
-	// One's Complement
-	frameCheckSum = crctable[(frameCheckSum ^ aSuppliedChecksum)];
-
-	if (frameCheckSum == 0xCF)
-		return ETrue;
-
-	return EFalse;
-	}
-
-void CCommFrameReaderAo::AddToReceivedFramesList(CCsyMsgBufBpFrame* aBpFrame)
-/**
- * This method is called by the comm frame reader to add the specified
- * received frame to a c32 port interface queue. The specific C32 port 
- * interface object is determined from the DLC number embedded in the frame.
- *
- * @param aBpFrame - Pointer to the received frame
- */
-	{
-	_LOG_L4C1(">>CCommFrameReaderAo::AddToReceivedFramesList");
-
-	TUint8 dlcNum = aBpFrame->GetDlcNum();
-
-	_LOG_L4C2("dlcNum=%d", dlcNum);
-	_LOG_L4C2("frameType=0x%x", aBpFrame->GetFrameType());
-
-	// check for a message for the control channel
-	if (dlcNum == 0)
-		{
-		iParent->GetControlChannel()->ProcessRecvFrame(aBpFrame);
-		}
-	else
-		{
-		CChannelMgrCmdData* channel = iParent->FindChannelMgrByDlcNum(dlcNum);
-		if (channel != NULL)
-			channel->ProcessRecvFrame(aBpFrame);
-		else
-			{
-			_LOG_L1C2("** No port defined for dlcNum=%d **", dlcNum);
-			iMux0710Protocol->AddFrameFreeQ(aBpFrame);
-			}
-		}
-
-	_LOG_L4C1("<<CCommFrameReaderAo::AddToReceivedFramesList");
-	}
-

--- a/cbsref/csyrefplugins/csy27010/src/CommFrameWriterAo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,518 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file contains the implemenation for the CCommFrameWriterAo class.
-// *               This class is used to handle the write operations to the serial port
-// *               logical device driver.
-//
-
-// CommFrameWriterAo.cpp
-
-/** @file CommFrameWriterAo.cpp
- *
- * This file contains the implemenation for the CCommFrameWriterAo class.
- * This class is used to handle the write operations to the serial port
- * logical device driver.
- */
-
-#include "CommFrameWriterAo.h"
-#include "CsyMsgBufBPFrame.h"
-#include "Mux0710Protocol.h"
-#include "CsyDebugLogger.h"
-#include "PortC32InterfaceBase.h"
-
-CCommFrameWriterAo* CCommFrameWriterAo::NewL(CPortFactory* aParent, CMux0710Protocol* aMux0710Protocol)
-/**
- * This method uses two phase construction and the cleanup stack to
- * create an instance of class CCommFrameWriterAo. 
- *
- * @param aParent - Pointer to the parent object
- * @param aMux0710Protocol - Pointer to mux protocol object
- * @return Pointer to new instance of CCommFrameWriterAo
- */
-    {
-	_LOG_L4C1("CCommFrameWriterAo::NewL");
-
-    CCommFrameWriterAo* obj = new (ELeave) CCommFrameWriterAo(aParent, aMux0710Protocol);
-    CleanupStack::PushL(obj);
-    obj->ConstructL();
-    CleanupStack::Pop();
-    return (obj);
-    }
-
-
-CCommFrameWriterAo::~CCommFrameWriterAo()
-/**
- * Destructor.
- */
-    {
-	_LOG_L4C1("CCommFrameWriterAo::~CCommFrameWriterAo");
-
-    Cancel();
-
- 	// Remove the frames in Write Buf List
-	CCsyMsgBufBpFrame* frame;
-	iWriteFrameBufIter.SetToFirst();
-	while ((frame = iWriteFrameBufIter++) != NULL)
-		{
-		iWriteFrameBufList.Remove(*frame);
-		delete frame;
-	 	}
-
- 	// Remove the frames in waiting list
-	iWaitingForFcOffIter.SetToFirst();
-	while ((frame = iWaitingForFcOffIter++) != NULL)
-		{
-		iWaitingForFcOffList.Remove(*frame);
-		delete frame;
-	 	}
-   }
-
-CCommFrameWriterAo::CCommFrameWriterAo(CPortFactory* aParent, CMux0710Protocol* aMux0710Protocol)
-/**
- * Constructor.
- * @param aParent - Pointer to the parent object
- * @param aMux0710Protocol - Pointer to mux protocol object
- */
-:	CCommReadWriteBaseAo(aParent, aMux0710Protocol, KFrameWriterAoPriority),
-	iWriteFrameBufList(_FOFF(CCsyMsgBufBpFrame, iMsgLink)),
-	iWriteFrameBufIter(iWriteFrameBufList),
-	iWaitingForFcOffList(_FOFF(CCsyMsgBufBpFrame, iMsgLink)),
-	iWaitingForFcOffIter(iWaitingForFcOffList)
-	{}
-
-
-void CCommFrameWriterAo::ConstructL()
-/**
- * Safe constructor
- */
-    {
-	_LOG_L4C1("CCommFrameWriterAo::ConstructL");
-	SetBuffersL();
-    }
-
-void CCommFrameWriterAo::RunL()
-/**
- * This method is called when a write to the LDD completes.
- */
-	{
-	_LOG_L4C1(" ");
-	_LOG_L4C2(">>CCommFrameWriterAo::RunL [iStatus=%d] - written to LDD",
-		iStatus.Int());
-
-	if (iStatus.Int())
-		{
-		_LOG_L1C2("** Error writing to LDD ** [iStatus=%d]",iStatus.Int());
-
-		if (!iCompleteWhenSent)
-			{
-			// The frame being sent was not the last or only one for this dlc, other
-			// frames exist
-
-			// go through list and remove other frames to send for this dlc
-			RemoveAnyDlcFramesOnWriteList(iDlcNum, EFalse);
-
-			iCompleteWhenSent = ETrue;
-			}
-		}
-
-	if (iCompleteWhenSent)
-		{
-		iCompleteWhenSent = EFalse;
-
-		_LOG_L3C2("Complete write [iDlcNum=%d]",iDlcNum);
-		CompleteWrite(iDlcNum,iStatus.Int());
-		}
-
-	// check for another message that needs to be sent to the baseband
-	CCsyMsgBufBpFrame* bpFrame = GetFrameToWrite();
-	if (bpFrame)
-		{
-		TInt ret = KErrNone;
-		do
-			{
-			ret = WriteFrame(bpFrame);
-			if (ret)
-				{
-				_LOG_L1C2("** Write frame failed [ret=%d] **",ret);
-				if (!iCompleteWhenSent)
-					{
-					// go through list and remove other frames to send for this dlc
-					RemoveAnyDlcFramesOnWriteList(iDlcNum, EFalse);
-					}
-				}
-
-			// Loop around if there is an error and try and send the next frame
-			}
-			while (ret);
-		}
-	else
-		{
-		_LOG_L3C1("Finished all writes - nothing more to send to LDD");
-		}
-
-	_LOG_L4C1("<<CCommFrameWriterAo::RunL");
-	_LOG_L3C1(" "); // please leave this separator in
-	}
-
-void CCommFrameWriterAo::DoCancel()
-/**
- * Cancel a pending write
- */
-    {
-	_LOG_L4C1("CCommFrameWriterAo::DoCancel - cancelling LDD write");
-
-	iCommPort->WriteCancel();
-
- 	// Remove the frames in Write Buf List
-	CCsyMsgBufBpFrame* frame;
-	iWriteFrameBufIter.SetToFirst();
-	while ((frame = iWriteFrameBufIter++) != NULL)
-		{
-		iWriteFrameBufList.Remove(*frame);
-		iMux0710Protocol->AddFrameFreeQ(frame);
-	 	}
-
- 	// Remove the frames in waiting list
-	iWaitingForFcOffIter.SetToFirst();
-	while ((frame = iWaitingForFcOffIter++) != NULL)
-		{
-		iWaitingForFcOffList.Remove(*frame);
-		iMux0710Protocol->AddFrameFreeQ(frame);
-	 	}
-    }
-
-TInt CCommFrameWriterAo::Write(CCsyMsgBufBpFrame* aBpFrame,
-							   TBool aHighPriority)
-/**
- * This method is called to transmit a frame to the baseband.
- *
- * @param aBpFrame - Pointer to frame
- * @param aHighPriority - Flag to indicate a high priority frame
- */
-    {
-	_LOG_L4C3(">>CCommFrameWriterAo::Write [aBpFrame=0x%x, aHighPriority=%d]",
-		aBpFrame,aHighPriority);
-
-	TInt ret = KErrNone;
-
-	// 1st check if we are already transmitting a frame
-	if (!IsActive())
-		{
-		_LOG_L4C1("Not currently writing a frame");
-		ret = WriteFrame(aBpFrame);
-		}
-	else
-		{
-		// add frame to the list of frames that need to be sent to the BP
-		_LOG_L2C1("Already writing a frame - add to queue");
-		AddToWaitingToSendList(aBpFrame, aHighPriority);
-		}
-
-	_LOG_L4C2("<<CCommFrameWriterAo::Write [ret=%d]",ret);
-	return ret;
-	}
-
-TInt CCommFrameWriterAo::WriteFrame(CCsyMsgBufBpFrame* aBpFrame)
-/**
- * This method is called to transmit a frame to the baseband.
- *
- * @param aBpFrame - Pointer to frame
- */
-    {
-	_LOG_L4C2(">>CCommFrameWriterAo::WriteFrame [aBpFrame=0x%x]",
-		aBpFrame);
-
-	TInt ret = KErrNone;
-
-	iDlcNum = aBpFrame->MsgDlc();
-	iCompleteWhenSent = aBpFrame->CompleteWhenSent();
-
-	if (iBuf == NULL)
-		{
-		_LOG_L1C1("** Failure to alloc iBuf **");
-
-		ret = KErrNoMemory;
-		_LOG_L4C2("<<CCommFrameWriterAo::WriteFrame [ret=%d]",ret);
-		return ret;
-		}
-
-//*********************************************************
-// MAF tidy up
-#ifdef _DEBUG
-	//log out frame
-	TInt len = aBpFrame->iMsg.Length();
-	_LOG_L3C3("[0x%02x] Tx Got Start dlc=%d", aBpFrame->iMsg[0], aBpFrame->MsgDlc());
-	for(TInt k = 1; k < len-1; k++)
-		{
-		_LOG_L3C2("[0x%02x]",aBpFrame->iMsg[k]);
-		}
-	_LOG_L3C2("[0x%02x] Tx Frame End", aBpFrame->iMsg[len-1]);
-	if (iMux0710Protocol->IsMuxModeEnabled())
-		{
-		if ((aBpFrame->iMsg[2] & 0xEF) == KCsy0710CTLUIH)
-			{
-#ifdef __DEBUGLOGFILE__
-			TBuf8<200> tt;
-#else
-			TBuf16<200> tt;
-#endif
-			tt.Copy(aBpFrame->iMsg);
-
-			TInt ttLength = tt.Length();
-			tt.SetLength(ttLength);
-#ifdef __LOGDEBUGLEVELMINOR__
-			_LOG_L3C3("Sent >>>> %d: %S", aBpFrame->iMsg[1] >> 2, &tt);
-#endif
-			}
-		}
-#endif
-//*********************************************************
-
-	// copy message to local buffer
-#ifdef _27010ADVANCEOPTION
-
-	if (iMux0710Protocol->IsMuxModeEnabled())
-		{
-		TInt length = aBpFrame->iMsg.Length() - 1;
-		TUint8 mask = 1<<5;
-
-		iBuf->Zero();
-
-		 // start flag
-		iBuf->Append(aBpFrame->iMsg[0]);
-
-		// check data for flag or escape character
-		for (TInt i=1; i < length; i++)
-			{
-			TUint8 tmp = aBpFrame->iMsg[i];
-			if ((tmp == KCsy0710StartEndFlag)||(tmp== KCsy0710EscapeByte))
-				{
-				_LOG_L3C1("Adding escape byte");
-				iBuf->Append(KCsy0710EscapeByte);
-				tmp = (TUint8) (tmp^mask);
-				}
-			iBuf->Append(tmp);
-			}
-
-		//ending flag
-		iBuf->Append(aBpFrame->iMsg[length]);  
-		}
-	else
-		iBuf->Copy(aBpFrame->iMsg);
-
-#else
-
-	// Basic option - no escape chars
-	iBuf->Copy(aBpFrame->iMsg);
-
-#endif
-
-	// free the caller's frame buffer
-	iMux0710Protocol->AddFrameFreeQ(aBpFrame);
-
-	// invoke LDD
-	_LOG_L3C1("Sending to LDD");
-	iStatus = KRequestPending; //MAF why is this being set to KRequestPending?
- 	SetActive();
-	iCommPort->Write(iStatus, *iBuf, iBuf->Length());
-
-	_LOG_L4C2("<<CCommFrameWriterAo::WriteFrame [ret=%d]",ret);
-	return ret;
-	}
-
-void CCommFrameWriterAo::WriteCancel()
-/**
- * Cancel the current write operation.
- * @return void
- */
-    {
-    _LOG_L4C1("CCommFrameWriterAo::WriteCancel");
-	Cancel();
-    }
-
-void CCommFrameWriterAo::AddToWaitingToSendList(CCsyMsgBufBpFrame* aBpFrame, TBool aHighPriority)
-/**
- * This method is called to by C32 Interface objects to add
- * the specified frame to the baseband queue.
- *
- * @param aBpFrame - Pointer to the frame buffer
- * @param aHighPriority - Flag to indicate a high priority frame
- */
-	{
-	_LOG_L4C3(">>CCommFrameWriterAo::AddToWaitingToSendList [aBpFrame=0x%x,aHighPriority=%d]",
-		aBpFrame, aHighPriority);
-
-	if (aHighPriority)
-		iWriteFrameBufList.AddFirst(*aBpFrame);
-	else
-		iWriteFrameBufList.AddLast(*aBpFrame);
-
-	_LOG_L4C1("<<CCommFrameWriterAo::AddToWaitingToSendList");
-	}
-
-CCsyMsgBufBpFrame* CCommFrameWriterAo::GetFrameToWrite()
-/**
- * This method checks the queue for a frame that needs to be sent
- * to the baseband.  If there is a message then deque it from the queue and
- * return a pointer to it, else return NULL.
- *
- * @return Pointer to the frame to be written or NULL
- */
-	{
-	_LOG_L4C1(">>CCommFrameWriterAo::GetFrameToWrite");
-
-	CCsyMsgBufBpFrame* frame = NULL;
-	if (!iWriteFrameBufList.IsEmpty())
-		{
-		frame = iWriteFrameBufList.First();
-		if (frame)
-			iWriteFrameBufList.Remove(*frame);
-		}
-
-	_LOG_L4C2("<<CCommFrameWriterAo::GetFrameToWrite [frame=0x%x]",frame);
-	return frame;
-	}
-
-void CCommFrameWriterAo::RemoveAnyDlcFramesOnWriteList(TUint8 aDlcNum, TBool aPlaceOnWaitList)
-/**
- * This method transfers any frames on the write list from the dlc specified
- * to the waiting list.
- *
- * @param aDlcNum is the dlc number of the frames to move to the waiting list
- * @param aPlaceOnWaitList indicates whether to free the frame or place onto the
- *        wait list.
- */
-	{
-	_LOG_L4C3(">>CCommFrameWriterAo::RemoveAnyDlcFramesOnWriteList [aDlcNum=%d, aPlaceOnWaitList=%d]",
-		aDlcNum,aPlaceOnWaitList);
-
-	if (iWriteFrameBufList.IsEmpty())
-		{
-		// No frames to transfer
-		_LOG_L4C1("No frames on write list");
-		}
-	else
-		{
-		CCsyMsgBufBpFrame* frame = NULL;
-		iWriteFrameBufIter.SetToFirst();
-		while ((frame = iWriteFrameBufIter++) != NULL)
-			{
-			if (frame->GetDlcNum() == aDlcNum)
-				{
-				iWriteFrameBufList.Remove(*frame);
-				if (aPlaceOnWaitList)
-					{
-					_LOG_L4C1("Transferring frame to wait list");
-					iWaitingForFcOffList.AddLast(*frame);
-					}
-				else
-					{
-					// Adding frame to the free list
-					iMux0710Protocol->AddFrameFreeQ(frame);
-					}
-				}
-			}
-		}
-
-	_LOG_L4C1("<<CCommFrameWriterAo::RemoveAnyDlcFramesOnWriteList");
-	}
-
-void CCommFrameWriterAo::RemoveAnyDlcFramesFromWaitList(TUint8 aDlcNum, TBool aPlaceOnWriteList)
-/**
- * This method transfers any frames on the waiting list from the dlc specified
- * to the write list.
- *
- * @param aDlcNum is the dlc number of the frames to move to the write list
- */
-	{
-	_LOG_L4C3(">>CCommFrameWriterAo::RemoveAnyDlcFramesFromWaitList [aDlcNum=%d,aPlaceOnWriteList=%d]",
-		aDlcNum,aPlaceOnWriteList);
-
-	if (iWaitingForFcOffList.IsEmpty())
-		{
-		// No frames to transfer
-		_LOG_L4C1("No frames on waiting list");
-		}
-	else
-		{
-		TBool writeQueueWasEmpty = iWriteFrameBufList.IsEmpty();
-
-		CCsyMsgBufBpFrame* frame = NULL;
-		iWaitingForFcOffIter.SetToFirst();
-		while ((frame = iWaitingForFcOffIter++) != NULL)
-			{
-			if (frame->GetDlcNum() == aDlcNum)
-				{
-				iWaitingForFcOffList.Remove(*frame);
-				if (aPlaceOnWriteList)
-					{
-					_LOG_L4C1("Transferring frame to write list");
-					iWriteFrameBufList.AddLast(*frame);
-					}
-				else
-					{
-					// Adding frame to the free list
-					iMux0710Protocol->AddFrameFreeQ(frame);
-					}
-				}
-			}
-
-		if ((!iWriteFrameBufList.IsEmpty())&&(writeQueueWasEmpty)&&(!IsActive()))
-			{
-			_LOG_L4C1("Write queue was empty and not active - triggering write");
-			frame = GetFrameToWrite();
-			TInt ret = WriteFrame(frame);
-			if (ret)
-				{
-				_LOG_L1C2("Write delayed frame failed [ret=%d]",ret);
-
-				// Place the failed frame back on the list.
-				iWriteFrameBufList.AddFirst(*frame);
-				}
-			}
-		}
-
-	_LOG_L4C1("<<CCommFrameWriterAo::RemoveAnyDlcFramesFromWaitList");
-	}
-
-void CCommFrameWriterAo::CompleteWrite(const TUint8 aDlcNum, TInt aStatus)
-/**
- * This method calls the DLC port interface to complete the write request.
- *
- * @param aDlcNum - DLC number of the port
- */
-	{
-	_LOG_L4C3(">>CCommFrameWriterAo::CompleteWrite [aDlcNum=%d,aStatus=%d]",
-		aDlcNum,aStatus);
-
-	if (aDlcNum)
-		{
-		CPortC32InterfaceBase* port = iParent->FindPortC32Interface(aDlcNum);
-		if (port)
-			port->CompleteWriteRequest(aStatus);
-		else
-			{
-			_LOG_L1C2("** Port does not exist for aDlcNum=%d **",
-				aDlcNum);
-			// MAF __ASSERT_DEBUG(EFalse,PANIC(KPanicIllegalState));
-			}
-		}
-	else
-		{
-		// MAF tell mux control channel of send result
-		}
-
-	_LOG_L4C1("<<CCommFrameWriterAo::CompleteWrite");
-	}
-

--- a/cbsref/csyrefplugins/csy27010/src/CommReadWriteBaseAo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file has the implementation for the class MsgToBPCmdQueue
-// *               for adding and removing the BasePort Command messages from the queue.
-//
-
-// CommReadWriteBaseAo.cpp
-
-/** @file CommReadWriteBaseAo.cpp
- *
- * 
- */
-
-#include "CommReadWriteBaseAo.h"
-#include "Portfactory.h"
-#include "CsyDebugLogger.h"
-#include "CsyGlobals.h"
-
-CCommReadWriteBaseAo::CCommReadWriteBaseAo(CPortFactory* aParent,
-										   CMux0710Protocol* aMux0710Protocol,
-										   TInt aPriority)
-/**
- * Constructor.
- * @param aParent - Pointer to the parent
- * @param aMux0710Protocol - Pointer to the mux protocol
- * @param aPriority - Priority to set for active object
- */
- : CActive(aPriority),
-   iBufSize(KDefaultTxRxBufSize),
-   iRole(ECommRoleDTE),
-   iParent(aParent),
-   iMux0710Protocol(aMux0710Protocol)
-	{
-	iCommPort = aParent->DTEPort();
-	CActiveScheduler::Add(this);
-	}
-
-
-CCommReadWriteBaseAo::~CCommReadWriteBaseAo()
-/**
- * Destructor. Delete the memory allocated by this object.
- */
-    {
-    delete iBuffer;
-    delete iBuf;
-    }
-
-TInt CCommReadWriteBaseAo::SetServerConfig(TCommServerConfig& aConfig)
-/**
- * Set the port to use partial reads/writes or the bungee buffer.
- *
- * @param aConfig Reference to the new Comm server configuration
- * @return TInt error code. KErrNone for sucess
- */
-    {
-    _LOG_L4C1(">>CCommReadWriteBaseAo::SetServerConfig");
-
-    TCommServerConfigV01& c = aConfig();
-    TInt res = KErrNone;
-
-    if (c.iBufFlags & KCommBufferPartial)
-        {
-        TInt bufSave = iBufSize;
-        iBufSize = c.iBufSize;
-        TRAP(res, SetBuffersL();)
-        if (res==KErrNone)
-            iBufFlags = c.iBufFlags;
-        else
-            iBufSize = bufSave;
-        }
-
-	_LOG_L4C2("<<CCommReadWriteBaseAo::SetServerConfig [res=%d]",res);
-	return res;
-    }
-
-void CCommReadWriteBaseAo::GetServerConfig(TCommServerConfig& aConfig) const
-/**
- * This method reads the comm server buffer configuration.
- *
- * @param aConfig Reference to location to write the Comm server configuration
- */
-    {
-    _LOG_L4C1("CCommReadWriteBaseAo::GetServerConfig");
-
-    aConfig().iBufFlags = iBufFlags;
-    aConfig().iBufSize  = iBufSize;
-    }
-
-void CCommReadWriteBaseAo::FreeMemory()
-/**
- * Reduce memory allocation levels by order of the comm server.
- */
-    {
-    _LOG_L4C1("CCommReadWriteBaseAo::FreeMemory");
-
-    TRAP_IGNORE(SetBuffersL();)
-	// MAF the result is ignored?
-    }
-
-void CCommReadWriteBaseAo::SetBuffersL()
-/**
- * This method frees the buffer memory and then tries to allocate
- * a smaller piece of memory. Note that this function will leave if
- * the memory allocation fails.
- */
-    {
-    _LOG_L4C1(">>CCommReadWriteBaseAo::SetBuffersL");
-
-    if (!IsActive())
-        {
-		_LOG_L3C1("Not active - allow alloc to happen");
-        TInt allocLen = Align4(iBufSize);
-   
-        delete iBuffer;
-        delete iBuf;
-        iBuf = NULL;   // set to NULL, in case new leaves
-        iBuffer = NULL;
-
-        iBuffer = HBufC8::NewMaxL(allocLen);
-        iBuf = new (ELeave) TPtr8((TText8*)iBuffer->Des().Ptr(), allocLen, allocLen);
-        }
-
-	_LOG_L4C1("<<CCommReadWriteBaseAo::SetBuffersL");
-	}
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/src/CsyDebugLogger.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file implements the CCsyDebugLogger class.
-// *               This class provides the functionality to log TSY debug messages to a file.
-// *               The log file is located at \epoc32\wins\c\logs\etel.
-//
-
-// CsyDebugLogger.cpp
-/*
-Copies from RefLog.cpp
-MAF move back to using RefLog
-*/
-
-// MAF we need to move to using RefLog.cpp - because we are duplicating code
-// fixes to the code that TapRoot have copied from us.
-
-#include <e32svr.h>
-
-#include "CsyGlobals.h"
-#include "CsyDebugLogger.h"
-
-#ifdef _DEBUG // Only use the following code when in Debug mode
-
-_LIT8(KDateFormat, "%02d.%02d:%4d");
-_LIT8(KTimeFormat, "%02d.%02d:%02d:%06d ");
-
-class TNoOverflow : public TDes8Overflow
-/**
- * This class is used to avoid panics when logging anything that's too long.
- */
-	{
-public:
-	virtual void Overflow(TDes8& /*aDes*/)
-		{
-		}
-	};
-
-void CCsyDebugLogger::WriteHeader()
-/**
- * Write the log header.
- */	
-	{
-	TBuf8<64> buf;
-	TTime now;
-	now.UniversalTime();
-	TDateTime dateTime;
-	dateTime = now.DateTime();
-	// TDateTimes Day() and Month() start at 0
-	buf.Format(KDateFormat, dateTime.Day() + 1, dateTime.Month() + 1,
-		dateTime.Year());
-
-#ifndef __DEBUGSERIALPORT__
-	// overwrite log file
-	RFileLogger logger;
-	TInt ret = logger.Connect();
-	if (ret == KErrNone)
-		{
-		logger.SetDateAndTime(EFalse, EFalse);
-		logger.CreateLog(KCsyLogDir, KCsyLogFile, EFileLoggingModeOverwrite);
-		logger.Write(KCsyLogLine);
-		logger.CloseLog();
-		logger.Close();
-		}
-#endif
-
-	CCsyDebugLogger::Write(_L8(" ")); // please leave this separator in
-	CCsyDebugLogger::WriteFormat(_L8("Date: %S"), &buf);
-	CCsyDebugLogger::WriteFormat(_L8("CSY 3GPP 27.010 version %d.%02d  (v8.0 build:%d)"),
-			KCSY_Gsm0710MajorVersionNumber,
-			KCSY_Gsm0710MinorVersionNumber,
-			KCSY_Gsm0710BuildVersionNumber);
-	}
-
-void CCsyDebugLogger::Write(const TDesC8& aText)
-/**
- * Write an 8-bit descriptor to the log file.
- * @param aDebugLevel Debug level of log request
- * @param aText is the text to write to the log file
- * @return void
- */	
-	{
-	TBuf8<KLogBufferSize> buf;
-	TTime now;
-	now.UniversalTime();
-	TDateTime dateTime;
-	dateTime = now.DateTime();
-	buf.Format(KTimeFormat, dateTime.Hour(), dateTime.Minute(), 
-			   dateTime.Second(), dateTime.MicroSecond());
-
-	if (aText.Length() <= (buf.MaxLength() - buf.Length()))
-		{
-		buf.Append(aText);
-		}
-	else
-		{
-		buf.Append(aText.Left(buf.MaxLength() - buf.Length()));
-		}
-
-#ifdef __DEBUGSERIALPORT__
-
-	TBuf<KLogBufferSize> buf2;
-	// TEMP: Do not print single % since appear as format char to RDebug::Print
-	for (TInt i = 0; i < buf.Length(); i++)
-		{
-		if (buf[i] == '%')
-			buf2.Append(_L("."));
-		else
-			buf2.Append(buf[i]);
-		}
-
-	RDebug::Print(buf2);
-
-#else
-	// log to our own file
-	RFileLogger logger;
-	TInt ret = logger.Connect();
-	if (ret == KErrNone)
-		{
-		logger.SetDateAndTime(EFalse, EFalse);
-		logger.CreateLog(KCsyLogDir, KCsyLogFile, EFileLoggingModeAppend);
-		logger.Write(buf);
-		logger.CloseLog();
-		logger.Close();
-		}
-#endif
-	}
-
-void CCsyDebugLogger::WriteFormat(TRefByValue<const TDesC8> aFmt, ...)
-/**
- * Write an 8-bit format list to the log file.
- * @param aDebugLevel Debug level of log request
- * @param aFmt is the variable arguments
- * @return void
- */	
-	{
-	VA_LIST list;
-	VA_START(list,aFmt);
-
-	TBuf8<KLogBufferSize> buf;
-	TNoOverflow overflow;
-	buf.AppendFormatList(aFmt, list, &overflow);
-	Write(buf);
-	}
-
-#endif // _DEBUG

--- a/cbsref/csyrefplugins/csy27010/src/CsyMsgBufBpFrame.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file contains the implementation for the CCsyMsgBufBpFrame class.
-// *               This class is used to hold messages that the CSY sends to and receives
-// *               from the BP multiplexer.
-//
-
-/** @file
- * This file contains the implementation for the CCsyMsgBufBpFrame class.
- * This class is used to hold messages that the CSY sends to and receives
- * from the baseband multiplexer.
- */
-
-#include "CsyMsgBufBPFrame.h"
-#include "CsyGlobals.h"
-
-CCsyMsgBufBpFrame* CCsyMsgBufBpFrame::NewL()
-/**
- * This static method uses 2-phase construction to create an instance of
- * class CCsyMsgBufBpFrame.
- *
- * @return Pointer to the created object
- */
-	{
-	CCsyMsgBufBpFrame* p = new(ELeave) CCsyMsgBufBpFrame();
-	CleanupStack::PushL(p);
-	p->ConstructL();
-	CleanupStack::Pop(p);
-	return p;
- 	}
-
-CCsyMsgBufBpFrame::~CCsyMsgBufBpFrame()
-/**
- * Destructor.
- */
-	{}
-
-CCsyMsgBufBpFrame::CCsyMsgBufBpFrame()
-/**
- * Constructor.
- */
-	{}
-
-void CCsyMsgBufBpFrame::ConstructL()
-/**
- * Set the buffer type to Frame and then zero the buffer's contents.
- */
-	{
-	iMsg.FillZ();
-	}
-
-TUint8 CCsyMsgBufBpFrame::GetDlcNum() const
-/**
- * The is method extracts the DLC number from the frame.
- *
- * @return DLC number
- */
-	{
-	return (TUint8) (iMsg[KAdvOptionAddress] >> 2); // remove EA and CR bits
-	}
-
-TUint8 CCsyMsgBufBpFrame::GetFrameType() const
-/**
- * The is method extracts the frame type from the frame.
- *
- * @return frame type
- */
-	{
-	return ((TUint8) (iMsg[KAdvOptionControl] & 0xEF));  // remove poll/final bit
-	}
-
-TUint8 CCsyMsgBufBpFrame::GetType4FrameSequence() const
-/**
- * The is method extracts the Convergence Layer Type 4 sequence from the frame.
- *
- * @return Frame Sequence
- */
-	{
-	return (TUint8) (iMsg[KAdvOptionType4FrameControl] >> 6);
-	}
-

--- a/cbsref/csyrefplugins/csy27010/src/DllMain.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file contains the entry point for the CSY module.
-//
-
-// DllMain.cpp
-
-/** @file DllMain.cpp
- *
- */
-
-#include <cs_port.h>
-#include "Portfactory.h"
-#include "CsyDebugLogger.h"
-
-
-
-EXPORT_C CSerial* LibEntry()
-/**
- * The single exported function.
- * @return Pointer to and ownership of a new CSerial-derived object
- */
-	{
-	LOGHEADER();
-	return (CPortFactory::NewL());
-	}

--- a/cbsref/csyrefplugins/csy27010/src/Mux0710Protocol.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1034 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file contains the implementation for the Mux0710Protocol class.
-//
-
-// Mux0710Protocol.cpp
-
-/** @file Mux0710Protocol.cpp
- *
- */
- 
-#include "Mux0710Protocol.h"
-#include "Portfactory.h"
-#include "PortC32Interface.h"
-#include "CsyMsgBufBPFrame.h"
-#include "ChannelMgrCmdData.h"
-#include "CommFrameWriterAo.h"
-#include "CommFrameReaderAo.h"
-#include "ChannelMgrCtrl.h"
-#include "CsyDebugLogger.h"
-
-// AT Commands
-_LIT8(KATCmdAttention,     "ATE0\r");
-_LIT8(KATCmdDisableEcho,   "ATE0Q0V1\r");
-_LIT8(KATCmdReset,   "AT%b\r");
-_LIT8(KATCmdSleep,   "AT%SLEEP=0\r");
-
-const TInt KRetryCount = 2;
-
-CMux0710Protocol* CMux0710Protocol::NewL(CPortFactory& aPortFactory)
-/**
- * This static method uses 2-phase construction to create an instance of
- * this class.
- *
- * @return Pointer to the created object
- */
-	{
-	_LOG_L4C1("CMux0710Protocol::NewL");
-
-	CMux0710Protocol* p = new(ELeave) CMux0710Protocol(aPortFactory);
-	CleanupStack::PushL(p);
-	p->ConstructL();
-	CleanupStack::Pop(p);
-	return p;
- 	}
-
-CMux0710Protocol::~CMux0710Protocol()
-/**
- * Destructor.
- */
-	{
-	_LOG_L4C1("CMux0710Protocol::~CMux0710Protocol");
-
-	// Release  Free Frame Memory 
-	CCsyMsgBufBpFrame* aBpFrame;
-    iFreeFrameBufIter.SetToFirst();
-	while ((aBpFrame = iFreeFrameBufIter++) != NULL)
-		{
-		iFreeFrameBufList.Remove(*aBpFrame);
-		delete  aBpFrame;
-	 	}  
-
-	delete iTimeouter;
-	}
-
-CMux0710Protocol::CMux0710Protocol(CPortFactory& aPortFactory)
-/**
- * Constructor.
- *
- */
- : iPortFactory(aPortFactory),
-   iMuxMgrState(ECsyWaitingForFlushResp),
-   iFreeFrameBufList(_FOFF(CCsyMsgBufBpFrame, iMsgLink)),
-   iFreeFrameBufIter(iFreeFrameBufList),
-   iRetryCount(KRetryCount)
-   	{}
-
-void CMux0710Protocol::ConstructL()
-/**
- * Allocate the memory for the free frames list.
- */
-	{
-	_LOG_L4C1("CMux0710Protocol::ConstructL");
-
-	iTimeouter = CActiveTimeouter::NewL(*this);
-
-	// allocate memory for the free frame buffer
-	for (TUint i=0; i < KMaxFreeFrames; i++)
-		{
-		CCsyMsgBufBpFrame* aBpFrame = CCsyMsgBufBpFrame::NewL();
-		iFreeFrameBufList.AddLast(*aBpFrame);
-		}
-	iFreeFrameCount = KMaxFreeFrames;
-	}
-
-CCsyMsgBufBpFrame* CMux0710Protocol::GetFreeFrameBuf(TBool aCheckFlowControlThresholds)
-/**
- * Get a free frame buffer and then remove the buffer from
- * the free list.
- *
- * @return - Pointer to a frame buffer or NULL 
- */
-	{
-	_LOG_L4C2(">>CMux0710Protocol::GetFreeFrameBuf [aCheckFlowControlThresholds=%d]",
-		aCheckFlowControlThresholds);
-
-	CCsyMsgBufBpFrame* frame = NULL;
-	if (!iFreeFrameBufList.IsEmpty())
-		{
-		frame = iFreeFrameBufList.First();
-		if (frame)
-			{
-			iFreeFrameBufList.Remove(*frame);
-			iFreeFrameCount--;
-			_LOG_L4C2("iFreeFrameCount=%d",iFreeFrameCount);
-
-			if ((aCheckFlowControlThresholds)&&(iFreeFrameCount < KStopDataDlcsThreshold))
-				{
-				// Need to enforce some flow control
-				iEnforcingFlowControl = ETrue;
-
-				if (iFreeFrameCount == 1)
-					{
-					// Only one frame free - that can be used to send the MSC command
-					_LOG_L4C1("Drastic action! - 1 frame free");
-					iPortFactory.StopAnyDlc();
-					}
-				else
-					{
-					_LOG_L4C2("Less than %d frames free",KStopDataDlcsThreshold);
-					iPortFactory.FindActiveDataDlcToStop();
-					}
-				}
-
-			frame->iMsg.Zero();
-			frame->MsgDlc() = KCtrlChannelDlcNum;
-			frame->CompleteWhenSent() = ETrue;
-			}
-		}
-
-	_LOG_L4C2("<<CMux0710Protocol::GetFreeFrameBuf [frame=0x%x]",frame);
-	return frame;
-	}
-
-void CMux0710Protocol::AddFrameFreeQ(CCsyMsgBufBpFrame* aBpFrame)
-/**
- * This method is called to add the specified frame buffer to the
- * free frame queue.
- *
- * @param aBpFrame - Pointer to the frame buffer
- */
-	{
-	_LOG_L4C2(">>CMux0710Protocol::AddFrameFreeQ [aBpFrame=0x%x]",aBpFrame);
-
-	iFreeFrameBufList.AddLast(*aBpFrame);
-
-	if (iEnforcingFlowControl)
-		{
-		if (iFreeFrameCount >= KStartDataDlcsThreshold)
-			{
-			// Release flow control
-			_LOG_L4C2("More than %d frames free",
-				KStartDataDlcsThreshold);
-
-			// re-enable a data dlc (note only re-enable one dlc at a time)
-			iEnforcingFlowControl = iPortFactory.FindDlcToEnable();
-			_LOG_L4C2("iEnforcingFlowControl=%d",iEnforcingFlowControl);
-			}
-		}
-
-	iFreeFrameCount++;
-	//MAF __ASSERT_DEBUG((iFreeFrameCount <= KMaxFreeFrames),PANIC(KPanicIllegalState));
-
-	_LOG_L4C2("<<CMux0710Protocol::AddFrameFreeQ iFreeFrameCount=%d",
-		iFreeFrameCount);
-	}
-	
-TUint8 CMux0710Protocol::CalcFCS(TUint8* aBuffer, TInt aLen)
-/**
- * This method calculates the checkSum for the specified buffer
- * with the specified length.
- *
- * @param aBuffer - Pointer to the data buffer
- * @param aLen    - Length of Number of bytes in the Buffer for which CheckSum to be calculated
- * @return checksum
- */
-	{
-    TUint8 frameCheckSum = 0xFF;
-	aBuffer++;
-	for (TInt i=0; i < aLen; i++ )
-		{
-		frameCheckSum = crctable[(frameCheckSum ^ (*aBuffer++))];
-		}
-
-	// One's Complement
-	frameCheckSum = (TUint8) ((TUint8)(0xFF) - frameCheckSum);
-
-	return frameCheckSum;
-	}
-
-TInt CMux0710Protocol::Create0710DataFrames(TDesC8& aMsgBuf, 
-											   const TUint8 aDlcNum)
-/**
- * This method is called by channel manager objects to fragment
- * a client message into frames for transmission to the BP.
- * The length of the client message is determined, the client message is
- * fragment into 27.010 format, and the formatted frames are added to the
- * write frame queue.
- *
- * @param aMsgBuf - Pointer to the client message
- * @param aDlcNum - DLC number
- * @return KErrNone, KErrArgument, or KErrNoMemory
- */
-	{
-	_LOG_L4C2(">>CMux0710Protocol::Create0710DataFrames [aDlcNum=%d]",
-		aDlcNum);
-
-	TInt ret = KErrNone;
-
-	TInt msgLength   = aMsgBuf.Length();
-	TInt offset      = 0;
-	TInt frameLength = 0;
-	TInt maxFrameLength = KMaxFrameSize;
-
-	TBool beginFlag = ETrue;
-	TBool endFlag = EFalse;
-
-	_LOG_L4C2("msgLength = %d", msgLength);
-	if (msgLength > 0)
-		{
-		while ((msgLength > 0)&&(ret == KErrNone))
-			{
-			CCsyMsgBufBpFrame* bpFrame = GetFreeFrameBuf();
-			if (bpFrame)
-				{
-				// Set up the frame
-				bpFrame->MsgDlc() = aDlcNum;
-
-				if (msgLength > maxFrameLength)
-					{
-					_LOG_L4C3("Fragmenting (%d > %d)",msgLength,maxFrameLength);
-
-					frameLength = maxFrameLength;
-					bpFrame->CompleteWhenSent() = EFalse;
-					}
-				else
-					{
-					_LOG_L4C1("No Fragment");
-
-					frameLength = msgLength;
-					bpFrame->CompleteWhenSent() = ETrue;
-					endFlag = ETrue;
-					}
-			
-				// Test for convergence layer 4
-				CPortC32InterfaceBase* port = 
-					iPortFactory.FindPortC32Interface(aDlcNum);
-				if (port)
-					{
-					if (port->GetClientType() == CPortFactory::EC32ClientIpNif)
-						{
-						_LOG_L4C1("Layer 4 frame");
-
-						Create0710UIHLayer4FrameFromMsg(aMsgBuf, offset, 
-							bpFrame, frameLength, aDlcNum, beginFlag, endFlag);
-
-						// No longer the beginning
-						beginFlag = EFalse;
-						}
-					else
-						{
-						_LOG_L4C1("Normal frame");
-
-						Create0710UIHFrameFromMsg(
-							aMsgBuf, offset, bpFrame, frameLength, aDlcNum);
-						}
-
-					_LOG_L4C1("Writing the frame");
-					ret = iCommWriter->Write(bpFrame);
-					}
-				else
-					{
-					_LOG_L1C2("** No port defined for aDlcNum=%d",
-						aDlcNum);
-					}
-				}
-			else
-				{
-				// error no free frame available
-				_LOG_L1C1("** No free frame buffer **");
-				ret = KErrNoMemory;
-				}
-
-			msgLength -= frameLength;
-			offset += maxFrameLength;
-			}
-		}
-	else
-		{
-		ret = KErrArgument;
-		}
-
-	_LOG_L4C2("<<CMux0710Protocol::Create0710DataFrames [ret=%d]",ret);
-	return ret;
-	}
-
-void CMux0710Protocol::Create0710UIHFrameFromMsg(TDesC8& aMsgBuf,
-												 TInt aOffset,
-												 CCsyMsgBufBpFrame* aFrameBuf,
-												 TInt aLength,
-												 TUint8 aDlcNum)
-/**
- * This method creates an 27.010 UIH frame from a message.
- * NOTE: This method assumes that a free frame buffer has been allocated.
- *
- * @param aMsgBuf - Pointer to a CSY memory element pointing to a Msg
- * @param aOffset - Offset from the start of the message to be copied to the frame.
- *                  This is needed if the calling method needs to defragment a long message.
- * @param aFrameBuf - Pointer to a CSY memory elelemt pointing to a Frame
- * @param aLength   - Length of the payload to be copied.
- * @param aDlcNum   - DLC channel number.
- */
-    {
-	_LOG_L4C3(">>CMux0710Protocol::Create0710UIHFrameFromMsg [aOffset=%d,aLength=%d]",aOffset,aLength);
-
-	aFrameBuf->iMsg.Zero();
-
-	// set initial length for headers
-#ifdef _27010ADVANCEOPTION
-	aFrameBuf->iMsg.SetLength(3);
-#else
-	aFrameBuf->iMsg.SetLength(4);
-#endif
-
-	// Octet 0 = Start Flag
-	aFrameBuf->iMsg[0] = KCsy0710StartEndFlag;
-
-	// Octet 1 = Non-extended Address, Command/Response, DLCI number
-	aFrameBuf->iMsg[1] = (TUint8) ((aDlcNum << 2) | 0x03);  // Set the DLCI, EA, C/R
-
-	// Octet 2 = Control Field = Frame Type (UIH)
-	aFrameBuf->iMsg[2] = (TUint8) KCsy0710CTLUIH;
-	
-
-#ifdef _27010ADVANCEOPTION
-	TInt checksumLength = 2;
-#else
-	// Octet 3 = Length indicator
-	// ASSUME only 1 byte needed for length size
-	//    27.010 supports 7 bits in Octet 3 to indicate a length up to 128 bytes long
-	aFrameBuf->iMsg[3] = (TUint8) ((aLength << 1) | KCsy0710EA);
-
-
-	// CRC Frame check : Basic Option  -> for Addr, Control, Length Fields only
-	// length = 3 bytes  [Addr(1) + Control(1) + Length (1)]
-	TInt checksumLength = 3;
-#endif
-	TUint8 checksum;
-	checksum = (TUint8) CalcFCS(&aFrameBuf->iMsg[0], checksumLength);
-
-	// Octet 5-x
-	//CCsyMsgBufClient* csyMsgBufClient = STATIC_CAST(CCsyMsgBufClient*, aMsgBuf);
-	const TUint8* temp = &aMsgBuf[aOffset];
-	aFrameBuf->iMsg.Append(temp, aLength);
-	TInt tempLength = aFrameBuf->iMsg.Length();
-	aFrameBuf->iMsg.SetLength(tempLength + 2);
-	aFrameBuf->iMsg[tempLength] = checksum;
-	aFrameBuf->iMsg[tempLength+1] = KCsy0710StartEndFlag;
-
- 	_LOG_L4C1("<<CMux0710Protocol::Create0710UIHFrameFromMsg");
-	}
-
-void CMux0710Protocol::Create0710UIHLayer4FrameFromMsg(TDesC8& aMsgBuf, 
-													   TInt aOffset, 
-													   CCsyMsgBufBpFrame* aFrameBuf, 
-													   TInt aLength, 
-													   TUint8 aDlcNum, 
-													   TBool aLayer4Begin, 
-													   TBool aLayer4End)
-/**
- * This method creates an 27.010 UIH frame from a message.
- * NOTE: This method assumes that a free frame buffer has been allocated.
- *
- * @param aMsgBuf - Pointer to a CSY memory element pointing to a Msg
- * @param aOffset - Offset from the start of the message to be copied to the frame.
- *                  This is needed if the calling method needs to defragment a long message.
- *                  This method builds the message as a Convergence Layer 4 type, so
- *                  only Advanced Option.
- * @param aFrameBuf - Pointer to a CSY memory elelemt pointing to a Frame
- * @param aLength   - Length of the payload to be copied.
- * @param aDlcNum   - DLC channel number.
- * @param aLayer4Begin - Beginning of Convergence Layer 4.
- * @param aLayer4End   - End of Convergence Layer 4.
- */
-    {
-	_LOG_L4C3(">>CMux0710Protocol::Create0710UIHLayer4FrameFromMsg [aOffset=%d,aLength=%d]",aOffset,aLength);
-	_LOG_L4C3("[aLayer4Begin=%d,aLayer4End=%d]",aLayer4Begin,aLayer4End);
-
-	//aFrameBuf->iMsg.Zero(); - this is done in GetFreeFrameBuf
-
-	// set initial length for headers
-	aFrameBuf->iMsg.SetLength(3);
-
-	// Octet 0 = Start Flag
-	aFrameBuf->iMsg[0] = KCsy0710StartEndFlag;
-
-	// Octet 1 = Non-extended Address, Command/Response, DLCI number
-	aFrameBuf->iMsg[1] = (TUint8) ((aDlcNum << 2) | 0x03);  // Set the DLCI, EA, C/R
-
-	// Octet 2 = Control Field = Frame Type (UIH)
-	aFrameBuf->iMsg[2] = (TUint8) KCsy0710CTLUIH;
-
-	TInt checksumLength = 2;
-	TUint8 checksum;
-	checksum = (TUint8) CalcFCS(&aFrameBuf->iMsg[0], checksumLength);
-
-	// Octet 5-x	
-	// Build the Convergence Layer 4 byte
-	TUint8 tempLayer4Byte = 0x01;	// Default Middle Frame fragment 
-	if (aLayer4Begin && aLayer4End)	// Begin and End - Single Frame Message
-		{
-		tempLayer4Byte = 0xC1; // MAF magic numbers
-		}
-	else if (aLayer4Begin)	// Begin Frame
-		{
-		tempLayer4Byte = 0x41;
-		}
-	else if (aLayer4End)	// End Frame
-		{
-		tempLayer4Byte = 0x81;
-		}
-	aFrameBuf->iMsg.Append(tempLayer4Byte);
-
-	const TUint8* temp = &aMsgBuf[aOffset];
-	aFrameBuf->iMsg.Append(temp, aLength);
-	TInt tempLength = aFrameBuf->iMsg.Length();
-
-	aFrameBuf->iMsg.SetLength(tempLength + 2);
-	aFrameBuf->iMsg[tempLength] = checksum;
-	aFrameBuf->iMsg[tempLength+1] = KCsy0710StartEndFlag;
-
-	DumpFrame(aFrameBuf);
-
-	_LOG_L4C1("<<CMux0710Protocol::Create0710UIHLayer4FrameFromMsg");
-    }
-
-TInt CMux0710Protocol::Create0710ControlFrame(TCsyFrameType aFrameType,
-											  TUint8 aDlcNum,
-											  TCsyCtrlCommand aType,
-											  TUint8 aV24Signals)
-/**
- * This method creates an 27.010 control frame using the specified frame type
- * and DLC number.
- * NOTE: This method assumes that a free frame buffer has been allocated.
- *
- * @param aFrameType - Frame type of the control frame
- * @param aDlcNum - DLC number of this frame
- * @return KErrNone or KErrGeneral
- */
-	{
-	_LOG_L4C2(">>CMux0710Protocol::Create0710ControlFrame [aDlcNum=%d]",aDlcNum);
-
-	TInt ret = KErrNone;
-
-	if (iMaxRetriesReached == EFalse)
-		{
-	
-		#ifdef _27010ADVANCEOPTION
-			TUint8 tempArray[15]; // MAF magic numbers
-		#else
-			TUint8 tempArray[8];
-		#endif
-
-		// Octet 0 = Start Flag
-		tempArray[0] = KCsy0710StartEndFlag;
-
-		// Octet 1 = Non-extended Address, initiating end (Command/Response), DLCI number
-		tempArray[1] = (TUint8) ((aDlcNum << 2) | 0x03);  // Set the DLCI, EA, C/R
-
-		// Octet 2 = Frame Type
-		switch (aFrameType)
-			{
-		case ESABM:
-			_LOG_L3C1("ESABM");
-			tempArray[2] = (TUint8) KCsy0710CTLSABM;
-			tempArray[2] |= KCsy0710PollFinal;
-			break;
-		case EUA:
-			_LOG_L3C1("EUA");
-			tempArray[1] = (TUint8) ((aDlcNum << 2) | 0x01);  // Set the DLCI, EA
-			tempArray[2] = (TUint8) KCsy0710CTLUA;
-			break;
-		case EDM:
-			_LOG_L3C1("EDM");
-			tempArray[1] = (TUint8) ((aDlcNum << 2) | 0x01);  // Set the DLCI, EA
-			tempArray[2] = (TUint8) KCsy0710CTLDM;
-			break;
-		case EDISC:
-			_LOG_L3C1("EDISC");
-			tempArray[2] = (TUint8) KCsy0710CTLDISC;
-			tempArray[2] |= KCsy0710PollFinal;
-			break;
-		case EUIH:
-			_LOG_L3C1("EUIH");
-			tempArray[2] = (TUint8) KCsy0710CTLUIH;
-			tempArray[2] |= KCsy0710PollFinal; // no pollbit
-			break;
-		case EUI:
-			_LOG_L3C1("EUI");
-			tempArray[2] = (TUint8) KCsy0710CTLUI;
-			break;
-		default:
-			_LOG_L1C2("** Unknown FrameType=%d **",aFrameType);
-			ret = KErrGeneral;
-			break;
-			}
-
-	#ifndef _27010ADVANCEOPTION
-
-		(void) aType;	//to hide warning.
-		(void) aV24Signals; //to hide warning.
-
-		// Octet 3 = Length1 indicator octet1
-		tempArray[3] = (TUint8) 0x01;  // zero length and set EA bit
-
-		// CRC Frame check : Basic Option  -> for Addr, Control, Length Fields only
-		// length = 4 bytes  [Addr(1) + Control(1) + Length (2)]
-		TInt length = 3;  
-		tempArray[4] = (TUint8) CalcFCS(tempArray, length);
-		tempArray[5] = KCsy0710StartEndFlag;
-
-		// For this call of GetFreeFrameBuf do not check the low frame threshold
-		// since control frame and it could be related to an already occurring flow
-		// control action anyway.
-		CCsyMsgBufBpFrame* ctrlFrame = GetFreeFrameBuf(EFalse);
-		if (ctrlFrame)
-			{
-			ctrlFrame->iMsg.Copy(tempArray, 6);
-			iCommWriter->Write(ctrlFrame); // MAF should be high priority frame
-			}
-	#else
-
-		if (aFrameType == EUIH)
-			{
-			// Set the DLCI to 0
-			tempArray[1]  = 0x03; // Set the DLCI to 0, EA, C/R
-			}
-
-		TUint8 checkSum; 
-		TInt length = 2;
-		checkSum = (TUint8) CalcFCS(tempArray, length);
-
-		if (aFrameType == EUIH)
-			{
-			// Only two types of control UIH supported
-			if (aType == EParamNeg)
-				{
-				_LOG_L3C1("Param Negotiate");
-
-				tempArray[3]  = KCsy0710CTLUIH_DlcParamNegotiate;
-				tempArray[4]  = 0x11; // i.e 8 bytes, EA
-				tempArray[5]  = aDlcNum;
-				tempArray[6]  = (KPNClBits << 4) + KPNFrameType;
-				tempArray[7]  = KPNDlcPriority;
-				tempArray[8]  = KPNAckTimer;
-				tempArray[9]  = KPNMaxFrameSize & 0x00ff;
-				tempArray[10] = KPNMaxFrameSize >> 8;
-				tempArray[11] = KPNMaxRetransmissions;
-				tempArray[12] = KPNWindowSize;
-				tempArray[13] = checkSum;
-				tempArray[14] = KCsy0710StartEndFlag;
-
-				iParamNegotiateDlcNum = aDlcNum;
-				}
-			else
-				{
-				_LOG_L3C2("MSC aV24Signals=0x%x", aV24Signals);
-
-				tempArray[3]  = KCsy0710CTLUIH_ModemStatusCmd;
-				tempArray[4]  = 0x05; // i.e 2 bytes, EA
-				tempArray[5]  = (TUint8) ((aDlcNum << 2) | 0x03);  // Set the DLCI, EA, 1
-				tempArray[6]  = aV24Signals;
-				tempArray[7] = checkSum;
-				tempArray[8] = KCsy0710StartEndFlag;
-				}
-			}
-		else
-			{
-			tempArray[3] = checkSum;
-			tempArray[4] = KCsy0710StartEndFlag;
-			}
-
-		CCsyMsgBufBpFrame* ctrlFrame = GetFreeFrameBuf(EFalse);
-		if (ctrlFrame)
-			{
-	#ifdef _27010ADVANCEOPTION
-			if (aFrameType == EUIH)
-				{
-				if (aType == EParamNeg)
-					{
-					ctrlFrame->iMsg.Copy(tempArray, 15);
-					}
-				else
-					{
-					ctrlFrame->iMsg.Copy(tempArray, 9);
-					}
-				}
-			else
-				{
-				ctrlFrame->iMsg.Copy(tempArray, 5);
-				}
-	#else
-			ctrlFrame->iMsg.Copy(tempArray, 5);
-	#endif
-
-			_LOG_L3C1("Write the frame");
-			iCommWriter->Write(ctrlFrame); // MAF should be high priority frame
-			}
-	#endif
-		else
-			{		// no memory available
-			_LOG_L1C1("** No Memory Available **");
-			ret = KErrNoMemory;
-			}
-		}
-	else
-		{	
-		_LOG_L1C1("** Max Retries Reached **");
-		ret = KErrTimedOut;
-		}
-	_LOG_L4C2("<<CMux0710Protocol::Create0710ControlFrame [ret=%d]",ret);
-	return ret;
-	}
-
-TInt CMux0710Protocol::SwitchToMuxMode()
-/**
- * This method is called to switch the baseband to multiplexer mode.
- * This method formats the AT command the buffer with the AT+CMUX command
- * and writes to the write FrameBuf List.
- *
- * @return KErrNone or KErrNoMemory
- */
-	{
-	_LOG_L4C1(">>CMux0710Protocol::SwitchToMuxMode");
-
-#ifdef __CSY_PROTOTYPE__
-	iMuxMgrState = ECsyMuxEnabled;
-#else
-	
-	if(iMuxMgrState == ECsyWaitingForFlushResp)
-		{
-		//flush the read queue.
-		iTimeouter->Start(KOneSecond);
-		return KErrNone;
-		}
-	else
-		{
-		iTimeouter->Start(KTwoSeconds);
-		}
-		
-	TInt ret = KErrNone;
-
-	CCsyMsgBufBpFrame* initBuf = GetFreeFrameBuf();
-	if (initBuf)
-		{
-		
-#ifdef USE_TI_CONDAT_STACK
-		if(iMuxMgrState == ECsyWaitingForResetResp)
-			{
-			//when using the TI stack we first attempt to reset the board using at%b.  
-			_LOG_L3C1("Sending AT reset command");
-			TBuf8<16> aBuf(KATCmdReset);
-			initBuf->iMsg.Copy(aBuf);
-			iMuxMgrState = ECsyWaitingForResetResp;
-			}
-		else if(iMuxMgrState == ECsyWaitingForSleepResp)
-			{
-			//Need to ensure that the TI stack will not timeout in the lull between commands
-			_LOG_L3C1("Sending AT sleep command");
-			TBuf8<16> aBuf(KATCmdSleep);
-			initBuf->iMsg.Copy(aBuf);
-			iMuxMgrState = ECsyWaitingForSleepResp;
-			}
-		else
-			{
-#endif
-		_LOG_L3C1("Sending AT");
-		TBuf8<16> aBuf(KATCmdAttention);
-		initBuf->iMsg.Copy(aBuf);
-		iMuxMgrState = ECsyWaitingForAttentionResp;
-
-#ifdef USE_TI_CONDAT_STACK
-			}
-#endif
-		iResponseStr.Zero();
-		
-		// call comm write to xmit frame
-		// comm writer's RunL will run when frame has been xmitted by LDD
-		// and return the frame buffer to the free list
-		ret = iCommWriter->Write(initBuf);
-		}
-	else
-		{
-		_LOG_L1C1("** No Memory Available **");
-		ret = KErrNoMemory;
-		}
-#endif
-
-	_LOG_L4C2("<<CMux0710Protocol::SwitchToMuxMode [ret=%d]",ret);
-	return ret;
-	}
-
-TInt CMux0710Protocol::ParseATResponse(TDes8& aResp)
-/**
- * This method parses the specified AT ascii response for the
- * expected ascii "OK" string.  If the string is found then set
- * the Mux Mode to True.
- *
- * @param aResp - Reference to the AT response string to parse
- * @return KErrNone, KErrGeneral or KErrNotFound
- */
-	{
-	_LOG_L4C3(">>CMux0710Protocol::ParseATResponse [iMuxMgrState = %d, aResp=%S]",
-		iMuxMgrState,&aResp);
-		
-	//Response string not always read in one go so concatonate it together to form full response string.
-	TInt appendsize = iResponseStr.MaxSize() - iResponseStr.Length();
-	iResponseStr.Append(aResp.LeftTPtr(appendsize));
-	_LOG_L4C2("Result string concatenated = %S",&iResponseStr);
-	
-	if(iMuxMgrState == ECsyWaitingForFlushResp)
-		{
-		_LOG_L4C2("Flushed comm port on opening = %S",&iResponseStr);
-		return KErrNotFound;
-		}
-		
-#ifdef USE_TI_CONDAT_STACK
-	if(iMuxMgrState == ECsyWaitingForResetResp)
-		{
-		if(iResponseStr.Find(KATInitialised) != KErrNotFound)
-			{
-			//got match - reset Rsp string to enter normal loop handle
-			_LOG_L3C1("Board has successfully been reset.");
-			iResponseStr = _L8("OK");
-			iRetryCount = 0; // stop retries of the reset
-			}
-		}
-
-	if(iMuxMgrState == ECsyWaitingForSleepResp)
-		{
-		if(iResponseStr.Find(_L8("OK")) != KErrNotFound)
-			{
-			//got match - sleep acknowledged
-			_LOG_L3C1("Board has had sleep timeout disabled.");
-			iRetryCount = 0; //stop retries of the sleep;
-			}
-		}				
-#endif
-
-	TInt ret = KErrNone;
-
-	// all AT responses should contain an "OK" keyword
-	if ((iResponseStr.Find(_L8("OK")) != KErrNotFound) ||
-		(iResponseStr.Find(_L8("ERROR")) != KErrNotFound))
-		{
-		if (iResponseStr.Find(_L8("ERROR")) != KErrNotFound)
-			{
-#ifdef USE_TI_CONDAT_STACK
-			if(iMuxMgrState == ECsyWaitingForResetResp)
-				{
-				_LOG_L3C1("*******TI Board failed to reset (AT%b) - continue anyway as may already be in a stable state.*******");
-				iRetryCount--;
-				}
-			else if (iMuxMgrState == ECsyWaitingForSleepResp)
-				{
-				_LOG_L3C1("*******TI Board failed to acknowledge sleep disable (AT%SLEEP=0) - continue anyway as may already be in a stable state.*******");
-				iRetryCount--;
-				}
-			else
-				{
-				_LOG_L3C1("****************** Received ERROR back ****************");
-				}
-#else
-			_LOG_L3C1("****************** Received ERROR back ****************");
-#endif
-			}
-		iTimeouter->Stop();
-
-		switch (iMuxMgrState)
-			{
-#ifdef USE_TI_CONDAT_STACK
-		case ECsyWaitingForResetResp:
-			{			
-			_LOG_L3C1("ECsyWaitingForResetResp - Start proper init sequence.");
-			if(iRetryCount>0) 
-				iMuxMgrState = ECsyWaitingForResetResp; //try reset command again
-			else
-				{
-				iMuxMgrState = ECsyWaitingForSleepResp;
-				iRetryCount = KRetryCount;
-				}				
-			SwitchToMuxMode();
-			}
-			break;
-			
-		case ECsyWaitingForSleepResp:
-			{			
-			iResponseStr.Zero();
-			_LOG_L3C1("ECsyWaitingForSleepResp");
-			if(iRetryCount>0)
-				iMuxMgrState = ECsyWaitingForSleepResp;
-			else
-				iMuxMgrState = ECsyWaitingForAttentionResp;
-			SwitchToMuxMode();
-			}
-			break;			
-#endif			
-		case ECsyWaitingForAttentionResp:
-			{
-			iResponseStr.Zero();
-			CCsyMsgBufBpFrame* atCmdBuf = GetFreeFrameBuf();
-			if (atCmdBuf)
-				{
-				_LOG_L3C1("Writing ATE0 command");
-				atCmdBuf->iMsg.Copy(KATCmdDisableEcho);
-				iCommWriter->Write(atCmdBuf);
-				iMuxMgrState = ECsyWaitingForEchoDisableResp;
-				}
-
-			iTimeouter->Start(KTwoSeconds);
-			}
-			break;
-
-		case ECsyWaitingForEchoDisableResp:
-			{
-			iResponseStr.Zero();
-			CCsyMsgBufBpFrame* atCmdBuf = GetFreeFrameBuf();
-			if (atCmdBuf)
-				{
-				_LOG_L3C1("Writing CMUX cmd");
-				atCmdBuf->iMsg.Copy(KCsyDefaultATEnterMuxModeCmd);
-				iCommWriter->Write(atCmdBuf);
-				iMuxMgrState = ECsyWaitingForCmuxResp;
-				}
-
-			iTimeouter->Start(KTwoSeconds);
-			}
-			break;
-
-		case ECsyWaitingForCmuxResp:
-			{
-			iResponseStr.Zero();
-			_LOG_L3C1("Got CMUX response");
-			iMuxMgrState = ECsyMuxEnabled;
-
-			// start the connect process for the control, command & data channels
-			iPortFactory.ConnectControlChannel();
-			}
-			break;
-
-		default:
-			_LOG_L3C2("** Invalid Mux Mgr State = %d **", iMuxMgrState);
-			ret = KErrGeneral;
-			break;
-			}
-		}
-	else
-		{
-		ret = KErrNotFound;
-		}
-
-	_LOG_L4C2("<<CMux0710Protocol::ParseATResponse [ret = %d]",ret);
-	return ret;
-	}
-
-void CMux0710Protocol::TimedOut()
-/**
- * This resends the AT command required.
- */
-	{
-	_LOG_L4C2(">>CMux0710Protocol::TimedOut [iMuxMgrState=%d]",iMuxMgrState);
-
-	switch (iMuxMgrState)
-		{
-
-	case ECsyWaitingForFlushResp:
-		{
-		//read queue has just been flushed, now start switch to MUX mode
-		_LOG_L3C1("ECsyWaitingForFlushResp");
-#ifdef USE_TI_CONDAT_STACK
-		iMuxMgrState = ECsyWaitingForResetResp;
-#else
-		iMuxMgrState = ECsyWaitingForAttentionResp;
-#endif
-		SwitchToMuxMode();
-		}
-		break;
-#ifdef USE_TI_CONDAT_STACK
-	case ECsyWaitingForResetResp:
-		{
-		_LOG_L3C1("ECsyWaitingForResetResp");
-		if(--iRetryCount>0) 
-			iMuxMgrState = ECsyWaitingForResetResp; //try reset command again
-		else
-			iMuxMgrState = ECsyWaitingForSleepResp;	
-		SwitchToMuxMode();
-		}
-		break;
-
-	case ECsyWaitingForSleepResp:
-		{
-		_LOG_L3C1("ECsyWaitingForSleepResp");
-		if(--iRetryCount>0)
-			iMuxMgrState = ECsyWaitingForSleepResp; //try sleep command again
-		else
-			iMuxMgrState = ECsyWaitingForAttentionResp;
-		SwitchToMuxMode();	
-		}
-		break;
-#endif
-	case ECsyWaitingForAttentionResp:
-		{
-		if (++iAtResponseTimeout < KAtResponseTimeoutLimit)
-			{
-			_LOG_L3C2("ECsyWaitingForAttentionResp [timeout:%d]",iAtResponseTimeout);
-			SwitchToMuxMode();	
-			}
-		else
-			{
-			_LOG_L3C2("Max retries [%d] reached for At Response", KAtResponseTimeoutLimit);
-
-			iMaxRetriesReached = ETrue;
-			//call to scheduler DoCancel required here
-			iPortFactory.ChannelCtrlDoCancel();
-			}
-		}
-		break;
-
-	case ECsyWaitingForEchoDisableResp:
-		{
-		_LOG_L3C1("ECsyWaitingForEchoDisableResp");
-		iResponseStr.Zero();
-		CCsyMsgBufBpFrame* atCmdBuf = NULL;
-		atCmdBuf = GetFreeFrameBuf();
-		if (atCmdBuf)
-			{
-			TBuf8<16> tempBuf(KATCmdDisableEcho);
-			atCmdBuf->iMsg.Copy(tempBuf);
-			iCommWriter->Write(atCmdBuf);
-			}
-
-		iTimeouter->Start(KOneSecond);
-		}
-		break;
-
-	case ECsyWaitingForCmuxResp:
-		{
-		_LOG_L3C1("ECsyWaitingForCmuxResp");
-		iResponseStr.Zero();
-		CCsyMsgBufBpFrame* atCmdBuf = GetFreeFrameBuf();
-		if (atCmdBuf)
-			{
-			_LOG_L3C1("Writing CMUX cmd");
-			atCmdBuf->iMsg.Copy(KCsyDefaultATEnterMuxModeCmd);
-			iCommWriter->Write(atCmdBuf);
-			iMuxMgrState = ECsyWaitingForCmuxResp;
-			}
-		iTimeouter->Start(KTwoSeconds);
-		}
-		break;
-
-	default:
-		_LOG_L1C2("** Invalid Mux Mgr State = %d **", iMuxMgrState);
-		break;
-		}
-
-	_LOG_L4C1("<<CMux0710Protocol::TimedOut");
-	}
-
-void CMux0710Protocol::DumpFrame(CCsyMsgBufBpFrame* aFrameBuf)
-/**
- * Logs the packet into the log file.
- *
- * @param aPacket The incoming packet
- */
-	{
-	_LOG_L4C1(">>CMux0710Protocol::DumpFrame");
-
-	TInt packetLen = aFrameBuf->iMsg.Length();
-	_LOG_L4C2("frame length %d",packetLen);
-
-	TBuf8<256> logBuf;
-	TBuf8<256> logBuf2;
-
-	logBuf.Copy(_L8("    "));
-	logBuf2.Copy(_L8(" "));
-	_LOG_L4C1("");
-
-	for (TInt i = 0; i <= packetLen; i++)
-		{
-		if (i >= packetLen)
-			{
-			logBuf.Append(logBuf2);
-			_LOG_L4C2("%S",&logBuf);
-			break;
-			}
-		if (((i % 16) == 0) && (i > 0))
-			{
-			logBuf.Append(logBuf2);
-			_LOG_L4C2("%S",&logBuf);
-			logBuf.Copy(_L8("    "));
-			logBuf2.Copy(_L8(" "));
-			}
-		logBuf.AppendFormat(_L8("%02X "), aFrameBuf->iMsg[i]);
-		if (TChar(aFrameBuf->iMsg[i]).IsPrint())
-			logBuf2.AppendFormat(_L8("%c"), aFrameBuf->iMsg[i]);
-		else
-			logBuf2.Append(_L8("."));
-		}
-
-	_LOG_L4C1("<<CMux0710Protocol::DumpFrame");
-	_LOG_L4C1("");
-	}
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/src/PortC32Interface.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,368 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file contains the implementation for the CPortC32Interface class.
-// *               This class contains methods which are invoked by C32 when the
-// *               associated client RComm public API is invoked. These methods
-// *               are used to create, configure, read, write, and close logical
-// *               serial ports. Instances of this class are created by the CSY's
-// *               Port Factory.
-//
-
-// PortC32Interface.cpp
-
-/** @file PortC32Interface.cpp
- *
- */
-
-#include <cdbcols.h>
-#include "PortC32Interface.h"
-#include "Portfactory.h"
-#include "Mux0710Protocol.h"
-#include "CsyMsgBufBPFrame.h"
-#include "ChannelMgrCmdData.h"
-#include "CommFrameReaderAo.h"
-#include "CsyDebugLogger.h"
-#include "CsyGlobals.h"
-#include "CommFrameWriterAo.h"
-
-CPortC32Interface* CPortC32Interface::NewL(CPortFactory& aPortFactory, 
-										   CPortFactory::TC32PortInfo& aPortInfo)
-/**
- * This method uses two phase construction and the cleanup stack to create
- * an instance of class CPortC32Interface.
- *
- * @param aPortFactory - Reference to the port factory
- * @param aPortInfo - Reference to the port information
- * @return Pointer to the created instance
- */
-	{
-	_LOG_L4C1( "CPortC32Interface::NewL");
-
-	CPortC32Interface* self = new(ELeave) CPortC32Interface(aPortFactory, aPortInfo);
-	TCleanupItem closeSelf(CPortFactory::CloseObject, self);
-	CleanupStack::PushL(closeSelf);
-	self->ConstructL();
-	CleanupStack::Pop(self);
-
-	return self;
-	}
-
-CPortC32Interface::~CPortC32Interface()
-/**
- * Destructor.
- */
-	{
-	_LOG_L4C1( ">>CPortC32Interface::~CPortC32Interface");
-
-	// let port factory know we are deleted
-	iPortFactory.RemoveC32Port(this);
-	CompleteOutstandingRequest();
-
-	iMuxChannel->Close(this);
-
-	if (iReadBuf)
-		{
-		_LOG_L3C1("Delete read buffer");
-		delete iReadBuf;
-		}
-
-	_LOG_L4C1( "<<CPortC32Interface::~CPortC32Interface");
-	}
-
-CPortC32Interface::CPortC32Interface(CPortFactory& aPortFactory,
-									 CPortFactory::TC32PortInfo& aPortInfo)
-/**
- * Constructor.
- *
- * @param aPortFactory - Reference to the port factory
- * @param aPortInfo - Reference to the port information
- */
-: CPortC32InterfaceBase(aPortFactory, aPortInfo)
-	{}
-
-void CPortC32Interface::ConstructL(void)
-/**
- * Safe constructor
- */
-	{
-	_LOG_L4C1( "CPortC32Interface::ConstructL");
-	CPortC32InterfaceBase::ConstructL();
-	}
-
-/********************************************************************************/
-/*               Start of utility methods for CPortC32InterfaceBase                 */
-/********************************************************************************/
-
-TInt CPortC32Interface::QueryReceiveBuffer(TInt& aLength) const
-/**
- * Called by C32 when the client queries the size of the receive buffer,
- * which returns the number of receive characters available to be read by
- * the C32 client RComm instance.
- *
- * @param aLength - Reference to client's buffer length variable
- * @return KErrNone
- */
-	{
-	_LOG_L4C2( "CPortC32Interface::QueryReceiveBuffer [port=%d]", GetPortNumber());
-
-	aLength = 0;
-	if (iReadBuf)
-		{
-		aLength = iReadBuf->iMsg.Length();
-		_LOG_L4C2("iReadBuf aLength=%d", aLength);
-		}
-	else if (!iFramesWaitingToBeReadList.IsEmpty())
-		{
-		CCsyMsgBufBpFrame* frame = iFramesWaitingToBeReadList.First();
-		if ((frame)&&(frame->iMsg.Length() >= (KAdvOptionHeaderSize + KChecksumSize)))
-			{
-#ifdef _27010ADVANCEOPTION
-			aLength = frame->iMsg.Length() - (KAdvOptionHeaderSize + KChecksumSize);
-#else
-			aLength = frame->iMsg.Length() - (KBasicOptionHeaderSize + KChecksumSize);
-#endif
-			_LOG_L4C2("iFramesWaitingToBeReadList aLength=%d", aLength);
-			}
-		}
-
-	return KErrNone;
-	}
-
-void CPortC32Interface::ResetBuffers(TUint aFlags)
-/**
- * Called by C32 when the client requests to reset the buffers,
- * by removing all receive and/or transmit messages according to
- * the specified flags.
- *
- * @param aFlags Indicate which buffers (receive and/or transmit) should be reset
- */
-	{
-	_LOG_L4C2(">>CPortC32Interface::ResetBuffers [aFlags=%d]", aFlags);
-	_LOG_L4C2("[port=%d]", GetPortNumber());
-
-	if (aFlags & KCommResetRx)
-		{
-		_LOG_L4C1("Removing all messages intended for the C32 client");
-
-		RemoveWaitingAllFrames();
-		}
-
-	if (aFlags & KCommResetTx)
-		{
-		_LOG_L4C1("Removing all messages intended for the modem");
-
-		GetMuxChannel()->WriteCancel();
-		}
-
-	_LOG_L4C1("<<CPortC32Interface::ResetBuffers");
-	}
-
-void CPortC32Interface::SendFrameToClient(CCsyMsgBufBpFrame* aFrame)
-/**
- * This method is called by a CSY Channel object when it has a single
- * frame to send to a C32 client RComm object.
- *
- * @param aFrame - Pointer to message to send to client
- */
-	{
-	_LOG_L4C2( "CPortC32Interface::SendFrameToClient [port=%d]", GetPortNumber());
-
-	if (aFrame)
-		{
-		// check if queue is empty
-		TBool trigger = iFramesWaitingToBeReadList.IsEmpty();
-
-		iFramesWaitingToBeReadList.AddLast(*aFrame);
-		if (trigger)
-			{
-			_LOG_L4C1("No packets already waiting");
-			if (iIsReadInProgress)
-				{
-				_LOG_L4C1("A read is outstanding");
-				ReadFromBufOrQueue();
-				}
-			}
-
-		// inform client new data is available
-		SetDataAvailable();
-		}
-	else
-		{
-		//MAF __ASSERT_DEBUG(EFalse, PANIC(KPanicIllegalState));
-		}
-	}
-
-TBool CPortC32Interface::ReadFromBufOrQueue()
-/**
- * This method is called to read from buffer or the frame list
- * It will read as much as possible.
- *
- * @return ETrue if complete the read request
- */
-	{
-	_LOG_L4C2( ">>CPortC32Interface::ReadFromBufOrQueue [port=%d]",GetPortNumber());
-
-	TBool completedTheReadRequest = EFalse;
-
-	TInt err = KErrGeneral;
-	TBool cont;
-	do
-		{
-		cont = EFalse;
-		if(iReadBuf==NULL)
-			{
-			//Read data from the frame list
-			if (!iFramesWaitingToBeReadList.IsEmpty())
-				{
-				_LOG_L4C1("Set to first item");
-				iReadBuf = iFramesWaitingToBeReadList.First();
-				if (iReadBuf)
-					{
-					_LOG_L4C1("iReadBuf not null");
-					// remove msg buf from client list
-					iFramesWaitingToBeReadList.Remove(*iReadBuf);
-
-					// subtract checksum field
-					TInt frameLength = iReadBuf->iMsg.Length();
-					_LOG_L4C2("New read buffer frameLength=%d",frameLength);
-
-					if (frameLength >= KBasicOptionHeaderSize)
-						{
-						iReadBuf->iMsg.SetLength(frameLength - KChecksumSize);
-
-						// remove leading header ints from frame
-#ifdef _27010ADVANCEOPTION
-						iReadBuf->iMsg.Delete(0, KAdvOptionHeaderSize);
-#else
-						iReadBuf->iMsg.Delete(0, KBasicOptionHeaderSize);
-#endif
-						}
-					else
-						{
-						_LOG_L4C1("Incorrect frame size - freeing read buffer");
-						iPortFactory.GetMux0710Protocol()->AddFrameFreeQ(iReadBuf);
-						iReadBuf = NULL;
-						}
-					}
-				}
-			}
-		if (iReadBuf)
-			{
-			TInt length = -1;
-			if (iClientLength - iPos < iReadBuf->iMsg.Length())
-				{
-				length = iClientLength - iPos;
-				_LOG_L4C2("length = %d",length);
-				}
-
-			if (iConfig.iTerminatorCount > 0)
-				{
-				_LOG_L4C2("iTerminatorCount = %d",iConfig.iTerminatorCount);
-
-				// First find terminator
-				TInt terminatorLoc = -1;
-				TInt loc;
-				for (TInt i=0; i< iConfig.iTerminatorCount;i++)
-					{
-					loc = iReadBuf->iMsg.LocateF(iConfig.iTerminator[i]);
-					if (loc > KErrNotFound)
-						{
-						if (terminatorLoc == KErrNotFound)
-							{
-							terminatorLoc = loc;
-							}
-						else
-							{
-							terminatorLoc = Min(loc,terminatorLoc);
-							}
-						}
-					}
-				if (terminatorLoc>KErrNotFound)
-					{
-					if (length > KErrNotFound)
-						length = Min(terminatorLoc + 1,length);
-					else
-						length = terminatorLoc + 1;
-					}
-				_LOG_L4C2("length = %d",length);
-				}
-
-			_LOG_L4C2("Read buf length %d",iReadBuf->iMsg.Length());
-
-			if ((iReadBuf->iMsg.Length() >= length) && (length > -1))
-				{
-				_LOG_L2C2("complete partial read: # %d ", length);
-
-				iPartialReadBuf.Copy(&iReadBuf->iMsg[0], length);
-				iReadBuf->iMsg.Delete(0, length);
-
-				err = IPCWrite(iClientBuffer, iPartialReadBuf, iPos); 
-				if (err)
-					{
-					_LOG_L1C2("** IPCWrite Error %d **",err);
-					}
-
-				CompleteReadRequest(err);
-				err = KErrGeneral;
-
-				completedTheReadRequest = ETrue;
-				iPos = 0;
-
-				if (iReadBuf->iMsg.Length()==0)
-					{
-					_LOG_L4C1("All data used - freeing read buffer");
-					iPortFactory.GetMux0710Protocol()->AddFrameFreeQ(iReadBuf);
-					iReadBuf = NULL;
-					}
-				}
-			else
-				{
-				err = IPCWrite(iClientBuffer, iReadBuf->iMsg, iPos);
-				if (err)
-					{
-					_LOG_L1C2("** IPCWrite Error %d **",err);
-					}
-
-				_LOG_L4C3( "Read: iPos = %d, add %d bytes", iPos, iReadBuf->iMsg.Length());
-
-				//try read next frame in the list
-				cont = ETrue; 
-				iPos += iReadBuf->iMsg.Length();
-
-				_LOG_L4C1("Freeing read buffer");
-				iPortFactory.GetMux0710Protocol()->AddFrameFreeQ(iReadBuf);
-				iReadBuf = NULL;
-				}
-			}
-		}
-	while (cont);
-
-	if (iPos>0)
-		{
-		if (iOneOrMore)
-			{
-			CompleteReadRequest(err);
-			iPos = 0;
-			completedTheReadRequest = ETrue;
-			}
-		else 
-			{
-			//normal read and have not filled the buffer yet
-			_LOG_L4C3( "Not filled buffer yet iPos = %d, iClientLength = %d", iPos, iClientLength);
-			}
-		}
-
-	_LOG_L4C2( "<<CPortC32Interface::ReadFromBufOrQueue [completedTheReadRequest=%d]",completedTheReadRequest);
-	return completedTheReadRequest;
-	}
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/src/PortC32InterfaceBase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1002 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file contains the implementation for the CPortC32Interface class.
-// *               This class contains methods which are invoked by C32 when the
-// *               associated client RComm public API is invoked. These methods
-// *               are used to create, configure, read, write, and close logical
-// *               serial ports. Instances of this class are created by the CSY's
-// *               Port Factory.
-//
-
-/** @file PortC32InterfaceBase.cpp
- * This file contains the implementation for the CPortC32InterfaceBase class.
- * This base class contains methods which are invoked by C32 when the
- * associated client RComm public API is invoked. These methods
- * are used to create, configure, read, write, and close logical
- * serial ports. Instances of this class are created by the CSY's
- * Port Factory.
- */
-
-#include <cdbcols.h>
-
-#include "PortC32InterfaceBase.h"
-#include "Portfactory.h"
-#include "Mux0710Protocol.h"
-#include "CsyMsgBufBPFrame.h"
-#include "ChannelMgrCmdData.h"
-#include "CommFrameReaderAo.h"
-#include "CsyDebugLogger.h"
-
-CPortC32InterfaceBase::CPortC32InterfaceBase(CPortFactory& aPortFactory,
-									 CPortFactory::TC32PortInfo& aPortInfo)
-/**
- * Constructor.
- *
- * @param aPortFactory - Reference to the port factory
- * @param aPortInfo - Reference to the port information
- */
- : CPort(),
- 	iFramesWaitingToBeReadList(_FOFF(CCsyMsgBufBpFrame, iMsgLink)),
-    iFramesWaitingToBeReadIter(iFramesWaitingToBeReadList),
-    iRole(ECommRoleDTE),
-	iPortFactory(aPortFactory),
-	iPortInfo(aPortInfo)
-	{}
-
-void CPortC32InterfaceBase::ConstructL()
-/**
- * Base construction for channels
- */
-	{
-	_LOG_L4C1("CPortC32InterfaceBase::ConstructL");
-
-	// create active objects to handle events
-	iConfig.iTerminatorCount = 0;
-	}
-
-CPortC32InterfaceBase::~CPortC32InterfaceBase()
-/**
- * Destructor.
- */
-	{
-	_LOG_L4C1(">>CPortC32InterfaceBase::~CPortC32InterfaceBase");
-
-	// remove all frames from queue and delete
-	RemoveWaitingAllFrames(EFalse);
-
-	if (iMuxChannel)
-		iMuxChannel->Close(this);
-
-	_LOG_L4C1("<<CPortC32InterfaceBase::~CPortC32InterfaceBase");
-	}
-
-void CPortC32InterfaceBase::RemoveWaitingAllFrames(TBool aAddToFreeList)
-/**
- * 
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::RemoveWaitingAllFrames [aAddToFreeList=%d]",
-		aAddToFreeList);
-
-	CCsyMsgBufBpFrame* frame = NULL;
-	iFramesWaitingToBeReadIter.SetToFirst();
-	while ((frame = iFramesWaitingToBeReadIter++) != NULL)
-		{
-		iFramesWaitingToBeReadList.Remove(*frame);
-		if (aAddToFreeList)
-			iPortFactory.GetMux0710Protocol()->AddFrameFreeQ(frame);
-		else
-			delete frame;
-		}
-	}
-
-/********************************************************************************/
-/*                       Start of methods from CPort                            */
-/********************************************************************************/
-
-void CPortC32InterfaceBase::NotifySignalChange(TUint aSignalMask)
-/**
- * Called by C32 when the client requests NotifySignalChange.
- *
- * @param aSignal
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::NotifySignalChange [port=%d]", GetPortNumber());
-
-	TUint reqSigs = aSignalMask & ~KSignalBreak;
-	if (!reqSigs)
-		{
-		// User has only asked to be notified of break.
-		SignalChangeCompleted(iSignals, KErrArgument);
-		return;
-		}
-	iSignalMask |= reqSigs;
-
-	iSignalChangeNotifyPending = ETrue;
-	}		   
-
-void CPortC32InterfaceBase::NotifySignalChangeCancel()
-/**
- * Called by C32 when the client requests to cancel a NotifySignalChange 
- * request.
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::NotifySignalChangeCancel [port=%d]", GetPortNumber());
-
-	iSignalMask &= (KSignalBreak);	// set mask to zero, excluding BREAK
-	if (iSignalChangeNotifyPending)
-		{
-		iSignalChangeNotifyPending = EFalse;
-		SignalChangeCompleted(iSignals, KErrCancel);
-		}
-	}
-
-void CPortC32InterfaceBase::StartRead(const TAny* aClientBuffer, TInt aLength)
-/**
- * This method is called by C32 to read data from the CSY in response to a 
- * read request by a client RComm object.
- *
- * @param aClientBuffer - Pointer to where to put the new data
- * @param aLength - Length of data to read
- */
-	{
-	_LOG_L4C1(" "); // please leave in this separator
-	_LOG_L4C3(">>CPortC32InterfaceBase::StartRead [aLength=%d, port=%d] called by client",
-			 aLength, GetPortNumber());
-
-	if (iIsReadInProgress)
-		{
-		// Something has gone wrong - either the flag was not reset correctly
-		// or C32 has lost track of a read
-		// MAF __ASSERT_DEBUG(EFalse,PANIC(KPanicIllegalState));
-		_LOG_L1C1("** Read waiting to complete already set **");
-		}
-
-	// Set the flag that there is a read request outstanding
-	iIsReadInProgress = ETrue;
-
-	if (aLength == 0)
-		{
-		_LOG_L3C1("<<CPortC32InterfaceBase::StartRead - Length of 0?");
-		CompleteReadRequest(KErrArgument);
-		return;
-		}
-
-	// save client info
-	iClientBuffer = (TAny*) aClientBuffer;
-	iPos = 0;
-
-	if (aLength > 0)
-		{
-		_LOG_L3C1("Normal read");
-		iClientLength = aLength;
-		iOneOrMore = EFalse;
-		}
-	else
-		{
-		_LOG_L3C1("Read one or more");
-		iClientLength = -aLength;
-		iOneOrMore = ETrue;
-		}
-
-	if(!ReadFromBufOrQueue())
-		{
-		_LOG_L3C1("No data to be read - request is outstanding");
-		}
-
-	_LOG_L4C1("<<CPortC32InterfaceBase::StartRead");
-	_LOG_L4C1(" "); // please leave in this separator
-	}
-
-void CPortC32InterfaceBase::StartWrite(const TAny* aClientBuffer, TInt aLength)
-/**
- * This method is called by C32 to write data to the CSY in response to a 
- * write request by a client RComm object.
- *
- * @param aClientBuffer - Pointer to where to put the new data
- * @param aLength - Length of data to read
- */
-	{
-	_LOG_L4C1(" "); // please leave in this separator
-	_LOG_L4C3(">>CPortC32InterfaceBase::StartWrite [aLength=%d, port=%d] called by client",
-			 aLength, GetPortNumber());
-
-	if (iIsWriteInProgress)
-		{
-		// Something has gone wrong - either the flag was not reset correctly
-		// or C32 has lost track of a write
-		// MAF __ASSERT_DEBUG(EFalse,PANIC(KPanicIllegalState));
-		_LOG_L1C1("** Write already waiting to complete **");
-		iIsWriteInProgress = EFalse;
-		}
-
-	iIsWriteInProgress = ETrue;
-
-	if (aLength > 0)
-		{
-		// Get the outgoing message buffer for this dlc/port
-		TDes8& buffer = iMuxChannel->RefToMsgBuffer();
-
-		// zero the buffer
-		buffer.Zero();
-
-		// read data from client's address space
-		TInt err = IPCRead(aClientBuffer, buffer); 
-		if (err == KErrNone)
-			{
-			iMuxChannel->SetOwner(this);
-			err = iMuxChannel->PlaceOnOutboundQueue();
-			}
-		else
-			{
-			_LOG_L1C2("** Read of client buffer failed [err=%d] **",err);
-			}
-
-		if (err)
-			{
-			CompleteWriteRequest(err);
-			}
-		}
-	else
-		{
-		// no data to write is not an error, so just complete
-		CompleteWriteRequest(KErrNone);
-		}
-
-	_LOG_L4C1("<<CPortC32InterfaceBase::StartWrite");
-	_LOG_L4C1(" "); // please leave in this separator
-	}
-
-void CPortC32InterfaceBase::Destruct()
-/**
- * Called by C32 in response to a client Close request.
- */
-	{
-	_LOG_L4C2(">>CPortC32InterfaceBase::Destruct [port=%d]", GetPortNumber());
-
-	// C32 requires us to do this here.
-	delete this;
-
-	_LOG_L4C1("<<CPortC32InterfaceBase::Destruct()");
-	}
-
-TInt CPortC32InterfaceBase::SetConfig(const TDesC8& aConfiguration)
-/**
- * Called by C32 in response to a client calling RComm::SetConfig().
- * This method is used by the client to tell the CSY what parameters
- * are needed to instantiate the lower-level driver.
- * Note that the CSY reads the config data from CommDb and bpcaps.ini
- * and does not need or want the client to overwrite the config
- * parameters.
- *
- * @param aConfiguration - Descriptor containing the config params
- * @return KErrNone
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::SetConfig [port=%d]",iPortInfo.iPortNumber);
-
-    TCommConfigV01 c;
-
-    Mem::FillZ(&c,sizeof(c));
-	TInt len=Min(aConfiguration.Length(),sizeof(c));
-	Mem::Copy(&c, aConfiguration.Ptr(),len);
-
-	if(c.iTerminatorCount > KConfigMaxTerminators)
-		{
-		return KErrNotSupported;
-		}
-	else
-		{
-		for (TInt i=0; i < c.iTerminatorCount;i++)
-			{
-			_LOG_L4C2("Terminator: %d" ,c.iTerminator[i]);
-			}
-		}
-
-	iConfig = c;
-	//we will only use Terminators of this configure
-	return KErrNone;
-	}
-
-void CPortC32InterfaceBase::ReadCancel()
-/**
- * Called by C32 when the client requests to cancel a Read.
- */
-	{
-	_LOG_L4C2(">>CPortC32InterfaceBase::ReadCancel [port=%d]", GetPortNumber());
-
-	iClientBuffer = NULL;
-	iClientLength = 0;
-
-	CompleteReadRequest(KErrCancel);
-
-	_LOG_L4C1("<<CPortC32InterfaceBase::ReadCancel()");
-	}
-
-void CPortC32InterfaceBase::WriteCancel()
-/**
- * Called by C32 when the client requests to cancel a write operation.
- * Empty the mux queue of a possible message that is destined for the 
- * baseband on the channel associated with this C32 port interface
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::WriteCancel [port=%d]", GetPortNumber());
-
-	iMuxChannel->WriteCancel();
-
-	CompleteWriteRequest(KErrCancel);
-	}
-
-/*****************************************************************************/
-// Functions below here are the C32 pure virtuals which must be implemented  //
-// by the CSY, but may not be supported by the CSY.                          //
-/*****************************************************************************/
-
-void CPortC32InterfaceBase::Break(TInt /*aTime*/)
-/**
- * Called by C32.
- * Note that this method is not supported.
- *
- * @param aTime
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::Break [port=%d]", GetPortNumber());
-	}
-
-void CPortC32InterfaceBase::BreakCancel()
-/**
- * Called by C32.
- * Note that this method is not supported.
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::BreakCancel [port=%d]", GetPortNumber());
-	}
-
-TInt CPortC32InterfaceBase::GetConfig(TDes8& /*aPackage*/) const
-/**
- * Called by C32.
- * Note that this method is not supported.
- * @param aPackage - Reference to package
- * @return KErrNotSupported
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::GetConfig [port=%d]", GetPortNumber());
-	return KErrNotSupported;
-	}
-
-TInt CPortC32InterfaceBase::SetServerConfig(const TDesC8& /*aPackage*/)
-/**
- * Called by C32.
- * Note that this method is not supported.
- * @param aPackage - Reference to package
- * @return KErrNotSupported
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::SetServerConfig [port=%d]", GetPortNumber());
-	return KErrNotSupported;
-	}
-
-TInt CPortC32InterfaceBase::GetServerConfig(TDes8& /*aPackage*/)
-/**
- * Called by C32.
- * Note that this method is not supported.
- * @param aPackage - Reference to package
- * @return KErrNotSupported
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::GetServerConfig [port=%d]", GetPortNumber());
-	return KErrNotSupported;
-	}
-
-TInt CPortC32InterfaceBase::GetCaps(TDes8& aPackage)
-/**
- * Called by C32.
- * @param aPackage - Reference to package
- * @return KErrNone
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::GetCaps [port=%d]", GetPortNumber());
-
-	// create a Package pointer
-	TCommCaps* pckg = (TCommCaps*) &aPackage;
-
-	// create a V01 reference
-	TCommCapsV01& caps = (*pckg)();
-
-	// fill in the capabilities
-	caps.iRate       = KCapsBps19200 | KCapsBps115200;
-
-	caps.iDataBits   = KCapsData8;
-	caps.iStopBits   = KCapsStop1;
-	caps.iParity     = KCapsParityNone;
-	caps.iHandshake  = KCapsSignalCTSSupported |
-		               KCapsSignalDSRSupported |
-					   KCapsSignalDCDSupported |
-					   KCapsSignalRTSSupported |
-					   KCapsSignalDTRSupported;
-	caps.iSignals    = KCapsObeyCTSSupported | KCapsObeyDSRSupported;
-	caps.iFifo       = KCapsHasFifo;
-	caps.iSIR        = KCapsSIR115kbps;
-
-	// TCommCapsV02 support
-	if (aPackage.Length()==sizeof(TCommCapsV02))
-		{
-		TCommCapsV02* commcaps = (TCommCapsV02*)(aPackage.Ptr());
-		commcaps->iNotificationCaps = 
-			KNotifyFlowControlChangeSupported |
-			KNotifyDataAvailableSupported;
-		commcaps->iFlowControlCaps = KCapsFlowControlStatusSupported;
-		}
-
-	return KErrNone;
-	}
-
-TInt CPortC32InterfaceBase::GetSignals(TUint& aSignals)
-/**
- * get the status of the signal pins
- *
- * @param aSignals signals will be written to this descriptor
- * @return KErrNone always
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::GetSignals [port=%d]", GetPortNumber());
-	aSignals = iSignals;
-	return KErrNone;
-	}
-
-TInt CPortC32InterfaceBase::SetSignalsToMark(TUint aSignals)
-/**
- * set selected signals to high (logical 1)
- *
- * @param aSignals bitmask with the signals to be set
- * @return KErrNone always
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::SetSignalsToMark [port=%d]", GetPortNumber());
-
-	TInt ret = KErrNone;
-	TUint alreadySent = iSentSignals & aSignals;
-	if (alreadySent == aSignals)
-		{
-		_LOG_L4C1("Signals already set to high");
-		}
-	else
-		{
-		TUint temp = iSentSignals | aSignals;
-		ret = SetV24Signals(temp);
-		if (ret == KErrNone)
-			{
-			iSentSignals = temp;
-			_LOG_L4C2("iSentSignals 0x%08x",iSentSignals);
-			}
-		}
-	
-	return ret;
-	}
-
-TInt CPortC32InterfaceBase::SetSignalsToSpace(TUint aSignals)
-/**
- * set selected signals to low (logical 0)
- *
- * @param aSignals bitmask with the signals to be cleared
- * @return KErrNone always
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::SetSignalsToSpace [port=%d]", GetPortNumber());
-
-	TInt ret = KErrNone;
-	TUint change = iSentSignals & aSignals;
-	if (change)
-		{
-		TUint temp = iSentSignals & ~aSignals;
-		ret = SetV24Signals(temp);
-		if (ret == KErrNone)
-			{
-			iSentSignals = temp;
-			_LOG_L4C2("iSentSignals 0x%08x",iSentSignals);
-			}
-		}
-	else
-		{
-		_LOG_L4C1("Signals already set to low");
-		}
-	
-	return ret;
-	}
-
-TInt CPortC32InterfaceBase::GetReceiveBufferLength(TInt& aLength) const
-/**
- * Called by C32.
- * @param aLength
- * @return KErrNone
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::GetReceiveBufferLength [port=%d]", GetPortNumber());
-
-	aLength = KMaxIpPacketSize;
-	return KErrNone;
-	}
-
-TInt CPortC32InterfaceBase::SetReceiveBufferLength(TInt /*aLength*/)
-/**
- * Called by C32.
- * Note that this method is not supported.
- * @param aLength
- * @return KErrNotSupported
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::SetReceiveBufferLength [port=%d]", GetPortNumber());
-	return KErrNotSupported;
-	}
-
-void CPortC32InterfaceBase::NotifyConfigChange()
-/**
- * Called by C32.
- * Note that this method is not supported.
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::NotifyConfigChange [port=%d]", GetPortNumber());
- 	}
-
-void CPortC32InterfaceBase::NotifyDataAvailable()
-/**
- * Called by C32.
- * Note that this method is not supported.
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::NotifyDataAvailable [port=%d]", GetPortNumber());
-
-	iDataAvailableNotifyPending = ETrue;
-	}
-
-void CPortC32InterfaceBase::NotifyDataAvailableCancel()
-/**
- * Called by C32.
- * Note that this method is not supported.
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::NotifyDataAvailableCancel [port=%d]", GetPortNumber());
-
-	if (iDataAvailableNotifyPending)
-		{
-		iDataAvailableNotifyPending = EFalse;
-		NotifyDataAvailableCompleted(KErrCancel);
-		}
-	}
-
-void CPortC32InterfaceBase::NotifyConfigChangeCancel()
-/**
- * Called by C32.
- * Note that this method is not supported.
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::NotifyConfigChangeCancel [port=%d]", GetPortNumber());
-	}
-
-void CPortC32InterfaceBase::NotifyFlowControlChange()
-/**
- * Called by C32.
- * Note that this method is not supported.
- */
-	{
-	_LOG_L3C2("CPortC32InterfaceBase::NotifyFlowControlChange [port=%d]", GetPortNumber());
-
-	iFlowControlNotifyPending = ETrue;
-	}
-
-void CPortC32InterfaceBase::NotifyFlowControlChangeCancel()
-/**
- * Called by C32 to cancel a previous notification request.
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::NotifyFlowControlChangeCancel [port=%d]", GetPortNumber());
-
-	if (iFlowControlNotifyPending)
-		{
-		iFlowControlNotifyPending = EFalse;
-		FlowControlChangeCompleted(iCsyAllowedToSendFrames, KErrCancel);
-		}
-	}
-
-void CPortC32InterfaceBase::NotifyBreak()
-/**
- * Called by C32.
- * Note that this method is not supported.
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::NotifyBreak [port=%d]", GetPortNumber());
-	}
-
-void CPortC32InterfaceBase::NotifyBreakCancel()
-/**
- * Called by C32.
- * Note that this method is not supported.
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::NotifyBreakCancel [port=%d]", GetPortNumber());
-	}
-
-void CPortC32InterfaceBase::NotifyOutputEmpty()
-/**
- * Called by C32.
- * Note that this method is not supported.
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::NotifyOutputEmpty [port=%d]", GetPortNumber());
-	}
-
-void CPortC32InterfaceBase::NotifyOutputEmptyCancel()
-/**
- * Called by C32.
- * Note that this method is not supported.
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::NotifyOutputEmptyCancel [port=%d]", GetPortNumber());
-	}
-
-TInt CPortC32InterfaceBase::GetFlowControlStatus(TFlowControl& aFlowControl)
-/**
- * Called by C32 to return the port's flow control state.
- *
- * @param aFlowControl Reference to location to write the flow control value
- * @return KErrNone
- */
-	{
-	_LOG_L3C2("CPortC32InterfaceBase::GetFlowControlStatus [Port=%d]", GetPortNumber());
-
-	aFlowControl = EFlowControlOff;
-	if ((iCsyAllowedToSendFrames == EFlowControlOn) ||
-		(iMuxChannel->CsyToModemFlowControl() == EFlowControlOn))
-		aFlowControl = EFlowControlOn;
-
-	return KErrNone;
-	}
-
-TInt CPortC32InterfaceBase::GetRole(TCommRole& aRole)
-/**
- * Called by C32 to return the port's role. The role will be either
- * DTE or DCE.
- * @param aRole - Reference to location to write the port role (DTE or DCE).
- * @return KErrNone
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::GetRole [port=%d]", GetPortNumber());
-
-	aRole = iRole;  // or get from RDevComm instance ???
-	return KErrNone;
-	}
-
-TInt CPortC32InterfaceBase::SetRole(TCommRole aRole)
-/**
- * Called by C32 to set the port role to either DTE or DCE.
- * @param aRole - DTE or DCE
- * @return KErrNone.
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::SetRole [aRole=%d]", aRole);
-
-#if defined _DEBUG
-	if (aRole == ECommRoleDTE)
-		{
-		_LOG_L4C2("CPortC32InterfaceBase::SetRole() - DTE for Port %d", iPortInfo.iPortNumber);
-		}
-	else if (aRole == ECommRoleDCE)
-		{
-		_LOG_L4C2("CPortC32InterfaceBase::SetRole() - DCE for Port %d", iPortInfo.iPortNumber);
-		}
-	else
-		{
-		_LOG_L4C3("CPortC32InterfaceBase::SetRole() - Unknown Role %d for Port %d", aRole, iPortInfo.iPortNumber);
-		}
-#endif
-
-	iRole = aRole;
-	return KErrNone;
-	}
-
-
-void CPortC32InterfaceBase::FreeMemory()
-/**
- * Called by C32 when the client wishes the CSY to free some memory. 
- * Note that this method does nothing. The CSY uses statically-allocated 
- * memory. In principle there is no memory that can be freed within the CSY.
- *
- *
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::FreeMemory [port=%d]", GetPortNumber());
-
-	// MAF missing functionality
-	}
-
-/********************************************************************************/
-/*                       End of methods from CPort                              */
-/********************************************************************************/
-
-void CPortC32InterfaceBase::CompleteWriteRequest(TInt aStatus)
-/**
- * This method is called by the CSY object writing to the LDD and is used to
- * signal C32 that its message has been sent to the BP.  C32 is now free to
- * write another message to the CSY on this port interface.
- * @param aStatus - Status of message write to BP
- *
- */
-	{
-	_LOG_L4C3("CPortC32InterfaceBase::CompleteWriteRequest [aStatus=%d, Port=%d]", aStatus, GetPortNumber());
-
-	if (iIsWriteInProgress)
-		{
-		iIsWriteInProgress = EFalse;
-		WriteCompleted(aStatus);
-		}
-	else
-		{
-		_LOG_L3C1("* No write outstanding to complete *");
-		}
-	}
-
-void CPortC32InterfaceBase::CompleteReadRequest(TInt aStatus)
-/**
- * This method is called to complete the C32 client's read request.
- *
- * @param aStatus - Status read result
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::CompleteReadRequest [aStatus=%d]", aStatus);
-
-	if (iIsReadInProgress)
-		{
-		iIsReadInProgress = EFalse;
-		ReadCompleted(aStatus);
-		}
-	else
-		{
-		_LOG_L3C1("* No read outstanding to complete *");
-		}
-	}
-
-void CPortC32InterfaceBase::Shutdown()
-/**
- * Returns all the used memory 
- *
- *
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::Shutdown [port=%d]", GetPortNumber());
-
-	// MAF missing functionality
-	}
-
-void CPortC32InterfaceBase::ModemAndCsyToClientFlowCtrl(const TFlowControl aFlowControl)
-/**
- * This method is called to update the port's flow control state.
- * If a notification is pending then complete it.
- * @param aFlowControl New flow control state
- *
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::ModemAndCsyToClientFlowCtrl [aFlowControl=%d]", aFlowControl);
-	_LOG_L4C2("[port=%d]", GetPortNumber());
-
-	if (iCsyAllowedToSendFrames != aFlowControl)
-		{
-		iCsyAllowedToSendFrames = aFlowControl;
-		if (iFlowControlNotifyPending)
-			{
-			iFlowControlNotifyPending = EFalse;
-			FlowControlChangeCompleted(iCsyAllowedToSendFrames, KErrNone);
-			}
-		}
-	}
-
-TInt CPortC32InterfaceBase::SetV24Signals(const TUint aRs232Signals)
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::SetV24Signals [aRs232Signals=0x%08x]",
-		aRs232Signals);
-	_LOG_L4C2("port=%d", GetPortNumber());
-
-	// From 27.010 Sending
-	//
-	// Bit number/name	DTE			DCE
-	//
-	// 3, RTC			DTR			DSR
-	// 4, RTR			RTS			CTS	
-	// 7, IC			always 0	RI
-	// 8, DV			always 1	DCD
-
-	TUint8 v24signals = 0;
-	if (iRole == ECommRoleDTE)
-		{
-		_LOG_L3C1("DTE sending entity");
-
-		if (aRs232Signals & KSignalDTR)
-			{
-			_LOG_L3C1("DTR set (setting RTC)");
-			v24signals |= KV24SignalRTC;
-			}
-
-		if (aRs232Signals & KSignalRTS)
-			{
-			_LOG_L3C1("RTS set (setting RTR)");
-			v24signals |= KV24SignalRTR;
-			}
-
-		// DV always 1
-		v24signals |= 0x80;
-		}
-	else if (iRole == ECommRoleDCE)
-		{
-		_LOG_L3C1("DCE sending entity");
-
-		if (aRs232Signals & KSignalDSR)
-			{
-			_LOG_L3C1("DSR set (setting RTC)");
-			v24signals |= KV24SignalRTC;
-			}
-
-		if (aRs232Signals & KSignalCTS)
-			{
-			_LOG_L3C1("CTS set (setting RTR)");
-			v24signals |= KV24SignalRTR;
-			}
-
-		if (aRs232Signals & KSignalRNG)
-			{
-			_LOG_L3C1("RNG set (setting IC)");
-			v24signals |= KV24SignalIC;
-			}
-
-		if (aRs232Signals & KSignalDCD)
-			{
-			_LOG_L3C1("DCD set (setting DV)");
-			v24signals |= KV24SignalDV;
-			}
-		}
-	else
-		{
-		_LOG_L3C1("** Unknown role **");
-		}
-
-	return iMuxChannel->SendMscCommand(v24signals);
-	}
-
-void CPortC32InterfaceBase::ReceivedV24Signals(const TUint8 aV24Signals)
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::ReceivedV24Signals [aV24Signals=0x%x]",
-		aV24Signals);
-	_LOG_L4C2("port=%d", GetPortNumber());
-
-	// From 27.010 Receiving (mapping from control signal octet)
-	//
-	// Bit number/name	DTE		DCE
-	// 	
-	// 3, RTC			DSR		DTR
-	// 4, RTR			CTS		RFR/RTS
-	// 7, IC			RI		-ignored
-	// 8, DV			DCD		-ignored
-
-	TUint signals = 0;
-	if (iRole == ECommRoleDTE)
-		{
-		_LOG_L3C1("DTE receiving entity");
-
-		// RTC (bit 3)
-		if (aV24Signals & KV24SignalRTC)
-			{
-			_LOG_L3C1("Device ready to communicate (setting DSR)");
-			signals |= KSignalDSR;
-			}
-		// RTR (bit 4)
-		if (aV24Signals & KV24SignalRTR)
-			{
-			_LOG_L3C1("Device ready to receive (setting CTS)");
-			signals |= KSignalCTS;
-			}
-		// IC (bit 7)
-		if (aV24Signals & KV24SignalIC)
-			{
-			_LOG_L3C1("Incoming call (setting RNG)");
-			signals |= KSignalRNG;
-			}
-		// DV (bit 8)
-		if (aV24Signals & KV24SignalDV)
-			{
-			_LOG_L3C1("Data valid (setting DCD)");
-			signals |= KSignalDCD;
-			}
-		}
-	else if (iRole == ECommRoleDCE)
-		{
-		_LOG_L3C1("DCE receiving entity");
-
-		// RTC (bit 3)
-		if (aV24Signals & KV24SignalRTC)
-			{
-			_LOG_L3C1("Device ready to communicate (setting DTR)");
-			signals |= KSignalDTR;
-			}
-		// RTR (bit 4)
-		if (aV24Signals & KV24SignalRTR)
-			{
-			_LOG_L3C1("Device ready to receive (setting RTS)");
-			signals |= KSignalRTS;
-			}
-		}
-	else
-		{
-		_LOG_L3C1("** Unknown role **");
-		}
-
-	signals &= iSignalMask;
-	if (signals != iSignals)
-		{
-		iSignals = signals;
-
-		// notification processing
-		if (iSignalChangeNotifyPending)
-			SignalChangeCompleted(iSignals, KErrNone);
-		}
-	}
-
-void CPortC32InterfaceBase::SetMuxChannel(CChannelMgrCmdData* aMuxChannel)
-/**
- * This method sets the flow control state for the port object
- * by reading the specified channel's flow control state.
- * @param aMuxChannel - Pointer to the channel
- *
- */
-	{
-	iMuxChannel = aMuxChannel;
-	if (iMuxChannel != NULL)
-		{
-		ModemAndCsyToClientFlowCtrl(iMuxChannel->
-			GetModemAndCsyToClientFlowControl());
-		}
-	else
-		{
-		_LOG_L1C1("** SetMuxChannel - channel not ready **");
-		}
-	}
-
-void CPortC32InterfaceBase::SetDataAvailable()
-/**
- * This method is called to set the port's data available state.
- * If the data available notification is pending then complete it.
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceBase::SetDataAvailable [port=%d]", GetPortNumber());
-
-	if (iDataAvailableNotifyPending)
-		{
-		iDataAvailableNotifyPending = EFalse;
-		NotifyDataAvailableCompleted(KErrNone);
-		}
-	}
-
-void CPortC32InterfaceBase::CompleteOutstandingRequest()
-/**
- * This method is called to complete an outstanding request.
- * There can be read and write requests that are outstanding.
- */
-	{
-	_LOG_L4C1("CPortC32InterfaceBase::CompleteOutstandingRequest");
-
-	if (iIsReadInProgress)
-		CompleteReadRequest(KErrCancel);
-
-	if (iIsWriteInProgress)
-		CompleteWriteRequest(KErrCancel);
-	}
-	
-

--- a/cbsref/csyrefplugins/csy27010/src/PortC32InterfaceIp.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,670 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file contains the implementation for the CPortC32Interface class.
-// *               This class contains methods which are invoked by C32 when the
-// *               associated client RComm public API is invoked. These methods
-// *               are used to create, configure, read, write, and close logical
-// *               serial ports. Instances of this class are created by the CSY's
-// *               Port Factory.
-//
-
-/** @file PortC32InterfaceIp.cpp
- *
- * This file contains the implementation for the CPortC32InterfaceIp class.
- * This class contains methods which are invoked by C32 when the
- * associated client RComm public API is invoked. These methods
- * are used to create, configure, read, write, and close logical
- * serial ports. Instances of this class are created by the CSY's
- * Port Factory.
- *
- */
-
-#include <cdbcols.h>
-#include "PortC32InterfaceIp.h"
-#include "Portfactory.h"
-#include "Mux0710Protocol.h"
-#include "CsyMsgBufBPFrame.h"
-#include "ChannelMgrCmdData.h"
-#include "CommFrameReaderAo.h"
-#include "CsyDebugLogger.h"
-#include "CsyGlobals.h"
-#include "CommFrameWriterAo.h"
-
-CPortC32InterfaceIp* CPortC32InterfaceIp::NewL(CPortFactory& aPortFactory, 
-										   CPortFactory::TC32PortInfo& aPortInfo)
-/**
- * This method uses two phase construction and the cleanup stack to create
- * an instance of class CPortC32InterfaceIp.
- *
- * @param aPortFactory - Reference to the port factory
- * @param aPortInfo - Reference to the port information
- * @return Pointer to the created instance
- */
-	{
-	_LOG_L4C1("CPortC32InterfaceIp::NewL");
-
-	CPortC32InterfaceIp* self =
-		new(ELeave) CPortC32InterfaceIp(aPortFactory, aPortInfo);
-
-	TCleanupItem closeSelf(CPortFactory::CloseObject, self);
-	CleanupStack::PushL(closeSelf);
-	self->ConstructL();
-	CleanupStack::Pop(self);
-
-	return (self);
-	}
-
-CPortC32InterfaceIp::~CPortC32InterfaceIp()
-/**
- * Destructor.
- */
-	{
-	_LOG_L4C1(">>CPortC32InterfaceIp::~CPortC32InterfaceIp");
-
-	_LOG_L3C1("Remove port from the port factory");
-
-	// let port factory know we are deleted
-	iPortFactory.RemoveC32Port(this);
-	CompleteOutstandingRequest();
-
-	_LOG_L3C1("Release any packets going to the C32 client");
-
-	// remove all frames to do with the most recent IP packet
-	CCsyMsgBufBpFrame* ipPacketFrame = NULL;
-	iFramesReceivedForIpPacketIter.SetToFirst();
-	while ((ipPacketFrame = iFramesReceivedForIpPacketIter++) != NULL)
-		{
-		iFramesReceivedForIpPacket.Remove(*ipPacketFrame);
-		delete ipPacketFrame;
-		}
-
-	_LOG_L4C1("<<CPortC32InterfaceIp::~CPortC32InterfaceIp");
-	}
-
-CPortC32InterfaceIp::CPortC32InterfaceIp(CPortFactory& aPortFactory,
-									 CPortFactory::TC32PortInfo& aPortInfo)
-/**
- * Constructor.
- *
- * @param aPortFactory - Reference to the port factory
- * @param aPortInfo - Reference to the port information
- */
-: CPortC32InterfaceBase(aPortFactory, aPortInfo),
-   iFramesReceivedForIpPacket(_FOFF(CCsyMsgBufBpFrame, iMsgLink)),
-   iFramesReceivedForIpPacketIter(iFramesReceivedForIpPacket)
-	{}
-
-void CPortC32InterfaceIp::ConstructL()
-/**
- * Safe constructor
- */
-	{
-	_LOG_L4C1(">>CPortC32InterfaceIp::ConstructL");
-
-	CPortC32InterfaceBase::ConstructL();
-
-	_LOG_L4C1("<<CPortC32InterfaceIp::ConstructL");
-	}
-
-/********************************************************************************/
-/*               Start of utility methods for CPortC32InterfaceBase             */
-/********************************************************************************/
-
-TInt CPortC32InterfaceIp::QueryReceiveBuffer(TInt& aLength) const
-/**
- * Called by C32 when the client queries the size of the receive buffer,
- * which returns the number of receive characters available to be read by
- * the C32 client RComm instance.
- *
- * @param aLength - Reference to client's buffer length variable
- * @return KErrNone
- */
-	{
-	_LOG_L4C2("CPortC32InterfaceIp::QueryReceiveBuffer [port=%d]", GetPortNumber());
-
-	aLength = 0;
-
-	// MAF
-
-	return KErrNone;
-	}
-
-void CPortC32InterfaceIp::ResetBuffers(TUint aFlags)
-/**
- * Called by C32 when the client requests to reset the buffers,
- * by removing all receive and/or transmit messages according to
- * the specified flags.
- *
- * @param aFlags Indicate which buffers (receive and/or transmit) should be reset
- */
-	{
-	_LOG_L4C3(">>CPortC32InterfaceIp::ResetBuffers [aFlags=%d,port=%d]",
-		aFlags,GetPortNumber());
-
-	if (aFlags & KCommResetRx)
-		{
-		_LOG_L4C1("Removing all messages intended for the C32 client");
-
-		RemoveWaitingAllFrames();
-
-		// remove all frames to do with the most recent IP packet
-		CCsyMsgBufBpFrame* ipPacketFrame = NULL;
-		iFramesReceivedForIpPacketIter.SetToFirst();
-		while ((ipPacketFrame = iFramesReceivedForIpPacketIter++) != NULL)
-			{
-			iFramesReceivedForIpPacket.Remove(*ipPacketFrame);
-			delete ipPacketFrame;
-			}
-		}
-
-	if (aFlags & KCommResetTx)
-		{
-		_LOG_L4C1("Removing all messages intended for the modem");
-
-		GetMuxChannel()->WriteCancel();
-		}
-
-	_LOG_L4C1("<<CPortC32InterfaceIp::ResetBuffers");
-	}
-
-void CPortC32InterfaceIp::PlaceIpPacketFramesOntoFreeList()
-/**
- * Place all frames to do with recent IP packet onto free list
- */
-	{
-	_LOG_L4C2(">>CPortC32InterfaceIp::PlaceIpPacketFramesOntoFreeList [port=%d]", GetPortNumber());
-
-	CCsyMsgBufBpFrame* frame = NULL;
-	iFramesReceivedForIpPacketIter.SetToFirst();
-	while ((frame = iFramesReceivedForIpPacketIter++) != NULL)
-		{
-		iFramesReceivedForIpPacket.Remove(*frame);
-		iPortFactory.GetMux0710Protocol()->AddFrameFreeQ(frame);
-		}
-	iCurrentIpPacketLength = 0;
-
-	_LOG_L4C1("<<CPortC32InterfaceIp::PlaceIpPacketFramesOntoFreeList");
-	}
-
-void CPortC32InterfaceIp::PlaceIpPacketFramesOntoReadList()
-/**
- * Place all frames to do with recent IP packet onto read list
- */
-	{
-	_LOG_L4C2(">>CPortC32InterfaceIp::PlaceIpPacketFramesOntoReadList [port=%d]", GetPortNumber());
-
-	CCsyMsgBufBpFrame* frame = NULL;
-	iFramesReceivedForIpPacketIter.SetToFirst();
-	while ((frame = iFramesReceivedForIpPacketIter++) != NULL)
-		{
-		iFramesReceivedForIpPacket.Remove(*frame);
-		iFramesWaitingToBeReadList.AddLast(*frame);
-		}
-	iCurrentIpPacketLength = 0;
-	iNumberOfPacketsWaiting++;
-	_LOG_L4C2("iNumberOfPacketsWaiting=%d",iNumberOfPacketsWaiting);
-
-	if (iNumberOfPacketsWaiting == KMaxPacketsOutstandingForC32Client)
-		{
-		_LOG_L2C1("Client appears to be slow at reading");
-		_LOG_L2C3("iNumberOfPacketsWaiting %d > KMaxPacketsOutstandingForC32Client %d)",
-			iNumberOfPacketsWaiting,KMaxPacketsOutstandingForC32Client);
-
-		iMuxChannel->SetCsyToModemFlowControl(EFlowControlOn);
-		}
-
-	_LOG_L4C1("<<CPortC32InterfaceIp::PlaceIpPacketFramesOntoReadList");
-	}
-
-void CPortC32InterfaceIp::SendFrameToClient(CCsyMsgBufBpFrame* aFrame)
-/**
- * This method is called by a CSY Channel object when it has a single
- * frame to send to a C32 client RComm object.
- *
- * @param aFrame - Pointer to message to send to client
- */
-	{
-	_LOG_L4C2(">>CPortC32InterfaceIp::SendFrameToClient [port=%d]", GetPortNumber());
-
-	if (aFrame)
-		{
-		// frame validation
-		if (aFrame->iMsg.Length() <= KAdvOptionNumOfNonDataOctets)
-			{
-			_LOG_L1C1("** Does not appear to be a valid frame - disregarding **");
-
-			// Place received frames on the empty list
-			iPortFactory.GetMux0710Protocol()->AddFrameFreeQ(aFrame);
-			PlaceIpPacketFramesOntoFreeList();
-
-			_LOG_L4C1("<<CPortC32InterfaceIp::SendFrameToClient - bad frame");
-			return;
-			}
-
-		TUint8 framePosition = aFrame->GetType4FrameSequence();
-		_LOG_L4C2("framePosition = 0x%02x",framePosition);
-
-		// read buffer validation
-		if (iFramesReceivedForIpPacket.IsEmpty())
-			{
-			// There is no read buffer allocated for this frame
-			switch (framePosition)
-				{
-			case KSingleFrame:
-			case KStartMultiFrame:
-				{
-				_LOG_L4C1("Starting new IP frame list");
-				iCurrentIpPacketLength = 0;
-				}
-				break;
-			case KEndMultiFrame:
-			case KMiddleMultiFrame:
-			default:
-				// assumption here is that because no read buffer is allocated then
-				// there cannot have been a valid start frame
-				_LOG_L1C1("** Missed start of packet - disregarding **");
-
-				// Place received frame on the empty list
-				iPortFactory.GetMux0710Protocol()->AddFrameFreeQ(aFrame);
-
-				_LOG_L4C1("<<CPortC32InterfaceIp::SendFrameToClient - no start");
-				return;
-				}
-			}
-		else if ((framePosition == KSingleFrame)||(framePosition == KStartMultiFrame))
-			{
-			// There's been a comms error and an end packet has been lost
-			_LOG_L1C1("** Unexpected Start/Single frame - disregarded previous frames **");
-
-			// Place received frames on the empty list
-			PlaceIpPacketFramesOntoFreeList();
-
-			// Continue processing this frame
-			_LOG_L4C1("Starting new IP frame list");
-			iCurrentIpPacketLength = 0;
-			}
-
-		// If have got to here then IP frame list exists
-
-		TInt length = aFrame->iMsg.Length() - KAdvOptionNumOfNonDataOctets;
-		_LOG_L4C2("length=%d",length);
-
-		// length validation
-		if ((iCurrentIpPacketLength + length) > KMaxIpPacketSize)
-			{
-			// The length of the data in the new frame would exceed that available
-			// in the read buffer.
-
-			_LOG_L1C3("** iCurrentIpPacketLength + length %d exceeds max size %d **",
-				(iCurrentIpPacketLength + length),KMaxIpPacketSize);
-
-			// Place received frames on the empty list
-			iPortFactory.GetMux0710Protocol()->AddFrameFreeQ(aFrame);
-			PlaceIpPacketFramesOntoFreeList();
-
-			_LOG_L4C1("<<CPortC32InterfaceIp::SendFrameToClient - frame sized exceeded");
-			return;
-			}
-
-		// If have got to here IP frame list exists and length is valid
-		iCurrentIpPacketLength += length;
-
-		TBool addReadBufferToClientList = EFalse;
-		switch (framePosition)
-			{
-		// Single frame	
-		case KSingleFrame:
-			_LOG_L4C1("Only frame");
-			iFramesReceivedForIpPacket.AddFirst(*aFrame);
-			addReadBufferToClientList = ETrue;
-			break;
-
-		// Multiframe
-		case KStartMultiFrame:
-			_LOG_L4C1("Start multiframe");
-			iFramesReceivedForIpPacket.AddFirst(*aFrame);
-			break;
-
-		case KMiddleMultiFrame:
-			_LOG_L4C1("Middle multiframe");
-			iFramesReceivedForIpPacket.AddLast(*aFrame);
-			break;
-
-		case KEndMultiFrame:
-			_LOG_L4C1("Last multiframe");
-			iFramesReceivedForIpPacket.AddLast(*aFrame);
-			addReadBufferToClientList = ETrue;
-			break;
-
-		// Unknown
-		default:
-			_LOG_L1C2("** Unknown framePosition %d - ignoring **",
-				framePosition);
-
-			// Place received frame on the empty list
-			iPortFactory.GetMux0710Protocol()->AddFrameFreeQ(aFrame);
-			PlaceIpPacketFramesOntoFreeList();
-
-			_LOG_L4C1("<<CPortC32InterfaceIp::SendFrameToClient - unknown frame pos");
-			return;
-			}
-
-		if (addReadBufferToClientList)
-			{
-			// Give iFramesWaitingToBeReadList ownership of the frames making up the IP Packet
-			_LOG_L4C1("Transfer frames to client msg list");
-
-			// check if queue is empty
-			TBool trigger = iFramesWaitingToBeReadList.IsEmpty();
-
-			PlaceIpPacketFramesOntoReadList();
-
-			if (trigger)
-				{
-				_LOG_L4C1("No packets already waiting");
-				if (iIsReadInProgress)
-					{
-					_LOG_L4C1("A read is outstanding");
-					ReadFromBufOrQueue();
-					}
-				}
-
-			// inform client new data is available
-			SetDataAvailable();
-			}
-		}
-	else
-		{
-		_LOG_L1C1("** aFrame is null **");
-		// MAF __ASSERT_DEBUG(EFalse, PANIC(KPanicIllegalState));
-		}
-
-	_LOG_L4C1("<<CPortC32InterfaceIp::SendFrameToClient");
-	}
-
-TBool CPortC32InterfaceIp::CreateIpPacketFromFrames()
-/**
- * We assume that all validation has been done during SendFrameToClient so only valid
- * data exists on the iFramesWaitingToBeReadList frame list.
- *
- * @return ETrue if packet retrieved successfully
- */
-	{
-	_LOG_L4C2(">>CPortC32InterfaceIp::CreateIpPacketFromFrames [port=%d]", GetPortNumber());
-
-	iIpPacket.Zero();
-
-	TUint8	framePosition = 0;
-	TInt	length = 0;
-	TBool	packetRetrieved = EFalse;
-
-	// Remove all frames to do with the same IP Packet from waiting to be read list
-	CCsyMsgBufBpFrame* frame = NULL;
-	iFramesWaitingToBeReadIter.SetToFirst();
-	while ((frame = iFramesWaitingToBeReadIter++) != NULL)
-		{
-		iFramesWaitingToBeReadList.Remove(*frame);
-
-		framePosition = frame->GetType4FrameSequence();
-		_LOG_L4C2("framePosition = 0x%02x",framePosition);
-
-		length = frame->iMsg.Length() - KAdvOptionNumOfNonDataOctets;
-		_LOG_L4C2("length=%d",length);
-
-		iIpPacket.Append(&frame->iMsg[KAdvOptionType4StartOfMessageData], length);
-
-		iPortFactory.GetMux0710Protocol()->AddFrameFreeQ(frame);
-
-		if ((framePosition == KSingleFrame)||(framePosition == KEndMultiFrame))
-			{
-			_LOG_L4C1("retrieved packet");
-			packetRetrieved = ETrue;
-
-			if (iNumberOfPacketsWaiting == KMaxPacketsOutstandingForC32Client)
-				{
-				_LOG_L2C1("Client appears to be reading again");
-
-				// Assume it is okay to set FC to Off even in low free frame
-				// condition since just freed a frame.
-
-				iMuxChannel->SetCsyToModemFlowControl(EFlowControlOff);
-				}
-
-			iNumberOfPacketsWaiting--;
-			_LOG_L4C2("iNumberOfPacketsWaiting=%d",iNumberOfPacketsWaiting);
-			break;
-			}
-		}
-
-	_LOG_L4C2("<<CPortC32InterfaceIp::CreateIpPacketFromFrames [packetRetrieved=%d]",packetRetrieved);
-	return packetRetrieved;
-	}
-
-TBool CPortC32InterfaceIp::ReadFromBufOrQueue()
-/**
- * This method is called to read from buffer or the frame list
- * It will read as much as possible.
- *
- * @return ETrue if complete the read request
- */
-	{
-	_LOG_L4C2(">>CPortC32InterfaceIp::ReadFromBufOrQueue [port=%d]", GetPortNumber());
-
-	TBool completedRead = EFalse;
-	TInt ret = KErrNone;
-
-	_LOG_L4C2("iOneOrMore=%d",iOneOrMore);
-	_LOG_L4C2("iClientLength=%d",iClientLength);
-
-	while ((CreateIpPacketFromFrames())&&(!ret))
-		{
-		TInt ipPacketLength = iIpPacket.Length();
-		TInt length = -1; 
-		if (iClientLength - iPos < ipPacketLength)
-			{
-			length = iClientLength - iPos;
-			_LOG_L4C2("length remaining = %d",length);
-			}
-
-		if ((length > -1) && (ipPacketLength >= length))
-			{
-			// MAF should partial reads be allowed?
-			_LOG_L2C1("Partial read?");
-
-			}
-		else
-			{
-			_LOG_L4C3("read buf %d >= length %d ", ipPacketLength, length);
-
-			ret = IPCWrite(iClientBuffer, iIpPacket, iPos);
-			if (ret)
-				{
-				_LOG_L1C2("** IPCWrite Error %d **",ret);
-				}
-
-			_LOG_L4C3("Read: iPos = %d, add %d bytes", iPos, ipPacketLength);
-
-			iPos += ipPacketLength;
-			}
-		}
-
-	if (iPos>0)
-		{
-		if (iOneOrMore)
-			{
-			CompleteReadRequest(ret);
-
-			iPos = 0;
-			completedRead = ETrue;
-			}
-		else
-			{
-			//normal read? and have not filled the buffer yet
-			_LOG_L4C3( "Not filled buffer yet iPos = %d, iClientLength = %d", iPos, iClientLength);
-			}
-		}
-	
-	_LOG_L4C2("<<CPortC32InterfaceIp::ReadFromBufOrQueue [completedRead=%d]", completedRead);
-	return completedRead;
-	}
-
-
-/***
-TBool CPortC32InterfaceIp::ReadFromBufOrQueue()
-**
- * This method is called to read from buffer or the frame list
- * It will read as much as possible.
- *
- * @return ETrue if complete the read request
- *
-	{
-	_LOG_L4C2(">>CPortC32InterfaceIp::ReadFromBufOrQueue [port=%d]", GetPortNumber());
-
-	TBool completedRead = EFalse;
-	TInt err = KErrGeneral;
-	TBool cont;
-	do
-		{
-		cont = EFalse;
-		if(iQueuedIpPacket == NULL)
-			{
-			//Read data from the frame list
-			if (!iMsgToClientList.IsEmpty())
-				{
-				_LOG_L4C1("Set to first item");
-				iQueuedIpPacket = iMsgToClientList.First();
-				if (iQueuedIpPacket)
-					{
-					_LOG_L4C1("iQueuedIpPacket not null");
-					// remove msg buf from client list
-					iMsgToClientList.Remove(*iQueuedIpPacket);
-					}
-				}
-			}
-		if (iQueuedIpPacket)
-			{
-			TInt length = KErrNotFound; // <- yeaks!
-			if (iClientLength - iPos < iQueuedIpPacket->iMsg.Length())
-				{
-				length = iClientLength - iPos;
-				_LOG_L4C2("length remaining = %d",length);
-				}
-
-			if (iConfig.iTerminatorCount > 0)
-				{
-				_LOG_L4C2("iTerminatorCount = %d",iConfig.iTerminatorCount);
-
-				// First find terminator
-				TInt terminatorLoc = KErrNotFound; // <- yeaks!
-				TInt loc;
-				for (TInt i = 0; i < iConfig.iTerminatorCount; i++)
-					{
-					loc = iQueuedIpPacket->iMsg.LocateF(iConfig.iTerminator[i]);
-					if (loc > KErrNotFound)
-						{
-						if (terminatorLoc == KErrNotFound)
-							{
-							terminatorLoc = loc;
-							}
-						else
-							{
-							terminatorLoc = Min(loc,terminatorLoc);
-							}
-						}
-					}
-				if (terminatorLoc > KErrNotFound)
-					{
-					if (length > KErrNotFound)
-						length = Min(terminatorLoc + 1,length);
-					else
-						length = terminatorLoc + 1;
-					}
-				_LOG_L4C2("length = %d",length);
-				}
-
-			_LOG_L4C2("Read buf length %d",iQueuedIpPacket->iMsg.Length());
-
-			if ((iQueuedIpPacket->iMsg.Length() >= length) && (length > KErrNotFound))
-				{
-				LOGTEXT2(__DEBUGLEVELMAJOR__,"complete partial read: # %d ", length);
-
-				iPartialReadBuf.Copy(&iQueuedIpPacket->iMsg[0], length);
-				iQueuedIpPacket->iMsg.Delete(0, length);
-
-				err = IPCWrite(iClientBuffer, iPartialReadBuf, iPos); 
-				if (err)
-					{
-					_LOG_L1C2("** IPCWrite Error %d **",err);
-					}
-
-				CompleteReadRequest(err);
-				err = KErrGeneral;
-
-				completedRead = ETrue;
-				iPos = 0;
-
-				if (iQueuedIpPacket->iMsg.Length() == 0)
-					{
-					_LOG_L4C1("All data used - freeing read buffer");
-					AddToFreeC32BufferQ(iQueuedIpPacket);
-					iQueuedIpPacket = NULL;
-					}
-				}
-			else
-				{
-				LOGTEXT3(__DEBUGLEVELMAJOR__,"read buf %d >= length %d ", iQueuedIpPacket->iMsg.Length(), length);
-
-				err = IPCWrite(iClientBuffer, iQueuedIpPacket->iMsg, iPos);
-
-				_LOG_L4C3("Read: iPos = %d, add %d bytes", iPos, iQueuedIpPacket->iMsg.Length());
-
-				cont = ETrue; //try read next frame in the list
-				iPos = iPos + iQueuedIpPacket->iMsg.Length();
-
-				_LOG_L4C1("Freeing read buffer");
-				AddToFreeC32BufferQ(iQueuedIpPacket);
-				iQueuedIpPacket = NULL;
-				}
-			}
-		}
-	while (cont);
-
-	if (iPos>0)
-		{
-		if (iOneOrMore)
-			{
-			if (err)
-				{
-				_LOG_L1C2("** IPCWrite Error %d **",err);
-				}
-
-			CompleteReadRequest(err);
-
-			iPos = 0;
-			completedRead = ETrue;
-			}
-		else
-			{
-			//normal read and have not filled the buffer yet
-			_LOG_L4C3( "Not filled buffer yet iPos = %d, iClientLength = %d", iPos, iClientLength);
-			//iToClientMsgQAo->IssueNotificationRequest();
-			}
-		}
-
-	_LOG_L4C2("<<CPortC32InterfaceIp::ReadFromBufOrQueue [ret=%d]",completedRead);
-	return completedRead;
-	}
-***/
-
-

--- a/cbsref/csyrefplugins/csy27010/src/PortFactory.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,982 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file contains the implementation for the class CPortFactory.
-// *               This class is used to create C32 port interface instances.
-//
-
-// PortFactory.cpp
-
-/** @file PortFactory.cpp
- *
- */
-
-/*! \mainpage CSY 27.010 Documentation
- *
- * \section intro Introduction
- *
- * This CSY has been designed and implemented by TapRoot Systems.
- * This CSY is part of the TapRoot Systems Communications Platform (CommP)
- * product family for Symbian OS. Please contact TapRoot Systems for 
- * information on CommP.
- * <p>
- * A CSY is a specialized type of DLL that implements API interfaces
- * required by the C32 Serial Communications Server. "CSY" is the file
- * name extension used by CSY modules as in "ecuart.csy", which is the
- * name of Symbian's generic CSY for non-multiplexed serial ports.  
- * TapRoot Systems 27.010 CSY (gsm0701.csy) is compatible with the
- * 3GPP 27.010 v5.0.0 specification.
- * <p>
- * The CSY has been designed and tested with the Intel Lubbock application
- * processor, TI Condat baseband processor and Symbian OS 8.0a.
- * The CSY is not guaranteed to work with other AP's, BP's or Symbian OS versions.
- * The CSY has been integrated with Symbian OS supplied TSY and NIF IP.
- * The CSY is not guaranteed to work with other TSY's and NIF's.
- *
- * \section feat Features
- *
- * The CSY supports the 27.010 Basic Option. The 3GPP 27.010 specification 
- * is derived from the GSM 07.10 specification. 3GPP 27.010 defines a mechanism
- * whereby multiple commands and data streams can be carried over the same
- * physical link. This specification defines a multiplexing protocol between
- * a Terminal Equipment (TE) and a Mobile Station (MS) allowing multiple 
- * simultaneous sessions over a single start-stop, framed, serial link. 
- * Each session (channel) can carry different types of data including voice,
- * fax, data, SMS, CBS, phonebook maintenance, battery status, GPRS, USSD, etc.
- * <p>
- * The multiplexer has three operating options, basic, advanced without error
- * recovery and advanced with error recovery. CSY 27.010 supports the
- * basic option. The basic option is recommended on highly reliable links. 
- * Advanced options are not supported by the CSY. The characteristics of the 
- * basic option are:
- * <li> Length indicator used instead of the HDLC transparency mechanism
- * <li> Different flag octet from that used by HDLC
- * <li> Cannot be used on links that use XON/XOFF flow control
- * <li> May have longer recovery procedure from loss of synchronization
- * <p>
- * Each channel between the TE and MS is called a Data Link Connection (DLC).
- * A special DLC called "control channel" is used to exchange management 
- * information (e.g. parameter negotiation), power saving control information,
- * testing, flow control, close down, etc. between the TE and MS.
- * <p>
- * The multiplexer is activated with the 3GPP 27.007 AT+CMUX command.
- * <p>
- * 
- * \section install Installation
- *
- * Refer to the readme.txt file for installation and build instructions.
- * <br>
- * Please contact TapRoot Systems for information on product updates and
- * additional support.
- */
-
-/** @file PortFactory.cpp
- * This file contains the implementation for the class CPortFactory.
- * This class is used to create C32 port interface instances.
- */
-
-#include <cs_port.h>
-#include <f32file.h>
-#include <commsdattypesv1_1.h>
-#include <commsdat_partner.h>
-using namespace CommsDat;
-#include "Portfactory.h"
-#include "CsyGlobals.h"
-#include "Mux0710Protocol.h"
-#include "ChannelMgrCtrl.h"
-#include "ChannelMgrCmdData.h"
-#include "PortC32InterfaceBase.h"
-#include "PortC32Interface.h"
-#include "PortC32InterfaceIp.h"
-#include "CommFrameWriterAo.h"
-#include "CommFrameReaderAo.h"
-#include "CsyDebugLogger.h"
-
-CPortFactory* CPortFactory::NewL()
-/**
- * This method uses two phase construction and the cleanup stack to create
- * an instance of class CPortFactory. This method is invoked when the user
- * invokes the C32 comm server's LoadCommModule() method to load the CSY.
- * Note that multiple instances of CPortFactory can be created by C32,
- * so no memory allocation or objects should be created when the 
- * port factory is first created.
- *
- * @return Pointer to the created instance of CPortFactory
- */
-	{
-	_LOG_L4C1("CPortFactory::NewL");
-
-	CPortFactory* self = new(ELeave) CPortFactory;
-	TCleanupItem closeSelf(CPortFactory::CloseObject, self);
-	CleanupStack::PushL(closeSelf);
-	self->ConstructL();
-	CleanupStack::Pop(self);
-	return (self);
-	}
-
-CPortFactory::CPortFactory()
-: iPortC32InterfaceList(_FOFF(CPortC32Interface, iLink)),
-  iPortC32InterfaceIter(iPortC32InterfaceList),
-  iDataChannelList(_FOFF(CChannelMgrCmdData, iLink)),
-  iDataChannelIter(iDataChannelList)
-/**
- * Constructor.
- */
-	{
-	_LOG_L4C1("CPortFactory::CPortFactory");
-	}
-
-CPortFactory::~CPortFactory()
-/**
- * Destructor. Delete all objects and memory created/allocated by this class.
- */
-	{
-	_LOG_L4C1(">>CPortFactory::~CPortFactory");
-
-	// check if the CSY's objects have been created 
-	// C32 creates a new instance of the port factory each time a client
-	// loads the CSY. The C32 recognizes a redundant CSerial name and promptly
-	// destroys the redundant CSY.
-	if (iMuxObjectsCreated)
-		{
-		// client channels
-		CChannelMgrCmdData* anyChannel = NULL;
-		iDataChannelIter.SetToFirst();
-		while ((anyChannel = iDataChannelIter++) != NULL)
-			{
-			iDataChannelList.Remove(*anyChannel);
-			delete anyChannel;
-			}
-
-		// control channel
-		delete iChannelCtrl;
-
-		delete iCommWriterAo;
-		delete iCommReaderAo;
-
-		delete iMux0710Protocol;
-
-		// may not be necessary ???
-		// MAF /\ what does this comment mean
-
-		// delete any remaining C32 port objects that were not closed by the client
-		CPortC32InterfaceBase* port = NULL;
-		iPortC32InterfaceIter.SetToFirst();
-		while ((port = iPortC32InterfaceIter++) != NULL)
-			{
-			delete port;
-			}
-
-		iCommPort.Close();
-		}
-
-	//iMuxObjectsCreated = EFalse;
-
-	_LOG_L4C1("<<CPortFactory::~CPortFactory");
-	_LOG_L3C1(" ");
-	}
-
-void CPortFactory::ConstructL()
-/**
- * 2nd-phase construction. Registers the CSY Name with C32.
- */
-	{
-	_LOG_L4C1("CPortFactory::ConstructL");
-
-#ifdef _DEBUG
-	TInt usedCellCount;
-	TInt freeCellCount;
-	usedCellCount = User::CountAllocCells(freeCellCount);
-	_LOG_L4C3("Cell Counts Used = %d   Free = %d", usedCellCount, freeCellCount);
-#endif
-
-	// inform C32 of the CSY name
-	TName name(KCSY_Gsm0710ServerName);
-	TInt retVal1 = SetName(&name);
-	if (retVal1 != KErrNone)
-		{
-		_LOG_L1C3("** Failed to set CSY:%S in C32. Err: %d **", &name, retVal1);
-		User::Leave(retVal1);
-		}
-	iVersion = TVersion(KCSY_Gsm0710MinorVersionNumber,
-						KCSY_Gsm0710MajorVersionNumber,
-						KCSY_Gsm0710BuildVersionNumber);
-	}
-
-void CPortFactory::CreateCsyObjectsL()
-/**
- * This method is called to create the CSY objects for the multiplexing channels,
- * message queues, i/o interface, etc.  This method should be called when the
- * 1st client request to create a port is received by the CSY via NewPortL().
- */
-	{
-	_LOG_L4C1(">>CPortFactory::CreateCsyObjectsL");
-
-	// set flag
-	iMuxObjectsCreated = ETrue;
-	iOpenPortFailed = EFalse;
-
-	// load physical device drivers for serial port(s)
-
-#ifdef __WINS__
-	// 1st make sure the file server is running
-	RFs fileServer;
-	User::LeaveIfError(fileServer.Connect());
-	fileServer.Close();
-
-	_LIT(KPDDName, "ECDRV");
-	TInt retVal1 = User::LoadPhysicalDevice(KPDDName);
-	if ((retVal1 != KErrNone) && (retVal1 != KErrAlreadyExists))
-		User::Leave(retVal1);
-
-#else  // target
-
-	TBuf<20> commPddName;
-	TInt retVal1;
-
-	commPddName.Copy(KCsyDefaultPDDNameComm1);
-	retVal1 = User::LoadPhysicalDevice(commPddName);
-	if ((retVal1 != KErrNone) && (retVal1 != KErrAlreadyExists))
-		User::Leave(retVal1);
-	// only load 2nd PDD if debugging is enabled 
-
-#ifdef __DEBUGSERIALPORT__
-	commPddName.Copy(KCsyDefaultPDDNameComm2);
-	retVal1 = User::LoadPhysicalDevice(commPddName);
-	if ((retVal1 != KErrNone) && (retVal1 != KErrAlreadyExists))
-		User::Leave(retVal1);
-#endif //__DEBUGSERIALPORT__
-
-#endif  //__WINS__
-
-	// load logical device driver for serial ports
-	_LIT(KLDDName, "ECOMM");
-	retVal1 = User::LoadLogicalDevice(KLDDName);
-	if ((retVal1 != KErrNone) && (retVal1 != KErrAlreadyExists))
-		User::Leave(retVal1);
-
-	ConfigurePhysicalCommPortL();
-	
-	// create 27.010 framer and comm i/o objects
-	iMux0710Protocol = CMux0710Protocol::NewL(*this);
-	iCommWriterAo    = CCommFrameWriterAo::NewL(this, iMux0710Protocol);
-	iMux0710Protocol->SetCommWriter(iCommWriterAo);
-
-	iCommReaderAo    = CCommFrameReaderAo::NewL(this, iMux0710Protocol);
-	iCommReaderAo->Read();  // start it
-	
-	// create the Multiplexer Control Channel
-	iChannelCtrl = CChannelMgrCtrl::NewL(*this, *iMux0710Protocol);
-
-	// create All Multiplexer Channels	
-	for (TUint8 i=1; i < KCsyDefaultMaxDLCChannels; i++)
-		{
-		CChannelMgrCmdData* channelMgrCmd =
-			CChannelMgrCmdData::NewL(i, *this, *iMux0710Protocol);
-		iDataChannelList.AddLast(*channelMgrCmd);
-		}
-
-	// switch to multiplexer mode
-	iMux0710Protocol->SwitchToMuxMode();
-
-#ifdef _DEBUG
-	TInt usedCellCount;
-	TInt freeCellCount;
-	usedCellCount = User::CountAllocCells(freeCellCount);
-	_LOG_L4C3("Cell Counts Used = %d   Free = %d", usedCellCount, freeCellCount);
-#endif
-
-	_LOG_L4C1("<<CPortFactory::CreateCsyObjectsL");
-	}
-
-void CPortFactory::CloseObject(TAny* aObject)
-/**
- * Utility to close objects created by the port factory. 
- * Used during construction with the cleanup stack.
- *
- * @param aObject - The CObject to close.
- * @return void
- */
-	{
-	reinterpret_cast<CObject*>(aObject)->Close();
-	}
-
-CPort* CPortFactory::NewPortL(const TUint aUnit)
-/**
- * This method is called by C32 when a port is opened via RComm::Open().
- * An instance of the CSY's class CPortC32Interface is created.
- * The instance is assigned a channel manager and then is added to
- * the list of C32 port interface objects.
- *
- * @param aUnit - Numeric portion of the port identifier
- * @return Pointer to the created C32 port interface object
- */
-	{
-	_LOG_L4C2(">>CPortFactory::NewPortL [aUnit=%d]", aUnit);
-
-	TC32PortInfo portInfo;
-
-	portInfo.iClientType = GetClientType(aUnit);
-	portInfo.iPortNumber = aUnit;
-
-	// check if port number is valid and translates to a client type
-	if (portInfo.iClientType == EC32ClientUndefined)
-		{
-		_LOG_L4C1("<<CPortFactory::NewPortL - ** Unknown client **");
-		return NULL;
-		}
-
-	// check if this is the 1st port to be opened
-	if (!iMuxObjectsCreated)
-		{
-		_LOG_L4C1("first port to be opened");
-		CreateCsyObjectsL();
-		}
-	else if (iChannelCtrl->GetChannelReady() == EFalse)
-		{
-		_LOG_L4C1("CSY objects already exist");
-		// switch to multiplexer mode
-		iMux0710Protocol->SwitchToMuxMode();
-		}
-
-	// first make sure control channel is already connected
-	iChannelCtrl->WaitForChannelReady();
-	
-	if (! iOpenPortFailed)
-		{
-		// create a new C32 Interface Port based on port number
-		CPortC32InterfaceBase* port = NULL;
-	
-		if (portInfo.iClientType == EC32ClientIpNif)
-			{
-			_LOG_L4C1("Raw IP port");
- 			port = CPortC32InterfaceIp::NewL(*this, portInfo);
- 			}
-		else
-			{
-			_LOG_L4C1("Normal port");
- 			port = CPortC32Interface::NewL(*this, portInfo);
- 			}
-	
-		CleanupStack::PushL(port);
-		CChannelMgrCmdData* channel = FindChannelMgr(aUnit);
-
-		if (channel == NULL)
-			{
-			_LOG_L2C1("** channel is null, delete interface **");
-			CleanupStack::PopAndDestroy(port);
-			User::Leave(KErrNotFound);
-			}
-		TName name;
-		name.Format(_L("%d"), aUnit);
-		port->SetName(&name);
-
-		// channel->Open() will add this port to it's port list, and connect channel if needed
-		// Make sure that during channel init we do not tx/rx through channel
-		channel->Open(port);
-	
-		iNumOfOpenPorts++;
-		_LOG_L4C2("No. of ports = %d",iNumOfOpenPorts);
- 		
-		port->SetMuxChannel(channel);
-
-		channel->WaitForChannelReady();
-
-		//Need to wait for the channel to be ready. How to wait for something without blocking whole thread?
-		// add it to list of ports
-		iPortC32InterfaceList.AddLast(*port);	
-		CleanupStack::Pop(port);
-
-#ifdef _DEBUG
-		TInt usedCellCount;
-		TInt freeCellCount;
-		usedCellCount = User::CountAllocCells(freeCellCount);
-		_LOG_L4C3("Cell Counts Used = %d   Free = %d", usedCellCount, freeCellCount);
-#endif
-
-		_LOG_L4C2("<<CPortFactory::NewPortL [port=%d]", port);
-		return port;
-		}
-	else //iPortOpenFailed == ETrue
-		{
-		_LOG_L4C1("<<CPortFactory::NewPortL [port=NULL]");
-		User::Leave(KErrTimedOut);
-		return NULL;
-		}
-	}
- 
-void CPortFactory::Info(TSerialInfo& aSerialInfo)
-/**
- * Called by C32 to identify the CSY module.
- * @param aSerialInfo - Reference holder for information to be populated by the function.
- * @return void
- */
-	{
-	_LOG_L4C1("CPortFactory::Info");
-
-	aSerialInfo.iDescription	= KCSY_Description;
-	aSerialInfo.iName			= KCSY_Gsm0710ServerName;
-	aSerialInfo.iLowUnit		= KCSY_Gsm0710LowUnit;
-	aSerialInfo.iHighUnit		= KCSY_Gsm0710HighUnit;
-	}
-
-CPortFactory::TC32ClientType CPortFactory::GetClientType(TInt aC32PortNum)
-/**
- * Returns the ClientType for the specified C32 port number.
- * @param aC32PortNum -  C32 port number
- * @return Client type - TSY or NIF
- */
-	{ 
-	_LOG_L4C2("CPortFactory::GetClientType [aC32PortNum=%d]", aC32PortNum);
-
-	if (aC32PortNum >= KCOMMP_IP_NIF_OFFSET)
-		{
-		_LOG_L4C1("Raw Ip");
-		return CPortFactory::EC32ClientIpNif;
-		}
-	else if (aC32PortNum == KCOMMP_CSD_PPP_NUMBER)
-		{ 
-		_LOG_L4C1("Csd PPP");
-		return CPortFactory::EC32ClientNif;
-		}
-
-	_LOG_L4C1("Tsy");
-	return CPortFactory::EC32ClientTsy;
-	}
-
-CPortC32InterfaceBase* CPortFactory::FindPortC32Interface(const TUint8 aDlcNum)
-/**
- * This method returns a pointer to the C32 port interface object 
- * that is associated with the specified DLC number.
- *
- * @param aDlcNum - DLC number
- * @return Pointer to C32 port interface object or NULL if not found
- */
-	{
-	_LOG_L4C2(">>CPortFactory::FindPortC32Interface [aDlcNum=%d]", aDlcNum);
-
-	CPortC32InterfaceBase* port = NULL;
-
-	CChannelMgrCmdData* anyChannel = NULL;
-	iDataChannelIter.SetToFirst();
-	while ((anyChannel = iDataChannelIter++) != NULL)
-		{
-		if (anyChannel->GetDlcNumber() == aDlcNum)
-			{
-			_LOG_L4C1("AT channel");
-			port = anyChannel->GetC32Port();
-			break;
-			}
-		}
-	
-	_LOG_L4C2("<<CPortFactory::FindPortC32Interface [port=0x%x]",port);
-	return port;
-	}
-
-CChannelMgrCmdData* CPortFactory::FindChannelMgr(const TUint aC32PortNum)
-/**
- * This method is only called when a port is created.
- *
- * @param aC32PortNum - C32 port number
- * @return Pointer to the channel manager object or NULL
- */
-	{
-	_LOG_L4C2(">>CPortFactory::FindChannelMgr [aC32PortNum=%d]", aC32PortNum);
-
-	TUint dlcNum = ++iLastDlcNum;
-	_LOG_L4C2("iLastDlcNum: %d", iLastDlcNum);
-
-	//
-	// MAF Horrible
-	// This just counts through the array of channel pointers
-	// and returns a pointer when the count gets to the correct value.
-	// 
-	// We should be able to use an array here and directly access it using
-	// the dlc number!?!?
-	//
-
-	TUint count  = 1;
-	CChannelMgrCmdData* anyChannelCmd;
-
-	iDataChannelIter.SetToFirst();
-	while ((anyChannelCmd = iDataChannelIter++) != NULL)
-		{
-		if (count == dlcNum)
-			{
-			_LOG_L4C2("<<CPortFactory::FindChannelMgr() - found, count %d",count);
-			return anyChannelCmd;
-			}
-		count++;
-		}
-
-	_LOG_L4C1("<<CPortFactory::FindChannelMgr() - *** NOT FOUND ***");
-	return NULL;
-	}
-
-CChannelMgrCmdData* CPortFactory::FindChannelMgrByDlcNum(const TUint8 aDlcNum)
-/**
- * This method returns a pointer to the channel manager object 
- * that has the specified  DLC number.
- *
- * @param aDlcNum -  DLC number
- * @return Pointer to the channel manager object or NULL
- */
-	{
-	_LOG_L4C2(">>CPortFactory::FindChannelMgrByDlcNum [aDlcNum=%d]", aDlcNum);
-
-    CChannelMgrCmdData* channel = NULL;
-	iDataChannelIter.SetToFirst();
-	while ((channel = iDataChannelIter++) != NULL)
-		{
-		if (channel->GetDlcNumber() == aDlcNum)
-			{
-			_LOG_L4C1("AT channel");
-			return channel;
-			}
-		}
-
-	_LOG_L2C1("<<CPortFactory::FindChannelMgrByDlcNum() - NOT FOUND");
-	return NULL;
-	}
-
-TInt CPortFactory::ConfigurePhysicalCommPortL()
-/**
- * This method is used to configure the specified physical comm port.
- * The parameters are read from CommDb or supplied by C32.
- * @param aPhysPortNum - Physical port number
- * @return KErrorNone or KErrAccessDenied.
- */
-	{
-	_LOG_L4C1(">>CPortFactory::ConfigurePhysicalCommPortL");
-
-	// create a package pointer
-	TPckgBuf<TCommConfigV01> newCfg;
-	TInt ret, len;
-
-	// get the modem table	- Get port settings from CommDB.
-	CMDBSession* db = CMDBSession::NewL(KCDLatestVersion);
-
-	CleanupStack::PushL(db);
-
-	TUint32 modemId = 0;
-
-	// We are using the same modem as TSY
-	// Accessing the ModemPhoneServicesSMS field in the Global Settings Table
-	CMDBField<TUint32>* globalSettingsField = new(ELeave) CMDBField<TUint32>(KCDTIdModemPhoneServicesSMS);
-	CleanupStack::PushL(globalSettingsField);
-	globalSettingsField->SetRecordId(1);
-	globalSettingsField->LoadL(*db);
-	modemId = *globalSettingsField;	// The field value gives the record id in the Modem Bearer Table.
-	CleanupStack::PopAndDestroy(globalSettingsField);
-	
-	_LOG_L4C2("Accessing modem entry %d in the modem table", modemId);
-
-	TUint32 rate;
-	TUint32 dataBits;
-	TUint32 stopBits;
-	TUint32 parity;
-	TUint32 handshake;
-	TPckgBuf<TCommConfigV01> config;
-	
-	TUint port = 0;
-	TBuf<KCommsDbSvrMaxFieldLength> controlPort;
-	
-	// Accessing the ControlChannelPort Name from the ModemBearer Table in the record number 
-	//corresponding to modemId
-	CMDBField<TDesC>* portField = new(ELeave) CMDBField<TDesC>(KCDTIdControlChannelPortName);
-	CleanupStack::PushL(portField);
-	portField->SetRecordId(modemId);
-	portField->SetMaxLengthL(KMaxTextLength);
-	portField->LoadL(*db);
-	controlPort = *portField;
-	CleanupStack::PopAndDestroy(portField);
-	// Diagnostics - control port
-	if (controlPort.Length())
-		{
-		TBuf8<16> portName;
-		portName.Copy(controlPort.Left(16));
-		_LOG_L4C2("Control port(MODEM_CONTROL_CHANNEL_PORT_NAME) '%S'",
-			&portName);
-
-		// Get number of port out of the port descriptor.
-		_LIT(KDoubleColon, "::");
-		TInt len = controlPort.Find(KDoubleColon);
-		if (len < KErrNone)
-			{
-			_LOG_L1C1("** finding :: in control port failed **");
-			User::Leave(KErrGeneral);
-			}
-		TUint numPos = len + KDoubleColon.iTypeLength;
-		TPtrC numPtr(&controlPort[numPos], controlPort.Length() - numPos);
-		TLex lexer(numPtr);
-		TInt ret = lexer.Val(port);
-		if (ret)
-			{
-			_LOG_L1C1("** lexing to get port number failed **");
-			User::Leave(ret);
-			}
-		}
-	else
-		{
-		_LOG_L1C1("** Control port not set in commDb **");
-		User::Leave(KErrGeneral);
-		}
-	
-	// Accessing the Rate from the ModemBearer Table in the record number 
-	//corresponding to modemId
-	CMDBField<TUint32>* rateField = new(ELeave) CMDBField<TUint32>(KCDTIdRate);
-	CleanupStack::PushL(rateField);
-	rateField->SetRecordId(modemId);
-	rateField->LoadL(*db);
-	rate = *rateField;
-	CleanupStack::PopAndDestroy(rateField);
-	
-	// Accessing the DataBits from the ModemBearer Table in the record number 
-	//corresponding to modemId
-	CMDBField<TUint32>* dataBitsField = new(ELeave) CMDBField<TUint32>(KCDTIdDataBits);
-	CleanupStack::PushL(dataBitsField);
-	dataBitsField->SetRecordId(modemId);
-	dataBitsField->LoadL(*db);
-	dataBits = *dataBitsField;
-	CleanupStack::PopAndDestroy(dataBitsField);
-
-	// Accessing the StopBits from the ModemBearer Table in the record number 
-	//corresponding to modemId
-	CMDBField<TUint32>* stopBitsField = new(ELeave) CMDBField<TUint32>(KCDTIdStopBits);
-	CleanupStack::PushL(stopBitsField);
-	stopBitsField->SetRecordId(modemId);
-	stopBitsField->LoadL(*db);
-	stopBits = *stopBitsField;
-	CleanupStack::PopAndDestroy(stopBitsField);
-	
-	// Accessing the Parity from the ModemBearer Table in the record number 
-	//corresponding to modemId
-	CMDBField<TUint32>* parityField = new(ELeave) CMDBField<TUint32>(KCDTIdParity);
-	CleanupStack::PushL(parityField);
-	parityField->SetRecordId(modemId);
-	parityField->LoadL(*db);
-	parity = *parityField;
-	CleanupStack::PopAndDestroy(parityField);
-	
-	// Accessing the HandShake from the ModemBearer Table in the record number 
-	//corresponding to modemId
-	CMDBField<TUint32>* handshakeField = new(ELeave) CMDBField<TUint32>(KCDTIdHandshaking);
-	CleanupStack::PushL(handshakeField);
-	handshakeField->SetRecordId(modemId);
-	handshakeField->LoadL(*db);
-	handshake = *handshakeField;
-	CleanupStack::PopAndDestroy(handshakeField);
-
-	config().iRate		  = (TBps)rate;
-	config().iDataBits    = (TDataBits)dataBits;
-	config().iStopBits    = (TStopBits)stopBits;
-	config().iParity      = (TParity)parity;
-	config().iHandshake   = (TUint)handshake;
-	config().iParityError = KConfigParityErrorIgnore;
-	config().iFifo        = static_cast<TUint>(EFifoEnable);
-
-	newCfg.Copy(config);
-
-	ret = iCommPort.Open(port);
-	if (ret)
-		{
-		_LOG_L1C3("** Failed CommPort.Open(%d) ret=%d **", port,ret);
-		User::Leave(ret);
-		}
-
-	// Configure the port
-	len = iCommPort.ReceiveBufferLength();
-	
-	if (len < KErrNone)
-		{
-		_LOG_L1C2("** Leave: CommPort.ReceiveBufferLength() len=%d **", len);
-		User::Leave(KErrGeneral);
-		}
-
-	// Increase the receive buffer to make sure we can operate as slowly as we 
-	// can without filling up the LDD's receive buffer with incoming signals 
-	len *= KCSY_ReceiveBufferSizeIncreaseFactor; 
-	ret = iCommPort.SetReceiveBufferLength(len);
-
-	TCommConfig cbuf;
-	TCommConfigV01 &cfg = cbuf();
-	iCommPort.Config(cbuf);					// Get the Configuration Parameters
-
-	cfg.iRate        = newCfg().iRate;
-	cfg.iDataBits    = newCfg().iDataBits;
-	cfg.iStopBits    = newCfg().iStopBits;
-	cfg.iParity      = newCfg().iParity;
-	cfg.iHandshake   = newCfg().iHandshake;
-	cfg.iParityError = newCfg().iParityError;
-	cfg.iFifo        = newCfg().iFifo;
-
-	_LOG_L4C2("  Set Phys Port Config for Port %d", port);
-	_LOG_L4C2("    Rate = 0x%x", cfg.iRate);
-	_LOG_L4C2("    DataBits = 0x%x", cfg.iDataBits);
-	_LOG_L4C2("    Stop Bits = 0x%x", cfg.iStopBits);
-	_LOG_L4C2("    Parity = 0x%x", cfg.iParity);
-	_LOG_L4C2("    Handshake = 0x%x", cfg.iHandshake);
-	_LOG_L4C2("    Parity Error = 0x%x", cfg.iParityError);
-	_LOG_L4C2("    Fifo = 0x%x", cfg.iFifo);
-
-	ret = iCommPort.SetConfig(cbuf);		// Set the Configuration Parameters
-	if (ret)
-		{
-		_LOG_L1C2("** CommPort.SetConfig ret=%d **", ret);
-		User::Leave(KErrNotSupported);
-		}
-
-	// Clean up the stack
-	CleanupStack::PopAndDestroy(db);
-
-	_LOG_L4C2("<<CPortFactory::ConfigurePhysicalCommPortL [ret=%d]", ret);
-	return ret;
-	}
-
-void CPortFactory::ConnectControlChannel()
-/**
- * This method is called to connect the 27.010 control channel,
- * which is DLC 0.
- */
-	{
-	_LOG_L4C1("CPortFactory::ConnectControlChannel");
-
-	TInt ret = 	iChannelCtrl->Connect();	
-	if (ret != KErrNone)
-		{
-		_LOG_L4C2(("<<CCPortFactory::ConnectControlChannel ret=%d"),ret);
-		}
-	}
-
-void CPortFactory::DisconnectControlChannel()
-/**
- * This method is called to set the 27.010 control channel to the "disconnect" state.
- */
-	{
-	_LOG_L4C1("CPortFactory::DisconnectAllChannels");
-	iChannelCtrl->Disconnect();
-	}
-
-void CPortFactory::ChannelCtrlDoCancel()
-/**
- * This method is called when the port has been opened and the max number of retries has been reached.
- */
-	{
-	_LOG_L4C1(">>CPortFactory::ChannelCtrlDoCancel");
-	
-	iOpenPortFailed = ETrue;
-	iChannelCtrl->NotifyChannelReady();
-
-	_LOG_L4C1("<<CPortFactory::ChannelCtrlDoCancel");
-	}
-	
-
-void CPortFactory::RemoveC32Port(CPortC32InterfaceBase* aPort)
-/**
- * This method removes the specified C32 port object from the
- * port factory's list of current/open C32 port objects.
- * This will allow another client to open that port.
- * @param aPort - Pointer to C32 port object
- * @return void
- */
-	{
-	_LOG_L4C2(">>CPortFactory::RemoveC32Port [aPort=%d]", aPort->GetPortNumber());
-
-	CPortC32InterfaceBase* port = NULL;
-	iPortC32InterfaceIter.SetToFirst();
-	while ((port = iPortC32InterfaceIter++) != NULL)
-		{
-		if (port == aPort)
-			{
-			iPortC32InterfaceList.Remove(*port);
-			_LOG_L4C1("<<CPortFactory::RemoveC32Port - okay");
-			return;
-			}
-		}
-
-	// MAF this is a bad condition
-	_LOG_L4C1("<<CPortFactory::RemoveC32Port ** Not Removed? **");
-	}
-
-void CPortFactory::ConnectIpNifPort(const TUint8 aDlcNum)
-/**
- * This method connects the port interface object
- * in the CSY that are used for a data interface to a NIF.
- * @param void
- */
-	{
-	_LOG_L4C2("CPortFactory::ConnectIpNifPort [aDlcNum=%d]",aDlcNum);
-
-	CPortC32InterfaceBase* port = FindPortC32Interface(aDlcNum);
-
-	if (port)
-		{
-		CChannelMgrCmdData* iMuxChannel = port->GetMuxChannel();
-		if (iMuxChannel)
-			{
-			
-			TInt err = iMuxChannel->Connect();
-			if (err != KErrNone)
-				{
-				_LOG_L1C2("iMuxChannel->Connect() error =%d",err);
-				}
-			}
-		else
-			{
-			// MAF assert here
-			_LOG_L1C2("** Could not find channel for port [0x%x] **",port);
-			}
-		}
-	else
-		{
-		// MAF assert here
-		_LOG_L1C1("** Could not find port for dlcnumber **");
-		}
-	}
-
-TBool CPortFactory::FindDlcToEnable()
-/**
- * We have resources again. Find a dlc that has had its flow control
- * set and re-enable.
- *
- * @return ETrue if there are still dlcs that are stopped due to flow control.
- */
-	{
-	_LOG_L4C1(">>CPortFactory::FindDlcToEnable");
-
-	TInt numberOfStopped = 0;
-	TBool dlcsStillToEnable = EFalse;
-
-    CChannelMgrCmdData* channel = NULL;
-
-	iDataChannelIter.SetToFirst();
-	while ((channel = iDataChannelIter++) != NULL)
-		{
-		if (channel->CsyToModemFlowControl() == EFlowControlOn)
-			{
-			numberOfStopped++;
-			if (numberOfStopped == 1)
-				{
-				_LOG_L4C1("Found a dlc to re-enable");
-				if (channel->SetCsyToModemFlowControl(EFlowControlOff))
-					{
-					_LOG_L4C1("Re-enable failed");
-					dlcsStillToEnable = ETrue;
-					break;
-					}
-				}
-			else
-				{
-				_LOG_L4C1("Other dlc still to re-enable");
-				dlcsStillToEnable = ETrue;
-				}
-			}
-		}
-
-	_LOG_L4C2("<<CPortFactory::FindDlcToEnable numberOfStopped=%d",numberOfStopped);
-	return dlcsStillToEnable;
-	}
-
-void CPortFactory::FindActiveDataDlcToStop()
-/**
- * MAF come up with a better algorithm. Currently this scans sequentially for a data
- * DLC to stop.
- * Check the data dlcs to see if one of them can be stopped
- */
-	{
-	_LOG_L4C1(">>CPortFactory::FindActiveDataDlcToStop");
-
-    CChannelMgrCmdData* channel = NULL;
-	CPortC32InterfaceBase* port = NULL;
-
-	iDataChannelIter.SetToFirst();
-	while ((channel = iDataChannelIter++) != NULL)
-		{
-		port = channel->GetC32Port();
-		if ((port)&&(port->GetClientType() == EC32ClientIpNif))
-			{
-			if (channel->CsyToModemFlowControl() == EFlowControlOff)
-				{
-				_LOG_L4C1("Found a data dlc to stop");
-				if (channel->SetCsyToModemFlowControl(EFlowControlOn))
-					{
-					_LOG_L4C1("Failed to stop dlc");
-					}
-				else
-					break;
-				}
-			}
-		}
-
-	_LOG_L4C1("<<CPortFactory::FindActiveDataDlcToStop");
-	}
-
-void CPortFactory::StopAnyDlc()
-/**
- * Time for drastic action - enforce flow control on any DLC (except ctrl).
- */
-	{
-	_LOG_L4C1(">>CPortFactory::StopAnyDlc");
-
-    CChannelMgrCmdData* channel = NULL;
-
-	iDataChannelIter.SetToFirst();
-	while ((channel = iDataChannelIter++) != NULL)
-		{
-		if (channel->CsyToModemFlowControl() == EFlowControlOff)
-			{
-			_LOG_L4C1("Found a dlc to stop");
-			if (channel->SetCsyToModemFlowControl(EFlowControlOn))
-				{
-				_LOG_L4C1("Failed to stop dlc");
-				}
-			else
-				break;
-			}
-		}
-
-	_LOG_L4C1("<<CPortFactory::StopAnyDlc");
-	}
-
-TBool CPortFactory::DecrementNumOfOpenPorts()
-/**
- * Used to decrement the number of open ports and disconnect if number = 0
- *
- * aReturn returns EFalse if Num of Ports is 0; ETrue otherwise
- */
-{
-	if (iNumOfOpenPorts==0)
-		return EFalse;
-	else if (--iNumOfOpenPorts == 0)
-		{
-		_LOG_L4C1("******* DISCONNECT ALL *********");
-		DisconnectControlChannel();
-		iLastDlcNum = 0;
-		return EFalse;
-		}	
-	return ETrue;
-}
-
-
-TSecurityPolicy CPortFactory::PortPlatSecCapability(TUint /*aPort*/) const
-/**
- * This method returns the capabilities required to open the given port number
- * This 27.010 CSY requires the same capabilities for all port numbers
- *
- * @param aPort - The port number to check against
- * @return TSecurityPolicy - containing the required capabilities to use this CSY
- */
-{
-	return TSecurityPolicy(ECapabilityNetworkServices, ECapabilityNetworkControl, ECapabilityReadUserData, ECapabilityWriteUserData);
-}
-

--- a/cbsref/csyrefplugins/csy27010/src/timeouter.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file contains the implementation a very simple timeout class.
-//
-
-// timeouter.cpp
-
-/** @file timeouter.cpp
- *
- */
- 
-#include "timeouter.h"
-#include "CsyDebugLogger.h"
-
-
-CActiveTimeouter* CActiveTimeouter::NewL(MTimeoutObserver& aObserver)
-/**
- * 2 phase constructor. Call this function to create a new 
- * active timeouter object.
- *
- * @param aObserver reference to the Observer object
- * @return a newly created CActiveTimeouter object
- */
-	{
-	CActiveTimeouter* p = new (ELeave) CActiveTimeouter(aObserver);
-	CleanupStack::PushL(p);
-	p->ConstructL(); 
-	CleanupStack::Pop(p);
-	return p;
-	}
-
-CActiveTimeouter::~CActiveTimeouter()
-/**
- * Destructor
- */
-	{
-	Cancel();
-	}
-
-void CActiveTimeouter::Start(const TTimeIntervalMicroSeconds32& aTimeoutMs)
-/**
- * Start a timeout
- *
- * @param aTimeoutMs The timeout period in microseconds
- */
-	{
-	Stop(); //Cancel current request if there is one
-	iStatus = KRequestPending;
-	After(aTimeoutMs);
-	}
-  
-void CActiveTimeouter::Stop()
-/**
- * Stop the timer (if running)
- */
-	{
-
-	if (IsActive())
-	      Cancel();
-	}
-
-CActiveTimeouter::CActiveTimeouter(MTimeoutObserver& aObserver)
-/**
- * Constructor
- *
- * @param aObserver reference to the Observer object
- */
- :	CTimer(CActive::EPriorityStandard),
-	iTheTimeoutObserver(aObserver)
-	{
-	CLASSNAMEINIT(CActiveTimeouter)
-
-	CActiveScheduler::Add(this);
-	}
-
-void CActiveTimeouter::RunL()
-/**
- * Called by the Active Scheduler when the timeout completes.
- * This function calls the TimedOut() function implemented 
- * by the observer.
- */
-	{
-	iTheTimeoutObserver.TimedOut();
-	}
-

--- a/cbsref/csyrefplugins/csy27010/test/Csy27010UnitTest.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1739 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This contains the Unit Tests dealing with CSY 0710 related
-// *               functionality as documented in the project's Unit Test Spec.
-// *
-// *               The tests may be run either interactively or automatically.
-// *
-// *               The tests are dependant on a predictable response from
-// *               the BP side according to the test spec.
-// *
-// *               The automated tests achieve this predictable response by
-// *               using the Tester component.
-//
-
-// Csy0710UnitTest.cpp
-
-/** @file Csy0710UnitTest.cpp
- *
- */
-
-#include "Csy27010UnitTest.h"
-#include <exterror.h>
-
-
-_LIT8(KATCommand1,  "AT+CGMM\r");
-_LIT8(KATCommand2,  "AT+CGMM\r");
-_LIT8(KATCommand3,  "AT+CMUX?\r");
-_LIT8(KATCommand4,  "AT\r");
-_LIT8(KATCommand5,  "AT+CGMI\r");
-_LIT8(KATCommand6,  "AT+CGSN\r");
-_LIT8(KATCommand7,  "AT+CGMR\r");
-_LIT8(KATCommand8,  "AT+CBC\r");
-_LIT8(KATCommand9,  "AT+CSQ\r");
-_LIT8(KATCommand10, "ATS7?\r");
-_LIT8(KATCommand11, "ATS0=5\r");
-_LIT8(KATCommand12, "AT+FCLASS=2.0\r");
-_LIT8(KATCommand13, "AT+CRC=?\r");
-
-//_LIT8(KATCommandToCancel, "ABCDEFGHIJKLMNOPQRSTUVWXYZ\r");
-_LIT8(KATCommandToCancel, "AT\r");
-
-//-----------------------------------------------------------------------------
-// Helper routines
-//-----------------------------------------------------------------------------
-//
-
-TBool CCsy0710UnitTest::HasTestRangesDefined()
-	{
-	return ETrue;
-	}
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-CCsy0710UnitTest* CCsy0710UnitTest::NewL(const TDesC& aUnitTestName,
-								 const TDesC& aLogFileName,
-							     const TDesC& aTestSpecName,
-							     const TDesC& aTestScriptName)
-	{
-	CCsy0710UnitTest* self = new(ELeave) CCsy0710UnitTest(aUnitTestName,
-				aLogFileName, aTestSpecName, aTestScriptName);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop();
-	return self;
-	}
-
-CCsy0710UnitTest::~CCsy0710UnitTest()
-	{
-	}
-
-
-CCsy0710UnitTest::CCsy0710UnitTest(const TDesC& aUnitTestName,
-						   const TDesC& aLogFileName,
-						   const TDesC& aTestSpecName,
-						   const TDesC& aTestScriptName)
-: CUnitTestBase(aUnitTestName, aLogFileName, aTestSpecName, aTestScriptName)
-	{}
-
-
-void CCsy0710UnitTest::ConstructL()
-	{	
-	CUnitTestBase::ConstructL();
-	
-	iCmdPortName[0].Copy(_L("gsm0710::1"));
-	iCmdPortName[1].Copy(_L("gsm0710::2"));
-	iCmdPortName[2].Copy(_L("gsm0710::3"));
-	iCmdPortName[3].Copy(_L("gsm0710::4"));
-	iDataPort1Name.Copy(_L("gsm0710::101"));
-	}
-
-void CCsy0710UnitTest::PrintTestSpecIdentifiers()
-	{
-	iTest.Printf(_L("\nCSY 0710 Unit Test\n\n"));
-	iTest.Printf(_L("1: CSY A tests\n"));
-	iTest.Printf(_L("2: CSY B tests\n"));
-	iTest.Printf(_L("3: CSY C tests\n"));
-	iTest.Printf(_L("4: CSY D tests\n"));
-	iTest.Printf(_L("5: CSY E tests\n"));
-	iTest.Printf(_L("6: CSY F tests\n"));
-	iTest.Printf(_L("7: CSY G tests\n"));
-	iTest.Printf(_L("8: CSY H tests\n"));
-	}
-
-
-void CCsy0710UnitTest::PrintTestDetails(TInt /*aTstSpecNumber*/)
-	{
-	// This version prints no helpful info on the screen. Overload this in
-	// your own test class to put out test details for the test spec idenifier
-	// selected
-	}
-
-
-void CCsy0710UnitTest::RunTestsL(TBool aEndInd,TTestMode aTestMode,
-								 TInt& aErrCode, TInt& aLeaveCode, 
-								 TInt aApiNumber, TInt aTestNumber)
-	{
-	switch (aApiNumber)
-		{
-		case 0:
-			aLeaveCode = KErrNone;
-			aErrCode = 8;  // 8 more tests
-			break;
-		case 1:
-			TRAP(aLeaveCode,aErrCode = CsyAL(aTestNumber));
-			break;
-		case 2:
-			TRAP(aLeaveCode,aErrCode = CsyBL(aTestNumber));
-			break;
-		case 3:
-			TRAP(aLeaveCode,aErrCode = CsyCL(aTestNumber));
-			break;
-		case 4:
-			TRAP(aLeaveCode,aErrCode = CsyDL(aTestNumber));
-			break;
-		case 5:
-			TRAP(aLeaveCode,aErrCode = CsyEL(aTestNumber));
-			break;
-		case 6:
-			TRAP(aLeaveCode,aErrCode = CsyFL(aTestNumber));
-			break;
-		case 7:
-			TRAP(aLeaveCode,aErrCode = CsyGL(aTestNumber));
-			break;
-		case 8:
-			TRAP(aLeaveCode,aErrCode = CsyHL(aTestNumber));
-			break;
-		default:
-			ActionNoMatch(aEndInd,aTestMode,aApiNumber, aTestNumber);
-		}
-
-	//CloseAllResources();
-	}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-
-TInt CCsy0710UnitTest::CsyAL(TInt aTstNum)
-/**
- * CSY Information Tests
- * @param aTstNum test number
- * @return KErrNone or error code
- */
-	{
-	if (aTstNum != 0)
-		iTest.Printf(_L("CSYA-%d\n"), aTstNum);
-
-	TInt ret = KErrNone;
-
-	SetTsIdentifier(_L("CSYA"));
-	SetMethodName(_L("CSYA"));
-
-	switch (aTstNum)
-		{
-		case 0:		// Return how may auto tests are present
-			return (4);
-			break;
-
-		case 1:		// Start C32
-			iTest.Printf(_L("Start C32...\n"));	
-			SetFunIndex(1);
-			TEST(LoadSerialDeviceDrivers());
-			ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-			iTest.Printf(_L("Test 1-1 Passed\n"));
-			return (KErrNone);
-			break;
-
-		case 2:		// Load and Unload CSY multiple times
-			iTest.Printf(_L("Basic check on something else..\n"));	
-			SetFunIndex(1);
-			TEST(LoadSerialDeviceDrivers());
-			ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-
-			TEST(iCommServer.Connect());
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-			iCommServer.Close();
-			iTest.Printf(_L("Test 1-2 Passed\n"));
-			return (KErrNone);
-			break;
-
-		case 3:		// Open Multiple Sessions to C32
-			iTest.Printf(_L("Open Multiple Sessions to C32...\n"));	
-			SetFunIndex(1);
-			TEST(LoadSerialDeviceDrivers());
-			ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-
-			TEST(iCommServer.Connect());
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			TEST(OpenAllCommPorts());
-			User::After(5000000);
-			CloseAllCommPorts();
-			iCommServer.UnloadCommModule(KCsyName);
-			iCommServer.Close();
-			User::After(3000000);
-			iTest.Printf(_L("Test 1-3 Passed\n"));
-			return (KErrNone);
-			break;
-
-		case 4: 		// Check that the phone supports the expected extensions
-			iTest.Printf(_L("Get CSY Info...\n"));	
-			SetFunIndex(1);
-			TEST(LoadSerialDeviceDrivers());
-			ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-
-			TEST(iCommServer.Connect());
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			TEST(GetCsyInfo());
-			iCommServer.UnloadCommModule(KCsyName);
-			iCommServer.Close();			
-			User::After(5000000);
-			return KErrNone;
-			break;
-
-					// Manual Tests Follow...
-		case 100:		// Return how many manual tests are present
-			{
-			return 0;
-			}
-			break;
-
-		default:
-			iTest.Printf(_L("** Not implemented CSYA-%d **\n"), aTstNum);
-			break;
-		}
-
-	return ret;
-	}
-
-
-TInt CCsy0710UnitTest::CsyBL(TInt aTstNum)
-/**
- * CSY Open and Close Logical Ports Tests
- * @param aTstNum test number
- * @return void
- */
-	{
-	if (aTstNum != 0)
-		iTest.Printf(_L("CSYB-%d\n"), aTstNum);
-
-	TInt ret = KErrNone;
-
-	SetTsIdentifier(_L("CSYB"));
-	SetMethodName(_L("CSYB"));
-
-	switch (aTstNum)
-		{
-		case 0:		// Return how may auto tests are present
-			return (6);
-			break;
-
-		case 1:		// open & close subsessions
-			iTest.Printf(_L("Open & Close Subsessions...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			TEST(LoadSerialDeviceDrivers());
-			ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-
-			TEST(iCommServer.Connect());
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			// specific test code
-			TEST(OpenAllCommPorts());
-			CloseAllCommPorts();
-			iCommServer.UnloadCommModule(KCsyName);
-			iCommServer.Close();
-			iTest.Printf(_L("Test 2-1 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 2:		// check failure to open comm port	
-			iTest.Printf(_L("Check failure to open comm port...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			TEST(LoadSerialDeviceDrivers());
-            ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-			TEST(iCommServer.Connect());
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			// specific test code
-			TEST(OpenCommPortFail());
-			iCommServer.UnloadCommModule(KCsyName);
-			iCommServer.Close();
-			iTest.Printf(_L("Test 2-2 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 3:		// open many ports
-			iTest.Printf(_L("Open many RComm ports...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			TEST(LoadSerialDeviceDrivers());
-            ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-			TEST(iCommServer.Connect());
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			// specific test code
-			TEST(OpenAllCommPorts());
-			User::After(5000000);
-			CloseAllCommPorts();
-			iCommServer.UnloadCommModule(KCsyName);
-			iCommServer.Close();
-			iTest.Printf(_L("Test 2-3 Passed\n"));
-			User::After(3000000);
-			return (KErrNone);
-			break;
-
-		case 4:		// check ability to open same port twice
-			iTest.Printf(_L("Check ability to open RComm port twice...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			TEST(LoadSerialDeviceDrivers());
-            ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-			TEST(iCommServer.Connect());
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			// specific test code
-			TEST(OpenCmdPortTwice());
-			iCommServer.UnloadCommModule(KCsyName);
-			iCommServer.Close();
-			iTest.Printf(_L("Test 2-4 Passed\n"));
-			User::After(3000000);
-			return (KErrNone);
-			break;
-
-		case 5:		// open many subsessions at same time
-			iTest.Printf(_L("Open many RComm ports at same time...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			TEST(LoadSerialDeviceDrivers());
-            ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-			TEST(iCommServer.Connect());
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			// specific test code
-			TEST(OpenAllCommPorts());
-			User::After(5000000);
-			CloseAllCommPorts();
-			iCommServer.UnloadCommModule(KCsyName);
-			iCommServer.Close();
-			iTest.Printf(_L("Test 2-5 Passed\n"));
-			User::After(3000000);
-			return (KErrNone);
-			break;
-
-		case 6:		// check failure to open port with an invalid name
-			iTest.Printf(_L("Check failure to open port with invalid name...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			TEST(LoadSerialDeviceDrivers());
-            ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-
-			TEST(iCommServer.Connect());
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			// specific test code
-			TEST(OpenCmdPortInvalidName());
-			User::After(5000000);
-			iCommServer.UnloadCommModule(KCsyName);
-			iCommServer.Close();
-			User::After(1000000);
-			iTest.Printf(_L("Test 2-6 Passed\n"));
-			User::After(2000000);
-			return (KErrNone);
-			break;
-
-			
-			// Manual Tests Follow...
-		case 100:		// Return how many manual tests are present
-			{
-			return 0;
-			}
-			break;
-
-		default:
-			iTest.Printf(_L("** Not implemented CSYB-%d **\n"), aTstNum);
-			break;
-		}
-
-	return (ret);
-	}
-
-
-TInt CCsy0710UnitTest::CsyCL(TInt aTstNum)
-/**
- * CSY Data Transmission Tests.
- * @param aTstNum test number
- * @return void
- */
-	{
-	if (aTstNum != 0)
-		iTest.Printf(_L("CSYC-%d\n"), aTstNum);
-
-	TInt ret = KErrNone;
-
-	SetTsIdentifier(_L("CSYC"));
-	SetMethodName(_L("CSYC"));
-
-	switch (aTstNum)
-		{
-		case 0:		// Return how may auto tests are present
-			return (4);
-			break;
-
-		case 1:		// Check that information can be sent
-			iTest.Printf(_L("Send command on Comm Port...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			TEST(LoadSerialDeviceDrivers());
-            ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-			TEST(iCommServer.Connect());
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			// specific test code
-			TEST(SendCmdOneCommPort(0));
-			User::After(1000000);
-			iCommServer.UnloadCommModule(KCsyName);
-			iCommServer.Close();
-			iTest.Printf(_L("Test 3-1 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 2:		// Check that information can be sent
-			iTest.Printf(_L("Send multiple commands on Comm Port...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			TEST(LoadSerialDeviceDrivers());
-            ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-			TEST(iCommServer.Connect());
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			// specific test code
-			SendCmdsOneCommPort(0);
-			User::After(1000000);
-			iCommServer.UnloadCommModule(KCsyName);
-			iCommServer.Close();
-			iTest.Printf(_L("Test 3-2 Passed\n"));
-			User::After(3000000);
-			return (KErrNone);
-			break;
-			
-		case 3:		// check BP ack failure
-			iTest.Printf(_L("Test 3-3 Passed\n"));
-			SetFunIndex(1);
-			User::After(3000000);
-			return (KErrNone);
-
-		case 4:		// Check write cancel on outstanding cmd
-			iTest.Printf(_L("Cancel Write Request on Comm Port...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			TEST(LoadSerialDeviceDrivers());
-            ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-			TEST(iCommServer.Connect());
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			// specific test code
-			CancelWriteOneCommPort(0);
-			User::After(1000000);
-
-			// common exit test code
-			iCommServer.UnloadCommModule(KCsyName);
-			iCommServer.Close();
-			iTest.Printf(_L("Test 3-4 Passed\n"));
-			User::After(3000000);
-			return (KErrNone);
-			break;
-
-			// Manual Tests Follow...
-		case 100:		// Return how many manual tests are present
-			{
-			return 0;
-			}
-			break;
-
-		default:
-			iTest.Printf(_L("** Not implemented CSYC-%d **\n"), aTstNum);
-			break;
-		}
-
-	return (ret);
-	}
-
-
-TInt CCsy0710UnitTest::CsyDL(TInt aTstNum)
-/**
- * CSY Tests for receive data on channels.
- * @param aTstNum test number
- * @return KErrNone or error code
- */
-	{
-	TInt ret = KErrNone;
-
-	if (aTstNum != 0)
-		iTest.Printf(_L("CSYD-%d\n"), aTstNum);
-
-	SetTsIdentifier(_L("CSYD"));
-	SetMethodName(_L("CSYD"));
-
-	switch (aTstNum)
-		{
-		case 0:		// Return how may auto tests are present
-			return (2);
-			break;
-
-		case 1:		// Check that data can be received
-			iTest.Printf(_L("Recv Data on Comm Port...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			TEST(LoadSerialDeviceDrivers());
-            ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-			TEST(iCommServer.Connect());
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			// specific test code
-			ret = iCommPort[0].Open(iCommServer, iCmdPortName[0], ECommShared);
-			if (ret != KErrNone) return __LINE__;
-			TEST(RecvDataOneCommPort(0));
-			iCommPort[0].Close();
-			iCommServer.UnloadCommModule(KCsyName);
-			iCommServer.Close();
-			iTest.Printf(_L("Test 4-1 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 2:		// Check that data is received and given to the correct port
-			iTest.Printf(_L("Recv Data and Route to Correct Port...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			TEST(LoadSerialDeviceDrivers());
-            ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-			TEST(iCommServer.Connect());
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			// specific test code
-			ret = iCommPort[0].Open(iCommServer, iCmdPortName[0], ECommShared);
-			if (ret != KErrNone) return __LINE__;
-			ret = iCommPort[1].Open(iCommServer, iCmdPortName[1], ECommShared);
-			if (ret != KErrNone) return __LINE__;
-			ret = iCommPort[2].Open(iCommServer, iCmdPortName[1], ECommShared);
-			if (ret != KErrNone) return __LINE__;
-			ret = iCommPort[3].Open(iCommServer, iCmdPortName[1], ECommShared);
-			if (ret != KErrNone) return __LINE__;
-
-			TEST(RecvDataOneCommPort(0));
-			TEST(RecvDataOneCommPort(1));
-			TEST(RecvDataOneCommPort(2));
-			TEST(RecvDataOneCommPort(3));
-
-			ret = iCommPort[4].Open(iCommServer, iDataPort1Name, ECommShared); //data port
-			if (ret != KErrNone) return __LINE__;
-			TEST(RecvDataOneCommPort(4)); //newly open port will take away the control of the dlc
-			iCommPort[4].Close();
-			// should return control of dlc
-
-			TEST(RecvDataOneCommPort(0));
-			TEST(RecvDataOneCommPort(1));
-			TEST(RecvDataOneCommPort(2));
-			TEST(RecvDataOneCommPort(3));
-
-			iCommPort[3].Close();
-			iCommPort[2].Close();
-			iCommPort[1].Close();
-			iCommPort[0].Close();
-			User::After(1000000);
-			iCommServer.UnloadCommModule(KCsyName);
-			iCommServer.Close();
-			iTest.Printf(_L("Test 4-2 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-			// Manual Tests Follow...
-		case 100:		// Return how many manual tests are present
-			{
-			return 0;
-			}
-			break;
-
-		default:
-			iTest.Printf(_L("** Not implemented CSYD-%d **\n"), aTstNum);
-			break;
-		}		
-			
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::CsyEL(TInt aTstNum)
-/**
- * CSY Tests for flow control of data on logical ports.
- * @param aTstNum test number
- * @return KErrNone or error code
- */
-	{
-	TInt ret = KErrNone;
-
-	if (aTstNum != 0)
-		iTest.Printf(_L("CSYE-%d\n"), aTstNum);
-
-	SetTsIdentifier(_L("CSYE"));
-	SetMethodName(_L("CSYE"));
-
-	switch (aTstNum)
-		{
-		case 0:		// Return how may auto tests are present
-			return (1);
-			break;
-
-		case 1:		// Check that flow control signals correct port
-			iTest.Printf(_L("Verify Flow Control Signals to Correct Port...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			TEST(LoadSerialDeviceDrivers());
-            ret = StartC32();
-            if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-                TEST(ret);
-			TEST(iCommServer.Connect());
-			ret = iCommServer.LoadCommModule(KCsyName);
-			if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-			// specific test code
-			ret = iCommPort[0].Open(iCommServer, iCmdPortName[0], ECommShared);
-			if (ret != KErrNone) return __LINE__;
-			ret = iCommPort[1].Open(iCommServer, iCmdPortName[1], ECommShared);
-			if (ret != KErrNone) return __LINE__;
-			ret = iCommPort[2].Open(iCommServer, iCmdPortName[2], ECommShared);
-			if (ret != KErrNone) return __LINE__;
-			ret = iCommPort[3].Open(iCommServer, iCmdPortName[3], ECommShared);
-			if (ret != KErrNone) return __LINE__;
-
-			TEST(VerifyFlowControl(0));
-			TEST(VerifyFlowControl(1));
-			TEST(VerifyFlowControl(2));
-			TEST(VerifyFlowControl(3));
-
-			iCommPort[3].Close();
-			iCommPort[2].Close();
-			iCommPort[1].Close();
-			iCommPort[0].Close();
-			User::After(1000000);
-			iCommServer.UnloadCommModule(KCsyName);
-			iCommServer.Close();
-			iTest.Printf(_L("Test 5-1 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-			// Manual Tests Follow...
-		case 100:		// Return how many manual tests are present
-			{
-			return 0;
-			}
-			break;
-
-		default:
-			iTest.Printf(_L("** Not implemented CSYE-%d **\n"), aTstNum);
-			break;
-		}			
-			
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::CsyFL(TInt aTstNum)
-/**
- * CSY Tests for 3GPP 27.010 compliance.
- * @param aTstNum test number
- * @return KErrNone or error code
- */
-	{
-	if (aTstNum != 0)
-		iTest.Printf(_L("CSYF-%d\n"), aTstNum);
-
-	SetTsIdentifier(_L("CSYF"));
-	SetMethodName(_L("CSYF"));
-
-	iTest.Printf(_L("Verify 3GPP 27.010 Compliance\n"));	
-
-	switch (aTstNum)
-		{
-		case 0:		// Return how may auto tests are present
-			return (8);
-			break;
-
-		case 1:		// Check that AT+CMUX is sent to enter mux mode
-			iTest.Printf(_L("Verify AT+CMUX is sent to enter Mux mode...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			Verify0710Compliance();
-			iTest.Printf(_L("Test 6-1 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 2:		// Check that frames are created correctly
-			iTest.Printf(_L("Verify frames are created properly...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			Verify0710Compliance();
-			iTest.Printf(_L("Test 6-2 Passed\n"));
-			User::After(2000000);
-			return KErrNone;
-			break;
-
-		case 3:		// Check that channels are created via SABM frames
-			iTest.Printf(_L("Verify channels are created via SABM frames...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			Verify0710Compliance();
-			iTest.Printf(_L("Test 6-3 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 4:		// Check that received frames are validated
-			iTest.Printf(_L("Verify received frames are validated...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			Verify0710Compliance();
-			iTest.Printf(_L("Test 6-4 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 5:		// Check that recv frames are ack'd with a UA frame
-			iTest.Printf(_L("Verify received frames are ack'd with a UA frame...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			Verify0710Compliance();
-			iTest.Printf(_L("Test 6-5 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 6:		// Check that received modem status control frames are processed correctly
-			iTest.Printf(_L("Verify received modem status control frames are processed...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			Verify0710Compliance();
-			iTest.Printf(_L("Test 6-6 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 7:		// Check that received flow control frames are processed correctly
-			iTest.Printf(_L("Verify received flow control frames are processed...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			Verify0710Compliance();
-			iTest.Printf(_L("Test 6-7 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 8:		// Check that channel is closed by sending a DISC frame
-			iTest.Printf(_L("Verify channel is closed by when sending DISC frame...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			Verify0710Compliance();
-			iTest.Printf(_L("Test 6-8 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-			// Manual Tests Follow...
-		case 100:		// Return how many manual tests are present
-			return 0;
-			break;
-
-		default:
-			iTest.Printf(_L("** Not implemented CSYF-%d **\n"), aTstNum);
-			break;
-		}			
-			
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::CsyGL(TInt aTstNum)
-/**
- * CSY Tests
- * @param aTstNum test number
- * @return KErrNone or error code
- */
-	{
-	if (aTstNum != 0)
-		iTest.Printf(_L("CSYG-%d\n"), aTstNum);
-
-	SetTsIdentifier(_L("CSYG"));
-	SetMethodName(_L("CSYG"));
-
-	switch (aTstNum)
-		{
-		case 0:		// Return how may auto tests are present
-			return (14);
-			break;
-
-		case 1:		// Verify no memory allocation until 1st port is opened
-			iTest.Printf(_L("Verify no memory allocation until 1st port is opened...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			VerifyStartup();
-			iTest.Printf(_L("Test 7-1 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 2:		// Verify mux startup params are read
-			iTest.Printf(_L("Verify mux startup params are read...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			VerifyStartup();
-			iTest.Printf(_L("Test 7-2 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 3:		// Verify correct serial port PDD is loaded
-			iTest.Printf(_L("Verify correct serial port PDD is loaded...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			VerifyStartup();
-			iTest.Printf(_L("Test 7-3 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 4:		// Verify correct serial port LDD is loaded
-			iTest.Printf(_L("Verify correct serial port LDD is loaded...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			VerifyStartup();
-			iTest.Printf(_L("Test 7-4 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 5:		// Check serial port startup config
-			iTest.Printf(_L("Verify serial port startup config...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			VerifyStartup();
-			iTest.Printf(_L("Test 7-5 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 6:		// Check control channel 0 is created
-			iTest.Printf(_L("Verify control channel 0 is created...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			VerifyStartup();
-			iTest.Printf(_L("Test 7-6 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 7:		// Check command and data channels are created
-			iTest.Printf(_L("Verify cmd and data channels are created...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			VerifyStartup();
-			iTest.Printf(_L("Test 7-7 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 8:		// Verify enter mux AT command is issued to the BP
-			iTest.Printf(_L("Verify enter mux AT command is issued to BP...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			VerifyStartup();
-			iTest.Printf(_L("Test 7-8 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 9:		// Verify cmd channels are setup disable cmd echo
-			iTest.Printf(_L("Verify cmd channels are setup to disable cmd echo...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			VerifyStartup();
-			iTest.Printf(_L("Test 7-9 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 10:	// Verify C32 is informed of the CSY's serial name of "gsm0710"
-			iTest.Printf(_L("Verify C32 is informed of the CSY's serial name of gsm0710...\n"));	
-			SetFunIndex(1);
-
-			// common test code
-			VerifyStartup();
-			iTest.Printf(_L("Test 7-10 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 11:	// Verify flow control is set to Off after channel init
-			iTest.Printf(_L("Verify Verify flow control is set to Off after channel init...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			VerifyStartup();
-			iTest.Printf(_L("Test 7-11 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 12:	// Verify NotifyFlowControlChange requests are accepted
-			iTest.Printf(_L("Verify NotifyFlowControlChange requests are accepted...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			VerifyStartup();
-			iTest.Printf(_L("Test 7-12 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 13:	// Verify NotifyFlowControlChange request can be cancelled
-			iTest.Printf(_L("Verify NotifyFlowControlChange request can be cancelled...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			VerifyStartup();
-			iTest.Printf(_L("Test 7-13 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 14:	// Verify NotifyFlowControlChange requests are completed properly
-			iTest.Printf(_L("Verify NotifyFlowControlChange requests are completed properly...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			VerifyStartup();
-			iTest.Printf(_L("Test 7-14 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-			
-			// Manual Tests Follow...
-		case 100:		// Return how many manual tests are present
-			return 0;
-			break;
-
-		default:
-			iTest.Printf(_L("** Not implemented CSYG-%d **\n"), aTstNum);
-			break;
-		}
-
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::CsyHL(TInt aTstNum)
-/**
- * CSY Tests
- * @param aTstNum test number
- * @return KErrNone or error code
- */
-	{
-	if (aTstNum != 0)
-		iTest.Printf(_L("CSYH-%d\n"), aTstNum);
-
-	SetTsIdentifier(_L("CSYH"));
-	SetMethodName(_L("CSYH"));
-
-	switch (aTstNum)
-		{
-		case 0:		// Return how may auto tests are present
-			return (5);
-			break;
-
-		case 1:		// Verify any active or outstanding requests are cancelled
-			iTest.Printf(_L("Verify any active or outstanding requests are cancelled...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			TEST(VerifyShutdown(1));
-			iTest.Printf(_L("Test 8-1 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 2:		// Verify each command channel and control channel is disconnected by sending DISC frame to BP
-			iTest.Printf(_L("Verify channels are disconnected by sending DISC frame to BP...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			TEST(VerifyShutdown(2));
-			iTest.Printf(_L("Test 8-2 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 3:		// Verify all memory allocated is deallocated
-			iTest.Printf(_L("Verify all memory allocated is deallocated...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			TEST(VerifyShutdown(3));
-			iTest.Printf(_L("Test 8-3 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 4:		// Verify all created objects are deleted
-			iTest.Printf(_L("Verify all created objects are deleted...\n"));
-			SetFunIndex(1);
-
-			// common test code
-			TEST(VerifyShutdown(4));
-			iTest.Printf(_L("Test 8-4 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-		case 5:		// Verify BP is returned to non-mux mode for AT commands.
-			iTest.Printf(_L("Verify BP is returned to non-mux mode for AT commands....\n"));
-			SetFunIndex(1);
-
-			// common test code
-			TEST(VerifyShutdown(5));
-			iTest.Printf(_L("Test 8-5 Passed\n"));
-			User::After(3000000);
-			return KErrNone;
-			break;
-
-			// Manual Tests Follow...
-		case 100:		// Return how many manual tests are present
-			return 0;
-			break;
-
-		default:
-			iTest.Printf(_L("** Not implemented CSYH-%d **\n"), aTstNum);
-			break;
-		}
-
-	return (KErrNone);
-	}
-
-
-////////////////////
-// Helper classes
-//
-TInt CCsy0710UnitTest::LoadSerialDeviceDrivers()
-	{
-#ifdef __WINS__
-	TInt ret;
-	_LIT(KPDDName,"ECDRV");
-	_LIT(KLDDName,"ECOMM");
-
-	ret= User::LoadPhysicalDevice(KPDDName);
-	if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-		return (ret);
-
-	ret = User::LoadLogicalDevice(KLDDName);
-	if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-		return (ret);
-#endif
-
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::OpenAllCommPorts()
-	{
-	TInt ret;
-
-	// Open RComm Ports
-	ret = iCommPort[0].Open(iCommServer, iCmdPortName[0], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-			
-	// Open Port #2
-	ret = iCommPort[1].Open(iCommServer, iCmdPortName[1], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-
-	// Open Port #3
-	ret = iCommPort[2].Open(iCommServer, iCmdPortName[2], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-
-	// Open Port #4
-	ret = iCommPort[3].Open(iCommServer, iCmdPortName[3], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-
-	return (KErrNone);
-	}
-
-			
-TInt CCsy0710UnitTest::CloseAllCommPorts()
-	{
-	iCommPort[0].Close();
-	iCommPort[1].Close();
-	iCommPort[2].Close();
-	iCommPort[3].Close();
-
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::GetCsyInfo()
-	{
-	TInt ret;
-	TName csyName(_L("gsm0710"));
-	TSerialInfo serialInfo;
-
-	ret = iCommServer.GetPortInfo(csyName, serialInfo);
-	if (ret == KErrNone)
-		{
-		iTest.Printf(_L("    Descrip   = %S\n"), &serialInfo.iDescription);
-		iTest.Printf(_L("    Name      = %S\n"), &serialInfo.iName);
-		iTest.Printf(_L("    Low Unit  = %d\n"), serialInfo.iLowUnit);
-		iTest.Printf(_L("    High Unit = %d\n"), serialInfo.iHighUnit);
-		User::After(2000000);
-		}
-	return (ret);
-	}
-
-
-TInt CCsy0710UnitTest::OpenCommPortFail()
-	{
-	TInt ret;
-	TName invalidName = _L("gsm0710::A");
-
-	ret = iCommPort[0].Open(iCommServer, invalidName, ECommShared);
-	if (ret == KErrNone) return __LINE__;
-
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::OpenCmdPortTwice()
-	{
-	TInt ret;
-
-	// Open RComm Port once
-	ret = iCommPort[0].Open(iCommServer, iCmdPortName[0], ECommExclusive);
-	if (ret != KErrNone) return __LINE__;
-
-	// Open same RComm Port again
-	ret = iCommPort[1].Open(iCommServer, iCmdPortName[0], ECommExclusive);
-	if (ret != KErrNone) return __LINE__;
-
-	iCommPort[0].Close();
-	iCommPort[1].Close();
-
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::OpenCmdPortInvalidName()
-	{
-	TInt ret;
-	TName invalidName = _L("gsm0710::A");
-
-	ret = iCommPort[0].Open(iCommServer, invalidName, ECommShared);
-	if (ret == KErrNone) return __LINE__;
-
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::SendCmdOneCommPort(TInt aPortNum)
-	{
-	TInt ret;
-
-	// Open RComm Port
-	ret = iCommPort[aPortNum].Open(iCommServer, iCmdPortName[aPortNum], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-
-	// send data
-	TBuf8<32> buf;
-	buf.Copy(KATCommand1);
-
-	TRequestStatus writeRequestStatus = KRequestPending;
- 	iCommPort[aPortNum].Write(writeRequestStatus, buf, buf.Length());
-	User::WaitForRequest(writeRequestStatus);
-	if (writeRequestStatus != KErrNone) return __LINE__;
-	
-	TEST(ReadDataFromCommPort(aPortNum));
-	
-	iCommPort[aPortNum].Close();
-
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::SendCmdsOneCommPort(TInt aPortNum)
-	{
-	TInt ret;
-
-	// Open RComm Port
-	ret = iCommPort[aPortNum].Open(iCommServer, iCmdPortName[aPortNum], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-
-	TRequestStatus writeRequestStatus;
-	TBuf8<32> buf;
-
-	// send data
-	writeRequestStatus = KRequestPending;
-	buf.Copy(KATCommand1);
- 	iCommPort[aPortNum].Write(writeRequestStatus, buf, buf.Length());
-	User::WaitForRequest(writeRequestStatus);
-	if (writeRequestStatus != KErrNone) return __LINE__;
-
-	TEST(ReadDataFromCommPort(aPortNum));
-
-	writeRequestStatus = KRequestPending;
-	buf.Copy(KATCommand2);
- 	iCommPort[aPortNum].Write(writeRequestStatus, buf, buf.Length());
-	User::WaitForRequest(writeRequestStatus);
-	if (writeRequestStatus != KErrNone) return __LINE__;
-
-	TEST(ReadDataFromCommPort(aPortNum));
-
-	writeRequestStatus = KRequestPending;
-	buf.Copy(KATCommand3);
- 	iCommPort[aPortNum].Write(writeRequestStatus, buf, buf.Length());
-	User::WaitForRequest(writeRequestStatus);
-	if (writeRequestStatus != KErrNone) return __LINE__;
-
-	TEST(ReadDataFromCommPort(aPortNum));
-
-	writeRequestStatus = KRequestPending;
-	buf.Copy(KATCommand4);
- 	iCommPort[aPortNum].Write(writeRequestStatus, buf, buf.Length());
-	User::WaitForRequest(writeRequestStatus);
-	if (writeRequestStatus != KErrNone) return __LINE__;
-
-	TEST(ReadDataFromCommPort(aPortNum));
-
-	writeRequestStatus = KRequestPending;
-	buf.Copy(KATCommand5);
- 	iCommPort[aPortNum].Write(writeRequestStatus, buf, buf.Length());
-	User::WaitForRequest(writeRequestStatus);
-	if (writeRequestStatus != KErrNone) return __LINE__;
-
-	TEST(ReadDataFromCommPort(aPortNum));
-
-	writeRequestStatus = KRequestPending;
-	buf.Copy(KATCommand6);
- 	iCommPort[aPortNum].Write(writeRequestStatus, buf, buf.Length());
-	User::WaitForRequest(writeRequestStatus);
-	if (writeRequestStatus != KErrNone) return __LINE__;
-
-	TEST(ReadDataFromCommPort(aPortNum));
-
-	writeRequestStatus = KRequestPending;
-	buf.Copy(KATCommand7);
- 	iCommPort[aPortNum].Write(writeRequestStatus, buf, buf.Length());
-	User::WaitForRequest(writeRequestStatus);
-	if (writeRequestStatus != KErrNone) return __LINE__;
-
-	TEST(ReadDataFromCommPort(aPortNum));
-
-	writeRequestStatus = KRequestPending;
-	buf.Copy(KATCommand8);
- 	iCommPort[aPortNum].Write(writeRequestStatus, buf, buf.Length());
-	User::WaitForRequest(writeRequestStatus);
-	if (writeRequestStatus != KErrNone) return __LINE__;
-
-	TEST(ReadDataFromCommPort(aPortNum));
-
-	iCommPort[aPortNum].Close();
-
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::CancelWriteOneCommPort(TInt aPortNum)
-	{
-	TInt ret;
-
-	// Open RComm Port
-	ret = iCommPort[aPortNum].Open(iCommServer, iCmdPortName[aPortNum], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-
-	// wait for CSY to initialize
-	// check current flow control state
-	TFlowControl flow;
-	iCommPort[aPortNum].GetFlowControlStatus(flow);
-	if (flow == EFlowControlOn)
-		{
-		// Port isn't active yet - wait for it to become active
-		//gTest.Printf(_L("Waiting for port 1 to become active...\n\n"));
-		TRequestStatus flowReqStatus;
-		iCommPort[aPortNum].NotifyFlowControlChange(flowReqStatus, flow);
-		User::WaitForRequest(flowReqStatus);
-		if (flow == EFlowControlOn)
-			{
-			iTest.Printf(_L("Incorrect flow %d\n"), flow);
-			iTest.Printf(_L("*** CSY did not init properly!! ***\n"));
-			}
-		}
-
-	User::After(5000000);
-
-	TRequestStatus writeRequestStatus;
-	TBuf8<100> buf;
-
-	// send data
-	writeRequestStatus = KRequestPending;
-	buf.Copy(KATCommandToCancel);
- 	iCommPort[aPortNum].Write(writeRequestStatus, buf, buf.Length());
-
-	// cancel write request
- 	iCommPort[aPortNum].WriteCancel();
-	User::WaitForRequest(writeRequestStatus);
-	if (writeRequestStatus != KErrCancel && writeRequestStatus != KErrNone) return __LINE__;
-
-	if (writeRequestStatus == KErrNone)
-		{
-		TEST(ReadDataFromCommPort(aPortNum));
-		}
-
-	iCommPort[aPortNum].Close();
-
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::RecvDataOneCommPort(TInt aPortNum)
-	{
-	iTest.Printf(_L("  Port %d\n"), aPortNum);
-
-	// wait for CSY to initialize
-	// check current flow control state
-	TFlowControl flow;
-	iCommPort[aPortNum].GetFlowControlStatus(flow);
-	if (flow == EFlowControlOn)
-		{
-		// Port isn't active yet - wait for it to become active
-		TRequestStatus flowReqStatus;
-		iCommPort[aPortNum].NotifyFlowControlChange(flowReqStatus, flow);
-		User::WaitForRequest(flowReqStatus);
-		if (flow == EFlowControlOn) return __LINE__;
-		}
-
-	User::After(5000000);
-
-
-	// send data
-	TBuf8<32> buf;
-	buf.Copy(KATCommand1);
-
-	TRequestStatus writeRequestStatus = KRequestPending;
- 	iCommPort[aPortNum].Write(writeRequestStatus, buf, buf.Length());
-	User::WaitForRequest(writeRequestStatus);
-	if (writeRequestStatus != KErrNone) return __LINE__;
-	
-
-	// Recv Data
-	TRequestStatus readRequestStatus = KRequestPending;
-	TBuf8<80> respBuf;
-	// gTest.Printf(_L("Port 1 Read ...\n"));
- 	iCommPort[aPortNum].ReadOneOrMore(readRequestStatus,respBuf);
-	User::WaitForRequest(readRequestStatus);
-	if (readRequestStatus != KErrNone) return __LINE__;
-
-	User::After(100000);
-
-	// see if there is any more data to read
- 	TInt extraRecvData = 0;
-	while ((extraRecvData = iCommPort[aPortNum].QueryReceiveBuffer()) > 0)
-		{
-		respBuf.Zero();
-		readRequestStatus = KRequestPending;
- 		iCommPort[aPortNum].ReadOneOrMore(readRequestStatus, respBuf);
- 		//iCommPort[aPortNum].Read(readRequestStatus, respBuf);
-		User::WaitForRequest(readRequestStatus);
-		if (readRequestStatus != KErrNone) return __LINE__;
-		}
-
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::ReadDataFromCommPort(TInt aPortNum)
-	{
-	// Recv Data
-	TRequestStatus readRequestStatus = KRequestPending;
-	TBuf8<80> respBuf;
- 	iCommPort[aPortNum].ReadOneOrMore(readRequestStatus, respBuf);
-	User::WaitForRequest(readRequestStatus);
-	if (readRequestStatus != KErrNone) return __LINE__;
-
-	User::After(100000);
-
-	// see if there is any more data to read
- 	TInt extraRecvData = 0;
-	while ((extraRecvData = iCommPort[aPortNum].QueryReceiveBuffer()) > 0)
-		{
-		respBuf.Zero();
-		readRequestStatus = KRequestPending;
- 		iCommPort[aPortNum].ReadOneOrMore(readRequestStatus, respBuf);
-		User::WaitForRequest(readRequestStatus);
-		if (readRequestStatus != KErrNone) return __LINE__;
-		}
-
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::VerifyFlowControl(TInt aPortNum)
-	{
-	iTest.Printf(_L("  Port %d\n"), aPortNum);
-
-	// check current flow control state
-	TFlowControl flow;
-	iCommPort[aPortNum].GetFlowControlStatus(flow);
-	if (flow == EFlowControlOn)
-		{
-		// Port isn't active yet - wait for it to become active
-		TRequestStatus flowReqStatus;
-		iCommPort[aPortNum].NotifyFlowControlChange(flowReqStatus, flow);
-		User::WaitForRequest(flowReqStatus);
-		if (flow == EFlowControlOn)
-			{
-			iTest.Printf(_L("Incorrect flow %d\n"), flow);
-			iTest.Printf(_L("*** CSY did not init properly!! ***\n"));
-			}
-		}
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::Verify0710Compliance()
-	{
-	TInt ret;
-
-	TEST(LoadSerialDeviceDrivers());
-    ret = StartC32();
-    if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-       TEST(ret);
-	TEST(iCommServer.Connect());
-	ret = iCommServer.LoadCommModule(KCsyName);
-	if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-	// specific test code
-	ret = iCommPort[0].Open(iCommServer, iCmdPortName[0], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-	ret = iCommPort[1].Open(iCommServer, iCmdPortName[1], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-	ret = iCommPort[2].Open(iCommServer, iCmdPortName[2], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-	ret = iCommPort[3].Open(iCommServer, iCmdPortName[3], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-
-	TEST(VerifyFlowControl(0));
-	TEST(VerifyFlowControl(1));
-	TEST(VerifyFlowControl(2));
-	TEST(VerifyFlowControl(3));
-
-	iCommPort[3].Close();
-	iCommPort[2].Close();
-	iCommPort[1].Close();
-	iCommPort[0].Close();
-	User::After(1000000);
-	iCommServer.UnloadCommModule(KCsyName);
-	iCommServer.Close();
-
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::VerifyStartup()
-	{
-	TInt ret;
-
-	TEST(LoadSerialDeviceDrivers());
-    ret = StartC32();
-    if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-        TEST(ret);
-	TEST(iCommServer.Connect());
-	ret = iCommServer.LoadCommModule(KCsyName);
-	if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-	// specific test code
-	ret = iCommPort[0].Open(iCommServer, iCmdPortName[0], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-	ret = iCommPort[1].Open(iCommServer, iCmdPortName[1], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-	ret = iCommPort[2].Open(iCommServer, iCmdPortName[2], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-	ret = iCommPort[3].Open(iCommServer, iCmdPortName[3], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-
-	TEST(VerifyStartupFlowControl(0));
-	TEST(VerifyStartupFlowControl(1));
-	TEST(VerifyStartupFlowControl(2));
-	TEST(VerifyStartupFlowControl(3));
-
-	iCommPort[3].Close();
-	iCommPort[2].Close();
-	iCommPort[1].Close();
-	iCommPort[0].Close();
-	User::After(1000000);
-	iCommServer.UnloadCommModule(KCsyName);
-	iCommServer.Close();
-
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::VerifyStartupFlowControl(TInt aPortNum)
-	{
-	// check current flow control state
-	TFlowControl flow;
-	iCommPort[aPortNum].GetFlowControlStatus(flow);
-	if (flow == EFlowControlOn)
-		{
-		// Port isn't active yet - wait for it to become active
-		TRequestStatus flowReqStatus;
-		iCommPort[aPortNum].NotifyFlowControlChange(flowReqStatus, flow);
-		User::WaitForRequest(flowReqStatus);
-		if (flow == EFlowControlOn)
-			{
-			iTest.Printf(_L("Incorrect flow %d\n"), flow);
-			iTest.Printf(_L("*** CSY did not init properly!! ***\n"));
-			}
-		}
-	return (KErrNone);
-	}
-
-
-TInt CCsy0710UnitTest::VerifyShutdown(TInt aTestSubset)
-	{
-	aTestSubset = aTestSubset;
-	TInt ret;
-
-	TEST(LoadSerialDeviceDrivers());
-    ret = StartC32();
-    if ((ret != KErrNone) && (ret != KErrAlreadyExists))
-        TEST(ret);
-	TEST(iCommServer.Connect());
-	ret = iCommServer.LoadCommModule(KCsyName);
-	if (ret!=KErrNone && ret!=KErrAlreadyExists) return __LINE__;
-
-	// specific test code
-	ret = iCommPort[0].Open(iCommServer, iCmdPortName[0], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-	ret = iCommPort[1].Open(iCommServer, iCmdPortName[1], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-	ret = iCommPort[2].Open(iCommServer, iCmdPortName[2], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-	ret = iCommPort[3].Open(iCommServer, iCmdPortName[3], ECommShared);
-	if (ret != KErrNone) return __LINE__;
-
-	TEST(VerifyStartupFlowControl(0));
-	TEST(VerifyStartupFlowControl(1));
-	TEST(VerifyStartupFlowControl(2));
-	TEST(VerifyStartupFlowControl(3));
-
-	iCommPort[3].Close();
-	iCommPort[2].Close();
-	iCommPort[1].Close();
-	iCommPort[0].Close();
-	User::After(1000000);
-	iCommServer.UnloadCommModule(KCsyName);
-	iCommServer.Close();
-
-	return (KErrNone);
-	}
-
-
-/////////////////////////////////////////////////
-//The following functions also need to be implemented by
-//CUnitTestBase derived classes 
-
-void CCsy0710UnitTest::CreateTestL()
-/**
- *
- *
- */
-	{
-	CCsy0710UnitTest* unitTest=CCsy0710UnitTest::NewL(
-		KCsy0710UnitTest, KCsy0710UnitTestLog, KUnitTestSpec, KCsy0710UnitTestScript);
-
-	CleanupStack::PushL(unitTest);
-
-	TInt ret=unitTest->SetUpTest();
-	
-	if(!ret)
-		{
-		unitTest->RunUnitTestsL();
-		}
-	
-	unitTest->Test().End();
-	
-	CleanupStack::PopAndDestroy(1); //unitTest
-	}
-
-
-#ifndef _ACCEPTANCE_TESTS
-
-GLDEF_C TInt E32Main()
-//
-// Main entry point - make sure everything is going.
-//
-#ifdef BUILD_FOR_JETSTREAM
-	{
-	RProcess().SecureApi(RProcess::ESecureApiOn);
-	RProcess().DataCaging(RProcess::EDataCagingOn);
-	// We must include the brace in the #ifndef to allow the security
-	// checking script 'perl.txt' to pass.
-#else
-	{
-#endif // BUILD_FOR_JETSTREAM
-	CTrapCleanup* cleanup=CTrapCleanup::New(); // get clean-up stack
-
-	TRAPD(ret,CCsy0710UnitTest::CreateTestL());
-
-	delete cleanup;
-	return KErrNone;        
-	}
-
-#endif //_ACCEPTANCE_TESTS
\ No newline at end of file

--- a/cbsref/csyrefplugins/csy27010/test/Csy27010UnitTest.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This defines the Unit Tests dealing with CSY 0710 related
-// *               functionality as documented in the project's Unit Test Spec.
-// *
-// *               The tests may be run either interactively or automatically.
-// *
-// *               The tests are dependant on a predictable response from
-// *               the BP side according to the test spec.
-// *
-// *               The automated tests achieve this predictable response by
-// *               using the Tester component.
-//
-
-// Csy0710UnitTest.h
-
-/** @file Csy0710UnitTest.h
- *
- */
- 
-#ifndef CSY0710UNITTEST_H__
-#define CSY0710UNITTEST_H__
-
-#include "unitTestBase.h"
-
-_LIT(KCsy0710UnitTest,       "Csy0710UnitTest");
-_LIT(KCsy0710UnitTestLog,    "Csy0710UnitTestLog.txt");
-_LIT(KCsy0710UnitTestScript, "Csy0710UnitTest.cpp;");
-
-const TInt KMaxCommPorts = 4;
-
-const TInt  KMaxDataSessions = 3;
-
-
-class CCsy0710UnitTest : public CUnitTestBase
-	{
-public:
-	static void CreateTestL(); //NewL() is called within this function
-
-	static CCsy0710UnitTest* NewL(const TDesC& aUnitTestName,
-								  const TDesC& aLogFileName,
-								  const TDesC& aTestSpecName,
-								  const TDesC& aTestScriptName);
-	~CCsy0710UnitTest();
-
-private:
-	CCsy0710UnitTest(const TDesC& aUnitTestName,const TDesC& aLogFileName,
-				 const TDesC& aTestSpecName,const TDesC& aTestScriptName);
-
-	void ConstructL();
-
-	// from CUnitTestBase
-	virtual void RunTestsL(TBool aEndInd,TTestMode aTestMode,
-						   TInt& aErrCode, TInt& aLeaveCode, 
-		                   TInt aApiNumber,TInt aTestNumber);
-
-	// tests to be called within RunTestsL()
-	TInt CsyAL(TInt aTstNum);  // 1
-	TInt CsyBL(TInt aTstNum);  // 2
-	TInt CsyCL(TInt aTstNum);  // 3
-	TInt CsyDL(TInt aTstNum);  // 4
-	TInt CsyEL(TInt aTstNum);  // 5
-	TInt CsyFL(TInt aTstNum);  // 6
-	TInt CsyGL(TInt aTstNum);  // 7
-	TInt CsyHL(TInt aTstNum);  // 8
-
-private:
-
-	void PrintTestSpecIdentifiers();
-	void PrintTestDetails(TInt aTstSpecNumber);
-
-	TBool HasTestRangesDefined();
-
-	// Helper functions
-	void CloseAllResources();
-
-	TInt LoadSerialDeviceDrivers();
-	TInt OpenAllCommPorts();
-	TInt CloseAllCommPorts();
-	TInt GetCsyInfo();
-	TInt OpenCommPortFail();
-	TInt OpenCmdPortTwice();
-	TInt OpenCmdPortInvalidName();
-	TInt SendCmdOneCommPort(TInt aPortNum);
-	TInt SendCmdsOneCommPort(TInt aPortNum);
-	TInt CancelWriteOneCommPort(TInt aPortNum);
-	TInt RecvDataOneCommPort(TInt aPortNum);
-	TInt ReadDataFromCommPort(TInt aPortNum);
-	TInt VerifyFlowControl(TInt aPortNum);
-	TInt Verify0710Compliance();
-	TInt VerifyStartup();
-	TInt VerifyStartupFlowControl(TInt aPortNum);
-	TInt VerifyShutdown(TInt aTestSubset);
-
-private:
-	RCommServ   iCommServer;
-	RComm       iCommPort[KMaxCommPorts + 1];
-	RComm		iDataPort;
-	TName       iCmdPortName[KMaxCommPorts];
-	TName       iDataPort1Name;
-	};
-
-#endif//END Csy0710UnitTest_H__
-
-
-

--- a/cbsref/csyrefplugins/csy27010/test/Csy27010UnitTest.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:
-//
-
-/** @Csy27010UnitTest.mmp
- *
- * Top-level project file for CSY 3GPP 27.010
- *
- */
- 
-TARGET			Csy0710UnitTest.EXE
-TARGETTYPE    EXE
-
-#ifdef BUILD_FOR_JETSTREAM
-MACRO		__SECURE_API__
-MACRO		__DATA_CAGING__
-CAPABILITY	ALL -ROOT
-#endif
-
-SOURCEPATH	  .
-SOURCE        Csy27010UnitTest.cpp
-
-SOURCEPATH    ..\test\unit_test_base
-SOURCE        UnitTestBase.cpp
-
-
-USERINCLUDE   .
-USERINCLUDE   ..\test\unit_test_base
-
-
-SYSTEMINCLUDE \epoc32\include
-
-LIBRARY       euser.lib C32.lib efsrv.lib
-//DEBUGLIBRARY flogger.lib

--- a/cbsref/csyrefplugins/csy27010/test/unit_test_base/unitTestBase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1266 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file contains the implementation for the base class from 
-// *               which all unit test classes are derived.
-//
-
-// UnitTestBase.cpp
-
-/** @file UnitTestBase.cpp
- *
- */
-
-#include "unitTestBase.h"
-
-// This indicates that the CSY is loaded by the TSY
-#define LOADED_BY_TSY	1
-
-//
-// CUnitTestBase
-//
-
-// These methods can be overwritten
-
-TBool CUnitTestBase::HasTestRangesDefined()
-	{
-	return EFalse;
-	}
-
-
-void CUnitTestBase::ConstructL()
-/**
- *
- *
- */
-	{
-	//LOGTEXT(">>ConstructL");
-
-	User::LeaveIfError(iFs.Connect());
-	User::LeaveIfError(iFs.SetSessionPath(KTestSessionPath));
-
-	TInt err=iLogFile.Open(iFs,iLogFileName, EFileWrite);
-
-	if (err==KErrNotFound) // file does not exist - create it
-		{
-		err = iLogFile.Create(iFs, iLogFileName, EFileWrite);
-		}
-	// In simultaneous tests, someone else may have created it between our
-	// calls to Open and Create, so no 'else' here.
-	if ( err == KErrInUse || err == KErrAlreadyExists )
-		{
-		//LOGTEXT("Distinct logging required");
-
-		// Same filename already open by someone else. In order to run more
-		// than one test in, say, BasicCall at once AND have logging that
-		// works, create distinct log files when required.
-		TInt n = 0;
-		while ( err == KErrInUse || err == KErrAlreadyExists )
-			{
-			TName newLogFileName(iLogFileName);
-			n++;
-			newLogFileName.AppendFormat(_L("%d"),n);
-			err = iLogFile.Open(iFs, newLogFileName, EFileWrite);
-			if (! err)
-				{
-				TInt pos = 0;
-				iLogFile.Seek(ESeekEnd, pos);
-				}
-			if ( err == KErrNotFound )
-				{
-				err = iLogFile.Create(iFs, newLogFileName, EFileWrite);
-				break;
-				}
-			}
-		}
-
-	if (err)
-		{
-		iTest.Printf(_L("Couldn't open log file (%d). Does the %S path exist?\n"), err, &KTestSessionPath);
-		User::After(4000000);
-		User::Leave(err);
-		}
-	TInt pos = 0;
-	iLogFile.Seek(ESeekEnd, pos);
-
-	err = iLogFile.Write(_L8("#------------------------Test Run Start-------------------------\r\n"));
-	iLogFile.Flush();
-
-	}
-
-CUnitTestBase::CUnitTestBase(const TDesC& aUnitTestName,
-							 const TDesC& aLogFileName,
-							 const TDesC& aTestSpecName,
-							 const TDesC& aTestScriptName)
-/**
- *
- *
- */
-	:iTest(aUnitTestName),
-	 iUnitTestName(aUnitTestName),
-	 iLogFileName(aLogFileName),
-	 iTestScriptName(aTestScriptName),
-	 iTestSpecName(aTestSpecName)
-	{
-#ifndef __WINS__
-	iTest.SetLogged(EFalse);
-#endif // __WINS__
-	}
-
-CUnitTestBase::~CUnitTestBase()
-/**
- *
- *
- */
-	{
-	iFailedTests.Close();
-
-	if (iLogFile.SubSessionHandle())
-		{
-		iLogFile.Write(_L8("#------------------------Test Run End-------------------------\r\n"));
-		iLogFile.Flush();
-		}
-	iLogFile.Close();
-	iFs.Close();
-	iTest.Close();
-	}
-
-void CUnitTestBase::ResizeConsoleL(const TDesC& aName, TInt aXOrg, TInt aYOrg, TInt aXSize, TInt aYSize)
-	{
-#if defined (__WINS__)
-	CConsoleBase* cons = iTest.Console();
-	CConsoleBase* newCon = NULL;
-
-	TRAPD(err,newCon = Console::NewL(aName,TSize(aXSize,aYSize)));
-	if (!err)
-		{
-		(void)aXOrg; (void)aYOrg; //unable to use these without a dirty hack!
-		delete cons;
-		iTest.SetConsole(newCon);
-		}
-#else //__WINS__
-	(void)aName; (void)aXOrg; (void)aYOrg; (void)aXSize; (void)aYSize;
-#endif //__WINS__
-	}
-
-TBool CUnitTestBase::DoSingleTestL(TInt aMethodNum, TInt aTestNum, TTestMode aTestMode)
-	{
-	//LOGTEXT3(">>DoSingleTestL [aMethodNum=%d, aTestNum=%d]",aMethodNum,aTestNum);
-
-	TInt numMethods;
-	TInt numTests;
-	TInt errorCode;
-	TInt leaveCode;
-
-	// Check if the specified test is in a valid range - if we can
-	if (HasTestRangesDefined())
-		{
-		RunTestsL(EFalse, EBatch, numMethods, leaveCode, 0, 0);
-
-		// Check that the method number is correct
-		if (aMethodNum == 0 || aMethodNum > numMethods)
-			{
-			iTest.Printf(_L("Bad method number: %d - Needs to be in range 1 to %d\n"),
-						aMethodNum, numMethods);
-			iTest.Printf(_L("Press a key when ready\n"));
-			iTest.Console()->Getch();
-			//LOGTEXT("<<DoSingleTestL bad method number");
-			return ETrue;
-			}
-
-
-		TInt testRange = 0;
-		if (aTestNum > 100) testRange = 100;
-
-		// Get the number of tests for this method and test if aTestNum is in range
-		RunTestsL(EFalse, EBatch, numTests, leaveCode, aMethodNum, testRange);
-		numTests += testRange;
-
-		if (aTestNum <= testRange || aTestNum > numTests)
-			{
-			iTest.Printf(_L("Bad test number (%d) for method %d - Needs to be in range %d to %d\n"),
-						aTestNum, aMethodNum, testRange+1, numTests);
-			iTest.Printf(_L("Press a key when ready\n"));
-			iTest.Console()->Getch();
-			//LOGTEXT("<<DoSingleTestL bad test number");
-			return ETrue;
-			}
-		}
-
-	errorCode = KErrNone;
-	leaveCode = KErrNone;
-
-	RunTestsL(EFalse, aTestMode, errorCode, leaveCode, aMethodNum,aTestNum);
-
-	LogTestResult(errorCode, leaveCode, EFalse, aMethodNum, aTestNum, aTestMode);
-
-	//LOGTEXT("<<DoSingleTestL ETrue");
-	return ETrue;
-	}
-
-TBool CUnitTestBase::DoAutoMethodTestsL(TInt aMethodNum)
-	{
-	//LOGTEXT2(">>DoAutoMethodTestsL [aMethodNum=%d]",aMethodNum);
-
-	TInt numMethods;
-	TInt numTests;
-	TInt errorCode;
-	TInt leaveCode;
-
-	if (! HasTestRangesDefined())
-		{
-		iTest.Printf(_L("Cannot auto run tests as test ranges not implemented\n"));
-		iTest.Printf(_L("Press a key when ready\n"));
-		iTest.Console()->Getch();
-		return ETrue;
-		}
-
-	// Check that the method number is correct
-	RunTestsL(EFalse, EBatch, numMethods, leaveCode, 0, 0);
-
-	if (aMethodNum == 0 || aMethodNum > numMethods)
-		{
-		iTest.Printf(_L("Bad method number: %d - Needs to be in range 1 to %d\n"),
-					aMethodNum, numMethods);
-		iTest.Printf(_L("Press a key when ready\n"));
-		iTest.Console()->Getch();
-		return ETrue;
-		}
-
-
-	// Get the number of automated tests for this method
-	RunTestsL(EFalse, EBatch, numTests, leaveCode, aMethodNum, 0);
-
-	for (TInt testIndex = 1; testIndex <= numTests; testIndex++)
-		{
-		errorCode = KErrNone;
-		leaveCode = KErrNone;
-
-		RunTestsL(EFalse, EBatch, errorCode, leaveCode, aMethodNum, testIndex);
-		LogTestResult(errorCode, leaveCode, EFalse, aMethodNum, testIndex, EBatch);
-
-		if (errorCode || leaveCode)
-			{
-			TTestFailure theFailedTest(aMethodNum, testIndex);
-			(void) iFailedTests.Append(theFailedTest);
-			}
-		}
-
-	//LOGTEXT("<<DoAutoMethodTestsL");
-	return ETrue;
-	}
-
-TBool CUnitTestBase::DoTestsInSpecifiedRangeL(TInt aStartMethodNum,
-											  TInt aStartTestNum,
-											  TInt aEndMethodNum,
-											  TInt aEndTestNum)
-	{
-	//LOGTEXT3(">>DoTestsInSpecifiedRangeL [aStartMethodNum=%d, aEndMethodNum=%d]",
-	//	aStartMethodNum,aEndMethodNum);
-
-	TInt numMethods;
-	TInt numTests;
-	TInt errorCode;
-	TInt leaveCode;
-
-	if (! HasTestRangesDefined())
-		{
-		iTest.Printf(_L("Cannot auto run tests as test ranges not implemented\n"));
-		iTest.Printf(_L("Press a key when ready\n"));
-		iTest.Console()->Getch();
-		return ETrue;
-		}
-
-	// Check that the method number is correct
-	RunTestsL(EFalse, EBatch, numMethods, leaveCode, 0, 0);
-
-	if (aStartMethodNum == 0 || aStartMethodNum > numMethods)
-		{
-		iTest.Printf(_L("Bad method number: %d - Needs to be in range 1 to %d\n"),
-					aStartMethodNum, numMethods);
-		iTest.Printf(_L("Press a key when ready\n"));
-		iTest.Console()->Getch();
-		return ETrue;
-		}
-	if (aEndMethodNum == 0 || aEndMethodNum > numMethods)
-		{
-		iTest.Printf(_L("Bad method number: %d - Needs to be in range 1 to %d\n"),
-					aEndMethodNum, numMethods);
-		iTest.Printf(_L("Press a key when ready\n"));
-		iTest.Console()->Getch();
-		return ETrue;
-		}
-	if (aEndMethodNum == -1)
-		aEndMethodNum = numMethods;
-
-	for (TInt methodIndex = aStartMethodNum; methodIndex <= aEndMethodNum; methodIndex++)
-		{
-		TInt testIndex;
-
-		if ((methodIndex < aEndMethodNum) || (aEndTestNum == -1))
-			{
-			// Get the number of automated tests for the current method
-			RunTestsL(EFalse, EBatch, numTests, leaveCode, methodIndex, 0);
-			}
-		else
-			{
-			// Finish on a specified test.
-			numTests = aEndTestNum;
-			}
-
-		if (methodIndex == aStartMethodNum)
-			testIndex = aStartTestNum;
-		else
-			testIndex = 1;
-
-		iTest.Printf(_L("Running tests %d to %d in method %d\n"),
-			testIndex, numTests, methodIndex);
-		for (; testIndex <= numTests; testIndex++)
-			{
-			errorCode = KErrNone;
-			leaveCode = KErrNone;
-
-			RunTestsL(EFalse, EBatch, errorCode, leaveCode, methodIndex, testIndex);
-
-			LogTestResult(errorCode, leaveCode, EFalse, methodIndex, testIndex, EBatch);
-			}
-		}
-
-	//LOGTEXT("<<DoTestsInSpecifiedRangeL");
-	return ETrue;
-	}
-
-TBool CUnitTestBase::DoAutoMethodsL()
-	{
-	//LOGTEXT(">>DoAutoMethodsL");
-
-	TInt numMethods;
-	TInt leaveCode;
-
-	if (! HasTestRangesDefined())
-		{
-		iTest.Printf(_L("Cannot auto run tests as test ranges not implemented\n"));
-		iTest.Printf(_L("Press a key when ready\n"));
-		iTest.Console()->Getch();
-		return ETrue;
-		}
-
-	// Get the number of automated tests for this method
-	RunTestsL(EFalse, EBatch, numMethods, leaveCode, 0, 0);
-
-	iFailedTests.Reset();
-	for (TInt methodIndex = 1; methodIndex <= numMethods; methodIndex++)
-		{
-		DoAutoMethodTestsL(methodIndex);
-		}
-
-	TInt failedCount = iFailedTests.Count();
-	if (   iRepeatFailedTests
-		&& failedCount > 0)
-		{
-		iTest.Printf(_L("%d tests failed. Will retry them now.\n"), failedCount);
-		iLogFile.Write(_L8("#--- Retrying the tests that failed ---\r\n"));
-		for (TInt i = 0; i < failedCount; i++)
-			{
-			TTestFailure theFailedTest = iFailedTests[i];
-			DoSingleTestL(theFailedTest.iMethodNum, theFailedTest.iTestIndex, EBatch);
-			}
-		}
-	iFailedTests.Reset();
-
-	//LOGTEXT("<<DoAutoMethodsL");
-	return ETrue;
-	}
-
-TBool CUnitTestBase::DoTestsL()
-/**
- * This function selects a unit test, runs it and then logs the result
- *
- * @return return a TBool
- * @retval ETrue if another test to run in interactive mode
- * @retval EFalse if the test is in batch mode or there is not another
- *         test to run in interactive mode
- */
-	{
-	TInt methodNum;
-	TInt testNum;
-	TInt endMethodNum;
-	TInt endTestNum;
-	TTestMode testMode = EBatch;
-	TBool exitTests;
-
-	TBool numOK = SelectTestL(methodNum, testNum,
-		endMethodNum, endTestNum, testMode, exitTests);
-
-	if (! numOK)
-		{
-		iTest.Printf(_L("Bad number entered\n"));
-		iTest.Printf(_L("Press a key when ready\n"));
-		iTest.Console()->Getch();
-		return ETrue;
-		}
-
-	if (exitTests)
-		{
-		return EFalse;
-		}
-
-	// Is this a manual test?
-	if ((testNum != -1) && ((endTestNum == -1) || (testMode == EInteractive)))
-		{
-		iTest.Printf(_L("Running single test %d-%d\n"), methodNum, testNum);
-		DoSingleTestL(methodNum, testNum, testMode);
-		return ETrue;
-		}
-
-	// Do we want to auto run all the tests for a specified method
-	if ((methodNum != -1) && (testNum == -1))
-		{
-		iTest.Printf(_L("Running all tests in method %d\n"), methodNum);
-		DoAutoMethodTestsL(methodNum);
-		return ETrue;
-		}
-
-	// Do we want to run tests from one index to another?
-	if (methodNum != -1)
-		{
-		iTest.Printf(_L("Running tests %d-%d to %d-%d\n"), methodNum, testNum, endMethodNum, endTestNum);
-		DoTestsInSpecifiedRangeL(methodNum, testNum, endMethodNum, endTestNum);
-		return ETrue;
-		}
-
-	// methodNum == -1 && testNum == -1 =>
-	// We want to all the tests for every method automatically
-	iTest.Printf(_L("Running all tests\n"));
-	return DoAutoMethodsL();
-  	}
-
-TInt CUnitTestBase::PostTestDelayTime()
-/**
- * This virtual function can be overridden by derived tests to
- * configure the length of delay between running tests in
- * automated mode. This used to be hard coded to KTsyTestCompleteTime,
- * which was 3 seconds.
- *
- * With 100 tests, that adds up to 5 minutes of wasted time per run!
- */
-	{
-	return KTsyTestCompleteTime;
-	}
-
-void  CUnitTestBase::ActionNoMatch(TBool aEndInd,TTestMode aTestMode,
-								   TInt aApiNumber,TInt aTestNumber)
-/**
- * This function provides the default action for the case
- * when the test identified by the API and test number is
- * not implemented. It is to be called within RunTestsL()
- * in the default case of its switch statement
- */
-	{
-	if(!aEndInd)
-		{
-		iTest.Printf(_L("** Not implemented CSY%S-%d-%d yet **\n"),
-			         &iUnitTestName,aApiNumber,aTestNumber);
-		if(aTestMode==EInteractive)
-			{
-			iTest.Printf(_L("press any key to continue\n"));
-			iTest.Console()->Getch();
-			}
-		}
-	}
-
-TInt CUnitTestBase::CompareTestResult
-(TInt aExpectedResult,TRequestStatus aStatus)
-/**
- * This function compare the test result with the expected one
- *
- * @param aStatus stores the result of a client API request
- *
- */
-	{
-	TInt ret=KErrNone;
-	if (aStatus.Int() != aExpectedResult)
-		{
-		if(aStatus==KErrNone)
-			ret=__LINE__;
-		else
-			ret=aStatus.Int();
-		}
-	return ret;
-	}
-
-void  CUnitTestBase::LogTestResult(TInt aErrCode, TInt aLeaveCode,
-								   TBool aEndInd,TInt aApiNumber,
-								   TInt aTestNumber,TTestMode aTestMode)
-/**
- * This function logs the test result
- */
-	{
-	TInt err=KErrNone;
-	if ((aErrCode)||(aLeaveCode))
-		{
-		if (aLeaveCode)
-			{
-			iTest.Printf(_L("Test failed with a LEAVE: CSY%S-%d-%d\n"),
-				         &iUnitTestName,aApiNumber,aTestNumber);
-			err=aLeaveCode;
-			}
-		else
-			{
-			iTest.Printf(_L("FAILURE: CSY%S-%d-%d failed with %d\n"),
-				         &iUnitTestName,aApiNumber,aTestNumber,aErrCode);
-			err=aErrCode;
-			}
-
-		//Print out test results in Symbian's requested format
-		TUint count=iFunIndices.Count();
-		for(TUint i = 0; i < count; i++)
-			WriteLog(EFalse,iFunIndices[i],aApiNumber,aTestNumber,err);
-		iFunIndices.Reset();
-
-		if (aTestMode==EInteractive)
-			{
-			iTest.Printf(_L("press any key to continue\n"));
-			iTest.Console()->Getch();
-			}
-		}
-	else
-		{
-		//these code will not be run if a user type E or e
-		//to end running the tests in interactive mode
-		if (!aEndInd)
-			{
-			iTest.Printf(_L("CSY%S-%d-%d finished successfully\n"),
-				         &iUnitTestName,aApiNumber,aTestNumber);
-
-#ifndef LOG_FAILED_TESTS_ONLY
-			//Print out test results in Symbian's requested format
-			TUint count=iFunIndices.Count();
-			for(TUint i = 0; i < count; i++)
-				WriteLog(ETrue,iFunIndices[i],aApiNumber,aTestNumber,err);
-			iFunIndices.Reset();
-#endif
-			iTest.Printf(_L("Waiting briefly for system to close\n"));
-
-			// give some time for test to complete
-//			User::After(this->PostTestDelayTime());
-			}
-		}
-	}
-
-
-TBool CUnitTestBase::UserSelectionL(TChar aMainNumber,
-									TInt aNumMethods,
-									TBool aRangeSpecified,
-									TInt& aApiNum, TInt& aTestNum,
-								    TTestMode& aTestMode)
-	{
-	TInt leaveCode  = 0;
-	aApiNum = UserChoice(aMainNumber);
-
-	if (aApiNum == -1) return EFalse;
-
-	if (aNumMethods != -1 && (aApiNum < 1 || aApiNum > aNumMethods))
-		{
-		aApiNum = -1;
-		aTestNum  = -1;
-		return EFalse;
-		}
-
-	PrintTestDetails(aApiNum);
-
-	TInt numAutoTests   = -1;
-	TInt numManualTests = -1;
-
-	if (! HasTestRangesDefined())
-		iTest.Printf(_L("Test number:"));
-	else
-		{
-		RunTestsL(EFalse, EBatch, numAutoTests, leaveCode, aApiNum, 0);
-		RunTestsL(EFalse, EBatch, numManualTests, leaveCode, aApiNum, 100);
-
-		iTest.Printf(_L("There are %d auto and %d manual tests\n"),
-											numAutoTests, numManualTests);
-		if (aRangeSpecified)
-			iTest.Printf(_L("Range test number:"));
-		else
-			iTest.Printf(_L("Test number or 'A' for all tests:"));
-		}
-
-	TChar numberKey = iTest.Console()->Getch();
-	iTest.Printf(_L("\n"));
-
-	if ((!aRangeSpecified) && HasTestRangesDefined() && ((numberKey == 'A')||(numberKey == 'a')))
-		{
-		aTestMode = EBatch;
-		aTestNum  = -1;
-		return ETrue;
-		}
-
-	aTestNum = UserChoice(numberKey);
-
-	if (aTestNum == -1) return EFalse;
-
-	TBool ret = EFalse;
-
-	if (! HasTestRangesDefined())
-		ret = ETrue;
-
-	if (aTestNum > 0 && aTestNum <= numAutoTests)
-		ret = ETrue;
-
-	if (aTestNum > 100 && aTestNum <= (100+numManualTests))
-		ret = ETrue;
-
-	return ret;
-	}
-
-TBool CUnitTestBase::SelectTestL(TInt& aApiNum, TInt& aTestNum,
-								 TInt& aEndApiNum, TInt& aEndTestNum,
-								 TTestMode& aTestMode, TBool& aExit)
-/**
- * This function selects a unit test which is identified by its API &
- * test numbers to be run either in batch or interactive mode
- *
- * @return return a TBool to indicate whether or not to end the test in
- *         interactive mode
- */
-	{
-	aTestMode = EBatch;
-	aExit     = EFalse;
-
-	iTest.Console()->ClearScreen();
-
-	if (CommandLineL(aApiNum, aTestNum, aEndApiNum, aEndTestNum))
-		{
-		aTestMode = EBatch;
-		iExitAfterTestsComplete = ETrue;
-
-		// we have got the numbers from the command line
-		iTest.Printf(_L("Running %S automated API tests\n"),&iUnitTestName);
-
-		// give tester time to get up and running
-		User::After(KTsyTesterSetupTime);
-		return ETrue;
-		}
-
-	// need to get numbers from the user
-	iTest.Printf(_L("Running %S API Tests - interactively\n"), &iUnitTestName);
-
-	aTestMode = EInteractive;
-
-	// helper to aid user - which identifier relates to which number
-	PrintTestSpecIdentifiers();
-
-	TInt numMethods = -1;
-	TInt leaveCode  = 0;
-	TBool rangeSpecified = EFalse;
-
-	// Get the numbers
-	if (! HasTestRangesDefined())
-		iTest.Printf(_L("\nNumber or 'S' for specific test or 'E' to end:"));
-	else
-		{
-		RunTestsL(EFalse, EBatch, numMethods, leaveCode, 0, 0);
-		iTest.Printf(_L("\nNumber or 'S' for specific test, 'R' for range, 'A' for all or 'E' to end:"), numMethods);
-		}
-
-	TChar numberKey = iTest.Console()->Getch();
-	iTest.Printf(_L("\n"));
-
-	if (!numberKey.IsDigit())
-		{
-		switch (numberKey)
-			{
-		case 'E':
-		case 'e':
-			aExit = ETrue;
-			return ETrue;
-		case 'A':
-		case 'a':
-			{
-			if (HasTestRangesDefined())
-				{
-				aTestMode = EBatch;
-				aApiNum   = -1;
-				aTestNum  = -1;
-				return ETrue;
-				}
-			}
-			return EFalse;
-		case 'R':
-		case 'r':
-			{
-			if (HasTestRangesDefined())
-				{
-				aTestMode = EBatch;
-				iTest.Printf(_L("Enter Start Method of range (1 -> %d):"), numMethods);
-				numberKey = iTest.Console()->Getch();
-				rangeSpecified = ETrue;
-				}
-			else
-				return EFalse;
-			}
-			break;
-		case 'S':
-		case 's':
-			{
-			iTest.Printf(_L("Method to test (1 -> %d):"), numMethods);
-			numberKey = iTest.Console()->Getch();
-			}
-			break;
-		default:
-			iTest.Printf(_L("Incorrect value\n"));
-			return EFalse;
-			}
-		}
-
-	// User to select test case or start of range
-	TBool ret = UserSelectionL(numberKey, numMethods, rangeSpecified,
-		aApiNum, aTestNum, aTestMode);
-
-	if (ret && rangeSpecified)
-		{
-		PrintTestSpecIdentifiers();
-
-		iTest.Printf(_L("Enter end method of range (1 -> %d) or 'L' last"), numMethods);
-		numberKey = iTest.Console()->Getch();
-		iTest.Printf(_L("\n"));
-
-		if ((numberKey == 'L')||(numberKey == 'l'))
-			{
-			aTestMode = EBatch;
-			aEndApiNum   = -1;
-			aEndTestNum  = -1;
-			return ETrue;
-			}
-
-		// User to select end of range
-		ret = UserSelectionL(numberKey, numMethods, ETrue,
-			aEndApiNum, aEndTestNum, aTestMode);
-		}
-
-	return ret;
-	}
-
-TInt  CUnitTestBase::UserChoice(TChar aNumberKey)
-/**
- * This function gets the number equivalent to the user's keyboard input
- * and will return once the enter key is pressed
- *
- * @param  aNumberKey is a key pressed by the user
- * @return return the number equivalent to the user's keyboard input
- */
-	{
-	TInt choice=0;
-	TInt mult=1;
-
-	while ( STATIC_CAST(TInt,aNumberKey) != EKeyEnter )
-		{
-		// If the user pressed Backspace, delete the previous number.
-		if (aNumberKey == 0x8)
-			{
-			if (choice > 0)
-				{
-				iTest.Printf(_L("%c %c"), aNumberKey, aNumberKey);
-				choice /= 10;
-				if (choice == 0)
-					mult = 1;
-				}
-			}
-
-		if (!aNumberKey.IsDigit())
-			{
-			aNumberKey = iTest.Console()->Getch();
-			continue;
-			}
-
-		TInt val = aNumberKey.GetNumericValue();
-		iTest.Printf(_L("%d"),val) ;
-		choice = (choice * mult) + val;
-		if(mult==1)
-			mult *=  10;
-		aNumberKey = iTest.Console()->Getch() ;
-		}
-
-	iTest.Printf(_L("\n")) ;
-	return choice;
-	}
-
-TBool CUnitTestBase::CommandLineL(TInt& aApiNum, TInt& aTestNum,
-								  TInt& aEndApiNum, TInt& aEndTestNum)
-/**
- * This function takes inputs from command lines in the batch file run_me.bat
- */
-	{
-	aApiNum = 0;
-	aTestNum = 0;
-
-	TInt commandLineLength;
-#ifndef BUILD_FOR_JETSTREAM
-	commandLineLength = User::CommandLineLength();
-#else
-	RProcess eteltest;
-	commandLineLength = eteltest.CommandLineLength();
-#endif // BUILD_FOR_JETSTREAM
-
-	if (commandLineLength > 0)
-		{
-		HBufC* argv = HBufC::NewLC(commandLineLength);
-		TPtr cmd(argv->Des());
-
-#ifndef BUILD_FOR_JETSTREAM
-		User::CommandLine(cmd);
-#else
-		eteltest.CommandLine(cmd);
-#endif // BUILD_FOR_JETSTREAM
-
-		TLex argParser(*argv);
-
-		TInt argc = 0;
-		while (argParser.NextToken().Length()) argc++;
-		if ((argc < 2) || (argc > 4))
-			{
-			iTest.Console()->Printf(_L("Usage: <app> <api num> <test num> [<end api> <end test>]\n"));
-			return EFalse;
-			}
-
-		argParser.UnGetToMark(); //Returns to the beginning of argv.
-		argParser.SkipSpace();
-
-		argParser.Val(aApiNum);
-		argParser.SkipSpace();
-		argParser.Val(aTestNum);
-
-		if (argc == 4)
-			{
-			argParser.SkipSpace();
-			argParser.Val(aEndApiNum);
-			argParser.SkipSpace();
-			argParser.Val(aEndTestNum);
-			}
-		else
-			{
-			aEndApiNum = aApiNum;
-			aEndTestNum = aTestNum;
-			}
-
-		delete argv;
-		CleanupStack::Pop();//argv
-
-		// we did find some command line params
-		return ETrue;
-		}
-	return EFalse;
-	}
-
-TInt CUnitTestBase::WriteLog(TBool aIsPassed,TUint aFunIndex,TUint aApiNum,
-		                     TUint aTstNum, TInt aErrorCode)
-/**
- * This function write test result to log in the folowing formats:
- * AUTO;<DATE>;<TIME>;UTS;<TS-Identifier>;<Functionality-Index>;
- * PASSED;<Test-Script>;<Method-In-Test-Script>;
- * or
- * AUTO;<DATE>;<TIME>;UTS;<TS-Identifier>;<Functionality-Index>;
- * FAILED;<Test-Script>;<Method-In-Test-Script>;<ErrorCode>
- */
-	{
-	//Get date & time
-	TTime time;
-	TDateTime dateTime;
-	time.HomeTime();
-	dateTime=time.DateTime();
-	TUint year = dateTime.Year();
-	TUint day = dateTime.Day() + 1;//Day() & Month() starts from 0
-	TUint month = dateTime.Month() + 1;
-	TUint hour = dateTime.Hour();
-	TUint minute = dateTime.Minute();
-	TUint second = dateTime.Second();
-
-	//Prepared the PASSED/FAILED field
-	TBuf8<KBufSize10> passedOrFailed;
-	if(aIsPassed)
-		passedOrFailed.Copy(KPassed);
-	else
-		passedOrFailed.Copy(KFailed);
-
-	TBuf8<KMaxName> testResult;
-
-	testResult.Copy(KAutoTestMarker);//AUTO;
-
-	//<DATE>;<TIME>;
-	TBuf8<KBufSize25> dateTimeField;
-	FormDateTimeBit(dateTimeField,day,ETrue,ETrue);
-	FormDateTimeBit(dateTimeField,month,ETrue,ETrue);
-	FormDateTimeBit(dateTimeField,year,ETrue,EFalse);
-	FormDateTimeBit(dateTimeField,hour,EFalse,ETrue);
-	FormDateTimeBit(dateTimeField,minute,EFalse,ETrue);
-	FormDateTimeBit(dateTimeField,second,EFalse,EFalse);
-	testResult.Append(dateTimeField);
-
-	testResult.Append(iTestSpecName);//UTS;
-
-	//<TS-Identifier>;
-	testResult.Append(iTsIdentifier);
-	testResult.Append(KSemiColon);
-
-	//<Functionality-Index>;
-	TBuf8<KBufSize25> buf;
-	buf.Num(aFunIndex);
-	buf.Append(KSemiColon);
-	testResult.Append(buf);
-
-	//PASSED/FAILED;
-	testResult.Append(passedOrFailed);
-
-	//<Test-Script>;
-	testResult.Append(iTestScriptName);
-
-	//<Method-In-Test-Script>
-	TBuf8<KBufSize100> bufMethodWithId;
-	bufMethodWithId.Copy(iMethodName);
-	bufMethodWithId.Append(KHyphen);
-	buf.Num(aApiNum);
-	buf.Append(KHyphen);
-	bufMethodWithId.Append(buf);
-	buf.Num(aTstNum);
-	buf.Append(KSemiColon);
-	bufMethodWithId.Append(buf);
-	testResult.Append(bufMethodWithId);
-
-	if(!aIsPassed)
-		{
-		buf.Num(aErrorCode);
-		testResult.Append(buf);
-		}
-	testResult.Append(KNewLine);
-
-	TInt err = iLogFile.Write(testResult);
-	iLogFile.Flush();
-
-	return err;
-	}
-
-void CUnitTestBase::FormDateTimeBit(TDes8& aDateTimeField,TUint aDateTimeBit,
-		                            TBool aIsDateSepa,TBool aAddSepa)
-/**
- * Append a date/time bit(month & hour etc.) and separator or delimiter
- * into the dateTimeField descriptor
- */
-	{
-	TBuf8<KBufSize1> separator;//- or :
-	TBuf8<KBufSize4> buf;//year takes 4 digits, the rest takes two digits
-	if(aIsDateSepa)
-		separator.Copy(KHyphen);
-	else
-		separator.Copy(KColon);
-	if(aDateTimeBit < KZeroPadValue)
-		aDateTimeField.Append(KZeroPadding);
-	buf.Num(aDateTimeBit);
-	aDateTimeField.Append(buf);
-	if(aAddSepa)
-		aDateTimeField.Append(separator);
-	else
-		aDateTimeField.Append(KSemiColon);
-	}
-
-
-TInt CUnitTestBase::LoadComms()
-/**
- *
- */
-	{
-	// connect to C32
-	TInt ret = iCommServer.Connect();
-	if (ret)
-		{
-		return ret;
-		}
-	return ret;
-	}
-
-TInt CUnitTestBase::UnloadComms()
-/**
- *
- */
-	{
-	iCommServer.Close();
-	
-	return (KErrNone);
-	}
-
-void CUnitTestBase::ReadStr(TDes& aDes)
-	{
-	TChar inputKey;
-	TInt count = 0;
-	const TInt KMaxLength = aDes.MaxLength();
-
-	aDes.Zero();
-	for (;;)
-		{
-		inputKey = (TInt) iTest.Getch();
-
-		if ((TInt)inputKey == EKeyEnter)
-			{
-			iTest.Printf(_L("\n"));
-			break;
-			}
-
-		if (inputKey == EKeyBackspace)
-			{
-			if (count > 0)
-				{
-				iTest.Printf(_L("%c"), inputKey);
-				aDes.Delete(--count,1);
-				}
-			}
-		else if (inputKey.IsPrint() && count < KMaxLength)
-			{
-			iTest.Printf(_L("%c"), inputKey);
-			aDes.Append(inputKey);
-			count++;
-			}
-		}
-	}
-
-void CUnitTestBase::GetCompilationDate(TInt& aDay, TInt& aMonth, TInt& /*aYear*/)
-	{
-	// The __DATE__ string is guaranteed to be of the form "Mmm dd yyyy"
-	// eg. Sep  9 2002
-
-	const TUint8* KMonthNames[] = {
-		_S8("Jan"), _S8("Feb"), _S8("Mar"), _S8("Apr"), _S8("May"), _S8("Jun"),
-		_S8("Jul"), _S8("Aug"), _S8("Sep"), _S8("Oct"), _S8("Nov"), _S8("Dec") };
-	const TUint8 KDateString[] = __DATE__;
-	const TPtrC8 KMonth(KDateString, 3);
-	const TPtrC8 KDay(KDateString + 4, 2);
-	const TPtrC8 KYear(KDateString + 7, 4);
-
-	TLex8 lex(KDay);
-	lex.SkipSpaceAndMark();
-	//kmif (lex.Val(aDay)) PANIC(10000);
-	aDay--;               // get a zero based day for compatibility with TDateTime
-	lex.Assign(KYear);
-	//kmif (lex.Val(aYear)) PANIC(10000);
-
-	aMonth = KErrNotFound;
-	for (TInt i = 0; i < 12; i++)
-		{
-		TPtrC8 month(KMonthNames[i], 3);
-		if (month == KMonth) aMonth = i;
-		}
-
-	//kmif (aMonth < 0) PANIC(10000);
-	//kmif (aMonth > 11) PANIC(10000);
-	}
-
-void CUnitTestBase::EnsureTargetDeviceClockIsSet()
-	{
-	TTime now;
-	now.HomeTime();
-	TDateTime date = now.DateTime();
-
-	TInt month, dayInMonth, year;
-	GetCompilationDate(dayInMonth, month, year);
-
-	//LOGTEXT4("day %d  month %d  year %d", dayInMonth, month, year);
-
-	// If boards current date is later than our compilation year, just return
-	if (   date.Year() >= year
-		&& date.Month() >= month
-		&& date.Day() >= dayInMonth)
-		{
-		return;
-		}
-
-	const TInt KCompiledYear = year;
-	for (;;)
-		{
-		iTest.Printf(_L("Enter date as DD MM YYYY (year is optional, defaults to %d) "), year);
-
-		TBuf<12> input;
-		TBuf8<12> input8;
-		ReadStr(input);
-		input.TrimAll();
-		input8.Copy(input);
-
-		TLex8 lex(input8);
-
-		lex.Val(dayInMonth);
-		lex.SkipSpaceAndMark();
-		lex.Val(month);
-		lex.SkipSpaceAndMark();
-		lex.Val(year); // if no year entered, this just returns error - year is unchanged
-
-		TInt err;
-		err = date.SetYear(year);
-		if (!err) err = date.SetMonth(static_cast<TMonth>(month-1));
-		if (!err) err = date.SetDay(dayInMonth-1);
-		if (!err && year < KCompiledYear) err = KErrNotReady;
-
-		if (err == KErrNone)
-			{
-			break; // loop termination condition
-			}
-		else
-			{
-			iTest.Printf(_L("Does not appear to be a correctly formatted date, try again.\n"));
-			month = 0;
-			dayInMonth = 0;
-			year = KCompiledYear;
-			}
-		}
-
-	// Refresh the other time values
-	now.HomeTime();
-	date = now.DateTime();
-	// Now restore the user-entered values
-	date.SetYear(year);
-	date.SetMonth(static_cast<TMonth>(month-1));
-	date.SetDay(dayInMonth-1);
-	User::SetHomeTime(date);
-	}
-
-void CUnitTestBase::RunUnitTestsL()
-/**
- * This function is called within CreateTestL(), which is a
- * static member function of CUnitTestBase derived classes,  to run
- * the unit tests for the appropriate module
- */
-	{
-	// load the CSY
-	iTest(LoadComms() == KErrNone);
-
-#ifdef __EPOC32__
-//	EnsureTargetDeviceClockIsSet();
-#endif
-
-	// do test sequence
-	TBool noEnd = ETrue;
-	while(noEnd)
-		{
-		noEnd = DoTestsL();
-		if (iExitAfterTestsComplete)
-			noEnd = EFalse;
-		}
-
-	// unload the CSY
-	iTest(UnloadComms() == KErrNone);
-	}
-
-TInt CUnitTestBase::SetUpTest()
-/**
- * This function is called within CreateTestL(), which is a
- * static member function of CUnitTestBase derived classes,
- * to load drivers & start C32
- *
- * If you want to give an 'opening page' of instructions for your unit test,
- * override this and do so. Remember to base call! See DataUnitTest for an
- * example.
- *
- * @return return an error code if set up fails
- */
-	{
-	iTest.Title();
-
-	iTest.Start(_L("Loading Serial drivers\n"));
-
-	TInt r;
-
-#if defined (__WINS__)
-	r = User::LoadPhysicalDevice(PDD_NAME);
-    r = User::LoadLogicalDevice(LDD_NAME);
-
-//taproot: tushar commented for OMAP
-//#else  // __GCC32__ 
-//	r = User::LoadPhysicalDevice(PDD_SIR_NAME);
-//	r = User::LoadPhysicalDevice(PDD_UART_NAME);
-//  r = User::LoadLogicalDevice(LDD_NAME);
-#endif
-
-	r = StartC32();
-	if ((r != KErrNone) && (r != KErrAlreadyExists))
-		iTest.Printf(_L("Failed to start C32 %d\n"), r);
-
-	return KErrNone;
-	}
-
-void CUnitTestBase::PrintTestSpecIdentifiers()
-	{
-	// This version prints no helpful info on the screen. Overload this in
-	// your own test class to put out test identifier and number of API test
-	}
-
-void CUnitTestBase::PrintTestDetails(TInt /*aTstSpecNumber*/)
-	{
-	// This version prints no helpful info on the screen. Overload this in
-	// your own test class to put out test details for the test spec idenifier
-	// selected
-	}
-
-void CUnitTestBase::SetFunIndex2(TUint aFunIndex1,TUint aFunIndex2)
-	{
-	iFunIndices.Insert(aFunIndex1,0);
-	iFunIndices.Insert(aFunIndex2,1);
-	}
-
-void CUnitTestBase::SetFunIndex3(TUint aFunIndex1,TUint aFunIndex2,
-		                         TUint aFunIndex3)
-	{
-	iFunIndices.Insert(aFunIndex1,0);
-	iFunIndices.Insert(aFunIndex2,1);
-	iFunIndices.Insert(aFunIndex3,2);
-	}
-
-void CUnitTestBase::SetFunIndex4(TUint aFunIndex1,TUint aFunIndex2,
-		                         TUint aFunIndex3,TUint aFunIndex4)
-	{
-	iFunIndices.Insert(aFunIndex1,0);
-	iFunIndices.Insert(aFunIndex2,1);
-	iFunIndices.Insert(aFunIndex3,2);
-	iFunIndices.Insert(aFunIndex4,3);
-	}
-
-TInt CUnitTestBase::GetRequestOrTimeOut(TRequestStatus& aRequestStatus,
-										TTimeIntervalMicroSeconds32 aTimeOut)
-/**
- * Acts exactly like User::WaitForRequest, except aTimeOut is a timeout period
- * to give up waiting after.
- * If the request times out, returns KErrTimedOut, otherwise returns KErrNone
- * and aRequestStatus is completed as usual.
- */
-	{
-	//LOGTEXT(">>GetRequestOrTimeOut");
-
-	RTimer timer;
-	TRequestStatus timerRequest;
-	timer.CreateLocal();
-	timer.After(timerRequest, aTimeOut);
-
-	// Wait for the requestto complete or until we time out
-	User::WaitForRequest(timerRequest, aRequestStatus);
-
-	// If timer is no longer pending => we have timed out
-	if (timerRequest != KRequestPending)
-		{
-		//LOGTEXT("<<GetRequestOrTimeOut **** Timed out ****");
-		return KErrTimedOut;
-		}
-
-	timer.Cancel();
-
-	User::WaitForRequest(timerRequest);
-
-	//LOGTEXT2("<<GetRequestOrTimeOut [aRequestStatus=%d]",aRequestStatus);
-	return KErrNone;
-	}

--- a/cbsref/csyrefplugins/csy27010/test/unit_test_base/unitTestBase.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,374 +0,0 @@
-//
-// * Copyright 2004 Neusoft America Inc.
-// * All rights reserved.
-// * This component and the accompanying materials are made available
-// * under the terms of the Eclipse Public License v1.0
-// * which accompanies this distribution, and is available
-// * at the URL "http://www.eclipse.org/legal/epl-v10.html".
-// *
-// * Contributors:
-// * Keith Collins (Neusoft America Inc.)  original software development and additional code and modifications.
-// * Thomas Gahagen (Neusoft America Inc.)  additional code and modifications.
-// * Zhen Yuan (Neusoft America Inc.)  additional code and modifications.
-// *
-// * Description:  This file contains the defintion for the base class from 
-// *               which all unit test classes are derived.
-//
-
-// UnitTestBase.h
-
-/** @file UnitTestBase.h
- *
- */
-
-#ifndef UNITTESTBASE_H__
-#define UNITTESTBASE_H__
-
-#include <e32base.h>
-#include <e32test.h>
-#include <c32comm.h>
-#include "f32file.h"
-//#include "inifile.h"
-
-#include <etel.h>
-#include <etelmm.h>
-
-//#include "Constants.h"
-
-//comment out this line if both passed & failed tests
-//are to be logged in the test log file, reftsyTest.txt
-//#define LOG_FAILED_TESTS_ONLY
-
-#define TEST(AAA) {TInt XXX = (AAA); if (XXX) return (__LINE__);}
-
-//_LIT(KCsyName, "ECUART.CSY");
-_LIT(KCsyName, "GSM0710.CSY");
-//_LIT(KTsyName,    "phonetsy");
-_LIT(KTsyName,    "GSM0707");
-
-_LIT(KTestSessionPath, "c:\\Logs\\Tests\\");
-_LIT(KUnitTestSpec, "UTS;");
-_LIT(KAccTestSpec, "ATS;");
-_LIT(KAutoTestMarker, "AUTO;");
-_LIT(KPassed, "PASSED;");
-_LIT(KFailed, "FAILED;");
-_LIT(KZeroPadding, "0");
-_LIT(KHyphen,"-");
-_LIT(KSemiColon,";");
-_LIT(KColon, ":");
-_LIT(KNewLine, "\r\n");
-
-const TUint KTsyTesterSetupTime = 3000000;
-const TUint KTsyTestCompleteTime = 3000000;
-const TUint KBufSize1 = 1;
-const TUint KBufSize4 = 4;
-const TUint KBufSize25 = 25;
-const TUint KBufSize10 = 10;
-const TUint KBufSize100 = 100;
-const TUint KZeroPadValue = 10;
-const TUint KMaxTestTelNumberSize = 20;
-
-// BttTest.Ini constants
-_LIT(KIniFile, "CommPTest.INI");
-_LIT(KIniSection, "PhoneNumberList");
-_LIT(KIniSection2, "Sms");
-_LIT(KIniSection3, "GeneralSettings");
-_LIT(KIniTelNumConnect1, "TelNumConnect1");
-_LIT(KIniTelNumConnect2, "TelNumConnect2");
-_LIT(KIniTelNumConnect3, "TelNumConnect3");
-_LIT(KIniTelNumConnect4, "TelNumConnect4");
-_LIT(KIniTelNumConnect5, "TelNumConnect5");
-_LIT(KIniTelNumConnect6, "TelNumConnect6");
-_LIT(KIniTelNumConnect7, "TelNumConnect7");
-_LIT(KIniTelNumDataConnect, "TelNumDataConnect");
-_LIT(KIniTelNumNeverConnect, "TelNumNeverConnect");
-_LIT(KIniTelNumRejectCall, "TelNumRejectCall");
-_LIT(KIniTelNumRemoteEndHangUp, "TelNumRemoteEndHangUp");
-_LIT(KIniTelNumIncorrect1, "TelNumIncorrect1");
-_LIT(KIniTelNumIncorrect2, "TelNumIncorrect2");
-_LIT(KIniTelNumMobile1, "TelNumMobile1");
-_LIT(KIniTelNumDTMFTest, "TelNumDTMFTest");
-_LIT(KIniTelNumCallback, "TelNumCallbackService");
-_LIT(KIniTelNumDataServer1, "TelNumDataServer1");
-_LIT(KIniTelNumDataServer2, "TelNumDataServer2");
-_LIT(KIniTelNumDataServer3, "TelNumDataServer3");
-_LIT(KIniTelNumDataServer4, "TelNumDataServer4");
-_LIT(KIniSmsDestNumber, "SmsDestNumber");
-_LIT(KIniTelNumberInMadCow, "SimTelNumberInMadCow");
-_LIT(KIniSmsNetworkName, "SmsNetworkName");
-_LIT(KIniTypeOfTest, "TypeOfTest");
-_LIT(KIniKeepPhoneOpen, "KeepPhoneOpen");
-_LIT(KIniAutoRepeatFailedTests, "AutoRepeatFailedTests");
-_LIT(KIniTypeOfNumber1, "DestNumberIs44Format");
-_LIT(KIniTypeOfNumber2, "MadCowNumberIs44Format");
-
-// Moved from phone
-const TUint KDelayLong   = 10000000;
-const TUint KDelayMedium = 1000000;
-const TUint KDelayShort  = 100000;
-
-//const TUint KOneSecond = 1000000;
-const TUint KTwoSeconds = 2000000;
-const TUint KFiveSeconds = 5000000;
-const TUint KTenSeconds = 10000000;
-const TUint KTwentySeconds = 20000000;
-
-#define KEightSeconds TTimeIntervalMicroSeconds32(8000000)
-
-#if defined (__WINS__)
-#define PDD_NAME _L("ECDRV")
-#define LDD_NAME _L("ECOMM")
-#else  // __GCC32__
-#define PDD_SIR_NAME _L("ESIR")
-#define PDD_UART_NAME _L("ECUART4")
-#define LDD_NAME _L("ECOMM")
-#endif
-
-const TInt KErrWrongValue=KErrGeneral;
-
-//Network Name
-//Size of text string must be less than
-//12 for the  Cellnet and Vodafone test SIM
-//10 for the  Orange test SIM
-//8  for the  One-2-One  test SIM
-//for the SMSP list storage test to pass.
-const TUint KMaxSimNameLen = 12;
-
-class CUnitTestBase : public CBase
-	{
-public:
-	enum TTestMode
-		{
-		EBatch,
-		EInteractive
-		};
-
-	enum TTestPhoneNumbers
-		{
-		ETelNumConnect1,
-		ETelNumConnect2,
-		ETelNumConnect3,
-		ETelNumConnect4,
-		ETelNumConnect5,
-		ETelNumConnect6,
-		ETelNumConnect7,
-		ETelNumDataConnect,
-		ETelNumNeverConnect,
-		ETelNumRejectCall,
-		ETelNumIncorrect1,
-		ETelNumIncorrect2,
-		ETelNumDTMFTest,
-		ETelNumCallbackService,
-		ETelNumDataServer1,
-		ETelNumDataServer2,
-		ETelNumDataServer3,
-		ETelNumDataServer4,
-		ESmsDestNumber,
-		ETelNumberInMadCow,
-		ESmsNetworkName,
-		ETypeOfTest
-		};
-
-//	virtual static void CreateTestL()=0;//not allowed in C++!!
-	~CUnitTestBase();
-
-	inline RTest Test() const;
-
-	//These functions are called within CreateTestL() which is a
-	//static member function of CUnitTestBase derived classes.
-	//Every derived class must implement CreateTestL() as it
-	//first calls NewL() to instantiate the derived class before
-	//calling SetUpTest() and RunUnitTestsL().
-	//CreateTestL() is called in E32Main() which should be in the file
-    //containing the CUnitTestBase derived class implementation
-	//Please look at the SMS test code for an example on how to
-	//code up E32main() and CreateTestL()
-	virtual TInt SetUpTest();    //load drivers & start C32
-	void RunUnitTestsL();
-
-	//Helper Functions
-	TInt CompareTestResult(TInt aExpectedResult,TRequestStatus aStatus);
-
-	//For running more than one at once
-	void ResizeConsoleL(const TDesC& aName, TInt aXOrg, TInt aYOrg, TInt aXSize, TInt aYSize);
-
-	//For test result logging
-	//Setters to be called by derived classes within their specific tests
-	inline void SetTsIdentifier(const TName& aTsIdentifier);
-	inline void SetMethodName(const TName& aMethodName);
-	inline void SetFunIndex(TUint aFunIndex);
-	void SetFunIndex2(TUint aFunIndex1,TUint aFunIndex2);
-	void SetFunIndex3(TUint aFunIndex1,TUint aFunIndex2,
-		              TUint aFunIndex3);
-	void SetFunIndex4(TUint aFunIndex1,TUint aFunIndex2,
-		              TUint aFunIndex3,TUint aFunIndex4);
-
-	// These three made public for the acceptance tests
-	TInt  LoadComms();
-	TInt  UnloadComms();
-	TBool DoSingleTestL(TInt aMethodNum, TInt aTestNum, TTestMode aTestMode);
-
-protected:
-	CUnitTestBase(const TDesC& aUnitTestName,const TDesC& aLogFileName,
-				  const TDesC& aTestSpecName,const TDesC& aTestScriptName);
-	void ConstructL();
-
-	TInt GetRequestOrTimeOut(TRequestStatus& aRequestStatus,
-		TTimeIntervalMicroSeconds32 aTimeOut);
-
-	//Derived classes must implement this function
-	//which is just simply a switch statement to
-	//run their specific tests according to API and test numbers
-	virtual void RunTestsL(TBool aEndInd,TTestMode aTestMode,
-						   TInt& aErrCode, TInt& aLeaveCode,
-		                   TInt aApiNumber,TInt aTestNumber)=0;
-	//this function is to be called within RunTestsL() in the default case
-	//of the switch statement
-	void ActionNoMatch(TBool aEndInd,TTestMode aTestMode,
-					   TInt aApiNumber,TInt aTestNumber);
-
-	// overload this function if you want to show what test is what number
-	virtual void PrintTestSpecIdentifiers();
-	// overload this function to show detail of the tests
-	virtual void PrintTestDetails(TInt aTstSpecNumber);
-
-	// Should the base class automatically connect to the Etel server. Overload if not
-	virtual TBool HasTestRangesDefined();
-
-	void RequestIncomingCallL(RMobileCall& aCall);
-	TBool DoTestsL();
-
-protected:
-	virtual TInt PostTestDelayTime();     ///< configurable delay time after each test
-	inline void LeaveIfPhoneAlreadyOpenL();
-
-private:
-	void GetCompilationDate(TInt& aDay, TInt& aMonth, TInt& aYear);
-	void EnsureTargetDeviceClockIsSet();  ///< prompt user for date if Assabet clock not set
-	void ReadStr(TDes& aDes);
-
-	TBool DoAutoMethodsL();
-	TBool DoAutoMethodTestsL(TInt aMethodNum);
-	TBool DoTestsInSpecifiedRangeL(TInt aStartMethodNum,
-									TInt aStartTestNum,
-									TInt aEndMethodNum,
-									TInt aEndTestNum);
-
-	//DoTestsL() calls SelectTestL(), RunTestsL() and LogTestResult()
-
-	TBool SelectTestL(TInt& aApiNum,TInt& aTestNum,
-						TInt& aEndApiNum, TInt& aEndTestNum,
-						TTestMode& aTestMode, TBool& aExit);
-
-	//These functions are called within SelectTestL()
-	TInt  UserChoice(TChar aNumberKey);
-	TBool UserSelectionL(TChar aMainNumber,
-						TInt aNumMethods,
-						TBool aRangeSpecified,
-						TInt& aApiNum, TInt& aTestNum,
-						TTestMode& aTestMode);
-
-
-
-
-	//process command line params
-	TBool CommandLineL(TInt& aApiNum, TInt& aTestNum,
-						TInt& aEndApiNum, TInt& aEndTestNum);
-
-	void LogTestResult(TInt aErrCode, TInt aLeaveCode, TBool aEndInd,
-		               TInt aApiNumber,TInt aTestNumber,TTestMode aTestMode);
-
-	TInt WriteLog(TBool aIsPassed,TUint aFunIndex,TUint aApiNum,
-		          TUint aTstNum, TInt aErrorCode);
-	void FormDateTimeBit(TDes8& aDateTimeField,TUint aDateTimeBit,
-		                 TBool aIsDateSepa,TBool aAddSepa);
-
-private:
-	RCommServ   iCommServer;
-
-	TBuf<KMaxTestTelNumberSize> iTelNumConnect1;
-	TBuf<KMaxTestTelNumberSize> iTelNumConnect2;
-	TBuf<KMaxTestTelNumberSize> iTelNumConnect3;
-	TBuf<KMaxTestTelNumberSize> iTelNumConnect4;
-	TBuf<KMaxTestTelNumberSize> iTelNumConnect5;
-	TBuf<KMaxTestTelNumberSize> iTelNumConnect6;
-	TBuf<KMaxTestTelNumberSize> iTelNumConnect7;
-	TBuf<KMaxTestTelNumberSize> iTelNumMobile1;
-	TBuf<KMaxTestTelNumberSize> iTelNumDataConnect;
-	TBuf<KMaxTestTelNumberSize> iTelNumNeverConnect;
-	TBuf<KMaxTestTelNumberSize> iTelNumRejectCall;
-	TBuf<KMaxTestTelNumberSize> iTelNumRemoteEndHangUp;
-	TBuf<KMaxTestTelNumberSize> iTelNumIncorrect1;
-	TBuf<KMaxTestTelNumberSize> iTelNumIncorrect2;
-	TBuf<KMaxTestTelNumberSize> iTelNumDTMFTest;
-	TBuf<KMaxTestTelNumberSize> iTelNumCallback;
-	TBuf<KMaxTestTelNumberSize> iTelNumDataServer1;
-	TBuf<KMaxTestTelNumberSize> iTelNumDataServer2;
-	TBuf<KMaxTestTelNumberSize> iTelNumDataServer3;
-	TBuf<KMaxTestTelNumberSize> iTelNumDataServer4;
-	TBuf<KMaxTestTelNumberSize> iSmsDestNumber;
-	TBuf<KMaxTestTelNumberSize> iTelNumberInMadCow;
-	TBuf<KMaxSimNameLen>		iSmsNetworkName;
-	TInt	 iTypeOfTest;
-
-	///< Determines whether to repeat the tests that failed at the end of a full automatic run
-	TBool    iRepeatFailedTests;
-	///< Do we want to keep the phone open between tests?
-	TBool    iKeepPhoneOpen;
-
-	TBool iExitAfterTestsComplete;
-
-private:
-	// Another session with Etel, to be kept permanently open. Helps to test
-	// bad states building up, speeds the tests up too...
-
-	struct TTestFailure
-		{
-		TTestFailure(TInt aMethodNum,TInt aTestIndex) : iMethodNum(aMethodNum), iTestIndex(aTestIndex) {}
-		TInt iMethodNum;
-		TInt iTestIndex;
-		};
-	typedef RArray<TTestFailure> RFailedTestsArray;
-	RFailedTestsArray iFailedTests;
-
-protected:
-	RFs iFs;
-	RFile iLogFile;
-	RTest		iTest;
-	const TName iUnitTestName;
-	const TName iLogFileName;
-	const TName iTestScriptName;
-	const TName iTestSpecName;
-	TName iTsIdentifier;
-	TName iMethodName;
-	RArray<TUint> iFunIndices;
-	};
-
-//inline functions
-RTest CUnitTestBase::Test() const
-	{
-	return iTest;
-	}
-
-void CUnitTestBase::SetTsIdentifier(const TName& aTsIdentifier)
-	{
-	iTsIdentifier=aTsIdentifier;
-	}
-
-void CUnitTestBase::SetMethodName(const TName& aMethodName)
-	{
-	iMethodName=aMethodName;
-	}
-
-void CUnitTestBase::SetFunIndex(TUint aFunIndex)
-	{
-	iFunIndices.Insert(aFunIndex,0);
-	}
-
-void CUnitTestBase::LeaveIfPhoneAlreadyOpenL()
-	{
-	if (iKeepPhoneOpen)
-		User::Leave(KErrAbort);
-	}
-
-#endif//END UNITTESTBASE_H__

--- a/cbsref/csyrefplugins/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-// Copyright (c) 1999-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
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-#include "../csy27010/group/bld.inf"

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/inc/allcallreleasecompleteobserver.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-// 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:
-// MAllCallReleaseCompleteObserver
-
-
-#ifndef ALLCALLRELEASECOMPLETEOBSERVER_H_
-#define ALLCALLRELEASECOMPLETEOBSERVER_H_
-
-//system include
-#include <e32std.h>
-//user include
-
-
-class MAllCallReleaseCompleteObserver
-	{
-public:
-	
-	/**
-	 * All call was released by ATH
-	 */
-	virtual void ReleaseAllCallComplete(TInt aError) = 0;
-	};
-
-#endif /*ALLCALLRELEASECOMPLETENOTIFY_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/inc/atanswer.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,186 +0,0 @@
-// 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:
-// @file atanswer.h
-// This contains CATAnswer which answering incomging call.
-// 
-
-#ifndef ATANSWER_H_
-#define ATANSWER_H_
-
-//system include
-
-//user include
-#include "atcommandbase.h"
-
-class CATAnswer : public CAtCommandBase
-	{
-public:
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	static CATAnswer* NewL(CGlobalPhonemanager& aGloblePhone,
-			               CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC 
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	static CATAnswer* NewLC(CGlobalPhonemanager& aGloblePhone,
-			                CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	
-	/**
-	 * Destructor
-	 * 
-	 */
-	virtual ~CATAnswer();
-	
-	/**
-	 * Seting answer id
-	 * 
-	 * @param aCallId
-	 */
-	void SetAnswerCallId(TInt aCallId);
-	
-	/**
-	 * Seting the call is or not 3rd party
-	 * 
-	 * 
-	 * @param aIsIsvCall ETrue 3rd party  another EFalse
-	 */
-	void SetIsIsvCall(TBool aIsIsvCall);
-	
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-		
-	/**
-	* Start AT request
-	* 
-	*/
-	virtual void StartRequest();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-protected:
-	
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	CATAnswer(CGlobalPhonemanager& aGloblePhone, 
-			  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/	
-	void ConstructL();
-	
-	/**
-	* The last execute end of this command
-	*/	
-	void Complete();
-	
-private:
-	
-	/**
-	 * Handle IO errors
-	 * 
-	 */
-	void HandleIOError();
-	
-	/**
-	 * Handle response error
-	 * 
-	 */
-	void HandleResponseError();
-	
-	/**
-	 * Handle response OK
-	 * 
-	 */
-	void HandleConnectedComplete();		
-	
-private:
-	
-	/**
-	 * AT command execute step
-	 * 
-	 */
-	enum TATStep
-		{
-		EATNotInProgress,
-		EATWaitForWriteComplete,
-		EATReadComplete
-		};	
-	
-private:
-	/**
-	 * I/O error when Read or Write
-	 * include timeout
-	 */
-	TInt iIOStatus;
-	
-	/**
-	 * At command return errors
-	 * 
-	 */
-	TInt iATResult;
-	
-	/**
-	 * Identifier step
-	 * 
-	 */
-	TATStep iAnswerStep;	
-	
-	/**
-	 * answer call id
-	 * 
-	 */
-	TInt iCallId;
-	
-	/**
-	 * The flag of 3rd party call
-	 * 
-	 */
-	TBool iIsIsvCall;
-	
-	};
-
-#endif /*ATANSWER_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/inc/atchld.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,296 +0,0 @@
-// 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:
-// @file atchld.h
-// This contains CATChld which hold, resume, release, swap one call.
-// 
-
-#ifndef ATCHLD_H_
-#define ATCHLD_H_
-
-//system include
-
-//user include
-#include "atcommandbase.h"
-
-class CATChld : public CAtCommandBase
-	{
-public:
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	static CATChld* NewL(CGlobalPhonemanager& aGloblePhone,
-			             CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	static CATChld* NewLC(CGlobalPhonemanager& aGloblePhone,
-			              CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * Destructor
-	 * 
-	 */
-	virtual ~CATChld();
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-		
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start AT request
-	* 
-	*/
-	virtual void StartRequest();	
-	
-public:
-	
-	/**
-	 * IPC type
-	 * 
-	 */
-	enum TIpcType
-		{
-		ELtsyReqCallHangup = 0,   //Invoke function HandleHangUpReqL(TInt aCallId, TInt aHangupCause)     
-		ELtsyReqCallHold = 1,	  //Invoke function HandleHoldReqL(TInt aCallId)
-		ELtsyReqCallResume = 2,	  //Invoke function HandleResumeReqL(TInt aCallId)
-		ELtsyReqCallSwap = 3	  //Invoke function HandleSwapReqL(TInt aHeldCallId, TInt aConnectedCallId)
-		};
-	
-	/**
-	 * which identify AT type
-	 * 
-	 */
-	enum TChldType
-		{
-		EReleaseAllHeldCallOrUDUB = 0,
-		EReleaseAllActiveCallAndAcceptHeldWaiting = 1,
-		EHeldAllActiveCallAndAcceptHeldWaiting = 2,  //For held a call and resume a call
-		EAddHeldCallToConversation = 3,
-		ECallTranster =  4,
-		ERleaseSpecificCall = 5,
-		EHeldAllActiveCallExceptCallX = 6
-		};
-	
-	/**
-	 *Set IPC type 
-	 * 
-	 * @param aIpcType
-	 */
-	void SetIpcType(TIpcType aIpcType);	
-	
-	/**
-	 * Set chld type
-	 * 
-	 * @param aManageType
-	 */
-	void SetChldType(TChldType aManageType);
-	
-	/**
-	 * Set call id
-	 * 
-	 * @param aCallId
-	 */
-	void SetCallId(TInt aCallId);
-	
-	/**
-	 * Set connected call id
-	 * 
-	 * @param aConnectedCallId
-	 */
-	void SetConnectedCallId(TInt aConnectedCallId);
-	
-	/**
-	 * Set hang up case 
-	 * 
-	 * @param aHangupCase
-	 */
-	void SetHangupCase(TInt aHangupCase);
-	
-	/**
-	 * Init member
-	 * 
-	 */
-	void InitVariable();
-	
-	/**
-	 * Prevent second holding when the aHoldCallId is holded
-	 * 
-	 * @param aHoldCallId
-	 */
-	TBool IsHoldCall(TInt aHoldCallId);
-	
-	/**
-	 * Prevent second resumeing when the aActiveCallId is actived
-	 * 
-	 * @param aActiveCallId
-	 */
-	TBool IsActiveCall(TInt aActiveCallId);
-	
-protected:
-	
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	CATChld(CGlobalPhonemanager& aGloblePhone,
-			CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/	
-	void ConstructL();
-
-	/**
-	* The last execute end of this command
-	* 
-	*/	
-	virtual void Complete();
-	
-private:
-	
-	/**
-	 * AT command execute step
-	 * 
-	 */
-	enum TATStep
-		{
-		EATNotInProgress,
-		EATWaitForWriteComplete,
-		EATReadComplete
-		};
-	
-private:
-	/**
-	 * Handle IO errors
-	 * 
-	 */
-	void HandleIOError();
-	
-	/**
-	 * Handle response error
-	 * 
-	 */
-	void HandleResponseError();
-	
-	/**
-	 * Handle response OK
-	 * 
-	 */
-	void HandleCHLDComplete();
-	
-	/**
-	 * Hang up call complete
-	 * 
-	 */
-	void HandleHangupComplete();
-	
-	/**
-	 * Hold call complete
-	 * 
-	 */
-	void HandleHoldComplete();
-	
-	/**
-	 * Resume call complete
-	 * 
-	 */
-	void HandleResumeComplete();
-	
-	/**
-	 * Swap call complete
-	 * 
-	 */
-	void HandleSwapComplete();
-	
-private:
-	
-	/**
-	 * I/O error when Read or Write
-	 * include timeout
-	 */
-	TInt iIOStatus;
-	
-	/**
-	 * At command return errors
-	 * 
-	 */
-	TInt iATResult;
-		
-	/**
-	 * Identifier step
-	 * 
-	 */
-	TATStep iATStep;
-	
-	/**
-	 * 
-	 * 
-	 */
-	TIpcType iIpcType;
-	
-	/**
-	 * 
-	 * 
-	 */
-	TChldType iChldType;
-	
-	/**
-	 * for hangup/hold/resum/swap
-	 * 
-	 */
-	TInt iCallId;
-	
-	/**
-	 * for swap
-	 * 
-	 */
-	TInt iConnectedCallId;
-	
-	/**
-	 * for hangup
-	 * 
-	 */
-	TInt iHangupCause;
-	
-	};
-
-#endif /*ATCHLD_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/inc/atclcc.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +0,0 @@
-// 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:
-// @file atclcc.h
-// This contains CATClcc which query incoming or waitting call information.
-// 
-
-
-#ifndef ATCLCC_H_
-#define ATCLCC_H_
-
-//system include
-
-//user include
-#include "atcommandbase.h"
-
-//class forward
-class MCallInformationQueryCompleteNotify;
-
-class CATClcc : public CAtCommandBase
-	{
-public:
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	static CATClcc* NewL(CGlobalPhonemanager& aGloblePhone,
-			             CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC 
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	static CATClcc* NewLC(CGlobalPhonemanager& aGloblePhone,
-			              CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * Destructor
-	 * 
-	 */
-	virtual ~CATClcc();
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-		
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/	
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);	
-	
-	/**
-	* Start AT request
-	* 
-	*/
-	virtual void StartRequest();
-	
-	/**
-	 * Init member variable
-	 * 
-	 */
-	void InitVariable();
-	
-	/**
-	 * Add query call information complete obsever 
-	 * 
-	 */
-	void AddQueryCallInformationCompleteNotify(MCallInformationQueryCompleteNotify* aQueryCallInfoNotify);
-
-public:
-	
-	/**
-	 * AT execute result
-	 * 
-	 */
-	enum TATProcessStates
-		{
-		EProcessNotInProgress,
-		EProcessInProgress,
-		EProcessError,
-		EProcessOK
-		};
-	
-	/**
-	 * Get AT Process status
-	 * 
-	 */
-	TATProcessStates GetProcessStates() const;
-	
-	/**
-	 * Set AT Process status
-	 * 
-	 */
-	void SetProcessStates(TATProcessStates aProcessState);
-	
-protected:
-	
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	CATClcc(CGlobalPhonemanager& aGloblePhone,
-			CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/	
-	void ConstructL();
-	
-	/**
-	* The last execute end of this command
-	* 
-	*/	
-	virtual void Complete();
-	
-private:
-	
-	/**
-	 * Handle IO errors
-	 * 
-	 */
-	void HandleIOError();
-	
-	/**
-	 * Handle response error
-	 * 
-	 */
-	void HandleResponseError();
-	
-	/**
-	 * Handle response OK
-	 * 
-	 */
-	void HandleCLCCComplete();	
-	
-	/**
-	 * Parse AT clcc result
-	 * 
-	 */
-	void ParseCLCCResponseL(const TDesC8& aResponseBuf);
-	
-private:
-	
-	/**
-	 * At step
-	 * 
-	 */
-	enum TATStep
-		{
-		EATNotInProgress,
-		EATWaitForWriteComplete,
-		EATReadComplete
-		};
-	
-private:
-	
-	/**
-	 * I/O error when Read or Write
-	 * include timeout
-	 */
-	TInt iIOStatus;
-	
-	/**
-	 * At command return errors
-	 * 
-	 */
-	TInt iATResult;
-	
-	/**
-	 * Find OK result
-	 * 
-	 */
-	TBool iOKFounded;
-	
-	/**
-	 * Identifier step
-	 * 
-	 */
-	TATStep iATStep;
-	
-	/**
-	 * Process at command states
-	 * 
-	 */
-	TATProcessStates iProcessStates;
-	
-	/**
-	 * Observer which notify querying call information result
-	 * 
-	 */
-	MCallInformationQueryCompleteNotify* iQueryCallInfoNotify;
-	};
-
-#endif /*ATCLCC_H_*/
\ No newline at end of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/inc/atdialvoice.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,246 +0,0 @@
-// 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:
-// @file atdialvoice.h
-// This contains CATDialVoice which dial a voice call.
-// 
-
-#ifndef ATDIALVOICE_H_
-#define ATDIALVOICE_H_
-
-//system include
-#include <etelmm.h>
-
-//user include
-#include "atcommandbase.h"
-#include "unsolicitedparams.h"
-#include "athangup.h"
-#include "allcallreleasecompleteobserver.h"
-
-class CATDialVoice : public CAtCommandBase, public MAllCallReleaseCompleteObserver
-	{
-public:
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	static CATDialVoice* NewL(CGlobalPhonemanager& aGloblePhone,
-			                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	static CATDialVoice* NewLC(CGlobalPhonemanager& aGloblePhone,
-			                   CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * Destructor
-	 * 
-	 */
-	virtual ~CATDialVoice();
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-		
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Start AT request
-	* 
-	*/
-	virtual void StartRequest();
-	
-	/**
-	 * set telephone number
-	 * 
-	 * @param aTelNum
-	 */
-	void SetTelephoneNumber(const TDesC8& aTelNum);
-	
-	/**
-	 * ETrue : Emergency call
-	 * EFalse : Normal call
-	 */
-	void SetEmergnecyCallFlag(TBool aIsEmergencyCall = EFalse);
-	
-	/**
-	 * Init member
-	 * 
-	 */
-	void InitVariable();
-	
-	/**
-	 * From MAllCallReleaseCompleteObserver
-	 * 
-	 * @param aError
-	 */
-	virtual void ReleaseAllCallComplete(TInt aError);
-	
-protected:
-	
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	CATDialVoice(CGlobalPhonemanager& aGloblePhone,
-			     CCtsyDispatcherCallback& aCtsyDispatcherCallback); 
-	
-	/**
-	* 2nd Constructor
-	* 
-	*/	
-	void ConstructL();
-	
-	/**
-	* The last execute end of this command
-	* 
-	*/	
-	virtual void Complete();
-	
-	/**
-	 * Parse +Wind at command
-	 * 
-	 * @param aParams class TUnsolicitedParams
-	 * @param aCommandBuf buffer of at command
-	 */
-	TInt ParseUnsolicitedCommandBufL(TUnsolicitedParams& aParams, const TDesC8& aCommandBuf);
-	
-	/**
-	 * Parse +Wind at command
-	 * 
-	 * @param aParams class TUnsolicitedParams
-	 */
-	TInt ProcessUnsolicitedCallCreated(const TUnsolicitedParams& aParams);
-private:
-	/**
-	 * Handle IO errors
-	 * 
-	 */
-	void HandleIOError();
-	
-	/**
-	 * Handle response error
-	 * 
-	 */
-	void HandleResponseError();
-	
-	/**
-	 * Handle call dialing complete
-	 * 
-	 */
-	void HandleDiallingComplete();
-	
-	/**
-	 * Handle call connecting complete
-	 * 
-	 */
-	void HandleConnectingComplete();
-	
-	/**
-	 * Handle call connected complete
-	 * 
-	 */
-	void HandleConnectedComplete();
-		
-private:
-	
-	/**
-	 * Dial voice call step
-	 * 
-	 */
-	enum TDialVoicStep
-		{
-		EATDialNotInProgress,
-		EATWaitForWriteComplete,
-		EATWaitForDiallingComplete,
-		EATWaitForConnectingComplete,
-		EATWaitForConnectedComplete
-		};
-	
-private:
-	
-	/**
-	 * Telephony number
-	 * 
-	 */
-	TBuf8<RMobilePhone::KMaxMobileTelNumberSize> iTelNum;
-	
-	/**
-	 * call id
-	 * 
-	 */
-	TInt iCallId;
-	
-	/**
-	 * I/O error when Read or Write
-	 * include timeout
-	 */
-	TInt iStatus;
-	
-	/**
-	 * At Command return errors
-	 * 
-	 */
-	TInt iResult;
-	
-	/**
-	 * OK response is founded
-	 * 
-	 */
-	TBool iOKFounded;
-	
-	/**
-	 * State about reading and writing
-	 * 
-	 */
-	TDialVoicStep iDialStep;
-	
-	/**
-	 * True : Emergency Call
-	 * False : Normal Call
-	 * 
-	 */
-	TBool iIsEmergencyCall;
-	
-	/**
-	 * When Emergency call release all call
-	 */
-	CATHangUp* iATH;
-	};
-
-#endif /*ATDIALVOICE_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/inc/atdtmfvts.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,242 +0,0 @@
-// 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:
-// @file atdtmfvts.h
-// This contains CATDtmfVts which send the DTMF to network.
-// 
-
-#ifndef ATDTMFVTS_H_
-#define ATDTMFVTS_H_
-
-//system include
-#include <callbacktimer.h>
-//user include
-#include "atcommandbase.h"
-
-//const define
-const TInt KLtsyTonesLength = 200;
-
-
-//class forward
-class CGlobalPhonemanager;
-class CCtsyDispatcherCallback;
-
-class CATDtmfVts : public CAtCommandBase, 
-				   public MTimerObserver
-	{
-public:
-	/**
-	 * Factory funciton
-	 * 
-	 */
-	static CATDtmfVts* NewL(CGlobalPhonemanager& aGloblePhone,
-			                CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * Factory function
-	 * 
-	 */
-	static CATDtmfVts* NewLC(CGlobalPhonemanager& aGloblePhone,
-			                 CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * Destructor
-	 * 
-	 */
-	virtual ~CATDtmfVts();
-	
-	/**
-	 * Execute the AT command
-	 * 
-	 */
-	virtual void ExecuteCommand();
-		
-	/**
-	 * Start the request
-	 * 
-	 */
-	virtual void StartRequest();
-	
-	/**
-	 * From CAtCommandBase
-	 * 
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-
-	/**
-	 * From CAtCommandBase
-	 * 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-		
-	/**
-	 * This call id is must an active call id
-	 * 
-	 */
-	TInt SetCallId(TInt aCallId);
-	
-	/**
-	 * Must be invoke when Execucommand
-	 * 
-	 */
-	TInt SetDtmfString(const TDesC& aDtmfString);
-	
-	/**
-	 * Check if the char is the DTMF tones
-	 * 
-	 */
-	TBool CharIsDtmf(const TChar& aDtmfChar);
-	
-	/**
-	 * Check if the string are DTMF tones
-	 * 
-	 */
-	TBool StringIsDtmf(const TDesC& aDtmfString);
-	
-	/**
-     * Reset the all the flag
-	 * 
-	 */
-	void InitVariable();		
-public:
-	/**
-	 * Define the DTMF type
-	 * 
-	 */
-	enum TDtmfWorkType
-		{
-		EDtmfUnknow,
-		EDtmfSendOneTone,   //Send One Char
-		EDtmfSendMoreTones, //Send string tones
-		EDtmfStopOneTone,   //Stop One char
-		EDtmfCancelMoreTones //Cancel More Tones
-		};
-	
-	/**
-	 * 
-     * Set the DTMF Type
-	 */
-	void SetDtmfWorkType(TDtmfWorkType aDtmfWorkType);
-protected:	
-	/**
-	 * Constructor
-	 * 
-	 */
-	CATDtmfVts(CGlobalPhonemanager& aGloblePhone,
-			   CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * 2nd constructor
-	 * 
-	 */
-	void ConstructL();	
-private:
-	/**
-	 * Overwite the Parent's complete
-	 * 
-	 */
-	virtual void Complete();
-	
-	/**
-	 * Checck if there is any active call current
-	 * 
-	 */
-	TBool IsHaveActiveCall(TInt aActiveCallId);	
-	
-	/**
-	 * From MTimerObserver 
-	 * 
-	 */
-    virtual void TimerRun(TInt aError);
-    
-    /**
-     * Start the timer
-     * 
-     */
-    void StartTimer();	
-    
-	/**
-	 * Handle IO errors
-	 * 
-	 */
-	void HandleIOError();
-	
-	/**
-	 * Handle response error
-	 * 
-	 */
-	void HandleResponseError();
-	
-	/**
-	 * Handle the complete event
-	 * 
-	 */
-	void HandleSendDtmfTonesSuccess();
-	
-private:
-	
-	/**
-	 * Define the state of sending the DTMF tone
-	 * 
-	 */
-	enum TATStep
-		{
-		EATNotInProgress,
-		EATWaitForWriteComplete,
-		EATReadComplete
-		};
-private:
-	/**
-	 * I/O error when Read or Write
-	 * include timeout
-	 */
-	TInt iIOStatus;
-	
-	/**
-	 * At command return errors
-	 * 
-	 */
-	TInt iATResult;
-	
-	/**
-	 * The sending is done successfully
-	 * 
-	 */
-	TBool iOKFounded;
-	
-	/**
-	 * Identifier step
-	 * 
-	 */
-	TATStep iAnswerStep;	
-	
-	/**
-	 * The calll Id
-	 * 
-	 */
-	TInt iCallId;
-	
-	/**
-	 * The DTMF type
-	 * 
-	 */
-	TDtmfWorkType iDtmfWorkType;
-	
-	/**
-	 * The timer active object
-	 * 
-	 */
-	CCallbackTimer* iCallbackTimer;	
-	};
-
-#endif /*ATDTMFVTS_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/inc/athangup.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-// 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:
-// Hangup a ongoning call
-
-#ifndef ATHANGUP_H_
-#define ATHANGUP_H_
-
-//system include
-
-//user include
-#include "atcommandbase.h"
-
-//class forward
-class MAllCallReleaseCompleteObserver;
-
-class CATHangUp : public CAtCommandBase
-	{
-public:
-	/**
-	 * Factory function
-	 * 
-	 */
-	static CATHangUp* NewL(CGlobalPhonemanager& aGloblePhone,
-			               CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * Factory function
-	 * 
-	 */
-	static CATHangUp* NewLC(CGlobalPhonemanager& aGloblePhone,
-			               CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * Destrctor
-	 * 
-	 */
-	virtual ~CATHangUp();
-	
-	/**
-	 * From CAtCommandBase
-	 * 
-	 */
-	virtual void ExecuteCommand();
-	
-	/**
-	 * From CAtCommandBase
-	 * 
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	 * From CAtCommandBase
-	 * 
-	 */		
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);	
-	
-	/**
-	 * From CRequestBase
-	 * 
-	 */	
-	virtual void StartRequest();
-	
-	/**
-	 * Add the call release observer
-	 */
-	void AddAllCallReleaseObserver(MAllCallReleaseCompleteObserver* aObserver);
-	
-	/**
-	 * Reset the internal states
-	 */
-	void InitVariable();
-	
-public:
-	
-	/**
-	 * Define the hungup opertion
-	 * 
-	 */
-	enum THangupOperator
-		{
-		EUnknownAPI,
-		ECustomAPI,
-		ERMobilePhoneAPI
-		};
-	
-	/**
-	 * Set the hangup opertion type
-	 * 
-	 */
-	void SetHangupOperator(THangupOperator aOperator);
-	
-protected:
-	/**
-	 * Constructor
-	 * 
-	 */
-	CATHangUp(CGlobalPhonemanager& aGloblePhone,
-			  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * 2nd constructor
-	 * 
-	 */
-	void ConstructL();
-	
-	/**
-	 * From CAtCommandBase
-	 * 
-	 */
-	virtual void Complete();
-	
-private:
-	/**
-	 * Handle IO errors
-	 * 
-	 */
-	void HandleIOError();
-	
-	/**
-	 * Handle response error
-	 * 
-	 */
-	void HandleResponseError();
-	
-	/**
-	 * Handle response OK
-	 * 
-	 */
-	void HandleDisconnectedComplete();		
-
-private:
-	/**
-	 * Define the states for hanging up a call
-	 * 
-	 */
-	enum THangUpStep
-		{
-		EATHangUpNotInProgress,
-		EATHangUpWaitForWriteComplete,
-		EATHangUpReadComplete
-		};
-	
-private:
-	/**
-	 * I/O error when Read or Write
-	 * include timeout
-	 */
-	TInt iIOStatus;
-	
-	/**
-	 * At command return errors
-	 * 
-	 */
-	TInt iATResult;
-		
-	/**
-	 * Identifier step
-	 * 
-	 */
-	THangUpStep iHangupStep;
-	
-	/**
-	 * The hangup opertion type
-	 * 
-	 */
-	THangupOperator iHangupOperator;
-	
-	/**
-	 * Notify all release
-	 * 
-	 */
-	MAllCallReleaseCompleteObserver* iAllCallReleaseObserver;
-	
-	};
-
-#endif /*ATHANGUP_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/inc/athangupcommandrecords.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-// 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:
-// Record the infomation related to hangup commands
-
-#ifndef ATHANGUPCOMMANDRECORDS_H_
-#define ATHANGUPCOMMANDRECORDS_H_
-
-//system include
-#include <e32base.h>
-#include <e32cmn.h> 
-
-/**
- * Hand up command information
- * 
- */
-class TATHanupCommandInfo
-	{
-public:
-	TATHanupCommandInfo();
-	TInt iCallId;
-	TInt iHangupCause;
-	};
-
-/**
- * Hang up command information records
- */
-class CATHangupCommandRecords : public CBase
-	{
-public:
-	
-	/**
-	 * Factory fucntion
-	 */
-	static CATHangupCommandRecords* NewL();
-	
-	/**
-	 * Factory function
-	 * 
-	 */
-	static CATHangupCommandRecords* NewLC();
-	
-	/**
-	 * Destructor
-	 * 
-	 */
-	virtual ~CATHangupCommandRecords();
-	
-	/**
-	 * Add hanup information
-	 */
-	TInt AddHangupCommandInfo(TInt aCallId, TInt aHangupCase);
-	
-	/**
-	 * KErrNone get command info
-	 * KErrNotFound not get command info
-	 * and then remove this info from the array
-	 */
-	TInt GetFirstHangupCommandInfoAndRemoveIt(TATHanupCommandInfo& aInfo);
-	
-	/**
-	 * Mark there is one hanup active command
-	 */
-	void SetHangupActiveFlag(TBool aIsActive);
-	
-	/**
-	 * Retrieve the flag of current hangup command
-	 *
-	 * @return The ETrue if there is one acitve hangup command active, EFalase otherwise
-	 */
-	TBool GetHangupActiveFlag() const;
-	
-	/**
-	 * Check if there are any hangup command in this store
-	 */
-	TBool IsHaveRecords() const;
-	
-protected:
-	
-	/**
-	 * Constructor
-	 */
-	CATHangupCommandRecords();
-	
-	/**
-	 * 2nd structor
-	 */
-	void ConstructL();
-	
-private:
-	/**
-	 * Flag of active hangup command 
-	 */
-	TBool iHangupActive;
-	
-	/**
-	 * Store the hangup command info
-	 */
-	RArray<TATHanupCommandInfo> iHangupInfoArray;
-	};
-
-#endif /*ATHANGUPCOMMANDRECORDS_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/inc/atring.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-// 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:
-// Wait for first one incoming call
-
-#ifndef ATRING_H_
-#define ATRING_H_
-
-//system include
-
-//user include
-#include "atcommandbase.h"
-
-class CATRing : public CAtCommandBase
-	{
-public:
-	/**
-	 * Factory function
-	 * 
-	 */
-	static CATRing* NewL(CGlobalPhonemanager& aGloblePhone,
-			             CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 *
-	 * Factory function
-	 * 
-	 */ 
-	static CATRing* NewLC(CGlobalPhonemanager& aGloblePhone,
-			              CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 
-	 * Destructor
-	 * 
-	 */
-	virtual ~CATRing();
-	
-	/**
-	 * Run this command
-	 * 
-	 */
-	virtual void ExecuteCommand(){};
-		
-protected:
-	/**
-	 * 
-	 * Constructor
-	 * 
-	 */
-	CATRing(CGlobalPhonemanager& aGloblePhone,
-			CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * 
-	 * 2nd constructor
-	 * 
-	 */
-	void ConstructL();
-	
-	};
-
-#endif /*ATRING_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/inc/atwaitforcallhandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-// 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:
-// Wait for 1st incoming call
-
-#ifndef ATWAITFORCALLHANDLER_H_
-#define ATWAITFORCALLHANDLER_H_
-
-//system include
-
-//user include
-#include "atcommandcontrolbase.h"
-
-
-//class forward
-class CATRing;
-class CATClcc;
-
-class CATWaitForCallHandler : public CATCommandControlBase
-	{
-public:
-	static CATWaitForCallHandler* NewL(CGlobalPhonemanager& aGloblePhone,
-			                           CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	static CATWaitForCallHandler* NewLC(CGlobalPhonemanager& aGloblePhone,
-			                            CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	virtual ~CATWaitForCallHandler();
-	
-	void StartToWaitForCall();
-	
-	//From MAtCommandExecuteObserver
-	void AtCommandExecuteComplete(TAtEventSource aEventSource, TInt aStatus);
-	
-protected:
-	
-	CATWaitForCallHandler(CGlobalPhonemanager& aGloblePhone,
-			              CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	void ConstructL();
-	
-	TInt ProcessIncomingCallInfomation();	
-
-private:
-	
-	CATRing* iAtRing;
-	
-	CATClcc* iAtClcc;
-
-	};
-
-#endif /*ATWAITFORCALLHANDLER_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/inc/callinformationquerycompletenotify.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-// 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:
-// MCallInformationQueryCompleteNotify. The observer for getting the notification of completion of querying the call infomation
-
-#ifndef CALLINFORMATIONQUERYCOMPLETENOTIFY_H_
-#define CALLINFORMATIONQUERYCOMPLETENOTIFY_H_
-
-//system include
-#include <e32std.h>
-//user include
-
-class MCallInformationQueryCompleteNotify
-	{
-public:
-	virtual void QueryCallInformationComplete(TInt aError) = 0;
-	};
-
-#endif /*CALLINFORMATIONQUERYCOMPLETENOTIFY_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/inc/unsolicitedcommandcallcontrolhandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-// 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:
-// CUnsolicitedCommandCallControlHandler. The handler for handling the unsolicited command related to call control
-
-#ifndef UNSOLICITEDCOMMANDCALLCONTROLHANDLER_H_
-#define UNSOLICITEDCOMMANDCALLCONTROLHANDLER_H_
-
-//system include
-#include <e32base.h>
-//user include
-#include "atunsolicitedobserver.h"
-#include "callinformationquerycompletenotify.h"
-
-//class forward
-class CGlobalPhonemanager;
-class CCtsyDispatcherCallback;
-class CATClcc;
-
-class CUnsolicitedCommandCallControlHandler : public CBase, 
-											  public MLtsyUnsolicitedCommandObserver,
-											  public MCallInformationQueryCompleteNotify											  
-	{
-public:
-	/**
-	 * Factory function
-	 * 
-	 */
-	static CUnsolicitedCommandCallControlHandler* NewL(CGlobalPhonemanager& aGloblePhone,
-			                                           CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Factory function
-	 * 
-	 */
-	static CUnsolicitedCommandCallControlHandler* NewLC(CGlobalPhonemanager& aGloblePhone,
-			                                            CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 * 
-	 */
-	virtual ~CUnsolicitedCommandCallControlHandler();
-
-	/**
-	 * From MLtsyUnsolicitedCommandObserver
-	 * 
-	 */
-	virtual void UnsolicitedCommandArriving(TInt aEvent, const TDesC8& aWindPkg);
-	
-	/**
-	 * From MCallInformationQueryCompleteNotify
-	 * 
-	 */
-	virtual void QueryCallInformationComplete(TInt aError);
-	
-protected:
-	/**
-	 * Constructor
-	 * 
-	 */
-	CUnsolicitedCommandCallControlHandler(CGlobalPhonemanager& aGloblePhone,
-			                              CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd constructor
-	 * 
-	 */
-	void ConstructL();
-	
-private:
-	/**
-	 * Handler sim remove event
-	 * 
-	 */
-	void HandleSimRemoveEvent();
-	
-	/**
-	 * Handle product init event
-	 * 
-	 */
-	void HandleProductInitEvent();
-	
-	/**
-	 * Handle network lost event
-	 * 
-	 */
-	void HandleNetworkLostEvent();
-	
-	/**
-	 * Handle call created event
-	 * 
-	 */
-	void HandleCallCreatedEvent(const TDesC8& aWindPkg);
-	
-	/**
-	 * Handle call release event
-	 * 
-	 */
-	void HandleCallReleasedEvent(const TDesC8& aWindPkg);
-
-private:
-	/**
-	 * Phone manager
-	 * 
-	 */
-	CGlobalPhonemanager& iGlobalPhone;
-	
-	/**
-	 * Call back reference
-	 * 
-	 */
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-	
-	/**
-	 * The at command for querying the call infomation
-	 * 
-	 */
-	CATClcc* iAtClcc;
-	};
-
-#endif /*UNSOLICITEDCOMMANDCALLCONTROLHANDLER_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/src/atanswer.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,292 +0,0 @@
-// 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:
-// @file atanswer.cpp
-// This contains CATAnswer which answering incomging call.
-// 
-
-//system include
-
-//user include
-#include "atanswer.h"
-#include "ltsycallinformationmanager.h"
-#include "mslogger.h"
-
-//const define
-const TInt KLtsyAnswerReadTimeOut = 20;
-_LIT8(KLtsyAnswerCallCommand, "ATA\r");
-
-
-// ---------------------------------------------------------------------------
-// CATAnswer::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATAnswer* CATAnswer::NewL(CGlobalPhonemanager& aGloblePhone,
-						   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATAnswer::NewL()"));
-	
-	CATAnswer* self = CATAnswer::NewLC(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-
-// ---------------------------------------------------------------------------
-// CATAnswer::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATAnswer* CATAnswer::NewLC(CGlobalPhonemanager& aGloblePhone,
-						    CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATAnswer::NewLC()"));
-	
-	CATAnswer* self = new (ELeave) CATAnswer(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CATAnswer::~CATAnswer
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATAnswer::~CATAnswer()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATAnswer::SetAnswerCallId
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATAnswer::SetAnswerCallId(TInt aCallId)
-	{
-	iCallId = aCallId;
-	}
-
-
-// ---------------------------------------------------------------------------
-// CATAnswer::SetIsIsvCall
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATAnswer::SetIsIsvCall(TBool aIsIsvCall)
-	{
-	iIsIsvCall = aIsIsvCall;
-	}
-
-
-// ---------------------------------------------------------------------------
-// CATAnswer::SetIsIsvCall
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATAnswer::CATAnswer(CGlobalPhonemanager& aGloblePhone,
-		             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-					 :CAtCommandBase(aGloblePhone, aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATAnswer::CATAnswer()"));
-	
-	iIOStatus = KErrNone;
-	iATResult = KErrNone;
-	iAnswerStep = EATNotInProgress;
-	}
-
-
-// ---------------------------------------------------------------------------
-// CATAnswer::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATAnswer::ConstructL()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATAnswer::ConstructL()"));
-	
-	CAtCommandBase::ConstructL();
-	AddExpectStringL(KLtsyNoCarrierString);
-	
-	//Set read and write timeout
-	SetTimeOut(KLtsyDefaultWriteTimeOut, KLtsyAnswerReadTimeOut);	
-	}
-
-// ---------------------------------------------------------------------------
-// CATAnswer::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATAnswer::ExecuteCommand()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATAnswer::ExecuteCommand()"));
-	
-	//Write AT command
-	iTxBuffer.Copy(KLtsyAnswerCallCommand);
-	Write();
-	iAnswerStep = EATWaitForWriteComplete;
-	}
-
-// ---------------------------------------------------------------------------
-// CATAnswer::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATAnswer::StartRequest()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATAnswer::StartRequest()"));
-	
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATAnswer::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATAnswer::ParseResponseL(const TDesC8& aResponseBuf)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATAnswer::ParseResponseL()"));
-	
-	if (aResponseBuf.Match(KLtsyOkString) == 0)
-		{
-		iATResult = KErrNone;
-		}
-	else if (aResponseBuf.Match(KLtsyErrorString) == 0)
-		{
-		iATResult = KErrArgument;
-		}
-	else if (aResponseBuf.Match(KLtsyNoCarrierString) == 0)
-		{
-		iATResult = KErrEtelNoCarrier;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATAnswer::HandleIOError
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATAnswer::HandleIOError()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATAnswer::HandleIOError()"));
-	
-	//Call back
-	iCtsyDispatcherCallback.CallbackCallControlAnswerComp(iIOStatus, iCallId);
-	}
-
-// ---------------------------------------------------------------------------
-// CATAnswer::HandleResponseError
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATAnswer::HandleResponseError()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATAnswer::HandleResponseError()"));
-	
-	//Call back
-	iCtsyDispatcherCallback.CallbackCallControlAnswerComp(iATResult, iCallId);
-	}
-
-// ---------------------------------------------------------------------------
-// CATAnswer::HandleConnectedComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATAnswer::HandleConnectedComplete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATAnswer::HandleConnectedComplete()"));
-
-	//Setting call states
-	iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrNone, 
-			                                                             iCallId, 
-			                                                             RMobileCall::EStatusAnswering);	
-		
-	iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrNone, 
-			                                                             iCallId, 
-			                                                             RMobileCall::EStatusConnected);
-			                                                             
-    //Call back
-	iCtsyDispatcherCallback.CallbackCallControlAnswerComp(KErrNone, iCallId);
-				                                                             						
-	//Change Call State to active
-	TLtsyCallInformation& tCallInfo(iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(iCallId));
-	if (tCallInfo.GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed)
-		{
-		tCallInfo.SetCallState(TLtsyCallInformation::EActiveCall);
-		}
-	
-	//If exist other call , should set hold
-	for (TInt n = KLtsyMinCallId; n <= KLtsyMaxCallId; n++)
-		{
-		if (n != iCallId)
-			{
-			TLtsyCallInformation& tCallInfo(iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(n));
-			if (tCallInfo.GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed &&
-				tCallInfo.GetCallState() != TLtsyCallInformation::EHeldCall )
-				{
-				tCallInfo.SetCallState(TLtsyCallInformation::EHeldCall);
-				
-				//Notify CTSY call state has changed
-				iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrNone, 
-						                                                             n, 
-						                                                 RMobileCall::EStatusHold);				
-				}
-			}
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATAnswer::Complete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATAnswer::Complete()
-	{
-	//Invoke base class complete
-	CAtCommandBase::Complete();
-	
-	//Let other command can use I/O port
-	iPhoneGlobals.iEventSignalActive = EFalse;	
-	}
-
-// ---------------------------------------------------------------------------
-// CATAnswer::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATAnswer::EventSignal(TAtEventSource /*aEventSource*/, TInt aStatus)
-	{  
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATAnswer::EventSignal()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] aStatus = %d"),aStatus);
-	
-	iIOStatus = aStatus;
-	
-	//I/O error
-	if (iIOStatus != KErrNone)
-		{
-		HandleIOError();
-		Complete();
-		return;
-		}
-	
-	switch (iAnswerStep)
-		{
-		case EATWaitForWriteComplete:
-			iAnswerStep = EATReadComplete;
-			break;
-			
-		case EATReadComplete:
-			if (iATResult == KErrNone)
-				{
-				HandleConnectedComplete();
-				}
-			else
-				{
-				HandleResponseError();
-				}
-			Complete();
-			break;
-			
-		default:
-			break;
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/src/atchld.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,622 +0,0 @@
-// 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:
-// @file atchld.cpp
-// This contains CATChld which hold, resume, release, swap one call.
-// 
-
-
-//sysmtem include
-
-//user include
-#include "atchld.h"
-#include "ltsycallinformationmanager.h"
-#include "athangupcommandrecords.h"
-#include "mslogger.h"
-
-//const define
-const TInt KLtsyCHLDReadTimeout = 3;
-const TInt KLtsyCHLDWaitForModemTime = 1000*250; // 0.25 seconds
-_LIT8(KLtsyCHLDCommandFormat1, "AT+CHLD=%d\r");
-_LIT8(KLtsyCHLDCommandFormat2, "AT+CHLD=%d%d\r");
-_LIT8(KLtsyReleaseOutgoingCommand, "ATH1\r");    //Hang up outging call
-
-
-// ---------------------------------------------------------------------------
-// CATChld::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATChld* CATChld::NewL(CGlobalPhonemanager& aGloblePhone,
-		               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATChld* self = CATChld::NewLC(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATChld* CATChld::NewLC(CGlobalPhonemanager& aGloblePhone,
-		               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATChld* self = new (ELeave) CATChld(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-
-// ---------------------------------------------------------------------------
-// CATChld::~CATChld
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATChld::~CATChld()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::CATChld
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATChld::CATChld(CGlobalPhonemanager& aGloblePhone,
-		         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-				 : CAtCommandBase(aGloblePhone, aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::CATChld()"));
-	
-	//Set At type
-	iAtType = ELtsyAT_Call_CHLD;
-	
-	//Init variable
-	InitVariable();
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::InitVariable
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::InitVariable()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::InitVariable()"));
-	
-	iIOStatus = KErrNone;
-	iATResult = KErrNone;
-	iATStep = EATNotInProgress;
-	iIpcType = ELtsyReqCallHangup;
-	iChldType = ERleaseSpecificCall;
-	iCallId = KLtsyErrorCallId;
-	iConnectedCallId = KLtsyErrorCallId;
-	iHangupCause = -1;
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::IsHoldCall
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TBool CATChld::IsHoldCall(TInt aHoldCallId)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::IsHoldCall()"));
-	if (aHoldCallId >= KLtsyMinCallId && aHoldCallId <= KLtsyMaxCallId)
-		{
-		const TLtsyCallInformation& tCallInfo = iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(aHoldCallId);
-		if (TLtsyCallInformation::EUsed == tCallInfo.GetCallIdIsUsedInfo() &&
-			TLtsyCallInformation::EHeldCall == tCallInfo.GetCallState())
-			{
-			return ETrue;
-			}		
-		}
-	return EFalse;
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::IsActiveCall
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TBool CATChld::IsActiveCall(TInt aActiveCallId)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::IsActiveCall()"));
-	
-	if (aActiveCallId >= KLtsyMinCallId && aActiveCallId <= KLtsyMaxCallId)
-		{
-		const TLtsyCallInformation& tCallInfo = iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(aActiveCallId);
-		if (TLtsyCallInformation::EUsed == tCallInfo.GetCallIdIsUsedInfo() &&
-			TLtsyCallInformation::EActiveCall == tCallInfo.GetCallState())
-			{
-			return ETrue;
-			}		
-		}	
-	
-	return EFalse;
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::ConstructL()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::ConstructL()"));
-	
-	//Invoke base class function
-	CAtCommandBase::ConstructL();
-	
-	//Set read and write timeout
-	SetTimeOut(KLtsyDefaultWriteTimeOut, KLtsyCHLDReadTimeout);	
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::ExecuteCommand()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::ExecuteCommand()"));
-	
-	if (iChldType == EReleaseAllHeldCallOrUDUB ||
-		iChldType == EReleaseAllActiveCallAndAcceptHeldWaiting ||
-		iChldType == EHeldAllActiveCallAndAcceptHeldWaiting ||
-		iChldType == EAddHeldCallToConversation ||
-		iChldType == ECallTranster)
-		{
-		iTxBuffer.Format(KLtsyCHLDCommandFormat1, iChldType);
-		}
-	else
-		{
-		if (iChldType == ERleaseSpecificCall) //Release one call
-			{
-			
-			const TLtsyCallInformation& tCallInfo(iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(iCallId));
-			
-			if (TLtsyCallInformation::EDialingCall == tCallInfo.GetCallState() ||
-				TLtsyCallInformation::EAlertingCall == 	tCallInfo.GetCallState())
-				{
-				//Hang up dialing or Alerting call(Outgoing call)
-				iTxBuffer.Copy(KLtsyReleaseOutgoingCommand);
-				}
-			else //Other call
-				{
-				iTxBuffer.Format(KLtsyCHLDCommandFormat2, EReleaseAllActiveCallAndAcceptHeldWaiting, iCallId);
-				}
-			}
-		else
-			{
-			iTxBuffer.Format(KLtsyCHLDCommandFormat2, EHeldAllActiveCallAndAcceptHeldWaiting, iCallId);
-			}
-		}
-	
-	LOGTEXT2(_L8("[Ltsy CallControl] CHLD Command = %S"), &iTxBuffer);
-	
-	//Setting waiting for modem time, when Command is too fast, Modem response error
-	if (iIpcType == ELtsyReqCallHold || 
-		iIpcType == ELtsyReqCallResume ||
-		iIpcType == ELtsyReqCallSwap)
-		{
-		User::After(KLtsyCHLDWaitForModemTime);
-		}
-	
-	Write();
-	iATStep = EATWaitForWriteComplete;
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::SetIpcType
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::SetIpcType(TIpcType aIpcType)
-	{
-	iIpcType = aIpcType;
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::SetChldType
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::SetChldType(TChldType aChldType)
-	{
-	iChldType = aChldType;
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::SetCallId
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::SetCallId(TInt aCallId)
-	{
-	iCallId = aCallId;
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::SetConnectedCallId
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::SetConnectedCallId(TInt aConnectedCallId)
-	{
-	iConnectedCallId = aConnectedCallId;
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::SetHangupCase
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::SetHangupCase(TInt aHangupCase)
-	{
-	iHangupCause = aHangupCase;
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::ParseResponseL(const TDesC8& aResponseBuf)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::ParseResponseL()"));
-	
-	if (aResponseBuf.Match(KLtsyOkString) == 0)
-		{
-		iATResult = KErrNone;
-		}
-	else if (aResponseBuf.Match(KLtsyErrorString) == 0)
-		{
-		iATResult = KErrArgument;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::HandleIOError
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::HandleIOError()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::HandleIOError()"));
-	
-	//Hangup
-	if (iIpcType == ELtsyReqCallHangup)
-		{
-		iCtsyDispatcherCallback.CallbackCallControlHangUpComp(iIOStatus, iCallId);
-		}
-	else if (iIpcType == ELtsyReqCallHold) //Hold call
-		{
-		iCtsyDispatcherCallback.CallbackCallControlHoldComp(iIOStatus, iCallId);
-		}
-	else if (iIpcType == ELtsyReqCallResume) //Resume call
-		{
-		iCtsyDispatcherCallback.CallbackCallControlResumeComp(iIOStatus, iCallId);
-		}
-	else if (iIpcType == ELtsyReqCallSwap) //Swap call
-		{
-		iCtsyDispatcherCallback.CallbackCallControlSwapComp(iIOStatus);
-		}		
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::HandleResponseError
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::HandleResponseError()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::HandleResponseError()"));
-	
-	//Hangup
-	if (iIpcType == ELtsyReqCallHangup)
-		{
-		iCtsyDispatcherCallback.CallbackCallControlHangUpComp(iATResult, iCallId);
-		}
-	else if (iIpcType == ELtsyReqCallHold) //Hold call
-		{
-		iCtsyDispatcherCallback.CallbackCallControlHoldComp(iATResult, iCallId);
-		}
-	else if (iIpcType == ELtsyReqCallResume) //Resume call
-		{
-		iCtsyDispatcherCallback.CallbackCallControlResumeComp(iATResult, iCallId);
-		}
-	else if (iIpcType == ELtsyReqCallSwap) //Swap call
-		{
-		iCtsyDispatcherCallback.CallbackCallControlSwapComp(iATResult);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::HandleCHLDComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::HandleCHLDComplete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::HandleCHLDComplete()"));
-	
-	//Hangup
-	if (iIpcType == ELtsyReqCallHangup)
-		{
-		HandleHangupComplete();
-		}
-	else if (iIpcType == ELtsyReqCallHold) //Hold call
-		{
-		HandleHoldComplete();
-		}
-	else if (iIpcType == ELtsyReqCallResume) //Resume call
-		{
-		HandleResumeComplete();
-		}
-	else if (iIpcType == ELtsyReqCallSwap) //Swap call
-		{
-		HandleSwapComplete();
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::HandleHangupComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::HandleHangupComplete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::HandleHangupComplete()"));
-	
-	const TLtsyCallInformation& tCallInfo(iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(iCallId));
-	
-	if (tCallInfo.GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed)
-		{
-		if (tCallInfo.GetCallState() == TLtsyCallInformation::EInComingCall ||
-			tCallInfo.GetCallState() == TLtsyCallInformation::EWaitingCall	)
-			{
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrGsmCCCallRejected, 
-					                                                             iCallId, 
-					                                                             RMobileCall::EStatusDisconnecting);
-			
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrGsmCCCallRejected, 
-					                                                             iCallId, 
-					                                                             RMobileCall::EStatusIdle);			
-			}
-		else
-			{
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrGsmCCNormalCallClearing, 
-					                                                             iCallId, 
-					                                                             RMobileCall::EStatusDisconnecting);
-			
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrGsmCCNormalCallClearing, 
-					                                                             iCallId, 
-					                                                             RMobileCall::EStatusIdle);			
-			}
-		}
-	
-	//Call back
-	iCtsyDispatcherCallback.CallbackCallControlHangUpComp(KErrNone, iCallId);
-	//Setting all call id state unused
-	iPhoneGlobals.GetCallInfoManager().ResetCallInformationByCallId(iCallId);
-	}
-
-
-// ---------------------------------------------------------------------------
-// CATChld::HandleHoldComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::HandleHoldComplete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::HandleHoldComplete()"));
-	
-	iCtsyDispatcherCallback.CallbackCallControlHoldComp(KErrNone, iCallId);
-	iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrNone, 
-			                                                             iCallId, 
-			                                                             RMobileCall::EStatusHold);
-	
-	//Notify CTSY Call id Idel
-	for (TInt n = KLtsyMinCallId; n <= KLtsyMaxCallId; n++)
-		{
-		TLtsyCallInformation& tCallInfo(iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(n));
-		if (n == iCallId)
-			{
-			if (tCallInfo.GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed)
-				{
-				//Setting my call state active
-				tCallInfo.SetCallState(TLtsyCallInformation::EHeldCall);				
-				}
-			}
-		else
-			{
-			if (tCallInfo.GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed)
-				{
-				//Setting my call state active
-				tCallInfo.SetCallState(TLtsyCallInformation::EActiveCall);
-				
-				//Notify CTSY call state change
-				iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrNone, 
-																					 n,
-																                     RMobileCall::EStatusConnected);
-				}
-			}
-		}	
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::HandleResumeComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::HandleResumeComplete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::HandleResumeComplete()"));
-	
-	iCtsyDispatcherCallback.CallbackCallControlResumeComp(KErrNone, iCallId);
-	iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrNone, 
-			                                                             iCallId, 
-			                                                             RMobileCall::EStatusConnected);
-
-	//Notify CTSY Call id Idel
-	for (TInt n = KLtsyMinCallId; n <= KLtsyMaxCallId; n++)
-		{
-		TLtsyCallInformation& tCallInfo(iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(n));
-		if (n == iCallId)
-			{
-			if (tCallInfo.GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed)
-				{
-				//Setting my call state active
-				tCallInfo.SetCallState(TLtsyCallInformation::EActiveCall);				
-				}			
-			}
-		else
-			{
-			if (tCallInfo.GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed)
-				{
-				//Setting my call state active
-				tCallInfo.SetCallState(TLtsyCallInformation::EHeldCall);
-				
-				//Notify CTSY call state change
-				iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrNone, 
-																					 n,
-																                     RMobileCall::EStatusHold);
-				}			
-			}
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::HandleSwapComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::HandleSwapComplete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::HandleSwapComplete()"));
-	
-	iCtsyDispatcherCallback.CallbackCallControlSwapComp(KErrNone);
-	
-	//One call or two calls situation
-	for (TInt n = KLtsyMinCallId; n <= KLtsyMaxCallId; n++)
-		{
-		TLtsyCallInformation& tCallInfo(iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(n));
-		
-		if (tCallInfo.GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed &&
-			tCallInfo.GetCallState() == TLtsyCallInformation::EActiveCall)
-			{
-			tCallInfo.SetCallState(TLtsyCallInformation::EHeldCall);
-			//Notify CTSY call state change
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrNone, 
-																				 n,
-															                     RMobileCall::EStatusHold);			
-			}
-		else if (tCallInfo.GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed &&
-				((tCallInfo.GetCallState() == TLtsyCallInformation::EHeldCall) || 
-				 (tCallInfo.GetCallState() == TLtsyCallInformation::EWaitingCall) ||
-				 (tCallInfo.GetCallState() == TLtsyCallInformation::EInComingCall))) //????
-			{
-			tCallInfo.SetCallState(TLtsyCallInformation::EActiveCall);
-			//Notify CTSY call state change
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrNone, 
-																				 n,
-															                     RMobileCall::EStatusConnected);			
-			}		
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::Complete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::Complete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::Complete()"));
-	
-	//Check Hang up arrray
-	if ((iIpcType == ELtsyReqCallHangup) && iPhoneGlobals.GetCallInfoManager().GetHangupCommandRecords().IsHaveRecords())
-		{
-		InitVariable();
-		
-		TATHanupCommandInfo tHangupInfo;
-		iPhoneGlobals.GetCallInfoManager().GetHangupCommandRecords().GetFirstHangupCommandInfoAndRemoveIt(tHangupInfo);
-		
-		//Set hang up info
-		SetCallId(tHangupInfo.iCallId);
-		SetHangupCase(tHangupInfo.iHangupCause);
-		SetIpcType(CATChld::ELtsyReqCallHangup);
-		SetChldType(CATChld::ERleaseSpecificCall);
-		StartRequest();
-		return;
-		}
-	
-	//Invoke base class complete
-	CAtCommandBase::Complete();
-	
-	//Set hang up active
-	iPhoneGlobals.GetCallInfoManager().GetHangupCommandRecords().SetHangupActiveFlag(EFalse);
-	
-	//Let other command can use I/O port
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	}
-
-// ---------------------------------------------------------------------------
-// CATChld::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATChld::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATChld::EventSignal()"));
-	if(aEventSource == EReadCompletion)
-	    {
-	    LOGTEXT(_L8("[Ltsy CallControl] The EventSource = EReadCompletion"));
-	    }
-	else if(aEventSource == EWriteCompletion)
-	    {
-	    LOGTEXT(_L8("[Ltsy CallControl] The EventSource = EWriteCompletion"));
-	    }
-	else if(aEventSource == ETimeoutCompletion)
-	    {
-	    LOGTEXT(_L8("[Ltsy CallControl] The EventSource = ETimeoutCompletion"));
-	    }
-	else
-	    {
-	    LOGTEXT(_L8("[Ltsy CallControl] The EventSource = Unknown"));
-	    }
-	    
-	LOGTEXT2(_L8("[Ltsy CallControl]aStatus = %d"),aStatus);
-
-	iIOStatus = aStatus;
-	
-	if (iIOStatus != KErrNone)
-		{
-		HandleIOError();
-		Complete();
-		return;
-		}
-	
-	switch (iATStep)
-		{
-		case EATWaitForWriteComplete:
-			iATStep = EATReadComplete;
-			break;
-			
-		case EATReadComplete:
-			ClearCurrentLine();
-			if (iATResult == KErrNone)
-				{
-				HandleCHLDComplete();
-				}
-			else
-				{
-				HandleResponseError();
-				}
-			Complete();
-			break;
-			
-		default:
-			break;
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/src/atclcc.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,511 +0,0 @@
-// 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:
-// @file atclcc.cpp
-// This contains CATClcc which query incoming or waitting call information.
-// 
-
-//system include
-
-//user include
-#include "mslogger.h"
-#include "atmanager.h"
-#include "activecommandstore.h"
-#include "atclcc.h"
-#include "callinformationquerycompletenotify.h"
-#include "ltsycommondefine.h"
-#include "ltsycallinformationmanager.h"
-
-//const define
-const TInt KLtsyClccReadTimeout = 2;
-
-//List current call information 
-_LIT8(KLtsyCLCCCommand, "AT+CLCC\r");
-_LIT8(KLtsyCLCCMatchString, "+CLCC:*");
-
-
-// ---------------------------------------------------------------------------
-// CATClcc::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATClcc* CATClcc::NewL(CGlobalPhonemanager& aGloblePhone,
-			           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATClcc::NewL()"));
-	
-	CATClcc* self = CATClcc::NewLC(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATClcc* CATClcc::NewLC(CGlobalPhonemanager& aGloblePhone,
-		                CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATClcc::NewLC()"));
-	
-	CATClcc* self = new (ELeave) CATClcc(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-
-// ---------------------------------------------------------------------------
-// CATClcc::~CATClcc
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATClcc::~CATClcc()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATClcc::~CATClcc()"));
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::CATClcc
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATClcc::CATClcc(CGlobalPhonemanager& aGloblePhone, 
-		         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-				 :CAtCommandBase(aGloblePhone, aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATClcc::CATClcc()"));
-	
-	iAtType = ELtsyAT_General_CLCC;
-	
-	iQueryCallInfoNotify = NULL;
-	InitVariable();
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATClcc::ConstructL()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATClcc::ConstructL()"));
-	
-	//Invoke base class function
-	CAtCommandBase::ConstructL();
-	
-	//Set read and write timeout
-	SetTimeOut(KLtsyDefaultWriteTimeOut, KLtsyClccReadTimeout);
-	
-	//Add expecting string
-	AddExpectStringL(KLtsyCLCCMatchString);
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATClcc::ExecuteCommand()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATClcc::ExecuteCommand()"));
-	
-	iOKFounded = EFalse;
-	iTxBuffer.Copy(KLtsyCLCCCommand);
-	Write();
-	iATStep = EATWaitForWriteComplete;
-	iProcessStates = EProcessInProgress;
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::InitVariable
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATClcc::InitVariable()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATClcc::InitVariable()"));
-	
-	iOKFounded = EFalse;
-	iIOStatus = KErrNone;
-	iATResult = KErrNone;
-	iATStep = EATNotInProgress;
-	iProcessStates = EProcessNotInProgress;	
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::AddQueryCallInformationCompleteNotify
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATClcc::AddQueryCallInformationCompleteNotify(MCallInformationQueryCompleteNotify* aQueryCallInfoNotify)
-	{
-	iQueryCallInfoNotify = aQueryCallInfoNotify;
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::GetProcessStates
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATClcc::TATProcessStates CATClcc::GetProcessStates() const
-	{
-	return iProcessStates;
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::SetProcessStates
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATClcc::SetProcessStates(CATClcc::TATProcessStates aProcessState)
-	{
-	iProcessStates = aProcessState;
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATClcc::StartRequest()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATClcc::StartRequest()"));
-	
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::ParseCLCCResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATClcc::ParseCLCCResponseL(const TDesC8& aResponseBuf)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATClcc::ParseCLCCResponseL()"));
-	
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array, aResponseBuf);
-	TInt nCount = array.Count();
-	
-	//  1       2      3      4       5       6
-	//+CLCC : <id1>, <dir>, <stat>, <mode>, <mpty>
-	//Its count must >= 6
-	if (nCount < 6)	  
-		{
-		CleanupStack::PopAndDestroy(1);
-		return;
-		}
-	
-	//Parse +CLCC :* buffer
-	//Only care Waiting call and incoming call
-	TInt nVal(0);
-	TLex8 tLex(array[3]);
-	if (tLex.Val(nVal) == KErrNone)
-		{		
-		if (nVal == TLtsyCallInformation::EActiveCall ||
-			nVal == TLtsyCallInformation::EHeldCall ||
-			nVal == TLtsyCallInformation::EDialingCall ||
-			nVal == TLtsyCallInformation::EAlertingCall )
-			{
-			CleanupStack::PopAndDestroy(1);
-			LOGTEXT(_L8("[Ltsy CallControl] First Parse state of the call not find incoming call and waiting call"));
-			return;			
-			}
-		
-		}
-	else
-		{
-		CleanupStack::PopAndDestroy(1);
-		LOGTEXT(_L8("[Ltsy CallControl] First Parse state of the call Failing"));
-		return;
-		}
-	
-	//Parse incoming call or waiting call
-	
-	//Call id
-	tLex.Assign(array[1]);
-	if ((tLex.Val(nVal) != KErrNone)||
-	    (nVal < KLtsyMinCallId)	||
-		(nVal > KLtsyMaxCallId))
-		{
-		CleanupStack::PopAndDestroy(1);
-		LOGTEXT(_L8("[Ltsy CallControl] Parse call id of the call Failing"));
-		return;
-		}
-   
-	//Parse call id success
-	TLtsyCallInformation& callinfo(iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(nVal));
-	callinfo.SetCallIdIsUsedInfo(TLtsyCallInformation::EUsed);
-	callinfo.SetCallId(nVal);
-	
-	TBool bSuccess(ETrue);
-	for (TInt n = 2; bSuccess && n < nCount; n++)
-		{
-		//Direction Call
-		if (n == 2)
-			{
-			tLex.Assign(array[n]);
-			if (tLex.Val(nVal) == KErrNone)
-				{
-				if (TLtsyCallInformation::EMoCall == nVal)
-					{
-					callinfo.SetCallDirection(TLtsyCallInformation::EMoCall);
-					}
-				else
-					{
-					callinfo.SetCallDirection(TLtsyCallInformation::EMtCall);
-					}
-				}
-			else
-				{
-				bSuccess = EFalse;
-				LOGTEXT(_L8("[Ltsy CallControl] Parse direction call Failing"));
-				}
-			}
-		
-		//State of the Call
-		if (n == 3)
-			{
-			tLex.Assign(array[n]);
-			if (tLex.Val(nVal) == KErrNone)
-				{
-				if (TLtsyCallInformation::EInComingCall == nVal)
-					{
-					callinfo.SetCallState(TLtsyCallInformation::EInComingCall);
-					}
-				else
-					{
-					callinfo.SetCallState(TLtsyCallInformation::EWaitingCall);
-					}
-				}
-			else
-				{
-				bSuccess = EFalse;
-				LOGTEXT(_L8("[Ltsy CallControl] Parse state of the call Failing"));				
-				}
-			}
-		
-		//Teleservice
-		if (n == 4)
-			{
-			tLex.Assign(array[n]);
-			if (tLex.Val(nVal) == KErrNone)
-				{
-				if (TLtsyCallInformation::EVoiceCall == nVal)
-					{
-					callinfo.SetCallMode(TLtsyCallInformation::EVoiceCall);
-					}
-				else if (TLtsyCallInformation::EDataCall == nVal)
-					{
-					callinfo.SetCallMode(TLtsyCallInformation::EDataCall);
-					}
-				else if (TLtsyCallInformation::EFaxCall == nVal)
-					{
-					callinfo.SetCallMode(TLtsyCallInformation::EFaxCall);
-					}
-				else
-					{
-					callinfo.SetCallMode(TLtsyCallInformation::EUnKnowCall);
-					}
-				}
-			else
-				{
-				bSuccess = EFalse;
-				LOGTEXT(_L8("[Ltsy CallControl] Parse teleservice Failing"));					
-				}
-			}
-
-		//multiparty
-		if (n == 5)
-			{
-			tLex.Assign(array[n]);
-			if (tLex.Val(nVal) == KErrNone)
-				{
-				if (TLtsyCallInformation::ENotConference == nVal)
-					{
-					callinfo.SetConferenceCall(TLtsyCallInformation::ENotConference);
-					}
-				else
-					{
-					callinfo.SetConferenceCall(TLtsyCallInformation::EIsConference);
-					}
-				}
-			else
-				{
-				bSuccess = EFalse;
-				LOGTEXT(_L8("[Ltsy CallControl] Parse multiparty Failing"));				
-				}
-			}
-		
-		//telenum
-		if (n == 6)
-			{
-			callinfo.SetMobileTelNum(array[n]);
-			}		
-
-		//type of address
-		if (n == 7)
-			{
-			tLex.Assign(array[n]);
-			if (tLex.Val(nVal) == KErrNone)
-				{
-				callinfo.SetAddressType(nVal);
-				}
-			else
-				{
-				bSuccess = EFalse;
-				LOGTEXT(_L8("[Ltsy CallControl] Parse type of address Failing"));				
-				}
-			}
-		
-		//alpah
-		if (n == 8)
-			{
-			callinfo.SetMobileName(array[n]);
-			}
-		}
-	
-	//Parse failer
-	if (!bSuccess)
-		{
-		iPhoneGlobals.GetCallInfoManager().ResetCallInformationByCallId(callinfo.GetCallId());
-		}
-	
-	CleanupStack::PopAndDestroy(1);
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATClcc::ParseResponseL(const TDesC8& aResponseBuf)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATClcc::ParseResponseL()"));
-	
-	//Process expecting string +CLCC : *
-	if (aResponseBuf.Match(KLtsyCLCCMatchString) == 0)
-		{
-		ParseCLCCResponseL(aResponseBuf);
-		}
-	else if (aResponseBuf.Match(KLtsyOkString) == 0) //Process expecting string OK
-		{
-		iATResult = KErrNone;
-		iProcessStates = EProcessOK;
-		iOKFounded = ETrue;		
-		}
-	else if (aResponseBuf.Match(KLtsyErrorString) == 0) //Process expecting string ERROR
-		{
-		iATResult = KErrArgument;
-		iProcessStates = EProcessError;
-		iOKFounded = EFalse;		
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::HandleIOError
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATClcc::HandleIOError()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATClcc::HandleIOError()"));
-	
-	iProcessStates = EProcessError;
-	
-	if (iQueryCallInfoNotify != NULL)
-		{
-		iQueryCallInfoNotify->QueryCallInformationComplete(iIOStatus);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::HandleResponseError
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATClcc::HandleResponseError()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATClcc::HandleResponseError()"));
-	
-	if (iQueryCallInfoNotify != NULL)
-		{
-		iQueryCallInfoNotify->QueryCallInformationComplete(iATResult);
-		}	
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::HandleCLCCComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATClcc::HandleCLCCComplete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATClcc::HandleCLCCComplete()"));
-	
-	if (iQueryCallInfoNotify != NULL)
-		{
-		iQueryCallInfoNotify->QueryCallInformationComplete(KErrNone);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::Complete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATClcc::Complete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATClcc::Complete()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] iIOStatus = %d"), iIOStatus);
-	LOGTEXT2(_L8("[Ltsy CallControl] iATResult = %d"), iATResult);
-	
-	//Remove Ative Command and stop timer
-	CAtCommandBase::Complete();
-	
-	//Let other command can use I/O port
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	}
-
-// ---------------------------------------------------------------------------
-// CATClcc::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATClcc::EventSignal(TAtEventSource /*aEventSource*/, TInt aStatus)
-	{  
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATClcc::EventSignal()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] aEventSource = %d\taStatus = %d"),aStatus);
-	
-	iIOStatus = aStatus;
-	if (iIOStatus != KErrNone)
-		{
-		HandleIOError();	
-		Complete();
-		return;
-		}
-	
-	switch (iATStep)
-		{
-		case EATWaitForWriteComplete:
-			iATStep = EATReadComplete;
-			break;
-			
-		case EATReadComplete:
-			ClearCurrentLine();
-			if (iATResult == KErrNone)
-				{
-				if (iOKFounded)
-					{
-					HandleCLCCComplete();
-					Complete();
-					}
-				}
-			else
-				{
-				HandleResponseError();
-				Complete();
-				}
-			break;
-			
-		default:
-			break;
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/src/atdialvoice.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,648 +0,0 @@
-// 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:
-// @file atdialvoice.cpp
-// This contains CATDialVoice which dial a voice call.
-//
-
-//user include
-#include "atdialvoice.h"
-#include "ltsycommondefine.h"
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include "globalphonemanager.h"
-#include "activecommandstore.h"
-#include "atmanager.h"
-#include "ltsycallinformationmanager.h"
-#include "mslogger.h"
-
-//const define 
-const TInt KLtsyWaitForConnect = 60;
-_LIT8(KLtsyDialVoiceCommandFormat,"ATD%S;\r");
-_LIT8(KLtsyBusyString, "BUSY");
-_LIT8(KLtsyNoAnswerString, "NO ANSWER");
-_LIT8(KLtsyUnsolicitedCallCreated, "+WIND: 5*");
-_LIT8(KLtsyUnsolicitedCallingAltert, "+WIND: 2");
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATDialVoice* CATDialVoice::NewL(CGlobalPhonemanager& aGloblePhone,
-		                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDialVoice::NewL()"));
-	
-	CATDialVoice* self = CATDialVoice::NewLC(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATDialVoice* CATDialVoice::NewLC(CGlobalPhonemanager& aGloblePhone,
-		                          CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDialVoice::NewLC()"));
-	
-	CATDialVoice* self = new (ELeave) CATDialVoice(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::~CATDialVoice
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATDialVoice::~CATDialVoice()
-	{
-	delete iATH;
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::CATDialVoice
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATDialVoice::CATDialVoice(CGlobalPhonemanager& aGloblePhone, 
-		                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-				           :CAtCommandBase(aGloblePhone, aCtsyDispatcherCallback)	
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDialVoice::CATDialVoice()"));
-	
-	iAtType = ELtsyAT_Call_ATD;
-	iResult = KErrNone;
-	iOKFounded = EFalse;
-	iCallId = KLtsyErrorCallId;
-	iStatus = KErrNone;
-	iDialStep = EATDialNotInProgress;
-	iIsEmergencyCall = EFalse;
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDialVoice::ConstructL()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDialVoice::ConstructL()"));
-	
-	//Invoke base class function
-	CAtCommandBase::ConstructL();
-	
-	//Set read and write timeout
-	SetTimeOut(KLtsyDefaultWriteTimeOut, KLtsyWaitForConnect);
-	
-	//Add expecting string
-	AddExpectStringL(KLtsyUnsolicitedCallCreated);
-	AddExpectStringL(KLtsyUnsolicitedCallingAltert);
-	AddExpectStringL(KLtsyBusyString);
-	AddExpectStringL(KLtsyNoAnswerString);
-	AddExpectStringL(KLtsyNoCarrierString);
-	
-	//Create Hang up call
-	iATH = CATHangUp::NewL(iPhoneGlobals, iCtsyDispatcherCallback);
-	
-	//Add Observer
-	iATH->AddAllCallReleaseObserver(this);
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::SetEmergnecyCallFlag
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDialVoice::InitVariable()
-	{
-	iAtType = ELtsyAT_Call_ATD;
-	iResult = KErrNone;
-	iOKFounded = EFalse;
-	iCallId = KLtsyErrorCallId;
-	iStatus = KErrNone;
-	iDialStep = EATDialNotInProgress;
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::ReleaseAllCallComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDialVoice::ReleaseAllCallComplete(TInt /*aError*/)
-	{
-	//if aError equal KErrNone or other dial Emergency call
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::SetEmergnecyCallFlag
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDialVoice::SetEmergnecyCallFlag(TBool aIsEmergencyCall)
-	{
-	iIsEmergencyCall = aIsEmergencyCall;
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::SetTelephoneNumber
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDialVoice::SetTelephoneNumber(const TDesC8& aTelNum)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDialVoice::SetTelephoneNumber()"));
-	
-	iTelNum.Copy(aTelNum.Left(iTelNum.MaxLength()));
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDialVoice::ExecuteCommand()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDialVoice::ExecuteCommand()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] Telephone number = %S"), &iTelNum);
-	
-	iOKFounded = EFalse;
-	iTxBuffer.Format(KLtsyDialVoiceCommandFormat, &iTelNum);
-	Write(); 
-	iDialStep = EATWaitForWriteComplete;
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDialVoice::StartRequest()
-	{
-	if (iIsEmergencyCall && iPhoneGlobals.GetCallInfoManager().IsHaveUsedCallId())
-		{
-		iATH->InitVariable();
-		iATH->StartRequest();
-		}
-	else
-		{
-		ExecuteCommand();
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::ParseUnsolicitedCommandBufL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATDialVoice::ParseUnsolicitedCommandBufL(TUnsolicitedParams& aParams, const TDesC8& aCommandBuf)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDialVoice::ParseUnsolicitedCommandBufL()"));
-	
-	RArray<TPtrC8> rArray;
-	CleanupClosePushL(rArray);
-	
-	iParser->ParseRespondedBuffer(rArray, aCommandBuf);
-	aParams.InitParams();
-	
-	TInt nCount = rArray.Count();
-	if (nCount <= 1)
-		{
-		CleanupStack::PopAndDestroy(1);
-		return KErrGeneral;
-		}
-
-	for(TInt index =1; index < nCount; index++)
-		{
-		if(index == 1)
-			{
-			TInt tVal(0);
-			TLex8 tLex(rArray[index]);
-			TInt nRes = tLex.Val(tVal);
-			if (nRes == KErrNone)
-				{
-				aParams.iEvent = tVal;
-				}
-			else
-				{
-				CleanupStack::PopAndDestroy(1);
-				return nRes;
-				}
-			}
-		
-		if(index == 2)
-			{
-			TInt tVal(0);
-			TLex8 tLex(rArray[index]);
-			TInt nRes = tLex.Val(tVal);
-			if (nRes == KErrNone)
-				{
-				aParams.iIdx = tVal;
-				}
-			else
-				{
-				CleanupStack::PopAndDestroy(1);	
-				return nRes;
-				}
-			}
-		}
-	
-	CleanupStack::Pop(1);
-	
-	return KErrNone;
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::ProcessUnsolicitedCallCreated
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATDialVoice::ProcessUnsolicitedCallCreated(const TUnsolicitedParams& aParams)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDialVoice::ProcessUnsolicitedCallCreated()"));
-	
-	if (aParams.iEvent !=  KLtsyUnsolicitedEvent05)
-		{
-		return KErrGeneral;
-		}
-	
-	TInt nCallId = aParams.iIdx;
-	if ((nCallId < KLtsyMinCallId) || (nCallId > KLtsyMaxCallId))
-		{
-		nCallId = iPhoneGlobals.GetCallInfoManager().FindUnUesedCallId();
-		if (KErrNotFound == nCallId)
-			{
-			return KErrNotFound;
-			}
-		}
-	
-	iCallId = nCallId;
-	return KErrNone;
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDialVoice::ParseResponseL(const TDesC8& aResponseBuf)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDialVoice::ParseResponseL()"));
-	
-	if (aResponseBuf.Match(KLtsyUnsolicitedCallCreated) == 0)
-		{
-		LOGTEXT2(_L8("[Ltsy CallControl] iDialStep = %d"),iDialStep);
-		ASSERT(iDialStep == EATWaitForDiallingComplete);
-		
-		TUnsolicitedParams aParams;
-		iResult = ParseUnsolicitedCommandBufL(aParams, aResponseBuf);
-		if (iResult == KErrNone)
-			{
-			iResult = ProcessUnsolicitedCallCreated(aParams);
-			}
-		}
-	else if (aResponseBuf.Match(KLtsyUnsolicitedCallingAltert) == 0)
-		{
-		LOGTEXT2(_L8("[Ltsy CallControl] iDialStep = %d"),iDialStep);
-		ASSERT(iDialStep == EATWaitForConnectingComplete);
-		iResult = KErrNone;
-		}
-	else if (aResponseBuf.Match(KLtsyOkString) == 0)
-		{
-		LOGTEXT2(_L8("[Ltsy CallControl] iDialStep = %d"),iDialStep);
-		LOGTEXT(_L8("[Ltsy CallControl] The call was connected successfully"));
-		
-		// if no KLtsyUnsolicitedCallingAltert string was received before we receive "OK"
-		// it aslo means the call has been connected even though such KLtsyUnsolicitedCallingAltert
-		// or KLtsyUnsolicitedCallCreated was not received
-		if(iDialStep == EATWaitForConnectingComplete || iDialStep == EATWaitForDiallingComplete)
-		    {
-		    LOGTEXT(_L8("[Ltsy CallControl] No alert string [+WIND: 2] received before we receive string [ok]"));
-		    
-		    if (iCallId == KLtsyErrorCallId)
-		    	{
-		    	iCallId = iPhoneGlobals.GetCallInfoManager().FindUnUesedCallId();
-		    	}
-		    
-		    HandleConnectingComplete();
-		    iDialStep = EATWaitForConnectedComplete;
-		    }
-		
-		iResult = KErrNone;
-		}
-	else if (aResponseBuf.Match(KLtsyBusyString) == 0)
-		{
-		LOGTEXT(_L8("[Ltsy CallControl] Busy tone was detected"));
-		//iResult = KErrEtelBusyDetected;
-		iResult = KErrGsmCCUserBusy;
-		}
-	else if (aResponseBuf.Match(KLtsyNoAnswerString) == 0)
-		{
-		LOGTEXT(_L8("[Ltsy CallControl] No answer from remote party"));
-		//iResult = KErrEtelNoAnswer;
-		iResult = KErrGsmCCUserAlertingNoAnswer;
-		}
-	else if (aResponseBuf.Match(KLtsyNoCarrierString) == 0)
-		{
-		// that could be the problem of the client, when there were two ongoing call, but a new call is coming up. As
-		// GSM only support two ongoing calls
-		LOGTEXT(_L8("[Ltsy CallControl] No carrier was detected"));
-		if(iCallId == KLtsyErrorCallId)
-		    {
-		    iResult = KErrEtelNoCarrier;
-		    return;
-		    }
-		        
-		const TLtsyCallInformation& tCallInfo(iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(iCallId));		
-		if (tCallInfo.GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed)
-			{
-			if (tCallInfo.GetCallState() == TLtsyCallInformation::EDialingCall)
-				{
-				iResult = KErrEtelNoCarrier;
-				}
-			else
-				{
-				iResult = KErrGsmCCNormalCallClearing;
-				}
-			}
-		}
-	else if (aResponseBuf.Match(KLtsyErrorString) == 0)
-		{
-		LOGTEXT(_L8("[Ltsy CallControl] There was an error connecting the call"));
-		iResult = KErrArgument;
-		}
-	else
-		{
-		LOGTEXT(_L8("[Ltsy CallControl] An unknown problem occurred connecting the call"));
-		iResult = KErrGeneral;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::Complete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDialVoice::Complete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDialVoice::Complete()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] iStatus = %d"), iStatus);
-	LOGTEXT2(_L8("[Ltsy CallControl] iResult = %d"), iResult);
-	//Remove Active Command and Stop timer
-	CAtCommandBase::Complete();
-		
-	//Let other command can use I/O port
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::HandleIOErrorL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDialVoice::HandleIOError()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDialVoice::HandleIOError()"));
-	
-	if (iDialStep == EATWaitForWriteComplete)
-		{
-		if (iIsEmergencyCall)
-			{
-			iCtsyDispatcherCallback.CallbackCallControlDialEmergencyComp(iStatus, KLtsyErrorCallId);
-			}
-		else
-			{
-			iCtsyDispatcherCallback.CallbackCallControlDialVoiceComp(iStatus, KLtsyErrorCallId);
-			}
-		}
-	else
-		{
-		//Call id has not be allocated
-		if (KLtsyErrorCallId == iCallId)
-			{
-			if (iIsEmergencyCall)
-				{
-				iCtsyDispatcherCallback.CallbackCallControlDialEmergencyComp(iStatus, iCallId);
-				}
-			else
-				{
-				iCtsyDispatcherCallback.CallbackCallControlDialVoiceComp(iStatus, iCallId);
-				}
-			}
-		else
-			{
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(iStatus, 
-					                                                             iCallId, 
-																		         RMobileCall::EStatusDisconnecting);
-			
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(iStatus, 
-					                                                             iCallId, 
-																		         RMobileCall::EStatusIdle);
-			//Setting ltsy call information
-			iPhoneGlobals.GetCallInfoManager().ResetCallInformationByCallId(iCallId);
-			}
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::HandleResponseError
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDialVoice::HandleResponseError()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDialVoice::HandleResponseError()"));
-	
-	//Call id has not be allocated
-	if (KLtsyErrorCallId == iCallId)
-		{
-		if (iIsEmergencyCall)
-			{
-			iCtsyDispatcherCallback.CallbackCallControlDialEmergencyComp(iResult, iCallId);
-			}
-		else
-			{
-			iCtsyDispatcherCallback.CallbackCallControlDialVoiceComp(iResult, iCallId);
-			}
-		}
-	else
-		{
-		iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(iResult, 
-																			 iCallId, 
-																			 RMobileCall::EStatusDisconnecting);
-		
-		iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(iResult, 
-																			 iCallId, 
-																			 RMobileCall::EStatusIdle);
-		//Setting ltsy call information
-		iPhoneGlobals.GetCallInfoManager().ResetCallInformationByCallId(iCallId);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::HandleDiallingCompleteL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDialVoice::HandleDiallingComplete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDialVoice::HandleDiallingComplete()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] Call id = %d"), iCallId);
-	
-	if (iIsEmergencyCall)
-		{
-		iCtsyDispatcherCallback.CallbackCallControlDialEmergencyComp(KErrNone, iCallId);
-		}
-	else
-		{
-		iCtsyDispatcherCallback.CallbackCallControlDialVoiceComp(KErrNone, iCallId);
-		}
-	
-	LOGTEXT(_L8("[Ltsy CallControl] Call status = RMobileCall::EStatusDialling"));
-	iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrNone, 
-																		 iCallId, 
-													 RMobileCall::EStatusDialling);
-	
-	//Setting ltsy call information
-	TLtsyCallInformation& tCallInfo(iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(iCallId));
-	tCallInfo.SetCallId(iCallId);
-	tCallInfo.SetCallIdIsUsedInfo(TLtsyCallInformation::EUsed);
-	tCallInfo.SetCallDirection(TLtsyCallInformation::EMoCall);
-	tCallInfo.SetCallState(TLtsyCallInformation::EDialingCall);
-	tCallInfo.SetCallMode(TLtsyCallInformation::EVoiceCall);
-	tCallInfo.SetConferenceCall(TLtsyCallInformation::ENotConference);
-	//Emergency call flag
-	if (iIsEmergencyCall)
-		{
-		tCallInfo.SetEmergencyCallFlag(ETrue);
-		}
-	
-	
-	//If have another and it's state is not hold so setting hold
-	for (TInt n = KLtsyMinCallId; n <= KLtsyMaxCallId; n++)
-		{
-		if (n != iCallId)
-			{
-			TLtsyCallInformation& tCallInfo(iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(n));
-			if (tCallInfo.GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed && 
-				tCallInfo.GetCallState() != TLtsyCallInformation::EHeldCall)
-				{
-				//Setting ltsy call state
-				tCallInfo.SetCallState(TLtsyCallInformation::EHeldCall);
-				
-				//Notify CTSY state change
-				iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrNone, 
-																					 n, 
-																      RMobileCall::EStatusHold);				
-				}
-			}
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::HandleConnectingCompleteL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDialVoice::HandleConnectingComplete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Call status = RMobileCall::EStatusConnecting"));
-	
-	iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrNone, 
-																		 iCallId, 
-													 RMobileCall::EStatusConnecting);	
-	
-	//Setting ltsy call information
-	TLtsyCallInformation& tCallInfo(iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(iCallId));
-	tCallInfo.SetCallState(TLtsyCallInformation::EAlertingCall);
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::HandleConnectedCompleteL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDialVoice::HandleConnectedComplete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Call status = RMobileCall::EStatusConnected"));
-	iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrNone, 
-			                                                              iCallId, 
-			                                           RMobileCall::EStatusConnected);
-	
-	//Setting ltsy call information
-	TLtsyCallInformation& tCallInfo(iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(iCallId));
-	tCallInfo.SetCallState(TLtsyCallInformation::EActiveCall);	
-	}
-
-// ---------------------------------------------------------------------------
-// CATDialVoice::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDialVoice::EventSignal(TAtEventSource /*aEventSource*/, TInt aStatus)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CATDialVoice::EventSignal()"));
-	
-	iStatus = aStatus;
-	
-	if (aStatus != KErrNone)
-		{
-		HandleIOError();
-		Complete();
-		return;
-		}
-	
-	switch (iDialStep)
-		{
-		case EATWaitForWriteComplete:
-			iDialStep = EATWaitForDiallingComplete;
-			break;
-			
-		case EATWaitForDiallingComplete:
-			//first clean current line
-			ClearCurrentLine();
-			//Process result
-			if (iResult == KErrNone)
-				{
-				HandleDiallingComplete();
-				iDialStep = EATWaitForConnectingComplete;
-				}
-			else
-				{
-				HandleResponseError();
-				Complete();
-				}
-			break;
-			
-		case EATWaitForConnectingComplete:
-			//first clean current line
-			ClearCurrentLine();
-			//Process result
-			if (iResult == KErrNone)
-				{
-				HandleConnectingComplete();
-				iDialStep = EATWaitForConnectedComplete;
-				}
-			else
-				{
-				HandleResponseError();
-				Complete();
-				}
-		    break;
-		    
-		case EATWaitForConnectedComplete:
-			//first clean current line
-			ClearCurrentLine();
-			//Process result
-			if (iResult == KErrNone)
-				{
-				HandleConnectedComplete();
-				}
-			else
-				{
-				HandleResponseError();
-				}
-			
-			Complete();
-			break;
-			
-		default:
-			break;
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/src/atdtmfvts.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,395 +0,0 @@
-// 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:
-// @file atdtmfvts.h
-// This contains CATDtmfVts which dial a voice call.
-// 
-
-//system include
-
-//user include
-#include "atdtmfvts.h"
-#include "mslogger.h"
-#include "ltsycommondefine.h"
-#include "ltsycallinformationmanager.h"
-
-//const define
-_LIT8(KLtsyVTSFirstCharFormat, "AT+VTS=%c");
-_LIT8(KLtsyVTSMoreCharFormat, ";+VTS=%c");
-_LIT8(KLtsyCarriageReturn,"\r");
-const TInt KLtsyVTSReadTimeout = 2;
-const TInt KLtsyStopAndCancelTimeOut = 100000; // 0.1 second
-
-
-CATDtmfVts* CATDtmfVts::NewL(CGlobalPhonemanager& aGloblePhone,
-			                 CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::NewL()"));
-	
-	CATDtmfVts* self = CATDtmfVts::NewLC(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-CATDtmfVts* CATDtmfVts::NewLC(CGlobalPhonemanager& aGloblePhone,
-			                  CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::NewLC()"));
-	
-	CATDtmfVts* self = new (ELeave) CATDtmfVts(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CATDtmfVts::~CATDtmfVts()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::~CATDtmfVts()"));
-	}
-
-CATDtmfVts::CATDtmfVts(CGlobalPhonemanager& aGloblePhone,
-		               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-					   :CAtCommandBase(aGloblePhone, aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::CATDtmfVts()"));
-	
-	InitVariable();
-	}
-
-void CATDtmfVts::InitVariable()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::InitVariable()"));
-	
-	iDtmfWorkType = EDtmfUnknow;
-	iOKFounded = EFalse;
-	iAnswerStep = EATNotInProgress;
-	iCallId = KLtsyErrorCallId;
-	iIOStatus = KErrNone;
-	iATResult = KErrNone;	
-	}
-
-void CATDtmfVts::SetDtmfWorkType(TDtmfWorkType aDtmfWorkType)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::SetDtmfWorkType()"));
-	
-	iDtmfWorkType = aDtmfWorkType;
-	}
-
-void CATDtmfVts::ConstructL()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::ConstructL()"));
-	
-	//Invoke base class function
-	CAtCommandBase::ConstructL();
-	
-	//Create Timer
-	iCallbackTimer = CCallbackTimer::NewL(*this);
-	
-	//Set read and write timeout
-	SetTimeOut(KLtsyDefaultWriteTimeOut, KLtsyVTSReadTimeout);
-	}
-
-void CATDtmfVts::ExecuteCommand()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::ExecuteCommand()"));
-	
-	if (iDtmfWorkType == EDtmfStopOneTone ||
-	    iDtmfWorkType == EDtmfCancelMoreTones)
-		{
-		StartTimer();
-		}
-	else
-		{
-		iOKFounded = EFalse;
-		if (iTxBuffer.Length() > 0)
-			{
-			LOGTEXT2(_L8("[Ltsy CallControl] VTS = %S"), &iTxBuffer);
-			Write();
-			iAnswerStep = EATWaitForWriteComplete;
-			}		
-		}
-	}
-
-TBool CATDtmfVts::IsHaveActiveCall(TInt aActiveCallId)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::IsHaveActiveCall()"));
-	
-	if (aActiveCallId >= KLtsyMinCallId && aActiveCallId <= KLtsyMaxCallId)
-		{
-		const TLtsyCallInformation& tCallInfo = iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(aActiveCallId);
-		if (TLtsyCallInformation::EUsed == tCallInfo.GetCallIdIsUsedInfo() &&
-			TLtsyCallInformation::EActiveCall == tCallInfo.GetCallState())
-			{
-			return ETrue;
-			}
-		}
-	return EFalse;
-	}
-
-void CATDtmfVts::StartRequest()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::StartRequest()"));
-	
-	ExecuteCommand();
-	}
-
-TInt CATDtmfVts::SetCallId(TInt aCallId)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::SetCallId()"));
-	
-	if (!IsHaveActiveCall(aCallId))
-		{
-		return KErrEtelCallNotActive;
-		}
-	
-	iCallId = aCallId;
-	
-	return KErrNone;
-	}
-
-TInt CATDtmfVts::SetDtmfString(const TDesC& aDtmfString)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::SetDtmfString()"));
-	
-	if (!StringIsDtmf(aDtmfString))
-		{
-		return KErrArgument;
-		}
-	
-	TInt nLen = aDtmfString.Length();
-	for (TInt n = 0; n < nLen; n++)
-		{
-		if (n == 0)
-			{
-			iTxBuffer.Format(KLtsyVTSFirstCharFormat, (TUint8)(aDtmfString[n]));
-			}
-		else
-			{
-			TBuf8<16> buf;
-			buf.Format(KLtsyVTSMoreCharFormat, (TUint8)(aDtmfString[n]));
-			
-			if ((buf.Length() + iTxBuffer.Length()) >= KLtsyGenericBufferSize)
-				{
-				return KErrOverflow;
-				}
-			iTxBuffer.Append(buf);
-			}
-		}
-	
-	//Converts the content of this descriptor to upper case.
-	iTxBuffer.UpperCase();
-	iTxBuffer.Append(KLtsyCarriageReturn);
-	
-	return KErrNone;
-	}
-
-TBool CATDtmfVts::CharIsDtmf(const TChar& aDtmfChar)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl]  Starting CATDtmfVts::IsDtmf()"));
-	
-	TUint uC = aDtmfChar.GetUpperCase();
-	
-	switch(uC)
-		{
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		case '8':
-		case '9':
-		case 'A':
-		case 'B':
-		case 'C':
-		case 'D':
-		case '*':
-		case '#':
-			return ETrue;
-		}
-	return EFalse;
-	}
-
-TBool CATDtmfVts::StringIsDtmf(const TDesC& aDtmfString)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl]  Starting CATDtmfVts::StringIsDtmf()"));
-	
-	TInt nLen = aDtmfString.Length();
-	if (nLen == 0) 
-		{
-		return EFalse;
-		}
-	
-	for (TInt n = 0; n < nLen; n++)
-		{
-		if (!CharIsDtmf(aDtmfString[n]))
-			{
-			return EFalse;
-			}
-		}
-	
-	return ETrue;
-	}
-
-void CATDtmfVts::Complete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::Complete()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] iIOStatus = %d"), iIOStatus);
-	LOGTEXT2(_L8("[Ltsy CallControl] iATResult = %d"), iATResult);
-	
-	//Remove Ative Command and stop timer
-	CAtCommandBase::Complete();
-	
-	//Init
-	InitVariable();
-	
-	//Let other command can use I/O port
-	iPhoneGlobals.iEventSignalActive = EFalse;	
-	}
-
-void CATDtmfVts::StartTimer()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::StartTimer()"));	
-	
-    if (iCallbackTimer->IsActive())
-    	{
-    	iCallbackTimer->Cancel();
-    	}
-	iCallbackTimer->After(KLtsyStopAndCancelTimeOut);	
-	}
-
-void CATDtmfVts::TimerRun(TInt aError)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::TimerRun()"));
-	
-	if (aError != KErrNone)
-		{
-		User::After(KLtsyStopAndCancelTimeOut);
-		}
-	
-	if (iDtmfWorkType == EDtmfStopOneTone)
-		{
-		iCtsyDispatcherCallback.CallbackCallControlStopDtmfToneComp(KErrNone);
-		}
-	else if (iDtmfWorkType == EDtmfCancelMoreTones)
-		{
-		iCtsyDispatcherCallback.CallbackCallControlSendDtmfTonesCancelComp(KErrNone);
-		}
-	
-	//Init
-	InitVariable();
-	
-	//Let other command can use I/O port
-	iPhoneGlobals.iEventSignalActive = EFalse;	
-	}
-
-void CATDtmfVts::HandleIOError()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::HandleIOError()"));
-	
-	if (iDtmfWorkType == EDtmfSendOneTone)
-		{
-		iCtsyDispatcherCallback.CallbackCallControlStartDtmfToneComp(iIOStatus);
-		}
-	else if (iDtmfWorkType == EDtmfSendMoreTones)
-		{
-		iCtsyDispatcherCallback.CallbackCallControlSendDtmfTonesComp(iIOStatus);
-		}		
-	}
-
-void CATDtmfVts::HandleResponseError()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::HandleResponseError()"));
-	
-	if (iDtmfWorkType == EDtmfSendOneTone)
-		{
-		iCtsyDispatcherCallback.CallbackCallControlStartDtmfToneComp(iATResult);
-		}
-	else if (iDtmfWorkType == EDtmfSendMoreTones)
-		{
-		iCtsyDispatcherCallback.CallbackCallControlSendDtmfTonesComp(iATResult);
-		}			
-	}
-
-void CATDtmfVts::HandleSendDtmfTonesSuccess()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::HandleSendDtmfTonesSuccess()"));
-	
-	if (iDtmfWorkType == EDtmfSendOneTone)
-		{
-		iCtsyDispatcherCallback.CallbackCallControlStartDtmfToneComp(KErrNone);
-		}
-	else if (iDtmfWorkType == EDtmfSendMoreTones)
-		{
-		iCtsyDispatcherCallback.CallbackCallControlSendDtmfTonesComp(KErrNone);
-		}
-	}
-
-void CATDtmfVts::ParseResponseL(const TDesC8& aResponseBuf)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::ParseResponseL()"));
-	
-	if (aResponseBuf.Match(KLtsyOkString) == 0)
-		{
-		iATResult = KErrNone;
-		iOKFounded = ETrue;
-		}
-	else if(aResponseBuf.Match(KLtsyErrorString) == 0)
-		{
-		iATResult = KErrArgument;
-		}
-	}
-
-void CATDtmfVts::EventSignal(TAtEventSource /*aEventSource*/, TInt aStatus)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATDtmfVts::EventSignal()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] aEventSource = %d\taStatus = %d"),aStatus);
-	
-	iIOStatus = aStatus;
-	
-	//Process I/O Error
-	if (iIOStatus != KErrNone)
-		{
-		HandleResponseError();
-		Complete();
-		return;
-		}
-	
-	//Process at step
-	switch(iAnswerStep)
-		{
-		case EATWaitForWriteComplete:
-			iAnswerStep = EATReadComplete;
-			break;
-			
-		case EATReadComplete:
-			ClearCurrentLine();
-			if (iATResult == KErrNone)
-				{
-				HandleSendDtmfTonesSuccess();
-				}
-			else
-				{
-				HandleResponseError();
-				}
-			Complete();
-			break;
-			
-		default:
-			break;
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/src/athangup.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,293 +0,0 @@
-// 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:
-// Hangup a ongoning call
-
-//system include
-
-//user include
-#include "athangup.h"
-#include "atmanager.h"
-#include "activecommandstore.h"
-#include "mslogger.h"
-#include "ltsycallinformationmanager.h"
-#include "allcallreleasecompleteobserver.h"
-
-//const define
-const TInt KLtsyHangupReadTimeout = 2;
-_LIT8(KLtsyHangUpAllCallCommand, "ATH\r"); //ATH0
-
-
-CATHangUp* CATHangUp::NewL(CGlobalPhonemanager& aGloblePhone,
-			               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATHangUp::NewL()"));
-	
-	CATHangUp* self = CATHangUp::NewLC(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-CATHangUp* CATHangUp::NewLC(CGlobalPhonemanager& aGloblePhone,
-			               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATHangUp::NewLC()"));
-	
-	CATHangUp* self = new (ELeave) CATHangUp(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CATHangUp::~CATHangUp()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATHangUp::~CATHangUp()"));
-	}
-
-CATHangUp::CATHangUp(CGlobalPhonemanager& aGloblePhone,
-		             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-					 :CAtCommandBase(aGloblePhone, aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATHangUp::CATHangUp()"));
-	
-	iAtType = ELtsyAT_Call_ATH;
-	iIOStatus = KErrNone;
-	iATResult = KErrNone;
-	iHangupStep = EATHangUpNotInProgress;
-	iHangupOperator = EUnknownAPI;
-	iAllCallReleaseObserver = NULL;
-	}
-
-void CATHangUp::ConstructL()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATHangUp::ConstructL()"));
-	
-	//Invoke base class function
-	CAtCommandBase::ConstructL();
-	
-	//Set read and write timeout
-	SetTimeOut(KLtsyDefaultWriteTimeOut, KLtsyHangupReadTimeout);
-	}
-
-
-void CATHangUp::ExecuteCommand()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATHangUp::ExecuteCommand()"));
-	
-	iTxBuffer.Copy(KLtsyHangUpAllCallCommand);
-	Write();
-	iHangupStep = EATHangUpWaitForWriteComplete;
-	}
-
-void CATHangUp::StartRequest()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATHangUp::StartRequest()"));
-	
-	ExecuteCommand();
-	}
-
-void CATHangUp::AddAllCallReleaseObserver(MAllCallReleaseCompleteObserver* aObserver)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATHangUp::AddAllCallReleaseObserver()"));
-	
-	iAllCallReleaseObserver = aObserver;
-	}
-
-void CATHangUp::InitVariable()
-	{
-	iAtType = ELtsyAT_Call_ATH;
-	iIOStatus = KErrNone;
-	iATResult = KErrNone;
-	iHangupStep = EATHangUpNotInProgress;
-	iHangupOperator = EUnknownAPI;	
-	}
-
-void CATHangUp::SetHangupOperator(THangupOperator aOperator)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATHangUp::SetHangupOperator()"));
-	
-	iHangupOperator = aOperator;
-	}
-
-void CATHangUp::HandleIOError()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATHangUp::HandleIOError()"));
-	
-	if (iHangupOperator == ECustomAPI)
-		{
-		iCtsyDispatcherCallback.CallbackCallControlTerminateAllCallsComp(iIOStatus);
-		}
-	else if (iHangupOperator == ERMobilePhoneAPI)
-		{
-		iCtsyDispatcherCallback.CallbackPhoneTerminateAllCallsComp(iIOStatus);
-		}
-	else
-		{
-		LOGTEXT(_L8("[Ltsy CallControl] Hangup unknown operator!!!!"));
-		}
-	}
-
-void CATHangUp::HandleResponseError()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATHangUp::HandleResponseError()"));
-	
-	if (iHangupOperator == ECustomAPI)
-		{
-		iCtsyDispatcherCallback.CallbackCallControlTerminateAllCallsComp(iATResult);
-		}
-	else if (iHangupOperator == ERMobilePhoneAPI)
-		{
-		iCtsyDispatcherCallback.CallbackPhoneTerminateAllCallsComp(iATResult);
-		}
-	else
-		{
-		LOGTEXT(_L8("[Ltsy CallControl] Hangup unknown operator!!!!"));
-		}
-	}
-
-void CATHangUp::HandleDisconnectedComplete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATHangUp::HandleDisconnectedComplete()"));
-	
-	if (iHangupOperator == ECustomAPI)
-		{
-		iCtsyDispatcherCallback.CallbackCallControlTerminateAllCallsComp(iATResult);
-		}
-	else if (iHangupOperator == ERMobilePhoneAPI)
-		{
-		iCtsyDispatcherCallback.CallbackPhoneTerminateAllCallsComp(iATResult);
-		}
-	else 
-		{
-		LOGTEXT(_L8("[Ltsy CallControl] Hangup unknown operator!!!!"));
-		if (iAllCallReleaseObserver == NULL)
-			{
-			return;
-			}
-		}
-
-	//Notify CTSY all call idel
-	for (TInt n = KLtsyMinCallId; n <= KLtsyMaxCallId; n++)
-		{
-		TLtsyCallInformation& tCallInfo(iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(n));
-		if (tCallInfo.GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed)
-			{
-			
-			if (tCallInfo.GetCallState() == TLtsyCallInformation::EInComingCall ||
-				tCallInfo.GetCallState() == TLtsyCallInformation::EWaitingCall	)
-				{
-				iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrGsmCCCallRejected, 
-						                                                             n, 
-						                                                             RMobileCall::EStatusDisconnecting);			
-				iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrGsmCCCallRejected, 
-																					 n,
-																					 RMobileCall::EStatusIdle);				
-				}
-			else
-				{
-				iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrGsmCCNormalCallClearing, 
-						                                                             n, 
-						                                                             RMobileCall::EStatusDisconnecting);			
-				iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrGsmCCNormalCallClearing, 
-																					 n,
-																					 RMobileCall::EStatusIdle);				
-				}
-			}		
-		}
-	
-	//Setting all call id state unused
-	iPhoneGlobals.GetCallInfoManager().ResetAllCalInformation();
-	}
-
-void CATHangUp::ParseResponseL(const TDesC8& aResponseBuf)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATHangUp::ParseResponseL()"));
-	
-	if (aResponseBuf.Match(KLtsyOkString) == 0)
-		{
-		LOGTEXT(_L8("[Ltsy CallControl] Hang up call reponse is OK"));
-		
-		iATResult = KErrNone;
-		}
-	else if (aResponseBuf.Match(KLtsyErrorString) == 0)
-		{
-		LOGTEXT(_L8("[Ltsy CallControl] Hang up call reponse is Error"));
-		
-		iATResult = KErrArgument;
-		}
-	}
-
-void CATHangUp::Complete()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATHangUp::Complete()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] iIOStatus = %d"), iIOStatus);
-	LOGTEXT2(_L8("[Ltsy CallControl] iATResult = %d"), iATResult);
-	
-	//Remove Ative Command and stop timer
-	CAtCommandBase::Complete();
-		
-	//Let other command can use I/O port
-	if (iAllCallReleaseObserver == NULL)
-		{
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		}
-	else
-		{
-		if (iIOStatus != KErrNone)
-			{
-			iAllCallReleaseObserver->ReleaseAllCallComplete(iIOStatus);
-			}
-		else
-			{
-			iAllCallReleaseObserver->ReleaseAllCallComplete(iATResult);
-			}
-		}
-	}
-
-void CATHangUp::EventSignal(TAtEventSource /*aEventSource*/, TInt aStatus)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATHangUp::EventSignal()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] aEventSource = %d\taStatus = %d"),aStatus);
-	
-	iIOStatus = aStatus;
-	if (iIOStatus != KErrNone)
-		{
-		HandleIOError();
-		Complete();
-		return;
-		}
-	
-	switch (iHangupStep)
-		{
-		case EATHangUpWaitForWriteComplete:
-			iHangupStep = EATHangUpReadComplete;
-			break;
-			
-		case EATHangUpReadComplete:
-			if (iATResult == KErrNone)
-				{
-				HandleDisconnectedComplete();
-				}
-			else
-				{
-				HandleResponseError();
-				}
-			Complete();
-			break;
-			
-		default:
-			break;
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/src/athangupcommandrecords.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-// 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:
-// Record the infomation related to hangup commands
-
-//system include
-
-//user include
-#include "athangupcommandrecords.h"
-#include "mslogger.h"
-
-TATHanupCommandInfo::TATHanupCommandInfo()
-	{
-	LOGTEXT( _L8("[Ltsy CallControl]  Starting TATHanupCommandInfo::TATHanupCommandInfo()"));	
-	iCallId = -1;
-	iHangupCause = -1;
-	}
-
-/**
- * 
- *
- */
-CATHangupCommandRecords* CATHangupCommandRecords::NewL()
-	{
-	LOGTEXT( _L8("[Ltsy CallControl]  Starting CATHangupCommandRecords::NewL()"));
-	CATHangupCommandRecords* self = CATHangupCommandRecords::NewLC();
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-CATHangupCommandRecords* CATHangupCommandRecords::NewLC()
-	{
-	LOGTEXT( _L8("[Ltsy CallControl]  Starting CATHangupCommandRecords::NewLC()"));
-	CATHangupCommandRecords* self = new (ELeave) CATHangupCommandRecords;
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CATHangupCommandRecords::~CATHangupCommandRecords()
-	{
-	LOGTEXT( _L8("[Ltsy CallControl]  Starting CATHangupCommandRecords::~CATHangupCommandRecords()"));
-	iHangupInfoArray.Close();
-	}
-
-CATHangupCommandRecords::CATHangupCommandRecords()
-	{
-	LOGTEXT( _L8("[Ltsy CallControl]  Starting CATHangupCommandRecords::CATHangupCommandRecords()"));
-	iHangupActive = EFalse;
-	}
-
-void CATHangupCommandRecords::ConstructL()
-	{
-	LOGTEXT( _L8("[Ltsy CallControl]  Starting CATHangupCommandRecords::ConstructL()"));
-	}
-
-TInt CATHangupCommandRecords::AddHangupCommandInfo(TInt aCallId, TInt aHangupCase)
-	{
-	LOGTEXT( _L8("[Ltsy CallControl]  Starting CATHangupCommandRecords::AddHangupCommandInfo()"));
-	TATHanupCommandInfo tInfo;
-	tInfo.iCallId = aCallId;
-	tInfo.iHangupCause = aHangupCase;
-	TInt nRes = iHangupInfoArray.Append(tInfo);
-	return nRes;
-	}
-
-TInt CATHangupCommandRecords::GetFirstHangupCommandInfoAndRemoveIt(TATHanupCommandInfo& aInfo)
-	{
-	LOGTEXT( _L8("[Ltsy CallControl]  Starting CATHangupCommandRecords::GetFirstHangupCommandInfoAndRemoveIt()"));
-	TInt nCount = iHangupInfoArray.Count();
-	LOGTEXT2( _L8("[Ltsy CallControl] Hang up command information array count = %d"), nCount);
-	
-	if (nCount > 0)
-		{
-		aInfo.iCallId = iHangupInfoArray[0].iCallId;
-		aInfo.iHangupCause = iHangupInfoArray[0].iHangupCause;
-		iHangupInfoArray.Remove(0);
-		return KErrNone;
-		}
-	return KErrNotFound;
-	}
-
-void CATHangupCommandRecords::SetHangupActiveFlag(TBool aIsActive)
-	{
-	LOGTEXT( _L8("[Ltsy CallControl]  Starting CATHangupCommandRecords::SetHangupActiveFlag()"));
-	iHangupActive = aIsActive;
-	}
-
-TBool CATHangupCommandRecords::GetHangupActiveFlag() const
-	{
-	LOGTEXT( _L8("[Ltsy CallControl]  Starting CATHangupCommandRecords::GetHangupActiveFlag()"));
-	return iHangupActive;
-	}
-
-
-TBool CATHangupCommandRecords::IsHaveRecords() const
-	{
-	if (iHangupInfoArray.Count() > 0)
-		{
-		return ETrue;
-		}
-	else
-		{
-		return EFalse;
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/src/atring.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-// 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:
-// Wait for first one incoming call
-
-//system include
-
-//user include
-#include "atring.h"
-#include "mslogger.h"
-
-//const define
-_LIT8(KLtsyIncomingExtCallIndication,"+CRING:*");
-_LIT8(KLtsyIncomingCallIndication,"RING");
-
-CATRing* CATRing::NewL(CGlobalPhonemanager& aGloblePhone,
-			           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATRing::NewL()"));
-	
-	CATRing* self = CATRing::NewLC(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-
-CATRing* CATRing::NewLC(CGlobalPhonemanager& aGloblePhone,
-			            CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATRing::NewLC()"));
-	
-	CATRing* self = new (ELeave) CATRing(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CATRing::~CATRing()
-	{
-	}
-
-CATRing::CATRing(CGlobalPhonemanager& aGloblePhone,
-		         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                 :CAtCommandBase(aGloblePhone, aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATRing::CATRing()"));
-	
-	iAtType = ELtsyAT_Call_RING;
-	}
-
-void CATRing::ConstructL()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATRing::ConstructL()"));
-	
-	CAtCommandBase::ConstructL(); //Not must
-	RemoveAllExpectString();
-	AddExpectStringL(KLtsyIncomingCallIndication);
-	AddExpectStringL(KLtsyIncomingExtCallIndication);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/src/atwaitforcallhandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-// 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:
-// Wait for 2nd incoming call
-
-//system include
-
-//user include
-#include "atwaitforcallhandler.h"
-#include "atclcc.h"
-#include "atring.h"
-#include "atmanager.h"
-#include "activecommandstore.h"
-#include "ltsycallinformationmanager.h"
-#include "mslogger.h"
-
-CATWaitForCallHandler* CATWaitForCallHandler::NewL(CGlobalPhonemanager& aGloblePhone,
-		                                           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATWaitForCallHandler::NewL()"));
-	
-	CATWaitForCallHandler* self = CATWaitForCallHandler::NewLC(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-CATWaitForCallHandler* CATWaitForCallHandler::NewLC(CGlobalPhonemanager& aGloblePhone,
-		                                            CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATWaitForCallHandler::NewLC()"));
-	
-	CATWaitForCallHandler* self = new (ELeave) CATWaitForCallHandler(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CATWaitForCallHandler::~CATWaitForCallHandler()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATWaitForCallHandler::~CATWaitForCallHandler()"));
-	
-	delete iAtRing;
-	iAtRing = NULL;
-	
-	delete iAtClcc;
-	iAtClcc = NULL;
-	}
-
-
-CATWaitForCallHandler::CATWaitForCallHandler(CGlobalPhonemanager& aGloblePhone,
-		                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-											 :CATCommandControlBase(aGloblePhone, aCtsyDispatcherCallback) 
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATWaitForCallHandler::CATWaitForCallHandler()"));
-	
-	iPhoneGlobals.GetCallInfoManager().SetIncomingCallFlag(EFalse);
-	}
-
-void CATWaitForCallHandler::ConstructL()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATWaitForCallHandler::ConstructL()"));
-	
-	iAtClcc = CATClcc::NewL(iPhoneGlobals, iCtsyDispatcherCallback);
-	iAtRing = CATRing::NewL(iPhoneGlobals, iCtsyDispatcherCallback);
-	iAtRing->SetAtCommandObserver(this);
-	}
-
-
-void CATWaitForCallHandler::StartToWaitForCall()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATWaitForCallHandler::StartToWaitForCall()"));
-	
-	iPhoneGlobals.iAtManager->GetActiveCommandStore()->AddUnsolicitedAtCommand(iAtRing);
-	}
-
-TInt CATWaitForCallHandler::ProcessIncomingCallInfomation()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATWaitForCallHandler::ProcessIncomingCallInfomation()"));
-	
-	TInt nCallId = iPhoneGlobals.GetCallInfoManager().FindIncomingCallId();
-	
-	if (KErrNotFound == nCallId)
-		{
-		return KErrNotFound;
-		}
-	
-	//Incoming call information
-	TLtsyCallInformation& tIncomingCallInfo(iPhoneGlobals.GetCallInfoManager().GetCallInformationByCallId(nCallId));
-	
-	RMobileCall::TMobileCallInfoV1 tMobileCallInfo;
-	
-	//Call id
-	tMobileCallInfo.iCallId = tIncomingCallInfo.GetCallId();
-	
-	//Call service
-	TLtsyCallInformation::TCallMode tCallService(tIncomingCallInfo.GetCallMode());
-	if (TLtsyCallInformation::EVoiceCall == tCallService)
-		{
-		tMobileCallInfo.iService = RMobilePhone::EVoiceService;
-		}
-	else if (TLtsyCallInformation::EDataCall == tCallService)
-		{
-		tMobileCallInfo.iService = RMobilePhone::ECircuitDataService;
-		}
-	else if (TLtsyCallInformation::EFaxCall == tCallService)
-		{
-		tMobileCallInfo.iService = RMobilePhone::EFaxService;
-		}
-	else
-		{
-		tMobileCallInfo.iService = RMobilePhone::EServiceUnspecified;
-		}
-		
-	//Call back
-	iCtsyDispatcherCallback.CallbackCallControlNotifyIncomingCallInd(KErrNone, tMobileCallInfo);
-	
-	//Ring State
-	tMobileCallInfo.iStatus = RMobileCall::EStatusRinging;
-	
-	//Telephone number
-	tMobileCallInfo.iRemoteParty.iRemoteNumber.iTelNumber.Copy(tIncomingCallInfo.GetMobileTelNum());
-	
-	iCtsyDispatcherCallback.CallbackCallControlNotifyCallInfoChangeInd(KErrNone, tMobileCallInfo);
-	
-	return KErrNone;
-	}
-
-void CATWaitForCallHandler::AtCommandExecuteComplete(TAtEventSource /*aEventSource*/, TInt aStatus)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CATWaitForCallHandler::AtCommandExecuteComplete()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] aEventSource = %d\taStatus = %d"),aStatus);
-		
-	//Process read or timeout error
-	if (aStatus != KErrNone)
-		{
-		//Reset Ring Count
-		iPhoneGlobals.GetCallInfoManager().SetIncomingCallFlag(EFalse);
-		
-		//Init ATCLCC Variable
-		iAtClcc->InitVariable();
-		
-		//Init InComing Call State
-		TInt nCall = iPhoneGlobals.GetCallInfoManager().FindIncomingCallId();
-		if (nCall != KErrNotFound)
-			{
-			iPhoneGlobals.GetCallInfoManager().ResetCallInformationByCallId(nCall);
-			}
-		return;
-		}
-	
-	//Clear Ring String
-	iAtRing->ClearCurrentLine();
-	
-	//CLCC find incoming information If first ring  coming
-	if (!iPhoneGlobals.GetCallInfoManager().GetIncomingCallFlag())
-		{
-		TInt nRet = iPhoneGlobals.CheckGlobalPhoneStatus();
-		if (nRet == KErrNone)
-			{
-			iPhoneGlobals.iEventSignalActive = ETrue;
-			iPhoneGlobals.GetCallInfoManager().SetIncomingCallFlag(ETrue);
-			iAtClcc->StartRequest();			
-			}
-		}	
-	
-	//Find At Clcc OK
-	if (iAtClcc->GetProcessStates() == CATClcc::EProcessOK)
-		{
-		TInt nRes = ProcessIncomingCallInfomation();
-		iAtClcc->InitVariable();
-		}	
-	
-	//Process AT CLCC error
-	if (iAtClcc->GetProcessStates() == CATClcc::EProcessError )
-		{
-		iAtClcc->InitVariable();
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/callcontrol/src/unsolicitedcommandcallcontrolhandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,291 +0,0 @@
-// 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:
-// CUnsolicitedCommandCallControlHandler. The handler for handling the unsolicited command related to call control
-
-//system include
-
-//user include
-#include "unsolicitedcommandcallcontrolhandler.h"
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include "ltsycommondefine.h"
-#include "globalphonemanager.h"
-#include "unsolicitedparams.h"
-#include "atclcc.h"
-#include "ltsycallinformationmanager.h"
-#include "mslogger.h"
-
-CUnsolicitedCommandCallControlHandler* CUnsolicitedCommandCallControlHandler::NewL(CGlobalPhonemanager& aGloblePhone,
-		                                                                           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CUnsolicitedCommandCallControlHandler::NewL()"));
-	
-	CUnsolicitedCommandCallControlHandler* self = CUnsolicitedCommandCallControlHandler::NewLC(aGloblePhone, 
-			                                                                                   aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-CUnsolicitedCommandCallControlHandler* CUnsolicitedCommandCallControlHandler::NewLC(CGlobalPhonemanager& aGloblePhone,
-		                                                                            CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CUnsolicitedCommandCallControlHandler::NewLC()"));
-	
-	CUnsolicitedCommandCallControlHandler* self = new (ELeave) CUnsolicitedCommandCallControlHandler(aGloblePhone, 
-			                                                                                         aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CUnsolicitedCommandCallControlHandler::~CUnsolicitedCommandCallControlHandler()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CUnsolicitedCommandCallControlHandler::~CUnsolicitedCommandCallControlHandler()"));
-	}
-
-CUnsolicitedCommandCallControlHandler::CUnsolicitedCommandCallControlHandler(CGlobalPhonemanager& aGloblePhone,
-		                                                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-																			 :iGlobalPhone(aGloblePhone),
-																			  iCtsyDispatcherCallback(aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CUnsolicitedCommandCallControlHandler::CUnsolicitedCommandCallControlHandler()"));
-	}
-
-void CUnsolicitedCommandCallControlHandler::ConstructL()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CUnsolicitedCommandCallControlHandler::ConstructL()"));
-	
-	iAtClcc = CATClcc::NewL(iGlobalPhone, iCtsyDispatcherCallback);
-	
-	iAtClcc->AddQueryCallInformationCompleteNotify(this);
-	}
-
-void CUnsolicitedCommandCallControlHandler::QueryCallInformationComplete(TInt /*aError*/)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CUnsolicitedCommandCallControlHandler::QueryCallInformationComplete()"));
-	
-	if (iAtClcc->GetProcessStates() == CATClcc::EProcessOK)
-		{
-		TInt nCallId = iGlobalPhone.GetCallInfoManager().FindWaitingCallId();
-		
-		LOGTEXT2(_L8("[Ltsy CallControl] The Waiting Call Id = %d"), nCallId);
-		if (KErrNotFound == nCallId)
-			{
-			iAtClcc->InitVariable();
-			return;
-			}
-		
-		//Waiting call information
-		TLtsyCallInformation& tWaitingCallInfo(iGlobalPhone.GetCallInfoManager().GetCallInformationByCallId(nCallId));
-		
-		RMobileCall::TMobileCallInfoV1 tMobileCallInfo;
-		
-		//Call id
-		tMobileCallInfo.iCallId = tWaitingCallInfo.GetCallId();
-		
-		//Call service
-		TLtsyCallInformation::TCallMode tCallService(tWaitingCallInfo.GetCallMode());
-		if (TLtsyCallInformation::EVoiceCall == tCallService)
-			{
-			tMobileCallInfo.iService = RMobilePhone::EVoiceService;
-			}
-		else if (TLtsyCallInformation::EDataCall == tCallService)
-			{
-			tMobileCallInfo.iService = RMobilePhone::ECircuitDataService;
-			}
-		else if (TLtsyCallInformation::EFaxCall == tCallService)
-			{
-			tMobileCallInfo.iService = RMobilePhone::EFaxService;
-			}
-		else
-			{
-			tMobileCallInfo.iService = RMobilePhone::EServiceUnspecified;
-			}	
-		
-		//Call back
-		iCtsyDispatcherCallback.CallbackCallControlNotifyIncomingCallInd(KErrNone, tMobileCallInfo);
-		
-		//Waiting States
-		tMobileCallInfo.iStatus = RMobileCall::EStatusRinging;		
-		
-		//Telephone number
-		tMobileCallInfo.iRemoteParty.iRemoteNumber.iTelNumber.Copy(tWaitingCallInfo.GetMobileTelNum());
-			
-		//Callback
-		iCtsyDispatcherCallback.CallbackCallControlNotifyCallInfoChangeInd(KErrNone, tMobileCallInfo);		
-		}
-	
-	//Init iAtCll for reusing it
-	iAtClcc->InitVariable();	
-	}
-
-void CUnsolicitedCommandCallControlHandler::HandleSimRemoveEvent()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CUnsolicitedCommandCallControlHandler::HandleSimRemoveEvent()"));
-	
-	TInt nErr = KErrEtelNoCarrier;
-	
-	for (TInt nCallId = KLtsyMinCallId; nCallId <= KLtsyMaxCallId; nCallId++)
-		{
-		TLtsyCallInformation& tCallInfo(iGlobalPhone.GetCallInfoManager().GetCallInformationByCallId(nCallId));
-		if (TLtsyCallInformation::EUsed == tCallInfo.GetCallIdIsUsedInfo())
-			{
-			//Notify disconnecting status
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(nErr,
-					                                                             nCallId, 
-					                                                             RMobileCall::EStatusDisconnecting);				
-			
-			//Nofity idel status
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(nErr,
-					                                                             nCallId, 
-					                                                             RMobileCall::EStatusIdle);				
-			}
-		}
-	
-	iGlobalPhone.GetCallInfoManager().ResetAllCalInformation();	
-	}
-
-void CUnsolicitedCommandCallControlHandler::HandleProductInitEvent()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CUnsolicitedCommandCallControlHandler::HandleProductInitEvent()"));
-	
-	TInt nErr = KErrEtelNoCarrier;
-	
-	for (TInt nCallId = KLtsyMinCallId; nCallId <= KLtsyMaxCallId; nCallId++)
-		{
-		TLtsyCallInformation& tCallInfo(iGlobalPhone.GetCallInfoManager().GetCallInformationByCallId(nCallId));
-		if (TLtsyCallInformation::EUsed == tCallInfo.GetCallIdIsUsedInfo())
-			{
-			//Notify disconnecting status
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(nErr,
-					                                                             nCallId, 
-					                                                             RMobileCall::EStatusDisconnecting);				
-			//Notify idel status
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(nErr,
-					                                                             nCallId, 
-					                                                             RMobileCall::EStatusIdle);				
-			}
-		}
-	
-	iGlobalPhone.GetCallInfoManager().ResetAllCalInformation();		
-	}
-
-void CUnsolicitedCommandCallControlHandler::HandleNetworkLostEvent()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CUnsolicitedCommandCallControlHandler::HandleNetworkLostEvent()"));
-	
-	TInt nErr = KErrEtelNoCarrier;	
-	
-	for (TInt nCallId = KLtsyMinCallId; nCallId <= KLtsyMaxCallId; nCallId++)
-		{
-		TLtsyCallInformation& tCallInfo(iGlobalPhone.GetCallInfoManager().GetCallInformationByCallId(nCallId));
-		if (TLtsyCallInformation::EUsed == tCallInfo.GetCallIdIsUsedInfo())
-			{
-			//Notify disconnecting status
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(nErr,
-					                                                             nCallId, 
-					                                                             RMobileCall::EStatusDisconnecting);				
-			//Notify idel status
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(nErr,
-					                                                             nCallId, 
-					                                                             RMobileCall::EStatusIdle);				
-			}
-		}
-	
-	iGlobalPhone.GetCallInfoManager().ResetAllCalInformation();		
-	}
-
-void CUnsolicitedCommandCallControlHandler::HandleCallCreatedEvent(const TDesC8& aWindPkg)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CUnsolicitedCommandCallControlHandler::HandleCallCreatedEvent()"));
-	
-	TUnsolicitedParams::TUnsolicitedParamsPckgBuf* pPckg = (TUnsolicitedParams::TUnsolicitedParamsPckgBuf*)(&aWindPkg);
-	TInt nCallId = (*pPckg)().iIdx;
-	LOGTEXT2(_L8("[Ltsy CallControl] nCallId = %d"), nCallId);
-	
-	if (iAtClcc->GetProcessStates() == CATClcc::EProcessNotInProgress)
-		{
-		TInt nRet = iGlobalPhone.CheckGlobalPhoneStatus();
-		if (nRet == KErrNone)
-			{
-			iGlobalPhone.iEventSignalActive = ETrue;
-			iAtClcc->StartRequest();			
-			}
-		}
-	}
-
-void CUnsolicitedCommandCallControlHandler::HandleCallReleasedEvent(const TDesC8& aWindPkg)
-	{
-	//if call id is incoming call reset incoming call states
-	iGlobalPhone.GetCallInfoManager().SetIncomingCallFlag(EFalse);
-	
-	//Notify CTSY incoming call release
-	TUnsolicitedParams::TUnsolicitedParamsPckgBuf* pPckg = (TUnsolicitedParams::TUnsolicitedParamsPckgBuf*)(&aWindPkg);
-	TInt nCallId = (*pPckg)().iIdx;		
-	LOGTEXT2(_L8("[Ltsy CallControl] nCallId = %d"), nCallId);
-	
-	if (nCallId >= KLtsyMinCallId && nCallId <= KLtsyMaxCallId)
-		{
-		TLtsyCallInformation& tCallInfo(iGlobalPhone.GetCallInfoManager().GetCallInformationByCallId(nCallId));
-		if (TLtsyCallInformation::EUsed == tCallInfo.GetCallIdIsUsedInfo())
-			{
-			//Notify disconnecting status
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrGsmCCNormalCallClearing,
-																				 nCallId,
-																				 RMobileCall::EStatusDisconnecting);			
-			//Notify idel status
-			iCtsyDispatcherCallback.CallbackCallControlNotifyCallStatusChangeInd(KErrGsmCCNormalCallClearing,
-																				 nCallId,
-																				 RMobileCall::EStatusIdle);
-			
-			iGlobalPhone.GetCallInfoManager().ResetCallInformationByCallId(nCallId);
-			}
-		}	
-	}
-
-void CUnsolicitedCommandCallControlHandler::UnsolicitedCommandArriving(TInt aEvent, 
-																	   const TDesC8& aWindPkg)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CUnsolicitedCommandCallControlHandler::UnsolicitedCommandArriving()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] nEvent = %d"), aEvent);
-	
-	switch (aEvent)
-		{
-		case KLtsyUnsolicitedEvent00:
-			HandleSimRemoveEvent();
-			break;
-			
-		case KLtsyUnsolicitedEvent03:
-			HandleProductInitEvent();
-			break;
-			
-		case KLtsyUnsolicitedEvent08:
-			HandleNetworkLostEvent();
-			break;
-			
-		case KLtsyUnsolicitedEvent05:
-			HandleCallCreatedEvent(aWindPkg);
-			break;
-			
-		case KLtsyUnsolicitedEvent06:
-			HandleCallReleasedEvent(aWindPkg);
-			break;
-			
-		default:
-			break;
-		}
-	
-	LOGTEXT(_L8("[Ltsy CallControl] End CUnsolicitedCommandCallControlHandler::UnsolicitedCommandArriving()"));
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/activecommandstore.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-// 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:
-// This contains CActiveCommandStore which store one and only one solicited active at command and a number of active 
-// unsolicited at commands
-// 
-
-#ifndef ACTIVECOMMANDSTORE_H_
-#define ACTIVECOMMANDSTORE_H_
-
-#include "atcommandbase.h"
-
-//Class forward
-
-/**
- * This class is used to manager a list of active AT commands
- * 
- */
-class CActiveCommandStore : public CBase
-	{
-public:
-    /**
-     * Factory function
-     */
-	static CActiveCommandStore* NewL();
-	
-	/**
-	 * Factory function
-	 */
-	static CActiveCommandStore* NewLC();
-	
-	/**
-	 * Destructor
-	 */
-	virtual ~CActiveCommandStore();
-	
-	/**
-	 * Add unsolicited AT command
-	 */
-	TInt AddUnsolicitedAtCommand(CAtCommandBase *aAtCommand);
-	
-	/**
-	 * Add the solicited AT command
-	 */
-	TInt AddSolicitedAtCommand(CAtCommandBase *aAtCommand);
-	
-	/**
-	 * Remove the At command
-	 */
-	TInt RemoveActiveAtCommand(const CAtCommandBase *aAtCommand);
-	
-	/**
-	 * Get the active command list
-	 */
-	RPointerArray<CAtCommandBase>& GetActiveCommandArray();
-protected:
-    /**
-     * constructor
-     */
-	CActiveCommandStore();
-	
-	/**
-	 * 2nd constructor
-	 */
-	void ConstructL();
-private:
-    /**
-     * The list store the acitve AT command solicited and unsolicited
-     */
-	RPointerArray<CAtCommandBase> iArray;
-	};
-
-#endif /*ACTIVECOMMANDSTORE_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/asynchelperrequest.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-// 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:
-// @file asynchelperrequest.h
-// 
-
-#ifndef __ASYNCHELPERREQUEST_H__
-#define __ASYNCHELPERREQUEST_H__
-
-//system include
-#include <e32base.h>
-//user include
-#include "cltsypacketserviceshandler.h"
-// forward class
-class CCtsyDispatcherCallback;
-class CGlobalPhonemanager;
-/**
- * This is a helper class. 
- * There are sometimes, CTSY passed an asynchronous request to LTSY, and LTSY alreay know what should be returned(No need to Send AT command to Baseband).
- * But as the passed request is 'Asynchronous', so we have to somehow return this value to CTSY in an asynchronous way.
- * So we just inherit form CTimer which an Active object, and reuturn the alreay-known value to CTSY some time later.
- *  
- */
-class CAsyncHelperRequest : public CTimer
-	{
-public:
-	/**
-	 * 2nd Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 * @param aPriority
-	 */
-	static CAsyncHelperRequest* NewL(CGlobalPhonemanager& aGloblePhone,
-			                   CCtsyDispatcherCallback& aCallBack,
-			                   TInt aPriority = CActive::EPriorityLow);	
-	/**
-	 * Destructor
-	 *
-	 */
-	virtual ~CAsyncHelperRequest();
-	
-	/**
-	 * Set request IPC
-	 */
-	void SetRequestId(const TInt aIpc);
-protected:
-    /**
-     * constructor
-     */
-	CAsyncHelperRequest(CGlobalPhonemanager& aGloblePhone,CCtsyDispatcherCallback& aCallBack,TInt aPriority);
-	
-	/**
-	 * Typicl RunL which inherit from CActive
-	 */
-	virtual void RunL();
-private:
-    /**
-     * Start the timer
-     */
-	void StartTimer(const TTimeIntervalMicroSeconds32 aTimeout = 100000);
-	
-	/**
-	 * Stop the timer
-	 */
-	void StopTimer();
-protected:	
-    /**
-     * Call back dispatcher
-     */
-    CCtsyDispatcherCallback& iCallBack;
-    
-    /**
-     * The global phone reference
-     */
-    CGlobalPhonemanager& iGloblePhone;	
-private:
-    /**
-     * The IPC requtest ID which is used to identiy what callback function should be returned
-     */
-	TInt iRequestId;
-	
-	/**
-	 * Store the IPC request ID
-	 */
-	RArray<TInt> iReqArray;
-	/*
-	 * The context to be set configuration
-	 */
-	TInt iContextId;
-	};
-
-
-
-#endif //__ASYNCHELPERREQUEST_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/atcommandbase.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,278 +0,0 @@
-// 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:
-// @file atcommandbase.h
-// This contains CAtCommandBase which is the base class for AT command
-// 
-
-#ifndef ATCOMMANDBASE_H_
-#define ATCOMMANDBASE_H_
-
-// system include
-#include <e32base.h>
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-
-// user include
-#include "atcommandtype.h"
-#include "ltsycommondefine.h"
-#include "respondbufparser.h"
-#include "requestbase.h"
-#include "globalphonemanager.h"
-
-
-// const defination
-const TUint KLtsyGenericBufferSize = 200;
-
-// forward class
-class CGlobalPhonemanager;
-class CAtManager;
-class CCommEngine;
-class CCtsyDispatcherCallback;
-class MAtCommandExecuteObserver;
-class CRequestBase;
-class CATSwitchOnLineMode;
-
-/**
-* This class provide the common functionalities for AT Command
-*
-*/
-class CAtCommandBase : public CRequestBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	virtual ~CAtCommandBase();
-public:// pure virtual functions	
-
-	/**
-	* Pure virtual function. Start Execute AT Command
-	*/
-	virtual void ExecuteCommand()=0;
-	
-	/**
-	* Cancel the AT Command execution
-	*/
-	virtual void CancelCommand();
-	
-public:// virtual functions	
-	/**
-	* Must be called after the AT Command execution get complete
-	*/
-	virtual void Complete();
-	
-	/**
-	* It can be overrided by inherited class
-	* 
-	* @param aResponseBuf Line buf reading from baseband which is 
-	*  parsered by class CAtCommandBase or CAtCommandBase's subtype
-	*/	
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	 * Virtual Function
-	 * This function would be called after one of @see TAtEventSource happened.
-	 * Subclass should implement this function.
-	 * 
-	 * @param aEventSource One of them: EReadCompletion, EWriteCompletion and ETimeoutCompletion
-	 * @param aStatus KErrNone if the event was complete without any error, or otherwise.
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-public:
-	/**
-	* Return the AT Type
-	* @return TLtsyATCommandType The AT Type and @see TLtsyATCommandType
-	*/
-	TLtsyATCommandType AtType();
-	
-	/**
-	* Add expected response string after an AT Command was executed
-	*
-	* @param aExpectStr
-	*/
-	void AddExpectStringL(const TDesC8& aExpectStr);
-	
-	/**
-	* Add expected response string after an AT Command was executed
-	*
-	* @param aExpectStr
-	*/
-	void RemoveExpectString(const TDesC8& aExpectStr);
-	
-	/**
-	* Reset and clean all the expect string
-	*
-	*/
-	void RemoveAllExpectString();
-	
-	/**
-	* Add an AT Command to ATCommandStore
-	*
-	*/
-	void AddUnsolicitedAtCommand();
-	
-	/**
-	* Remove an AT Command in ATCommandStore
-	*
-	*/
-	void RemoveAtCommand();
-	
-	/**
-	* Issue writing AT Command to baseband
-	*
-	*/
-	void Write();
-	
-	/**
-	 * Set write and read timout
-	 */
-	void SetTimeOut(TInt aWriteTimeOut, TInt aReadTimeOut);
-	
-	/**
-	* Clean the whole buffer received from baseband
-	*/
-	void ClearBuffer();
-	
-	/**
-	* Clean the current line in the buffer
-	*/
-	void ClearCurrentLine();
-	
-	/**
-	* The buffer for storing the all received data from comms engine
-	*/
-	TPtrC8 Buffer() const;
-	
-	/**
-	* The current line in the buffer
-	*/
-	TPtrC8 CurrentLine() const;
-	/**
-	* The last line which had not matched in the buffer
-	*/
-	TPtrC8 PrecedingLine() const;
-	
-	/**
-	* Check if the passed string was matched with Expected AT String
-	*
-	* @param aReadLine
-	* @return TBool ETrue if matched, otherwise EFalse
-	*/
-	virtual TBool MatchExpectString(const TDesC8& aReadLine);
-	/**
-	 * Set AT command observer
-	 * If the observer was set, the AT command should return the data from baseband back to it but not Dispatcher Callback handler.
-	 * 
-	 * @param aAtCommandObserver The AT command observer @see MAtCommandExecuteObserver
-	 */
-	void SetAtCommandObserver(MAtCommandExecuteObserver* aAtCommandObserver);
-	
-	/**
-	 * Remove the AT command observer
-	 * 
-	 */
-	void RemoveAtCommandObserver();
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	void GenericEventSignal(TAtEventSource aEventSource, TInt aStatus);
-protected:
-	/**
-	* Constructor
-	*
-	* @param aAtManager
-	* @param aCommEngine
-	* @param aAtCommandObserver
-	*/
-	CAtCommandBase(CGlobalPhonemanager& aGloblePhone, CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	* This function must be called in his subtype class for 
-	* creating instance of class CRespondBufParser
-	*/
-	void ConstructL();
-    /**
-	* Start timer and would be expired after time periond of aTimeOut seconds
-	*/
-	void StartTimer(const TInt aTimeOut);
-private:
-  	/**
-	* Stop the timer
-	*/
-	void StopTimer();
-
-protected:
-    /**
-	* Identify the Type of AT Command
-	*/
-	TLtsyATCommandType iAtType;
-	
-	/**
-	* The array of strings which contain the expected Response Message from BaseBand
-	*/
-	RArray<TPtrC8> iExpectingArray;
-	
-	/**
-	* The buffer contains the "AT" String which should be sent to BaseBand Modem
-	*/
-	TBuf8<KLtsyGenericBufferSize> iTxBuffer;
-	
-	/**
-	* The expired time in which the Writing of AT command should be complete
-	*/
-	TInt iWriteTimeOut;
-	
-	/**
-	* The expired time in which the response message should be received
-	*/
-	TInt iReadTimeOut;
-	
-	/**
-	* The pointer to class CRespondBufParserparser for parsering response 
-	* message buffer
-	* 
-	*/	
-	CRespondBufParser* iParser;
-	
-	/**
-	* The dispacher callback handler
-	*/
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-private:	
-	/**
-	* The AT command observer.
-	* In most of cases, when the AT command was complete, it should use dispathcer callback handler to return data back to CTSY.
-	* But in some of cases, AT command should return the data back to the AT Command Observer which actually return the composed data
-	* (some of them were collected from other AT commands)
-	* back to CTSY.
-	* 
-	* Not own
-	*/
-	MAtCommandExecuteObserver* iAtCommandObserver;
-	
-	/**
-	* The buffer contains the line which had not matched
-	*/
-	TBuf8<KLtsyGenericBufferSize> iNoMatchedLastLine;
-	
-	
-	CATSwitchOnLineMode* iATSwitchOnLineMode;
-
-	};
-
-#endif /*ATCOMMANDBASE_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/atcommandcontrolbase.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-// 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:
-// This contains CATCommandControlBase which is composite class of a number classes
-// 
-
-#ifndef ATCOMMANDCONTROLBASE_H_
-#define ATCOMMANDCONTROLBASE_H_
-
-//system include
-#include <e32base.h>
-
-//user include 
-#include "atcommandtype.h"
-#include "atcommandexecuteobserver.h"
-#include "requestbase.h"
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-
-
-//forward class
-class CAtCommandBase;
-class CRequestBase;
-
-/**
- * This class is a composite class which is composed of a number of AT commands
- * 
- */
-class CATCommandControlBase : public CRequestBase, public MAtCommandExecuteObserver
-	{
-public:
-    /**
-     * Destructor
-     */
-	virtual ~CATCommandControlBase();
-public:
-    /**
-     * Add an AT command
-     * 
-     * @param aAtCommand The AT command which is to be added in
-     */
-	TInt AddAtCommand(const CAtCommandBase* aAtCommand);
-	
-	/**
-	 * Remove the AT command
-	 */
-	void RemoveAtCommand(const CAtCommandBase* aAtCommand);
-	
-	/**
-	 * Remove the AT command by its AT type
-	 */
-	void RemoveAtCommandByAtType(TLtsyATCommandType aType);
-	
-	/**
-	 * Get the AT command by its AT type
-	 * 
-	 * @param aType @see TLtsyATCommandType
-	 */
-	CAtCommandBase& GetAtCommandByAtTypeL(TLtsyATCommandType aType);
-	
-	/**
-	 * Remove all the AT commands
-	 */
-	void CleanAllAtCommands();
-	
-	/**
-	 * Remove all the AT commands and destroy them also
-	 */
-	void CleanAndDeleteAllAtCommands();	
-public:
-    /**
-     * Define the type to delete the AT command
-     */
-	enum TAutoDeleteAtCommand
-		{
-		/**
-		 * Delete all at command instance contained in the RPointArray when destructor
-		 */
-		EAutoDelete,
-		/**
-		 * Only close RPointArray, not delete at command instance contained in the RPonintArray
-		 */
-		ENoDelete
-		};
-	/**
-	 * Set the type of auto delete type
-	 */
-	void SetIsAutoDelete(TAutoDeleteAtCommand aIsDel);
-	
-	/**
-	 * Get the auto delete type
-	 */
-	TAutoDeleteAtCommand GetIsAutoDelete();
-protected:
-    /**
-     * Constructor
-     */
-	CATCommandControlBase(CGlobalPhonemanager& aGloblePhone, 
-		                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-protected:
-    /**
-     * The dispatcher call back
-     */
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-private:
-    /**
-     * Auto delete type
-     */
-    TAutoDeleteAtCommand iIsDel;
-    
-    /**
-     * AT commands store
-     */
-    RPointerArray<CAtCommandBase> iArray;	
-	};
-
-#endif /*ATCOMMANDCONTROLBASE_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/atcommandexecuteobserver.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// 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:
-// @file atcommandexecuteobserver.h
-// 
-
-#ifndef ATCOMMANDEXECUTEOBSERVER_H_
-#define ATCOMMANDEXECUTEOBSERVER_H_
-
-//symstem include
-
-//user include
-#include "ltsycommondefine.h"
-
-
-class MAtCommandExecuteObserver
-	{
-public:
-	virtual void AtCommandExecuteComplete(TAtEventSource aEventSource, TInt aStatus) = 0;
-	};
-
-#endif /*ATCOMMANDEXECUTEOBSERVER_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/atcommandtype.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-// 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:
-// @file atcommandtype.h
-// 
-
-#ifndef ATCOMMANDTYPE_H_
-#define ATCOMMANDTYPE_H_
-
-//Identifer at command class
-
-const TInt KLtsyGeneralAtCommandTypeUnitId = 0;
-const TInt KLtsyCallControlAtCommandTypeUnitId = 200;
-const TInt KLtsyPhoneAtCommandTypeUnitId = 400;
-const TInt KLtsySecurityAtCommandTypeUnitId = 600;
-const TInt KLtsyCellBroadcastAtCommandTypeUnitId = 800;
-const TInt KLtsyPhonebookOnTypeUnitId = 1000;
-const TInt KLtsyPhonebookTypeUnitId = 1200;
-const TInt KLtsySimTypeUnitId = 1400;
-const TInt KLtsySmsTypeUnitId = 1600;
-const TInt KLtsyCallControlMultipartyTypeUnitId = 1800;
-const TInt KLtsySupplementaryServicesTypeUnitId = 2000;
-const TInt KLtsyPacketServicesTypeUnitId = 2200;
-const TInt KLtsySatTypeUnitId = 2400;
-
-enum TLtsyATCommandType
-	{
-	/*Not Use*/
-	ELtsyAt_User_NotUse = -1,
-	/*General*/
-	ELtsyAT_General_AT = KLtsyGeneralAtCommandTypeUnitId + 1,	//AT
-	ELtsyAT_General_WIND = KLtsyGeneralAtCommandTypeUnitId + 2,	//+WIND (Unsolicited command)
-	ELtsyAT_General_CLCC = KLtsyGeneralAtCommandTypeUnitId + 3, //AT+CLCC (list current call information)
-	
-	/*Call Control*/
-	ELtsyAT_Call_ATD = KLtsyCallControlAtCommandTypeUnitId + 1,		//ATD
-	ELtsyAT_Call_ATH = KLtsyCallControlAtCommandTypeUnitId + 2,     //ATH
-	ELtsyAT_Call_RING = KLtsyCallControlAtCommandTypeUnitId + 3,    //RING or +CRING : *
-	ELtsyAT_Call_CHLD = KLtsyCallControlAtCommandTypeUnitId + 4,    //CHLD(for use release/hold/resume/swap a call)
-	
-	/*Phone*/
-	ELtsyAT_Phone_ModemStatus      = KLtsyPhoneAtCommandTypeUnitId + 1,
-	ELtsyAT_Phone_NwkRegStatus     = KLtsyPhoneAtCommandTypeUnitId + 2,
-	ELtsyAT_Phone_SimCardStatus    = KLtsyPhoneAtCommandTypeUnitId + 3,
-	ELtsyAT_Phone_NwkInfo          = KLtsyPhoneAtCommandTypeUnitId + 4,
-	ELtsyAT_Phone_GetSignal        = KLtsyPhoneAtCommandTypeUnitId + 5,
-	ELtsyAT_Phone_GetBattery       = KLtsyPhoneAtCommandTypeUnitId + 6,
-	ELtsyAT_Phone_SMSSetting1      = KLtsyPhoneAtCommandTypeUnitId + 7,
-	ELtsyAT_Phone_SMSSetting2      = KLtsyPhoneAtCommandTypeUnitId + 8,
-	ELtsyAT_Phone_RegistNwk        = KLtsyPhoneAtCommandTypeUnitId + 9,
-	ELtsyAT_Phone_GPRSRegNwk       = KLtsyPhoneAtCommandTypeUnitId + 10,
-	ELtsyAT_Phone_SetWind          = KLtsyPhoneAtCommandTypeUnitId + 11,
-	ELtsyAT_Phone_GetImei          = KLtsyPhoneAtCommandTypeUnitId + 12,
-	ELtsyAT_Phone_GetManufacturer  = KLtsyPhoneAtCommandTypeUnitId + 13,
-	ELtsyAT_Phone_GetModel         = KLtsyPhoneAtCommandTypeUnitId + 14,
-	ELtsyAT_Phone_GetRevision      = KLtsyPhoneAtCommandTypeUnitId + 15,
-	ELtsyAT_Phone_SetOperFormat    = KLtsyPhoneAtCommandTypeUnitId + 16,
-	ELtsyAT_Phone_CheckFdnSupport  = KLtsyPhoneAtCommandTypeUnitId + 17,
-	ELtsyAT_Phone_GetFdnStatus     = KLtsyPhoneAtCommandTypeUnitId + 18,
-	ELtsyAT_Phone_SetTDRSingal     = KLtsyPhoneAtCommandTypeUnitId + 19,
-	/*Security*/
-	
-	/*Cell Broad Cast*/
-	
-	/*Phone book On*/
-	
-	/*Phone book*/
-	
-	ELtsyAT_Phonebook_SmsStoreGetInfo=KLtsyPhonebookTypeUnitId  + 1,
-	/*Sim*/
-	
-	/*Sms*/
-	ELtsyAT_Sms_GetMessageStoreInfo = KLtsySmsTypeUnitId + 1,
-	
-	ELtsyAT_Sms_ReceiveMessage = KLtsySmsTypeUnitId+2,
-	/*Call Control Multiparty*/
-	
-	/*Supplementary Services*/
-	
-	/*PacketServices*/
-	ELtsyAT_Packet_ActivateContext          = KLtsyPacketServicesTypeUnitId + 1,
-	ELtsyAT_Packet_GetContextAddr           = KLtsyPacketServicesTypeUnitId + 2,
-	ELtsyAT_Packet_SwitchOnlineMode         = KLtsyPacketServicesTypeUnitId + 3,
-	ELtsyAT_Packet_HangUp                   = KLtsyPacketServicesTypeUnitId + 4,
-	ELtsyAT_Packet_DeactivateContext        = KLtsyPacketServicesTypeUnitId + 5,
-	ELtsyAT_Packet_ConnectContext           = KLtsyPacketServicesTypeUnitId + 6,
-	ELtsyAT_Packet_DeleteContext1           = KLtsyPacketServicesTypeUnitId + 7,
-	ELtsyAT_Packet_DeleteContext2           = KLtsyPacketServicesTypeUnitId + 8,
-	ELtsyAT_Packet_DeleteContext3           = KLtsyPacketServicesTypeUnitId + 9,
-	ELtsyAT_Packet_DeleteContext4           = KLtsyPacketServicesTypeUnitId + 10
-	/*Sat*/
-	};
-
-#endif /*ATCOMMANDTYPE_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/athelpercommand.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-// 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:
-// @file athelpercommand.h
-// 
-
-
-#ifndef __ATHELPERCOMMAND_H__
-#define __ATHELPERCOMMAND_H__
-
-//user include
-#include "atcommandbase.h"
-
-/**
- * \class CATHelperCommand 
- * \brief get Modem status.
- *
- * CATHelperCommand inherits from the CAtCommandBase class. 
- * This file defines the AT command for simple AT command 
- * which only return OK or Error
- */
-class CATHelperCommand : public CAtCommandBase
-{
-public:
-	static CATHelperCommand* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                           CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATHelperCommand();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Cancel the AT Command execution
-	 */
-	virtual void CancelCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Get error value executed AT Command
-	 */
-	TInt GetErrorValue();
-	/**
-	 * Set the string which should be executed AT Command
-	 */
-	void SetAtCommandString(const TDesC8& aATString);
-	/**
-	 * Start this request
-	 */
-	virtual void StartRequest();
-	/**
-	 * Start this request
-	 */
-	void SetATType(TLtsyATCommandType aATType);
-	
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATHelperCommand(CGlobalPhonemanager& aGloblePhone, 
-		              CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/**
-	 * The return error value of AT command executed 
-	 */
-	TInt iError;
-	/**
-	* The buffer contains the "AT" String which should be sent to BaseBand Modem
-	*/
-	TBuf8<KLtsyGenericBufferSize> iATBuffer;
-
-};
-#endif //__ATHELPERCOMMAND_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/atipcrequestcompleteobserver.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-// 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:
-// This contains MIpcRequestCompleteObserver which store one and only one solicited active at command and a number of active 
-// 
-
-#ifndef ATIPCREQUESTCOMPLETEOBSERVER_H_
-#define ATIPCREQUESTCOMPLETEOBSERVER_H_
-
-class MIpcRequestCompleteObserver
-    {
-public:    
-    virtual void NotifyIpcRequestComplete(TInt aIpcId) = 0;
-    };
-#endif /* ATIPCREQUESTCOMPLETEOBSERVER_H_ */

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/atmanager.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-// 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:
-// @file atmanager.h
-// This contains CAtManager which manage AT commands
-//
-
-#ifndef ATMANAGER_H_
-#define ATMANAGER_H_
-
-// system include
-#include <e32base.h>
-
-// user include
-#include "mcommobserver.h"
-#include "atcommandbase.h"
-
-//class forward
-class CActiveCommandStore;
-
-/**
- * This class is acting an interface between Comms Engine and AT commands, which manage to find active
- * AT command and send the Event to it.
- * 
- */
-class CAtManager : public CBase, 
-				   public MCommReadLineNotifier, 
-				   public MCommEngineObserver
-	{
-public:
-	/**
-	 * Factory function
-	 * 
-	 */
-	static CAtManager* NewL();
-	
-	/**
-	 * Factory function
-	 */
-	static CAtManager* NewLC();
-	
-	/**
-	 * Destructor
-	 */
-	virtual ~CAtManager();
-	
-public:
-	/**
-	 * Set current active solicited AT Command.
-	 * By default, one one solicited AT command should be currently Active
-	 * 
-	 * @param aSolicitedCommand The solicited AT command
-	 */
-	void SetSolicitedAtCommand(CAtCommandBase* aSolicitedCommand);
-	
-	/**
-	 * Get the Active Commands store: only one solicited and number of unsoclited AT Commands
-	 * 
-	 * CActiveCommandStore The active commands store
-	 */
-	CActiveCommandStore* GetActiveCommandStore() const;
-	
-	/**
-	 * From MCommEngineObserver
-	 * This function would be called when the event @see TAtEventSource happened.
-	 * 
-	 */
-	virtual void ReadOrWriteComplete(TAtEventSource aEvent, TInt aStatus);
-	
-	/**
-	 * From MCommReadLineNotifier
-	 * This function would be called when one line string were found 
-	 */
-	virtual TBool NotifyOneLineFoundL(TInt aStatus, const TDesC8& aLineBuf);
-	
-protected:
-	/**
-	 * Constructor
-	 * 
-	 */
-	CAtManager();
-	
-	/**
-	 * 2nd constructor
-	 * 
-	 */
-	void ConstructL();
-	
-private:
-	/**
-	 * The active solicited AT command
-	 * Not Own
-	 */
-	CAtCommandBase* iSolicitedCommand; 
-	
-	/**
-	 * The active command store
-	 * Own
-	 */
-	CActiveCommandStore* iActiveCommandStore;
-	};
-
-#endif /*ATMANAGER_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/atswitchonlinemode.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-// 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:
-// This contains CATSwitchOnLineMode which switch to online mode
-// 
-
-#ifndef __ATSWITCHONLINEMODE_H__
-#define __ATSWITCHONLINEMODE_H__
-
-#include <callbacktimer.h>
-//user include
-#include "atcommandbase.h"
-
-/**
- * \class CATSwitchOnLineMode 
- * \brief get Modem status.
- *
- * CATSwitchOnLineMode inherits from the CAtCommandBase class. 
- * This file defines the AT command for simple AT command 
- * which only return OK or Error
- */
-class CATSwitchOnLineMode : public CAtCommandBase,
-                            public MTimerObserver
-{
-public:
-	static CATSwitchOnLineMode* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                             CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATSwitchOnLineMode();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	 * Start this request
-	 */
-	void StartSwitchOnLineMode(CAtCommandBase* aAtCommandBase,MAtCommandExecuteObserver* aAtCommandObserver);
-	/**
-	 * 
-	 * 
-	 */
-	void Enable();
-	/**
-	 * 
-	 * 
-	 */
-	void Disable();
-	
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATSwitchOnLineMode(CGlobalPhonemanager& aGloblePhone, 
-		                CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	//From MTimerObserver
-    virtual void TimerRun(TInt aError);	
-    void StartTimer(const TInt aTimeout);
-private:
-	/**
-	 * The return error value of AT command executed 
-	 */
-	TInt iError;
-	CAtCommandBase* iAtCommandBase;
-	MAtCommandExecuteObserver* iAtCommandObserver;
-	CCallbackTimer* iCallbackTimer;	
-	
-	enum 
-		{
-		ETimerNone,
-		ETimerDrop,
-		ETimerRaise,
-		ETimerReset,
-		ETimerRead,
-		ETimerWait
-		} iWhichTimer;
-
-};
-#endif //__ATSWITCHONLINEMODE_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/atunsolicited.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-// 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:
-// @file atunsolicited.h
-// 
-
-#ifndef ATUNSOLICITED_H_
-#define ATUNSOLICITED_H_
-
-//system include
-
-//user include
-#include "atcommandbase.h"
-#include "unsolicitedparams.h"
-
-class CATUnsolicited : public CAtCommandBase
-	{
-public:
-	/**
-	 * 
-	 * 
-	 */
-	static CATUnsolicited* NewL(CGlobalPhonemanager& aGloblePhone,
-			                    CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * 
-	 * 
-	 */
-	static CATUnsolicited* NewLC(CGlobalPhonemanager& aGloblePhone,
-			                     CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-			                     
-	
-	/**
-	 * 
-	 * 
-	 */
-	virtual ~CATUnsolicited();
-	
-	/**
-	 * 
-	 * 
-	 * 
-	 */
-	virtual void ExecuteCommand(){};
-	
-	/**
-	 * 
-	 * 
-	 */
-	virtual void CancelCommand(){};
-	
-	/**
-	 * 
-	 * 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	 * 
-	 * 
-	 */
-	TInt GetParserResult() const;	
-	
-	/**
-	 * 
-	 * 
-	 */
-	const TDesC8& GetUnsolicitedParams() const;
-protected:
-	/**
-	 * 
-	 * 
-	 */
-	CATUnsolicited(CGlobalPhonemanager& aGloblePhone,
-				   CCtsyDispatcherCallback& aCtsyDispatcherCallback);	
-	
-	/**
-	 * 
-	 * 
-	 */
-	void ConstructL();
-	
-private:
-	/**
-	 * 
-	 * 
-	 */
-	TUnsolicitedParams::TUnsolicitedParamsPckgBuf iPckgBuf;
-	
-	/**
-	 * 
-	 * 
-	 * 
-	 */
-	TInt iResult;
-	};
-
-#endif /*ATUNSOLICITED_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/atunsolicitedobserver.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-// 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:
-// @file atunsolicitedobserver.h
-// 
-
-#ifndef ATUNSOLICITEDOBSERVER_H_
-#define ATUNSOLICITEDOBSERVER_H_
-
-//system include
-#include <e32std.h>
-//user include
-
-class MLtsyUnsolicitedCommandObserver
-	{
-public:
-	/**
-	 * 
-	 * 
-	 */
-	virtual void UnsolicitedCommandArriving(TInt aEvent, const TDesC8& aWindPkg) = 0;
-	};
-
-#endif /*ATUNSOLICITEDOBSERVER_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/globalphonemanager.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +0,0 @@
-// 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:
-// @file globlephonemanager.h
-// This contains CGlobalPhonemanager which manage the global phone status and call info manager.
-// 
-
-#ifndef __GLOBALPHONEMANAGER_H__
-#define __GLOBALPHONEMANAGER_H__
-
-// system include
-#include <etel.h>
-#include <etelmm.h>
-#include <etelqos.h>
-#include <ctsy/ltsy/mltsydispatchphonebookinterface.h>
-
-// user include
-#include <cmmutility.h>
-#include "cltsypacketserviceshandler.h"
-
-/**
- *  Define the prort access type
- */
-enum TPortAccess
-	{
-	EPortAccessAllowed,
-	EPortAccessDenied
-	};
-
-/**
- * Define the phone status for phone initialization
- */ 
-enum TPhoneInitStatus
-	{
-	EPhoneNotInitialised,
-	EPhoneInitialising,
-	EPhoneInitialiseCancelling,
-	EPhoneInitialised
-	};
-
-/**
- * Define the singnal info
- * 
- */ 
-struct TTsySignalInfo
-	{
-	TInt iSignalStrength;
-	TInt iBar;
-	};
-
-/**
- * Define the storage type
- */
-typedef TBuf8<2> TStorageType;
-
-/**
- * Define the global phone status
- */
-struct TPhoneStatusTSY
-	{
-	RPhone::TModemDetection iModemDetected;
-	RPhone::TMode iMode;
-	TUint iDataAndFaxFlags;
-	TPhoneInitStatus iInitStatus;
-	TPortAccess iPortAccess;
-	TInt iWaitForCarrierTime;
-	TBool iDataPortLoaned;
-	TUint iSupportedPhoneBookStorageFlag;
-	TInt iSupportedPhoneBookCount;
-	TStorageType iLastAccessedPhoneBook;
-	TBool iNetworkChanged;
-	RMobilePhone::TMobilePhoneRegistrationStatus iRegistrationStatus;
-	RMobilePhone::TMobilePhoneLocationAreaV1 iLocationArea;
-	RMobilePhone::TMobilePhoneNetworkInfoV5 iCurrentNetwork;
-	TTsySignalInfo iSignalInfo;
-	RMobilePhone::TMobilePhoneBatteryInfoV1 iBatteryInfo;
-	RMobilePhone::TMobilePhoneNITZ iMobilePhoneNITZ;
-	RPacketService::TRegistrationStatus iGprsRegistrationStatus;
-	RPacketService::TStatus iPacketStatus;
-	TInt iGprsMaxNumContexts;
-	TRfStateInfo iRfStateInfo;
-	RMobilePhone::TMobilePhoneNetworkSelectionV1  iLocalNetworkSel;
-	RMobilePhone::TMobilePhoneIdentityV1 iPhoneId;
-	};
-
-// forward class declarations
-class CTsyConfig;
-class CAtManager;
-class CCommEngine;
-class CRequestBase;
-class CLtsyCallInformationManager;
-
-/**
- * This class is a shared global phone manager across all the handlers.
- * 
- * This class provide the functions which store the phone status, modem status and access the call info manager.
- * 
- */
-class CGlobalPhonemanager : public CBase
-	{
-public:
-	/**
-	 * Factory function
-	 */
-	static CGlobalPhonemanager* NewL();
-	
-	/**
-	 * Factory function
-	 */
-	static CGlobalPhonemanager* NewLC();
-	
-	/**
-	 * virtual destructor
-	 */
-	virtual ~CGlobalPhonemanager();
-	
-public:
-	/**
-	 * Check current phone status before writing an AT command
-	 */
-	TInt CheckGlobalPhoneStatus();
-	
-	/**
-	 * Set current Active IPC Request
-	 */
-	void SetActiveRequest(CRequestBase* aRequestBase);
-	
-	/**
-	 * Before writing an AT command to baseband, the last active Request must be deleted in order to avoiding the  
-	 */
-	void DeleteLastActiveRequest();
-	
-	/**
-	 * Get Call informantion manager reference
-	 * 
-	 */
-	CLtsyCallInformationManager& GetCallInfoManager();
-	
-	/**
-	 * Get current active IPC request
-	 */
-	CRequestBase* CurrentActiveRequest();
-private:
-	/**
-	 * Constructor
-	 * 
-	 */
-	CGlobalPhonemanager();
-	
-	/**
-	 * 2nd Constructor
-	 * 
-	 */
-	void ConstructL();
-	
-	/**
-	 * Initialize Phone Manager
-	 * 
-	 */
-	void InitL();
-public:
-	/**
-	 * CommDB Engine
-	 */
-	CTsyConfig *iConfiguration;
-	
-	/**
-	 * Comm Engine
-	 * Own
-	 */
-	CCommEngine *iCommEngine;
-	
-	/**
-	 * AT Manager
-	 * Own
-	 */
-	CAtManager *iAtManager;	
-	
-	/**
-	 * Global phone status
-	 */
-	TPhoneStatusTSY iPhoneStatus;
-	
-	/**
-	 * This member define if or not there is unfinished IPC active
-	 */
-	TBool iEventSignalActive;
-
-	/**
-	 * Pkt Context list
-	 */
-	RPointerArray<TContextInfomation> iContextList;
-	/**
- 	 * Phonebook store info
- 	 */
-	DispatcherPhonebook::TPhonebookStoreInfoV1  iPhonebookStoreInfo;
-	/**
-	 * Get the total storage items from CAtSmsStoreInfo
-	 */
-	TInt iStoreTotal; 
-private:
-	/**
-	 * Current active Ipc Request
-	 */
-	CRequestBase* iActiveIpcRequest;
-	
-	/**
-	 * The call information manager
-	 * Own
-	 */
-	CLtsyCallInformationManager* iCallInfoManager;
-	};
-
-#endif /*__GLOBALPHONEMANAGER_H__*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/ltsycallinformation.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
-// 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:
-// This contains TLtsyCallInformation which store baseband related call information
-// 
-
-#ifndef LTSYCALLINFORMATION_H_
-#define LTSYCALLINFORMATION_H_
-
-//system include
-#include <e32base.h>
-#include <etelmm.h>
-
-//user include
-
-class TLtsyCallInformation
-	{
-public:
-	/**
-	 * 
-	 * 
-	 */
-	TLtsyCallInformation();
-	
-	/**
-	 *Call id is used or not 
-	 * 
-	 */
-	enum TCallIdUsedInfo
-		{
-		EUsed,
-		ENotUsed
-		};
-	
-	/**
-	 * Direction of the call
-	 * 
-	 */
-	enum TDirectionCall
-		{
-		EUnknownDirection = -1,	//Don't know
-		EMoCall = 0, 	//Mobile originated(MO) call
-		EMtCall = 1   	//Moblie teminated(MT) call
-		};
-
-	/**
-	 * State of the call
-	 * 
-	 */
-	enum TCallState
-		{
-		EUnknownState = -1,   //Don't know call state
-		EActiveCall = 0,	  //Active call
-		EHeldCall = 1,        //Hold call
-		EDialingCall = 2,     //Dialing Call(MO call)
-		EAlertingCall = 3,    //Alerting Call(MO call)
-		EInComingCall = 4,    //InComing call(MT call)
-		EWaitingCall = 5      //Waiting call(MT call)
-		};
-	
-	/**
-	 * Teleservice
-	 * 
-	 */
-	enum TCallMode
-		{
-		EVoiceCall  = 0,
-		EDataCall   = 1,
-		EFaxCall    = 2,
-		EUnKnowCall = 9
-		};	
-	
-	/**
-	 * Multiparty(Conference)
-	 * 
-	 */
-	enum TConferenceCall
-		{
-		EUnknownIsConference = -1, //Don't know
-		ENotConference = 0,		   //Not conference
-		EIsConference  = 1         //Conference
-		};
-	
-public:
-	/**
-	 * 
-	 */
-	void SetCallId(TInt aCallId);
-	
-	/**
-	 * 
-	 * 
-	 */
-	TInt GetCallId() const;
-	
-	void SetCallIdIsUsedInfo(TCallIdUsedInfo aUsedInfo);
-	TCallIdUsedInfo GetCallIdIsUsedInfo() const;
-	
-	void SetCallDirection(TDirectionCall aDirection);
-	TDirectionCall GetCallDirection() const;
-	
-	void SetCallState(TCallState aCallState);
-	TCallState GetCallState() const;
-	
-	void SetCallMode(TCallMode aCallMode);
-	TCallMode GetCallMode() const;
-	
-	void SetConferenceCall(TConferenceCall aConferenceCall);
-	TConferenceCall GetConferenceCall() const;
-	
-	void SetMobileTelNum(const TDesC8& aTelNum);
-	const TDesC8& GetMobileTelNum() const;
-	
-	void SetAddressType(TInt aAddressType);
-	TInt GetAddressType() const;
-	
-	void SetMobileName(const TDesC8& aMobileName);
-	const TDesC8& GetMobileName() const;
-	
-	void SetEmergencyCallFlag(TBool aIsEmergency);
-	TBool GetEmergencyCallFlag() const;
-	
-private:
-	
-	/**
-	 * Call id
-	 * 
-	 */
-	TInt iCallId;
-	
-	/**
-	 * Call id used info
-	 * 
-	 */
-	TCallIdUsedInfo iUsedInfo;
-	
-	/**
-	 * Direction of the call
-	 * 
-	 */
-	TDirectionCall iDirection;
-	
-	/**
-	 * State of the call
-	 * 
-	 */
-	TCallState iCallState;
-	
-	/**
-	 * Teleservice
-	 * 
-	 */
-	TCallMode iCallMode;
-	
-	/**
-	 * Multiparty(Conference)
-	 * 
-	 */
-	TConferenceCall iIsConference;
-	
-	/**
-	 * Telephone num
-	 * 
-	 */
-	TBuf8<RMobilePhone::KMaxMobileTelNumberSize> iTelNum; 
-	
-	/**
-	 * 
-	 * 
-	 */
-	TInt iAddressType;
-	
-	/**
-	 * Moblie name
-	 * 
-	 */
-	TBuf8<RMobilePhone::KMaxMobileNameSize> iMobileName;
-	
-	/**
-	 * Emergency call
-	 * 
-	 */
-	TBool iIsEmergencyCall;
-	
-	};
-
-#endif /*LTSYCALLINFORMATION_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/ltsycallinformationmanager.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +0,0 @@
-// 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:
-// This contains CLtsyCallInformationManager which manager call information
-// 
-
-#ifndef LTSYCALLINFORMATIONMANAGER_H_
-#define LTSYCALLINFORMATIONMANAGER_H_
-
-//system include
-
-//user include
-#include "ltsycallinformation.h"
-
-//const define
-const TInt KLtsyMaxCallCount = 8;
-
-// forward class declarations
-class CATHangupCommandRecords;
-
-/**
- * This class is handling all the call related information.
- * 
- * This call information manager store the call information and manage the call status.
- * 
- */
-class CLtsyCallInformationManager : public CBase
-	{
-public:
-    /**
-     * Factory funciton to create a new object of CLtsyCallInfomationManager
-     */
-	static CLtsyCallInformationManager* NewL();
-	
-	/**
-     * Factory funciton to create a new object of CLtsyCallInfomationManager
-     */
-	static CLtsyCallInformationManager* NewLC();
-	
-	/**
-	 * The destructor
-	 */
-	virtual ~CLtsyCallInformationManager();
-	
-	/**
-	 * Clear all the call information related to the specific CallID
-	 */
-	void ResetCallInformationByCallId(TInt aCallId);
-	
-	/**
-	 * Clear all the call information stored by call information manager
-	 * 
-	 * This function will be called when Hangup terminates all calls is called
-	 */
-	void ResetAllCalInformation();
-	
-	/**
-	 * Get the call information by specific CallID
-	 */
-	TLtsyCallInformation& GetCallInformationByCallId(TInt aCallId);
-	
-	/**
-	 * Get the call Id which is not currently used
-	 */
-	TInt FindUnUesedCallId() const;
-	
-	/**
-	 * Check the callId is used or not
-	 */
-	TBool IsHaveUsedCallId() const;
-	
-	/**
-	 * Find the call ID of 1st incoming call
-	 */
-	TInt FindIncomingCallId() const;
-	
-	/**
-	 * Find the call Id by its status which is dialling and altering
-	 */
-	TInt FindDialingOrAlertingCallId() const;
-	
-	/**
-	 * Get the call Id of 2nd incoming call.
-	 * Waiting call means that an incoming call is already processed by the client. and just wait
-	 * the client to hanle this 2nd incoming call
-	 */
-	TInt FindWaitingCallId() const;
-	
-	/**
-	 * Set the incoming ring call flag.
-	 * If received "Ring" or "+CRing", set this flag to be ETrue. and set it to be EFalse, if this call has been connected.
-	 */
-	void SetIncomingCallFlag(TBool aIncomingCallFlag);
-	
-	/**
-	 * Get the incoming call flag
-	 */
-	TBool GetIncomingCallFlag() const;
-	
-	/**
-	 * Get the call ID assigned to emergence call
-	 */
-	TInt FindEmergencyCallId() const;
-	
-	/**
-	 * Get Hang up command records
-	 * 
-	 */
-	CATHangupCommandRecords& GetHangupCommandRecords();	
-	
-protected:
-	/**
-	 * Constructor
-	 */
-	CLtsyCallInformationManager();
-	
-	/**
-	 * 2nd constructor
-	 */
-	void ConstructL();
-	
-private:
-    /**
-     *Call Information array 
-     */
-	TLtsyCallInformation iCallInfo[KLtsyMaxCallCount];
-	
-	/**
-	 * Incoming call status flag
-	 */
-	TBool iIncomingCallFlag;
-	
-	/**
-	 * Own. 
-	 * The store to store the hanup information related to AT hangup command
-	 */
-	CATHangupCommandRecords* iHangupCommandRecords;		
-	};
-
-#endif /*LTSYCALLINFORMATIONMANAGER_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/ltsycommondefine.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-// 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:
-// This contains common defination
-// 
-
-#ifndef LTSYCOMMONDEFINE_H_
-#define LTSYCOMMONDEFINE_H_
-
-// system include
-#include <e32std.h>
-
-/**
- * Define the IO event
- * 
- */
-enum TAtEventSource
-	{
-	EReadCompletion,
-	EWriteCompletion,
-	ETimeoutCompletion
-	};
-
-/**
-* The default maximum time in which Writing an AT command must be complete
-* 5 seconds
-*/
-const TInt KLtsyDefaultWriteTimeOut = 5;
-
-/**
-* The default maximum time in which The response from baseband must be received 
-* 10 seconds
-*/
-const TInt KLtsyDefaultReadTimeOut = 20;
-
-/**
-* The invalid call ID
-*/
-const TInt KLtsyErrorCallId = -1;
-
-/**
- * The minimum call id
- * 
- */
-const TInt KLtsyMinCallId = 1;
-
-/**
- * The maximal call id
- * 
- */
-const TInt KLtsyMaxCallId = 7;
-
-/**
- * +WIND
- */
-const TInt KLtsyUnsolicitedEvent00 = 0;
-const TInt KLtsyUnsolicitedEvent01 = 1;
-const TInt KLtsyUnsolicitedEvent02 = 2;
-const TInt KLtsyUnsolicitedEvent03 = 3;
-const TInt KLtsyUnsolicitedEvent04 = 4;
-const TInt KLtsyUnsolicitedEvent05 = 5;
-const TInt KLtsyUnsolicitedEvent06 = 6;
-const TInt KLtsyUnsolicitedEvent07 = 7;
-const TInt KLtsyUnsolicitedEvent08 = 8;
-const TInt KLtsyUnsolicitedEvent09 = 9;
-const TInt KLtsyUnsolicitedEvent10 = 10;
-const TInt KLtsyUnsolicitedEvent11 = 11;
-const TInt KLtsyUnsolicitedEvent12 = 12;
-/**
- *  const for sms 
- */
-const TInt KGsmTpduSize = 165;            // 140 bytes user data + 25 bytes TPDU header
-const TInt KPduMode = 0;
-const TInt KTextMode = 1;
-const TInt KCMTMode = 2;
-const TInt KMaxAsciiPduLength = 400;       //For write message and send message
-
-/**
- * ReadEntry for phonebook
- */
-class TPhonebookReadEntry
-    {
-public:
-	TUint16     iIndex;
-    TBuf16<20>  iNumber;
-    TUint8      iTon;
-    TBuf16<14>  iText;	
-    };
-
-// const string defination
-_LIT8(KLtsyOkString,"OK");
-_LIT8(KLtsyErrorString,"ERROR");
-_LIT8(KLtsyCmeErrorString,"+CME ERROR:*");
-_LIT8(KLtsyNoCarrierString,"NO CARRIER");
-_LIT8(KLtsyGeneralIndMatchString, "+WIND:*");
-_LIT8(KAnyATCommand,"AT+*");
-
-_LIT8(KLtsyCtrlZChar,"\032");
-_LIT8(KLtsyCommaChar,",");
-#endif /*LTSYCOMMONDEFINE_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/mslogger.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-// 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:
-// TSYLogger
-
-#include <e32std.h>	// for basic Symbian data types
-
-#ifndef __MSLOGGER_H__
-#define __MSLOGGER_H__
-
-#ifdef _DEBUG
-#define __LOGDEB__
-#else
-#define __LOGREL__
-#endif
-
-#ifdef	__LOGDEB__
-#define __LOGREL__
-#endif
-
-#ifdef __LOGDEB__
-#define LOGTEXT(AAA)				TSYLogger::Write(AAA)
-#else
-#define LOGTEXT(AAA)
-#endif
-
-#ifdef __LOGDEB__
-#define LOGTEXT2(AAA,BBB)			TSYLogger::WriteFormat(AAA,BBB)
-#else
-#define LOGTEXT2(AAA,BBB)
-#endif
-
-#ifdef __LOGDEB__
-#define LOGTEXT3(AAA,BBB,CCC)		TSYLogger::WriteFormat(AAA,BBB,CCC)
-#else
-#define LOGTEXT3(AAA,BBB,CCC)
-#endif
-
-#ifdef	__LOGREL__
-#define LOGTEXTREL(AAA)				TSYLogger::Write(AAA)
-#else
-#define LOGTEXTREL(AAA)				
-#endif
-
-#ifdef	__LOGREL__
-#define LOGTEXTREL2(AAA,BBB)		TSYLogger::WriteFormat(AAA,BBB)
-#else
-#define LOGTEXTREL2(AAA,BBB)		
-#endif
-
-#ifdef __LOGREL__
-#define LOGTEXTREL3(AAA,BBB,CCC)	TSYLogger::WriteFormat(AAA,BBB,CCC)
-#else
-#define LOGTEXTREL3(AAA,BBB,CCC)	
-#endif
-
-// TSYLogger
-// Implements logging.  All static calls.
-
-class TSYLogger
-	{
-public:
-	static void Write(const TDesC8& aText);
-	static void WriteFormat(TRefByValue<const TDesC8> aFmt,...);
-	};
-
-#endif	// __MSLOGGER_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/panic.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-// 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:
-// @file panic.h
-// Panic codes and panic function. This header should be kept private and not exported to
-// /epoc32/include/
-
-#ifndef __PANIC_H__
-#define __PANIC_H__
-
-/**
- * Please add new panic codes to the end of the list so that panic code values
- * do not change meaning.
- * You can name the panic code as you wish.
- */
-enum TTSYPanic
-	{
-	EGeneral,
-	EUnexpectedState,
-	EATCommand_NotConstructed,
-	EATCommand_IllegalCompletionWaitExpected,
-	EATCommand_IllegalCompletionWriteExpected,
-	EATCommand_IllegalCompletionWriteNotExpected,
-	EATCommand_IllegalCompletionReadExpected,
-	EATCommand_IllegalCompletionReadNotExpected,
-	EATCommand_IllegalWaitCompletion,
-	EATCommand_IllegalResponse,
-	EIllegalTsyReqHandle,
-	EIllegalPanicOccurredValue,
-	EIllegalOwnedState,
-	ENotifications_Remaining,
-	ELastEvents_Remaining,
-	ECalls_Remaining,
-	EFaxPtrNull,
-	EFaxCompletionPtrNull,
-	EATCommand_NotInProgress,
-	ERelinquishOwnershipWithNoCall,
-	EIllegalTsyNameInConnectedModemRecord,
-	EIllegalCallDuration,
-	EIllegalEvent,
-	EPreAllocatedCallDoesNotExist,
-	ENewCallDoesNotExist,
-	ECallNameAlreadyExists,
-	ERingingCallNotFound,
-	ELineAlreadyExists,
-	EAcquirerNotFound,
-	EUnknownPhoneBookStorageTypeIndex,
-	EIllegalPhoneBookState,
-	EFaxServerNotNull,
-	ENotDataCallType,
-	EATSmsUtilsDescriptorOverflow,
-	EATSmsUtilsOddNumberOfSemiOctets,
-	EATSmsCommandsWrongRequest,
-	EATSmsCommandsUnknownRequestStage,
-	EATSmsCommandsUnknownRequest,
-	EATSmsCommandsWrongRequestToCancel,
-	EATSmsMessagingSendNullMsgAttributes,
-	EATSmsMessagingSCATooLarge,
-	EATSmsMessagingUnknownRequestCompleted,
-	EMobileSmsMessagingUnknownIPC,		
-	EMobileSmsMessagingUnknownParamVersion,				
-	EMobileSmsMessagingNotYetImplemented,				
-	EMobileSmsMessagingNullParameter,					
-	EMobileSmsMessagingUnexpectedState,					
-	EMobileSmsMessagingReceiveBufferEmpty,				
-	EMobileSmsMessagingASCIIPduHasOddLength,			
-	EMobileSmsMessagingDigitCountOutOfRange,			
-	EMobileSmsMessagingCanNotReceiveUnstoredMessage,	
-	EMobileSmsMessagingMessageNotReserved,				
-	EMobileSmsMessagingClientAllocatedTooLittle,		
-	EMobileSmsMessagingClientAllocatedTooMuch,			
-	EMobileSmsMessagingSmsCapsNotValid,					
-	EMobileSmsMessagingIllegalIPCCallForRxMode,			
-	EMobileSmsMessagingAlreadyStarted,					
-	EMobileSmsMessagingCanNotReceiveStoredMessage,
-	ECMTHandlerDesPassedWithZeroLength,
-	EATGetSignalNullParameter,
-	EReceiveSmsQueueRequestOutstanding,
-	EMobileSmsMessagingPhoneNotSetToAReceiveMode,
-	EMobileSmsMessagingPhoneNotSetToASupportedReceiveMode,
-	ESmsRxQueuePduReadNullPointers,
-	ESmsRxQueuePduReadNoState,
-	ESmsRxQueuePduReadStopCalled,
-	ESmsRxQueuePduReadNonNullExpectString,
-	ESmsRxQueuePduReadNullExpectString,
-	ESmsRxQueuePduReadNullParameter,
-	ESmsRxQueuePduReadSCARemovalFailure,
-	EATSmsUtilsUnknownStoreName,
-	EATWaitForCMTNoState,
-	EATWaitForCMTSCARemovalFailure,
-	EATWaitForCMTPDUTooLong,
-	ETsyConfigNullDBPointer,
-	ETsyConfigAmbiguousModemTables,
-	ETsyConfigMMTSYNotInModemTables,
-	EPacketContextsRemaining,
-	EPacketContextDoesNotExist,
-	EUnableToConnectToFlogger,
-	};
-
-GLREF_C void Panic(TTSYPanic aPanicNumber);
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/requestbase.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-// 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:
-// CRequestBase
-
-#ifndef ATIPCREQUEST_H_
-#define ATIPCREQUEST_H_
-
-// system include
-#include <e32base.h>
-
-// user include
-#include "atipcrequestcompleteobserver.h"
-
-//Class forward
-class CGlobalPhonemanager;
-
-/**
- * The request base which acts a single IPC request passed by dispatcher
- * 
- */
-class CRequestBase : public CBase
-	{
-public:
-	/**
-	* Destructor
-	*/
-	virtual ~CRequestBase();
-	
-	/**
-	* Defince an interface of an IPC request to start this request asynchronously
-	*/
-	virtual void StartRequest();
-	
-	/**
-	 * Set the IPC request complete observer
-	 */
-	void SetIpcRequestCompleteObserver(MIpcRequestCompleteObserver* aIpcCompleteObserver);
-	
-	/**
-	 * Set IPC Id
-	 */
-	void SetIpcId(TInt aIpcId);
-	
-	/**
-	 * Get IPC Id
-	 */
-	TInt IpcId();
-protected:
-    /**
-    * The constructor
-    */
-	CRequestBase(CGlobalPhonemanager& aPhoneGlobals);
-	
-protected:
-    /**
-    * The global phone manager
-    */	
-	CGlobalPhonemanager& iPhoneGlobals;
-	
-	/**
-	 * The Ipc Request complete observer
-	 */
-	MIpcRequestCompleteObserver* iIpcCompleteObserver;
-	
-	/**
-	 * IPC Id
-	 */
-	TInt iIpcId;
-	};
-
-#endif /*ATIPCREQUEST_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/respondbufparser.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// 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:
-// This contains CRespondBufParser which provide an algorithm to analize the passed data from baseband
-//
-
-#ifndef __CRESPONDBUFPARSER_H__
-#define __CRESPONDBUFPARSER_H__
-#include <e32cmn.h> 
-#include <e32base.h>
-
-/**
-* This class is used to analyze the passed data and put the value in the buffer store
-*
-*/
-class CRespondBufParser : public CBase
-	{
-public:
-    /**
-    * Constructor
-    */
-	CRespondBufParser();
-	
-	/**
-	* Destructor
-	*/
-	virtual ~CRespondBufParser();
-	
-	/**
-	* Parse the responsed data
-	*/
-	void ParseRespondedBuffer(RArray<TPtrC8>& aArray, const TDesC8& aBuf);
-	};
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/tsyconfg.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,222 +0,0 @@
-// 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:
-// @file tsconfig.h
-// This contains CTsyConfig which manage to get the modem settings from CommDB.
-// 
-
-#ifndef __TSYCONFG_H
-#define __TSYCONFG_H
-
-// system include
-#include <e32base.h>
-#include <d32comm.h>
-#include <etelmm.h>
-#include <commsdattypesv1_1.h>
-
-// use name space
-using namespace CommsDat;
-
-enum TConfigType
-	{
-	EConfigTypePreInit,
-	EConfigTypeInit,
-	EConfigTypeConnect,
-	EConfigTypeHangUp,
-	EConfigTypeFull,
-	EConfigTypeQuickInit,
-	EConfigTypeDDBugWorkAroundStart,
-	EConfigTypeDDBugWorkAroundEnd
-	};
-
-/** 
- * CTsyConfig Class
- * Creating the class will load the current modem settings.
- * They may be refreshed by calling ReloadSettings.
- * The ModemName, PortDriverName, CommPortName and String functions 
- * will return descriptors to the relevant settings taken from 
- * the current modem's settings.
- * The CommConfig function will return a reference to the Configuration 
- * structure in the current modem's settings. 
- * All file closing, tidying and memory deallocation should be done 
- * in the ~CTsyConfig destructor.
- */
-class CTsyConfig : public CBase
-	{
-public:
-	/**
-	 * Factory function.
-	 * 
-	 * @return A newly created CTsyConfig Object
-	 */
-	static CTsyConfig* NewL();
-	
-	/**
-	 * Virtual destructor
-	 * 
-	 */
-	~CTsyConfig();
-    
-	/**
-	 * Set current table view.
-	 * Try to get current table view by 10 times.
-	 */
-	void SetCurrentTableViewL();
-	
-	/**
-	 * Get the field value by the name from modem Bearer record table in commdb.
-	 * 
-	 * @param aStringTag The field name
-	 * @param aString The field value
-	 */
-	TInt ConfigModemStringL(const TDesC& aStringTag, TDes8& aString);
-	
-	/**
-	 * Get the field value by the name from modem Bearer record table in commdb.
-	 * 
-	 * @param aStringTag The field name
-	 * @param aString The field value
-	 */
-	TInt ConfigModemStringL(const TDesC& aStringTag, TDes16& aString);
-	
-	/**
-	 * Gets the port config settings and masks out appropriate handshaking settings
-	 * according to whether state is about to initialise, just connected or about to hang up
-	 */ 
-	TInt PortConfig(TCommConfig& aConfigPckg, TConfigType aConfigType);
-	
-	/**
-	 * Stores the Speaker Preferences settings internally. These settings are stored on construction
-	 * of the CTsyConfig object.
-	 * @param aSpeakerSetting Speaker Preference setting
-	 */
-	void GetSpeakerSettingPref(RCall::TMonitorSpeakerControl& aSpeakerSetting);
-	
-	/**
-	 * Stores the Speaker Volume Preferences settings internally. These settings are stored on construction
-	 * of the CTsyConfig object.
-	 * @param aSpeakerVolume Speaker Volume setting
-	 */
-	void GetSpeakerVolumePref(RCall::TMonitorSpeakerVolume& aSpeakerVolume);
-	
-	/**
-	 * Stores the Dial Tone Preferences settings internally. These settings are stored on construction
-	 * of the CTsyConfig object.
-	 * @param aWaitForDialTonePref Wait for Dial Tone Preference setting
-	 */
-	void GetWaitForDialTonePref(RCall::TWaitForDialTone& aWaitForDialTonePref);
-	
-	/**
-	 * Opens a handle to CCommsDatabase	and positions the view on the default modem specified 
-	 * in the current Connected Modem record.
-	 * Note that the TSY does not keep the handle to the CCommsDatabase opened all the time, 
-	 * therefore this method is used to open the handle only when needed. The methods using 
-	 * this method are also responsible for calling ResetCurrentTableViews() to close the
-	 * handle to the CCommsDatabase and to clean up the table views.
-	 */
-	void GetCurrentTableViewsL();
-	
-	/**
-	 * Gets some commonly used settings from the Location and Modem Table Views and stores them
-	 * internally as these are not likely to change. 
-	 * If some of these settings are not found in the table view then a predefined default values are
-	 * used.
-	 */
-	void GetLocationModemSettingsL();
-	
-	/**
-	 * Closes the handle to CCommsDatabase and clears the view on the default modem specified 
-	 * in the current Connected Modem record. This method needs to be called after 
-	 * GetCurrentTableViewsL().
-	 */
-	void ResetCurrentTableViews();
-private:
-	/**
-	 * Constructor 
-	 */
-	CTsyConfig();
-	
-	/**
-	 * 2nd constructor
-	 * 
-	 */
-	void ConstructL();
-	
-	/*
-	 * Scan through the table for records containing Phonetsy.tsy
-	 * Stop at the first instance of such a record and return the id
-	 * 
-	 * @param aBearerId The Bearer ID in modem bearer table
-	 */
- 	void GetModemBearerIdL(TUint32& aBearerId);  	
- 	/*
- 	 * Scan through the table for records containing MM.TSY
- 	 * Stop at the first instance of such a record and return the id
- 	 *
- 	 * @param aBearerId The Bearer ID in modem bearer table
- 	 * @param aLocationId 
- 	 */
- 	void GetLocationIdL(const TUint32& aBearerId, TUint32& aLocationId); 
-
-private:
-	/**
-	 * Store the modem configuration for connecting with AT Modem
-	 * 
-	 */
-	TCommConfigV01 iConfig;
-	
-	/**
-	 * The CommDB session
-	 * 
-	 * Own
-	 */
-	CMDBSession* iDbSession;
-	
-	/**
-	 * Store the IAP number for the selected modem
-	 * 
-	 */
-	TUint32 iModemBearer;
-	
-	/**
-	 * Location ID
-	 * 
-	 */
-	TUint32 iLocationId;
-	
-	/**
-	 * An integer value that indicates the time to pause after using the dial-ot code
-	 * 
-	 */
-	TInt iInterval;
-	
-	/**
-	 * Monitor speaker control setting flags
-	 * 
-	 */
-	RCall::TMonitorSpeakerControl iSpeakerSetting;
-	
-	/**
-	 * Monitor speaker volume control setting flags
-	 * 
-	 */
-	RCall::TMonitorSpeakerVolume iSpeakerVolume;
-	
-	/**
-	 * Wait for dial tone flags
-	 * 
-	 */
-	RCall::TWaitForDialTone iWaitForDialTonePref;
-	};
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/unsolicitedeventmonitor.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-// 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:
-// This contains CUnsolicitedEventMonitor which mornitor the arriving unsocilited event and then notify this to all observers.
-// 
-
-#ifndef UNSOLICITEDEVENTMONITOR_H_
-#define UNSOLICITEDEVENTMONITOR_H_
-
-//system include
-
-//user include
-#include "atcommandcontrolbase.h"
-#include "globalphonemanager.h"
-#include "atunsolicitedobserver.h"
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-
-/**
- * This is a watcher class which mornitor the unsolicited events sent by baseband.
- * Notify all the interesting observers when an unsolicited event has been received
- */
-class CUnsolicitedEventMonitor : public CATCommandControlBase
-	{
-public:
-	/**
-	 * Factory function
-	 */
-	static CUnsolicitedEventMonitor* NewL(CGlobalPhonemanager& aPhoneglobals,
-						                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * Factory function
-	 */
-	static CUnsolicitedEventMonitor* NewLC(CGlobalPhonemanager& aPhoneglobals,
-			                               CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * Destructor
-	 */
-	virtual ~CUnsolicitedEventMonitor();
-	
-	/**
-	 * Add the observer which is interested in geting the notification of incoming unsolicited event  
-	 */
-	void AddUnsolicitedObserver(const MLtsyUnsolicitedCommandObserver* aObserver);
-	
-	/**
-	 * Remove the unsolicited observer
-	 */
-	void RemoveUnsolicitedObserver(const MLtsyUnsolicitedCommandObserver* aObserver);
-	
-	/**
-	 * Notify all the observers that the unsoclicited event is received
-	 */
-	void NotifyEveryObserver();
-	
-	/**
-	 * Start to mornitor
-	 */
-	void StartUnsolicitedObserver();
-	
-	/**
-	 * Stop to mornitor
-	 */
-	void StopUnsolicitedObserver();
-	
-protected:
-	/**
-	 * The constructor
-	 */
-	CUnsolicitedEventMonitor(CGlobalPhonemanager& aPhoneglobals,
-			                 CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * 2nd constructor
-	 */
-	void ConstructL();
-	
-public:
-	/**
-	 * Inherit from CAtCommandContolBase
-	 */
-	virtual void AtCommandExecuteComplete(TAtEventSource aEventSource, TInt aStatus);
-	
-private:
-	/**
-	 * Own
-	 * Store a list of observers
-	 */
-	RPointerArray <MLtsyUnsolicitedCommandObserver> iArray;
-	};
-
-#endif /*UNSOLICITEDEVENTMONITOR_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/inc/unsolicitedparams.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-// 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:
-// This define the unsolicted event data
-// 
-
-#ifndef UNSOLICITEDPARAMS_H_
-#define UNSOLICITEDPARAMS_H_
-
-#include <e32std.h>
-
-class TUnsolicitedParams
-	{
-public:
-	TUnsolicitedParams();
-	void InitParams();
-public:
-	typedef TPckgBuf<TUnsolicitedParams> TUnsolicitedParamsPckgBuf;
-public:
-	TInt iEvent;
-	TInt iIdx;
-	};
-
-#endif /*UNSOLICITEDPARAMS_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/activecommandstore.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-// 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:
-// This contains CActiveCommandStore which store one and only one solicited active at command and a number of active 
-// unsolicited at commands
-// 
-
-#include "activecommandstore.h"
-#include "mslogger.h"
-
-//const TInt KLtsyActiveCommandStoreReserve = 5;
-
-CActiveCommandStore* CActiveCommandStore::NewL()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CActiveCommandStore::NewL()"));
-	CActiveCommandStore *self = CActiveCommandStore::NewLC();
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-CActiveCommandStore* CActiveCommandStore::NewLC()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CActiveCommandStore::NewLC()"));
-	CActiveCommandStore *self = new (ELeave) CActiveCommandStore;
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CActiveCommandStore::~CActiveCommandStore()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CActiveCommandStore::~CActiveCommandStore()"));
-	iArray.Close();
-	}
-
-CActiveCommandStore::CActiveCommandStore()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CActiveCommandStore::CActiveCommandStore()"));
-	}
-
-void CActiveCommandStore::ConstructL()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CActiveCommandStore::ConstructL()"));
-	iArray.Reset();
-	iArray.AppendL(NULL);
-	//iArray.ReserveL(KLtsyActiveCommandStoreReserve);
-	LOGTEXT2(_L8("[Ltsy] Active Store Count = %d"), iArray.Count());
-	}
-
-TInt CActiveCommandStore::AddUnsolicitedAtCommand(CAtCommandBase *aAtCommand)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CActiveCommandStore::AddUnsolicitedAtCommand()"));
-	if (aAtCommand == NULL)
-		{
-		return KErrArgument;
-		}
-	
-	TInt nRes(KErrNone);
-	nRes = iArray.Append(aAtCommand);
-	LOGTEXT2(_L8("[Ltsy] Active Store Count = %d"), iArray.Count());
-	return nRes;	
-	}
-
-TInt CActiveCommandStore::AddSolicitedAtCommand(CAtCommandBase *aAtCommand)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CActiveCommandStore::AddSolicitedAtCommand()"));
-	if (aAtCommand == NULL)
-		{
-		return KErrArgument;
-		}
-	
-	iArray[0] = aAtCommand;
-	LOGTEXT2(_L8("[Ltsy] Active Store Count = %d"), iArray.Count());
-	return KErrNone;	
-	}
-
-TInt CActiveCommandStore::RemoveActiveAtCommand(const CAtCommandBase *aAtCommand)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CActiveCommandStore::RemoveActiveAtCommand()"));
-	if (aAtCommand == NULL) 
-		{
-		return KErrArgument;
-		}
-	
-	TInt nFind = iArray.Find(aAtCommand);
-	if (nFind != KErrNotFound)
-		{
-		if (nFind == 0)
-			{
-			iArray[0] = NULL;
-			}
-		else
-			{
-			iArray.Remove(nFind);
-			}
-		return KErrNone;
-		}
-	else
-		{
-		return KErrNotFound;
-		}
-	}
-
-RPointerArray<CAtCommandBase>& CActiveCommandStore::GetActiveCommandArray()
-	{
-	return iArray;
-	}
-
-//End of file
-
-
-
-
-
-
-
-
-
-
-

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/asynchelperrequest.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-// 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:
-// This contains CAsyncHelperRequest which is a helper request which callback to ctsy asynchronously 
-// 
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <rmmcustomapi.h> 
-#include "asynchelperrequest.h"
-#include <ctsy/ltsy/mltsydispatchphoneinterface.h>
-#include "globalphonemanager.h"
-#include "tsyconfg.h"
-#include "mslogger.h"
-
-// Class CAsyncHelperRequest
-// ---------------------------------------------------------------------------
-// CAsyncHelperRequest::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAsyncHelperRequest* CAsyncHelperRequest::NewL(CGlobalPhonemanager& aGloblePhone,
-		                           CCtsyDispatcherCallback& aCallBack,
-		                           TInt aPriority )
-	{
-	CAsyncHelperRequest* newTimer=new(ELeave) CAsyncHelperRequest(aGloblePhone,aCallBack,aPriority);
-	CleanupStack::PushL(newTimer);
-	newTimer->ConstructL();
-	CleanupStack::Pop();
-	return newTimer;
-	}
-// ---------------------------------------------------------------------------
-// CAsyncHelperRequest::CAsyncHelperRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAsyncHelperRequest ::CAsyncHelperRequest(CGlobalPhonemanager& aGloblePhone,
-		                      CCtsyDispatcherCallback& aCallBack,
-		                      TInt aPriority)
-	: CTimer(aPriority),iCallBack(aCallBack),iGloblePhone(aGloblePhone)
-	{
-	CActiveScheduler::Add(this);
-	iRequestId = 0;
-	iReqArray.Reset();
-	}
-// ---------------------------------------------------------------------------
-// CAsyncHelperRequest::~CAsyncHelperRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAsyncHelperRequest::~CAsyncHelperRequest()
-	{
-	Cancel();
-	}
-// ---------------------------------------------------------------------------
-// CAsyncHelperRequest::SetRequestId
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAsyncHelperRequest::SetRequestId(const TInt aIpc)
-	{
-	TInt count = iReqArray.Count();
-	if((count > 0)||IsActive())
-		{
-		iReqArray.Append(aIpc);
-		}
-	else
-		{
-		iRequestId = aIpc;
-		StartTimer();
-		}
-	}
-// ---------------------------------------------------------------------------
-// CAsyncHelperRequest::RunL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAsyncHelperRequest::RunL()
-	{
-	switch(iRequestId)
-		{
-		case MLtsyDispatchPhoneGetNetworkMode::KLtsyDispatchPhoneGetNetworkModeApiId:
-			iCallBack.CallbackPhoneGetNetworkModeComp(KErrNone,RMobilePhone::ENetworkModeGsm);
-			break;
-		case MLtsyDispatchPhoneGetCurrentSystemNetworkModes::KLtsyDispatchPhoneGetCurrentSystemNetworkModesApiId:
-			iCallBack.CallbackPhoneGetCurrentSystemNetworkModesComp(KErrNone,RMmCustomAPI::KCapsNetworkModeGsm);
-			break;
-		case MLtsyDispatchPhoneGetNitzInfo::KLtsyDispatchPhoneGetNitzInfoApiId:
-			iCallBack.CallbackPhoneGetNitzInfoComp(KErrNone,iGloblePhone.iPhoneStatus.iMobilePhoneNITZ);
-			break;
-		case MLtsyDispatchPhoneSimRefreshRegister::KLtsyDispatchPhoneSimRefreshRegisterApiId:
-			iCallBack.CallbackPhoneSimRefreshRegisterComp(KErrNone);
-			break;
-		case MLtsyDispatchPacketServicesSetDefaultPdpContextGprsParams::KLtsyDispatchPacketServicesSetDefaultPdpContextGprsParamsApiId:
-			iCallBack.CallbackPacketServicesSetDefaultPdpContextParamsComp(KErrNone);
-			break;
-		case MLtsyDispatchPacketServicesGetStaticCapabilities::KLtsyDispatchPacketServicesGetStaticCapabilitiesApiId:
-			TUint aCaps ;
-			aCaps=RPacketService::KCapsSetDefaultContextSupported;
-			aCaps|=RPacketService::KCapsMSClassSupported;
-			iCallBack.CallbackPacketServicesGetStaticCapabilitiesComp(KErrNone,aCaps);
-			break;
-		case MLtsyDispatchPacketServicesGetMaxNoMonitoredServiceLists::KLtsyDispatchPacketServicesGetMaxNoMonitoredServiceListsApiId:
-			iCallBack.CallbackPacketServicesGetMaxNoMonitoredServiceListsComp(KErrNone,1);
-			break;
-		case MLtsyDispatchPacketServicesGetMaxNoActiveServices::KLtsyDispatchPacketServicesGetMaxNoActiveServicesApiId:
-			iCallBack.CallbackPacketServicesGetMaxNoActiveServicesComp(KErrNone,1);
-			break;
-		case MLtsyDispatchPacketServicesGetStatus::KLtsyDispatchPacketServicesGetStatusApiId:
-			iCallBack.CallbackPacketServicesGetStatusComp(KErrNone,iGloblePhone.iPhoneStatus.iPacketStatus,EFalse);
-			break;
-		case MLtsyDispatchPhoneGetDetectedNetworksCancel::KLtsyDispatchPhoneGetDetectedNetworksCancelApiId:
-			iCallBack.CallbackPhoneGetDetectedNetworksCancelComp(KErrNone);
-			break;
-		case MLtsyDispatchPhoneSelectNetworkCancel::KLtsyDispatchPhoneSelectNetworkCancelApiId:
-			iCallBack.CallbackPhoneSelectNetworkCancelComp(KErrGeneral);
-			break;
-		case MLtsyDispatchSmsSetMoSmsBearer::KLtsyDispatchSmsSetMoSmsBearerApiId:
-			iCallBack.CallbackSmsSetMoSmsBearerComp(KErrNotSupported);
-			break;	
-		case MLtsyDispatchPacketServicesGetPacketAttachMode::KLtsyDispatchPacketServicesGetPacketAttachModeApiId:
-		    iCallBack.CallbackPacketServicesGetPacketAttachModeComp(KErrNone, RPacketService::EAttachWhenNeeded);
-		    break;
-		default:
-			break;
-		}
-	TInt count = iReqArray.Count();
-	if(count > 0)
-		{
-		iRequestId = iReqArray[0];
-		iReqArray.Remove(0);
-		StartTimer();
-		}
-	}
-// ---------------------------------------------------------------------------
-// CAsyncHelperRequest::StartTimer
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAsyncHelperRequest::StartTimer(const TTimeIntervalMicroSeconds32 aTimeout)
-	{
-	if (IsActive())
-		Cancel();
-	After(aTimeout);
-	}
-// ---------------------------------------------------------------------------
-// CAsyncHelperRequest::StopTimer
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAsyncHelperRequest::StopTimer()
-	{
-	Cancel();
-	}
-
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/atcommandbase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,333 +0,0 @@
-// 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:
-// @file atcommandbase.cpp
-// This contains CAtCommandBase which is the base class for AT command
-// 
-
-// user include
-#include "mslogger.h"
-#include "atcommandbase.h"
-#include "commengine.h"
-#include "atmanager.h"
-#include "stringparser.h"
-#include "atcommandexecuteobserver.h"
-#include "activecommandstore.h"
-#include "atswitchonlinemode.h"
-
-// ---------------------------------------------------------------------------
-// CAtCommandBase::~CAtCommandBase
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtCommandBase::~CAtCommandBase()
-	{
-	iExpectingArray.Close();
-	
-	delete iParser;
-	iParser = NULL;
-	
-	if(iATSwitchOnLineMode)
-		{
-		delete iATSwitchOnLineMode;
-		iATSwitchOnLineMode = NULL;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtCommandBase::AtType
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TLtsyATCommandType CAtCommandBase::AtType()
-	{
-	return iAtType;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtCommandBase::CAtCommandBase
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtCommandBase::CAtCommandBase(CGlobalPhonemanager& aGloblePhone, 
-	                           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                               :CRequestBase(aGloblePhone),
-                               iCtsyDispatcherCallback(aCtsyDispatcherCallback)
-					  
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CAtCommandBase::CAtCommandBase()"));
-	
-	iAtType = ELtsyAt_User_NotUse;
-	
-	iWriteTimeOut = KLtsyDefaultWriteTimeOut;
-	iReadTimeOut = KLtsyDefaultReadTimeOut;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtCommandBase::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtCommandBase::ConstructL()
-	{
-	iParser = new (ELeave) CRespondBufParser;
-	iAtCommandObserver = NULL;
-	//Add OK and ERROR expecting string
-	iExpectingArray.AppendL(KLtsyOkString());
-	iExpectingArray.AppendL(KLtsyErrorString());
-	iExpectingArray.AppendL(KLtsyCmeErrorString());
-	
-	}
-
-// ---------------------------------------------------------------------------
-// CAtCommandBase::AddExpectStringL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtCommandBase::AddExpectStringL(const TDesC8& aExpectStr)
-	{
-	iExpectingArray.AppendL(aExpectStr);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtCommandBase::RemoveAllExpectString
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-void CAtCommandBase::RemoveAllExpectString()
-	{
-	iExpectingArray.Reset();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtCommandBase::RemoveExpectString
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-void CAtCommandBase::RemoveExpectString(const TDesC8& aExpectStr)
-	{
-	TBool found(ETrue);
-	TInt count = iExpectingArray.Count();
-	
-	for (TInt n = 0; found && n < count; n++)
-		{
-		if (iExpectingArray[n].Compare(aExpectStr) == 0)
-			{
-			iExpectingArray.Remove(n);
-			iExpectingArray.Compress();
-			found = EFalse;
-			}
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtCommandBase::MatchExpectString
-// other items were commented in a header 
-// ---------------------------------------------------------------------------		
-TBool CAtCommandBase::MatchExpectString(const TDesC8& aReadLine)
-	{
-	TInt count = iExpectingArray.Count();
-	LOGTEXT2(_L8("[Ltsy] count = %d"), count);
-	for (TInt n = 0; n < count; n++)
-		{
-		if (aReadLine.Match(iExpectingArray[n]) == 0)
-			{
-			return ETrue;
-			}
-		}
-	if(aReadLine.Length()< KLtsyGenericBufferSize)
-		{
-		iNoMatchedLastLine.Copy(aReadLine);
-		}
-	return EFalse;
-	}
-// ---------------------------------------------------------------------------
-// CAtCommandBase::SetAtCommandObserver
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-void CAtCommandBase::SetAtCommandObserver(MAtCommandExecuteObserver* aAtCommandObserver)
-	{
-	iAtCommandObserver = aAtCommandObserver;
-	}
-// ---------------------------------------------------------------------------
-// CAtCommandBase::RemoveAtCommandObserver
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-void CAtCommandBase::RemoveAtCommandObserver()
-	{
-	iAtCommandObserver = NULL;
-	}
-// ---------------------------------------------------------------------------
-// CAtCommandBase::GenericEventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------		
-void CAtCommandBase::GenericEventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CAtCommandBase::GenericEventSignal()"));
-	if(iAtCommandObserver)
-		{
-		iAtCommandObserver->AtCommandExecuteComplete(aEventSource, aStatus);
-		}
-	else
-		{
-		EventSignal(aEventSource, aStatus);
-		}
-	if((aEventSource == EWriteCompletion) && (aStatus == KErrNone))
-	    {
-	    StartTimer(iReadTimeOut);
-		}
-	LOGTEXT(_L8("[Ltsy] End CAtCommandBase::GenericEventSignal()"));
-	}
-// ---------------------------------------------------------------------------
-// CAtCommandBase::Write
-// other items were commented in a header
-// ---------------------------------------------------------------------------		
-void CAtCommandBase::Write()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CAtCommandBase::Write()"));
-	if(iPhoneGlobals.iPhoneStatus.iMode==RPhone::EModeOnlineData)
-		{
-		if(!iATSwitchOnLineMode)
-			{
-			TRAPD(ret,iATSwitchOnLineMode = CATSwitchOnLineMode::NewL(iPhoneGlobals,iCtsyDispatcherCallback));
-			if(ret!=KErrNone)
-				{
-				EventSignal(EWriteCompletion,ret);
-				return;
-				}
-			}
-		iATSwitchOnLineMode->StartSwitchOnLineMode(this,iAtCommandObserver);
-		}
-	else
-		{
-		ClearBuffer();
-		iPhoneGlobals.iAtManager->SetSolicitedAtCommand(this);
-		iPhoneGlobals.iCommEngine->CommWrite(iTxBuffer);	
-		StartTimer(iWriteTimeOut);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtCommandBase::SetTimeOut
-// other items were commented in a header
-// ---------------------------------------------------------------------------		
-void CAtCommandBase::SetTimeOut(TInt aWriteTimeOut, TInt aReadTimeOut)
-	{
-	iWriteTimeOut = aWriteTimeOut;
-	iReadTimeOut = aReadTimeOut;
-	}
-
-//---------------------------------------------------------------------------
-// CAtCommandBase::SetTimeOut
-// other items were commented in a header
-// ---------------------------------------------------------------------------		
-void CAtCommandBase::StartTimer(const TInt aTimeOut)
-	{
-	iPhoneGlobals.iCommEngine->StartTimer(aTimeOut);
-	}
-
-//---------------------------------------------------------------------------
-// CAtCommandBase::StopTimer
-// other items were commented in a header
-// ---------------------------------------------------------------------------		
-void CAtCommandBase::StopTimer()
-	{
-	iPhoneGlobals.iCommEngine->StopTimer();
-	}
-
-//---------------------------------------------------------------------------
-// CAtCommandBase::Buffer
-// other items were commented in a header
-// ---------------------------------------------------------------------------		
-TPtrC8 CAtCommandBase::Buffer() const
-	{
-	return iPhoneGlobals.iCommEngine->GetStringParse()->Buffer();
-	}
-
-//---------------------------------------------------------------------------
-// CAtCommandBase::CurrentLine
-// other items were commented in a header
-// ---------------------------------------------------------------------------		
-TPtrC8 CAtCommandBase::CurrentLine() const
-	{
-	return iPhoneGlobals.iCommEngine->GetStringParse()->CurrentLine();
-	}
-//---------------------------------------------------------------------------
-// CAtCommandBase::PrecedingLine
-// other items were commented in a header
-// ---------------------------------------------------------------------------		
-TPtrC8 CAtCommandBase::PrecedingLine() const
-	{
-	return iNoMatchedLastLine;
-	}
-//---------------------------------------------------------------------------
-// CAtCommandBase::ClearBuffer
-// other items were commented in a header
-// ---------------------------------------------------------------------------		
-void CAtCommandBase::ClearBuffer()
-	{
-	iPhoneGlobals.iCommEngine->GetStringParse()->ClearBuffer();
-	}
-
-//---------------------------------------------------------------------------
-// CAtCommandBase::ClearCurrentLine
-// other items were commented in a header
-// ---------------------------------------------------------------------------		
-void CAtCommandBase::ClearCurrentLine()
-	{
-	iPhoneGlobals.iCommEngine->GetStringParse()->ClearCurrentLine();	
-	}
-
-//---------------------------------------------------------------------------
-// CAtCommandBase::Complete
-// other items were commented in a header
-// ---------------------------------------------------------------------------		
-void CAtCommandBase::Complete()
-    {
-    (iPhoneGlobals.iAtManager->GetActiveCommandStore())->RemoveActiveAtCommand(this);	
-	StopTimer();
-	ClearBuffer();
-	}
-
-//---------------------------------------------------------------------------
-// CAtCommandBase::CancelCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-void CAtCommandBase::CancelCommand()
-	{
-	
-	}
-
-//---------------------------------------------------------------------------
-// CAtCommandBase::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------		
-void CAtCommandBase::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CAtCommandBase::ParseResponseL()"));
-	}
-
-void CAtCommandBase::EventSignal(TAtEventSource /*aEventSource*/, TInt /*aStatus*/)
-	{
-	
-	}
-//---------------------------------------------------------------------------
-// CAtCommandBase::AddUnsolicitedAtCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-void CAtCommandBase::AddUnsolicitedAtCommand()
-	{
-	iPhoneGlobals.iAtManager->GetActiveCommandStore()->AddUnsolicitedAtCommand(this);
-	}
-//---------------------------------------------------------------------------
-// CAtCommandBase::RemoveAtCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-void CAtCommandBase::RemoveAtCommand()
-	{
-	iPhoneGlobals.iAtManager->GetActiveCommandStore()->RemoveActiveAtCommand(this);
-	}
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/atcommandcontrolbase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-// 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:
-// This contains CATCommandControlBase which is composite class of a number classes
-// 
-
-#include "mslogger.h"
-#include "atcommandbase.h"
-#include "atcommandcontrolbase.h"
-
-
-CATCommandControlBase::CATCommandControlBase(CGlobalPhonemanager& aGloblePhone, 
-                                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                             :CRequestBase(aGloblePhone),
-                                             iCtsyDispatcherCallback(aCtsyDispatcherCallback)
-	{
-//	LOGTEXT(_L8("[Ltsy] Starting CATCommandControlBase::CATCommandControlBase()"));
-	iIsDel = EAutoDelete;
-	}
-
-CATCommandControlBase::~CATCommandControlBase()
-	{
-//	LOGTEXT(_L8("[Ltsy] Starting CATCommandControlBase::~CATCommandControlBase()"));
-	if (EAutoDelete == iIsDel)
-		{
-		CleanAndDeleteAllAtCommands();
-		}
-	
-	iArray.Close();
-	}
-
-TInt CATCommandControlBase::AddAtCommand(const CAtCommandBase* aAtCommand)
-	{
-//	LOGTEXT(_L8("[Ltsy] Starting CATCommandControlBase::AddAtCommand()"));
-	if (NULL == aAtCommand)
-		{
-		return KErrArgument;
-		}
-	
-	TInt nRes = iArray.Append(aAtCommand);
-	return nRes;
-	}
-
-void CATCommandControlBase::RemoveAtCommand(const CAtCommandBase* aAtCommand)
-	{	
-	if (NULL != aAtCommand)
-		{
-		TInt nFind = iArray.Find(aAtCommand);
-		if (nFind != KErrNotFound)
-			{
-			iArray.Remove(nFind);
-			iArray.Compress();
-			}
-		}
-	}
-
-void CATCommandControlBase::RemoveAtCommandByAtType(TLtsyATCommandType aType)
-	{
-	TBool bFlag(ETrue);
-	
-	for (TInt n = 0; bFlag && n < iArray.Count(); n++)
-		{
-		if (iArray[n]->AtType() == aType)
-			{
-			iArray.Remove(n);
-			iArray.Compress();
-			bFlag = EFalse;
-			}
-		}
-	}
-
-CAtCommandBase& CATCommandControlBase::GetAtCommandByAtTypeL(TLtsyATCommandType aType)
-	{
-	TBool bFlag(ETrue);
-	CAtCommandBase *cAtBase(NULL);
-	
-	for (TInt n = 0; bFlag && n < iArray.Count(); n++)
-		{
-		if (iArray[n]->AtType() == aType)
-			{
-			cAtBase = iArray[n];
-			}
-		}
-	
-	User::LeaveIfNull(cAtBase);
-	
-	return (*cAtBase);
-	}
-
-
-void CATCommandControlBase::SetIsAutoDelete(TAutoDeleteAtCommand aIsDel)
-	{
-	iIsDel = aIsDel;
-	}
-
-CATCommandControlBase::TAutoDeleteAtCommand CATCommandControlBase::GetIsAutoDelete()
-	{
-	return iIsDel;
-	}
-
-void CATCommandControlBase::CleanAllAtCommands()
-	{
-	iArray.Reset();
-	}
-
-void CATCommandControlBase::CleanAndDeleteAllAtCommands()
-	{
-	iArray.ResetAndDestroy();
-	}
-// End of file
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/athelpercommand.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-// 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:
-// This contains CATHelperCommand which is composite class of a number classes
-// 
-
-#include "athelpercommand.h"
-#include "mslogger.h"
-
-// Class CATHelperCommand
-// ---------------------------------------------------------------------------
-// CATHelperCommand::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATHelperCommand* CATHelperCommand::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                       CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATHelperCommand* self = new(ELeave) CATHelperCommand(aGloblePhone,
-			                                                aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATHelperCommand::CATHelperCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATHelperCommand::CATHelperCommand(CGlobalPhonemanager& aGloblePhone, 
-	                                 CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATHelperCommand::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATHelperCommand::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-// ---------------------------------------------------------------------------
-// CATHelperCommand::~CATHelperCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATHelperCommand::~CATHelperCommand()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATHelperCommand::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATHelperCommand::StartRequest()
-	{
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATHelperCommand::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATHelperCommand::ExecuteCommand()
-	{
-	iTxBuffer.Copy(iATBuffer);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATHelperCommand::CancelCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATHelperCommand::CancelCommand()
-	{	
-	}
-// ---------------------------------------------------------------------------
-// CATHelperCommand::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATHelperCommand::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-// ---------------------------------------------------------------------------
-// CATHelperCommand::GetErrorValue
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATHelperCommand::GetErrorValue()
-	{
-	return iError;
-	}
-// ---------------------------------------------------------------------------
-// CATHelperCommand::SetAtCommandString
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATHelperCommand::SetAtCommandString(const TDesC8& aATString)
-	{
-	iATBuffer.Copy(aATString);
-	}
-// ---------------------------------------------------------------------------
-// CATHelperCommand::StartATType
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATHelperCommand::SetATType(TLtsyATCommandType aATType)
-	{
-	iAtType = aATType;
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/atmanager.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-// 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:
-// 
-// 
-
-// use include
-#include "atmanager.h"
-#include "activecommandstore.h"
-#include "mslogger.h"
-
-// ---------------------------------------------------------------------------
-// CAtManager::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-CAtManager* CAtManager::NewL()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CAtManager::NewL()"));
-	CAtManager *self = CAtManager::NewLC();
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtManager::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-CAtManager* CAtManager::NewLC()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CAtManager::NewLC()"));
-	CAtManager *self = new (ELeave) CAtManager;
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtManager::~CAtManager
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-CAtManager::~CAtManager()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CAtManager::~CAtManager()"));
-	
-	delete iActiveCommandStore;
-	iActiveCommandStore = NULL;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtManager::CAtManager
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-CAtManager::CAtManager()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CAtManager::CAtManager()"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtManager::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-void CAtManager::ConstructL()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CAtManager::ConstructL()"));
-	iActiveCommandStore = CActiveCommandStore::NewL();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtManager::SetSolicitedAtCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-void CAtManager::SetSolicitedAtCommand(CAtCommandBase* aSolicitedCommand)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CAtManager::SetSolicitedAtCommand()"));
-	iSolicitedCommand = aSolicitedCommand;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtManager::GetActiveCommandStore
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-CActiveCommandStore* CAtManager::GetActiveCommandStore() const
-	{
-	return iActiveCommandStore;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtManager::ReadOrWriteComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-void CAtManager::ReadOrWriteComplete(TAtEventSource aEvent, TInt aStatus)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CAtManager::AtCommandReadOrWriteComplete()"));
-	LOGTEXT3(_L8("[Ltsy] aEvent = %d, aStatus = %d"), aEvent, aStatus);
-	
-    if (aEvent == EWriteCompletion)
-		{
-		if (iSolicitedCommand != NULL)
-			{
-			if(aStatus == KErrNone)
-				{
-				// add this active AT Command in the first place of the store
-				iActiveCommandStore->AddSolicitedAtCommand(iSolicitedCommand);
-				}
-			else
-				{
-				iSolicitedCommand = NULL;
-				}
-			
-			iSolicitedCommand->GenericEventSignal(aEvent, aStatus);
-			}
-		}
-    else if (aEvent == EReadCompletion)
-		{
-		if (aStatus != KErrNone)
-			{
-			// check if there is active solicited AT command in the AT active command store
-			if((iActiveCommandStore->GetActiveCommandArray())[0] != NULL)
-	          {
-	          iSolicitedCommand->GenericEventSignal(aEvent, aStatus);
-	          }
-			
-			iSolicitedCommand = NULL;
-			}
-		}
-    else if(aEvent == ETimeoutCompletion)
-    	{
-		if(iSolicitedCommand)
-			{
-			iSolicitedCommand->GenericEventSignal(ETimeoutCompletion, aStatus);
-			iSolicitedCommand = NULL;
-			}
-    	}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtManager::NotifyOneLineFoundL
-// other items were commented in a header
-// ---------------------------------------------------------------------------	
-TBool CAtManager::NotifyOneLineFoundL(TInt aStatus, const TDesC8& aLineBuf)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CAtManager::NotifyOneLineFoundL()"));
-		
-	RPointerArray<CAtCommandBase>& atCommands = iActiveCommandStore->GetActiveCommandArray();
-	TInt count = atCommands.Count();
-	LOGTEXT2(_L8("[Ltsy] count = %d"), count);
-	
-	TBool atCommandFound(EFalse);
-	
-	for (TInt n = 0; !atCommandFound && n < count; n++)
-		{
-		CAtCommandBase* atCommand = atCommands[n];
-		if ((atCommand != NULL) && atCommand->MatchExpectString(aLineBuf))
-			{
-			atCommandFound = ETrue;
-			atCommand->ParseResponseL(aLineBuf);
-			atCommand->GenericEventSignal(EReadCompletion, aStatus);
-			}
-		}
-	LOGTEXT(_L8("[Ltsy] End CAtManager::NotifyOneLineFoundL()"));
-	return ETrue;
-	}
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/atswitchonlinemode.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,227 +0,0 @@
-// 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:
-// This contains CATSwitchOnLineMode which switch to online mode
-// 
-
-#include "atswitchonlinemode.h"
-#include "mslogger.h"
-#include "commengine.h"
-#include "tsyconfg.h"
-
-// Class CATSwitchOnLineMode
-// ---------------------------------------------------------------------------
-// CATSwitchOnLineMode::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATSwitchOnLineMode* CATSwitchOnLineMode::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATSwitchOnLineMode* self = new(ELeave) CATSwitchOnLineMode(aGloblePhone,
-			                                                    aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATSwitchOnLineMode::CATSwitchOnLineMode
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATSwitchOnLineMode::CATSwitchOnLineMode(CGlobalPhonemanager& aGloblePhone, 
-	                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATSwitchOnLineMode::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSwitchOnLineMode::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	RemoveAllExpectString();
-	AddExpectStringL(KLtsyNoCarrierString());
-	iWhichTimer = ETimerNone;
-	iCallbackTimer = CCallbackTimer::NewL(*this);
-	}
-// ---------------------------------------------------------------------------
-// CATSwitchOnLineMode::~CATSwitchOnLineMode
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATSwitchOnLineMode::~CATSwitchOnLineMode()
-	{
-	if(iCallbackTimer)
-		{
-		iCallbackTimer->Cancel();
-		delete iCallbackTimer;
-		iCallbackTimer = NULL;
-		}
-	}
-// ---------------------------------------------------------------------------
-// CATSwitchOnLineMode::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSwitchOnLineMode::ExecuteCommand()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATSwitchOnLineMode::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSwitchOnLineMode::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if(CurrentLine().Match(KLtsyNoCarrierString) == 0)
-		{
-		iError = KErrNone;
-		}
-	}
-// ---------------------------------------------------------------------------
-// CATSwitchOnLineMode::StartSwitchOnLineModeL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSwitchOnLineMode::StartSwitchOnLineMode(CAtCommandBase* aAtCommandBase,
-		                  MAtCommandExecuteObserver* aAtCommandObserver)
-	{
-	iAtCommandBase = aAtCommandBase;
-	iAtCommandObserver = aAtCommandObserver;
-	RemoveAtCommandObserver();
-	iPhoneGlobals.iCommEngine->CommCancel();		// This required to avoid a panic in C32 when we call iIo->ConfigurePort
-	TCommConfig configPckg;
-	TInt ret = KErrNone;
-	ret = iPhoneGlobals.iConfiguration->PortConfig(configPckg,EConfigTypeHangUp);	
-	if (ret==KErrNone)
-		ret = iPhoneGlobals.iCommEngine->ConfigurePort(configPckg);		
-	if (ret!=KErrNone)
-		{
-		iAtCommandBase->EventSignal(EWriteCompletion,ret);
-		}
-	iPhoneGlobals.iCommEngine->DropDtr();
-	iWhichTimer = ETimerDrop;
-	StartTimer(500000L);
-	}
-// ---------------------------------------------------------------------------
-// CATSwitchOnLineMode::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSwitchOnLineMode::EventSignal(TAtEventSource /*aEventSource*/, TInt aStatus)
-	{
-	if(KErrNone ==aStatus)
-		{
-		aStatus = iError;
-		}
-	CAtCommandBase::Complete();
-	if(KErrNone ==aStatus)
-		{
-		//iPhoneGlobals.iPhoneStatus.iMode = RPhone::EModeOnlineCommand;
-		Disable();
-		StartTimer(1000000L);
-		iWhichTimer = ETimerWait;
-		}
-	else
-		{
-		Disable();
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iAtCommandBase->EventSignal(EWriteCompletion,KErrNotReady);
-		}
-	
-	}
-// ---------------------------------------------------------------------------
-// CATSwitchOnLineMode::Enable
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSwitchOnLineMode::Enable()
-	{
-	AddUnsolicitedAtCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATSwitchOnLineMode::Disable
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSwitchOnLineMode::Disable()
-	{
-	RemoveAtCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATSwitchOnLineMode::StartTimer
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSwitchOnLineMode::StartTimer(const TInt aTimeout)
-	{
-	if (iCallbackTimer->IsActive())
-		iCallbackTimer->Cancel();
-	iCallbackTimer->After(aTimeout);
-	}
-/**
- * 
- * 
- */
-void CATSwitchOnLineMode::TimerRun(TInt aError)
-    {
-	if(aError == KErrNone)
-	    {
-		switch(iWhichTimer)
-			{
-			case ETimerDrop:
-			    LOGTEXT(_L8("[Ltsy] CATSwitchOnLineMode::ETimerDrop time out."));
-				iPhoneGlobals.iCommEngine->RaiseDTR();
-				iPhoneGlobals.iPhoneStatus.iMode = RPhone::EModeOnlineCommand;
-				iPhoneGlobals.iEventSignalActive = ETrue;
-				iWhichTimer = ETimerRaise;
-				StartTimer(1000000L);
-				break;
-			case ETimerRaise:
-                LOGTEXT(_L8("[Ltsy] CATSwitchOnLineMode::ETimerRaise time out."));
-				iPhoneGlobals.iCommEngine->ResetBuffers();
-				iWhichTimer = ETimerReset;
-				StartTimer(1000000L);
-				break;
-			case ETimerReset:
-                LOGTEXT(_L8("[Ltsy] CATSwitchOnLineMode::ETimerReset time out."));
-				ClearBuffer();
-				iPhoneGlobals.iCommEngine->Read();
-				iWhichTimer = ETimerRead;
-				Enable();
-				StartTimer(1000000L);
-				break;
-			case ETimerRead:
-                LOGTEXT(_L8("[Ltsy] CATSwitchOnLineMode::ETimerRead time out."));
-				StartTimer(1000000L);
-				iWhichTimer = ETimerWait;
-				break;
-			case ETimerWait:
-                LOGTEXT(_L8("[Ltsy] CATSwitchOnLineMode::ETimerWait time out."));
-			    if(iAtCommandObserver)
-			    	{
-			    	SetAtCommandObserver(iAtCommandObserver);
-			    	}
-			    Disable();
-			    iAtCommandBase->StartRequest(); 
-			    iWhichTimer = ETimerNone;
-				break;
-			default:
-				Disable();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				iAtCommandBase->EventSignal(EWriteCompletion,KErrNotReady);
-				break;
-			}
-		}
-	else
-		{
-		Disable();
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iAtCommandBase->EventSignal(EWriteCompletion,KErrNotReady);
-		}
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/atunsolicited.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-// 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:
-// This contains CATUnsolicited
-// 
-
-//system include
-
-//user include
-#include "atunsolicited.h"
-
-// ---------------------------------------------------------------------------
-// CATUnsolicited::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATUnsolicited* CATUnsolicited::NewL(CGlobalPhonemanager& aGloblePhone,
-		                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATUnsolicited* self = CATUnsolicited::NewLC(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CATUnsolicited::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATUnsolicited* CATUnsolicited::NewLC(CGlobalPhonemanager& aGloblePhone,
-		                              CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATUnsolicited* self = new (ELeave) CATUnsolicited(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CATUnsolicited::~CATUnsolicited
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATUnsolicited::~CATUnsolicited()
-	{
-	
-	}
-
-// ---------------------------------------------------------------------------
-// CATUnsolicited::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATUnsolicited::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	RemoveAllExpectString();
-	AddExpectStringL(KLtsyGeneralIndMatchString);
-	}
-
-// ---------------------------------------------------------------------------
-// CATUnsolicited::CATUnsolicited
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATUnsolicited::CATUnsolicited(CGlobalPhonemanager& aGloblePhone,
-		                       CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-							   :CAtCommandBase(aGloblePhone, aCtsyDispatcherCallback)
-	{
-	iAtType = ELtsyAT_General_WIND;
-	iResult = KErrNone;
-	}
-
-// ---------------------------------------------------------------------------
-// CATUnsolicited::GetParserResult
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATUnsolicited::GetParserResult() const
-	{
-	return iResult;
-	}
-
-// ---------------------------------------------------------------------------
-//  CATUnsolicited::GetUnsolicitedParams
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-const TDesC8& CATUnsolicited::GetUnsolicitedParams() const
-	{
-	return iPckgBuf;
-	}
-
-// ---------------------------------------------------------------------------
-// CATUnsolicited::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATUnsolicited::ParseResponseL(const TDesC8& aResponseBuf)
-	{
-	iResult = KErrNone;
-	
-	RArray<TPtrC8> rArray;
-	CleanupClosePushL(rArray);
-	
-	iParser->ParseRespondedBuffer(rArray, aResponseBuf);
-	
-	TUnsolicitedParams& tParams(iPckgBuf());
-	tParams.InitParams();
-	
-	TInt nCount = rArray.Count();
-	if (nCount <= 1)
-		{
-		iResult = KErrGeneral;
-		CleanupStack::PopAndDestroy(1);
-		return;
-		}
-	
-	if (nCount >= 2)
-		{
-		TInt tVal(0);
-		TLex8 tLex(rArray[1]);
-		TInt nRes = tLex.Val(tVal);
-		if (nRes == KErrNone)
-			{
-			tParams.iEvent = tVal;
-			}
-		else
-			{
-			iResult = nRes;
-			CleanupStack::PopAndDestroy(1);
-			return;
-			}
-		}
-	
-	if (nCount == 3 && tParams.iEvent != 10 && tParams.iEvent != 11)
-		{
-		TInt tVal(0);
-		TLex8 tLex(rArray[2]);
-		TInt nRes = tLex.Val(tVal);
-		if (nRes == KErrNone)
-			{
-			tParams.iIdx = tVal;
-			}
-		else
-			{
-			iResult = nRes;
-			CleanupStack::PopAndDestroy(1);	
-			return;
-			}
-		}
-	CleanupStack::PopAndDestroy(1);	
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/globalphonemanager.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,247 +0,0 @@
-// 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:
-// @file globlephonemanager.cpp
-// This contains CGlobalPhonemanager which manage the global phone status and call info manager.
-// 
-
-// user include
-#include "globalphonemanager.h"
-#include "atmanager.h"
-#include "commengine.h"
-#include "tsyconfg.h"
-#include "mslogger.h"
-#include "requestbase.h"
-#include "ltsycallinformationmanager.h"
-#include "athangupcommandrecords.h"
-
-#if defined (__WINS__)
-_LIT(KPDDName,"ECDRV");
-_LIT(KLDDName,"ECOMM");
-#else
-_LIT(KPDDName,"EUART1");
-#if defined (PDD2_NAME)
-_LIT(KPDD2Name,"EUART2");
-#endif
-_LIT(KLDDName,"ECOMM");
-#endif
-
-//define constant value
-const TInt KLtsyDefaultSecondsToWaitForCarrier=40;
-const TInt KLtsyCommReadPriority = 10;
-const TInt KLtsyCommWritePriority = 20;
-const TInt KLtsyChatBufferSize = 400;
-
-// ---------------------------------------------------------------------------
-// CGlobalPhonemanager::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGlobalPhonemanager* CGlobalPhonemanager::NewL()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CGlobalPhonemanager::NewL()"));
-	
-	CGlobalPhonemanager *self = CGlobalPhonemanager::NewLC();
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CGlobalPhonemanager::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGlobalPhonemanager* CGlobalPhonemanager::NewLC()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CGlobalPhonemanager::NewLC()"));
-	
-	CGlobalPhonemanager *self = new (ELeave) CGlobalPhonemanager;
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CGlobalPhonemanager::~CGlobalPhonemanager
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGlobalPhonemanager::~CGlobalPhonemanager()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CGlobalPhonemanager::~CGlobalPhonemanager()"));
-
-	delete iConfiguration;
-	delete iAtManager;
-	delete iCommEngine;
-	delete iActiveIpcRequest;
-	iContextList.ResetAndDestroy();
-	}
-
-// ---------------------------------------------------------------------------
-// CGlobalPhonemanager::CGlobalPhonemanager
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGlobalPhonemanager::CGlobalPhonemanager()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CGlobalPhonemanager::CGlobalPhonemanager()"));
-	}
-
-// ---------------------------------------------------------------------------
-// CGlobalPhonemanager::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGlobalPhonemanager::ConstructL()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CGlobalPhonemanager::ConstructL()"));
-	
-	InitL();
-	}
-
-// ---------------------------------------------------------------------------
-// CGlobalPhonemanager::InitL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGlobalPhonemanager::InitL()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CGlobalPhonemanager::InitL()"));
-	
-	// initialize the status of phone
-	iPhoneStatus.iLocalNetworkSel.iMethod = RMobilePhone::ENetworkSelectionUnknown;
-	iPhoneStatus.iModemDetected = RPhone::EDetectedUnknown;
-	iPhoneStatus.iDataAndFaxFlags = RPhone::KCapsUnknown;
-	iPhoneStatus.iWaitForCarrierTime = KLtsyDefaultSecondsToWaitForCarrier;
-	iPhoneStatus.iRegistrationStatus = RMobilePhone::ERegistrationUnknown;
-	iPhoneStatus.iPortAccess = EPortAccessAllowed;
-	iPhoneStatus.iMode = RPhone::EModeUnknown;
-	iPhoneStatus.iDataAndFaxFlags = RPhone::KCapsUnknown;
-	iPhoneStatus.iInitStatus = EPhoneNotInitialised;
-	iPhoneStatus.iGprsMaxNumContexts = 1;
-	iPhoneStatus.iMode=RPhone::EModeOnlineCommand;
-	
-	//Create the call information manager
-	iCallInfoManager = CLtsyCallInformationManager::NewL();
-	
-	// load physical device driver
-	TInt r = User::LoadPhysicalDevice(KPDDName);
-	if (r != KErrNone && r != KErrAlreadyExists)
-		{
-		User::Leave(r);
-		}
-	
-	// load logical device driver
-	r = User::LoadLogicalDevice(KLDDName);
-	if (r != KErrNone && r != KErrAlreadyExists)
-		{
-		User::Leave(r);
-		}
-		
-	// create the AT Manager
-	iAtManager = CAtManager::NewL();
-	
-	// create the Comm Engine which handle 
-	iCommEngine = CCommEngine::NewL(KLtsyChatBufferSize,KLtsyCommReadPriority,KLtsyCommWritePriority,iPhoneStatus.iPortAccess);
-	
-	// Set Comm Engine observer		
-	iCommEngine->SetCommEngineObserver(iAtManager);
-	iCommEngine->SetCommReadLineNotify(iAtManager);
-	
-	// create a CommDB configration helper class
-	iConfiguration = CTsyConfig::NewL();
-	
-	TFileName csy;
-	TName port;	
-	LOGTEXT(_L8("[Ltsy] Getting CSY from CommDB"));
-	User::LeaveIfError(iConfiguration->ConfigModemStringL(TPtrC(KCDTypeNameCsyName),csy));
-
-	LOGTEXT(_L8("[Ltsy] Getting PORT from CommDB"));
-	User::LeaveIfError(iConfiguration->ConfigModemStringL(TPtrC(KCDTypeNamePortName),port));
-	
-	// Open serial port by shared mode
-	User::LeaveIfError(iCommEngine->CommOpen(csy, port, ECommShared));
-	
-	// Configure Port
-	TCommConfig tConfigPckg;
-	
-	// Get the port configuration
-	LOGTEXT(_L8("[Ltsy] Setting Port Config"));	
-	User::LeaveIfError(iConfiguration->PortConfig(tConfigPckg,EConfigTypeInit));
-
-	LOGTEXT(_L8("[Ltsy] CommEngine Configure Port"));
-	User::LeaveIfError(iCommEngine->ConfigurePort(tConfigPckg));
-	
-	// issue reading from baseband
-	iCommEngine->Read();
-	
-	// Reset the context list
-	iContextList.Reset();
-	}
-
-// ---------------------------------------------------------------------------
-// CGlobalPhonemanager::CheckGlobalPhoneStatus
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CGlobalPhonemanager::CheckGlobalPhoneStatus()
-	{
-	if(EPhoneInitialised == iPhoneStatus.iInitStatus)
-		{
-		if (iEventSignalActive)
-			{
-			return  KErrInUse;
-			}
-		else
-			{
-			DeleteLastActiveRequest();
-			return KErrNone;
-			}
-		}
-	else
-		{
-		return iPhoneStatus.iInitStatus;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CGlobalPhonemanager::SetActiveRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGlobalPhonemanager::SetActiveRequest(CRequestBase* aCurActiveRequest)
-	{
-	iActiveIpcRequest = aCurActiveRequest;
-	}
-
-// ---------------------------------------------------------------------------
-// CGlobalPhonemanager::DeleteLastActiveRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGlobalPhonemanager::DeleteLastActiveRequest()
-	{
-	delete iActiveIpcRequest;
-	iActiveIpcRequest = NULL;
-	}
-
-// ---------------------------------------------------------------------------
-// CGlobalPhonemanager::GetCallInfoManager
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CLtsyCallInformationManager& CGlobalPhonemanager::GetCallInfoManager()
-	{
-	return (*iCallInfoManager);
-	}
-
-// ---------------------------------------------------------------------------
-// CGlobalPhonemanager::CurrentActiveRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CRequestBase* CGlobalPhonemanager::CurrentActiveRequest()
-    {
-    return iActiveIpcRequest;
-    }
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/ltsycallinformation.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-// 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:
-// This contains TLtsyCallInformation which store baseband related call information
-// 
-
-//system include
-
-//user include
-#include "ltsycallinformation.h"
-#include "ltsycommondefine.h"
-#include "mslogger.h"
-
-TLtsyCallInformation::TLtsyCallInformation()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::TLtsyCallInformation()"));
-	
-	iCallId = KLtsyErrorCallId;
-	iUsedInfo = ENotUsed;
-	iDirection = EUnknownDirection;
-	iCallState = EUnknownState;
-	iCallMode = EUnKnowCall;
-	iIsConference = EUnknownIsConference;
-	iTelNum = KNullDesC8;
-	iAddressType = -1;
-	iMobileName = KNullDesC8;
-	iIsEmergencyCall = EFalse;
-	}
-
-void TLtsyCallInformation::SetCallId(TInt aCallId)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::SetCallId()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] aCallId = %d"), aCallId);
-	
-	ASSERT((aCallId >= KLtsyMinCallId) && (aCallId <= KLtsyMaxCallId));
-	
-	iCallId = aCallId;
-	}
-
-TInt TLtsyCallInformation::GetCallId() const
-	{
-	return iCallId;
-	}
-
-void TLtsyCallInformation::SetCallIdIsUsedInfo(TCallIdUsedInfo aUsedInfo)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::SetCallId()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] aUsedInfo = %d"), aUsedInfo);
-	
-	iUsedInfo = aUsedInfo;
-	}
-
-TLtsyCallInformation::TCallIdUsedInfo TLtsyCallInformation::GetCallIdIsUsedInfo() const
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::GetCallIdIsUsedInfo()"));
-	
-	return iUsedInfo;
-	}
-
-void TLtsyCallInformation::SetCallDirection(TDirectionCall aDirection)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::SetCallDirection()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] aDirection = %d"), aDirection);
-	
-	iDirection = aDirection;
-	}
-
-TLtsyCallInformation::TDirectionCall TLtsyCallInformation::GetCallDirection() const
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::GetCallDirection()"));
-	
-	return iDirection;
-	}
-
-void TLtsyCallInformation::SetCallState(TCallState aCallState)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::SetCallState()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] aCallState = %d"), aCallState);
-	
-	iCallState = aCallState; 
-	}
-
-TLtsyCallInformation::TCallState TLtsyCallInformation::GetCallState() const
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::GetCallState()"));
-	
-	return iCallState;
-	}
-
-void TLtsyCallInformation::SetCallMode(TCallMode aCallMode)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::SetCallMode()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] aCallMode = %d"), aCallMode);
-	
-	iCallMode = aCallMode;
-	}
-
-TLtsyCallInformation::TCallMode TLtsyCallInformation::GetCallMode() const
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::GetCallMode()"));
-	
-	return iCallMode;
-	}
-
-void TLtsyCallInformation::SetConferenceCall(TConferenceCall aConferenceCall)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::SetConferenceCall()"));
-	LOGTEXT2(_L8("[Ltsy CallControl] aConferenceCall = %d"), aConferenceCall);
-	
-	iIsConference = aConferenceCall;
-	}
-
-TLtsyCallInformation::TConferenceCall TLtsyCallInformation::GetConferenceCall() const
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::GetConferenceCall()"));
-	
-	return iIsConference;
-	}
-
-void TLtsyCallInformation::SetMobileTelNum(const TDesC8& aTelNum)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::SetMobileTelNum()"));
-	
-	iTelNum.Copy(aTelNum.Left(iTelNum.MaxLength()));
-	}
-
-const TDesC8& TLtsyCallInformation::GetMobileTelNum() const
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::GetMobileTelNum()"));
-	
-	return iTelNum;
-	}
-
-void TLtsyCallInformation::SetAddressType(TInt aAddressType)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::SetAddressType()"));
-	
-	iAddressType = aAddressType;
-	}
-
-TInt TLtsyCallInformation::GetAddressType() const
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::GetAddressType()"));
-	
-	return iAddressType;
-	}
-
-void TLtsyCallInformation::SetMobileName(const TDesC8& aMobileName)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::SetMobileName()"));
-	
-	iMobileName.Copy(aMobileName.Left(iMobileName.MaxLength()));
-	}
-
-const TDesC8& TLtsyCallInformation::GetMobileName() const
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting TLtsyCallInformation::GetMobileName()"));
-	
-	return iMobileName;
-	}
-
-void TLtsyCallInformation::SetEmergencyCallFlag(TBool aIsEmergency)
-	{
-	iIsEmergencyCall = aIsEmergency;
-	}
-
-TBool TLtsyCallInformation::GetEmergencyCallFlag() const
-	{
-	return iIsEmergencyCall;
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/ltsycallinformationmanager.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,211 +0,0 @@
-// 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:
-// This contains CLtsyCallInformationManager which manager call information
-// 
-
-//system include
-
-//user include
-#include "ltsycallinformationmanager.h"
-#include "ltsycommondefine.h"
-#include "athangupcommandrecords.h"
-#include "mslogger.h"
-
-CLtsyCallInformationManager* CLtsyCallInformationManager::NewL()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CLtsyCallInformationManager::NewL()"));
-	
-	CLtsyCallInformationManager* self = CLtsyCallInformationManager::NewLC();
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-CLtsyCallInformationManager* CLtsyCallInformationManager::NewLC()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CLtsyCallInformationManager::NewLC()"));
-	
-	CLtsyCallInformationManager* self = new (ELeave) CLtsyCallInformationManager;
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CLtsyCallInformationManager::~CLtsyCallInformationManager()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CLtsyCallInformationManager::~CLtsyCallInformationManager()"));
-	
-	delete iHangupCommandRecords;
-	}
-
-CLtsyCallInformationManager::CLtsyCallInformationManager()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CLtsyCallInformationManager::CLtsyCallInformationManager()"));
-	//Init call id
-	iCallInfo[1].SetCallId(1);
-	iCallInfo[2].SetCallId(2);
-	iCallInfo[3].SetCallId(3);
-	iCallInfo[4].SetCallId(4);
-	iCallInfo[5].SetCallId(5);
-	iCallInfo[6].SetCallId(6);
-	iCallInfo[7].SetCallId(7);
-	
-	//Init incoming call flag
-	iIncomingCallFlag = EFalse;
-	}
-
-void CLtsyCallInformationManager::ConstructL()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CLtsyCallInformationManager::ConstructL()"));
-	
-	//Create hang up call command records
-	iHangupCommandRecords = CATHangupCommandRecords::NewL();	
-	}
-
-void CLtsyCallInformationManager::ResetCallInformationByCallId(TInt aCallId)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CLtsyCallInformationManager::ResetCallInformationByCallId()"));
-	
-	ASSERT((aCallId >= KLtsyMinCallId) && (aCallId <= KLtsyMaxCallId));
-	
-	iCallInfo[aCallId].SetCallIdIsUsedInfo(TLtsyCallInformation::ENotUsed);
-	iCallInfo[aCallId].SetCallDirection(TLtsyCallInformation::EUnknownDirection);
-	iCallInfo[aCallId].SetCallState(TLtsyCallInformation::EUnknownState);
-	iCallInfo[aCallId].SetCallMode(TLtsyCallInformation::EUnKnowCall);
-	iCallInfo[aCallId].SetConferenceCall(TLtsyCallInformation::EUnknownIsConference);
-	iCallInfo[aCallId].SetMobileTelNum(KNullDesC8);
-	iCallInfo[aCallId].SetAddressType(-1);
-	iCallInfo[aCallId].SetMobileName(KNullDesC8);
-	iCallInfo[aCallId].SetEmergencyCallFlag(EFalse);
-	}
-
-void CLtsyCallInformationManager::ResetAllCalInformation()
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CLtsyCallInformationManager::ResetAllCalInformation()"));
-	
-	for (TInt n = KLtsyMinCallId; n <= KLtsyMaxCallId; n++)
-		{
-		ResetCallInformationByCallId(n);
-		}	
-	}
-
-TLtsyCallInformation& CLtsyCallInformationManager::GetCallInformationByCallId(TInt aCallId)
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CLtsyCallInformationManager::GetCallInformationByCallId()"));
-	
-	ASSERT((aCallId >= KLtsyMinCallId) && (aCallId <= KLtsyMaxCallId));
-	
-	return iCallInfo[aCallId];
-	}
-
-TInt CLtsyCallInformationManager::FindUnUesedCallId() const
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CLtsyCallInformationManager::FindUnUesedCallId()"));
-	
-	for (TInt n = KLtsyMinCallId; n <= KLtsyMaxCallId; n++)
-		{
-		if (iCallInfo[n].GetCallIdIsUsedInfo() == TLtsyCallInformation::ENotUsed)
-			{
-			return n;
-			}
-		}
-	return KErrNotFound;
-	}
-
-TBool CLtsyCallInformationManager::IsHaveUsedCallId() const
-	{
-	LOGTEXT(_L8("[Ltsy CallControl] Starting CLtsyCallInformationManager::FindIsHaveUsedCallId()"));
-	
-	for (TInt n = KLtsyMinCallId; n <= KLtsyMaxCallId; n++)
-		{
-		if (iCallInfo[n].GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed)
-			{
-			return ETrue;
-			}
-		}
-	return EFalse;	
-	}
-
-void CLtsyCallInformationManager::SetIncomingCallFlag(TBool aIncomingCallFlag)
-	{
-	iIncomingCallFlag = aIncomingCallFlag;
-	}
-
-TBool CLtsyCallInformationManager::GetIncomingCallFlag() const
-	{
-	return iIncomingCallFlag;
-	}
-
-TInt CLtsyCallInformationManager::FindIncomingCallId() const
-	{
-	for (TInt n = KLtsyMinCallId; n <= KLtsyMaxCallId; n++)
-		{
-		if (iCallInfo[n].GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed &&
-			iCallInfo[n].GetCallState() == TLtsyCallInformation::EInComingCall)
-			{
-			return n;
-			}
-		}
-	return KErrNotFound;
-	}
-
-TInt CLtsyCallInformationManager::FindEmergencyCallId() const
-	{
-	for (TInt n = KLtsyMinCallId; n <= KLtsyMaxCallId; n++)
-		{
-		if ((iCallInfo[n].GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed) &&
-			iCallInfo[n].GetEmergencyCallFlag())
-			{
-			return n;
-			}
-		}
-	return KErrNotFound;	
-	}
-
-TInt CLtsyCallInformationManager::FindDialingOrAlertingCallId() const
-	{
-	for (TInt n = KLtsyMinCallId; n <= KLtsyMaxCallId; n++)
-		{
-		if (iCallInfo[n].GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed &&
-			((iCallInfo[n].GetCallState() == TLtsyCallInformation::EDialingCall) ||
-			 (iCallInfo[n].GetCallState() == TLtsyCallInformation::EAlertingCall)))
-			{
-			return n;
-			}
-		}
-	return KErrNotFound;	
-	}
-
-TInt CLtsyCallInformationManager::FindWaitingCallId() const
-	{
-	for (TInt n = KLtsyMinCallId; n <= KLtsyMaxCallId; n++)
-		{
-		if (iCallInfo[n].GetCallIdIsUsedInfo() == TLtsyCallInformation::EUsed &&
-			iCallInfo[n].GetCallState() == TLtsyCallInformation::EWaitingCall)
-			{
-			return n;
-			}
-		}
-	return KErrNotFound;	
-	}
-
-// ---------------------------------------------------------------------------
-// CLtsyCallInformationManager::GetHangupCommandRecords
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATHangupCommandRecords& CLtsyCallInformationManager::GetHangupCommandRecords()
-	{
-	return (*iHangupCommandRecords);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/mslogger.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-// 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:
-// TSYLogger
-
-// system inlcude
-#include <flogger.h>		// for FLogger
-
-// user include
-#include "mslogger.h"		// Header file for this source file
-
-// const defination
-_LIT(KLogFolder,"etel");
-_LIT(KLogFileName,"PhoneTsy.txt");
-_LIT8(KTimeFormat,"%02d:%02d:%02d.%03d ");
-
-const TInt KTSYLogBufferSize=400;
-
-void TSYLogger::Write(const TDesC8& aText)
-	{
-	//
-	// Assemble time stamp and callers text into one string
-	TBuf8<KTSYLogBufferSize> buf;
-	TTime now;
-	now.UniversalTime();
-	TDateTime t(now.DateTime());
-	buf.Format(KTimeFormat,t.Hour(),t.Minute(),t.Second(),t.MicroSecond());
-	buf.Append(aText);
-
-	//
-	// Open log, write text to log and close log
-	RFileLogger log;
-	if(KErrNone==log.Connect())
-		{
-		log.CreateLog(KLogFolder,KLogFileName,EFileLoggingModeAppend);
-		log.SetDateAndTime(EFalse,EFalse);
-		log.Write(buf);
-		log.CloseLog();
-		log.Close();
-		}
-	}
-
-
-void TSYLogger::WriteFormat(TRefByValue<const TDesC8> aFmt,...)
-	{
-	VA_LIST list;
-	VA_START(list,aFmt);
-
-	//
-	// Assemble time stamp and callers text into one string
-	TBuf8<KTSYLogBufferSize> buf;
-	TTime now;
-	now.UniversalTime();
-	TDateTime t(now.DateTime());
-	buf.Format(KTimeFormat,t.Hour(),t.Minute(),t.Second(),t.MicroSecond());
-	buf.AppendFormatList(aFmt,list);
-
-	//
-	// Open log, write text to log and close log
-	RFileLogger log;
-	if(KErrNone==log.Connect())
-		{
-		log.CreateLog(KLogFolder,KLogFileName,EFileLoggingModeAppend);
-		log.SetDateAndTime(EFalse,EFalse);
-		log.Write(buf);
-		log.CloseLog();
-		log.Close();
-		}
-	}
-

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/panic.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-// 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:
-// @file panic.cpp
-// Panic codes and panic function. This header should be kept private and not exported to
-// /epoc32/include/
-
-#include <e32std.h>		/// for GLDEF_C and User::
-#include "panic.h"		/// Header for this file
-
-//
-// Panic Function
-//
-GLDEF_C void Panic(TTSYPanic aPanicNumber)
-	{
-	_LIT(panicText,"PhoneTsy");
-	_LIT(extension,".TSY");
-
-	TName myTsyName(panicText);
-
-	#ifdef TSY_INSTANCE
-		TBuf16<16> tgt;
-		tgt.Num(TSY_INSTANCE);
-		myTsyName.Append(tgt);
-	#endif
-	myTsyName.Append(extension);
-
-	User::Panic(myTsyName,aPanicNumber);
-	}

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/requestbase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-// 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:
-// This contains CRequestBase which act as an interface with dispater to handle a single passed IPC request
-
-#include "requestbase.h"
-#include "mslogger.h"
-#include "globalphonemanager.h"
-
-// ---------------------------------------------------------------------------
-// CRequestBase::~CRequestBase
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CRequestBase::~CRequestBase()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CRequestBase::~CRequestBase()"));
-	iIpcCompleteObserver = NULL;
-	}
-
-// ---------------------------------------------------------------------------
-// CRequestBase::CRequestBase
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CRequestBase::CRequestBase(CGlobalPhonemanager& aPhoneGlobals)
-							:iPhoneGlobals(aPhoneGlobals)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CRequestBase::CRequestBase()"));
-	}
-
-// ---------------------------------------------------------------------------
-// CRequestBase::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CRequestBase::StartRequest()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CRequestBase::SetIpcRequestCompleteObserver
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CRequestBase::SetIpcRequestCompleteObserver(MIpcRequestCompleteObserver* aIpcCompleteObserver)
-    {
-    iIpcCompleteObserver = aIpcCompleteObserver;
-    }
-
-// ---------------------------------------------------------------------------
-// CRequestBase::SetIpcId
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CRequestBase::SetIpcId(TInt aIpcId)
-    {
-    iIpcId = aIpcId;
-    }
-
-// ---------------------------------------------------------------------------
-// CRequestBase::SetIpcId
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CRequestBase::IpcId()
-    {
-    return iIpcId;
-    }
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/respondbufparser.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-// 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:
-// This contains CRespondBufParser which provide an algorithm to analize the passed data from baseband
-//
-
-#include "respondbufparser.h"
-#include "mslogger.h"
-
-_LIT8(KSpace, " ");
-
-CRespondBufParser::CRespondBufParser() 
-	{	
-	}
-
-CRespondBufParser::~CRespondBufParser()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CRespondBufParser::ParseRespondedBuffer
-// other items were commented in a header
-// ---------------------------------------------------------------------------		
-void CRespondBufParser::ParseRespondedBuffer(RArray<TPtrC8>& aArray, const TDesC8& aBuf)
-	{
-	aArray.Reset();
-	
-	TBool firstDoubleQuoteFound = EFalse;
-	TBool endByComma = EFalse;
-	TBool Marked = EFalse;
-	TLex8 tmpLex(aBuf);
-	
-	//Move cursor past any spaces or open brackets
-	while(!tmpLex.Eos())
-		{
-		TChar peek=tmpLex.Peek();
-		switch(peek)
-			{
-			//Skip the '(','[', and '{' in end
-			case '(':
-			case '[':
-			case '{':
-				break;
-			//Skip the '(','[', and '{' in end
-			case ')':
-			case ']':
-			case '}':
-				break;
-			case '"': 
-				//Skip first '"'
-				if(!firstDoubleQuoteFound)
-					{
-					firstDoubleQuoteFound = ETrue;
-					}
-				else
-					{
-					//Extracts the marked token(No include the '"' in end)
-					firstDoubleQuoteFound = EFalse;
-					TPtrC8 temp = tmpLex.MarkedToken();
-					aArray.Append(temp);
-					LOGTEXT2(_L8("normal parameter >%S<"),&(temp));
-					Marked = EFalse;
-					endByComma = EFalse;
-					}
-				break;
-			case ',':
-				if(!firstDoubleQuoteFound)
-					{
-					if(Marked)
-						{
-						//Extracts the marked token
-						TPtrC8 temp = tmpLex.MarkedToken();
-						aArray.Append(temp);
-						LOGTEXT2(_L8("normal parameter >%S<"),&(temp));
-						Marked = EFalse;
-						}
-					else if(endByComma)
-						{
-						//Add a space between two camma
-						aArray.Append(KSpace());
-						LOGTEXT2(_L8("normal parameter >%S<"),&(KSpace()));
-						}
-					endByComma = ETrue;
-					}
-				break;
-			case ';':
-			case ' ': 
-			case '\r': 
-			case '\n': 
-				if(!firstDoubleQuoteFound&&Marked)
-					{
-					//Extracts the marked token
-					TPtrC8 temp = tmpLex.MarkedToken();
-					aArray.Append(temp);
-					LOGTEXT2(_L8("normal parameter >%S<"),&(temp));
-					Marked = EFalse;	
-					endByComma = EFalse;
-					}
-				break;
-			case ':': 
-				if(!firstDoubleQuoteFound&&Marked)
-					{
-					//Extracts the marked token(Include ':')
-					tmpLex.Inc();
-					TPtrC8 temp = tmpLex.MarkedToken();
-					aArray.Append(temp);
-					LOGTEXT2(_L8("normal parameter >%S<"),&(temp));
-					//back one char because add it in end 
-					tmpLex.Inc(-1);
-					Marked = EFalse;
-					endByComma = EFalse;
-					}
-				break;
-			default:
-				if(!Marked)
-					{
-					tmpLex.Mark();
-					Marked = ETrue;	
-					}
-				break;
-			}
-		tmpLex.Inc();
-		}
-	if(Marked)
-		{
-		//Extracts the marked token which haven't 
-		TPtrC8 temp = tmpLex.MarkedToken();
-		aArray.Append(temp);
-		LOGTEXT2(_L8("normal parameter >%S<"),&(temp));
-		}
-	}

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/tsyconfg.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,487 +0,0 @@
-// 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:
-// @file tsyconfig.cpp
-// This contains CTsyConfig which manage access to CommDB configuration.
-// 
-
-// system include
-#include <commsdattypesv1_1.h>
-#include <commsdat_partner.h>
-using namespace CommsDat;
-
-// user include
-#include "tsyconfg.h"
-#include "mslogger.h"
-
-#ifdef __LOGDEB__
-_LIT8(KLogEntry,"CTsyConfig::%S\t%S");
-#define LOCAL_LOGTEXT(function,text) {_LIT8(F,function);_LIT8(T,text);LOGTEXT3(KLogEntry,&F,&T);}
-#else
-#define LOCAL_LOGTEXT(function,text)
-#endif
-
-// const defination
-const TInt KDefaultLocationInternalPref = 0;
-const RCall::TMonitorSpeakerControl KDefaultModemSpeakerSetting = RCall::EMonitorSpeakerControlOnUntilCarrier;
-const RCall::TMonitorSpeakerVolume KDefaultMonitorSpeakerVolume = RCall::EMonitorSpeakerVolumeOff;
-const RCall::TWaitForDialTone KDefaultWaitForDialTone = RCall::EDialToneNoWait;
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CTsyConfig* CTsyConfig::NewL() 
-	{
-	CTsyConfig* self = new(ELeave) CTsyConfig();
-	CleanupStack::PushL(self);
-	self->ConstructL(); 
-	CleanupStack::Pop();
-	return (self);
-	}
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::CTsyConfig
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CTsyConfig::CTsyConfig()
-	{	
-	}
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CTsyConfig::ConstructL()
-	{
-	iLocationId = 0;
-	iModemBearer = 0;
-	SetCurrentTableViewL();
-	GetLocationModemSettingsL();
-	}
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::SetCurrentTableViewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CTsyConfig::SetCurrentTableViewL()
-	{
-	TInt r = KErrNone;
-
-	for (TInt i = 0; i < 10; i++)
-		{
-		TRAP(r, GetCurrentTableViewsL()); // Place a cursor on the default modem record in comms database server
-		if (r == KErrAccessDenied)        // if we get access denied from DBMS, which is a timing thing, just re-post
-			{
-			User::After(1000000);
-			continue;
-			}
-		else
-			{
-			break;
-			}
-		}
-	
-	if(r)
-		{
-		LOGTEXT(_L8("CommDB values seem to be corrupt"));
-		User::Leave(KErrEtelModemSettingsCorrupt);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::GetLocationModemSettingsL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CTsyConfig::GetLocationModemSettingsL()
-	{
-	ASSERT(iModemBearer != 0);
-	
-	iSpeakerSetting = KDefaultModemSpeakerSetting;
-	iSpeakerVolume = KDefaultMonitorSpeakerVolume;
-	
-	if(iLocationId == 0)
-		{
-		iInterval = KDefaultLocationInternalPref;
-		iWaitForDialTonePref = KDefaultWaitForDialTone;
-		}
-	else
-		{
-		TBool value(EFalse);
-		CMDBField<TUint32>* intervalField = new(ELeave) CMDBField<TUint32>(KCDTIdPauseAfterDialOut);
-		CleanupStack::PushL(intervalField);
-		intervalField->SetRecordId(iLocationId);
-		intervalField->LoadL(*iDbSession);
-		iInterval = *intervalField;
-		CleanupStack::PopAndDestroy(intervalField);
-		
-		CMDBField<TUint32>* valueField = new(ELeave) CMDBField<TUint32>(KCDTIdWaitForDialTone);		
-		CleanupStack::PushL(valueField);
-		valueField->SetRecordId(iLocationId);
-		valueField->LoadL(*iDbSession);
-		value = *valueField;
-		CleanupStack::PopAndDestroy(valueField);
-		
-		if (value)
-			{
-			iWaitForDialTonePref = RCall::EDialToneWait;
-			}
-		else
-			{
-			iWaitForDialTonePref = RCall::EDialToneNoWait;
-			}
-		}
-
-    // read speaker preferences
-	CMDBField<TUint32>* speakerPrefField = new(ELeave) CMDBField<TUint32>(KCDTIdSpeakerPref);
-	CleanupStack::PushL(speakerPrefField);
-	speakerPrefField->SetRecordId(iModemBearer);
-	speakerPrefField->LoadL(*iDbSession);
-	iSpeakerSetting = static_cast<RCall::TMonitorSpeakerControl>(static_cast<TUint32>(*speakerPrefField));
-	CleanupStack::PopAndDestroy(speakerPrefField);
-	
-	// read speaker volume preferences
-	CMDBField<TUint32>* speakerVolPrefField = new(ELeave) CMDBField<TUint32>(KCDTIdSpeakerVolPref);
-	CleanupStack::PushL(speakerVolPrefField);
-	speakerVolPrefField->SetRecordId(iModemBearer);
-	speakerVolPrefField->LoadL(*iDbSession);
-	iSpeakerVolume = static_cast<RCall::TMonitorSpeakerVolume>(static_cast<TUint32>(*speakerVolPrefField));			
-	CleanupStack::PopAndDestroy(speakerVolPrefField);
-
-    // read modem rate
-	CMDBField<TUint32>* rateField = new(ELeave) CMDBField<TUint32>(KCDTIdRate);
-	CleanupStack::PushL(rateField);
-	rateField->SetRecordId(iModemBearer);
-	rateField->LoadL(*iDbSession);
-	TUint32 rate;
-	rate = *rateField;
-	CleanupStack::PopAndDestroy(rateField);
-	
-	// read data bits for modem
-	CMDBField<TUint32>* dataBitsField = new(ELeave) CMDBField<TUint32>(KCDTIdDataBits);
-	CleanupStack::PushL(dataBitsField);
-	dataBitsField->SetRecordId(iModemBearer);
-	dataBitsField->LoadL(*iDbSession);
-	TUint32 dataBits;
-	dataBits = *dataBitsField;
-	CleanupStack::PopAndDestroy(dataBitsField);
-    
-	// read stop bits for modem
-	CMDBField<TUint32>* stopBitsField = new(ELeave) CMDBField<TUint32>(KCDTIdStopBits);
-	CleanupStack::PushL(stopBitsField);
-	stopBitsField->SetRecordId(iModemBearer);
-	stopBitsField->LoadL(*iDbSession);
-	TUint32 stopBits;
-	stopBits = *stopBitsField;
-	CleanupStack::PopAndDestroy(stopBitsField);
-	
-	// read parity for modem
-	CMDBField<TUint32>* parityField = new(ELeave) CMDBField<TUint32>(KCDTIdParity);
-	CleanupStack::PushL(parityField);
-	parityField->SetRecordId(iModemBearer);
-	parityField->LoadL(*iDbSession);
-	TUint32 parity;
-	parity = *parityField;
-	CleanupStack::PopAndDestroy(parityField);
-	
-	// read handshake for modem
-	CMDBField<TUint32>* handshakeField = new(ELeave) CMDBField<TUint32>(KCDTIdHandshaking);
-	CleanupStack::PushL(handshakeField);
-	handshakeField->SetRecordId(iModemBearer);
-	handshakeField->LoadL(*iDbSession);
-	TUint32 handshake;
-	handshake = *handshakeField;
-	CleanupStack::PopAndDestroy(handshakeField);
-    
-	// set the modem configuration
-	iConfig.iRate = (TBps)rate;
-	iConfig.iDataBits = (TDataBits)dataBits;
-	iConfig.iStopBits = (TStopBits)stopBits;
-	iConfig.iParity = (TParity)parity;
-	iConfig.iHandshake = handshake;
-	}
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::~CTsyConfig
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CTsyConfig::~CTsyConfig()
-	{
-	delete iDbSession;
-	}
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::ConfigModemStringL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CTsyConfig::ConfigModemStringL(const TDesC& aStringTag, TDes8& aString)
-	{
-	ASSERT(iDbSession != 0);
-	CCDModemBearerRecord* modemRecord = static_cast<CCDModemBearerRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdModemBearerRecord));
-	CleanupStack::PushL(modemRecord);
-	modemRecord->SetRecordId(iModemBearer);
-	modemRecord->LoadL(*iDbSession);
-	
-	TInt ret;
-	TInt type(0);
-	CMDBElement* baseField = NULL;
-	TRAP(ret, baseField = modemRecord->GetFieldByNameL(aStringTag, type));
-	if (ret == KErrNone)
-		{
-		// check for type
-		switch(type)
-			{
-			case EMedText:
-			case EText:
-				{
-				CMDBField<TDesC>* field16 = static_cast<CMDBField<TDesC>*>(baseField);
-				const TDesC& refField = *field16;
-				aString.Copy(refField);
-				ret = KErrNone;
-				}
-				break;
-			case EDesC8:
-				{
-				CMDBField<TDesC8>* field = static_cast<CMDBField<TDesC8>*>(baseField);
-				aString = *field;
-				ret = KErrNone;
-				}
-				break;
-			default:
-				ret = KErrNotFound;
-			}
-    	}
-	CleanupStack::PopAndDestroy(modemRecord);
-
-	return ret;
-	}
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::ConfigModemStringL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CTsyConfig::ConfigModemStringL(const TDesC& aStringTag, TDes16& aString)
-	{
-	ASSERT(iDbSession != 0);
-	// get the table record
-	CCDModemBearerRecord* modemRecord = static_cast<CCDModemBearerRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdModemBearerRecord));
-	CleanupStack::PushL(modemRecord);
-	modemRecord->SetRecordId(iModemBearer);
-	modemRecord->LoadL(*iDbSession);
-	
-	TInt ret;
-	TInt type(0);
-	CMDBElement* baseField = NULL;
-	TRAP(ret, baseField = modemRecord->GetFieldByNameL(aStringTag, type));
-	if (ret == KErrNone)
-		{
-		// check for type
-		switch(type)
-			{
-			case EMedText:
-			case EText:
-				{
-				CMDBField<TDesC>* field = static_cast<CMDBField<TDesC>*>(baseField);
-				aString = *field;
-				ret = KErrNone;
-				}
-				break;
-			case EDesC8:
-				{
-				// des16 needs to be cast to des8
-				CMDBField<TDesC8>* field8 = static_cast<CMDBField<TDesC8>*>(baseField);
-				const TDesC8& refField = *field8;
-				aString.Copy(refField);
-				ret = KErrNone;
-				}
-				break;
-			default:
-				ret = KErrNotFound;
-			}
-		}
-	
-	CleanupStack::PopAndDestroy(modemRecord);
-
-	return ret;
-	}
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::GetSpeakerSettingPref
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CTsyConfig::GetSpeakerSettingPref(RCall::TMonitorSpeakerControl& aSpeakerSetting)
-	{
-	aSpeakerSetting = iSpeakerSetting;
-	}
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::GetSpeakerVolumePref
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CTsyConfig::GetSpeakerVolumePref(RCall::TMonitorSpeakerVolume& aSpeakerVolume)
-	{
-	aSpeakerVolume = iSpeakerVolume;
-	}
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::GetWaitForDialTonePref
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CTsyConfig::GetWaitForDialTonePref(RCall::TWaitForDialTone& aWaitForDialTonePref)
-	{
-	aWaitForDialTonePref = iWaitForDialTonePref;
-	}
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::PortConfig
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CTsyConfig::PortConfig(TCommConfig& aConfigPckg, TConfigType aConfigType)
-	{
-	TCommConfig configDummyPckg;
-	TCommConfigV01& config = configDummyPckg();
-	config = iConfig;
-	
-	if (aConfigType==EConfigTypeHangUp ||
-		aConfigType==EConfigTypeQuickInit)
-		{
-		config.iHandshake = 0;//&= (~(KConfigFailDCD | KConfigObeyDCD | KConfigFailDSR));
-		}
-	else
-		{
-		switch (aConfigType)
-			{
-		case EConfigTypePreInit:
-			config.iHandshake &= (~(KConfigObeyCTS | KConfigFailCTS | KConfigObeyDCD | KConfigFailDCD | KConfigFailDSR));
-			break;
-		case EConfigTypeInit:
-			config.iHandshake &= (~(KConfigObeyCTS | KConfigFailCTS | KConfigObeyDCD | KConfigFailDCD));
-			break;
-		case EConfigTypeConnect:
-			config.iHandshake &= (~(KConfigFailCTS | KConfigFailDCD));	// fail DCD masked out, as should get NO CARRIER anyway
-			break;
-		case EConfigTypeFull:
-			break;
-		case EConfigTypeDDBugWorkAroundStart:
-			if (config.iRate!=EBps300)	// ensure that something other than handshaking has changed
-				config.iRate=EBps300;	// to work around the bug in the ARM device driver
-			else
-				config.iRate=EBps2400;
-			config.iHandshake=0;
-			break;
-		case EConfigTypeDDBugWorkAroundEnd:
-			config.iHandshake=0;
-			break;
-		default:
-			break;
-			}
-		}
-	
-	aConfigPckg=configDummyPckg;
-	return KErrNone;
-	}
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::GetCurrentTableViewsL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CTsyConfig::GetCurrentTableViewsL() 
-	{
-	ResetCurrentTableViews();
-	
-#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-	iDbSession = CMDBSession::NewL(KCDVersion1_2);
-#else
-	iDbSession = CMDBSession::NewL(KCDVersion1_1);
-#endif
-
-	iModemBearer = 0;
-	iLocationId = 0;
-	// Search the bearer tables for records using the Phonetsy.TSY
-	GetModemBearerIdL(iModemBearer);
-
-	// Get the associated locationId
-	GetLocationIdL(iModemBearer,iLocationId);
-	
-	//Check if the selected bearer is an MMTSY bearer with a valid location
-	if(!iModemBearer || !iLocationId) 
-		{
-		//
-		// Selected bearer does not mention the MMTSY
-		LOCAL_LOGTEXT("GetCurrentSettingsL","PhoneTSY not mentioned in the selected bearer");
-		User::Leave(KErrNotFound);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::ResetCurrentTableViews
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CTsyConfig::ResetCurrentTableViews()
-	{
-	delete iDbSession;
-	iDbSession = NULL;		
-	}
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::GetLocationIdL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CTsyConfig::GetLocationIdL(const TUint32& aBearerId, TUint32& aLocationId) 
- 	{
-    CCDIAPRecord *iapRecord = static_cast<CCDIAPRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdIAPRecord));
-  	CleanupStack::PushL(iapRecord);
-  	
-  	iapRecord->iBearer = aBearerId;
-  	TBool err = iapRecord->FindL(*iDbSession);
-  	if (err)
-  		{
-  		aLocationId = iapRecord->iLocation;
-  		}
-  	else
-  		{
-  		aLocationId = static_cast<TUint32>(KErrNotFound);
-  		}
-  	
-    CleanupStack::PopAndDestroy(iapRecord);
-    
-	}
-
-// ---------------------------------------------------------------------------
-// CTsyConfig::GetModemBearerIdL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CTsyConfig::GetModemBearerIdL(TUint32& aBearerId)
-	{
-    CCDModemBearerRecord *modemRecord = static_cast<CCDModemBearerRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdModemBearerRecord));
-    CleanupStack::PushL(modemRecord);
-    
-    _LIT(KTsyName,"phonetsy"); // Note this is case sensitive and must match the name in commdb
-    modemRecord->iTsyName.SetMaxLengthL(KMaxTextLength);
-    modemRecord->iTsyName = KTsyName;
-    
-    TBool searchResult = modemRecord->FindL(*iDbSession);
-    
-    if (searchResult)
-	    {
-		aBearerId = modemRecord->RecordId();	
-	    }
-	else
-		{
-		aBearerId = static_cast<TUint32>(KErrNotFound);
-		}
-    
-    CleanupStack::PopAndDestroy(modemRecord);
-	}
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/unsolicitedeventmonitor.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,237 +0,0 @@
-// 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:
-// This contains CUnsolicitedEventMonitor which mornitor the arriving unsocilited event and then notify this to all observers.
-// 
-
-//user include
-#include "unsolicitedeventmonitor.h"
-#include "atunsolicited.h"
-#include "mslogger.h"
-#include "atmanager.h"
-#include "activecommandstore.h"
-
-// ---------------------------------------------------------------------------
-// CUnsolicitedEventMonitor::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CUnsolicitedEventMonitor* CUnsolicitedEventMonitor::NewL(CGlobalPhonemanager& aPhoneglobals,
-										    CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CUnsolicitedEventMonitor::NewL()"));
-	CUnsolicitedEventMonitor* self = CUnsolicitedEventMonitor::NewLC(aPhoneglobals, aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CUnsolicitedEventMonitor::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CUnsolicitedEventMonitor* CUnsolicitedEventMonitor::NewLC(CGlobalPhonemanager& aPhoneglobals,
-											CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CUnsolicitedEventMonitor::NewLC()"));
-	CUnsolicitedEventMonitor* self = new (ELeave) CUnsolicitedEventMonitor(aPhoneglobals, 
-																 aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CUnsolicitedEventMonitor::~CUnsolicitedEventMonitor
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CUnsolicitedEventMonitor::~CUnsolicitedEventMonitor()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CUnsolicitedEventMonitor::~CUnsolicitedEventMonitor()"));
-	iArray.Close();
-	}
-
-// ---------------------------------------------------------------------------
-// CUnsolicitedEventMonitor::CUnsolicitedEventMonitor
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CUnsolicitedEventMonitor::CUnsolicitedEventMonitor(CGlobalPhonemanager& aPhoneglobals,
-		                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-						             :CATCommandControlBase(aPhoneglobals, aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CUnsolicitedEventMonitor::CUnsolicitedEventMonitor()"));
-	}
-
-// ---------------------------------------------------------------------------
-// CUnsolicitedEventMonitor::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CUnsolicitedEventMonitor::ConstructL()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CUnsolicitedEventMonitor::ConstructL()"));
-	
-	CATUnsolicited* command = CATUnsolicited::NewL(iPhoneGlobals, iCtsyDispatcherCallback);
-	command->SetAtCommandObserver(this);
-	AddAtCommand(command);
-	}
-
-// ---------------------------------------------------------------------------
-// CUnsolicitedEventMonitor::AddUnsolicitedObserver
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CUnsolicitedEventMonitor::AddUnsolicitedObserver(const MLtsyUnsolicitedCommandObserver* aObserver)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CUnsolicitedEventMonitor::AddUnsolicitedObserver()"));
-	
-	if (aObserver != NULL)
-		{
-		TInt nRes = iArray.Append(aObserver);
-		if (nRes == KErrNone)
-			{
-			LOGTEXT(_L8("[Ltsy] Append unsolicited Observer Success"));
-			}
-		else
-			{
-			LOGTEXT2(_L8("[Ltsy] Append unsolicited Observer fail Because result code = %d"), nRes);
-			}
-		}
-	else
-		{
-		LOGTEXT(_L8("[Ltsy] Unsolicited observer is NULL"));
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CUnsolicitedEventMonitor::RemoveUnsolicitedObserver
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CUnsolicitedEventMonitor::RemoveUnsolicitedObserver(const MLtsyUnsolicitedCommandObserver* aObserver)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CUnsolicitedEventMonitor::RemoveUnsolicitedObserver()"));
-	if (aObserver != NULL)
-		{
-		TInt nFound = iArray.Find(aObserver);
-		if (KErrNotFound != nFound)
-			{
-			LOGTEXT(_L8("[Ltsy] Array have removed observer"));
-			iArray.Remove(nFound);
-			}
-		else
-			{
-			LOGTEXT(_L8("[Ltsy] Array not found observer"));
-			}
-		}
-	else
-		{
-		LOGTEXT(_L8("[Ltsy] Wind Observer is NULL"));
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CUnsolicitedEventMonitor::NotifyEveryObserver
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CUnsolicitedEventMonitor::NotifyEveryObserver()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CUnsolicitedEventMonitor::NotifyEveryObserver()"));
-	
-	CAtCommandBase *cAtBase(NULL);
-	TRAPD(err, cAtBase = &GetAtCommandByAtTypeL(ELtsyAT_General_WIND));
-	if (err == KErrNoMemory)
-		{
-		return;
-		}
-	
-	CATUnsolicited*  unsolicited = dynamic_cast<CATUnsolicited*>(cAtBase);
-	if (unsolicited == NULL)
-		{
-		LOGTEXT(_L8("[Ltsy] Dynamic cast class CAtCommandBase to class CATUnsolicited failing"));
-		return;
-		}
-	
-	if (unsolicited->GetParserResult() != KErrNone)
-		{
-		LOGTEXT(_L8("[Ltsy] parse unsolicited command error"));
-		return;
-		}
-	
-	TUnsolicitedParams::TUnsolicitedParamsPckgBuf* pckg = (TUnsolicitedParams::TUnsolicitedParamsPckgBuf*)(&(unsolicited->GetUnsolicitedParams()));
-	TInt nEvent = (*pckg)().iEvent;
-	
-	TInt count = iArray.Count();
-	for (TInt n = 0; n < count;  n++)
-		{
-		MLtsyUnsolicitedCommandObserver* observer = iArray[n];
-		observer->UnsolicitedCommandArriving(nEvent, (*pckg));
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CUnsolicitedEventMonitor::StartUnsolicitedObserver
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CUnsolicitedEventMonitor::StartUnsolicitedObserver()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CUnsolicitedEventMonitor::NotifyEveryObserver()"));
-	
-	CAtCommandBase *cAtBase(NULL);
-	TRAPD(err, cAtBase = &GetAtCommandByAtTypeL(ELtsyAT_General_WIND));
-	if (err == KErrNoMemory)
-		{
-		return;
-		}
-	
-	iPhoneGlobals.iAtManager->GetActiveCommandStore()->AddUnsolicitedAtCommand(cAtBase);
-	}
-
-// ---------------------------------------------------------------------------
-// CUnsolicitedEventMonitor::StopUnsolicitedObserver
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CUnsolicitedEventMonitor::StopUnsolicitedObserver()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CUnsolicitedEventMonitor::StopUnsolicitedObserver()"));
-	
-	CAtCommandBase *cAtBase(NULL);
-	TRAPD(err, cAtBase = &GetAtCommandByAtTypeL(ELtsyAT_General_WIND));
-	if (err == KErrNoMemory)
-		{
-		return;
-		}
-	
-	iPhoneGlobals.iAtManager->GetActiveCommandStore()->RemoveActiveAtCommand(cAtBase);
-	}
-
-// ---------------------------------------------------------------------------
-// CUnsolicitedEventMonitor::AtCommandExecuteComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CUnsolicitedEventMonitor::AtCommandExecuteComplete(TAtEventSource /*aEventSource*/, TInt aStatus)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CUnsolicitedEventMonitor::AtCommandExecuteComplete()"));
-	if (aStatus == KErrNone)
-		{
-		NotifyEveryObserver();
-		}
-	
-	CAtCommandBase *cAtBase(NULL);
-	TRAPD(err, cAtBase = &GetAtCommandByAtTypeL(ELtsyAT_General_WIND));
-	if (err == KErrNoMemory)
-		{
-		return;
-		}
-	
-	cAtBase->ClearCurrentLine();
-	
-	LOGTEXT(_L8("[Ltsy] End CUnsolicitedEventMonitor::AtCommandExecuteComplete()"));
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/generic/src/unsolicitedparams.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// 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:
-// This define the unsolicted event data
-// 
-
-//user include
-#include "unsolicitedparams.h"
-
-TUnsolicitedParams::TUnsolicitedParams()
-	{
-	iEvent = -1;
-	iIdx = 0;
-	}
-
-void TUnsolicitedParams::InitParams()
-	{
-	iEvent = -1;
-	iIdx = 0;	
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atdetectnetwork.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-// 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:
-// @file atdetectnetwork.h
-// This contains CATDetectNetwork which is describes the GSM Network & Operator information.
-// 
-#ifndef __ATDETECTNETWORK_H__
-#define __ATDETECTNETWORK_H__
-
-#include <mmlist.h>
-//User include
-#include "atcommandbase.h"
-
-
-/**
- * CATDetectNetwork inherits from the CAtCommandBase class. 
- * brief Determines the Operators present in the GSM Network.
- * This class transmits the AT+COPS=? Command in order to determine all the Operators 
- * present in the GSM Network.
- *
- */
-class CATDetectNetwork : public CAtCommandBase
-{
-public:
-	static CATDetectNetwork* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                          CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATDetectNetwork();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Cancel the AT Command execution
-	 */
-	virtual void CancelCommand();
-    /**
-     * Start the request 
-     */
-	virtual void StartRequest();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATDetectNetwork(CGlobalPhonemanager& aGloblePhone, 
-		             CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-public:
-	/**
-	 * Detect Network Command is running? or not
-	 */
-	TBool iCommandRunning;
-	/**
-	 * Detect Network Cancel Command is running? or not
-	 */
-	TBool iCommandCancel;
-private:
-	/*
-	 * Returned all the Operators which present in the GSM Network.
-	 */
-	CMobilePhoneNetworkListV2* iList;
-	/*
-	 * The return value of AT command executed 
-	 */
-	TInt iError;
-};
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atgetbatteryinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-// 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:
-// @file atgetbatteryinfo.h
-// This contains CATGetBattery which is defines the AT command for Getting Battery status
-// 
-
-#ifndef __CBATTERY_H__
-#define __CBATTERY_H__
-
-//system include
-#include <etelmm.h>
-#include <cmmutility.h>
-//user include
-#include "atcommandbase.h"
-
-
-/**
- * class CATGetBattery 
- *
- * CATGetBattery inherits from the CAtCommandBase class. 
- * This class transmits the AT+COPS=? Command in order to get 
- * Battery status in this phone
- */
-class CATGetBattery : public CAtCommandBase
-{
-public:
-	static CATGetBattery* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                       CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGetBattery();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Get the battery infomation returned by executing AT Command
-	 */
-	RMobilePhone::TMobilePhoneBatteryInfoV1 GetBatteryinfo();
-	/**
-	 * Get RF state information
-	 */
-	TRfStateInfo GetRfStateInfo();
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * The return error value of AT command executed 
-	 */
-	TInt GetErrorValue();
-    /**
-     * Start the request 
-     */
-	virtual void StartRequest();
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGetBattery(CGlobalPhonemanager& aGloblePhone, 
-		          CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/*
-	 * The return battery infomation  of AT command executed 
-	 */
-	RMobilePhone::TMobilePhoneBatteryInfoV1 iBatteryInfo; 
-	/*
-	 * The return error value of AT command executed 
-	 */
-	TInt iError;
-	/**
-	 * The RF state information
-	 */
-	TRfStateInfo iRfStateInfo;
-	
-};
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atgetcellinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-// 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:
-// @file atgetcellinfo.h
-//  
-
-#ifndef __ATGETCELLINFO_H__
-#define __ATGETCELLINFO_H__
-
-//system include
-#include <etelmm.h>
-//user include
-#include "atcommandbase.h"
-// forward class
-
-/**
- * class CATGetCellInfo 
- * brief Determines the Cell infomation present in the GSM Network.
- *
- * CATGetCellInfo inherits from the CAtCommandBase class. 
- * This class transmits the AT+CCED=0,7\r Command in order to get 
- * Cell infomation
- */
-class CATGetCellInfo : public CAtCommandBase
-{
-public:
-	static CATGetCellInfo* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                        CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGetCellInfo();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Start this request
-	 */
-	virtual void StartRequest();
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGetCellInfo(CGlobalPhonemanager& aGloblePhone, 
-		           CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/**
-	 * The return Cell infomation  of AT command executed 
-	 */
-	RMmCustomAPI::TMmCellInfo::TGSMCellInfo iCellInfo; 
-	/**
-	 * The return error value of AT command executed 
-	 */
-	TInt iError;	
-};
-#endif //__ATGETCELLINFO_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atgetfdnstatus.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-// 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:
-// @file atgetfdnstatus.h
-// 
-
-#ifndef __ATGETFDNSTATUS_H__
-#define __ATGETFDNSTATUS_H__
-
-//system include
-#include <etelmm.h>
-#include <cmmutility.h>
-//user include
-#include "atcommandbase.h"
-
-
-/**
- * class CATGetFdnStatus 
- *
- * CATGetFdnStatus inherits from the CAtCommandBase class. 
- * This class transmits the AT+CPBS? Command in order to get 
- * FDN status
- */
-class CATGetFdnStatus : public CAtCommandBase
-{
-public:
-	static CATGetFdnStatus* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                       CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGetFdnStatus();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Get 
-	 */
-	TBool GetFdnStatus();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * The return error value of AT command executed 
-	 */
-	TInt GetErrorValue();
-
-	virtual void StartRequest();
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGetFdnStatus(CGlobalPhonemanager& aGloblePhone, 
-		          CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/*
-	 * iFdnStatus is ETrue if FDN was activing
-	 */
-	TBool iFdnStatus; 
-	/*
-	 * The return error value of AT command executed 
-	 */
-	TInt iError;
-	
-	
-};
-#endif //__ATGETFDNSTATUS_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atgetfdnsupport.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-// 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:
-// @file atgetfdnsupport.h
-// 
-
-#ifndef __ATGETFDNSUPPORT_H__
-#define __ATGETFDNSUPPORT_H__
-
-//user include
-#include "atcommandbase.h"
-
-
-/**
- * class CATGetFdnSupport 
- *
- * CATGetFdnSupport inherits from the CAtCommandBase class. 
- * This class transmits the AT+CPBS=? Command in order to get 
- * FDN support
- */
-class CATGetFdnSupport : public CAtCommandBase
-{
-public:
-	static CATGetFdnSupport* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                          CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGetFdnSupport();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Get 
-	 */
-	TBool GetFdnSupport();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * The return error value of AT command executed 
-	 */
-	TInt GetErrorValue();
-
-	virtual void StartRequest();
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGetFdnSupport(CGlobalPhonemanager& aGloblePhone, 
-		             CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/*
-	 * iFdnSupport is ETrue if FDN was supported
-	 */
-	TBool iFdnSupport; 
-	/*
-	 * The return error value of AT command executed 
-	 */
-	TInt iError;
-	
-};
-#endif //__ATGETFDNSUPPORT_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atgetimei.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-// 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:
-// @file atgetimei.h
-// This contains CATGetImei which is defines the AT command for Getting Serial Numuber
-// 
-
-
-#ifndef ATGETIMEI_H__
-#define ATGETIMEI_H__
-
-//system include
-#include <etelmm.h>
-//user include
-#include "atcommandbase.h"
-/**
- * \class CATGetImei 
- * \brief get the phone Serial Numuber in the GSM Network.
- *
- * CATGetImei inherits from the CAtCommandBase class. 
- * This class transmits the AT+CGSN Command in order to get Serial Numuber 
- * in the phone.
- */
-class CATGetImei : public CAtCommandBase
-{
-public:
-	static CATGetImei* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                    CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGetImei();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Get the return value executed AT Command
-	 */
-	RMobilePhone::TMobilePhoneIdentityV1 GetPhoneImei();
-	/**
-	 * Get error value executed AT Command
-	 */
-	TInt GetErrorValue();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Start this request
-	 */
-	virtual void StartRequest();
-	
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGetImei(CGlobalPhonemanager& aGloblePhone, 
-		       CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/**
-	 * The return infomation is  multi-word?
-	 */
-	TBool iMoreInfoFlag;
-	/**
-	 * The return phone infomation  of AT command executed 
-	 */
-	RMobilePhone::TMobilePhoneIdentityV1 iPhoneId;
-	/**
-	 * The return error value of AT command executed 
-	 */
-	TInt iError;
-};
-
-#endif // ATGETIMEI_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atgetmanufacturer.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-// 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:
-// @file atgetmanufacturer.h
-// This contains CATGetManufacturer which is defines the AT command for Getting manufacturer
-// 
-
-#ifndef ATGETMANUFACTURER_H__
-#define ATGETMANUFACTURER_H__
-
-//system include
-#include <etelmm.h>
-//user include
-#include "atcommandbase.h"
-/**
- * \class CATGetManufacturer 
- * \brief get the phone manufacturer in the GSM Network.
- *
- * CATGetManufacturer inherits from the CAtCommandBase class. 
- * This class transmits the AT+CGMI Command in order to get manufacturer 
- * in the phone.
- */
-class CATGetManufacturer : public CAtCommandBase
-{
-public:
-	static CATGetManufacturer* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                            CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGetManufacturer();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Get the return value executed AT Command
-	 */
-	RMobilePhone::TMobilePhoneIdentityV1 GetPhoneManufacturer();
-	/**
-	 * Get error value executed AT Command
-	 */
-	TInt GetErrorValue();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Start this request
-	 */
-	virtual void StartRequest();
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGetManufacturer(CGlobalPhonemanager& aGloblePhone, 
-		               CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/**
-	 * The return infomation is  multi-word?
-	 */
-	TBool iMoreInfoFlag;
-	/**
-	 * The return phone infomation  of AT command executed 
-	 */
-	RMobilePhone::TMobilePhoneIdentityV1 iPhoneId;
-	/**
-	 * The return error value of AT command executed 
-	 */
-	TInt iError;
-};
-#endif // ATGETMANUFACTURER_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atgetmodel.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-// 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:
-// @file atgetmodel.h
-// This contains CATGetModel which is defines the AT command for Getting Model
-// 
-
-#ifndef ATGETMODEL_H__
-#define ATGETMODEL_H__
-
-//system include
-#include <etelmm.h>
-//user include
-#include "atcommandbase.h"
-/**
- * \class CATGetModel 
- * \brief get the phone Model in the GSM Network.
- *
- * CATGetModel inherits from the CAtCommandBase class. 
- * This class transmits the AT+CGMM Command in order to get Serial Numuber 
- * in the phone
- */
-class CATGetModel : public CAtCommandBase
-{
-public:
-	static CATGetModel* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                     CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGetModel();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Get the return value executed AT Command
-	 */
-	RMobilePhone::TMobilePhoneIdentityV1 GetPhoneModel();
-	/**
-	 * Get error value executed AT Command
-	 */
-	TInt GetErrorValue();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Start this request
-	 */
-	virtual void StartRequest();
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGetModel(CGlobalPhonemanager& aGloblePhone, 
-		        CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/**
-	 * The return infomation is  multi-word?
-	 */
-	TBool iMoreInfoFlag;
-	/**
-	 * The return phone infomation  of AT command executed 
-	 */
-	RMobilePhone::TMobilePhoneIdentityV1 iPhoneId;
-	/**
-	 * The return error value of AT command executed 
-	 */
-	TInt iError;
-};
-
-#endif // ATGETMODEL_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atgetmodemstatus.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-// 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:
-// @file atgetmodemstatus.h
-// This contains CATGetModemStatus which is defines the AT command for Getting modem staus
-// 
-
-/**
- * @file
- *
- * AT command definition
- * This file defines the AT command for Getting Modem status
- * This queries the ME (Mobile Equipment) Modem,
- * using a standard (ETSI GSM 07.07 April 1997) AT command : AT
- * 
- */
-
-#ifndef __CMODEMSTATUS_H__
-#define __CMODEMSTATUS_H__
-
-//user include
-#include "atcommandbase.h"
-
-
-/**
- * \class CATGetModemStatus 
- * \brief get Modem status.
- *
- * CATGetModemStatus inherits from the CAtCommandBase class. 
- * This class transmits the AT Command in order to get Modem status 
- * in the phone, using a standard AT command : AT+CGSN
- */
-class CATGetModemStatus : public CAtCommandBase
-{
-public:
-	static CATGetModemStatus* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                           CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGetModemStatus();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	/**
-	 * Get error value executed AT Command
-	 */
-	TInt GetErrorValue();
-	/**
-	 * Start this request
-	 */
-	virtual void StartRequest();
-	
-	/**
-	 * Start this request
-	 */
-	void Complete(TInt aError);
-	
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGetModemStatus(CGlobalPhonemanager& aGloblePhone, 
-		              CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/**
-	 * The return error value of AT command executed 
-	 */
-	TInt iError;
-
-};
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atgetnetworkinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-// 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:
-// @file atgetnetworkinfo.h
- /**
- * @file
- * Network Header file.
- * AT command definition
- * This file defines the AT command for Getting GSM Networ info
- * Describes the GSM Network & Operator information.
- * Using a standard (ETSI GSM 07.07 April 1997) AT command : AT
- * 
- */
-#ifndef __CNETWORK_H__
-#define __CNETWORK_H__
-
-//system include
-#include <etelmm.h>
-//user include
-#include "atcommandbase.h"
-
-/**
- * Determines GSM Network and Operator Information.
- *
- * CATNetworkInfo inherits from the CAtCommandBase class. 
- * This class transmits the Set Network Operator Command (AT+COPS=x,x) in numeric, short 
- * alphanumeric and long alphanumeric formats. It also determines the current operator 
- * using the operator query command (AT+COPS?).
- */
-class CATNetworkInfo : public CAtCommandBase
-{
-public:
-	static CATNetworkInfo* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                        CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATNetworkInfo();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Get the return value executed AT Command
-	 */
-	RMobilePhone::TMobilePhoneNetworkInfoV5 GetNetWorkInfo();
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Get error value executed AT Command
-	 */
-	TInt GetErrorValue();
-	
-	void SetToGetHomeNwk();
-	/**
-	 * Start this request
-	 */
-	virtual void StartRequest();
-	
-	enum TPortAccess
-		{
-		EPortAccessAllowed,
-		EPortAccessDenied
-		};
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATNetworkInfo(CGlobalPhonemanager& aGloblePhone, 
-		           CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/**
-	 * The return phone infomation  of AT command executed 
-	 */
-	RMobilePhone::TMobilePhoneNetworkInfoV5 iNetworkInfo; 
-	/**
-	 * The return error value of AT command executed 
-	 */
-	TInt iError;
-	
-	TInt iNameFormat;
-	
-	TBool iGetHomeNwk;
-	
-};
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atgetnetworkregistrationstatus.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-// 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:
-// @file atgetnetworkregistrationstatus.h
-// This contains CATNetworkRegistration which is defines the AT command for Getting
-// network registration status
-// 
-
-#ifndef __CNETWORKREGISTRATION_H__
-#define __CNETWORKREGISTRATION_H__
-
-//user include
-#include "atcommandbase.h"
-
-// forward class
-class CATNetworkRegStatusChange;
-/**
- * class CATNetworkRegistration 
- *
- * CATNetworkRegistration inherits from the CAtCommandBase class. 
- * This class transmits the AT+CREG=? Command in order to get 
- * network registration status
- */
-class CATNetworkRegistration : public CAtCommandBase
-{
-public:
-	static CATNetworkRegistration* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                                CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATNetworkRegistration();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Get error value executed AT Command
-	 */
-	TInt GetErrorValue();
-	
-	virtual void StartRequest();
-	
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATNetworkRegistration(CGlobalPhonemanager& aGloblePhone, 
-		                   CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-	
-private:	
-	/*
-	 * The return network registration status infomation  of AT command executed 
-	 */
-	RMobilePhone::TMobilePhoneRegistrationStatus iRegistrationStatus;
-	/*
-	 * The return error value of AT command executed 
-	 */
-	TInt iError;
-};
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atgetphonecellinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-// 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:
-// @file atgetphonecellinfo.h
-// This contains CATGetPhoneCellInfo which is defines the AT command for Getting Battery status
-// 
-
-#ifndef __ATGETPHONECELLINFO_H__
-#define __ATGETPHONECELLINFO_H__
-
-//system include
-#include <etelmm.h>
-
-//user include
-#include "atcommandbase.h"
-
-// forward class
-
-/**
- * class CATGetPhoneCellInfo 
- * brief Determines the Operators present in the GSM Network.
- *
- * CATGetPhoneCellInfo inherits from the CAtCommandBase class. 
- * This class transmits the AT+COPS=? Command in order to get 
- * Battery status in this phone
- */
-class CATGetPhoneCellInfo : public CAtCommandBase
-{
-public:
-	static CATGetPhoneCellInfo* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                             CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGetPhoneCellInfo();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-
-	/**
-	 * Start this request
-	 */
-	virtual void StartRequest();
-	
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGetPhoneCellInfo(CGlobalPhonemanager& aGloblePhone, 
-		                CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-	
-private:
-	/*
-	 * The return battery infomation  of AT command executed 
-	 */
-	RMobilePhone::TMobilePhoneCellInfoV9 iCellInfo;
-	
-	/**
-	 * Store the error code
-	 */
-	TInt iError;
-};
-#endif //__ATGETPHONECELLINFO_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atgetrevision.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-// 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:
-// @file atgetrevision.h
-// This contains CATGprsAttach which is defines the AT command for retrieving the
-// protocol stack revision being used.
-
-
-#ifndef ATGETREVISION_H__
-#define ATGETREVISION_H__
-
-//system include
-#include <etelmm.h>
-//user include
-#include "atcommandbase.h"
-/**
- * \class CATGetRevision 
- * \brief retrieving the protocol stack revision being used.
- *
- * CATGetRevision inherits from the CAtCommandBase class. 
- * This class transmits the AT+CGMR Command in order to the protocol 
- * stack revision being used 
- * 
- */
-class CATGetRevision : public CAtCommandBase
-{
-public:
-	static CATGetRevision* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                        CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGetRevision();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Get the return value executed AT Command
-	 */
-	RMobilePhone::TMobilePhoneIdentityV1 GetPhoneRevision();
-	/**
-	 * Get error value executed AT Command
-	 */
-	TInt GetErrorValue();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Start this request
-	 */
-	virtual void StartRequest();
-	
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGetRevision(CGlobalPhonemanager& aGloblePhone, 
-		           CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-	
-private:
-	/**
-	 * The return infomation is  multi-word?
-	 */
-	TBool iMoreInfoFlag;
-	/**
-	 * The return phone infomation  of AT command executed 
-	 */
-	RMobilePhone::TMobilePhoneIdentityV1 iPhoneId;
-	/**
-	 * The return error value of AT command executed 
-	 */
-	TInt iError;
-};
-
-#endif // ATGETREVISION_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atgetsignalstrength.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-// 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:
-// @file atgetsignalstrength.h
-// 
-
-/**
- * @file
- *
- * AT command definition
- * This file defines the AT command for Getting Signal level
- * This queries the ME (Mobile Equipment) Signal level,
- * using a standard (ETSI GSM 07.07 April 1997) AT command : AT+CSQ?
- * 
- */
-
-#ifndef __CSIGNAL_H__
-#define __CSIGNAL_H__
-
-//system include
-#include <etelmm.h>
-//user include
-#include "atcommandbase.h"
-
-// forward class
-class MCallBackPhoneHander;
-/**
- * \class CATGetSignal 
- * \brief get Modem status.
- *
- * CATGetSignal inherits from the CAtCommandBase class. 
- * This class transmits the AT Command in order to get  Getting Signal level
- * in the phone, using a standard AT command : AT+CSQ?
- */	
-class CATGetSignal : public CAtCommandBase
-{
-public:
-	static CATGetSignal* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                      CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGetSignal();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-    /**
-     * Get network signal information of phone
-     */ 
-	TTsySignalInfo getSignalInfo();
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * The return error value of AT command executed 
-	 */
-	TInt GetErrorValue();
-	/**
-	 * Start this request
-	 */
-	virtual void StartRequest();
-	
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGetSignal(CGlobalPhonemanager& aGloblePhone, 
-		         CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-	
-private:
-	TTsySignalInfo iSignalInfo; 
-	TInt iError;
-};
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atgetsimstatusready.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-// 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:
-// @file atgetsimstatusready.h
-// 
-/**
- * @file
- *
- * AT command definition
- * This file defines the AT command for Getting SIM card status
- * 
- */
-
-#ifndef __CATSIMCARD_H__
-#define __CATSIMCARD_H__
-
-//user include
-#include "atcommandbase.h"
-
-// forward class
-class MCallBackPhoneHander;
-/**
- * \class CATSIMCard 
- *
- * CATSIMCard inherits from the CAtCommandBase class. 
- * This class transmits the AT Command in order to get SIM card status 
- * in the phone, using a standard AT command : AT+CCID=?
- */
-class CATSIMCard : public CAtCommandBase
-{
-public:
-	static CATSIMCard* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                    CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATSIMCard();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	/**
-	 * Get error value executed AT Command
-	 */
-	TInt GetErrorValue();
-	/**
-	 * Start this request
-	 */
-	virtual void StartRequest();
-	
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATSIMCard(CGlobalPhonemanager& aGloblePhone, 
-		       CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	TInt iError;
-};
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atnetworkregstatuschange.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-// 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:
-// @file atnetworkregstatuschange.h
-// AT command definition
-// This file defines the AT command used to Notify the phones current network
-//registration status..
-//
-#ifndef __ATNETWORKREGSTATUSCHANGE_H__
-#define __ATNETWORKREGSTATUSCHANGE_H__
-
-//system include
-
-//user include
-#include "atcommandbase.h"
-
-/**
- * CATNetworkRegStatusChange inherits from the CAtCommandBase class. 
- * AT command to Notify the phones current network
- * registration status.
- * This class transmits the following commands: +CREG:
- */
-class CATNetworkRegStatusChange : public CAtCommandBase
-	{
-public:
-	static CATNetworkRegStatusChange* NewL(CGlobalPhonemanager& aGloblePhone,
-			                    CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	static CATNetworkRegStatusChange* NewLC(CGlobalPhonemanager& aGloblePhone,
-			                     CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	virtual ~CATNetworkRegStatusChange();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Start Execute AT Command
-	 */
-	virtual void ExecuteCommand(){};
-	/**
-	 * Parses the +CGREG unsolicited string from the modem.
-	 * An example response would be '+CREG: 2' where the value denotes the
-	 * current registration status.
-	 * If parsing succeeds then aRegStatus is updated.
-	 * 
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	/**
-	 * 
-	 * 
-	 */
-	void Enable();
-	/**
-	 * 
-	 * 
-	 */
-	void Disable();
-	
-	
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATNetworkRegStatusChange(CGlobalPhonemanager& aGloblePhone,
-				   CCtsyDispatcherCallback& aCtsyDispatcherCallback);	
-	/**
-	 * 2nd Constructor
-	 * This function must be called in his subtype class for 
-	 * creating instance of class CRespondBufParser
-	 */
-	void ConstructL();
-	
-private:
-	/**
-	 * 
-	 * 
-	 */
-	RMobilePhone::TMobilePhoneRegistrationStatus iRegistrationStatus;
-	/*
-	 * The return value of AT command executed 
-	 */
-	TInt iError;
-	
-	};
-
-#endif //__ATNETWORKREGSTATUSCHANGE_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atnotifycellinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-// 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:
-// @file atnotifycellinfo.h
-// AT command definition
-// This file defines the AT command used to Notify Cell infomation
-
-#ifndef __ATNODIFYCELLINFO_H__
-#define __ATNODIFYCELLINFO_H__
-
-//system include
-
-//user include
-#include "atcommandbase.h"
-
-/**
- * CATNotifyCellInfo inherits from the CAtCommandBase class. 
- * AT command to Notify the phones current network
- * registration status.
- * This class transmits the following commands: +CCED:
- */
-class CATNotifyCellInfo : public CAtCommandBase
-	{
-public:
-	static CATNotifyCellInfo* NewL(CGlobalPhonemanager& aGloblePhone,
-			                    CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	static CATNotifyCellInfo* NewLC(CGlobalPhonemanager& aGloblePhone,
-			                     CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	virtual ~CATNotifyCellInfo();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Start Execute AT Command
-	 */
-	virtual void ExecuteCommand(){};
-	/**
-	 * Parses the +CGREG unsolicited string from the modem.
-	 * An example response would be '+CREG: 2' where the value denotes the
-	 * current registration status.
-	 * If parsing succeeds then aRegStatus is updated.
-	 * 
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	/**
-	 * 
-	 * 
-	 */
-	void Enable();
-	/**
-	 * 
-	 * 
-	 */
-	void Disable();
-	
-	
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATNotifyCellInfo(CGlobalPhonemanager& aGloblePhone,
-				   CCtsyDispatcherCallback& aCtsyDispatcherCallback);	
-	/**
-	 * 2nd Constructor
-	 * This function must be called in his subtype class for 
-	 * creating instance of class CRespondBufParser
-	 */
-	void ConstructL();
-	
-private:
-	/**
-	 * The return Cell infomation  of AT command executed 
-	 */
-	RMmCustomAPI::TMmCellInfo::TGSMCellInfo iCellInfo; 
-	/*
-	 * The return value of AT command executed 
-	 */
-	TInt iError;
-	
-	};
-
-#endif //__ATNODIFYCELLINFO_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atselectnetwork.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-// 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:
-// @file atselectnetwork.h
-//This file defines the AT command for Selecting Network
-
-#ifndef __CATSELECTNETWORK_H__
-#define __CATSELECTNETWORK_H__
-
-//user include
-#include "atcommandbase.h"
-
-/**
- * class CATSelectNetwork 
- *
- * CATSelectNetwork inherits from the CAtCommandBase class. 
- * This class transmits the AT+COPS=1,2,x Command in order to  
- * Select Network
- */
-class CATSelectNetwork : public CAtCommandBase
-{
-public:
-	static CATSelectNetwork* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                          CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATSelectNetwork();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Cancel the AT Command execution
-	 */
-	virtual void CancelCommand();
-	
-	virtual void StartRequest();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	void SetNetworkSelection(const RMobilePhone::TMobilePhoneNetworkManualSelection& aNetworkManualSelection);
-public:
-	TBool iCommandRunning;
-	TBool iCommandCancel;
-	TBool iCommandSetBack;
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATSelectNetwork(CGlobalPhonemanager& aGloblePhone, 
-		             CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-	/**
-	 * 
-	 */
-	void ExecuteSetBackCommand();
-
-private:
-	TInt iError;
-	RMobilePhone::TMobilePhoneNetworkManualSelection iNetworkManualSelection;
-};
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atselectnetworkmode.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-// 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:
-// @file atselectnetworkmode.h
-//This file defines the AT command for Selecting Network Mode
-
-
-#ifndef __CATSELECTNETWORKMODE_H__
-#define __CATSELECTNETWORKMODE_H__
-
-//user include
-#include "atcommandbase.h"
-
-/**
- * class CATSelectNetworkMode 
- *
- * CATSelectNetworkMode inherits from the CAtCommandBase class. 
- * This class transmits the AT+COPS=x Command in order to  
- * Select Network Mode
- */
-class CATSelectNetworkMode : public CAtCommandBase
-{
-public:
-	static CATSelectNetworkMode* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                              CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATSelectNetworkMode();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	
-	virtual void StartRequest();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	void SetNetworkSelection(const TInt aNetworkSelection);
-
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATSelectNetworkMode(CGlobalPhonemanager& aGloblePhone, 
-		                 CCtsyDispatcherCallback& aCtsyDispatcherCallback);	
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	TInt iError;
-	TInt iNetworkSelection;
-};
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/atsetnotifycell.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-// 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:
-// @file atsetnotifycell.h
-//
-
-
-#ifndef __ATSETNOTIFYCELL_H__
-#define __ATSETNOTIFYCELL_H__
-
-//system include
-#include "atcommandbase.h"
-
-class CATGetPhoneCellInfo;
-class CATNotifyCellInfo;
-/**
- * class CATSetNotifyCellInfo 
- *
- * CATSetNotifyCellInfo inherits from the CAtCommandBase class. 
- * This class transmits the AT+CCED=1,1 Command in order to set 
- * Notify Cell infomation
- */
-class CATSetNotifyCellInfo : public CAtCommandBase
-{
-public:
-	static CATSetNotifyCellInfo* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                              CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATSetNotifyCellInfo();
-
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	/**
-	 * The return error value of AT command executed 
-	 */
-	TInt GetErrorValue();
-	
-	/**
-	 * Start the request
-	 */
-	virtual void StartRequest();
-	
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATSetNotifyCellInfo(CGlobalPhonemanager& aGloblePhone, 
-		                 CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-	
-private:
-	TInt iError;
-};
-#endif //__ATSETNOTIFYCELL_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/getcurrentnetworkinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-// 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:
-// @file getcurrentnetworkinfo.h
-// 
-
-#ifndef __GETCURRENTNETWORKINFO_H__
-#define __GETCURRENTNETWORKINFO_H__
-
-//user include
-#include "atcommandcontrolbase.h"
-#include "athelpercommand.h"
-
-// forward class
-class CATNetworkInfo;
-class CATHelperCommand;
-
-/**
- * CGetCurrentNetworkInfo inherits from the CATCommandControlBase class. 
- *
- */
-class CGetCurrentNetworkInfo : public CATCommandControlBase
-{
-public:
-    /**
-     * Two-phased constructor.
-     * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-     */ 
-	static CGetCurrentNetworkInfo* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                          CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CGetCurrentNetworkInfo();
-	virtual void AtCommandExecuteComplete(TAtEventSource aEventSource, TInt aStatus);
-	void StartRequest();
-	/**
-	 * Get the return value executed AT Command
-	 */
-	RMobilePhone::TMobilePhoneNetworkInfoV5 GetNetWorkInfo();
-	/**
-	 * Get error value executed AT Command
-	 */
-	TInt GetErrorValue();
-	
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CGetCurrentNetworkInfo(CGlobalPhonemanager& aGloblePhone, 
-		             CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-	
-private:
-    /**
-     * Start the AT command
-     */
-	void StartATCommand(CAtCommandBase* aAtCommand);
-	
-	/**
-	 * Complete AT command
-	 */
-	void CompeteATCommand(CAtCommandBase* aAtCommand);
-	
-	/**
-	 * Set long name format for modem
-	 */
-	void SetLongNameFormat();
-	
-	/**
-	 * Get the long name from modem
-	 */
-	void GetNetworkLongName();
-	
-	/**
-	 * Set short name format for modem
-	 */
-	void SetShortNameFormat();
-	
-	/**
-	 * Get the short name from modem
-	 */
-	void GetNetworkShortName();
-	
-	/**
-	 * Set numberic format
-	 */
-	void SetNumbericFormat();
-	
-	/**
-	 * Get the country code and network Id
-	 */
-	void GetCountryCodeAndNetworkId();
-	
-	/**
-	 * Handle the error
-	 */
-	void HandleGetCurNetworkError(TInt aError);
-	
-	/**
-	 * Handle the completion of geting current network information
-	 */
-	void HandleGetCurNetworkComplete();
-private:
-    /**
-     * The AT command to get the network info
-     */
-	CATNetworkInfo* iATNetworkInfo;
-	
-	/**
-	 * The Helper AT command @see CATHelperCommand
-	 */
-	CATHelperCommand* iATHelperCommand;
-	
-	/**
-	 * The network info
-	 */
-	RMobilePhone::TMobilePhoneNetworkInfoV5 iNetworkInfo;
-    
-	/**
-	 * Define the states for retrieving the network information
-	 */
-	enum TGetCurNetworkState
-		{
-		/**
-		 * The state is unknown
-		 */
-		EATUnknown,
-		
-		/**
-		 * The state of seting long format
-		 */
-		EATSetLongFormat,
-		
-		/**
-		 * The state of getting long name 
-		 */
-		EATGetLongName,
-		
-		/**
-		 * The state of seting short name format 
-		 */
-		EATSetShortFormat,
-		
-		/**
-		 * The state of getting short name
-		 */
-		EATGetShortName,
-		
-		/**
-		 * The state of Seting the numberic format
-		 */
-		EATSetNumbericFormat,
-		
-		/**
-		 * The state of geting country code and network Id
-		 */
-		EATGetCountryCodeAndNetwrokId
-		} iState;
-
-};
-#endif //__GETCURRENTNETWORKINFO_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/getfdnstatus.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-// 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:
-// @file getfdnstatus.h
-// 
-// 
-
-#ifndef __GETFDNSTATUS_H__
-#define __GETFDNSTATUS_H__
-
-//user include
-#include "atcommandcontrolbase.h"
-
-// forward class
-class CATGetFdnStatus;
-class CATGetFdnSupport;
-
-/**
- * CGetFdnStatus inherits from the CATCommandControlBase class. 
- *
- */
-class CGetFdnStatus : public CATCommandControlBase
-{
-public:
-    /**
-     * Two-phased constructor.
-     * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-     */ 
-	static CGetFdnStatus* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                       CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CGetFdnStatus();
-	virtual void AtCommandExecuteComplete(TAtEventSource aEventSource, TInt aStatus);
-	void StartRequest();	
-
-protected: 
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CGetFdnStatus(CGlobalPhonemanager& aGloblePhone, 
-		          CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	void StartATCommand(CAtCommandBase* iAtCommand);
-	void EndATCommand(CAtCommandBase* aAtCommand);
-	void FdnSupportComplete(const TInt aError);
-	void FdnStatusComplete(const TInt aError);
-private:
-	CATGetFdnSupport* iATGetFdnSupport;
-	CATGetFdnStatus* iATGetFdnStatus;
-	TLtsyATCommandType iATType;
-	/**
-	 *
-	 */
-	enum 
-		{
-		EATNone,
-		EATGetFdnStatus,
-		EATGetFdnSupport
-		} iATCommandName;
-
-};
-#endif //__GETFDNSTATUS_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/getoperatorname.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-// 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:
-// @file getoperatorname.h
-// 
-
-#ifndef __GETOPERATORNAME_H__
-#define __GETOPERATORNAME_H__
-
-//user include
-#include "atcommandcontrolbase.h"
-#include "athelpercommand.h"
-
-// forward class
-class CATNetworkInfo;
-class CATHelperCommand;
-
-/**
- * CGetOperatorNmae inherits from the CATCommandControlBase class. 
- *
- */
-class CGetOperatorNmae : public CATCommandControlBase
-{
-public:
-    /**
-     * Two-phased constructor.
-     * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-     */ 
-	static CGetOperatorNmae* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                          CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CGetOperatorNmae();
-	virtual void AtCommandExecuteComplete(TAtEventSource aEventSource, TInt aStatus);
-	void StartRequest();
-	void SetRequestTypeL(TInt aIpc);
-	
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CGetOperatorNmae(CGlobalPhonemanager& aGloblePhone, 
-		             CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-	
-private:
-	void StartATCommand(CAtCommandBase* aAtCommand);
-	void EndATCommand(CAtCommandBase* aAtCommand);
-	void SetOperFormatComplete(const TInt aError);
-	void CtsyDispatcherCallBack(const TInt aError);
-private:
-	CATNetworkInfo* iATNetworkInfo;
-	CATHelperCommand* iATHelperCommand;
-	RMobilePhone::TMobilePhoneNetworkInfoV5 iNetworkInfo;
-	TInt iError;
-	TInt iRequestIpc;
-	TLtsyATCommandType iATType;
-	enum 
-		{
-		EATNone,
-		EATNetworkInfo,
-		EATSimpleCommand
-		} iATCommandName;
-
-};
-#endif //__GETOPERATORNAME_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/getphoneid.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-// 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:
-// @file getphoneid.h
-// 
-
-#ifndef __GETPHONEID_H__
-#define __GETPHONEID_H__
-
-//user include
-#include "atcommandcontrolbase.h"
-
-// forward class
-class CATGetImei;
-class CATGetManufacturer;
-class CATGetModel;
-class CATGetRevision;
-
-/**
- * CGetPhoneID inherits from the CATCommandControlBase class. 
- *
- */
-class CGetPhoneID : public CATCommandControlBase
-{
-public:
-    /**
-     * Two-phased constructor.
-     * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-     */ 
-	static CGetPhoneID* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                     CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CGetPhoneID();
-
-	virtual void AtCommandExecuteComplete(TAtEventSource aEventSource, TInt aStatus);
-	void StartRequest();
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CGetPhoneID(CGlobalPhonemanager& aGloblePhone, 
-		        CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	void StartATCommand(CAtCommandBase* aAtCommand);
-	void EndATCommand(CAtCommandBase* aAtCommand);
-	void GetImeiComplete(const TInt aError);
-	void GetManufacturerComplete(const TInt aError);
-	void GetModelComplete(const TInt aError);
-private:
-	RMobilePhone::TMobilePhoneIdentityV1 iPhoneId;
-	CATGetImei* iATGetImei;
-	CATGetManufacturer* iATGetManufacturer;
-	CATGetModel* iATGetModel;
-	CATGetRevision* iATGetRevision;
-	TLtsyATCommandType iATType;
-
-};
-#endif //__GETPHONEID_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/initializephone.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,226 +0,0 @@
-// 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:
-// @file initializephone.h
-// 
-
-#ifndef __INITIALIZEPHONE_H__
-#define __INITIALIZEPHONE_H__
-
-//user include
-#include "atcommandcontrolbase.h"
-#include "globalphonemanager.h"
-#include "atipcrequestcompleteobserver.h"
-
-// forward class
-class CATGetModemStatus;
-class CATNetworkRegistration;
-class CATSIMCard;
-class CATNetworkInfo;
-class CATGetSignal;
-class CATGetBattery;
-class CATHelperCommand;
-class CATNetworkRegStatusChange;
-class CNotifyBatteryAndSignal;
-class CGetCurrentNetworkInfo;
-
-/**
- * CInitializePhone inherits from the CATCommandControlBase class. 
- *
- */
-class CInitializePhone : public CATCommandControlBase, public MIpcRequestCompleteObserver
-{
-public:
-    /**
-     * Two-phased constructor.
-     * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 * @param aNtwkRegStatusChange
-	 * @param aNotifyBatteryAndSignal
-     */
-	static CInitializePhone* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                           CCtsyDispatcherCallback& aCtsyDispatcherCallback,
-		                           CATNetworkRegStatusChange& aNtwkRegStatusChange,
-		                           CNotifyBatteryAndSignal& aNotifyBatteryAndSignal);
-
-	/**
-	 * Destructor
-	 *
-	 */
-	~CInitializePhone();
-
-	virtual void AtCommandExecuteComplete(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	 * Start this request 
-	 */
-	void StartRequest();
-    
-	/**
-     * Execute next request stored in request list
-     */
-	void ExecutePendingRequest();
-	
-	/**
-	 * Get the notification when one of the IPC request was complete
-	 */
-	virtual void NotifyIpcRequestComplete(TInt aIpcId);
-	
-	/**
-	 * Append the IPC request to pending request list
-	 */
-	void AppendIpcRequestToPendingListL(TInt aIpc);
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 * @param aNtwkRegStatusChange
-	 * @param aNotifyBatteryAndSignal
-	 */
-	CInitializePhone(CGlobalPhonemanager& aGloblePhone, 
-		              CCtsyDispatcherCallback& aCtsyDispatcherCallback,
-		              CATNetworkRegStatusChange& aNtwkRegStatusChange,
-		              CNotifyBatteryAndSignal& aNotifyBatteryAndSignal);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-	
-private:
-    /**
-     * Execute next AT commane 
-     * 
-     * @param aATString The context of excuting aommand
-     * @param aATType Identify the Type of AT Command
-     */
-	void ExecuteNextATHelpCommand(const TDesC8& aATString,TLtsyATCommandType aATType);
-	/**
-	 * Start an AT Command
-	 * @param  aAtCommand the AT Command class 
-	 */
-	void StartATCommand(CAtCommandBase* aAtCommand);
-	/**
-	 * End an AT Command
-	 * @param  aAtCommand  the AT Command class 
-	 */
-	void CompleteATCommand(CAtCommandBase* aAtCommand);
-	/**
-	 * Get modem status command finished
-	 */
-	void ModemStatusComplete(TInt aError);
-	/**
-	 * Set oper format command finished
-	 */
-	void SetOperFormatComplete(const TInt aError);
-	/**
-	 * Get network infomation command finished
-	 */
-	void NetworkInfoComplete();
-	/**
-	 * Get phone's signal infomation command finished
-	 */
-	void GetSignalComplete(TInt aError);
-	/**
-	 * Get phone's battery infomation command finished
-	 */
-	void GetBatteryComplete(TInt aError);
-	
-private:
-    /**
-     * AT type is used to identify AT command
-     */
-    TInt iATType;
-    
-    /**
-     * Check if the current executed pending request is still running
-     */
-    TBool iIsPendingRequestStillRunning;
-    
-    /**
-     * Get the current modem status
-     * Own
-     */
-	CATGetModemStatus* iATGetModemStatus;
-	
-	/**
-	 * Get the current network registration status
-	 * Own
-	 */
-	CATNetworkRegistration* iNetworkRegStatus;
-	
-	/**
-	 * Get the current SIM card status
-	 * Own
-	 */
-	CATSIMCard* iATSIMCard;
-	
-	/**
-	 * Get the current signal level
-	 * Own
-	 */
-	CATGetSignal* iATGetSignal;
-	
-	/**
-	 * Get the current battery level
-	 * Own
-	 */
-	CATGetBattery* iATGetBattery;
-	
-	/**
-	 * Helper command for get a set of phone info
-	 * Own
-	 */
-	CATHelperCommand* iATHelperCommand;
-	
-	/**
-	 * Get the current netwok info
-	 * Own
-	 */
-	CGetCurrentNetworkInfo* iATGetCurNetworkInfo;
-	
-	/**
-	 * Notify the regisration status change
-	 * Not Own
-	 */
-	CATNetworkRegStatusChange& iNtwkRegStatusChange;
-	
-	/**
-	 * Not Own
-	 */
-	CNotifyBatteryAndSignal& iNotifyBatteryAndSignal;
-	
-	/**
-	 * Network infomation
-	 */
-	RMobilePhone::TMobilePhoneNetworkInfoV5 iNetworkInfo; 
-	
-	/**
-	 * Battery infomation
-	 */
-	RMobilePhone::TMobilePhoneBatteryInfoV1 iBatteryInfo; 
-	
-	/**
-	 * Signal infomation
-	 */
-	TTsySignalInfo iSignalInfo;
-	
-	/**
-     * This store the IPC request which should be handled specially as those IPC requests would be coming together.
-     * So we should store one or another before one of those special IPC requests was complete and then execute next request 
-     * retrived from this store.
-     */
-	RArray<TInt> iPendingRequestList;
-};
-#endif //__INITIALIZEPHONE_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/inc/notifybatteryandsignal.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-// 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:
-// @file notifybatteryandsignal.h
-// 
-// 
-
-#ifndef __NOTIFYBATTERYANDSIGNAL_H__
-#define __NOTIFYBATTERYANDSIGNAL_H__
-
-//user include
-#include <callbacktimer.h>
-#include "atcommandcontrolbase.h"
-#include "globalphonemanager.h"
-
-// forward class
-class CATGetBattery;
-class CATGetSignal;
-
-/**
- * CNotifyBatteryAndSignal inherits from the CATCommandControlBase class. 
- *
- */
-class CNotifyBatteryAndSignal : public CATCommandControlBase,
-                                public MTimerObserver
-{
-public:
-    /**
-     * Two-phased constructor.
-     * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-     */
-	static CNotifyBatteryAndSignal* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                                 CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	 * Destructor
-	 *
-	 */
-	~CNotifyBatteryAndSignal();
-
-	virtual void AtCommandExecuteComplete(TAtEventSource aEventSource, TInt aStatus);
-	void StartRequest();	
-	void StartTimer(TInt aSecond);
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CNotifyBatteryAndSignal(CGlobalPhonemanager& aGloblePhone, 
-		                    CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	//From MTimerObserver
-    virtual void TimerRun(TInt aError);
-    
-private:
-	RMobilePhone::TMobilePhoneBatteryInfoV1 iBatteryInfo; 
-	TTsySignalInfo iSignalInfo; 
-	CATGetBattery* iATGetBattery;
-	CATGetSignal* iATGetSignal;
-	/**
-	 *
-	 */
-	CCallbackTimer* iCallbackTimer;	
-	enum 
-		{
-		EATNone,
-		EATGetBattery,
-		EATGetSignal
-		} iATCommandName;
-
-};
-#endif //__NOTIFYBATTERYANDSIGNAL_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atdetectnetwork.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-// 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:
-// Get the detected network
-
-#include "atdetectnetwork.h"
-#include "mslogger.h"
-
-_LIT8(KDetectNetworkCommand,"AT+COPS=?\r");
-_LIT8(KGetDetectNetworkRepondStr,"+COPS:");
-const TInt KLtsyDetectNetworkReadTimeOut = 80;
-
-// ---------------------------------------------------------------------------
-// NetworkIdL
-// Utility function to translate the 5 digit ASCII network identification 
-// returned by the ME into Mobile Country Code (aCountryCode) and a Mobile 
-// Network Code (aNetworkIdentity) strings. Tbe format returned by the ME is 
-// XXXYY, where XXX represents the Mobile Country Code and YY represents the 
-// Mobile Network Code.
-// ---------------------------------------------------------------------------
-static TInt NetworkIdL(const TDesC8& aCode,
-					   RMobilePhone::TMobilePhoneNetworkCountryCode& aCountryCode, 
-					   RMobilePhone::TMobilePhoneNetworkIdentity& aNetworkIdentity)
-	{
-	if (aCode.Length()!=5)
-		{
-		return KErrGeneral;
-		}
-	
-	aCountryCode.SetLength(3);
-	aCountryCode[0] = aCode[0];
-	aCountryCode[1] = aCode[1];
-	aCountryCode[2] = aCode[2];
-
-	aNetworkIdentity.SetLength(2);
-	aNetworkIdentity[0] = aCode[3];
-	aNetworkIdentity[1] = aCode[4];
-	return KErrNone;
-	}
-// Class CATDetectNetwork
-// ---------------------------------------------------------------------------
-// CATDetectNetwork::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATDetectNetwork* CATDetectNetwork::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATDetectNetwork* self = new(ELeave) CATDetectNetwork(aGloblePhone,aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATDetectNetwork::CATDetectNetwork
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATDetectNetwork::CATDetectNetwork(CGlobalPhonemanager& aGloblePhone, 
-	                               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	iReadTimeOut = KLtsyDetectNetworkReadTimeOut;
-	}
-// ---------------------------------------------------------------------------
-// CATDetectNetwork::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDetectNetwork::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iList= NULL;
-	iCommandRunning = EFalse;
-	iCommandCancel = EFalse;
-	}
-// ---------------------------------------------------------------------------
-// CATDetectNetwork::~CATDetectNetwork
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATDetectNetwork::~CATDetectNetwork()
-	{
-	if(iList)
-		{
-		delete iList;
-		iList = NULL;
-		}
-	}
-// ---------------------------------------------------------------------------
-// CATDetectNetwork::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDetectNetwork::StartRequest()
-	{
-	iCommandRunning = ETrue;
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATDetectNetwork::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDetectNetwork::ExecuteCommand()
-	{
-	iTxBuffer.Copy(KDetectNetworkCommand);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATDetectNetwork::CancelCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDetectNetwork::CancelCommand()
-	{	
-	iCommandCancel = ETrue;
-	}
-// ---------------------------------------------------------------------------
-// CATDetectNetwork::ParseResponseL
-// should be
-// +COPS: (status,"longname","shortname",code),... ,,(list),(list)
-// +COPS: [list of supported (<stat>,long alphanumeric <oper>,short alphanumeric 
-// <oper>,numeric <oper>)s]
-// <stat>:
-// 0 unknown
-// 1 available
-// 2 current
-// 3 forbidden
-// <oper>: string type; <format> indicates if the format is alphanumeric or numeric;
-// long alphanumeric format can be upto 16 characters long and short format up to 8 
-// characters (refer GSM MoU SE.13 [9]); numeric format is the GSM Location Area 
-// Identification number (refer GSM 04.08 [8] subclause 10.5.1.3) which consists of
-// a three BCD digit country code coded as in ITU-T E.212 Annex A [10], plus a two 
-// BCD digit network code, which is administration specific; returned <oper> shall 
-// not be in BCD format, but in IRA characters converted from BCD; hence the number 
-// has structure: (country code digit 3)(country code digit 2)(country code digit 1)
-// (network code digit 2)(network code digit 1)
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDetectNetwork::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) != 0)
-		{
-		iError = KErrGeneral;
-		return ;
-		}
-    if(iList)
-    	{
-    	delete iList;
-    	iList = NULL;
-    	}
-	iList=CMobilePhoneNetworkListV2::NewL();
-	
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,PrecedingLine());
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return ;
-		}
-	if( array[0].MatchF(KGetDetectNetworkRepondStr)==KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return ;
-		}
-	TInt count = array.Count() - 1;
-	for (TInt i = 1;i < count;i++)
-		{
-		RMobilePhone::TMobilePhoneNetworkInfoV2 info;	
-		// This TSY only supports GSM mode so we can hardcode this
-		info.iMode=RMobilePhone::ENetworkModeGsm;
-		TInt val;
-		TLex8 lex(array[i]);
-		lex.Val(val);
-		info.iStatus = RMobilePhone::TMobilePhoneNetworkStatus(val);
-		i++;
-		info.iLongName.Copy(array[i]);		
-		i++;
-		if(array[i].Length() > info.iShortName.MaxLength())
-			info.iShortName.Copy(array[i].Mid(0,info.iShortName.MaxLength()));			
-		else
-			info.iShortName.Copy(array[i]);
-		i++;
-		User::LeaveIfError(NetworkIdL(array[i],info.iCountryCode, info.iNetworkId));  // MNC and MCC	
-		
-		iList->AddEntryL(info); 
-		}
-	CleanupStack::PopAndDestroy();
-	} //ParseResponseL
-// ---------------------------------------------------------------------------
-// ATDetectNetwork::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATDetectNetwork::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone ==aStatus)
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			aStatus = iError;
-			}
-		else
-			return;
-		}
-	if(iCommandCancel)
-		{
-		iCtsyDispatcherCallback.CallbackPhoneGetDetectedNetworksCancelComp(0);
-		}
-	else
-		{
-		iCtsyDispatcherCallback.CallbackPhoneGetDetectedNetworksComp(aStatus,*iList);
-		}
-	iCommandRunning = EFalse;
-	iCommandCancel = EFalse;
-	CAtCommandBase::Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	
-	}
-//
-// End of file
-

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atgetbatteryinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-// 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:
-// Queries the ME battery. Retrieves charge level and battery status
-
-#include "atgetbatteryinfo.h"
-#include "mslogger.h"
-#include "requestbase.h"
-
-
-_LIT8(KGetBatteryCommand,"AT+CIND?\r");
-_LIT8(KGetBatteryCmdRepondStr,"+CIND:");
-// Class CATGetBattery
-// ---------------------------------------------------------------------------
-// CATGetBattery::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetBattery* CATGetBattery::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGetBattery* self = new(ELeave) CATGetBattery(aGloblePhone,
-			                                        aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATGetBattery::CATGetBattery
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetBattery::CATGetBattery(CGlobalPhonemanager& aGloblePhone, 
-	                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetBattery::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetBattery::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iAtType = ELtsyAT_Phone_GetBattery;
-	}
-// ---------------------------------------------------------------------------
-// CATGetBattery::~CATGetBattery
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetBattery::~CATGetBattery()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetBattery::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetBattery::StartRequest()
-	{
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATGetBattery::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetBattery::ExecuteCommand()
-	{
-	iTxBuffer.Copy(KGetBatteryCommand);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATGetBattery::CATGetBattery
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-RMobilePhone::TMobilePhoneBatteryInfoV1 CATGetBattery::GetBatteryinfo()
-	{
-	return iBatteryInfo;
-	}
-// ---------------------------------------------------------------------------
-// CATGetBattery::CATGetBattery
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TRfStateInfo CATGetBattery::GetRfStateInfo()
-	{
-	return iRfStateInfo;
-	}
-// ---------------------------------------------------------------------------
-// CATGetBattery::GetErrorValue
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATGetBattery::GetErrorValue()
-	{
-	return iError;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGetBattery::ParseResponseL
-// This method parses the modems response to the 'AT+CIND?' command.
-// +CIND: <ind>[,<ind>[,...]]
-// An example response is '+CIND: 3,3,1,1,1,1,1,1,1' where first value 
-// denotes the current battery charge level.
-// "battchg" battery charge level (0-5)
-// "signal" signal quality (0-5)
-// "service" service availability (0-1)
-// "sounder" sounder activity (0-1)
-// "message" message received (0-1)
-// "call" call in progress (0-1)
-// "vox" transmit activated by voice activity (0-1)
-// "roam" roaming indicator (0-1)
-// "smsfull" a short message memory storage in the MT has become full (1), or memory locations are available (0);
-// i.e. the range is (0-1)
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetBattery::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) != 0)
-		{
-		iError = KErrGeneral;
-		return ;
-		}
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,PrecedingLine());
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return;
-		}
-	if( array[0].MatchF(KGetBatteryCmdRepondStr)==KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return ;
-		}
-	TInt val = 0;
-	TLex8 lex(array[1]);
-	lex.Val(val);
-	if (val < 0) 
-		{
-		iBatteryInfo.iStatus = RMobilePhone::EPowerStatusUnknown;
-		iBatteryInfo.iChargeLevel = 0;
-		}
-	else	
-		{
-		iBatteryInfo.iStatus = RMobilePhone::EPoweredByBattery;
-		iBatteryInfo.iChargeLevel = val;
-		}
-	TLex8 lexRf(array[3]);
-	lexRf.Val(val);
-	if(val == 1)
-		{
-		iRfStateInfo = ERfsStateInfoNormal;
-		}
-	else
-		{
-		iRfStateInfo = ERfsStateInfoInactive;
-		}
-	
-	CleanupStack::PopAndDestroy(&array);
-	iError = KErrNone;
-	}
-// ---------------------------------------------------------------------------
-// CATGetBattery::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetBattery::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone ==aStatus)
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			aStatus = iError;
-			}
-		else
-			return;
-		}
-	CAtCommandBase::Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	iCtsyDispatcherCallback.CallbackPhoneGetBatteryInfoComp(aStatus,iBatteryInfo);
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atgetcellinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-// 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:
-// CATGetCellInfo
-
-//user include
-#include "atgetcellinfo.h"
-#include "mslogger.h"
-
-_LIT8(KGetCellInfoCommand,"AT+CCED=0,7\r");
-_LIT8(KGetCellInfoCmdRepondStr,"+CCED:");
-// Class CATGetCellInfo
-// ---------------------------------------------------------------------------
-// CATGetCellInfo::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetCellInfo* CATGetCellInfo::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                 CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGetCellInfo* self = new(ELeave) CATGetCellInfo(aGloblePhone,
-			                                          aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATGetCellInfo::CATGetCellInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetCellInfo::CATGetCellInfo(CGlobalPhonemanager& aGloblePhone, 
-	                           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetCellInfo::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetCellInfo::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-// ---------------------------------------------------------------------------
-// CATGetCellInfo::~CATGetCellInfo(
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetCellInfo::~CATGetCellInfo()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetCellInfo::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetCellInfo::StartRequest()
-	{
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATGetCellInfo::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetCellInfo::ExecuteCommand()
-	{
-	iTxBuffer.Copy(KGetCellInfoCommand);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATGetCellInfo::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetCellInfo::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) != 0)
-		{
-		iError = KErrGeneral;
-		return ;
-		}
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,PrecedingLine());
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return;
-		}
-	if( array[0].MatchF(KGetCellInfoCmdRepondStr)==KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return ;
-		}
-	TInt number = 0;
-	TInt val = 0;
-	TLex8 lexBasic(array[5]);
-	lexBasic.Val(val);
-	iCellInfo.iNmr[number].iBSIC = val;
-	TLex8 lexArfcn(array[6]);
-	lexArfcn.Val(val);
-	iCellInfo.iNmr[number].iARFCN = val;
-	TLex8 lexRxlev(array[7]);
-	lexRxlev.Val(val);
-	iCellInfo.iNmr[number].iRxLEV = val;
-	
-	
-    for(TInt i = 14;i < Count-2;i++ )
-    	{
-    	number++;
-    	i = i + 4;
-    	TInt val = 0;
-    	TLex8 lexBasic(array[i]);
-    	lexBasic.Val(val);
-    	i++;
-    	iCellInfo.iNmr[number].iBSIC = val;
-    	TLex8 lexArfcn(array[i]);
-    	lexArfcn.Val(val);
-    	iCellInfo.iNmr[number].iARFCN = val;
-    	i++;
-    	TLex8 lexRxlev(array[i]);
-    	lexRxlev.Val(val);
-    	iCellInfo.iNmr[number].iRxLEV = val;
-    	}
-	TLex8 lexTa(array[Count-2]);
-	lexTa.Val(val);
-    iCellInfo.iTA = val;
-	
-	
-	CleanupStack::PopAndDestroy(&array);
-	iError = KErrNone;
-	}
-// ---------------------------------------------------------------------------
-// CATGetCellInfo::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetCellInfo::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone ==aStatus)
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			aStatus = iError;
-			}
-		else if(aEventSource == EWriteCompletion)
-		    {
-		    return;
-		    }
-		}
-	
-	// complete this request
-	CAtCommandBase::Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	iCtsyDispatcherCallback.CallbackPhoneGetCellInfoComp(aStatus,iCellInfo);
-	if(iIpcCompleteObserver)
-	    {
-	    iIpcCompleteObserver->NotifyIpcRequestComplete(iIpcId);
-	    }
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atgetfdnstatus.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-// 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:
-// CATGetFdnStatus
-
-//user include
-#include "atgetfdnstatus.h"
-#include "mslogger.h"
-
-
-_LIT8(KGetFdnStatusCommand,"AT+CPBS?\r");
-_LIT8(KGetFdnStatusCmdRepondStr,"+CPBS:");
-_LIT8(KFdnString,"FD");
-// Class CATGetFdnStatus
-// ---------------------------------------------------------------------------
-// CATGetFdnStatus::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetFdnStatus* CATGetFdnStatus::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGetFdnStatus* self = new(ELeave) CATGetFdnStatus(aGloblePhone,
-			                                        aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATGetFdnStatus::CATGetFdnStatus
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetFdnStatus::CATGetFdnStatus(CGlobalPhonemanager& aGloblePhone, 
-	                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetFdnStatus::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetFdnStatus::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iFdnStatus = EFalse;
-	iAtType = ELtsyAT_Phone_GetFdnStatus;
-	}
-// ---------------------------------------------------------------------------
-// CATGetFdnStatus::~CATGetFdnStatus
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetFdnStatus::~CATGetFdnStatus()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetFdnStatus::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetFdnStatus::StartRequest()
-	{
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATGetFdnStatus::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetFdnStatus::ExecuteCommand()
-	{
-	iTxBuffer.Copy(KGetFdnStatusCommand);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATGetFdnStatus::CATGetFdnStatus
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TBool CATGetFdnStatus::GetFdnStatus()
-	{
-	return iFdnStatus;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGetFdnStatus::GetErrorValue
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATGetFdnStatus::GetErrorValue()
-	{
-	return iError;
-	}
-// ---------------------------------------------------------------------------
-// CATGetFdnStatus::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetFdnStatus::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) != 0)
-		{
-		iError = KErrGeneral;
-		return ;
-		}
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,PrecedingLine());
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return;
-		}
-	if( array[0].MatchF(KGetFdnStatusCmdRepondStr)==KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return ;
-		}
-	if( array[1].MatchF(KFdnString)!=KErrNotFound)
-		{
-		iFdnStatus = ETrue;
-		}
-	
-	CleanupStack::PopAndDestroy(&array);
-	iError = KErrNone;
-	}
-
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atgetfdnsupport.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-// 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:
-// CATGetFdnSupport
-
-//user include
-#include "atgetfdnsupport.h"
-#include "mslogger.h"
-
-
-_LIT8(KGetFdnSupportCommand,"AT+CPBS=?\r");
-_LIT8(KGetFdnSupportCmdRepondStr,"+CPBS:");
-_LIT8(KFdnString,"FD");
-// Class CATGetFdnSupport
-// ---------------------------------------------------------------------------
-// CATGetFdnSupport::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetFdnSupport* CATGetFdnSupport::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGetFdnSupport* self = new(ELeave) CATGetFdnSupport(aGloblePhone,
-			                                        aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATGetFdnSupport::CATGetFdnSupport
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetFdnSupport::CATGetFdnSupport(CGlobalPhonemanager& aGloblePhone, 
-	                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetFdnSupport::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetFdnSupport::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iFdnSupport = EFalse;
-	iAtType = ELtsyAT_Phone_CheckFdnSupport; 
-	}
-// ---------------------------------------------------------------------------
-// CATGetFdnSupport::~CATGetFdnSupport
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetFdnSupport::~CATGetFdnSupport()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetFdnSupport::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetFdnSupport::StartRequest()
-	{
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATGetFdnSupport::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetFdnSupport::ExecuteCommand()
-	{
-	iTxBuffer.Copy(KGetFdnSupportCommand);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATGetFdnSupport::CATGetFdnSupport
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TBool CATGetFdnSupport::GetFdnSupport()
-	{
-	return iFdnSupport;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGetFdnSupport::GetErrorValue
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATGetFdnSupport::GetErrorValue()
-	{
-	return iError;
-	}
-// ---------------------------------------------------------------------------
-// CATGetFdnSupport::ParseResponseL
-// This method parses the modems response to the 'AT+CPBS=?' command.
-// +CPBS: <pb>
-// <pb> values reserved by this TS:
-// "SM" SIM phonebook
-// "FD" SIM fixdialling-phonebook
-// "ON" SIM (or ME) own numbers (MSISDNs) list (reading of this storage may be 
-// available through +CNUM also) 
-// "EN" SIM (or ME) emergency number (+CPBW is not be applicable for this storage) 
-// "LD" SIM last-dialling-phonebook
-// "MC" ME missed (unanswered received) calls list (+CPBW may not be applicable for 
-// this storage)
-// "ME" ME phonebook
-// "MT" combined ME and SIM phonebook
-// "RC" ME received calls list (+CPBW may not be applicable for this storage)
-// "SN" SDN  (service dailing phonebook)
-// An example response is '+CPBS: "SM","FD","ON","EN" 
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetFdnSupport::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) != 0)
-		{
-		iError = KErrGeneral;
-		return ;
-		}
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,PrecedingLine());
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return;
-		}
-	if( array[0].MatchF(KGetFdnSupportCmdRepondStr)==KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return ;
-		}
-	for(TInt i = 1; i < Count; i++)
-		{
-		if( array[i].MatchF(KFdnString)!=KErrNotFound)
-			{
-			iFdnSupport = ETrue;
-			break;
-			}
-		}
-	
-	CleanupStack::PopAndDestroy(&array);
-	iError = KErrNone;
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atgetimei.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-// 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:
-// CATGetImei
-
-#include "atgetimei.h"
-#include "mslogger.h"
-
-
-_LIT8(KGetSerialNumCommand,"AT+CGSN\r");
-_LIT(KSpaceSeparator," ");
-// Class CATGetImei
-// ---------------------------------------------------------------------------
-// CATGetImei::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetImei* CATGetImei::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGetImei* self = new(ELeave) CATGetImei(aGloblePhone,aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATGetImei::CATGetImei
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetImei::CATGetImei(CGlobalPhonemanager& aGloblePhone, 
-	                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetImei::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetImei::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iAtType = ELtsyAT_Phone_GetImei;
-	}
-// ---------------------------------------------------------------------------
-// CATGetImei::~CATGetImei
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetImei::~CATGetImei()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetImei::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetImei::StartRequest()
-	{
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATGetImei::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetImei::ExecuteCommand()
-	{
-	iTxBuffer.Copy(KGetSerialNumCommand);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATGetImei::CATGetImei
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-RMobilePhone::TMobilePhoneIdentityV1 CATGetImei::GetPhoneImei()
-	{
-	return iPhoneId;
-	}
-// ---------------------------------------------------------------------------
-// CATGetImei::GetErrorValue
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATGetImei::GetErrorValue()
-	{
-	return iError;
-	}
-// ---------------------------------------------------------------------------
-// CATGetImei::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetImei::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) != 0)
-		{
-		iError = KErrGeneral;
-		return ;
-		}
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,PrecedingLine());
-	iMoreInfoFlag = EFalse;
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrGeneral;
-		return ;
-		}
-	for(TInt i = 0; i < Count ; i++)
-		{
-		//lex.Assign(array[2]);
-		
-		if  (iMoreInfoFlag)
-			{
-			TBuf<RMobilePhone::KPhoneSerialNumberSize> Data;
-			Data.Zero();
-			TInt remainingBufferSize = RMobilePhone::KPhoneSerialNumberSize - 
-			                           iPhoneId.iSerialNumber.Length() - 1;
-			if(array[i].Length() > remainingBufferSize)
-				{
-				Data.Copy(array[i].Mid(0,remainingBufferSize));
-				}
-			else
-				{
-				Data.Copy(array[i]);
-				}
-			iPhoneId.iSerialNumber.Append(KSpaceSeparator);
-			iPhoneId.iSerialNumber.Append(Data);
-			}
-		else
-			{
-			if(array[i].Length() > RMobilePhone::KPhoneSerialNumberSize)
-				{
-				iPhoneId.iSerialNumber.Copy(array[i].Mid(0,RMobilePhone::KPhoneSerialNumberSize));
-				}
-			else
-				{
-				iPhoneId.iSerialNumber.Copy(array[i]);
-				}
-			iMoreInfoFlag = ETrue;
-			}
-		}
-	CleanupStack::PopAndDestroy();
-	iError = KErrNone;
-	}
-//
-// End of file
-

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atgetmanufacturer.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-// 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:
-// CATGetManufacturer
-
-#include "atgetmanufacturer.h"
-#include "mslogger.h"
-
-
-_LIT8(KGetManufacturerCommand,"AT+CGMI\r");
-_LIT(KSpaceSeparator," ");
-// Class CATGetManufacturer
-// ---------------------------------------------------------------------------
-// CATGetManufacturer::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetManufacturer* CATGetManufacturer::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGetManufacturer* self = new(ELeave) CATGetManufacturer(aGloblePhone,
-			                                                  aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGetManufacturer::CATGetManufacturer
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetManufacturer::CATGetManufacturer(CGlobalPhonemanager& aGloblePhone, 
-	                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGetManufacturer::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetManufacturer::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iAtType = ELtsyAT_Phone_GetManufacturer;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGetManufacturer::~CATGetManufacturer
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetManufacturer::~CATGetManufacturer()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGetManufacturer::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetManufacturer::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGetManufacturer::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetManufacturer::ExecuteCommand()
-	{
-	iTxBuffer.Copy(KGetManufacturerCommand);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGetManufacturer::GetPhoneManufacturer
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-RMobilePhone::TMobilePhoneIdentityV1 CATGetManufacturer::GetPhoneManufacturer()
-	{
-	return iPhoneId;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGetManufacturer::GetErrorValue
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATGetManufacturer::GetErrorValue()
-	{
-	return iError;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGetManufacturer::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetManufacturer::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) != 0)
-		{
-		iError = KErrGeneral;
-		return ;
-		}
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,PrecedingLine());
-	iMoreInfoFlag = EFalse;
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrGeneral;
-		return ;
-		}
-	for(TInt i = 0; i < Count; i++)
-		{
-		//lex.Assign(array[2]);
-		
-		if  (iMoreInfoFlag)
-			{
-			TBuf<RMobilePhone::KPhoneSerialNumberSize> Data;
-			Data.Zero();
-			TInt remainingBufferSize = RMobilePhone::KPhoneSerialNumberSize - 
-			                           iPhoneId.iManufacturer.Length() - 1;
-			if(array[i].Length() > remainingBufferSize)
-				{
-				Data.Copy(array[i].Mid(0,remainingBufferSize));
-				}
-			else
-				{
-				Data.Copy(array[i]);
-				}
-			iPhoneId.iManufacturer.Append(KSpaceSeparator);
-			iPhoneId.iManufacturer.Append(Data);
-			}
-		else
-			{
-			if(array[i].Length() > RMobilePhone::KPhoneSerialNumberSize)
-				{
-				iPhoneId.iManufacturer.Copy(array[i].Mid(0,RMobilePhone::KPhoneSerialNumberSize));
-				}
-			else
-				{
-				iPhoneId.iManufacturer.Copy(array[i]);
-				}
-			iMoreInfoFlag = ETrue;
-			}
-		}
-	iMoreInfoFlag = EFalse;
-	CleanupStack::PopAndDestroy();
-	iError = KErrNone;
-	}
-//
-// End of file
-

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atgetmodel.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-// 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:
-// CATGetModel
-
-#include "atgetmodel.h"
-#include "mslogger.h"
-
-
-_LIT8(KGetModelCommand,"AT+CGMM\r");
-_LIT(KSpaceSeparator," ");
-// Class CATGetModel
-// ---------------------------------------------------------------------------
-// CATGetModel::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetModel* CATGetModel::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGetModel* self = new(ELeave) CATGetModel(aGloblePhone,aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATGetModel::CATGetModel
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetModel::CATGetModel(CGlobalPhonemanager& aGloblePhone, 
-	                     CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetModel::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetModel::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iAtType = ELtsyAT_Phone_GetModel;
-	}
-// ---------------------------------------------------------------------------
-// CATGetModel::CATGetModel
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetModel::~CATGetModel()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetModel::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetModel::StartRequest()
-	{
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATGetModel::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetModel::ExecuteCommand( )
-	{
-	iTxBuffer.Copy(KGetModelCommand);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATGetModel::GetPhoneModel
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-RMobilePhone::TMobilePhoneIdentityV1 CATGetModel::GetPhoneModel()
-	{
-	return iPhoneId;
-	}
-// ---------------------------------------------------------------------------
-// CATGetModel::GetErrorValue
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATGetModel::GetErrorValue()
-	{
-	return iError;
-	}
-// ---------------------------------------------------------------------------
-// CATGetModel::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetModel::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) != 0)
-		{
-		iError = KErrGeneral;
-		return ;
-		}
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,PrecedingLine());
-	iMoreInfoFlag = EFalse;
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrGeneral;
-		return ;
-		}
-	for(TInt i = 0; i < Count; i++)
-		{
-		//lex.Assign(array[2]);
-		
-		if  (iMoreInfoFlag)
-			{
-			TBuf<RMobilePhone::KPhoneModelIdSize> Data;
-			Data.Zero();
-			TInt remainingBufferSize = RMobilePhone::KPhoneModelIdSize - 
-									   iPhoneId.iModel.Length() - 1;
-			if(array[i].Length() > remainingBufferSize)
-				{
-				Data.Copy(array[i].Mid(0,remainingBufferSize));
-				}
-			else
-				{
-				Data.Copy(array[i]);
-				}
-			iPhoneId.iModel.Append(KSpaceSeparator);
-			iPhoneId.iModel.Append(Data);
-			}
-		else
-			{
-			if(array[i].Length() > RMobilePhone::KPhoneModelIdSize)
-				{
-				iPhoneId.iModel.Copy(array[i].Mid(0,RMobilePhone::KPhoneModelIdSize));
-				}
-			else
-				{
-				iPhoneId.iModel.Copy(array[i]);
-				}
-			iMoreInfoFlag = ETrue;
-			}
-		}
-	iMoreInfoFlag = EFalse;
-	CleanupStack::PopAndDestroy();
-	iError = KErrNone;
-	}
-//
-// End of file
-

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atgetmodemstatus.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-// 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:
-// CATGetModemStatus
-
-#include "atgetmodemstatus.h"
-#include "mslogger.h"
-
-
-_LIT8(KATCommand, "AT\r");
-// Class CATGetModemStatus
-// ---------------------------------------------------------------------------
-// CATGetModemStatus::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetModemStatus* CATGetModemStatus::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                       CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGetModemStatus* self = new(ELeave) CATGetModemStatus(aGloblePhone,
-			                                                aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATGetModemStatus::CATGetModemStatus
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetModemStatus::CATGetModemStatus(CGlobalPhonemanager& aGloblePhone, 
-	                                 CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetModemStatus::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetModemStatus::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iAtType = ELtsyAT_Phone_ModemStatus;
-	}
-// ---------------------------------------------------------------------------
-// CATGetModemStatus::~CATGetModemStatus
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetModemStatus::~CATGetModemStatus()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetModemStatus::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetModemStatus::StartRequest()
-	{
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATGetModemStatus::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetModemStatus::ExecuteCommand()
-	{
-	iTxBuffer.Copy(KATCommand);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATGetModemStatus::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetModemStatus::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-// ---------------------------------------------------------------------------
-// CATGetModemStatus::GetErrorValue
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATGetModemStatus::GetErrorValue()
-	{
-	return iError;
-	}
-// ---------------------------------------------------------------------------
-// CATGetModemStatus::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetModemStatus::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone !=aStatus)
-		{
-		iCtsyDispatcherCallback.CallbackPhoneBootNotifyModemStatusReadyComp(aStatus,ERfsStateInfoInactive);
-		}
-	else 
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			iCtsyDispatcherCallback.CallbackPhoneBootNotifyModemStatusReadyComp(iError,ERfsStateInfoNormal);
-			}
-		else
-			{
-			return;
-			}
-		}
-	CAtCommandBase::Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atgetnetworkinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,250 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// Basic GSM Network and Operator information Implementation file.
-// 
-// This file contains the implementation of the CATNetworkInfo, CATDetectNetwork,
-// CNotifyNetworkRegistrationStatusChange and CCurrentNetworkChangedNotify classes.
-// Find the current Network Operator in Numeric, Long and Short formats.
-// NB - Some phones do not fully support all the formats, if any. The commands are 
-// supported implement this command. Valid responses are set in the TMobilePhoneLocationAreaV1
-// and the TMobilePhoneNetworkInfoV1 structures and the Network's status is set to Current.
-
-
-
-#include <etelmm.h>
-#include "atgetnetworkinfo.h"
-#include "mslogger.h"
-
-_LIT8(KGetCurrentNetworkInfoCommand, "AT+COPS?\r");
-_LIT8(KGetCurrentNetworkInfoResponse,"+COPS:");
-/**
- * Utility function to translate the 5 digit ASCII network identification returned by the ME
- * into Mobile Country Code (aCountryCode) and a Mobile Network Code (aNetworkIdentity) strings.
- * Tbe format returned by the ME is XXXYY, where XXX represents the Mobile Country Code and YY
- * represents the Mobile Network Code.
- */
-static TInt NetworkIdL(const TDesC8& aCode,
-					   RMobilePhone::TMobilePhoneNetworkCountryCode& aCountryCode, 
-					   RMobilePhone::TMobilePhoneNetworkIdentity& aNetworkIdentity)
-	{
-	if (aCode.Length()!=5)
-		{
-		return KErrGeneral;
-		}
-	
-	aCountryCode.SetLength(3);
-	aCountryCode[0] = aCode[0];
-	aCountryCode[1] = aCode[1];
-	aCountryCode[2] = aCode[2];
-
-	aNetworkIdentity.SetLength(2);
-	aNetworkIdentity[0] = aCode[3];
-	aNetworkIdentity[1] = aCode[4];
-	return KErrNone;
-	}
-// Class CATNetworkInfo
-// ---------------------------------------------------------------------------
-// CATNetworkInfo::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATNetworkInfo* CATNetworkInfo::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                 CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATNetworkInfo* self = new(ELeave) CATNetworkInfo(aGloblePhone,
-			                                          aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkInfo::CATNetworkInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATNetworkInfo::CATNetworkInfo(CGlobalPhonemanager& aGloblePhone, 
-	                           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkInfo::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkInfo::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iGetHomeNwk = EFalse;
-	iAtType = ELtsyAT_Phone_NwkInfo;
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkInfo::~CATNetworkInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATNetworkInfo::~CATNetworkInfo()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkInfo::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkInfo::StartRequest()
-	{
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkInfo::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkInfo::ExecuteCommand( )
-	{
-	iTxBuffer.Copy(KGetCurrentNetworkInfoCommand);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkInfo::GetNetWorkInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-RMobilePhone::TMobilePhoneNetworkInfoV5 CATNetworkInfo:: GetNetWorkInfo()
-	{
-	return iNetworkInfo;
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkInfo::GetErrorValue
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATNetworkInfo::GetErrorValue()
-	{
-	return iError;
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkInfo::SetToGetHomeNwk
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkInfo::SetToGetHomeNwk()
-	{
-	iGetHomeNwk = ETrue;
-	}
-/**
- * This method parses the modems response to the 'AT+CGREG?' command.
- * An example response is '+CGREG: 0,1' where second value denotes the
- * current registration status.
- */
-// ---------------------------------------------------------------------------
-// CATNetworkInfo::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkInfo::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) != 0)
-		{
-		iError = KErrGeneral;
-		return ;
-		}
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,PrecedingLine());
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return ;
-		}
-	
-	if( array[0].MatchF(KGetCurrentNetworkInfoResponse)==KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return ;
-		}
-	TInt val = 0;
-	TLex8 lex(array[1]);
-	lex.Val(val);
-	iPhoneGlobals.iPhoneStatus.iLocalNetworkSel.iMethod = RMobilePhone::TMobilePhoneSelectionMethod(val);
-	if(Count > 2)
-		{
-		TLex8 lex1(array[2]);
-		lex1.Val(iNameFormat);
-		switch (iNameFormat)
-			{
-			case 0:
-				if(array[3].Length() > iNetworkInfo.iLongName.MaxLength())
-					iNetworkInfo.iLongName.Copy(array[3].Mid(0,iNetworkInfo.iLongName.MaxLength()));			
-				else
-					iNetworkInfo.iLongName.Copy(array[3]);
-				break;
-			case 1:
-				if(array[2].Length() > iNetworkInfo.iShortName.MaxLength())
-					iNetworkInfo.iShortName.Copy(array[3].Mid(0,iNetworkInfo.iShortName.MaxLength()));			
-				else 
-					iNetworkInfo.iShortName.Copy(array[3]);	
-				break;
-			case 2:
-				/*if(array[2].Length() > iNetworkInfo.iShortName.MaxLength())
-					iNetworkInfo.iShortName.Copy(array[3].Mid(0,iNetworkInfo.iShortName.MaxLength()));			
-				else 
-					iNetworkInfo.iShortName.Copy(array[3]);*/	
-				User::LeaveIfError(NetworkIdL(array[3],iNetworkInfo.iCountryCode, iNetworkInfo.iNetworkId));
-				break;
-			default:
-				User::Leave(KErrGeneral);
-				break;
-				}
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	iNetworkInfo.iStatus=RMobilePhone::ENetworkStatusCurrent;
-	CleanupStack::PopAndDestroy();
-	iError = KErrNone;
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkInfo::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkInfo::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone ==aStatus)
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			aStatus = iError;
-			}
-		else
-			return;
-		}
-	iPhoneGlobals.iPhoneStatus.iCurrentNetwork = iNetworkInfo;
-	if(iGetHomeNwk)
-		{
-		iCtsyDispatcherCallback.CallbackPhoneGetHomeNetworkComp(aStatus,iNetworkInfo);
-		}
-	else
-		{
-		iCtsyDispatcherCallback.CallbackPhoneGetCurrentNetworkInfoComp(aStatus,
-								iNetworkInfo, 
-								iPhoneGlobals.iPhoneStatus.iLocationArea);
-		}
-	CAtCommandBase::Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	}
-//
-// End of file
-
-
-
-
-

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atgetnetworkregistrationstatus.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CATNetworkRegistration
-
-#include <et_phone.h>
-
-#include "atgetnetworkregistrationstatus.h"
-#include "mslogger.h"
-#include "atnetworkregstatuschange.h"
-
-
-_LIT8(KATGetNetworkRegCommand, "AT+CREG?\r");
-_LIT8(KATGetNetworkRegResponse,"+CREG:");
-// Class CATNetworkRegistration
-// ---------------------------------------------------------------------------
-// CATNetworkRegistration::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATNetworkRegistration* CATNetworkRegistration::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                                 CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATNetworkRegistration* self = new(ELeave) CATNetworkRegistration(aGloblePhone,
-			                                                          aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkRegistration::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATNetworkRegistration::CATNetworkRegistration(CGlobalPhonemanager& aGloblePhone, 
-	                                           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkRegistration::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkRegistration::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iAtType = ELtsyAT_Phone_NwkRegStatus;
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkRegistration::~CATNetworkRegistration
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATNetworkRegistration::~CATNetworkRegistration()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkRegistration::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkRegistration::StartRequest()
-	{
-	ExecuteCommand();	
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkRegistration::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkRegistration::ExecuteCommand()
-	{
-	iTxBuffer.Copy(KATGetNetworkRegCommand);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkRegistration::GetErrorValue
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATNetworkRegistration::GetErrorValue()
-	{
-	return iError;
-	}
-/**
- * This method parses the modems response to the 'AT+CGREG?' command.
- * An example response is '+CGREG: 0,1' where second value denotes the
- * current registration status.
- */
-// ---------------------------------------------------------------------------
-// CATNetworkRegistration::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkRegistration::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-		{
-		if (CurrentLine().Match(KLtsyOkString) != 0)
-			{
-			iError = KErrGeneral;
-			return ;
-			}
-		RArray<TPtrC8> array;
-		CleanupClosePushL(array);
-		iParser->ParseRespondedBuffer(array,PrecedingLine());
-		TInt Count = array.Count();
-		if (Count < 1)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNotFound;
-			return ;
-			}
-		if( array[0].MatchF(KATGetNetworkRegResponse)==KErrNotFound)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNotFound;
-			return ;
-			}
-		// Skip over one parameter
-		
-		TInt val = 0;
-		TLex8 lex(array[2]);
-		lex.Val(val);
-		// Convert scond value to equivalent EtelMM enum
-		switch(val)
-			{
-			case 0:		
-				iRegistrationStatus = RMobilePhone::ENotRegisteredNoService;
-				break;
-			case 1:		
-				iRegistrationStatus = RMobilePhone::ERegisteredOnHomeNetwork;
-				break;
-			case 2:		
-				iRegistrationStatus = RMobilePhone::ENotRegisteredSearching;
-				break;
-			case 3:		
-				iRegistrationStatus = RMobilePhone::ERegistrationDenied;
-				break;
-			case 4:		
-				iRegistrationStatus = RMobilePhone::ERegistrationUnknown;
-				break;
-			case 5:		
-				iRegistrationStatus = RMobilePhone::ERegisteredRoaming;
-				break;
-			default:
-				iRegistrationStatus = RMobilePhone::ERegistrationUnknown;
-				break;
-			}
-		iPhoneGlobals.iPhoneStatus.iRegistrationStatus = iRegistrationStatus;
-		CleanupStack::PopAndDestroy(&array);
-		iError = KErrNone;
-	} //ParseResponseL
-// ---------------------------------------------------------------------------
-// CATNetworkRegistration::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkRegistration::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone ==aStatus)
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			aStatus = iError;
-			}
-		else
-			return;
-		}
-	CAtCommandBase::Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	iCtsyDispatcherCallback.CallbackPhoneGetNetworkRegistrationStatusComp(aStatus,iRegistrationStatus);
-	if(iIpcCompleteObserver)
-        {
-        iIpcCompleteObserver->NotifyIpcRequestComplete(iIpcId);
-        }
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atgetphonecellinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CATGetPhoneCellInfo
-
-#include "atgetphonecellinfo.h"
-#include "mslogger.h"
-
-_LIT8(KGetPhoneCellInfoCommand,"AT+CCED=0,5\r");
-_LIT8(KGetPhoneCellInfoCmdRepondStr,"+CCED:");
-// Class CATGetPhoneCellInfo
-// ---------------------------------------------------------------------------
-// CATGetPhoneCellInfo::NewL
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-CATGetPhoneCellInfo* CATGetPhoneCellInfo::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGetPhoneCellInfo* self = new(ELeave) CATGetPhoneCellInfo(aGloblePhone,
-			                                                    aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATGetPhoneCellInfo::CATGetPhoneCellInfo
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-CATGetPhoneCellInfo::CATGetPhoneCellInfo(CGlobalPhonemanager& aGloblePhone, 
-                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetPhoneCellInfo::ConstructL
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetPhoneCellInfo::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-// ---------------------------------------------------------------------------
-// CATGetPhoneCellInfo::~CATGetPhoneCellInfo
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-CATGetPhoneCellInfo::~CATGetPhoneCellInfo()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetPhoneCellInfo::StartRequestL
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetPhoneCellInfo::StartRequest()
-	{
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATGetPhoneCellInfo::ExecuteCommand
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetPhoneCellInfo::ExecuteCommand()
-	{
-	iTxBuffer.Copy(KGetPhoneCellInfoCommand);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGetPhoneCellInfo::ParseResponseL
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetPhoneCellInfo::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) != 0)
-		{
-		iError = KErrGeneral;
-		return ;
-		}
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,PrecedingLine());
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return;
-		}
-	if( array[0].MatchF(KGetPhoneCellInfoCmdRepondStr)==KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return ;
-		}
-	iCellInfo.iMode = RMobilePhone::ECellModeGsm;
-	TInt val = 0;
-	TLex8 lex(array[4]);
-	lex.Val(val);
-	iCellInfo.iCellId = val;
-	TLex8 lex1(array[14]);
-	lex1.Val(val);
-	iCellInfo.iTimingAdvance = val;
-	
-	
-	CleanupStack::PopAndDestroy(&array);
-	iError = KErrNone;
-	}
-// ---------------------------------------------------------------------------
-// CATGetPhoneCellInfo::EventSignal
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetPhoneCellInfo::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	// handle IO error
-	if(aStatus != KErrNone)
-	    {
-	    iPhoneGlobals.iEventSignalActive = EFalse;
-        iCtsyDispatcherCallback.CallbackPhoneGetPhoneCellInfoComp(aStatus,iCellInfo);
-        CAtCommandBase::Complete();
-        if(iIpcCompleteObserver)
-            {
-            iIpcCompleteObserver->NotifyIpcRequestComplete(iIpcId);
-            }
-	    }
-	else if(aEventSource == EReadCompletion)
-	    {
-        iPhoneGlobals.iEventSignalActive = EFalse;
-        iCtsyDispatcherCallback.CallbackPhoneGetPhoneCellInfoComp(iError,iCellInfo);
-        CAtCommandBase::Complete();
-        if(iIpcCompleteObserver)
-            {
-            iIpcCompleteObserver->NotifyIpcRequestComplete(iIpcId);
-            }
-	    }
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atgetrevision.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CATGetRevision
-
-#include "atgetrevision.h"
-#include "mslogger.h"
-
-_LIT8(KGetRevisionCommand,"AT+CGMR\r");
-_LIT(KSpaceSeparator," ");
-// CATGetRevision
-// ---------------------------------------------------------------------------
-// CATGetRevision::NewL
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-CATGetRevision* CATGetRevision::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                 CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGetRevision* self = new(ELeave) CATGetRevision(aGloblePhone,aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATGetRevision::CATGetRevision
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-CATGetRevision::CATGetRevision(CGlobalPhonemanager& aGloblePhone, 
-	                           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetRevision::ConstructL
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetRevision::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iAtType = ELtsyAT_Phone_GetRevision;
-	}
-// ---------------------------------------------------------------------------
-// CATGetRevision::~CATGetRevision
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-CATGetRevision::~CATGetRevision()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetRevision::StartRequest
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetRevision::StartRequest()
-	{
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATGetRevision::ExecuteCommand
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetRevision::ExecuteCommand( )
-	{
-	iTxBuffer.Copy(KGetRevisionCommand);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATGetRevision::GetPhoneRevision
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-RMobilePhone::TMobilePhoneIdentityV1 CATGetRevision::GetPhoneRevision()
-	{
-	return iPhoneId;
-	}
-// ---------------------------------------------------------------------------
-// CATGetRevision::GetErrorValue
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATGetRevision::GetErrorValue()
-	{
-	return iError;
-	}
-// ---------------------------------------------------------------------------
-// CATGetRevision::ParseResponseL
-// other CATGetPhoneCellInfo were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetRevision::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) != 0)
-		{
-		iError = KErrGeneral;
-		return ;
-		}
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,PrecedingLine());
-	iMoreInfoFlag = EFalse;
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrGeneral;
-		return ;
-		}
-	for(TInt i = 0; i < Count; i++)
-		{
-		//lex.Assign(array[2]);
-		
-		if  (iMoreInfoFlag)
-			{
-			TBuf<RMobilePhone::KPhoneSerialNumberSize> Data;
-			Data.Zero();
-			TInt remainingBufferSize = RMobilePhone::KPhoneSerialNumberSize - 
-			                           iPhoneId.iRevision.Length() - 1;
-			if(array[i].Length() > remainingBufferSize)
-				{
-				Data.Copy(array[i].Mid(0,remainingBufferSize));
-				}
-			else
-				{
-				Data.Copy(array[i]);
-				}
-			iPhoneId.iRevision.Append(KSpaceSeparator);
-			iPhoneId.iRevision.Append(Data);
-			}
-		else
-			{
-			if(array[i].Length() > RMobilePhone::KPhoneSerialNumberSize)
-				{
-				iPhoneId.iRevision.Copy(array[i].Mid(0,RMobilePhone::KPhoneSerialNumberSize));
-				}
-			else
-				{
-				iPhoneId.iRevision.Copy(array[i]);
-				}
-			iMoreInfoFlag = ETrue;
-			}
-		}
-	iMoreInfoFlag = EFalse;
-	CleanupStack::PopAndDestroy();
-	iError = KErrNone;
-	}
-//
-// End of file
-

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atgetsignalstrength.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CATGetSignal
-
-#include "atgetsignalstrength.h"
-#include "mslogger.h"
-
-
-_LIT8(KGetSignalQualityCommand,"AT+CSQ\r");
-_LIT8(KGetSingalCommandRepStr,"+CSQ:");
-// Class CATGetSignal
-// ---------------------------------------------------------------------------
-// CATGetSignal::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetSignal* CATGetSignal::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGetSignal* self = new(ELeave) CATGetSignal(aGloblePhone,
-			                                      aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATGetSignal::CATGetSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetSignal::CATGetSignal(CGlobalPhonemanager& aGloblePhone, 
-	                       CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetSignal::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetSignal::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iAtType = ELtsyAT_Phone_GetSignal;
-	}
-// ---------------------------------------------------------------------------
-// CATGetSignal::~CATGetSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGetSignal::~CATGetSignal()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATGetSignal::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetSignal::StartRequest()
-	{
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATGetSignal::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetSignal::ExecuteCommand( )
-	{
-	iTxBuffer.Copy(KGetSignalQualityCommand);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATGetSignal::getSignalInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TTsySignalInfo CATGetSignal::getSignalInfo()
-	{
-	return iSignalInfo;
-	}
-// ---------------------------------------------------------------------------
-// CATGetSignal::GetErrorValue
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATGetSignal::GetErrorValue()
-	{
-	return iError;
-	}
-// ---------------------------------------------------------------------------
-// CATGetSignal::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetSignal::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) != 0)
-		{
-		iError = KErrGeneral;
-		return ;
-		}
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,PrecedingLine());
-	TInt Count = array.Count();
-	if (Count <= 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrGeneral;
-		return ;
-		}
-	if( array[0].MatchF(KGetSingalCommandRepStr)==KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrGeneral;
-		return ;
-		}
-	TInt val = 0;
-	TLex8 lex(array[1]);
-	lex.Val(val);
-	if (val < 0) 
-		{
-		iSignalInfo.iSignalStrength = 0;
-		}
-	else	
-		{
-		iSignalInfo.iSignalStrength = val;
-		}
-	TLex8 lex1(array[2]);
-	lex1.Val(val);
-	if (val < 0) 
-		{
-		iSignalInfo.iBar = 0;
-		}
-	else	
-		{
-		iSignalInfo.iBar = val;
-		}
-
-	CleanupStack::PopAndDestroy();
-	iError = KErrNone;
-	}
-// ---------------------------------------------------------------------------
-// CATGetSignal::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGetSignal::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone ==aStatus)
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			aStatus = iError;
-			}
-		else
-			return;
-		}
-	CAtCommandBase::Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	iCtsyDispatcherCallback.CallbackPhoneGetSignalStrengthComp(aStatus,
-							                                   iSignalInfo.iSignalStrength,
-							                                   iSignalInfo.iBar);
-	}
-//
-// End of file
-

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atgetsimstatusready.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CATSIMCard
-
-#include "atgetsimstatusready.h"
-#include "mslogger.h"
-
-
-_LIT8(KGetSIMCardCommand, "AT+CCID=?;\r");
-// Class CATSIMCard
-// ---------------------------------------------------------------------------
-// CATSIMCard::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATSIMCard* CATSIMCard::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATSIMCard* self = new(ELeave) CATSIMCard(aGloblePhone,
-			                                  aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATSIMCard::CATSIMCard
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATSIMCard::CATSIMCard(CGlobalPhonemanager& aGloblePhone, 
-	                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATSIMCard::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSIMCard::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iAtType = ELtsyAT_Phone_SimCardStatus;
-	}
-// ---------------------------------------------------------------------------
-// CATSIMCard::~CATSIMCard(
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATSIMCard::~CATSIMCard()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATSIMCard::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSIMCard::StartRequest()
-	{
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATSIMCard::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSIMCard::ExecuteCommand( )
-	{
-	iTxBuffer.Copy(KGetSIMCardCommand);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATSIMCard::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSIMCard::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-// ---------------------------------------------------------------------------
-// CATSIMCard::GetErrorValue
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATSIMCard::GetErrorValue()
-	{
-	return iError;
-	}
-// ---------------------------------------------------------------------------
-// CATSIMCard::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSIMCard::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone ==aStatus)
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			aStatus = iError;
-			}
-		else
-			return;
-		}
-	CAtCommandBase::Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	iCtsyDispatcherCallback.CallbackPhoneBootNotifySimStatusReadyComp(aStatus);
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atnetworkregstatuschange.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CATNetworkRegStatusChange
-
-//user include
-#include "atnetworkregstatuschange.h"
-
-_LIT8(KATGetNetworkRegResponse,"+CREG:*");
-
-// ---------------------------------------------------------------------------
-// CATNetworkRegStatusChange::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATNetworkRegStatusChange* CATNetworkRegStatusChange::NewL(CGlobalPhonemanager& aGloblePhone,
-		                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATNetworkRegStatusChange* self = CATNetworkRegStatusChange::NewLC(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CATNetworkRegStatusChange::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATNetworkRegStatusChange* CATNetworkRegStatusChange::NewLC(CGlobalPhonemanager& aGloblePhone,
-		                              CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATNetworkRegStatusChange* self = new (ELeave) CATNetworkRegStatusChange(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CATNetworkRegStatusChange::~CATNetworkRegStatusChange
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATNetworkRegStatusChange::~CATNetworkRegStatusChange()
-	{
-	
-	}
-
-// ---------------------------------------------------------------------------
-// CATNetworkRegStatusChange::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkRegStatusChange::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	RemoveAllExpectString();
-	AddExpectStringL(KATGetNetworkRegResponse);
-	Enable();
-	}
-
-// ---------------------------------------------------------------------------
-// CATNetworkRegStatusChange::CATNetworkRegStatusChange
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATNetworkRegStatusChange::CATNetworkRegStatusChange(CGlobalPhonemanager& aGloblePhone,
-		                       CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-							   :CAtCommandBase(aGloblePhone, aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkRegStatusChange::CATNetworkRegStatusChange
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkRegStatusChange::Enable()
-	{
-	AddUnsolicitedAtCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkRegStatusChange::CATNetworkRegStatusChange
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkRegStatusChange::Disable()
-	{
-	RemoveAtCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkRegStatusChange::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkRegStatusChange::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,CurrentLine());
-	ClearCurrentLine();
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return ;
-		}
-	if( array[0].MatchF(KATGetNetworkRegResponse)==KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return ;
-		}
-	// Skip over one parameter
-	
-	TInt val = 0;
-	TLex8 lex(array[1]);
-	lex.Val(val);
-	// Convert scond value to equivalent EtelMM enum
-	switch(val)
-		{
-		case 0:		
-			iRegistrationStatus = RMobilePhone::ENotRegisteredNoService;
-			break;
-		case 1:		
-			iRegistrationStatus = RMobilePhone::ERegisteredOnHomeNetwork;
-			break;
-		case 2:		
-			iRegistrationStatus = RMobilePhone::ENotRegisteredSearching;
-			break;
-		case 3:		
-			iRegistrationStatus = RMobilePhone::ERegistrationDenied;
-			break;
-		case 4:		
-			iRegistrationStatus = RMobilePhone::ERegistrationUnknown;
-			break;
-		case 5:		
-			iRegistrationStatus = RMobilePhone::ERegisteredRoaming;
-			break;
-		default:
-			iRegistrationStatus = RMobilePhone::ERegistrationUnknown;
-			break;
-		}
-	CleanupStack::PopAndDestroy(&array);
-	iError = KErrNone;
-	}
-// ---------------------------------------------------------------------------
-// CATNetworkRegStatusChange::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNetworkRegStatusChange::EventSignal(TAtEventSource /*aEventSource*/, TInt /*aStatus*/)
-	{
-	iCtsyDispatcherCallback.CallbackPhoneNotifyNetworkRegistrationStatusChangeInd(iError,
-				            iRegistrationStatus);
-	}
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atnotifycellinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CATNotifyCellInfo
-
-//user include
-#include "atnotifycellinfo.h"
-
-_LIT8(KATNotifyCellInfo,"+CCED:*");
-
-// ---------------------------------------------------------------------------
-// CATNotifyCellInfo::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATNotifyCellInfo* CATNotifyCellInfo::NewL(CGlobalPhonemanager& aGloblePhone,
-		                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATNotifyCellInfo* self = CATNotifyCellInfo::NewLC(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CATNotifyCellInfo::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATNotifyCellInfo* CATNotifyCellInfo::NewLC(CGlobalPhonemanager& aGloblePhone,
-		                              CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATNotifyCellInfo* self = new (ELeave) CATNotifyCellInfo(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CATNotifyCellInfo::~CATNotifyCellInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATNotifyCellInfo::~CATNotifyCellInfo()
-	{
-	
-	}
-
-// ---------------------------------------------------------------------------
-// CATNotifyCellInfo::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNotifyCellInfo::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	RemoveAllExpectString();
-	AddExpectStringL(KATNotifyCellInfo);
-	Enable();
-	}
-
-// ---------------------------------------------------------------------------
-// CATNotifyCellInfo::CATNotifyCellInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATNotifyCellInfo::CATNotifyCellInfo(CGlobalPhonemanager& aGloblePhone,
-		                       CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-							   :CAtCommandBase(aGloblePhone, aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATNotifyCellInfo::CATNotifyCellInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNotifyCellInfo::Enable()
-	{
-	AddUnsolicitedAtCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATNotifyCellInfo::CATNotifyCellInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNotifyCellInfo::Disable()
-	{
-	RemoveAtCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATNotifyCellInfo::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNotifyCellInfo::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,CurrentLine());
-	ClearCurrentLine();
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return;
-		}
-	if( array[0].MatchF(KATNotifyCellInfo)==KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return ;
-		}
-	TInt number = 0;
-	TInt val = 0;
-	TLex8 lexBasic(array[5]);
-	lexBasic.Val(val);
-	iCellInfo.iNmr[number].iBSIC = val;
-	TLex8 lexArfcn(array[6]);
-	lexArfcn.Val(val);
-	iCellInfo.iNmr[number].iARFCN = val;
-	TLex8 lexRxlev(array[7]);
-	lexRxlev.Val(val);
-	iCellInfo.iNmr[number].iRxLEV = val;
-	
-	
-    for(TInt i = 14;i < Count-2;i++ )
-    	{
-    	number++;
-    	i = i + 4;
-    	TInt val = 0;
-    	TLex8 lexBasic(array[i]);
-    	lexBasic.Val(val);
-    	i++;
-    	iCellInfo.iNmr[number].iBSIC = val;
-    	TLex8 lexArfcn(array[i]);
-    	lexArfcn.Val(val);
-    	iCellInfo.iNmr[number].iARFCN = val;
-    	i++;
-    	TLex8 lexRxlev(array[i]);
-    	lexRxlev.Val(val);
-    	iCellInfo.iNmr[number].iRxLEV = val;
-    	}
-	TLex8 lexTa(array[Count-2]);
-	lexTa.Val(val);
-    iCellInfo.iTA = val;
-	
-	
-	CleanupStack::PopAndDestroy(&array);
-	iError = KErrNone;
-	}
-// ---------------------------------------------------------------------------
-// CATNotifyCellInfo::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATNotifyCellInfo::EventSignal(TAtEventSource /*aEventSource*/, TInt /*aStatus*/)
-	{
-	iCtsyDispatcherCallback.CallbackPhoneNotifyCellInfoChangedInd(iError,iCellInfo);
-	}
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atselectnetwork.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CATSelectNetwork
-
-#include "atselectnetwork.h"
-#include "mslogger.h"
-
-_LIT8(KSelectNetworkCommand,"AT+COPS=1,2,%d\r");
-// Class CATSelectNetwork
-// ---------------------------------------------------------------------------
-// CATSelectNetwork::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATSelectNetwork* CATSelectNetwork::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATSelectNetwork* self = new(ELeave) CATSelectNetwork(aGloblePhone,
-			                                              aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetwork::CATSelectNetwork
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATSelectNetwork::CATSelectNetwork(CGlobalPhonemanager& aGloblePhone, 
-	                               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetwork::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSelectNetwork::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iCommandRunning = EFalse;
-	iCommandCancel = EFalse;
-	iCommandSetBack = EFalse;
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetwork::~CATSelectNetwork
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATSelectNetwork::~CATSelectNetwork()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetwork::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSelectNetwork::StartRequest()
-	{
-	iCommandRunning = ETrue;
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetwork::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSelectNetwork::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CATSelectNetwork::ExecuteCommand called"));
-	TBuf<5> tmpbuf;
-	tmpbuf.Append(iNetworkManualSelection.iCountry);
-	tmpbuf.Append(iNetworkManualSelection.iNetwork);
-    TLex lex(tmpbuf);
-    TInt tmpNum;
-    lex.Val( tmpNum );
-	LOGTEXT2(_L8("tmpNum=%d"),tmpNum);
-	iTxBuffer.Format(KSelectNetworkCommand,tmpNum);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetwork::CancelCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSelectNetwork::CancelCommand()
-	{	
-	iCommandCancel = ETrue;
-	}
-
-// ---------------------------------------------------------------------------
-// CATSelectNetwork::ExecuteSetBackCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSelectNetwork::ExecuteSetBackCommand()
-	{
-	LOGTEXT(_L8("CATSelectNetwork::ExecuteSetBackCommand called"));
-	TBuf<5> tmpbuf;
-	tmpbuf.Append(iPhoneGlobals.iPhoneStatus.iCurrentNetwork.iCountryCode);
-	tmpbuf.Append(iPhoneGlobals.iPhoneStatus.iCurrentNetwork.iNetworkId);
-    TLex lex(tmpbuf);
-    TInt tmpNum;
-    lex.Val( tmpNum );
-	LOGTEXT2(_L8("tmpNum=%d"),tmpNum);
-	iTxBuffer.Format(KSelectNetworkCommand,tmpNum);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetwork::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSelectNetwork::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetwork::SetNetworkSelection
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSelectNetwork::SetNetworkSelection(const RMobilePhone::TMobilePhoneNetworkManualSelection& aNetworkManualSelection)
-	{
-	iNetworkManualSelection = aNetworkManualSelection;
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetwork::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSelectNetwork::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone ==aStatus)
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			aStatus = iError;
-			}
-		else
-			return;
-		}
-	if(iCommandCancel) //User runing cancel cmd
-		{
-		//We should set back network when selected network success
-		if((KErrNone ==aStatus)&&(!iCommandSetBack))
-			{
-			iCommandSetBack = ETrue;
-			//Set parameter
-			ExecuteSetBackCommand();
-			return;
-			}
-		if((iCommandSetBack)&&(KErrNone !=aStatus))
-			{
-			//Cancel fail because set back fail 
-			//Current Network Changed
-			iCtsyDispatcherCallback.CallbackPhoneSelectNetworkCancelComp(aStatus);
-			}
-		else
-			{
-			//First selectrd fail or set back success
-			//Cancel OK
-			iCtsyDispatcherCallback.CallbackPhoneSelectNetworkCancelComp(KErrNone);
-			}
-		}
-	else
-		{
-		iCtsyDispatcherCallback.CallbackPhoneSelectNetworkComp(aStatus);
-		}
-	CAtCommandBase::Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	iCommandRunning = EFalse;
-	iCommandCancel = EFalse;
-	iCommandSetBack = EFalse;
-	}
-//
-// End of file
-
-

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atselectnetworkmode.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CATSelectNetworkMode
-
-
-#include "atselectnetworkmode.h"
-#include "mslogger.h"
-
-
-_LIT8(KATSelectNetworkMode,"AT+COPS=%d\r");
-// Class CATSelectNetworkMode
-// ---------------------------------------------------------------------------
-// CATSelectNetworkMode::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATSelectNetworkMode* CATSelectNetworkMode::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATSelectNetworkMode* self = new(ELeave) CATSelectNetworkMode(aGloblePhone,
-			                                                      aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetworkMode::CATSelectNetworkMode
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATSelectNetworkMode::CATSelectNetworkMode(CGlobalPhonemanager& aGloblePhone, 
-	                                      CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetworkMode::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSelectNetworkMode::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetworkMode::~CATSelectNetworkMode
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATSelectNetworkMode::~CATSelectNetworkMode()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetworkMode::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSelectNetworkMode::StartRequest()
-	{
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetworkMode::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSelectNetworkMode::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CATSelectNetworkMode::ExecuteCommand called"));
-	iTxBuffer.Format(KATSelectNetworkMode,iNetworkSelection);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetworkMode::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSelectNetworkMode::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetworkMode::SetNetworkSelection
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSelectNetworkMode::SetNetworkSelection(const TInt aNetworkSelection)
-	{
-	iNetworkSelection = aNetworkSelection;
-	}
-// ---------------------------------------------------------------------------
-// CATSelectNetworkMode::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSelectNetworkMode::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone ==aStatus)
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			aStatus = iError;
-			}
-		else
-			return;
-		}
-	CAtCommandBase::Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	switch (iNetworkSelection)
-		{
-	case 0:
-		iCtsyDispatcherCallback.CallbackPhoneSetNetworkSelectionSettingComp(aStatus, 
-				                RMobilePhone::ENetworkSelectionAutomatic);
-		break;
-	case 1:
-		iCtsyDispatcherCallback.CallbackPhoneSetNetworkSelectionSettingComp(aStatus, 
-				                RMobilePhone::ENetworkSelectionManual);
-		break;
-	default:
-		iCtsyDispatcherCallback.CallbackPhoneSetNetworkSelectionSettingComp(aStatus, 
-				                RMobilePhone::ENetworkSelectionUnknown);
-		break;
-		}
-	}
-//
-// End of file
-
-
-
-
-

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/atsetnotifycell.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CATSetNotifyCellInfo
-
-#include "atsetnotifycell.h"
-#include "mslogger.h"
-#include "atgetphonecellinfo.h"
-#include "atnotifycellinfo.h"
-
-
-_LIT8(KATSetCellCommand, "AT+CCED=0,1\r");
-// Class CATSetNotifyCellInfo
-// ---------------------------------------------------------------------------
-// CATSetNotifyCellInfo::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATSetNotifyCellInfo* CATSetNotifyCellInfo::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATSetNotifyCellInfo* self = new(ELeave) CATSetNotifyCellInfo(aGloblePhone,
-			                                                      aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CATSetNotifyCellInfo::CATSetNotifyCellInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATSetNotifyCellInfo::CATSetNotifyCellInfo(CGlobalPhonemanager& aGloblePhone, 
-	                                      CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATSetNotifyCellInfo::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSetNotifyCellInfo::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-// ---------------------------------------------------------------------------
-// CATSetNotifyCellInfo::~CATSetNotifyCellInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATSetNotifyCellInfo::~CATSetNotifyCellInfo()
-	{
-	}
-// ---------------------------------------------------------------------------
-// CATSetNotifyCellInfo::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSetNotifyCellInfo::StartRequest()
-	{
-	ExecuteCommand();
-	}
-// ---------------------------------------------------------------------------
-// CATSetNotifyCellInfo::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSetNotifyCellInfo::ExecuteCommand()
-	{
-	iTxBuffer.Copy(KATSetCellCommand);
-	Write();
-	}
-// ---------------------------------------------------------------------------
-// CATSetNotifyCellInfo::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSetNotifyCellInfo::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-//// ---------------------------------------------------------------------------
-//// CATSetNotifyCellInfo::GetErrorValue
-//// other items were commented in a header
-//// ---------------------------------------------------------------------------
-TInt CATSetNotifyCellInfo::GetErrorValue()
-	{
-	return iError;
-	}
-// ---------------------------------------------------------------------------
-// CATSetNotifyCellInfo::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATSetNotifyCellInfo::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone == aStatus)
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			aStatus = iError;
-			}
-		else
-		    {
-		    return;
-		    }
-		}
-	
-	CAtCommandBase::Complete();
-	iCtsyDispatcherCallback.CallbackPhoneRegisterCellInfoChangeNotificationComp(aStatus);
-	if(iIpcCompleteObserver)
-	    {
-	    iIpcCompleteObserver->NotifyIpcRequestComplete(iIpcId);
-	    }
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/getcurrentnetworkinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,347 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CGetCurrentNetworkInfo
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <ctsy/ltsy/mltsydispatchphoneinterface.h>
-#include "getcurrentnetworkinfo.h"
-#include "mslogger.h"
-#include "atgetnetworkinfo.h"
-
-// define the AT command format
-_LIT8(KATSetFormatForLongName,  "AT+COPS=3,0\r");
-_LIT8(KATSetFormatForShortName, "AT+COPS=3,1\r");
-_LIT8(KATSetNumbericFormat,     "AT+COPS=3,2\r");
-
-// Class CGetCurrentNetworkInfo
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGetCurrentNetworkInfo* CGetCurrentNetworkInfo::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CGetCurrentNetworkInfo* self = new(ELeave) CGetCurrentNetworkInfo(aGloblePhone,
-			                                              aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop();
-	return self ;
-	}
-
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::CGetCurrentNetworkInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGetCurrentNetworkInfo::CGetCurrentNetworkInfo(CGlobalPhonemanager& aGloblePhone, 
-	                               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CATCommandControlBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetCurrentNetworkInfo::ConstructL()
-	{
-	LOGTEXT(_L8("[Ltsy Phone Control] Starting CATAnswer::ConstructL"));
-	iState = EATUnknown;
-	iATNetworkInfo = CATNetworkInfo::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	iATHelperCommand = CATHelperCommand::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	}
-
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::~CGetCurrentNetworkInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGetCurrentNetworkInfo::~CGetCurrentNetworkInfo()
-	{
-	LOGTEXT(_L8("[Ltsy Phone Control] Starting CATAnswer::~CGetCurrentNetworkInfo()"));
-	delete iATHelperCommand;
-	iATHelperCommand = NULL;
-	delete iATNetworkInfo;
-	iATNetworkInfo = NULL;
-	}
-
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::AtCommandExecuteComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetCurrentNetworkInfo::AtCommandExecuteComplete(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if((aEventSource == EWriteCompletion)&&(KErrNone == aStatus))
-		{
-		return;
-		}
-	
-	switch(iState)
-		{
-		case EATSetLongFormat:
-		    LOGTEXT(_L8("[Ltsy Phone Control] complete EATSetLongFormat"));
-		    CompeteATCommand(iATHelperCommand);
-		    if(aStatus != KErrNone)
-		        {
-		        HandleGetCurNetworkError(aStatus);
-		        }
-		    else 
-		        {
-		        aStatus = iATHelperCommand->GetErrorValue();
-		        if(aStatus != KErrNone)
-		            {
-		            HandleGetCurNetworkError(aStatus);
-		            }
-		        else
-		            {
-		            iState = EATGetLongName;
-		            GetNetworkLongName();
-		            }
-		        }
-			break;
-			
-		case EATGetLongName:
-		    LOGTEXT(_L8("[Ltsy Phone Control] complete EATGetLongName"));
-		    CompeteATCommand(iATNetworkInfo);
-		    if(aStatus != KErrNone)
-		        {
-		        HandleGetCurNetworkError(aStatus);
-		        }
-		    else
-				{
-				TInt err = iATNetworkInfo->GetErrorValue();
-				if(err != KErrNone)
-				    {
-				    HandleGetCurNetworkError(err);
-				    }
-				else
-				    {
-				    iState = EATSetShortFormat;
-				    SetShortNameFormat();
-				    }
-				}
-			break;
-			
-		case EATSetShortFormat:
-		    LOGTEXT(_L8("[Ltsy Phone Control] complete EATSetShortFormat"));
-		    CompeteATCommand(iATHelperCommand);
-            if(aStatus != KErrNone)
-                {
-                HandleGetCurNetworkError(aStatus);
-                }
-            else 
-                {
-                aStatus = iATHelperCommand->GetErrorValue();
-                if(aStatus != KErrNone)
-                    {
-                    HandleGetCurNetworkError(aStatus);
-                    }
-                else
-                    {
-                    iState = EATGetShortName;
-                    GetNetworkShortName();
-                    }
-                }		    
-		    break;
-		    
-		case EATGetShortName:
-		    LOGTEXT(_L8("[Ltsy Phone Control] complete EATGetShortName"));
-            CompeteATCommand(iATNetworkInfo);
-            if(aStatus != KErrNone)
-                {
-                HandleGetCurNetworkError(aStatus);
-                }
-            else
-                {
-                TInt err = iATNetworkInfo->GetErrorValue();
-                if(err != KErrNone)
-                    {
-                    HandleGetCurNetworkError(err);
-                    }
-                else
-                    {
-                    iState = EATSetNumbericFormat;
-                    SetNumbericFormat();
-                    }
-                }
-		    break;
-		case EATSetNumbericFormat:
-		    LOGTEXT(_L8("[Ltsy Phone Control] complete EATSetNumbericFormat"));
-            CompeteATCommand(iATHelperCommand);
-            if(aStatus != KErrNone)
-                {
-                HandleGetCurNetworkError(aStatus);
-                }
-            else 
-                {
-                aStatus = iATHelperCommand->GetErrorValue();
-                if(aStatus != KErrNone)
-                    {
-                    HandleGetCurNetworkError(aStatus);
-                    }
-                else
-                    {
-                    iState = EATGetCountryCodeAndNetwrokId;
-                    GetCountryCodeAndNetworkId();
-                    }
-                }           
-            break;
-        case EATGetCountryCodeAndNetwrokId:
-            LOGTEXT(_L8("[Ltsy Phone Control] complete EATGetCountryCodeAndNetwrokId"));
-            CompeteATCommand(iATNetworkInfo);
-            if(aStatus != KErrNone)
-                {
-                HandleGetCurNetworkError(aStatus);
-                }
-            else
-                {
-                TInt err = iATNetworkInfo->GetErrorValue();
-                if(err != KErrNone)
-                    {
-                    HandleGetCurNetworkError(err);
-                    }
-                else
-                    {
-                    iState = EATUnknown;
-                    HandleGetCurNetworkComplete();
-                    }
-                }
-            break;
-            
-		default:
-			break;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetCurrentNetworkInfo::StartRequest()
-	{
-	LOGTEXT(_L8("[Ltsy Phone Control] Starting CATAnswer::StartRequest()"));
-	iState = EATSetLongFormat;
-	SetLongNameFormat();
-	}
-
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::StartATCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetCurrentNetworkInfo::StartATCommand(CAtCommandBase* aAtCommand)
-	{
-	aAtCommand->SetAtCommandObserver(this);
-	aAtCommand->StartRequest();
-	}
-
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::EndATCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetCurrentNetworkInfo::CompeteATCommand(CAtCommandBase* aAtCommand)
-	{
-	aAtCommand->RemoveAtCommandObserver();
-	aAtCommand->Complete();
-	}
-
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::SetLongNameFormat
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetCurrentNetworkInfo::SetLongNameFormat()
-    {
-    iATHelperCommand->SetAtCommandString(KATSetFormatForLongName);
-    StartATCommand(iATHelperCommand);
-    }
-
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::SetLongNameFormat
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetCurrentNetworkInfo::GetNetworkLongName()
-    {
-    StartATCommand(iATNetworkInfo);
-    }
-
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::SetLongNameFormat
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetCurrentNetworkInfo::SetShortNameFormat()
-    {
-    iATHelperCommand->SetAtCommandString(KATSetFormatForShortName);
-    StartATCommand(iATHelperCommand);
-    }
-
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::GetNetworkShortName
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetCurrentNetworkInfo::GetNetworkShortName()
-    {
-    StartATCommand(iATNetworkInfo);
-    }
-
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::SetShortNumbericFormat
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetCurrentNetworkInfo::SetNumbericFormat()
-    {
-    iATHelperCommand->SetAtCommandString(KATSetNumbericFormat);
-    StartATCommand(iATHelperCommand);
-    }
-
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::SetShortNumbericFormat
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetCurrentNetworkInfo::GetCountryCodeAndNetworkId()
-    {
-    StartATCommand(iATNetworkInfo);
-    }
-
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::HandleGetCurNetworkError
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetCurrentNetworkInfo::HandleGetCurNetworkError(TInt aError)
-    {
-    iCtsyDispatcherCallback.CallbackPhoneGetCurrentNetworkInfoComp(aError,
-                                    iNetworkInfo, 
-                                    iPhoneGlobals.iPhoneStatus.iLocationArea);
-    }
-
-// ---------------------------------------------------------------------------
-// CGetCurrentNetworkInfo::HandleGetCurNetworkComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetCurrentNetworkInfo::HandleGetCurNetworkComplete()
-    {
-    LOGTEXT(_L8("[Ltsy Phone Control] CGetCurrentNetworkInfo::HandleGetCurNetworkComplete()"));
-    iNetworkInfo = iATNetworkInfo->GetNetWorkInfo();
-    iPhoneGlobals.iPhoneStatus.iCurrentNetwork = iNetworkInfo;
-    iPhoneGlobals.iEventSignalActive = EFalse;
-    iCtsyDispatcherCallback.CallbackPhoneGetCurrentNetworkInfoComp(KErrNone,
-                            iNetworkInfo, 
-                            iPhoneGlobals.iPhoneStatus.iLocationArea);
-    
-    if(iIpcCompleteObserver)
-        {
-        iIpcCompleteObserver->NotifyIpcRequestComplete(MLtsyDispatchPhoneGetCurrentNetworkInfo::KLtsyDispatchPhoneGetCurrentNetworkInfoApiId);
-        }
-    }
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/getfdnstatus.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CGetFdnStatus
-
-#include "getfdnstatus.h"
-#include "mslogger.h"
-#include "atgetfdnsupport.h"
-#include "atgetfdnstatus.h"
-
-// Class CGetFdnStatus
-// ---------------------------------------------------------------------------
-// CGetFdnStatus::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGetFdnStatus* CGetFdnStatus::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CGetFdnStatus* self = new(ELeave) CGetFdnStatus(aGloblePhone,
-			                                        aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self);
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CGetFdnStatus::CGetFdnStatus
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGetFdnStatus::CGetFdnStatus(CGlobalPhonemanager& aGloblePhone, 
-	                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CATCommandControlBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CGetFdnStatus::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetFdnStatus::ConstructL()
-	{
-	iATCommandName = EATNone;
-	iATGetFdnStatus = CATGetFdnStatus::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	iATGetFdnSupport = CATGetFdnSupport::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	}
-// ---------------------------------------------------------------------------
-// CGetFdnStatus::~CGetFdnStatus
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGetFdnStatus::~CGetFdnStatus()
-	{
-	delete iATGetFdnStatus;
-	iATGetFdnStatus = NULL;
-	delete iATGetFdnSupport;
-	iATGetFdnSupport = NULL;
-	}
-// ---------------------------------------------------------------------------
-// CGetFdnStatus::AtCommandExecuteComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetFdnStatus::AtCommandExecuteComplete(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if((aEventSource == EWriteCompletion)&&(KErrNone == aStatus))
-		{
-		return;
-		}
-	switch(iATType)
-		{
-		case ELtsyAT_Phone_CheckFdnSupport:
-			if((KErrNone == aStatus)&&(aEventSource == EReadCompletion))
-				{
-				aStatus = iATGetFdnSupport->GetErrorValue();
-				}
-			iATGetFdnSupport->RemoveAtCommandObserver();
-			FdnSupportComplete(aStatus);
-			break;
-		case ELtsyAT_Phone_GetFdnStatus: 
-			if((KErrNone == aStatus)&&(aEventSource == EReadCompletion))
-				{
-				aStatus = iATGetFdnStatus->GetErrorValue();
-				}
-			FdnStatusComplete(aStatus);
-			EndATCommand(iATGetFdnStatus);
-			delete iATGetFdnStatus;
-			iATGetFdnStatus = NULL;
-			iPhoneGlobals.iEventSignalActive = EFalse;
-			break;
-		default:
-			break;
-		}
-	}
-// ---------------------------------------------------------------------------
-// CGetFdnStatus::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetFdnStatus::StartRequest()
-	{
-	StartATCommand(iATGetFdnSupport);
-	}
-// ---------------------------------------------------------------------------
-// CGetFdnStatus::HandleFdnSupport
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetFdnStatus::FdnSupportComplete(const TInt aError)
-	{
-	if((KErrNone == aError)&&(iATGetFdnSupport->GetFdnSupport()))
-		{	
-		EndATCommand(iATGetFdnSupport);
-		StartATCommand(iATGetFdnStatus);
-		}
-	else
-		{
-		EndATCommand(iATGetFdnSupport);
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iCtsyDispatcherCallback.CallbackPhoneGetFdnStatusComp(aError,RMobilePhone::EFdnUnknown);
-		}
-	}
-// ---------------------------------------------------------------------------
-// CGetFdnStatus::FdnStatusComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetFdnStatus::FdnStatusComplete(const TInt aError)
-	{
-	if((KErrNone == aError)&&(iATGetFdnStatus->GetFdnStatus()))
-		{
-		iCtsyDispatcherCallback.CallbackPhoneGetFdnStatusComp(aError,RMobilePhone::EFdnActive);
-		}
-	else
-		{
-		iCtsyDispatcherCallback.CallbackPhoneGetFdnStatusComp(aError,RMobilePhone::EFdnNotActive);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CGetFdnStatus::StartATCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetFdnStatus::StartATCommand(CAtCommandBase* aAtCommand)
-	{
-	aAtCommand->SetAtCommandObserver(this);
-	iATType = aAtCommand->AtType();
-	aAtCommand->StartRequest();
-	}
-// ---------------------------------------------------------------------------
-// CGetFdnStatus::EndATCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetFdnStatus::EndATCommand(CAtCommandBase* aAtCommand)
-	{
-	aAtCommand->RemoveAtCommandObserver();
-	aAtCommand->Complete();
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/getoperatorname.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,195 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CGetOperatorNmae
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <ctsy/ltsy/mltsydispatchphoneinterface.h>
-#include "getoperatorname.h"
-#include "mslogger.h"
-#include "atgetnetworkinfo.h"
-
-
-_LIT8(KATSetFormatForOperater, "AT+COPS=3,0\r");
-// Class CGetOperatorNmae
-// ---------------------------------------------------------------------------
-// CGetOperatorNmae::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGetOperatorNmae* CGetOperatorNmae::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CGetOperatorNmae* self = new(ELeave) CGetOperatorNmae(aGloblePhone,
-			                                              aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self);
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CGetOperatorNmae::CGetOperatorNmae
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGetOperatorNmae::CGetOperatorNmae(CGlobalPhonemanager& aGloblePhone, 
-	                               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CATCommandControlBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CGetOperatorNmae::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetOperatorNmae::ConstructL()
-	{
-	iATCommandName = EATNone;
-	iRequestIpc = 0;
-	iATHelperCommand = CATHelperCommand::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	iATNetworkInfo = CATNetworkInfo::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	}
-// ---------------------------------------------------------------------------
-// CGetOperatorNmae::~CGetOperatorNmae
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGetOperatorNmae::~CGetOperatorNmae()
-	{
-	delete iATHelperCommand;
-	iATHelperCommand = NULL;
-	delete iATNetworkInfo;
-	iATNetworkInfo = NULL;
-	}
-// ---------------------------------------------------------------------------
-// CGetOperatorNmae::AtCommandExecuteComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetOperatorNmae::AtCommandExecuteComplete(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if((aEventSource == EWriteCompletion)&&(KErrNone == aStatus))
-		{
-		return;
-		}
-	switch(iATType)
-		{
-		case ELtsyAT_Phone_SetOperFormat: 
-			if((KErrNone == aStatus)&&(aEventSource == EReadCompletion))
-				{
-				aStatus = iATHelperCommand->GetErrorValue();
-				}
-			SetOperFormatComplete(aStatus);
-			break;
-		case ELtsyAT_Phone_NwkInfo:
-			if((KErrNone == aStatus)&&(aEventSource == EReadCompletion))
-				{
-				aStatus = iATNetworkInfo->GetErrorValue();
-				if(KErrNone == aStatus)
-					{
-					iNetworkInfo = iATNetworkInfo->GetNetWorkInfo();
-					}
-				}
-			iPhoneGlobals.iEventSignalActive = EFalse;
-			iATNetworkInfo->RemoveAtCommandObserver();
-			EndATCommand(iATNetworkInfo);
-			CtsyDispatcherCallBack(aStatus);
-			break;
-		default:
-			break;
-		}
-	}
-// ---------------------------------------------------------------------------
-// CGetOperatorNmae::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetOperatorNmae::StartRequest()
-	{
-	iATHelperCommand->SetAtCommandObserver(this);
-	iATHelperCommand->SetAtCommandString(KATSetFormatForOperater);
-	iATHelperCommand->ExecuteCommand();
-	iATType = ELtsyAT_Phone_SetOperFormat;
-	}
-// ---------------------------------------------------------------------------
-// CGetOperatorNmae::SetRequestTypeL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetOperatorNmae::SetRequestTypeL(TInt aIpc)
-	{
-	iRequestIpc = aIpc;
-	}
-// ---------------------------------------------------------------------------
-// CGetOperatorNmae::SetOperFormatComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetOperatorNmae::SetOperFormatComplete(const TInt aError)
-	{
-	if(KErrNone == aError)
-		{
-		EndATCommand(iATHelperCommand);
-		StartATCommand(iATNetworkInfo);
-		}
-	else
-		{
-		EndATCommand(iATHelperCommand);
-		CtsyDispatcherCallBack(aError);
-		}
-	}
-// ---------------------------------------------------------------------------
-// CGetOperatorNmae::CtsyDispatcherCallBackL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetOperatorNmae::CtsyDispatcherCallBack(const TInt aError)
-	{
-	switch(iRequestIpc)
-		{
-		case MLtsyDispatchPhoneGetOperatorName::KLtsyDispatchPhoneGetOperatorNameApiId:
-			iCtsyDispatcherCallback.CallbackPhoneGetOperatorNameComp(aError,  
-					                RMmCustomAPI::EOperatorNameProgrammableLatin, 
-					                iNetworkInfo.iLongName);
-			break;
-		case MLtsyDispatchPhoneGetNetworkProviderName::KLtsyDispatchPhoneGetNetworkProviderNameApiId:
-			iCtsyDispatcherCallback.CallbackPhoneGetNetworkProviderNameComp(aError,  
-					                iNetworkInfo.iLongName);
-			break;
-		case MLtsyDispatchPhoneGetServiceProviderName::KLtsyDispatchPhoneGetServiceProviderNameApiId:
-			{
-			RMobilePhone::TMobilePhoneServiceProviderNameV2 ServiceProvider;
-			ServiceProvider.iSPName = iNetworkInfo.iLongName;
-			iCtsyDispatcherCallback.CallbackPhoneGetServiceProviderNameComp(aError,ServiceProvider);
-			}
-			//CallbackPhoneGetServiceProviderNameComp(TInt aError, const RMobilePhone::TMobilePhoneServiceProviderNameV2& aServiceProvider);
-			break;
-		default:
-			break;
-			
-		}
-	}
-// ---------------------------------------------------------------------------
-// CGetOperatorNmae::StartATCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetOperatorNmae::StartATCommand(CAtCommandBase* aAtCommand)
-	{
-	aAtCommand->SetAtCommandObserver(this);
-	iATType = aAtCommand->AtType();
-	aAtCommand->StartRequest();
-	}
-// ---------------------------------------------------------------------------
-// CGetOperatorNmae::EndATCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetOperatorNmae::EndATCommand(CAtCommandBase* aAtCommand)
-	{
-	aAtCommand->RemoveAtCommandObserver();
-	aAtCommand->Complete();
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/getphoneid.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CGetPhoneID
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <ctsy/ltsy/mltsydispatchphoneinterface.h>
-#include "getphoneid.h"
-#include "mslogger.h"
-#include "atgetimei.h"
-#include "atgetmanufacturer.h"
-#include "atgetmodel.h"
-#include "atgetrevision.h"
-
-
-// Class CGetPhoneID
-// ---------------------------------------------------------------------------
-// CGetPhoneID::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGetPhoneID* CGetPhoneID::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CGetPhoneID* self = new(ELeave) CGetPhoneID(aGloblePhone,
-			                                    aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop();
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CGetPhoneID::CGetPhoneID
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGetPhoneID::CGetPhoneID(CGlobalPhonemanager& aGloblePhone, 
-	                     CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CATCommandControlBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CGetPhoneID::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetPhoneID::ConstructL()
-	{
-	iATGetImei = CATGetImei::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	iATGetManufacturer = CATGetManufacturer::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	iATGetModel = CATGetModel::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	iATGetRevision = CATGetRevision::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	}
-// ---------------------------------------------------------------------------
-// CGetPhoneID::~CGetPhoneID
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CGetPhoneID::~CGetPhoneID()
-	{
-	delete iATGetImei;
-	iATGetImei = NULL;
-	delete iATGetManufacturer;
-	iATGetManufacturer = NULL;
-	delete iATGetModel;
-	iATGetModel = NULL;
-	delete iATGetRevision;
-	iATGetRevision = NULL;
-	}
-// ---------------------------------------------------------------------------
-// CGetPhoneID::AtCommandExecuteComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetPhoneID::AtCommandExecuteComplete(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if((aEventSource == EWriteCompletion)&&(KErrNone == aStatus))
-		{
-		return;
-		}
-	switch(iATType)
-		{
-		case ELtsyAT_Phone_GetImei:
-			if((KErrNone == aStatus)&&(aEventSource == EReadCompletion))
-				{
-				aStatus = iATGetImei->GetErrorValue();
-				}
-			GetImeiComplete(aStatus);
-			break;
-		case ELtsyAT_Phone_GetManufacturer: 
-			if((KErrNone == aStatus)&&(aEventSource == EReadCompletion))
-				{
-				aStatus = iATGetManufacturer->GetErrorValue();
-				}
-			GetManufacturerComplete(aStatus);
-			break;
-		case ELtsyAT_Phone_GetModel:
-			if((KErrNone == aStatus)&&(aEventSource == EReadCompletion))
-				{
-				aStatus = iATGetModel->GetErrorValue();
-				}
-			GetModelComplete(aStatus);
-			break;
-		case ELtsyAT_Phone_GetRevision:
-			if((KErrNone == aStatus)&&(aEventSource == EReadCompletion))
-				{
-				aStatus = iATGetRevision->GetErrorValue();
-				if(KErrNone == aStatus)
-					{
-					RMobilePhone::TMobilePhoneIdentityV1 PhoneId;
-					PhoneId = iATGetRevision->GetPhoneRevision();
-					iPhoneId.iRevision = PhoneId.iRevision;
-					}
-				}
-			iCtsyDispatcherCallback.CallbackPhoneGetPhoneIdComp(aStatus,iPhoneId);
-			EndATCommand(iATGetRevision);
-			iPhoneGlobals.iEventSignalActive = EFalse;
-			break;
-		default:
-			break;
-		}
-	}
-// ---------------------------------------------------------------------------
-// CGetPhoneID::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetPhoneID::StartRequest()
-	{	
-	StartATCommand(iATGetImei);
-	}
-// ---------------------------------------------------------------------------
-// CGetPhoneID::GetImeiComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetPhoneID::GetImeiComplete(const TInt aError)
-	{
-	if(KErrNone == aError)
-		{
-		RMobilePhone::TMobilePhoneIdentityV1 PhoneId;
-		PhoneId = iATGetImei->GetPhoneImei();
-		iPhoneId.iSerialNumber = PhoneId.iSerialNumber;
-		EndATCommand(iATGetImei);
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		StartATCommand(iATGetManufacturer);
-		}
-	else
-		{
-		EndATCommand(iATGetImei);
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iCtsyDispatcherCallback.CallbackPhoneGetPhoneIdComp(aError,iPhoneId);
-		}
-	}
-// ---------------------------------------------------------------------------
-// CGetPhoneID::GetManufacturerComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetPhoneID::GetManufacturerComplete(const TInt aError)
-	{
-	if(KErrNone == aError)
-		{
-		RMobilePhone::TMobilePhoneIdentityV1 PhoneId;
-		PhoneId = iATGetManufacturer->GetPhoneManufacturer();
-		iPhoneId.iManufacturer = PhoneId.iManufacturer;
-		EndATCommand(iATGetManufacturer);
-		StartATCommand(iATGetModel);
-		}
-	else
-		{
-		EndATCommand(iATGetManufacturer);
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iCtsyDispatcherCallback.CallbackPhoneGetPhoneIdComp(aError,iPhoneId);
-		}
-	}
-// ---------------------------------------------------------------------------
-// CGetPhoneID::GetModelComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetPhoneID::GetModelComplete(const TInt aError)
-	{
-	if(KErrNone == aError)
-		{
-		RMobilePhone::TMobilePhoneIdentityV1 PhoneId;
-		PhoneId = iATGetModel->GetPhoneModel();
-		iPhoneId.iModel = PhoneId.iModel;
-		EndATCommand(iATGetModel);
-		StartATCommand(iATGetRevision);
-		}
-	else
-		{
-		EndATCommand(iATGetModel);
-		iCtsyDispatcherCallback.CallbackPhoneGetPhoneIdComp(aError,iPhoneId);
-		}
-	}
-// ---------------------------------------------------------------------------
-// CGetPhoneID::StartATCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetPhoneID::StartATCommand(CAtCommandBase* aAtCommand)
-	{
-	aAtCommand->SetAtCommandObserver(this);
-	iATType = aAtCommand->AtType();
-	aAtCommand->StartRequest();
-	}
-// ---------------------------------------------------------------------------
-// CGetPhoneID::EndATCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CGetPhoneID::EndATCommand(CAtCommandBase* aAtCommand)
-	{
-	aAtCommand->RemoveAtCommandObserver();
-	aAtCommand->Complete();
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/initializephone.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,427 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CInitializePhone
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <ctsy/ltsy/mltsydispatchphoneinterface.h>
-#include "initializephone.h"
-#include "mslogger.h"
-#include "atgetmodemstatus.h"
-#include "atgetnetworkregistrationstatus.h"
-#include "atgetsimstatusready.h"
-#include "getcurrentnetworkinfo.h"
-#include "atgetnetworkinfo.h"
-#include "atgetsignalstrength.h"
-#include "atgetbatteryinfo.h"
-#include "athelpercommand.h"
-#include "notifybatteryandsignal.h"
-#include "commengine.h"
-#include "atnetworkregstatuschange.h"
-
-_LIT8(KATSMSSetting1,              "AT+CMGF=0\r");
-_LIT8(KATSMSSetting2,              "AT+CNMI=2,2\r");
-_LIT8(KATNwkRegistration,          "AT+CREG=1\r");
-_LIT8(KATGprsNwkRegistration,      "AT+CGREG=1\r");
-_LIT8(KATUnsolicitedWind,          "AT+WIND=16383\r");
-_LIT8(KATSetTDRSingal,             "AT&D1\r");
-// Class CInitializePhone
-// ---------------------------------------------------------------------------
-// CInitializePhone::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CInitializePhone* CInitializePhone::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback,
-	                                     CATNetworkRegStatusChange& aNtwkRegStatusChange,
-	                                     CNotifyBatteryAndSignal& aNotifyBatteryAndSignal)
-	{
-	CInitializePhone* self = new(ELeave) CInitializePhone(aGloblePhone,
-			                                              aCtsyDispatcherCallback,
-			                                              aNtwkRegStatusChange,
-			                                              aNotifyBatteryAndSignal);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self);
-	return self ;
-	}
-
-// ---------------------------------------------------------------------------
-// CInitializePhone::CInitializePhone
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CInitializePhone::CInitializePhone(CGlobalPhonemanager& aGloblePhone, 
-	                               CCtsyDispatcherCallback& aCtsyDispatcherCallback,
-	                               CATNetworkRegStatusChange& aNtwkRegStatusChange,
-	                               CNotifyBatteryAndSignal& aNotifyBatteryAndSignal)
-		:CATCommandControlBase(aGloblePhone,aCtsyDispatcherCallback),
-		iNtwkRegStatusChange(aNtwkRegStatusChange),
-		iNotifyBatteryAndSignal(aNotifyBatteryAndSignal)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CInitializePhone::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitializePhone::ConstructL()
-	{
-	iATGetCurNetworkInfo = CGetCurrentNetworkInfo::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	iATGetCurNetworkInfo->SetIpcRequestCompleteObserver(this);
-	
-	iATHelperCommand = CATHelperCommand::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	
-	iATGetModemStatus = CATGetModemStatus::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	
-	iATSIMCard = CATSIMCard::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	
-	iNetworkRegStatus = CATNetworkRegistration::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	iNetworkRegStatus->SetIpcRequestCompleteObserver(this);
-	iNetworkRegStatus->SetIpcId(MLtsyDispatchPhoneGetNetworkRegistrationStatus::KLtsyDispatchPhoneGetNetworkRegistrationStatusApiId);
-	
-	iATGetSignal = CATGetSignal::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	
-	iATGetBattery = CATGetBattery::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	
-	iPendingRequestList.Reset();
-	}
-
-// ---------------------------------------------------------------------------
-// CInitializePhone::~CInitializePhone
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CInitializePhone::~CInitializePhone()
-	{
-	delete iATGetModemStatus;
-	iATGetModemStatus = NULL;
-
-	delete iNetworkRegStatus;
-	iNetworkRegStatus = NULL;
-
-	delete iATSIMCard;
-	iATSIMCard = NULL;
-
-	delete iATGetCurNetworkInfo;
-    
-	delete iATGetSignal;
-	iATGetSignal = NULL;
-
-	delete iATGetBattery;
-	iATGetBattery = NULL;
-
-	delete iATHelperCommand;
-	iATHelperCommand = NULL;
-	
-	iPendingRequestList.Close();
-	}
-
-// ---------------------------------------------------------------------------
-// CInitializePhone::AtCommandExecuteComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitializePhone::AtCommandExecuteComplete(TAtEventSource aEventSource, TInt aStatus)
-	{
-	// we are not going to handle the event of EWriteCompletion if no error was returned
-	if((aEventSource == EWriteCompletion)&&(KErrNone == aStatus))
-		{
-		return;
-		}
-	
-	TInt err = aStatus;
-	switch(iATType)
-		{
-		case ELtsyAT_Phone_ModemStatus:
-		    if(aStatus == KErrNone)
-		        {
-		        err = iATGetModemStatus->GetErrorValue();
-		        }
-		    
-            ModemStatusComplete(err);
-            CompleteATCommand(iATGetModemStatus);
-			break;
-			
-		case ELtsyAT_Phone_NwkRegStatus: 
-			if(KErrNone == aStatus)
-				{
-				err = iNetworkRegStatus->GetErrorValue();
-				}
-			iCtsyDispatcherCallback.CallbackPhoneGetNetworkRegistrationStatusComp(err,
-								    iPhoneGlobals.iPhoneStatus.iRegistrationStatus);
-			CompleteATCommand(iNetworkRegStatus);
-			break;
-			
-		case ELtsyAT_Phone_SimCardStatus: 
-			if(KErrNone == aStatus)
-				{
-				err = iATSIMCard->GetErrorValue();
-				}
-			iCtsyDispatcherCallback.CallbackPhoneBootNotifySimStatusReadyComp(err);
-			CompleteATCommand(iATSIMCard);
-			break;
-			
-		case ELtsyAT_Phone_GetSignal: 
-			if(KErrNone == aStatus)
-				{
-				err = iATGetSignal->GetErrorValue();
-				}
-			GetSignalComplete(err);
-			CompleteATCommand(iATGetSignal);
-			break;
-			
-		case ELtsyAT_Phone_GetBattery:
-			if(KErrNone == aStatus)
-				{
-				err = iATGetBattery->GetErrorValue();
-				}
-			GetBatteryComplete(err);
-			CompleteATCommand(iATGetBattery);
-			break;
-			
-		case ELtsyAT_Phone_SMSSetting1:
-			ExecuteNextATHelpCommand(KATSMSSetting2,ELtsyAT_Phone_SMSSetting2);
-			break;
-			
-		case ELtsyAT_Phone_SMSSetting2:
-			ExecuteNextATHelpCommand(KATNwkRegistration,ELtsyAT_Phone_RegistNwk);
-			break;
-		case ELtsyAT_Phone_RegistNwk:
-			ExecuteNextATHelpCommand(KATGprsNwkRegistration,ELtsyAT_Phone_GPRSRegNwk);
-			break;
-			
-		case ELtsyAT_Phone_GPRSRegNwk:
-			ExecuteNextATHelpCommand(KATSetTDRSingal,ELtsyAT_Phone_SetTDRSingal);
-			break;
-			
-		case ELtsyAT_Phone_SetTDRSingal:
-			ExecuteNextATHelpCommand(KATUnsolicitedWind,ELtsyAT_Phone_SetWind);
-			break;
-			
-		case ELtsyAT_Phone_SetWind:
-			iPhoneGlobals.iEventSignalActive = EFalse;
-			if(iPhoneGlobals.iPhoneStatus.iInitStatus == EPhoneInitialising)
-				{
-				iPhoneGlobals.iPhoneStatus.iInitStatus = EPhoneInitialised;
-				}
-			CompleteATCommand(iATHelperCommand);
-			break;
-			
-		default:
-			break;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CInitializePhone::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitializePhone::StartRequest()
-	{
-	StartATCommand(iATGetModemStatus);
-	}
-
-// ---------------------------------------------------------------------------
-// CInitializePhone::ExecuteNextRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitializePhone::ExecutePendingRequest()
-	{
-	if(iPendingRequestList.Count() > 0 && !iIsPendingRequestStillRunning)
-		{
-		// Mark if the next pending request should be run immediately. 
-		// There is a case: If we have alreay known the passed-back results for a certain API, so when such API passed by, 
-		// what is going to to is to complete this IPC request immediately synchronously.
-		TBool nextPendingReqShouldBeExecutedImmediatley = EFalse;
-		
-		// get the IPC number
-		TInt ipc = iPendingRequestList[0];
-		
-		// remove this request from the pending request list
-		iPendingRequestList.Remove(0);
-		
-		switch(ipc)
-			{
-			case MLtsyDispatchPhoneBootNotifySimStatusReady::KLtsyDispatchPhoneBootNotifySimStatusReadyApiId:				
-				StartATCommand(iATSIMCard);
-				break;
-				
-			case MLtsyDispatchPhoneGetNetworkRegistrationStatus::KLtsyDispatchPhoneGetNetworkRegistrationStatusApiId:
-			    iNtwkRegStatusChange.Disable();
-				StartATCommand(iNetworkRegStatus);
-				break;
-				
-			case MLtsyDispatchPhoneGetCurrentNetworkInfo::KLtsyDispatchPhoneGetCurrentNetworkInfoApiId: 
-				iATGetCurNetworkInfo->StartRequest();
-				break;
-				
-			case MLtsyDispatchPhoneGetNetworkMode::KLtsyDispatchPhoneGetNetworkModeApiId: 
-				iCtsyDispatcherCallback.CallbackPhoneGetNetworkModeComp(0,RMobilePhone::ENetworkModeGsm);
-				nextPendingReqShouldBeExecutedImmediatley = ETrue;
-				break;
-				
-			case MLtsyDispatchPhoneGetNitzInfo::KLtsyDispatchPhoneGetNitzInfoApiId:
-				iCtsyDispatcherCallback.CallbackPhoneGetNitzInfoComp(0,iPhoneGlobals.iPhoneStatus.iMobilePhoneNITZ);
-				nextPendingReqShouldBeExecutedImmediatley = ETrue;
-				break;
-				
-			case MLtsyDispatchPhoneGetSignalStrength::KLtsyDispatchPhoneGetSignalStrengthApiId: 
-				StartATCommand(iATGetSignal);
-				break;
-				
-			case MLtsyDispatchPhoneGetBatteryInfo::KLtsyDispatchPhoneGetBatteryInfoApiId: 
-				StartATCommand(iATGetBattery);
-				break;
-				
-			case MLtsyDispatchPhoneGetHomeNetwork::KLtsyDispatchPhoneGetHomeNetworkApiId: 
-				iCtsyDispatcherCallback.CallbackPhoneGetHomeNetworkComp(0,iNetworkInfo);
-				nextPendingReqShouldBeExecutedImmediatley = ETrue;
-				break;
-				
-			case MLtsyDispatchPhoneSimRefreshRegister::KLtsyDispatchPhoneSimRefreshRegisterApiId: 
-				iCtsyDispatcherCallback.CallbackPhoneSimRefreshRegisterComp(0);
-				iATHelperCommand->SetAtCommandObserver(this);
-				ExecuteNextATHelpCommand(KATSMSSetting1,ELtsyAT_Phone_SMSSetting1);
-				break;
-				
-			default:
-				break;
-			}
-		
-		// if the request was complete, we need to call ExecutePendingRequest() to execute next pending request again 
-        if(nextPendingReqShouldBeExecutedImmediatley)
-            {
-            ExecutePendingRequest();
-            }
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CInitializePhone::NotifyIpcRequestComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitializePhone::NotifyIpcRequestComplete(TInt aIpcId)
-    {
-    if(aIpcId == MLtsyDispatchPhoneGetCurrentNetworkInfo::KLtsyDispatchPhoneGetCurrentNetworkInfoApiId)
-        {
-        NetworkInfoComplete();
-        }
-    else if(aIpcId == MLtsyDispatchPhoneGetNetworkRegistrationStatus::KLtsyDispatchPhoneGetNetworkRegistrationStatusApiId)
-        {
-        iNtwkRegStatusChange.Enable();
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// CInitializePhone::ExecuteNextATHelpCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitializePhone::ExecuteNextATHelpCommand(const TDesC8& aATString,TLtsyATCommandType aATType)
-	{
-	iATHelperCommand->Complete();
-	iATHelperCommand->SetAtCommandString(aATString);
-	iATType = aATType;
-	iATHelperCommand->StartRequest();
-	}
-
-// ---------------------------------------------------------------------------
-// CInitializePhone::StartATCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitializePhone::StartATCommand(CAtCommandBase* aAtCommand)
-	{
-	iIsPendingRequestStillRunning = ETrue;
-	aAtCommand->SetAtCommandObserver(this);
-	iATType = aAtCommand->AtType();
-	aAtCommand->StartRequest();
-	}
-
-// ---------------------------------------------------------------------------
-// CInitializePhone::CompleteATCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitializePhone::CompleteATCommand(CAtCommandBase* aAtCommand)
-	{
-	iIsPendingRequestStillRunning = EFalse;
-	aAtCommand->RemoveAtCommandObserver();
-	aAtCommand->Complete();
-	ExecutePendingRequest();
-	}
-
-// ---------------------------------------------------------------------------
-// CInitializePhone::ModemStatusComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitializePhone::ModemStatusComplete(TInt aError)
-	{
-	if(KErrNone == aError)
-		{
-		iCtsyDispatcherCallback.CallbackPhoneBootNotifyModemStatusReadyComp(aError,
-				                ERfsStateInfoNormal);
-		}
-	else
-		{
-		User::After(5000000);
-		iCtsyDispatcherCallback.CallbackPhoneBootNotifyModemStatusReadyComp(aError,
-							    ERfsStateInfoNormal);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CInitializePhone::NetworkInfoComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitializePhone::NetworkInfoComplete()
-	{
-	ExecutePendingRequest();
-	}
-
-// ---------------------------------------------------------------------------
-// CInitializePhone::GetSignalComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitializePhone::GetSignalComplete(TInt aError)
-	{
-	if(KErrNone == aError)
-		{
-		iSignalInfo = iATGetSignal->getSignalInfo();
-		iPhoneGlobals.iPhoneStatus.iSignalInfo = iSignalInfo;
-		}
-	iCtsyDispatcherCallback.CallbackPhoneGetSignalStrengthComp(aError,
-							iSignalInfo.iSignalStrength,
-							iSignalInfo.iBar);
-	}
-// ---------------------------------------------------------------------------
-// CInitializePhone::GetBatteryComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitializePhone::GetBatteryComplete(TInt aError)
-	{
-	if(KErrNone == aError)
-		{
-		iBatteryInfo = iATGetBattery->GetBatteryinfo();
-		iPhoneGlobals.iPhoneStatus.iBatteryInfo = iBatteryInfo;
-		iPhoneGlobals.iPhoneStatus.iRfStateInfo = iATGetBattery->GetRfStateInfo();
-		}
-	iCtsyDispatcherCallback.CallbackPhoneGetBatteryInfoComp(aError,iBatteryInfo);
-	}
-
-// ---------------------------------------------------------------------------
-// CInitializePhone::GetBatteryComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitializePhone::AppendIpcRequestToPendingListL(TInt aIpc)
-    {
-    iPendingRequestList.AppendL(aIpc);
-    }
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phone/src/notifybatteryandsignal.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,191 +0,0 @@
-// 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:
-// CATGetModemStatus
-// Description:
-// CNotifyBatteryAndSignal
-
-#include "notifybatteryandsignal.h"
-#include "mslogger.h"
-#include "atgetbatteryinfo.h"
-#include "atgetsignalstrength.h"
-
-const TInt KLtsyOneSecond = 1000000;
-
-// Class CNotifyBatteryAndSignal
-// ---------------------------------------------------------------------------
-// CNotifyBatteryAndSignal::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CNotifyBatteryAndSignal* CNotifyBatteryAndSignal::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CNotifyBatteryAndSignal* self = new(ELeave) CNotifyBatteryAndSignal(aGloblePhone,
-			                                                            aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop();
-	return self ;
-	}
-// ---------------------------------------------------------------------------
-// CNotifyBatteryAndSignal::CNotifyBatteryAndSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CNotifyBatteryAndSignal::CNotifyBatteryAndSignal(CGlobalPhonemanager& aGloblePhone, 
-	                                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CATCommandControlBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-// ---------------------------------------------------------------------------
-// CNotifyBatteryAndSignal::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CNotifyBatteryAndSignal::ConstructL()
-	{
-	iATCommandName = EATNone;
-	iCallbackTimer = CCallbackTimer::NewL(*this);
-	iATGetBattery = CATGetBattery::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	iATGetSignal = CATGetSignal::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	}
-// ---------------------------------------------------------------------------
-// CNotifyBatteryAndSignal::~CNotifyBatteryAndSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CNotifyBatteryAndSignal::~CNotifyBatteryAndSignal()
-	{
-	if(iATGetBattery)
-		{
-		delete iATGetBattery;
-		iATGetBattery = NULL;
-		}
-	if(iATGetSignal)
-		{
-		delete iATGetSignal;
-		iATGetSignal = NULL;
-		}
-	}
-// ---------------------------------------------------------------------------
-// CNotifyBatteryAndSignal::AtCommandExecuteComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CNotifyBatteryAndSignal::AtCommandExecuteComplete(TAtEventSource aEventSource, TInt /*aStatus*/)
-	{
-	if(aEventSource == EWriteCompletion)
-		{
-		return;
-		}
-	TInt ret = KErrNone;
-	switch(iATCommandName)
-		{
-		case EATGetBattery:
-			iATGetBattery->RemoveAtCommandObserver();
-			iPhoneGlobals.iEventSignalActive = EFalse;
-			if(aEventSource == EReadCompletion)
-				{
-				ret = iATGetBattery->GetErrorValue();
-				if(KErrNone == ret)
-					{
-					iBatteryInfo = iATGetBattery->GetBatteryinfo();
-					TRfStateInfo RfStateInfo;
-					RfStateInfo = iATGetBattery->GetRfStateInfo();
-					if(iPhoneGlobals.iPhoneStatus.iRfStateInfo!=RfStateInfo)
-						{
-						iPhoneGlobals.iPhoneStatus.iRfStateInfo = RfStateInfo;
-						iCtsyDispatcherCallback.CallbackPhoneNotifyRfStatusChangeInd(ret,RfStateInfo);
-						}
-					if(iPhoneGlobals.iPhoneStatus.iBatteryInfo.iChargeLevel != iBatteryInfo.iChargeLevel)
-						{
-						iPhoneGlobals.iPhoneStatus.iBatteryInfo.iChargeLevel = iBatteryInfo.iChargeLevel;
-						iCtsyDispatcherCallback.CallbackPhoneNotifyBatteryInfoChangeInd(ret,iBatteryInfo);
-						}
-					}
-				}
-			iATGetBattery->Complete();
-			iATCommandName = EATGetSignal;
-			break;
-		case EATGetSignal: 
-			iATGetSignal->RemoveAtCommandObserver();
-			iPhoneGlobals.iEventSignalActive = EFalse;
-			if(aEventSource == EReadCompletion)
-				{
-				ret = iATGetSignal->GetErrorValue();
-				if(KErrNone == ret)
-					{
-					iSignalInfo = iATGetSignal->getSignalInfo();
-					if(iPhoneGlobals.iPhoneStatus.iSignalInfo.iSignalStrength != iSignalInfo.iSignalStrength)
-						{
-						iCtsyDispatcherCallback.CallbackPhoneNotifySignalStrengthChangeInd(ret,
-								                iSignalInfo.iSignalStrength,
-								                iSignalInfo.iBar);
-						}
-					}
-				}
-			iATGetSignal->Complete();
-			iATCommandName = EATGetBattery;
-			break;
-		default:
-			break;
-		}
-	StartTimer(30);
-	}
-// ---------------------------------------------------------------------------
-// CNotifyBatteryAndSignal::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CNotifyBatteryAndSignal::StartRequest()
-	{
-	StartTimer(10);
-	iATCommandName = EATGetBattery;
-	}
-// ---------------------------------------------------------------------------
-// CNotifyBatteryAndSignal::TimerRun
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CNotifyBatteryAndSignal::TimerRun(TInt aError)
-    {
-	if((aError == KErrNone)&&
-	   (!iPhoneGlobals.iEventSignalActive)&&
-	   (iPhoneGlobals.iPhoneStatus.iMode==RPhone::EModeOnlineCommand))
-	    {
-		switch(iATCommandName)
-			{
-			case EATGetBattery:
-				iPhoneGlobals.iEventSignalActive = ETrue;
-				iATGetBattery->SetAtCommandObserver(this);
-				iATGetBattery->ExecuteCommand();
-				break;
-			case EATGetSignal:
-				iPhoneGlobals.iEventSignalActive = ETrue;
-				iATGetSignal->SetAtCommandObserver(this);
-				iATGetSignal->ExecuteCommand();
-				break;
-			default:
-				break;
-			}
-		}
-	else
-		{
-		StartTimer(30);
-		}
-	}
-
-/**
- * 
- * 
- */
-void CNotifyBatteryAndSignal::StartTimer(TInt aSeconds)
-    {
-	iCallbackTimer->After(aSeconds*KLtsyOneSecond);
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebook/inc/atphbkgetphonestoreinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-// 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:
-// @file atphbkgetphonestoreinfo.h
-// This contains CAtPhbkGetPhoneStoreInfo which is used to get phonebook information
-// 
-
-#ifndef ATPHBKGETPHONESTOREINFO_H
-#define ATPHBKGETPHONESTOREINFO_H
-
-//system include 
-#include <etelmm.h>
-#include <e32std.h>
-#include <e32base.h>
-
-//user include 
-#include "atcommandbase.h"
-
-/**
- * CAtPhbkGetPhoneStoreInfo
- *
- */
-class CAtPhbkGetPhoneStoreInfo : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtPhbkGetPhoneStoreInfo();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkGetPhoneStoreInfo* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                          CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkGetPhoneStoreInfo* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                           CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-	
-	/**
-	* Set PhoneStoreParam by handler
-	* 
-	* @param aStoreName
-	*/
-	void SetPhoneStoreParam(const TDesC& aStoreName);
-private:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtPhbkGetPhoneStoreInfo(CGlobalPhonemanager& aGloblePhone, 
-                             CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-	
-	/**
-	*  Executer AT command for getting Phone Store Info
-	*/
-	void GetPhoneStoreInfo();
-private:
-	/**
-	*   save the iStoreName by SetPhoneStoreParam
-	*/
-	TBuf<8>  iStoreName;
-
-	/**
-	*  phonestoreinfo for callback
-	*/
-	RMobilePhoneStore::TMobilePhoneStoreInfoV1 iPhoneStoreInfo;
-	
-	/**
-	*  state machine for EventSignal 
-	*/
-	enum 
-		{
-		ESetIccSmsStore,
-		ESetIccSmsStoreComplete,
-		ESetPhoneStore,
-		ESetPhoneStoreComplete,
-		EGetPhoneStoreInfo,
-		EGetPhoneStoreInfoComplete,
-		EATNotInProgress
-		}iState;
-		
-	/**
-	* The return error value of AT command executed 
-	*/
-	TInt iError;			
-
-	}; // class CAtPhbkGetPhoneStoreInfo
-
-#endif //  ATPHBKGETPHONESTOREINFO_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebook/inc/atphbkstorecache.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-// 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:
-// @file atphbkstorecache.h
-// This contains CAtPhbkStoreCache which is used to cache phonebook Entries
-// 
-
-#ifndef ATPHBKSTORECACHE_H
-#define ATPHBKSTORECACHE_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include 
-#include "atcommandbase.h"
-
-/**
- * CAtPhbkStoreCache
- *
- */
-class CAtPhbkStoreCache : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtPhbkStoreCache();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkStoreCache* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkStoreCache* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-	
-	/**
-	* Set Phonebook Type 
-	* 
-	* @param  aPhonebookType
-	*/
-	void SetPhonebookType(DispatcherPhonebook::TPhonebook aPhonebookType);
-protected:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	CAtPhbkStoreCache(CGlobalPhonemanager& aGloblePhone, 
-                     CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-private:
-	/**
-	*  Executer AT command for reading phonebook entries
-	*/	
-	void ReadEntry();
-	
-	/**
-	*  Generate TLV Data should be used by callback
-	*/
-	TInt GeneratePhbkDataL();
-private:	
-	/**
-	*  save PhoneBookType by SetPhonebookType
-	*/	
-	DispatcherPhonebook::TPhonebook iPhoneBookType;
-	
-	/**
-	*  state machine for EventSignal 
-	*/	
-	enum 
-		{
-		ESetStoreName,
-		ESetStoreNameComplete,
-		EReadEntry,
-		EReadEntryComplete,
-		EATNotInProgress
-		}iState;
-	
-	/**
-	* The return error value of AT command executed 
-	*/		
-	TInt iError;	
-
-	/**
-	*  This is used to generate TLV data by GeneratePhbkData 
-	*/
-	TPhonebookReadEntry  iReadEntry;
-	
-	/*
-	* Client reserved space for phonebook data
-	*/
-	TBuf8<800>   iPhbkData; 
-	
-	/*
-	*  indicate whether it is OK or ERROR string 
-	*/
-    TBool   iEndFlag;
-	
-	}; // class CAtPhbkStoreCache
-#endif // ATPHBKSTORECACHE_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebook/inc/atphbkstoredelete.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-// 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:
-// @file atphbkstoredelete.h
-// This contains CAtPhbkStoreDelete which is used to delete a phonebook Entry
-// 
-
-#ifndef ATPHBKSTOREDELETE_H
-#define ATPHBKSTOREDELETE_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include 
-#include "atcommandbase.h"
-
-/**
- * CAtPhbkStoreDelete
- *
- */
-class CAtPhbkStoreDelete : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtPhbkStoreDelete();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkStoreDelete* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                    CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkStoreDelete* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-	
-	/**
-	* Set Phonebook Type 
-	* 
-	* @param  aPhonebookType
-	*/
-	void SetPhonebookType(DispatcherPhonebook::TPhonebook aPhonebookType);
-	
-	/**
-	* Set Phonebook Index should be deleted
-	* 
-	* @param  aIndex
-	*/
-	void SetDeleteIndex(TInt aIndex);
-protected:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtPhbkStoreDelete(CGlobalPhonemanager& aGloblePhone, 
-                       CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-private:
-	/**
-	*  Executer AT command for Deleting an Entry
-	*/
-	void DeleteEntry();
-	
-	/**
-	* Get the maximum number length for each phonebook store type
-	*/
-	void GetMaxNumberLen();
-private:	
-	/**
-	*  save PhoneBookType by SetPhonebookType
-	*/	
-	DispatcherPhonebook::TPhonebook iPhoneBookType;
-	
-	/**
-	*  state machine for EventSignal 
-	*/
-	enum 
-		{
-		ESetStoreName,
-		ESetStoreNameComplete,
-		EDeleteEntry,
-		EDeleteEntryComplete,
-		EATNotInProgress
-		}iState;
-		
-	/**
-	* The return error value of AT command executed 
-	*/		
-	TInt iError;	
-	
-	/**
-	*  The index phonebook Entry should be deleted
-	*/
-	TInt iIndex;
-	
-	/**
-	* the maximum number length 
-	*/
-	TInt iMaxLen;
-	
-	}; // class AtPhbkStoreDelete
-#endif // ATPHBKSTOREDELETE_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebook/inc/atphbkstoreinitialise.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-// 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:
-// @file atphbkstoreinitialise.h
-// This contains CAtPhbkStoreInitialise which initialises all kinds of phonebook 
-// 
-
-#ifndef ATPHBKSTOREINITIALISE_H
-#define ATPHBKSTOREINITIALISE_H
-
-//system include  
-#include <etelmm.h>
-#include <e32std.h>
-#include <e32base.h>
-
-//user include 
-#include "atcommandbase.h"
-
-/**
- * CAtPhbkStoreInitialise
- *
- */
-class CAtPhbkStoreInitialise : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtPhbkStoreInitialise();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkStoreInitialise* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                        CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkStoreInitialise* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-private:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtPhbkStoreInitialise(CGlobalPhonemanager& aGloblePhone, 
-                           CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-	
-	/**
-	*  Executer AT command for getting Store Info
-	*/
-	void GetStoreInfo();
-	
-	/**
-	*  assign totalEntries,maxTextLen and maxNumberLen for each 
-	*  phonebook store type 
-	*/
-	void AssignPhbkType();
-private:
-	/**
-	*  the structure for callback
-	*/
-	DispatcherPhonebook::TPhonebookStoreInfoV1  iStoreInfo;
-
-	/**
-	*  state machine for EventSignal 
-	*/	
-	enum 
-		{
-		ESetStoreName,
-		ESetStoreNameComplete,
-		EGetStoreInfo,
-		EGetStoreInfoComplete,
-		EATNotInProgress
-		}iState;
-		
-	/**
-	* The return error value of AT command executed 
-	*/		
-	TInt iError;
-	
-	/**
-	*  the array stores phonebook type's string 
-	*/
-	RArray<TPtrC8>  iStoreArr;
-	
-    /**
-	*  phonebook store type's index 
-	*/
-	TInt  iStoreIndex;
-	
-	/**
-	*  total Entries for each store type
-	*/
-	TInt iTotalEntries;
-	
-	/**
-	*  maximum number Length
-	*/
-	TUint16 iValNumberLen;
-	
-	/**
-	*  maximum text Length
-	*/	
-	TUint16 iValTextLen;
-	
-	}; // class CAtPhbkStoreInitialise
-
-#endif // ATPHBKSTOREINITIALISE_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebook/inc/atphbkstoreread.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,173 +0,0 @@
-// 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:
-// @file atphbkstoreread.h
-// This contains CAtPhbkStoreRead which is use to read a phonebook Entry
-// 
-
-#ifndef ATPHBKSTOREREAD_H
-#define ATPHBKSTOREREAD_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include 
-#include "atcommandbase.h"
-
-/**
- * CAtPhbkStoreRead
- *
- */
-class CAtPhbkStoreRead : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtPhbkStoreRead();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkStoreRead* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkStoreRead* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-	
-	/**
-	* Set read phonebook parameters
-	* 
-	* @param  aIndex
-	* @param  aSlotNum
-	*/
-	void SetReadParam(TInt aIndex,TInt aSlotNum);
-
-	/**
-	* Set Phonebook Type 
-	* 
-	* @param  aPhonebookType
-	*/
-	void SetPhonebookType(DispatcherPhonebook::TPhonebook aPhonebookType);
-protected:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtPhbkStoreRead(CGlobalPhonemanager& aGloblePhone, 
-                     CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-private:
-	/**
-	*  Executer AT command for reading a phonebook entry
-	*/	
-	void ReadEntry();
-	
-	/**
-	*  Generate TLV Data should be used by callback
-	*/
-	TInt GeneratePhbkDataL();
-private:
-	/**
-	*  save PhoneBookType by SetPhonebookType
-	*/	
-	DispatcherPhonebook::TPhonebook iPhoneBookType;
-	
-	/**
-	*  state machine for EventSignal 
-	*/
-	enum 
-		{
-		ESetStoreName,
-		ESetStoreNameComplete,
-		EReadEntry,
-		EReadEntryComplete,
-		EATNotInProgress
-		}iState;
-		
-	/**
-	* The return error value of AT command executed 
-	*/		
-	TInt iError;
-	
-	/*
-	* the first index should be read
-	*/
-	TInt iIndex;
-	
-	/*
-	* the phonebook item number want to read
-	*/
-	TInt iSlotNum;
-	
-	/**
-	*  This is used to generate TLV data by GeneratePhbkData 
-	*/
-	TPhonebookReadEntry  iReadEntry;
-	
-	/*
-	* Client reserved space for phonebook data
-	*/
-	TBuf8<800>   iPhbkData; 
-	
-	/*
-	*  indicate whether it is OK or ERROR string 
-	*/
-    TBool   iEndFlag;
-	
-	}; // class CAtPhbkStoreRead
-#endif // ATPHBKSTOREREAD_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebook/inc/atphbkstorewrite.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-// 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:
-// @file atphbkstorewrite.h
-// This contains CAtPhbkStoreWrite which is use to write a phonebook Entry
-// 
-
-#ifndef ATPHBKSTOREWRITE_H
-#define ATPHBKSTOREWRITE_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include 
-#include "atcommandbase.h"
-
-/**
- * TPhonebookEntry
- *
- */
-class TPhonebookEntry
-    {
-public:
-	TUint16     iIndex;
-    TBuf16<20>  iNumber;
-    TBuf16<14>  iText;	
-    };
-
-/**
- * CAtPhbkStoreWrite
- *
- */
-class CAtPhbkStoreWrite : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtPhbkStoreWrite();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkStoreWrite* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkStoreWrite* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                    CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-	
-    /**
-	*   set PhoneEntry passed by handler
-	*/
-	void SetPhonebookEntryL(const TDesC8& aEntry);
-	
-	/**
-	* Set Phonebook Type 
-	* 
-	* @param  aPhonebookType
-	*/
-	void SetPhonebookType(DispatcherPhonebook::TPhonebook aPhonebookType);
-protected:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtPhbkStoreWrite(CGlobalPhonemanager& aGloblePhone, 
-                      CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-private:
-	/**
-	*  Executer AT command for writing a phonebook entry
-	*/	
-	void WriteEntry();
-	
-	/**
-	* Get the maximum number length for each phonebook store type
-	*/
-	void GetMaxNumberLen();
-private:	
-	/**
-	*  save PhoneBookType by SetPhonebookType
-	*/	
-	DispatcherPhonebook::TPhonebook iPhoneBookType;
-
-	/**
-	*  state machine for EventSignal 
-	*/
-	enum 
-		{
-		ESetStoreName,
-		ESetStoreNameComplete,
-		EWriteEntry,
-		EWriteEntryComplete,
-		EATNotInProgress
-		}iState;
-	
-	/**
-	* The return error value of AT command executed 
-	*/		
-	TInt iError;	
-	
-	/**
-	*  The structure decoded for phonebook Entry 
-	*/
-	TPhonebookEntry iPhbkEntry;
-	
-	/**
-	* the maximum number length 
-	*/
-	TInt iMaxLen;
-	
-	}; // class CAtPhbkStoreWrite
-#endif // ATPHBKSTOREWRITE_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebook/src/atphbkgetphonestoreinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,365 +0,0 @@
-// 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:
-// @file atphbkgetphonestoreinfo.cpp
-// This contains CAtPhbkGetPhoneStoreInfo which is used to get phonebook information
-// 
-
-//system include 
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <etelmm.h>
-
-//user include
-#include "atphbkgetphonestoreinfo.h"
-#include "mslogger.h"
-#include "ltsycommondefine.h"
-
-//constant defination
-_LIT8(KSetPhoneStore,"AT+CPBS=\"%S\"\r");
-_LIT8(KGetPhoneStoreInfo,"AT+CPBS?\r");
-_LIT8(KCPBSResponseString,"+CPBS:");
-_LIT8(KAdnPhonebook,"SM");
-_LIT8(KFdnPhonebook,"FD");
-_LIT8(KGetPrefMemCommand,"AT+CPMS?\r");
-_LIT8(KCPMSResponseString,"+CPMS:");
-
-
-// ---------------------------------------------------------------------------
-// CAtPhbkGetPhoneStoreInfo::CAtPhbkGetPhoneStoreInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkGetPhoneStoreInfo::CAtPhbkGetPhoneStoreInfo(CGlobalPhonemanager& aGloblePhone, 
-                                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                                   :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtPhbkGetPhoneStoreInfo::CAtPhbkGetPhoneStoreInfo called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkGetPhoneStoreInfo::~CAtPhbkGetPhoneStoreInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkGetPhoneStoreInfo::~CAtPhbkGetPhoneStoreInfo()
-	{
-	LOGTEXT(_L8("CAtPhbkGetPhoneStoreInfo::~CAtPhbkGetPhoneStoreInfo called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkGetPhoneStoreInfo::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkGetPhoneStoreInfo* CAtPhbkGetPhoneStoreInfo::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                                          CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-    {
-	CAtPhbkGetPhoneStoreInfo* self = new (ELeave)CAtPhbkGetPhoneStoreInfo(aGloblePhone, 
-			                                                              aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkGetPhoneStoreInfo::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkGetPhoneStoreInfo* CAtPhbkGetPhoneStoreInfo::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-    {
-	CAtPhbkGetPhoneStoreInfo* self=CAtPhbkGetPhoneStoreInfo::NewLC(aGloblePhone, 
-                                                                   aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkGetPhoneStoreInfo::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkGetPhoneStoreInfo::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkGetPhoneStoreInfo::SetPhoneStoreParam
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkGetPhoneStoreInfo::SetPhoneStoreParam(const TDesC& aStoreName)
-	{
-	iStoreName = aStoreName;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkGetPhoneStoreInfo::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkGetPhoneStoreInfo::StartRequest()
-	{
-	if( iStoreName.CompareF(KETelIccSmsStore) == KErrNone)
-		{
-		iState = ESetIccSmsStore;
-		iTxBuffer.Zero();
-		iTxBuffer.Copy(KGetPrefMemCommand);
-		Write();
-		}
-	else
-		{
-	    ExecuteCommand();
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkGetPhoneStoreInfo::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkGetPhoneStoreInfo::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtPhbkGetPhoneStoreInfo::ExecuteCommand called"));
-	iState = ESetPhoneStore;
-	TPtrC8  storeName;
-	iTxBuffer.Zero();
-	if( iStoreName.CompareF(KETelIccFdnPhoneBook) == KErrNone )
-		{
-		storeName.Set(KFdnPhonebook);
-		}
-	else if( iStoreName.CompareF(KETelIccAdnPhoneBook) == KErrNone)
-		{
-		storeName.Set(KAdnPhonebook);
-		}
-	iTxBuffer.Format(KSetPhoneStore,&storeName);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkGetPhoneStoreInfo::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkGetPhoneStoreInfo::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtPhbkGetPhoneStoreInfo::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-	
-	if(aStatus != KErrNone)
-		{
-		Complete();
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iCtsyDispatcherCallback.CallbackPhonebookGetPhoneStoreInfoComp(aStatus,iPhoneStoreInfo);
-		}
-	else
-		{
-		if( aEventSource == EWriteCompletion )
-			{
-			LOGTEXT(_L8("CAtPhbkGetPhoneStoreInfo::EventSignal,EWriteCompletion!"));
-			if( iState == ESetPhoneStore )
-				{
-				iState = ESetPhoneStoreComplete;
-				}
-			else if( iState == EGetPhoneStoreInfo )
-				{
-				iState = EGetPhoneStoreInfoComplete;
-				}
-			else if( iState ==ESetIccSmsStore )
-				{
-				iState = ESetIccSmsStoreComplete;
-				}
-			}
-    	else 
-			{
-			LOGTEXT(_L8("CAtPhbkGetPhoneStoreInfo::EventSignal,EReadCompletion!"));
-			if( iState == ESetPhoneStoreComplete )
-				{
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				if(iError == KErrNone)
-					{
-					iState = EGetPhoneStoreInfo;
-					GetPhoneStoreInfo();
-					}
-				else
-					{
-					iCtsyDispatcherCallback.CallbackPhonebookGetPhoneStoreInfoComp(iError,iPhoneStoreInfo);
-					}
-				}
-			else if( iState == EGetPhoneStoreInfoComplete )
-				{
-				iPhoneStoreInfo.iName = iStoreName;
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				iCtsyDispatcherCallback.CallbackPhonebookGetPhoneStoreInfoComp(iError,iPhoneStoreInfo);
-				}
-			else if( iState == ESetIccSmsStoreComplete)
-				{
-				iPhoneStoreInfo.iName = iStoreName;
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				iCtsyDispatcherCallback.CallbackPhonebookGetPhoneStoreInfoComp(iError,iPhoneStoreInfo);
-				}
-			}
-		}
-	}	
-
-// ---------------------------------------------------------------------------
-// CAtPhbkGetPhoneStoreInfo::GetPhoneStoreInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkGetPhoneStoreInfo::GetPhoneStoreInfo()
-	{
-	LOGTEXT(_L8("CAtPhbkGetPhoneStoreInfo::GetPhoneStoreInfo callded"));
-	iPhoneGlobals.iEventSignalActive = ETrue;
-	iTxBuffer.Zero();
-	iTxBuffer.Copy(KGetPhoneStoreInfo);
-	Write();   
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkGetPhoneStoreInfo::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkGetPhoneStoreInfo::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if( iState == ESetPhoneStoreComplete )
-		{
-		if (CurrentLine().Match(KLtsyOkString) == 0)
-			{
-			iError = KErrNone;
-			}
-		else
-			{
-			iError = KErrGeneral;
-			}
-		}
-	else if( iState == EGetPhoneStoreInfoComplete )
-		{
-		/**
-		* Here is an Example 
-		* +CPBS: "SM",6,250  
-        * ADN phonebook is selected,6 locations are used and 
-        * total 250 locations are available
-		*/
-		iError = KErrNone;
-		RArray<TPtrC8> array;
-		CleanupClosePushL(array);
-		iParser->ParseRespondedBuffer(array,Buffer());
-		//remove AT+CPBS
-		if(array[0].MatchF(KAnyATCommand) != KErrNotFound)
-			{
-			array.Remove(0);
-			}
-		TInt count = array.Count();
-#ifdef _DEBUG			
-		for( TInt i=0;i<count;i++ )
-			{
-		    LOGTEXT3(_L8("CAtPhbkGetPhoneStoreInfo::ParseResponseL\tarray[%d]=%S"),
-		    		      i,&array[i]);     
-			}
-#endif			
-		if (count <= 1)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNotFound;
-			return;
-			}
-		if(array[0].MatchF(KCPBSResponseString) == KErrNotFound)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNotFound;
-			return;
-			}
-				
-		//parse used
-		TLex8 lex(array[2]);
-		TUint16 val;
-		TInt ret = lex.Val(val,EDecimal);
-		if(ret != KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		iPhoneStoreInfo.iUsedEntries = val;
-		
-		//parse total
-		TLex8 lex1(array[3]);
-		ret = lex1.Val(val,EDecimal);
-		if(ret != KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		iPhoneStoreInfo.iTotalEntries = val;
-		iPhoneStoreInfo.iType = RMobilePhoneStore::EPhoneBookStore;
-	    LOGTEXT3(_L8("CAtPhbkGetPhoneStoreInfo::ParseResponseL\tPreferred store used=%d, total=%d"), 
-	    		                                iPhoneStoreInfo.iUsedEntries,iPhoneStoreInfo.iTotalEntries);
-		CleanupStack::PopAndDestroy(&array);
-		}
-	else 
-		{
-		/**
-		* Parse result of AT+CPMS? 
-		* Response:+CPMS:<mem1>,<used1>,<total1>,<mem2>,<used2>,<total2>
-		* Here only the first mem is used. mem1 is SM
-		*/
-		iError = KErrNone;
-		RArray<TPtrC8> array;
-		CleanupClosePushL(array);
-		iParser->ParseRespondedBuffer(array,Buffer());
-		if(array[0].MatchF(KAnyATCommand) != KErrNotFound)
-			{
-			array.Remove(0);
-			}
-		TInt Count = array.Count();
-		if (Count <= 1)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNotFound;
-			return;
-			}
-		if(array[0].MatchF(KCPMSResponseString) == KErrNotFound)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNotFound;
-			return;
-			}
-		//parse name 
-		TPtrC8 name(array[1]);
-		
-		//parse used
-		TLex8 lex(array[2]);
-		TUint16 val;
-		TInt ret = lex.Val(val,EDecimal);
-		if(ret != KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		iPhoneStoreInfo.iUsedEntries = val;
-		
-		//parse total
-		TLex8 lex1(array[3]);
-		ret = lex1.Val(val,EDecimal);
-		if(ret != KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		iPhoneStoreInfo.iTotalEntries = val;
-		iPhoneStoreInfo.iType = RMobilePhoneStore::EShortMessageStore;
-		LOGTEXT3(_L8("CAtPhbkGetPhoneStoreInfo::ParseResponseL\tPreferred store used=%d, total=%d"), 
-			    		                        iPhoneStoreInfo.iUsedEntries,iPhoneStoreInfo.iTotalEntries);
-		CleanupStack::PopAndDestroy(&array);
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebook/src/atphbkstorecache.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,371 +0,0 @@
-// 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:
-// @file atphbkstorecache.cpp
-// This contains CAtPhbkStoreCache which is used to cache phonebook Entries
-// 
-
-//system include 
-#include <etelmm.h>
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mpbutil.h>
-#include <cmmgsmphonestorageutility.h>
-
-//user include 
-#include "atphbkstorecache.h"
-#include "mslogger.h"
-
-//constant defination
-_LIT8(KPhbkStoreRead,"AT+CPBR=%d,%d\r");
-_LIT8(KSelAdnPhonebook,"AT+CPBS=\"SM\"\r");
-_LIT8(KSelFdnPhonebook,"AT+CPBS=\"FD\"\r");
-_LIT8(KCPBRMatchString,"+CPBR:*");
-_LIT8(KCPBRSResponseString,"+CPBR:");
-const TInt KAdnStartIndex = 1;
-const TInt KFdnStartIndex = 1;
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreCache::CAtPhbkStoreCache
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreCache::CAtPhbkStoreCache(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                   :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtPhbkStoreCache::CAtPhbkStoreCache called"));
-	iEndFlag = EFalse;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreCache::~CAtPhbkStoreCache
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreCache::~CAtPhbkStoreCache()
-	{
-	LOGTEXT(_L8("CAtPhbkStoreCache::~CAtPhbkStoreCache called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreCache::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreCache* CAtPhbkStoreCache::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                          CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtPhbkStoreCache* self = new (ELeave)CAtPhbkStoreCache(aGloblePhone, 
-                                                          aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreCache::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreCache* CAtPhbkStoreCache::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtPhbkStoreCache* self=CAtPhbkStoreCache::NewLC(aGloblePhone, 
-                                                   aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreCache::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreCache::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	AddExpectStringL(KLtsyOkString);
-	AddExpectStringL(KLtsyErrorString);
-	AddExpectStringL(KCPBRMatchString);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreCache::SetPhonebookType
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreCache::SetPhonebookType(DispatcherPhonebook::TPhonebook aPhonebookType)
-	{
-	iPhoneBookType = aPhonebookType;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreCache::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreCache::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreCache::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreCache::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtPhbkStoreCache::ExecuteCommand called"));
-	iState = ESetStoreName;
-	iTxBuffer.Zero();	
-	if( iPhoneBookType == DispatcherPhonebook::EIccAdn )
-		{
-		iTxBuffer.Copy(KSelAdnPhonebook);
-		}
-	else if( iPhoneBookType == DispatcherPhonebook::EIccFdn )
-		{
-		iTxBuffer.Copy(KSelFdnPhonebook);
-		}
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreCache::ReadEntry
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreCache::ReadEntry()
-	{
-	LOGTEXT(_L8("CAtPhbkStoreCache::ReadEntry callded"));
-	iPhoneGlobals.iEventSignalActive = ETrue;
-	iTxBuffer.Zero();
-	TInt totalEntries(KErrNone);
-	if( iPhoneBookType == DispatcherPhonebook::EIccAdn )
-		{
-		totalEntries = iPhoneGlobals.iPhonebookStoreInfo.iAdnTotalEntries;
-		iTxBuffer.Format(KPhbkStoreRead,KAdnStartIndex,totalEntries);
-		}
-	else if( iPhoneBookType == DispatcherPhonebook::EIccFdn )
-		{
-		totalEntries = iPhoneGlobals.iPhonebookStoreInfo.iFdnTotalEntries; 
-		iTxBuffer.Format(KPhbkStoreRead,KFdnStartIndex,totalEntries);
-		}
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreCache::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreCache::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtPhbkStoreCache::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-	if(aStatus != KErrNone)
-		{
-		Complete();
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iCtsyDispatcherCallback.CallbackPhonebookStoreCacheComp(aStatus,iPhoneBookType,iPhbkData);
-		}
-	else
-		{
-		if( aEventSource== EWriteCompletion )
-			{
-			if( iState==ESetStoreName )
-				{
-				iState = ESetStoreNameComplete;
-				}
-			else if( iState==EReadEntry )
-				{
-				iState = EReadEntryComplete;
-				}
-			}
-		else 
-			{
-			if( iState==ESetStoreNameComplete )
-				{
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				if(iError == KErrNone)
-					{
-					ClearBuffer();
-					iState = EReadEntry;
-					ReadEntry();
-					}
-				else 
-					{
-					iCtsyDispatcherCallback.CallbackPhonebookStoreCacheComp(iError,iPhoneBookType,iPhbkData);
-					}
-				}
-			else if( iState==EReadEntryComplete )
-				{
-				//encounter OK or ERROR
-				if( iEndFlag )
-					{
-					ClearBuffer();
-					iPhbkData.Zero();
-					Complete();
-					iPhoneGlobals.iEventSignalActive = EFalse;
-					iCtsyDispatcherCallback.CallbackPhonebookStoreCacheComp(iError,iPhoneBookType,iPhbkData);
-					}
-				else 
-					{
-					if( iError==KErrNone )
-						{
-						TRAPD(err, GeneratePhbkDataL());
-						iCtsyDispatcherCallback.CallbackPhonebookStoreCacheComp(err,iPhoneBookType,iPhbkData);
-						ClearCurrentLine();
-						}
-					else 
-						{
-						iCtsyDispatcherCallback.CallbackPhonebookStoreCacheComp(iError,iPhoneBookType,iPhbkData);
-						ClearCurrentLine();
-						}
-					}
-				}
-			}
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreCache::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreCache::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if( iState == ESetStoreNameComplete )
-	    {
-		if (CurrentLine().Match(KLtsyOkString) == 0)
-			{
-			iError = KErrNone;
-			}
-		else
-			{
-			iError = KErrGeneral;
-			}
-	    }
-	else if( iState == EReadEntryComplete )
-		{
-		/**
-		* Here is an Example 
-		* at+CPBR=1,250    
-		*+CPBR: 1,"1234001",129,""
-		*+CPBR: 2,"123456002",129,"TelNo 002"
-		*+CPBR: 3,"123456003",129,"TelNo 003"
-		*+CPBR: 4,"123456004",129,"TelNo 004"
-		*OK
-		*/
-		RArray<TPtrC8> array;
-		CleanupClosePushL(array);
-		iParser->ParseRespondedBuffer(array,Buffer());
-		// remove the string of AT+CPBR=..
-		if(array[0].MatchF(KAnyATCommand) != KErrNotFound)
-			{
-			array.Remove(0);
-			}
-		TInt count = array.Count();
-#ifdef _DEBUG		
-		for( TInt i=0;i<count;i++ )
-			{
-			LOGTEXT3(_L8("CAtPhbkStoreCache::ParseResponseL\tarray[%d]=%S"),i,&array[i]);  
-			}
-#endif		
-		if((array[1].Match(KLtsyOkString) == KErrNone))
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNone;
-			iEndFlag = ETrue;
-			return; 
-			}
-		else if((array[1].Match(KLtsyErrorString) == KErrNone))
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrGeneral;
-			iEndFlag = ETrue;
-			return; 
-			}
-	  
-		iError = KErrNone;
-		//remove number line if it has 
-		if( array[0].MatchF(KCPBRSResponseString) == KErrNotFound )
-			{
-			array.Remove(0);
-			}
-		if( array[0].MatchF(KCPBRSResponseString) == KErrNotFound )
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNotFound;
-			return;
-			}
-		//parse index
-		TLex8 lex(array[1]);
-		TUint16 val;
-		TInt ret = lex.Val(val,EDecimal);
-		if(ret != KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		//Index  
-		iReadEntry.iIndex = val;             
-		iReadEntry.iNumber.Copy(array[2]);   
-		//Parse TON/NPI
-		TLex8 lex1(array[3]);
-		TUint16 val1;
-		ret = lex1.Val(val1,EDecimal);
-		if(ret != KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		 //TON/NPI
-		iReadEntry.iTon = (TUint8)val1;  
-		iReadEntry.iText.Copy(array[4]);
-		CleanupStack::PopAndDestroy();
-		} 
-  	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreCache::GeneratePhbkData
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CAtPhbkStoreCache::GeneratePhbkDataL()
-	{
-	CPhoneBookBuffer* pbBuffer = new(ELeave) CPhoneBookBuffer(); // used to write phonebook data
-	iPhbkData.Zero();
-	 // Set it to point to the Client buffer
-	pbBuffer->Set(&iPhbkData);
-	pbBuffer->AddNewEntryTag();
-	
-	TInt ret = pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBAdnIndex,iReadEntry.iIndex);
-	if( ret!=KErrNone )
-		{
-		delete pbBuffer;
-		return ret;
-		}
-	ret=pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBNumber, iReadEntry.iNumber);
-	if( ret!=KErrNone )
-		{
-		delete pbBuffer;
-		return ret;
-		}
-	ret=pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBTonNpi, iReadEntry.iTon);
-	if(ret!=KErrNone)
-		{
-		delete pbBuffer;
-		return ret;
-		}
-	ret=pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBText, iReadEntry.iText);
-	if(ret != KErrNone)
-		{
-		delete pbBuffer;
-		return ret;
-		}
-	delete pbBuffer;
-	return KErrNone;
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebook/src/atphbkstoredelete.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,233 +0,0 @@
-// 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:
-// @file atphbkstoredelete.cpp
-// This contains CAtPhbkStoreDelete which is used to delete a phonebook Entry
-// 
-
-//system include 
-#include <etelmm.h>
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-
-//user include 
-#include "atphbkstoredelete.h"
-#include "mslogger.h"
-
-//constant defination
-_LIT8(KPhbkStoreDelete,"AT+CPBW=%d\r");
-_LIT8(KSelAdnPhonebook,"AT+CPBS=\"SM\"\r");
-_LIT8(KSelFdnPhonebook,"AT+CPBS=\"FD\"\r");
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreDelete::CAtPhbkStoreDelete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreDelete::CAtPhbkStoreDelete(CGlobalPhonemanager& aGloblePhone, 
-                                       CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                       :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtPhbkStoreDelete::CAtPhbkStoreDelete called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreDelete::~CAtPhbkStoreDelete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreDelete::~CAtPhbkStoreDelete()
-	{
-	LOGTEXT(_L8("CAtPhbkStoreDelete::~CAtPhbkStoreDelete called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreDelete::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreDelete* CAtPhbkStoreDelete::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                              CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtPhbkStoreDelete* self = new (ELeave)CAtPhbkStoreDelete(aGloblePhone, 
-                                                              aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreDelete::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreDelete* CAtPhbkStoreDelete::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtPhbkStoreDelete* self=CAtPhbkStoreDelete::NewLC(aGloblePhone, 
-                                                       aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreDelete::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreDelete::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreDelete::SetPhonebookType
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreDelete::SetPhonebookType(DispatcherPhonebook::TPhonebook aPhonebookType)
-	{
-	iPhoneBookType = aPhonebookType;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreDelete::SetDeleteIndex
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreDelete::SetDeleteIndex(TInt aIndex)
-	{
-	iIndex = aIndex;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreDelete::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreDelete::StartRequest()
-	{
-	GetMaxNumberLen();
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreDelete::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreDelete::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtPhbkStoreDelete::ExecuteCommand called"));
-	iState = ESetStoreName;
-	iTxBuffer.Zero();	
-	if( iPhoneBookType == DispatcherPhonebook::EIccAdn )
-		{
-		iTxBuffer.Copy(KSelAdnPhonebook);
-		}
-	else if( iPhoneBookType == DispatcherPhonebook::EIccFdn )
-		{
-		iTxBuffer.Copy(KSelFdnPhonebook);
-		}
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreDelete::DeleteEntry
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreDelete::DeleteEntry()
-	{
-	LOGTEXT(_L8("CAtPhbkStoreDelete::DeleteEntry callded"));
-	iPhoneGlobals.iEventSignalActive = ETrue;
-	iTxBuffer.Zero();
-	iTxBuffer.Format(KPhbkStoreDelete,iIndex);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreDelete::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreDelete::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtPhbkStoreDelete::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-	
-	if(aStatus != KErrNone)
-		{
-		Complete();
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iCtsyDispatcherCallback.CallbackPhonebookStoreDeleteEntryComp(aStatus,iPhoneBookType,iMaxLen);
-		}
-	else
-		{
-		if( aEventSource== EWriteCompletion )
-			{
-			if( iState==ESetStoreName )
-				{
-				iState = ESetStoreNameComplete;
-				}
-			else if( iState==EDeleteEntry )
-				{
-				iState = EDeleteEntryComplete;
-				}
-			}
-		else 
-			{
-			if( iState==ESetStoreNameComplete )
-				{
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				if( iError == KErrNone )
-					{
-					iState = EDeleteEntry;
-					DeleteEntry();
-					}
-				else
-					{
-					iCtsyDispatcherCallback.CallbackPhonebookStoreDeleteEntryComp(iError,iPhoneBookType,iMaxLen);
-					}
-				}
-			else if( iState== EDeleteEntryComplete)
-				{
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				iCtsyDispatcherCallback.CallbackPhonebookStoreDeleteEntryComp(iError,iPhoneBookType,iMaxLen);
-				}
-			}
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreDelete::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreDelete::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreDelete::GetMaxNumberLen
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreDelete::GetMaxNumberLen()
-	{
-	if( iPhoneBookType == DispatcherPhonebook::EIccAdn )
-		{
-		iMaxLen = iPhoneGlobals.iPhonebookStoreInfo.iAdnMaximumNumberLength;
-		}
-	else if( iPhoneBookType == DispatcherPhonebook::EIccFdn )
-		{
-		iMaxLen = iPhoneGlobals.iPhonebookStoreInfo.iFdnMaximumNumberLength;
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebook/src/atphbkstoreinitialise.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,339 +0,0 @@
-// 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:
-// @file atphbkstoreinitialise.cpp
-// This contains CAtPhbkStoreInitialise which initialises all kinds of phonebook 
-// 
-
-//system include 
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <etelmm.h>
-
-//user  include 
-#include "atphbkstoreinitialise.h"
-#include "mslogger.h"
-#include "ltsycommondefine.h"
-
-//constant defination
-_LIT8(KAdnStore,"AT+CPBS=\"SM\"\r");
-_LIT8(KFdnStore,"AT+CPBS=\"FD\"\r");
-_LIT8(KGetSotreInfo,"AT+CPBR=?\r");
-_LIT8(KCPBRResponseString,"+CPBR:");
-_LIT8(KSeparator,"-");
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreInitialise::CAtPhbkStoreInitialise
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreInitialise::CAtPhbkStoreInitialise(CGlobalPhonemanager& aGloblePhone, 
-                                               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                               :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtPhbkStoreInitialise::CAtPhbkStoreInitialise called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreInitialise::~CAtPhbkStoreInitialise
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreInitialise::~CAtPhbkStoreInitialise()
-	{
-	LOGTEXT(_L8("CAtPhbkStoreInitialise::~CAtPhbkStoreInitialise called"));
-	
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreInitialise::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreInitialise* CAtPhbkStoreInitialise::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                                      CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-    {
-	CAtPhbkStoreInitialise* self = new (ELeave)CAtPhbkStoreInitialise(aGloblePhone, 
-			                                                          aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreInitialise::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreInitialise* CAtPhbkStoreInitialise::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-    {
-	CAtPhbkStoreInitialise* self=CAtPhbkStoreInitialise::NewLC(aGloblePhone, 
-                                                               aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreInitialise::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreInitialise::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	//first is ADN 
-	iStoreArr.Reset();
-	iStoreArr.Append(KAdnStore());
-//	//second is FDN
-	iStoreArr.Append(KFdnStore());
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreInitialise::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreInitialise::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreInitialise::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreInitialise::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtPhbkStoreInitialise::ExecuteCommand called"));
-	iState = ESetStoreName;
-	iStoreIndex = 0;
-	iTxBuffer.Zero();	
-	iTxBuffer.Copy(iStoreArr[iStoreIndex]);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreInitialise::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreInitialise::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtPhbkStoreInitialise::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-	
-	if(aStatus != KErrNone)
-		{
-		Complete();
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iCtsyDispatcherCallback.CallbackPhonebookStoreInitialiseComp(aStatus,iStoreInfo);
-		}
-	else
-		{
-		if( aEventSource == EWriteCompletion )
-			{
-			LOGTEXT(_L8("CAtPhbkStoreInitialise::EventSignal,EWriteCompletion!"));
-			if( iState==ESetStoreName )
-				{
-				iState = ESetStoreNameComplete;
-				}
-			else if( iState==EGetStoreInfo )
-				{
-				iState = EGetStoreInfoComplete;
-				}
-			 }
-		else 
-			{
-			LOGTEXT(_L8("CAtPhbkStoreInitialise::EventSignal,EReadCompletion!"));
-			if( iState==ESetStoreNameComplete )
-				{
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				if(iError == KErrNone )
-					{
-					iState = EGetStoreInfo;
-					GetStoreInfo();
-					}
-				else
-					{
-					iCtsyDispatcherCallback.CallbackPhonebookStoreInitialiseComp(iError,iStoreInfo);
-					}
-				}
-			else if( iState==EGetStoreInfoComplete )
-				{
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				iStoreIndex++;
-				//stands for complete all phonebook store type's at+CPBR=?
-				if ( iStoreIndex > 1 )
-					{
-					iCtsyDispatcherCallback.CallbackPhonebookStoreInitialiseComp(iError,iStoreInfo);
-					}
-				else 
-					{
-					iState = ESetStoreName;
-					iTxBuffer.Zero();
-					//For this case,only two store type
-					iTxBuffer.Copy(iStoreArr[iStoreIndex]);   
-					Write();
-					}
-				}
-			}  
-		}
-	}	
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreInitialise::GetStoreInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreInitialise::GetStoreInfo()
-	{
-	LOGTEXT(_L8("CAtPhbkStoreInitialise::GetPhoneStoreInfo callded"));
-	iPhoneGlobals.iEventSignalActive = ETrue;
-	iTxBuffer.Zero();
-	iTxBuffer.Copy(KGetSotreInfo);
-	Write();   
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreInitialise::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreInitialise::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if( iState == ESetStoreNameComplete )
-		{
-		if (CurrentLine().Match(KLtsyOkString) == 0)
-			{
-			iError = KErrNone;
-			}
-		else
-			{
-			iError = KErrGeneral;
-			}
-		}
-	else if( iState == EGetStoreInfoComplete )
-		{
-		/**
-		* Parse result of AT+CPBR=? 
-		* Response:+CPMS:<(startIndex-endIndex>,<len1>,<len2>
-		* len1 is maximum length for phone number
-		* len2 is maximum length for text 
-		*/
-		iError = KErrNone;
-		RArray<TPtrC8> array;
-		CleanupClosePushL(array);
-		iParser->ParseRespondedBuffer(array,Buffer());
-		// remove the string of AT+CPBR=?
-		if(array[0].MatchF(KAnyATCommand) != KErrNotFound)
-			{
-			array.Remove(0);
-			}
-		TInt count = array.Count();
-#ifdef _DEBUG	
-		for( TInt i=0;i<count;i++ )
-			{
-		    LOGTEXT3(_L8("CAtPhbkStoreInitialise::ParseResponseL\tarray[%d]=%S"),
-		    		      i,&array[i]);     
-			}
-#endif		
-		if (count <= 1)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNotFound;
-			return;
-			}
-		if(array[0].MatchF(KCPBRResponseString) == KErrNotFound)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNotFound;
-			return;
-			}
-		//parse iTotalEntries
-		TInt len = array[1].Length();
-		TInt pos = array[1].FindF(KSeparator);
-		TPtrC8 tempStr;
-		tempStr.Set(array[1].Left(pos));
-		TLex8 lex(tempStr);
-		TUint16 val;
-		TInt ret = lex.Val(val,EDecimal);
-		if(ret != KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		tempStr.Set(array[1].Right(len-pos-1));
-		TLex8 lex1(tempStr);
-		TUint16 val1;
-		ret = lex1.Val(val1,EDecimal);
-		if(ret!=KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-	    iTotalEntries = val1-val+1;
-
-		
-	  	//parse MaximumNumberLength
-		TLex8 lexNumberLen(array[2]);
-		ret = lexNumberLen.Val(iValNumberLen,EDecimal);
-		if(ret != KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-				
-		//parse MaximumTextLength
-		TLex8 lexTextLen(array[3]);
-		ret = lexTextLen.Val(iValTextLen,EDecimal);
-		if(ret != KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		AssignPhbkType();
-		LOGTEXT2(_L8("CAtPhbkStoreInitialise::ParseResponseL\tiTotalEntries=%d"),iTotalEntries);
-	    LOGTEXT3(_L8("CAtPhbkStoreInitialise::ParseResponseL\tPreferred MaxNumbereLen=%d, MaxTextLen=%d"), 
-	    		                                              iValNumberLen,iValTextLen);
-		CleanupStack::PopAndDestroy(&array);
-
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreInitialise::AssignPhbkType
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreInitialise::AssignPhbkType()
-	{
-	if( iStoreIndex == 0 )
-		{
-		iStoreInfo.iAdnTotalEntries = iTotalEntries;
-		iPhoneGlobals.iPhonebookStoreInfo.iAdnTotalEntries = iTotalEntries;
-		iStoreInfo.iAdnMaximumNumberLength = iValNumberLen;
-		iStoreInfo.iAdnMaximumTextLength = iValTextLen;
-		iPhoneGlobals.iPhonebookStoreInfo.iAdnMaximumNumberLength =
-		                                    iValNumberLen;
-		iPhoneGlobals.iPhonebookStoreInfo.iAdnMaximumTextLength =
-		                                     iValTextLen;
-		}
-	else if( iStoreIndex == 1 )
-		{
-		iStoreInfo.iFdnTotalEntries = iTotalEntries;
-		iPhoneGlobals.iPhonebookStoreInfo.iFdnTotalEntries = iTotalEntries;
-		iStoreInfo.iFdnMaximumNumberLength = iValNumberLen;
-		iStoreInfo.iFdnMaximumTextLength = iValTextLen;
-		iPhoneGlobals.iPhonebookStoreInfo.iFdnMaximumNumberLength = 
-											iValNumberLen;
-		iPhoneGlobals.iPhonebookStoreInfo.iFdnMaximumTextLength =
-											iValTextLen;    
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebook/src/atphbkstoreread.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,362 +0,0 @@
-// 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:
-// @file atphbkstoreread.cpp
-// This contains CAtPhbkStoreRead which is use to read a phonebook Entry
-// 
-
-//system include
-#include <etelmm.h>
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mpbutil.h>
-#include <cmmgsmphonestorageutility.h>
-
-//user include 
-#include "atphbkstoreread.h"
-#include "mslogger.h"
-
-//constant defination
-_LIT8(KPhbkStoreRead,"AT+CPBR=%d,%d\r");
-_LIT8(KSelAdnPhonebook,"AT+CPBS=\"SM\"\r");
-_LIT8(KSelFdnPhonebook,"AT+CPBS=\"FD\"\r");
-_LIT8(KCPBRMatchString,"+CPBR:*");
-_LIT8(KCPBRSResponseString,"+CPBR:");
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreRead::CAtPhbkStoreRead
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreRead::CAtPhbkStoreRead(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                   :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtPhbkStoreRead::CAtPhbkStoreRead called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreRead::~CAtPhbkStoreRead
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreRead::~CAtPhbkStoreRead()
-	{
-	LOGTEXT(_L8("CAtPhbkStoreRead::~CAtPhbkStoreRead called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreRead::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreRead* CAtPhbkStoreRead::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                          CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtPhbkStoreRead* self = new (ELeave)CAtPhbkStoreRead(aGloblePhone, 
-                                                          aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreRead::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreRead* CAtPhbkStoreRead::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtPhbkStoreRead* self=CAtPhbkStoreRead::NewLC(aGloblePhone, 
-                                                   aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreRead::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreRead::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	AddExpectStringL(KLtsyOkString);
-	AddExpectStringL(KLtsyErrorString);
-	AddExpectStringL(KCPBRMatchString);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreRead::SetPhonebookType
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreRead::SetPhonebookType(DispatcherPhonebook::TPhonebook aPhonebookType)
-	{
-	iPhoneBookType = aPhonebookType;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreRead::SetReadParam
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreRead::SetReadParam(TInt aIndex,TInt aSlotNum)
-	{
-	iIndex = aIndex;
-	iSlotNum = aSlotNum;
-	}	
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreRead::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreRead::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreRead::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreRead::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtPhbkStoreRead::ExecuteCommand called"));
-	iState = ESetStoreName;
-	iTxBuffer.Zero();	
-	if( iPhoneBookType == DispatcherPhonebook::EIccAdn )
-		{
-		iTxBuffer.Copy(KSelAdnPhonebook);
-		}
-	else if( iPhoneBookType == DispatcherPhonebook::EIccFdn )
-		{
-		iTxBuffer.Copy(KSelFdnPhonebook);
-		}
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreRead::ReadEntry
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreRead::ReadEntry()
-	{
-	LOGTEXT(_L8("CAtPhbkStoreRead::ReadEntry callded"));
-	iPhoneGlobals.iEventSignalActive = ETrue;
-	iTxBuffer.Zero();
-	iTxBuffer.Format(KPhbkStoreRead,iIndex,iIndex+iSlotNum-1);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreRead::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreRead::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtPhbkStoreRead::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-	if(aStatus != KErrNone)
-		{
-		Complete();
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iCtsyDispatcherCallback.CallbackPhonebookStoreReadEntryComp(aStatus,iPhoneBookType,iPhbkData);
-		}
-	else
-		{
-		if( aEventSource== EWriteCompletion )
-			{
-			if( iState==ESetStoreName )
-				{
-				iState = ESetStoreNameComplete;
-				}
-			else if( iState==EReadEntry )
-				{
-				iState = EReadEntryComplete;
-				}
-			}
-		else 
-			{
-			if( iState==ESetStoreNameComplete )
-				{
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				if(iError == KErrNone)
-					{
-					ClearBuffer();
-					iState = EReadEntry;
-					ReadEntry();
-					}
-				else 
-					{
-					iCtsyDispatcherCallback.CallbackPhonebookStoreReadEntryComp(iError,iPhoneBookType,iPhbkData);
-					}
-				}
-			else if( iState==EReadEntryComplete )
-				{
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				//encounter OK or ERROR
-				if( iEndFlag )
-					{
-					ClearBuffer();
-					iPhbkData.Zero();
-					iCtsyDispatcherCallback.CallbackPhonebookStoreReadEntryComp(iError,iPhoneBookType,iPhbkData);
-					}
-				else
-					{
-					if( iError==KErrNone )
-						{
-						TRAPD(err, GeneratePhbkDataL());
-						iCtsyDispatcherCallback.CallbackPhonebookStoreReadEntryComp(err,iPhoneBookType,iPhbkData);
-						ClearCurrentLine();
-						}
-					else
-						{
-						iCtsyDispatcherCallback.CallbackPhonebookStoreReadEntryComp(iError,iPhoneBookType,iPhbkData);
-						}
-					}
-				}
-			}
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreRead::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreRead::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if( iState == ESetStoreNameComplete )
-	    {
-		if (CurrentLine().Match(KLtsyOkString) == 0)
-			{
-			iError = KErrNone;
-			}
-		else
-			{
-			iError = KErrGeneral;
-			}
-	    }
-	else if( iState == EReadEntryComplete )
-		{
-		/**
-		* +CPBR = <index>,<number>,<129/145>,<text> 
-		* OK    
-		*/
-		RArray<TPtrC8> array;
-		CleanupClosePushL(array);
-		iParser->ParseRespondedBuffer(array,Buffer());
-		// remove the string of AT+CPBR=..
-		if(array[0].MatchF(KAnyATCommand) != KErrNotFound)
-			{
-			array.Remove(0);
-			}
-		TInt count = array.Count();
-#ifdef _DEBUG		
-		for( TInt i=0;i<count;i++ )
-			{
-			LOGTEXT3(_L8("CAtPhbkStoreRead::ParseResponseL\tarray[%d]=%S"),i,&array[i]); 
-			}
-#endif		
-		if((array[1].Match(KLtsyOkString) == KErrNone))
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNone;
-			iEndFlag = ETrue;
-			return; 
-			}
-		else if((array[1].Match(KLtsyErrorString) == KErrNone))
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrGeneral;
-			iEndFlag = ETrue;
-			return; 
-			}
-	  
-		iError = KErrNone;
-		//remove number line if it has 
-		if( array[0].MatchF(KCPBRSResponseString) == KErrNotFound )
-			{
-			array.Remove(0);
-			}
-		if( array[0].MatchF(KCPBRSResponseString) == KErrNotFound )
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNotFound;
-			return;
-			}
-		//parse index
-		TLex8 lex(array[1]);
-		TUint16 val;
-		TInt ret = lex.Val(val,EDecimal);
-		if(ret != KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		//Index  
-		iReadEntry.iIndex = val;             
-		iReadEntry.iNumber.Copy(array[2]);   
-		//Parse TON/NPI
-		TLex8 lex1(array[3]);
-		TUint16 val1;
-		ret = lex1.Val(val1,EDecimal);
-		if(ret != KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		 //TON/NPI
-		iReadEntry.iTon = (TUint8)val1;  
-		iReadEntry.iText.Copy(array[4]);
-		CleanupStack::PopAndDestroy();
-		} 
-  	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreRead::GeneratePhbkData
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CAtPhbkStoreRead::GeneratePhbkDataL()
-	{
-	CPhoneBookBuffer* pbBuffer = new(ELeave) CPhoneBookBuffer(); // used to write phonebook data
-	iPhbkData.Zero();
-	pbBuffer->Set(&iPhbkData); // Set it to point to the Client buffer
-	pbBuffer->AddNewEntryTag();
-	
-	TInt ret = pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBAdnIndex,iReadEntry.iIndex);
-	if( ret!=KErrNone )
-		{
-		delete pbBuffer;
-		return ret;
-		}
-	ret=pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBNumber, iReadEntry.iNumber);
-	if( ret!=KErrNone )
-		{
-		delete pbBuffer;
-		return ret;
-		}
-	ret=pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBTonNpi, iReadEntry.iTon);
-	if(ret!=KErrNone)
-		{
-		delete pbBuffer;
-		return ret;
-		}
-	ret=pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBText, iReadEntry.iText);
-	if(ret != KErrNone)
-		{
-		delete pbBuffer;
-		return ret;
-		}
-	
-	delete pbBuffer;
-	return KErrNone;
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebook/src/atphbkstorewrite.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,311 +0,0 @@
-// 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:
-// @file atphbkstorewrite.cpp
-// This contains CAtPhbkStoreWrite which is use to write a phonebook Entry
-// 
-
-//system include 
-#include <etelmm.h>
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mpbutil.h> 
-
-//user include 
-#include "atphbkstorewrite.h"
-#include "mslogger.h"
-
-//constant defination
-_LIT8(KPhbkStoreWrite,"AT+CPBW=%d,\"%S\",145,\"%S\"\r");
-_LIT8(KSelAdnPhonebook,"AT+CPBS=\"SM\"\r");
-_LIT8(KSelFdnPhonebook,"AT+CPBS=\"FD\"\r");
-const TInt KMaxNumberLen = 20;
-const TInt KMaxTextLen = 14;
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreWrite::CAtPhbkStoreWrite
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreWrite::CAtPhbkStoreWrite(CGlobalPhonemanager& aGloblePhone, 
-                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                     :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtPhbkStoreWrite::CAtPhbkStoreWrite called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreWrite::~CAtPhbkStoreWrite
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreWrite::~CAtPhbkStoreWrite()
-	{
-	LOGTEXT(_L8("CAtPhbkStoreWrite::~CAtPhbkStoreWrite called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreWrite::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreWrite* CAtPhbkStoreWrite::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                            CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtPhbkStoreWrite* self = new (ELeave)CAtPhbkStoreWrite(aGloblePhone, 
-                                                            aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreWrite::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkStoreWrite* CAtPhbkStoreWrite::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtPhbkStoreWrite* self=CAtPhbkStoreWrite::NewLC(aGloblePhone, 
-                                                     aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreWrite::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreWrite::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreWrite::SetPhonebookType
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreWrite::SetPhonebookType(DispatcherPhonebook::TPhonebook aPhonebookType)
-	{
-	iPhoneBookType = aPhonebookType;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreWrite::SetPhonebookEntry
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreWrite::SetPhonebookEntryL(const TDesC8& aEntry)
-	{
-	TInt ret = KErrNone;
-	TInt retVal = KErrNone;
-	TUint8 tmpTagValue;
-	TPtrC16 textPtr;
-    TUint8 tagValue;
-    CPhoneBookBuffer::TPhBkTagType tagType;
-    TUint8 newEntryTag;
-    newEntryTag = RMobilePhoneBookStore::ETagPBNewEntry;
-    TUint16 index;
-    TPtrC16 numPtr;
-    TPtrC16 type;
-    // used to write phonebook data
-	CPhoneBookBuffer* pbBuffer = new(ELeave) CPhoneBookBuffer(); 
-	CleanupStack::PushL(pbBuffer);
-	
-    //  Set pointer to constant descriptor
-    TPtr8 dataToSeparate( NULL, 0, 0 );
-    dataToSeparate.Set( (TUint8*)aEntry.Ptr(),
-    		aEntry.Length(), aEntry.Length() );
-    
-    //  Init and get entry info
-    pbBuffer->Set( &dataToSeparate );
-    pbBuffer->StartRead();
-    ret = pbBuffer->GetTagAndType( tmpTagValue, tagType );
-    // Ensure, that there is new entry containing data
-    if ( KErrNone == ret && tmpTagValue == newEntryTag )
-        {
-        // Get the first value from TLV data
-        ret = pbBuffer->GetTagAndType( tagValue, tagType );
-        while(ret == KErrNone)
-			{	
-			switch ( tagValue )
-		        {
-		        // Get name
-		        case RMobilePhoneBookStore::ETagPBText:
-		        	retVal = pbBuffer->GetValue( textPtr );
-		            if(retVal == KErrNone)
-		                {
-		                iPhbkEntry.iText = textPtr;
-		            	}
-		            break;
-		         // Get number
-		        case RMobilePhoneBookStore::ETagPBNumber:
-		            ret = pbBuffer->GetValue( numPtr );
-		            if(retVal == KErrNone)
-		            	{
-		            	iPhbkEntry.iNumber = numPtr;
-		            	}
-		            break;
-		         // get the index
-		        case RMobilePhoneBookStore::ETagPBAdnIndex:
-		        	retVal = pbBuffer->GetValue(index);
-		            if( retVal == KErrNone )
-		            	{
-		            	iPhbkEntry.iIndex = index;
-		            	}
-		            break;
-		         // get ETagPBTonNpi , not needed
-		        case RMobilePhoneBookStore::ETagPBTonNpi:
-		        	retVal = pbBuffer->GetValue(type);
-		            break;      
-		        default:
-		        	break;
-		        }//switch 
-			ret = pbBuffer->GetTagAndType( tagValue, tagType );
-		    }//while
- 		}
-	CleanupStack::PopAndDestroy(pbBuffer);
-	}	
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreWrite::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreWrite::StartRequest()
-	{
-	GetMaxNumberLen();
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreWrite::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreWrite::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtPhbkStoreWrite::ExecuteCommand called"));
-	iState = ESetStoreName;
-	iTxBuffer.Zero();	
-	if( iPhoneBookType == DispatcherPhonebook::EIccAdn )
-		{
-		iTxBuffer.Copy(KSelAdnPhonebook);
-		}
-	else if( iPhoneBookType == DispatcherPhonebook::EIccFdn )
-		{
-		iTxBuffer.Copy(KSelFdnPhonebook);
-		}
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreWrite::WriteEntry
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreWrite::WriteEntry()
-	{
-	LOGTEXT(_L8("CAtPhbkStoreWrite::WriteEntry callded"));
-	iPhoneGlobals.iEventSignalActive = ETrue;
-	iTxBuffer.Zero();
-	TBuf8<KMaxNumberLen> tempNumber;
-	TBuf8<KMaxTextLen>   tempText;
-	//covert 16 bit to 8 bit
-	tempNumber.Copy(iPhbkEntry.iNumber);
-	tempText.Copy(iPhbkEntry.iText);
-	iTxBuffer.Format(KPhbkStoreWrite,iPhbkEntry.iIndex,
-			         &tempNumber,&tempText);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreWrite::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreWrite::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtPhbkStoreWrite::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-	
-	if(aStatus != KErrNone)
-		{
-		Complete();
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iCtsyDispatcherCallback.CallbackPhonebookStoreWriteEntryComp(aStatus,iPhoneBookType,iPhbkEntry.iIndex,iMaxLen);
-		}
-	else
-		{
-		if( aEventSource== EWriteCompletion )
-			{
-			if( iState==ESetStoreName )
-				{
-				iState = ESetStoreNameComplete;
-				}
-			else if( iState==EWriteEntry )
-				{
-				iState = EWriteEntryComplete;
-				}
-			}
-		else 
-			{
-			if( iState==ESetStoreNameComplete )
-				{
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				if( iError==KErrNone )
-					{
-					iState = EWriteEntry;
-					WriteEntry();
-					}
-				else
-					{
-					iCtsyDispatcherCallback.CallbackPhonebookStoreWriteEntryComp(iError,iPhoneBookType,
-																				 iPhbkEntry.iIndex,iMaxLen);
-					}
-				}
-			else if( iState== EWriteEntryComplete)
-				{
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				iCtsyDispatcherCallback.CallbackPhonebookStoreWriteEntryComp(iError,iPhoneBookType,
-															                 iPhbkEntry.iIndex,iMaxLen);
-				}
-			}
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreWrite::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreWrite::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkStoreWrite::GetMaxNumberLen
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkStoreWrite::GetMaxNumberLen()
-	{
-	if( iPhoneBookType == DispatcherPhonebook::EIccAdn )
-		{
-		iMaxLen = iPhoneGlobals.iPhonebookStoreInfo.iAdnMaximumNumberLength;
-		}
-	else if( iPhoneBookType == DispatcherPhonebook::EIccFdn )
-		{
-		iMaxLen = iPhoneGlobals.iPhonebookStoreInfo.iFdnMaximumNumberLength;
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebooken/inc/atphbkengetinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-// 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:
-// @file atphbkengetinfo.h
-// This contains CAtPhbkEnGetInfo which is used to get emergency call info
-// 
-
-#ifndef ATPHBKENGETINFO_H
-#define ATPHBKENGETINFO_H
-
-//system include 
-#include <etelmm.h>
-#include <e32std.h>
-#include <e32base.h>
-
-//user include 
-#include "atcommandbase.h"
-
-/**
- * CAtPhbkEnGetInfo
- *
- */
-class CAtPhbkEnGetInfo : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtPhbkEnGetInfo();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkEnGetInfo* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                          CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkEnGetInfo* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                           CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-private:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtPhbkEnGetInfo(CGlobalPhonemanager& aGloblePhone, 
-                             CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-	
-	/**
-	*  Executer AT command for getting Phone Store Info
-	*/
-	void GetEnStoreInfo();
-private:
-
-	/**
-	*  state machine for EventSignal 
-	*/
-	enum 
-		{
-		ESetEnStore,
-		ESetEnStoreComplete,
-		EGetEnStoreInfo,
-		EGetEnStoreInfoComplete,
-		EATNotInProgress
-		}iState;
-	
-    /**
-	* PhonebookEn used entries
-	*/		
-	TUint16 iUsed;
-	
-    /**
-	* PhonebookEn total entries
-	*/		
-	TUint16 iTotal;
-	
-	/**
-	* The return error value of AT command executed 
-	*/
-	TInt iError;			
-
-	}; // class CAtPhbkEnGetInfo
-
-#endif //  ATPHBKENGETINFO_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebooken/inc/atphbkenread.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +0,0 @@
-// 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:
-// @file atphbkenread.h
-// This contains CAtPhbkEnRead which is use to read a PhonebookEn Entry
-// 
-
-#ifndef ATPHBKENREAD_H
-#define ATPHBKENREAD_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include 
-#include "atcommandbase.h"
-
-//constant defination
-const TInt KEnNumberLen = 6;
-
-/**
- * CAtPhbkEnRead
- *
- */
-class CAtPhbkEnRead : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtPhbkEnRead();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkEnRead* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkEnRead* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-	
-	/**
-	* Set read PhonebookEn index
-	* 
-	* @param  aIndex
-	* @param  aSlotNum
-	*/
-	void SetIndex(TInt aIndex);
-protected:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtPhbkEnRead(CGlobalPhonemanager& aGloblePhone, 
-                     CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-private:
-	/**
-	*  Executer AT command for reading a phonebook entry
-	*/	
-	void ReadEntry();
-	
-private:
-	/**
-	*  state machine for EventSignal 
-	*/
-	enum 
-		{
-		ESetEnName,
-		ESetEnNameComplete,
-		EReadEntry,
-		EReadEntryComplete,
-		EATNotInProgress
-		}iState;
-		
-	/**
-	* The return error value of AT command executed 
-	*/		
-	TInt iError;
-	
-	/*
-	* the first index should be read
-	*/
-	TInt iIndex;
-	
-	/*
-	* the phonebooken number want to read
-	*/
-	TBuf<KEnNumberLen> iNumber;
-	
-	
-	/*
-	*  indicate whether it is OK or ERROR string 
-	*/
-    TBool   iEndFlag;
-	
-	}; // class CAtPhbkEnRead
-#endif // ATPHBKENREAD_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebooken/inc/atphbkenreadall.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-// 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:
-// @file atphbkenreadall.h
-// This contains CAtPhbkEnReadAll which is used to read all PhonebookEn Entries
-// 
-
-#ifndef ATPHBKENREADALL_H
-#define ATPHBKENREADALL_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include 
-#include "atcommandbase.h"
-
-//constant defination
-const TInt KEnNumberLength = 6;
-
-/**
- * CAtPhbkEnReadAll
- *
- */
-class CAtPhbkEnReadAll : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtPhbkEnReadAll();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkEnReadAll* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtPhbkEnReadAll* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-protected:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	CAtPhbkEnReadAll(CGlobalPhonemanager& aGloblePhone, 
-                     CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-private:
-	/**
-	*  Executer AT command for reading phonebook entries
-	*/	
-	void ReadEntry();
-private:	
-	/**
-	*  state machine for EventSignal 
-	*/	
-	enum 
-		{
-		ESetEnName,
-		ESetEnNameComplete,
-		EReadEntry,
-		EReadEntryComplete,
-		EATNotInProgress
-		}iState;
-	
-	/**
-	* The return error value of AT command executed 
-	*/		
-	TInt iError;	
-
-	/*
-	* the first index should be read
-	*/
-	TInt iIndex;
-	
-	/*
-	* the phonebooken number want to read
-	*/
-	TBuf<KEnNumberLength> iNumber;
-	
-	/*
-	*  indicate whether it is OK or ERROR string 
-	*/
-    TBool   iEndFlag;
-	
-	}; // class CAtPhbkEnReadAll
-#endif // ATPHBKENREADALL_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebooken/src/atphbkengetinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,265 +0,0 @@
-// 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:
-// @file atphbkengetinfo.cpp
-// This contains CAtPhbkEnGetInfo which is used to get emergency call info
-// 
-
-//system include 
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <etelmm.h>
-
-//user include
-#include "atphbkengetinfo.h"
-#include "mslogger.h"
-#include "ltsycommondefine.h"
-
-//constant defination
-_LIT8(KSetEnStore,"AT+CPBS=\"%S\"\r");
-_LIT8(KGetEnStoreInfo,"AT+CPBS?\r");
-_LIT8(KCPBSResponseString,"+CPBS:");
-_LIT8(KPhonebookEn,"EN");
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnGetInfo::CAtPhbkEnGetInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkEnGetInfo::CAtPhbkEnGetInfo(CGlobalPhonemanager& aGloblePhone, 
-                                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                                   :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtPhbkEnGetInfo::CAtPhbkEnGetInfo called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnGetInfo::~CAtPhbkEnGetInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkEnGetInfo::~CAtPhbkEnGetInfo()
-	{
-	LOGTEXT(_L8("CAtPhbkEnGetInfo::~CAtPhbkEnGetInfo called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnGetInfo::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkEnGetInfo* CAtPhbkEnGetInfo::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                                          CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-    {
-	CAtPhbkEnGetInfo* self = new (ELeave)CAtPhbkEnGetInfo(aGloblePhone, 
-			                                                              aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnGetInfo::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkEnGetInfo* CAtPhbkEnGetInfo::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-    {
-	CAtPhbkEnGetInfo* self=CAtPhbkEnGetInfo::NewLC(aGloblePhone, 
-                                                                   aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnGetInfo::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnGetInfo::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnGetInfo::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnGetInfo::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnGetInfo::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnGetInfo::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtPhbkEnGetInfo::ExecuteCommand called"));
-	iState = ESetEnStore;
-	TPtrC8  storeName;
-	iTxBuffer.Zero();
-	storeName.Set(KPhonebookEn);
-	iTxBuffer.Format(KSetEnStore,&storeName);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnGetInfo::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnGetInfo::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtPhbkEnGetInfo::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-	
-	if(aStatus != KErrNone)
-		{
-		Complete();
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iCtsyDispatcherCallback.CallbackPhonebookEnStoreGetInfoComp(aStatus,iUsed);
-		}
-	else
-		{
-		if( aEventSource == EWriteCompletion )
-			{
-			LOGTEXT(_L8("CAtPhbkEnGetInfo::EventSignal,EWriteCompletion!"));
-			if( iState==ESetEnStore )
-				{
-				iState = ESetEnStoreComplete;
-				}
-			else if( iState==EGetEnStoreInfo )
-				{
-				iState = EGetEnStoreInfoComplete;
-				}
-			 }
-		else 
-			{
-			LOGTEXT(_L8("CAtPhbkEnGetInfo::EventSignal,EReadCompletion!"));
-			if( iState == ESetEnStoreComplete )
-				{
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				if(iError == KErrNone)
-					{
-					iState = EGetEnStoreInfo;
-					GetEnStoreInfo();
-					}
-				else
-					{
-					iCtsyDispatcherCallback.CallbackPhonebookEnStoreGetInfoComp(iError,iUsed);
-					}
-				}
-			else if( iState == EGetEnStoreInfoComplete )
-				{
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				iCtsyDispatcherCallback.CallbackPhonebookEnStoreGetInfoComp(iError,iUsed);
-				}
-			}
-		}
-	}	
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnGetInfo::GetEnStoreInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnGetInfo::GetEnStoreInfo()
-	{
-	LOGTEXT(_L8("CAtPhbkEnGetInfo::GetEnStoreInfo callded"));
-	iPhoneGlobals.iEventSignalActive = ETrue;
-	iTxBuffer.Zero();
-	iTxBuffer.Copy(KGetEnStoreInfo);
-	Write();   
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnGetInfo::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnGetInfo::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if( iState==ESetEnStoreComplete )
-		{
-		if (CurrentLine().Match(KLtsyOkString) == 0)
-			{
-			iError = KErrNone;
-			}
-		else
-			{
-			iError = KErrGeneral;
-			}
-		}
-	else if( iState==EGetEnStoreInfoComplete )
-		{
-		/**
-		* Here is an Example 
-		* +CPBS: "EN",2,16 
-        * phonebooken is selected,2 locations are used and 
-        * total 16 locations are available
-		*/
-		iError = KErrNone;
-		RArray<TPtrC8> array;
-		CleanupClosePushL(array);
-		iParser->ParseRespondedBuffer(array,Buffer());
-		//remove AT+CPBS
-		if(array[0].MatchF(KAnyATCommand)!=KErrNotFound)
-			{
-			array.Remove(0);
-			}
-		TInt count = array.Count();
-#ifdef _DEBUG			
-		for( TInt i=0;i<count;i++ )
-			{
-		    LOGTEXT3(_L8("CAtPhbkEnGetInfo::ParseResponseL\tarray[%d]=%S"),
-		    		      i,&array[i]);     
-			}
-#endif			
-		if (count <= 1)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNotFound;
-			return;
-			}
-		if(array[0].MatchF(KCPBSResponseString)==KErrNotFound)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNotFound;
-			return;
-			}
-				
-		//parse used
-		TLex8 lex(array[2]);
-		TUint16 val;
-		TInt ret=lex.Val(val,EDecimal);
-		if(ret!=KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		iUsed = val;
-		
-		//parse total
-		TLex8 lex1(array[3]);
-		ret=lex1.Val(val,EDecimal);
-		if(ret!=KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		iTotal = val;
-	    LOGTEXT3(_L8("CAtPhbkEnGetInfo::ParseResponseL\tPreferred store used=%d, total=%d"), 
-	    		                                iUsed,iTotal);
-		CleanupStack::PopAndDestroy(&array);
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebooken/src/atphbkenread.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,293 +0,0 @@
-// 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:
-// @file atphbkenread.cpp
-// This contains CAtPhbkEnRead which is use to read a PhonebookEn Entry
-// 
-
-//system include
-#include <etelmm.h>
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mpbutil.h>
-#include <cmmgsmphonestorageutility.h>
-
-//user include 
-#include "atphbkenread.h"
-#include "mslogger.h"
-
-//constant defination
-_LIT8(KPhbkStoreRead,"AT+CPBR=%d\r");
-_LIT8(KSelPhonebookEn,"AT+CPBS=\"EN\"\r");
-_LIT8(KCPBRMatchString,"+CPBR:*");
-_LIT8(KCPBRSResponseString,"+CPBR:");
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnRead::CAtPhbkEnRead
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkEnRead::CAtPhbkEnRead(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                   :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtPhbkEnRead::CAtPhbkEnRead called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnRead::~CAtPhbkEnRead
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkEnRead::~CAtPhbkEnRead()
-	{
-	LOGTEXT(_L8("CAtPhbkEnRead::~CAtPhbkEnRead called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnRead::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkEnRead* CAtPhbkEnRead::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                          CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtPhbkEnRead* self = new (ELeave)CAtPhbkEnRead(aGloblePhone, 
-                                                          aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnRead::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkEnRead* CAtPhbkEnRead::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtPhbkEnRead* self=CAtPhbkEnRead::NewLC(aGloblePhone, 
-                                                   aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnRead::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnRead::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	AddExpectStringL(KLtsyOkString);
-	AddExpectStringL(KLtsyErrorString);
-	AddExpectStringL(KCPBRMatchString);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnRead::SetIndex
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnRead::SetIndex(TInt aIndex)
-	{
-	iIndex = aIndex;
-	}	
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnRead::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnRead::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnRead::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnRead::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtPhbkEnRead::ExecuteCommand called"));
-	iState = ESetEnName;
-	iTxBuffer.Zero();	
-	iTxBuffer.Copy(KSelPhonebookEn);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnRead::ReadEntry
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnRead::ReadEntry()
-	{
-	LOGTEXT(_L8("CAtPhbkEnRead::ReadEntry callded"));
-	iPhoneGlobals.iEventSignalActive = ETrue;
-	iTxBuffer.Zero();
-	iTxBuffer.Format(KPhbkStoreRead,iIndex);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnRead::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnRead::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtPhbkEnRead::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-	if(aStatus != KErrNone)
-		{
-		Complete();
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iCtsyDispatcherCallback.CallbackPhonebookEnStoreReadEntryComp(aStatus,iIndex,iNumber);
-		}
-	else
-		{
-		if( aEventSource== EWriteCompletion )
-			{
-			if( iState==ESetEnName )
-				{
-				iState = ESetEnNameComplete;
-				}
-			else if( iState==EReadEntry )
-				{
-				iState = EReadEntryComplete;
-				}
-			}
-		else 
-			{
-			if( iState==ESetEnNameComplete )
-				{
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				if(iError == KErrNone)
-					{
-					ClearBuffer();
-					iState = EReadEntry;
-					ReadEntry();
-					}
-				else 
-					{
-					iCtsyDispatcherCallback.CallbackPhonebookEnStoreReadEntryComp(iError,iIndex,iNumber);
-					}
-				}
-			else if( iState==EReadEntryComplete )
-				{
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				//encounter OK or ERROR
-				if( iEndFlag )
-					{
-					ClearBuffer();
-					iCtsyDispatcherCallback.CallbackPhonebookEnStoreReadEntryComp(iError,iIndex,iNumber);
-					}
-				else
-					{
-					iCtsyDispatcherCallback.CallbackPhonebookEnStoreReadEntryComp(iError,iIndex,iNumber);
-					ClearCurrentLine();
-					}
-				}
-			} 
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnRead::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnRead::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if( iState == ESetEnNameComplete )
-	    {
-		if (CurrentLine().Match(KLtsyOkString) == 0)
-			{
-			iError = KErrNone;
-			}
-		else
-			{
-			iError = KErrGeneral;
-			}
-	    }
-	else if( iState == EReadEntryComplete )
-		{
-		/**
-		* +CPBR = <index>,<number>,<129>
-		* OK    
-		*/
-		RArray<TPtrC8> array;
-		CleanupClosePushL(array);
-		iParser->ParseRespondedBuffer(array,Buffer());
-		// remove the string of AT+CPBR=..
-		if(array[0].MatchF(KAnyATCommand)!=KErrNotFound)
-			{
-			array.Remove(0);
-			}
-		TInt count = array.Count();
-#ifdef _DEBUG		
-		for( TInt i=0;i<count;i++ )
-			{
-			LOGTEXT3(_L8("CAtPhbkEnRead::ParseResponseL\tarray[%d]=%S"),i,&array[i]); 
-			}
-#endif		
-		if((array[0].Match(KLtsyOkString) == KErrNone))
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNone;
-			iEndFlag = ETrue;
-			return; 
-			}
-		else if((array[0].Match(KLtsyErrorString) == KErrNone))
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrGeneral;
-			iEndFlag = ETrue;
-			return; 
-			}
-	  
-		iError = KErrNone;
-		//remove number line if it has 
-		if( array[0].MatchF(KCPBRSResponseString) == KErrNotFound )
-			{
-			array.Remove(0);
-			}
-		if( array[0].MatchF(KCPBRSResponseString) == KErrNotFound )
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNotFound;
-			return;
-			}
-		//parse index
-		TLex8 lex(array[1]);
-		TUint16 val;
-		TInt ret = lex.Val(val,EDecimal);
-		if(ret != KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		//Index  
-		iIndex = val;    
-		iNumber.Zero();
-		iNumber.Copy(array[2]);   
-		//Parse TON/NPI
-		TLex8 lex1(array[3]);
-		TUint16 val1;
-		ret = lex1.Val(val1,EDecimal);
-		if(ret != KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		CleanupStack::PopAndDestroy();
-		} 
-    }
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/phonebooken/src/atphbkenreadall.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,292 +0,0 @@
-// 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:
-// @file atphbkenreadall.cpp
-// This contains CAtPhbkEnReadAll which is used to read all PhonebookEn Entries
-// 
-
-//system include 
-#include <etelmm.h>
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mpbutil.h>
-#include <cmmgsmphonestorageutility.h>
-
-//user include 
-#include "atphbkenreadall.h"
-#include "mslogger.h"
-
-//constant defination
-_LIT8(KPhbkStoreRead,"AT+CPBR=%d,%d\r");
-_LIT8(KSelPhonebookEn,"AT+CPBS=\"EN\"\r");
-_LIT8(KCPBRMatchString,"+CPBR:*");
-_LIT8(KCPBRSResponseString,"+CPBR:");
-const TInt KEnStartIndex = 1;
-const TInt KEnEndIndex = 16;
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnReadAll::CAtPhbkEnReadAll
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkEnReadAll::CAtPhbkEnReadAll(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                   :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtPhbkEnReadAll::CAtPhbkEnReadAll called"));
-	iEndFlag = EFalse;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnReadAll::~CAtPhbkEnReadAll
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkEnReadAll::~CAtPhbkEnReadAll()
-	{
-	LOGTEXT(_L8("CAtPhbkEnReadAll::~CAtPhbkEnReadAll called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnReadAll::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkEnReadAll* CAtPhbkEnReadAll::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                          CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtPhbkEnReadAll* self = new (ELeave)CAtPhbkEnReadAll(aGloblePhone, 
-                                                          aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnReadAll::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtPhbkEnReadAll* CAtPhbkEnReadAll::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtPhbkEnReadAll* self=CAtPhbkEnReadAll::NewLC(aGloblePhone, 
-                                                   aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnReadAll::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnReadAll::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	AddExpectStringL(KLtsyOkString);
-	AddExpectStringL(KLtsyErrorString);
-	AddExpectStringL(KCPBRMatchString);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnReadAll::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnReadAll::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnReadAll::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnReadAll::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtPhbkEnReadAll::ExecuteCommand called"));
-	iState = ESetEnName;
-	iTxBuffer.Zero();	
-	iTxBuffer.Copy(KSelPhonebookEn);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnReadAll::ReadEntry
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnReadAll::ReadEntry()
-	{
-	LOGTEXT(_L8("CAtPhbkEnReadAll::ReadEntry callded"));
-	iPhoneGlobals.iEventSignalActive = ETrue;
-	iTxBuffer.Zero();
-	iTxBuffer.Format(KPhbkStoreRead,KEnStartIndex,KEnEndIndex);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnReadAll::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnReadAll::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtPhbkEnReadAll::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-	if(aStatus != KErrNone)
-		{
-		Complete();
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iCtsyDispatcherCallback.CallbackPhonebookEnStoreReadAllComp(aStatus,iIndex,iNumber,EFalse);
-		}
-	else
-		{
-		if( aEventSource== EWriteCompletion )
-			{
-			if( iState==ESetEnName )
-				{
-				iState = ESetEnNameComplete;
-				}
-			else if( iState==EReadEntry )
-				{
-				iState = EReadEntryComplete;
-				}
-			}
-		else 
-			{
-			if( iState==ESetEnNameComplete )
-				{
-				Complete();
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				if(iError == KErrNone)
-					{
-					ClearBuffer();
-					iState = EReadEntry;
-					ReadEntry();
-					}
-				else 
-					{
-					iCtsyDispatcherCallback.CallbackPhonebookEnStoreReadAllComp(iError,iIndex,iNumber,EFalse);
-					}
-				}
-			else if( iState==EReadEntryComplete )
-				{
-				//encounter OK or ERROR
-				if( iEndFlag )
-					{
-					ClearBuffer();
-					iIndex++;
-					iNumber.Zero();
-					Complete();
-					iPhoneGlobals.iEventSignalActive = EFalse;
-		    		iCtsyDispatcherCallback.CallbackPhonebookEnStoreReadAllComp(iError,iIndex,iNumber,EFalse);
-					}
-				else 
-					{
-					iCtsyDispatcherCallback.CallbackPhonebookEnStoreReadAllComp(iError,iIndex,iNumber,ETrue);
-					ClearCurrentLine();
-					}
-				}
-			}
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtPhbkEnReadAll::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtPhbkEnReadAll::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if( iState == ESetEnNameComplete )
-	    {
-		if (CurrentLine().Match(KLtsyOkString) == 0)
-			{
-			iError = KErrNone;
-			}
-		else
-			{
-			iError = KErrGeneral;
-			}
-	    }
-	else if( iState == EReadEntryComplete )
-		{
-		/**
-		* Here is an Example 
-		* at+CPBR=1,16  
-		*+CPBR: 1,"112",129
-		*+CPBR: 2,"911",129
-		*OK
-		*/
-		RArray<TPtrC8> array;
-		CleanupClosePushL(array);
-		iParser->ParseRespondedBuffer(array,Buffer());
-		// remove the string of AT+CPBR=..
-		if(array[0].MatchF(KAnyATCommand)!=KErrNotFound)
-			{
-			array.Remove(0);
-			}
-		TInt count = array.Count();
-#ifdef _DEBUG		
-		for( TInt i = 0;i<count;i++ )
-			{
-			LOGTEXT3(_L8("CAtPhbkEnReadAll::ParseResponseL\tarray[%d]=%S"),i,&array[i]);  
-			}
-#endif		
-		if((array[1].Match(KLtsyOkString) == KErrNone))
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNone;
-			iEndFlag = ETrue;
-			return; 
-			}
-		else if((array[1].Match(KLtsyErrorString) == KErrNone))
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrGeneral;
-			iEndFlag = ETrue;
-			return; 
-			}
-	  
-		iError = KErrNone;
-		//remove number line if it has 
-		if( array[0].MatchF(KCPBRSResponseString) == KErrNotFound )
-			{
-			array.Remove(0);
-			}
-		if( array[0].MatchF(KCPBRSResponseString) == KErrNotFound )
-			{
-			CleanupStack::PopAndDestroy();
-			iError = KErrNotFound;
-			return;
-			}
-		//parse index
-		TLex8 lex(array[1]);
-		TUint16 val;
-		TInt ret = lex.Val(val,EDecimal);
-		if(ret != KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		//Index  
-		iIndex = val;     
-		iNumber.Zero();
-		iNumber.Copy(array[2]);   
-		//Parse TON/NPI
-		TLex8 lex1(array[3]);
-		TUint16 val1;
-		ret = lex1.Val(val1,EDecimal);
-		if(ret != KErrNone)
-			{
-			CleanupStack::PopAndDestroy();
-			iError = ret;
-			return;
-			}
-		CleanupStack::PopAndDestroy();
-		} 
-  	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/inc/activatecontextandgetaddr.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-// 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:
-// @file activatecontextandgetip.h
-// 
-// 
-
-#ifndef __CACTIVATECONTEXTANDGETIP_H__
-#define __CACTIVATECONTEXTANDGETIP_H__
-
-// user include
-#include <callbacktimer.h>
-#include "atcommandcontrolbase.h"
-
-class CATHelperCommand;
-class CATGprsContextActivate;
-class CATGPRSGetContextAddr;
-class CATGprsContextConnect;
-
-/**
- * CActivatContextAndGetAddr inherits from the CATCommandControlBase class. 
- * This class provide the common functionalities for activatinf context and 
- * get context address.
- *
- */
-class CActivatContextAndGetAddr : public CATCommandControlBase
-{
-public:
-	static CActivatContextAndGetAddr* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CActivatContextAndGetAddr();
-	virtual void AtCommandExecuteComplete(TAtEventSource aEventSource, TInt aStatus);
-	/**
-	 * start the request 
-	 */
-	void StartRequest();
-	/*
-	 * Set the parameter of AT command 
-	 * 
-	 * @param aContext The context to be set configuration
-	 */
-	void SetContext(const TInt aContextId);
-
-protected :
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CActivatContextAndGetAddr(CGlobalPhonemanager& aGloblePhone, 
-		                      CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-	
-private:
-	/**
-	 * Call back when the at command finished
-	 * 
-	 */
-	void DispatcherCallback(TInt aError);
-	/**
-	 * Start an AT Command
-	 * @param  aAtCommand the AT Command class 
-	 */
-	void StartATCommand(CAtCommandBase* aAtCommand);
-	/**
-	 * End an AT Command
-	 * @param  aAtCommand  the AT Command class 
-	 */
-	void EndATCommand(CAtCommandBase* aAtCommand);
-	/**
-	 * Start an AT Help Command
-	 * @param  aATString the AT Command string 
-	 * @param  aATType the AT Command Type 
-	 */
-	void ExecuteATHelpCommand(const TDesC8& aATString,TLtsyATCommandType aATType);
-	
-private:
-	CATHelperCommand* iATHelperCommand;
-	CATGprsContextActivate* iATGprsContextActivate;
-	CATGPRSGetContextAddr* iATGPRSGetContextAddr;
-	CATGprsContextConnect* iATGprsContextConnect;
-	/**
-	 * Context ID
-	 */
-	TInt iContextId;
-    /**
-	* Identify the Type of AT Command
-	*/
-	TLtsyATCommandType iATType;
-	TUint iConnectionSpeed;
-	enum 
-		{
-		EATNone,
-		EATActivateContext,
-		EATGetContextIp
-		} iATCommandName;
-
-};
-#endif //__CACTIVATECONTEXTANDGETIP_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/inc/atgprsattach.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-// 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:
-// @file atgprsattach.h
-// This contains CATGprsAttach which is defines the AT command used for attacheing.
-// 
-
-
-#ifndef _ATGPRSATTACH_H
-#define _ATGPRSATTACH_H
-
-// user include
-#include "atcommandbase.h"
-
-/**
- * CATGprsAttach inherits from the CAtCommandBase class. 
- * This class provide the common functionalities for attacheing.
- *
- */
-class CATGprsAttach : public CAtCommandBase
-{
-public:
-	static CATGprsAttach* NewL(CGlobalPhonemanager& aGloblePhone, 
-                               CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGprsAttach();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 *  Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Cancel the AT Command execution
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	virtual void StartRequest();
-	
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGprsAttach(CGlobalPhonemanager& aGloblePhone, 
-                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/*
-	 * The return value of AT command executed 
-	 */
-	TInt iError;
-};
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/inc/atgprsconfig.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-// 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:
-// @file atgprsconfig.h
-// AT command definition
-// This contains CATGPRSSetConfig which is defines the AT command used 
-// for setting GPRS context configuration.
-// 
-
-#ifndef _ATGPRSCONFIG_H
-#define _ATGPRSCONFIG_H
-
-// user include
-#include "atcommandbase.h"
-#include "cltsypacketserviceshandler.h"
-
-/**
- * CATGPRSSetConfig inherits from the CAtCommandBase class. 
- * This class provide the common functionalities for setting 
- * GPRS context configuration.
- *
- */
-class CATGPRSSetConfig : public CAtCommandBase
-{
-public:
-	static CATGPRSSetConfig* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGPRSSetConfig();
-	/**
-	 * This Function creates the at set string for the AT+CGDCONT command.
-	 */
-	TInt MakeupCGDCONT();
-	/*
-	 * Set the parameter of AT command 
-	 * 
-	 * @param aContext The context to be set configuration
-	 */
-	void SetContext(const TInt aContextId);
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	virtual void StartRequest();
-	
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGPRSSetConfig( CGlobalPhonemanager& aGloblePhone, 
-                      CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/*
-	 * The return value of AT command executed 
-	 */
-	TInt iError;
-	/*
-	 * The context to be set configuration
-	 */
-	TInt iContextId;
-	
-	TBool iDeleteContext;
-	
-};
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/inc/atgprscontextactivate.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-// 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:
-// @file atgprscontextactivate.h
-// AT command definition
-// This file defines the AT command used for activating a PDP context.
-// 
-
-#ifndef __ATGPRSCONTEXTACTIVATE_H
-#define __ATGPRSCONTEXTACTIVATE_H
-
-// user include
-#include "atcommandbase.h"
-#include "cltsypacketserviceshandler.h"
-
-
-/**
- * CATGprsContextActivate inherits from the CATCommands class. 
- * Sends the AT command to attach a context to the network.
- */
-class CATGprsContextActivate : public CAtCommandBase
-{
-public:
-	static CATGprsContextActivate* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                        CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGprsContextActivate();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/*
-	 * Set the parameter of AT command 
-	 * 
-	 * @param aContext The context to be set configuration
-	 */
-	void SetContext(const TInt aContextId);
-	TInt GetErrorValue();
-	virtual void StartRequest();
-	
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGprsContextActivate(CGlobalPhonemanager& aGloblePhone, 
-                           CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/*
-	 * The return value of AT command executed 
-	 */
-	TInt iError;
-	/*
-	 * The context to be set configuration
-	 */
-	TInt iContextId;
-};
-
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/inc/atgprscontextconnect.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-// 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:
-// @file atgprscontextconnect.h
-// AT command definition
-// This file defines the AT command used for activating a PDP context.
-// 
-
-#ifndef __ATGPRSCONTEXTCONNECT_H
-#define __ATGPRSCONTEXTCONNECT_H
-
-// user include
-#include "atcommandbase.h"
-#include "cltsypacketserviceshandler.h"
-
-
-/**
- * CATGprsContextConnect inherits from the CATCommands class. 
- * Sends the AT command to attach a context to the network.
- */
-class CATGprsContextConnect : public CAtCommandBase
-{
-public:
-	static CATGprsContextConnect* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                       CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGprsContextConnect();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/*
-	 * Set the parameter of AT command 
-	 * 
-	 * @param aContext The context to be set configuration
-	 */
-	void SetContext(const TInt aContextId);
-	TInt GetErrorValue();
-	virtual void StartRequest();
-	TUint GetConnectionSpeed();
-	
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGprsContextConnect(CGlobalPhonemanager& aGloblePhone, 
-                          CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/*
-	 * The return value of AT command executed 
-	 */
-	TInt iError;
-	/*
-	 * The context to be set configuration
-	 */
-	TInt iContextId;
-	TUint iConnectionSpeed;
-};
-
-
-#endif //__ATGPRSCONTEXTCONNECT_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/inc/atgprscontextdeactivate.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-// 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:
-// @file atgprscontextdeactivate.h
-// AT command definition
-// This file defines the AT command used for deactivating a PDP context.
-// 
-
-
-#ifndef __ATGPRSCONTEXTDEACTIVATE_H
-#define __ATGPRSCONTEXTDEACTIVATE_H
-
-#include "atcommandbase.h"
-#include "cltsypacketserviceshandler.h"
-
-/**
- * CATGprsContextDelete inherits from the CATCommands class. 
- * Sends the AT command to deactivate a context to the network.
- */
-class CATGprsContextDeactivate : public CAtCommandBase
-{
-public:
-	static CATGprsContextDeactivate* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGprsContextDeactivate();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/*
-	 * Set the parameter of AT command 
-	 * 
-	 * @param aContext The context to be set configuration
-	 */
-	void SetContext(const TInt aContextId);
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	virtual void StartRequest();
-	
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGprsContextDeactivate(CGlobalPhonemanager& aGloblePhone, 
-                             CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructorr
-	 */
-	void ConstructL();
-private:
-	/*
-	 * The return value of AT command executed 
-	 */
-	TInt iError;
-	/*
-	 * The context to be set configuration
-	 */
-	TInt iContextId;
-};
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/inc/atgprscontextdelete.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-// 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:
-// @file atgprscontextdelete.h
-// AT command definition
-// This file defines the AT command used for deleting a context from the phone.
-// 
-
-#ifndef __ATGPRSCONTEXTDELETE_H
-#define __ATGPRSCONTEXTDELETE_H
-
-// user include
-#include "atcommandbase.h"
-#include "cltsypacketserviceshandler.h"
-
-/**
- * CATGprsContextDelete inherits from the CATCommands class. 
- * Sends the AT command 'AT+CGDCONT=x' to delete a context from the phone
- */
-class CATGprsContextDelete : public CAtCommandBase
-{
-public:
-	static CATGprsContextDelete* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                      CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGprsContextDelete();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/*
-	 * Set the parameter of AT command 
-	 * 
-	 * @param aContext The context to be set configuration
-	 */
-	void SetContext(const TInt aContextId);
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	virtual void StartRequest();
-	
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGprsContextDelete(CGlobalPhonemanager& aGloblePhone, 
-                         CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructorr
-	 */
-	void ConstructL();
-private:
-	/*
-	 * The return value of AT command executed 
-	 */
-	TInt iError;
-	/*
-	 * The context to be set configuration
-	 */
-	TInt iContextId;
-};
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/inc/atgprsdetach.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-// 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:
-// @file atgprsdetach.h
-// AT command definition
-// This file defines the AT command used for detaching..
-// 
-
-#ifndef _ATGPRSDETACH_H
-#define _ATGPRSDETACH_H
-
-#include "atcommandbase.h"
-
-/**
- * CATGprsDetach inherits from the CAtCommandBase class. 
- * Sends the AT command to detach from the network.
- * This class transmits the following commands: AT+CGATT=0
- */
-class CATGprsDetach : public CAtCommandBase
-{
-public:
-	static CATGprsDetach* NewL(CGlobalPhonemanager& aGloblePhone, 
-                               CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGprsDetach();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	virtual void StartRequest();
-	
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGprsDetach(CGlobalPhonemanager& aGloblePhone, 
-                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/*
-	 * The return value of AT command executed 
-	 */
-	TInt iError;
-};
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/inc/atgprsgetcontextaddr.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-// 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:
-// @file atgprsgetcontextip.h
-// AT command definition
-// This contains CATGPRSGetContextAddr which is defines the AT command used 
-// for getting GPRS context IP address.
-// 
-
-#ifndef _ATGPRSGETCONTEXTIP_H
-#define _ATGPRSGETCONTEXTIP_H
-
-// user include
-#include "atcommandbase.h"
-#include "cltsypacketserviceshandler.h"
-
-/**
- * CATGPRSGetContextAddr inherits from the CAtCommandBase class. 
- * This class provide the common functionalities for getting 
- * GPRS context IP address..
- *
- */
-class CATGPRSGetContextAddr : public CAtCommandBase
-{
-public:
-	static CATGPRSGetContextAddr* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGPRSGetContextAddr();
-	/*
-	 * Set the parameter of AT command 
-	 * 
-	 * @param aContext The context to be set configuration
-	 */
-	void SetContext(const TInt aContextId);
-	TInt GetErrorValue();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	virtual void StartRequest();
-	
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGPRSGetContextAddr( CGlobalPhonemanager& aGloblePhone, 
-                      CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/*
-	 * The return value of AT command executed 
-	 */
-	TInt iError;
-	/*
-	 * The context to be set configuration
-	 */
-	TInt iContextId;
-	/*
-	 * The config to be set configuration
-	 */
-	RPacketContext::TContextConfigGPRS iContextConfig;
-    };
-
-#endif //_ATGPRSGETCONTEXTIP_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/inc/atgprsntwkregstatus.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-// 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:
-// @file atgprsntwkregstatus.h
-// AT command definition
-// This file defines the AT command used for getting out the phones current network
-//registration status..
-// 
-
-#ifndef __ATGPRSNTWKREGSTATUS_H
-#define __ATGPRSNTWKREGSTATUS_H
-
-//system include
-#include <etelpckt.h>
-
-//user include
-#include "atcommandbase.h"
-
-class CATGprsNtwkRegStatusChange;
-/**
- * CATGprsNtwkRegStatus inherits from the CAtCommandBase class. 
- * Sends the AT command to find out the phones current network
- * registration status.
- * This class transmits the following commands: AT+CGREG?
- */
-class CATGprsNtwkRegStatus : public CAtCommandBase
-{
-public:
-	static CATGprsNtwkRegStatus* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                      CCtsyDispatcherCallback& aCtsyDispatcherCallback,
-                                      CATGprsNtwkRegStatusChange& aNtwkRegStatusChange);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGprsNtwkRegStatus();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	virtual void StartRequest();
-	
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 * @param aNtwkRegStatusChange
-	 */
-	CATGprsNtwkRegStatus(CGlobalPhonemanager& aGloblePhone, 
-                         CCtsyDispatcherCallback& aCtsyDispatcherCallback,
-                         CATGprsNtwkRegStatusChange& aNtwkRegStatusChange);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	/*
-	 * The return value of AT command executed 
-	 */
-	TInt iError;
-	RPacketService::TRegistrationStatus iGprsRegistrationStatus; 
-	CATGprsNtwkRegStatusChange& iNtwkRegStatusChange;
-    };
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/inc/atgprsntwkregstatuschange.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-// 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:
-// @file atgprsntwkregstatus.h
-// AT command definition
-// This file defines the AT command used to Notify the phones current network
-//registration status..
-//
-
-#ifndef __ATGPRSNTWKREGSTATUSCHANGE_H
-#define __ATGPRSNTWKREGSTATUSCHANGE_H
-
-//system include
-
-//user include
-#include "atcommandbase.h"
-/**
- * CATGprsNtwkRegStatusChange inherits from the CAtCommandBase class. 
- * AT command to Notify the phones current network
- * registration status.
- * This class transmits the following commands: +CGREG:
- */
-class CATGprsNtwkRegStatusChange : public CAtCommandBase
-	{
-public:
-	static CATGprsNtwkRegStatusChange* NewL(CGlobalPhonemanager& aGloblePhone,
-			                                CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	static CATGprsNtwkRegStatusChange* NewLC(CGlobalPhonemanager& aGloblePhone,
-			                                 CCtsyDispatcherCallback& aCtsyDispatcherCallback);			                     	
-	/**
-	 * Destructor
-	 *
-	 */
-	virtual ~CATGprsNtwkRegStatusChange();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Start Execute AT Command
-	 */
-	virtual void ExecuteCommand(){};
-	/**
-	 * Parses the +CGREG unsolicited string from the modem.
-	 * An example response would be '+CGREG: 2' where the value denotes the
-	 * current registration status.
-	 * If parsing succeeds then aRegStatus is updated.
-	 * 
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	/**
-	 * 
-	 * 
-	 */
-	void Enable();
-	/**
-	 * 
-	 * 
-	 */
-	void Disable();
-	
-	
-protected:
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGprsNtwkRegStatusChange(CGlobalPhonemanager& aGloblePhone,
-				               CCtsyDispatcherCallback& aCtsyDispatcherCallback);	
-	/**
-	 * 2nd Constructor
-	 * This function must be called in his subtype class for 
-	 * creating instance of class CRespondBufParser
-	 */
-	void ConstructL();
-	
-private:
-	/**
-	 * 
-	 * 
-	 */
-	RPacketService::TRegistrationStatus iRegistrationStatus;
-	/*
-	 * The return value of AT command executed 
-	 */
-	TInt iError;
-	};
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/inc/atgprsqosprofile.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-// 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:
-// @file atgprsqosprofile.h
-// AT command definition
-// This file defines the AT command used to set GPRS Qos profile
-//
-
-#ifndef __ATGPRSQOSPROFILE_H
-#define __ATGPRSQOSPROFILE_H
-
-#include "atcommandbase.h"
-#include "cltsypacketserviceshandler.h"
-
-/**
- * CATGprsSetProfileMin inherits from the CAtCommandBase class. 
- * AT command to set GPRS Qos profile for require value
- * This class transmits the following commands: AT+CGQREQ=%d,%d,%d,%d,%d,%d
- */
-class CATGprsSetProfileReq : public CAtCommandBase
-{
-public:
-	static CATGprsSetProfileReq* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                      CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CATGprsSetProfileReq();
-	/**
-	 * Format the command 
-	 */
-	void MakeupCGQREQ();
-	/**
-	 * Set the context for config
-	 * 
-	 */
-	void SetContext(const TInt aContextId);
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * Start Execute AT Command
-	 */
-	virtual void ExecuteCommand();
-	/**
-	 * Virtual function. Inherited from CAtCommandBase
-	 * @param aResponseBuf Line buf reading from baseband 
-	 */
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	 * Will be called by AT Manager whenever a event was triggered
-	 * 
-	 * @param aEventSource
-	 * @param aStatus
-	 */
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	virtual void StartRequest();
-	
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CATGprsSetProfileReq( CGlobalPhonemanager& aGloblePhone, 
-                          CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	TInt iError;
-	TInt iContextId;
-	RPacketQoS::TQoSGPRSRequested iQoSConfig;
-    };
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/inc/initialisepdpcontext.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-// 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:
-// @file initialisepdpcontext.h
-// This contains CInitialisePdpContext which is defines the founctions for loan comm port.
-// 
-
-#ifndef __INITIALISEPDPCONTEXT_H__
-#define __INITIALISEPDPCONTEXT_H__
-
-#include <callbacktimer.h>
-
-// user include
-#include "atcommandcontrolbase.h"
-#include "cltsypacketserviceshandler.h"
-
-/**
- *  CInitialisePdpContext inherits from the MTimerObserver class. 
- * This class provide the common functionalities for Initialise Pdp Context.
- */
-class CInitialisePdpContext : public MTimerObserver,
-                              public CBase
-{
-public:
-	static CInitialisePdpContext* NewL(CGlobalPhonemanager& aGloblePhone, 
-		                               CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * Destructor
-	 *
-	 */
-	~CInitialisePdpContext();
-
-	void StartRequest();
-	/*
-	 * Set the parameter of AT command 
-	 * 
-	 * @param aContext The context to be set configuration
-	 */
-	void SetContext(const TInt aContextId);
-	/**
-	 * This function will stop the TSY from using the comport 
-	 * and loan it to the client.
-	 */
-	void LoanCommPort();
-	
-protected:	
-	/**
-	 * Constructor
-	 *
-	 * @param aGloblePhone
-	 * @param aCtsyDispatcherCallback
-	 */
-	CInitialisePdpContext(CGlobalPhonemanager& aGloblePhone, 
-		                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	/**
-	 * 2nd Constructor
-	 */
-	void ConstructL();
-private:
-	//From MTimerObserver
-    virtual void TimerRun(TInt aError);	
-private:
-	
-	CGlobalPhonemanager& iPhoneGlobals;
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-	CCallbackTimer* iCallbackTimer;	
-	/*
-	 * The context to be set configuration
-	 */
-	TInt iContextId;
-    };
-
-#endif //__INITIALISEPDPCONTEXT_H__

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/src/activatecontextandgetaddr.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,313 +0,0 @@
-// 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:
-// CActivatContextAndGetAddr
-// 
-
-#include <ctsy/ltsy/ltsylogger.h>
-
-#include "activatecontextandgetaddr.h"
-#include "mslogger.h"
-#include "athelpercommand.h"
-#include "atgprscontextactivate.h"
-#include "atgprsgetcontextaddr.h"
-#include "atgprscontextconnect.h"
-#include "commengine.h"
-
-_LIT8(KATDeleteContext2, "AT+CGDCONT=2\r");
-_LIT8(KATDeleteContext3, "AT+CGDCONT=3\r");
-_LIT8(KATDeleteContext4, "AT+CGDCONT=4\r");
-
-// CActivatContextAndGetAddr
-// ---------------------------------------------------------------------------
-// CActivatContextAndGetAddr::NewL()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CActivatContextAndGetAddr* CActivatContextAndGetAddr::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                       CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CActivatContextAndGetAddr* self = new(ELeave) CActivatContextAndGetAddr(aGloblePhone,
-			                                      aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self);
-	return self ;
-	}
-
-// ---------------------------------------------------------------------------
-// CActivatContextAndGetAddr::CActivatContextAndGetAddr()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CActivatContextAndGetAddr::CActivatContextAndGetAddr(CGlobalPhonemanager& aGloblePhone, 
-	                        CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CATCommandControlBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CActivatContextAndGetAddr::CActivatContextAndGetAddr()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CActivatContextAndGetAddr::ConstructL()
-	{
-	iATCommandName = EATNone;
-	iATHelperCommand = CATHelperCommand::NewL(iPhoneGlobals,iCtsyDispatcherCallback);
-	
-	iATGprsContextActivate = CATGprsContextActivate::NewL(iPhoneGlobals,
-			                                              iCtsyDispatcherCallback);
-	iATGPRSGetContextAddr = CATGPRSGetContextAddr::NewL(iPhoneGlobals,
-								                        iCtsyDispatcherCallback);
-	iATGprsContextConnect = CATGprsContextConnect::NewL(iPhoneGlobals,
-								                        iCtsyDispatcherCallback);
-	}
-
-// ---------------------------------------------------------------------------
-// CActivatContextAndGetAddr::~CActivatContextAndGetAddr()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CActivatContextAndGetAddr::~CActivatContextAndGetAddr()
-	{
-	delete iATHelperCommand;
-	iATHelperCommand = NULL;
-	
-	delete iATGprsContextActivate;
-	iATGprsContextActivate = NULL;
-	
-	delete iATGPRSGetContextAddr;
-	iATGPRSGetContextAddr = NULL;
-	
-	delete iATGprsContextConnect;
-	iATGprsContextConnect = NULL;
-	}
-
-// ---------------------------------------------------------------------------
-// CActivatContextAndGetAddr::AtCommandExecuteComplete()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CActivatContextAndGetAddr::AtCommandExecuteComplete(TAtEventSource aEventSource, 
-		                                                 TInt aStatus)
-	{
-	if((aEventSource == EWriteCompletion)&&(KErrNone == aStatus))
-		{
-		return;
-		}
-	
-	TInt ret = KErrNone;
-	switch(iATType)
-		{
-		case ELtsyAT_Packet_DeleteContext2:
-            ret = iATHelperCommand->GetErrorValue();
-		    if ((KErrNone == ret) && (KErrNone == aStatus))
-		        {
-		        ExecuteATHelpCommand(KATDeleteContext3,ELtsyAT_Packet_DeleteContext3);
-		        }
-		    else
-		        {
-	            EndATCommand(iATHelperCommand);
-                iPhoneGlobals.iEventSignalActive = EFalse;
-                LOGTEXT3(_L8("[Ltsy] DeleteContext2 failed (%d or %d) in CActivatContextAndGetAddr"), ret, aStatus);
-                DispatcherCallback(KErrGeneral);
-		        }
-			break;
-		case ELtsyAT_Packet_DeleteContext3:
-            ret = iATHelperCommand->GetErrorValue();
-            if ((KErrNone == ret) && (KErrNone == aStatus))
-                {
-                ExecuteATHelpCommand(KATDeleteContext4,ELtsyAT_Packet_DeleteContext4);
-                }
-            else
-                {
-                EndATCommand(iATHelperCommand);
-                iPhoneGlobals.iEventSignalActive = EFalse;
-                LOGTEXT3(_L8("[Ltsy] DeleteContext3 failed (%d or %d) in CActivatContextAndGetAddr"), ret, aStatus);
-                DispatcherCallback(KErrGeneral);
-                }
-			break;
-		case ELtsyAT_Packet_DeleteContext4:
-            ret = iATHelperCommand->GetErrorValue();
-            EndATCommand(iATHelperCommand);
-            if ((KErrNone == ret) && (KErrNone == aStatus))
-                {
-                iATGprsContextActivate->SetContext(iContextId);
-                StartATCommand(iATGprsContextActivate);
-                }
-            else
-                {
-                iPhoneGlobals.iEventSignalActive = EFalse;
-                LOGTEXT3(_L8("[Ltsy] DeleteContext4 failed (%d or %d) in CActivatContextAndGetAddr"), ret, aStatus);
-                DispatcherCallback(KErrGeneral);
-                }
-			break;
-		case ELtsyAT_Packet_ActivateContext:
-			EndATCommand(iATGprsContextActivate);
-			if(aStatus == KErrNone)
-				{
-				ret = iATGprsContextActivate->GetErrorValue();
-				if(KErrNone == ret)
-					{
-					iATGPRSGetContextAddr->SetContext(iContextId);
-					StartATCommand(iATGPRSGetContextAddr);
-					}
-				else
-				    {
-				    iPhoneGlobals.iEventSignalActive = EFalse;
-				    DispatcherCallback(ret);
-				    }
-				}
-			else
-				{
-				iPhoneGlobals.iEventSignalActive = EFalse;
-				DispatcherCallback(aStatus);
-				}
-			break;
-		case ELtsyAT_Packet_GetContextAddr: 
-			EndATCommand(iATGPRSGetContextAddr);
-			if(aStatus == KErrNone)
-				{
-				ret = iATGPRSGetContextAddr->GetErrorValue();
-				if(KErrNone == ret)
-					{
-					iATGprsContextConnect->SetContext(iContextId);
-					StartATCommand(iATGprsContextConnect);
-					}
-				else
-				    {
-                    iPhoneGlobals.iEventSignalActive = EFalse;
-                    DispatcherCallback(ret);
-				    }
-				}
-			else
-				{
-                iPhoneGlobals.iEventSignalActive = EFalse;
-				DispatcherCallback(aStatus);
-				}
-			break;
-		case ELtsyAT_Packet_ConnectContext: 
-			EndATCommand(iATGprsContextConnect);
-			if(aStatus == KErrNone)
-				{
-				ret = iATGprsContextConnect->GetErrorValue();
-				if(KErrNone == aStatus)
-					{
-					iConnectionSpeed = iATGprsContextConnect->GetConnectionSpeed();
-					}
-				DispatcherCallback(ret);
-				}
-			else
-				{
-				DispatcherCallback(aStatus);
-				}
-            iPhoneGlobals.iEventSignalActive = EFalse;
-			break;
-		default:
-			break;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CActivatContextAndGetAddr::StartRequest()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CActivatContextAndGetAddr::StartRequest()
-	{
-	iATHelperCommand->SetAtCommandObserver(this);
-	ExecuteATHelpCommand(KATDeleteContext2,ELtsyAT_Packet_DeleteContext2);
-	}
-
-// ---------------------------------------------------------------------------
-// CActivatContextAndGetAddr::SetContext()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CActivatContextAndGetAddr::SetContext(const TInt aContextId)
-	{
-	iContextId = aContextId;
-	}
-
-// ---------------------------------------------------------------------------
-// CActivatContextAndGetAddr::ExecuteNextATHelpCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CActivatContextAndGetAddr::ExecuteATHelpCommand(const TDesC8& aATString,TLtsyATCommandType aATType)
-	{
-	iATHelperCommand->Complete();
-	iATHelperCommand->SetAtCommandString(aATString);
-	iATType = aATType;
-	iATHelperCommand->StartRequest();
-	}
-
-// ---------------------------------------------------------------------------
-// CActivatContextAndGetAddr::StartATCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CActivatContextAndGetAddr::StartATCommand(CAtCommandBase* aAtCommand)
-	{
-	aAtCommand->SetAtCommandObserver(this);
-	iATType = aAtCommand->AtType();
-	aAtCommand->StartRequest();
-	}
-
-// ---------------------------------------------------------------------------
-// CActivatContextAndGetAddr::EndATCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CActivatContextAndGetAddr::EndATCommand(CAtCommandBase* aAtCommand)
-	{
-	aAtCommand->RemoveAtCommandObserver();
-	aAtCommand->Complete();
-	}
-
-// ---------------------------------------------------------------------------
-// CActivatContextAndGetAddr::DispatcherCallback()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CActivatContextAndGetAddr::DispatcherCallback(TInt aError)
-	{
-	TInt count = iPhoneGlobals.iContextList.Count();
-	TInt i = 0;
-	
-	//Get the context from context list
-	for(i = 0; i < count;i++)
-		{
-		if(iPhoneGlobals.iContextList[i]->iContextID == iContextId)
-			{
-			break;
-			}
-		}
-	iCtsyDispatcherCallback.CallbackPacketServicesActivatePdpContextComp(aError, 
-			                iPhoneGlobals.iContextList[i]->iInfo.iName,
-			                iPhoneGlobals.iContextList[i]->iDefContextConfigGPRS.iAccessPointName,
-			                iPhoneGlobals.iContextList[i]->iDefContextConfigGPRS.iPdpType);
-	if(aError == KErrNone)
-		{
-		iPhoneGlobals.iContextList[i]->iInfo.iStatus = RPacketContext::EStatusActive;
-		TContextMisc contextMisc;
-		contextMisc.iStatus = RPacketContext::EStatusActive;
-		iPhoneGlobals.iPhoneStatus.iMode = RPhone::EModeOnlineData;
-		iCtsyDispatcherCallback.CallbackPacketServicesNotifyPdpContextStatusChangeInd(aError,
-								iPhoneGlobals.iContextList[i]->iInfo.iName,
-								contextMisc);
-		iCtsyDispatcherCallback.CallbackPacketServicesNotifyPdpContextConfigChangedInd(aError, 
-				                iPhoneGlobals.iContextList[i]->iInfo.iName, 
-				                iPhoneGlobals.iContextList[i]->iDefContextConfigGPRS.iAccessPointName, 
-				                iPhoneGlobals.iContextList[i]->iDefContextConfigGPRS.iPdpAddress, 
-				                0, 
-				                iPhoneGlobals.iContextList[i]->iDefContextConfigGPRS.iProtocolConfigOption.iMiscBuffer);
-		iCtsyDispatcherCallback.CallbackPacketServicesNotifyPdpContextConnectionSpeedChangeInd(aError,
-				                iPhoneGlobals.iContextList[i]->iInfo.iName,
-				                iConnectionSpeed);
-		iPhoneGlobals.iCommEngine->CommCancel();
-		}
-	}
-
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/src/atgprsattach.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-// 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:
-// CATGprsAttach
-// The execution command is used to attach the MT to, or detach the MT from, the GPRS
-// service. After the command has completed, the MT remains in V.25ter command state.
-// If the MT is already in the requested state, the command is ignored and the OK
-// response is returned. If the requested state cannot be achieved, an ERROR or +CME
-// ERROR response is returned. Extended error responses are enabled by the +CMEE
-// command.
-// Any active PDP contexts will be automatically deactivated when the attachment state
-// changes to detached.
-// The read command returns the current GPRS service state.
-// The test command is used for requesting information on the supported GPRS service
-// states.
-// +CGATT= [<state>]
-// <state>: indicates the state of GPRS attachment
-// 0 – detached
-// 1 – attached
-// Other values are reserved and will result in an ERROR response to the
-// execution command.
-// other items were commented in a header
-// 
-
-#include "atgprsattach.h"
-#include "mslogger.h"
-
-_LIT8(KAttachCommand, "AT+CGATT=1\r");
-
-// ---------------------------------------------------------------------------
-// CATGprsAttach::NewL
-// other items were commented in a header
-// --------------------------------------------------------------------------
-CATGprsAttach* CATGprsAttach::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGprsAttach* self = new(ELeave) CATGprsAttach(aGloblePhone,
-			                                        aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsAttach::CATGprsAttach
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsAttach::CATGprsAttach(CGlobalPhonemanager& aGloblePhone, 
-                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsAttach::ConstructL()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsAttach::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsAttach::~CATGprsAttach()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsAttach::~CATGprsAttach()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsAttach::StartRequest()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsAttach::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsAttach::ExecuteCommand()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsAttach::ExecuteCommand()
-	{
-	iTxBuffer.Copy(KAttachCommand);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsAttach::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsAttach::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsAttach::EventSigna
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsAttach::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone ==aStatus)
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			aStatus = iError;
-			}
-		else
-			return;
-		}
-	iCtsyDispatcherCallback.CallbackPacketServicesPacketAttachComp(aStatus);
-	CAtCommandBase::Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	}
-
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/src/atgprsconfig.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,242 +0,0 @@
-// 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:
-// CActivatContextAndGetAddr
-// This command specifies PDP context parameter values for a PDP context identified 
-// by the local context identification parameter, <cid>.
-// Eleven PDP contexts can be defined through Wavecom software.
-// A special form of the set command, +CGDCONT= <cid> causes the values for context
-// number <cid> to become undefined.
-// The test command returns values supported as a compound value. If the MT supports
-// several PDP types, <PDP_type>, the parameter value ranges for each <PDP_type> are
-// returned on a separate line.
-// The read command returns the current settings for each defined context.
-// The test command returns values supported as a compound value. If the MT supports
-// several PDP types, <PDP_type), the parameter value ranges for each <PDP_type> are
-// returned on a separate line.
-// +CGDCONT=[<cid> [,<PDP_type> [,<APN>[,<PDP_addr> [,<d_comp>[,<h_comp>]]]]]]
-// Defined values
-// <cid>: (PDP Context Identifier) a numeric parameter (1-32) which specifies a particular
-// PDP context definition. The parameter is local to the TE-MT interface and is used in
-// other PDP context-related commands.
-// <PDP_type>: (Packet Data Protocol type) a string parameter which specifies the type of
-// packet data protocol
-// IP Internet Protocol
-// PPP Point to Point Protocol
-// <APN>: (Access Point Name) a string parameter, which is a logical name that is used to
-// select the GGSN or the external packet data network.
-// If the value is null or omitted, then the subscription value will be requested.
-// WAVECOM confidential ?
-// This confidential document is the property of WAVECOM and may not be copied or circulated
-// without permission
-// <PDP_address>: a string parameter that identifies the MT in the address space
-// applicable to the PDP.
-// If the value is null or omitted, then a value may be provided by the TE during the PDP
-// startup procedure or, failing that, a dynamic address will be requested.
-// The read form of the command will continue to return the null string even if an address
-// has been allocated during the PDP startup procedure. The allocated address may be
-// read using the +CGPADDR command.
-// <d_comp>: a numeric parameter that controls PDP data compression
-// 0 - off (default if value is omitted)
-// 1 ?on
-// Other values are reserved.
-// <h_comp>: a numeric parameter that controls PDP header compression
-// 0 - off (default if value is omitted)
-// 1 ?on
-// Other values are reserved.
-// other items were commented in a header
-
-#include "mslogger.h"
-#include "atgprsconfig.h"
-
-_LIT8(KIPType4	, "IP");
-_LIT8(KIPType6	, "IP");
-_LIT8(KX25		, "X25");
-_LIT8(KSetCGDCONTCommand,"AT+CGDCONT=%d,\"%S\",\"%S\"\r");
-_LIT8(KATDeleteContext1, "AT+CGDCONT=1\r");
-
-// ---------------------------------------------------------------------------
-// CATGPRSSetConfig::NewL
-//
-// ---------------------------------------------------------------------------
-CATGPRSSetConfig* CATGPRSSetConfig::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGPRSSetConfig* self = new(ELeave) CATGPRSSetConfig(aGloblePhone,aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSSetConfig::CATGPRSSetConfig
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGPRSSetConfig::CATGPRSSetConfig(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSSetConfig::ConstructL()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGPRSSetConfig::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iDeleteContext = EFalse;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSSetConfig::~CATGPRSSetConfig()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGPRSSetConfig::~CATGPRSSetConfig()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSSetConfig::StartRequest()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGPRSSetConfig::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSSetConfig::ExecuteCommand()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGPRSSetConfig::ExecuteCommand()
-	{
-	iDeleteContext = ETrue;
-	iTxBuffer.Copy(KATDeleteContext1);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSSetConfig::MakeupCGDCONT()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATGPRSSetConfig::MakeupCGDCONT()
-	{
-	TInt count = iPhoneGlobals.iContextList.Count();
-	TInt i;
-	//Get the context location from context list
-	for(i = 0; i < count;i++)
-		{
-		if(iPhoneGlobals.iContextList[i]->iContextID == iContextId)
-			{
-			break;
-			}
-		}
-	const TInt KPDPTypeIdent=5;
-	TBuf8<KPDPTypeIdent>						pdpType;		// PDP Type identifier
-	TBuf8<RPacketContext::KGSNNameLength>		gsnName;			// Access point Name
-	TBuf8<RPacketContext::KMaxPDPAddressLength>	pdpAddress;	// PDP pre-assigned address
-	switch(iPhoneGlobals.iContextList[i]->iDefContextConfigGPRS.iPdpType)
-		{
-		case RPacketContext::EPdpTypeIPv4:
-			pdpType.Format(KIPType4);
-			break;
-		case RPacketContext::EPdpTypeIPv6:
-			pdpType.Format(KIPType6);
-			break;
-		case RPacketContext::EPdpTypeX25:
-			pdpType.Format(KX25);
-			break;
-		default:
-			pdpType.Format(KIPType6);
-			break;
-		}
-
-	gsnName.Copy(iPhoneGlobals.iContextList[i]->iDefContextConfigGPRS.iAccessPointName);
-	pdpAddress.Copy(iPhoneGlobals.iContextList[i]->iDefContextConfigGPRS.iPdpAddress);
-
-	iTxBuffer.Format(KSetCGDCONTCommand, iContextId, &pdpType, &gsnName);
-
-	return KErrNone;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSSetConfig::SetContext
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGPRSSetConfig::SetContext(const TInt aContextId)
-	{
-	iContextId = aContextId;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSSetConfig::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGPRSSetConfig::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSSetConfig::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGPRSSetConfig::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone ==aStatus)
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			aStatus = iError;
-			}
-		else
-			return;
-		}
-	if(iDeleteContext)
-		{
-		iDeleteContext = EFalse;
-		TInt ret=MakeupCGDCONT();
-		Write();
-		}
-	else
-		{
-		TInt count = iPhoneGlobals.iContextList.Count();
-		TInt i;
-		//Get the context location from context list
-		for(i = 0; i < count;i++)
-			{
-			if(iPhoneGlobals.iContextList[i]->iContextID == iContextId)
-				{
-				break;
-				}
-			}
-		iCtsyDispatcherCallback.CallbackPacketServicesSetPdpContextConfigComp(aStatus,
-						        iPhoneGlobals.iContextList[i]->iInfo.iName);
-        iCtsyDispatcherCallback.CallbackPacketServicesNotifyPdpContextAddedInd(aStatus,
-                                iPhoneGlobals.iContextList[i]->iInfo.iName);
-		CAtCommandBase::Complete();
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		}
-	}
-
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/src/atgprscontextactivate.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-// 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:
-// The execution command is used to activate or deactivate the specified PDP context (s).
-// After the command has completed, the MT remains in V.25ter command state. If any
-// PDP context is already in the requested state, the state for that context remains
-// unchanged.
-// If the requested state for any specified context cannot be achieved, an ERROR or +CME
-// ERROR response is returned. Extended error responses are enabled by the +CMEE
-// command.
-// If the MT is not GPRS attached when the activation form of the command is executed,
-// the MT first performs a GPRS attach and them attempts to activate the specified
-// contexts. If the attach fails then the MT responds with ERROR or, if extended error
-// responses are enabled, with the appropriate failure-to-attach error message.
-// If no <cid>s are specified the activation form of the command activates all defined
-// contexts.
-// If no <cid>s are specified the deactivation form of the command deactivates all active
-// contexts.
-// Two PDP contexts can be activated through Wavecom software.
-// The read command returns the current activation states for all the defined PDP
-// contexts.
-// The test command is used for requesting information on the supported PDP context
-// activation states.
-// Defined Values
-// <state>: indicates the state of PDP context activation
-//  0 ?deactivated
-//  1 ?activated
-//  Other values are reserved and will result in an ERROR response to the
-// execution command.
-// <cid>: a numeric parameter which specifies a particular PDP context.
-//  other items were commented in a header
-
-#include "mslogger.h"
-#include "atgprscontextactivate.h"
-
-_LIT8(KATContextActivate,   "AT+CGACT=1,%d\r");
-const TInt KLtsyGprsContextActivateTimeOut = 30;
-
-// ---------------------------------------------------------------------------
-// CATGprsContextActivate::NewL
-//
-// ---------------------------------------------------------------------------
-CATGprsContextActivate* CATGprsContextActivate::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGprsContextActivate* self = new(ELeave) CATGprsContextActivate(aGloblePhone,
-			                                                          aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextActivate::CATGprsContextActivate
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsContextActivate::CATGprsContextActivate(CGlobalPhonemanager& aGloblePhone, 
-                                               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextActivate::ConstructL()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextActivate::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iAtType = ELtsyAT_Packet_ActivateContext;
-	iReadTimeOut = KLtsyGprsContextActivateTimeOut;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextActivate::~CATGprsContextActivate()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsContextActivate::~CATGprsContextActivate()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextActivate::StartRequest()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextActivate::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextActivate::ExecuteCommand()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextActivate::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CATGprsContextActivate::Start called"));
-	LOGTEXT2(_L8("iCid=%d"),iContextId);
-	iTxBuffer.Format(KATContextActivate,iContextId);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextActivate::SetContext
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextActivate::SetContext(const TInt aContextId)
-	{
-	iContextId = aContextId;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextActivate::GetErrorValue
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATGprsContextActivate::GetErrorValue()
-	{
-	return iError;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextActivate::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextActivate::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/src/atgprscontextconnect.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +0,0 @@
-// 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:
-// The execution command is used to activate or deactivate the specified PDP context (s).
-// After the command has completed, the MT remains in V.25ter command state. If any
-// PDP context is already in the requested state, the state for that context remains
-// unchanged.
-// If the requested state for any specified context cannot be achieved, an ERROR or +CME
-// ERROR response is returned. Extended error responses are enabled by the +CMEE
-// command.
-// If the MT is not GPRS attached when the activation form of the command is executed,
-// the MT first performs a GPRS attach and them attempts to activate the specified
-// contexts. If the attach fails then the MT responds with ERROR or, if extended error
-// responses are enabled, with the appropriate failure-to-attach error message.
-// If no <cid>s are specified the activation form of the command activates all defined
-// contexts.
-// If no <cid>s are specified the deactivation form of the command deactivates all active
-// contexts.
-// Two PDP contexts can be activated through Wavecom software.
-// The read command returns the current activation states for all the defined PDP
-// contexts.
-// The test command is used for requesting information on the supported PDP context
-// activation states.
-// Defined Values
-// <state>: indicates the state of PDP context activation
-//  0 ?deactivated
-//  1 ?activated
-//  Other values are reserved and will result in an ERROR response to the
-// execution command.
-// <cid>: a numeric parameter which specifies a particular PDP context.
-//  other items were commented in a header
-
-#include "mslogger.h"
-#include "atgprscontextconnect.h"
-
-_LIT8(KATContextConnect,   "ATD*99***%d#\r");
-_LIT8(KLtsyGprsNoConnect, "NO CARRIER");
-_LIT8(KLtsyGprsConnectStr, "CONNECT*");
-_LIT8(KLtsyGprsConnect, "CONNECT");
-
-// ---------------------------------------------------------------------------
-// CATGprsContextConnect::NewL
-//
-// ---------------------------------------------------------------------------
-CATGprsContextConnect* CATGprsContextConnect::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGprsContextConnect* self = new(ELeave) CATGprsContextConnect(aGloblePhone,
-			                                                          aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextConnect::CATGprsContextConnect
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsContextConnect::CATGprsContextConnect(CGlobalPhonemanager& aGloblePhone, 
-                                               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextConnect::ConstructL()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextConnect::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iAtType = ELtsyAT_Packet_ConnectContext;
-	AddExpectStringL(KLtsyGprsConnectStr);
-	AddExpectStringL(KLtsyGprsNoConnect);
-	iReadTimeOut = 30;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextConnect::~CATGprsContextConnect()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsContextConnect::~CATGprsContextConnect()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextConnect::StartRequest()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextConnect::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextConnect::ExecuteCommand()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextConnect::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CATGprsContextConnect::Start called"));
-	LOGTEXT2(_L8("iCid=%d"),iContextId);
-	iTxBuffer.Format(KATContextConnect,iContextId);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextConnect::SetContext
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextConnect::SetContext(const TInt aContextId)
-	{
-	iContextId = aContextId;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextConnect::GetErrorValue
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATGprsContextConnect::GetErrorValue()
-	{
-	return iError;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextConnect::GetConnectionSpeed
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TUint CATGprsContextConnect::GetConnectionSpeed()
-	{
-	return iConnectionSpeed;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextConnect::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextConnect::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,CurrentLine());
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrGeneral;
-		return ;
-		}
-	if( array[0].MatchF(KLtsyGprsConnect)==KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrGeneral;
-		return ;
-		}
-	else
-		{
-		TUint val = 0;
-		TLex8 lex(array[1]);
-		lex.Val(val);
-		iConnectionSpeed = val;
-		CleanupStack::PopAndDestroy(&array);
-		iError = KErrNone;
-		}
-	}
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/src/atgprscontextdeactivate.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-// 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:
-// The execution command is used to activate or deactivate the specified PDP context (s).
-// After the command has completed, the MT remains in V.25ter command state. If any
-// PDP context is already in the requested state, the state for that context remains
-// unchanged.
-// If the requested state for any specified context cannot be achieved, an ERROR or +CME
-// ERROR response is returned. Extended error responses are enabled by the +CMEE
-// command.
-// If the MT is not GPRS attached when the activation form of the command is executed,
-// the MT first performs a GPRS attach and them attempts to activate the specified
-// contexts. If the attach fails then the MT responds with ERROR or, if extended error
-// responses are enabled, with the appropriate failure-to-attach error message.
-// If no <cid>s are specified the activation form of the command activates all defined
-// contexts.
-// If no <cid>s are specified the deactivation form of the command deactivates all active
-// contexts.
-// Two PDP contexts can be activated through Wavecom software.
-// The read command returns the current activation states for all the defined PDP
-// contexts.
-// The test command is used for requesting information on the supported PDP context
-// activation states.
-// Defined Values
-// <state>: indicates the state of PDP context activation
-//  0 ?deactivated
-//  1 ?activated
-//  Other values are reserved and will result in an ERROR response to the
-// execution command.
-// <cid>: a numeric parameter which specifies a particular PDP context.
-//  other items were commented in a header
-// other items were commented in a header
-
-#include "mslogger.h"
-#include "atgprscontextdeactivate.h"
-
-_LIT8(KATContextDeactivate,   "AT+CGACT=0,%d\r");
-const TInt KDefaultDeactivateTimeout = 30;
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDeactivate::NewL
-//
-// ---------------------------------------------------------------------------
-CATGprsContextDeactivate* CATGprsContextDeactivate::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGprsContextDeactivate* self = new(ELeave) CATGprsContextDeactivate(aGloblePhone,
-			                                                              aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDeactivate::CATGprsContextDeactivate
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsContextDeactivate::CATGprsContextDeactivate(CGlobalPhonemanager& aGloblePhone, 
-                                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	iReadTimeOut = KDefaultDeactivateTimeout;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDeactivate::ConstructL()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextDeactivate::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iAtType = ELtsyAT_Packet_DeactivateContext;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDeactivate::~CATGprsContextDeactivate()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsContextDeactivate::~CATGprsContextDeactivate()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDeactivate::StartRequest()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextDeactivate::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDeactivate::ExecuteCommand()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextDeactivate::ExecuteCommand()
-	{
-	LOGTEXT2(_L8("iCid=%d"),iContextId);
-	// Send the AT+CGACT=0,x command to the phone
-	iTxBuffer.Format(KATContextDeactivate,iContextId);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDeactivate::SetContext
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextDeactivate::SetContext(const TInt aContextId)
-	{
-	iContextId = aContextId;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDeactivate::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextDeactivate::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDeactivate::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextDeactivate::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if((KErrNone ==aStatus)&&(aEventSource == EWriteCompletion))
-		{
-		return;
-		}
-	TInt count = iPhoneGlobals.iContextList.Count();
-	TInt i;
-	//Get the context from context list
-	for(i = 0; i < count;i++)
-		{
-		if(iPhoneGlobals.iContextList[i]->iContextID == iContextId)
-			{
-			break;
-			}
-		}
-	if((KErrNone ==aStatus)&&(aEventSource == EReadCompletion)&&(iError==KErrNone))
-		{
-		iPhoneGlobals.iContextList[i]->iInfo.iStatus = RPacketContext::EStatusInactive;
-		TContextMisc contextMisc;
-		contextMisc.iStatus = RPacketContext::EStatusInactive;
-		iPhoneGlobals.iPhoneStatus.iMode = RPhone::EModeOnlineCommand;
-		iCtsyDispatcherCallback.CallbackPacketServicesNotifyPdpContextStatusChangeInd(iError,
-				                iPhoneGlobals.iContextList[i]->iInfo.iName,
-				                contextMisc);
-		}
-	iCtsyDispatcherCallback.CallbackPacketServicesDeactivatePdpContextComp(iError,
-					        iPhoneGlobals.iContextList[i]->iInfo.iName);
-	CAtCommandBase::Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	}
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/src/atgprscontextdelete.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-// 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:
-// CATGprsContextDelete
-
-#include "atgprscontextdelete.h" // header file for this source file
-#include "mslogger.h"		 // for LOGTEXT macros
-
-_LIT8(KATContextDelete,  "AT+CGDCONT=%d\r");
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDelete::NewL
-// AT state machine which will send AT+CGDCONT=x to delete a context from the phone.
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsContextDelete* CATGprsContextDelete::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                                 CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGprsContextDelete* self = new(ELeave) CATGprsContextDelete(aGloblePhone,
-			                                                      aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDelete::CATGprsContextDelete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsContextDelete::CATGprsContextDelete(CGlobalPhonemanager& aGloblePhone, 
-                                           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDelete::ConstructL()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextDelete::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDelete::~CATGprsContextDelete()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsContextDelete::~CATGprsContextDelete()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDelete::StartRequest()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextDelete::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDelete::ExecuteCommand()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextDelete::ExecuteCommand()
-	{
-	LOGTEXT2(_L8("iCid=%d"),iContextId);
-	// Send the AT+CGDCONT=x command to the phone
-	iTxBuffer.Format(KATContextDelete,iContextId);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDelete::SetContext
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextDelete::SetContext(const TInt aContextId)
-	{
-	iContextId = aContextId;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDelete::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextDelete::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsContextDelete::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsContextDelete::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if((KErrNone ==aStatus)&&(aEventSource == EWriteCompletion))
-		{
-		return;
-		}
-	TName Name;
-	if((KErrNone ==aStatus)&&(aEventSource == EReadCompletion)&&(iError==KErrNone))
-		{
-		TInt count = iPhoneGlobals.iContextList.Count();
-		TInt i;
-		//Get the context from context list
-		for(i = 0; i < count;i++)
-			{
-			if(iPhoneGlobals.iContextList[i]->iContextID == iContextId)
-				{
-				Name = iPhoneGlobals.iContextList[i]->iInfo.iName;
-				delete iPhoneGlobals.iContextList[i];
-				iPhoneGlobals.iContextList[i] = NULL;
-				iPhoneGlobals.iContextList.Remove(i);
-				break;
-				}
-			}
-		count = iPhoneGlobals.iContextList.Count();
-		}
-	iCtsyDispatcherCallback.CallbackPacketServicesDeletePdpContextComp(aStatus,Name);
-	CAtCommandBase::Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	}
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/src/atgprsdetach.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-// 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:
-// The execution command is used to attach the MT to, or detach the MT from, the GPRS
-// service. After the command has completed, the MT remains in V.25ter command state.
-// If the MT is already in the requested state, the command is ignored and the OK
-// response is returned. If the requested state cannot be achieved, an ERROR or +CME
-// ERROR response is returned. Extended error responses are enabled by the +CMEE
-// command.
-// Any active PDP contexts will be automatically deactivated when the attachment state
-// changes to detached.
-// The read command returns the current GPRS service state.
-// The test command is used for requesting information on the supported GPRS service
-// states.
-// +CGATT= [<state>]
-// <state>: indicates the state of GPRS attachment
-// 0 ?detached
-// 1 ?attached
-// Other values are reserved and will result in an ERROR response to the
-// execution command.
-
-#include "mslogger.h"
-#include "atgprsdetach.h"
-
-_LIT8(KDetachCommand, "AT+CGATT=0\r");
-
-// ---------------------------------------------------------------------------
-// CATGprsDetach::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsDetach* CATGprsDetach::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGprsDetach* self = new(ELeave) CATGprsDetach(aGloblePhone,
-			                                        aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsDetach::CATGprsDetach
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsDetach::CATGprsDetach(CGlobalPhonemanager& aGloblePhone, 
-                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsDetach::ConstructL()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsDetach::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsDetach::~CATGprsDetach()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsDetach::~CATGprsDetach()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsDetach::StartRequest()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsDetach::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsDetach::ExecuteCommand()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsDetach::ExecuteCommand()
-	{
-	iTxBuffer.Copy(KDetachCommand);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsDetach::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsDetach::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsDetach::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsDetach::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone ==aStatus)
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			aStatus = iError;
-			}
-		else
-			return;
-		}
-	iCtsyDispatcherCallback.CallbackPacketServicesPacketDetachComp(aStatus);
-	CAtCommandBase::Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	}
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/src/atgprsgetcontextaddr.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,163 +0,0 @@
-// 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:
-// The execution command returns a list of PDP addresses for the specified context
-// identifiers.
-// The test command returns a list of defined <cid>s
-// Defined values
-// <cid>: a numeric parameter which specifies a particular PDP context definition. 
-// If no <cid> is specified, the addresses for all defined contexts are returned.
-// <PDP_address>: a string that identifies the MT in the address space applicable 
-// to the PDP. The address may be static or dynamic. For a static address, it will 
-// be the one set by the +CGDCONT command when the context was defined. For a 
-// dynamic address it will be the one assigned during the last PDP context 
-// activation that used the context definition referred to by <cid>. 
-// <PDP_address> is omitted if none is available.
-
-#include "mslogger.h"
-#include "atgprsgetcontextaddr.h"
-
-_LIT8(KATGetContextAddress,    "AT+CGPADDR=%d\r");
-_LIT8(KATGetContextAddressStr, "+CGPADDR:");
-
-// ---------------------------------------------------------------------------
-// CATGPRSGetContextAddr::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGPRSGetContextAddr* CATGPRSGetContextAddr::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGPRSGetContextAddr* self = new(ELeave) CATGPRSGetContextAddr(aGloblePhone,aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSGetContextAddr::CATGPRSGetContextAddr
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGPRSGetContextAddr::CATGPRSGetContextAddr(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSGetContextAddr::ConstructL()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGPRSGetContextAddr::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	iAtType = ELtsyAT_Packet_GetContextAddr;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSGetContextAddr::~CATGPRSGetContextAddr()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGPRSGetContextAddr::~CATGPRSGetContextAddr()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSGetContextAddr::StartRequest()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGPRSGetContextAddr::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSGetContextAddr::ExecuteCommand()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGPRSGetContextAddr::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CATGPRSGetContextAddr::Start called"));
-	LOGTEXT2(_L8("iCid=%d"),iContextId);
-	iTxBuffer.Format(KATGetContextAddress,iContextId);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSGetContextAddr::SetContext
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGPRSGetContextAddr::SetContext(const TInt aContextId)
-	{
-	iContextId = aContextId;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSGetContextAddr::GetErrorValue
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CATGPRSGetContextAddr::GetErrorValue()
-	{
-	return iError;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGPRSGetContextAddr::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGPRSGetContextAddr::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) != 0)
-		{
-		iError = KErrGeneral;
-		return;
-		}
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,PrecedingLine());
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrGeneral;
-		return ;
-		}
-	if( array[0].MatchF(KATGetContextAddressStr)==KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrGeneral;
-		return ;
-		}
-	TInt count = iPhoneGlobals.iContextList.Count();
-	TInt i = 0;
-	//Get the context from context list
-	for(i = 0; i < count;i++)
-		{
-		if(iPhoneGlobals.iContextList[i]->iContextID == iContextId)
-			{
-			break;
-			}
-		}
-	if(Count > 2 )
-		{
-		iPhoneGlobals.iContextList[i]->iDefContextConfigGPRS.iPdpAddress.Copy(array[2]);
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	CleanupStack::PopAndDestroy(&array);
-	}
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/src/atgprsntwkregstatus.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-// 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:
-// The set command controls the presentation of an unsolicited result code +CGREG:
-// <stat> when <n>=1 and there is a change in the MT's GPRS network registration
-// status, or code +CGREG: <stat>[,<lac>,<ci>] when <n>=2 and there is a change of the
-// network cell.
-// The read command returns the status of result code presentation and an integer <stat>
-// which shows whether the network has currently indicated the registration of the MT.
-// Location information elements <lac> and <ci> are returned only when <n>=2 and MT
-// is registered in the network.
-// Defined values
-// <n>:
-//  0 disable network registration unsolicited result code
-//  1 enable network registration unsolicited result code +CGREG: <stat>
-//  2 enable network registration and location information unsolicited result code
-// +CGREG: <stat>[,<lac>,<ci>]
-// <stat>:
-//  0 not registered, ME is not currently searching a new operator to register to
-//  1 registered, home network
-//  2 not registered, but ME is currently searching a new operator to register to
-//  3 registration denied
-//  4 unknown
-//  5 registered, roaming
-// <lac>:
-//  string type; two byte location area code in hexadecimal format.
-// <ci>:
-//  string type; two byte cell ID in hexadecimal format
-
-#include "atgprsntwkregstatus.h"		// Header file for this source file
-#include "mslogger.h"				// For LOGTEXT macros
-#include "atgprsntwkregstatuschange.h"	
-
-_LIT8(KATGprsNtwkRegStatusCommand, "AT+CGREG?\r");
-_LIT8(KATGetGprsNetworkRegResponse,"+CGREG:");
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatus::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsNtwkRegStatus* CATGprsNtwkRegStatus::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                                 CCtsyDispatcherCallback& aCtsyDispatcherCallback,
-                                                 CATGprsNtwkRegStatusChange& aNtwkRegStatusChange)
-	{
-	CATGprsNtwkRegStatus* self = new(ELeave) CATGprsNtwkRegStatus(aGloblePhone,
-			                                                      aCtsyDispatcherCallback,
-			                                                      aNtwkRegStatusChange);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatus::CATGprsNtwkRegStatus
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsNtwkRegStatus::CATGprsNtwkRegStatus(CGlobalPhonemanager& aGloblePhone, 
-                                           CCtsyDispatcherCallback& aCtsyDispatcherCallback,
-                                           CATGprsNtwkRegStatusChange& aNtwkRegStatusChange)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback),
-		iNtwkRegStatusChange(aNtwkRegStatusChange)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatus::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsNtwkRegStatus::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatus::~CATGprsNtwkRegStatus
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsNtwkRegStatus::~CATGprsNtwkRegStatus()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatus::StartRequestL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsNtwkRegStatus::StartRequest()
-	{
-	iNtwkRegStatusChange.Disable();
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatus::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsNtwkRegStatus::ExecuteCommand()
-	{
-	iTxBuffer.Copy(KATGprsNtwkRegStatusCommand);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatus::ParseResponseL
-// other items were commented in a header
-//
-// ---------------------------------------------------------------------------
-void CATGprsNtwkRegStatus::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) != 0)
-		{
-		iError = KErrGeneral;
-		return;
-		}
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,PrecedingLine());
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrGeneral;
-		return ;
-		}
-	if( array[0].MatchF(KATGetGprsNetworkRegResponse)==KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrGeneral;
-		return ;
-		}
-	
-	// Skip over one parameter
-	TInt val = 0;
-	TLex8 lex(array[2]);
-	lex.Val(val);
-	// Convert scond value to equivalent EtelMM enum
-	switch(val)
-		{
-	case 0:		// ETSI value as defined in ETSI 07.07 section 10.1.14
-		iGprsRegistrationStatus = RPacketService::ENotRegisteredNotSearching;
-		break;
-	case 1:		// ETSI value as defined in ETSI 07.07 section 10.1.14
-		iGprsRegistrationStatus=RPacketService::ERegisteredOnHomeNetwork;
-		break;
-	case 2:		// ETSI value as defined in ETSI 07.07 section 10.1.14
-		iGprsRegistrationStatus=RPacketService::ENotRegisteredSearching;
-		break;
-	case 3:		// ETSI value as defined in ETSI 07.07 section 10.1.14
-		iGprsRegistrationStatus=RPacketService::ERegistrationDenied;
-		break;
-	case 4:		// ETSI value as defined in ETSI 07.07 section 10.1.14
-		iGprsRegistrationStatus=RPacketService::EUnknown;
-		break;
-	case 5:		// ETSI value as defined in ETSI 07.07 section 10.1.14
-		iGprsRegistrationStatus=RPacketService::ERegisteredRoaming;
-		break;
-	default:
-		iGprsRegistrationStatus = RPacketService::EUnknown;
-		break;
-		}
-	CleanupStack::PopAndDestroy(&array);
-	iError = KErrNone;
-	} //ParseResponseL
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatus::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsNtwkRegStatus::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone ==aStatus)
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			aStatus = iError;
-			}
-		else
-			return;
-		}
-	iCtsyDispatcherCallback.CallbackPacketServicesGetPacketNetworkRegistrationStatusComp(aStatus,
-					        iGprsRegistrationStatus);
-	iNtwkRegStatusChange.Enable();
-	CAtCommandBase::Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	}
-
-// End of file
-

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/src/atgprsntwkregstatuschange.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,175 +0,0 @@
-// 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:
-// +CGREG: <stat>[,<lac>,<ci>]
-// <stat>:
-//  0 not registered, ME is not currently searching a new operator to register to
-//  1 registered, home network
-//  2 not registered, but ME is currently searching a new operator to register to
-//  3 registration denied
-//  4 unknown
-//  5 registered, roaming
-// <lac>:
-//  string type; two byte location area code in hexadecimal format.
-// <ci>:
-//  string type; two byte cell ID in hexadecimal format
-
-#include <et_phone.h>		// For CTelObject
-#include "atgprsntwkregstatuschange.h"		// Header file for this source file
-#include "mslogger.h"					// For LOGTEXT macros
-
-_LIT8(KATGetGprsNtwkRegResponse,"+CGREG:*");
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatusChange::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsNtwkRegStatusChange* CATGprsNtwkRegStatusChange::NewL(CGlobalPhonemanager& aGloblePhone,
-		                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGprsNtwkRegStatusChange* self = CATGprsNtwkRegStatusChange::NewLC(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatusChange::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsNtwkRegStatusChange* CATGprsNtwkRegStatusChange::NewLC(CGlobalPhonemanager& aGloblePhone,
-		                              CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGprsNtwkRegStatusChange* self = new (ELeave) CATGprsNtwkRegStatusChange(aGloblePhone, aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatusChange::~CATGprsNtwkRegStatusChange
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsNtwkRegStatusChange::~CATGprsNtwkRegStatusChange()
-	{
-	
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatusChange::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsNtwkRegStatusChange::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	RemoveAllExpectString();
-	AddExpectStringL(KATGetGprsNtwkRegResponse);
-	Enable();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatusChange::CATGprsNtwkRegStatusChange
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsNtwkRegStatusChange::CATGprsNtwkRegStatusChange(CGlobalPhonemanager& aGloblePhone,
-		                       CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-							   :CAtCommandBase(aGloblePhone, aCtsyDispatcherCallback)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatusChange::CATGprsNtwkRegStatusChange
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsNtwkRegStatusChange::Enable()
-	{
-	AddUnsolicitedAtCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatusChange::CATGprsNtwkRegStatusChange
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsNtwkRegStatusChange::Disable()
-	{
-	RemoveAtCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatusChange::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsNtwkRegStatusChange::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,CurrentLine());
-	ClearCurrentLine();
-	TInt Count = array.Count();
-	if (Count < 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return ;
-		}
-	if( array[0].MatchF(KATGetGprsNtwkRegResponse)==KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return ;
-		}
-	// Skip over one parameter
-	
-	TInt val = 0;
-	TLex8 lex(array[1]);
-	lex.Val(val);
-	// Convert scond value to equivalent EtelMM enum
-	switch(val)
-		{
-		case 0:		// ETSI value as defined in ETSI 07.07 section 10.1.14
-			iRegistrationStatus = RPacketService::ENotRegisteredNotSearching;
-			break;
-		case 1:		// ETSI value as defined in ETSI 07.07 section 10.1.14
-			iRegistrationStatus=RPacketService::ERegisteredOnHomeNetwork;
-			break;
-		case 2:		// ETSI value as defined in ETSI 07.07 section 10.1.14
-			iRegistrationStatus=RPacketService::ENotRegisteredSearching;
-			break;
-		case 3:		// ETSI value as defined in ETSI 07.07 section 10.1.14
-			iRegistrationStatus=RPacketService::ERegistrationDenied;
-			break;
-		case 4:		// ETSI value as defined in ETSI 07.07 section 10.1.14
-			iRegistrationStatus=RPacketService::EUnknown;
-			break;
-		case 5:		// ETSI value as defined in ETSI 07.07 section 10.1.14
-			iRegistrationStatus=RPacketService::ERegisteredRoaming;
-			break;
-		default:
-			iRegistrationStatus = RPacketService::EUnknown;
-			break;
-		}
-	CleanupStack::PopAndDestroy(&array);
-	iError = KErrNone;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsNtwkRegStatusChange::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsNtwkRegStatusChange::EventSignal(TAtEventSource /*aEventSource*/, TInt /*aStatus*/)
-	{
-	iCtsyDispatcherCallback.CallbackPacketServicesNotifyPacketNetworkRegistrationStatusInd(iError,
-				            iRegistrationStatus);
-	}
-
-//End file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/src/atgprssetqosprofile.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,390 +0,0 @@
-// 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:
-// This file implements the CATGprsSetProfile class and the CATGprsGetProfile.
-// This command allows the TE to specify a Quality of Service Profile that is 
-// used when the MT sends an Activate PDP Context Request message to the network.
-// The set command specifies a profile for the context identified by the local context
-// identification parameter, <cid>. Since this is the same parameter that is used in the
-// +CGDCONT command, the +CGQREQ command is effectively an extension to the
-// +CGDCONT command. The QoS profile consists of a number of parameters, each of
-// which may be set to a separate value.
-// A special form of the set command, +CGQREQ= <cid> causes the requested profile for
-// context number <cid> to become undefined.
-// The read command returns the current settings for each defined context.
-// The test command returns values supported as a compound value. If the MT supports
-// several PDP types, the parameter value ranges for each PDP type are returned on a
-// separate line.
-// Defined values
-// <cid>: a numeric parameter which specifies a particular PDP context definition.
-// <precedence>: a numeric parameter which specifies the precedence class
-// <delay>: a numeric parameter which specifies the delay class
-// <reliability>: a numeric parameter which specifies the reliability class
-// <peak>: a numeric parameter which specifies the peak throughput class
-// <mean>: a numeric parameter which specifies the mean throughput class
-// If a value is omitted for a particular class then the value is considered to be 
-// unspecified.
-// AT+CGQREQ=[<cid> [,<precedence >[,<delay> [,<reliability.> [,<peak>[,<mean>]]]]]]
-// other items were commented in a header
-
-#include <pcktcs.h>
-#include "atgprsqosprofile.h"
-#include <etelpckt.h>
-#include "mslogger.h"
-
-_LIT8(KCGQreq, "AT+CGQREQ=%d,%d,%d,%d,%d,%d\r");
-
-// CATGprsSetProfileReq::NewL()
-CATGprsSetProfileReq* CATGprsSetProfileReq::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CATGprsSetProfileReq* self = new(ELeave) CATGprsSetProfileReq(aGloblePhone,aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop(self );
-	return self ;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsSetProfileReq::CATGprsSetProfileReq()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsSetProfileReq::CATGprsSetProfileReq(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsSetProfileReq::ConstructL()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsSetProfileReq::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsSetProfileReq::~CATGprsSetProfileReq()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CATGprsSetProfileReq::~CATGprsSetProfileReq()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsSetProfileReq::StartRequest()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsSetProfileReq::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsSetProfileReq::ExecuteCommand()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsSetProfileReq::ExecuteCommand()
-	{
-	MakeupCGQREQ();
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsSetProfileReq::SetContext()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsSetProfileReq::SetContext(const TInt aContextId)
-	{
-	iContextId = aContextId;
-	TInt count = iPhoneGlobals.iContextList.Count();
-	TInt i;
-	//Get the context from context list
-	for(i = 0; i < count;i++)
-		{
-		if(iPhoneGlobals.iContextList[i]->iContextID == iContextId)
-			{
-			break;
-			}
-		}
-	iQoSConfig = iPhoneGlobals.iContextList[i]->iQoSConfig;
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsSetProfileReq::ParseResponseL()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsSetProfileReq::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CATGprsSetProfileReq::EventSignal()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CATGprsSetProfileReq::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	if(KErrNone ==aStatus)
-		{
-		if(aEventSource == EReadCompletion)
-			{
-			aStatus = iError;
-			}
-		else
-			return;
-		}
-	TInt count = iPhoneGlobals.iContextList.Count();
-	TInt i;
-	//Get the context from context list
-	for(i = 0; i < count;i++)
-		{
-		if(iPhoneGlobals.iContextList[i]->iContextID == iContextId)
-			{
-			break;
-			}
-		}
-
-	CAtCommandBase::Complete();
-	if(KErrNone ==aStatus)
-		{
-		RPacketQoS::TQoSGPRSNegotiated QoSGPRSNegotiated;
-		QoSGPRSNegotiated.iDelay = iPhoneGlobals.iContextList[i]->iQoSConfig.iReqDelay;
-		QoSGPRSNegotiated.iMeanThroughput = iPhoneGlobals.iContextList[i]->iQoSConfig.iReqMeanThroughput;
-		QoSGPRSNegotiated.iPeakThroughput = iPhoneGlobals.iContextList[i]->iQoSConfig.iReqPeakThroughput;
-		QoSGPRSNegotiated.iPrecedence = iPhoneGlobals.iContextList[i]->iQoSConfig.iReqPrecedence;
-		QoSGPRSNegotiated.iReliability = iPhoneGlobals.iContextList[i]->iQoSConfig.iReqReliability;
-		iCtsyDispatcherCallback.CallbackPacketServicesNotifyQosProfileChangedGPRSInd(aStatus,
-				                iPhoneGlobals.iContextList[i]->iInfo.iName,
-				                QoSGPRSNegotiated);
-		}
-	iCtsyDispatcherCallback.CallbackPacketServicesSetPdpContextQosComp(aStatus,
-						    iPhoneGlobals.iContextList[i]->iInfo.iName);
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	}
-
-/**
- * This Function creates the at set string for the AT+CGQREQ command.
- */
-void CATGprsSetProfileReq::MakeupCGQREQ()
-	{
-	TInt precedence, delay, reliability, peakthru, meanthru = 0;
-
-	switch (iQoSConfig.iReqPrecedence)
-		{
-		case RPacketQoS::EPriorityHighPrecedence:
-			precedence = 1; // high precedence
-		break;
-
-		case RPacketQoS::EPriorityMediumPrecedence:
-			precedence = 2; // normal precedence
-		break;
-		
-		case RPacketQoS::EPriorityLowPrecedence:
-			precedence = 3; // low precedence
-		break;
-		
-		default:
-			precedence = 0; // unspecified or unknown precedence
-		break;
-		};
-
-	switch (iQoSConfig.iReqDelay)
-		{
-		case RPacketQoS::EDelayClass1:
-			delay = 1;
-		break;
-
-		case RPacketQoS::EDelayClass2:
-			delay = 2;
-		break;
-
-		case RPacketQoS::EDelayClass3:
-			delay = 3;
-		break;
-
-		case RPacketQoS::EDelayClass4:
-			delay = 4;
-		break;
-
-		default:
-			delay = 0;
-		break;
-		};
-
-	switch (iQoSConfig.iReqReliability)
-		{
-		case RPacketQoS::EReliabilityClass1:
-			reliability = 1;
-		break;
-
-		case RPacketQoS::EReliabilityClass2:
-			reliability = 2;
-		break;
-
-		case RPacketQoS::EReliabilityClass3:
-			reliability = 3;
-		break;
-
-		case RPacketQoS::EReliabilityClass4:
-			reliability = 4;
-		break;
-
-		case RPacketQoS::EReliabilityClass5:
-			reliability = 5;
-		break;
-
-		default:
-			reliability = 0; // unspecified or unknown reliability
-		break;
-		};
-
-	switch (iQoSConfig.iReqPeakThroughput)
-		{
-		case RPacketQoS::EPeakThroughput1000:
-			peakthru = 1;
-		break;
-
-		case RPacketQoS::EPeakThroughput2000:
-			peakthru = 2;
-		break;
-
-		case RPacketQoS::EPeakThroughput4000:
-			peakthru = 3;
-		break;
-
-		case RPacketQoS::EPeakThroughput8000:
-			peakthru = 4;
-		break;
-
-		case RPacketQoS::EPeakThroughput16000:
-			peakthru = 5;
-		break;
-
-		case RPacketQoS::EPeakThroughput32000:
-			peakthru = 6;
-		break;
-
-		case RPacketQoS::EPeakThroughput64000:
-			peakthru = 7;
-		break;
-
-		case RPacketQoS::EPeakThroughput128000:
-			peakthru = 8;
-		break;
-
-		case RPacketQoS::EPeakThroughput256000:
-			peakthru = 9;
-		break;
-		
-		default:
-			peakthru = 0; // unspecified or unknown peak throughput
-		break;
-		};
-
-	switch (iQoSConfig.iReqMeanThroughput)
-		{
-		case RPacketQoS::EMeanThroughput100:
-			meanthru = 2;
-		break;
-
-		case RPacketQoS::EMeanThroughput200:
-			meanthru = 3;
-		break;
-
-		case RPacketQoS::EMeanThroughput500:
-			meanthru = 4;
-		break;
-
-		case RPacketQoS::EMeanThroughput1000:
-			meanthru = 5;
-		break;
-
-		case RPacketQoS::EMeanThroughput2000:
-			meanthru = 6;
-		break;
-
-		case RPacketQoS::EMeanThroughput5000:
-			meanthru = 7;
-		break;
-
-		case RPacketQoS::EMeanThroughput10000:
-			meanthru = 8;
-		break;
-
-		case RPacketQoS::EMeanThroughput20000:
-			meanthru = 9;
-		break;
-		
-		case RPacketQoS::EMeanThroughput50000:
-			meanthru = 10;
-		break;
-
-		case RPacketQoS::EMeanThroughput100000:
-			meanthru = 11;
-		break;
-
-		case RPacketQoS::EMeanThroughput200000:
-			meanthru = 12;
-		break;
-		case RPacketQoS::EMeanThroughput500000:
-			meanthru = 13;
-		break;
-
-		case RPacketQoS::EMeanThroughput1000000:
-			meanthru = 14;
-		break;
-
-		case RPacketQoS::EMeanThroughput2000000:
-			meanthru = 15;
-		break;
-
-		case RPacketQoS::EMeanThroughput5000000:
-			meanthru = 16;
-		break;
-
-		case RPacketQoS::EMeanThroughput10000000:
-			meanthru = 17;
-		break;
-
-		case RPacketQoS::EMeanThroughput20000000:
-			meanthru = 18;
-		break;
-
-		case RPacketQoS::EUnspecifiedMeanThroughput:
-		case RPacketQoS::EMeanThroughput50000000:
-			meanthru = 31;
-		break;
-
-		default:
-			meanthru = 0; // unspecified or unknown mean throughput
-		break;
-		};
-
-	iTxBuffer.Format(KCGQreq,iContextId,			
-			precedence,
-			delay,
-			reliability,
-			peakthru,
-			meanthru);
-	}
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/pktservice/src/initialisepdpcontext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-// 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:
-//
-// CInitialisePdpContext:
-// 
-
-#include "initialisepdpcontext.h"
-#include "mslogger.h"
-#include "tsyconfg.h"
-#include "globalphonemanager.h"
-
-const TInt KLtsyOnePause = 100000;
-
-// ---------------------------------------------------------------------------
-// CInitialisePdpContext::NewL()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CInitialisePdpContext* CInitialisePdpContext::NewL(CGlobalPhonemanager& aGloblePhone, 
-	                                               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CInitialisePdpContext* self = new(ELeave) CInitialisePdpContext(aGloblePhone,aCtsyDispatcherCallback);
-	CleanupStack::PushL(self );
-	self->ConstructL();
-	CleanupStack::Pop();
-	return self ;
-	}
-
-// ---------------------------------------------------------------------------
-// CInitialisePdpContext::CInitialisePdpContext()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CInitialisePdpContext::CInitialisePdpContext(CGlobalPhonemanager& aGloblePhone, 
-	                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-		:iPhoneGlobals(aGloblePhone),
-		 iCtsyDispatcherCallback(aCtsyDispatcherCallback)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CInitialisePdpContext::ConstructL()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitialisePdpContext::ConstructL()
-	{
-	iCallbackTimer = CCallbackTimer::NewL(*this);
-	}
-
-// ---------------------------------------------------------------------------
-// CInitialisePdpContext::~CInitialisePdpContext()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CInitialisePdpContext::~CInitialisePdpContext()
-	{
-	if(iCallbackTimer)
-		{
-		iCallbackTimer->Cancel();
-		delete iCallbackTimer;
-		iCallbackTimer = NULL;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CInitialisePdpContext::StartRequest()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitialisePdpContext::StartRequest()
-	{
-	iCallbackTimer->After(KLtsyOnePause);
-	}
-
-// ---------------------------------------------------------------------------
-// CInitialisePdpContext::SetContext()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitialisePdpContext::SetContext(const TInt aContextId)
-	{
-	iContextId = aContextId;
-	}
-
-// ---------------------------------------------------------------------------
-// CInitialisePdpContext::LoanCommPort()
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CInitialisePdpContext::LoanCommPort()
-	{
-	TInt count = iPhoneGlobals.iContextList.Count();
-	TInt i = 0;
-	
-	//Get the context from context list
-	for(i = 0; i < count;i++)
-		{
-		if(iPhoneGlobals.iContextList[i]->iContextID == iContextId)
-			{
-			break;
-			}
-		}
-	
-	TFileName csy;
-	TName port;
-	if(iPhoneGlobals.iPhoneStatus.iDataPortLoaned)
-		{
-		iCtsyDispatcherCallback.CallbackPacketServicesInitialisePdpContextComp(KErrEtelPortAlreadyLoaned,
-				                iPhoneGlobals.iContextList[i]->iInfo.iName,
-								port);
-		return ;
-		}
-	TInt ret = 0;
-	TRAP(ret,iPhoneGlobals.iConfiguration->ConfigModemStringL(TPtrC(KCDTypeNameCsyName),csy));
-	if (ret!=KErrNone)
-		{
-		iCtsyDispatcherCallback.CallbackPacketServicesInitialisePdpContextComp(ret,
-				                iPhoneGlobals.iContextList[i]->iInfo.iName,
-				                port);
-		return ;
-		}
-	TBuf8<KMaxName> tmp;
-	tmp.Copy(csy);
-    LOGTEXTREL2(_L8("csy:\t%S"),&tmp);
-	
-	TRAP(ret,iPhoneGlobals.iConfiguration->ConfigModemStringL(TPtrC(KCDTypeNamePortName),port));
-	if (ret!=KErrNone)
-		{
-		iCtsyDispatcherCallback.CallbackPacketServicesInitialisePdpContextComp(ret,
-				                iPhoneGlobals.iContextList[i]->iInfo.iName,
-				                port);
-		return;
-		}
-    tmp.Copy(port);
-    LOGTEXTREL2(_L8("port:\t%S"),&tmp);
-
-	iCtsyDispatcherCallback.CallbackPacketServicesInitialisePdpContextComp(KErrNone,
-			                iPhoneGlobals.iContextList[i]->iInfo.iName,
-			                port);
-
-	TContextMisc contextMisc;
-	contextMisc.iStatus = RPacketContext::EStatusInactive;
-	iPhoneGlobals.iContextList[i]->iInfo.iStatus = RPacketContext::EStatusInactive;
-	iCtsyDispatcherCallback.CallbackPacketServicesNotifyPdpContextStatusChangeInd(ret,
-			                iPhoneGlobals.iContextList[i]->iInfo.iName,
-							contextMisc);
-	iCtsyDispatcherCallback.CallbackPacketServicesNotifyPdpContextAddedInd(ret, 
-			                iPhoneGlobals.iContextList[i]->iInfo.iName);
-	}
-
-void CInitialisePdpContext::TimerRun(TInt aError)
-    {
-	if(aError == KErrNone)
-	    {
-	    LoanCommPort();
-		}
-	}
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/inc/atmessagestoreinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-// 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:
-// @file atmessagestoreinfo.h
-// This contains CAtMessageStoreInfo which is used to get message store information
-// 
-
-#ifndef ATMESSAGESTOREINFO_H
-#define ATMESSAGESTOREINFO_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include 
-#include "atcommandbase.h"
-
-/**
- * CAtGetMessageStoreInfo
- *
- */
-
-class CAtMessageStoreInfo : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtMessageStoreInfo();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtMessageStoreInfo* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC 
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtMessageStoreInfo* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                      CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-		
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-private:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtMessageStoreInfo(CGlobalPhonemanager& aGloblePhone, 
-                        CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-	
-	/**
-	* indicate how many items message stored
-	*/
-	TInt iUsed;
-	
-	/**
-	* total items for storeing message
-	*/
-	TInt iTotal;
-	
-	/**
-	* The return error value of AT command executed 
-	*/
-    TInt iError;	
-    
-	}; // class CAtMessageStoreInfo
-
-#endif // ATMESSAGESTOREINFO_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/inc/atsmsack.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-// 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:
-// @file atsmsack.h
-// This contains CAtSmsAck and CAtSmsNack which is used to send 
-// positive(negative) acknowledgment
-// 
-
-#ifndef ATSMSACK_H
-#define ATSMSACK_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include 
-#include "atcommandbase.h"
-
-// CLASS DECLARATION
-class CAtSmsAck : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtSmsAck();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsAck* NewL(CGlobalPhonemanager& aGloblePhone, 
-                           CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsAck* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                            CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-protected:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtSmsAck(CGlobalPhonemanager& aGloblePhone, 
-              CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-private:
-	/**
-	* The return error value of AT command executed 
-	*/
-	TInt iError;	
-	}; // class CAtSmsAck
-
-class CAtSmsNack : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtSmsNack();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsNack* NewL(CGlobalPhonemanager& aGloblePhone, 
-                            CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsNack* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                             CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-	/**
-	* Set Nack TPDU data
-	* 
-	*/
-	void SetNackTpdu(TPtrC8 aRpError);
-protected:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtSmsNack(CGlobalPhonemanager& aGloblePhone, 
-               CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-private:
-    /**
-	 *  Nack required TPDU data
-	 */
-	TBuf8<256> iRpError;
-	
-	/**
-	* The return error value of AT command executed 
-	*/
-	TInt iError;	
-	}; // class CAtSmsNack
-#endif // ATSMSACK_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/inc/atsmsreceive.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-// 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:
-// @file atsmsreceive.h
-// This contains CAtSmsReceive which received incoming messages
-// 
-
-#ifndef ATSMSRECEIVE_H
-#define ATSMSRECEIVE_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-#include <cmmsmsutility.h>
-
-//user include 
-#include "atcommandbase.h"
-
-// CLASS DECLARATION
-
-/**
- * CAtSmsReceiveMessage
- *
- */
-class CAtSmsReceive: public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/	
-	~CAtSmsReceive();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsReceive* NewL(CGlobalPhonemanager& aGloblePhone, 
-                               CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC 
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	static CAtSmsReceive* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-protected:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	CAtSmsReceive(CGlobalPhonemanager& aGloblePhone, 
-                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/	
-	void ConstructL();
-private:
-	/**
-	* Parse 1st line of CMT response, of the format: "+CMT: [<alpha>], <pdu_len>"
-	* Stores the <pdu_len> in aPduLen
-	*/
-	void CMTResponseFirstLineL();
-	
-	/**
-	* Parse second line of CMT or DS response, of the format: "<pdu>"
-	* The <pdu> is saved to aPdu. If the <pdu> is found to have a prefixed SCA
-	* then that is removed before the save to aPdu.
-	*/
-	void CMTResponseSecondLineL();
-private:
-	/**
-	*   when receiving a message,its states should be changed
-	*/
-	enum 
-		{
-		EReceiveReady,
-		EWaitForCmtSecondLine,
-		EATNotInProgress
-		}iState;
-	
-	/**
-	*  Stores the length of PDU received
-	*/	
-	TInt iPduLen;		
-	
-	/**
-	*  binary format of PDU
-	*/	
-	RMobileSmsMessaging::TMobileSmsGsmTpdu  iPdu;
-	
-	/**
-	*  iAttr saved attritube of message revceived 
-	*/	
-	RMobileSmsMessaging::TMobileSmsReceiveAttributesV1 iAttr;
-	
-    /**
-	*  The structure used for callback
-	*/
-	TSmsMsg iMsgReceive;
-    
-	/**
-	* The return error value of AT command executed 
-	*/	
-	TInt iError; 
-	
-	}; // class CAtSmsReceive: 
-#endif // ATSMSRECEIVE_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/inc/atsmssend.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
-// 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:
-// @file atsmssend.h
-// This contains CAtSmsSend which is used to send sms message
-// 
-
-#ifndef ATSMSSEND_H
-#define ATSMSSEND_H
-
- //system include
-#include <e32std.h>
-#include <e32base.h>
-#include <callbacktimer.h>
-
-// user include
-#include "atcommandbase.h"
-
-// CLASS DECLARATION
-/**
- *  TSmsSendParam
- */
-class TSmsSendParam
-   	{
-public:
-	RMobilePhone::TMobileAddress iDestination;
-   	TBuf8<KGsmTpduSize> iSmsTpdu;
-    RMobileSmsMessaging::TMobileSmsDataFormat iDataFormat;
-    RMobilePhone::TMobileAddress  iGsmServiceCentre;
-    TBool iMoreMessages;
-   	};
-/**
- *  TSmsSendResponse 
- */
-class TSmsSendResponse
-	{
-public:
-    TInt iValRef;
-    TBuf8<KGsmTpduSize>	 iSubmitReport;
-	};
-/**
- * CAtSmsSend
- *
- */
-class CAtSmsSend : public CAtCommandBase,
-                   public MTimerObserver
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtSmsSend();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsSend* NewL(CGlobalPhonemanager& aGloblePhone, 
-                            CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC 
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsSend* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                             CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-	/**
-	* set send message parameter
-	* 
-	* @param  aMsgParam
-	*/
-	void SetMessageParam(TSmsSendParam aMsgParam);
-private:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtSmsSend(CGlobalPhonemanager& aGloblePhone, 
-               CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-	
-	/**
-	* confirm if there is a sca address 
-	*  
-	*  @return  KErrNone......
-	*/
-	TInt ConfirmSca();
-		
-    /**
-     * start a timer
-     */
-    void BeginTimer();	
-    
-	/**
-	* From MTimerObserver 
-	*/
-	virtual void TimerRun(TInt aError);
-	
-	/**
-	* Issue writing AT Command to baseband
-	* not using base class because the buffer length is KMaxAsciiPduLength
-	*/
-	void StartWritingPduLength();
-	
-	/**
-	* Issue writing AT Command to baseband
-	* not using base class because the buffer length is KMaxAsciiPduLength
-	*/
-	void StartWritingPdu();
-private:
-	/**
-	*  state machine for EventSignal 
-	*/
-	enum 
-		{
-		ESetPDULengthComplete,
-		ESendPDUComplete,
-		}iState;
-		
-	/**
-	*  A pointer for Timer
-	*/
-	CCallbackTimer* iCallbackTimer;	
-	
-	/**
-	* The buffer contains the "AT" String which should be sent to BaseBand Modem
-	*/
-	TBuf8<KMaxAsciiPduLength> iTxBuffer;	
-	
-	/**
-	* The structure contains sending message parameter
-	*/
-	TSmsSendParam iSmsSendParam;
-	
-	/**
-	* PDU in ascii format
-	*/
-	TBuf8<KMaxAsciiPduLength> iMsgDataAscii; 
-	
-	/**
-	* The response structure which read from modem
-	*/
-	TSmsSendResponse iSmsSendResponse;
-	
-	/**
-	* The return error value of AT command executed 
-	*/
-	TInt iError;	
-	
-	/**
-	* The error value before Execute write()
-	*/
-	TInt iCallbackVal;
-	}; // class CAtSmsSend
-#endif // ATSMSSEND_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/inc/atsmsstoredelete.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,199 +0,0 @@
-// 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:
-// @file atsmsstoredelete.h
-// This contains CAtSmsStoreDelete and CAtSmsStoreDeleteAll which is used to delete message(s)
-// 
-
-#ifndef ATSMSSTOREDELETE_H
-#define ATSMSSTOREDELETE_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include 
-#include "atcommandbase.h"
-
-// CLASS DECLARATION
-/**
- * CAtSmsStoreDelete
- *
- */
-class CAtSmsStoreDelete : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtSmsStoreDelete();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsStoreDelete* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC 
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsStoreDelete* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                    CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-	
-	/**
-	* Set the message index to be deleted
-	* 
-	*/
-	void SetDelIndex(TInt aIndex);
-private:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtSmsStoreDelete(CGlobalPhonemanager& aGloblePhone, 
-                     CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-private:
-	/**
-	*  message's index 
-	* 
-	*/	
-	TInt iIndex;
-	
-	/**
-	* The return error value of AT command executed 
-	*/
-	TInt iError;
-	
-	}; // class CAtSmsStoreDelete
-
-
-/**
- * CAtSmsStoreDeleteAll
- *
- */
-class CAtSmsStoreDeleteAll : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtSmsStoreDeleteAll();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsStoreDeleteAll* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                      CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC 
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsStoreDeleteAll* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                       CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-private:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtSmsStoreDeleteAll(CGlobalPhonemanager& aGloblePhone, 
-                         CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-private:
-	/**
-	* The return error value of AT command executed 
-	*/
-	TInt iError;	
-	
-	}; // class CAtSmsStoreDeleteAll	
-#endif // ATSMSDELETE_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/inc/atsmsstoreinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-// 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:
-// @file atsmsstoreinfo.h
-// This contains CAtSmsStoreInfo which is used to get sms store information
-// 
-
-#ifndef ATSMSSTOREINFO_H
-#define ATSMSSTOREINFO_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include 
-#include "atcommandbase.h"
-
-/**
- * CAtSmsStoreInfo
- *
- */
-class CAtSmsStoreInfo : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtSmsStoreInfo();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsStoreInfo* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                 CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC 
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsStoreInfo* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-private:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtSmsStoreInfo(CGlobalPhonemanager& aGloblePhone, 
-                    CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-	
-	/**
-	* indicate how many items message stored
-	*/
-	TInt iUsed;
-	
-	/**
-	* total items for storeing message
-	*/
-	TInt iTotal;
-	
-	/**
-	* The return error value of AT command executed 
-	*/
-    TInt iError;	
-	
-	}; // class CAtSmsStoreInfo
-
-#endif // ATSMSSTOREINFO_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/inc/atsmsstoreread.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-// 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:
-// @file atsmsstoreread.h
-// This contains CAtSmsStoreRead which is used to Read PDU Message
-// via aIndex 
-// 
-
-#ifndef ATSMSSTOREREAD_H
-#define ATSMSSTOREREAD_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include 
-#include "atcommandbase.h"
-
-// CLASS DECLARATION
-/**
- * CAtSmsStoreRead
- *
- */
-class CAtSmsStoreRead : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtSmsStoreRead();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsStoreRead* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                 CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsStoreRead* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-	
-	/**
-	* set message index should be read
-	* 
-	* @param aIndex
-	*/
-	void SetMsgIndex(TInt aIndex);
-private:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtSmsStoreRead(CGlobalPhonemanager& aGloblePhone, 
-                    CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-	
-	/**
-	*  Executer AT command for reading message via aIndex
-	*/
-	void ReadMessage();
-private:
-	/**
-	* readmessage callback struct
-	*/
-	DispatcherPhonebook::TSmsData iSmsData;  
-	
-	/**
-	*  The message index want to be read
-	*/
-	TInt iIndex;
-	
-	/**
-	* The return error value of AT command executed 
-	*/
-	TInt iError; 
-	
-	}; // class CAtSmsStoreRead
-
-#endif // ATSMSSTOREREAD_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/inc/atsmsstorereadall.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-// 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:
-// @file atsmsstorereadall.h
-// This contains CAtSmsStoreReadAll which is used to read all messages
-// 
-
-#ifndef ATSMSSTOREREADALL_H
-#define ATSMSSTOREREADALL_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-#include <ctsy/ltsy/mltsydispatchphonebookinterface.h>
-
-//user include
-#include "atcommandbase.h"
-
-// CLASS DECLARATION
-/**
- * CAtSmsStoreReadAll
- *
- */
-
-class CAtSmsStoreReadAll : public CAtCommandBase
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/	
-	~CAtSmsStoreReadAll();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsStoreReadAll* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsStoreReadAll* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                      CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-private:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	CAtSmsStoreReadAll(CGlobalPhonemanager& aGloblePhone, 
-                        CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/	
-	void ConstructL();
-	
-	/**
-	*  Executer AT command for reading message via aIndex
-	*/
-	void ReadMessage();
-private:
-	/*
-	*  The index message should be read
-	*/	
-    TInt iIndex;
-    
-    /**
-	* readmessage callback struct
-	*/
-	DispatcherPhonebook::TSmsData iSmsData;
-	
-	/**
-	* The return error value of AT command executed 
-	*/
-	TInt iError; 
-	
-	}; // class CAtSmsStoreReadAll
-
-#endif // ATSMSSTOREREADALL_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/inc/atsmsstorewrite.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,184 +0,0 @@
-// 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:
-// @file atsmsstorewrite.h
-// This contains CAtSmsStoreWrite which is used to write sms message
-// 
-
-#ifndef ATSMSSTOREWRITE_H
-#define ATSMSSTOREWRITE_H
-
-// system include 
-#include <e32std.h>
-#include <e32base.h>
-#include <ctsy/ltsy/mltsydispatchphonebookinterface.h>
-#include <callbacktimer.h>
-
-// user include
-#include "atcommandbase.h"
-
-// CLASS DECLARATION
-
-/**
- * CAtSmsStoreWrite
- *
- */
-
-class CAtSmsStoreWrite : public CAtCommandBase,
-                         public MTimerObserver
-	{
-public:
-	/**
-	* Destructor
-	*
-	*/
-	~CAtSmsStoreWrite();
-	
-	/**
-	*  static NewL  
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/	
-	static CAtSmsStoreWrite* NewL(CGlobalPhonemanager& aGloblePhone, 
-                                  CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	*  static NewLC 
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	static CAtSmsStoreWrite* NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	*  Start Execute AT Command
-	*/
-	virtual void ExecuteCommand();
-	
-	
-	/**
-	* Will be called by AT Manager whenever a event was triggered
-	* 
-	* @param aEventSource
-	* @param aStatus
-	*/
-	virtual void EventSignal(TAtEventSource aEventSource, TInt aStatus);
-	
-	/**
-	* Virtual function. Inherited from CAtCommandBase
-	* 
-	* @param aResponseBuf Line buf reading from baseband 
-	*/
-	virtual void ParseResponseL(const TDesC8& aResponseBuf);
-	
-	/**
-	* Start this request
-	* 
-	*/
-	void StartRequest();
-	
-	/**
-	*  set GsmSmsEntry which is passed by handler
-	*/
-	void SeGsmSmsEntry(RMobileSmsStore::TMobileGsmSmsEntryV1 aMobileGsmEntry);
-private:
-	/**
-	* Constructor
-	*
-	* @param aGloblePhone
-	* @param aCtsyDispatcherCallback
-	*/
-	CAtSmsStoreWrite(CGlobalPhonemanager& aGloblePhone, 
-                     CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	
-	/**
-	* 2nd Constructor
-	*/
-	void ConstructL();
-	
-    /**
-	* start a timer
-	*/
-    void BeginTimer();	
-    
-	/**
-	* From MTimerObserver 
-	*/
-	virtual void TimerRun(TInt aError);
-	
-	/**
-	* Issue writing AT Command to baseband
-	* not using base class because the buffer length is KMaxAsciiPduLength
-	*/
-	void StartWritingPduLength();
-	
-	/**
-	* Issue writing AT Command to baseband
-	* not using base class because the buffer length is KMaxAsciiPduLength
-	*/
-	void StartWritingPdu();
-	
-	/**
-	*  Executer AT command for writing a message
-	*/
-	void WriteMessage();
-private:
-	/**
-	*  state machine for EventSignal 
-	*/
-	enum 
-		{
-		ESetPDULengthComplete,
-		EWritePDUComplete,
-		}iState;
-	
-	/**
-	*  A pointer for Timer
-	*/
-	CCallbackTimer* iCallbackTimer;	
-	
-	/**
-	* The buffer contains the "AT" String which should be sent to BaseBand Modem
-	*/	
-	TBuf8<KMaxAsciiPduLength> iTxBuffer;	
-	
-	/**
-	*  writemessage index should be used by callback
-	*/
-	TInt iLocation;   
-
-	/**
-	* PDU in ascii format
-	*/
-	TBuf8<KMaxAsciiPduLength> iMsgDataAscii;  
-	
-	/**
-	* get the GsmSmsEntry value passed by handler
-    */
-	RMobileSmsStore::TMobileGsmSmsEntryV1 iMobileGsmEntry;
-
-	/**
-	* The return error value of AT command executed 
-	*/
-	TInt iError;
-	
-	/**
-	* The error value before Execute write()
-	*/
-	TInt iCallbackVal;
-	}; // class CAtSmsStoreWrite
-	
-#endif // ATSMSSTOREWRITE_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/inc/smsatutil.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-// 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:
-// @file smsatutil.h
-// This contains SmsAtUtil which is util for Sms At command
-// 
-
-#ifndef SMSATUTIL_H
-#define SMSATUTIL_H
-// system include
-#include <e32std.h>
-#include <e32base.h>
-#include <etelmm.h>
-
-
-/**
-*  SmsAtUtil
-* 
-*/
-class SmsAtUtil : public CBase
-	{
-public:
-	
-	 /**
-	 * Converts aAscii ASCII chars to Semi Octets in aData.
-	 * One ASCII char (8bits in aAscii) is translated to one Semi-Octet (4bits in aData).
-	 * 
-	 * @param aAscii input ascii string
-	 * @param aData  output binary data 
-	 * @return Standard KErr... values 
-	 */	
-	static TInt ConvertAsciiToBinary(const TDesC8& aAscii,TDes8& aData);
-	
-	 /**
-	 * Default operation is to code Address-Length according to=
-	 * 04.11 spec (ie. Address-Length=number of digits in Address-Value).
-	 * Append this sca adress to the ascii string  
-	 *
-	 * @param aAscii an ascii string 
-	 * @param aAddress  a SCA adress 
-	 * @return Standard KErr... values
-	 */
-	static TInt AppendAddressToAscii(TDes8& aAscii,const RMobilePhone::TMobileAddress& aAddress);
-	
-	 /**
-	 * Appends the binary data (aData) onto the end of an ASCII string (aAscii) in ASCII format.
-	 * 
-	 * @param aAscii  an ascii string 
-	 * @param aData   a  binary string 
-	 */
-	static void AppendDataToAscii(TDes8& aAscii,const TDesC8& aData);
-	
-	 /**
-	 * Reads an address from the front of the ASCII string (aAscii) and fills up Address structure (aAddress).
-	 * The address read from the ASCII string is removed from the ASCII string.
-	 * 
-	 * @param aAscii an ascii string 
-	 * @param aAddress  a SCA address
-	 * @return Standard KErr... values
-	 */
-	static TInt ReadAndRemoveAddressFromAscii(TDes8& aAscii,RMobilePhone::TMobileAddress& aAddress);
-	
-	/**
-	 * Default operation assumes has prefixed SCA which uses 04.11 format
-	 * (ie. Address-Length=number of digits in Address-Value).
-	 *
-	 * @param aAscii an ascii string 
-	 * @param aAddress  a SCA address
-	 * @return Standard KErr... values
-	 */
-	static TInt ReadAddressFromAscii(const TDesC8& aAscii,RMobilePhone::TMobileAddress& aAddress);
-	
-	 /**
-	 *  get the SCA field in the aAscii structure from the SCA prepended in the PDU sring .
-	 *  
-	 *  @param aPdu  a PDU string 
-	 *  @param aAddress a SCA address
-	 */
-	static void ReadAndRemoveAddressFromPdu(TPtrC8& aPdu, RMobilePhone::TMobileAddress& aGsmServiceCentre);
-	 /**
-	 * Judge whether a char is an address char
-	 * 
-	 * @param  aChar  
-	 * @return ETrue if, and only if, the given ASCII charcater 
-	 *  is valid as an ASCII address character.
-	 */
-	static TBool IsAddressChar(TChar aChar);
-
-private:
-	
-	 /**
-	 * @param aValue should be an ETSI Numbering-Plan-Identification field
-	 * @return The equivalent RMobilePhone::TMobileNPI value for aValue
-	 */
-	static RMobilePhone::TMobileNPI ConvertNumberingPlan(TInt aValue);
-	
-	 /**
-	 * @param aValue should be an ETSI Type-Of-Number field
-	 * @return The equivalent RMobilePhone::TMobileTON value for aValue
-	 */
-	static RMobilePhone::TMobileTON ConvertTypeOfNumber(TInt aValue); 
-	
-	 /**
-	 * Converts a TInt octet value into ASCII representation and then appends that
-	 * ASCII representation to the end of the given ASCII string.
-	 *
-	 * @param aOctet the octet value to append
-	 * @param aAscii the ASCII string to which aOctet value should be appended
-	 */	
-	static void AppendOctet(TInt aOctet,TDes8& aAscii);
-	
-	 /**
-	 * Returns the equivalent numeric value for a given ASCII address character.
-	 *
-	 * @param aChar the address character to be converted
-	 * @return The numeric value equivalent of the given address character.
-	 */
-	static TInt ConvertAddressChar(TChar aChar);
-	
-	 /**
-	 * Returns the equivalent ASCII address character for a given address value.
-	 *
-	 * @param aBinary the numerix value of the address character to be returned
-	 * @return The ASCII charcater which represents the given address numeric value.
-	 */
-	static TChar ConvertAddressChar(TInt aBinary);
-	
-	};
-
-#endif // SMSATUTIL_H

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/src/atmessagestoreinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,192 +0,0 @@
-// 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:
-// @file atmessagestoreinfo.cpp
-// This contains CAtMessageStoreInfo which is used to get message store information
-// 
-
-//system include 
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-
-//user include 
-#include "atmessagestoreinfo.h"
-#include "mslogger.h"
-
-//constant defination
-_LIT8(KGetPrefMemCommand,"AT+CPMS?\r");
-_LIT8(KCPMSResponseString,"+CPMS:");
-
-// ---------------------------------------------------------------------------
-// CAtMessageStoreInfo::CAtMessageStoreInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtMessageStoreInfo::CAtMessageStoreInfo(CGlobalPhonemanager& aGloblePhone, 
-                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                         :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtMessageStoreInfo::CAtMessageStoreInfo called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtMessageStoreInfo::~CAtMessageStoreInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtMessageStoreInfo::~CAtMessageStoreInfo()
-	{
-	LOGTEXT(_L8("CAtMessageStoreInfo::~CAtMessageStoreInfo called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtMessageStoreInfo::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtMessageStoreInfo* CAtMessageStoreInfo::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                                CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-    {
-	CAtMessageStoreInfo* self = new (ELeave)CAtMessageStoreInfo(aGloblePhone, 
-			                                                    aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtMessageStoreInfo::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtMessageStoreInfo* CAtMessageStoreInfo::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-    {
-	CAtMessageStoreInfo* self=CAtMessageStoreInfo::NewLC(aGloblePhone, 
-                                                         aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtMessageStoreInfo::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtMessageStoreInfo::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtMessageStoreInfo::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtMessageStoreInfo::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtMessageStoreInfo::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtMessageStoreInfo::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtMessageStoreInfo::ExecuteCommand called"));
-	
-	iTxBuffer.Zero();
-	iTxBuffer.Copy(KGetPrefMemCommand);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtMessageStoreInfo::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtMessageStoreInfo::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtMessageStoreInfo::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-	if(aStatus == KErrNone)
-		{
-		if((aEventSource == EWriteCompletion))
-			{
-			LOGTEXT(_L8("CAtMessageStoreInfo::EventSignal,EWriteCompletion!"));
-			return;
-			}
-		aStatus = iError;
-		}
-	Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	iCtsyDispatcherCallback.CallbackSmsGetSmsStoreInfoComp(aStatus,iTotal,iUsed);
-	}	
-
-// ---------------------------------------------------------------------------
-// CAtMessageStoreInfo::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtMessageStoreInfo::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	/**
-	* Parse result of AT+CPMS? 
-	* Response:+CPMS:<mem1>,<used1>,<total1>,<mem2>,<used2>,<total2>
-	* Here only the first mem is used. mem1 is SM
-	*/
-	iError = KErrNone;
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,Buffer());
-	if(array[0].MatchF(KAnyATCommand) != KErrNotFound)
-		{
-		array.Remove(0);
-		}
-	TInt Count = array.Count();
-	if (Count <= 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return;
-		}
-	if(array[0].MatchF(KCPMSResponseString) == KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return;
-		}
-	//parse name 
-	TPtrC8 name(array[1]);
-	
-	//parse used
-	TLex8 lex(array[2]);
-	TUint16 val;
-	TInt ret = lex.Val(val,EDecimal);
-	if(ret != KErrNone)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = ret;
-		return;
-		}
-	iUsed = val;
-	
-	//parse total
-	TLex8 lex1(array[3]);
-	ret = lex1.Val(val,EDecimal);
-	if(ret != KErrNone)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = ret;
-		return;
-		}
-	iTotal = val;
-	
-	LOGTEXT2(_L8("CAtMessageStoreInfo::ParseResponseL\tPreferred store name=%S"),&name);
- 	LOGTEXT3(_L8("CAtMessageStoreInfo::ParseResponseL\tPreferred store used=%d, total=%d"), 
- 			                                           iUsed,iTotal);
-	CleanupStack::PopAndDestroy(&array);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/src/atsmsack.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,280 +0,0 @@
-// 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:
-// @file atsmsack.cpp
-// This contains CAtSmsAck and CAtSmsNack which is used to send 
-// positive(negative) acknowledgment
-// 
-
-//system include 
-#include <etelmm.h>
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-
-//user include 
-#include "atsmsack.h"
-#include "mslogger.h"
-#include "smsatutil.h"
-
-//constant defination
-_LIT8(KSendCNMACommand,"AT+CNMA\r\n");
-_LIT8(KCNMAForNack,"AT+CNMA=2,%d\r\n");
-
-// ---------------------------------------------------------------------------
-// CAtSmsAck::CAtSmsAck
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsAck::CAtSmsAck(CGlobalPhonemanager& aGloblePhone, 
-                     CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                     :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtSmsAck::CAtSmsAck called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsAck::~CAtSmsAck
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsAck::~CAtSmsAck()
-	{
-	LOGTEXT(_L8("CAtSmsAck::~CAtSmsAck called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsAck::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsAck* CAtSmsAck::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                            CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsAck* self = new (ELeave)CAtSmsAck(aGloblePhone, 
-                                            aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsAck::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsAck* CAtSmsAck::NewL(CGlobalPhonemanager& aGloblePhone, 
-                           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsAck* self=CAtSmsAck::NewLC(aGloblePhone, 
-                                     aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsAck::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsAck::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsAck::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsAck::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsAck::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsAck::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtSmsAck::ExecuteCommand called"));
-	iTxBuffer.Zero();
-	iTxBuffer.Copy( KSendCNMACommand );
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsAck::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsAck::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtSmsAck::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-	if(aStatus == KErrNone)
-		{
-		if((aEventSource == EWriteCompletion))
-			{
-			LOGTEXT(_L8("CAtSmsNack::EventSignal,EWriteCompletion!"));
-			return;
-			}
-		aStatus = iError;
-		}
-	Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	iCtsyDispatcherCallback.CallbackSmsAckSmsStoredComp(aStatus);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsAck::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsAck::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsNack::CAtSmsNack
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsNack::CAtSmsNack(CGlobalPhonemanager& aGloblePhone, 
-                       CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                       :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtSmsNack::CAtSmsNack called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsNack::~CAtSmsNack
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsNack::~CAtSmsNack()
-	{
-	LOGTEXT(_L8("CAtSmsNack::~CAtSmsNack called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsNack::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsNack* CAtSmsNack::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                              CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsNack* self = new (ELeave)CAtSmsNack(aGloblePhone, 
-                                              aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsNack::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsNack* CAtSmsNack::NewL(CGlobalPhonemanager& aGloblePhone, 
-                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsNack* self=CAtSmsNack::NewLC(aGloblePhone, 
-                                       aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsNack::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsNack::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsNack::SetNackTpdu
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsNack::SetNackTpdu(TPtrC8 aRpError)
-	{
-	iRpError = aRpError;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsNack::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsNack::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsNack::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsNack::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtSmsNack::ExecuteCommand called"));
-	iTxBuffer.Zero();
-	TInt pduLen = iRpError.Length();
-	TBuf8<KLtsyGenericBufferSize> nackAsciiData;
-	nackAsciiData.Zero();
-	SmsAtUtil::AppendDataToAscii(nackAsciiData,iRpError);
-	iTxBuffer.Format(KCNMAForNack,pduLen);
-	iTxBuffer.Append(nackAsciiData);
-	iTxBuffer.Append(KLtsyCtrlZChar);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsNack::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsNack::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-/**
- * Handle the events from the comm port
- *ValidateExpectString
- * @param aSource denotes if event is due to read, write or timeout
- */
-	{
-	LOGTEXT3(_L8("CAtSmsNack::EventSignal iStatus=%D iSource=%D"),aStatus,aEventSource);
-	if(aStatus == KErrNone)
-		{
-		if((aEventSource == EWriteCompletion))
-			{
-			LOGTEXT(_L8("CAtSmsNack::EventSignal,EWriteCompletion!"));
-			return;
-			}
-		aStatus = iError;
-		}
-	Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	iCtsyDispatcherCallback.CallbackSmsAckSmsStoredComp(aStatus);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsNack::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsNack::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/src/atsmsreceive.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,317 +0,0 @@
-// 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:
-// @file atsmsreceive.cpp
-// This contains CAtSmsReceive which received incoming messages
-// 
-
-//system include
-#include <etelmm.h>
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-
-//user include 
-#include "atsmsreceive.h"
-#include "atsmsstoreread.h"
-#include "atsmsack.h"
-#include "atmanager.h"
-#include "activecommandstore.h"
-#include "mslogger.h"
-#include "smsatutil.h"
-
-//constant defination
-_LIT8(KCMTMatchString,"+CMT:*");
-_LIT8(KCMTResponseString,"+CMT:");
-_LIT8(KAsterisk,"*");
-
-#ifdef _DEBUG
-const TInt KLogMaxCharNumPerLine = 160;
-#endif
-// ---------------------------------------------------------------------------
-// CAtSmsReceive::CAtSmsReceive
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsReceive::CAtSmsReceive(CGlobalPhonemanager& aGloblePhone, 
-                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                             :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtSmsReceive::CAtSmsReceive called"));
-	iAtType = ELtsyAT_Sms_ReceiveMessage;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsReceive::~CAtSmsReceive
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsReceive::~CAtSmsReceive()
-	{
-	LOGTEXT(_L8("CAtSmsReceive::~CAtSmsReceive called"));
-	RemoveAllExpectString();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsReceive::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsReceive* CAtSmsReceive::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                    CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsReceive* self = new (ELeave)CAtSmsReceive(aGloblePhone, 
-                                                    aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsReceive::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsReceive* CAtSmsReceive::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsReceive* self=CAtSmsReceive::NewLC(aGloblePhone, 
-                                             aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsReceive::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsReceive::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	//Add expecting string
-	RemoveAllExpectString();
-	AddExpectStringL(KCMTMatchString);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsReceive::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsReceive::StartRequest()
-	{
-	iState = EReceiveReady;
-	iPhoneGlobals.iAtManager->GetActiveCommandStore()->AddUnsolicitedAtCommand(this);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsReceive::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsReceive::ExecuteCommand()
-	{
-	
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsReceive::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsReceive::EventSignal(TAtEventSource /*aEventSource*/, TInt aStatus)
-/**
- * Handle the events from the comm port
- *ValidateExpectString
- * @param aSource denotes if event is due to read, write or timeout
- */
-	{
-	if(aStatus != KErrNone)
-		{
-		iCtsyDispatcherCallback.CallbackSmsNotifyReceiveSmsMessageInd(iError,EFalse,iMsgReceive);
-		return;
-		}
-	
-	if( iState == EReceiveReady )
-		{
-		LOGTEXT(_L8("CAtSmsReceive::EventSigna,EReadCompletion"));
-		//Handle CMT response
-		if (iError == KErrNone)
-			{
-             //want to read the second line
-			TRAPD(err,AddExpectStringL(KAsterisk));
-			if( err==KErrNone )
-				{
-				// Wait for the reception of the second line
-				iState=EWaitForCmtSecondLine;
-				return;
-				}
-			else
-				{
-				iError = err;
-				}
-			}
-		iCtsyDispatcherCallback.CallbackSmsNotifyReceiveSmsMessageInd(iError,EFalse,iMsgReceive);
-		}
-	else if( iState == EWaitForCmtSecondLine )
-		{
-		LOGTEXT(_L8("CAtSmsReceiveMessage::EventSignal EWaitForCmtSecondLine"));
-        RemoveExpectString(KAsterisk);
-		iCtsyDispatcherCallback.CallbackSmsNotifyReceiveSmsMessageInd(iError,EFalse,iMsgReceive);
-		// We've got the PDU, and will delete the buffer when the line is parsed
-		if(iPhoneGlobals.iEventSignalActive == EFalse)
-			{
-		    ClearBuffer();
-			}
-		iState = EReceiveReady;
-		}
-     
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsReceive::CMTResponseFirstLineL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void  CAtSmsReceive::CMTResponseFirstLineL()
-	{
-	LOGTEXT(_L8("CAtSmsReceive::CMTResponseFirstLineL Enter funciton"));
-	iError = KErrNone;
-	TPtrC8 firstLineBuf;
-	firstLineBuf.Set(Buffer());
-	TInt pos = firstLineBuf.FindF(KCMTResponseString);
-	if (pos == KErrNotFound)
-		{
-		LOGTEXT(_L8("CAtSmsReceive::CMTResponseFirstLineL()\tError - Cannot find '+CMT:' string"));
-		iError = KErrNotFound;
-		return;
-		}
-	//skip the string of +CMT:
-	pos += KCMTResponseString().Length();
-	//skip a  "," character
-	while(!(TChar(firstLineBuf[pos]).IsDigit()))
-		{
-		++pos;
-		}
-	TInt lenPos = firstLineBuf.Length()-pos;
-	TPtrC8 pduLenBuf;
-	pduLenBuf.Set(firstLineBuf.Right(lenPos));
-	
-	
-	TLex8 lex(pduLenBuf);
-	TUint16 val;
-	TInt ret = lex.Val(val,EDecimal);
-	if(ret != KErrNone)
-		{
-		iError = ret;
-		return;
-		}
-	iPduLen = val;
-    LOGTEXT2(_L8("New SMS detected of length %d"),iPduLen);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsReceive::CMTResponseSecondLineL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void  CAtSmsReceive::CMTResponseSecondLineL() 
-	{
-	LOGTEXT(_L8("CAtSmsReceive::CMTResponseSecondLineL Enter funciton"));
-	iError = KErrNone;
-	iAttr.iFlags=0;
-	TPtrC8 secondLineBuf;
-	secondLineBuf.Set(CurrentLine());
-	
-#ifdef _DEBUG
-	TInt totalLen = secondLineBuf.Length();
-	if(totalLen <= KLogMaxCharNumPerLine)
-		{
-		LOGTEXT2(_L8("CAtSmsReceiveMessage::CMTResponseSecondLineL\tSecondLine=%S"),&secondLineBuf);
-		}
-	else
-		{
-		TInt lines = (totalLen/KLogMaxCharNumPerLine);
-		TInt remainingStrNum = (totalLen%KLogMaxCharNumPerLine);
-		for(TInt i = 0; i < lines; i++)
-			{
-			TPtrC8 line(secondLineBuf.Mid(i*KLogMaxCharNumPerLine,KLogMaxCharNumPerLine));
-			LOGTEXT2(_L8("CAtSmsReceiveMessage::CMTResponseSecondLineL \tSecondLine line=%S"),&line);
-			}
-		
-		TPtrC8 remaining(secondLineBuf.Right(remainingStrNum));
-		
-		LOGTEXT2(_L8("CAtSmsReceiveMessage::CMTResponseSecondLineL \tSecondLine line=%S"),&remaining);
-		}
-#endif  
-	// Buffer size calculated as follows;
-	//   (max pdu size + max prefixed SCA size) * number of ASCII chars used to code an octet
-	TBuf8<(RMobileSmsMessaging::KGsmTpduSize+12)*2> localPdu;	
-	localPdu.Copy(secondLineBuf);
-	//  The CMT frame sometimes contains odd number of nibbles which
-	// causes panic in ConvertAsciiToBinary() method. This type of
-	// frames will simply be discarded.
-	if(localPdu.Length() < (iPduLen*2))
-		{
-		iError = KErrUnderflow;
-		User::Leave(KErrUnderflow);
-		}
-		
-	//
-	// Check if we have a prefixed SCA on our pdu.
-	// If we do then remove it.
-	
-	if(localPdu.Length() > (iPduLen*2))
-		{
-		TInt ret = SmsAtUtil::ReadAndRemoveAddressFromAscii(localPdu,iAttr.iGsmServiceCentre);
-		if(ret !=KErrNone)
-			{
-			LOGTEXT(_L8("CAtSmsReceiveMessage::CMTResponseSecondLineL Failed to read and remove SCA from PDU"));
-			iError = ret;
-			return;
-			}
-		else
-			{
-			iMsgReceive.iServiceCentre = iAttr.iGsmServiceCentre.iTelNumber;    //for iServiceCentre
-			iMsgReceive.iMobileScNPI = iAttr.iGsmServiceCentre.iNumberPlan;
-			iMsgReceive.iMobileScTON = iAttr.iGsmServiceCentre.iTypeOfNumber;
-			iAttr.iFlags|= RMobileSmsMessaging::KGsmServiceCentre;
-			}
-		}
-	//
-	// Convert received pdu from ASCII into binary
-	TInt ret = SmsAtUtil::ConvertAsciiToBinary(localPdu,iPdu);
-	if (ret!=KErrNone)
-		{
-		LOGTEXT(_L8("CAtSmsReceiveMessage::CMTResponseSecondLineL Failed to code PDU into binary"));
-		iError = ret;
-		return;
-		}
-	else
-		{
-		iAttr.iDataFormat=RMobileSmsMessaging::EFormatGsmTpdu;
-		iAttr.iFlags|=RMobileSmsMessaging::KSmsDataFormat;
-		iAttr.iStatus = RMobileSmsMessaging::EMtMessageUnstoredClientAck;
-		iAttr.iFlags|=RMobileSmsMessaging::KIncomingStatus;
-		}
-
-	LOGTEXT2(_L8("Received PDU String is %S"),&iPdu);
-	iMsgReceive.iSmsMsg = iPdu;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsReceive::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsReceive::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if(iState == EReceiveReady)
-		{
-		CMTResponseFirstLineL();
-		}
-	else if(iState == EWaitForCmtSecondLine)
-		{
-		CMTResponseSecondLineL();
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/src/atsmssend.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,335 +0,0 @@
-// 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:
-// @file atsmssend.cpp
-// This contains CAtSmsSend which is used to send sms message
-// 
-
-//system include
-#include <etelmm.h>
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-
-// user include
-#include "atsmssend.h"
-#include "mslogger.h"
-#include "ltsycommondefine.h"
-#include "atmanager.h"
-#include "commengine.h"
-#include "smsatutil.h"
-
-//Constants
-_LIT8(KSmsSendCommandPdu,"AT+CMGS=%d\r");
-_LIT8(KCMGSResponseString,"+CMGS:");
-_LIT8(KDefaultSCA,"00");
-_LIT8(KSmsEnterPduResponse,">");
-_LIT8(KSendExpectedString,"+CMGS:*");
-const TInt KLtsyOnePause = 100000;
-const TInt KLtsySendSmsWriteTimeOut = 20;
-const TInt KLtsySendSmsReadTimeOut = 30;
-
-// ---------------------------------------------------------------------------
-// CAtSmsSend::CAtSmsSend
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsSend::CAtSmsSend(CGlobalPhonemanager& aGloblePhone, 
-                       CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                       :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)                  
- 	{
-	LOGTEXT(_L8("CAtSmsSend::CAtSmsSend called"));
-	iWriteTimeOut = KLtsySendSmsWriteTimeOut;
-	iReadTimeOut = KLtsySendSmsReadTimeOut;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsSend::~CAtSmsSend
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsSend::~CAtSmsSend()
-	{
-	LOGTEXT(_L8("CAtSmsSend::~CAtSmsSend called"));
-	delete iCallbackTimer;
-	iCallbackTimer = NULL;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsSend::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsSend* CAtSmsSend::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                              CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsSend* self = new (ELeave)CAtSmsSend(aGloblePhone,
-			                                  aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsSend::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsSend* CAtSmsSend::NewL(CGlobalPhonemanager& aGloblePhone, 
-                             CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsSend* self=CAtSmsSend::NewLC(aGloblePhone,aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsSend::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsSend::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	//Create Timer
-	iCallbackTimer = CCallbackTimer::NewL(*this);
-	//set writing timeout
-	iWriteTimeOut = KLtsyDefaultWriteTimeOut;
-	AddExpectStringL(KSmsEnterPduResponse);
-	AddExpectStringL(KSendExpectedString);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsSend::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsSend::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsSend::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsSend::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtSmsSend::ExecuteCommand called"));
-	LOGTEXT(_L8("SendPDUMessage..."));
-	
-	iMsgDataAscii.Zero();
-	TInt ret = ConfirmSca();
-	if(ret == KErrNone)
-		{
-		//Here is a SCA
-		ret = SmsAtUtil::AppendAddressToAscii(iMsgDataAscii,iSmsSendParam.iGsmServiceCentre);
-		if( ret!=KErrNone )
-			{
-			BeginTimer();
-			iCallbackVal = ret;
-			return;
-			}
-		}
-	else 
-		{
-		//Here is no SCA,usign default SCA
-		iMsgDataAscii.Append(KDefaultSCA);
-		}
-	const TInt msgDataAsciiLen(iMsgDataAscii.Length());
-	// Convert PDU to ASCII
-	SmsAtUtil::AppendDataToAscii(iMsgDataAscii,iSmsSendParam.iSmsTpdu);
-	iState = ESetPDULengthComplete;
-	StartWritingPduLength();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsSend::StartWritingPduLength
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsSend::StartWritingPduLength()
-	{
-	LOGTEXT(_L8("CAtSmsSend::StartWritingPduLength called"));
-	TInt pduLen = iSmsSendParam.iSmsTpdu.Length();
-	iTxBuffer.Zero();
-	iTxBuffer.Format(KSmsSendCommandPdu,pduLen);
-	ClearBuffer();
-	iPhoneGlobals.iAtManager->SetSolicitedAtCommand(this);
-	iPhoneGlobals.iCommEngine->CommWrite(iTxBuffer);	
-	StartTimer(iWriteTimeOut);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsSend::StartWritingPdu
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsSend::StartWritingPdu()
-	{
-	LOGTEXT(_L8("CAtSmsSend::StartWritingPdu called"));
-	iTxBuffer.Zero();
-	iTxBuffer.Append(iMsgDataAscii);
-	iTxBuffer.Append(KLtsyCtrlZChar);
-	ClearBuffer();
-	iPhoneGlobals.iAtManager->SetSolicitedAtCommand(this);
-	iPhoneGlobals.iCommEngine->CommWrite(iTxBuffer);	
-	StartTimer(iWriteTimeOut);
-	}
-
-
-// ---------------------------------------------------------------------------
-// CAtSmsSend::SetMessageParam
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsSend::SetMessageParam(TSmsSendParam aMsgParam)
-	{
-	iSmsSendParam = aMsgParam;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsSend::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsSend::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtSmsSend::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-    if(aStatus == KErrNone)
-		{
-		if(aEventSource == EWriteCompletion)
-			{
-			LOGTEXT(_L8("CAtSmsSend::EventSignal,EWriteCompletion!"));
-			return;
-			}
-		else
-			{
-			if( iState == ESetPDULengthComplete )
-				{
-	            if(iError==KErrNone)
-	            	{
-			    	iState = ESendPDUComplete;
-			    	Complete();
-			       	StartWritingPdu();
-			    	return;     
-	            	}
-				}
-			}
-		aStatus = iError;
-		}
-    Complete();
-   	iPhoneGlobals.iEventSignalActive = EFalse;
-    iCtsyDispatcherCallback.CallbackSmsSendSmsMessageComp(aStatus,iSmsSendResponse.iValRef,
-    		                                              iSmsSendResponse.iSubmitReport);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsSend::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsSend::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-    {
-    LOGTEXT(_L8("CAtSmsSend::ParseResponseL called!"));
-    if(iState == ESetPDULengthComplete) 
-	    {
-   	    if(CurrentLine().MatchF(KSmsEnterPduResponse) != KErrNotFound)
-	    	{
-	    	iError = KErrNone;
-	    	}
-	    else
-	    	{
-	    	iError = KErrNotFound;
-	    	}
-	    }
-    else
-		{
-		iError = KErrNone;
-		TPtrC8 responseBuf;
-		responseBuf.Set(Buffer());
-		TInt pos = responseBuf.FindF(KCMGSResponseString);
-		if (pos == KErrNotFound)
-			{
-			LOGTEXT(_L8("CAtSmsSend::ParseCMGSResponse \"+CMGS:\" not found"));
-			iError = KErrNotFound;
-			return;
-			}
-	
-		// Locate the message reference number
-		// (ie. read in all digits form the first found to the end of the string)
-		const TInt bufLength=responseBuf.Length();
-		pos += KCMGSResponseString().Length();
-		while(pos<bufLength && !(TChar(responseBuf[pos]).IsDigit()))
-				++pos;
-		if(pos == bufLength)
-			{
-			LOGTEXT(_L8("CAtSmsSend::ParseCMGSResponse cannot find any digits after \"+CMS:\" "));
-			iError = KErrNotFound;
-			return;
-			}
-	
-		// Read message number and store in clients data structure
-		TPtrC8 ptr = responseBuf.Mid(pos);	
-		TLex8 lex(ptr);
-		TUint16 val;
-		TInt ret = lex.Val(val,EDecimal);
-		if(ret != KErrNone)
-			{
-			LOGTEXT(_L8("CAtSmsSend::ParseCMGSResponse cannot read Message Reference Number"));
-			iError = ret;
-			return;
-			}
-		iSmsSendResponse.iValRef = val;
-		LOGTEXT2(_L8("CAtSmsSend  Message reference number %d"),val);
-	    }
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsSend::ConfirmSca
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CAtSmsSend::ConfirmSca()
-	{
-	if(iSmsSendParam.iGsmServiceCentre.iTelNumber.Length() == 0)
-		{
-		return KErrNotFound;
-		}
-	if(!(iSmsSendParam.iGsmServiceCentre.iNumberPlan == RMobilePhone::EIsdnNumberPlan &&
-		(iSmsSendParam.iGsmServiceCentre.iTypeOfNumber == RMobilePhone::EInternationalNumber ||
-		iSmsSendParam.iGsmServiceCentre.iTypeOfNumber == RMobilePhone::EUnknownNumber)))
-		{
-		return KErrCorrupt;
-		}
-	return KErrNone;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsSend::BeginTimer
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsSend::BeginTimer()
-	{
-	LOGTEXT(_L8("CAtSmsSend::BeginTimer() called"));	
-	
-    if (iCallbackTimer->IsActive())
-    	{
-    	iCallbackTimer->Cancel();
-    	}
-	iCallbackTimer->After(KLtsyOnePause);	
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsSend::TimerRun
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsSend::TimerRun(TInt aError)
-	{
-	LOGTEXT(_L8("CAtSmsSend::TimerRun() called"));
-	if(aError == KErrNone)
-		{
-		Complete();
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iCtsyDispatcherCallback.CallbackSmsSendSmsMessageComp(iCallbackVal,iSmsSendResponse.iValRef,
-				                                              iSmsSendResponse.iSubmitReport);
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/src/atsmsstoredelete.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,272 +0,0 @@
-// 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:
-// @file atsmsstoredelete.cpp
-// This contains CAtSmsStoreDelete and CAtSmsStoreDeleteAll which is used to delete message(s)
-// 
-
-//system include 
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-
-//user include
-#include "atsmsstoredelete.h"
-#include "mslogger.h"
-
-//constant defination
-const TUint KSmsDeleteAllTimeOut = 200;
-_LIT8(KSmsDeleteCommand,"AT+CMGD=%d\r");
-_LIT8(KSmsDeleteAllCommand,"AT+CMGD=1,4\r");
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDelete::CAtSmsStoreDelete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreDelete::CAtSmsStoreDelete(CGlobalPhonemanager& aGloblePhone, 
-                                     CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                     :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtSmsStoreDelete::CAtSmsStoreDelete called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDelete::~CAtSmsStoreDelete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreDelete::~CAtSmsStoreDelete()
-	{
-	LOGTEXT(_L8("CAtSmsStoreDelete::~CAtSmsStoreDelete called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDelete::NewLC(
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreDelete* CAtSmsStoreDelete::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                            CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsStoreDelete* self = new (ELeave)CAtSmsStoreDelete(aGloblePhone, 
-                                                            aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDelete::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreDelete* CAtSmsStoreDelete::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                           CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsStoreDelete* self=CAtSmsStoreDelete::NewLC(aGloblePhone, 
-                                                     aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDelete::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreDelete::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDelete::SetDelIndex
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreDelete::SetDelIndex(TInt aIndex)
-	{
-	LOGTEXT(_L8("CAtSmsStoreDelete::SetReadMessageParam callded"));
-	iIndex = aIndex;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDelete::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreDelete::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDelete::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreDelete::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtSmsStoreDelete::ExecuteCommand callded"));
-	iTxBuffer.Zero();
-	iTxBuffer.Format(KSmsDeleteCommand,iIndex); // Delete Command through aIndex
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDelete::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreDelete::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtSmsStoreDelete::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-	if(aStatus == KErrNone)
-		{
-		if((aEventSource == EWriteCompletion))
-			{
-			LOGTEXT(_L8("CAtSmsStoreDelete::EventSignal,EWriteCompletion!"));
-			return;
-			}
-		aStatus = iError;
-		}
-	Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	iCtsyDispatcherCallback.CallbackPhonebookSmsStoreDeleteEntryComp(aStatus);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDelete::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreDelete::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-
-// End of CAtSmsStoreDelete 
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDeleteAll::CAtSmsStoreDeleteAll
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreDeleteAll::CAtSmsStoreDeleteAll(CGlobalPhonemanager& aGloblePhone, 
-										   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-										   :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtSmsStoreDeleteAll::CAtSmsStoreDeleteAll called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDeleteAll::~CAtSmsStoreDeleteAll
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreDeleteAll::~CAtSmsStoreDeleteAll()
-	{
-	LOGTEXT(_L8("CAtSmsStoreDeleteAll::~CAtSmsStoreDeleteAll called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDeleteAll::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreDeleteAll* CAtSmsStoreDeleteAll::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                                  CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsStoreDeleteAll* self = new (ELeave)CAtSmsStoreDeleteAll(aGloblePhone, 
-                                                                  aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDeleteAll::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreDeleteAll* CAtSmsStoreDeleteAll::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                                 CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsStoreDeleteAll* self=CAtSmsStoreDeleteAll::NewLC(aGloblePhone, 
-                                                           aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDeleteAll::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreDeleteAll::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	//Set read and write timeout
-	SetTimeOut(KLtsyDefaultWriteTimeOut, KSmsDeleteAllTimeOut);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDeleteAll::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreDeleteAll::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDeleteAll::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreDeleteAll::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtSmsStoreDeleteAll::ExecuteCommand callded"));
-	iTxBuffer.Zero();
-	iTxBuffer.Format(KSmsDeleteAllCommand); // Delete Command through aIndex
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDeleteAll::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreDeleteAll::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtSmsStoreDeleteAll::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-	if(aStatus == KErrNone)
-		{
-		if((aEventSource == EWriteCompletion))
-			{
-			LOGTEXT(_L8("CAtSmsStoreDeleteAll::EventSignal,EWriteCompletion!"));
-			return;
-			}
-		aStatus = iError;
-		}
-	Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	iCtsyDispatcherCallback.CallbackPhonebookSmsStoreDeleteAllComp(aStatus);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreDeleteAll::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreDeleteAll::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	if (CurrentLine().Match(KLtsyOkString) == 0)
-		{
-		iError = KErrNone;
-		}
-	else
-		{
-		iError = KErrGeneral;
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/src/atsmsstoreinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-// 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:
-// @file atsmsstoreinfo.cpp
-// This contains CAtSmsStoreInfo which is used to get sms store information
-// 
-
-//system include 
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-
-//user include 
-#include "atsmsstoreinfo.h"
-#include "mslogger.h"
-#include "ltsycommondefine.h"
-#include "globalphonemanager.h"
-
-//constant defination
-_LIT8(KGetPrefMemCommand,"AT+CPMS?\r");
-_LIT8(KCPMSResponseString,"+CPMS:");
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreInfo::CAtSmsStoreInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreInfo::CAtSmsStoreInfo(CGlobalPhonemanager& aGloblePhone, 
-                                 CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                 :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtSmsStoreInfo::CAtSmsStoreInfo called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreInfo::~CAtSmsStoreInfo
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreInfo::~CAtSmsStoreInfo()
-	{
-	LOGTEXT(_L8("CAtSmsStoreInfo::~CAtSmsStoreInfo called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreInfo::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreInfo* CAtSmsStoreInfo::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                        CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-    {
-	CAtSmsStoreInfo* self = new (ELeave)CAtSmsStoreInfo(aGloblePhone, 
-			                                            aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreInfo::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreInfo* CAtSmsStoreInfo::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                       CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-    {
-	CAtSmsStoreInfo* self=CAtSmsStoreInfo::NewLC(aGloblePhone, 
-                                                 aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreInfo::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreInfo::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreInfo::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreInfo::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreInfo::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreInfo::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtSmsStoreInfo::ExecuteCommand called"));
-	iTxBuffer.Zero();
-	iTxBuffer.Copy(KGetPrefMemCommand);
-	Write();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreInfo::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreInfo::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtSmsStoreInfo::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-	if(aStatus == KErrNone)
-		{
-		if((aEventSource == EWriteCompletion))
-			{
-			LOGTEXT(_L8("CAtSmsStoreInfo::EventSignal,EWriteCompletion!"));
-			return;
-			}
-		aStatus = iError;
-		}
-	Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;	
-	iCtsyDispatcherCallback.CallbackPhonebookSmsStoreGetInfoComp(aStatus,iTotal,iUsed);
-	}	
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreInfo::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreInfo::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	/**
-	* Parse result of AT+CPMS? 
-	* Response:+CPMS:<mem1>,<used1>,<total1>,<mem2>,<used2>,<total2>
-	* Here only the first mem is used. mem1 is SM
-	*/
-	iError = KErrNone;
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,Buffer());
-	if(array[0].MatchF(KAnyATCommand) != KErrNotFound)
-		{
-		array.Remove(0);
-		}
-	TInt Count = array.Count();
-	if (Count <= 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return;
-		}
-	if(array[0].MatchF(KCPMSResponseString) == KErrNotFound)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return;
-		}
-	//parse name 
-	TPtrC8 name(array[1]);
-	
-	//parse used
-	TLex8 lex(array[2]);
-	TUint16 val;
-	TInt ret = lex.Val(val,EDecimal);
-	if(ret != KErrNone)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = ret;
-		return;
-		}
-	iUsed = val;
-	
-	//parse total
-	TLex8 lex1(array[3]);
-	ret = lex1.Val(val,EDecimal);
-	if(ret != KErrNone)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = ret;
-		return;
-		}
-	iTotal = val;
-	iPhoneGlobals.iStoreTotal = iTotal;
-	LOGTEXT2(_L8("CAtSmsStoreInfo::CPMSResponseL\tPreferred store name=%S"),&name);
- 	LOGTEXT3(_L8("CAtSmsStoreInfo::CPMSResponseL\tPreferred store used=%d, total=%d"), 
- 			                                     iUsed,iTotal);
-	CleanupStack::PopAndDestroy(&array);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/src/atsmsstoreread.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,232 +0,0 @@
-// 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:
-// @file atsmsstoreread.cpp
-// This contains CAtSmsStoreRead which is used to Read PDU Message
-// via aIndex 
-// 
-
-
-//system include 
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-
-//user include 
-#include "atsmsstoreread.h"
-#include "mslogger.h"
-#include "smsatutil.h"
-
-//constant defination
-_LIT8(KSmsReadCommand,"AT+CMGR=%d\r");
-_LIT8(KCMGRResponseString,"+CMGR:");
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreRead::CAtSmsStoreRead
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreRead::CAtSmsStoreRead(CGlobalPhonemanager& aGloblePhone, 
-                                 CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                 :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtSmsStoreRead::CAtSmsStoreRead called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreRead::~CAtSmsStoreRead
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreRead::~CAtSmsStoreRead()
-	{
-	LOGTEXT(_L8("CAtSmsStoreRead::~CAtSmsStoreRead called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreRead::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreRead* CAtSmsStoreRead::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                        CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsStoreRead* self = new (ELeave)CAtSmsStoreRead(aGloblePhone, 
-                                                        aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreRead::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreRead* CAtSmsStoreRead::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                       CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsStoreRead* self=CAtSmsStoreRead::NewLC(aGloblePhone, 
-                                                 aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreRead::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreRead::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreRead::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreRead::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreRead::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreRead::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtSmsStoreRead::ExecuteCommand callded"));
-	ReadMessage();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreRead::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreRead::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtSmsStoreRead::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-		
-	if(aStatus == KErrNone)
-		{
-		if((aEventSource == EWriteCompletion))
-			{
-			LOGTEXT(_L8("CAtSmsStoreRead::EventSignal,EWriteCompletion!"));
-			return;
-			}
-		aStatus = iError;
-		}
-	Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	iCtsyDispatcherCallback.CallbackPhonebookSmsStoreReadEntryComp(aStatus,iSmsData);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreRead::SetMsgIndex
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreRead::SetMsgIndex(TInt aIndex)
-	{
-	LOGTEXT(_L8("CAtSmsStoreRead::SetReadMessageParam callded"));
-	iIndex = aIndex;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreRead::ReadMessage
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreRead::ReadMessage()
-	{
-	LOGTEXT(_L8("CAtSmsStoreRead::ReadMessage callded"));
-	iTxBuffer.Zero();
-	iTxBuffer.Format(KSmsReadCommand,iIndex);
-	Write();   
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreRead::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreRead::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	/**
-	* Response:+CMGR:<stat>,[<alpha>],<length><CR><LF><pdu>
-	*/
-	iError = KErrNone;	
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,Buffer());
-	if(array[0].MatchF(KAnyATCommand)!=KErrNotFound)
-		{
-		array.Remove(0);
-		}
-	TInt count = array.Count();
-#ifdef _DEBUG
-	for( TInt i=0;i<count;i++ )
-		{
-        LOGTEXT3(_L8("CAtSmsStoreRead::ParseResponseL\tarray[%d]=%S"),i,&array[i]);  
-		}
-#endif   
-	if (count <= 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return;
-		}
-	if(array[0].MatchF(KCMGRResponseString)==KErrNotFound)
-		{
-		LOGTEXT(_L8("CAtSmsStoreRead::ParseResponseL\tFound +CMGR String!"));
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return;
-		}
-	// parse the message status
-	TLex8 lex(array[1]);
-	TUint16 val;
-	TInt ret=lex.Val(val,EDecimal);
-	if(ret!=KErrNone)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = ret;
-		return;
-		}
-	iSmsData.iMessageStatus = val;
-	
-	//parse the message length
-	TLex8 lex1(array[3]);
-	TUint msgLength;
-	ret=lex1.Val(msgLength,EDecimal);
-	if(ret!=KErrNone)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = ret;
-		return;
-		}
-	LOGTEXT2(_L8("CAtSmsStoreRead::ParseResponseL\tMessage Length=%d"),msgLength);
-	TBuf8<KMaxAsciiPduLength>  pdu;	   //Binary Message pdu
-	SmsAtUtil::ConvertAsciiToBinary(array[4],pdu);
-	TPtrC8 pduPtr(pdu);
-	
-	RMobilePhone::TMobileAddress gsmServiceCentre;   //messages's SCA
-	if (msgLength*2 < array[4].Length())
-		{
-		// There is an SCA prepended so remove this and store it in iGsmServiceCentre
-		SmsAtUtil::ReadAndRemoveAddressFromPdu(pduPtr,gsmServiceCentre);
-		}
-	iSmsData.iSmsMsg = pduPtr;
-	iSmsData.iServiceCentre = gsmServiceCentre.iTelNumber;
-	iSmsData.iMobileScNPI = gsmServiceCentre.iNumberPlan;
-	iSmsData.iMobileScTON = gsmServiceCentre.iTypeOfNumber;
-	LOGTEXT2(_L8("CAtSmsStoreRead::ParseResponseL\tMessage Status=%d"),
-			                       iSmsData.iMessageStatus);
-	LOGTEXT3(_L8("CAtSmsStoreRead::ParseResponseL\tSmsMsg=%S, ServiceCentre=%S"), 
-			                       &iSmsData.iSmsMsg, &iSmsData.iServiceCentre);
-	CleanupStack::PopAndDestroy(&array);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/src/atsmsstorereadall.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-// 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:
-// @file atsmsstorereadall.cpp
-// This contains CAtSmsStoreReadAll which is used to read all messages
-// 
-
-//system include 
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-
-//user include 
-#include "mslogger.h"
-#include "atsmsstorereadall.h"
-#include "smsatutil.h"
-
-//constant defination
-_LIT8(KSmsReadCommand,"AT+CMGR=%d\r");
-_LIT8(KCMGRResponseString,"+CMGR:");
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreReadAll::CAtSmsStoreReadAll
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreReadAll::CAtSmsStoreReadAll(CGlobalPhonemanager& aGloblePhone, 
-                                       CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                       :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtSmsStoreReadAll::CAtSmsStoreReadAll called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreReadAll::~CAtSmsStoreReadAll
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreReadAll::~CAtSmsStoreReadAll()
-	{
-	LOGTEXT(_L8("CAtSmsStoreReadAll::~CAtSmsStoreReadAll called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreReadAll::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreReadAll* CAtSmsStoreReadAll::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                                CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsStoreReadAll* self = new (ELeave)CAtSmsStoreReadAll( aGloblePhone,aCtsyDispatcherCallback );
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreReadAll::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreReadAll* CAtSmsStoreReadAll::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                               CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsStoreReadAll* self=CAtSmsStoreReadAll::NewLC( aGloblePhone,aCtsyDispatcherCallback );
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreReadAll::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreReadAll::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreRead::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreReadAll::StartRequest()
-	{
-	iIndex = 1;
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreReadAll::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreReadAll::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtSmsStoreReadAll::ExecuteCommand callded"));
-	ReadMessage();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreReadAll::ReadMessage
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreReadAll::ReadMessage()
-	{
-	LOGTEXT(_L8("CAtSmsStoreReadAll::ReadMessage callded"));
-	iTxBuffer.Zero();
-	iTxBuffer.Format(KSmsReadCommand,iIndex);
-	Write();   
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreReadAll::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreReadAll::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtSmsStoreReadAll::EventSignal aStatus=%D iSource=%D"),
-			                          aStatus,aEventSource);
-	if(aStatus == KErrNone)
-		{
-		if((aEventSource == EWriteCompletion))
-			{
-			LOGTEXT(_L8("CAtSmsStoreRead::EventSignal,EWriteCompletion!"));
-			return;
-			}
-		aStatus = iError;
-		}		
-		
-	if(iIndex < iPhoneGlobals.iStoreTotal)
-		{
-		iCtsyDispatcherCallback.CallbackPhonebookSmsStoreReadAllComp(aStatus,iSmsData,iIndex,ETrue,EFalse);
-		iIndex++;
-		ReadMessage();
-		}
-	else 
-		{
-		//Handle last message 
-		Complete();
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iCtsyDispatcherCallback.CallbackPhonebookSmsStoreReadAllComp(aStatus,iSmsData,iIndex,EFalse,EFalse);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreReadAll::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreReadAll::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-	/**
-	* Response:+CMGR:<stat>,[<alpha>],<length><CR><LF><pdu>
-	*/
-	iError = KErrNone;	
-	RArray<TPtrC8> array;
-	CleanupClosePushL(array);
-	iParser->ParseRespondedBuffer(array,Buffer());
-	if(array[0].MatchF(KAnyATCommand)!=KErrNotFound)
-		{
-		array.Remove(0);
-		}
-	TInt count = array.Count();
-#ifdef _DEBUG
-	for( TInt i=0;i<count;i++ )
-		{
-        LOGTEXT3(_L8("CAtSmsStoreReadAll::ParseResponseL\tarray[%d]=%S"),i,&array[i]);  
-		}
-#endif   
-	if (count <= 1)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return;
-		}
-	if(array[0].MatchF(KCMGRResponseString)==KErrNotFound)
-		{
-		LOGTEXT(_L8("CAtSmsStoreReadAll::ParseResponseL\tFound +CMGR String!"));
-		CleanupStack::PopAndDestroy();
-		iError = KErrNotFound;
-		return;
-		}
-	// parse the message status
-	TLex8 lex(array[1]);
-	TUint16 val;
-	TInt ret=lex.Val(val,EDecimal);
-	if(ret!=KErrNone)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = ret;
-		return;
-		}
-	iSmsData.iMessageStatus = val;
-	
-	//parse the message length
-	TLex8 lex1(array[3]);
-	TUint msgLength;
-	ret=lex1.Val(msgLength,EDecimal);
-	if(ret!=KErrNone)
-		{
-		CleanupStack::PopAndDestroy();
-		iError = ret;
-		return;
-		}
-	LOGTEXT2(_L8("CAtSmsStoreReadAll::ParseResponseL\tMessage Length=%d"),msgLength);
-	TBuf8<KMaxAsciiPduLength>  pdu;	   //Binary Message pdu
-	SmsAtUtil::ConvertAsciiToBinary(array[4],pdu);
-	TPtrC8 pduPtr(pdu);
-	
-	RMobilePhone::TMobileAddress gsmServiceCentre;   //messages's SCA
-	if (msgLength*2 < array[4].Length())
-		{
-		// There is an SCA prepended so remove this and store it in iGsmServiceCentre
-		SmsAtUtil::ReadAndRemoveAddressFromPdu(pduPtr,gsmServiceCentre);
-		}
-	iSmsData.iSmsMsg = pduPtr;
-	iSmsData.iServiceCentre = gsmServiceCentre.iTelNumber;
-	iSmsData.iMobileScNPI = gsmServiceCentre.iNumberPlan;
-	iSmsData.iMobileScTON = gsmServiceCentre.iTypeOfNumber;
-	LOGTEXT2(_L8("CAtSmsStoreReadAll::ParseResponseL\tMessage Status=%d"),
-			                          iSmsData.iMessageStatus);
-	LOGTEXT3(_L8("CAtSmsStoreReadAll::ParseResponseL\tSmsMsg=%S, ServiceCentre=%S"), 
-			                          &iSmsData.iSmsMsg, &iSmsData.iServiceCentre);
-	CleanupStack::PopAndDestroy(&array);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/src/atsmsstorewrite.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,316 +0,0 @@
-// 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:
-// @file atsmsstorewrite.cpp
-// This contains CAtSmsStoreWrite which is used to write sms message
-// 
-
-//system include 
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-
-//user include
-#include "atsmsstorewrite.h"
-#include "mslogger.h"
-#include "atmanager.h"
-#include "commengine.h"
-#include "smsatutil.h"
-
-//constant defination
-_LIT8(KCMGWResponseString,"+CMGW:");
-_LIT8(KSmsWriteLengthCommand,"AT+CMGW = %d\r");
-_LIT8(KDefaultSCA,"00");
-_LIT8(KSmsEnterPduResponse,">");
-const TInt KLtsyOnePause = 100000;   //0.1s
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreWrite::CAtSmsStoreWrite
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreWrite::CAtSmsStoreWrite(CGlobalPhonemanager& aGloblePhone, 
-                                   CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-                                   :CAtCommandBase(aGloblePhone,aCtsyDispatcherCallback)
-	{
-	LOGTEXT(_L8("CAtSmsStoreWrite::CAtSmsStoreWrite called"));
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreWrite::~CAtSmsStoreWrite
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreWrite::~CAtSmsStoreWrite()
-	{
-	LOGTEXT(_L8("CAtSmsStoreWrite::~CAtSmsStoreWrite called"));
-	delete iCallbackTimer;
-	iCallbackTimer = NULL;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreWrite::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreWrite* CAtSmsStoreWrite::NewLC(CGlobalPhonemanager& aGloblePhone, 
-                                          CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsStoreWrite* self = new (ELeave)CAtSmsStoreWrite(aGloblePhone, 
-                                                          aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreWrite::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CAtSmsStoreWrite* CAtSmsStoreWrite::NewL(CGlobalPhonemanager& aGloblePhone, 
-                                         CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	CAtSmsStoreWrite* self=CAtSmsStoreWrite::NewLC(aGloblePhone, 
-                                                   aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreWrite::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreWrite::ConstructL()
-	{
-	CAtCommandBase::ConstructL();
-	//Create Timer
-	iCallbackTimer = CCallbackTimer::NewL(*this);
-	//set writing timeout
-	iWriteTimeOut = KLtsyDefaultWriteTimeOut;
-	AddExpectStringL(KSmsEnterPduResponse);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreWrite::SeGsmSmsEntry
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreWrite::SeGsmSmsEntry(RMobileSmsStore::TMobileGsmSmsEntryV1 aMobileGsmEntry)
-	{
-	iMobileGsmEntry = aMobileGsmEntry;
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreWrite::StartRequest
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreWrite::StartRequest()
-	{
-	ExecuteCommand();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreWrite::ExecuteCommand
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreWrite::ExecuteCommand()
-	{
-	LOGTEXT(_L8("CAtSmsStoreWrite::ExecuteCommand callded"));
-	WriteMessage();
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreWrite::WriteMessage
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreWrite::WriteMessage()
-	{
-	LOGTEXT(_L8("CAtSmsStoreWrite::WriteMessage callded"));
-	iTxBuffer.Zero();
-	
-	RMobilePhone::TMobileAddress  msgSca = iMobileGsmEntry.iServiceCentre;
-	if( msgSca.iTelNumber.Length()!=0 )
-		{
-		//Here is a SCA
-		TInt ret = SmsAtUtil::AppendAddressToAscii(iMsgDataAscii,msgSca);
-		if( ret!=KErrNone )
-			{
-			BeginTimer();
-			iCallbackVal = ret;
-			return;
-			}
-		}
-	else 
-		{
-		//Here is no SCA,usign default SCA
-		iMsgDataAscii.Append(KDefaultSCA);
-		}
-	
-	const TInt msgDataAsciiLen(iMsgDataAscii.Length());
-	// Convert PDU to ASCII
-	SmsAtUtil::AppendDataToAscii(iMsgDataAscii,iMobileGsmEntry.iMsgData);
-	iState = ESetPDULengthComplete;
-	StartWritingPduLength();	
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreWrite::StartWritingPduLength
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreWrite::StartWritingPduLength()
-	{
-	LOGTEXT(_L8("CAtSmsStoreWrite::StartWritingPduLength called"));
-	TInt pduLen = iMobileGsmEntry.iMsgData.Length();
-	iTxBuffer.Zero();
-	iTxBuffer.Format(KSmsWriteLengthCommand,pduLen);
-	ClearBuffer();
-	iPhoneGlobals.iAtManager->SetSolicitedAtCommand(this);
-	iPhoneGlobals.iCommEngine->CommWrite(iTxBuffer);	
-	StartTimer(iWriteTimeOut);
-	}
-
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreWrite::StartWritingPdu
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreWrite::StartWritingPdu()
-	{
-	LOGTEXT(_L8("CAtSmsStoreWrite::StartWritingPdu called"));
-	iTxBuffer.Zero();
-	iTxBuffer.Append(iMsgDataAscii);
-	iTxBuffer.Append(KLtsyCtrlZChar);
-	ClearBuffer();
-	iPhoneGlobals.iAtManager->SetSolicitedAtCommand(this);
-	iPhoneGlobals.iCommEngine->CommWrite(iTxBuffer);	
-	StartTimer(iWriteTimeOut);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreWrite::EventSignal
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreWrite::EventSignal(TAtEventSource aEventSource, TInt aStatus)
-	{
-	LOGTEXT3(_L8("CAtSmsStoreWrite::EventSignal aStatus=%D iSource=%D"),aStatus,aEventSource);
-		
-	if(aStatus == KErrNone)
-		{
-		if((aEventSource == EWriteCompletion))
-			{
-			LOGTEXT(_L8("CAtSmsStoreWrite::EventSignal,EWriteCompletion!"));
-			return;
-			}
-		else
-			{
-			if( iState == ESetPDULengthComplete )
-				{
-	            if(iError==KErrNone)
-	            	{
-			    	iState = EWritePDUComplete;
-			    	Complete();
-			    	StartWritingPdu();
-			    	return;     
-	            	}
-				}
-			}
-		aStatus = iError;
-		}
-	Complete();
-	iPhoneGlobals.iEventSignalActive = EFalse;
-	iCtsyDispatcherCallback.CallbackPhonebookSmsStoreWriteEntryComp(aStatus,iLocation,EFalse);
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreWrite::ParseResponseL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreWrite::ParseResponseL(const TDesC8& /*aResponseBuf*/)
-	{
-    LOGTEXT(_L8("CAtSmsStoreWrite::ParseResponseL called!"));
-    if(iState == ESetPDULengthComplete) 
-	    {
-   	    if(CurrentLine().MatchF(KSmsEnterPduResponse) != KErrNotFound)
-	    	{
-	    	iError = KErrNone;
-	    	}
-	    else
-	    	{
-	    	iError = KErrNotFound;
-	    	}
-	    }
-    else
-    	{
-	    iError = KErrNone;	
-	    TPtrC8 responseBuf;
-	    responseBuf.Set(Buffer());
-		TInt pos = responseBuf.FindF(KCMGWResponseString);
-		if (pos == KErrNotFound)
-			{
-			LOGTEXT(_L8("CAtSmsStoreWrite::ParseResponseL\tError - Cannot find '+CMGW:' string"));
-			iError = KErrNotFound;
-			return;
-			}
-		pos += KCMGWResponseString().Length();
-		//skip a "space" start
-		while(!(TChar(responseBuf[pos]).IsDigit()))
-			{
-			++pos;
-			}
-		// Place the message reference number into buffer 
-		//(ie: everything after +CMGW: string)
-		TInt refPos = responseBuf.Length()-pos;
-		responseBuf.Set(responseBuf.Right(refPos));
-		
-		
-		TLex8 lex(responseBuf);
-		TUint16 val;
-		TInt ret = lex.Val(val,EDecimal);
-		if(ret != KErrNone)
-			{
-			iError = ret;
-			return;
-			}
-		iLocation = val;
-		LOGTEXT2(_L8("CAtSmsStoreWrite::ParseResponseL write index =%d"),iLocation);
-    	}
-	}
-
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreWrite::BeginTimer
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreWrite::BeginTimer()
-	{
-	LOGTEXT(_L8("CAtSmsStoreWrite::BeginTimer() called"));	
-	
-    if (iCallbackTimer->IsActive())
-    	{
-    	iCallbackTimer->Cancel();
-    	}
-	iCallbackTimer->After(KLtsyOnePause);	
-	}
-
-// ---------------------------------------------------------------------------
-// CAtSmsStoreWrite::TimerRun
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CAtSmsStoreWrite::TimerRun(TInt aError)
-	{
-	LOGTEXT(_L8("CAtSmsStoreWrite::TimerRun() called"));
-	if(aError == KErrNone)
-		{
-		Complete();
-		iPhoneGlobals.iEventSignalActive = EFalse;
-		iCtsyDispatcherCallback.CallbackPhonebookSmsStoreWriteEntryComp(
-				                iCallbackVal,iLocation,EFalse);
-		
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/atcommand/sms/src/smsatutil.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,447 +0,0 @@
-// 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:
-// @file smsatutil.cpp
-// This contains SmsAtUtil which is util for Sms At command
-// 
-
-// user include
-#include "smsatutil.h"
-#include "ltsycommondefine.h"
-#include "panic.h"
-
-/**
- * Receive PDU example 
- * 0891683108200805F0040D91683188902848F4000850208151754500108FD9662F4E0067616D4B8BD577ED4FE1
- * 08 ocet length including 91
- * 91 Identify Address Type
- * 683108200805F0 SCA address
- * 04
- * 0D91683188902848F4
- * 00
- * 08
- * 50208151754500
- * 10   
- * 8FD9662F4E0067616D4B8BD577ED4FE1
- */
-// ---------------------------------------------------------------------------
-// SmsAtUtil::ConvertAsciiToBinary
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt SmsAtUtil::ConvertAsciiToBinary(const TDesC8& aAscii,TDes8& aData)
-	{
-	aData.Zero();
-	TLex8 lex;
-	TUint8 val;
-	TInt ret;
-	const TInt count(aAscii.Length());
-	for(TInt i = 0;i < count;i = i + 2)
-		{
-		lex = aAscii.Mid(i,2);
-		ret = lex.Val(val,EHex);
-		if(ret != KErrNone)
-			{
-			return ret;
-			}
-		aData.Append(val);
-		}
-	return KErrNone;
-	}
-
-// -------------------------------------------------------------------------------
-// SmsAtUtil::AppendAddressToAscii
-// other items were commented in a header
-// -------------------------------------------------------------------------------
-TInt SmsAtUtil::AppendAddressToAscii(TDes8& aAscii,
-		                             const RMobilePhone::TMobileAddress& aAddress)
-	{
-	// Duplicate tel number, removing all the weird chars
-	TBuf<RMobilePhone::KMaxMobileTelNumberSize> telNumber;
-	const TInt count(aAddress.iTelNumber.Length());
-	// Validate the size of the supplied SCA
-    if(count >= RMobilePhone::KMaxMobileTelNumberSize)
-    	{
-    	return KErrOverflow;
-    	}
-	TInt i;
-	for(i = 0;i < count;++i)
-		{
-		if(IsAddressChar(TChar(aAddress.iTelNumber[i])))
-			telNumber.Append(aAddress.iTelNumber[i]);
-		}
-
-	const TInt telNumberLength(telNumber.Length());
-	
-	// Code Address-Length
-	AppendOctet(1 + (telNumberLength/2) + (telNumberLength%2),aAscii);
-
-	// Code Type-Of-Address
-	TInt typeOfNumber = ConvertTypeOfNumber(aAddress.iTypeOfNumber);
-	TInt numberingPlan = ConvertNumberingPlan(aAddress.iNumberPlan);
-	AppendOctet(0x80+(typeOfNumber<<4) + (numberingPlan),aAscii);
-
-	// Code Address-Value
-	TInt highSemiOctet;
-	TInt lowSemiOctet;
-	const TInt octets(telNumberLength/2);	// This division will be rounded down
-	for(i = 0; i < octets; ++i)
-		{
-		// See ETSI 03.40 section 9.1.2.3
-		// Address digits are coded into octets as pairs.
-		lowSemiOctet = ConvertAddressChar(TChar(telNumber[i*2]));
-		highSemiOctet = ConvertAddressChar(TChar(telNumber[(i*2)+1]));
-		AppendOctet((highSemiOctet<<4)+lowSemiOctet,aAscii);
-		}
-				
-	// If number of semi octects is odd then process the final octet
-	if(telNumberLength%2 == 1)		
-		{
-		lowSemiOctet = ConvertAddressChar(TChar(telNumber[telNumberLength-1]));
-		AppendOctet(0xf0+lowSemiOctet,aAscii);
-		}
-				
-	__ASSERT_DEBUG(aAscii.Length()%2 == 0,Panic(EATSmsUtilsOddNumberOfSemiOctets));
-	return KErrNone;
-	}
-
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::AppendDataToAscii
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void SmsAtUtil::AppendDataToAscii(TDes8& aAscii,const TDesC8& aData)
- 	{
-	const TInt count(aData.Length());
-	__ASSERT_DEBUG((aAscii.MaxLength()-aAscii.MaxLength())<=(count*2),Panic(EATSmsUtilsDescriptorOverflow));
-
-	for(TInt i = 0; i < count; ++i)
-		{
-		AppendOctet(aData[i],aAscii);
-		}
-		
-	__ASSERT_DEBUG(aAscii.Length()%2==0,Panic(EATSmsUtilsOddNumberOfSemiOctets));
-	}
-
-// ----------------------------------------------------------------------------------
-// SmsAtUtil::ReadAndRemoveAddressFromAscii
-// other items were commented in a header
-// ----------------------------------------------------------------------------------
-TInt SmsAtUtil::ReadAndRemoveAddressFromAscii(TDes8& aAscii,
-		                                      RMobilePhone::TMobileAddress& aAddress)
-	{
-	__ASSERT_DEBUG(aAscii.Length()%2==0,Panic(EATSmsUtilsOddNumberOfSemiOctets));
-	TInt ret(KErrNone);
-
-	ret = ReadAddressFromAscii(aAscii,aAddress);
-	
-	if(ret==KErrNone)
-		{
-		// Delete address from aAscii (using Address-length at start of string)
-		TLex8 lex(aAscii.Mid(0,2));
-		TUint val;
-		ret=lex.Val(val,EHex);
-		if(ret == KErrNone)
-			{
-			// +1 to include 1 octect of Address-Length 
-			val = val+1;		
-			
-			// double value to change from 'octets used' to 'ASCII chars used'
-			val = val*2;
-			
-			aAscii.Delete(0,val);		
-			__ASSERT_DEBUG(aAscii.Length()%2==0,Panic(EATSmsUtilsOddNumberOfSemiOctets));
-			}
-		}
-	return ret;
-	}
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::ReadAddressFromAscii
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt SmsAtUtil::ReadAddressFromAscii(const TDesC8& aAscii,
-		                             RMobilePhone::TMobileAddress& aAddress)
-	{
-	TLex8 lex;
-	TInt ret;
-	TUint8 val;
-	
-	// get address length + 1 octet Address Type(91)
-	lex = aAscii.Mid(0,2);
-	ret = lex.Val(val,EHex);
-	if(ret != KErrNone)
-		{
-		return ret;
-		}
-		
-	// we exclude the Address Type as address should not include this 
-	TInt addrLen = val-1;
-
-	// Type-Of-Number (see example above as 9)
-	lex = aAscii.Mid(2,1);
-	ret = lex.Val(val,EHex);
-	if(ret != KErrNone)
-		{
-		return ret;
-		}
-	
-	// Highest bit is not part of Type-Of-Number
-	aAddress.iTypeOfNumber = ConvertTypeOfNumber(val&0x07);	
-
-	// Number-Plan
-	lex = aAscii.Mid(3,1);
-	ret = lex.Val(val,EHex);
-	if(ret != KErrNone)
-		{
-		return ret;
-		}
-	
-	// we got Number-Plan which should be compatiable with Symbian defination
-	aAddress.iNumberPlan = ConvertNumberingPlan(val);
-	
-	// Address (loop for each octet ie. two hex chars from aAscii)
-	aAddress.iTelNumber.Zero();
-	for(TInt i = 0; i < addrLen; ++i)		
-		{
-		// Process semi-octet
-		lex = aAscii.Mid((i*2)+5,1);
-		ret = lex.Val(val,EHex);
-		if(ret != KErrNone)
-			{
-			return ret;
-			}
-		// 0xF is consider a pedding when the address length is odd number, so we do not need to append it to address field
-		if(val < 0xF)
-			aAddress.iTelNumber.Append(ConvertAddressChar(val));
-
-		// Process semi-octet
-		lex = aAscii.Mid((i*2)+4,1);
-		ret = lex.Val(val,EHex);
-		if(ret != KErrNone)
-			{
-			return ret;
-			}
-		
-		// 0xF is consider a pedding when the address length is odd number, so we do not need to append it to address field
-		if(val < 0xF)
-			aAddress.iTelNumber.Append(ConvertAddressChar(val));
-		}
-	return KErrNone;
-	}
-
-// ----------------------------------------------------------------------------------------
-// SmsAtUtil::ReadAndRemoveAddressFromPdu
-// other items were commented in a header
-// ----------------------------------------------------------------------------------------
-void SmsAtUtil::ReadAndRemoveAddressFromPdu(TPtrC8& aPdu, 
-		                                    RMobilePhone::TMobileAddress& aGsmServiceCentre)
-	{
-	const TUint8 KTONBitMask = 0x70;
-	const TUint8 KNPIBitMask = 0x0f;
-	const TUint8 KTONBitShift = 4;
-	const TUint8 KNPIBitShift = 0;
-	_LIT(KInternationalPrefix,"+");
-
-	aGsmServiceCentre.iTypeOfNumber = (RMobilePhone::TMobileTON)0;
-	aGsmServiceCentre.iNumberPlan = (RMobilePhone::TMobileNPI)0;
-	aGsmServiceCentre.iTelNumber.Zero();
-	
-	TUint8 len = aPdu[0];
-	
-	if(len == 0)
-		{
-		// A zero length SCA has been prepended - just strip this first byte off
-		aPdu.Set(aPdu.Mid(len+1));
-		return;
-		}
-
-	TUint8 numDes = aPdu[1];
-	aGsmServiceCentre.iTypeOfNumber = (RMobilePhone::TMobileTON)((numDes&KTONBitMask)>>KTONBitShift);
-	aGsmServiceCentre.iNumberPlan = (RMobilePhone::TMobileNPI)((numDes&KNPIBitMask)>>KNPIBitShift);
-
-	if(aGsmServiceCentre.iTypeOfNumber == RMobilePhone::EInternationalNumber)
-		aGsmServiceCentre.iTelNumber.Append(KInternationalPrefix);
-
-	TInt i;
-	TUint16 digit;
-	for(i = 2;i<(len+1);i++)
-		{
-		digit = (TUint16)((aPdu[i]&0x0f) + 0x30);
-		aGsmServiceCentre.iTelNumber.Append(digit);
-		digit = (TUint16)(((aPdu[i]&0xf0)>>4) + 0x30);
-		if(digit == 0x003f)		// 'F' is the padding digit at the end of a number
-			break;
-		aGsmServiceCentre.iTelNumber.Append(digit);
-		}
-	aPdu.Set(aPdu.Mid(len + 1));
-	}
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::IsAddressChar
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TBool SmsAtUtil::IsAddressChar(TChar aChar)
- 	{
-	if(aChar.IsDigit())
-		{
-		return ETrue;
-		}
-	if(aChar == TChar('*') ||
-	   aChar == TChar('#') ||
-	   aChar == TChar('a') ||
-	   aChar == TChar('b') ||
-	   aChar == TChar('c'))
-		{
-		return ETrue;
-		}
-	return EFalse;
-	}
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::ConvertNumberingPlan
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-RMobilePhone::TMobileNPI SmsAtUtil::ConvertNumberingPlan(TInt aValue)
-	{
-	switch(aValue)
-		{
-		// The below 'magic numbers' come from the ETSI 03.40
-		// specification for Address Fields (section 9.1.2.5)
-	case 1:
-		return RMobilePhone::EIsdnNumberPlan;
-	case 3:
-		return RMobilePhone::EDataNumberPlan;
-	case 4:
-		return RMobilePhone::ETelexNumberPlan;
-	case 8:
-		return RMobilePhone::ENationalNumberPlan;
-	case 9:
-		return RMobilePhone::EPrivateNumberPlan;
-	default:
-		return RMobilePhone::EUnknownNumberingPlan;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::ConvertTypeOfNumber
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-RMobilePhone::TMobileTON SmsAtUtil::ConvertTypeOfNumber(TInt aValue) 
-	{
-	switch(aValue)
-		{
-		// The below 'magic numbers' come from the ETSI 03.40
-		// specification for Address Fields (section 9.1.2.5)
-	case 0:		
-		return RMobilePhone::EUnknownNumber;
-	case 1:		
-		return RMobilePhone::EInternationalNumber;
-	case 2:
-		return RMobilePhone::ENationalNumber;
-	case 3:
-		return RMobilePhone::ENetworkSpecificNumber;
-	case 4:
-		return RMobilePhone::ESubscriberNumber;
-	default:
-		return RMobilePhone::EUnknownNumber;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::AppendOctet
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void SmsAtUtil::AppendOctet(TInt aOctet,TDes8& aAscii)
-	{
-	// Ensure client has only passed us a octet (ie. low 8 bits only)
-	aOctet = aOctet&0xff;
-	// Append octet 
-	// (prefix '0' if the octets value only uses one digit as final 
-    //  octet coding must use two digits)
-	if(aOctet <= 0x0f)
-		{
-		aAscii.Append(TChar('0'));
-		}
-	
-	aAscii.AppendNum(aOctet,EHex);
-	}
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::ConvertAddressChar
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt SmsAtUtil::ConvertAddressChar(TChar aChar)
- 	{
-	aChar.LowerCase();
-	if(aChar-TChar('0') <= 9)
-		{
-		// it should be digital number from 0~9
-		return aChar-TChar('0');
-		}
-	else if(aChar == TChar('*'))
-		{
-		return 10;
-		}
-	else if(aChar == TChar('#'))
-		{
-		return 11;
-		}
-	else if(aChar == TChar('a'))
-		{
-		return 12;
-		}
-	else if(aChar == TChar('b'))
-		{
-		return 13;
-		}
-	else if(aChar == TChar('c'))
-		{
-		return 14;
-		}
-	return 15;
-	}	
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::ConvertAddressChar
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TChar SmsAtUtil::ConvertAddressChar(TInt aBinary)
-	{
-	if(aBinary >= 0 && aBinary <= 9)
-		{
-		return aBinary + TChar('0');  	// Assumes digit characters are one after each other
-		}
-	else if(aBinary == 10)
-		{
-		return TChar('*');
-		}
-	else if(aBinary == 11)
-		{
-		return TChar('#');
-		}
-	else if(aBinary == 12)
-		{
-		return TChar('a');
-		}
-	else if(aBinary == 13)
-		{
-		return TChar('b');
-		}
-	else if(aBinary == 14)
-		{
-		return TChar('c');
-		}
-	return TChar(0);		// This is the cloest I can find to a NULL char 
-	}
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/bwins/licenseeskeletontsyu.def	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LTsyFactoryL@@YAPAVMLtsyFactoryBase@@XZ @ 1 NONAME ; class MLtsyFactoryBase * LTsyFactoryL(void)
-

--- a/cbsref/telephonyrefplugins/atltsy/bwins/stltsyu.def	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LTsyFactoryL@@YAPAVMLtsyFactoryBase@@XZ @ 1 NONAME ; class MLtsyFactoryBase * LTsyFactoryL(void)
-

--- a/cbsref/telephonyrefplugins/atltsy/comms/inc/commengine.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,305 +0,0 @@
-// 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:
-// @file commengine.h
-// This contains CCommEngine which manage access to serial port.
-// 
-
-#ifndef __CCOMMENGINE_H__
-#define __CCOMMENGINE_H__
-
-// system include
-#include <c32comm.h>
-#include <callbacktimer.h>
-
-// use include
-#include "mcommobserver.h"
-#include "globalphonemanager.h"
-
-// const defination
-const TInt KCommRxBufSize = 200;
-
-//Class forward
-class CCommWriter;
-class CCommReader;
-class CStringParser;
-
-/**
- * The class provide the functionalities to access the serials port, write and read to or from
- * serial port. It also provide the function to find one line of string and notify its observer. 
- * 
- */
-class CCommEngine : public CBase,
-					public MTimerObserver
-
-	{
-	friend class CCommWriter;
-	friend class CCommReader;
-public:
-	/**
-	 * Factory function
-	 * 
-	 * @param aBufferSize
-	 * @param aReadPriority
-	 * @param aWritePriority
-	 * @param aPortAccess
-	 */
-	static CCommEngine* NewL(TInt aBufferSize, 
-						TInt aReadPriority, 
-						TInt aWritePriority, 
-						TPortAccess& aPortAccess);
-	
-	/**
-	 * Factory function
-	 * 
-	 * @param aBufferSize
-	 * @param aReadPriority
-	 * @param aWritePriority
-	 * @param aPortAccess
-	 */
-	static CCommEngine* NewLC(TInt aBufferSize, 
-						TInt aReadPriority, 
-						TInt aWritePriority, 
-						TPortAccess& aPortAccess);
-	
-	/**
-	 * Destructor
-	 * 
-	 */
-	virtual ~CCommEngine();
-	
-public:
-	/**
-	 * Configure the serial port
-	 * 
-	 */
-	TInt ConfigurePort(TCommConfig aConfiguration);
-	
-	/**
-	 * Open the serial port
-	 * 
-	 * @param aDll
-	 * @param aName
-	 * @param aAccess
-	 */
-	TInt CommOpen(const TDesC& aDll, const TDesC& aName, TCommAccess aAccess);
-	
-	/**
-	 * Close the serial port
-	 * 
-	 */
-	void CommClose();
-	
-	/**
-	 * Cancel comm serail IO opeation
-	 * 
-	 */
-	void CommCancel();
-	
-	/**
-	 * Start serail IO writing
-	 * 
-	 */
-	void CommWrite(const TDesC8& aDes);
-	
-	/**
-	 * Serial port writing is ready
-	 * 
-	 */
-	void CommWriteReady();
-	
-	/**
-	 * Cancel serial writing
-	 * 
-	 */
-	void CommWriteCancel();
-	
-	/**
-	 * Start serail IO reading
-	 * 
-	 */
-	void CommRead();
-	
-	/**
-	 * Start to read
-	 * 
-	 */
-	void Read();
-	
-	/**
-	 * The read will return whatever the data have been received
-	 * 
-	 */
-	void CommReadOneOrMore();
-	
-	/**
-	 * Cancel reading
-	 */
-	void CommReadCancel();
-	
-	/**
-	 * Disconnect it from modem
-	 */
-	void Disconnect();
-	
-	/**
-	 * Drop the DTR
-	 */
-	void DropDtr();
-	
-	/**
-	 * Raise the DTR-- Data Terminal Ready
-	 */
-	void RaiseDTR();
-	
-	/**
-	 * Drop the RTS signal-- Request to send
-	 */
-	void DropRTS();
-	
-	/**
-	 * Raise the RTS signal
-	 */
-	void RaiseRTS();
-	
-	/**
-	 * Clean all the buffers
-	 */
-	void ResetBuffers();
-	
-	/**
-	 * Get the singnals
-	 */
-	TUint Signals();
-	
-	/**
-	 * Start the timer
-	 */
-	void StartTimer(TInt aSecond);
-	
-	/**
-	 * Stop the timer
-	 */
-	void StopTimer();
-	
-	/**
-	 * Reset all the buffers
-	 */
-	void ResetReadAndWriteBuffers();
-	
-	/**
-	 * Get the port shutdown timeout
-	 */
-	TInt GetPortShutdownTimeout();
-	
-	/**
-	 * Set the port shut down timeout
-	 */
-	TInt SetPortShutdownTimeout(TInt aTimeout);
-	
-	/**
-	 * Get the string parser
-	 */
-	CStringParser* GetStringParse() const;
-public:
-    /**
-     * Set the notifier for get the notificaiton when one line of string was found
-     */
-	void SetCommReadLineNotify(MCommReadLineNotifier *aReadLineNotify);
-	
-	/**
-	 * Set the comm engine observer
-	 */
-	void SetCommEngineObserver(MCommEngineObserver *aEngineObserver);
-public:
- 	/**
- 	 * Handle read complete event
- 	 */
-	virtual void CommReadComplete(TInt aStatus);
-	
-	/**
-	 * Handle write complete event
-	 */
-	virtual void CommWriteComplete(TInt aStatus);
-protected:
-    /**
-     * Constructor
-     */
-	CCommEngine(TPortAccess& aPortAccess);
-	
-	/**
-	 * 2nd constructor
-	 */
-	void ConstructL(TInt aBufferSize, TInt aReadPriority, TInt aWritePriority);	
-private:
-	/**
-	 * From MTimerObserver
-	 */
-    virtual void TimerRun(TInt aError);  
-    
-    /**
-     * Get the size of received buffer
-     */
-    TInt GetSizeOfRxBuffer();
-private:
-	/**
-	 * The comm server reference
-	 */
-	RCommServ iCommServer;
-	
-	/**
-	 * The comm port object
-	 */
-	RComm iCommPort;	
-	
-	/**
-	 * The active object for reading data from Baseband
-	 */
-	CCommReader *iCommReader;
-	
-	/**
-	 * The active object for writing AT command
-	 */
-	CCommWriter *iCommWriter;
-	
-	/**
-	 * The string parser
-	 */
-	CStringParser *iStringParse;
-	
-	/**
-	 * The engine observer
-	 */
-	MCommEngineObserver *iEngineObserver;
-	
-	/**
-	 * The received data
-	 */
-	TBuf8<KCommRxBufSize> iRxBuf;
-	
-	/**
-	 * The port specification
-	 */
-	TPortAccess& iPortAccess;
-    
-	/**
-	 * The timer active object. Used to record the time after a writing request is triggered.
-	 */
-	CCallbackTimer* iCallbackTimer;	
-	
-	/**
-	 * Check if the comm has been canceled.
-	 */	
-	TBool iCommCancel;
-	};
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/comms/inc/commreader.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-// 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:
-// CCommReader.
-// 
-
-#ifndef __COMMREADER_H__
-#define __COMMREADER_H__
-
-#include <e32base.h>
-
-class MCommObserver;
-class CCommEngine;
-
-class CCommReader : public CActive
-	{
-public:
-	CCommReader(CCommEngine* aComm, TInt aPriority);
-	virtual ~CCommReader();
-	void Activate();
-	TRequestStatus& StatusRef();
-protected:
-	virtual void RunL();
-	virtual void DoCancel();
-private:
-	CCommEngine* iComm; //Not owned
-	};
-
-
-#endif
-

--- a/cbsref/telephonyrefplugins/atltsy/comms/inc/commwriter.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-// 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:
-// CCommWriter.
-// 
-
-#ifndef __COMMWRITER_H__
-#define __COMMWRITER_H__
-
-#include<e32base.h>
-class MCommObserver;
-class CCommEngine;
-
-class CCommWriter : public CActive
-	{
-public:
-	CCommWriter(CCommEngine* aComm, TInt aPriority);
-	virtual ~CCommWriter();
-	void Activate();
-	TRequestStatus& StatusRef();
-protected:
-	virtual void RunL();
-	virtual void DoCancel();
-private:
-	CCommEngine* iComm; //Not owned
-	};
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/comms/inc/mcommobserver.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// MCommEngineObserve & MCommReadLineNotifier
-// 
-
-#ifndef __MCOMMOBSERVER_H__
-#define __MCOMMOBSERVER_H__
-
-//symtem include
-
-//user include 
-#include "ltsycommondefine.h"
-
-/**
- * Define the engine's observer
- * 
- */
-class MCommEngineObserver
-	{
-public:
-	/**
-	 * Notify the observer if any event happens
-	 * 
-	 */
-	virtual void ReadOrWriteComplete(TAtEventSource aEvent, TInt aStatus) = 0;
-	};
-
-/**
- * Define the notifer of one line string which has been found
- * 
- */
-class MCommReadLineNotifier
-	{
-public:
-	/**
-	 * Notify one line of string was found
-	 */
-	virtual TBool NotifyOneLineFoundL(TInt aStatus, const TDesC8& aLineBuf)=0;
-	};	
-
-#endif
\ No newline at end of file

--- a/cbsref/telephonyrefplugins/atltsy/comms/inc/stringparser.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-// 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:
-// CStringParser
-
-#ifndef STRINGPARSER_H_
-#define STRINGPARSER_H_
-
-//system include
-#include <e32base.h>
-
-//user include
-#include "mcommobserver.h"
-
-
-class CStringParser : public CBase
-	{
-public:
-	static CStringParser* NewL(TInt aBufferSize);
-	
-	static CStringParser* NewLC(TInt aBufferSize);
-	
-	virtual ~CStringParser();
-	
-public:
-	void ProcessReadString(const TDesC8& aReadString);
-	
-	TPtrC8 Buffer() const;
-	
-	TPtrC8 CurrentLine() const;
-	
-	void ClearBuffer();
-	
-	void ClearCurrentLine();
-	
-	//Must be call this function
-	void SetReadLineNotify(MCommReadLineNotifier* aNofity);
-	
-protected:
-	
-	CStringParser();
-	
-	void ConstructL(TInt aBufferSize);
-	
-	void CreateL(TInt aBufferSize);
-	
-private:
-	TText8 *iBuffer;
-	TText8 *iBufferEnd;
-	/**
-	* The last char added in the current line
-	*/
-	TText8 *iLastChar;
-	
-	/**
-	* The start of \r\n delimited line
-	*/
-	TText8 *iLineStart;
-	
-	/**
-	* Means if current char is a delimiter
-	*/
-	TBool iInDelimiter;
-	
-	/**
-	*
-	*/
-	MCommReadLineNotifier *iReadLineNotify; //Not owned
-	};
-
-#endif /*STRINGPARSER_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/comms/src/commengine.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,581 +0,0 @@
-// 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:
-// @file commengine.cpp
-// This contains CCommEngine which manage access to serial port.
-// 
-
-// user include
-#include "globalphonemanager.h"
-#include "commengine.h"
-#include "mslogger.h"
-#include "commreader.h"
-#include "commwriter.h"
-#include "mcommobserver.h"
-#include "stringparser.h"
-
-// const define
-const TInt KLtsyOneSecondPause = 1000000;
-
-// ---------------------------------------------------------------------------
-// CCommEngine::NewL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CCommEngine* CCommEngine::NewL(TInt aBufferSize, 
-					           TInt aReadPriority, 
-					           TInt aWritePriority, 
-					           TPortAccess& aPortAccess)
-	{
-	CCommEngine *self = CCommEngine::NewLC(aBufferSize, 
-										   aReadPriority, 
-										   aWritePriority, 
-										   aPortAccess);
-	CleanupStack::Pop(self);
-	
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::NewLC
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CCommEngine* CCommEngine::NewLC(TInt aBufferSize, 
-							    TInt aReadPriority, 
-							    TInt aWritePriority, 
-							    TPortAccess& aPortAccess)
-	{
-	CCommEngine* self = new (ELeave) CCommEngine(aPortAccess);
-	CleanupStack::PushL(self);
-	
-	self->ConstructL(aBufferSize, aReadPriority, aWritePriority);
-	
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::~CCommEngine
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CCommEngine::~CCommEngine()
-	{
-    delete iCommReader;
-	delete iCommWriter;
-	delete iStringParse;
-	delete iCallbackTimer;
-	iCommPort.Close();
-	iCommServer.Close();
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::CCommEngine
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CCommEngine::CCommEngine(TPortAccess& aPortAccess) 
-						:iPortAccess(aPortAccess)
-	{
-	iCommReader = NULL;
-	iCommWriter = NULL;
-	iEngineObserver = NULL;
-	iStringParse = NULL;
-	iCommCancel = EFalse;
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::ConstructL
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::ConstructL(TInt aBufferSize, TInt aReadPriority, TInt aWritePriority)
-	{
-	iCommReader = new (ELeave) CCommReader(this, aReadPriority);
-	iCommWriter = new (ELeave) CCommWriter(this, aWritePriority);	
-	iStringParse = CStringParser::NewL(aBufferSize);
-	iCallbackTimer = CCallbackTimer::NewL(*this);
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::ConfigurePort
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CCommEngine::ConfigurePort(TCommConfig aConfiguration)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CCommEngine::ConfigurePort()"));
-	if (iPortAccess == EPortAccessAllowed)
-		{
-		TInt ret;
-		TCommConfig cbuf;
-		TCommConfigV01 &cfg = cbuf();
-		
-		// Get the Configuration from current serial com port
-		iCommPort.Config(cbuf);
-	    
-		// set the configuration according to passed config data
-		TCommConfigV01 &newCfg = aConfiguration();
-		cfg.iRate = newCfg.iRate;
-		cfg.iDataBits = newCfg.iDataBits;
-		cfg.iStopBits = newCfg.iStopBits;
-		cfg.iParity = newCfg.iParity;
-		cfg.iHandshake = newCfg.iHandshake;
-		
-		// Set the Configuration
-		ret = iCommPort.SetConfig(cbuf);
-		if(ret != KErrNone)
-			{
-			LOGTEXT2(_L8("[Ltsy] CCommEngine:\tError %d configuring port"),ret);
-			return ret;
-			}
-		}
-	return KErrNone;	
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::Disconnect
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::Disconnect()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CCommEngine::Disconnect()"));
-	
-	if (iPortAccess == EPortAccessAllowed)
-		{
-		TCommConfig cbuf;
-		TCommConfigV01 &cfg = cbuf();
-		iCommPort.Config(cbuf);
-		cfg.iHandshake = KConfigFreeRTS	| KConfigFreeDTR;
-		TInt ret = iCommPort.SetConfig(cbuf);
-		if (ret == KErrNone)
-			{
-			iCommPort.SetSignalsToSpace(KSignalRTS | KSignalDTR);
-			}
-		}
-	
-	CommClose();
-	
-	iPortAccess = EPortAccessDenied;	
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::Read
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::Read()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CCommEngine::Read()"));
-	iCommCancel = EFalse;
-	if (iPortAccess == EPortAccessAllowed)
-		{
-		CommReadOneOrMore();
-		}
-	else
-		{
-		LOGTEXT(_L8("[Ltsy] Port Not Allow Access"));
-		}	
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::DropDtr
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::DropDtr()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CCommEngine::DropDtr()"));
-	
-	if (iPortAccess == EPortAccessAllowed)
-		{
-		LOGTEXT(_L8("[Ltsy] CCommEngine::DropDtr Dropping DTR"));
-		
-		iCommPort.SetSignals(0,KSignalDTR);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::RaiseDTR
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::RaiseDTR()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CCommEngine::RaiseDTR()"));
-	
-	if (iPortAccess == EPortAccessAllowed)
-		{
-		LOGTEXT(_L8("[Ltsy] CCommEngine::RaiseDTR Raising DTR"));
-		
-		iCommPort.SetSignals(KSignalDTR,0);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::DropRTS
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::DropRTS()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CCommEngine::DropRTS()"));
-	
-	if (iPortAccess == EPortAccessAllowed)
-		{
-		LOGTEXT(_L8("[Ltsy] Dropping RTS"));
-		
-		iCommPort.SetSignals(0,KSignalRTS);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::RaiseRTS
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::RaiseRTS()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CCommEngine::RaiseRTS()"));
-	
-	if (iPortAccess == EPortAccessAllowed)
-		{
-		LOGTEXT(_L8("[Ltsy] Raising RTS"));
-		
-		iCommPort.SetSignals(KSignalRTS,0);
-		}
-	}
-// ---------------------------------------------------------------------------
-// CCommEngine::ResetBuffers
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::ResetBuffers()
-	{
-	iCommPort.ResetBuffers();
-	}
-// ---------------------------------------------------------------------------
-// CCommEngine::Signals
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TUint CCommEngine::Signals()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CCommEngine::Signals()"));
-	
-	return iCommPort.Signals();
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::ResetReadAndWriteBuffers
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::ResetReadAndWriteBuffers()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CCommEngine::ResetReadAndWriteBuffers()"));
-	
-	iCommPort.ResetBuffers();
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::GetSizeOfRxBuffer
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CCommEngine::GetSizeOfRxBuffer()
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CCommEngine::GetSizeOfRxBuffer()"));
-	
-	return iCommPort.QueryReceiveBuffer();
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::GetPortShutdownTimeout
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CCommEngine::GetPortShutdownTimeout()
-	{
-	if (iPortAccess == EPortAccessAllowed)
-		{
-		TCommConfig2 cbuf;
-		TCommConfigV02& cfg = cbuf();
-		// Get the Configuration
-		iCommPort.Config(cbuf);				
-
-		return (cfg.iTxShutdownTimeout);
-		}
-	else
-		{
-		return (0);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::SetPortShutdownTimeout
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CCommEngine::SetPortShutdownTimeout(TInt aTimeout)
-	{
-	if (iPortAccess == EPortAccessAllowed)
-		{
-		TCommConfig2 cbuf;
-		TCommConfigV02 &cfg = cbuf();
-		
-		//Get the Configuration
-		iCommPort.Config(cbuf);
-	
-		//Set the Configuration
-		cfg.iTxShutdownTimeout = aTimeout;
-		return (iCommPort.SetConfig(cbuf));
-		}
-	else
-		{
-		return KErrAccessDenied;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::CommOpen
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt CCommEngine::CommOpen(const TDesC& aDll, const TDesC& aName, TCommAccess aMode)
-	{
-	TInt err;
-	if (err = iCommServer.Connect(), err!=KErrNone)
-		return err;
-		
-	// load serial comm module
-	if (aDll.Length()>0)
-		{
-		if (err = iCommServer.LoadCommModule(aDll), err!=KErrNone)
-			{
-			iCommServer.Close();
-			return err;
-			}
-		}
-	
-	// start to open the serial com with ECommShared model
-	if (aMode==ECommShared)
-		{
-		if (err = iCommPort.Open(iCommServer, aName, aMode), err!=KErrNone)
-			{
-			iCommServer.Close();
-			return err;
-			}
-		}
-		
-	return KErrNone;
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::CommClose
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::CommClose()
-	{
-	iCommReader->Cancel();
-	iCommWriter->Cancel();
-	iCommPort.Close();
-	iCommServer.Close();
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::CommWrite
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::CommWrite(const TDesC8& aDes)
-	{
-    LOGTEXT(_L8("[Ltsy] Starting CCommEngine::CommWrite()"));
-    LOGTEXTREL2(_L8("Tx:\t%S"),&aDes);
-    
-	iCommPort.Write(iCommWriter->StatusRef(), aDes);
-	iCommWriter->Activate();
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::CommRead
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::CommRead()
-	{
-	iCommPort.Read(iCommReader->StatusRef(), iRxBuf, iRxBuf.Length());
-	iCommReader->Activate();
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::CommReadOneOrMore
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::CommReadOneOrMore()
-	{
-	if(!iCommCancel)
-		{
-		iCommPort.ReadOneOrMore(iCommReader->StatusRef(), iRxBuf);
-		iCommReader->Activate();
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::CommCancel
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::CommCancel()
-	{
-	iCommCancel = ETrue;
-	if(iCallbackTimer->IsActive())
-	    {
-		iCallbackTimer->Cancel();
-		}
-		
-	if (NULL != iCommWriter)
-		{
-		iCommWriter->Cancel();
-		}
-	
-	if (NULL != iCommReader)
-		{
-		iCommReader->Cancel();
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::CommWriteCancel
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::CommWriteCancel()
-	{
-	if(iCallbackTimer->IsActive())
-	    {
-		iCallbackTimer->Cancel();
-		}
-		
-	if (NULL != iCommWriter)
-		{
-		iCommWriter->Cancel();
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::CommReadCancel
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::CommReadCancel()
-	{
-	if(iCallbackTimer->IsActive())
-	    {
-		iCallbackTimer->Cancel();
-		}
-		
-	if (NULL != iCommReader)
-		{
-		iCommReader->Cancel();
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::CommReadComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::CommReadComplete(TInt aStatus)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CCommEngine::CommReadComplete()"));
-	LOGTEXT2(_L8("[Ltsy] aStatus = %d"), aStatus);
-	LOGTEXT2(_L8("Received %d"),iRxBuf.Length());
-	LOGTEXTREL2(_L8("Rx:\t%S"),&iRxBuf);
-		
-	if (KErrNone == aStatus)
-		{
-		if (NULL != iStringParse)
-			{
-			iStringParse->ProcessReadString(iRxBuf);
-			}
-			
-		CommReadOneOrMore();	
-		}
-	else
-		{
-		if (NULL != iEngineObserver)
-			{
-			iEngineObserver->ReadOrWriteComplete(EReadCompletion, aStatus);
-			}
-		}
-	LOGTEXT(_L8("[Ltsy] End CCommEngine::CommReadComplete()"));
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::CommWriteComplete
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::CommWriteComplete(TInt aStatus)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CCommEngine::CommWriteComplete()"));
-	LOGTEXT2(_L8("[Ltsy] aStatus = %d"), aStatus);
-	if(iCallbackTimer->IsActive())
-	    {
-		iCallbackTimer->Cancel();
-		}
-		
-	if (NULL != iEngineObserver)
-		{
-		iEngineObserver->ReadOrWriteComplete(EWriteCompletion, aStatus);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::GetStringParse
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-CStringParser* CCommEngine::GetStringParse() const
-	{
-	return iStringParse;
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::SetCommReadLineNotify
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::SetCommReadLineNotify(MCommReadLineNotifier *aReadLineNotify)
-	{
-	iStringParse->SetReadLineNotify(aReadLineNotify);
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::SetCommEngineObserver
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::SetCommEngineObserver(MCommEngineObserver *aEngineObserver)
-	{
-	iEngineObserver = aEngineObserver;
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::TimerRun
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::TimerRun(TInt aError)
-    {
-	if(aError == KErrNone)
-	    {
-		iEngineObserver->ReadOrWriteComplete(ETimeoutCompletion, KErrTimedOut);
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::StartTimer
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::StartTimer(TInt aSeconds)
-    {
-    if (iCallbackTimer->IsActive())
-    	{
-    	iCallbackTimer->Cancel();
-    	}
-	iCallbackTimer->After(aSeconds*KLtsyOneSecondPause);
-	}
-
-// ---------------------------------------------------------------------------
-// CCommEngine::StopTimer
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void CCommEngine::StopTimer()	
-    {
-	iCallbackTimer->Cancel();
-	}
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/comms/src/commreader.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-// 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:
-// CCommReader.
-// 
-
-//user include
-#include "commreader.h"
-#include "mcommobserver.h"
-#include "commengine.h"
-
-//Class CCommReader
-
-CCommReader::CCommReader(CCommEngine* aComm, TInt aPriority)
-	: CActive(aPriority), iComm(aComm)
-	{
-	CActiveScheduler::Add(this);
-	}
-	
-CCommReader::~CCommReader()
-	{
-	Cancel();
-	}
-
-void CCommReader::RunL()
-	{
-	iComm->CommReadComplete(iStatus.Int());
-	}
-
-void CCommReader::DoCancel()
-	{
-	iComm->iCommPort.ReadCancel();
-	}
-
-void CCommReader::Activate()
-	{
-	SetActive();
-	}
-
-TRequestStatus& CCommReader::StatusRef()
-	{ 
-	return iStatus; 
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/comms/src/commwriter.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-// 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:
-// CCommWriter.
-// 
-
-//user include
-#include "commwriter.h"
-#include "mcommobserver.h"
-#include "commengine.h"
-
-// CCommWriter
-
-CCommWriter::CCommWriter(CCommEngine* aComm, TInt aPriority)
-	: CActive(aPriority), iComm(aComm)
-	{
-	CActiveScheduler::Add(this);
-	}
-
-CCommWriter::~CCommWriter()
-	{
-	Cancel();
-	}
-
-void CCommWriter::RunL()
-	{
-	iComm->CommWriteComplete(iStatus.Int());
-	}
-
-void CCommWriter::DoCancel()
-	{
-	iComm->iCommPort.WriteCancel();
-	}
-
-void CCommWriter::Activate() 
-	{ 
-	SetActive(); 
-	}
-
-TRequestStatus& CCommWriter::StatusRef() 
-	{ 
-	return iStatus; 
-	}
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/comms/src/stringparser.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-// 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:
-// CStringParser.
-// 
-
-//user include
-#include "stringparser.h"
-#include "mslogger.h"
-
-CStringParser* CStringParser::NewL(TInt aBufferSize)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CStringParser::NewL()"));
-	
-	CStringParser* self = CStringParser::NewLC(aBufferSize);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-CStringParser* CStringParser::NewLC(TInt aBufferSize)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CStringParser::NewLC()"));
-	
-	CStringParser* self = new (ELeave) CStringParser;
-	CleanupStack::PushL(self);
-	self->ConstructL(aBufferSize);
-	return self;
-	}
-
-CStringParser::~CStringParser()
-	{
-	User::Free(iBuffer);
-	}
-
-CStringParser::CStringParser()
-	{
-	}
-
-void CStringParser::ConstructL(TInt aBufferSize)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CStringParser::ConstructL()"));
-	CreateL(aBufferSize);
-	}
-
-TPtrC8 CStringParser::Buffer() const
-	{
-	return TPtrC8(iBuffer, iLastChar-iBuffer);
-	}
-
-TPtrC8 CStringParser::CurrentLine() const
-	{
-	TInt len=iLastChar-iLineStart;
-	if (len>0 && iInDelimiter)
-		len-=1;
-	return TPtrC8(iLineStart, len);	
-	}
-
-void CStringParser::ClearBuffer()
-	{
-	iLastChar = iBuffer;
-	iLineStart = iBuffer;
-	iInDelimiter = ETrue;	
-	}
-
-//
-// Remove current line, which is always at the end of the buffer
-//
-void CStringParser::ClearCurrentLine()
-	{
-	iLastChar = iLineStart;
-	iInDelimiter = ETrue;	
-	}
-
-void CStringParser::CreateL(TInt aBufSize)
-	{
-	iBuffer = (TText8*)User::AllocL(aBufSize);
-	iBufferEnd = (iBuffer+aBufSize)-1;
-	ClearBuffer();
-	}
-
-
-void CStringParser::SetReadLineNotify(MCommReadLineNotifier* aNofity)
-	{
-	iReadLineNotify = aNofity;
-	}
-
-
-void CStringParser::ProcessReadString(const TDesC8& aReadString)
-	{
-	LOGTEXT(_L8("[Ltsy] Starting CStringParse::ProcessReadString()"));
-	LOGTEXT2(_L8("[Ltsy] Read String = %S"), &aReadString);
-	for (TInt nBufferOffset = 0; nBufferOffset < aReadString.Length(); nBufferOffset++)
-		{
-		TText8 tChar = aReadString[nBufferOffset];
-		
-		// we have already found a char which is a delimiter of the Line
-        // so would dismiss any of delimiter following this one already found		
-		if (iInDelimiter && (tChar == '\r' || tChar == '\n'))
-			{
-			continue;
-			}
-		
-		// move on lastchar
-		*iLastChar++ = tChar;
-		// Diacarding characters if our buffer was overflowed
-		if (iLastChar >= iBufferEnd)
-			{
-			iLastChar = iBufferEnd;
-			}
-        // we anyway to find out the delimiter and notify the obser the line was found 		
-		if (tChar == '\r' || tChar == '\n')
-			{
-			iInDelimiter = ETrue;
-			TPtrC8 tLine(CurrentLine());
-			LOGTEXT2(_L8("[Ltsy] Line Content = %S"), &tLine);
-			TRAPD(err, iReadLineNotify->NotifyOneLineFoundL(KErrNone, tLine));
-			if (err != KErrNone)
-				{
-				ClearCurrentLine();
-				}
-			}
-		else
-			{
-			if(iInDelimiter) // the last char is a delimiter
-			    {
-				iInDelimiter=EFalse;
-			    iLineStart=iLastChar-1;	
-			    if(tChar == '>')
-			    	{
-			    	TPtrC8 tLine(CurrentLine());
-			    	TRAPD(err, iReadLineNotify->NotifyOneLineFoundL(KErrNone, tLine));
-					if (err != KErrNone)
-						{
-						ClearCurrentLine();
-						}			    	
-			    	}
-				}   
-			}
-		}
-	LOGTEXT(_L8("[Ltsy] End CStringParse::ProcessReadString()"));
-	}
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/config/AT-LTSY(default).cfg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2756 +0,0 @@
-############################################################
-## AUTO-GENERATED CONFIGURATION FILE
-## CommsDat Database Dump Utility
-## 1.1
-############################################################
-
-############################################################
-## Network
-## 
-[Network]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Intranet
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=mRouter
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Vodafone
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=Orange
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=O2
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=TMobile
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=Airtel
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=Hutch
-	FIELD_COUNT=1
-END_ADD
-
-
-############################################################
-## ModemBearer
-## 
-[ModemBearer]
-ADD_TEMPLATE
-	Name=Default Modem
-	IfName=PPP
-	PortName=COMM::9
-	TSYName=phonetsy
-	CSYName=ECUART
-	LastSocketActivityTimeout=600
-	LastSessionClosedTimeout=600
-	LastSocketClosedTimeout=600
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=57600
-	Handshaking=0
-	SpecialRate=0
-	XonChar=0
-	XoffChar=0
-	FaxClassPref=AUTO
-	SpeakerPref=NEVER
-	SpeakerVolPref=QUIET
-	ModemInitString=AT
-	DataInitString=AT
-	FaxInitString=AT
-	IspInitString=*99***1#
-	DialPauseLength=S8=
-	SpeakerVolContorlLow=L0
-	SpeakerVolControlMedium=L1
-	SpeakerVolControlHigh=L2
-	SpeakerAlwaysOff=M0
-	SpeakerOnUntilCarrier=M1
-	SpeakerAlwaysOn=M2
-	SpeakerOnAfterUntilCarrier=M3
-	DialToneWaitModifier=W
-	CallProgress1=X1
-	CallProgress2=X2
-	CallProgress3=X3
-	CallProgress4=X4
-	EchoOff=E0
-	VerboseText=V1
-	QuietOff=Q0
-	QuietOn=Q1
-	DialCommandStateModifier=;
-	OnLine=O
-	ResetConfiguration=Z
-	ReturnToFactoryDefs=&F
-	DCDOnDuringLink=&C1
-	DTRHangUp=&D2
-	DSRAlwaysOn=&S0
-	RTSCTSHandshake=&K3
-	XonXoffHandshake=&K4
-	EscapeCharacter=+
-	EscapeGuardPeriod=S12
-	NoDialTone=NO DIAL TONE
-	Busy=BUSY
-	NoAnswer=NO ANSWER
-	Carrier=CARRIER
-	Connect=CONNECT
-	CompressionClass5=COMPRESSION:CLASS 5
-	CompressionV42bis=COMPRESSION:V.42 bis
-	CompressionNone=COMPRESSION:NONE
-	ProtocolLAPD=PROTOCOL:LAPD
-	ProtocolALT=PROTOCOL:ALT
-	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
-	ProtocolNone=PROTOCOL:NONE
-	MessageCentreNumber=+44123456789
-	MessageValidityPeriod=1440
-	MessageDeliveryReport=FALSE
-	MinimumSignalLevel=9905
-	CommRole=0
-	ControlChannelPortName=COMM::0
-	SIRSettings=0
-	Agent=psd.agt
-	FIELD_COUNT=71
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=GsmPhone1
-	Rate=150
-	Handshaking=4
-	XonChar=17
-	XoffChar=19
-	MessageCentreNumber=+447973100973
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=NTRAS (Com0) Null Modem 115200bps
-	Rate=600
-	PortName=COMM::7
-	TSYName=NTRAS
-	Handshaking=4
-	MessageDeliveryReport=TRUE
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=NTRAS (Com1) Null Modem 115200bps
-	Rate=2400
-	TSYName=NTRAS
-	Handshaking=4
-	MessageDeliveryReport=TRUE
-	FIELD_COUNT=5
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=CommModem
-	IfName=PPP
-	PortName=COMM::0
-	Rate=115200
-	TSYName=phonetsy
-	CSYName=ECUART
-	LastSocketActivityTimeout=300
-	LastSessionClosedTimeout=300
-	LastSocketClosedTimeout=300
-	Handshaking=4
-	MessageCentreNumber=+447785016005
-	ControlChannelPortName=COMM::0
-	Agent=PSD.agt
-	FIELD_COUNT=13
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=SimulatorPhone
-	Rate=4800
-	PortName=COMM::9
-	TSYName=SIM
-	Handshaking=196
-	XonChar=17
-	XoffChar=19
-	ModemInitString=ATZ
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=GsmPhone3
-	Rate=7200
-	PortName=COMM::9
-	Handshaking=4
-	XonChar=17
-	XoffChar=19
-	ModemInitString=ATZ
-	MessageCentreNumber=+447973100973
-	Agent=PSD.agt
-	FIELD_COUNT=9
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=GsmPhone4
-	PortName=COMM::9
-	TSYName=DMM
-	Rate=19200
-	Handshaking=196
-	XonChar=17
-	XoffChar=19
-	ModemInitString=ATZ
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=mRouterWinsBearer
-	Rate=38400
-	PortName=WINS::0
-	CSYName=WINSCSY
-	LastSocketActivityTimeout=9999
-	LastSessionClosedTimeout=180
-	LastSocketClosedTimeout=30
-	Handshaking=4
-	Agent=mRouterAgent.agt
-	FIELD_COUNT=9
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=mRouterUsbBearer
-	Rate=150
-	PortName=ACM::0
-	CSYName=ECACM
-	LastSocketActivityTimeout=9999
-	LastSessionClosedTimeout=180
-	LastSocketClosedTimeout=30
-	Handshaking=4
-	Agent=mRouterAgent.agt
-	FIELD_COUNT=9
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=trpat_psd
-	Rate=600
-	IfName=rawip
-	PortName=not used
-	TSYName=TRPAT
-	CSYName=CSY27010
-	LastSocketActivityTimeout=300
-	LastSessionClosedTimeout=300
-	LastSocketClosedTimeout=300
-	Handshaking=4
-	MessageCentreNumber=+447785016005
-	BCAStack=C32Bca
-	Agent=trp.agt
-	FIELD_COUNT=13
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 12
-	Name=CommModem
-	PortName=COMM::0
-	Rate=115200
-	TSYName=phonetsy
-	CSYName=ECUART
-	LastSocketActivityTimeout=300
-	LastSessionClosedTimeout=300
-	LastSocketClosedTimeout=300
-	Handshaking=4
-	MessageCentreNumber=+447785016005
-	Agent=csd.agt
-	FIELD_COUNT=11
-END_ADD
-
-# AndyS Modem on PC COM 3 [COMM::2]
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=CommModem
-	PortName=COMM::0
-	TSYName=phonetsy
-	Rate=115200
-	ModemInitString=ATZ
-	Agent=csd.agt
-	FIELD_COUNT=6
-END_ADD
-
-############################################################
-## LANBearer
-## 
-[LANBearer]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Ethernet 001
-	IfName=ethint
-	LDDFilename=enet
-	LDDName=Ethernet
-	PDDFilename=ethernet
-	PDDName=ethernet.wins
-	PacketDriverName=EtherPkt.drv
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=nullagt.agt
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Ethernet 002
-	IfName=ethint
-	LDDName=EtherCard
-	PDDName=EtherWins
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=nullagt.agt
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## Location
-## 
-[Location]
-ADD_TEMPLATE
-	Name=Default Location
-	IntlPrefixCode=+
-	NatPrefixCode=0
-	NatCode=44
-	AreaCode=44
-	DialOutCode=44
-	DisableCallWaitingCode=44
-	Mobile=TRUE
-	UsePulseDial=FALSE
-	WaitForDialTone=FALSE
-	PauseAfterDialout=0
-	FIELD_COUNT=11
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Office
-	IntlPrefixCode=00
-	AreaCode=171
-	DialOutCode=9,
-	DisableCallWaitingCode=9,
-	Mobile=FALSE
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Office Direct Dial
-	IntlPrefixCode=00
-	AreaCode=171
-	DialOutCode=171
-	DisableCallWaitingCode=171
-	Mobile=FALSE
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=Mobile
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=Home
-	IntlPrefixCode=00
-	AreaCode=181
-	DialOutCode=181
-	DisableCallWaitingCode=181
-	Mobile=FALSE
-	UsePulseDial=TRUE
-	WaitForDialTone=TRUE
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## Chargecard
-## 
-[Chargecard]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Dummy BT Chargecard
-	AccountNumber=144,12345678
-	Pin=0000
-	LocalRule=HG
-	NatRule=HFG
-	IntlRule=HEFG
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Dummy Mercury Chargecard
-	AccountNumber=0500800800,,12345678
-	Pin=****
-	LocalRule=HG
-	NatRule=J,K,0FG
-	IntlRule=HEFG
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## DialOutISP
-## 
-[DialOutISP]
-ADD_TEMPLATE
-	Name=Default Dial Out ISP
-	DialResolution=TRUE
-	UseLoginScript=FALSE
-	PromptForLogin=TRUE
-	DisplayPCT=FALSE
-	IfPromptForAuth=TRUE
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	BearerService=0
-	BearerProtocol=UNSPECIFIED
-	RlpVersion=0
-	IwfToMs=0
-	MsToIwf=0
-	AckTimer=0
-	RetransmissionAttempts=0
-	ResequencePeriod=0
-	V42Compression=0
-	V42Codewords=0
-	V42MaxLength=0
-	Asymmetry=0
-	UserInitUpgrade=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=28
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Pipex CSD
-	Description=Pipex Service Provider
-	Type=INTERNETONLY
-	DefaultTelNum=08450885336
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=solabf75
-	IfAuthPass=oodifama
-	AuthRetries=0
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=158.43.128.1
-	IpNameServer2=158.43.192.1
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=21
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=NT RAS
-	Description=Test
-	Type=INTERNETONLY
-	UseLoginScript=TRUE
-	LoginScript=CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n
-	PromptForLogin=FALSE
-	IfNetworks=ip,ip6
-	IfPromptForAuth=FALSE
-	IfAuthName=RasUser
-	IfAuthPass=pass
-	AuthRetries=0
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=19
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=WSP Test CSD
-	Description=Symbian WSP Test Server
-	Type=INTERNETANDWAP
-	DefaultTelNum=02071541211
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=wapusr
-	IfAuthPass=train2
-	AuthRetries=0
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=158.43.128.1
-	IpNameServer2=158.43.192.1
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=21
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=Auth CSD
-	Description=Authentication Service Provider
-	Type=INTERNETONLY
-	DefaultTelNum=+358331520777
-	UseLoginScript=TRUE
-	PromptForLogin=FALSE
-	LoginName=mailtst1
-	LoginPass=mailtest1
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=mailtst1
-	IfAuthPass=mailtest1
-	AuthRetries=0
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	UseEdge=TRUE
-	FIELD_COUNT=22
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=IP6 Dial Test
-	Description=4th Floor Test Lab
-	Type=INTERNETONLY
-	DefaultTelNum=02071541455
-	PromptForLogin=FALSE
-	IfNetworks=ip,ip6
-	IfPromptForAuth=FALSE
-	IfAuthName=ipv6test
-	IfAuthPass=Symbian
-	AuthRetries=0
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=192.168.10.2
-	IpNameServer2=192.168.20.2
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=21
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=USIM Test NT RAS
-	Type=INTERNETONLY
-	UseLoginScript=TRUE
-	LoginScript=CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=RasUser
-	IfAuthPass=pass
-	FIELD_COUNT=9
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=CityOnlines CSD India
-	Description=CityOnlines Indian Service Provider
-	Type=INTERNETONLY
-	DefaultTelNum=+9180172388
-	UseLoginScript=TRUE
-	PromptForLogin=FALSE
-	LoginName=ktl1@blr.cityonlines.com
-	LoginPass=1234
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=ktl1
-	IfAuthPass=1234
-	AuthRetries=0
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	UseEdge=TRUE
-	FIELD_COUNT=22
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=Vodafone WAP GSM
-	Description=Vodafone WAP GSM
-	Type=INTERNETANDWAP
-	DefaultTelNum=+447836900808
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=user@vodafone.net
-	IfAuthPass=user
-	AuthRetries=0
-	BearerProtocol=V110
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=Orange WAP GSM
-	Description=Orange WAP GSM
-	Type=INTERNETANDWAP
-	DefaultTelNum=+447973100500
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=Orange
-	IfAuthPass=Multimedia
-	AuthRetries=0
-	BearerProtocol=V110
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=O2 WAP GSM
-	Description=O2 WAP GSM
-	Type=INTERNETANDWAP
-	DefaultTelNum=+447712927927
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=O2wap
-	IfAuthPass=password
-	AuthRetries=0
-	BearerProtocol=V110
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 12
-	Name=Test Network CSD
-	Description=Symbian Test Network
-	Type=INTERNETONLY
-	DefaultTelNum=02071541259
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=Systemtest09
-	IfAuthPass=l33ds
-	AuthRetries=0
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=18
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=IP6 Dial Test
-	Description=Symbian Test Network
-	Type=INTERNETONLY
-	DefaultTelNum=02077248525
-	PromptForLogin=FALSE
-	IfNetworks=ip,ip6
-	IfPromptForAuth=FALSE
-	IfAuthName=ipv6test
-	IfAuthPass=Symbian
-	AuthRetries=0
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=192.168.10.2
-	IpNameServer2=192.168.20.2
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=21
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 14
-	Name=mRouterDialOutIsp
-	Description=mRouterDialOutIsp
-	Type=INTERNETONLY
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=IfAuthPass=
-	IfAuthPass=AuthRetries=0
-	AuthRetries=0
-	FIELD_COUNT=9
-END_ADD
-
-
-############################################################
-## DialInISP
-## 
-[DialInISP]
-ADD_TEMPLATE
-	Name=Default Dial In ISP
-	UseLoginScript=FALSE
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=9
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Dial In ISP01
-	FIELD_COUNT=1
-END_ADD
-
-
-############################################################
-## OutgoingGPRS
-## 
-[OutgoingGPRS]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Vodafone GPRS
-	APN=internet
-	PDPType=IPV4
-	ReqPrecedence=0
-	ReqDelay=0
-	ReqReliability=0
-	ReqPeakThroughput=0
-	ReqMeanThroughput=0
-	MinPrecedence=0
-	MinDelay=0
-	MinReliability=0
-	MinPeakThroughput=0
-	MinMeanThroughput=0
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=web
-	IfAuthPass=web
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpAddr=0.0.0.0
-	IpDNSAddrFromServer=TRUE
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=33
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Vodafone WAP GPRS
-	APN=wap.vodafone.co.uk
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=wap
-	IfAuthPass=wap
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpAddr=0.0.0.0
-	IpDNSAddrFromServer=TRUE
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=33
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Orange GPRS
-	APN=orangeinternet
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=29
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=Orange WAP GPRS
-	APN=orangewap
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=29
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=O2 GPRS
-	APN=mobile.o2.co.uk
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=web
-	IfAuthPass=password
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=0.0.0.0
-	IpNameServer2=0.0.0.0
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=34
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=O2 WAP GPRS
-	APN=wap.o2.co.uk
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=o2wap
-	IfAuthPass=o2wap
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=0.0.0.0
-	IpNameServer2=0.0.0.0
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=34
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=Hutch GPRS
-	APN=portalnmms
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	AuthRetries=1
-	IpGateway=10.10.1.100
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=28
-END_ADD
-
-
-############################################################
-## IncomingGPRS
-## 
-[IncomingGPRS]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Incoming GPRS Settings PlaceHolder
-	APN=Test
-	PDPType=IPV4
-	PDPAddress=0.0.0.0
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=1
-	MinDelay=1
-	MinReliability=1
-	MinPeakThroughput=1
-	MinMeanThroughput=1
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=RasUser
-	IfAuthPass=pass
-	AuthRetries=1
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=0.0.0.0
-	IpNameServer2=0.0.0.0
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	FIELD_COUNT=29
-END_ADD
-
-
-############################################################
-## DefaultGPRS
-## 
-[DefaultGPRS]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Dummy Default GPRS Settings
-	Usage=1
-	APN=Access point name
-	PDPType=IPV6
-	PDPAddress=www.wid.com
-	Precedence=1
-	Delay=150
-	Reliability=1
-	PeakThroughput=1
-	MinReliability=1
-	MinPeakThroughput=1
-	MinMeanThroughput=1
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=TRUE
-	FIELD_COUNT=16
-END_ADD
-
-
-############################################################
-## LANService
-## 
-[LANService]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=IP4 DHCP Ethernet
-	IfNetworks=ip
-	IpNetMask=255.255.252.0
-	IpGateway=10.192.203.254
-	IpAddrFromServer=TRUE
-	IpAddr=10.192.200.59
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=10.192.59.6
-	IpNameServer2=10.192.58.49
-	ConfigDaemonManagerName=NetCfgExtnDhcp
-	ConfigDaemonName=!DhcpServ
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=IP6 Ethernet
-	IfNetworks=ip,ip6
-	IpNetMask=255.255.255.0
-	IpGateway=194.72.6.1
-	IpAddrFromServer=TRUE
-	IpAddr=192.168.0.100
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=192.168.10.2
-	IpNameServer2=192.168.20.2
-	FIELD_COUNT=9
-END_ADD
-
-
-############################################################
-## APPrioritySelectionPolicyTable
-## 
-[APPrioritySelectionPolicyTable]
-ADD_SECTION
-# COMMDB_ID = 254
-	Id=20000
-	Name=APSelPolNetworkDefault
-	AP1=Link.AccessPointTable.10001
-	APCOUNT=1
-	FIELD_COUNT=4
-END_ADD
-
-
-############################################################
-## TierTable
-## 
-[TierTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Id=2048
-	Name=Tier1
-	TierImplUid=271064536
-	TierThreadName=ESock_IP
-	TierManagerName=NetworkTierManager
-	DefaultAccessPoint=Link.AccessPointTable.10000
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Id=271064560
-	Name=Tier2
-	TierImplUid=271064560
-	TierThreadName=ESock_IP
-	TierManagerName=ProtoTierManager
-	DefaultAccessPoint=Link.AccessPointTable.10001
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Id=271064565
-	Name=Tier3
-	TierImplUid=271064565
-	TierThreadName=ESock_IP
-	TierManagerName=LinkTierManager
-	DefaultAccessPoint=Link.AccessPointTable.10000
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Id=536887799
-	Name=Tier4
-	TierImplUid=536887799
-	TierThreadName=ESock_SIP
-	TierManagerName=SIPTierManager
-	DefaultAccessPoint=Link.AccessPointTable.10002
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-
-############################################################
-## MCprTable
-## 
-[MCprTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=netmcpr
-	MCprUid=271009095
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipprotomcpr
-	MCprUid=271064558
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=pppmcpr
-	MCprUid=271064556
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=ethmcpr
-	MCprUid=271064572
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=rawipmcpr
-	MCprUid=271064576
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=tunnelmcpr
-	MCprUid=271064578
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=qospppmcpr
-	MCprUid=271064556
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=dummynifmcpr
-	MCprUid=271064580
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=hungrynifmcpr
-	MCprUid=271064580
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=pdpmcpr
-	MCprUid=271065840
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=sipmcpr
-	MCprUid=536887801
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=panethermcpr
-	MCprUid=271070626
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## CprTable
-## 
-[CprTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=ipcpr
-	CprUid=270561519
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipprotocpr
-	CprUid=271064531
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=agentcpr
-	CprUid=271064552
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=vanillacpr
-	CprUid=271065843
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=sipcpr
-	CprUid=271010872
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=tunnelagentcpr
-	CprUid=271080968
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=pdpcpr
-	CprUid=271065826
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## SCprTable
-## 
-[SCprTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=qosipscpr
-	SCprUid=270549768
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipprotoscpr
-	SCprUid=271064529
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=agentscpr
-	SCprUid=271064554
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=pdpscpr
-	SCprUid=271065824
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=pppscpr
-	SCprUid=271065852
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=vanillascpr
-	SCprUid=271065844
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=qosscpr
-	SCprUid=271065811
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=sipscpr
-	SCprUid=271010839
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## ProtocolTable
-## 
-[ProtocolTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=sapshim
-	ProtocolUid=270496898
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipshim4
-	ProtocolUid=271064118
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=ppp
-	ProtocolUid=271064143
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=ethernet
-	ProtocolUid=271064539
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=rawip
-	ProtocolUid=271064562
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=tunnel
-	ProtocolUid=271064567
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=qosppp
-	ProtocolUid=271064148
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=dummynif
-	ProtocolUid=271064123
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=hungrynif
-	ProtocolUid=271064125
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=panether
-	ProtocolUid=271070627
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=rawip2
-	ProtocolUid=271084280
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## VirtualBearer
-## 
-[VirtualBearer]
-ADD_TEMPLATE
-	Name=Default VPN Bearer
-	IfName=VPN.nif
-	LastSocketActivityTimeout=600
-	LastSessionClosedTimeout=600
-	LastSocketClosedTimeout=600
-	Agent=VPN.agt
-	FIELD_COUNT=6
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=VPN Bearer1
-	IfName=ppp.nif
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=ntras.agt
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=VPN Bearer2
-	IfName=tunnelnif
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=vpnconnagt.agt
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## BearerTypeTable
-## 
-[BearerTypeTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=ppp
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ethint
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.4
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.4
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=rawip
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.5
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.5
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=tunnelnif
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.6
-	Cpr=CprTable.7
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.6
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=qosppp
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.7
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.7
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=dummynif
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.8
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.8
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=hungrynif
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.9
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.9
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=spud-ppp
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.10
-	Cpr=CprTable.3
-	SCpr=SCprTable.4
-	Protocol=ProtocolTable.3
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=spud-rawip
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.10
-	Cpr=CprTable.3
-	SCpr=SCprTable.4
-	Protocol=ProtocolTable.5
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=IPProtoDefaultTemplate
-	Tier=Link.TierTable.271064560
-	MCpr=MCprTable.2
-	Cpr=CprTable.2
-	SCpr=SCprTable.2
-	Protocol=ProtocolTable.2
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=NetworkDefaultTemplate
-	Tier=Link.TierTable.2048
-	MCpr=MCprTable.1
-	Cpr=CprTable.1
-	SCpr=SCprTable.7
-	Protocol=ProtocolTable.1
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 12
-	Name=rawip2
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.10
-	Cpr=CprTable.8
-	SCpr=SCprTable.4
-	Protocol=ProtocolTable.11
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=spud-rawip2
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.10
-	Cpr=CprTable.8
-	SCpr=SCprTable.4
-	Protocol=ProtocolTable.11
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## AccessPointTable
-## 
-[AccessPointTable]
-ADD_SECTION
-# COMMDB_ID = 193
-	Id=29
-	Name=pppMappedFromIAP29
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 195
-	Id=28
-	Name=pppMappedFromIAP28
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 197
-	Id=27
-	Name=pppMappedFromIAP27
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 199
-	Id=26
-	Name=tunnelnifMappedFromIAP26
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.6
-	Cpr=CprTable.7
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.6
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 201
-	Id=25
-	Name=pppMappedFromIAP25
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 203
-	Id=24
-	Name=pppMappedFromIAP24
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 205
-	Id=23
-	Name=pppMappedFromIAP23
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 207
-	Id=22
-	Name=pppMappedFromIAP22
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 209
-	Id=21
-	Name=pppMappedFromIAP21
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 211
-	Id=20
-	Name=pppMappedFromIAP20
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 213
-	Id=19
-	Name=pppMappedFromIAP19
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 215
-	Id=18
-	Name=pppMappedFromIAP18
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 217
-	Id=17
-	Name=pppMappedFromIAP17
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 219
-	Id=16
-	Name=pppMappedFromIAP16
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 221
-	Id=15
-	Name=pppMappedFromIAP15
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 223
-	Id=14
-	Name=pppMappedFromIAP14
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 225
-	Id=13
-	Name=pppMappedFromIAP13
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 227
-	Id=12
-	Name=pppMappedFromIAP12
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 229
-	Id=11
-	Name=pppMappedFromIAP11
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 231
-	Id=10
-	Name=pppMappedFromIAP10
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 233
-	Id=9
-	Name=ethintMappedFromIAP9
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.4
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.4
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 235
-	Id=8
-	Name=pppMappedFromIAP8
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 237
-	Id=7
-	Name=pppMappedFromIAP7
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 239
-	Id=6
-	Name=pppMappedFromIAP6
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 241
-	Id=5
-	Name=pppMappedFromIAP5
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 243
-	Id=4
-	Name=pppMappedFromIAP4
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 245
-	Id=3
-	Name=pppMappedFromIAP3
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 247
-	Id=2
-	Name=ethintMappedFromIAP2
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.4
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.4
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 249
-	Id=1
-	Name=pppMappedFromIAP1
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 252
-	Id=10002
-	Name=SIPDefault
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.536887799
-	MCpr=MCprTable.11
-	Cpr=CprTable.5
-	SCpr=SCprTable.8
-	Protocol=ProtocolTable.2
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 253
-	Id=10001
-	Name=IPProto_generated_10001
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064560
-	MCpr=MCprTable.2
-	Cpr=CprTable.2
-	SCpr=SCprTable.2
-	Protocol=ProtocolTable.2
-	CprConfig=13
-	CustomSelectionPolicy=13
-	FIELD_COUNT=10
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 254
-	Id=10000
-	Name=NetworkDefault
-	AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.20000
-	Tier=Link.TierTable.2048
-	MCpr=MCprTable.1
-	Cpr=CprTable.1
-	SCpr=SCprTable.7
-	Protocol=ProtocolTable.1
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## GlobalSettings
-## 
-[GlobalSettings]
-ADD_TEMPLATE
-	DefaultTier=1
-	FIELD_COUNT=1
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	WAPAccessPoint=1
-	ConnectionAttempts=2
-	RedialAttempts=3
-	SmsBearer=12
-	SmsReceiveMode=2
-	GPRSAttachMode=0
-	AcceptIncomingGprs=0
-	GPRSClassCBearer=GSM
-	ModemForDataAndFax=12
-	ModemForPhoneServicesAndSMS=12
-	BearerAvailabilityCheckTSY=phonetsy
-	LocationForDataAndFax=2
-	LocationForPhoneServicesAndSMS=5
-	MaxMBufHeap=2
-	DefaultNetwork=1
-	FIELD_COUNT=16
-END_ADD
-
-
-############################################################
-## IAP
-## 
-[IAP]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Pipex CSD
-	IAPServiceType=DialOutISP
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Ethernet IP4
-	IAPServiceType=LANService
-	IAPService=1
-	IAPBearerType=LANBearer
-	IAPBearer=1
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=NT RAS Com 0
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=3
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=3
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=NT RAS Com 1
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=4
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=3
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=WSP Test CSD
-	IAPServiceType=DialOutISP
-	IAPService=4
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=Msg Test CSD
-	IAPServiceType=DialOutISP
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=Msg Test Auth CSD
-	IAPServiceType=DialOutISP
-	IAPService=5
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=WinTunnel on Epoc Com1
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=5
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=3
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=Ethernet IP6
-	IAPServiceType=LANService
-	IAPService=2
-	IAPBearerType=LANBearer
-	IAPBearer=1
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=IP6 Dial
-	IAPServiceType=DialOutISP
-	IAPService=6
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=GSMPhone1
-	IAPServiceType=DialOutISP
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 12
-	Name=USIM Test
-	IAPServiceType=DialOutISP
-	IAPService=7
-	IAPBearerType=ModemBearer
-	IAPBearer=6
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=Vodafone GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=1
-	IAPBearerType=ModemBearer
-	IAPBearer=5
-	IAPNetwork=3
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 14
-	Name=Vodafone WAP GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=3
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 15
-	Name=Orange GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=4
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 16
-	Name=Orange WAP GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=4
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=4
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 17
-	Name=O2 GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=5
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=5
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 18
-	Name=O2 WAP GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=6
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=5
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 19
-	Name=CityOnlines CSD India
-	IAPServiceType=DialOutISP
-	IAPService=8
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 20
-	Name=Hutch GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=7
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=6
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 21
-	Name=Vodafone WAP GSM
-	IAPServiceType=DialOutISP
-	IAPService=9
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=3
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 22
-	Name=Orange WAP GSM
-	IAPServiceType=DialOutISP
-	IAPService=10
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=4
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 23
-	Name=O2 WAP GSM
-	IAPServiceType=DialOutISP
-	IAPService=11
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=5
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 24
-	Name=Test Network CSD
-	IAPServiceType=DialOutISP
-	IAPService=12
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 25
-	Name=Test Network CSD IP6
-	IAPServiceType=DialOutISP
-	IAPService=13
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 26
-	Name=Cisco VPN IAP
-	IAPServiceType=VpnService
-	IAPService=3
-	IAPBearerType=VirtualBearer
-	IAPBearer=3
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 27
-	Name=DUMMY TSY
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=8
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 28
-	Name=mRouter USB
-	IAPServiceType=DialOutISP
-	IAPService=14
-	IAPBearerType=ModemBearer
-	IAPBearer=10
-	IAPNetwork=2
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 29
-	Name=mRouter Wins
-	IAPServiceType=DialOutISP
-	IAPService=14
-	IAPBearerType=ModemBearer
-	IAPBearer=9
-	IAPNetwork=2
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## ConnectionPreferences
-## 
-[ConnectionPreferences]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	Ranking=1
-	Direction=OUTGOING
-	BearerSet=PSD
-	DialogPref=DONOTPROMPT
-	IAP=13
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## Proxies
-## 
-[Proxies]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	ISP=4
-	ProxyServiceType=DialOutISP
-	UseProxyServer=TRUE
-	ProxyServerName=www.dummyproxy.com
-	ProtocolName=http
-	PortNumber=80
-	Exceptions=www.dummyproxy.com/exception
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## WAPAccessPoint
-## 
-[WAPAccessPoint]
-ADD_TEMPLATE
-	Name=Default Dial In ISP
-	CurrentBearer=WAPIPBearer
-	FIELD_COUNT=2
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Vodafone WAP GPRS
-	StartPage=wap:1999/vodafone.wml
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Orange WAP GPRS
-	StartPage=orange.multimedia
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=O2 WAP GPRS
-	StartPage=wap.o2.co.uk
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## WAPIPBearer
-## 
-[WAPIPBearer]
-ADD_TEMPLATE
-	Name=DefaultRecordName-1
-	GatewayAddress=0
-	WSPOption=CONNECTIONLESS
-	Security=FALSE
-	ProxyPortNumber=0
-	ProxyLogin=0
-	ProxyPassword=0
-	FIELD_COUNT=7
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=DefaultRecordName-2
-	AccessPointId=2
-	GatewayAddress=wap.closedtest.intra
-	IAP=24
-	WSPOption=CONNECTIONORIENTED
-	ProxyPortNumber=1
-	ProxyLogin=1
-	ProxyPassword=1
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## WAPSMSBearer
-## 
-[WAPSMSBearer]
-ADD_TEMPLATE
-	Name=DefaultRecordName-1
-	GatewayAddress=0
-	ServiceCentreAddress=0
-	WSPOption=CONNECTIONLESS
-	Security=FALSE
-	FIELD_COUNT=5
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=DefaultRecordName-2
-	AccessPointId=2
-	GatewayAddress=+4412345678901
-	ServiceCentreAddress=+442071234567
-	WSPOption=CONNECTIONORIENTED
-	FIELD_COUNT=5
-END_ADD
-
-
-############################################################
-## SecureSocketTable
-## 
-[SecureSocketTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	ProtocolName=ssl3.0
-	ProtoLibrary=ssladaptor.dll
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=DefaultRecordName-2
-	ProtocolName=tls1.0
-	ProtoLibrary=ssladaptor.dll
-	FIELD_COUNT=3
-END_ADD
-
-
-############################################################
-## VpnService
-## 
-[VpnService]
-ADD_TEMPLATE
-	Name=Default VPN
-	Policy=DefaultVPNpolicy
-	HomeIAP=1
-	FIELD_COUNT=3
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=VPN1
-	Policy=VPNpolicy1
-	HomeIAP=2
-	HomeNetwork=1
-	FIELD_COUNT=4
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=cisco tunnel
-	Policy=cisco_all
-	HomeIAP=8
-	HomeNetwork=1
-	FIELD_COUNT=4
-END_ADD
-

--- a/cbsref/telephonyrefplugins/atltsy/config/AT-LTSY(wavcom).cfg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2756 +0,0 @@
-############################################################
-## AUTO-GENERATED CONFIGURATION FILE
-## CommsDat Database Dump Utility
-## 1.1
-############################################################
-
-############################################################
-## Network
-## 
-[Network]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Intranet
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=mRouter
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Vodafone
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=Orange
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=O2
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=TMobile
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=Airtel
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=Hutch
-	FIELD_COUNT=1
-END_ADD
-
-
-############################################################
-## ModemBearer
-## 
-[ModemBearer]
-ADD_TEMPLATE
-	Name=Default Modem
-	IfName=PPP
-	PortName=COMM::9
-	TSYName=phonetsy
-	CSYName=ECUART
-	LastSocketActivityTimeout=600
-	LastSessionClosedTimeout=600
-	LastSocketClosedTimeout=600
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=57600
-	Handshaking=0
-	SpecialRate=0
-	XonChar=0
-	XoffChar=0
-	FaxClassPref=AUTO
-	SpeakerPref=NEVER
-	SpeakerVolPref=QUIET
-	ModemInitString=AT
-	DataInitString=AT
-	FaxInitString=AT
-	IspInitString=*99***1#
-	DialPauseLength=S8=
-	SpeakerVolContorlLow=L0
-	SpeakerVolControlMedium=L1
-	SpeakerVolControlHigh=L2
-	SpeakerAlwaysOff=M0
-	SpeakerOnUntilCarrier=M1
-	SpeakerAlwaysOn=M2
-	SpeakerOnAfterUntilCarrier=M3
-	DialToneWaitModifier=W
-	CallProgress1=X1
-	CallProgress2=X2
-	CallProgress3=X3
-	CallProgress4=X4
-	EchoOff=E0
-	VerboseText=V1
-	QuietOff=Q0
-	QuietOn=Q1
-	DialCommandStateModifier=;
-	OnLine=O
-	ResetConfiguration=Z
-	ReturnToFactoryDefs=&F
-	DCDOnDuringLink=&C1
-	DTRHangUp=&D2
-	DSRAlwaysOn=&S0
-	RTSCTSHandshake=&K3
-	XonXoffHandshake=&K4
-	EscapeCharacter=+
-	EscapeGuardPeriod=S12
-	NoDialTone=NO DIAL TONE
-	Busy=BUSY
-	NoAnswer=NO ANSWER
-	Carrier=CARRIER
-	Connect=CONNECT
-	CompressionClass5=COMPRESSION:CLASS 5
-	CompressionV42bis=COMPRESSION:V.42 bis
-	CompressionNone=COMPRESSION:NONE
-	ProtocolLAPD=PROTOCOL:LAPD
-	ProtocolALT=PROTOCOL:ALT
-	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
-	ProtocolNone=PROTOCOL:NONE
-	MessageCentreNumber=+44123456789
-	MessageValidityPeriod=1440
-	MessageDeliveryReport=FALSE
-	MinimumSignalLevel=9905
-	CommRole=0
-	ControlChannelPortName=COMM::0
-	SIRSettings=0
-	Agent=psd.agt
-	FIELD_COUNT=71
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=GsmPhone1
-	Rate=150
-	Handshaking=4
-	XonChar=17
-	XoffChar=19
-	MessageCentreNumber=+447973100973
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=NTRAS (Com0) Null Modem 115200bps
-	Rate=600
-	PortName=COMM::7
-	TSYName=NTRAS
-	Handshaking=4
-	MessageDeliveryReport=TRUE
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=NTRAS (Com1) Null Modem 115200bps
-	Rate=2400
-	TSYName=NTRAS
-	Handshaking=4
-	MessageDeliveryReport=TRUE
-	FIELD_COUNT=5
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=CommModem
-	IfName=PPP
-	PortName=COMM::0
-	Rate=9600
-	TSYName=phonetsy
-	CSYName=ECUART
-	LastSocketActivityTimeout=300
-	LastSessionClosedTimeout=300
-	LastSocketClosedTimeout=300
-	Handshaking=4
-	MessageCentreNumber=+447785016005
-	ControlChannelPortName=COMM::0
-	Agent=PSD.agt
-	FIELD_COUNT=13
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=SimulatorPhone
-	Rate=4800
-	PortName=COMM::9
-	TSYName=SIM
-	Handshaking=196
-	XonChar=17
-	XoffChar=19
-	ModemInitString=ATZ
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=GsmPhone3
-	Rate=7200
-	PortName=COMM::9
-	Handshaking=4
-	XonChar=17
-	XoffChar=19
-	ModemInitString=ATZ
-	MessageCentreNumber=+447973100973
-	Agent=PSD.agt
-	FIELD_COUNT=9
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=GsmPhone4
-	PortName=COMM::9
-	TSYName=DMM
-	Rate=19200
-	Handshaking=196
-	XonChar=17
-	XoffChar=19
-	ModemInitString=ATZ
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=mRouterWinsBearer
-	Rate=38400
-	PortName=WINS::0
-	CSYName=WINSCSY
-	LastSocketActivityTimeout=9999
-	LastSessionClosedTimeout=180
-	LastSocketClosedTimeout=30
-	Handshaking=4
-	Agent=mRouterAgent.agt
-	FIELD_COUNT=9
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=mRouterUsbBearer
-	Rate=150
-	PortName=ACM::0
-	CSYName=ECACM
-	LastSocketActivityTimeout=9999
-	LastSessionClosedTimeout=180
-	LastSocketClosedTimeout=30
-	Handshaking=4
-	Agent=mRouterAgent.agt
-	FIELD_COUNT=9
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=trpat_psd
-	Rate=600
-	IfName=rawip
-	PortName=not used
-	TSYName=TRPAT
-	CSYName=CSY27010
-	LastSocketActivityTimeout=300
-	LastSessionClosedTimeout=300
-	LastSocketClosedTimeout=300
-	Handshaking=4
-	MessageCentreNumber=+447785016005
-	BCAStack=C32Bca
-	Agent=trp.agt
-	FIELD_COUNT=13
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 12
-	Name=CommModem
-	PortName=COMM::0
-	Rate=9600
-	TSYName=phonetsy
-	CSYName=ECUART
-	LastSocketActivityTimeout=300
-	LastSessionClosedTimeout=300
-	LastSocketClosedTimeout=300
-	Handshaking=4
-	MessageCentreNumber=+447785016005
-	Agent=csd.agt
-	FIELD_COUNT=11
-END_ADD
-
-# AndyS Modem on PC COM 3 [COMM::2]
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=CommModem
-	PortName=COMM::0
-	TSYName=phonetsy
-	Rate=9600
-	ModemInitString=ATZ
-	Agent=csd.agt
-	FIELD_COUNT=6
-END_ADD
-
-############################################################
-## LANBearer
-## 
-[LANBearer]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Ethernet 001
-	IfName=ethint
-	LDDFilename=enet
-	LDDName=Ethernet
-	PDDFilename=ethernet
-	PDDName=ethernet.wins
-	PacketDriverName=EtherPkt.drv
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=nullagt.agt
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Ethernet 002
-	IfName=ethint
-	LDDName=EtherCard
-	PDDName=EtherWins
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=nullagt.agt
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## Location
-## 
-[Location]
-ADD_TEMPLATE
-	Name=Default Location
-	IntlPrefixCode=+
-	NatPrefixCode=0
-	NatCode=44
-	AreaCode=44
-	DialOutCode=44
-	DisableCallWaitingCode=44
-	Mobile=TRUE
-	UsePulseDial=FALSE
-	WaitForDialTone=FALSE
-	PauseAfterDialout=0
-	FIELD_COUNT=11
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Office
-	IntlPrefixCode=00
-	AreaCode=171
-	DialOutCode=9,
-	DisableCallWaitingCode=9,
-	Mobile=FALSE
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Office Direct Dial
-	IntlPrefixCode=00
-	AreaCode=171
-	DialOutCode=171
-	DisableCallWaitingCode=171
-	Mobile=FALSE
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=Mobile
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=Home
-	IntlPrefixCode=00
-	AreaCode=181
-	DialOutCode=181
-	DisableCallWaitingCode=181
-	Mobile=FALSE
-	UsePulseDial=TRUE
-	WaitForDialTone=TRUE
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## Chargecard
-## 
-[Chargecard]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Dummy BT Chargecard
-	AccountNumber=144,12345678
-	Pin=0000
-	LocalRule=HG
-	NatRule=HFG
-	IntlRule=HEFG
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Dummy Mercury Chargecard
-	AccountNumber=0500800800,,12345678
-	Pin=****
-	LocalRule=HG
-	NatRule=J,K,0FG
-	IntlRule=HEFG
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## DialOutISP
-## 
-[DialOutISP]
-ADD_TEMPLATE
-	Name=Default Dial Out ISP
-	DialResolution=TRUE
-	UseLoginScript=FALSE
-	PromptForLogin=TRUE
-	DisplayPCT=FALSE
-	IfPromptForAuth=TRUE
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	BearerService=0
-	BearerProtocol=UNSPECIFIED
-	RlpVersion=0
-	IwfToMs=0
-	MsToIwf=0
-	AckTimer=0
-	RetransmissionAttempts=0
-	ResequencePeriod=0
-	V42Compression=0
-	V42Codewords=0
-	V42MaxLength=0
-	Asymmetry=0
-	UserInitUpgrade=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=28
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Pipex CSD
-	Description=Pipex Service Provider
-	Type=INTERNETONLY
-	DefaultTelNum=08450885336
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=solabf75
-	IfAuthPass=oodifama
-	AuthRetries=0
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=158.43.128.1
-	IpNameServer2=158.43.192.1
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=21
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=NT RAS
-	Description=Test
-	Type=INTERNETONLY
-	UseLoginScript=TRUE
-	LoginScript=CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n
-	PromptForLogin=FALSE
-	IfNetworks=ip,ip6
-	IfPromptForAuth=FALSE
-	IfAuthName=RasUser
-	IfAuthPass=pass
-	AuthRetries=0
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=19
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=WSP Test CSD
-	Description=Symbian WSP Test Server
-	Type=INTERNETANDWAP
-	DefaultTelNum=02071541211
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=wapusr
-	IfAuthPass=train2
-	AuthRetries=0
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=158.43.128.1
-	IpNameServer2=158.43.192.1
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=21
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=Auth CSD
-	Description=Authentication Service Provider
-	Type=INTERNETONLY
-	DefaultTelNum=+358331520777
-	UseLoginScript=TRUE
-	PromptForLogin=FALSE
-	LoginName=mailtst1
-	LoginPass=mailtest1
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=mailtst1
-	IfAuthPass=mailtest1
-	AuthRetries=0
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	UseEdge=TRUE
-	FIELD_COUNT=22
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=IP6 Dial Test
-	Description=4th Floor Test Lab
-	Type=INTERNETONLY
-	DefaultTelNum=02071541455
-	PromptForLogin=FALSE
-	IfNetworks=ip,ip6
-	IfPromptForAuth=FALSE
-	IfAuthName=ipv6test
-	IfAuthPass=Symbian
-	AuthRetries=0
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=192.168.10.2
-	IpNameServer2=192.168.20.2
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=21
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=USIM Test NT RAS
-	Type=INTERNETONLY
-	UseLoginScript=TRUE
-	LoginScript=CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=RasUser
-	IfAuthPass=pass
-	FIELD_COUNT=9
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=CityOnlines CSD India
-	Description=CityOnlines Indian Service Provider
-	Type=INTERNETONLY
-	DefaultTelNum=+9180172388
-	UseLoginScript=TRUE
-	PromptForLogin=FALSE
-	LoginName=ktl1@blr.cityonlines.com
-	LoginPass=1234
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=ktl1
-	IfAuthPass=1234
-	AuthRetries=0
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	UseEdge=TRUE
-	FIELD_COUNT=22
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=Vodafone WAP GSM
-	Description=Vodafone WAP GSM
-	Type=INTERNETANDWAP
-	DefaultTelNum=+447836900808
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=user@vodafone.net
-	IfAuthPass=user
-	AuthRetries=0
-	BearerProtocol=V110
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=Orange WAP GSM
-	Description=Orange WAP GSM
-	Type=INTERNETANDWAP
-	DefaultTelNum=+447973100500
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=Orange
-	IfAuthPass=Multimedia
-	AuthRetries=0
-	BearerProtocol=V110
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=O2 WAP GSM
-	Description=O2 WAP GSM
-	Type=INTERNETANDWAP
-	DefaultTelNum=+447712927927
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=O2wap
-	IfAuthPass=password
-	AuthRetries=0
-	BearerProtocol=V110
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 12
-	Name=Test Network CSD
-	Description=Symbian Test Network
-	Type=INTERNETONLY
-	DefaultTelNum=02071541259
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=Systemtest09
-	IfAuthPass=l33ds
-	AuthRetries=0
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=18
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=IP6 Dial Test
-	Description=Symbian Test Network
-	Type=INTERNETONLY
-	DefaultTelNum=02077248525
-	PromptForLogin=FALSE
-	IfNetworks=ip,ip6
-	IfPromptForAuth=FALSE
-	IfAuthName=ipv6test
-	IfAuthPass=Symbian
-	AuthRetries=0
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=192.168.10.2
-	IpNameServer2=192.168.20.2
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=21
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 14
-	Name=mRouterDialOutIsp
-	Description=mRouterDialOutIsp
-	Type=INTERNETONLY
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=IfAuthPass=
-	IfAuthPass=AuthRetries=0
-	AuthRetries=0
-	FIELD_COUNT=9
-END_ADD
-
-
-############################################################
-## DialInISP
-## 
-[DialInISP]
-ADD_TEMPLATE
-	Name=Default Dial In ISP
-	UseLoginScript=FALSE
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=9
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Dial In ISP01
-	FIELD_COUNT=1
-END_ADD
-
-
-############################################################
-## OutgoingGPRS
-## 
-[OutgoingGPRS]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Vodafone GPRS
-	APN=internet
-	PDPType=IPV4
-	ReqPrecedence=0
-	ReqDelay=0
-	ReqReliability=0
-	ReqPeakThroughput=0
-	ReqMeanThroughput=0
-	MinPrecedence=0
-	MinDelay=0
-	MinReliability=0
-	MinPeakThroughput=0
-	MinMeanThroughput=0
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=web
-	IfAuthPass=web
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpAddr=0.0.0.0
-	IpDNSAddrFromServer=TRUE
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=33
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Vodafone WAP GPRS
-	APN=wap.vodafone.co.uk
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=wap
-	IfAuthPass=wap
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpAddr=0.0.0.0
-	IpDNSAddrFromServer=TRUE
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=33
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Orange GPRS
-	APN=orangeinternet
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=29
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=Orange WAP GPRS
-	APN=orangewap
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=29
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=O2 GPRS
-	APN=mobile.o2.co.uk
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=web
-	IfAuthPass=password
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=0.0.0.0
-	IpNameServer2=0.0.0.0
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=34
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=O2 WAP GPRS
-	APN=wap.o2.co.uk
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=o2wap
-	IfAuthPass=o2wap
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=0.0.0.0
-	IpNameServer2=0.0.0.0
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=34
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=Hutch GPRS
-	APN=portalnmms
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	AuthRetries=1
-	IpGateway=10.10.1.100
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=28
-END_ADD
-
-
-############################################################
-## IncomingGPRS
-## 
-[IncomingGPRS]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Incoming GPRS Settings PlaceHolder
-	APN=Test
-	PDPType=IPV4
-	PDPAddress=0.0.0.0
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=1
-	MinDelay=1
-	MinReliability=1
-	MinPeakThroughput=1
-	MinMeanThroughput=1
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=RasUser
-	IfAuthPass=pass
-	AuthRetries=1
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=0.0.0.0
-	IpNameServer2=0.0.0.0
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	FIELD_COUNT=29
-END_ADD
-
-
-############################################################
-## DefaultGPRS
-## 
-[DefaultGPRS]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Dummy Default GPRS Settings
-	Usage=1
-	APN=Access point name
-	PDPType=IPV6
-	PDPAddress=www.wid.com
-	Precedence=1
-	Delay=150
-	Reliability=1
-	PeakThroughput=1
-	MinReliability=1
-	MinPeakThroughput=1
-	MinMeanThroughput=1
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=TRUE
-	FIELD_COUNT=16
-END_ADD
-
-
-############################################################
-## LANService
-## 
-[LANService]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=IP4 DHCP Ethernet
-	IfNetworks=ip
-	IpNetMask=255.255.252.0
-	IpGateway=10.192.203.254
-	IpAddrFromServer=TRUE
-	IpAddr=10.192.200.59
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=10.192.59.6
-	IpNameServer2=10.192.58.49
-	ConfigDaemonManagerName=NetCfgExtnDhcp
-	ConfigDaemonName=!DhcpServ
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=IP6 Ethernet
-	IfNetworks=ip,ip6
-	IpNetMask=255.255.255.0
-	IpGateway=194.72.6.1
-	IpAddrFromServer=TRUE
-	IpAddr=192.168.0.100
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=192.168.10.2
-	IpNameServer2=192.168.20.2
-	FIELD_COUNT=9
-END_ADD
-
-
-############################################################
-## APPrioritySelectionPolicyTable
-## 
-[APPrioritySelectionPolicyTable]
-ADD_SECTION
-# COMMDB_ID = 254
-	Id=20000
-	Name=APSelPolNetworkDefault
-	AP1=Link.AccessPointTable.10001
-	APCOUNT=1
-	FIELD_COUNT=4
-END_ADD
-
-
-############################################################
-## TierTable
-## 
-[TierTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Id=2048
-	Name=Tier1
-	TierImplUid=271064536
-	TierThreadName=ESock_IP
-	TierManagerName=NetworkTierManager
-	DefaultAccessPoint=Link.AccessPointTable.10000
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Id=271064560
-	Name=Tier2
-	TierImplUid=271064560
-	TierThreadName=ESock_IP
-	TierManagerName=ProtoTierManager
-	DefaultAccessPoint=Link.AccessPointTable.10001
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Id=271064565
-	Name=Tier3
-	TierImplUid=271064565
-	TierThreadName=ESock_IP
-	TierManagerName=LinkTierManager
-	DefaultAccessPoint=Link.AccessPointTable.10000
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Id=536887799
-	Name=Tier4
-	TierImplUid=536887799
-	TierThreadName=ESock_SIP
-	TierManagerName=SIPTierManager
-	DefaultAccessPoint=Link.AccessPointTable.10002
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-
-############################################################
-## MCprTable
-## 
-[MCprTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=netmcpr
-	MCprUid=271009095
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipprotomcpr
-	MCprUid=271064558
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=pppmcpr
-	MCprUid=271064556
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=ethmcpr
-	MCprUid=271064572
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=rawipmcpr
-	MCprUid=271064576
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=tunnelmcpr
-	MCprUid=271064578
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=qospppmcpr
-	MCprUid=271064556
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=dummynifmcpr
-	MCprUid=271064580
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=hungrynifmcpr
-	MCprUid=271064580
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=pdpmcpr
-	MCprUid=271065840
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=sipmcpr
-	MCprUid=536887801
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=panethermcpr
-	MCprUid=271070626
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## CprTable
-## 
-[CprTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=ipcpr
-	CprUid=270561519
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipprotocpr
-	CprUid=271064531
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=agentcpr
-	CprUid=271064552
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=vanillacpr
-	CprUid=271065843
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=sipcpr
-	CprUid=271010872
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=tunnelagentcpr
-	CprUid=271080968
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=pdpcpr
-	CprUid=271065826
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## SCprTable
-## 
-[SCprTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=qosipscpr
-	SCprUid=270549768
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipprotoscpr
-	SCprUid=271064529
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=agentscpr
-	SCprUid=271064554
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=pdpscpr
-	SCprUid=271065824
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=pppscpr
-	SCprUid=271065852
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=vanillascpr
-	SCprUid=271065844
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=qosscpr
-	SCprUid=271065811
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=sipscpr
-	SCprUid=271010839
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## ProtocolTable
-## 
-[ProtocolTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=sapshim
-	ProtocolUid=270496898
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipshim4
-	ProtocolUid=271064118
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=ppp
-	ProtocolUid=271064143
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=ethernet
-	ProtocolUid=271064539
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=rawip
-	ProtocolUid=271064562
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=tunnel
-	ProtocolUid=271064567
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=qosppp
-	ProtocolUid=271064148
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=dummynif
-	ProtocolUid=271064123
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=hungrynif
-	ProtocolUid=271064125
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=panether
-	ProtocolUid=271070627
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=rawip2
-	ProtocolUid=271084280
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## VirtualBearer
-## 
-[VirtualBearer]
-ADD_TEMPLATE
-	Name=Default VPN Bearer
-	IfName=VPN.nif
-	LastSocketActivityTimeout=600
-	LastSessionClosedTimeout=600
-	LastSocketClosedTimeout=600
-	Agent=VPN.agt
-	FIELD_COUNT=6
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=VPN Bearer1
-	IfName=ppp.nif
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=ntras.agt
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=VPN Bearer2
-	IfName=tunnelnif
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=vpnconnagt.agt
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## BearerTypeTable
-## 
-[BearerTypeTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=ppp
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ethint
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.4
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.4
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=rawip
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.5
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.5
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=tunnelnif
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.6
-	Cpr=CprTable.7
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.6
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=qosppp
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.7
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.7
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=dummynif
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.8
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.8
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=hungrynif
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.9
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.9
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=spud-ppp
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.10
-	Cpr=CprTable.3
-	SCpr=SCprTable.4
-	Protocol=ProtocolTable.3
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=spud-rawip
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.10
-	Cpr=CprTable.3
-	SCpr=SCprTable.4
-	Protocol=ProtocolTable.5
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=IPProtoDefaultTemplate
-	Tier=Link.TierTable.271064560
-	MCpr=MCprTable.2
-	Cpr=CprTable.2
-	SCpr=SCprTable.2
-	Protocol=ProtocolTable.2
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=NetworkDefaultTemplate
-	Tier=Link.TierTable.2048
-	MCpr=MCprTable.1
-	Cpr=CprTable.1
-	SCpr=SCprTable.7
-	Protocol=ProtocolTable.1
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 12
-	Name=rawip2
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.10
-	Cpr=CprTable.8
-	SCpr=SCprTable.4
-	Protocol=ProtocolTable.11
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=spud-rawip2
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.10
-	Cpr=CprTable.8
-	SCpr=SCprTable.4
-	Protocol=ProtocolTable.11
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## AccessPointTable
-## 
-[AccessPointTable]
-ADD_SECTION
-# COMMDB_ID = 193
-	Id=29
-	Name=pppMappedFromIAP29
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 195
-	Id=28
-	Name=pppMappedFromIAP28
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 197
-	Id=27
-	Name=pppMappedFromIAP27
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 199
-	Id=26
-	Name=tunnelnifMappedFromIAP26
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.6
-	Cpr=CprTable.7
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.6
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 201
-	Id=25
-	Name=pppMappedFromIAP25
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 203
-	Id=24
-	Name=pppMappedFromIAP24
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 205
-	Id=23
-	Name=pppMappedFromIAP23
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 207
-	Id=22
-	Name=pppMappedFromIAP22
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 209
-	Id=21
-	Name=pppMappedFromIAP21
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 211
-	Id=20
-	Name=pppMappedFromIAP20
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 213
-	Id=19
-	Name=pppMappedFromIAP19
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 215
-	Id=18
-	Name=pppMappedFromIAP18
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 217
-	Id=17
-	Name=pppMappedFromIAP17
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 219
-	Id=16
-	Name=pppMappedFromIAP16
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 221
-	Id=15
-	Name=pppMappedFromIAP15
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 223
-	Id=14
-	Name=pppMappedFromIAP14
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 225
-	Id=13
-	Name=pppMappedFromIAP13
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 227
-	Id=12
-	Name=pppMappedFromIAP12
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 229
-	Id=11
-	Name=pppMappedFromIAP11
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 231
-	Id=10
-	Name=pppMappedFromIAP10
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 233
-	Id=9
-	Name=ethintMappedFromIAP9
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.4
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.4
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 235
-	Id=8
-	Name=pppMappedFromIAP8
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 237
-	Id=7
-	Name=pppMappedFromIAP7
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 239
-	Id=6
-	Name=pppMappedFromIAP6
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 241
-	Id=5
-	Name=pppMappedFromIAP5
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 243
-	Id=4
-	Name=pppMappedFromIAP4
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 245
-	Id=3
-	Name=pppMappedFromIAP3
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 247
-	Id=2
-	Name=ethintMappedFromIAP2
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.4
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.4
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 249
-	Id=1
-	Name=pppMappedFromIAP1
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 252
-	Id=10002
-	Name=SIPDefault
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.536887799
-	MCpr=MCprTable.11
-	Cpr=CprTable.5
-	SCpr=SCprTable.8
-	Protocol=ProtocolTable.2
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 253
-	Id=10001
-	Name=IPProto_generated_10001
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064560
-	MCpr=MCprTable.2
-	Cpr=CprTable.2
-	SCpr=SCprTable.2
-	Protocol=ProtocolTable.2
-	CprConfig=13
-	CustomSelectionPolicy=13
-	FIELD_COUNT=10
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 254
-	Id=10000
-	Name=NetworkDefault
-	AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.20000
-	Tier=Link.TierTable.2048
-	MCpr=MCprTable.1
-	Cpr=CprTable.1
-	SCpr=SCprTable.7
-	Protocol=ProtocolTable.1
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## GlobalSettings
-## 
-[GlobalSettings]
-ADD_TEMPLATE
-	DefaultTier=1
-	FIELD_COUNT=1
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	WAPAccessPoint=1
-	ConnectionAttempts=2
-	RedialAttempts=3
-	SmsBearer=12
-	SmsReceiveMode=2
-	GPRSAttachMode=0
-	AcceptIncomingGprs=0
-	GPRSClassCBearer=GSM
-	ModemForDataAndFax=12
-	ModemForPhoneServicesAndSMS=12
-	BearerAvailabilityCheckTSY=phonetsy
-	LocationForDataAndFax=2
-	LocationForPhoneServicesAndSMS=5
-	MaxMBufHeap=2
-	DefaultNetwork=1
-	FIELD_COUNT=16
-END_ADD
-
-
-############################################################
-## IAP
-## 
-[IAP]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Pipex CSD
-	IAPServiceType=DialOutISP
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Ethernet IP4
-	IAPServiceType=LANService
-	IAPService=1
-	IAPBearerType=LANBearer
-	IAPBearer=1
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=NT RAS Com 0
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=3
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=3
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=NT RAS Com 1
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=4
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=3
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=WSP Test CSD
-	IAPServiceType=DialOutISP
-	IAPService=4
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=Msg Test CSD
-	IAPServiceType=DialOutISP
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=Msg Test Auth CSD
-	IAPServiceType=DialOutISP
-	IAPService=5
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=WinTunnel on Epoc Com1
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=5
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=3
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=Ethernet IP6
-	IAPServiceType=LANService
-	IAPService=2
-	IAPBearerType=LANBearer
-	IAPBearer=1
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=IP6 Dial
-	IAPServiceType=DialOutISP
-	IAPService=6
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=GSMPhone1
-	IAPServiceType=DialOutISP
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 12
-	Name=USIM Test
-	IAPServiceType=DialOutISP
-	IAPService=7
-	IAPBearerType=ModemBearer
-	IAPBearer=6
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=Vodafone GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=1
-	IAPBearerType=ModemBearer
-	IAPBearer=5
-	IAPNetwork=3
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 14
-	Name=Vodafone WAP GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=3
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 15
-	Name=Orange GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=4
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 16
-	Name=Orange WAP GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=4
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=4
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 17
-	Name=O2 GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=5
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=5
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 18
-	Name=O2 WAP GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=6
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=5
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 19
-	Name=CityOnlines CSD India
-	IAPServiceType=DialOutISP
-	IAPService=8
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 20
-	Name=Hutch GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=7
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=6
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 21
-	Name=Vodafone WAP GSM
-	IAPServiceType=DialOutISP
-	IAPService=9
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=3
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 22
-	Name=Orange WAP GSM
-	IAPServiceType=DialOutISP
-	IAPService=10
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=4
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 23
-	Name=O2 WAP GSM
-	IAPServiceType=DialOutISP
-	IAPService=11
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=5
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 24
-	Name=Test Network CSD
-	IAPServiceType=DialOutISP
-	IAPService=12
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 25
-	Name=Test Network CSD IP6
-	IAPServiceType=DialOutISP
-	IAPService=13
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 26
-	Name=Cisco VPN IAP
-	IAPServiceType=VpnService
-	IAPService=3
-	IAPBearerType=VirtualBearer
-	IAPBearer=3
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 27
-	Name=DUMMY TSY
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=8
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 28
-	Name=mRouter USB
-	IAPServiceType=DialOutISP
-	IAPService=14
-	IAPBearerType=ModemBearer
-	IAPBearer=10
-	IAPNetwork=2
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 29
-	Name=mRouter Wins
-	IAPServiceType=DialOutISP
-	IAPService=14
-	IAPBearerType=ModemBearer
-	IAPBearer=9
-	IAPNetwork=2
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## ConnectionPreferences
-## 
-[ConnectionPreferences]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	Ranking=1
-	Direction=OUTGOING
-	BearerSet=PSD
-	DialogPref=DONOTPROMPT
-	IAP=13
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## Proxies
-## 
-[Proxies]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	ISP=4
-	ProxyServiceType=DialOutISP
-	UseProxyServer=TRUE
-	ProxyServerName=www.dummyproxy.com
-	ProtocolName=http
-	PortNumber=80
-	Exceptions=www.dummyproxy.com/exception
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## WAPAccessPoint
-## 
-[WAPAccessPoint]
-ADD_TEMPLATE
-	Name=Default Dial In ISP
-	CurrentBearer=WAPIPBearer
-	FIELD_COUNT=2
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Vodafone WAP GPRS
-	StartPage=wap:1999/vodafone.wml
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Orange WAP GPRS
-	StartPage=orange.multimedia
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=O2 WAP GPRS
-	StartPage=wap.o2.co.uk
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## WAPIPBearer
-## 
-[WAPIPBearer]
-ADD_TEMPLATE
-	Name=DefaultRecordName-1
-	GatewayAddress=0
-	WSPOption=CONNECTIONLESS
-	Security=FALSE
-	ProxyPortNumber=0
-	ProxyLogin=0
-	ProxyPassword=0
-	FIELD_COUNT=7
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=DefaultRecordName-2
-	AccessPointId=2
-	GatewayAddress=wap.closedtest.intra
-	IAP=24
-	WSPOption=CONNECTIONORIENTED
-	ProxyPortNumber=1
-	ProxyLogin=1
-	ProxyPassword=1
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## WAPSMSBearer
-## 
-[WAPSMSBearer]
-ADD_TEMPLATE
-	Name=DefaultRecordName-1
-	GatewayAddress=0
-	ServiceCentreAddress=0
-	WSPOption=CONNECTIONLESS
-	Security=FALSE
-	FIELD_COUNT=5
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=DefaultRecordName-2
-	AccessPointId=2
-	GatewayAddress=+4412345678901
-	ServiceCentreAddress=+442071234567
-	WSPOption=CONNECTIONORIENTED
-	FIELD_COUNT=5
-END_ADD
-
-
-############################################################
-## SecureSocketTable
-## 
-[SecureSocketTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	ProtocolName=ssl3.0
-	ProtoLibrary=ssladaptor.dll
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=DefaultRecordName-2
-	ProtocolName=tls1.0
-	ProtoLibrary=ssladaptor.dll
-	FIELD_COUNT=3
-END_ADD
-
-
-############################################################
-## VpnService
-## 
-[VpnService]
-ADD_TEMPLATE
-	Name=Default VPN
-	Policy=DefaultVPNpolicy
-	HomeIAP=1
-	FIELD_COUNT=3
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=VPN1
-	Policy=VPNpolicy1
-	HomeIAP=2
-	HomeNetwork=1
-	FIELD_COUNT=4
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=cisco tunnel
-	Policy=cisco_all
-	HomeIAP=8
-	HomeNetwork=1
-	FIELD_COUNT=4
-END_ADD
-

--- a/cbsref/telephonyrefplugins/atltsy/config/AT-LTSY.cfg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2756 +0,0 @@
-############################################################
-## AUTO-GENERATED CONFIGURATION FILE
-## CommsDat Database Dump Utility
-## 1.1
-############################################################
-
-############################################################
-## Network
-## 
-[Network]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Intranet
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=mRouter
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Vodafone
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=Orange
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=O2
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=TMobile
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=Airtel
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=Hutch
-	FIELD_COUNT=1
-END_ADD
-
-
-############################################################
-## ModemBearer
-## 
-[ModemBearer]
-ADD_TEMPLATE
-	Name=Default Modem
-	IfName=PPP
-	PortName=COMM::9
-	TSYName=phonetsy
-	CSYName=ECUART
-	LastSocketActivityTimeout=600
-	LastSessionClosedTimeout=600
-	LastSocketClosedTimeout=600
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=57600
-	Handshaking=0
-	SpecialRate=0
-	XonChar=0
-	XoffChar=0
-	FaxClassPref=AUTO
-	SpeakerPref=NEVER
-	SpeakerVolPref=QUIET
-	ModemInitString=AT
-	DataInitString=AT
-	FaxInitString=AT
-	IspInitString=*99***1#
-	DialPauseLength=S8=
-	SpeakerVolContorlLow=L0
-	SpeakerVolControlMedium=L1
-	SpeakerVolControlHigh=L2
-	SpeakerAlwaysOff=M0
-	SpeakerOnUntilCarrier=M1
-	SpeakerAlwaysOn=M2
-	SpeakerOnAfterUntilCarrier=M3
-	DialToneWaitModifier=W
-	CallProgress1=X1
-	CallProgress2=X2
-	CallProgress3=X3
-	CallProgress4=X4
-	EchoOff=E0
-	VerboseText=V1
-	QuietOff=Q0
-	QuietOn=Q1
-	DialCommandStateModifier=;
-	OnLine=O
-	ResetConfiguration=Z
-	ReturnToFactoryDefs=&F
-	DCDOnDuringLink=&C1
-	DTRHangUp=&D2
-	DSRAlwaysOn=&S0
-	RTSCTSHandshake=&K3
-	XonXoffHandshake=&K4
-	EscapeCharacter=+
-	EscapeGuardPeriod=S12
-	NoDialTone=NO DIAL TONE
-	Busy=BUSY
-	NoAnswer=NO ANSWER
-	Carrier=CARRIER
-	Connect=CONNECT
-	CompressionClass5=COMPRESSION:CLASS 5
-	CompressionV42bis=COMPRESSION:V.42 bis
-	CompressionNone=COMPRESSION:NONE
-	ProtocolLAPD=PROTOCOL:LAPD
-	ProtocolALT=PROTOCOL:ALT
-	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
-	ProtocolNone=PROTOCOL:NONE
-	MessageCentreNumber=+44123456789
-	MessageValidityPeriod=1440
-	MessageDeliveryReport=FALSE
-	MinimumSignalLevel=9905
-	CommRole=0
-	ControlChannelPortName=COMM::0
-	SIRSettings=0
-	Agent=psd.agt
-	FIELD_COUNT=71
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=GsmPhone1
-	Rate=150
-	Handshaking=4
-	XonChar=17
-	XoffChar=19
-	MessageCentreNumber=+447973100973
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=NTRAS (Com0) Null Modem 115200bps
-	Rate=600
-	PortName=COMM::7
-	TSYName=NTRAS
-	Handshaking=4
-	MessageDeliveryReport=TRUE
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=NTRAS (Com1) Null Modem 115200bps
-	Rate=2400
-	TSYName=NTRAS
-	Handshaking=4
-	MessageDeliveryReport=TRUE
-	FIELD_COUNT=5
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=CommModem
-	IfName=PPP
-	PortName=COMM::89798
-	Rate=7654765
-	TSYName=phonetsy
-	CSYName=ECUART
-	LastSocketActivityTimeout=300
-	LastSessionClosedTimeout=300
-	LastSocketClosedTimeout=300
-	Handshaking=4
-	MessageCentreNumber=+447785016005
-	ControlChannelPortName=COMM::0
-	Agent=PSD.agt
-	FIELD_COUNT=13
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=SimulatorPhone
-	Rate=4800
-	PortName=COMM::9
-	TSYName=SIM
-	Handshaking=196
-	XonChar=17
-	XoffChar=19
-	ModemInitString=ATZ
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=GsmPhone3
-	Rate=7200
-	PortName=COMM::9
-	Handshaking=4
-	XonChar=17
-	XoffChar=19
-	ModemInitString=ATZ
-	MessageCentreNumber=+447973100973
-	Agent=PSD.agt
-	FIELD_COUNT=9
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=GsmPhone4
-	PortName=COMM::9
-	TSYName=DMM
-	Rate=19200
-	Handshaking=196
-	XonChar=17
-	XoffChar=19
-	ModemInitString=ATZ
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=mRouterWinsBearer
-	Rate=38400
-	PortName=WINS::0
-	CSYName=WINSCSY
-	LastSocketActivityTimeout=9999
-	LastSessionClosedTimeout=180
-	LastSocketClosedTimeout=30
-	Handshaking=4
-	Agent=mRouterAgent.agt
-	FIELD_COUNT=9
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=mRouterUsbBearer
-	Rate=150
-	PortName=ACM::0
-	CSYName=ECACM
-	LastSocketActivityTimeout=9999
-	LastSessionClosedTimeout=180
-	LastSocketClosedTimeout=30
-	Handshaking=4
-	Agent=mRouterAgent.agt
-	FIELD_COUNT=9
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=trpat_psd
-	Rate=600
-	IfName=rawip
-	PortName=not used
-	TSYName=TRPAT
-	CSYName=CSY27010
-	LastSocketActivityTimeout=300
-	LastSessionClosedTimeout=300
-	LastSocketClosedTimeout=300
-	Handshaking=4
-	MessageCentreNumber=+447785016005
-	BCAStack=C32Bca
-	Agent=trp.agt
-	FIELD_COUNT=13
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 12
-	Name=CommModem
-	PortName=COMM::89798
-	Rate=7654765
-	TSYName=phonetsy
-	CSYName=ECUART
-	LastSocketActivityTimeout=300
-	LastSessionClosedTimeout=300
-	LastSocketClosedTimeout=300
-	Handshaking=4
-	MessageCentreNumber=+447785016005
-	Agent=csd.agt
-	FIELD_COUNT=11
-END_ADD
-
-# AndyS Modem on PC COM 3 [COMM::2]
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=CommModem
-	PortName=COMM::89798
-	TSYName=phonetsy
-	Rate=7654765
-	ModemInitString=ATZ
-	Agent=csd.agt
-	FIELD_COUNT=6
-END_ADD
-
-############################################################
-## LANBearer
-## 
-[LANBearer]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Ethernet 001
-	IfName=ethint
-	LDDFilename=enet
-	LDDName=Ethernet
-	PDDFilename=ethernet
-	PDDName=ethernet.wins
-	PacketDriverName=EtherPkt.drv
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=nullagt.agt
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Ethernet 002
-	IfName=ethint
-	LDDName=EtherCard
-	PDDName=EtherWins
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=nullagt.agt
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## Location
-## 
-[Location]
-ADD_TEMPLATE
-	Name=Default Location
-	IntlPrefixCode=+
-	NatPrefixCode=0
-	NatCode=44
-	AreaCode=44
-	DialOutCode=44
-	DisableCallWaitingCode=44
-	Mobile=TRUE
-	UsePulseDial=FALSE
-	WaitForDialTone=FALSE
-	PauseAfterDialout=0
-	FIELD_COUNT=11
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Office
-	IntlPrefixCode=00
-	AreaCode=171
-	DialOutCode=9,
-	DisableCallWaitingCode=9,
-	Mobile=FALSE
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Office Direct Dial
-	IntlPrefixCode=00
-	AreaCode=171
-	DialOutCode=171
-	DisableCallWaitingCode=171
-	Mobile=FALSE
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=Mobile
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=Home
-	IntlPrefixCode=00
-	AreaCode=181
-	DialOutCode=181
-	DisableCallWaitingCode=181
-	Mobile=FALSE
-	UsePulseDial=TRUE
-	WaitForDialTone=TRUE
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## Chargecard
-## 
-[Chargecard]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Dummy BT Chargecard
-	AccountNumber=144,12345678
-	Pin=0000
-	LocalRule=HG
-	NatRule=HFG
-	IntlRule=HEFG
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Dummy Mercury Chargecard
-	AccountNumber=0500800800,,12345678
-	Pin=****
-	LocalRule=HG
-	NatRule=J,K,0FG
-	IntlRule=HEFG
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## DialOutISP
-## 
-[DialOutISP]
-ADD_TEMPLATE
-	Name=Default Dial Out ISP
-	DialResolution=TRUE
-	UseLoginScript=FALSE
-	PromptForLogin=TRUE
-	DisplayPCT=FALSE
-	IfPromptForAuth=TRUE
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	BearerService=0
-	BearerProtocol=UNSPECIFIED
-	RlpVersion=0
-	IwfToMs=0
-	MsToIwf=0
-	AckTimer=0
-	RetransmissionAttempts=0
-	ResequencePeriod=0
-	V42Compression=0
-	V42Codewords=0
-	V42MaxLength=0
-	Asymmetry=0
-	UserInitUpgrade=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=28
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Pipex CSD
-	Description=Pipex Service Provider
-	Type=INTERNETONLY
-	DefaultTelNum=08450885336
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=solabf75
-	IfAuthPass=oodifama
-	AuthRetries=0
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=158.43.128.1
-	IpNameServer2=158.43.192.1
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=21
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=NT RAS
-	Description=Test
-	Type=INTERNETONLY
-	UseLoginScript=TRUE
-	LoginScript=CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n
-	PromptForLogin=FALSE
-	IfNetworks=ip,ip6
-	IfPromptForAuth=FALSE
-	IfAuthName=RasUser
-	IfAuthPass=pass
-	AuthRetries=0
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=19
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=WSP Test CSD
-	Description=Symbian WSP Test Server
-	Type=INTERNETANDWAP
-	DefaultTelNum=02071541211
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=wapusr
-	IfAuthPass=train2
-	AuthRetries=0
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=158.43.128.1
-	IpNameServer2=158.43.192.1
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=21
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=Auth CSD
-	Description=Authentication Service Provider
-	Type=INTERNETONLY
-	DefaultTelNum=+358331520777
-	UseLoginScript=TRUE
-	PromptForLogin=FALSE
-	LoginName=mailtst1
-	LoginPass=mailtest1
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=mailtst1
-	IfAuthPass=mailtest1
-	AuthRetries=0
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	UseEdge=TRUE
-	FIELD_COUNT=22
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=IP6 Dial Test
-	Description=4th Floor Test Lab
-	Type=INTERNETONLY
-	DefaultTelNum=02071541455
-	PromptForLogin=FALSE
-	IfNetworks=ip,ip6
-	IfPromptForAuth=FALSE
-	IfAuthName=ipv6test
-	IfAuthPass=Symbian
-	AuthRetries=0
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=192.168.10.2
-	IpNameServer2=192.168.20.2
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=21
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=USIM Test NT RAS
-	Type=INTERNETONLY
-	UseLoginScript=TRUE
-	LoginScript=CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=RasUser
-	IfAuthPass=pass
-	FIELD_COUNT=9
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=CityOnlines CSD India
-	Description=CityOnlines Indian Service Provider
-	Type=INTERNETONLY
-	DefaultTelNum=+9180172388
-	UseLoginScript=TRUE
-	PromptForLogin=FALSE
-	LoginName=ktl1@blr.cityonlines.com
-	LoginPass=1234
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=ktl1
-	IfAuthPass=1234
-	AuthRetries=0
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	UseEdge=TRUE
-	FIELD_COUNT=22
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=Vodafone WAP GSM
-	Description=Vodafone WAP GSM
-	Type=INTERNETANDWAP
-	DefaultTelNum=+447836900808
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=user@vodafone.net
-	IfAuthPass=user
-	AuthRetries=0
-	BearerProtocol=V110
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=Orange WAP GSM
-	Description=Orange WAP GSM
-	Type=INTERNETANDWAP
-	DefaultTelNum=+447973100500
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=Orange
-	IfAuthPass=Multimedia
-	AuthRetries=0
-	BearerProtocol=V110
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=O2 WAP GSM
-	Description=O2 WAP GSM
-	Type=INTERNETANDWAP
-	DefaultTelNum=+447712927927
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=O2wap
-	IfAuthPass=password
-	AuthRetries=0
-	BearerProtocol=V110
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 12
-	Name=Test Network CSD
-	Description=Symbian Test Network
-	Type=INTERNETONLY
-	DefaultTelNum=02071541259
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=Systemtest09
-	IfAuthPass=l33ds
-	AuthRetries=0
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=18
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=IP6 Dial Test
-	Description=Symbian Test Network
-	Type=INTERNETONLY
-	DefaultTelNum=02077248525
-	PromptForLogin=FALSE
-	IfNetworks=ip,ip6
-	IfPromptForAuth=FALSE
-	IfAuthName=ipv6test
-	IfAuthPass=Symbian
-	AuthRetries=0
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=192.168.10.2
-	IpNameServer2=192.168.20.2
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	FIELD_COUNT=21
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 14
-	Name=mRouterDialOutIsp
-	Description=mRouterDialOutIsp
-	Type=INTERNETONLY
-	PromptForLogin=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=IfAuthPass=
-	IfAuthPass=AuthRetries=0
-	AuthRetries=0
-	FIELD_COUNT=9
-END_ADD
-
-
-############################################################
-## DialInISP
-## 
-[DialInISP]
-ADD_TEMPLATE
-	Name=Default Dial In ISP
-	UseLoginScript=FALSE
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=9
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Dial In ISP01
-	FIELD_COUNT=1
-END_ADD
-
-
-############################################################
-## OutgoingGPRS
-## 
-[OutgoingGPRS]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Vodafone GPRS
-	APN=internet
-	PDPType=IPV4
-	ReqPrecedence=0
-	ReqDelay=0
-	ReqReliability=0
-	ReqPeakThroughput=0
-	ReqMeanThroughput=0
-	MinPrecedence=0
-	MinDelay=0
-	MinReliability=0
-	MinPeakThroughput=0
-	MinMeanThroughput=0
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=web
-	IfAuthPass=web
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpAddr=0.0.0.0
-	IpDNSAddrFromServer=TRUE
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=33
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Vodafone WAP GPRS
-	APN=wap.vodafone.co.uk
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=wap
-	IfAuthPass=wap
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpAddr=0.0.0.0
-	IpDNSAddrFromServer=TRUE
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=33
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Orange GPRS
-	APN=orangeinternet
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=29
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=Orange WAP GPRS
-	APN=orangewap
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=29
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=O2 GPRS
-	APN=mobile.o2.co.uk
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=web
-	IfAuthPass=password
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=0.0.0.0
-	IpNameServer2=0.0.0.0
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=34
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=O2 WAP GPRS
-	APN=wap.o2.co.uk
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=o2wap
-	IfAuthPass=o2wap
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=0.0.0.0
-	IpNameServer2=0.0.0.0
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=34
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=Hutch GPRS
-	APN=portalnmms
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	AuthRetries=1
-	IpGateway=10.10.1.100
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=28
-END_ADD
-
-
-############################################################
-## IncomingGPRS
-## 
-[IncomingGPRS]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Incoming GPRS Settings PlaceHolder
-	APN=Test
-	PDPType=IPV4
-	PDPAddress=0.0.0.0
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=1
-	MinDelay=1
-	MinReliability=1
-	MinPeakThroughput=1
-	MinMeanThroughput=1
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=RasUser
-	IfAuthPass=pass
-	AuthRetries=1
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=0.0.0.0
-	IpNameServer2=0.0.0.0
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	FIELD_COUNT=29
-END_ADD
-
-
-############################################################
-## DefaultGPRS
-## 
-[DefaultGPRS]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Dummy Default GPRS Settings
-	Usage=1
-	APN=Access point name
-	PDPType=IPV6
-	PDPAddress=www.wid.com
-	Precedence=1
-	Delay=150
-	Reliability=1
-	PeakThroughput=1
-	MinReliability=1
-	MinPeakThroughput=1
-	MinMeanThroughput=1
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=TRUE
-	FIELD_COUNT=16
-END_ADD
-
-
-############################################################
-## LANService
-## 
-[LANService]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=IP4 DHCP Ethernet
-	IfNetworks=ip
-	IpNetMask=255.255.252.0
-	IpGateway=10.192.203.254
-	IpAddrFromServer=TRUE
-	IpAddr=10.192.200.59
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=10.192.59.6
-	IpNameServer2=10.192.58.49
-	ConfigDaemonManagerName=NetCfgExtnDhcp
-	ConfigDaemonName=!DhcpServ
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=IP6 Ethernet
-	IfNetworks=ip,ip6
-	IpNetMask=255.255.255.0
-	IpGateway=194.72.6.1
-	IpAddrFromServer=TRUE
-	IpAddr=192.168.0.100
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=192.168.10.2
-	IpNameServer2=192.168.20.2
-	FIELD_COUNT=9
-END_ADD
-
-
-############################################################
-## APPrioritySelectionPolicyTable
-## 
-[APPrioritySelectionPolicyTable]
-ADD_SECTION
-# COMMDB_ID = 254
-	Id=20000
-	Name=APSelPolNetworkDefault
-	AP1=Link.AccessPointTable.10001
-	APCOUNT=1
-	FIELD_COUNT=4
-END_ADD
-
-
-############################################################
-## TierTable
-## 
-[TierTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Id=2048
-	Name=Tier1
-	TierImplUid=271064536
-	TierThreadName=ESock_IP
-	TierManagerName=NetworkTierManager
-	DefaultAccessPoint=Link.AccessPointTable.10000
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Id=271064560
-	Name=Tier2
-	TierImplUid=271064560
-	TierThreadName=ESock_IP
-	TierManagerName=ProtoTierManager
-	DefaultAccessPoint=Link.AccessPointTable.10001
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Id=271064565
-	Name=Tier3
-	TierImplUid=271064565
-	TierThreadName=ESock_IP
-	TierManagerName=LinkTierManager
-	DefaultAccessPoint=Link.AccessPointTable.10000
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Id=536887799
-	Name=Tier4
-	TierImplUid=536887799
-	TierThreadName=ESock_SIP
-	TierManagerName=SIPTierManager
-	DefaultAccessPoint=Link.AccessPointTable.10002
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-
-############################################################
-## MCprTable
-## 
-[MCprTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=netmcpr
-	MCprUid=271009095
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipprotomcpr
-	MCprUid=271064558
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=pppmcpr
-	MCprUid=271064556
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=ethmcpr
-	MCprUid=271064572
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=rawipmcpr
-	MCprUid=271064576
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=tunnelmcpr
-	MCprUid=271064578
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=qospppmcpr
-	MCprUid=271064556
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=dummynifmcpr
-	MCprUid=271064580
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=hungrynifmcpr
-	MCprUid=271064580
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=pdpmcpr
-	MCprUid=271065840
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=sipmcpr
-	MCprUid=536887801
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=panethermcpr
-	MCprUid=271070626
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## CprTable
-## 
-[CprTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=ipcpr
-	CprUid=270561519
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipprotocpr
-	CprUid=271064531
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=agentcpr
-	CprUid=271064552
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=vanillacpr
-	CprUid=271065843
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=sipcpr
-	CprUid=271010872
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=tunnelagentcpr
-	CprUid=271080968
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=pdpcpr
-	CprUid=271065826
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## SCprTable
-## 
-[SCprTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=qosipscpr
-	SCprUid=270549768
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipprotoscpr
-	SCprUid=271064529
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=agentscpr
-	SCprUid=271064554
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=pdpscpr
-	SCprUid=271065824
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=pppscpr
-	SCprUid=271065852
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=vanillascpr
-	SCprUid=271065844
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=qosscpr
-	SCprUid=271065811
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=sipscpr
-	SCprUid=271010839
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## ProtocolTable
-## 
-[ProtocolTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=sapshim
-	ProtocolUid=270496898
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ipshim4
-	ProtocolUid=271064118
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=ppp
-	ProtocolUid=271064143
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=ethernet
-	ProtocolUid=271064539
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=rawip
-	ProtocolUid=271064562
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=tunnel
-	ProtocolUid=271064567
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=qosppp
-	ProtocolUid=271064148
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=dummynif
-	ProtocolUid=271064123
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=hungrynif
-	ProtocolUid=271064125
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=panether
-	ProtocolUid=271070627
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=rawip2
-	ProtocolUid=271084280
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## VirtualBearer
-## 
-[VirtualBearer]
-ADD_TEMPLATE
-	Name=Default VPN Bearer
-	IfName=VPN.nif
-	LastSocketActivityTimeout=600
-	LastSessionClosedTimeout=600
-	LastSocketClosedTimeout=600
-	Agent=VPN.agt
-	FIELD_COUNT=6
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=VPN Bearer1
-	IfName=ppp.nif
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=ntras.agt
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=VPN Bearer2
-	IfName=tunnelnif
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=vpnconnagt.agt
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## BearerTypeTable
-## 
-[BearerTypeTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=ppp
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=ethint
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.4
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.4
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=rawip
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.5
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.5
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=tunnelnif
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.6
-	Cpr=CprTable.7
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.6
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=qosppp
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.7
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.7
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=dummynif
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.8
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.8
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=hungrynif
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.9
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.9
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=spud-ppp
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.10
-	Cpr=CprTable.3
-	SCpr=SCprTable.4
-	Protocol=ProtocolTable.3
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=spud-rawip
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.10
-	Cpr=CprTable.3
-	SCpr=SCprTable.4
-	Protocol=ProtocolTable.5
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=IPProtoDefaultTemplate
-	Tier=Link.TierTable.271064560
-	MCpr=MCprTable.2
-	Cpr=CprTable.2
-	SCpr=SCprTable.2
-	Protocol=ProtocolTable.2
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=NetworkDefaultTemplate
-	Tier=Link.TierTable.2048
-	MCpr=MCprTable.1
-	Cpr=CprTable.1
-	SCpr=SCprTable.7
-	Protocol=ProtocolTable.1
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 12
-	Name=rawip2
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.10
-	Cpr=CprTable.8
-	SCpr=SCprTable.4
-	Protocol=ProtocolTable.11
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=spud-rawip2
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.10
-	Cpr=CprTable.8
-	SCpr=SCprTable.4
-	Protocol=ProtocolTable.11
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## AccessPointTable
-## 
-[AccessPointTable]
-ADD_SECTION
-# COMMDB_ID = 193
-	Id=29
-	Name=pppMappedFromIAP29
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 195
-	Id=28
-	Name=pppMappedFromIAP28
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 197
-	Id=27
-	Name=pppMappedFromIAP27
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 199
-	Id=26
-	Name=tunnelnifMappedFromIAP26
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.6
-	Cpr=CprTable.7
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.6
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 201
-	Id=25
-	Name=pppMappedFromIAP25
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 203
-	Id=24
-	Name=pppMappedFromIAP24
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 205
-	Id=23
-	Name=pppMappedFromIAP23
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 207
-	Id=22
-	Name=pppMappedFromIAP22
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 209
-	Id=21
-	Name=pppMappedFromIAP21
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 211
-	Id=20
-	Name=pppMappedFromIAP20
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 213
-	Id=19
-	Name=pppMappedFromIAP19
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 215
-	Id=18
-	Name=pppMappedFromIAP18
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 217
-	Id=17
-	Name=pppMappedFromIAP17
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 219
-	Id=16
-	Name=pppMappedFromIAP16
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 221
-	Id=15
-	Name=pppMappedFromIAP15
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 223
-	Id=14
-	Name=pppMappedFromIAP14
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 225
-	Id=13
-	Name=pppMappedFromIAP13
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 227
-	Id=12
-	Name=pppMappedFromIAP12
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 229
-	Id=11
-	Name=pppMappedFromIAP11
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 231
-	Id=10
-	Name=pppMappedFromIAP10
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 233
-	Id=9
-	Name=ethintMappedFromIAP9
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.4
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.4
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 235
-	Id=8
-	Name=pppMappedFromIAP8
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 237
-	Id=7
-	Name=pppMappedFromIAP7
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 239
-	Id=6
-	Name=pppMappedFromIAP6
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 241
-	Id=5
-	Name=pppMappedFromIAP5
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 243
-	Id=4
-	Name=pppMappedFromIAP4
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 245
-	Id=3
-	Name=pppMappedFromIAP3
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 247
-	Id=2
-	Name=ethintMappedFromIAP2
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.4
-	Cpr=CprTable.3
-	SCpr=SCprTable.3
-	Protocol=ProtocolTable.4
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 249
-	Id=1
-	Name=pppMappedFromIAP1
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064565
-	MCpr=MCprTable.3
-	Cpr=CprTable.3
-	SCpr=SCprTable.5
-	Protocol=ProtocolTable.3
-	CprConfig=0
-	AppSID=0
-	Priority=4294967295
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 252
-	Id=10002
-	Name=SIPDefault
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.536887799
-	MCpr=MCprTable.11
-	Cpr=CprTable.5
-	SCpr=SCprTable.8
-	Protocol=ProtocolTable.2
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 253
-	Id=10001
-	Name=IPProto_generated_10001
-	AccessPointSelectionPolicy=0
-	Tier=Link.TierTable.271064560
-	MCpr=MCprTable.2
-	Cpr=CprTable.2
-	SCpr=SCprTable.2
-	Protocol=ProtocolTable.2
-	CprConfig=13
-	CustomSelectionPolicy=13
-	FIELD_COUNT=10
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 254
-	Id=10000
-	Name=NetworkDefault
-	AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.20000
-	Tier=Link.TierTable.2048
-	MCpr=MCprTable.1
-	Cpr=CprTable.1
-	SCpr=SCprTable.7
-	Protocol=ProtocolTable.1
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## GlobalSettings
-## 
-[GlobalSettings]
-ADD_TEMPLATE
-	DefaultTier=1
-	FIELD_COUNT=1
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	WAPAccessPoint=1
-	ConnectionAttempts=2
-	RedialAttempts=3
-	SmsBearer=12
-	SmsReceiveMode=2
-	GPRSAttachMode=0
-	AcceptIncomingGprs=0
-	GPRSClassCBearer=GSM
-	ModemForDataAndFax=12
-	ModemForPhoneServicesAndSMS=12
-	BearerAvailabilityCheckTSY=phonetsy
-	LocationForDataAndFax=2
-	LocationForPhoneServicesAndSMS=5
-	MaxMBufHeap=2
-	DefaultNetwork=1
-	FIELD_COUNT=16
-END_ADD
-
-
-############################################################
-## IAP
-## 
-[IAP]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Pipex CSD
-	IAPServiceType=DialOutISP
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Ethernet IP4
-	IAPServiceType=LANService
-	IAPService=1
-	IAPBearerType=LANBearer
-	IAPBearer=1
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=NT RAS Com 0
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=3
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=3
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=NT RAS Com 1
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=4
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=3
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=WSP Test CSD
-	IAPServiceType=DialOutISP
-	IAPService=4
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=Msg Test CSD
-	IAPServiceType=DialOutISP
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=Msg Test Auth CSD
-	IAPServiceType=DialOutISP
-	IAPService=5
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=WinTunnel on Epoc Com1
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=5
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=3
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=Ethernet IP6
-	IAPServiceType=LANService
-	IAPService=2
-	IAPBearerType=LANBearer
-	IAPBearer=1
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=IP6 Dial
-	IAPServiceType=DialOutISP
-	IAPService=6
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=GSMPhone1
-	IAPServiceType=DialOutISP
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 12
-	Name=USIM Test
-	IAPServiceType=DialOutISP
-	IAPService=7
-	IAPBearerType=ModemBearer
-	IAPBearer=6
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=Vodafone GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=1
-	IAPBearerType=ModemBearer
-	IAPBearer=5
-	IAPNetwork=3
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 14
-	Name=Vodafone WAP GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=3
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 15
-	Name=Orange GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=4
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 16
-	Name=Orange WAP GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=4
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=4
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 17
-	Name=O2 GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=5
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=5
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 18
-	Name=O2 WAP GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=6
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=5
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 19
-	Name=CityOnlines CSD India
-	IAPServiceType=DialOutISP
-	IAPService=8
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 20
-	Name=Hutch GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=7
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=6
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 21
-	Name=Vodafone WAP GSM
-	IAPServiceType=DialOutISP
-	IAPService=9
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=3
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 22
-	Name=Orange WAP GSM
-	IAPServiceType=DialOutISP
-	IAPService=10
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=4
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 23
-	Name=O2 WAP GSM
-	IAPServiceType=DialOutISP
-	IAPService=11
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=5
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 24
-	Name=Test Network CSD
-	IAPServiceType=DialOutISP
-	IAPService=12
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 25
-	Name=Test Network CSD IP6
-	IAPServiceType=DialOutISP
-	IAPService=13
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 26
-	Name=Cisco VPN IAP
-	IAPServiceType=VpnService
-	IAPService=3
-	IAPBearerType=VirtualBearer
-	IAPBearer=3
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 27
-	Name=DUMMY TSY
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=8
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 28
-	Name=mRouter USB
-	IAPServiceType=DialOutISP
-	IAPService=14
-	IAPBearerType=ModemBearer
-	IAPBearer=10
-	IAPNetwork=2
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 29
-	Name=mRouter Wins
-	IAPServiceType=DialOutISP
-	IAPService=14
-	IAPBearerType=ModemBearer
-	IAPBearer=9
-	IAPNetwork=2
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## ConnectionPreferences
-## 
-[ConnectionPreferences]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	Ranking=1
-	Direction=OUTGOING
-	BearerSet=PSD
-	DialogPref=DONOTPROMPT
-	IAP=13
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## Proxies
-## 
-[Proxies]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	ISP=4
-	ProxyServiceType=DialOutISP
-	UseProxyServer=TRUE
-	ProxyServerName=www.dummyproxy.com
-	ProtocolName=http
-	PortNumber=80
-	Exceptions=www.dummyproxy.com/exception
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## WAPAccessPoint
-## 
-[WAPAccessPoint]
-ADD_TEMPLATE
-	Name=Default Dial In ISP
-	CurrentBearer=WAPIPBearer
-	FIELD_COUNT=2
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Vodafone WAP GPRS
-	StartPage=wap:1999/vodafone.wml
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Orange WAP GPRS
-	StartPage=orange.multimedia
-	FIELD_COUNT=2
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=O2 WAP GPRS
-	StartPage=wap.o2.co.uk
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## WAPIPBearer
-## 
-[WAPIPBearer]
-ADD_TEMPLATE
-	Name=DefaultRecordName-1
-	GatewayAddress=0
-	WSPOption=CONNECTIONLESS
-	Security=FALSE
-	ProxyPortNumber=0
-	ProxyLogin=0
-	ProxyPassword=0
-	FIELD_COUNT=7
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=DefaultRecordName-2
-	AccessPointId=2
-	GatewayAddress=wap.closedtest.intra
-	IAP=24
-	WSPOption=CONNECTIONORIENTED
-	ProxyPortNumber=1
-	ProxyLogin=1
-	ProxyPassword=1
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## WAPSMSBearer
-## 
-[WAPSMSBearer]
-ADD_TEMPLATE
-	Name=DefaultRecordName-1
-	GatewayAddress=0
-	ServiceCentreAddress=0
-	WSPOption=CONNECTIONLESS
-	Security=FALSE
-	FIELD_COUNT=5
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=DefaultRecordName-2
-	AccessPointId=2
-	GatewayAddress=+4412345678901
-	ServiceCentreAddress=+442071234567
-	WSPOption=CONNECTIONORIENTED
-	FIELD_COUNT=5
-END_ADD
-
-
-############################################################
-## SecureSocketTable
-## 
-[SecureSocketTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	ProtocolName=ssl3.0
-	ProtoLibrary=ssladaptor.dll
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=DefaultRecordName-2
-	ProtocolName=tls1.0
-	ProtoLibrary=ssladaptor.dll
-	FIELD_COUNT=3
-END_ADD
-
-
-############################################################
-## VpnService
-## 
-[VpnService]
-ADD_TEMPLATE
-	Name=Default VPN
-	Policy=DefaultVPNpolicy
-	HomeIAP=1
-	FIELD_COUNT=3
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=VPN1
-	Policy=VPNpolicy1
-	HomeIAP=2
-	HomeNetwork=1
-	FIELD_COUNT=4
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=cisco tunnel
-	Policy=cisco_all
-	HomeIAP=8
-	HomeNetwork=1
-	FIELD_COUNT=4
-END_ADD
-

--- a/cbsref/telephonyrefplugins/atltsy/config/configatmodem.bat	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-@echo off
-REM Copyright (c) 2010 Symbian Foundation and/or its subsidiary(-ies).
-REM All rights reserved.
-REM This component and the accompanying materials are made available
-REM under the terms of Eclipse Public License v1.0
-REM which accompanies this distribution, and is available
-REM at the URL http://www.eclipse.org/legal/epl-v10.html.
-REM
-REM Initial Contributors:
-REM Symbian Foundation - initial contribution.
-REM
-REM Contributors:
-REM
-REM Description:
-REM
-
-echo Backup hctl_base.dll:
-move /-Y \epoc32\release\winscw\udeb\hctl_base.dll \epoc32\release\winscw\udeb\hctl_base.bak
-
-echo Copying UREL version of hctl_base.dll:
-copy /Y \epoc32\release\winscw\urel\hctl_base.dll \epoc32\release\winscw\udeb\hctl_base.dll
-
-echo Backup phonetsy.tsy:
-move /-Y \epoc32\release\winscw\udeb\phonetsy.tsy \epoc32\release\winscw\udeb\phonetsy.bak
-
-echo Copying phonetsywithdispatcher.tsy to phonetsy:
-copy /Y \epoc32\release\winscw\udeb\phonetsywithdispatcher.tsy \epoc32\release\winscw\udeb\phonetsy.tsy
-
-echo Setup the feature manager to include GSM and WCDMA features:
-@perl -S -I/epoc32/tools/featmgr ./modifyfeaturedb.pl
-
-echo Setup the Converged Call Engine plugin to use CS rather than VCC:
-@perl -S ./modifycenrep.pl
-
-echo Setup CommDB:
-REM copy /Y \sf\os\cellularsrv\telephonyserverplugins\attestltsy\config\AT-LTSY(default).cfg \epoc32\winscw\c\AT-LTSY(default).cfg
-cd \sf\os\cellularsrv\telephonyserverplugins\attestltsy\config
-@perl -S ./modifycommdb.pl
-\epoc32\release\winscw\udeb\ced.exe -Dtextshell -- c:\AT-LTSY.cfg
-
-REM M:\sf\os\devicesrv\sysstatemgmt\group>sbs -b bld.inf -c winscw_udeb RESOURCE

--- a/cbsref/telephonyrefplugins/atltsy/config/modifycenrep.pl	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#!perl -w
-# Copyright (c) 2010 Symbian Foundation 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:
-# Symbian Foundation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-# This script modifies the CCE plugin cenrep file to use the CS plugin rather than the VCC one.
-# 
-#
-
-use strict;
-
-# Open the cenrep files
-my $cenrep = "/epoc32/release/winscw/UDEB/z/private/10202be9/10282E7F.txt";
-my $newcenrep = "/epoc32/release/winscw/UDEB/z/private/10202be9/10282E7F.tmp";
-my $cenrepbak = "/epoc32/release/winscw/UDEB/z/private/10202be9/10282E7F.bak";
-my $file2string;
-
-# Open the file in UNICODE-16 and read the whole contents into a string
-open(my $CENREPREAD, "<:raw:encoding(UTF-16LE):crlf:utf8", $cenrep) or die "Couldn't open current cenrep file";
-{
-$/ =undef;
-$file2string = <$CENREPREAD>;
-}
-close($CENREPREAD);
-
-# Modify the crucial line to the new UID for CS calls rather than VCC
-$file2string =~ s/0x9001 string \"536924074\"/0x9001 string \"271067365\"/g;
-
-# Write out the contents into a new UNICODE-16 encoded file
-open(my $CENREPOUT, ">:raw:encoding(UTF-16LE):crlf:utf8", $newcenrep) or die "Couldn't open new cenrep file for output";
-print $CENREPOUT $file2string;
-close($CENREPOUT);
-
-
-# Now backup the old and copy the new files
-rename($cenrep, $cenrepbak) or die "Couldn't backup feature data file '$cenrep'\n" unless (-e $cenrepbak); # OK for this to fail as it probably just means there's already a backup
-rename($newcenrep, $cenrep) or die "Couldn't copy feature data file '$newcenrep'\n";
-
-print "\tCCE CenRep Setup\n";
\ No newline at end of file

--- a/cbsref/telephonyrefplugins/atltsy/config/modifycommdb.pl	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-#!perl -w
-# Copyright (c) 2010 Symbian Foundation 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:
-# Symbian Foundation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-# This modifies CommDB for the AT LTSY modem, asking the user for the comm port and baud rate to use.
-# 
-#
-
-use strict;
-
-
-# Ask for the COM port and Baud
-my $com;
-my $baud;
-print "What COMM port is the modem on?\n(Note: Symbian COMM ports are 1 less than windows)\n\tCOMM::";
-chomp ($com = <>);
-
-print "What is the baud rate of the modem?\n(Wavecomm default is 9600, Telit default is 152000)\n\tBaud=";
-chomp ($baud = <>);
-
-#print "\nComm::$com Baud=$baud\n";
-
-# Open the config files
-my $defaultcomdb = "<./AT-LTSY(default).cfg";
-my $commdb = ">/epoc32/winscw/c/AT-LTSY.cfg";
-
-open(COMMDBOUT, $commdb);
-open(COMMDBREAD, $defaultcomdb);
-
-# Read in the default commdb and write it out to the new file, changing the com port and baud where necessary
-my $modembearertable = 0;
-my $modementry = 0;
-
-while(<COMMDBREAD>)
-{
-my($line)=$_;
-
-# first wait till we've found the $modembearertable line.
-if ($line =~ m/^\[ModemBearer\]/) 
-	{
-	#print "Found the modem bearer table\n";
-	$modembearertable = 1;
-	}
-# Or if we've got the end of the table unset the boolean
-elsif ($modembearertable && $line =~ m/^\[/) 
-	{
-	#print "Found the end fo the modem bearer table\n";
-	$modembearertable = 0;	
-	}
-
-# If we're in the modem table then check for a few things
-if ($modembearertable)
-	{
-	# Now wait till we've got to an entry for our modem
-	if ($line =~ m/^\sName=CommModem/) 
-		{
-		#print "Found the modem entry\n";
-		$modementry = 1;
-		}
-
-	# Or if we've reached the end of the modem entry unset the boolean
-	if ($modementry && $line =~ m/^END_ADD/) 
-		{
-		#print "Found the end of the modem entry\n";
-		$modementry = 0;
-		}
-	}
-
-# If we're in the entry for our modem then potentially modify the line
-if ($modementry)
-	{
-	# If it's the comm port number set that up
-	if ($line =~ m/^\sPortName=COMM::/) 
-		{
-		print "\tSetting the COMM port\n";
-		$line = "\tPortName=COMM::$com\n"
-		}
-	
-	# If it's the rate then set that up
-	if ($line =~ m/^\sRate=/) 
-		{
-		print "\tSetting the Baud rate\n";
-		$line = "\tRate=$baud\n"
-		}
-	}
-
-# Write out the (modified) line to the new commdb
-print COMMDBOUT $line;
-}
-
-# Close the files
-close(COMMDBOUT);
-close(COMMDBREAD);
-
-

--- a/cbsref/telephonyrefplugins/atltsy/config/modifyfeaturedb.pl	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-#!perl -w
-# Copyright (c) 2007-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:
-# This simple script shows how to modify the content of a feature manager
-# data file.
-# 
-#
-
-use strict;
-use FMCreate;
-
-#
-# Hardwire the datafile - this is only an example.
-# 
-my $datfile = "/epoc32/release/winscw/udeb/z/private/10205054/features.dat";
-my $datfile2 = "/epoc32/release/winscw/udeb/z/private/10205054/features2.dat";
-my $datfileback = "/epoc32/release/winscw/udeb/z/private/10205054/features.bak";
-
-#
-# Create an object that represents a feature data file.
-#
-my $fmc = FMCreate->new();
-
-#
-# Load the content of the data file into our FMCreate object.
-# Note that this will die if the content does not seem to be a feature set
-# file. This can happen if the first four bytes aren't 'feat' or if reading
-# the file fails at any point. This will also happen if the file is the wrong
-# size.
-#
-$fmc->LoadUp($datfile) or die "Failed to load up data from '$datfile'\n";
-
-# Setup an array of all the features we need to switch on.
-my $ffuid;
-my $ff;
-my @tomtab;
-
-$tomtab[0] = 81; 	# KFeatureIdProtocolGsm
-$tomtab[1] = 82; 	# KFeatureIdProtocolWcdma
-$tomtab[1] = 1696;	# KFeatureIdOnScreenDialer
-
-foreach $ffuid (@tomtab)
-#for ($ffuid = 1696; $ffuid <= 1696; $ffuid++)
-{
-	$ff = $fmc->GetFeatureFlagByUID($ffuid);
-	if(ref($ff) ne "FeatureFlag")
-	{
-		printf ("Feature flag uid 0x%0x was not already in $datfile, creating it.\n", $ffuid);
-		#
-		# Now add a new feature. The three arguments are UID, status flags (not defined
-		# here) and user data word.
-		#
-		$ff = FeatureFlag->new($ffuid, undef, 0x00000000);
-		die "Couldn't create new feature flag object.\n" unless(ref($ff));
-			
-		#
-		# Add it to our existing feature data.
-		#
-		$fmc->AddFeatureFlag($ff) or die "Couldn't add new feature flag..\n";
-
-		printf ("Feature flag uid 0x%0x created ok.\n", $ffuid);
-	} 
-
-	$ff->Supported(1);
-	$ff->Upgradable(0);
-	$ff->Modifiable(0);
-	$ff->BlackListed(0);
-	$ff->Uninitialized(0);
-	$ff->Persisted(0);
-}
-#
-# Now write out the file to a new location
-#
-$fmc->WriteToFile($datfile2) or die "Couldn't write feature data file '$datfile2'\n";
-
-rename($datfile, $datfileback) or die "Couldn't backup feature data file '$datfile'\n";
-rename($datfile2, $datfile) or die "Couldn't copy feature data file '$datfile2'\n";
-
-printf ("\tFeature Database setup\n");
-#
-# Example code to remove a feature flag.
-#
-#$fmc->RemoveFeatureFlagByUID($ffuid) or die "Couldn't remove feature flag\n";
-

--- a/cbsref/telephonyrefplugins/atltsy/data/snap.cfg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,721 +0,0 @@
-############################################################
-## AUTO-GENERATED CONFIGURATION FILE
-## CommsDat Database Dump Utility
-## 1.1
-############################################################
-
-############################################################
-## Network
-## 
-[Network]
-ADD_SECTION
-# COMMDB_ID = 1
-	Id=1
-	Name=Intranet
-	FIELD_COUNT=2
-END_ADD
-
-
-############################################################
-## ModemBearer
-## 
-[ModemBearer]
-ADD_TEMPLATE
-	Id=0
-	Name=Default Modem
-	TSYName=phonetsywithdispatcher
-	CSYName=ECUART
-	LastSocketActivityTimeout=180
-	LastSessionClosedTimeout=6
-	LastSocketClosedTimeout=100
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=115200
-	Handshaking=0
-	SpecialRate=0
-	XonChar=0
-	XoffChar=0
-	FaxClassPref=AUTO
-	SpeakerPref=NEVER
-	SpeakerVolPref=QUIET
-	ModemInitString=AT
-	DataInitString=AT
-	FaxInitString=AT
-	DialPauseLength=S8=
-	SpeakerVolContorlLow=L0
-	SpeakerVolControlMedium=L1
-	SpeakerVolControlHigh=L2
-	SpeakerAlwaysOff=M0
-	SpeakerOnUntilCarrier=M1
-	SpeakerAlwaysOn=M2
-	SpeakerOnAfterUntilCarrier=M3
-	DialToneWaitModifier=W
-	CallProgress1=X1
-	CallProgress2=X2
-	CallProgress3=X3
-	CallProgress4=X4
-	EchoOff=E0
-	VerboseText=V1
-	QuietOff=Q0
-	QuietOn=Q1
-	DialCommandStateModifier=;
-	OnLine=O
-	ResetConfiguration=Z
-	ReturnToFactoryDefs=&F
-	DCDOnDuringLink=&C1
-	DTRHangUp=&D2
-	DSRAlwaysOn=&S0
-	RTSCTSHandshake=&K3
-	XonXoffHandshake=&K4
-	EscapeCharacter=+
-	EscapeGuardPeriod=S12
-	NoDialTone=NO DIAL TONE
-	Busy=BUSY
-	NoAnswer=NO ANSWER
-	Carrier=CARRIER
-	Connect=CONNECT
-	CompressionClass5=COMPRESSION:CLASS 5
-	CompressionV42bis=COMPRESSION:V.42 bis
-	CompressionNone=COMPRESSION:NONE
-	ProtocolLAPD=PROTOCOL:LAPD
-	ProtocolALT=PROTOCOL:ALT
-	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
-	ProtocolNone=PROTOCOL:NONE
-	MessageValidityPeriod=0
-	MessageDeliveryReport=FALSE
-	CommRole=0
-	Agent=NULLAGT
-	BCAStack=C32Bca
-	FIELD_COUNT=66
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 1
-	Id=1
-	Name=Wavecom Modem
-	IfName=PPP
-	PortName=COMM::0
-	CSYName=ECUART
-	FIELD_COUNT=5
-END_ADD
-
-
-############################################################
-## Location
-## 
-[Location]
-ADD_TEMPLATE
-	Id=0
-	Name=Default Location
-	IntlPrefixCode=+
-	NatPrefixCode=0
-	NatCode=44
-	Mobile=TRUE
-	UsePulseDial=FALSE
-	WaitForDialTone=FALSE
-	PauseAfterDialout=0
-	FIELD_COUNT=9
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Id=2
-	Name=Office
-	IntlPrefixCode=00
-	NatPrefixCode=0
-	NatCode=44
-	AreaCode=171
-	DialOutCode=9,
-	Mobile=FALSE
-	UsePulseDial=FALSE
-	WaitForDialTone=FALSE
-	PauseAfterDialout=0
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Id=3
-	Name=Mobile
-	IntlPrefixCode=+
-	NatPrefixCode=0
-	NatCode=44
-	Mobile=TRUE
-	UsePulseDial=FALSE
-	WaitForDialTone=FALSE
-	PauseAfterDialout=0
-	FIELD_COUNT=9
-END_ADD
-
-
-############################################################
-## GlobalSettings
-## 
-[GlobalSettings]
-ADD_SECTION
-# COMMDB_ID = 1
-	Id=1
-	Name=DefaultRecordName-1
-	ConnectionAttempts=2
-	RedialAttempts=3
-	SmsReceiveMode=2
-	GPRSAttachMode=1
-	AcceptIncomingGprs=1
-	GPRSClassCBearer=GSM
-	ModemForDataAndFax=1
-	ModemForPhoneServicesAndSMS=1
-	LocationForDataAndFax=3
-	LocationForPhoneServicesAndSMS=3
-	MaxMBufHeap=3
-	DefaultNetwork=1
-	DefaultTier=2048
-	BearerAvailabilityCheckTSY=phonetsywithdispatcher
-	FIELD_COUNT=16
-END_ADD
-
-
-############################################################
-## OutgoingGPRS
-## 
-[OutgoingGPRS]
-ADD_TEMPLATE
-	Id=0
-	Name=Default Outgoing GPRS
-	APN=cmnet
-	PDPType=IPV4
-	ReqPrecedence=2
-	ReqDelay=4
-	ReqReliability=3
-	ReqPeakThroughput=3
-	ReqMeanThroughput=31
-	MinPrecedence=2
-	MinDelay=4
-	MinReliability=3
-	MinPeakThroughput=3
-	MinMeanThroughput=31
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=0.0.0.0
-	IpNameServer2=0.0.0.0
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	UmtsR99QoSAndOn=1
-	FIELD_COUNT=30
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 1
-	Id=1
-	Name=SPUD_Echo_1
-	PDPType=IPV4
-	IfParams=lowernif=PPP
-	IfPromptForAuth=FALSE
-	IpAddrFromServer=TRUE
-	IpAddr=0.0.0.0
-	IpDNSAddrFromServer=TRUE
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## DefaultGPRS
-## 
-[DefaultGPRS]
-ADD_SECTION
-# COMMDB_ID = 1
-	Id=1
-	Name=Dummy Default GPRS Settings
-	Usage=1
-	APN=cmnet
-	PDPType=IPV4
-	PDPAddress=www.wid.com
-	Precedence=1
-	Delay=1
-	Reliability=1
-	PeakThroughput=1
-	MeanThroughput=1
-	MinPrecedence=1
-	MinDelay=1
-	MinReliability=1
-	MinPeakThroughput=1
-	MinMeanThroughput=1
-	DataCompression=TRUE
-	HeaderCompression=TRUE
-	GprsUseEdge=FALSE
-	AnonymousAccess=TRUE
-	FIELD_COUNT=20
-END_ADD
-
-############################################################
-## APPrioritySelectionPolicyTable
-## 
-[APPrioritySelectionPolicyTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Id=1
-	Name=SelectionPolicy1
-	AP1=Link.AccessPointTable.2
-	FIELD_COUNT=3
-END_ADD
-
-
-############################################################
-## AccessPointTable
-## 
-[AccessPointTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Id=1
-	Name=Network1
-	Tier=Link.TierTable.2048
-	MCpr=MCprTable.1
-	AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.1
-	Cpr=CprTable.1
-	SCpr=SCprTable.7
-	Protocol=ProtocolTable.1
-	Priority=1
-	FIELD_COUNT=9
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Id=2
-	Name=IPProto1
-	Tier=Link.TierTable.271064560
-	MCpr=MCprTable.2
-	CustomSelectionPolicy=3
-	Cpr=CprTable.2
-	CprConfig=3
-	SCpr=SCprTable.2
-	Protocol=ProtocolTable.2
-	Priority=1
-	FIELD_COUNT=10
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Id=3
-	Name=pppMappedFromIAP3
-	Tier=Link.TierTable.536978267
-	MCpr=MCprTable.10  #pdpmcpr
-	Cpr=CprTable.4  #vallinacpr
-	SCpr=SCprTable.4  #pdpscpr
-	Protocol=ProtocolTable.3   #ppp
-	Priority=1
-	FIELD_COUNT=8
-END_ADD
-
-
-
-############################################################
-## IAP
-## 
-[IAP]
-ADD_SECTION
-# COMMDB_ID = 3
-	Id=3
-	Name=Wavecom_GRPS
-	IAPServiceType=OutgoingGPRS
-	IAPService=1
-	IAPBearerType=ModemBearer
-	IAPBearer=1
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=3
-	FIELD_COUNT=9
-END_ADD
-
-
-############################################################
-## ConnectionPreferences
-## 
-[ConnectionPreferences]
-ADD_SECTION
-# COMMDB_ID = 110
-	Id=110
-	Name=DefaultRecordName-1
-	Ranking=1
-	Direction=OUTGOING
-	BearerSet=PSD
-	DialogPref=DONOTPROMPT
-	IAP=3
-	FIELD_COUNT=7
-END_ADD
-
-
-############################################################
-## TierTable
-## 
-[TierTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Id=2048
-    TierImplUid=271064536
-	Name=Tier1
-	TierThreadName=ESock_IP
-	TierManagerName=NetworkTierManager
-	DefaultAccessPoint=Link.AccessPointTable.1
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Id=271064560
-    TierImplUid=271064560
-	Name=Tier2
-	TierThreadName=ESock_IP
-	TierManagerName=ProtoTierManager
-	DefaultAccessPoint=Link.AccessPointTable.2
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Id=536978267
-    TierImplUid=536978267
-	Name=Tier4
-	TierThreadName=ESock_IP
-	TierManagerName=LinkTierManager
-	DefaultAccessPoint=Link.AccessPointTable.3
-	PromptUser=0
-	FIELD_COUNT=7
-END_ADD
-
-
-############################################################
-## MCprTable
-## 
-[MCprTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Id=1
-	Name=netmcpr
-	MCprUid=271009095
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Id=2
-	Name=ipprotomcpr
-	MCprUid=271064558
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Id=3
-	Name=pppmcpr
-	MCprUid=271064556
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Id=4
-	Name=ethmcpr
-	MCprUid=271064572
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Id=5
-	Name=rawipmcpr
-	MCprUid=271064576
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Id=6
-	Name=tunnelmcpr
-	MCprUid=271064578
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Id=7
-	Name=qospppmcpr
-	MCprUid=271064556
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Id=8
-	Name=dummynifmcpr
-	MCprUid=271064580
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Id=9
-	Name=hungrynifmcpr
-	MCprUid=271064580
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Id=10
-	Name=pdpmcpr
-	MCprUid=271065840
-	FIELD_COUNT=3
-END_ADD
-
-
-############################################################
-## CprTable
-## 
-[CprTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Id=1
-	Name=ipcpr
-	CprUid=270561519
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Id=2
-	Name=ipprotocpr
-	CprUid=271064531
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Id=3
-	Name=agentcpr
-	CprUid=271064552
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Id=4
-	Name=vanillacpr
-	CprUid=271065843
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Id=5
-	Name=pdpcpr
-	CprUid=271065826
-	FIELD_COUNT=3
-END_ADD
-
-
-############################################################
-## SCprTable
-## 
-[SCprTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Id=1
-	Name=ipscpr
-	SCprUid=270549768
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Id=2
-	Name=ipprotoscpr
-	SCprUid=271064529
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Id=3
-	Name=agentscpr
-	SCprUid=271064554
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Id=4
-	Name=pdpscpr
-	SCprUid=271065824
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Id=5
-	Name=pppscpr
-	SCprUid=271065852
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Id=6
-	Name=vanillascpr
-	SCprUid=271065844
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Id=7
-	Name=qosscpr
-	SCprUid=271065811
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Id=8
-	Name=ipqosprotoscpr
-	SCprUid=271065816
-	FIELD_COUNT=3
-END_ADD
-
-
-############################################################
-## ProtocolTable
-## 
-[ProtocolTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Id=1
-	Name=sapshim
-	ProtocolUid=270496898
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Id=2
-	Name=ipshim4
-	ProtocolUid=271064118
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Id=3
-	Name=ppp
-	ProtocolUid=271064143
-	FIELD_COUNT=3
-END_ADD
-
-
-[UmtsR99QoSAndOn]
-ADD_SECTION
-# COMMDB_ID = 1
-  	Name=PRIMARY1
-        ReqTrafficClass=8
-        MinTrafficClass=8
-        ReqDeliveryOrder=1
-        MinDeliveryOrder=1
-        ReqDeliverErroneousSDU=8
-        MinDeliverErroneousSDU=8
-        ReqMaxSDUSize=0
-        MinAcceptableMaxSDUSize=0
-        ReqMaxUplinkRate=0
-        ReqMinUplinkRate=0
-        ReqMaxDownlinkRate=0
-        ReqMinDownlinkRate=0
-        ReqBER=1
-        MaxBER=1
-        ReqSDUErrorRatio=1
-        MaxSDUErrorRatio=1
-        ReqTrafficHandlingPriority=8
-        MinTrafficHandlingPriority=8
-        ReqTransferDelay=0
-        MaxTransferDelay=0
-        ReqGuaranteedUplinkRate=0
-        MinGuaranteedUplinkRat=0
-        ReqGuaranteedDownlinkRate=0
-        MinGuaranteedDownlinkRate=0
-        SignallingIndication=FALSE
-        IMCNSignallingIndication=FALSE
-        SourceStatisticsDescriptor=0
-	FIELD_COUNT=28
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-  	Name=SECONDARY1
-        ReqTrafficClass=4
-        MinTrafficClass=4
-        ReqDeliveryOrder=1
-        MinDeliveryOrder=1
-        ReqDeliverErroneousSDU=8
-        MinDeliverErroneousSDU=8
-        ReqMaxSDUSize=768
-        MinAcceptableMaxSDUSize=512
-        ReqMaxUplinkRate=1024
-        ReqMinUplinkRate=1024
-        ReqMaxDownlinkRate=1024
-        ReqMinDownlinkRate=1024
-        ReqBER=0
-        MaxBER=0
-        ReqSDUErrorRatio=1
-        MaxSDUErrorRatio=1
-        ReqTrafficHandlingPriority=1
-        MinTrafficHandlingPriority=1
-        ReqTransferDelay=250
-        MaxTransferDelay=250
-        ReqGuaranteedUplinkRate=1024
-        MinGuaranteedUplinkRat=1024
-        ReqGuaranteedDownlinkRate=1024
-        MinGuaranteedDownlinkRate=1024
-        SignallingIndication=FALSE
-        IMCNSignallingIndication=FALSE
-        SourceStatisticsDescriptor=0
-	FIELD_COUNT=28
-END_ADD
-
-[PolicySelectorTable]
-ADD_SECTION
-# COMMDB_ID = 1
-  PolicyId=1
-  AppUid=0
-  SrcAddress=0.0.0.0
-  SrcMask=255.255.255.255
-  DstAddress=0.0.0.0
-  DstMask=255.255.255.255
-  SrcPort=0
-  SrcPortMax=1031
-  DstPort=3461
-  DstPortMax=3461
-  ProtocolId=17
-  IapId=2
-  Priority=1
-  FIELD_COUNT=13
-END_ADD  
-
-ADD_SECTION
-# COMMDB_ID = 2
-  PolicyId=2
-  AppUid=0
-  SrcPort=0
-  SrcPortMax=0
-  ProtocolId=1
-  IapId=2
-  Priority=1
-  FIELD_COUNT=7
-END_ADD

--- a/cbsref/telephonyrefplugins/atltsy/data/systemtest.cfg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2400 +0,0 @@
-############################################################
-## AUTO-GENERATED CONFIGURATION FILE
-## CommsDat Database Dump Utility
-## 1.0
-############################################################
-
-############################################################
-## Network
-## 
-[Network]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Intranet
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=mRouter
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Vodafone
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=Orange
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=O2
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=TMobile
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=Airtel
-	FIELD_COUNT=1
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=Hutch
-	FIELD_COUNT=1
-END_ADD
-
-
-############################################################
-## ModemBearer
-## 
-[ModemBearer]
-ADD_TEMPLATE
-	Name=Default Modem
-	IfName=PPP
-	PortName=COMM::1
-	TSYName=MM
-	CSYName=ECUART
-	LastSocketActivityTimeout=600
-	LastSessionClosedTimeout=600
-	LastSocketClosedTimeout=600
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=115200
-	Handshaking=0
-	SpecialRate=0
-	XonChar=0
-	XoffChar=0
-	FaxClassPref=AUTO
-	SpeakerPref=NEVER
-	SpeakerVolPref=QUIET
-	ModemInitString=AT
-	DataInitString=AT
-	FaxInitString=AT
-	IspInitString=*99***1#
-	DialPauseLength=S8=
-	SpeakerVolContorlLow=L0
-	SpeakerVolControlMedium=L1
-	SpeakerVolControlHigh=L2
-	SpeakerAlwaysOff=M0
-	SpeakerOnUntilCarrier=M1
-	SpeakerAlwaysOn=M2
-	SpeakerOnAfterUntilCarrier=M3
-	DialToneWaitModifier=W
-	CallProgress1=X1
-	CallProgress2=X2
-	CallProgress3=X3
-	CallProgress4=X4
-	EchoOff=E0
-	VerboseText=V1
-	QuietOff=Q0
-	QuietOn=Q1
-	DialCommandStateModifier=;
-	OnLine=O
-	ResetConfiguration=Z
-	ReturnToFactoryDefs=&F
-	DCDOnDuringLink=&C1
-	DTRHangUp=&D2
-	DSRAlwaysOn=&S0
-	RTSCTSHandshake=&K3
-	XonXoffHandshake=&K4
-	EscapeCharacter=+
-	EscapeGuardPeriod=S12
-	NoDialTone=NO DIAL TONE
-	Busy=BUSY
-	NoAnswer=NO ANSWER
-	Carrier=CARRIER
-	Connect=CONNECT
-	CompressionClass5=COMPRESSION:CLASS 5
-	CompressionV42bis=COMPRESSION:V.42 bis
-	CompressionNone=COMPRESSION:NONE
-	ProtocolLAPD=PROTOCOL:LAPD
-	ProtocolALT=PROTOCOL:ALT
-	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
-	ProtocolNone=PROTOCOL:NONE
-	MessageCentreNumber=+44123456789
-	MessageValidityPeriod=1440
-	MessageDeliveryReport=FALSE
-	MinimumSignalLevel=9905
-	CommRole=0
-	ControlChannelPortName=COMM::0
-	SIRSettings=0
-	Agent=CSD.agt
-	FIELD_COUNT=71
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=GsmPhone1
-	IfName=PPP
-	PortName=COMM::1
-	TSYName=MM
-	CSYName=ECUART
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=115200
-	Handshaking=4
-	SpecialRate=0
-	XonChar=17
-	XoffChar=19
-	ModemInitString=AT
-	MessageCentreNumber=+447973100973
-	MessageValidityPeriod=1440
-	MessageDeliveryReport=FALSE
-	MinimumSignalLevel=9905
-	ControlChannelPortName=COMM::0
-	Agent=CSD.agt
-	FIELD_COUNT=20
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=NTRAS (Com0) Null Modem 115200bps
-	IfName=PPP
-	PortName=COMM::0
-	TSYName=NTRAS
-	CSYName=ECUART
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=115200
-	Handshaking=4
-	SpecialRate=0
-	XonChar=0
-	XoffChar=0
-	ModemInitString=AT
-	MessageCentreNumber=+44123456789
-	MessageValidityPeriod=1440
-	MessageDeliveryReport=TRUE
-	MinimumSignalLevel=9905
-	ControlChannelPortName=COMM::0
-	Agent=CSD.agt
-	FIELD_COUNT=20
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=NTRAS (Com1) Null Modem 115200bps
-	IfName=PPP
-	PortName=COMM::1
-	TSYName=NTRAS
-	CSYName=ECUART
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=115200
-	Handshaking=4
-	SpecialRate=0
-	XonChar=0
-	XoffChar=0
-	ModemInitString=AT
-	MessageCentreNumber=+44123456789
-	MessageValidityPeriod=1440
-	MessageDeliveryReport=TRUE
-	MinimumSignalLevel=9905
-	ControlChannelPortName=COMM::0
-	Agent=CSD.agt
-	FIELD_COUNT=20
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=GsmPhone2
-	IfName=PPP
-	PortName=COMM::0
-	TSYName=phonetsywithdispatcher
-	CSYName=ECUART
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=115200
-	Handshaking=4
-	SpecialRate=0
-	XonChar=0
-	XoffChar=0
-	ModemInitString=AT
-	MessageCentreNumber=+44123456789
-	MessageValidityPeriod=1440
-	MessageDeliveryReport=TRUE
-	MinimumSignalLevel=9905
-	ControlChannelPortName=COMM::0
-	Agent=PSD.agt
-	FIELD_COUNT=20
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=SimulatorPhone
-	IfName=PPP
-	PortName=COMM::0
-	TSYName=SIM
-	CSYName=ECUART
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=19200
-	Handshaking=196
-	SpecialRate=0
-	XonChar=17
-	XoffChar=19
-	ModemInitString=ATZ
-	MessageCentreNumber=+44123456789
-	MessageValidityPeriod=1440
-	MessageDeliveryReport=FALSE
-	MinimumSignalLevel=9905
-	ControlChannelPortName=COMM::0
-	Agent=CSD.agt
-	FIELD_COUNT=20
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=GsmPhone3
-	IfName=PPP
-	PortName=COMM::0
-	TSYName=MM
-	CSYName=ECUART
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=115200
-	Handshaking=4
-	SpecialRate=0
-	XonChar=17
-	XoffChar=19
-	ModemInitString=ATZ
-	MessageCentreNumber=+447973100973
-	MessageValidityPeriod=1440
-	MessageDeliveryReport=FALSE
-	MinimumSignalLevel=9905
-	ControlChannelPortName=COMM::0
-	Agent=PSD.agt
-	FIELD_COUNT=20
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=GsmPhone4
-	IfName=PPP
-	PortName=COMM::0
-	TSYName=DMM
-	CSYName=ECUART
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=19200
-	Handshaking=196
-	SpecialRate=0
-	XonChar=17
-	XoffChar=19
-	ModemInitString=ATZ
-	MessageCentreNumber=+44123456789
-	MessageValidityPeriod=1440
-	MessageDeliveryReport=FALSE
-	MinimumSignalLevel=9905
-	ControlChannelPortName=COMM::0
-	Agent=CSD.agt
-	FIELD_COUNT=20
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=mRouterWinsBearer
-	IfName=PPP
-	PortName=WINS::0
-	TSYName=MM
-	CSYName=WINSCSY
-	LastSocketActivityTimeout=9999
-	LastSessionClosedTimeout=180
-	LastSocketClosedTimeout=30
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=115200
-	Handshaking=4
-	SpecialRate=0
-	XonChar=0
-	XoffChar=0
-	FaxClassPref=AUTO
-	SpeakerPref=NEVER
-	SpeakerVolPref=QUIET
-	ModemInitString=AT
-	DataInitString=AT
-	FaxInitString=AT
-	DialPauseLength=S8=
-	SpeakerVolContorlLow=L0
-	SpeakerVolControlMedium=L1
-	SpeakerVolControlHigh=L2
-	SpeakerAlwaysOff=M0
-	SpeakerOnUntilCarrier=M1
-	SpeakerAlwaysOn=M2
-	SpeakerOnAfterUntilCarrier=M3
-	DialToneWaitModifier=W
-	CallProgress1=X1
-	CallProgress2=X2
-	CallProgress3=X3
-	CallProgress4=X4
-	EchoOff=E0
-	VerboseText=V1
-	QuietOff=Q0
-	QuietOn=Q1
-	DialCommandStateModifier=;
-	OnLine=O
-	ResetConfiguration=Z
-	ReturnToFactoryDefs=&F
-	DCDOnDuringLink=&C1
-	DTRHangUp=&D2
-	DSRAlwaysOn=&S0
-	RTSCTSHandshake=&K3
-	XonXoffHandshake=&K4
-	EscapeCharacter=+
-	EscapeGuardPeriod=S12
-	NoDialTone=NO DIAL TONE
-	Busy=BUSY
-	NoAnswer=NO ANSWER
-	Carrier=CARRIER
-	Connect=CONNECT
-	CompressionClass5=COMPRESSION:CLASS 5
-	CompressionV42bis=COMPRESSION:V.42 bis
-	CompressionNone=COMPRESSION:NONE
-	ProtocolLAPD=PROTOCOL:LAPD
-	ProtocolALT=PROTOCOL:ALT
-	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
-	ProtocolNone=PROTOCOL:NONE
-	MessageCentreNumber=+44123456789
-	MessageValidityPeriod=1440
-	MessageDeliveryReport=FALSE
-	MinimumSignalLevel=9905
-	CommRole=0
-	SIRSettings=0
-	Agent=mRouterAgent.agt
-	FIELD_COUNT=69
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=mRouterUsbBearer
-	IfName=PPP
-	PortName=ACM::0
-	TSYName=MM
-	CSYName=ECACM
-	LastSocketActivityTimeout=9999
-	LastSessionClosedTimeout=180
-	LastSocketClosedTimeout=30
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=115200
-	Handshaking=4
-	SpecialRate=0
-	XonChar=0
-	XoffChar=0
-	FaxClassPref=AUTO
-	SpeakerPref=NEVER
-	SpeakerVolPref=QUIET
-	ModemInitString=AT
-	DataInitString=AT
-	FaxInitString=AT
-	DialPauseLength=S8=
-	SpeakerVolContorlLow=L0
-	SpeakerVolControlMedium=L1
-	SpeakerVolControlHigh=L2
-	SpeakerAlwaysOff=M0
-	SpeakerOnUntilCarrier=M1
-	SpeakerAlwaysOn=M2
-	SpeakerOnAfterUntilCarrier=M3
-	DialToneWaitModifier=W
-	CallProgress1=X1
-	CallProgress2=X2
-	CallProgress3=X3
-	CallProgress4=X4
-	EchoOff=E0
-	VerboseText=V1
-	QuietOff=Q0
-	QuietOn=Q1
-	DialCommandStateModifier=;
-	OnLine=O
-	ResetConfiguration=Z
-	ReturnToFactoryDefs=&F
-	DCDOnDuringLink=&C1
-	DTRHangUp=&D2
-	DSRAlwaysOn=&S0
-	RTSCTSHandshake=&K3
-	XonXoffHandshake=&K4
-	EscapeCharacter=+
-	EscapeGuardPeriod=S12
-	NoDialTone=NO DIAL TONE
-	Busy=BUSY
-	NoAnswer=NO ANSWER
-	Carrier=CARRIER
-	Connect=CONNECT
-	CompressionClass5=COMPRESSION:CLASS 5
-	CompressionV42bis=COMPRESSION:V.42 bis
-	CompressionNone=COMPRESSION:NONE
-	ProtocolLAPD=PROTOCOL:LAPD
-	ProtocolALT=PROTOCOL:ALT
-	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
-	ProtocolNone=PROTOCOL:NONE
-	MessageCentreNumber=+44123456789
-	MessageValidityPeriod=1440
-	MessageDeliveryReport=FALSE
-	MinimumSignalLevel=9905
-	CommRole=0
-	SIRSettings=0
-	Agent=mRouterAgent.agt
-	FIELD_COUNT=69
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=trpat_psd
-	Agent=trp.agt
-	IfName=rawip
-	PortName=not used
-	BCAStack=C32Bca
-	ControlChannelPortName=COMM::0
-	TSYName=TRPAT
-	CSYName=CSY27010
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=115200
-	Handshaking=4
-	SpecialRate=0
-	XonChar=0
-	XoffChar=0
-	FaxClassPref=AUTO
-	SpeakerPref=NEVER
-	SpeakerVolPref=QUIET
-	ModemInitString=AT
-	DataInitString=AT
-	FaxInitString=AT
-	DialPauseLength=S8=
-	SpeakerVolContorlLow=L0
-	SpeakerVolControlMedium=L1
-	SpeakerVolControlHigh=L2
-	SpeakerAlwaysOff=M0
-	SpeakerOnUntilCarrier=M1
-	SpeakerAlwaysOn=M2
-	SpeakerOnAfterUntilCarrier=M3
-	DialToneWaitModifier=W
-	CallProgress1=X1
-	CallProgress2=X2
-	CallProgress3=X3
-	CallProgress4=X4
-	EchoOff=E0
-	VerboseText=V1
-	QuietOn=Q1
-	QuietOff=Q0
-	DialCommandStateModifier=;
-	OnLine=O
-	ResetConfiguration=Z
-	ReturnToFactoryDefs=&F
-	DCDOnDuringLink=&C1
-	DTRHangUp=&D2
-	DSRAlwaysOn=&S0
-	RTSCTSHandshake=&K3
-	XonXoffHandshake=&K4
-	EscapeCharacter=+
-	EscapeGuardPeriod=S12
-	NoDialTone=NO DIAL TONE
-	Busy=BUSY
-	NoAnswer=NO ANSWER
-	Carrier=CARRIER
-	Connect=CONNECT
-	CompressionClass5=COMPRESSION:CLASS 5
-	CompressionV42bis=COMPRESSION:V.42 bis
-	CompressionNone=COMPRESSION:NONE
-	ProtocolLAPD=PROTOCOL:LAPD
-	ProtocolALT=PROTOCOL:ALT
-	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
-	ProtocolNone=PROTOCOL:NONE
-	MessageCentreNumber=+447973100973
-	MessageValidityPeriod=1440
-	MessageDeliveryReport=FALSE
-	MinimumSignalLevel=9905
-	LastSocketActivityTimeout=300
-	LastSessionClosedTimeout=300
-	LastSocketClosedTimeout=300
-	SIRSettings=0
-	CommRole=0
-	FIELD_COUNT=71
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 12
-	Name=trpat_csd
-	Agent=csd.agt
-	IfName=PPP
-	PortName=not used
-	ControlChannelPortName=COMM::0
-	TSYName=TRPAT
-	CSYName=CSY27010
-	DataBits=8
-	StopBits=1
-	Parity=NONE
-	Rate=115200
-	Handshaking=4
-	SpecialRate=0
-	XonChar=0
-	XoffChar=0
-	FaxClassPref=AUTO
-	SpeakerPref=NEVER
-	SpeakerVolPref=QUIET
-	ModemInitString=AT
-	DataInitString=AT
-	FaxInitString=AT
-	DialPauseLength=S8=
-	SpeakerVolContorlLow=L0
-	SpeakerVolControlMedium=L1
-	SpeakerVolControlHigh=L2
-	SpeakerAlwaysOff=M0
-	SpeakerOnUntilCarrier=M1
-	SpeakerAlwaysOn=M2
-	SpeakerOnAfterUntilCarrier=M3
-	DialToneWaitModifier=W
-	CallProgress1=X1
-	CallProgress2=X2
-	CallProgress3=X3
-	CallProgress4=X4
-	EchoOff=E0
-	VerboseText=V1
-	QuietOn=Q1
-	QuietOff=Q0
-	DialCommandStateModifier=;
-	OnLine=O
-	ResetConfiguration=Z
-	ReturnToFactoryDefs=&F
-	DCDOnDuringLink=&C1
-	DTRHangUp=&D2
-	DSRAlwaysOn=&S0
-	RTSCTSHandshake=&K3
-	XonXoffHandshake=&K4
-	EscapeCharacter=+
-	EscapeGuardPeriod=S12
-	NoDialTone=NO DIAL TONE
-	Busy=BUSY
-	NoAnswer=NO ANSWER
-	Carrier=CARRIER
-	Connect=CONNECT
-	CompressionClass5=COMPRESSION:CLASS 5
-	CompressionV42bis=COMPRESSION:V.42 bis
-	CompressionNone=COMPRESSION:NONE
-	ProtocolLAPD=PROTOCOL:LAPD
-	ProtocolALT=PROTOCOL:ALT
-	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
-	ProtocolNone=PROTOCOL:NONE
-	MessageCentreNumber=+447973100973
-	MessageValidityPeriod=1440
-	MessageDeliveryReport=FALSE
-	MinimumSignalLevel=9905
-	LastSocketActivityTimeout=300
-	LastSessionClosedTimeout=300
-	LastSocketClosedTimeout=300
-	SIRSettings=0
-	CommRole=0
-	FIELD_COUNT=70
-END_ADD
-
-
-############################################################
-## LANBearer
-## 
-[LANBearer]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Ethernet 001
-	IfName=ethint
-	LDDFilename=enet
-	LDDName=Ethernet
-	PDDFilename=ethernet
-	PDDName=ethernet.wins
-	PacketDriverName=EtherPkt.drv
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=nullagt.agt
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Ethernet 002
-	IfName=ethint
-	LDDName=EtherCard
-	PDDName=EtherWins
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=nullagt.agt
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## Location
-## 
-[Location]
-ADD_TEMPLATE
-	Name=Default Location
-	IntlPrefixCode=+
-	NatPrefixCode=0
-	NatCode=44
-	AreaCode=44
-	DialOutCode=44
-	DisableCallWaitingCode=44
-	Mobile=TRUE
-	UsePulseDial=FALSE
-	WaitForDialTone=FALSE
-	PauseAfterDialout=0
-	FIELD_COUNT=11
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Office
-	IntlPrefixCode=00
-	NatPrefixCode=0
-	NatCode=44
-	AreaCode=171
-	DialOutCode=9,
-	DisableCallWaitingCode=9,
-	Mobile=FALSE
-	UsePulseDial=FALSE
-	WaitForDialTone=FALSE
-	PauseAfterDialout=0
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Office Direct Dial
-	IntlPrefixCode=00
-	NatPrefixCode=0
-	NatCode=44
-	AreaCode=171
-	DialOutCode=171
-	DisableCallWaitingCode=171
-	Mobile=FALSE
-	UsePulseDial=FALSE
-	WaitForDialTone=FALSE
-	PauseAfterDialout=0
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=Mobile
-	IntlPrefixCode=+
-	NatPrefixCode=0
-	NatCode=44
-	AreaCode=44
-	DialOutCode=44
-	DisableCallWaitingCode=44
-	Mobile=TRUE
-	UsePulseDial=FALSE
-	WaitForDialTone=FALSE
-	PauseAfterDialout=0
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=Home
-	IntlPrefixCode=00
-	NatPrefixCode=0
-	NatCode=44
-	AreaCode=181
-	DialOutCode=181
-	DisableCallWaitingCode=181
-	Mobile=FALSE
-	UsePulseDial=TRUE
-	WaitForDialTone=TRUE
-	PauseAfterDialout=0
-	FIELD_COUNT=11
-END_ADD
-
-
-############################################################
-## Chargecard
-## 
-[Chargecard]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Dummy BT Chargecard
-	AccountNumber=144,12345678
-	Pin=0000
-	LocalRule=HG
-	NatRule=HFG
-	IntlRule=HEFG
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Dummy Mercury Chargecard
-	AccountNumber=0500800800,,12345678
-	Pin=****
-	LocalRule=HG
-	NatRule=J,K,0FG
-	IntlRule=HEFG
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## GlobalSettings
-## 
-[GlobalSettings]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	WAPAccessPoint=1
-	ConnectionAttempts=2
-	RedialAttempts=3
-	SmsBearer=1
-	SmsReceiveMode=2
-	GPRSAttachMode=1
-	AcceptIncomingGprs=1
-	GPRSClassCBearer=GSM
-	ModemForDataAndFax=2
-	ModemForPhoneServicesAndSMS=5
-	LocationForDataAndFax=2
-	LocationForPhoneServicesAndSMS=5
-	MaxMBufHeap=2
-	DefaultNetwork=1
-	BearerAvailabilityCheckTSY=phonetsywithdispatcher
-	FIELD_COUNT=16
-END_ADD
-
-
-############################################################
-## DialOutISP
-## 
-[DialOutISP]
-ADD_TEMPLATE
-	Name=Default Dial Out ISP
-	DialResolution=TRUE
-	UseLoginScript=FALSE
-	PromptForLogin=TRUE
-	DisplayPCT=FALSE
-	IfPromptForAuth=TRUE
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	BearerService=0
-	BearerProtocol=UNSPECIFIED
-	RlpVersion=0
-	IwfToMs=0
-	MsToIwf=0
-	AckTimer=0
-	RetransmissionAttempts=0
-	ResequencePeriod=0
-	V42Compression=0
-	V42Codewords=0
-	V42MaxLength=0
-	Asymmetry=0
-	UserInitUpgrade=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=28
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Pipex CSD
-	Description=Pipex Service Provider
-	Type=INTERNETONLY
-	DefaultTelNum=08450885336
-	DialResolution=TRUE
-	UseLoginScript=FALSE
-	PromptForLogin=FALSE
-	DisplayPCT=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=solabf75
-	IfAuthPass=oodifama
-	AuthRetries=0
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=158.43.128.1
-	IpNameServer2=158.43.192.1
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	BearerService=0
-	BearerProtocol=UNSPECIFIED
-	RlpVersion=0
-	IwfToMs=0
-	MsToIwf=0
-	AckTimer=0
-	RetransmissionAttempts=0
-	ResequencePeriod=0
-	V42Compression=0
-	V42Codewords=0
-	V42MaxLength=0
-	Asymmetry=0
-	UserInitUpgrade=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=45
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=NT RAS
-	Description=Test
-	Type=INTERNETONLY
-	DialResolution=TRUE
-	UseLoginScript=TRUE
-	LoginScript=CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n
-	PromptForLogin=FALSE
-	DisplayPCT=FALSE
-	IfNetworks=ip,ip6
-	IfPromptForAuth=FALSE
-	IfAuthName=RasUser
-	IfAuthPass=pass
-	AuthRetries=0
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	BearerService=0
-	BearerProtocol=UNSPECIFIED
-	RlpVersion=0
-	IwfToMs=0
-	MsToIwf=0
-	AckTimer=0
-	RetransmissionAttempts=0
-	ResequencePeriod=0
-	V42Compression=0
-	V42Codewords=0
-	V42MaxLength=0
-	Asymmetry=0
-	UserInitUpgrade=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=43
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=WSP Test CSD
-	Description=Symbian WSP Test Server
-	Type=INTERNETANDWAP
-	DefaultTelNum=02071541211
-	DialResolution=TRUE
-	UseLoginScript=FALSE
-	PromptForLogin=FALSE
-	DisplayPCT=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=wapusr
-	IfAuthPass=train2
-	AuthRetries=0
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=158.43.128.1
-	IpNameServer2=158.43.192.1
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	BearerService=0
-	BearerProtocol=UNSPECIFIED
-	RlpVersion=0
-	IwfToMs=0
-	MsToIwf=0
-	AckTimer=0
-	RetransmissionAttempts=0
-	ResequencePeriod=0
-	V42Compression=0
-	V42Codewords=0
-	V42MaxLength=0
-	Asymmetry=0
-	UserInitUpgrade=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=45
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=Auth CSD
-	Description=Authentication Service Provider
-	Type=INTERNETONLY
-	DefaultTelNum=+358331520777
-	DialResolution=TRUE
-	UseLoginScript=TRUE
-	PromptForLogin=FALSE
-	LoginName=mailtst1
-	LoginPass=mailtest1
-	DisplayPCT=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=mailtst1
-	IfAuthPass=mailtest1
-	AuthRetries=0
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	BearerService=0
-	BearerProtocol=UNSPECIFIED
-	RlpVersion=0
-	IwfToMs=0
-	MsToIwf=0
-	AckTimer=0
-	RetransmissionAttempts=0
-	ResequencePeriod=0
-	V42Compression=0
-	V42Codewords=0
-	V42MaxLength=0
-	Asymmetry=0
-	UserInitUpgrade=FALSE
-	UseEdge=TRUE
-	FIELD_COUNT=45
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=IP6 Dial Test
-	Description=4th Floor Test Lab
-	Type=INTERNETONLY
-	DefaultTelNum=02071541455
-	DialResolution=TRUE
-	UseLoginScript=FALSE
-	PromptForLogin=FALSE
-	DisplayPCT=FALSE
-	IfNetworks=ip,ip6
-	IfPromptForAuth=FALSE
-	IfAuthName=ipv6test
-	IfAuthPass=Symbian
-	AuthRetries=0
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=192.168.10.2
-	IpNameServer2=192.168.20.2
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	BearerService=0
-	BearerProtocol=UNSPECIFIED
-	RlpVersion=0
-	IwfToMs=0
-	MsToIwf=0
-	AckTimer=0
-	RetransmissionAttempts=0
-	ResequencePeriod=0
-	V42Compression=0
-	V42Codewords=0
-	V42MaxLength=0
-	Asymmetry=0
-	UserInitUpgrade=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=45
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=USIM Test NT RAS
-	Type=INTERNETONLY
-	DialResolution=TRUE
-	UseLoginScript=TRUE
-	LoginScript=CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n
-	PromptForLogin=FALSE
-	DisplayPCT=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=RasUser
-	IfAuthPass=pass
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	BearerService=0
-	BearerProtocol=UNSPECIFIED
-	RlpVersion=0
-	IwfToMs=0
-	MsToIwf=0
-	AckTimer=0
-	RetransmissionAttempts=0
-	ResequencePeriod=0
-	V42Compression=0
-	V42Codewords=0
-	V42MaxLength=0
-	Asymmetry=0
-	UserInitUpgrade=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=33
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=CityOnlines CSD India
-	Description=CityOnlines Indian Service Provider
-	Type=INTERNETONLY
-	DefaultTelNum=+9180172388
-	DialResolution=TRUE
-	UseLoginScript=TRUE
-	PromptForLogin=FALSE
-	LoginName=ktl1@blr.cityonlines.com
-	LoginPass=1234
-	DisplayPCT=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=ktl1
-	IfAuthPass=1234
-	AuthRetries=0
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	BearerService=0
-	BearerProtocol=UNSPECIFIED
-	RlpVersion=0
-	IwfToMs=0
-	MsToIwf=0
-	AckTimer=0
-	RetransmissionAttempts=0
-	ResequencePeriod=0
-	V42Compression=0
-	V42Codewords=0
-	V42MaxLength=0
-	Asymmetry=0
-	UserInitUpgrade=FALSE
-	UseEdge=TRUE
-	FIELD_COUNT=45
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=Vodafone WAP GSM
-	Description=Vodafone WAP GSM
-	Type=INTERNETANDWAP
-	DefaultTelNum=+447836900808
-	DialResolution=TRUE
-	UseLoginScript=FALSE
-	PromptForLogin=FALSE
-	DisplayPCT=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=user@vodafone.net
-	IfAuthPass=user
-	AuthRetries=0
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	BearerProtocol=V110
-	FIELD_COUNT=18
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=Orange WAP GSM
-	Description=Orange WAP GSM
-	Type=INTERNETANDWAP
-	DefaultTelNum=+447973100500
-	DialResolution=TRUE
-	UseLoginScript=FALSE
-	PromptForLogin=FALSE
-	DisplayPCT=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=Orange
-	IfAuthPass=Multimedia
-	AuthRetries=0
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	BearerProtocol=V110
-	FIELD_COUNT=18
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=O2 WAP GSM
-	Description=O2 WAP GSM
-	Type=INTERNETANDWAP
-	DefaultTelNum=+447712927927
-	DialResolution=TRUE
-	UseLoginScript=FALSE
-	PromptForLogin=FALSE
-	DisplayPCT=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=O2wap
-	IfAuthPass=password
-	AuthRetries=0
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	BearerProtocol=V110
-	FIELD_COUNT=18
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 12
-	Name=Test Network CSD
-	Description=Symbian Test Network
-	Type=INTERNETONLY
-	DefaultTelNum=02071541259
-	DialResolution=TRUE
-	UseLoginScript=FALSE
-	PromptForLogin=FALSE
-	DisplayPCT=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=Systemtest09
-	IfAuthPass=l33ds
-	AuthRetries=0
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	BearerService=0
-	BearerProtocol=UNSPECIFIED
-	RlpVersion=0
-	IwfToMs=0
-	MsToIwf=0
-	AckTimer=0
-	RetransmissionAttempts=0
-	ResequencePeriod=0
-	V42Compression=0
-	V42Codewords=0
-	V42MaxLength=0
-	Asymmetry=0
-	UserInitUpgrade=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=43
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=IP6 Dial Test
-	Description=Symbian Test Network
-	Type=INTERNETONLY
-	DefaultTelNum=02077248525
-	DialResolution=TRUE
-	UseLoginScript=FALSE
-	PromptForLogin=FALSE
-	DisplayPCT=FALSE
-	IfNetworks=ip,ip6
-	IfPromptForAuth=FALSE
-	IfAuthName=ipv6test
-	IfAuthPass=Symbian
-	AuthRetries=0
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=192.168.10.2
-	IpNameServer2=192.168.20.2
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	BearerName=ASYNCHRONOUS
-	BearerSpeed=UNSPECIFIED
-	BearerCE=UNSPECIFIED
-	BearerType=CSD
-	ChannelCoding=UNSPECIFIED
-	Aiur=0
-	RequestedTimeSlots=0
-	MaximumTimeSlots=0
-	BearerService=0
-	BearerProtocol=UNSPECIFIED
-	RlpVersion=0
-	IwfToMs=0
-	MsToIwf=0
-	AckTimer=0
-	RetransmissionAttempts=0
-	ResequencePeriod=0
-	V42Compression=0
-	V42Codewords=0
-	V42MaxLength=0
-	Asymmetry=0
-	UserInitUpgrade=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=45
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 14
-	Name=mRouterDialOutIsp
-	Description=mRouterDialOutIsp
-	Type=INTERNETONLY
-	DialResolution=TRUE
-	UseLoginScript=FALSE
-	PromptForLogin=FALSE
-	DisplayPCT=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=IfAuthPass=
-	IfAuthPass=AuthRetries=0
-	AuthRetries=0
-	IfCallbackEnabled=FALSE
-	CallbackTimeout=0
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	BearerService=0
-	BearerProtocol=UNSPECIFIED
-	RlpVersion=0
-	IwfToMs=0
-	MsToIwf=0
-	AckTimer=0
-	RetransmissionAttempts=0
-	ResequencePeriod=0
-	V42Compression=0
-	V42Codewords=0
-	V42MaxLength=0
-	Asymmetry=0
-	UserInitUpgrade=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=34
-END_ADD
-
-
-
-############################################################
-## DialInISP
-## 
-[DialInISP]
-ADD_TEMPLATE
-	Name=Default Dial In ISP
-	UseLoginScript=FALSE
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=9
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Dial In ISP01
-	UseLoginScript=FALSE
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableIPHeaderComp=FALSE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	EnableSWComp=FALSE
-	UseEdge=FALSE
-	FIELD_COUNT=9
-END_ADD
-
-
-############################################################
-## OutgoingGPRS
-## 
-[OutgoingGPRS]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Vodafone GPRS
-	APN=internet
-	PDPType=IPV4
-	ReqPrecedence=0
-	ReqDelay=0
-	ReqReliability=0
-	ReqPeakThroughput=0
-	ReqMeanThroughput=0
-	MinPrecedence=0
-	MinDelay=0
-	MinReliability=0
-	MinPeakThroughput=0
-	MinMeanThroughput=0
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=web
-	IfAuthPass=web
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpAddr=0.0.0.0
-	IpDNSAddrFromServer=TRUE
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=33
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Vodafone WAP GPRS
-	APN=wap.vodafone.co.uk
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=wap
-	IfAuthPass=wap
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpAddr=0.0.0.0
-	IpDNSAddrFromServer=TRUE
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=33
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Orange GPRS
-	APN=orangeinternet
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=29
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=Orange WAP GPRS
-	APN=orangewap
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=29
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=O2 GPRS
-	APN=mobile.o2.co.uk
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=web
-	IfAuthPass=password
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=0.0.0.0
-	IpNameServer2=0.0.0.0
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=34
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=O2 WAP GPRS
-	APN=wap.o2.co.uk
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=o2wap
-	IfAuthPass=o2wap
-	AuthRetries=1
-	IpNetMask=255.255.255.0
-	IpGateway=1.2.3.4
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=0.0.0.0
-	IpNameServer2=0.0.0.0
-	Ip6DNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=34
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=Hutch GPRS
-	APN=portalnmms
-	PDPType=IPV4
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=8
-	MinDelay=16
-	MinReliability=32
-	MinPeakThroughput=2
-	MinMeanThroughput=2
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfParams=nullagt
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	AuthRetries=1
-	IpGateway=10.10.1.100
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	GprsAccessPointType=0
-	QosWarningTimeout=0
-	FIELD_COUNT=28
-END_ADD
-
-
-############################################################
-## IncomingGPRS
-## 
-[IncomingGPRS]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Incoming GPRS Settings PlaceHolder
-	APN=Test
-	PDPType=IPV4
-	PDPAddress=0.0.0.0
-	ReqPrecedence=1
-	ReqDelay=1
-	ReqReliability=1
-	ReqPeakThroughput=1
-	ReqMeanThroughput=1
-	MinPrecedence=1
-	MinDelay=1
-	MinReliability=1
-	MinPeakThroughput=1
-	MinMeanThroughput=1
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=RasUser
-	IfAuthPass=pass
-	AuthRetries=1
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=0.0.0.0
-	IpNameServer2=0.0.0.0
-	EnableLCPExtension=FALSE
-	DisablePlainTextAuth=FALSE
-	FIELD_COUNT=29
-END_ADD
-
-
-############################################################
-## DefaultGPRS
-## 
-[DefaultGPRS]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Dummy Default GPRS Settings
-	Usage=1
-	APN=Access point name
-	PDPType=IPV6
-	PDPAddress=www.wid.com
-	Precedence=1
-	Delay=150
-	Reliability=1
-	PeakThroughput=1
-	MinReliability=1
-	MinPeakThroughput=1
-	MinMeanThroughput=1
-	DataCompression=FALSE
-	HeaderCompression=FALSE
-	GprsUseEdge=FALSE
-	AnonymousAccess=TRUE
-	FIELD_COUNT=16
-END_ADD
-
-
-############################################################
-## CDMA2000PacketServiceTable
-## 
-[CDMA2000PacketServiceTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=test name cdma2000
-	IwfName=Test2000
-	ServiceOption=HIGHSPEEDCDMA2000DATA
-	PDPType=IPV4
-	ReqFwdPriority=PRIORITY04
-	ReqRevPriority=PRIORITY04
-	ReqFwdBitrate=32KBPS
-	ReqRevBitrate=32KBPS
-	ReqFwdLoss=LOSS1
-	ReqRevLoss=LOSS1
-	ReqFwdMaxdelay=40MS
-	ReqRevMaxdelay=40MS
-	MinFwdBitrate=32KBPS
-	MinRevBitrate=32KBPS
-	AccptFwdLoss=LOSS2
-	AccptRevLoss=LOSS2
-	AccptFwdMaxdelay=120MS
-	AccptRevMaxdelay=120MS
-	AnonymousAccess=FALSE
-	IfNetworks=ip
-	IfPromptForAuth=FALSE
-	IfAuthName=RasUser
-	IfAuthPass=pass
-	AuthRetries=1
-	IpNetMask=0.255.255.255
-	IpGateway=10.0.0.1
-	IpAddrFromServer=TRUE
-	IpDNSAddrFromServer=TRUE
-	EnableLCPExtension=TRUE
-	DisablePlainTextAuth=TRUE
-	ApType=2
-	QosWarningTimeout=1000000
-	RlpMode=TRANSPARENT
-	CDMANaiType=0
-	EnableIPHeaderComp=FALSE
-	CDMAMobileIP=FALSE
-	CDMAMobileIPTimeout=10000000
-	FIELD_COUNT=37
-END_ADD
-
-
-############################################################
-## LANService
-## 
-[LANService]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=IP4 DHCP Ethernet
-	IfNetworks=ip
-	IpNetMask=255.255.252.0
-	IpGateway=10.192.203.254
-	IpAddrFromServer=TRUE
-	IpAddr=10.192.200.59
-	IpDNSAddrFromServer=TRUE
-	IpNameServer1=10.192.59.6
-	IpNameServer2=10.192.58.49
-	ConfigDaemonManagerName=NetCfgExtnDhcp
-	ConfigDaemonName=!DhcpServ
-	FIELD_COUNT=11
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=IP6 Ethernet
-	IfNetworks=ip,ip6
-	IpNetMask=255.255.255.0
-	IpGateway=194.72.6.1
-	IpAddrFromServer=TRUE
-	IpAddr=192.168.0.100
-	IpDNSAddrFromServer=FALSE
-	IpNameServer1=192.168.10.2
-	IpNameServer2=192.168.20.2
-	FIELD_COUNT=9
-END_ADD
-
-
-############################################################
-## IAP
-## 
-[IAP]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=Pipex CSD
-	IAPServiceType=DialOutISP
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Ethernet IP4
-	IAPServiceType=LANService
-	IAPService=1
-	IAPBearerType=LANBearer
-	IAPBearer=1
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=NT RAS Com 0
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=3
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=3
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=NT RAS Com 1
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=4
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=3
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 5
-	Name=WSP Test CSD
-	IAPServiceType=DialOutISP
-	IAPService=4
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 6
-	Name=Msg Test CSD
-	IAPServiceType=DialOutISP
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 7
-	Name=Msg Test Auth CSD
-	IAPServiceType=DialOutISP
-	IAPService=5
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 8
-	Name=WinTunnel on Epoc Com1
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=5
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=3
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 9
-	Name=Ethernet IP6
-	IAPServiceType=LANService
-	IAPService=2
-	IAPBearerType=LANBearer
-	IAPBearer=1
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 10
-	Name=IP6 Dial
-	IAPServiceType=DialOutISP
-	IAPService=6
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 11
-	Name=GSMPhone1
-	IAPServiceType=DialOutISP
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 12
-	Name=USIM Test
-	IAPServiceType=DialOutISP
-	IAPService=7
-	IAPBearerType=ModemBearer
-	IAPBearer=6
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 13
-	Name=Vodafone GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=1
-	IAPBearerType=ModemBearer
-	IAPBearer=5
-	IAPNetwork=3
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 14
-	Name=Vodafone WAP GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=2
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=3
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 15
-	Name=Orange GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=4
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 16
-	Name=Orange WAP GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=4
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=4
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 17
-	Name=O2 GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=5
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=5
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 18
-	Name=O2 WAP GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=6
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=5
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 19
-	Name=CityOnlines CSD India
-	IAPServiceType=DialOutISP
-	IAPService=8
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 20
-	Name=Hutch GPRS
-	IAPServiceType=OutgoingGPRS
-	IAPService=7
-	IAPBearerType=ModemBearer
-	IAPBearer=7
-	IAPNetwork=6
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 21
-	Name=Vodafone WAP GSM
-	IAPServiceType=DialOutISP
-	IAPService=9
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=3
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 22
-	Name=Orange WAP GSM
-	IAPServiceType=DialOutISP
-	IAPService=10
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=4
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 23
-	Name=O2 WAP GSM
-	IAPServiceType=DialOutISP
-	IAPService=11
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=5
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 24
-	Name=Test Network CSD
-	IAPServiceType=DialOutISP
-	IAPService=12
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 25
-	Name=Test Network CSD IP6
-	IAPServiceType=DialOutISP
-	IAPService=13
-	IAPBearerType=ModemBearer
-	IAPBearer=2
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 26
-	Name=Cisco VPN IAP
-	IAPServiceType=VpnService
-	IAPService=3
-	IAPBearerType=VirtualBearer
-	IAPBearer=3
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 27
-	Name=DUMMY TSY
-	IAPServiceType=DialOutISP
-	IAPService=3
-	IAPBearerType=ModemBearer
-	IAPBearer=8
-	IAPNetwork=1
-	IAPNetworkWeighting=0
-	Location=4
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 28
-	Name=mRouter USB
-	IAPServiceType=DialOutISP
-	IAPService=14
-	IAPBearerType=ModemBearer
-	IAPBearer=10
-	IAPNetwork=2
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 29
-	Name=mRouter Wins
-	IAPServiceType=DialOutISP
-	IAPService=14
-	IAPBearerType=ModemBearer
-	IAPBearer=9
-	IAPNetwork=2
-	IAPNetworkWeighting=0
-	Location=2
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## ConnectionPreferences
-## 
-[ConnectionPreferences]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	Ranking=1
-	Direction=OUTGOING
-	BearerSet=PSD
-	DialogPref=DONOTPROMPT
-	IAP=13
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## Proxies
-## 
-[Proxies]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	ISP=4
-	ProxyServiceType=DialOutISP
-	UseProxyServer=TRUE
-	ProxyServerName=www.dummyproxy.com
-	ProtocolName=http
-	PortNumber=80
-	Exceptions=www.dummyproxy.com/exception
-	FIELD_COUNT=8
-END_ADD
-
-
-############################################################
-## WAPAccessPoint
-## 
-[WAPAccessPoint]
-ADD_TEMPLATE
-	Name=Default Dial In ISP
-	CurrentBearer=WAPIPBearer
-	FIELD_COUNT=2
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=Vodafone WAP GPRS
-	CurrentBearer=WAPIPBearer
-	StartPage=wap:1999/vodafone.wml
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=Orange WAP GPRS
-	CurrentBearer=WAPIPBearer
-	StartPage=orange.multimedia
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 4
-	Name=O2 WAP GPRS
-	CurrentBearer=WAPIPBearer
-	StartPage=wap.o2.co.uk
-	FIELD_COUNT=3
-END_ADD
-
-
-############################################################
-## WAPIPBearer
-## 
-[WAPIPBearer]
-ADD_TEMPLATE
-	Name=DefaultRecordName-1
-	AccessPointId=0
-	GatewayAddress=0
-	IAP=0
-	WSPOption=CONNECTIONLESS
-	Security=FALSE
-	ProxyPortNumber=0
-	ProxyLogin=0
-	ProxyPassword=0
-	FIELD_COUNT=9
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=DefaultRecordName-2
-	AccessPointId=2
-	GatewayAddress=wap.closedtest.intra
-	IAP=24
-	WSPOption=CONNECTIONORIENTED
-	Security=FALSE
-	ProxyPortNumber=1
-	ProxyLogin=1
-	ProxyPassword=1
-	FIELD_COUNT=9
-END_ADD
-
-
-############################################################
-## WAPSMSBearer
-## 
-[WAPSMSBearer]
-ADD_TEMPLATE
-	Name=DefaultRecordName-1
-	AccessPointId=0
-	GatewayAddress=0
-	ServiceCentreAddress=0
-	WSPOption=CONNECTIONLESS
-	Security=FALSE
-	FIELD_COUNT=6
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=DefaultRecordName-2
-	AccessPointId=2
-	GatewayAddress=+4412345678901
-	ServiceCentreAddress=+442071234567
-	WSPOption=CONNECTIONORIENTED
-	Security=FALSE
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## SecureSocketTable
-## 
-[SecureSocketTable]
-ADD_SECTION
-# COMMDB_ID = 1
-	Name=DefaultRecordName-1
-	ProtocolName=ssl3.0
-	ProtoLibrary=ssladaptor.dll
-	FIELD_COUNT=3
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=DefaultRecordName-2
-	ProtocolName=tls1.0
-	ProtoLibrary=ssladaptor.dll
-	FIELD_COUNT=3
-END_ADD
-
-
-############################################################
-## VirtualBearer
-## 
-[VirtualBearer]
-ADD_TEMPLATE
-	Name=Default VPN Bearer
-	IfName=VPN.nif
-	LastSocketActivityTimeout=600
-	LastSessionClosedTimeout=600
-	LastSocketClosedTimeout=600
-	Agent=VPN.agt
-	FIELD_COUNT=6
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=VPN Bearer1
-	IfName=ppp.nif
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=ntras.agt
-	FIELD_COUNT=6
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=VPN Bearer2
-	IfName=tunnelnif
-	LastSocketActivityTimeout=-1
-	LastSessionClosedTimeout=-1
-	LastSocketClosedTimeout=-1
-	Agent=vpnconnagt.agt
-	FIELD_COUNT=6
-END_ADD
-
-
-############################################################
-## VpnService
-## 
-[VpnService]
-ADD_TEMPLATE
-	Name=Default VPN
-	Policy=DefaultVPNpolicy
-	HomeIAP=1
-	HomeNetwork=0
-	FIELD_COUNT=4
-END_TEMPLATE
-
-ADD_SECTION
-# COMMDB_ID = 2
-	Name=VPN1
-	Policy=VPNpolicy1
-	HomeIAP=2
-	HomeNetwork=1
-	FIELD_COUNT=4
-END_ADD
-
-ADD_SECTION
-# COMMDB_ID = 3
-	Name=cisco tunnel
-	Policy=cisco_all
-	HomeIAP=8
-	HomeNetwork=1
-	FIELD_COUNT=4
-END_ADD
-

--- a/cbsref/telephonyrefplugins/atltsy/eabi/licenseeskeletontsyu.def	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-EXPORTS
-	_Z12LTsyFactoryLv @ 1 NONAME
-	_ZTI10CATDtmfVts @ 2 NONAME
-	_ZTI10CATGetImei @ 3 NONAME
-	_ZTI10CATSIMCard @ 4 NONAME
-	_ZTI10CAtManager @ 5 NONAME
-	_ZTI10CAtSmsNack @ 6 NONAME
-	_ZTI10CAtSmsSend @ 7 NONAME
-	_ZTI10CTsyConfig @ 8 NONAME
-	_ZTI11CATGetModel @ 9 NONAME
-	_ZTI11CCommEngine @ 10 NONAME
-	_ZTI11CCommReader @ 11 NONAME
-	_ZTI11CCommWriter @ 12 NONAME
-	_ZTI11CGetPhoneID @ 13 NONAME
-	_ZTI12CATDialVoice @ 14 NONAME
-	_ZTI12CATGetSignal @ 15 NONAME
-	_ZTI12CRequestBase @ 16 NONAME
-	_ZTI13CATGetBattery @ 17 NONAME
-	_ZTI13CATGprsAttach @ 18 NONAME
-	_ZTI13CATGprsDetach @ 19 NONAME
-	_ZTI13CAtPhbkEnRead @ 20 NONAME
-	_ZTI13CAtSmsReceive @ 21 NONAME
-	_ZTI13CGetFdnStatus @ 22 NONAME
-	_ZTI13CStringParser @ 23 NONAME
-	_ZTI14CATGetCellInfo @ 24 NONAME
-	_ZTI14CATGetRevision @ 25 NONAME
-	_ZTI14CATNetworkInfo @ 26 NONAME
-	_ZTI14CATUnsolicited @ 27 NONAME
-	_ZTI14CAtCommandBase @ 28 NONAME
-	_ZTI14CLtsyFactoryV1 @ 29 NONAME
-	_ZTI15CATGetFdnStatus @ 30 NONAME
-	_ZTI15CAtSmsStoreInfo @ 31 NONAME
-	_ZTI15CAtSmsStoreRead @ 32 NONAME
-	_ZTI15CLtsySatHandler @ 33 NONAME
-	_ZTI15CLtsySimHandler @ 34 NONAME
-	_ZTI15CLtsySmsHandler @ 35 NONAME
-	_ZTI16CATDetectNetwork @ 36 NONAME
-	_ZTI16CATGPRSSetConfig @ 37 NONAME
-	_ZTI16CATGetFdnSupport @ 38 NONAME
-	_ZTI16CATHelperCommand @ 39 NONAME
-	_ZTI16CATSelectNetwork @ 40 NONAME
-	_ZTI16CAtPhbkEnGetInfo @ 41 NONAME
-	_ZTI16CAtPhbkEnReadAll @ 42 NONAME
-	_ZTI16CAtPhbkStoreRead @ 43 NONAME
-	_ZTI16CAtSmsStoreWrite @ 44 NONAME
-	_ZTI16CGetOperatorNmae @ 45 NONAME
-	_ZTI16CInitializePhone @ 46 NONAME
-	_ZTI17CATGetModemStatus @ 47 NONAME
-	_ZTI17CATNotifyCellInfo @ 48 NONAME
-	_ZTI17CAtPhbkStoreCache @ 49 NONAME
-	_ZTI17CAtPhbkStoreWrite @ 50 NONAME
-	_ZTI17CAtSmsStoreDelete @ 51 NONAME
-	_ZTI17CLtsyPhoneHandler @ 52 NONAME
-	_ZTI17CRespondBufParser @ 53 NONAME
-	_ZTI18CATGetManufacturer @ 54 NONAME
-	_ZTI18CAtPhbkStoreDelete @ 55 NONAME
-	_ZTI18CAtSmsStoreReadAll @ 56 NONAME
-	_ZTI19CATGetPhoneCellInfo @ 57 NONAME
-	_ZTI19CATSwitchOnLineMode @ 58 NONAME
-	_ZTI19CActiveCommandStore @ 59 NONAME
-	_ZTI19CAsyncHelperRequest @ 60 NONAME
-	_ZTI19CAtMessageStoreInfo @ 61 NONAME
-	_ZTI19CGlobalPhonemanager @ 62 NONAME
-	_ZTI20CATGprsContextDelete @ 63 NONAME
-	_ZTI20CATGprsNtwkRegStatus @ 64 NONAME
-	_ZTI20CATGprsSetProfileReq @ 65 NONAME
-	_ZTI20CATSelectNetworkMode @ 66 NONAME
-	_ZTI20CATSetNotifyCellInfo @ 67 NONAME
-	_ZTI20CAtSmsStoreDeleteAll @ 68 NONAME
-	_ZTI20CLtsySecurityHandler @ 69 NONAME
-	_ZTI21CATCommandControlBase @ 70 NONAME
-	_ZTI21CATGPRSGetContextAddr @ 71 NONAME
-	_ZTI21CATGprsContextConnect @ 72 NONAME
-	_ZTI21CATWaitForCallHandler @ 73 NONAME
-	_ZTI21CInitialisePdpContext @ 74 NONAME
-	_ZTI21CLtsyPhonebookHandler @ 75 NONAME
-	_ZTI22CATGprsContextActivate @ 76 NONAME
-	_ZTI22CATNetworkRegistration @ 77 NONAME
-	_ZTI22CAtPhbkStoreInitialise @ 78 NONAME
-	_ZTI22CGetCurrentNetworkInfo @ 79 NONAME
-	_ZTI23CATHangupCommandRecords @ 80 NONAME
-	_ZTI23CLtsyCallControlHandler @ 81 NONAME
-	_ZTI23CLtsyPhonebookEnHandler @ 82 NONAME
-	_ZTI23CLtsyPhonebookOnHandler @ 83 NONAME
-	_ZTI23CNotifyBatteryAndSignal @ 84 NONAME
-	_ZTI24CATGprsContextDeactivate @ 85 NONAME
-	_ZTI24CAtPhbkGetPhoneStoreInfo @ 86 NONAME
-	_ZTI24CUnsolicitedEventMonitor @ 87 NONAME
-	_ZTI25CATNetworkRegStatusChange @ 88 NONAME
-	_ZTI25CActivatContextAndGetAddr @ 89 NONAME
-	_ZTI25CLtsyCellBroadcastHandler @ 90 NONAME
-	_ZTI26CATGprsNtwkRegStatusChange @ 91 NONAME
-	_ZTI26CLtsyPacketServicesHandler @ 92 NONAME
-	_ZTI27CLtsyCallInformationManager @ 93 NONAME
-	_ZTI33CLtsyCallControlMultipartyHandler @ 94 NONAME
-	_ZTI33CLtsySupplementaryServicesHandler @ 95 NONAME
-	_ZTI37CUnsolicitedCommandCallControlHandler @ 96 NONAME
-	_ZTI7CATChld @ 97 NONAME
-	_ZTI7CATClcc @ 98 NONAME
-	_ZTI7CATRing @ 99 NONAME
-	_ZTI9CATAnswer @ 100 NONAME
-	_ZTI9CATHangUp @ 101 NONAME
-	_ZTI9CAtSmsAck @ 102 NONAME
-	_ZTT15CLtsySimHandler @ 103 NONAME
-	_ZTV10CATDtmfVts @ 104 NONAME
-	_ZTV10CATGetImei @ 105 NONAME
-	_ZTV10CATSIMCard @ 106 NONAME
-	_ZTV10CAtManager @ 107 NONAME
-	_ZTV10CAtSmsNack @ 108 NONAME
-	_ZTV10CAtSmsSend @ 109 NONAME
-	_ZTV10CTsyConfig @ 110 NONAME
-	_ZTV11CATGetModel @ 111 NONAME
-	_ZTV11CCommEngine @ 112 NONAME
-	_ZTV11CCommReader @ 113 NONAME
-	_ZTV11CCommWriter @ 114 NONAME
-	_ZTV11CGetPhoneID @ 115 NONAME
-	_ZTV12CATDialVoice @ 116 NONAME
-	_ZTV12CATGetSignal @ 117 NONAME
-	_ZTV12CRequestBase @ 118 NONAME
-	_ZTV13CATGetBattery @ 119 NONAME
-	_ZTV13CATGprsAttach @ 120 NONAME
-	_ZTV13CATGprsDetach @ 121 NONAME
-	_ZTV13CAtPhbkEnRead @ 122 NONAME
-	_ZTV13CAtSmsReceive @ 123 NONAME
-	_ZTV13CGetFdnStatus @ 124 NONAME
-	_ZTV13CStringParser @ 125 NONAME
-	_ZTV14CATGetCellInfo @ 126 NONAME
-	_ZTV14CATGetRevision @ 127 NONAME
-	_ZTV14CATNetworkInfo @ 128 NONAME
-	_ZTV14CATUnsolicited @ 129 NONAME
-	_ZTV14CAtCommandBase @ 130 NONAME
-	_ZTV14CLtsyFactoryV1 @ 131 NONAME
-	_ZTV15CATGetFdnStatus @ 132 NONAME
-	_ZTV15CAtSmsStoreInfo @ 133 NONAME
-	_ZTV15CAtSmsStoreRead @ 134 NONAME
-	_ZTV15CLtsySatHandler @ 135 NONAME
-	_ZTV15CLtsySimHandler @ 136 NONAME
-	_ZTV15CLtsySmsHandler @ 137 NONAME
-	_ZTV16CATDetectNetwork @ 138 NONAME
-	_ZTV16CATGPRSSetConfig @ 139 NONAME
-	_ZTV16CATGetFdnSupport @ 140 NONAME
-	_ZTV16CATHelperCommand @ 141 NONAME
-	_ZTV16CATSelectNetwork @ 142 NONAME
-	_ZTV16CAtPhbkEnGetInfo @ 143 NONAME
-	_ZTV16CAtPhbkEnReadAll @ 144 NONAME
-	_ZTV16CAtPhbkStoreRead @ 145 NONAME
-	_ZTV16CAtSmsStoreWrite @ 146 NONAME
-	_ZTV16CGetOperatorNmae @ 147 NONAME
-	_ZTV16CInitializePhone @ 148 NONAME
-	_ZTV17CATGetModemStatus @ 149 NONAME
-	_ZTV17CATNotifyCellInfo @ 150 NONAME
-	_ZTV17CAtPhbkStoreCache @ 151 NONAME
-	_ZTV17CAtPhbkStoreWrite @ 152 NONAME
-	_ZTV17CAtSmsStoreDelete @ 153 NONAME
-	_ZTV17CLtsyPhoneHandler @ 154 NONAME
-	_ZTV17CRespondBufParser @ 155 NONAME
-	_ZTV18CATGetManufacturer @ 156 NONAME
-	_ZTV18CAtPhbkStoreDelete @ 157 NONAME
-	_ZTV18CAtSmsStoreReadAll @ 158 NONAME
-	_ZTV19CATGetPhoneCellInfo @ 159 NONAME
-	_ZTV19CATSwitchOnLineMode @ 160 NONAME
-	_ZTV19CActiveCommandStore @ 161 NONAME
-	_ZTV19CAsyncHelperRequest @ 162 NONAME
-	_ZTV19CAtMessageStoreInfo @ 163 NONAME
-	_ZTV19CGlobalPhonemanager @ 164 NONAME
-	_ZTV20CATGprsContextDelete @ 165 NONAME
-	_ZTV20CATGprsNtwkRegStatus @ 166 NONAME
-	_ZTV20CATGprsSetProfileReq @ 167 NONAME
-	_ZTV20CATSelectNetworkMode @ 168 NONAME
-	_ZTV20CATSetNotifyCellInfo @ 169 NONAME
-	_ZTV20CAtSmsStoreDeleteAll @ 170 NONAME
-	_ZTV20CLtsySecurityHandler @ 171 NONAME
-	_ZTV21CATCommandControlBase @ 172 NONAME
-	_ZTV21CATGPRSGetContextAddr @ 173 NONAME
-	_ZTV21CATGprsContextConnect @ 174 NONAME
-	_ZTV21CATWaitForCallHandler @ 175 NONAME
-	_ZTV21CInitialisePdpContext @ 176 NONAME
-	_ZTV21CLtsyPhonebookHandler @ 177 NONAME
-	_ZTV22CATGprsContextActivate @ 178 NONAME
-	_ZTV22CATNetworkRegistration @ 179 NONAME
-	_ZTV22CAtPhbkStoreInitialise @ 180 NONAME
-	_ZTV22CGetCurrentNetworkInfo @ 181 NONAME
-	_ZTV23CATHangupCommandRecords @ 182 NONAME
-	_ZTV23CLtsyCallControlHandler @ 183 NONAME
-	_ZTV23CLtsyPhonebookEnHandler @ 184 NONAME
-	_ZTV23CLtsyPhonebookOnHandler @ 185 NONAME
-	_ZTV23CNotifyBatteryAndSignal @ 186 NONAME
-	_ZTV24CATGprsContextDeactivate @ 187 NONAME
-	_ZTV24CAtPhbkGetPhoneStoreInfo @ 188 NONAME
-	_ZTV24CUnsolicitedEventMonitor @ 189 NONAME
-	_ZTV25CATNetworkRegStatusChange @ 190 NONAME
-	_ZTV25CActivatContextAndGetAddr @ 191 NONAME
-	_ZTV25CLtsyCellBroadcastHandler @ 192 NONAME
-	_ZTV26CATGprsNtwkRegStatusChange @ 193 NONAME
-	_ZTV26CLtsyPacketServicesHandler @ 194 NONAME
-	_ZTV27CLtsyCallInformationManager @ 195 NONAME
-	_ZTV33CLtsyCallControlMultipartyHandler @ 196 NONAME
-	_ZTV33CLtsySupplementaryServicesHandler @ 197 NONAME
-	_ZTV37CUnsolicitedCommandCallControlHandler @ 198 NONAME
-	_ZTV7CATChld @ 199 NONAME
-	_ZTV7CATClcc @ 200 NONAME
-	_ZTV7CATRing @ 201 NONAME
-	_ZTV9CATAnswer @ 202 NONAME
-	_ZTV9CATHangUp @ 203 NONAME
-	_ZTV9CAtSmsAck @ 204 NONAME
-

--- a/cbsref/telephonyrefplugins/atltsy/eabi/stltsyu.def	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +0,0 @@
-EXPORTS
-	_Z12LTsyFactoryLv @ 1 NONAME
-	_ZTI10CATDtmfVts @ 2 NONAME
-	_ZTI10CATGetImei @ 3 NONAME
-	_ZTI10CATSIMCard @ 4 NONAME
-	_ZTI10CAtManager @ 5 NONAME
-	_ZTI10CAtSmsNack @ 6 NONAME
-	_ZTI10CAtSmsSend @ 7 NONAME
-	_ZTI10CTsyConfig @ 8 NONAME
-	_ZTI11CATGetModel @ 9 NONAME
-	_ZTI11CCommEngine @ 10 NONAME
-	_ZTI11CCommReader @ 11 NONAME
-	_ZTI11CCommWriter @ 12 NONAME
-	_ZTI11CGetPhoneID @ 13 NONAME
-	_ZTI12CATDialVoice @ 14 NONAME
-	_ZTI12CATGetSignal @ 15 NONAME
-	_ZTI12CRequestBase @ 16 NONAME
-	_ZTI13CATGetBattery @ 17 NONAME
-	_ZTI13CATGprsAttach @ 18 NONAME
-	_ZTI13CATGprsDetach @ 19 NONAME
-	_ZTI13CAtPhbkEnRead @ 20 NONAME
-	_ZTI13CAtSmsReceive @ 21 NONAME
-	_ZTI13CGetFdnStatus @ 22 NONAME
-	_ZTI13CStringParser @ 23 NONAME
-	_ZTI14CATGetCellInfo @ 24 NONAME
-	_ZTI14CATGetRevision @ 25 NONAME
-	_ZTI14CATNetworkInfo @ 26 NONAME
-	_ZTI14CATUnsolicited @ 27 NONAME
-	_ZTI14CAtCommandBase @ 28 NONAME
-	_ZTI14CLtsyFactoryV1 @ 29 NONAME
-	_ZTI15CATGetFdnStatus @ 30 NONAME
-	_ZTI15CAtSmsStoreInfo @ 31 NONAME
-	_ZTI15CAtSmsStoreRead @ 32 NONAME
-	_ZTI15CLtsySatHandler @ 33 NONAME
-	_ZTI15CLtsySimHandler @ 34 NONAME
-	_ZTI15CLtsySmsHandler @ 35 NONAME
-	_ZTI16CATDetectNetwork @ 36 NONAME
-	_ZTI16CATGPRSSetConfig @ 37 NONAME
-	_ZTI16CATGetFdnSupport @ 38 NONAME
-	_ZTI16CATHelperCommand @ 39 NONAME
-	_ZTI16CATSelectNetwork @ 40 NONAME
-	_ZTI16CAtPhbkEnGetInfo @ 41 NONAME
-	_ZTI16CAtPhbkEnReadAll @ 42 NONAME
-	_ZTI16CAtPhbkStoreRead @ 43 NONAME
-	_ZTI16CAtSmsStoreWrite @ 44 NONAME
-	_ZTI16CGetOperatorNmae @ 45 NONAME
-	_ZTI16CInitializePhone @ 46 NONAME
-	_ZTI17CATGetModemStatus @ 47 NONAME
-	_ZTI17CATNotifyCellInfo @ 48 NONAME
-	_ZTI17CAtPhbkStoreCache @ 49 NONAME
-	_ZTI17CAtPhbkStoreWrite @ 50 NONAME
-	_ZTI17CAtSmsStoreDelete @ 51 NONAME
-	_ZTI17CLtsyPhoneHandler @ 52 NONAME
-	_ZTI17CRespondBufParser @ 53 NONAME
-	_ZTI18CATGetManufacturer @ 54 NONAME
-	_ZTI18CAtPhbkStoreDelete @ 55 NONAME
-	_ZTI18CAtSmsStoreReadAll @ 56 NONAME
-	_ZTI19CATGetPhoneCellInfo @ 57 NONAME
-	_ZTI19CATSwitchOnLineMode @ 58 NONAME
-	_ZTI19CActiveCommandStore @ 59 NONAME
-	_ZTI19CAsyncHelperRequest @ 60 NONAME
-	_ZTI19CAtMessageStoreInfo @ 61 NONAME
-	_ZTI19CGlobalPhonemanager @ 62 NONAME
-	_ZTI20CATGprsContextDelete @ 63 NONAME
-	_ZTI20CATGprsNtwkRegStatus @ 64 NONAME
-	_ZTI20CATGprsSetProfileReq @ 65 NONAME
-	_ZTI20CATSelectNetworkMode @ 66 NONAME
-	_ZTI20CATSetNotifyCellInfo @ 67 NONAME
-	_ZTI20CAtSmsStoreDeleteAll @ 68 NONAME
-	_ZTI20CLtsySecurityHandler @ 69 NONAME
-	_ZTI21CATCommandControlBase @ 70 NONAME
-	_ZTI21CATGPRSGetContextAddr @ 71 NONAME
-	_ZTI21CATGprsContextConnect @ 72 NONAME
-	_ZTI21CATWaitForCallHandler @ 73 NONAME
-	_ZTI21CInitialisePdpContext @ 74 NONAME
-	_ZTI21CLtsyPhonebookHandler @ 75 NONAME
-	_ZTI22CATGprsContextActivate @ 76 NONAME
-	_ZTI22CATNetworkRegistration @ 77 NONAME
-	_ZTI22CAtPhbkStoreInitialise @ 78 NONAME
-	_ZTI22CGetCurrentNetworkInfo @ 79 NONAME
-	_ZTI23CATHangupCommandRecords @ 80 NONAME
-	_ZTI23CLtsyCallControlHandler @ 81 NONAME
-	_ZTI23CLtsyPhonebookEnHandler @ 82 NONAME
-	_ZTI23CLtsyPhonebookOnHandler @ 83 NONAME
-	_ZTI23CNotifyBatteryAndSignal @ 84 NONAME
-	_ZTI24CATGprsContextDeactivate @ 85 NONAME
-	_ZTI24CAtPhbkGetPhoneStoreInfo @ 86 NONAME
-	_ZTI24CUnsolicitedEventMonitor @ 87 NONAME
-	_ZTI25CATNetworkRegStatusChange @ 88 NONAME
-	_ZTI25CActivatContextAndGetAddr @ 89 NONAME
-	_ZTI25CLtsyCellBroadcastHandler @ 90 NONAME
-	_ZTI26CATGprsNtwkRegStatusChange @ 91 NONAME
-	_ZTI26CLtsyPacketServicesHandler @ 92 NONAME
-	_ZTI27CLtsyCallInformationManager @ 93 NONAME
-	_ZTI33CLtsyCallControlMultipartyHandler @ 94 NONAME
-	_ZTI33CLtsySupplementaryServicesHandler @ 95 NONAME
-	_ZTI37CUnsolicitedCommandCallControlHandler @ 96 NONAME
-	_ZTI7CATChld @ 97 NONAME
-	_ZTI7CATClcc @ 98 NONAME
-	_ZTI7CATRing @ 99 NONAME
-	_ZTI9CATAnswer @ 100 NONAME
-	_ZTI9CATHangUp @ 101 NONAME
-	_ZTI9CAtSmsAck @ 102 NONAME
-	_ZTT15CLtsySimHandler @ 103 NONAME
-	_ZTT17CLtsyPhoneHandler @ 104 NONAME
-	_ZTT20CLtsySecurityHandler @ 105 NONAME
-	_ZTT23CLtsyCallControlHandler @ 106 NONAME
-	_ZTV10CATDtmfVts @ 107 NONAME
-	_ZTV10CATGetImei @ 108 NONAME
-	_ZTV10CATSIMCard @ 109 NONAME
-	_ZTV10CAtManager @ 110 NONAME
-	_ZTV10CAtSmsNack @ 111 NONAME
-	_ZTV10CAtSmsSend @ 112 NONAME
-	_ZTV10CTsyConfig @ 113 NONAME
-	_ZTV11CATGetModel @ 114 NONAME
-	_ZTV11CCommEngine @ 115 NONAME
-	_ZTV11CCommReader @ 116 NONAME
-	_ZTV11CCommWriter @ 117 NONAME
-	_ZTV11CGetPhoneID @ 118 NONAME
-	_ZTV12CATDialVoice @ 119 NONAME
-	_ZTV12CATGetSignal @ 120 NONAME
-	_ZTV12CRequestBase @ 121 NONAME
-	_ZTV13CATGetBattery @ 122 NONAME
-	_ZTV13CATGprsAttach @ 123 NONAME
-	_ZTV13CATGprsDetach @ 124 NONAME
-	_ZTV13CAtPhbkEnRead @ 125 NONAME
-	_ZTV13CAtSmsReceive @ 126 NONAME
-	_ZTV13CGetFdnStatus @ 127 NONAME
-	_ZTV13CStringParser @ 128 NONAME
-	_ZTV14CATGetCellInfo @ 129 NONAME
-	_ZTV14CATGetRevision @ 130 NONAME
-	_ZTV14CATNetworkInfo @ 131 NONAME
-	_ZTV14CATUnsolicited @ 132 NONAME
-	_ZTV14CAtCommandBase @ 133 NONAME
-	_ZTV14CLtsyFactoryV1 @ 134 NONAME
-	_ZTV15CATGetFdnStatus @ 135 NONAME
-	_ZTV15CAtSmsStoreInfo @ 136 NONAME
-	_ZTV15CAtSmsStoreRead @ 137 NONAME
-	_ZTV15CLtsySatHandler @ 138 NONAME
-	_ZTV15CLtsySimHandler @ 139 NONAME
-	_ZTV15CLtsySmsHandler @ 140 NONAME
-	_ZTV16CATDetectNetwork @ 141 NONAME
-	_ZTV16CATGPRSSetConfig @ 142 NONAME
-	_ZTV16CATGetFdnSupport @ 143 NONAME
-	_ZTV16CATHelperCommand @ 144 NONAME
-	_ZTV16CATSelectNetwork @ 145 NONAME
-	_ZTV16CAtPhbkEnGetInfo @ 146 NONAME
-	_ZTV16CAtPhbkEnReadAll @ 147 NONAME
-	_ZTV16CAtPhbkStoreRead @ 148 NONAME
-	_ZTV16CAtSmsStoreWrite @ 149 NONAME
-	_ZTV16CGetOperatorNmae @ 150 NONAME
-	_ZTV16CInitializePhone @ 151 NONAME
-	_ZTV17CATGetModemStatus @ 152 NONAME
-	_ZTV17CATNotifyCellInfo @ 153 NONAME
-	_ZTV17CAtPhbkStoreCache @ 154 NONAME
-	_ZTV17CAtPhbkStoreWrite @ 155 NONAME
-	_ZTV17CAtSmsStoreDelete @ 156 NONAME
-	_ZTV17CLtsyPhoneHandler @ 157 NONAME
-	_ZTV17CRespondBufParser @ 158 NONAME
-	_ZTV18CATGetManufacturer @ 159 NONAME
-	_ZTV18CAtPhbkStoreDelete @ 160 NONAME
-	_ZTV18CAtSmsStoreReadAll @ 161 NONAME
-	_ZTV19CATGetPhoneCellInfo @ 162 NONAME
-	_ZTV19CATSwitchOnLineMode @ 163 NONAME
-	_ZTV19CActiveCommandStore @ 164 NONAME
-	_ZTV19CAsyncHelperRequest @ 165 NONAME
-	_ZTV19CAtMessageStoreInfo @ 166 NONAME
-	_ZTV19CGlobalPhonemanager @ 167 NONAME
-	_ZTV20CATGprsContextDelete @ 168 NONAME
-	_ZTV20CATGprsNtwkRegStatus @ 169 NONAME
-	_ZTV20CATGprsSetProfileReq @ 170 NONAME
-	_ZTV20CATSelectNetworkMode @ 171 NONAME
-	_ZTV20CATSetNotifyCellInfo @ 172 NONAME
-	_ZTV20CAtSmsStoreDeleteAll @ 173 NONAME
-	_ZTV20CLtsySecurityHandler @ 174 NONAME
-	_ZTV21CATCommandControlBase @ 175 NONAME
-	_ZTV21CATGPRSGetContextAddr @ 176 NONAME
-	_ZTV21CATGprsContextConnect @ 177 NONAME
-	_ZTV21CATWaitForCallHandler @ 178 NONAME
-	_ZTV21CInitialisePdpContext @ 179 NONAME
-	_ZTV21CLtsyPhonebookHandler @ 180 NONAME
-	_ZTV22CATGprsContextActivate @ 181 NONAME
-	_ZTV22CATNetworkRegistration @ 182 NONAME
-	_ZTV22CAtPhbkStoreInitialise @ 183 NONAME
-	_ZTV22CGetCurrentNetworkInfo @ 184 NONAME
-	_ZTV23CATHangupCommandRecords @ 185 NONAME
-	_ZTV23CLtsyCallControlHandler @ 186 NONAME
-	_ZTV23CLtsyPhonebookEnHandler @ 187 NONAME
-	_ZTV23CLtsyPhonebookOnHandler @ 188 NONAME
-	_ZTV23CNotifyBatteryAndSignal @ 189 NONAME
-	_ZTV24CATGprsContextDeactivate @ 190 NONAME
-	_ZTV24CAtPhbkGetPhoneStoreInfo @ 191 NONAME
-	_ZTV24CUnsolicitedEventMonitor @ 192 NONAME
-	_ZTV25CATNetworkRegStatusChange @ 193 NONAME
-	_ZTV25CActivatContextAndGetAddr @ 194 NONAME
-	_ZTV25CLtsyCellBroadcastHandler @ 195 NONAME
-	_ZTV26CATGprsNtwkRegStatusChange @ 196 NONAME
-	_ZTV26CLtsyPacketServicesHandler @ 197 NONAME
-	_ZTV27CLtsyCallInformationManager @ 198 NONAME
-	_ZTV33CLtsyCallControlMultipartyHandler @ 199 NONAME
-	_ZTV33CLtsySupplementaryServicesHandler @ 200 NONAME
-	_ZTV37CUnsolicitedCommandCallControlHandler @ 201 NONAME
-	_ZTV7CATChld @ 202 NONAME
-	_ZTV7CATClcc @ 203 NONAME
-	_ZTV7CATRing @ 204 NONAME
-	_ZTV9CATAnswer @ 205 NONAME
-	_ZTV9CATHangUp @ 206 NONAME
-	_ZTV9CAtSmsAck @ 207 NONAME
-

--- a/cbsref/telephonyrefplugins/atltsy/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-// Copyright (c) 2008-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:
-// system test system build description file for stltsy.dll
-// 
-//
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-stltsy.mmp
-
-

--- a/cbsref/telephonyrefplugins/atltsy/group/stltsy.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-// 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:
-// @file stltsy.mmp
-// 
-
-TARGETTYPE      DLL
-TARGET          licenseeskeletontsy.dll
-UID             0x1000008D 0x102870ED
-
-CAPABILITY      All -Tcb
-VENDORID        0x70000001
-
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
-OS_LAYER_ESTLIB_SYSTEMINCLUDE
-
-USERINCLUDE 	../handler/inc
-USERINCLUDE 	../comms/inc 
-USERINCLUDE 	../atcommand/generic/inc 
-USERINCLUDE 	../atcommand/pktservice/inc 
-USERINCLUDE 	../atcommand/phone/inc 
-USERINCLUDE     ../atcommand/sms/inc
-USERINCLUDE 	../atcommand/callcontrol/inc 
-USERINCLUDE     ../atcommand/phonebook/inc
-USERINCLUDE     ../atcommand/phonebooken/inc
-//USERINCLUDE     ../../ctsydispatcher/exportinc
-
-SOURCEPATH      ../handler/src
-SOURCE 			cltsyfactoryv1.cpp
-SOURCE 			cltsycallcontrolhandler.cpp
-SOURCE 			cltsyphonehandler.cpp
-SOURCE 			cltsysecurityhandler.cpp
-SOURCE 			cltsyphonebookenhandler.cpp
-SOURCE 			cltsycellbroadcasthandler.cpp
-SOURCE 			cltsyphonebookonhandler.cpp
-SOURCE 			cltsyphonebookhandler.cpp
-SOURCE 			cltsysimhandler.cpp
-SOURCE 			cltsysmshandler.cpp
-SOURCE 			cltsycallcontrolmultipartyhandler.cpp
-SOURCE 			cltsysupplementaryserviceshandler.cpp
-SOURCE 			cltsypacketserviceshandler.cpp
-SOURCE 			cltsysathandler.cpp
-
-SOURCEPATH      ../comms/src
-SOURCE          stringparser.cpp
-SOURCE			commengine.cpp 
-SOURCE			commreader.cpp 
-SOURCE			commwriter.cpp
-
-SOURCEPATH      ../atcommand/generic/src
-SOURCE          tsyconfg.cpp
-SOURCE          mslogger.cpp
-SOURCE          panic.cpp
-SOURCE 			atcommandbase.cpp
-SOURCE 			activecommandstore.cpp 
-SOURCE			atmanager.cpp 
-SOURCE			globalphonemanager.cpp 
-SOURCE          respondbufparser.cpp
-SOURCE          atunsolicited.cpp
-SOURCE          unsolicitedparams.cpp
-SOURCE 			unsolicitedeventmonitor.cpp
-SOURCE 		    atcommandcontrolbase.cpp 
-SOURCE          requestbase.cpp
-SOURCE          ltsycallinformation.cpp
-SOURCE          ltsycallinformationmanager.cpp
-SOURCE          asynchelperrequest.cpp
-SOURCE          athelpercommand.cpp
-SOURCE          atswitchonlinemode.cpp
-
-
-SOURCEPATH      ../atcommand/phone/src
-SOURCE			atdetectnetwork.cpp
-SOURCE			atgetbatteryinfo.cpp
-SOURCE			atgetimei.cpp
-SOURCE			atgetmanufacturer.cpp
-SOURCE			atgetmodel.cpp
-SOURCE			atgetmodemstatus.cpp
-SOURCE			atgetnetworkinfo.cpp
-SOURCE			atgetnetworkregistrationstatus.cpp
-SOURCE			atgetrevision.cpp
-SOURCE			atgetsignalstrength.cpp
-SOURCE			atgetsimstatusready.cpp
-SOURCE			atselectnetwork.cpp
-SOURCE			atselectnetworkmode.cpp
-SOURCE			atsetnotifycell.cpp
-SOURCE			atgetphonecellinfo.cpp
-SOURCE			atgetcellinfo.cpp
-SOURCE			atnetworkregstatuschange.cpp
-SOURCE			atnotifycellinfo.cpp
-SOURCE			atgetfdnstatus.cpp
-SOURCE			atgetfdnsupport.cpp
-SOURCE			getphoneid.cpp
-SOURCE			getoperatorname.cpp
-SOURCE			getfdnstatus.cpp
-SOURCE			getcurrentnetworkinfo.cpp
-SOURCE			initializephone.cpp
-SOURCE			notifybatteryandsignal.cpp
-
-
-SOURCEPATH      ../atcommand/pktservice/src
-SOURCE			atgprsattach.cpp
-SOURCE			atgprsdetach.cpp
-SOURCE			atgprsntwkregstatus.cpp
-SOURCE			atgprscontextactivate.cpp
-SOURCE			atgprscontextdeactivate.cpp
-SOURCE			atgprscontextdelete.cpp
-SOURCE			atgprsconfig.cpp
-SOURCE			atgprssetqosprofile.cpp
-SOURCE			initialisepdpcontext.cpp
-SOURCE			atgprsntwkregstatuschange.cpp
-SOURCE			activatecontextandgetaddr.cpp
-SOURCE			atgprsgetcontextaddr.cpp
-//SOURCE			gprscontextdeactivate.cpp
-SOURCE			atgprscontextconnect.cpp
-
-SOURCEPATH      ../atcommand/callcontrol/src
-SOURCE          atdialvoice.cpp
-SOURCE          athangup.cpp
-SOURCE          atclcc.cpp
-SOURCE          atring.cpp
-SOURCE          atwaitforcallhandler.cpp
-SOURCE          atanswer.cpp
-SOURCE          atchld.cpp
-SOURCE          unsolicitedcommandcallcontrolhandler.cpp
-SOURCE          atdtmfvts.cpp
-SOURCE          athangupcommandrecords.cpp
-
-SOURCEPATH      ../atcommand/sms/src
-SOURCE          smsatutil.cpp
-SOURCE          atsmsack.cpp
-SOURCE          atsmsstoreinfo.cpp 
-SOURCE          atmessagestoreinfo.cpp
-SOURCE          atsmssend.cpp
-SOURCE          atsmsstorewrite.cpp   
-SOURCE          atsmsstoreread.cpp
-SOURCE          atsmsreceive.cpp
-SOURCE          atsmsstoredelete.cpp
-SOURCE          atsmsstorereadall.cpp
-
-SOURCEPATH      ../atcommand/phonebook/src
-SOURCE          atphbkgetphonestoreinfo.cpp
-SOURCE          atphbkstoreinitialise.cpp
-SOURCE          atphbkstorewrite.cpp
-SOURCE          atphbkstoreread.cpp
-SOURCE          atphbkstorecache.cpp
-SOURCE          atphbkstoredelete.cpp
-
-SOURCEPATH      ../atcommand/phonebooken/src
-SOURCE          atphbkengetinfo.cpp
-SOURCE          atphbkenread.cpp
-SOURCE          atphbkenreadall.cpp
-
-LIBRARY 		euser.lib
-LIBRARY         ctsydispatcher.lib
-LIBRARY			etelmm.lib
-LIBRARY			etelpckt.lib
-LIBRARY         flogger.lib
-LIBRARY			estlib.lib
-LIBRARY 		estor.lib
-LIBRARY         customapi.lib
-LIBRARY	        commsdat.lib
-LIBRARY         c32.lib
-LIBRARY         secutil.lib
-LIBRARY         efsrv.lib
-
-// For logging
-#include <comms-infras/commsdebugutility.mmh>
-
-SMPSAFE

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/cltsycallcontrolhandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-// 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:
-// CLtsyCallControlHandler
-
-#ifndef __CLTSYDISPATCHCALLCONTROLHANDLER_H_
-#define __CLTSYDISPATCHCALLCONTROLHANDLER_H_
-
-//system include
-#include <e32std.h>
-#include <e32base.h>
-#include <ctsy/ltsy/mltsydispatchinterface.h>
-#include <ctsy/ltsy/mltsydispatchcallcontrolinterface.h>
-#include "misdispatchinterfacesupported.h"
-
-//user include
-#include "ltsymacros.h"
-
-
-// FORWARD DECLARATIONS
-class CATDialVoice;
-class CCtsyDispatcherCallback;
-class CGlobalPhonemanager;
-class CATWaitForCallHandler;
-class MLtsyUnsolicitedCommandObserver;
-class CUnsolicitedCommandCallControlHandler;
-
-/**
- * Implements interfaces from the CTSY Dispatcher. The CTSY Dispatcher uses these
- * interfaces to make requests to the Licensee LTSY.
- */
-class CLtsyCallControlHandler : 	public CBase,
-							public MIsDispatchInterfaceSupported,
-							public MLtsyDispatchCallControlAnswer,
-							public MLtsyDispatchCallControlHold,
-							public MLtsyDispatchCallControlDialEmergency,
-							public MLtsyDispatchCallControlStopDtmfTone,
-							public MLtsyDispatchCallControlSetActiveAlsLine,
-							public MLtsyDispatchCallControlSendDtmfTonesCancel,
-							public MLtsyDispatchCallControlHangUp,
-							public MLtsyDispatchCallControlResume,
-							public MLtsyDispatchCallControlSetDynamicHscsdParams,
-							public MLtsyDispatchCallControlDialVoice,
-							public MLtsyDispatchCallControlTransfer,
-							public MLtsyDispatchCallControlSendDtmfTones,
-							public MLtsyDispatchCallControlGetIdentityServiceStatus,
-							public MLtsyDispatchCallControlSwap,
-							public MLtsyDispatchCallControlLoanDataPort,
-							public MLtsyDispatchCallControlRecoverDataPort,
-							public MLtsyDispatchCallControlStartDtmfTone,
-							public MLtsyDispatchCallControlGetActiveAlsLine,
-							public MLtsyDispatchCallControlDialData,
-                            public MLtsyDispatchCallControlQueryIsEmergencyNumber,
-                            public MLtsyDispatchCallControlGetAlsPpSupport,
-                            public MLtsyDispatchCallControlGetAlsBlockedStatus,
-                            public MLtsyDispatchCallControlSetAlsBlocked,
-                            public MLtsyDispatchCallControlGetLifeTime,
-                            public MLtsyDispatchCallControlTerminateErrorCall,
-                            public MLtsyDispatchCallControlTerminateAllCalls,
-                            public MLtsyDispatchCallControlGetCallForwardingIndicator,
-							public MLtsyDispatchCallControlUpdateLifeTimer
-	{
-public:
-
-	virtual ~CLtsyCallControlHandler();
-	static CLtsyCallControlHandler* NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback,  CGlobalPhonemanager* aGloblePhone);
-	static CLtsyCallControlHandler* NewLC(CCtsyDispatcherCallback& aCtsyDispatcherCallback, CGlobalPhonemanager* aGloblePhone);
-
-	virtual TBool IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId);
-	void IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask);
-
-
-
-    // From MLtsyDispatchCallControlAnswer
-    virtual TInt HandleAnswerReqL(TInt aCallId, TBool aIsIsvCall);
-
-    // From MLtsyDispatchCallControlHold
-    virtual TInt HandleHoldReqL(TInt aCallId);
-
-    // From MLtsyDispatchCallControlDialEmergency
-    virtual TInt HandleDialEmergencyReqL(const TDes& aEmergencyNumber);
-
-    // From MLtsyDispatchCallControlStopDtmfTone
-    virtual TInt HandleStopDtmfToneReqL(TInt aCallId);
-
-    // From MLtsyDispatchCallControlSetActiveAlsLine
-    virtual TInt HandleSetActiveAlsLineReqL(RMobilePhone::TMobilePhoneALSLine aAlsLine);
-
-    // From MLtsyDispatchCallControlSendDtmfTonesCancel
-    virtual TInt HandleSendDtmfTonesCancelReqL(TInt aCallId);
-
-    // From MLtsyDispatchCallControlHangUp
-    virtual TInt HandleHangUpReqL(TInt aCallId, TInt aHangupCause);
-
-    // From MLtsyDispatchCallControlResume
-    virtual TInt HandleResumeReqL(TInt aCallId);
-
-    // From MLtsyDispatchCallControlSetDynamicHscsdParams
-    virtual TInt HandleSetDynamicHscsdParamsReqL(TInt aCallId, const RMobileCall::TMobileHscsdCallParamsV1& aHscsdParams);
-
-    // From MLtsyDispatchCallControlDialVoice  void CallbackCallControlDialVoiceComp(TInt aError, TInt aCallId);
-    virtual TInt HandleDialVoiceReqL(RMobilePhone::TMobilePhoneALSLine aLine, const RMobilePhone::TMobileAddress& aDialledParty, const RMobileCall::TMobileCallParamsV1& aCallParamsV1, TBool aIsIsvCall, RMobileCall::TCallParamOrigin aCallOrigin, TBool aPerformFdnCheck);
-
-    // From MLtsyDispatchCallControlTransfer
-    virtual TInt HandleTransferReqL(TInt aHeldCallId, TInt aSecondCallId);
-
-    // From MLtsyDispatchCallControlSendDtmfTones
-    virtual TInt HandleSendDtmfTonesReqL(TInt aCallId, const TDesC &aTones);
-
-    // From MLtsyDispatchCallControlGetIdentityServiceStatus
-    virtual TInt HandleGetIdentityServiceStatusReqL(RMobilePhone::TMobilePhoneIdService aService);
-
-    // From MLtsyDispatchCallControlSwap
-    virtual TInt HandleSwapReqL(TInt aHeldCallId, TInt aConnectedCallId);
-
-    // From MLtsyDispatchCallControlLoanDataPort
-    virtual TInt HandleLoanDataPortSyncL(TInt aCallId, RCall::TCommPort& aCommPort);
-
-    // From MLtsyDispatchCallControlRecoverDataPort
-    virtual TInt HandleRecoverDataPortSyncL(TInt aCallId, RCall::TCommPort& aCommPort);
-
-    // From MLtsyDispatchCallControlStartDtmfTone
-    virtual TInt HandleStartDtmfToneReqL(TInt aCallId, const TChar& aTone);
-
-	// From MLtsyDispatchCallControlGetActiveAlsLine
-	virtual TInt HandleGetActiveAlsLineReqL();
-
-	// From MLtsyDispatchCallControlDialData
-	virtual TInt HandleDialDataReqL(const RMobilePhone::TMobileAddress& aDialledParty, const RMobileCall::TMobileDataCallParamsV1& aCallParamsV1, TBool aPerformFdnCheck);
-
-	// From MLtsyDispatchCallControlQueryIsEmergencyNumber
-	virtual TInt HandleQueryIsEmergencyNumberSyncL(const TDesC& aNumber, TBool& aIsEmergencyNumber);
-	
-	// From MLtsyDispatchCallControlUpdateLifeTimer
-	virtual TInt HandleUpdateLifeTimerReqL(TUint32 aDuration);
-
-    // From MLtsyDispatchCallControlGetAlsPpSupport
-    virtual TInt HandleGetAlsPpSupportL();
-
-    // From MLtsyDispatchCallControlGetAlsBlockedStatus
-    virtual TInt HandleGetAlsBlockedStatusL();
-
-    // From MLtsyDispatchCallControlSetAlsBlocked
-    virtual TInt HandleSetAlsBlockedL(RMmCustomAPI::TSetAlsBlock aBlocked);
-
-    // From MLtsyDispatchCallControlGetLifeTime
-    virtual TInt HandleGetLifeTimeL();
-
-    // From MLtsyDispatchCallControlTerminateErrorCall
-    virtual TInt HandleTerminateErrorCallL(TInt aCallId);
-
-    // From MLtsyDispatchCallControlTerminateAllCalls
-    virtual TInt HandleTerminateAllCallsL();
-
-    // From MLtsyDispatchCallControlGetCallForwardingIndicatorStatus
-    virtual TInt HandleGetCallForwardingIndicatorL();
-    
-public:
-	MLtsyUnsolicitedCommandObserver* GetUnsolicitedCallControlHandler() const;
-    
-private:
-
-	CLtsyCallControlHandler(CCtsyDispatcherCallback& aCtsyDispatcherCallback, CGlobalPhonemanager* aGloblePhone);
-	void ConstructL();
-
-private:
-
-	/**
-	 * Callback object in the CTSY Dispatcher.
-	 *
-	 * Used to complete a request back to the CTSY Dispatcher.
-	 */
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-	
-	//Not Owned
-	CGlobalPhonemanager* iGloblePhone;
-	
-	//monitor incoming call
-	CATWaitForCallHandler* iWaitForCall;
-	
-	//Process unsolicited command
-	CUnsolicitedCommandCallControlHandler* iUnsolicitedHandler;
-	
-	//Emergency call
-	CATDialVoice* iEmergencyCall;
-	}; // class CLtsyCallControlHandler
-
-#endif // __CLTSYDISPATCHCALLCONTROLHANDLER_H_

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/cltsycallcontrolmultipartyhandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-// 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:
-// CLtsyCallControlMultipartyHandler
-
-#ifndef __CLTSYDISPATCHCALLCONTROLMULTIPARTYHANDLER_H_
-#define __CLTSYDISPATCHCALLCONTROLMULTIPARTYHANDLER_H_
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-
-#include <ctsy/ltsy/mltsydispatchinterface.h>
-#include <ctsy/ltsy/mltsydispatchcallcontrolmultipartyinterface.h>
-#include "misdispatchinterfacesupported.h"
-#include "ltsymacros.h"
-
-
-
-// FORWARD DECLARATIONS
-class CCtsyDispatcherCallback;
-
-// Can be removed in real LTSY implementation
-MTEST_FORWARD_DECLARE_MOCKLTSYENGINE
-
-// CLASS DECLARATION
-
-/**
- * Implements interfaces from the CTSY Dispatcher. The CTSY Dispatcher uses these
- * interfaces to make requests to the Licensee LTSY.
- */
-class CLtsyCallControlMultipartyHandler : 	public CBase,
-							public MIsDispatchInterfaceSupported,
-							public MLtsyDispatchCallControlMultipartyConferenceHangUp,
-							public MLtsyDispatchCallControlMultipartyConferenceAddCall,
-							public MLtsyDispatchCallControlMultipartyCreateConference,
-							public MLtsyDispatchCallControlMultipartyConferenceSwap,
-							public MLtsyDispatchCallControlMultipartyConferenceGoOneToOne
-	{
-public:
-
-	virtual ~CLtsyCallControlMultipartyHandler();
-	static CLtsyCallControlMultipartyHandler* NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	static CLtsyCallControlMultipartyHandler* NewLC(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	// From MIsDispatchInterfaceSupported
-	virtual TBool IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId);
-	void IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask);
-
-
-
-    // From MLtsyDispatchCallControlMultipartyConferenceHangUp
-    virtual TInt HandleConferenceHangUpReqL(const RArray<TInt>& aCallIds);
-
-    // From MLtsyDispatchCallControlMultipartyConferenceAddCall
-    virtual TInt HandleConferenceAddCallReqL(TInt aCallId, TInt aExistingCallId);
-
-    // From MLtsyDispatchCallControlMultipartyCreateConference
-    virtual TInt HandleCreateConferenceReqL(TInt aHeldCallId, TInt aSecondCallId);
-
-    // From MLtsyDispatchCallControlMultipartyConferenceSwap
-    virtual TInt HandleConferenceSwapReqL(TInt aHeldCallId, TInt aConnectedCallId);
-
-    // From MLtsyDispatchCallControlMultipartyConferenceGoOneToOne
-    virtual TInt HandleConferenceGoOneToOneReqL(TInt aCallId);
-
-private:
-
-	CLtsyCallControlMultipartyHandler(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	void ConstructL();
-
-private:
-
-	// Not owned
-
-	/**
-	 * Callback object in the CTSY Dispatcher.
-	 *
-	 * Used to complete a request back to the CTSY Dispatcher.
-	 */
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-
-public:
-
-
-	}; // class CLtsyCallControlMultipartyHandler
-
-#endif // __CLTSYDISPATCHCALLCONTROLMULTIPARTYHANDLER_H_
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/cltsycellbroadcasthandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-// 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:
-// CLtsyCellBroadcastHandler
-
-#ifndef __CLTSYDISPATCHCELLBROADCASTHANDLER_H_
-#define __CLTSYDISPATCHCELLBROADCASTHANDLER_H_
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-
-#include <ctsy/ltsy/mltsydispatchinterface.h>
-#include <ctsy/ltsy/mltsydispatchcellbroadcastinterface.h>
-#include "misdispatchinterfacesupported.h"
-#include "ltsymacros.h"
-
-
-
-// FORWARD DECLARATIONS
-class CCtsyDispatcherCallback;
-
-// Can be removed in real LTSY implementation
-MTEST_FORWARD_DECLARE_MOCKLTSYENGINE
-
-// CLASS DECLARATION
-
-/**
- * Implements interfaces from the CTSY Dispatcher. The CTSY Dispatcher uses these
- * interfaces to make requests to the Licensee LTSY.
- */
-class CLtsyCellBroadcastHandler : 	public CBase,
-							public MIsDispatchInterfaceSupported, 
-							public MLtsyDispatchCellBroadcastSetBroadcastFilterSetting,
-							public MLtsyDispatchCellBroadcastActivateBroadcastReceiveMessage,
-							public MLtsyDispatchCellBroadcastReceiveMessageCancel,
-							public MLtsyDispatchCellBroadcastStartSimCbTopicBrowsing,
-							public MLtsyDispatchCellBroadcastDeleteSimCbTopic
-							
-	{
-public:
-
-	virtual ~CLtsyCellBroadcastHandler();
-	static CLtsyCellBroadcastHandler* NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	static CLtsyCellBroadcastHandler* NewLC(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	// From MIsDispatchInterfaceSupported
-	virtual TBool IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId);
-	void IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask);
-	
-	
-    // From MLtsyDispatchCellBroadcastSetBroadcastFilterSetting
-    virtual TInt HandleSetBroadcastFilterSettingReqL(RMobileBroadcastMessaging::TMobilePhoneBroadcastFilter aFilterSetting);
-
-    // From MLtsyDispatchCellBroadcastActivateBroadcastReceiveMessage
-    virtual TInt HandleActivateBroadcastReceiveMessageReqL(RMobileBroadcastMessaging::TMobilePhoneBroadcastFilter aFilterSetting);
-
-    // From MLtsyDispatchCellBroadcastReceiveMessageCancel
-    virtual TInt HandleReceiveMessageCancelReqL(RMobileBroadcastMessaging::TMobilePhoneBroadcastFilter aFilterSetting);
-    
-    // From MLtsyDispatchCellBroadcastStartSimCbTopicBrowsing
-    virtual TInt HandleStartSimCbTopicBrowsingReqL();
-    
-    // From MLtsyDispatchCellDeleteSimCbTopic
-    virtual TInt HandleDeleteSimCbTopicReqL(TUint aIndex, TBool aDeleteFlag);
-
-private:
-	
-	CLtsyCellBroadcastHandler(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	void ConstructL();
-
-private:
-	
-	// Not owned
-	
-	/**
-	 * Callback object in the CTSY Dispatcher.
-	 * 
-	 * Used to complete a request back to the CTSY Dispatcher.
-	 */
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-	
-public:
-
-
-	}; // class CLtsyCellBroadcastHandler
-
-#endif // __CLTSYDISPATCHCELLBROADCASTHANDLER_H_
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/cltsyfactoryv1.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-// 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:
-// @file ltsyfactoryv1.h
-// This contains CLtsyFactoryV1 which acting an interface for Lincesee dll
-//
-#ifndef CLTSYFACTORYV1_H
-#define CLTSYFACTORYV1_H
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-#include <e32def.h>
-#include <ctsy/ltsy/ltsylogger.h>
-#include <ctsy/ltsy/mltsydispatchfactory.h>
-#include "ltsymacros.h"
-
-//user include
-#include "atunsolicitedobserver.h"
-
-// FORWARD DECLARATIONS
-class CCtsyDispatcherCallback;
-class CLtsyCallControlHandler;
-class CLtsyPhoneHandler;
-class CLtsySecurityHandler;
-class CLtsyPhonebookEnHandler;
-class CLtsyCellBroadcastHandler;
-class CLtsyPhonebookOnHandler;
-class CLtsyPhonebookHandler;
-class CLtsySimHandler;
-class CLtsySmsHandler;
-class CLtsyCallControlMultipartyHandler;
-class CLtsySupplementaryServicesHandler;
-class CLtsyPacketServicesHandler;
-class CLtsySatHandler;
-class CGlobalPhonemanager;
-class CUnsolicitedEventMonitor;
-
-class CLtsyFactoryV1 : public CBase, public MLtsyDispatchFactoryV1  
-	{
-public:
-	
-	// Public constructor because this object is constructed in two phases where
-	// the second phase ConstructL() is called explicitly by the creator.
-	CLtsyFactoryV1(); 
-	
-	virtual ~CLtsyFactoryV1();
-
-	// From MLtsyDispatchFactoryV1 (or its base class)
-	virtual void Release();
-	virtual TInt GetDispatchHandler(
-			TLtsyDispatchInterfaceApiId aDispatchInterfaceId,
-			TAny*& aDispatchInterface);
-	virtual MLtsyFactoryBase::TCtsyInterfaceVersion Version();
-	virtual void ConstructL(CCtsyDispatcherCallback& aCallback);
-	virtual TBool IsDispatchInterfaceSupported(TInt aFuncUnitId, TLtsyDispatchInterfaceApiId aDispatchApiId);
-	virtual void IsCallbackIndicatorSupported(TInt aFuncUnitId, TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask);
-	virtual CTsySatMessagingBase* GetSatMessagingService(MCtsySatService& aSatMessagingService);
-private:
-	// To prevent explicit construction in this way
-	void NewL() {};
-	void NewLC() {};
-	
-private: // Owned
-	// Dispatch Handlers
-	CLtsyCallControlHandler* iLtsyDispatchCallControlHandler;
-	CLtsyPhoneHandler* iLtsyDispatchPhoneHandler;
-	CLtsySecurityHandler* iLtsyDispatchSecurityHandler;
-	CLtsyPhonebookEnHandler* iLtsyDispatchPhonebookEnHandler;
-	CLtsyCellBroadcastHandler* iLtsyDispatchCellBroadcastHandler;
-	CLtsyPhonebookOnHandler* iLtsyDispatchPhonebookOnHandler;
-	CLtsyPhonebookHandler* iLtsyDispatchPhonebookHandler;
-	CLtsySimHandler* iLtsyDispatchSimHandler;
-	CLtsySmsHandler* iLtsyDispatchSmsHandler;
-	CLtsyCallControlMultipartyHandler* iLtsyDispatchCallControlMultipartyHandler;
-	CLtsySupplementaryServicesHandler* iLtsyDispatchSupplementaryServicesHandler;
-	CLtsyPacketServicesHandler* iLtsyDispatchPacketServicesHandler;
-	CLtsySatHandler* iLtsyDispatchSatHandler;
-	CUnsolicitedEventMonitor* iUnsolicitedEventMonitor;
-public:	
-	CGlobalPhonemanager* iGlobalPhone;
-	}; // class CLtsyFactoryV1
-
-#endif // CLTSYFACTORYV1_H

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/cltsypacketserviceshandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +0,0 @@
-// 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:
-// CLtsyPacketServicesHandler
-
-#ifndef __CLTSYDISPATCHPACKETSERVICESHANDLER_H_
-#define __CLTSYDISPATCHPACKETSERVICESHANDLER_H_
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-
-#include <ctsy/ltsy/mltsydispatchinterface.h>
-#include <ctsy/ltsy/mltsydispatchpacketservicesinterface.h>
-#include "misdispatchinterfacesupported.h"
-#include "ltsymacros.h"
-
-struct TContextInfomation
-	{
-	RPacketContext::TContextConfigGPRS iDefContextConfigGPRS;
-	RPacketQoS::TQoSGPRSRequested iQoSConfig;
-	RPacketService::TContextInfo iInfo;
-	TInt iContextID;
-	};
-
-// FORWARD DECLARATIONS
-class CCtsyDispatcherCallback;
-class CGlobalPhonemanager;
-class CAsyncHelperRequest;
-class CATGprsNtwkRegStatusChange;
-class CInitialisePdpContext;
-
-
-// Can be removed in real LTSY implementation
-MTEST_FORWARD_DECLARE_MOCKLTSYENGINE
-
-// CLASS DECLARATION
-
-/**
- * Implements interfaces from the CTSY Dispatcher. The CTSY Dispatcher uses these
- * interfaces to make requests to the Licensee LTSY.
- */
-class CLtsyPacketServicesHandler : 	public CBase,
-							public MIsDispatchInterfaceSupported, 
-							public MLtsyDispatchPacketServicesPacketAttach,
-							public MLtsyDispatchPacketServicesGetPacketAttachMode,
-							public MLtsyDispatchPacketServicesGetPacketNetworkRegistrationStatus,
-							public MLtsyDispatchPacketServicesPacketDetach,
-							public MLtsyDispatchPacketServicesSetPdpContextConfig,
-							public MLtsyDispatchPacketServicesModifyActivePdpContext,
-							public MLtsyDispatchPacketServicesInitialisePdpContext,
-							public MLtsyDispatchPacketServicesDeletePdpContext,
-							public MLtsyDispatchPacketServicesSetPacketAttachMode,
-							public MLtsyDispatchPacketServicesNotifyPacketStatusChange,
-							public MLtsyDispatchPacketServicesSetDefaultPdpContextGprsParams,
-							public MLtsyDispatchPacketServicesSetDefaultPdpContextR99R4Params,
-							public MLtsyDispatchPacketServicesActivatePdpContext,
-							public MLtsyDispatchPacketServicesSetPdpContextQosGprs,
-							public MLtsyDispatchPacketServicesSetPdpContextQosR99R4,
-							public MLtsyDispatchPacketServicesSetPdpContextQosR5,
-							public MLtsyDispatchPacketServicesRejectNetworkInitiatedContextActivationRequest,
-							public MLtsyDispatchPacketServicesDeactivatePdpContext,
-							public MLtsyDispatchPacketServicesAddPacketFilter,
-							public MLtsyDispatchPacketServicesGetStatus,
-							public MLtsyDispatchPacketServicesGetStaticCapabilities,
-							public MLtsyDispatchPacketServicesGetMaxNoMonitoredServiceLists,
-							public MLtsyDispatchPacketServicesGetMaxNoActiveServices,
-							public MLtsyDispatchPacketServicesInitialiseMbmsContext,
-							public MLtsyDispatchPacketServicesGetMbmsNetworkServiceStatus,
-							public MLtsyDispatchPacketServicesUpdateMbmsMonitorServiceList,
-							public MLtsyDispatchPacketServicesUpdateMbmsSessionList,
-							public MLtsyDispatchPacketServicesRemovePacketFilter
-
-							
-	{
-public:
-
-	virtual ~CLtsyPacketServicesHandler();
-	static CLtsyPacketServicesHandler* NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone);
-	static CLtsyPacketServicesHandler* NewLC(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone);
-
-	// From MIsDispatchInterfaceSupported
-	virtual TBool IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId);
-	void IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask);
-	
-
-
-    // From MLtsyDispatchPacketServicesPacketAttach  //finished
-    virtual TInt HandlePacketAttachReqL();
-
-    // From MLtsyDispatchPacketServicesGetPacketAttachMode  //Nosupport
-    virtual TInt HandleGetPacketAttachModeReqL();
-
-    // From MLtsyDispatchPacketServicesGetPacketNetworkRegistrationStatus //finished
-    virtual TInt HandleGetPacketNetworkRegistrationStatusReqL();
-
-    // From MLtsyDispatchPacketServicesPacketDetach  //finished
-    virtual TInt HandlePacketDetachReqL();
-
-    // From MLtsyDispatchPacketServicesSetPdpContextConfig  //implementing
-    virtual TInt HandleSetPdpContextConfigReqL(const TDesC& aContextId,
-    				const TDesC8& aAccessPointName,
-    				const RPacketContext::TProtocolType aPdpType,
-    				const TDesC8& aPdpAddress,
-    				const TDesC8& aPcoBuffer);
-
-    // From MLtsyDispatchPacketServicesModifyActivePdpContext
-    virtual TInt HandleModifyActivePdpContextReqL(const TDesC& aContextName);
-
-    // From MLtsyDispatchPacketServicesInitialisePdpContext  //implementing
-    virtual TInt HandleInitialisePdpContextReqL(const TDesC& aPrimaryContextName, const TDesC& aSecondaryContextName);
-
-    // From MLtsyDispatchPacketServicesDeletePdpContext
-    virtual TInt HandleDeletePdpContextReqL(const TDesC& aContextName);
-
-    // From MLtsyDispatchPacketServicesSetPacketAttachMode
-    virtual TInt HandleSetPacketAttachModeReqL(RPacketService::TAttachMode aAttachMode);
-
-    // From MLtsyDispatchPacketServicesNotifyPacketStatusChange
-    virtual TInt HandleNotifyPacketStatusChangeReqL();
-
-    // From MLtsyDispatchPacketServicesSetDefaultPdpGprsContextParams
-    virtual TInt HandleSetDefaultPdpContextGprsParamsReqL(const RPacketContext::TContextConfigGPRS& aContextConfigGprs);
-
-    // From MLtsyDispatchPacketServicesSetDefaultPdpR99R4ContextParams
-    virtual TInt HandleSetDefaultPdpContextR99R4ParamsReqL(const RPacketContext::TContextConfigR99_R4& aContextConfigR99R4);    
-    
-    // From MLtsyDispatchPacketServicesActivatePdpContext
-    virtual TInt HandleActivatePdpContextReqL(const TDesC& aContextName);
-
-    // From MLtsyDispatchPacketServicesSetPdpContextQosGprs    
-    virtual TInt HandleSetPdpContextQosGprsReqL(const TDesC& aContextName, const RPacketQoS::TQoSGPRSRequested& aQoSConfig);
-    
-    // From MLtsyDispatchPacketServicesSetPdpContextQosGprs    
-    virtual TInt HandleSetPdpContextQosR99R4ReqL(const TDesC& aContextName, const RPacketQoS::TQoSR99_R4Requested& aQoSConfig);
-        
-    // From MLtsyDispatchPacketServicesSetPdpContextQosGprs    
-    virtual TInt HandleSetPdpContextQosR5ReqL(const TDesC& aContextName, const RPacketQoS::TQoSR5Requested& aQoSConfig);        
-
-    // From MLtsyDispatchPacketServicesRejectNetworkInitiatedContextActivationRequest
-    virtual TInt HandleRejectNetworkInitiatedContextActivationRequestReqL();
-
-    // From MLtsyDispatchPacketServicesDeactivatePdpContext
-    virtual TInt HandleDeactivatePdpContextReqL(const TDesC& aContextName);
-
-    // From MLtsyDispatchPacketServicesAddPacketFilter
-    virtual TInt HandleAddPacketFilterSyncL(const TDesC& aContextName,  CArrayFixFlat<RPacketContext::TPacketFilterV2>& aContextFilter);
-    
-    // From MLtsyDispatchPacketServicesGetStatus
-    virtual TInt HandleGetStatusReqL();
-    
-    // From MLtsyDispatchPacketServicesRemovePacketFilter
-    virtual TInt HandleRemovePacketFilterSyncL(const TDesC& aContextName,  TInt aFilterId);
-    
-
-    // From MLtsyDispatchPacketServicesGetStaticCapabilities
-    virtual TInt HandleGetStaticCapabilitiesReqL();
-    
-    // From MLtsyDispatchPacketServicesGetMaxNoMonitoredServiceLists
-    virtual TInt HandleGetMaxNoMonitoredServiceListsReqL();
-    
-    // From MLtsyDispatchPacketServicesGetMaxNoActiveServices
-    virtual TInt HandleGetMaxNoActiveServicesReqL();
-    
-    // From MLtsyDispatchPacketServicesInitialiseMbmsContext
-    virtual TInt HandleInitialiseMbmsContextReqL(const TDesC& aContextName);
-    
-    // From MLtsyDispatchPacketServicesGetMbmsNetworkServiceStatus
-    virtual TInt HandleGetMbmsNetworkServiceStatusReqL(TBool aAttemptAttach);
-
-    // From MLtsyDispatchPacketServicesUpdateMbmsMonitorServiceList
-    virtual TInt HandleUpdateMbmsMonitorServiceListsReqL(TMbmsAction aAction, const CPcktMbmsMonitoredServiceList& aServiceList, const CPcktMbmsMonitoredServiceList& aChangeList);
-
-    // From MLtsyDispatchPacketServicesUpdateMbmsSessionList
-    virtual TInt HandleUpdateMbmsSessionListReqL(const TDesC& aContextName, TMbmsAction aAction, TMbmsSessionId aSessionId, const TMbmsSessionIdList& aServiceList);
-    
-
-    
-
-	TDes* NameOfLastAddedContext();
-	TInt MaxNumberOfContexts();
-	TInt GetContext(const TDesC& aName);
-
-private:
-	
-	
-	CLtsyPacketServicesHandler(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone);
-	void ConstructL();
-	
-	
-	TInt GenerateNewContextCid(const TDesC& aName);
-	void SetDefaultContextConfigGPRS(const RPacketContext::TContextConfigGPRS* aContextConfigGPRS);
-	//void ContextConfigGPRS(RPacketContext::TContextConfigGPRS* aContextConfigGPRS);
-
-private:
-	
-	// Not owned
-	
-	/**
-	 * Callback object in the CTSY Dispatcher.
-	 * 
-	 * Used to complete a request back to the CTSY Dispatcher.
-	 */
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-	CGlobalPhonemanager* iGloblePhone;
-	CAsyncHelperRequest* iAsyncHelperRequest;
-	CATGprsNtwkRegStatusChange* iNtwkRegStatusChange;
-	CInitialisePdpContext* iInitialisePdpContext;
-		
-	RPacketContext::TContextConfigGPRS iDefContextConfigGPRS;
-	}; // class CLtsyPacketServicesHandler
-
-#endif // __CLTSYDISPATCHPACKETSERVICESHANDLER_H_
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/cltsyphonebookenhandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-// 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:
-// CLtsyPhonebookEnHandler
-
-#ifndef __CLTSYDISPATCHPHONEBOOKENHANDLER_H_
-#define __CLTSYDISPATCHPHONEBOOKENHANDLER_H_
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-
-#include <ctsy/ltsy/mltsydispatchinterface.h>
-#include <ctsy/ltsy/mltsydispatchphonebookeninterface.h>
-#include "misdispatchinterfacesupported.h"
-#include "ltsymacros.h"
-
-
-
-// FORWARD DECLARATIONS
-class CCtsyDispatcherCallback;
-class CGlobalPhonemanager;
-// Can be removed in real LTSY implementation
-MTEST_FORWARD_DECLARE_MOCKLTSYENGINE
-
-// CLASS DECLARATION
-
-/**
- * Implements interfaces from the CTSY Dispatcher. The CTSY Dispatcher uses these
- * interfaces to make requests to the Licensee LTSY.
- */
-class CLtsyPhonebookEnHandler : 	public CBase,
-							public MIsDispatchInterfaceSupported, 
-							public MLtsyDispatchPhonebookEnStoreGetInfo,
-							public MLtsyDispatchPhonebookEnStoreReadAll,
-							public MLtsyDispatchPhonebookEnStoreReadEntry
-							
-	{
-public:
-
-	virtual ~CLtsyPhonebookEnHandler();
-	static CLtsyPhonebookEnHandler* NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone);
-	static CLtsyPhonebookEnHandler* NewLC(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone);
-
-	// From MIsDispatchInterfaceSupported
-	virtual TBool IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId);
-	void IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask);
-	
-
-
-    // From MLtsyDispatchPhonebookEnStoreGetInfo
-    virtual TInt HandleStoreGetInfoReqL();
-
-    // From MLtsyDispatchPhonebookEnStoreReadAll
-    virtual TInt HandleStoreReadAllReqL();
-
-    // From MLtsyDispatchPhonebookEnStoreReadEntry
-    virtual TInt HandleStoreReadEntryReqL(TInt aIndex);
-
-
-private:
-	
-	CLtsyPhonebookEnHandler(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone);
-	void ConstructL();
-
-private:
-	
-	// Not owned
-	
-	/**
-	 * Callback object in the CTSY Dispatcher.
-	 * 
-	 * Used to complete a request back to the CTSY Dispatcher.
-	 */
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-	
-	//Not Owned
-	CGlobalPhonemanager* iGloblePhone;
-	
-public:
-
-
-	}; // class CLtsyPhonebookEnHandler
-
-#endif // __CLTSYDISPATCHPHONEBOOKENHANDLER_H_
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/cltsyphonebookhandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-// 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:
-// CLtsyPhonebookHandler
-
-#ifndef __CLTSYDISPATCHPHONEBOOKHANDLER_H_
-#define __CLTSYDISPATCHPHONEBOOKHANDLER_H_
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-
-#include <ctsy/ltsy/mltsydispatchinterface.h>
-#include <ctsy/ltsy/mltsydispatchphonebookinterface.h>
-#include "misdispatchinterfacesupported.h"
-#include "ltsymacros.h"
-
-// FORWARD DECLARATIONS
-class CCtsyDispatcherCallback;
-class CGlobalPhonemanager;
-// Can be removed in real LTSY implementation
-MTEST_FORWARD_DECLARE_MOCKLTSYENGINE
-
-// CLASS DECLARATION
-
-/**
- * Implements interfaces from the CTSY Dispatcher. The CTSY Dispatcher uses these
- * interfaces to make requests to the Licensee LTSY.
- */
-class CLtsyPhonebookHandler : 	public CBase,
-							public MIsDispatchInterfaceSupported, 
-							public MLtsyDispatchPhonebookStoreReadEntry,
-							public MLtsyDispatchPhonebookStoreDeleteEntry,
-							public MLtsyDispatchPhonebookStoreCache,
-							public MLtsyDispatchPhonebookStoreCacheCancel,
-							public MLtsyDispatchPhonebookStoreGetPhonebookInfo,
-							public MLtsyDispatchPhonebookStoreInitialise,
-							public MLtsyDispatchPhonebookStoreDeleteAll,
-							public MLtsyDispatchPhonebookSmsStoreReadAll,
-							public MLtsyDispatchPhonebookStoreWriteEntry,
-							public MLtsyDispatchPhonebookGetPhoneStoreInfo,
-							public MLtsyDispatchPhonebookSmsStoreDeleteEntry,
-							public MLtsyDispatchPhonebookSmsStoreDeleteAll,
-							public MLtsyDispatchPhonebookSmsStoreGetInfo,
-							public MLtsyDispatchPhonebookSmsStoreReadEntry,
-							public MLtsyDispatchPhonebookSmsStoreWriteEntry
-			
-	{
-public:
-
-	virtual ~CLtsyPhonebookHandler();
-	static CLtsyPhonebookHandler* NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone);
-	static CLtsyPhonebookHandler* NewLC(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone);
-
-	// From MIsDispatchInterfaceSupported
-	virtual TBool IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId);
-	void IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask);
-	
-
-
-    // From MLtsyDispatchPhonebookStoreReadEntry
-    virtual TInt HandleStoreReadEntryReqL(DispatcherPhonebook::TPhonebook aPhonebook, TInt aIndex, TInt aNumberOfSlots);
-
-    // From MLtsyDispatchPhonebookStoreDeleteEntry
-    virtual TInt HandleStoreDeleteEntryReqL(DispatcherPhonebook::TPhonebook aPhonebook, TInt aIndex);
-
-    // From MLtsyDispatchPhonebookStoreCache
-    virtual TInt HandleStoreCacheReqL(DispatcherPhonebook::TPhonebook aPhonebook);
-    
-    // From MLtsyDispatchPhonebookStoreCacheCancel
-    virtual TInt HandleStoreCacheCancelReqL(DispatcherPhonebook::TPhonebook aPhonebook);
-
-    // From MLtsyDispatchPhonebookStoreGetPhonebookInfo
-    virtual TInt HandleStoreGetPhonebookInfoReqL(DispatcherPhonebook::TPhonebook aPhonebook);
-
-    // From MLtsyDispatchPhonebookStoreInitialise
-    virtual TInt HandleStoreInitialiseReqL();
-
-    // From MLtsyDispatchPhonebookStoreDeleteAll
-    virtual TInt HandleStoreDeleteAllReqL(DispatcherPhonebook::TPhonebook aPhonebook);
-
-    // From MLtsyDispatchPhonebookStoreWriteEntry
-    virtual TInt HandleStoreWriteEntryReqL(DispatcherPhonebook::TPhonebook aPhonebook, const TDesC8& aEntry);
-
-    // From MLtsyDispatchPhonebookGetPhoneStoreInfo
-    virtual TInt HandleGetPhoneStoreInfoReqL(const TDesC& aStoreName);
-    
-    // From MLtsyDispatchPhonebookSmsStoreReadAll
-    virtual TInt HandleSmsStoreReadAllReqL();
-
-    // From MLtsyDispatchPhonebookSmsStoreDeleteEntry
-    virtual TInt HandleSmsStoreDeleteEntryReqL(TInt aIndex);
-
-    // From MLtsyDispatchPhonebookSmsStoreDeleteAll
-    virtual TInt HandleSmsStoreDeleteAllReqL();
-
-    // From MLtsyDispatchPhonebookSmsStoreGetInfo
-    virtual TInt HandleSmsStoreGetInfoReqL();
-
-    // From MLtsyDispatchPhonebookSmsStoreReadEntry
-    virtual TInt HandleSmsStoreReadEntryReqL(TInt aIndex);
-
-    // From MLtsyDispatchPhonebookSmsStoreWriteEntry
-    virtual TInt HandleSmsStoreWriteEntryReqL(const RMobileSmsStore::TMobileGsmSmsEntryV1& aMobileGsmEntry);
-public:
-	
-	/*virtual void LtsyIPCDataCallBack(TInt aIpc, TInt aError, TAny* aParams);
-	
-	virtual void LtsyINDDataCallBack(TInt aInd, TInt aError, TAny* aParams);*/
-private:
-	
-	CLtsyPhonebookHandler(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone);
-	void ConstructL();
-
-private:
-	
-	// Not owned
-	
-	/**
-	 * Callback object in the CTSY Dispatcher.
-	 * 
-	 * Used to complete a request back to the CTSY Dispatcher.
-	 */
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-	CGlobalPhonemanager*     iGloblePhone;
-public:
-
-
-	}; // class CLtsyPhonebookHandler
-
-#endif // __CLTSYDISPATCHPHONEBOOKHANDLER_H_
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/cltsyphonebookonhandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-// 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:
-// CLtsyPhonebookOnHandler
-
-#ifndef __CLTSYDISPATCHPHONEBOOKONHANDLER_H_
-#define __CLTSYDISPATCHPHONEBOOKONHANDLER_H_
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-
-#include <ctsy/ltsy/mltsydispatchinterface.h>
-#include <ctsy/ltsy/mltsydispatchphonebookoninterface.h>
-#include "misdispatchinterfacesupported.h"
-#include "ltsymacros.h"
-
-
-
-// FORWARD DECLARATIONS
-class CCtsyDispatcherCallback;
-
-// Can be removed in real LTSY implementation
-MTEST_FORWARD_DECLARE_MOCKLTSYENGINE
-
-// CLASS DECLARATION
-
-/**
- * Implements interfaces from the CTSY Dispatcher. The CTSY Dispatcher uses these
- * interfaces to make requests to the Licensee LTSY.
- */
-class CLtsyPhonebookOnHandler : 	public CBase,
-							public MIsDispatchInterfaceSupported, 
-							public MLtsyDispatchPhonebookOnStoreRead,
-							public MLtsyDispatchPhonebookOnStoreDeleteAll,
-							public MLtsyDispatchPhonebookOnStoreReadEntry,
-							public MLtsyDispatchPhonebookOnStoreGetInfo,
-							public MLtsyDispatchPhonebookOnStoreGetReadStoreSize,
-							public MLtsyDispatchPhonebookOnStoreDeleteEntry,
-							public MLtsyDispatchPhonebookOnStoreWriteEntry,
-							public MLtsyDispatchPhonebookOnStoreWrite,
-							public MLtsyDispatchPhonebookOnStoreGetStoreSize
-							
-	{
-public:
-
-	virtual ~CLtsyPhonebookOnHandler();
-	static CLtsyPhonebookOnHandler* NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	static CLtsyPhonebookOnHandler* NewLC(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	// From MIsDispatchInterfaceSupported
-	virtual TBool IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId);
-	void IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask);
-	
-
-
-    // From MLtsyDispatchPhonebookOnStoreRead
-    virtual TInt HandleStoreReadReqL(TInt aIndex);
-
-    // From MLtsyDispatchPhonebookOnStoreDeleteAll
-    virtual TInt HandleStoreDeleteAllReqL();
-
-    // From MLtsyDispatchPhonebookOnStoreReadEntry
-    virtual TInt HandleStoreReadEntryReqL(TInt aIndex);
-
-    // From MLtsyDispatchPhonebookOnStoreGetInfo
-    virtual TInt HandleStoreGetInfoReqL();
-
-    // From MLtsyDispatchPhonebookOnStoreGetReadStoreSize
-    virtual TInt HandleStoreGetReadStoreSizeReqL();
-
-    // From MLtsyDispatchPhonebookOnStoreDeleteEntry
-    virtual TInt HandleStoreDeleteEntryReqL(TInt aIndex);
-
-    // From MLtsyDispatchPhonebookOnStoreWriteEntry
-    virtual TInt HandleStoreWriteEntryReqL(const RMobileONStore::TMobileONEntryV1& aMobileOnEntry);
-
-    // From MLtsyDispatchPhonebookOnStoreWrite
-    virtual TInt HandleStoreWriteReqL(const RMobileONStore::TMobileONEntryV1& aMobileOnEntry);
-
-    // From MLtsyDispatchPhonebookOnStoreGetStoreSize
-    virtual TInt HandleStoreGetStoreSizeReqL();
-
-
-private:
-	
-	CLtsyPhonebookOnHandler(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	void ConstructL();
-
-private:
-	
-	// Not owned
-	
-	/**
-	 * Callback object in the CTSY Dispatcher.
-	 * 
-	 * Used to complete a request back to the CTSY Dispatcher.
-	 */
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-	
-public:
-
-
-	}; // class CLtsyPhonebookOnHandler
-
-#endif // __CLTSYDISPATCHPHONEBOOKONHANDLER_H_
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/cltsyphonehandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,249 +0,0 @@
-// 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:
-// CLtsyPhoneHandler
-
-#ifndef __CLTSYDISPATCHPHONEHANDLER_H_
-#define __CLTSYDISPATCHPHONEHANDLER_H_
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-
-#include <ctsy/ltsy/mltsydispatchinterface.h>
-#include <ctsy/ltsy/mltsydispatchphoneinterface.h>
-#include "misdispatchinterfacesupported.h"
-#include "ltsymacros.h"
-#include "globalphonemanager.h"
-
-
-#include "requestbase.h"
-
-
-// Can be removed in real LTSY implementation
-MTEST_FORWARD_DECLARE_MOCKLTSYENGINE
-class CRequestBase;
-
-class CInitializePhone;
-class CAsyncHelperRequest;
-class CATNetworkRegStatusChange;
-class CATNotifyCellInfo;
-class CNotifyBatteryAndSignal;
-class CATDetectNetwork;
-class CATSelectNetwork;
-
-
-class MLtsyUnsolicitedCommandObserver;
-class CUnsolicitedWindPhoneHandler;
-
-// CLASS DECLARATION
-
-/**
- * Implements interfaces from the CTSY Dispatcher. The CTSY Dispatcher uses these
- * interfaces to make requests to the Licensee LTSY.
- */
-class CLtsyPhoneHandler : 	public CBase,
-							public MIsDispatchInterfaceSupported, 		
-							public MLtsyDispatchPhoneGetFdnStatus,
-							public MLtsyDispatchPhoneGetNetworkRegistrationStatus,
-							public MLtsyDispatchPhoneGetHomeNetwork,
-							public MLtsyDispatchPhoneBootNotifyModemStatusReady,
-							public MLtsyDispatchPhoneBootNotifySimStatusReady,
-							public MLtsyDispatchPhoneSimRefreshRegister,
-							public MLtsyDispatchPhoneGetServiceProviderName,
-							public MLtsyDispatchPhoneGetPhoneId,
-							public MLtsyDispatchPhoneGetDetectedNetworks,
-							public MLtsyDispatchPhoneGetDetectedNetworksCancel,
-							public MLtsyDispatchPhoneSelectNetwork,
-							public MLtsyDispatchPhoneSelectNetworkCancel,
-							public MLtsyDispatchPhoneSetNetworkSelectionSetting,
-							public MLtsyDispatchPhoneGetCurrentNetworkInfo,
-							public MLtsyDispatchPhoneGetNetworkMode,
-							public MLtsyDispatchPhoneGetNitzInfo,
-							public MLtsyDispatchPhoneGetSignalStrength,
-							public MLtsyDispatchPhoneGetBatteryInfo,
-							public MLtsyDispatchPhoneNspsWakeup,
-                            public MLtsyDispatchPhoneSetSystemNetworkMode,
-                            public MLtsyDispatchPhoneGetCurrentSystemNetworkModes,
-                            public MLtsyDispatchPhoneResetNetServer,
-                            public MLtsyDispatchPhoneSetAlwaysOnMode,
-                            public MLtsyDispatchPhoneSetDriveMode,
-                            public MLtsyDispatchPhoneGetHspaStatus,
-                            public MLtsyDispatchPhoneSetHspaStatus,
-                            public MLtsyDispatchPhoneGetNetworkProviderName,
-                            public MLtsyDispatchPhoneGetOperatorName,
-                            public MLtsyDispatchPhoneGetCellInfo,
-							public MLtsyDispatchPhoneRegisterCellInfoChangeNotification,
-							public MLtsyDispatchPhoneGetPhoneCellInfo,
-							public MLtsyDispatchPhoneGetUsimServiceSupport,
-							public MLtsyDispatchPhoneGetCurrentActiveUsimApplication,
-							public MLtsyDispatchPhoneTerminateAllCalls,
-							public MLtsyDispatchPhoneGetSystemNetworkBand,
-							public MLtsyDispatchPhoneSetSystemNetworkBand,
-							public MIpcRequestCompleteObserver
-							
-	{
-public:
-	virtual ~CLtsyPhoneHandler();
-	static CLtsyPhoneHandler* NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone);
-	static CLtsyPhoneHandler* NewLC(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone);
-
-	// From MIsDispatchInterfaceSupported
-	virtual TBool IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId);
-	void IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask);
-	
-	// From MLtsyDispatchPhoneGetFdnStatus
-	virtual TInt HandleGetFdnStatusReqL();
-
-	// From MLtsyDispatchPhoneGetNetworkRegistrationStatus
-	virtual TInt HandleGetNetworkRegistrationStatusReqL();
-
-	// From MLtsyDispatchPhoneGetHomeNetwork
-	virtual TInt HandleGetHomeNetworkReqL();
-
-	// From MLtsyDispatchPhoneBootNotifyModemStatusReady
-	virtual TInt HandleBootNotifyModemStatusReadyReqL();
-
-	// From MLtsyDispatchPhoneBootNotifySimStatusReady
-	virtual TInt HandleBootNotifySimStatusReadyReqL();
-
-	// From MLtsyDispatchPhoneSimRefreshRegister
-	virtual TInt HandleSimRefreshRegisterReqL(TUint16 aFilesToRegister);
-	
-    // From MLtsyDispatchPhoneGetServiceProviderName
-    virtual TInt HandleGetServiceProviderNameReqL();
-
-    // From MLtsyDispatchPhoneGetPhoneId
-    virtual TInt HandleGetPhoneIdReqL();
-
-    // From MLtsyDispatchPhoneGetDetectedNetworks
-    virtual TInt HandleGetDetectedNetworksReqL();
-
-    // From MLtsyDispatchPhoneGetDetectedNetworksCancel
-    virtual TInt HandleGetDetectedNetworksCancelReqL();
-
-    // From MLtsyDispatchPhoneSelectNetwork
-    virtual TInt HandleSelectNetworkReqL(TBool aIsManual, const RMobilePhone::TMobilePhoneNetworkManualSelection& aNetworkManualSelection);
-
-    // From MLtsyDispatchPhoneSelectNetworkCancel
-    virtual TInt HandleSelectNetworkCancelReqL();
-
-    // From MLtsyDispatchPhoneSetNetworkSelectionSetting
-    virtual TInt HandleSetNetworkSelectionSettingReqL(const RMobilePhone::TMobilePhoneNetworkSelectionV1& aPhoneNetworkSelection);
-    
-    // From MLtsyDispatchPhoneGetCurrentNetworkInfo
-    virtual TInt HandleGetCurrentNetworkInfoReqL();
-    
-    // From MLtsyDispatchPhoneGetNetworkMode
-    virtual TInt HandleGetNetworkModeReqL();
-    
-    // From MLtsyDispatchPhoneGetNitzInfo
-    virtual TInt HandleGetNitzInfoReqL();
-    
-    // From MLtsyDispatchPhoneGetSignalStrength
-    virtual TInt HandleGetSignalStrengthReqL();
-    
-    // From MLtsyDispatchPhoneGetBatteryInfo
-    virtual TInt HandleGetBatteryInfoReqL();
-
-	// From MLtsyDispatchPhoneNspsWakeup
-	virtual TInt HandleNspsWakeupReqL();
-
-	// From MLtsyDispatchPhoneSetSystemNetworkMode
-	virtual TInt HandleSetSystemNetworkModeReqL(RMmCustomAPI::TNetworkModeCaps aMode);
-
-	// From MLtsyDispatchPhoneGetCurrentSystemNetworkModes
-	virtual TInt HandleGetCurrentSystemNetworkModesReqL();
-
-	// From MLtsyDispatchPhoneResetNetServer
-	virtual TInt HandleResetNetServerReqL();
-
-	// From MLtsyDispatchPhoneSetAlwaysOnMode
-	virtual TInt HandleSetAlwaysOnModeReqL(RMmCustomAPI::TSetAlwaysOnMode aMode);
-
-	// From MLtsyDispatchPhoneSetDriveMode
-	virtual TInt HandleSetDriveModeReqL(RMmCustomAPI::TSetDriveMode aMode);
-    
-	// From MLtsyDispatchPhoneGetHspaStatus
-	virtual TInt HandleGetHspaStatusReqL();
-
-	// From MLtsyDispatchPhoneSetHspaStatus
-	virtual TInt HandleSetHspaStatusReqL(RMmCustomAPI::THSxPAStatus aStatus);
-    
-	// From MLtsyDispatchPhoneGetNetworkProviderName
-	virtual TInt HandleGetNetworkProviderNameReqL();
-    
-	// From MLtsyDispatchPhoneGetOperatorName
-	virtual TInt HandleGetOperatorNameReqL();
-    
-	// From MLtsyDispatchPhoneGetCellInfo
-	virtual TInt HandleGetCellInfoReqL();
-
-	// From MLtsyDispatchPhoneRegisterCellInfoChangeNotification
-    virtual TInt HandleRegisterCellInfoChangeNotificationReqL();
-    
-    // From MLtsyDispatchPhoneGetPhoneCellInfo
-    virtual TInt HandleGetPhoneCellInfoReqL();
-    
-    // From MLtsyDispatchPhoneGetUsimServiceSupport
-    virtual TInt HandleGetGetUsimServiceSupportReqL(TInt aApplicationNumber);
-    
-    // From MLtsyDispatchPhoneGetCurrentActiveUsimApplication
-    virtual TInt HandleGetCurrentActiveUsimApplicationReqL();
-
-	// From MLtsyDispatchPhoneTerminateAllCalls
-    virtual TInt HandleTerminateAllCallsReqL(TInt aCallId);
-    
-	// From MLtsyDispatchPhoneGetSystemNetworkBand
-    virtual TInt HandleGetSystemNetworkBandReqL();
-    
-    // From MLtsyDispatchPhoneSetSystemNetworkBand
-    virtual TInt HandleSetSystemNetworkBandReqL(RMmCustomAPI::TBandSelection aBand, RMmCustomAPI::TNetworkModeCaps aMode);
-    
-    // From MIpcRequestCompleteObserver
-    virtual void NotifyIpcRequestComplete(TInt aIpcId);
-       
-public:
-	MLtsyUnsolicitedCommandObserver* GetUnsolicitedCallControlHandler() const;	
-private:
-	CLtsyPhoneHandler(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone);
-	void ConstructL();
-private:
-	/**
-	 * Callback object in the CTSY Dispatcher.
-	 * 
-	 * Used to complete a request back to the CTSY Dispatcher.
-	 */
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-	CGlobalPhonemanager* iGloblePhone;
-	CInitializePhone* iInitializePhone;
-	CAsyncHelperRequest* iAsyncHelperRequest;
-	CATNetworkRegStatusChange* iNetworkRegStatusChange;
-	CATNotifyCellInfo* iNotifyCellInfo;
-	CNotifyBatteryAndSignal* iNotifyBatteryAndSignal;
-	CATDetectNetwork* iATDetectNetwork;
-	CATSelectNetwork* iATSelectNetwork;
-	
-	/**
-	 * Process unsolicited command
-	 */
-	CUnsolicitedWindPhoneHandler* iUnsolicitedHandler;
-	
-	/**
-	 * Store the one IPC Id which identify next possible IPC request to be run
-	 */
-	TInt iPendingIpcId;
-	}; // class CLtsyPhoneHandler
-
-#endif // __CLTSYDISPATCHPHONEHANDLER_H_
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/cltsysathandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-// 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:
-// CLtsySatHandler
-
-#ifndef __CLTSYDISPATCHSATHANDLER_H_
-#define __CLTSYDISPATCHSATHANDLER_H_
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-
-#include <ctsy/ltsy/mltsydispatchinterface.h>
-#include <ctsy/ltsy/mltsydispatchsatinterface.h>
-#include "misdispatchinterfacesupported.h"
-#include "ltsymacros.h"
-
-
-
-// FORWARD DECLARATIONS
-class CCtsyDispatcherCallback;
-
-// Can be removed in real LTSY implementation
-MTEST_FORWARD_DECLARE_MOCKLTSYENGINE
-
-// CLASS DECLARATION
-
-/**
- * Implements interfaces from the CTSY Dispatcher. The CTSY Dispatcher uses these
- * interfaces to make requests to the Licensee LTSY.
- */
-class CLtsySatHandler : 	public CBase,
-							public MIsDispatchInterfaceSupported, 
-							public MLtsyDispatchSatSmsDeliverReport,
-							public MLtsyDispatchSatGetImageInstance,
-							public MLtsyDispatchSatGetIconData,
-							public MLtsyDispatchSatGetClut,
-							public MLtsyDispatchSatGetDefaultBearerCapability,
-							public MLtsyDispatchSatGetSmsPpDownloadSupported,
-							public MLtsyDispatchSatGetSmsControlActivated,
-							public MLtsyDispatchSatCellBroadcastEnvelope,
-							public MLtsyDispatchSatTimingAdvance,
-							public MLtsyDispatchSatSmControlResponseData,
-							public MLtsyDispatchSatProvideLocationInfo,
-							public MLtsyDispatchSatSetPollingInterval,
-							public MLtsyDispatchSatSmsPpDownloadEnvelope,
-							public MLtsyDispatchSatLocalInformationNmr,
-							public MLtsyDispatchSatGetAccessTechnology,
-							public MLtsyDispatchSatGetUssdControlSupported,
-							public MLtsyDispatchSatCallAndSmsControlEnvelope,
-							public MLtsyDispatchSatRefreshAllowed,
-							public MLtsyDispatchSatReady,
-							public MLtsyDispatchSatPCmdNotification,
-							public MLtsyDispatchSatUssdControlEnvelopeError,
-							public MLtsyDispatchSatTimerExpirationEnvelope,
-							public MLtsyDispatchSatTerminalRsp,
-							public MLtsyDispatchSatMenuSelectionEnvelope,
-							public MLtsyDispatchSatEventDownloadEnvelope
-							
-	{
-public:
-
-	virtual ~CLtsySatHandler();
-	static CLtsySatHandler* NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	static CLtsySatHandler* NewLC(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	// From MIsDispatchInterfaceSupported
-	virtual TBool IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId);
-	void IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask);
-	
-
-
-    // From MLtsyDispatchSatSmsDeliverReport
-    virtual TInt HandleSmsDeliverReportReqL(const TDesC8& aSmsDeliverReportTpdu);
-
-    // From MLtsyDispatchSatGetImageInstance
-    virtual TInt HandleGetImageInstanceReqL(TUint8 aEfImgRecordNumber, TUint8 aInstanceNumberInEfImgRecord);
-
-    // From MLtsyDispatchSatGetIconData
-    virtual TInt HandleGetIconDataReqL(TUint8 aEfImgRecordNumber, const TDesC8& aSimFilePath);
-
-    // From MLtsyDispatchSatGetClut
-    virtual TInt HandleGetClutReqL(TUint8 aEfImgRecordNumber, TUint8 aInstanceNumberInEfImgRecord);
-
-    // From MLtsyDispatchSatGetDefaultBearerCapability
-    virtual TInt HandleGetDefaultBearerCapabilityReqL();
-
-    // From MLtsyDispatchSatGetSmsPpDownloadSupported
-    virtual TInt HandleGetSmsPpDownloadSupportedReqL();
-
-    // From MLtsyDispatchSatGetSmsControlActivated
-    virtual TInt HandleGetSmsControlActivatedReqL();
-
-    // From MLtsyDispatchSatCellBroadcastEnvelope
-    virtual TInt HandleCellBroadcastEnvelopeReqL(const TDesC8& aEnvelope);
-
-    // From MLtsyDispatchSatTimingAdvance
-    virtual TInt HandleTimingAdvanceReqL();
-
-    // From MLtsyDispatchSatSmControlResponseData
-    virtual TInt HandleSmControlResponseDataReqL(
-    		TUint8 aResult, const TDesC8& aRpDestinationAddress, const TDesC8& aTpDestinationAddress);
-
-	// From MLtsyDispatchSatGetAccessTechnology
-    virtual TInt HandleGetAccessTechnologyReqL();
-    
-    // From MLtsyDispatchSatProvideLocationInfo
-    virtual TInt HandleProvideLocationInfoReqL();
-
-    // From MLtsyDispatchSatSetPollingInterval
-    virtual TInt HandleSetPollingIntervalReqL(TUint8 aPollingInterval);
-
-    // From MLtsyDispatchSatSmsPpDownloadEnvelope
-    virtual TInt HandleSmsPpDownloadEnvelopeReqL(const TDesC8& aEnvelope);
-
-    // From MLtsyDispatchSatLocalInformationNmr
-    virtual TInt HandleLocalInformationNmrReqL();
-    
-    // From MLtsyDispatchSatGetUssdControlSupported
-    virtual TInt HandleGetUssdControlSupportedReqL();
-
-    // From MLtsyDispatchSatCallAndSmsControlEnvelope
-    virtual TInt HandleCallAndSmsControlEnvelopeReqL(const TDesC8& aEnvelope);
-
-    // From MLtsyDispatchSatRefreshAllowed
-    virtual TInt HandleRefreshAllowedReqL(const TDesC8& aRefreshFileList, const TDesC8& aAid, TUint16 aTsyCache);
-
-    // From MLtsyDispatchSatReady
-    virtual TInt HandleReadyReqL();
-
-    // From MLtsyDispatchSatPCmdNotification
-    virtual TInt HandlePCmdNotificationReqL(TUint8 aPCmdType);
-
-    // From MLtsyDispatchSatUssdControlEnvelopeError
-    virtual TInt HandleUssdControlEnvelopeErrorReqL();
-
-    // From MLtsyDispatchSatTimerExpirationEnvelope
-    virtual TInt HandleTimerExpirationEnvelopeReqL(const TDesC8& aEnvelope);
-
-    // From MLtsyDispatchSatTerminalRsp
-    virtual TInt HandleTerminalRspReqL(const TDesC8& aTerminalRsp);
-
-    // From MLtsyDispatchSatMenuSelectionEnvelope
-    virtual TInt HandleMenuSelectionEnvelopeReqL(const TDesC8& aEnvelope);
-
-    // From MLtsyDispatchSatEventDownloadEnvelope
-    virtual TInt HandleEventDownloadEnvelopeReqL(const TDesC8& aEnvelope);
-
-
-private:
-	
-	CLtsySatHandler(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	void ConstructL();
-
-private:
-	
-	// Not owned
-	
-	/**
-	 * Callback object in the CTSY Dispatcher.
-	 * 
-	 * Used to complete a request back to the CTSY Dispatcher.
-	 */
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-	
-public:
-
-
-	}; // class CLtsySatHandler
-
-#endif // __CLTSYDISPATCHSATHANDLER_H_
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/cltsysecurityhandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-// 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:
-// CLtsySecurityHandler
-
-#ifndef __CLTSYDISPATCHSECURITYHANDLER_H_
-#define __CLTSYDISPATCHSECURITYHANDLER_H_
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-
-#include <ctsy/ltsy/mltsydispatchinterface.h>
-#include <ctsy/ltsy/mltsydispatchsecurityinterface.h>
-#include "misdispatchinterfacesupported.h"
-#include "ltsymacros.h"
-
-
-
-// FORWARD DECLARATIONS
-class CCtsyDispatcherCallback;
-
-// Can be removed in real LTSY implementation
-MTEST_FORWARD_DECLARE_MOCKLTSYENGINE
-
-// CLASS DECLARATION
-
-/**
- * Implements interfaces from the CTSY Dispatcher. The CTSY Dispatcher uses these
- * interfaces to make requests to the Licensee LTSY.
- */
-class CLtsySecurityHandler : 	public CBase,
-							public MIsDispatchInterfaceSupported, 
-							public MLtsyDispatchSecurityGetSecurityCodeInfo,
-							public MLtsyDispatchSecurityGetLockInfo,
-							public MLtsyDispatchSecurityAbortSecurityCode,
-							public MLtsyDispatchSecurityGetCurrentActivePin,
-							public MLtsyDispatchSecuritySetLockSetting,
-							public MLtsyDispatchSecurityVerifySecurityCode,
-							public MLtsyDispatchSecurityGetPin1DisableSupported,
-							public MLtsyDispatchSecurityCheckSecurityCode,
-							public MLtsyDispatchSecurityDisablePhoneLock,
-							public MLtsyDispatchSecurityGetCipheringInfo,
-							public MLtsyDispatchSecurityIsSecurityCodeBlocked,
-							public MLtsyDispatchSecurityCheckSecurityCodeCancel							
-	{
-public:
-
-	virtual ~CLtsySecurityHandler();
-	static CLtsySecurityHandler* NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	static CLtsySecurityHandler* NewLC(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	// From MIsDispatchInterfaceSupported
-	virtual TBool IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId);
-	void IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask);
-	
-
-
-    // From MLtsyDispatchSecurityGetSecurityCodeInfo
-    virtual TInt HandleGetSecurityCodeInfoReqL(RMobilePhone::TMobilePhoneSecurityCode aSecCode);
-
-    // From MLtsyDispatchSecurityGetLockInfo
-    virtual TInt HandleGetLockInfoReqL(RMobilePhone::TMobilePhoneLock aLockType);
-
-    // From MLtsyDispatchSecurityAbortSecurityCode
-    virtual TInt HandleAbortSecurityCodeReqL(RMobilePhone::TMobilePhoneSecurityCode aSecCode);
-
-    // From MLtsyDispatchSecurityGetCurrentActivePin
-    virtual TInt HandleGetCurrentActivePinReqL();
-
-    // From MLtsyDispatchSecuritySetLockSetting
-    virtual TInt HandleSetLockSettingReqL(RMobilePhone::TMobilePhoneLock aLock, RMobilePhone::TMobilePhoneLockSetting aSetting, const TDesC& aPassword);
-
-    // From MLtsyDispatchSecurityVerifySecurityCode
-    virtual TInt HandleVerifySecurityCodeReqL(RMobilePhone::TMobilePhoneSecurityCode aSecCode,
-    										  const RMobilePhone::TCodeAndUnblockCode& aCodes);
-
-	// From MLtsyDispatchSecurityGetPin1DisableSupported
-	virtual TInt HandleGetPin1DisableSupportedReqL();
-	
-    // From MLtsyDispatchSecurityCheckSecurityCode
-    virtual TInt HandleCheckSecurityCodeReqL(DispatcherSecurity::TSecurityCodeId aSecCodeID, const TDes& aSecCode);
-
-    // From MLtsyDispatchSecurityDisablePhoneLock
-    virtual TInt HandleDisablePhoneLockReqL(const TDesC& aSecCode);
-
-    // From MLtsyDispatchSecurityGetCipheringInfo
-    virtual TInt HandleGetCipheringInfoReqL();
-
-    // From MLtsyDispatchSecurityIsSecurityCodeBlocked
-    virtual TInt HandleIsSecurityCodeBlockedReqL(DispatcherSecurity::TSecurityCodeId aSecCodeID);
-    
-    // From MLtsyDispatchSecurityCheckSecurityCodeCancel
-    virtual TInt HandleCheckSecurityCodeCancelReqL(DispatcherSecurity::TSecurityCodeId aSecCodeID);    
-
-private:
-	
-	CLtsySecurityHandler(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	void ConstructL();
-
-private:
-	
-	// Not owned
-	
-	/**
-	 * Callback object in the CTSY Dispatcher.
-	 * 
-	 * Used to complete a request back to the CTSY Dispatcher.
-	 */
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-	
-public:
-
-
-	}; // class CLtsySecurityHandler
-
-#endif // __CLTSYDISPATCHSECURITYHANDLER_H_
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/cltsysimhandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-// 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:
-// CLtsySimHandler
-
-#ifndef __CLTSYDISPATCHSIMHANDLER_H_
-#define __CLTSYDISPATCHSIMHANDLER_H_
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-
-#include <ctsy/ltsy/mltsydispatchinterface.h>
-#include <ctsy/ltsy/mltsydispatchsiminterface.h>
-#include "misdispatchinterfacesupported.h"
-#include "ltsymacros.h"
-
-
-
-// FORWARD DECLARATIONS
-class CCtsyDispatcherCallback;
-
-// Can be removed in real LTSY implementation
-MTEST_FORWARD_DECLARE_MOCKLTSYENGINE
-
-// CLASS DECLARATION
-
-/**
- * Implements interfaces from the CTSY Dispatcher. The CTSY Dispatcher uses these
- * interfaces to make requests to the Licensee LTSY.
- */
-class CLtsySimHandler : 	public CBase,
-							public MIsDispatchInterfaceSupported, 
-							public MLtsyDispatchSimGetApnControlListServiceStatus,
-							public MLtsyDispatchSimDeleteApnName,
-							public MLtsyDispatchSimEnumerateApnEntries,
-							public MLtsyDispatchSimChangeSecurityCode,
-							public MLtsyDispatchSimSetFdnSetting,
-							public MLtsyDispatchSimGetCustomerServiceProfile,
-							public MLtsyDispatchSimGetSubscriberId,
-							public MLtsyDispatchSimAppendApnName,
-							public MLtsyDispatchSimGetActiveIccApplicationType,
-							public MLtsyDispatchSimSetIccMessageWaitingIndicators,
-							public MLtsyDispatchSimSetApnControlListServiceStatus,
-							public MLtsyDispatchSimGetApnName,
-							public MLtsyDispatchSimSimRefreshDone,
-							public MLtsyDispatchSimGetServiceTable,
-							public MLtsyDispatchSimGetIccMessageWaitingIndicators,
-							public MLtsyDispatchSimSimLockActivate,
-							public MLtsyDispatchSimSimLockDeActivate,
-							public MLtsyDispatchSimGetAnswerToReset,
-							public MLtsyDispatchSimGetSimCardReaderStatus,
-							public MLtsyDispatchSimGetSimAuthenticationEapSimData,
-							public MLtsyDispatchSimGetSimAuthenticationEapAkaData,
-							public MLtsyDispatchSimPowerSimOff,
-							public MLtsyDispatchSimPowerSimOn,
-							public MLtsyDispatchSimReadSimFile,
-							public MLtsyDispatchSimSendApduRequest,
-							public MLtsyDispatchSimSendApduRequestV2,
-							public MLtsyDispatchSimSimWarmReset,
-							public MLtsyDispatchSimSetSimMessageStatusRead
-							
-	{
-public:
-
-	virtual ~CLtsySimHandler();
-	static CLtsySimHandler* NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	static CLtsySimHandler* NewLC(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	// From MIsDispatchInterfaceSupported
-	virtual TBool IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId);
-	void IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask);
-	
-
-
-    // From MLtsyDispatchSimGetApnControlListServiceStatus
-    virtual TInt HandleGetApnControlListServiceStatusReqL();
-
-    // From MLtsyDispatchSimDeleteApnName
-    virtual TInt HandleDeleteApnNameReqL(TUint32 aIndex);
-
-    // From MLtsyDispatchSimEnumerateApnEntries
-    virtual TInt HandleEnumerateApnEntriesReqL();
-
-    // From MLtsyDispatchSimChangeSecurityCode
-    virtual TInt HandleChangeSecurityCodeReqL(RMobilePhone::TMobilePhoneSecurityCode aSecCode,
-			   const RMobilePhone::TMobilePhonePasswordChangeV1& aPasswds);
-
-    // From MLtsyDispatchSimSetFdnSetting
-    virtual TInt HandleSetFdnSettingReqL(RMobilePhone::TMobilePhoneFdnSetting aFdnSetting);
-
-    // From MLtsyDispatchSimGetCustomerServiceProfile
-    virtual TInt HandleGetCustomerServiceProfileReqL();
-
-    // From MLtsyDispatchSimGetSubscriberId
-    virtual TInt HandleGetSubscriberIdReqL();
-
-    // From MLtsyDispatchSimAppendApnName
-    virtual TInt HandleAppendApnNameReqL(const RMobilePhone::TAPNEntryV3& aEntry);
-
-    // From MLtsyDispatchSimGetActiveIccApplicationType
-    virtual TInt HandleGetActiveIccApplicationTypeReqL();
-
-    // From MLtsyDispatchSimSetIccMessageWaitingIndicators
-    virtual TInt HandleSetIccMessageWaitingIndicatorsReqL(const RMobilePhone::TMobilePhoneMessageWaitingV1& aIndicators);
-
-    // From MLtsyDispatchSimSetApnControlListServiceStatus
-    virtual TInt HandleSetApnControlListServiceStatusReqL(RMobilePhone::TAPNControlListServiceStatus aStatus);
-
-    // From MLtsyDispatchSimGetApnName
-    virtual TInt HandleGetApnNameReqL(TUint32 aIndex);
-
-    // From MLtsyDispatchSimSimRefreshDone
-    virtual TInt HandleSimRefreshDoneReqL(TInt aError);
-    
-    // From MLtsyDispatchPhoneGetServiceTable
-    virtual TInt HandleGetServiceTableReqL(RMobilePhone::TMobilePhoneServiceTable aServiceTable);
-    
-	// From MLtsyDispatchSimGetIccMessageWaitingIndicators
-	virtual TInt HandleGetIccMessageWaitingIndicatorsReqL();
-	
-    // From MLtsyDispatchSimSimLockActivate
-    virtual TInt HandleSimLockActivateReqL(const TDesC& aPassword, RMmCustomAPI::TLockNumber aLockNumber);
-
-    // From MLtsyDispatchSimSimLockDeActivate
-    virtual TInt HandleSimLockDeActivateReqL(const TDesC& aPassword, RMmCustomAPI::TLockNumber aLockNumber);
-
-    // From MLtsyDispatchSimGetAnswerToReset
-    virtual TInt HandleGetAnswerToResetReqL(const TDesC8& aAnswerToReset);
-
-    // From MLtsyDispatchSimGetSimCardReaderStatus
-    virtual TInt HandleGetSimCardReaderStatusReqL();
-
-    // From MLtsyDispatchSimGetSimAuthenticationEapSimData
-    virtual TInt HandleGetSimAuthenticationEapSimDataReqL(const TDesC8& aRandomParameters, TInt aRFStateInfo);
-
-    // From MLtsyDispatchSimGetSimAuthenticationEapAkaData
-    virtual TInt HandleGetSimAuthenticationEapAkaDataReqL(const TDesC8& aRandomParameters, const TDesC8& aAUTN, TInt aRFStateInfo);
-    
-    // From MLtsyDispatchSimPowerSimOff
-    virtual TInt HandlePowerSimOffReqL();
-
-    // From MLtsyDispatchSimPowerSimOn
-    virtual TInt HandlePowerSimOnReqL();
-
-    // From MLtsyDispatchSimReadSimFile
-    virtual TInt HandleReadSimFileReqL(const TDesC8& aPath, TUint16 aOffset, TUint16 aSize);
-
-    // From MLtsyDispatchSimSendApduRequest
-    virtual TInt HandleSimSendApduRequestReqL(TUint8 aServiceType, TUint8 aCardReaderNumber, TUint8 aApplicationType, const TDesC8& aCommandData);
-    
-    // From MLtsyDispatchSimSendApduRequestV2
-    virtual TInt HandleSimSendApduRequestV2ReqL(TUint8 aCardReaderId, const TDesC8& aCommandData);
-
-    // From MLtsyDispatchSimSimWarmReset
-    virtual TInt HandleSimWarmResetReqL();
-
-    // From MLtsyDispatchSimSetSimMessageStatusRead
-    virtual TInt HandleSetSimMessageStatusReadReqL(const TTime& aTimestamp, TInt aTimezoneDiff);
-
-
-private:
-	
-	CLtsySimHandler(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	void ConstructL();
-
-private:
-	
-	// Not owned
-	
-	/**
-	 * Callback object in the CTSY Dispatcher.
-	 * 
-	 * Used to complete a request back to the CTSY Dispatcher.
-	 */
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-	
-public:
-
-
-	}; // class CLtsySimHandler
-
-#endif // __CLTSYDISPATCHSIMHANDLER_H_
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/cltsysmshandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-// 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:
-// CLtsySmsHandler
-
-#ifndef __CLTSYDISPATCHSMSHANDLER_H_
-#define __CLTSYDISPATCHSMSHANDLER_H_
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-
-#include <ctsy/ltsy/mltsydispatchinterface.h>
-#include <ctsy/ltsy/mltsydispatchsmsinterface.h>
-#include "misdispatchinterfacesupported.h"
-#include "ltsymacros.h"
-
-// FORWARD DECLARATIONS
-class CCtsyDispatcherCallback;
-class CGlobalPhonemanager;
-class CAtSmsReceive;
-class CAsyncHelperRequest;
-// Can be removed in real LTSY implementation
-MTEST_FORWARD_DECLARE_MOCKLTSYENGINE
-
-// CLASS DECLARATION
-/**
- * Implements interfaces from the CTSY Dispatcher. The CTSY Dispatcher uses these
- * interfaces to make requests to the Licensee LTSY.
- */
-class CLtsySmsHandler : 	public CBase,
-							public MIsDispatchInterfaceSupported, 
-							public MLtsyDispatchSmsSendSatSms,
-							public MLtsyDispatchSmsGetSmsStoreInfo,
-							public MLtsyDispatchSmsGetSmspList,
-							public MLtsyDispatchSmsNackSmsStored,
-							public MLtsyDispatchSmsAckSmsStored,
-							public MLtsyDispatchSmsResumeSmsReception,
-							public MLtsyDispatchSmsSendSmsMessage,
-							public MLtsyDispatchSmsSendSmsMessageNoFdnCheck,
-							public MLtsyDispatchSmsSetMoSmsBearer,
-							public MLtsyDispatchSmsStoreSmspListEntry
-{
-public:
-
-	virtual ~CLtsySmsHandler();
-	static CLtsySmsHandler* NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone);
-	static CLtsySmsHandler* NewLC(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone);
-
-	// From MIsDispatchInterfaceSupported
-	virtual TBool IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId);
-	void IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask);
-	
-
-
-    // From MLtsyDispatchSmsSendSatSms
-    virtual TInt HandleSendSatSmsReqL( const TDesC8& aSmsTpdu,
-    										   RMobileSmsMessaging::TMobileSmsDataFormat aDataFormat,
-    										   const RMobilePhone::TMobileAddress& aGsmServiceCentre,
-    										   TBool aMoreMessages
-    										  );
-    
-    // From MLtsyDispatchSmsGetSmsStoreInfo
-    virtual TInt HandleGetSmsStoreInfoReqL(/* TODO: Add request params here */);
-
-    // From MLtsyDispatchSmsGetSmspList
-    virtual TInt HandleGetSmspListReqL(/* TODO: Add request params here */);
-
-    // From MLtsyDispatchSmsNackSmsStored
-    virtual TInt HandleNackSmsStoredReqL(const TDesC8& aMsgPtr, TInt aRpCause);
-    
-    // From MLtsyDispatchSmsNackSmsStored
-    virtual TInt HandleNackSmsStoredReqL(TInt aRpCause);
-
-    // From MLtsyDispatchSmsAckSmsStored
-    virtual TInt HandleAckSmsStoredReqL(const TDesC8& aMsgPtr);
-    
-    // From MLtsyDispatchSmsAckSmsStored
-    virtual TInt HandleAckSmsStoredReqL();
-
-    // From MLtsyDispatchSmsResumeSmsReception
-    virtual TInt HandleResumeSmsReceptionReqL(/* TODO: Add request params here */);
-
-    // From MLtsyDispatchSmsSendSmsMessage
-    virtual TInt HandleSendSmsMessageReqL( const RMobilePhone::TMobileAddress& aDestination,
-        								   const TDesC8& aSmsTpdu,
-        								   RMobileSmsMessaging::TMobileSmsDataFormat aDataFormat,
-        								   const RMobilePhone::TMobileAddress& aGsmServiceCentre,
-        								   TBool aMoreMessages
-        								  ) ;
-
-    // From MLtsyDispatchSmsSendSmsMessageNoFdnCheck
-    virtual TInt HandleSendSmsMessageNoFdnCheckReqL( const RMobilePhone::TMobileAddress& aDestination,
-    												 const TDesC8& aSmsTpdu,
-    											     RMobileSmsMessaging::TMobileSmsDataFormat aDataFormat,
-    											     const RMobilePhone::TMobileAddress& aGsmServiceCentre,
-    											     TBool aMoreMessages
-    											    ) ;
-
-    // From MLtsyDispatchSmsSetMoSmsBearer
-    virtual TInt HandleSetMoSmsBearerReqL(RMobileSmsMessaging::TMobileSmsBearer aBearer);
-
-    // From MLtsyDispatchSmsStoreSmspList
-    virtual TInt HandleStoreSmspListEntryReqL(const RMobileSmsMessaging::TMobileSmspEntryV1& aSmsParam);
-   
-private:
-	
-	CLtsySmsHandler(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone);
-	void ConstructL();
-
-private:
-	
-	// Not owned
-	
-	/**
-	 * Callback object in the CTSY Dispatcher.
-	 * 
-	 * Used to complete a request back to the CTSY Dispatcher.
-	 */
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-	CGlobalPhonemanager* iGloblePhone;
-	CAtSmsReceive       *iAtSmsReceive;
-	CAsyncHelperRequest* iAsyncHelperRequest;
-	
-	}; // class CLtsySmsHandler
-
-#endif // __CLTSYDISPATCHSMSHANDLER_H_
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/cltsysupplementaryserviceshandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-// 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:
-// CLtsySupplementaryServicesHandler
-
-#ifndef __CLTSYDISPATCHSUPPLEMENTARYSERVICESHANDLER_H_
-#define __CLTSYDISPATCHSUPPLEMENTARYSERVICESHANDLER_H_
-
-// INCLUDES
-#include <e32std.h>
-#include <e32base.h>
-
-#include <ctsy/ltsy/mltsydispatchinterface.h>
-#include <ctsy/ltsy/mltsydispatchsupplementaryservicesinterface.h>
-#include "misdispatchinterfacesupported.h"
-#include "ltsymacros.h"
-
-
-
-// FORWARD DECLARATIONS
-class CCtsyDispatcherCallback;
-
-// Can be removed in real LTSY implementation
-MTEST_FORWARD_DECLARE_MOCKLTSYENGINE
-
-// CLASS DECLARATION
-
-/**
- * Implements interfaces from the CTSY Dispatcher. The CTSY Dispatcher uses these
- * interfaces to make requests to the Licensee LTSY.
- */
-class CLtsySupplementaryServicesHandler : 	public CBase,
-							public MIsDispatchInterfaceSupported, 
-							public MLtsyDispatchSupplementaryServicesSendNetworkServiceRequestNoFdnCheck,
-							public MLtsyDispatchSupplementaryServicesGetCallWaitingStatus,
-							public MLtsyDispatchSupplementaryServicesSendNetworkServiceRequest,
-							public MLtsyDispatchSupplementaryServicesGetCallBarringStatus,
-							public MLtsyDispatchSupplementaryServicesSetCallBarringStatus,
-							public MLtsyDispatchSupplementaryServicesSetCallForwardingStatus,
-							public MLtsyDispatchSupplementaryServicesSetCallWaitingStatus,
-							public MLtsyDispatchSupplementaryServicesSetSsPassword,
-							public MLtsyDispatchSupplementaryServicesGetCallForwardingStatus,
-							public MLtsyDispatchSupplementaryServicesSendUssdMessage,
-							public MLtsyDispatchSupplementaryServicesSendUssdMessageNoFdnCheck,
-                            public MLtsyDispatchSupplementaryServicesSendUssdRelease,
-                            public MLtsyDispatchSupplementaryServicesClearBlacklist
-							
-	{
-public:
-
-	virtual ~CLtsySupplementaryServicesHandler();
-	static CLtsySupplementaryServicesHandler* NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	static CLtsySupplementaryServicesHandler* NewLC(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-
-	// From MIsDispatchInterfaceSupported
-	virtual TBool IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId);
-	void IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask);
-	
-
-
-    // From MLtsyDispatchSupplementaryServicesSendNetworkServiceRequestNoFdnCheck
-    virtual TInt HandleSendNetworkServiceRequestNoFdnCheckReqL(const TDesC& aRequest);
-
-    // From MLtsyDispatchSupplementaryServicesGetCallWaitingStatus
-    virtual TInt HandleGetCallWaitingStatusReqL();
-
-    // From MLtsyDispatchSupplementaryServicesSendNetworkServiceRequest
-    virtual TInt HandleSendNetworkServiceRequestReqL(const TDesC& aRequest);
-
-    // From MLtsyDispatchSupplementaryServicesGetCallBarringStatus
-    virtual TInt HandleGetCallBarringStatusReqL(RMobilePhone::TMobilePhoneCBCondition aCondition);
-
-    // From MLtsyDispatchSupplementaryServicesSetCallBarringStatus
-    virtual TInt HandleSetCallBarringStatusReqL(RMobilePhone::TMobilePhoneCBCondition aCondition,
-        RMobilePhone::TMobilePhoneServiceAction aAction,
-        RMobilePhone::TMobileService aGroup,
-        const TDesC& aPassword);
-
-    // From MLtsyDispatchSupplementaryServicesSetCallForwardingStatus
-    virtual TInt HandleSetCallForwardingStatusReqL(RMobilePhone::TMobilePhoneCFCondition aCondition,
-    		RMobilePhone::TMobileService aServiceGroup,
-    		RMobilePhone::TMobilePhoneServiceAction aAction,
-    		const TDesC& aNumber,
-    		TInt aTimeout);
-
-    // From MLtsyDispatchSupplementaryServicesSetCallWaitingStatus
-    virtual TInt HandleSetCallWaitingStatusReqL(RMobilePhone::TMobileService aService,
-    		RMobilePhone::TMobilePhoneServiceAction aAction);
-
-    // From MLtsyDispatchSupplementaryServicesSetSsPassword
-    virtual TInt HandleSetSsPasswordReqL(const TDesC& aOldPassword,
-			const TDesC& aNewPassword,
-    		MLtsyDispatchSupplementaryServicesSetSsPassword::TServiceType aService);
-
-    // From MLtsyDispatchSupplementaryServicesGetCallForwardingStatus
-    virtual TInt HandleGetCallForwardingStatusReqL(RMobilePhone::TMobilePhoneCFCondition aCondition, RMobilePhone::TMobileService aService);
-
-    // From MLtsyDispatchSupplementaryServicesSendUssdMessage
-    virtual TInt HandleSendUssdMessageReqL(const TDesC8& aData, TUint8 aDcs, 
-			RMobileUssdMessaging::TMobileUssdDataFormat aFormat, RMobileUssdMessaging::TMobileUssdMessageType aType);
-    
-    // From MLtsyDispatchSupplementaryServicesSendUssdMessagenoFdnCheck
-    virtual TInt HandleSendUssdMessageNoFdnCheckReqL(const TDesC8& aData, TUint8 aDcs, 
-			RMobileUssdMessaging::TMobileUssdDataFormat aFormat, RMobileUssdMessaging::TMobileUssdMessageType aType);
-
-    // From MLtsyDispatchSupplementaryServicesSendUssdRelease
-    virtual TInt HandleSendUssdReleaseReqL();
-
-    // From MLtsyDispatchSupplementaryServicesClearBlacklist
-    virtual TInt HandleClearBlacklistReqL();
-
-
-private:
-	
-	CLtsySupplementaryServicesHandler(CCtsyDispatcherCallback& aCtsyDispatcherCallback);
-	void ConstructL();
-
-private:
-	
-	// Not owned
-	
-	/**
-	 * Callback object in the CTSY Dispatcher.
-	 * 
-	 * Used to complete a request back to the CTSY Dispatcher.
-	 */
-	CCtsyDispatcherCallback& iCtsyDispatcherCallback;
-	
-public:
-
-
-	}; // class CLtsySupplementaryServicesHandler
-
-#endif // __CLTSYDISPATCHSUPPLEMENTARYSERVICESHANDLER_H_
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/ltsymacros.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-// 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:
-// 
-
-/**
- * This file contains macros to allow the LTSY skeleton to be used with
- * the Mock LTSY.
- */
-
-#ifndef __LTSYMACROS_H_
-#define __LTSYMACROS_H_
-
-	#ifdef BUILD_AS_LTSY_STUB
-#define MOCKLTSYREQ(A)//to remove
-		#define MTEST_ISSUE_MOCKLTSYENGINE_REQ(A, B, C, ARGS...)  A = iMockLtsy->ExtFuncL(B,C,##ARGS)
-		#define MTEST_DECLARE_MOCKLTSYENGINE CMockLtsyEngine* iMockLtsy;
-		#define MTEST_FORWARD_DECLARE_MOCKLTSYENGINE class CMockLtsyEngine;
-		#define MTEST_DELETE_MOCKLTSYENGINE delete iMockLtsy
-		#define MTEST_CREATE_MOCKLTSYENGINE(A)  iMockLtsy = CMockLtsyEngine::NewL(A);
-		#define MTEST_INCLUDE_MOCKLTSYENGINE_HEADER "cmockltsyengine.h"
-		#define MTEST_SET_MOCKLTSYENGINE(A) A->iMockLtsy = iMockLtsy
-		#define MTEST_QUERY_SUPPORT_MOCKLTSYENGINE(A,B) return iMockLtsy->IsInterfaceSupported(A, B)
-		#define MTEST_QUERY_IND_SUPPORT_MOCKLTSYENGINE(A,B, C) return iMockLtsy->IsCallbackIndSupported(A, B, C)
-		#define MTEST_DECLARE_EVENT_COUNTER TInt iCounter;
-//all we are doing is is simulating "events from received from baseband occuring at interval of 5s.
-		#define MTEST_WAIT_FOR_NEXT_EVENT	User::After(500000);iCounter++;	
-				
-		#define MTEST_LOG_RECEIVE_EVENT_NO LOG(_L8("LtsyReceiveThread simulated event = %d"), iCounter);
-		#define MTEST_COUNTER_EXCEEDED_SHUTDOWN_RECEIVETHREAD   if(iCounter>3) err = KShutdownLtsyReceiveThread;
-
-	#else
-#define MOCKLTSYREQ(A) //to remove
-		#define MTEST_ISSUE_MOCKLTSYENGINE_REQ(A, B, C, ARGS...)
-		#define MTEST_DECLARE_MOCKLTSYENGINE 
-		#define MTEST_FORWARD_DECLARE_MOCKLTSYENGINE
-		#define MTEST_DELETE_MOCKLTSYENGINE
-		#define MTEST_CREATE_MOCKLTSYENGINE(A)
-		#define MTEST_INCLUDE_MOCKLTSYENGINE_HEADER <e32std.h> //does not reallymatter what header is put here
-		#define MTEST_SET_MOCKLTSYENGINE(A)
-		#define MTEST_QUERY_SUPPORT_MOCKLTSYENGINE(A,B)
-		#define MTEST_QUERY_IND_SUPPORT_MOCKLTSYENGINE(A,B, C)
-		#define MTEST_DECLARE_EVENT_COUNTER
-		#define MTEST_WAIT_FOR_NEXT_EVENT
-		#define MTEST_LOG_RECEIVE_EVENT_NO
-		#define MTEST_COUNTER_EXCEEDED_SHUTDOWN_RECEIVETHREAD   
-	#endif
-
-#endif // __LTSYMACROS_H_

--- a/cbsref/telephonyrefplugins/atltsy/handler/inc/misdispatchinterfacesupported.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-// 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:
-// MIsDispatchInterfaceSupported
-
-#ifndef MISDISPATCHINTERFACESUPPORTED_H_
-#define MISDISPATCHINTERFACESUPPORTED_H_
-
-#include <ctsy/ltsy/mltsydispatchfactory.h>
-
-class MIsDispatchInterfaceSupported
-/**
- * Interface implemented by the functional unit handlers to return whether a 
- * specific interface is supported. 
- */
-	{
-public:
-	
-	virtual TBool IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId) = 0;
-	
-	}; // class MIsDispatchInterfaceSupported
-
-#endif // MISDISPATCHINTERFACESUPPORTED_H_

--- a/cbsref/telephonyrefplugins/atltsy/handler/src/cltsycallcontrolhandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1155 +0,0 @@
-// 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:
-// CLtsyCallControlHandler
-
-//system include
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mmtsy_ipcdefs.h>
-#include <ctsy/ltsy/ltsylogger.h>
-//#include <e32des16.h> 
-
-#include <e32base.h>
-#include <e32std.h>
-#include <e32cons.h>
-
-//user include
-#include "cltsycallcontrolhandler.h"
-#include "globalphonemanager.h"
-#include "ltsycommondefine.h"
-#include "mslogger.h"
-#include "ltsymacros.h"
-#include "tsyconfg.h"
-#include "atwaitforcallhandler.h"
-#include "atdialvoice.h"
-#include "athangup.h"
-#include "atanswer.h"
-#include "atchld.h"
-#include "unsolicitedcommandcallcontrolhandler.h"
-#include "atdtmfvts.h"
-#include "ltsycallinformationmanager.h"
-#include "athangupcommandrecords.h"
-
-
-//const define
-_LIT16(KLtsyEmergencyCallNumber911, "911");
-_LIT16(KLtsyEmergencyCallNumber112, "112");
-
-CLtsyCallControlHandler::CLtsyCallControlHandler(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback, CGlobalPhonemanager* aGloblePhone)
-	: iCtsyDispatcherCallback(aCtsyDispatcherCallback), iGloblePhone(aGloblePhone)
-	{
-
-	}
-
-
-CLtsyCallControlHandler::~CLtsyCallControlHandler()
-	{
-	delete iEmergencyCall;
-	iEmergencyCall = NULL;
-	
-	delete iUnsolicitedHandler;
-	iUnsolicitedHandler = NULL;
-	
-	delete iWaitForCall;
-	iWaitForCall = NULL;
-	}
-
-
-CLtsyCallControlHandler* CLtsyCallControlHandler::NewLC(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback,
-	CGlobalPhonemanager* aGloblePhone)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyCallControlHandler* self = new (ELeave) CLtsyCallControlHandler(aCtsyDispatcherCallback,aGloblePhone);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-
-CLtsyCallControlHandler* CLtsyCallControlHandler::NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback, CGlobalPhonemanager* aGloblePhone)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyCallControlHandler* self=
-			CLtsyCallControlHandler::NewLC(aCtsyDispatcherCallback, aGloblePhone);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-
-void CLtsyCallControlHandler::ConstructL()
-/**
- * Second phase constructor.
- */
-	{	
-	//Emergency Call
-	iEmergencyCall = CATDialVoice::NewL((*iGloblePhone),iCtsyDispatcherCallback);
-	iEmergencyCall->SetEmergnecyCallFlag(ETrue);
-	
-	//Process unsolicited command
-	iUnsolicitedHandler = CUnsolicitedCommandCallControlHandler::NewL((*iGloblePhone), 
-			                                                          iCtsyDispatcherCallback);
-	
-	//Monitor incoming call
-	iWaitForCall = CATWaitForCallHandler::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-	iWaitForCall->StartToWaitForCall();
-
-	} // CLtsyCallControlHandler::ConstructL
-
-TBool CLtsyCallControlHandler::IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId)
-/**
- * Returns whether a Dispatch Interface API is supported or not.
- *
- * @param aDispatchApiId Id of Dispatch interface being queried
- * @return indication whether interface is supported or not
- */
-	{
-	TBool bFlag(EFalse);
-	switch(aDispatchApiId)
-		{
-		// Insert ApiIds when support is provided in LTSY
-		case MLtsyDispatchCallControlAnswer::KLtsyDispatchCallControlAnswerApiId :
-			bFlag =  ETrue;
-			break;		
-		case MLtsyDispatchCallControlHold::KLtsyDispatchCallControlHoldApiId:
-			bFlag =  ETrue;
-			break;
-		case MLtsyDispatchCallControlHangUp::KLtsyDispatchCallControlHangUpApiId :
-			bFlag =  ETrue;
-			break;
-		case MLtsyDispatchCallControlResume::KLtsyDispatchCallControlResumeApiId :
-			bFlag = ETrue;
-			break;
-		case MLtsyDispatchCallControlDialVoice::KLtsyDispatchCallControlDialVoiceApiId :
-			bFlag =  ETrue;
-			break;		
-		case MLtsyDispatchCallControlSwap::KLtsyDispatchCallControlSwapApiId :
-			bFlag = ETrue;
-			break;
-		case MLtsyDispatchCallControlTerminateErrorCall::KLtsyDispatchCallControlTerminateErrorCallApiId :
-			bFlag = ETrue;
-			break;
-		case MLtsyDispatchCallControlTerminateAllCalls::KLtsyDispatchCallControlTerminateAllCallsApiId :
-			bFlag = ETrue;
-			break;
-		case MLtsyDispatchCallControlSendDtmfTones::KLtsyDispatchCallControlSendDtmfTonesApiId :
-			bFlag = ETrue;
-			break;
-		case MLtsyDispatchCallControlStartDtmfTone::KLtsyDispatchCallControlStartDtmfToneApiId :
-			bFlag = ETrue;
-			break;
-		case MLtsyDispatchCallControlStopDtmfTone::KLtsyDispatchCallControlStopDtmfToneApiId :
-			bFlag = ETrue;
-			break;
-		case MLtsyDispatchCallControlSendDtmfTonesCancel::KLtsyDispatchCallControlSendDtmfTonesCancelApiId :
-			bFlag = ETrue;
-			break;
-		case MLtsyDispatchCallControlQueryIsEmergencyNumber::KLtsyDispatchCallControlQueryIsEmergencyNumberApiId :
-			bFlag = ETrue;
-			break;
-		case MLtsyDispatchCallControlDialEmergency::KLtsyDispatchCallControlDialEmergencyApiId :
-			bFlag = ETrue;
-			break;
-		default:
-			bFlag = EFalse;
-			break;
-		}
-	return bFlag;
-	}
-
-void CLtsyCallControlHandler::IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask)
-/**
- * Returns the set of callback indicators that are supported.
- *
- * @param aIdGroup ID of group that is being queried e.g. aIdGroup=EIndIdGroup1
- * @param aIndIdBitMask [out] argument that should return a bitmask indicating which indicator callbacks are supported.
- */
-	{
-
-	//Create bitmask with bitset for each indicator ID that is supported. E.g.
-	
-	if(aIdGroup == EIndIdGroup1)
-		aIndIdBitMask = KLtsyDispatchCallControlNotifyCallStatusChangeIndId |
-		KLtsyDispatchCallControlReceiveUuiIndId |
-		KLtsyDispatchCallControlNotifyDataCallCapsChangeIndId|
-		KLtsyDispatchCallControlNotifyIncomingCallIndId|
-		KLtsyDispatchCallControlNotifyHscsdInfoChangeIndId|
-		KLtsyDispatchCallControlNotifyCallEventIndId|
-		KLtsyDispatchCallControlGetCallInfoIndId|
-		KLtsyDispatchCallControlNotifyIccCallForwardingStatusChangeIndId;
-	else
-		aIndIdBitMask = 0; //no indicators from other groups supported
-	
-	}
-
-TInt CLtsyCallControlHandler::HandleAnswerReqL(TInt aCallId, TBool aIsIsvCall)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlAnswerComp()
- *
- * @param aCallId The Call ID of the call to answer.
- *
- * @param aIsIsvCall ETrue if the request to answer the call comes from a
- * 3rd party application, EFalse otherwise. This parameter exists in case the
- * LTSY wishes to perform special handling of ISV calls.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	LOGTEXT( _L8("[Ltsy CallControl]  Starting CLtsyCallControlHandler::HandleAnswerReqL()"));
-	
-	TInt nEmergencyCallId = iGloblePhone->GetCallInfoManager().FindEmergencyCallId();
-	if (nEmergencyCallId != KErrNotFound)
-		{
-		const TLtsyCallInformation& tCallInfo(iGloblePhone->GetCallInfoManager().GetCallInformationByCallId(nEmergencyCallId));
-		if (TLtsyCallInformation::EHeldCall  !=  tCallInfo.GetCallState())
-			{
-			//Reset Ring state
-			iGloblePhone->GetCallInfoManager().SetIncomingCallFlag(EFalse);			
-			return KErrNotSupported;
-			}
-		}	
-	
-	TInt nRet = iGloblePhone->CheckGlobalPhoneStatus();
-	if (nRet == KErrNone)
-		{
-		//Reset Ring state
-		iGloblePhone->GetCallInfoManager().SetIncomingCallFlag(EFalse);
-		
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		//Create answer call
-		CATAnswer* cAnswerCall = CATAnswer::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-		iGloblePhone->SetActiveRequest(cAnswerCall);
-		cAnswerCall->SetAnswerCallId(aCallId);
-		cAnswerCall->SetIsIsvCall(aIsIsvCall);
-		//Start answer
-		cAnswerCall->StartRequest();		
-		}
-	
-	return nRet;
-	} // CLtsyCallControlHandler::HandleAnswerReqL
-
-TInt CLtsyCallControlHandler::HandleHoldReqL(TInt aCallId)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlHoldComp()
- *
- * @param aCallId The Call ID of the call to hold.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	LOGTEXT(_L8("[Ltsy CallControl]  Starting CLtsyCallControlHandler::HandleHoldReqL"));
-	LOGTEXT2(_L8("[Ltsy CallControl] aCallId = %d"), aCallId);
-	
-	TInt nRet = iGloblePhone->CheckGlobalPhoneStatus();
-	if (nRet == KErrNone)
-		{
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		
-		//Create hold call
-		CATChld* cHoldCall = CATChld::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-		iGloblePhone->SetActiveRequest(cHoldCall);
-		//Check call id is a hold call or not
-		if (cHoldCall->IsHoldCall(aCallId))
-			{
-			LOGTEXT2(_L8("[Ltsy CallControl] aCallId = %d is a hold call so return KErrNone"), aCallId);
-			iGloblePhone->iEventSignalActive = EFalse;
-			return KErrNotSupported;
-			}
-		
-		cHoldCall->SetCallId(aCallId);
-		cHoldCall->SetIpcType(CATChld::ELtsyReqCallHold);
-		cHoldCall->SetChldType(CATChld::EHeldAllActiveCallAndAcceptHeldWaiting);
-		cHoldCall->StartRequest();			
-		}
-	
-	return nRet;
-	} // CLtsyCallControlHandler::HandleHoldReqL
-
-
-TInt CLtsyCallControlHandler::HandleDialEmergencyReqL(const TDes& aEmergencyNumber)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlDialEmergencyComp()
- *
- * @param aEmergencyNumber The emergency phone number to dial.  The descriptor
- * should be of type RMobileENStore::TEmergencyNumber.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	LOGTEXT(_L8("[Ltsy CallControl]  Starting CLtsyCallControlHandler::HandleDialEmergencyReqL()"));
-	
-	//Checking is have emergency call
-	if (iGloblePhone->GetCallInfoManager().FindEmergencyCallId() != KErrNotFound)
-		{
-		return KErrNotSupported;
-		}
-	
-	TBuf8<RMobilePhone::KMaxMobileTelNumberSize> tTelNum;
-	tTelNum.Copy(aEmergencyNumber.Left(tTelNum.MaxLength()));
-	
-	TInt nRet = iGloblePhone->CheckGlobalPhoneStatus();
-	if (nRet == KErrNone)
-		{
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		
-		//Init call
-		iEmergencyCall->InitVariable();
-		
-		//Set telnum
-		iEmergencyCall->SetTelephoneNumber(tTelNum);
-		iEmergencyCall->StartRequest();
-		}
-	else // KErrInUse
-		{
-		if (iGloblePhone->GetCallInfoManager().FindDialingOrAlertingCallId() != KErrNotFound)
-			{
-			//Delete last call
-			iGloblePhone->DeleteLastActiveRequest();
-			
-			//Setting Port active
-			iGloblePhone->iEventSignalActive = ETrue;
-			
-			//Init call
-			iEmergencyCall->InitVariable();
-			//Set telnum
-			iEmergencyCall->SetTelephoneNumber(tTelNum);
-			iEmergencyCall->StartRequest();
-			nRet = KErrNone;
-			}	
-		}
-	
-	return nRet;
-	} // CLtsyCallControlHandler::HandleDialEmergencyReqL
-
-TInt CLtsyCallControlHandler::HandleStopDtmfToneReqL(TInt aCallId)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlStopDtmfToneComp()
- *
- * @param aCallId Call ID of the connected call the stop request will be sent
- * through.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	LOGTEXT(_L8("[Ltsy CallControl]  Starting CLtsyCallControlHandler::HandleStopDtmfToneReqL()"));
-	LOGTEXT2( _L8("[Ltsy CallControl] CallId = %d"), aCallId);
-	
-	TInt nRet = iGloblePhone->CheckGlobalPhoneStatus();
-	if (nRet == KErrNone)
-		{
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		
-		//Create DTMF 
-		CATDtmfVts* cDtmfVts = CATDtmfVts::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-		iGloblePhone->SetActiveRequest(cDtmfVts);
-		
-		//Set CallId
-		nRet = cDtmfVts->SetCallId(aCallId);
-		if (nRet != KErrNone)
-			{
-			return nRet;
-			}	
-		
-		//Set work type
-		cDtmfVts->SetDtmfWorkType(CATDtmfVts::EDtmfStopOneTone);
-		
-		//Start request
-		cDtmfVts->StartRequest();		
-		}	
-	
-	return nRet;
-	} // CLtsyCallControlHandler::HandleStopDtmfToneReqL
-
-
-TInt CLtsyCallControlHandler::HandleSetActiveAlsLineReqL(RMobilePhone::TMobilePhoneALSLine /*aAlsLine*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlSetActiveAlsLineComp()
- *
- * @param aAlsLine The new active ALS line.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlHandler::HandleSetActiveAlsLineReqL
-
-
-TInt CLtsyCallControlHandler::HandleSendDtmfTonesCancelReqL(TInt aCallId)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlSendDtmfTonesCancelComp()
- *
- * @param aCallId The Call ID through which the cancel request should be sent.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-
-	LOGTEXT(_L8("[Ltsy CallControl]  Starting CLtsyCallControlHandler::HandleSendDtmfTonesCancelReqL()"));
-	LOGTEXT2( _L8("[Ltsy CallControl] CallId = %d"), aCallId);
-	
-	TInt nRet = iGloblePhone->CheckGlobalPhoneStatus();
-	if (nRet == KErrNone)
-		{
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		
-		//Create DTMF 
-		CATDtmfVts* cDtmfVts = CATDtmfVts::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-		iGloblePhone->SetActiveRequest(cDtmfVts);
-		
-		//Set CallId
-		nRet = cDtmfVts->SetCallId(aCallId);
-		if (nRet != KErrNone)
-			{
-			return nRet;
-			}	
-		
-		//Set work type
-		cDtmfVts->SetDtmfWorkType(CATDtmfVts::EDtmfCancelMoreTones);
-		
-		//Start request
-		cDtmfVts->StartRequest();		
-		}
-	
-	return nRet;
-	} // CLtsyCallControlHandler::HandleSendDtmfTonesCancelReqL
-
-
-TInt CLtsyCallControlHandler::HandleHangUpReqL(TInt aCallId, TInt aHangupCause)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlHangUpComp()
- *
- * @param aCallId The Call ID of the call to hang up.
- *
- * @param aHangupCause The reason for the hang up request.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	LOGTEXT( _L8("[Ltsy CallControl]  Starting CLtsyCallControlHandler::HandleHangUpReqL"));
-	LOGTEXT3(_L8("[Ltsy CallControl]  aCallId = %d aHangupCause = %d"), aCallId, aHangupCause);
-
-	TInt nRet = iGloblePhone->CheckGlobalPhoneStatus();
-	if (nRet == KErrNone)
-		{
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		
-		//Reset Ring state
-		iGloblePhone->GetCallInfoManager().SetIncomingCallFlag(EFalse);
-		
-		//Set hang up active
-		iGloblePhone->GetCallInfoManager().GetHangupCommandRecords().SetHangupActiveFlag(ETrue);
-		
-		//Create Hang up  
-		CATChld* cHangupCall = CATChld::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-		iGloblePhone->SetActiveRequest(cHangupCall);
-		cHangupCall->SetCallId(aCallId);
-		cHangupCall->SetHangupCase(aHangupCause);
-		cHangupCall->SetIpcType(CATChld::ELtsyReqCallHangup);
-		cHangupCall->SetChldType(CATChld::ERleaseSpecificCall);
-		cHangupCall->StartRequest();			
-		}
-	else if (nRet == KErrInUse)
-		{
-		LOGTEXT( _L8("[Ltsy CallControl]  Starting Hang up in process so add hangup information"));
-		
-		const TLtsyCallInformation& tCallInfo(iGloblePhone->GetCallInfoManager().GetCallInformationByCallId(aCallId));
-		
-		if (iGloblePhone->GetCallInfoManager().GetHangupCommandRecords().GetHangupActiveFlag())
-			{
-			//Hang up is processing so add its information to array
-			nRet = iGloblePhone->GetCallInfoManager().GetHangupCommandRecords().AddHangupCommandInfo(aCallId, aHangupCause);					
-			}
-		else if (TLtsyCallInformation::EDialingCall  ==  tCallInfo.GetCallState() ||
-				 TLtsyCallInformation::EAlertingCall ==  tCallInfo.GetCallState())
-			{
-			
-			//Delete last call
-			iGloblePhone->DeleteLastActiveRequest();
-			
-			//Setting Port active
-			iGloblePhone->iEventSignalActive = ETrue;	
-			
-			//Set hang up active
-			iGloblePhone->GetCallInfoManager().GetHangupCommandRecords().SetHangupActiveFlag(ETrue);
-			
-			//Create Hang up  
-			CATChld* cHangupCall = CATChld::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-			iGloblePhone->SetActiveRequest(cHangupCall);
-			cHangupCall->SetCallId(aCallId);
-			cHangupCall->SetHangupCase(aHangupCause);
-			cHangupCall->SetIpcType(CATChld::ELtsyReqCallHangup);
-			cHangupCall->SetChldType(CATChld::ERleaseSpecificCall);
-			cHangupCall->StartRequest();
-			nRet = KErrNone;
-			}
-		}	
-	
-	return nRet;
-	} // CLtsyCallControlHandler::HandleHangUpReqL
-
-
-TInt CLtsyCallControlHandler::HandleResumeReqL(TInt aCallId)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlResumeComp()
- *
- * @param aCallId The Call ID of the call to resume.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	LOGTEXT(_L8("[Ltsy CallControl]  Starting CLtsyCallControlHandler::HandleResumeReqL"));
-	LOGTEXT2(_L8("[Ltsy CallControl] aCallId = %d"), aCallId);	
-
-	TInt nRet = iGloblePhone->CheckGlobalPhoneStatus();
-	if (nRet == KErrNone)
-		{
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		
-		//Create DTMF 
-		CATChld* cResumeCall = CATChld::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-		iGloblePhone->SetActiveRequest(cResumeCall);
-		if (cResumeCall->IsActiveCall(aCallId))
-			{
-			LOGTEXT2(_L8("[Ltsy CallControl] aCallId = %d is a active call so return KErrNone"), aCallId);
-			iGloblePhone->iEventSignalActive = EFalse;
-			return KErrNotSupported;
-			}
-		cResumeCall->SetCallId(aCallId);
-		cResumeCall->SetIpcType(CATChld::ELtsyReqCallResume);
-		cResumeCall->SetChldType(CATChld::EHeldAllActiveCallAndAcceptHeldWaiting);
-		cResumeCall->StartRequest();		
-		}
-	
-	return nRet;
-	} // CLtsyCallControlHandler::HandleResumeReqL
-
-TInt CLtsyCallControlHandler::HandleSetDynamicHscsdParamsReqL(
-	TInt /*aCallId*/, const RMobileCall::TMobileHscsdCallParamsV1& /*aHscsdParams*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlSetDynamicHscsdParamsComp()
- *
- * @param aCallId The call ID of the data call.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlHandler::HandleSetDynamicHscsdParamsReqL
-
-
-TInt CLtsyCallControlHandler::HandleDialVoiceReqL(RMobilePhone::TMobilePhoneALSLine /*aLine*/,
-	const RMobilePhone::TMobileAddress& aDialledParty, const RMobileCall::TMobileCallParamsV1& /*aCallParamsV1*/,
-	TBool /*aIsIsvCall*/, RMobileCall::TCallParamOrigin /*aCallOrigin*/, TBool /*aPerformFdnCheck*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlDialVoiceComp()
- *
- * @param aCallLine The line to use to dial the call.
- *
- * @param aDialledParty Details about the dialled party including the phone
- * number to dial.
- *
- * @param aCallParamsV1 The call parameters of the call to dial.
- *
- * @param aIsIsvCall Indicates whether the call originated from a third party
- * application.
- *
- * @param aCallOrigin The origin of the dial request. e.g. Whether the dial
- * came from an Etel client or the SIM or another source.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	LOGTEXT( _L8("[Ltsy CallControl]  Starting CLtsyCallControlHandler::HandleDialVoiceReqL()"));
-	
-	TInt nEmergencyCallId = iGloblePhone->GetCallInfoManager().FindEmergencyCallId();
-	if (nEmergencyCallId != KErrNotFound)
-		{
-		const TLtsyCallInformation& tCallInfo(iGloblePhone->GetCallInfoManager().GetCallInformationByCallId(nEmergencyCallId));
-		if (TLtsyCallInformation::EHeldCall  !=  tCallInfo.GetCallState())
-			{
-			return KErrNotSupported;
-			}
-		}
-	
-	//Set telephone number
-	TBuf8<KCommsDbSvrMaxFieldLength> dialModifier;
-	TInt nRet = iGloblePhone->iConfiguration->ConfigModemStringL(
-								TPtrC(KCDTypeNameDialToneWaitModifier),
-								dialModifier);
-	if (nRet != KErrNone)
-		{
-		return nRet;
-		}
-	
-	TBuf8<RMobilePhone::KMaxMobileTelNumberSize> tTelNum;
-	tTelNum.Copy(aDialledParty.iTelNumber.Left(tTelNum.MaxLength()));
-	
-	nRet = tTelNum.FindF(dialModifier);
-	if (nRet != KErrNotFound)
-		{
-		tTelNum.Delete(nRet, 1);
-		}
-	
-	nRet = iGloblePhone->CheckGlobalPhoneStatus();
-	if (nRet == KErrNone)
-		{
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		
-		//Create dial voice
-		CATDialVoice* cDialVoice = CATDialVoice::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-		iGloblePhone->SetActiveRequest(cDialVoice);
-		cDialVoice->SetTelephoneNumber(tTelNum);
-		cDialVoice->StartRequest();
-		}
-	
-	return nRet;
-	} // CLtsyCallControlHandler::HandleDialReqL
-
-TInt CLtsyCallControlHandler::HandleTransferReqL(TInt /*aHeldCallId*/, TInt /*aSecondCallId*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlTransferComp()
- *
- * @param aHeldCallId Call ID of the held call to transfer.
- *
- * @param aSecondCallId Call ID of the other to transfer the held call to.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlHandler::HandleTransferReqL
-
-
-TInt CLtsyCallControlHandler::HandleSendDtmfTonesReqL(TInt aCallId, const TDesC &aTones)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlSendDtmfTonesComp()
- *
- * @param aCallId The Call ID of the call through which the DTMF string will be
- * sent.
- *
- * @param aTones Tones to send through the active call.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	LOGTEXT( _L8("[Ltsy CallControl]  Starting CLtsyCallControlHandler::HandleSendDtmfTonesReqL()"));
-	LOGTEXT3( _L8("[Ltsy CallControl] CallId = %d\tTones = %S"), aCallId, &aTones);
-	
-	TInt nRet = iGloblePhone->CheckGlobalPhoneStatus();
-	if (nRet == KErrNone)
-		{
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		
-		//Create DTMF 
-		CATDtmfVts* cDtmfVts = CATDtmfVts::NewL((*iGloblePhone), iCtsyDispatcherCallback);	
-		iGloblePhone->SetActiveRequest(cDtmfVts);
-		//Set CallId
-		TInt nRet = cDtmfVts->SetCallId(aCallId);
-		if (nRet != KErrNone)
-			{
-			return nRet;
-			}	
-		
-		//Set Tones
-		nRet = cDtmfVts->SetDtmfString(aTones);
-		if (nRet != KErrNone)
-			{
-			return nRet;
-			}	
-		
-		//set work type
-		cDtmfVts->SetDtmfWorkType(CATDtmfVts::EDtmfSendMoreTones);
-		cDtmfVts->StartRequest();
-		}	
-	
-	return nRet;
-	} // CLtsyCallControlHandler::HandleSendDtmfTonesReqL
-
-
-TInt CLtsyCallControlHandler::HandleGetIdentityServiceStatusReqL(RMobilePhone::TMobilePhoneIdService /*aService*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlGetIdentityServiceStatusComp()
- *
- * @param aService The service whose status needs to be retrieved.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlHandler::HandleGetIdentityServiceStatusReqL
-
-
-TInt CLtsyCallControlHandler::HandleSwapReqL(TInt aHeldCallId, TInt aConnectedCallId)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlSwapComp()
- *
- * @param aHeldCallId The Call ID of the held call to swap.
- *
- * @param aConnectedCallId The Call ID of the connected call to swap.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	LOGTEXT(_L8("[Ltsy CallControl]  Starting CLtsyCallControlHandler::HandleSwapReqL"));
-	LOGTEXT3(_L8("[Ltsy CallControl] aHeldCallId = %d\taConnectedCallId = %d"), aHeldCallId, aConnectedCallId);
-	
-	TInt nRet = iGloblePhone->CheckGlobalPhoneStatus();
-	if (nRet == KErrNone)
-		{
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		
-		//Create DTMF 
-		CATChld* cSwapCall = CATChld::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-		iGloblePhone->SetActiveRequest(cSwapCall);
-		cSwapCall->SetCallId(aHeldCallId);
-		cSwapCall->SetConnectedCallId(aConnectedCallId);
-		cSwapCall->SetIpcType(CATChld::ELtsyReqCallSwap);
-		cSwapCall->SetChldType(CATChld::EHeldAllActiveCallAndAcceptHeldWaiting);
-		cSwapCall->StartRequest();			
-		}
-	
-	return nRet;
-	} // CLtsyCallControlHandler::HandleSwapReqL
-
-TInt CLtsyCallControlHandler::HandleLoanDataPortSyncL(TInt /*aCallId*/, RCall::TCommPort& /*aCommPort*/)
-/**
- * This request is part of
- * MLtsyDispatchCallControlLoanDataPort::HandleLoanDataPortSyncL()
- *
- * @param aCallId Call ID of the data call requiring the data port.
- *
- * @param aCommPort Output parameter. The communications port information
- * retrieved by a client using the RCall::LoanDataPort() API.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlHandler::HandleLoanDataPortSyncL
-
-
-TInt CLtsyCallControlHandler::HandleRecoverDataPortSyncL(TInt /*aCallId*/, RCall::TCommPort& /*aCommPort*/)
-/**
- * This request is part of
- * MLtsyDispatchCallControlRecoverDataPort::HandleRecoverDataPortSyncL()
- *
- * @param aCallId Call ID of the data call requiring the data port.
- *
- * @param aCommPort The data port to recover.  This contains the details previously
- * returned by a call to RCall::LoanDataPort()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlHandler::HandleRecoverDataPortSyncL
-
-
-TInt CLtsyCallControlHandler::HandleStartDtmfToneReqL(TInt aCallId, const TChar& aTone)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlStartDtmfTone()
- *
- * @param aCallId Call ID of the connected call through which the DTMF tone
- * will be sent.
- *
- * @param aTone The tone character to send through the call.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	LOGTEXT(_L8("[Ltsy CallControl]  Starting CLtsyCallControlHandler::HandleStartDtmfToneReqL()"));
-	LOGTEXT2( _L8("[Ltsy CallControl] CallId = %d"), aCallId);
-	
-	TInt nRet = iGloblePhone->CheckGlobalPhoneStatus();
-	if (nRet == KErrNone)
-		{
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		
-		//Create DTMF 
-		CATDtmfVts* cDtmfVts = CATDtmfVts::NewL((*iGloblePhone), iCtsyDispatcherCallback);	
-		iGloblePhone->SetActiveRequest(cDtmfVts);
-		//Set CallId
-		TInt nRet = cDtmfVts->SetCallId(aCallId);
-		if (nRet != KErrNone)
-			{
-			return nRet;
-			}	
-		
-		//Set Tones
-		TBuf<16> bufTone;
-		bufTone.Append(aTone);
-		nRet = cDtmfVts->SetDtmfString(bufTone);
-		if (nRet != KErrNone)
-			{
-			return nRet;
-			}
-		
-		//set work type
-		cDtmfVts->SetDtmfWorkType(CATDtmfVts::EDtmfSendOneTone);
-		cDtmfVts->StartRequest();
-		}
-	
-	return nRet;	
-	} // CLtsyCallControlHandler::HandleStartDtmfToneSyncL
-
-TInt CLtsyCallControlHandler::HandleGetActiveAlsLineReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlGetActiveAlsLineComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TO DO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlHandler::HandleGetActiveAlsLineReqL
-
-TInt CLtsyCallControlHandler::HandleDialDataReqL(const RMobilePhone::TMobileAddress& /*aDialledParty*/, const RMobileCall::TMobileDataCallParamsV1& /*aCallParamsV1*/, TBool /*aPerformFdnCheck*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlGetActiveAlsLineComp()
- *
- * @param aLine The line to use to dial the call.
- *
- * @param aDialledParty Details about the dialled party including the phone
- * number to dial.
- *
- * @param aCallParamsV1 The call parameters of the call to dial.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TO DO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlHandler::HandleDialDataReqL
-
-TInt CLtsyCallControlHandler::HandleQueryIsEmergencyNumberSyncL(const TDesC& aNumber, TBool& aIsEmergencyNumber)
-/**
- * This request is part of
- * MLtsyDispatchCallControlQueryIsEmergencyNumber::HandleQueryIsEmergencyNumberSyncL()
- *
- * @param aNumber Input parameter. The phone number being queried to see
- * if it is an emergency number or not.
- *
- * @param aIsEmergencyNumber Output parameter used to indicate whether the
- * aNumber parameter is an emergency number. ETrue if it is, EFalse otherwise.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	LOGTEXT(_L8("[Ltsy CallControl]  Starting CLtsyCallControlHandler::HandleQueryIsEmergencyNumberSyncL()"));
-	
-	TInt nEmergencyCallId = iGloblePhone->GetCallInfoManager().FindEmergencyCallId();
-	if (nEmergencyCallId != KErrNotFound)
-		{
-		const TLtsyCallInformation& tCallInfo(iGloblePhone->GetCallInfoManager().GetCallInformationByCallId(nEmergencyCallId));
-		if (TLtsyCallInformation::EHeldCall  !=  tCallInfo.GetCallState())
-			{			
-			return KErrNotSupported;
-			}
-		}	
-	
-	//Check Emergency call number	
-	if (aNumber.CompareF(KLtsyEmergencyCallNumber911) == 0 ||
-		aNumber.CompareF(KLtsyEmergencyCallNumber112) == 0 )
-		{
-		aIsEmergencyNumber = ETrue;
-		}
-	else
-		{
-		aIsEmergencyNumber = EFalse;
-		}
-	
-	return KErrNone;
-	} // CLtsyCallControlHandler::HandleQueryIsEmergencyNumberSyncL
-
-
-TInt CLtsyCallControlHandler::HandleGetAlsPpSupportL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlGetAlsPpSupportComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlHandler::HandleGetAlsPp
-
-TInt CLtsyCallControlHandler::HandleGetAlsBlockedStatusL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlGetAlsBlockedStatusComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlHandler::HandleGetAlsBlockedStatus
-
-TInt CLtsyCallControlHandler::HandleSetAlsBlockedL(RMmCustomAPI::TSetAlsBlock /*aBlocked*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlSetAlsBlockedComp()
- *
- *
- * @param aBlocked RMmCustomAPI::EDeactivateBlock when the ALS blocked needs to be deactivate,
- *                 RMmCustomAPI::EActivateBlock when the  ALS blocked needs to be activate.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlHandler::HandleSetAlsBlockedL
-
-TInt CLtsyCallControlHandler::HandleGetLifeTimeL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlGetLifeTimeComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlHandler::HandleGetLifeTime
-
-TInt CLtsyCallControlHandler::HandleTerminateErrorCallL(TInt /*aCallId*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlTerminateErrorCallComp()
- *
- *
- * @param aCallId The Call ID of the call to terminate.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlHandler::HandleTerminateErrorCallL
-
-TInt CLtsyCallControlHandler::HandleTerminateAllCallsL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::::CallbackCallControlTerminateAllCallsComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	LOGTEXT(_L8("[Ltsy CallControl]  Starting CLtsyCallControlHandler::HandleTerminateAllCallsL()"));
-	
-	TInt nRet = iGloblePhone->CheckGlobalPhoneStatus();
-	if (nRet == KErrNone)
-		{
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		
-		//Reset Ring state
-		iGloblePhone->GetCallInfoManager().SetIncomingCallFlag(EFalse);		
-		
-		CATHangUp* cTerminateAllCalls = CATHangUp::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-		iGloblePhone->SetActiveRequest(cTerminateAllCalls);
-		cTerminateAllCalls->SetHangupOperator(CATHangUp::ECustomAPI);
-		cTerminateAllCalls->StartRequest();	
-		}
-	
-	return nRet;
-	} // CLtsyCallControlHandler::HandleTerminateAllCallsL
-
-TInt CLtsyCallControlHandler::HandleGetCallForwardingIndicatorL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlGetCallForwardingIndicatorComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlHandler::HandleGetCallForwardingIndicator
-
-TInt CLtsyCallControlHandler::HandleUpdateLifeTimerReqL(TUint32 /*aDuration*/)
-/**
- * This request is completed by invoking
- *  CCtsyDispatcherCallback::CallbackCallControlUpdateLifeTimerComp
- *
- * @param aDuration Time spent on call since the last invocation of this method.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TO DO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlHandler:::HandleUpdateLifeTimerReqL
-
-
-MLtsyUnsolicitedCommandObserver* CLtsyCallControlHandler::GetUnsolicitedCallControlHandler() const
-	{
-	return static_cast<MLtsyUnsolicitedCommandObserver*>(iUnsolicitedHandler);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/handler/src/cltsycallcontrolmultipartyhandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,233 +0,0 @@
-// 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:
-// CLtsyCallControlMultipartyHandler
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mmtsy_ipcdefs.h>
-
-
-
-#include "cltsycallcontrolmultipartyhandler.h"
-#include <ctsy/ltsy/ltsylogger.h>
-#include "ltsymacros.h"
-
-
-
-CLtsyCallControlMultipartyHandler::CLtsyCallControlMultipartyHandler(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	: iCtsyDispatcherCallback(aCtsyDispatcherCallback)
-	{
-	}
-
-
-CLtsyCallControlMultipartyHandler::~CLtsyCallControlMultipartyHandler()
-	{
-	}
-
-
-CLtsyCallControlMultipartyHandler* CLtsyCallControlMultipartyHandler::NewLC(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyCallControlMultipartyHandler* self = new (ELeave) CLtsyCallControlMultipartyHandler(aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-
-CLtsyCallControlMultipartyHandler* CLtsyCallControlMultipartyHandler::NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyCallControlMultipartyHandler* self=
-			CLtsyCallControlMultipartyHandler::NewLC(aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-
-void CLtsyCallControlMultipartyHandler::ConstructL()
-/**
- * Second phase constructor.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-
-	} // CLtsyCallControlMultipartyHandler::ConstructL
-
-TBool CLtsyCallControlMultipartyHandler::IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId)
-/**
- * Returns whether a Dispatch Interface APi is supported or not.
- *
- * @param aDispatchApiId Id of Dispatch interface being queried
- * @return indication whether interface is supported or not
- */
-	{
-
-	switch(aDispatchApiId)
-		{
-		// Insert ApiIds when support is provided in LTSY e.g.
-		// case MLtsyDispatchPhoneBootNotifySimStatusReady::KLtsyDispatchPhoneBootNotifySimStatusReadyApiId: return ETrue;
-
-		default:
-			return EFalse;
-		}
-	}
-
-void CLtsyCallControlMultipartyHandler::IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup /*aIdGroup*/, TUint32& /*aIndIdBitMask*/)
-/**
- * Returns the set of callback indicators that are supported.
- *
-* @param aIdGroup ID of group that is being queried e.g. aIdGroup=EIndIdGroup1
-* @param aIndIdBitMask [out] argument that should return a bitmask indicating which indicator callbacks are supported.
- */
-	{
-
-	//Create bitmask with bitset for each indicator ID that is supported. E.g.
-	/*
-	if(aIdGroup == EIndIdGroup1)
-		aIndIdBitMask = KLtsyDispatchPhoneNotifyNetworkModeChangeIndId |
-						KLtsyDispatchPhoneNotifyEgprsInfoChangeIndId |
-						KLtsyDispatchPhoneNotifySignalStrengthChangeIndId;
-	else
-		aIndIdBitMask = 0; //no indicators from other groups supported
-	*/
-	}
-
-
-TInt CLtsyCallControlMultipartyHandler::HandleConferenceHangUpReqL(const RArray<TInt>& /*aCallIds*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlMultipartyConferenceHangUpComp()
- *
- * @param aCallIds Array of all Call IDs, which belong to the conference.
- * This array will be destroyed after the function call returns. 
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlMultipartyHandler::HandleConferenceHangUpReqL
-
-
-TInt CLtsyCallControlMultipartyHandler::HandleConferenceAddCallReqL(TInt /*aCallId*/, TInt /*aExistingCallId*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlMultipartyConferenceAddCallComp()
- *
- * @param aCallId The Call ID of the call to be added to the conference.
- * @param aExistingCallId The Call ID of one of the calls which is already a part of the conference call.
- * This can be the Call ID of any of the existing calls in the conference, not necessarily the first one that was added.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlMultipartyHandler::HandleConferenceAddCallReqL
-
-
-TInt CLtsyCallControlMultipartyHandler::HandleCreateConferenceReqL(TInt /*aHeldCallId*/, TInt /*aSecondCallId*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlMultipartyCreateConferenceComp()
- *
- * @param aHeldCallId The Call ID of the held call.
- *
- * @param aSecondCallId The Call ID of the other call to create a conference with.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlMultipartyHandler::HandleCreateConferenceReqL
-
-
-TInt CLtsyCallControlMultipartyHandler::HandleConferenceSwapReqL(
-		TInt /*aHeldCallId*/, TInt /*aConnectedCallId*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlMultipartyConferenceSwapComp()
- *
- * @param aHeldCallId The Call ID of the held call.
- *
- * @param aConnectedCallId The Call ID of the connected call.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlMultipartyHandler::HandleConferenceSwapReqL
-
-
-TInt CLtsyCallControlMultipartyHandler::HandleConferenceGoOneToOneReqL(TInt /*aCallId*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCallControlMultipartyConferenceGoOneToOneComp()
- *
- * @param aCallId The Call ID of the call with which to go one to one.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCallControlMultipartyHandler::HandleConferenceGoOneToOneReqL
-
-
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/src/cltsycellbroadcasthandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +0,0 @@
-// 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:
-// CLtsyCellBroadcastHandler
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mmtsy_ipcdefs.h>
-
-#include "cltsycellbroadcasthandler.h"
-#include <ctsy/ltsy/ltsylogger.h>
-#include "ltsymacros.h"
-
-
-
-CLtsyCellBroadcastHandler::CLtsyCellBroadcastHandler(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	: iCtsyDispatcherCallback(aCtsyDispatcherCallback)
-	{
-	}
-
-	
-CLtsyCellBroadcastHandler::~CLtsyCellBroadcastHandler()
-	{
-	}
-
-
-CLtsyCellBroadcastHandler* CLtsyCellBroadcastHandler::NewLC(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyCellBroadcastHandler* self = new (ELeave) CLtsyCellBroadcastHandler(aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-
-CLtsyCellBroadcastHandler* CLtsyCellBroadcastHandler::NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyCellBroadcastHandler* self=
-			CLtsyCellBroadcastHandler::NewLC(aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-
-void CLtsyCellBroadcastHandler::ConstructL()
-/**
- * Second phase constructor.
- */
-	{
-	TSYLOGENTRYEXIT;
-	
-	
-	} // CLtsyCellBroadcastHandler::ConstructL
-
-TBool CLtsyCellBroadcastHandler::IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId)
-/**
- * Returns whether a Dispatch Interface APi is supported or not.
- * 
- * @param aDispatchApiId Id of Dispatch interface being queried
- * @return indication whether interface is supported or not
- */
-	{
-
-	switch(aDispatchApiId)
-		{
-		// Insert ApiIds when support is provided in LTSY e.g.
-		// case MLtsyDispatchPhoneBootNotifySimStatusReady::KLtsyDispatchPhoneBootNotifySimStatusReadyApiId: return ETrue;
-		
-		default:
-			return EFalse;
-		}
-	}
-
-void CLtsyCellBroadcastHandler::IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup /*aIdGroup*/, TUint32& /*aIndIdBitMask*/)
-/**
- * Returns the set of callback indicators that are supported.
- * 
-* @param aIdGroup ID of group that is being queried e.g. aIdGroup=EIndIdGroup1
-* @param aIndIdBitMask [out] argument that should return a bitmask indicating which indicator callbacks are supported.
- */
-	{
-
-	//Create bitmask with bitset for each indicator ID that is supported. E.g.
-	/*
-	if(aIdGroup == EIndIdGroup1)
-		aIndIdBitMask = KLtsyDispatchPhoneNotifyNetworkModeChangeIndId | 
-						KLtsyDispatchPhoneNotifyEgprsInfoChangeIndId | 
-						KLtsyDispatchPhoneNotifySignalStrengthChangeIndId;
-	else
-		aIndIdBitMask = 0; //no indicators from other groups supported
-	*/
-	}
-
-
-TInt CLtsyCellBroadcastHandler::HandleSetBroadcastFilterSettingReqL(RMobileBroadcastMessaging::TMobilePhoneBroadcastFilter /*aFilterSetting*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCellBroadcastSetBroadcastFilterSettingComp
- *
- * @param aFilterSetting Broadcast filter setting
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCellBroadcastHandler::HandleSetBroadcastFilterSettingReqL
-
-
-TInt CLtsyCellBroadcastHandler::HandleActivateBroadcastReceiveMessageReqL(RMobileBroadcastMessaging::TMobilePhoneBroadcastFilter /*aFilterSetting*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCellBroadcastActivateBroadcastReceiveMessageComp
- *
- * @param aFilterSetting Broadcast filter setting
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCellBroadcastHandler::HandleActivateBroadcastReceiveMessageReqL
-
-
-TInt CLtsyCellBroadcastHandler::HandleReceiveMessageCancelReqL(RMobileBroadcastMessaging::TMobilePhoneBroadcastFilter /*aFilterSetting*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCellBroadcastReceiveMessageCancelComp
- *
- * @param aFilterSetting Broadcast filter setting
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCellBroadcastHandler::HandleReceiveMessageCancelReqL
-	
-TInt CLtsyCellBroadcastHandler::HandleStartSimCbTopicBrowsingReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCellBroadcastStartSimCbTopicBrowsingComp
- *
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCellBroadcastHandler::HandleStartSimCbTopicBrowsingReqL
-	
-TInt CLtsyCellBroadcastHandler::HandleDeleteSimCbTopicReqL(TUint /*aIndex*/, TBool /*aDeleteFlag*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackCellBroadcastDeleteSimCbTopicComp
- *
- * @param aIndex SimCb topic number.
- * @param aDeleteFlag topic in sim memory delete flag.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyCellBroadcastHandler::HandleDeleteSimCbTopicReqL

--- a/cbsref/telephonyrefplugins/atltsy/handler/src/cltsyfactoryv1.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1211 +0,0 @@
-// 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:
-// @file ltsyfactoryv1.cpp
-// This contains CLtsyFactoryV1 which acting an interface for Lincesee dll
-// 
-// system include
-#include <ctsy/ltsy/mltsydispatchinterface.h>
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-
-// use include
-#include "cltsyfactoryv1.h"
-#include "cltsycallcontrolhandler.h"
-#include "cltsyphonehandler.h"
-#include "cltsysecurityhandler.h"
-#include "cltsyphonebookenhandler.h"
-#include "cltsycellbroadcasthandler.h"
-#include "cltsyphonebookonhandler.h"
-#include "cltsyphonebookhandler.h"
-#include "cltsysimhandler.h"
-#include "cltsysmshandler.h"
-#include "cltsycallcontrolmultipartyhandler.h"
-#include "cltsysupplementaryserviceshandler.h"
-#include "cltsypacketserviceshandler.h"
-#include "cltsysathandler.h"
-#include "globalphonemanager.h"
-#include "unsolicitedeventmonitor.h"
-#include "unsolicitedcommandcallcontrolhandler.h"
-
-
-CLtsyFactoryV1::CLtsyFactoryV1()
-	{
-	}
-
-CLtsyFactoryV1::~CLtsyFactoryV1()
-	{
-	TSYLOGENTRYEXIT;
-
-	// Delete dispatch handlers
-	delete iLtsyDispatchCallControlHandler;
-	iLtsyDispatchCallControlHandler = NULL;
-
-	delete iLtsyDispatchPhoneHandler;
-	iLtsyDispatchPhoneHandler = NULL;
-
-	delete iLtsyDispatchSecurityHandler;
-	iLtsyDispatchSecurityHandler = NULL;
-
-	delete iLtsyDispatchPhonebookEnHandler;
-	iLtsyDispatchPhonebookEnHandler = NULL;
-
-	delete iLtsyDispatchCellBroadcastHandler;
-	iLtsyDispatchCellBroadcastHandler = NULL;
-
-	delete iLtsyDispatchPhonebookOnHandler;
-	iLtsyDispatchPhonebookOnHandler = NULL;
-
-	delete iLtsyDispatchPhonebookHandler;
-	iLtsyDispatchPhonebookHandler = NULL;
-
-	delete iLtsyDispatchSimHandler;
-	iLtsyDispatchSimHandler = NULL;
-
-	delete iLtsyDispatchSmsHandler;
-	iLtsyDispatchSmsHandler = NULL;
-
-	delete iLtsyDispatchCallControlMultipartyHandler;
-	iLtsyDispatchCallControlMultipartyHandler = NULL;
-
-	delete iLtsyDispatchSupplementaryServicesHandler;
-	iLtsyDispatchSupplementaryServicesHandler = NULL;
-
-	delete iLtsyDispatchPacketServicesHandler;
-	iLtsyDispatchPacketServicesHandler = NULL;
-
-	delete iLtsyDispatchSatHandler;
-	iLtsyDispatchSatHandler = NULL;
-	
-	delete iUnsolicitedEventMonitor;
-	iUnsolicitedEventMonitor = NULL;
-	
-	delete iGlobalPhone;
-	iGlobalPhone = NULL;
-	}
-
-MLtsyFactoryBase::TCtsyInterfaceVersion CLtsyFactoryV1::Version()
-	{
-	TSYLOGENTRYEXIT;
-	return EIfVersion1;
-	}
-
-void CLtsyFactoryV1::ConstructL(CCtsyDispatcherCallback& aCallback)
-/**
- * Second phase constructor. This function must be called explicitly
- * by the client to complete construction before any other functions in this
- * class are called.
- */
-	{
-	TSYLOGENTRYEXIT;
-	// create global phone manager
-	iGlobalPhone = CGlobalPhonemanager::NewL();
-	
-	// create the call control handler
-	iLtsyDispatchCallControlHandler = CLtsyCallControlHandler::NewL(aCallback, iGlobalPhone);
-	
-	// create the phone control handler
-	iLtsyDispatchPhoneHandler = CLtsyPhoneHandler::NewL(aCallback,iGlobalPhone);
-	
-	// create the sms control handler
-	iLtsyDispatchSmsHandler = CLtsySmsHandler::NewL(aCallback,iGlobalPhone);
-	
-	// create the packect service control handler
-	iLtsyDispatchPacketServicesHandler = CLtsyPacketServicesHandler::NewL(aCallback,iGlobalPhone);
-    
-	// create the phone book control handler
-	iLtsyDispatchPhonebookHandler = CLtsyPhonebookHandler::NewL(aCallback,iGlobalPhone);
-
-	// create the security control handler
-	iLtsyDispatchSecurityHandler = CLtsySecurityHandler::NewL(aCallback);
-	
-	// create the EN phone book control handler
-	iLtsyDispatchPhonebookEnHandler = CLtsyPhonebookEnHandler::NewL(aCallback,iGlobalPhone);
-	
-	// create the cell broad cast control handler
-	iLtsyDispatchCellBroadcastHandler = CLtsyCellBroadcastHandler::NewL(aCallback);
-	
-	// create the ON phone book control handler
-	iLtsyDispatchPhonebookOnHandler = CLtsyPhonebookOnHandler::NewL(aCallback);
-		
-	// create the sim card control handler
-	iLtsyDispatchSimHandler = CLtsySimHandler::NewL(aCallback);
-	
-	// create the conference call control handler
-	iLtsyDispatchCallControlMultipartyHandler = CLtsyCallControlMultipartyHandler::NewL(aCallback);
-	
-	// create the supplementary service control handler
-	iLtsyDispatchSupplementaryServicesHandler = CLtsySupplementaryServicesHandler::NewL(aCallback);
-		
-	// create the sat control handler
-	iLtsyDispatchSatHandler = CLtsySatHandler::NewL(aCallback);
-	
-	//Create unsolicited observer
-	iUnsolicitedEventMonitor = CUnsolicitedEventMonitor::NewL(*iGlobalPhone, aCallback);
-	
-	// create the security control handler
-	iUnsolicitedEventMonitor->AddUnsolicitedObserver(iLtsyDispatchCallControlHandler->GetUnsolicitedCallControlHandler());
-	
-	// create the security control handler
-	iUnsolicitedEventMonitor->StartUnsolicitedObserver();
-	} // CLtsyFactoryV1::ConstructL
-
-
-TInt CLtsyFactoryV1::GetDispatchHandler(
-			TLtsyDispatchInterfaceApiId aDispatchInterfaceId,
-			TAny*& aDispatchInterface)
-/**
- * Part of the MLtsyFactoryV1 interface.  Returns the requested dispatch handler.
- * For more details see MLtsyFactoryV1::GetDispatchHandler
- *
- * @param aInterfaceId The dispatch interface identifier of the requested
- * interface.
- *
- * @param aDispatchInterface If this function completes with KErrNone, will contain
- * a reference to a pointer to the dispatch handler interface in the LTSY.
- * aDispatchInterface may be NULL. Otherwise the parameter will remain unchanged.
- *
- * @return KErrNone if the requested interface was returned in the
- * aDispatchInterface parameter; KErrNotFound if the requested interface
- * was not found in the Licensee LTSY.
- */
-	{
-	TSYLOGENTRYEXITARGS(_L8("aDispatchInterfaceId=%d"), aDispatchInterfaceId);
-
-	switch (aDispatchInterfaceId)
-		{
-
-		// Handlers for IPCs used in boot sequence
-
-	case MLtsyDispatchPhoneBootNotifyModemStatusReady::KLtsyDispatchPhoneBootNotifyModemStatusReadyApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneBootNotifyModemStatusReady*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneBootNotifySimStatusReady::KLtsyDispatchPhoneBootNotifySimStatusReadyApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneBootNotifySimStatusReady*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetNetworkRegistrationStatus::KLtsyDispatchPhoneGetNetworkRegistrationStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetNetworkRegistrationStatus*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneSimRefreshRegister::KLtsyDispatchPhoneSimRefreshRegisterApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneSimRefreshRegister*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetFdnStatus::KLtsyDispatchPhoneGetFdnStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetFdnStatus*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetHomeNetwork::KLtsyDispatchPhoneGetHomeNetworkApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetHomeNetwork*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneNspsWakeup::KLtsyDispatchPhoneNspsWakeupApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneNspsWakeup*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneSetSystemNetworkMode::KLtsyDispatchPhoneSetSystemNetworkModeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneSetSystemNetworkMode*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetCurrentSystemNetworkModes::KLtsyDispatchPhoneGetCurrentSystemNetworkModesApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetCurrentSystemNetworkModes*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneResetNetServer::KLtsyDispatchPhoneResetNetServerApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneResetNetServer*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneSetAlwaysOnMode::KLtsyDispatchPhoneSetAlwaysOnModeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneSetAlwaysOnMode*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneSetDriveMode::KLtsyDispatchPhoneSetDriveModeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneSetDriveMode*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetHspaStatus::KLtsyDispatchPhoneGetHspaStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetHspaStatus*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneSetHspaStatus::KLtsyDispatchPhoneSetHspaStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneSetHspaStatus*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetNetworkProviderName::KLtsyDispatchPhoneGetNetworkProviderNameApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetNetworkProviderName*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetOperatorName::KLtsyDispatchPhoneGetOperatorNameApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetOperatorName*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetCellInfo::KLtsyDispatchPhoneGetCellInfoApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetCellInfo*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-
-		// CallControl Functional Unit interface handlers
-
-	case MLtsyDispatchCallControlAnswer::KLtsyDispatchCallControlAnswerApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlAnswer*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlHold::KLtsyDispatchCallControlHoldApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlHold*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlDialEmergency::KLtsyDispatchCallControlDialEmergencyApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlDialEmergency*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlStopDtmfTone::KLtsyDispatchCallControlStopDtmfToneApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlStopDtmfTone*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlSetActiveAlsLine::KLtsyDispatchCallControlSetActiveAlsLineApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlSetActiveAlsLine*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlSendDtmfTonesCancel::KLtsyDispatchCallControlSendDtmfTonesCancelApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlSendDtmfTonesCancel*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlHangUp::KLtsyDispatchCallControlHangUpApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlHangUp*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlResume::KLtsyDispatchCallControlResumeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlResume*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlSetDynamicHscsdParams::KLtsyDispatchCallControlSetDynamicHscsdParamsApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlSetDynamicHscsdParams*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlDialVoice::KLtsyDispatchCallControlDialVoiceApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlDialVoice*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlTransfer::KLtsyDispatchCallControlTransferApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlTransfer*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlSendDtmfTones::KLtsyDispatchCallControlSendDtmfTonesApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlSendDtmfTones*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlGetIdentityServiceStatus::KLtsyDispatchCallControlGetIdentityServiceStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlGetIdentityServiceStatus*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlSwap::KLtsyDispatchCallControlSwapApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlSwap*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlLoanDataPort::KLtsyDispatchCallControlLoanDataPortApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlLoanDataPort*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlRecoverDataPort::KLtsyDispatchCallControlRecoverDataPortApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlRecoverDataPort*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlStartDtmfTone::KLtsyDispatchCallControlStartDtmfToneApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlStartDtmfTone*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlGetActiveAlsLine::KLtsyDispatchCallControlGetActiveAlsLineApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlGetActiveAlsLine*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlDialData::KLtsyDispatchCallControlDialDataApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlDialData*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlQueryIsEmergencyNumber::KLtsyDispatchCallControlQueryIsEmergencyNumberApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlQueryIsEmergencyNumber*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlGetAlsPpSupport::KLtsyDispatchCallControlGetAlsPpSupportApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlGetAlsPpSupport*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlGetAlsBlockedStatus::KLtsyDispatchCallControlGetAlsBlockedStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlGetAlsBlockedStatus*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlSetAlsBlocked::KLtsyDispatchCallControlSetAlsBlockedApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlSetAlsBlocked*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlGetLifeTime::KLtsyDispatchCallControlGetLifeTimeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlGetLifeTime*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlTerminateErrorCall::KLtsyDispatchCallControlTerminateErrorCallApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlTerminateErrorCall*>
-												(iLtsyDispatchCallControlHandler);
-        break;
-	case MLtsyDispatchCallControlTerminateAllCalls::KLtsyDispatchCallControlTerminateAllCallsApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlTerminateAllCalls*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlGetCallForwardingIndicator::KLtsyDispatchCallControlGetCallForwardingIndicatorApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlGetCallForwardingIndicator*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-	case MLtsyDispatchCallControlUpdateLifeTimer::KLtsyDispatchCallControlUpdateLifeTimerApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlUpdateLifeTimer*>
-												(iLtsyDispatchCallControlHandler);
-		break;
-
-		// Phone Functional Unit interface handlers
-
-	case MLtsyDispatchPhoneGetServiceProviderName::KLtsyDispatchPhoneGetServiceProviderNameApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetServiceProviderName*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetPhoneId::KLtsyDispatchPhoneGetPhoneIdApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetPhoneId*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetDetectedNetworks::KLtsyDispatchPhoneGetDetectedNetworksApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetDetectedNetworks*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetDetectedNetworksCancel::KLtsyDispatchPhoneGetDetectedNetworksCancelApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetDetectedNetworksCancel*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneSelectNetwork::KLtsyDispatchPhoneSelectNetworkApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneSelectNetwork*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneSelectNetworkCancel::KLtsyDispatchPhoneSelectNetworkCancelApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneSelectNetworkCancel*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneSetNetworkSelectionSetting::KLtsyDispatchPhoneSetNetworkSelectionSettingApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneSetNetworkSelectionSetting*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetCurrentNetworkInfo::KLtsyDispatchPhoneGetCurrentNetworkInfoApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetCurrentNetworkInfo*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetNetworkMode::KLtsyDispatchPhoneGetNetworkModeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetNetworkMode*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetNitzInfo::KLtsyDispatchPhoneGetNitzInfoApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetNitzInfo*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetSignalStrength::KLtsyDispatchPhoneGetSignalStrengthApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetSignalStrength*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetBatteryInfo::KLtsyDispatchPhoneGetBatteryInfoApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetBatteryInfo*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneRegisterCellInfoChangeNotification::KLtsyDispatchPhoneRegisterCellInfoChangeNotificationApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneRegisterCellInfoChangeNotification*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetPhoneCellInfo::KLtsyDispatchPhoneGetPhoneCellInfoApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetPhoneCellInfo*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetUsimServiceSupport::KLtsyDispatchPhoneGetUsimServiceSupportApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetUsimServiceSupport*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetCurrentActiveUsimApplication::KLtsyDispatchPhoneGetCurrentActiveUsimApplicationApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetCurrentActiveUsimApplication*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneTerminateAllCalls::KLtsyDispatchPhoneTerminateAllCallsApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneTerminateAllCalls*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneGetSystemNetworkBand::KLtsyDispatchPhoneGetSystemNetworkBandApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneGetSystemNetworkBand*>
-												(iLtsyDispatchPhoneHandler);
-		break;
-	case MLtsyDispatchPhoneSetSystemNetworkBand::KLtsyDispatchPhoneSetSystemNetworkBandApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhoneSetSystemNetworkBand*>
-												(iLtsyDispatchPhoneHandler);
-		break;		
-		
-		// Security Functional Unit interface handlers
-
-	case MLtsyDispatchSecurityGetSecurityCodeInfo::KLtsyDispatchSecurityGetSecurityCodeInfoApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSecurityGetSecurityCodeInfo*>
-												(iLtsyDispatchSecurityHandler);
-		break;
-	case MLtsyDispatchSecurityGetLockInfo::KLtsyDispatchSecurityGetLockInfoApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSecurityGetLockInfo*>
-												(iLtsyDispatchSecurityHandler);
-		break;
-	case MLtsyDispatchSecurityAbortSecurityCode::KLtsyDispatchSecurityAbortSecurityCodeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSecurityAbortSecurityCode*>
-												(iLtsyDispatchSecurityHandler);
-		break;
-	case MLtsyDispatchSecurityGetCurrentActivePin::KLtsyDispatchSecurityGetCurrentActivePinApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSecurityGetCurrentActivePin*>
-												(iLtsyDispatchSecurityHandler);
-		break;
-	case MLtsyDispatchSecuritySetLockSetting::KLtsyDispatchSecuritySetLockSettingApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSecuritySetLockSetting*>
-												(iLtsyDispatchSecurityHandler);
-		break;
-	case MLtsyDispatchSecurityVerifySecurityCode::KLtsyDispatchSecurityVerifySecurityCodeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSecurityVerifySecurityCode*>
-												(iLtsyDispatchSecurityHandler);
-		break;
-	case MLtsyDispatchSecurityGetPin1DisableSupported::KLtsyDispatchSecurityGetPin1DisableSupportedApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSecurityGetPin1DisableSupported*>
-												(iLtsyDispatchSecurityHandler);
-		break;
-	case MLtsyDispatchSecurityCheckSecurityCode::KLtsyDispatchSecurityCheckSecurityCodeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSecurityCheckSecurityCode*>
-												(iLtsyDispatchSecurityHandler);
-		break;
-	case MLtsyDispatchSecurityDisablePhoneLock::KLtsyDispatchSecurityDisablePhoneLockApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSecurityDisablePhoneLock*>
-												(iLtsyDispatchSecurityHandler);
-		break;
-	case MLtsyDispatchSecurityGetCipheringInfo::KLtsyDispatchSecurityGetCipheringInfoApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSecurityGetCipheringInfo*>
-												(iLtsyDispatchSecurityHandler);
-		break;
-	case MLtsyDispatchSecurityIsSecurityCodeBlocked::KLtsyDispatchSecurityIsSecurityCodeBlockedApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSecurityIsSecurityCodeBlocked*>
-												(iLtsyDispatchSecurityHandler);
-		break;
-	case MLtsyDispatchSecurityCheckSecurityCodeCancel::KLtsyDispatchSecurityCheckSecurityCodeCancelApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSecurityCheckSecurityCodeCancel*>
-												(iLtsyDispatchSecurityHandler);
-		break;												
-				
-		// PhonebookEn Functional Unit interface handlers
-
-	case MLtsyDispatchPhonebookEnStoreGetInfo::KLtsyDispatchPhonebookEnStoreGetInfoApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookEnStoreGetInfo*>
-												(iLtsyDispatchPhonebookEnHandler);
-		break;
-	case MLtsyDispatchPhonebookEnStoreReadAll::KLtsyDispatchPhonebookEnStoreReadAllApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookEnStoreReadAll*>
-												(iLtsyDispatchPhonebookEnHandler);
-		break;
-	case MLtsyDispatchPhonebookEnStoreReadEntry::KLtsyDispatchPhonebookEnStoreReadEntryApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookEnStoreReadEntry*>
-												(iLtsyDispatchPhonebookEnHandler);
-		break;
-
-		// CellBroadcast Functional Unit interface handlers
-
-	case MLtsyDispatchCellBroadcastSetBroadcastFilterSetting::KLtsyDispatchCellBroadcastSetBroadcastFilterSettingApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCellBroadcastSetBroadcastFilterSetting*>
-												(iLtsyDispatchCellBroadcastHandler);
-		break;
-	case MLtsyDispatchCellBroadcastActivateBroadcastReceiveMessage::KLtsyDispatchCellBroadcastActivateBroadcastReceiveMessageApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCellBroadcastActivateBroadcastReceiveMessage*>
-												(iLtsyDispatchCellBroadcastHandler);
-		break;
-	case MLtsyDispatchCellBroadcastReceiveMessageCancel::KLtsyDispatchCellBroadcastReceiveMessageCancelApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCellBroadcastReceiveMessageCancel*>
-												(iLtsyDispatchCellBroadcastHandler);
-		break;
-	case MLtsyDispatchCellBroadcastStartSimCbTopicBrowsing::KLtsyDispatchCellBroadcastStartSimCbTopicBrowsingApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCellBroadcastStartSimCbTopicBrowsing*>
-												(iLtsyDispatchCellBroadcastHandler);
-		break;		
-	case MLtsyDispatchCellBroadcastDeleteSimCbTopic::KLtsyDispatchCellBroadcastDeleteSimCbTopicApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCellBroadcastDeleteSimCbTopic*>
-												(iLtsyDispatchCellBroadcastHandler);
-		break;		
-
-		// PhonebookOn Functional Unit interface handlers
-
-	case MLtsyDispatchPhonebookOnStoreRead::KLtsyDispatchPhonebookOnStoreReadApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookOnStoreRead*>
-												(iLtsyDispatchPhonebookOnHandler);
-		break;
-	case MLtsyDispatchPhonebookOnStoreDeleteAll::KLtsyDispatchPhonebookOnStoreDeleteAllApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookOnStoreDeleteAll*>
-												(iLtsyDispatchPhonebookOnHandler);
-		break;
-	case MLtsyDispatchPhonebookOnStoreReadEntry::KLtsyDispatchPhonebookOnStoreReadEntryApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookOnStoreReadEntry*>
-												(iLtsyDispatchPhonebookOnHandler);
-		break;
-	case MLtsyDispatchPhonebookOnStoreGetInfo::KLtsyDispatchPhonebookOnStoreGetInfoApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookOnStoreGetInfo*>
-												(iLtsyDispatchPhonebookOnHandler);
-		break;
-	case MLtsyDispatchPhonebookOnStoreGetReadStoreSize::KLtsyDispatchPhonebookOnStoreGetReadStoreSizeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookOnStoreGetReadStoreSize*>
-												(iLtsyDispatchPhonebookOnHandler);
-		break;
-	case MLtsyDispatchPhonebookOnStoreDeleteEntry::KLtsyDispatchPhonebookOnStoreDeleteEntryApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookOnStoreDeleteEntry*>
-												(iLtsyDispatchPhonebookOnHandler);
-		break;
-	case MLtsyDispatchPhonebookOnStoreWriteEntry::KLtsyDispatchPhonebookOnStoreWriteEntryApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookOnStoreWriteEntry*>
-												(iLtsyDispatchPhonebookOnHandler);
-		break;
-	case MLtsyDispatchPhonebookOnStoreWrite::KLtsyDispatchPhonebookOnStoreWriteApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookOnStoreWrite*>
-												(iLtsyDispatchPhonebookOnHandler);
-		break;
-	case MLtsyDispatchPhonebookOnStoreGetStoreSize::KLtsyDispatchPhonebookOnStoreGetStoreSizeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookOnStoreGetStoreSize*>
-												(iLtsyDispatchPhonebookOnHandler);
-		break;
-
-		// Phonebook Functional Unit interface handlers
-
-	case MLtsyDispatchPhonebookStoreReadEntry::KLtsyDispatchPhonebookStoreReadEntryApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookStoreReadEntry*>
-												(iLtsyDispatchPhonebookHandler);
-		break;
-	case MLtsyDispatchPhonebookStoreDeleteEntry::KLtsyDispatchPhonebookStoreDeleteEntryApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookStoreDeleteEntry*>
-												(iLtsyDispatchPhonebookHandler);
-		break;
-	case MLtsyDispatchPhonebookStoreCache::KLtsyDispatchPhonebookStoreCacheApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookStoreCache*>
-												(iLtsyDispatchPhonebookHandler);
-		break;
-	case MLtsyDispatchPhonebookStoreGetPhonebookInfo::KLtsyDispatchPhonebookStoreGetPhonebookInfoApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookStoreGetPhonebookInfo*>
-												(iLtsyDispatchPhonebookHandler);
-		break;
-	case MLtsyDispatchPhonebookStoreInitialise::KLtsyDispatchPhonebookStoreInitialiseApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookStoreInitialise*>
-												(iLtsyDispatchPhonebookHandler);
-		break;
-	case MLtsyDispatchPhonebookStoreDeleteAll::KLtsyDispatchPhonebookStoreDeleteAllApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookStoreDeleteAll*>
-												(iLtsyDispatchPhonebookHandler);
-		break;
-	case MLtsyDispatchPhonebookSmsStoreReadAll::KLtsyDispatchPhonebookSmsStoreReadAllApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookSmsStoreReadAll*>
-												(iLtsyDispatchPhonebookHandler);
-		break;
-	case MLtsyDispatchPhonebookStoreWriteEntry::KLtsyDispatchPhonebookStoreWriteEntryApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookStoreWriteEntry*>
-												(iLtsyDispatchPhonebookHandler);
-		break;
-	case MLtsyDispatchPhonebookGetPhoneStoreInfo::KLtsyDispatchPhonebookGetPhoneStoreInfoApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookGetPhoneStoreInfo*>
-												(iLtsyDispatchPhonebookHandler);
-		break;
-	case MLtsyDispatchPhonebookSmsStoreDeleteEntry::KLtsyDispatchPhonebookSmsStoreDeleteEntryApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookSmsStoreDeleteEntry*>
-												(iLtsyDispatchPhonebookHandler);
-		break;
-	case MLtsyDispatchPhonebookSmsStoreDeleteAll::KLtsyDispatchPhonebookSmsStoreDeleteAllApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookSmsStoreDeleteAll*>
-												(iLtsyDispatchPhonebookHandler);
-		break;
-	case MLtsyDispatchPhonebookSmsStoreGetInfo::KLtsyDispatchPhonebookSmsStoreGetInfoApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookSmsStoreGetInfo*>
-												(iLtsyDispatchPhonebookHandler);
-		break;
-	case MLtsyDispatchPhonebookSmsStoreReadEntry::KLtsyDispatchPhonebookSmsStoreReadEntryApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookSmsStoreReadEntry*>
-												(iLtsyDispatchPhonebookHandler);
-		break;
-	case MLtsyDispatchPhonebookSmsStoreWriteEntry::KLtsyDispatchPhonebookSmsStoreWriteEntryApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookSmsStoreWriteEntry*>
-												(iLtsyDispatchPhonebookHandler);
-		break;
-	case MLtsyDispatchPhonebookStoreCacheCancel::KLtsyDispatchPhonebookStoreCacheCancelApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPhonebookStoreCacheCancel*>
-												(iLtsyDispatchPhonebookHandler);
-		break;
-
-		// Sim Functional Unit interface handlers
-
-	case MLtsyDispatchSimGetApnControlListServiceStatus::KLtsyDispatchSimGetApnControlListServiceStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimGetApnControlListServiceStatus*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimDeleteApnName::KLtsyDispatchSimDeleteApnNameApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimDeleteApnName*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimEnumerateApnEntries::KLtsyDispatchSimEnumerateApnEntriesApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimEnumerateApnEntries*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimChangeSecurityCode::KLtsyDispatchSimChangeSecurityCodeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimChangeSecurityCode*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimSetFdnSetting::KLtsyDispatchSimSetFdnSettingApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimSetFdnSetting*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimGetCustomerServiceProfile::KLtsyDispatchSimGetCustomerServiceProfileApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimGetCustomerServiceProfile*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimGetSubscriberId::KLtsyDispatchSimGetSubscriberIdApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimGetSubscriberId*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimAppendApnName::KLtsyDispatchSimAppendApnNameApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimAppendApnName*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimGetActiveIccApplicationType::KLtsyDispatchSimGetActiveIccApplicationTypeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimGetActiveIccApplicationType*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimSetIccMessageWaitingIndicators::KLtsyDispatchSimSetIccMessageWaitingIndicatorsApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimSetIccMessageWaitingIndicators*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimSetApnControlListServiceStatus::KLtsyDispatchSimSetApnControlListServiceStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimSetApnControlListServiceStatus*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimGetApnName::KLtsyDispatchSimGetApnNameApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimGetApnName*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimSimRefreshDone::KLtsyDispatchSimSimRefreshDoneApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimSimRefreshDone*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimGetServiceTable::KLtsyDispatchSimGetServiceTableApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimGetServiceTable*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimGetIccMessageWaitingIndicators::KLtsyDispatchSimGetIccMessageWaitingIndicatorsApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimGetIccMessageWaitingIndicators*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimSimLockActivate::KLtsyDispatchSimSimLockActivateApiId:
-			aDispatchInterface = static_cast<MLtsyDispatchSimSimLockActivate*>
-													(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimSimLockDeActivate::KLtsyDispatchSimSimLockDeActivateApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimSimLockDeActivate*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimGetAnswerToReset::KLtsyDispatchSimGetAnswerToResetApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimGetAnswerToReset*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimGetSimCardReaderStatus::KLtsyDispatchSimGetSimCardReaderStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimGetSimCardReaderStatus*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimGetSimAuthenticationEapSimData::KLtsyDispatchSimGetSimAuthenticationEapSimDataApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimGetSimAuthenticationEapSimData*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimGetSimAuthenticationEapAkaData::KLtsyDispatchSimGetSimAuthenticationEapAkaDataApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimGetSimAuthenticationEapAkaData*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimPowerSimOff::KLtsyDispatchSimPowerSimOffApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimPowerSimOff*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimPowerSimOn::KLtsyDispatchSimPowerSimOnApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimPowerSimOn*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimReadSimFile::KLtsyDispatchSimReadSimFileApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimReadSimFile*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimSendApduRequest::KLtsyDispatchSimSendApduRequestApiId:
-			aDispatchInterface = static_cast<MLtsyDispatchSimSendApduRequest*>
-													(iLtsyDispatchSimHandler);
-			break;
-	case MLtsyDispatchSimSendApduRequestV2::KLtsyDispatchSimSendApduRequestV2ApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimSendApduRequestV2*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimSimWarmReset::KLtsyDispatchSimSimWarmResetApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimSimWarmReset*>
-												(iLtsyDispatchSimHandler);
-		break;
-	case MLtsyDispatchSimSetSimMessageStatusRead::KLtsyDispatchSimSetSimMessageStatusReadApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSimSetSimMessageStatusRead*>
-												(iLtsyDispatchSimHandler);
-		break;
-
-		// Sms Functional Unit interface handlers
-
-	case MLtsyDispatchSmsSendSatSms::KLtsyDispatchSmsSendSatSmsApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSmsSendSatSms*>
-												(iLtsyDispatchSmsHandler);
-		break;
-	case MLtsyDispatchSmsGetSmsStoreInfo::KLtsyDispatchSmsGetSmsStoreInfoApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSmsGetSmsStoreInfo*>
-												(iLtsyDispatchSmsHandler);
-		break;
-	case MLtsyDispatchSmsGetSmspList::KLtsyDispatchSmsGetSmspListApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSmsGetSmspList*>
-												(iLtsyDispatchSmsHandler);
-		break;
-	case MLtsyDispatchSmsNackSmsStored::KLtsyDispatchSmsNackSmsStoredApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSmsNackSmsStored*>
-												(iLtsyDispatchSmsHandler);
-		break;
-	case MLtsyDispatchSmsAckSmsStored::KLtsyDispatchSmsAckSmsStoredApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSmsAckSmsStored*>
-												(iLtsyDispatchSmsHandler);
-		break;
-	case MLtsyDispatchSmsResumeSmsReception::KLtsyDispatchSmsResumeSmsReceptionApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSmsResumeSmsReception*>
-												(iLtsyDispatchSmsHandler);
-		break;
-	case MLtsyDispatchSmsSendSmsMessage::KLtsyDispatchSmsSendSmsMessageApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSmsSendSmsMessage*>
-												(iLtsyDispatchSmsHandler);
-		break;
-	case MLtsyDispatchSmsSendSmsMessageNoFdnCheck::KLtsyDispatchSmsSendSmsMessageNoFdnCheckApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSmsSendSmsMessageNoFdnCheck*>
-												(iLtsyDispatchSmsHandler);
-		break;
-	case MLtsyDispatchSmsSetMoSmsBearer::KLtsyDispatchSmsSetMoSmsBearerApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSmsSetMoSmsBearer*>
-												(iLtsyDispatchSmsHandler);
-		break;
-	case MLtsyDispatchSmsStoreSmspListEntry::KLtsyDispatchSmsStoreSmspListEntryApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSmsStoreSmspListEntry*>
-												(iLtsyDispatchSmsHandler);
-		break;
-
-		// CallControlMultiparty Functional Unit interface handlers
-
-	case MLtsyDispatchCallControlMultipartyConferenceHangUp::KLtsyDispatchCallControlMultipartyConferenceHangUpApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlMultipartyConferenceHangUp*>
-												(iLtsyDispatchCallControlMultipartyHandler);
-		break;
-	case MLtsyDispatchCallControlMultipartyConferenceAddCall::KLtsyDispatchCallControlMultipartyConferenceAddCallApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlMultipartyConferenceAddCall*>
-												(iLtsyDispatchCallControlMultipartyHandler);
-		break;
-	case MLtsyDispatchCallControlMultipartyCreateConference::KLtsyDispatchCallControlMultipartyCreateConferenceApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlMultipartyCreateConference*>
-												(iLtsyDispatchCallControlMultipartyHandler);
-		break;
-	case MLtsyDispatchCallControlMultipartyConferenceSwap::KLtsyDispatchCallControlMultipartyConferenceSwapApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlMultipartyConferenceSwap*>
-												(iLtsyDispatchCallControlMultipartyHandler);
-		break;
-	case MLtsyDispatchCallControlMultipartyConferenceGoOneToOne::KLtsyDispatchCallControlMultipartyConferenceGoOneToOneApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchCallControlMultipartyConferenceGoOneToOne*>
-												(iLtsyDispatchCallControlMultipartyHandler);
-		break;
-
-		// SupplementaryServices Functional Unit interface handlers
-
-	case MLtsyDispatchSupplementaryServicesSendNetworkServiceRequestNoFdnCheck::KLtsyDispatchSupplementaryServicesSendNetworkServiceRequestNoFdnCheckApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSupplementaryServicesSendNetworkServiceRequestNoFdnCheck*>
-												(iLtsyDispatchSupplementaryServicesHandler);
-		break;
-	case MLtsyDispatchSupplementaryServicesGetCallWaitingStatus::KLtsyDispatchSupplementaryServicesGetCallWaitingStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSupplementaryServicesGetCallWaitingStatus*>
-												(iLtsyDispatchSupplementaryServicesHandler);
-		break;
-	case MLtsyDispatchSupplementaryServicesSendNetworkServiceRequest::KLtsyDispatchSupplementaryServicesSendNetworkServiceRequestApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSupplementaryServicesSendNetworkServiceRequest*>
-												(iLtsyDispatchSupplementaryServicesHandler);
-		break;
-	case MLtsyDispatchSupplementaryServicesGetCallBarringStatus::KLtsyDispatchSupplementaryServicesGetCallBarringStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSupplementaryServicesGetCallBarringStatus*>
-												(iLtsyDispatchSupplementaryServicesHandler);
-		break;
-	case MLtsyDispatchSupplementaryServicesSetCallBarringStatus::KLtsyDispatchSupplementaryServicesSetCallBarringStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSupplementaryServicesSetCallBarringStatus*>
-												(iLtsyDispatchSupplementaryServicesHandler);
-		break;
-	case MLtsyDispatchSupplementaryServicesSetCallForwardingStatus::KLtsyDispatchSupplementaryServicesSetCallForwardingStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSupplementaryServicesSetCallForwardingStatus*>
-												(iLtsyDispatchSupplementaryServicesHandler);
-		break;
-	case MLtsyDispatchSupplementaryServicesSetCallWaitingStatus::KLtsyDispatchSupplementaryServicesSetCallWaitingStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSupplementaryServicesSetCallWaitingStatus*>
-												(iLtsyDispatchSupplementaryServicesHandler);
-		break;
-	case MLtsyDispatchSupplementaryServicesSetSsPassword::KLtsyDispatchSupplementaryServicesSetSsPasswordApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSupplementaryServicesSetSsPassword*>
-												(iLtsyDispatchSupplementaryServicesHandler);
-		break;
-	case MLtsyDispatchSupplementaryServicesGetCallForwardingStatus::KLtsyDispatchSupplementaryServicesGetCallForwardingStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSupplementaryServicesGetCallForwardingStatus*>
-												(iLtsyDispatchSupplementaryServicesHandler);
-		break;
-	case MLtsyDispatchSupplementaryServicesSendUssdMessage::KLtsyDispatchSupplementaryServicesSendUssdMessageApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSupplementaryServicesSendUssdMessage*>
-												(iLtsyDispatchSupplementaryServicesHandler);
-		break;
-	case MLtsyDispatchSupplementaryServicesSendUssdMessageNoFdnCheck::KLtsyDispatchSupplementaryServicesSendUssdMessageNoFdnCheckApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSupplementaryServicesSendUssdMessageNoFdnCheck*>
-												(iLtsyDispatchSupplementaryServicesHandler);
-		break;		
-	case MLtsyDispatchSupplementaryServicesSendUssdRelease::KLtsyDispatchSupplementaryServicesSendUssdReleaseApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSupplementaryServicesSendUssdRelease*>
-												(iLtsyDispatchSupplementaryServicesHandler);
-		break;
-	case MLtsyDispatchSupplementaryServicesClearBlacklist::KLtsyDispatchSupplementaryServicesClearBlacklistApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSupplementaryServicesClearBlacklist*>
-												(iLtsyDispatchSupplementaryServicesHandler);
-		break;
-
-		// PacketServices Functional Unit interface handlers
-
-	case MLtsyDispatchPacketServicesPacketAttach::KLtsyDispatchPacketServicesPacketAttachApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesPacketAttach*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesGetPacketAttachMode::KLtsyDispatchPacketServicesGetPacketAttachModeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesGetPacketAttachMode*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesGetPacketNetworkRegistrationStatus::KLtsyDispatchPacketServicesGetPacketNetworkRegistrationStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesGetPacketNetworkRegistrationStatus*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesPacketDetach::KLtsyDispatchPacketServicesPacketDetachApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesPacketDetach*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesSetPdpContextConfig::KLtsyDispatchPacketServicesSetPdpContextConfigApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesSetPdpContextConfig*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesModifyActivePdpContext::KLtsyDispatchPacketServicesModifyActivePdpContextApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesModifyActivePdpContext*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesInitialisePdpContext::KLtsyDispatchPacketServicesInitialisePdpContextApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesInitialisePdpContext*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesDeletePdpContext::KLtsyDispatchPacketServicesDeletePdpContextApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesDeletePdpContext*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesSetPacketAttachMode::KLtsyDispatchPacketServicesSetPacketAttachModeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesSetPacketAttachMode*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesNotifyPacketStatusChange::KLtsyDispatchPacketServicesNotifyPacketStatusChangeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesNotifyPacketStatusChange*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesSetDefaultPdpContextGprsParams::KLtsyDispatchPacketServicesSetDefaultPdpContextGprsParamsApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesSetDefaultPdpContextGprsParams*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesSetDefaultPdpContextR99R4Params::KLtsyDispatchPacketServicesSetDefaultPdpContextR99R4ParamsApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesSetDefaultPdpContextR99R4Params*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;		
-	case MLtsyDispatchPacketServicesActivatePdpContext::KLtsyDispatchPacketServicesActivatePdpContextApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesActivatePdpContext*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesSetPdpContextQosGprs::KLtsyDispatchPacketServicesSetPdpContextQosGprsApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesSetPdpContextQosGprs*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesSetPdpContextQosR99R4::KLtsyDispatchPacketServicesSetPdpContextQosR99R4ApiId:
-			aDispatchInterface = static_cast<MLtsyDispatchPacketServicesSetPdpContextQosR99R4*>
-													(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesSetPdpContextQosR5::KLtsyDispatchPacketServicesSetPdpContextQosR5ApiId:
-				aDispatchInterface = static_cast<MLtsyDispatchPacketServicesSetPdpContextQosR5*>
-														(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesRejectNetworkInitiatedContextActivationRequest::KLtsyDispatchPacketServicesRejectNetworkInitiatedContextActivationRequestApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesRejectNetworkInitiatedContextActivationRequest*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesDeactivatePdpContext::KLtsyDispatchPacketServicesDeactivatePdpContextApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesDeactivatePdpContext*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesAddPacketFilter::KLtsyDispatchPacketServicesAddPacketFilterApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesAddPacketFilter*>
-												(iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesGetStatus::KLtsyDispatchPacketServicesGetStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesGetStatus*>
-						   				 (iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesGetStaticCapabilities::KLtsyDispatchPacketServicesGetStaticCapabilitiesApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesGetStaticCapabilities*>
-						   				 (iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesGetMaxNoMonitoredServiceLists::KLtsyDispatchPacketServicesGetMaxNoMonitoredServiceListsApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesGetMaxNoMonitoredServiceLists*>
-						   				 (iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesGetMaxNoActiveServices::KLtsyDispatchPacketServicesGetMaxNoActiveServicesApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesGetMaxNoActiveServices*>
-						   				 (iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesInitialiseMbmsContext::KLtsyDispatchPacketServicesInitialiseMbmsContextApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesInitialiseMbmsContext*>
-						   				 (iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesGetMbmsNetworkServiceStatus::KLtsyDispatchPacketServicesGetMbmsNetworkServiceStatusApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesGetMbmsNetworkServiceStatus*>
-						   				 (iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesUpdateMbmsMonitorServiceList::KLtsyDispatchPacketServicesUpdateMbmsMonitorServiceListApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesUpdateMbmsMonitorServiceList*>
-						   				 (iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesUpdateMbmsSessionList::KLtsyDispatchPacketServicesUpdateMbmsSessionListApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesUpdateMbmsSessionList*>
-						   				 (iLtsyDispatchPacketServicesHandler);
-		break;
-	case MLtsyDispatchPacketServicesRemovePacketFilter::KLtsyDispatchPacketServicesRemovePacketFilterApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchPacketServicesRemovePacketFilter*>
-										(iLtsyDispatchPacketServicesHandler);
-		break;
-
-		// Sat Functional Unit interface handlers
-
-	case MLtsyDispatchSatSmsDeliverReport::KLtsyDispatchSatSmsDeliverReportApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatSmsDeliverReport*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatGetImageInstance::KLtsyDispatchSatGetImageInstanceApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatGetImageInstance*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatGetIconData::KLtsyDispatchSatGetIconDataApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatGetIconData*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatGetClut::KLtsyDispatchSatGetClutApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatGetClut*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatGetDefaultBearerCapability::KLtsyDispatchSatGetDefaultBearerCapabilityApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatGetDefaultBearerCapability*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatGetSmsPpDownloadSupported::KLtsyDispatchSatGetSmsPpDownloadSupportedApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatGetSmsPpDownloadSupported*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatGetSmsControlActivated::KLtsyDispatchSatGetSmsControlActivatedApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatGetSmsControlActivated*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatCellBroadcastEnvelope::KLtsyDispatchSatCellBroadcastEnvelopeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatCellBroadcastEnvelope*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatGetAccessTechnology::KLtsyDispatchSatGetAccessTechnologyApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatGetAccessTechnology*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatTimingAdvance::KLtsyDispatchSatTimingAdvanceApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatTimingAdvance*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatSmControlResponseData::KLtsyDispatchSatSmControlResponseDataApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatSmControlResponseData*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatProvideLocationInfo::KLtsyDispatchSatProvideLocationInfoApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatProvideLocationInfo*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatSetPollingInterval::KLtsyDispatchSatSetPollingIntervalApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatSetPollingInterval*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatSmsPpDownloadEnvelope::KLtsyDispatchSatSmsPpDownloadEnvelopeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatSmsPpDownloadEnvelope*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatLocalInformationNmr::KLtsyDispatchSatLocalInformationNmrApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatLocalInformationNmr*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatCallAndSmsControlEnvelope::KLtsyDispatchSatCallAndSmsControlEnvelopeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatCallAndSmsControlEnvelope*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatRefreshAllowed::KLtsyDispatchSatRefreshAllowedApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatRefreshAllowed*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatReady::KLtsyDispatchSatReadyApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatReady*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatPCmdNotification::KLtsyDispatchSatPCmdNotificationApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatPCmdNotification*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatUssdControlEnvelopeError::KLtsyDispatchSatUssdControlEnvelopeErrorApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatUssdControlEnvelopeError*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatTimerExpirationEnvelope::KLtsyDispatchSatTimerExpirationEnvelopeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatTimerExpirationEnvelope*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatTerminalRsp::KLtsyDispatchSatTerminalRspApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatTerminalRsp*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatMenuSelectionEnvelope::KLtsyDispatchSatMenuSelectionEnvelopeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatMenuSelectionEnvelope*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatEventDownloadEnvelope::KLtsyDispatchSatEventDownloadEnvelopeApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatEventDownloadEnvelope*>
-												(iLtsyDispatchSatHandler);
-		break;
-	case MLtsyDispatchSatGetUssdControlSupported::KLtsyDispatchSatGetUssdControlSupportedApiId:
-		aDispatchInterface = static_cast<MLtsyDispatchSatGetUssdControlSupported*>
-												(iLtsyDispatchSatHandler);
-		break;
-	default:
-		return TSYLOGSETEXITERR(KErrNotFound);
-		} // switch (aDispatchInterfaceId)
-
-	return TSYLOGSETEXITERR(KErrNone);
-	} // CLtsyFactoryV1::GetDispatchHandler
-
-TBool CLtsyFactoryV1::IsDispatchInterfaceSupported(TInt aFuncUnitId, TLtsyDispatchInterfaceApiId aDispatchApiId)
-	{
-	switch(aFuncUnitId)
-	    {
-	  case KDispatchCallControlFuncUnitId:
-	    return iLtsyDispatchCallControlHandler->IsInterfaceSupported(aDispatchApiId);
-	  case KDispatchPhoneFuncUnitId:
-	    return iLtsyDispatchPhoneHandler->IsInterfaceSupported(aDispatchApiId);
-	  case KDispatchSecurityFuncUnitId:
-	    return iLtsyDispatchSecurityHandler->IsInterfaceSupported(aDispatchApiId);
-	  case KDispatchPhonebookEnFuncUnitId:
-	    return iLtsyDispatchPhonebookEnHandler->IsInterfaceSupported(aDispatchApiId);
-	  case KDispatchCellBroadcastFuncUnitId:
-	    return iLtsyDispatchCellBroadcastHandler->IsInterfaceSupported(aDispatchApiId);
-	  case KDispatchPhonebookOnFuncUnitId:
-	    return iLtsyDispatchPhonebookOnHandler->IsInterfaceSupported(aDispatchApiId);
-	  case KDispatchPhonebookFuncUnitId:
-	    return iLtsyDispatchPhonebookHandler->IsInterfaceSupported(aDispatchApiId);
-	  case KDispatchSimFuncUnitId:
-	    return iLtsyDispatchSimHandler->IsInterfaceSupported(aDispatchApiId);
-	  case KDispatchSmsFuncUnitId:
-	    return iLtsyDispatchSmsHandler->IsInterfaceSupported(aDispatchApiId);
-	  case KDispatchCallControlMultipartyFuncUnitId:
-	    return iLtsyDispatchCallControlMultipartyHandler->IsInterfaceSupported(aDispatchApiId);
-	  case KDispatchSupplementaryServicesFuncUnitId:
-	    return iLtsyDispatchSupplementaryServicesHandler->IsInterfaceSupported(aDispatchApiId);
-	  case KDispatchPacketServicesFuncUnitId:
-	    return iLtsyDispatchPacketServicesHandler->IsInterfaceSupported(aDispatchApiId);
-	  case KDispatchSatFuncUnitId:
-	    return iLtsyDispatchSatHandler->IsInterfaceSupported(aDispatchApiId);
-	  default:
-	    return EFalse;
-	    }
-	}
-
-void CLtsyFactoryV1::IsCallbackIndicatorSupported(TInt aFuncUnitId, TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask)
-	{
-	switch(aFuncUnitId)
-	    {
-	  case KDispatchCallControlFuncUnitId:
-	    iLtsyDispatchCallControlHandler->IsCallbackIndicatorSupported(aIdGroup, aIndIdBitMask);
-	    break;
-	  case KDispatchPhoneFuncUnitId:
-	    iLtsyDispatchPhoneHandler->IsCallbackIndicatorSupported(aIdGroup, aIndIdBitMask);
-	    break;
-	  case KDispatchSecurityFuncUnitId:
-	    iLtsyDispatchSecurityHandler->IsCallbackIndicatorSupported(aIdGroup, aIndIdBitMask);
-	    break;
-	  case KDispatchPhonebookEnFuncUnitId:
-	    iLtsyDispatchPhonebookEnHandler->IsCallbackIndicatorSupported(aIdGroup, aIndIdBitMask);
-	    break;
-	  case KDispatchCellBroadcastFuncUnitId:
-	    iLtsyDispatchCellBroadcastHandler->IsCallbackIndicatorSupported(aIdGroup, aIndIdBitMask);
-	    break;
-	  case KDispatchPhonebookOnFuncUnitId:
-	    iLtsyDispatchPhonebookOnHandler->IsCallbackIndicatorSupported(aIdGroup, aIndIdBitMask);
-	    break;
-	  case KDispatchPhonebookFuncUnitId:
-	    iLtsyDispatchPhonebookHandler->IsCallbackIndicatorSupported(aIdGroup, aIndIdBitMask);
-	    break;
-	  case KDispatchSimFuncUnitId:
-	    iLtsyDispatchSimHandler->IsCallbackIndicatorSupported(aIdGroup, aIndIdBitMask);
-	    break;
-	  case KDispatchSmsFuncUnitId:
-	    iLtsyDispatchSmsHandler->IsCallbackIndicatorSupported(aIdGroup, aIndIdBitMask);
-	    break;
-	  case KDispatchCallControlMultipartyFuncUnitId:
-	    iLtsyDispatchCallControlMultipartyHandler->IsCallbackIndicatorSupported(aIdGroup, aIndIdBitMask);
-	    break;
-	  case KDispatchSupplementaryServicesFuncUnitId:
-	    iLtsyDispatchSupplementaryServicesHandler->IsCallbackIndicatorSupported(aIdGroup, aIndIdBitMask);
-	    break;
-	  case KDispatchPacketServicesFuncUnitId:
-	    iLtsyDispatchPacketServicesHandler->IsCallbackIndicatorSupported(aIdGroup, aIndIdBitMask);
-	    break;
-	  case KDispatchSatFuncUnitId:
-	    iLtsyDispatchSatHandler->IsCallbackIndicatorSupported(aIdGroup, aIndIdBitMask);
-	    break;
-	  default:
-		  aIndIdBitMask = 0;//no support
-		 break;
-	    }
-	}
-
-CTsySatMessagingBase* CLtsyFactoryV1::GetSatMessagingService(MCtsySatService& /*aSatMessagingService*/)
-	{
-		return NULL;
-	}
-
-/**
- * Called by the CTSY Dispatcher to inform this object that it can clean itself up.
- */
-void CLtsyFactoryV1::Release()
-	{
-	TSYLOGENTRYEXIT;
-	delete this;
-	} // CLtsyFactoryV1::Release
-
-/**
- * Creates an instance of an object implementing the MLtsyFactoryBase interface.
- * ConstructL() must be called on the object returned before it is used.
- */
-EXPORT_C MLtsyFactoryBase* LTsyFactoryL()
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyFactoryV1* factory = new (ELeave) CLtsyFactoryV1;
-	return factory;
-	} // LTsyFactoryL
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/src/cltsypacketserviceshandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,995 +0,0 @@
-// 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:
-// CLtsyPacketServicesHandler
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mmtsy_ipcdefs.h>
-#include <pcktcs.h>
-#include <ctsy/ltsy/ltsylogger.h>
-
-#include "commengine.h"
-#include "tsyconfg.h"
-#include "cltsypacketserviceshandler.h"
-#include "ltsymacros.h"
-#include "tsyconfg.h"
-#include "mslogger.h"
-#include "atgprsattach.h"
-#include "atgprsdetach.h"
-#include "atgprsntwkregstatus.h"
-#include "atgprsconfig.h"
-#include "initialisepdpcontext.h"
-#include "atgprscontextactivate.h"
-#include "activatecontextandgetaddr.h"
-#include "atgprscontextdeactivate.h"
-#include "atgprscontextdelete.h"
-#include "atgprsqosprofile.h"
-#include "asynchelperrequest.h"
-#include "atgprsntwkregstatuschange.h"
-
-CLtsyPacketServicesHandler::CLtsyPacketServicesHandler(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback,
-	CGlobalPhonemanager* aGloblePhone)
-	: iCtsyDispatcherCallback(aCtsyDispatcherCallback),
-	iGloblePhone(aGloblePhone)
-	{
-	}
-	
-CLtsyPacketServicesHandler::~CLtsyPacketServicesHandler()
-	{
-	if(iAsyncHelperRequest)
-		{
-		delete iAsyncHelperRequest;
-		iAsyncHelperRequest = NULL;
-		}
-	if(iNtwkRegStatusChange)
-		{
-		delete iNtwkRegStatusChange;
-		iNtwkRegStatusChange = NULL;
-		}
-	}
-
-CLtsyPacketServicesHandler* CLtsyPacketServicesHandler::NewLC(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback,
-	CGlobalPhonemanager* aGloblePhone)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyPacketServicesHandler* self = new (ELeave) CLtsyPacketServicesHandler(aCtsyDispatcherCallback,aGloblePhone);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CLtsyPacketServicesHandler* CLtsyPacketServicesHandler::NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback,
-		CGlobalPhonemanager* aGloblePhone)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyPacketServicesHandler* self=
-			CLtsyPacketServicesHandler::NewLC(aCtsyDispatcherCallback,aGloblePhone);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CLtsyPacketServicesHandler::ConstructL()
-/**
- * Second phase constructor.
- */
-	{
-	TSYLOGENTRYEXIT;
-	iAsyncHelperRequest = CAsyncHelperRequest::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-	iInitialisePdpContext = CInitialisePdpContext::NewL(*iGloblePhone, iCtsyDispatcherCallback);
-	iNtwkRegStatusChange = CATGprsNtwkRegStatusChange::NewL((*iGloblePhone), iCtsyDispatcherCallback);	
-	} // CLtsyPacketServicesHandler::ConstructL
-
-TBool CLtsyPacketServicesHandler::IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId)
-/**
- * Returns whether a Dispatch Interface APi is supported or not.
- * 
- * @param aDispatchApiId Id of Dispatch interface being queried
- * @return indication whether interface is supported or not
- */
-	{
-	switch(aDispatchApiId)
-		{
-		// Insert ApiIds when support is provided in LTSY e.g.
-		case KLtsyDispatchPacketServicesPacketAttachApiId: 
-			return ETrue;
-		case KLtsyDispatchPacketServicesGetPacketAttachModeApiId: 
-			return ETrue;	
-		case KLtsyDispatchPacketServicesGetPacketNetworkRegistrationStatusApiId: 
-			return ETrue;			
-		case KLtsyDispatchPacketServicesPacketDetachApiId: 
-			return ETrue;
-		case KLtsyDispatchPacketServicesSetPdpContextConfigApiId: 
-			return ETrue;			
-		case KLtsyDispatchPacketServicesModifyActivePdpContextApiId: 
-			return EFalse;			
-		case KLtsyDispatchPacketServicesInitialisePdpContextApiId: 
-			return ETrue;			
-		case KLtsyDispatchPacketServicesDeletePdpContextApiId: 
-			return ETrue;
-		case KLtsyDispatchPacketServicesSetPacketAttachModeApiId: 
-			return EFalse;	
-		case KLtsyDispatchPacketServicesNotifyPacketStatusChangeApiId: 
-			return ETrue;			
-		case KLtsyDispatchPacketServicesSetDefaultPdpContextGprsParamsApiId: 
-			return ETrue;			
-		case KLtsyDispatchPacketServicesSetDefaultPdpContextR99R4ParamsApiId: 
-			return ETrue;			
-		case KLtsyDispatchPacketServicesActivatePdpContextApiId: 
-			return ETrue;
-		case KLtsyDispatchPacketServicesSetPdpContextQosGprsApiId: 
-			return ETrue;
-		case KLtsyDispatchPacketServicesSetPdpContextQosR99R4ApiId: 
-			return ETrue;			
-		case KLtsyDispatchPacketServicesSetPdpContextQosR5ApiId: 
-			return ETrue;			
-		case KLtsyDispatchPacketServicesRejectNetworkInitiatedContextActivationRequestApiId: 
-			return ETrue;			
-		case KLtsyDispatchPacketServicesDeactivatePdpContextApiId: 
-			return ETrue;
-		case KLtsyDispatchPacketServicesAddPacketFilterApiId: 
-			return EFalse;
-		case KLtsyDispatchPacketServicesGetStatusApiId: 
-			return ETrue;			
-		case KLtsyDispatchPacketServicesGetStaticCapabilitiesApiId: 
-			return EFalse;
-		case KLtsyDispatchPacketServicesGetMaxNoMonitoredServiceListsApiId: 
-			return EFalse;			
-		case KLtsyDispatchPacketServicesGetMaxNoActiveServicesApiId: 
-			return EFalse;
-		case KLtsyDispatchPacketServicesInitialiseMbmsContextApiId: 
-			return EFalse;			
-		case KLtsyDispatchPacketServicesGetMbmsNetworkServiceStatusApiId: 
-			return EFalse;			
-		case KLtsyDispatchPacketServicesUpdateMbmsMonitorServiceListApiId: 
-			return EFalse;			
-		case KLtsyDispatchPacketServicesUpdateMbmsSessionListApiId: 
-			return EFalse;			
-		case KLtsyDispatchPacketServicesRemovePacketFilterApiId: 
-			return EFalse;			
-		default:
-			return EFalse;
-		}
-	}
-
-void CLtsyPacketServicesHandler::IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask)
-/**
- * Returns the set of callback indicators that are supported.
- * 
- * @param aIdGroup ID of group that is being queried e.g. aIdGroup=EIndIdGroup1
- * @param aIndIdBitMask [out] argument that should return a bitmask indicating which indicator callbacks are supported.
- */
-	{
-	//Create bitmask with bitset for each indicator ID that is supported. E.g.
-	if(aIdGroup == EIndIdGroup1)
-		aIndIdBitMask =   KLtsyDispatchPacketServicesNotifyQosProfileChangedIndId |
-						  KLtsyDispatchPacketServicesNotifyRatTransferCapsChangeIndId |
-						  KLtsyDispatchPacketServicesNotifyPacketDynamicCapsChangeIndId |
-						  KLtsyDispatchPacketServicesNotifyPdpContextAddedIndId |
-						  KLtsyDispatchPacketServicesNotifyNetworkInitiatedContextActivationRequestIndId |
-						  KLtsyDispatchPacketServicesNotifyPdpContextConfigChangedIndId |
-						  KLtsyDispatchPacketServicesNotifyPdpContextStatusChangeIndId |
-						  KLtsyDispatchPacketServicesNotifyPacketNetworkRegistrationStatusIndId;
-	else
-		aIndIdBitMask = 0; //no indicators from other groups supported
-	}
-
-
-TInt CLtsyPacketServicesHandler::HandlePacketAttachReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesPacketAttachComp()
- *
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-    LOGTEXTREL(_L8("pkt:attach"));
-
-	TInt ret = KErrNotSupported;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(KErrNone == ret)
-		{
-		CATGprsAttach* ATGprsAttach = CATGprsAttach::NewL(*iGloblePhone, iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(ATGprsAttach);
-		ATGprsAttach->StartRequest();
-		}
-	else
-	    {
-	    LOGTEXTREL2(_L8("pkt:err(%d) in attach"), ret);
-	    }
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandlePacketAttachReqL
-
-
-TInt CLtsyPacketServicesHandler::HandleGetPacketAttachModeReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesGetPacketAttachModeComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	TInt ret = KErrNone;
-	iAsyncHelperRequest->SetRequestId(MLtsyDispatchPacketServicesGetPacketAttachMode::KLtsyDispatchPacketServicesGetPacketAttachModeApiId);
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleGetPacketAttachModeReqL
-
-
-TInt CLtsyPacketServicesHandler::HandleGetPacketNetworkRegistrationStatusReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesGetPacketNetworkRegistrationStatusComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(KErrNone == ret)
-		{
-		CATGprsNtwkRegStatus* ATGprsNtwkRegStatus = CATGprsNtwkRegStatus::NewL(*iGloblePhone,
-				                                          iCtsyDispatcherCallback,
-				                                          *iNtwkRegStatusChange);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(ATGprsNtwkRegStatus);
-		ATGprsNtwkRegStatus->StartRequest();
-		}
-	else
-	    {
-	    LOGTEXTREL2(_L8("pkt:err(%d) in GetPacketNetworkRegistrationStatus"), ret);
-	    }
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleGetPacketNetworkRegistrationStatusReqL
-
-
-TInt CLtsyPacketServicesHandler::HandlePacketDetachReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesPacketDetachComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-    LOGTEXTREL(_L8("pkt:detach"));
-
-    TInt ret = KErrNotSupported;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(KErrNone == ret)
-		{
-		CATGprsDetach* ATGprsDetach = CATGprsDetach::NewL(*iGloblePhone, iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(ATGprsDetach);
-		ATGprsDetach->StartRequest();
-		}
-	else
-	    {
-        LOGTEXTREL2(_L8("pkt:err(%d) in detach"), ret);
-	    }
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandlePacketDetachReqL
-
-
-TInt CLtsyPacketServicesHandler::HandleSetPdpContextConfigReqL(const TDesC& aContextId,
-		const TDesC8& aAccessPointName,
-		const RPacketContext::TProtocolType aPdpType,
-		const TDesC8& aPdpAddress,
-		const TDesC8& aPcoBuffer)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesSetPdpContextConfigComp()
- *
- * @param contextId The context name, the descriptor should be TBuf<10>
- * @param iAccessPointName The access name which identifies the GGSN to be used
- * @param iPdpType The protocol type
- * @param iPdpAddress The PDP address for this context
- * @param aPcoBuffer The pco buffer
- * 
- * The purpose of the protocol configuration options (PCO) is to transfer external network protocol options 
- * associated with a PDP context activation, and transfer additional (protocol) data 
- * (e.g. configuration parameters, error codes or messages/events) associated with an external protocol 
- * or an application.
- * The protocol configuration options (PCO) is a type 4 information element with a minimum length of 3 
- * octets and a maximum length of 253 octets
- * In order to generate the PCO buffer a TTlvStruct object is being used. The TTlvStruct wraps the buffers  
- * inserted to the PCO and identifies the buffers with given IDs.
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-    LOGTEXTREL2(_L8("pkt:setconfig,APN>%S<"), &aAccessPointName);
-	TInt ret = KErrNotSupported;	
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(KErrNone == ret)
-		{
-		TInt tmp = GetContext(aContextId);
-		if(tmp >= 0)
-			{
-			iGloblePhone->iContextList[tmp]->iDefContextConfigGPRS.iAccessPointName = aAccessPointName;
-			iGloblePhone->iContextList[tmp]->iDefContextConfigGPRS.iPdpType = aPdpType;
-			iGloblePhone->iContextList[tmp]->iDefContextConfigGPRS.iPdpAddress = aPdpAddress;
-			iGloblePhone->iContextList[tmp]->iDefContextConfigGPRS.iProtocolConfigOption.iMiscBuffer = aPcoBuffer;
-			
-						
-			CATGPRSSetConfig* ATGPRSSetConfig = CATGPRSSetConfig::NewL(*iGloblePhone, iCtsyDispatcherCallback);
-			iGloblePhone->iEventSignalActive = ETrue;
-			ATGPRSSetConfig->SetContext(iGloblePhone->iContextList[tmp]->iContextID);
-			iGloblePhone->SetActiveRequest(ATGPRSSetConfig);
-			ATGPRSSetConfig->StartRequest();
-			}
-		else
-		    {
-	        LOGTEXTREL2(_L8("pkt:err(%d) in setconfig, not found"), tmp);
-		    }
-		}
-	else
-	    {
-        LOGTEXTREL2(_L8("pkt:err(%d) in setconfig"), ret);
-	    }
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleSetPdpContextConfigReqL
-
-
-TInt CLtsyPacketServicesHandler::HandleModifyActivePdpContextReqL(const TDesC& /*aContextName*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesModifyActivePdpContextComp()
- *
- * @param aContextName Context name for which the modification is intended
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;	
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleModifyActivePdpContextReqL
-
-
-TInt CLtsyPacketServicesHandler::HandleInitialisePdpContextReqL(const TDesC& aPrimaryContextName, const TDesC& /*aSecondaryContextName*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesInitialisePdpContextComp()
- *
- * @param aPrimaryContextName Primary context name in the form of a character string, the descriptor should be TBuf<10>
- * @param aSecondaryContextName Optional secondary context name in the form of a character string, the descriptor should be TBuf<10>
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	LOGTEXT2(_L8("aPrimaryContextName >%S<"), &aPrimaryContextName);
-	LOGTEXTREL2(_L8("pkt:initctxt>%S<"), &aPrimaryContextName);
-	TInt ret = KErrNone;
-	TInt cid = 0;
-	TInt contextCount = iGloblePhone->iContextList.Count();
-	if(contextCount > 0)
-		{
-		for(TInt i = 0;i < contextCount;i++)
-			{
-			if(iGloblePhone->iContextList[i]->iInfo.iName == aPrimaryContextName)
-				{
-		        LOGTEXTREL2(_L8("pkt:err(%d) in initctxt, already existed"), ret);
-				return KErrNotSupported;
-				}
-			}
-		}
-
-	cid = GenerateNewContextCid(aPrimaryContextName);
-	LOGTEXT2(_L8("newcid=%d"),cid);
-	if(cid > MaxNumberOfContexts())
-	    {
-        LOGTEXTREL2(_L8("pkt:err(%d) in initctxt, context number overflow"), ret);
-		return KErrNotSupported;
-	    }
-	
-	TContextInfomation  *tmpContext = new TContextInfomation;
-	tmpContext->iInfo.iName = aPrimaryContextName;
-	tmpContext->iContextID = cid;
-	iGloblePhone->iContextList.Append(tmpContext);
-	LOGTEXT2(_L8("iGloblePhone->iContextList[0]->iContextID=%d"),iGloblePhone->iContextList[0]->iContextID);
-
-	iInitialisePdpContext->SetContext(cid);
-	iInitialisePdpContext->StartRequest();
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleInitialisePdpContextReqL
-
-
-TInt CLtsyPacketServicesHandler::HandleDeletePdpContextReqL(const TDesC& aContextName)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesDeletePdpContextComp()
- *
- * @param aContextName the context name to be deleted, , the descriptor should be TBuf<10>
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	LOGTEXTREL2(_L8("pkt:delete aContextName:\t%S"),&aContextName);
-	
-	TInt ret = KErrNotSupported;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(KErrNone == ret)
-		{
-		TInt tmp = -1;
-		tmp = GetContext(aContextName);
-		if(tmp >= 0)
-			{		
-			CATGprsContextDelete* ATGprsContextDelete = CATGprsContextDelete::NewL(*iGloblePhone, iCtsyDispatcherCallback);
-			iGloblePhone->iEventSignalActive = ETrue;
-			ATGprsContextDelete->SetContext(iGloblePhone->iContextList[tmp]->iContextID);
-			iGloblePhone->SetActiveRequest(ATGprsContextDelete);
-			ATGprsContextDelete->StartRequest();
-			}
-		else
-			{
-            LOGTEXTREL2(_L8("pkt:err(%d) in deletectxt, not found"), tmp);
-			ret = KErrNotFound;
-			}
-		}
-	else
-	    {
-        LOGTEXTREL2(_L8("pkt:err(%d) in deletectxt"), ret);
-	    }
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleDeletePdpContextReqL
-
-
-TInt CLtsyPacketServicesHandler::HandleSetPacketAttachModeReqL(RPacketService::TAttachMode /*aAttachMode*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesSetPacketAttachModeComp()
- *
- * @param aAttachMode the attach mode due to be set.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	TInt ret = KErrNotSupported;
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleSetPacketAttachModeReqL
-
-
-TInt CLtsyPacketServicesHandler::HandleNotifyPacketStatusChangeReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesNotifyPacketStatusChangeComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleNotifyPacketStatusChangeReqL
-
-
-TInt CLtsyPacketServicesHandler::HandleSetDefaultPdpContextGprsParamsReqL(const RPacketContext::TContextConfigGPRS& aContextConfigGprs)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesSetDefaultPdpContextParamsComp()
- *
- * @param aContextConfigGprs Default GPRS parameters
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	TInt ret = 0;
-	SetDefaultContextConfigGPRS(&aContextConfigGprs);
-	iAsyncHelperRequest->SetRequestId(KLtsyDispatchPacketServicesSetDefaultPdpContextGprsParamsApiId);
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleSetDefaultPdpContextGprsParamsReqL
-
-TInt CLtsyPacketServicesHandler::HandleSetDefaultPdpContextR99R4ParamsReqL(const RPacketContext::TContextConfigR99_R4& /*aContextConfigR99R4*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesSetDefaultPdpContextParamsComp()
- *
- * @param aContextConfigR99R4 Default R99/R4 parameters
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	TInt ret = KErrNotSupported;
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleSetDefaultPdpContextR99R4ParamsReqL
-
-
-
-TInt CLtsyPacketServicesHandler::HandleActivatePdpContextReqL(const TDesC& aContextName)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesActivatePdpContextComp()
- *
- * @param aContextName The context name.	 
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-    LOGTEXTREL(_L8("pkt:activatectxt"));
-	TInt ret = KErrNotSupported;	
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(KErrNone == ret)
-		{
-		TInt tmp = GetContext(aContextName);
-		if(tmp >= 0)
-			{		
-			CActivatContextAndGetAddr* ActivatContextAndGetAddr = CActivatContextAndGetAddr::NewL(*iGloblePhone, iCtsyDispatcherCallback);
-			iGloblePhone->iEventSignalActive = ETrue;
-			ActivatContextAndGetAddr->SetContext(iGloblePhone->iContextList[tmp]->iContextID);
-			iGloblePhone->SetActiveRequest(ActivatContextAndGetAddr);
-			ActivatContextAndGetAddr->StartRequest();
-			}
-		}
-	else
-	    {
-        LOGTEXTREL2(_L8("pkt:err(%d) in activatectxt"), ret);
-	    }
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleActivatePdpContextReqL
-
-
-TInt CLtsyPacketServicesHandler::HandleSetPdpContextQosGprsReqL(const TDesC& aContextName, const RPacketQoS::TQoSGPRSRequested& aQoSConfig)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesSetPdpContextQosComp()
- *
- * @param aContextName the name of the context.
- * @param aQoSConfig the QoS configuration parameters. 
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	
-    LOGTEXTREL(_L8("pkt:setctxtQos"));
-	TInt ret = KErrNotSupported;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(KErrNone == ret)
-		{
-		TInt tmp = GetContext(aContextName);
-		if(tmp >= 0)
-			{		
-			CATGprsSetProfileReq* ATGprsSetProfileReq = CATGprsSetProfileReq::NewL(*iGloblePhone, iCtsyDispatcherCallback);
-			iGloblePhone->iEventSignalActive = ETrue;
-			iGloblePhone->iContextList[tmp]->iQoSConfig = aQoSConfig;
-			ATGprsSetProfileReq->SetContext(iGloblePhone->iContextList[tmp]->iContextID);
-			iGloblePhone->SetActiveRequest(ATGprsSetProfileReq);
-			ATGprsSetProfileReq->StartRequest();
-			}
-		}
-	else
-	    {
-        LOGTEXTREL2(_L8("pkt:err(%d) in setctxtQos"), ret);
-	    }
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleSetPdpContextQosGprsReqL
-
-TInt CLtsyPacketServicesHandler::HandleSetPdpContextQosR99R4ReqL(const TDesC& aContextName, const RPacketQoS::TQoSR99_R4Requested& /*aQoSConfig*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesSetPdpContextQosComp()
- *
- * @param aContextName The name of the context.
- * @param aQoSConfig The QoS configuration parameters. 
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-    TSYLOGENTRYEXIT;
-    
-    RPacketQoS::TQoSGPRSRequested qosGprsReq;
-    qosGprsReq.iReqPrecedence = RPacketQoS::EPriorityMediumPrecedence;
-    qosGprsReq.iMinPrecedence = RPacketQoS::EPriorityMediumPrecedence;
-    qosGprsReq.iReqDelay = RPacketQoS::EUnspecifiedDelayClass;
-    qosGprsReq.iMinDelay = RPacketQoS::EUnspecifiedDelayClass;
-    qosGprsReq.iReqReliability = RPacketQoS::EUnspecifiedReliabilityClass;
-    qosGprsReq.iMinReliability = RPacketQoS::EUnspecifiedReliabilityClass;
-    qosGprsReq.iReqPeakThroughput = RPacketQoS::EUnspecifiedPeakThroughput;
-    qosGprsReq.iMinPeakThroughput = RPacketQoS::EUnspecifiedPeakThroughput;
-    qosGprsReq.iReqMeanThroughput = RPacketQoS::EMeanThroughputBestEffort;
-    qosGprsReq.iMinMeanThroughput = RPacketQoS::EMeanThroughputBestEffort;
-
-    return HandleSetPdpContextQosGprsReqL(aContextName, qosGprsReq);
-    } // CLtsyPacketServicesHandler::HandleSetPdpContextQosR99R4ReqL
-
-TInt CLtsyPacketServicesHandler::HandleSetPdpContextQosR5ReqL(const TDesC& aContextName, const RPacketQoS::TQoSR5Requested& /*aQoSConfig*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesSetPdpContextQosComp()
- *
- * @param aContextName The name of the context.
- * @param aQoSConfig The QoS configuration parameters. 
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-    TSYLOGENTRYEXIT;
-    
-    RPacketQoS::TQoSGPRSRequested qosGprsReq;
-    qosGprsReq.iReqPrecedence = RPacketQoS::EPriorityMediumPrecedence;
-    qosGprsReq.iMinPrecedence = RPacketQoS::EPriorityMediumPrecedence;
-    qosGprsReq.iReqDelay = RPacketQoS::EUnspecifiedDelayClass;
-    qosGprsReq.iMinDelay = RPacketQoS::EUnspecifiedDelayClass;
-    qosGprsReq.iReqReliability = RPacketQoS::EUnspecifiedReliabilityClass;
-    qosGprsReq.iMinReliability = RPacketQoS::EUnspecifiedReliabilityClass;
-    qosGprsReq.iReqPeakThroughput = RPacketQoS::EUnspecifiedPeakThroughput;
-    qosGprsReq.iMinPeakThroughput = RPacketQoS::EUnspecifiedPeakThroughput;
-    qosGprsReq.iReqMeanThroughput = RPacketQoS::EMeanThroughputBestEffort;
-    qosGprsReq.iMinMeanThroughput = RPacketQoS::EMeanThroughputBestEffort;
-
-    return HandleSetPdpContextQosGprsReqL(aContextName, qosGprsReq);
-    } // CLtsyPacketServicesHandler::HandleSetPdpContextQosR5ReqL
-	
-
-
-TInt CLtsyPacketServicesHandler::HandleRejectNetworkInitiatedContextActivationRequestReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesRejectNetworkInitiatedContextActivationRequestComp()
- * 
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleRejectNetworkInitiatedContextActivationRequestReqL
-
-
-TInt CLtsyPacketServicesHandler::HandleDeactivatePdpContextReqL(const TDesC& aContextName)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesDeactivatePdpContextComp()
- *
- * @param aContextName The context name that is to be deactivated.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-    LOGTEXTREL2(_L8("pkt:deact ctxt>%S<"),&aContextName);
-	TInt ret = KErrNotSupported;
-
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(KErrNone == ret)
-		{
-		TInt tmp = GetContext(aContextName);
-		if(tmp >= 0)
-			{	
-			CATGprsContextDeactivate* ATGprsContextDeactivate = CATGprsContextDeactivate::NewL(*iGloblePhone, iCtsyDispatcherCallback);
-			iGloblePhone->iEventSignalActive = ETrue;
-			ATGprsContextDeactivate->SetContext(iGloblePhone->iContextList[tmp]->iContextID);
-			iGloblePhone->SetActiveRequest(ATGprsContextDeactivate);
-			ATGprsContextDeactivate->StartRequest();
-			ret = KErrNone;
-			}
-		else
-		    {
-	        LOGTEXTREL2(_L8("pkt:err(%d) in deact ctxt, not found"), tmp);
-		    ret = KErrNotFound;
-		    }
-		}
-	else
-	    {
-        LOGTEXTREL2(_L8("pkt:err(%d) in deact ctxt"), ret);
-	    }
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleDeactivatePdpContextReqL
-
-TInt CLtsyPacketServicesHandler::HandleAddPacketFilterSyncL(const TDesC& /*aContextName*/,  CArrayFixFlat<RPacketContext::TPacketFilterV2>& /*aContextFilter*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesSetPdpContextConfigComp
- * 
- * @param aContextName The name of the context.
- * @param aContextFilter An array contains up to eight filters to be used
- * for configuring the secondary context.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleAddPacketFilterSyncL
-
-
-TInt CLtsyPacketServicesHandler::HandleGetStatusReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesGetStatus()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	TInt ret = 0;
-	iAsyncHelperRequest->SetRequestId(KLtsyDispatchPacketServicesGetStatusApiId);
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleGetStatusReqL
-
-TInt CLtsyPacketServicesHandler::HandleGetStaticCapabilitiesReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesGetStaticCapabilitiesComp()
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	TInt ret = 0;
-	iAsyncHelperRequest->SetRequestId(KLtsyDispatchPacketServicesGetStaticCapabilitiesApiId);
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleGetStaticCapabilitiesReqL
-
-TInt CLtsyPacketServicesHandler::HandleGetMaxNoMonitoredServiceListsReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesGetMaxNoMonitoredServiceListsComp()
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = 0;
-	iAsyncHelperRequest->SetRequestId(KLtsyDispatchPacketServicesGetMaxNoMonitoredServiceListsApiId);
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleGetMaxNoMonitoredServiceListsReqL
-
-TInt CLtsyPacketServicesHandler::HandleGetMaxNoActiveServicesReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesGetMaxNoActiveServicesComp()
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	TInt ret = 0;
-	iAsyncHelperRequest->SetRequestId(KLtsyDispatchPacketServicesGetMaxNoActiveServicesApiId);
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleGetMaxNoActiveServicesReqL
-
-TInt CLtsyPacketServicesHandler::HandleInitialiseMbmsContextReqL(const TDesC& /*aContextName*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesInitialiseMbmsContextComp()
- *
- * @param aContextName The context name in the form of a character string 
- * the maximum length of the descriptor should not exceed KMaxInfoName.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleInitialiseMbmsContextReqL
-
-TInt CLtsyPacketServicesHandler::HandleGetMbmsNetworkServiceStatusReqL(TBool /*aAttemptAttach*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesGetMbmsNetworkServiceStatusComp()
- * 
- * @param aAttemptAttach If a GMM attached is to be perfomed.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleGetMbmsNetworkServiceStatusReqL
-
-TInt CLtsyPacketServicesHandler::HandleUpdateMbmsMonitorServiceListsReqL(TMbmsAction /*aAction*/, const CPcktMbmsMonitoredServiceList& /*aServiceList*/, const CPcktMbmsMonitoredServiceList& /*aChangeList*/)
-/**
- * It is a request call that is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesUpdateMbmsMonitorServiceListComp()
- * 
- * @param aAction The MBMS action (add, remove or remove all).
- * @param aServiceList The current MBMS monitor service availability list as held by the CTSY.
- * @param aChangeList The list of entries to be changed as per the action. (e.g. the action = Add,
- * the change list will contain entries to be added to the MBMS monitor service availability list)
- *
- * @return KErrNone on success, otherwise another error code indicating the
- * failure.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleUpdateMbmsMonitorServiceListsReqL
-
-
-TInt CLtsyPacketServicesHandler::HandleUpdateMbmsSessionListReqL(const TDesC& /*aContextName*/, TMbmsAction /*aAction*/, TMbmsSessionId /*aSessionId*/, const TMbmsSessionIdList& /*aServiceList*/)
-/**
- * It is a request call that is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesUpdateMbmsSessionListComp()
- * 
- * @param aContextName The MBMS context name in the form of a character string.
- * @param aAction The action to be performed (add, remove or remove all).
- * @param aSessionId The MBMS session identifier which needs to be received or removed.
- * @param aServiceList The MBMS services table as held by the CTSY.
- *
- * @return KErrNone on success, otherwise another error code indicating the
- * failure.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleUpdateMbmsSessionListReqL
-
-
-TInt CLtsyPacketServicesHandler::HandleRemovePacketFilterSyncL(const TDesC& /*aContextName*/, TInt /*aFilterId*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPacketServicesSetPdpContextConfigComp
- * 
- * @param aContextName The name of the context.
- * @param aFilterId The filter Id to be removed.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPacketServicesHandler::HandleRemovePacketFilterSyncL
-
-TInt CLtsyPacketServicesHandler::MaxNumberOfContexts()
-/**
- * This function returns the maximum number of contexts that the phone supports.
- */
-    {
-    return iGloblePhone->iPhoneStatus.iGprsMaxNumContexts;
-    }
-TInt CLtsyPacketServicesHandler::GetContext(const TDesC& aName)
-/**
- * This function returns a specific context
- * @param aCount context to Retrieve in linked list.
- */
-    {
-    TInt index = -1;
-    TInt count = iGloblePhone->iContextList.Count();
-    for(TInt i = 0; i < count; i++)
-    	{
-    	if(0 ==(iGloblePhone->iContextList[i]->iInfo.iName.Compare(aName)))
-    		{
-    		index = i;
-    		}
-    	}
-    
-    LOGTEXT3(_L8("[Ltsy Pkt] iContext->ContextName() >%S<, index=%d"), &aName, index);
-    return index;
-    }
-
-TInt CLtsyPacketServicesHandler::GenerateNewContextCid(const TDesC& /*aName*/)
-/**
- * This function generates a unique context name and the first not taken cid number.
- * There is a 1 to 1 mapping between this Cid and the one in the phone. 
- * In order to do this we need to check all existing Cids, since they may not
- * be in conical order and there can be holes in the list(3,1,4,6,5) we need 
- * to loop around and find the lowest that we can use to create a name and a new
- * Cid.
- * @param aName New name that is generated.
- * @param aCid New context id.
- */
-    {
-    TInt lowestAvailableCid = 1;
-    TInt count = iGloblePhone->iContextList.Count();
-    if(count != 0 )
-        {
-        // There can be gaps between the Cids that the tsy has, so get the
-        // Cid number between them, if any. This nested for loop will find 
-        // the lowest available cid there is.
-        for(TInt k = 0; k < count;k++)
-            {
-            for(TInt i = 0; i < count;i++)
-                {
-                if(iGloblePhone->iContextList[i]->iContextID == lowestAvailableCid)
-                    ++lowestAvailableCid;
-                }
-            }
-        }
-    return lowestAvailableCid;
-    }
-
-void CLtsyPacketServicesHandler::SetDefaultContextConfigGPRS(const RPacketContext::TContextConfigGPRS* aContextConfig)
-/**
- * This function sets the default context configuration.
- *
- * @param aContextConfigV01 Set default context configuration.
- */
-    {
-    iDefContextConfigGPRS.iPdpType = aContextConfig->iPdpType;
-    iDefContextConfigGPRS.iAccessPointName.Copy(aContextConfig->iAccessPointName);
-    iDefContextConfigGPRS.iPdpAddress.Copy(aContextConfig->iPdpAddress);
-    iDefContextConfigGPRS.iPdpCompression = aContextConfig->iPdpCompression;
-    iDefContextConfigGPRS.iAnonymousAccessReqd = aContextConfig->iAnonymousAccessReqd;
-    }
-//
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/handler/src/cltsyphonebookenhandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-// 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:
-// CLtsyPhonebookEnHandler
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mmtsy_ipcdefs.h>
-
-
-
-#include "cltsyphonebookenhandler.h"
-#include <ctsy/ltsy/ltsylogger.h>
-#include "ltsymacros.h"
-#include "globalphonemanager.h"
-#include "atphbkengetinfo.h"
-#include "atphbkenread.h"
-#include "atphbkenreadall.h"
-
-CLtsyPhonebookEnHandler::CLtsyPhonebookEnHandler(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone)
-	:iCtsyDispatcherCallback(aCtsyDispatcherCallback),iGloblePhone(aGloblePhone)
-
-	{
-	}
-
-	
-CLtsyPhonebookEnHandler::~CLtsyPhonebookEnHandler()
-	{
-	}
-
-
-CLtsyPhonebookEnHandler* CLtsyPhonebookEnHandler::NewLC(
-		CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyPhonebookEnHandler* self = new (ELeave) CLtsyPhonebookEnHandler(aCtsyDispatcherCallback,aGloblePhone);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-
-CLtsyPhonebookEnHandler* CLtsyPhonebookEnHandler::NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyPhonebookEnHandler* self=
-			CLtsyPhonebookEnHandler::NewLC(aCtsyDispatcherCallback,aGloblePhone);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-
-void CLtsyPhonebookEnHandler::ConstructL()
-/**
- * Second phase constructor.
- */
-	{
-	TSYLOGENTRYEXIT;
-	
-	
-	} // CLtsyPhonebookEnHandler::ConstructL
-
-TBool CLtsyPhonebookEnHandler::IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId)
-/**
- * Returns whether a Dispatch Interface APi is supported or not.
- * 
- * @param aDispatchApiId Id of Dispatch interface being queried
- * @return indication whether interface is supported or not
- */
-	{
-
-	switch(aDispatchApiId)
-		{
-		// Insert ApiIds when support is provided in LTSY e.g.
-		// case MLtsyDispatchPhoneBootNotifySimStatusReady::KLtsyDispatchPhoneBootNotifySimStatusReadyApiId: return ETrue;
-		case  KLtsyDispatchPhonebookEnStoreGetInfoApiId:
-			return ETrue;
-		case KLtsyDispatchPhonebookEnStoreReadAllApiId:
-			return ETrue;
-		case KLtsyDispatchPhonebookEnStoreReadEntryApiId:
-			return ETrue;
-		default:
-			return EFalse;
-		}
-	}
-
-void CLtsyPhonebookEnHandler::IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup /*aIdGroup*/, TUint32& /*aIndIdBitMask*/)
-/**
- * Returns the set of callback indicators that are supported.
- * 
-* @param aIdGroup ID of group that is being queried e.g. aIdGroup=EIndIdGroup1
-* @param aIndIdBitMask [out] argument that should return a bitmask indicating which indicator callbacks are supported.
- */
-	{
-
-	//Create bitmask with bitset for each indicator ID that is supported. E.g.
-	/*
-	if(aIdGroup == EIndIdGroup1)
-		aIndIdBitMask = KLtsyDispatchPhoneNotifyNetworkModeChangeIndId | 
-						KLtsyDispatchPhoneNotifyEgprsInfoChangeIndId | 
-						KLtsyDispatchPhoneNotifySignalStrengthChangeIndId;
-	else
-		aIndIdBitMask = 0; //no indicators from other groups supported
-	*/
-	}
-
-
-TInt CLtsyPhonebookEnHandler::HandleStoreGetInfoReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookEnStoreGetInfoComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtPhbkEnGetInfo* atPhbkEnGetInfo = CAtPhbkEnGetInfo::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atPhbkEnGetInfo);
-		atPhbkEnGetInfo->StartRequest();
-		}
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookEnHandler::HandleStoreGetInfoReqL
-
-
-TInt CLtsyPhonebookEnHandler::HandleStoreReadAllReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookEnStoreReadAllComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtPhbkEnReadAll* atPhbkEnReadAll = CAtPhbkEnReadAll::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atPhbkEnReadAll);
-		atPhbkEnReadAll->StartRequest();
-		}
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookEnHandler::HandleStoreReadAllReqL
-
-
-TInt CLtsyPhonebookEnHandler::HandleStoreReadEntryReqL(TInt aIndex)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookEnStoreReadEntryComp()
- *
- * @param aIndex index of the EN entry.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtPhbkEnRead* atPhbkEnRead = CAtPhbkEnRead::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atPhbkEnRead);
-		atPhbkEnRead->SetIndex(aIndex);
-		atPhbkEnRead->StartRequest();
-	    }
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookEnHandler::HandleStoreReadEntryReqL
-
-
-
-
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/src/cltsyphonebookhandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,570 +0,0 @@
-// 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:
-// CLtsyPhonebookHandler
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mmtsy_ipcdefs.h>
-#include <mpbutil.h>
-#include <etelmm.h>
-
-
-#include "cltsyphonebookhandler.h"
-#include <ctsy/ltsy/ltsylogger.h>
-#include "ltsymacros.h"
-#include "globalphonemanager.h"
-#include "atsmsstoreinfo.h"
-#include "atsmsstorewrite.h"
-#include "atsmsstoreread.h"
-#include "atsmsstoredelete.h"
-#include "atsmsstorereadall.h"
-#include "atphbkgetphonestoreinfo.h"
-#include "atphbkstoreinitialise.h"
-#include "atphbkstorewrite.h"
-#include "atphbkstoreread.h"
-#include "atphbkstorecache.h"
-#include "atphbkstoredelete.h"
-
-
-CLtsyPhonebookHandler::CLtsyPhonebookHandler(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone)
-    :iCtsyDispatcherCallback(aCtsyDispatcherCallback),iGloblePhone(aGloblePhone)
-	{
-	}
-
-	
-CLtsyPhonebookHandler::~CLtsyPhonebookHandler()
-	{
-
-	}
-
-
-CLtsyPhonebookHandler* CLtsyPhonebookHandler::NewLC(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyPhonebookHandler* self = new (ELeave) CLtsyPhonebookHandler(aCtsyDispatcherCallback,aGloblePhone);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-
-CLtsyPhonebookHandler* CLtsyPhonebookHandler::NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyPhonebookHandler* self=
-			CLtsyPhonebookHandler::NewLC(aCtsyDispatcherCallback,aGloblePhone);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-
-void CLtsyPhonebookHandler::ConstructL()
-/**
- * Second phase constructor.
- */
-	{
-	TSYLOGENTRYEXIT;
-	} // CLtsyPhonebookHandler::ConstructL
-
-TBool CLtsyPhonebookHandler::IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId)
-/**
- * Returns whether a Dispatch Interface APi is supported or not.
- * 
- * @param aDispatchApiId Id of Dispatch interface being queried.
- * @return indication whether interface is supported or not.
- */
-	{
-
-	switch(aDispatchApiId)
-		{
-		case KLtsyDispatchPhonebookStoreReadEntryApiId: 
-			return ETrue;	
-		case KLtsyDispatchPhonebookStoreDeleteEntryApiId: 
-		 	return ETrue;	
-		case KLtsyDispatchPhonebookStoreCacheApiId: 
-			return ETrue;	
-		case KLtsyDispatchPhonebookStoreCacheCancelApiId: 
-			return ETrue;		
-//		case KLtsyDispatchPhonebookStoreGetPhonebookInfoApiId: 
-//			return ETrue;	
-		case KLtsyDispatchPhonebookStoreInitialiseApiId: 
-			return ETrue;			
-		case KLtsyDispatchPhonebookStoreDeleteAllApiId: 
-			return ETrue;	
-		case KLtsyDispatchPhonebookStoreWriteEntryApiId: 
-			return ETrue;	
-		case KLtsyDispatchPhonebookGetPhoneStoreInfoApiId: 
-			return ETrue;		
-		case KLtsyDispatchPhonebookSmsStoreReadAllApiId: 
-			return ETrue;	
-		case KLtsyDispatchPhonebookSmsStoreDeleteEntryApiId: 
-			return ETrue;	
-		case KLtsyDispatchPhonebookSmsStoreDeleteAllApiId: 
-			return ETrue;	
-		case KLtsyDispatchPhonebookSmsStoreGetInfoApiId: 
-			return ETrue;	
-		case KLtsyDispatchPhonebookSmsStoreReadEntryApiId: 
-			return ETrue;		
-		case KLtsyDispatchPhonebookSmsStoreWriteEntryApiId: 
-			return ETrue;	
-		default:
-			return EFalse;
-		}
-	}
-
-void CLtsyPhonebookHandler::IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup /*aIdGroup*/, TUint32& /*aIndIdBitMask*/)
-/**
- * Returns the set of callback indicators that are supported.
- * 
-* @param aIdGroup ID of group that is being queried e.g. aIdGroup=EIndIdGroup1.
-* @param aIndIdBitMask [out] argument that should return a bitmask indicating which indicator callbacks are supported.
- */
-	{
-
-	//Create bitmask with bitset for each indicator ID that is supported. E.g.
-	}
-
-
-TInt CLtsyPhonebookHandler::HandleStoreReadEntryReqL(DispatcherPhonebook::TPhonebook aPhonebook, TInt aIndex, TInt aNumberOfSlots)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookStoreReadEntryComp()
- *
- * @param aPhonebook The phonebook to read entries from.
- * @param aIndex Specifies the index to start reading from, must be >= 1.
- * @param aNumSlots Specifies the number of slots to read, must be >= 1 and <= total number of slots.
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- * 
- * @see RMobilePhoneBookStore::Read()
- */
-	{
-	TSYLOGENTRYEXIT;
-	
-	if((aPhonebook != DispatcherPhonebook::EIccAdn)&&
-			(aPhonebook != DispatcherPhonebook::EIccAdn))
-		{
-		return TSYLOGSETEXITERR(KErrNotSupported);
-		}
-
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtPhbkStoreRead* atPhbkStoreRead = CAtPhbkStoreRead::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atPhbkStoreRead);
-		atPhbkStoreRead->SetPhonebookType(aPhonebook);
-		atPhbkStoreRead->SetReadParam(aIndex,aNumberOfSlots);
-		atPhbkStoreRead->StartRequest();
-	    }
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookHandler::HandleStoreReadEntryReqL
-
-
-TInt CLtsyPhonebookHandler::HandleStoreDeleteEntryReqL(DispatcherPhonebook::TPhonebook aPhonebook, TInt aIndex)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookStoreDeleteEntryComp()
- *
- * @param aPhonebook The phonebook to delete an entry from.
- * @param aIndex The entry index in the phonebook to delete.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- * 
- * @see RMobilePhoneBookStore::Delete() 
- */
-	{
-	TSYLOGENTRYEXIT;
-	
-	if((aPhonebook != DispatcherPhonebook::EIccAdn)&&
-			(aPhonebook != DispatcherPhonebook::EIccAdn))
-		{
-		return TSYLOGSETEXITERR(KErrNotSupported);
-		}
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtPhbkStoreDelete* atPhbkStoreDelete = CAtPhbkStoreDelete::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atPhbkStoreDelete);
-		atPhbkStoreDelete->SetPhonebookType(aPhonebook);
-		atPhbkStoreDelete->SetDeleteIndex(aIndex);
-		atPhbkStoreDelete->StartRequest();
-	    }
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookHandler::HandleStoreDeleteEntryReqL
-
-
-TInt CLtsyPhonebookHandler::HandleStoreCacheReqL(DispatcherPhonebook::TPhonebook aPhonebook)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookStoreCacheComp()
- *
- * @param aPhonebook The phonebook to cache.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	if((aPhonebook != DispatcherPhonebook::EIccAdn)&&
-			(aPhonebook != DispatcherPhonebook::EIccAdn))
-		{
-		return TSYLOGSETEXITERR(KErrNotSupported);
-		}
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtPhbkStoreCache* atPhbkStoreCache = CAtPhbkStoreCache::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atPhbkStoreCache);
-		atPhbkStoreCache->SetPhonebookType(aPhonebook);
-		atPhbkStoreCache->StartRequest();
-	    }
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookHandler::HandleStoreCacheReqL
-
-
-TInt CLtsyPhonebookHandler::HandleStoreGetPhonebookInfoReqL(DispatcherPhonebook::TPhonebook /*aPhonebook*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookStoreGetPhonebookInfoComp()
- *
- * @param aPhonebook The phonebook to retrieve the information from.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- * 
- * @see RMobilePhoneBookStore::GetInfo() 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookHandler::HandleStoreGetPhonebookInfoReqL
-
-
-TInt CLtsyPhonebookHandler::HandleStoreInitialiseReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookStoreInitialiseComp()
- *
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-    TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtPhbkStoreInitialise* atPhbkStoreInitialise = CAtPhbkStoreInitialise::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atPhbkStoreInitialise);
-		atPhbkStoreInitialise->StartRequest();
-	    }
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookHandler::HandleStoreInitialiseReqL
-
-
-TInt CLtsyPhonebookHandler::HandleStoreDeleteAllReqL(DispatcherPhonebook::TPhonebook /*aPhonebook*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookStoreDeleteAllComp()
- *
- * @param aPhonebook The phonebook to delete all entries from.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- * 
- * @see RMobilePhoneBookStore::DeleteAll() 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookHandler::HandleStoreDeleteAllReqL
-
-
-TInt CLtsyPhonebookHandler::HandleSmsStoreReadAllReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookSmsStoreReadAllComp().
- *
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtSmsStoreReadAll* atSmsStoreReadAll = CAtSmsStoreReadAll::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atSmsStoreReadAll);
-		atSmsStoreReadAll->StartRequest();
-	    }
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookHandler::HandleSmsStoreReadAllReqL
-
-
-TInt CLtsyPhonebookHandler::HandleStoreWriteEntryReqL(DispatcherPhonebook::TPhonebook aPhonebook, const TDesC8& aEntry)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookStoreWriteEntryComp()
- *
- * @param aPhonebook The phonebook to be written to.
- * @param aEntry The entry to be written, this is coded as a TLV, this can be decoded either
- * directly via a CPhoneBookBuffer() or via the CPhoneBookEntry::InternalizeFromTlvEntry() utility.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- * 
- * @see RMobilePhoneBookStore::Write()
- * @see CPhoneBookBuffer()
- * @see CPhoneBookEntry::InternalizeFromTlvEntry()
- */
-	{
-	TSYLOGENTRYEXIT;
-	if((aPhonebook != DispatcherPhonebook::EIccAdn)&&
-			(aPhonebook != DispatcherPhonebook::EIccAdn))
-		{
-		return TSYLOGSETEXITERR(KErrNotSupported);
-		}
-	
-    TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtPhbkStoreWrite* atPhbkStoreWrite = CAtPhbkStoreWrite::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atPhbkStoreWrite);
-		atPhbkStoreWrite->SetPhonebookType(aPhonebook);
-		atPhbkStoreWrite->SetPhonebookEntryL(aEntry);
-		atPhbkStoreWrite->StartRequest();
-	    }              
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookHandler::HandleStoreWriteEntryReqL
-
-
-TInt CLtsyPhonebookHandler::HandleGetPhoneStoreInfoReqL(const TDesC& aStoreName)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookGetPhoneStoreInfoComp()
- *
- * @param aStoreName The store to retrieve the information from.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- * 
- * @see RMobilePhone::GetPhoneStoreInfo()
- */
-	{
-	TSYLOGENTRYEXIT;
-	if((aStoreName.CompareF(KETelIccFdnPhoneBook) != KErrNone)
-		&&(aStoreName.CompareF(KETelIccAdnPhoneBook) != KErrNone)
-		&&(aStoreName.CompareF(KETelIccSmsStore) != KErrNone))
-		{
-		return TSYLOGSETEXITERR(KErrNotSupported);
-		}
-	
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtPhbkGetPhoneStoreInfo* atPhbkGetPhoneStoreInfo =CAtPhbkGetPhoneStoreInfo::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atPhbkGetPhoneStoreInfo);
-		atPhbkGetPhoneStoreInfo->SetPhoneStoreParam(aStoreName);
-		atPhbkGetPhoneStoreInfo->StartRequest();
-	    }
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookHandler::HandleGetPhoneStoreInfoReqL
-
-
-TInt CLtsyPhonebookHandler::HandleSmsStoreDeleteEntryReqL(TInt aIndex)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookSmsStoreDeleteEntryComp().
- *
- * @param aIndex index of the entry to be deleted from the SMS store.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtSmsStoreDelete* atSmsStoreDelete = CAtSmsStoreDelete::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atSmsStoreDelete);
-		atSmsStoreDelete->SetDelIndex(aIndex);
-		atSmsStoreDelete->StartRequest();
-		}
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookHandler::HandleSmsStoreDeleteEntryReqL
-
-
-TInt CLtsyPhonebookHandler::HandleSmsStoreDeleteAllReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookSmsStoreDeleteAllComp().
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtSmsStoreDeleteAll* atSmsStoreDeleteAll = CAtSmsStoreDeleteAll::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atSmsStoreDeleteAll);
-		atSmsStoreDeleteAll->StartRequest();
-		}
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookHandler::HandleSmsStoreDeleteAllReqL
-
-
-TInt CLtsyPhonebookHandler::HandleSmsStoreGetInfoReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookSmsStoreGetInfoComp().
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtSmsStoreInfo* atSmsStoreInfo = CAtSmsStoreInfo::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atSmsStoreInfo);
-		atSmsStoreInfo->StartRequest();
-		}
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookHandler::HandleSmsStoreGetInfoReqL
-
-
-TInt CLtsyPhonebookHandler::HandleSmsStoreReadEntryReqL(TInt aIndex)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookSmsStoreReadEntryComp().
- *
- * @param aIndex index of the entry to be read.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtSmsStoreRead* atSmsStoreRead = CAtSmsStoreRead::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atSmsStoreRead);
-		atSmsStoreRead->SetMsgIndex(aIndex);
-		atSmsStoreRead->StartRequest();
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookHandler::HandleSmsStoreReadEntryReqL
-
-
-TInt CLtsyPhonebookHandler::HandleSmsStoreWriteEntryReqL(const RMobileSmsStore::TMobileGsmSmsEntryV1& aMobileGsmEntry)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookSmsStoreWriteEntryComp().
- *
- * @param aMobileGsmEntry Defines contents of a fixed-size GSM SMS entry to be stored.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtSmsStoreWrite* atSmsStoreWrite = CAtSmsStoreWrite::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atSmsStoreWrite);
-		atSmsStoreWrite->SeGsmSmsEntry(aMobileGsmEntry);
-		atSmsStoreWrite->StartRequest();
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookHandler::HandleSmsStoreWriteEntryReqL
-
-
-TInt CLtsyPhonebookHandler::HandleStoreCacheCancelReqL(DispatcherPhonebook::TPhonebook /*aPhonebook*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookStoreCacheCancel()
- *
- * @param aPhonebook The phonebook to cancel the pending cache.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookHandler::HandleStoreCacheCancelReqL
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/src/cltsyphonebookonhandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,288 +0,0 @@
-// 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:
-// CLtsyPhonebookOnHandler
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mmtsy_ipcdefs.h>
-
-
-
-#include "cltsyphonebookonhandler.h"
-#include <ctsy/ltsy/ltsylogger.h>
-#include "ltsymacros.h"
-
-
-
-CLtsyPhonebookOnHandler::CLtsyPhonebookOnHandler(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	: iCtsyDispatcherCallback(aCtsyDispatcherCallback)
-	{
-	}
-
-	
-CLtsyPhonebookOnHandler::~CLtsyPhonebookOnHandler()
-	{
-	}
-
-
-CLtsyPhonebookOnHandler* CLtsyPhonebookOnHandler::NewLC(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyPhonebookOnHandler* self = new (ELeave) CLtsyPhonebookOnHandler(aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-
-CLtsyPhonebookOnHandler* CLtsyPhonebookOnHandler::NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyPhonebookOnHandler* self=
-			CLtsyPhonebookOnHandler::NewLC(aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-
-void CLtsyPhonebookOnHandler::ConstructL()
-/**
- * Second phase constructor.
- */
-	{
-	TSYLOGENTRYEXIT;
-	
-	
-	} // CLtsyPhonebookOnHandler::ConstructL
-
-TBool CLtsyPhonebookOnHandler::IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId)
-/**
- * Returns whether a Dispatch Interface APi is supported or not.
- * 
- * @param aDispatchApiId Id of Dispatch interface being queried
- * @return indication whether interface is supported or not
- */
-	{
-
-	
-	switch(aDispatchApiId)
-		{
-		// Insert ApiIds when support is provided in LTSY e.g.
-		// case MLtsyDispatchPhoneBootNotifySimStatusReady::KLtsyDispatchPhoneBootNotifySimStatusReadyApiId: return ETrue;
-		
-		default:
-			return EFalse;
-		}
-	}
-
-void CLtsyPhonebookOnHandler::IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup /*aIdGroup*/, TUint32& /*aIndIdBitMask*/)
-/**
- * Returns the set of callback indicators that are supported.
- * 
-* @param aIdGroup ID of group that is being queried e.g. aIdGroup=EIndIdGroup1
-* @param aIndIdBitMask [out] argument that should return a bitmask indicating which indicator callbacks are supported.
- */
-	{
-
-	//Create bitmask with bitset for each indicator ID that is supported. E.g.
-	/*
-	if(aIdGroup == EIndIdGroup1)
-		aIndIdBitMask = KLtsyDispatchPhoneNotifyNetworkModeChangeIndId | 
-						KLtsyDispatchPhoneNotifyEgprsInfoChangeIndId | 
-						KLtsyDispatchPhoneNotifySignalStrengthChangeIndId;
-	else
-		aIndIdBitMask = 0; //no indicators from other groups supported
-	*/
-	}
-
-
-TInt CLtsyPhonebookOnHandler::HandleStoreReadReqL(TInt /*aIndex*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookOnStoreReadComp
- *
- * @param aIndex index of the entry.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookOnHandler::HandleStoreReadReqL
-
-
-TInt CLtsyPhonebookOnHandler::HandleStoreDeleteAllReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookOnStoreDeleteAllComp
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookOnHandler::HandleStoreDeleteAllReqL
-
-
-TInt CLtsyPhonebookOnHandler::HandleStoreReadEntryReqL(TInt /*aIndex*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookOnStoreReadEntryComp
- *
- * @param aIndex index of the ON entry.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookOnHandler::HandleStoreReadEntryReqL
-
-
-TInt CLtsyPhonebookOnHandler::HandleStoreGetInfoReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookOnStoreGetInfoComp
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookOnHandler::HandleStoreGetInfoReqL
-
-
-TInt CLtsyPhonebookOnHandler::HandleStoreGetReadStoreSizeReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookOnStoreGetReadStoreSizeComp
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookOnHandler::HandleStoreGetReadStoreSizeReqL
-
-
-TInt CLtsyPhonebookOnHandler::HandleStoreDeleteEntryReqL(TInt /*aIndex*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookOnStoreDeleteEntryComp
- *
- * @param aIndex index of the ON entry.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookOnHandler::HandleStoreDeleteEntryReqL
-
-
-TInt CLtsyPhonebookOnHandler::HandleStoreWriteEntryReqL(const RMobileONStore::TMobileONEntryV1& /*aMobileOnEntry*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookOnStoreWriteEntryComp
- *
- * @param aMobileOnEntry defines contents of a fixed-size ON entry to be stored.  
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookOnHandler::HandleStoreWriteEntryReqL
-
-
-TInt CLtsyPhonebookOnHandler::HandleStoreWriteReqL(const RMobileONStore::TMobileONEntryV1& /*aMobileOnEntry*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookOnStoreWriteComp
- *
- * @param aMobileOnEntry defines contents of a fixed-size ON entry to be stored.  
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookOnHandler::HandleStoreWriteReqL
-
-
-TInt CLtsyPhonebookOnHandler::HandleStoreGetStoreSizeReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhonebookOnStoreGetStoreSizeComp
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhonebookOnHandler::HandleStoreGetStoreSizeReqL
-
-
-
-
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/src/cltsyphonehandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1218 +0,0 @@
-// 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:
-// CLtsyPhoneHandler
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mmtsy_ipcdefs.h>
-#include <etelmm.h>
-#include <ctsy/ltsy/ltsylogger.h>
-#include <ctsy/ltsy/mltsydispatchphoneinterface.h>
-
-#include "cltsyphonehandler.h"
-#include "ltsymacros.h"
-#include "atgetmodemstatus.h"
-#include "atgetnetworkregistrationstatus.h"
-#include "atgetsimstatusready.h"
-#include "atgetnetworkinfo.h"
-#include "atgetsignalstrength.h"
-#include "atgetbatteryinfo.h"
-#include "atdetectnetwork.h"
-#include "getphoneid.h"
-#include "initializephone.h"
-#include "mslogger.h"
-#include "athangup.h"
-#include "getoperatorname.h"
-#include "atselectnetworkmode.h"
-#include "atselectnetwork.h"
-#include "atgetphonecellinfo.h"
-#include "atgetcellinfo.h"
-#include "atsetnotifycell.h"
-#include "asynchelperrequest.h"
-#include "atnetworkregstatuschange.h"
-#include "atnotifycellinfo.h"
-#include "notifybatteryandsignal.h"
-#include "getfdnstatus.h"
-#include "getcurrentnetworkinfo.h"
-#include "atgetphonecellinfo.h"
-
-CLtsyPhoneHandler::CLtsyPhoneHandler(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone)
-	: iCtsyDispatcherCallback(aCtsyDispatcherCallback),iGloblePhone(aGloblePhone)
-	{
-	}
-
-	
-CLtsyPhoneHandler::~CLtsyPhoneHandler()
-	{
-	if(iAsyncHelperRequest)
-		{
-		delete iAsyncHelperRequest;
-		iAsyncHelperRequest = NULL;
-		}	
-	if(iNetworkRegStatusChange)
-		{
-		delete iNetworkRegStatusChange;
-		iNetworkRegStatusChange = NULL;
-		}
-	if(iNotifyCellInfo)
-		{
-		delete iNotifyCellInfo;
-		iNotifyCellInfo = NULL;
-		}
-	if(iNotifyBatteryAndSignal)
-		{
-		delete iNotifyBatteryAndSignal;
-		iNotifyBatteryAndSignal = NULL;
-		}
-	if(iInitializePhone)
-		{
-		delete iInitializePhone;
-		iInitializePhone = NULL;
-		}
-	if(iATDetectNetwork)
-		{
-		delete iATDetectNetwork;
-		iATDetectNetwork = NULL;
-		}
-	}
-
-
-CLtsyPhoneHandler* CLtsyPhoneHandler::NewLC(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyPhoneHandler* self = new (ELeave) CLtsyPhoneHandler(aCtsyDispatcherCallback,aGloblePhone);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-
-CLtsyPhoneHandler* CLtsyPhoneHandler::NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback,
-		CGlobalPhonemanager* aGloblePhone)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsyPhoneHandler* self=
-			CLtsyPhoneHandler::NewLC(aCtsyDispatcherCallback,aGloblePhone);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-
-void CLtsyPhoneHandler::ConstructL()
-/**
- * Second phase constructor.
- */
-	{
-	TSYLOGENTRYEXIT;
-	
-	//for temp
-	iNetworkRegStatusChange = CATNetworkRegStatusChange::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-	iAsyncHelperRequest = CAsyncHelperRequest::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-	iNotifyCellInfo = CATNotifyCellInfo::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-	iNotifyBatteryAndSignal = CNotifyBatteryAndSignal::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-	iInitializePhone = CInitializePhone::NewL(*iGloblePhone,
-			                                  iCtsyDispatcherCallback,
-			                                  *iNetworkRegStatusChange,
-			                                  *iNotifyBatteryAndSignal);
-	iATDetectNetwork  = CATDetectNetwork::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-	iATSelectNetwork  = CATSelectNetwork::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-	} // CLtsyPhoneHandler::ConstructL
-
-TBool CLtsyPhoneHandler::IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId)
-/**
- * Returns whether a Dispatch Interface APi is supported or not.
- * 
- * @param aDispatchApiId Id of Dispatch interface being queried
- * @return indication whether interface is supported or not
- */
-	{
-	switch(aDispatchApiId)
-		{
-		// Insert ApiIds when support is provided in LTSY e.g.
-		case KLtsyDispatchPhoneBootNotifyModemStatusReadyApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneBootNotifySimStatusReadyApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneGetFdnStatusApiId: 
-			return ETrue; 
-		case KLtsyDispatchPhoneGetHomeNetworkApiId: 
-			return ETrue;	
-		case KLtsyDispatchPhoneGetNetworkRegistrationStatusApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneSimRefreshRegisterApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneGetServiceProviderNameApiId: 
-			return ETrue; //Not finished
-		case KLtsyDispatchPhoneGetPhoneIdApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneGetDetectedNetworksApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneGetDetectedNetworksCancelApiId: 
-			return ETrue; //
-		case KLtsyDispatchPhoneSelectNetworkApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneSelectNetworkCancelApiId: 
-			return ETrue; //KErrNotSupported
-		case KLtsyDispatchPhoneSetNetworkSelectionSettingApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneGetCurrentNetworkInfoApiId: 
-			return ETrue; //Finished ?
-		case KLtsyDispatchPhoneGetNetworkModeApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneGetNitzInfoApiId: 
-			return ETrue; 
-		case KLtsyDispatchPhoneGetSignalStrengthApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneGetBatteryInfoApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneNspsWakeupApiId: 
-			return EFalse;
-		case KLtsyDispatchPhoneSetSystemNetworkModeApiId: 
-			return EFalse;
-		case KLtsyDispatchPhoneGetCurrentSystemNetworkModesApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneResetNetServerApiId: 
-			return EFalse;
-		case KLtsyDispatchPhoneSetAlwaysOnModeApiId: 
-			return EFalse;
-		case KLtsyDispatchPhoneSetDriveModeApiId: 
-			return EFalse;
-		case KLtsyDispatchPhoneGetHspaStatusApiId: 
-			return EFalse;
-		case KLtsyDispatchPhoneSetHspaStatusApiId: 
-			return EFalse;
-		case KLtsyDispatchPhoneGetNetworkProviderNameApiId: 
-			return ETrue;  
-		case KLtsyDispatchPhoneGetOperatorNameApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneGetCellInfoApiId: 
-			return ETrue;  
-		case KLtsyDispatchPhoneRegisterCellInfoChangeNotificationApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneGetPhoneCellInfoApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneGetUsimServiceSupportApiId: 
-			return EFalse;
-		case KLtsyDispatchPhoneGetCurrentActiveUsimApplicationApiId: 
-			return EFalse;
-		case KLtsyDispatchPhoneTerminateAllCallsApiId: 
-			return ETrue;
-		case KLtsyDispatchPhoneGetSystemNetworkBandApiId: 
-			return EFalse;
-		case KLtsyDispatchPhoneSetSystemNetworkBandApiId: 
-			return EFalse;
-		default:
-			return EFalse;
-		}
-	}
-
-void CLtsyPhoneHandler::IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask)
-/**
- * Returns the set of callback indicators that are supported.
- * 
-* @param aIdGroup ID of group that is being queried e.g. aIdGroup=EIndIdGroup1.
-* @param aIndIdBitMask [out] argument that should return a bitmask indicating which indicator callbacks are supported.
- */
-	{
-	//Create bitmask with bitset for each indicator ID that is supported. E.g.
-	if(aIdGroup == EIndIdGroup1)
-		aIndIdBitMask =   KLtsyDispatchPhoneNotifyNetworkModeChangeIndId |
-						  KLtsyDispatchPhoneNotifyEgprsInfoChangeIndId |
-						  KLtsyDispatchPhoneNotifySignalStrengthChangeIndId |
-						  KLtsyDispatchPhoneNotifyNetworkRegistrationStatusChangeIndId |
-						  KLtsyDispatchPhoneNotifyNitzInfoChangeIndId |
-						  KLtsyDispatchPhoneNotifyBatteryInfoChangeIndId |
-						  KLtsyDispatchPhoneNotifyCurrentNetworkChangeIndId |
-						  KLtsyDispatchPhoneNotifyRfStatusChangeIndId |
-						  KLtsyDispatchPhoneNotifyCellInfoChangeIndId ;
-	else
-		aIndIdBitMask = 0; //no indicators from other groups supported
-	
-	}
-
-TInt CLtsyPhoneHandler::HandleGetFdnStatusReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetFdnStatusComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	TInt ret = KErrNotSupported;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == KErrNone)
-		{
-		CGetFdnStatus* GetFdnStatus  = CGetFdnStatus::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(GetFdnStatus);
-		GetFdnStatus->StartRequest();
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetFdnStatusReqL
-
-
-TInt CLtsyPhoneHandler::HandleGetNetworkRegistrationStatusReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetNetworkRegistrationStatusComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	TInt ret = KErrNone;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == EPhoneInitialising)
-		{
-		iInitializePhone->AppendIpcRequestToPendingListL(KLtsyDispatchPhoneGetNetworkRegistrationStatusApiId);
-		iInitializePhone->ExecutePendingRequest();   
-		ret = KErrNone;
-		}
-	else if(ret == KErrNone)
-		{
-		CATNetworkRegistration* atNetworkRegStatus  = CATNetworkRegistration::NewL(*iGloblePhone,
-				                                                                   iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atNetworkRegStatus);
-		atNetworkRegStatus->SetIpcRequestCompleteObserver(this);
-		atNetworkRegStatus->SetIpcId(KLtsyDispatchPhoneGetNetworkRegistrationStatusApiId);
-		iNetworkRegStatusChange->Disable();
-		atNetworkRegStatus->StartRequest();
-		}
-	 
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetNetworkRegistrationStatusReqL
-
-
-TInt CLtsyPhoneHandler::HandleGetHomeNetworkReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetHomeNetworkComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-	TInt ret = KErrNotSupported;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == EPhoneInitialising)
-		{
-		iInitializePhone->AppendIpcRequestToPendingListL(KLtsyDispatchPhoneGetHomeNetworkApiId);
-        iInitializePhone->ExecutePendingRequest();   
-		ret = KErrNone;
-		}
-	else if(ret == KErrNone)
-		{
-		CATNetworkInfo* ATNetworkInfo  = CATNetworkInfo::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(ATNetworkInfo);
-		ATNetworkInfo->SetToGetHomeNwk();
-		ATNetworkInfo->StartRequest();
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetHomeNetworkReqL
-
-
-TInt CLtsyPhoneHandler::HandleBootNotifyModemStatusReadyReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneBootNotifyModemStatusReadyComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-    // This function is the entry of phone bootup
-	// Let's get the phone bootup
-	TInt ret = KErrNone;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == EPhoneNotInitialised)
-		{
-		iGloblePhone->iPhoneStatus.iInitStatus = EPhoneInitialising;
-		iGloblePhone->iEventSignalActive = ETrue;
-		iInitializePhone->StartRequest();
-		ret = KErrNone;
-		}
-	else if(ret == KErrNone)
-		{
-		CATGetModemStatus* ATGetModemStatus = CATGetModemStatus::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(ATGetModemStatus);
-		ATGetModemStatus->StartRequest();
-		}	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleBootNotifyModemStatusReadyReqL
-
-
-TInt CLtsyPhoneHandler::HandleBootNotifySimStatusReadyReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneBootNotifySimStatusReadyComp()
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-	
-	TInt ret = KErrNone;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == EPhoneInitialising)
-		{
-		iInitializePhone->AppendIpcRequestToPendingListL(KLtsyDispatchPhoneBootNotifySimStatusReadyApiId);
-        iInitializePhone->ExecutePendingRequest();   
-		ret = KErrNone;
-		}
-	else if(ret == KErrNone)
-		{
-		CATSIMCard* ATSIMCard  = CATSIMCard::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(ATSIMCard);
-		ATSIMCard->StartRequest();
-		}
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleBootNotifySimStatusReadyReqL
-
-TInt CLtsyPhoneHandler::HandleSimRefreshRegisterReqL(TUint16 /*aFilesToRegister*/)
-/**
- * @param aFilesToRegister  Bitmask containing list of files to register for refresh indications.
- * The list of possible files is specified in TCacheFileTypes.
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-	
-	TInt ret = KErrNotSupported;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == EPhoneInitialising)
-		{
-		iInitializePhone->AppendIpcRequestToPendingListL(KLtsyDispatchPhoneSimRefreshRegisterApiId);
-        iInitializePhone->ExecutePendingRequest();   
-        ret = KErrNone;
-		}
-	else if(ret == EPhoneInitialised)
-		{
-		iAsyncHelperRequest->SetRequestId(KLtsyDispatchPhoneSimRefreshRegisterApiId);
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleSimRefreshRegisterReqL
-
-TInt CLtsyPhoneHandler::HandleGetServiceProviderNameReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetServiceProviderNameComp()
- *
- = * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	//TInt ret = KErrNotSupported;
-	TInt ret = 0;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == KErrNone)
-		{
-		CGetOperatorNmae* GetOperatorName  = CGetOperatorNmae::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		GetOperatorName->SetRequestTypeL(KLtsyDispatchPhoneGetServiceProviderNameApiId);
-		iGloblePhone->SetActiveRequest(GetOperatorName);
-		GetOperatorName->StartRequest();
-		}
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetServiceProviderNameReqL
-
-
-TInt CLtsyPhoneHandler::HandleGetPhoneIdReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetPhoneIdComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	//TInt ret = KErrNotSupported;
-	TInt ret = KErrNone;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == KErrNone)
-		{
-		CGetPhoneID* GetPhoneID  = CGetPhoneID::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(GetPhoneID);
-		GetPhoneID->StartRequest();
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetPhoneIdReqL
-
-
-TInt CLtsyPhoneHandler::HandleGetDetectedNetworksReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetDetectedNetworksComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	//TInt ret = KErrNotSupported;
-	TInt ret = 0;
-	
-	ret = KErrNone;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == KErrNone)
-		{
-		iGloblePhone->iEventSignalActive = ETrue;
-		iATDetectNetwork->StartRequest();
-		}
-	
-	return TSYLOGSETEXITERR(ret);
-	
-	} // CLtsyPhoneHandler::HandleGetDetectedNetworksReqL
-
-
-TInt CLtsyPhoneHandler::HandleGetDetectedNetworksCancelReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetDetectedNetworksCancelComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	//TInt ret = KErrNotSupported;
-	TInt ret = 0;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if((ret == KErrInUse)&&(iATDetectNetwork->iCommandRunning))
-		{
-		if(iATDetectNetwork->iCommandCancel)
-			{
-			ret = KErrNotSupported;
-			}
-		else
-			{
-		    iATDetectNetwork->CancelCommand();
-		    ret = KErrNone;
-			}
-		}
-	else if(ret == KErrNone)
-		{
-		iAsyncHelperRequest->SetRequestId(KLtsyDispatchPhoneGetDetectedNetworksCancelApiId);
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetDetectedNetworksCancelReqL
-
-
-TInt CLtsyPhoneHandler::HandleSelectNetworkReqL(TBool aIsManual, const RMobilePhone::TMobilePhoneNetworkManualSelection& aNetworkManualSelection)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneSelectNetworkComp()
- *
- * @param aIsManual Specifies whether phone should use a manual or automatic network selection method.
- * @param aNetworkManualSelection If aIsManual==ETrue, then this parameter contain the user's manually selected network.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	TInt ret = KErrNotSupported;
-	if(!aIsManual)
-		{
-		return KErrNotSupported;
-		}
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == KErrNone)
-		{
-		iGloblePhone->iEventSignalActive = ETrue;
-		iATSelectNetwork->SetNetworkSelection(aNetworkManualSelection);
-		iATSelectNetwork->StartRequest();
-		}
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleSelectNetworkReqL
-
-
-TInt CLtsyPhoneHandler::HandleSelectNetworkCancelReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneSelectNetworkCancelComp()
- *
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	TInt ret = 0;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if((ret == KErrInUse)&&(iATSelectNetwork->iCommandRunning))
-		{
-		if(iATSelectNetwork->iCommandCancel)
-			{
-			ret = KErrNotSupported;
-			}
-		else
-			{
-			iATSelectNetwork->CancelCommand();
-		    ret = KErrNone;
-			}
-		}
-	else if(ret == KErrNone)
-		{
-		iAsyncHelperRequest->SetRequestId(KLtsyDispatchPhoneSelectNetworkCancelApiId);
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleSelectNetworkCancelReqL
-
-
-TInt CLtsyPhoneHandler::HandleSetNetworkSelectionSettingReqL(const RMobilePhone::TMobilePhoneNetworkSelectionV1& aPhoneNetworkSelection)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneSetNetworkSelectionSettingComp()
- *
- * @param aPhoneNetworkSelection The network selection to be set.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	TInt networkSelection = -1;
-	switch (aPhoneNetworkSelection.iMethod)
-		{
-	case RMobilePhone::ENetworkSelectionAutomatic:
-	    networkSelection = 0;
-		break;
-	case RMobilePhone::ENetworkSelectionManual:
-	    networkSelection = 1;
-		break;
-	default:
-	    networkSelection = 0;
-		break;
-		}
-	
-	if(networkSelection != -1)
-		{
-		ret = iGloblePhone->CheckGlobalPhoneStatus();
-		if(ret == KErrNone)
-			{
-			CATSelectNetworkMode* ATSelectNetworkMode  = CATSelectNetworkMode::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-			iGloblePhone->iEventSignalActive = ETrue;
-			iGloblePhone->SetActiveRequest(ATSelectNetworkMode);
-			ATSelectNetworkMode->SetNetworkSelection(networkSelection);
-			ATSelectNetworkMode->StartRequest();
-			ret = KErrNone;
-			}
-		}
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleSetNetworkSelectionSettingReqL
-
-
-TInt CLtsyPhoneHandler::HandleGetCurrentNetworkInfoReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetCurrentNetworkInfoComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNone;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == EPhoneInitialising)
-		{
-		iInitializePhone->AppendIpcRequestToPendingListL(KLtsyDispatchPhoneGetCurrentNetworkInfoApiId);
-        iInitializePhone->ExecutePendingRequest();   
-		ret = KErrNone;
-		}
-	else if(ret == KErrNone)
-		{
-		CGetCurrentNetworkInfo* ATNetworkInfo  = CGetCurrentNetworkInfo::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(ATNetworkInfo);
-		ATNetworkInfo->StartRequest();
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetCurrentNetworkInfoReqL
-
-
-TInt CLtsyPhoneHandler::HandleGetNetworkModeReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetNetworkModeComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == EPhoneInitialising)
-		{
-		iInitializePhone->AppendIpcRequestToPendingListL(KLtsyDispatchPhoneGetNetworkModeApiId);
-        iInitializePhone->ExecutePendingRequest();   	
-		ret = KErrNone;
-		}
-	else if(ret == EPhoneInitialised)
-		{
-		iAsyncHelperRequest->SetRequestId(KLtsyDispatchPhoneGetNetworkModeApiId);
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetNetworkModeReqL
-
-
-TInt CLtsyPhoneHandler::HandleGetNitzInfoReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetNitzInfoComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	TInt ret = KErrNotSupported;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == EPhoneInitialising)
-		{
-		iInitializePhone->AppendIpcRequestToPendingListL(KLtsyDispatchPhoneGetNitzInfoApiId);
-        iInitializePhone->ExecutePendingRequest();   
-		ret = KErrNone;
-		}
-	else if(ret == EPhoneInitialised)
-		{
-		iAsyncHelperRequest->SetRequestId(KLtsyDispatchPhoneGetNitzInfoApiId);
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetNITZInfoReqL()
-
-
-TInt CLtsyPhoneHandler::HandleGetSignalStrengthReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetSignalStrengthComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNone;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == EPhoneInitialising)
-		{
-		iInitializePhone->AppendIpcRequestToPendingListL(KLtsyDispatchPhoneGetSignalStrengthApiId);
-        iInitializePhone->ExecutePendingRequest();   
-		ret = KErrNone;
-		}
-	else if(ret == KErrNone)
-		{
-		CATGetSignal* ATGetSignal  = CATGetSignal::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(ATGetSignal);
-		ATGetSignal->StartRequest();
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetSignalStrengthReqL()
-
-
-TInt CLtsyPhoneHandler::HandleGetBatteryInfoReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetBatteryInfoComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNone;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == EPhoneInitialising)
-		{
-		iInitializePhone->AppendIpcRequestToPendingListL(KLtsyDispatchPhoneGetBatteryInfoApiId);
-        iInitializePhone->ExecutePendingRequest();   
-		ret = KErrNone;
-		}
-	else if(ret == KErrNone)
-		{
-		CATGetBattery* ATGetBattery  = CATGetBattery::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(ATGetBattery);
-		ATGetBattery->StartRequest();
-		}
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetBatteryInfoReqL
-
-
-TInt CLtsyPhoneHandler::HandleNspsWakeupReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneNspsWakeupComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleNspsWakeupReqL
-
-
-TInt CLtsyPhoneHandler::HandleSetSystemNetworkModeReqL(RMmCustomAPI::TNetworkModeCaps /*aMode*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneSetSystemNetworkModeComp()
- *
- * @param aMode Specifies the mode to set the system network to.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleSetSystemNetworkModeReqL
-
-
-TInt CLtsyPhoneHandler::HandleGetCurrentSystemNetworkModesReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetCurrentSystemNetworkModesComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = 0;
-	iAsyncHelperRequest->SetRequestId(KLtsyDispatchPhoneGetCurrentSystemNetworkModesApiId);
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetCurrentSystemNetworkModesReqL
-
-
-TInt CLtsyPhoneHandler::HandleResetNetServerReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneResetNetServerComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleResetNetServerReqL
-
-
-TInt CLtsyPhoneHandler::HandleSetAlwaysOnModeReqL(RMmCustomAPI::TSetAlwaysOnMode /*aMode*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneSetAlwaysOnModeComp()
- *
- * @param aMode The new "always on" mode to set, can be
- *               RMmCustomAPI::EAlwaysModeVPLMN for VPLMN (Visited Public Land Mobile Network) always on,
- *               RMmCustomAPI::EAlwaysModeHPLMN for HPLMN (Home Public Land Mobile Network) always on,
- *               RMmCustomAPI::EAlwaysModeBoth for VPLMN and HPLMN always on,
- *               RMmCustomAPI::EAlwaysModeNeither for neither VPLMN mor HPLMN always on.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleSetAlwaysOnModeReqL
-
-
-TInt CLtsyPhoneHandler::HandleSetDriveModeReqL(RMmCustomAPI::TSetDriveMode /*aMode*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneSetDriveModeComp()
- *
- * @param aMode The new mode to set (RMmCustomAPI::EDeactivateDriveMode for deactivate drive mode
- *               or RMmCustomAPI::EActivateDriveMode to activate drive mode).
- *
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleSetDriveModeReqL
-
-
-TInt CLtsyPhoneHandler::HandleGetHspaStatusReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetHspaStatusComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetHspaStatusReqL
-
-
-TInt CLtsyPhoneHandler::HandleSetHspaStatusReqL(RMmCustomAPI::THSxPAStatus /*aStatus*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneSetHspaStatusComp()
- *
- * @param aStatus The new HSxPA status (enable or disable).
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleSetHspaStatusReqL
-
-
-TInt CLtsyPhoneHandler::HandleGetNetworkProviderNameReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetNetworkProviderNameComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == KErrNone)
-		{
-		CGetOperatorNmae* GetOperatorName  = CGetOperatorNmae::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		GetOperatorName->SetRequestTypeL(KLtsyDispatchPhoneGetNetworkProviderNameApiId);
-		iGloblePhone->SetActiveRequest(GetOperatorName);
-		GetOperatorName->StartRequest();
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetNetworkProviderNameReqL
-
-
-TInt CLtsyPhoneHandler::HandleGetOperatorNameReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetOperatorNameComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == KErrNone)
-		{
-		CGetOperatorNmae* GetOperatorName  = CGetOperatorNmae::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		GetOperatorName->SetRequestTypeL(KLtsyDispatchPhoneGetOperatorNameApiId);
-		iGloblePhone->SetActiveRequest(GetOperatorName);
-		GetOperatorName->StartRequest();
-		}
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetOperatorNameReqL
-
-
-TInt CLtsyPhoneHandler::HandleGetCellInfoReqL()
-/**
- * This request is completed by invoking one of the 
- * CCtsyDispatcherCallback::CallbackPhoneGetCellInfoComp().
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == KErrNone)
-		{
-		CATGetCellInfo* atGetCellInfo  = CATGetCellInfo::NewL(*iGloblePhone,
-				                                              iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atGetCellInfo);
-		atGetCellInfo->SetIpcId(KLtsyDispatchPhoneGetCellInfoApiId);
-		atGetCellInfo->SetIpcRequestCompleteObserver(this);
-		iNotifyCellInfo->Disable();
-		atGetCellInfo->StartRequest();
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetCellInfoReqL
-
-TInt CLtsyPhoneHandler::HandleRegisterCellInfoChangeNotificationReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneRegisterCellInfoChangeNotificationComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	//TInt ret = KErrNotSupported;
-	TInt ret = KErrNone;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == KErrNone)
-		{
-		CATSetNotifyCellInfo* atSetNotifyCellInfo  = CATSetNotifyCellInfo::NewL(*iGloblePhone,
-				                                                                iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atSetNotifyCellInfo);
-		atSetNotifyCellInfo->SetIpcId(KLtsyDispatchPhoneRegisterCellInfoChangeNotificationApiId);
-		atSetNotifyCellInfo->SetIpcRequestCompleteObserver(this);
-		atSetNotifyCellInfo->StartRequest();
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleRegisterCellInfoChangeNotificationReqL 
-
-TInt CLtsyPhoneHandler::HandleGetPhoneCellInfoReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetPhoneCellInfoComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == KErrNone)
-		{
-		CATGetPhoneCellInfo* atGetPhoneCellInfo  = CATGetPhoneCellInfo::NewL(*iGloblePhone,
-				                                                             iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atGetPhoneCellInfo);
-		atGetPhoneCellInfo->SetIpcRequestCompleteObserver(this);
-		atGetPhoneCellInfo->SetIpcId(KLtsyDispatchPhoneGetPhoneCellInfoApiId);
-		// disable to get the notification as we may get the incorrect response after CATGetPhoneCellInfo command was issued
-		iNotifyCellInfo->Disable();
-		atGetPhoneCellInfo->StartRequest();
-		}
-	else if (ret == KErrInUse)
-		{
-		// as dispather will post two IPC requests(KLtsyDispatchPhoneRegisterCellInfoChangeNotificationApiId and KLtsyDispatchPhoneGetPhoneCellInfoApiId)
-		// together, so we need store one and then execute this AT command after previous one was complete
-		iPendingIpcId = KLtsyDispatchPhoneGetPhoneCellInfoApiId;
-		CRequestBase* activeReq = iGloblePhone->CurrentActiveRequest();
-		if(activeReq)
-		    {
-		    if(activeReq->IpcId() == KLtsyDispatchPhoneRegisterCellInfoChangeNotificationApiId)
-		        {
-		        ret = KErrNone;
-		        }
-		    }
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetPhoneCellInfoReqL
-
-TInt CLtsyPhoneHandler::HandleGetGetUsimServiceSupportReqL(TInt /*aApplicationNumber*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetUsimServiceSupportComp()
- * 
- * @param aApplicationNumber The application number to check support for in the USIM.
- * 
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetGetUsimServiceSupportReqL
-
-TInt CLtsyPhoneHandler::HandleGetCurrentActiveUsimApplicationReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetCurrentActiveUsimApplicationComp()
- * 
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetCurrentActiveUsimApplicationReqL
-  
-TInt CLtsyPhoneHandler::HandleTerminateAllCallsReqL(TInt /*aCallId*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneTerminateAllCallsComp()
- * 
- * @param aCallId if a call is in the connecting state then this parameter will contain the id of that call, else 0.
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	LOGTEXT(_L8("[Ltsy Phone]  Starting CLtsyPhoneHandler::HandleTerminateAllCallsReqL()"));
-	
-	TInt ret = KErrNotSupported;
-	ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if(ret == KErrNone)
-		{
-		CATHangUp* cHangUp = CATHangUp::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(cHangUp);
-		cHangUp->SetHangupOperator(CATHangUp::ERMobilePhoneAPI);
-		cHangUp->StartRequest();
-		}
-	return ret;
-	} // CLtsyPhoneHandler::HandleTerminateAllCallsReqL
-
-TInt CLtsyPhoneHandler::HandleGetSystemNetworkBandReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneGetSystemNetworkBandComp()
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetSystemNetworkBandReqL
-
-TInt CLtsyPhoneHandler::HandleSetSystemNetworkBandReqL(RMmCustomAPI::TBandSelection /*aBand*/, RMmCustomAPI::TNetworkModeCaps /*aMode*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackPhoneSetSystemNetworkBandComp()
- * 
- * @param aBand the requested band
- * @param aMode the requested mode
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsyPhoneHandler::HandleGetSystemNetworkBandReqL
-
-void CLtsyPhoneHandler::NotifyIpcRequestComplete(TInt aIpcId)
-/**
- * This function was called by some IPC request after it complete the request 
- * 
- * If there are one more AT commands which need some interactions among them, the logic control should be put here.
- * 
- * @param aIpcId The IPC request Id
- * 
- * @return void
- */
-    {
-    if(aIpcId == KLtsyDispatchPhoneRegisterCellInfoChangeNotificationApiId)
-        {
-        if(iPendingIpcId == KLtsyDispatchPhoneGetPhoneCellInfoApiId)
-            {
-            iGloblePhone->DeleteLastActiveRequest();
-            CATGetPhoneCellInfo* getPhoneCellInfo = NULL;
-            TRAPD(err,getPhoneCellInfo  = CATGetPhoneCellInfo::NewL(*iGloblePhone,iCtsyDispatcherCallback));
-            if(err != KErrNone)
-                {
-                RMobilePhone::TMobilePhoneCellInfoV9 cellInfo; 
-                iCtsyDispatcherCallback.CallbackPhoneGetPhoneCellInfoComp(err,cellInfo);
-                }
-            else
-                {
-                iGloblePhone->iEventSignalActive = ETrue;
-                iGloblePhone->SetActiveRequest(getPhoneCellInfo);
-                getPhoneCellInfo->SetIpcRequestCompleteObserver(this);
-                getPhoneCellInfo->SetIpcId(KLtsyDispatchPhoneGetPhoneCellInfoApiId);
-                getPhoneCellInfo->StartRequest();
-                iPendingIpcId = -1;
-                }
-            }
-        }
-    else if(aIpcId == KLtsyDispatchPhoneGetPhoneCellInfoApiId)
-        {
-        // enable to receive the notificaiton of cell info changed
-        iNotifyCellInfo->Enable();
-        }
-    else if(aIpcId == KLtsyDispatchPhoneGetCellInfoApiId)
-        {
-        iNotifyCellInfo->Enable();
-        }
-    else if(aIpcId == KLtsyDispatchPhoneGetNetworkRegistrationStatusApiId)
-        {
-        iNetworkRegStatusChange->Enable();
-        }
-    }
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/handler/src/cltsysathandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,717 +0,0 @@
-// 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:
-// CLtsySatHandler
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mmtsy_ipcdefs.h>
-#include <satcs.h>
-
-
-
-#include "cltsysathandler.h"
-#include <ctsy/ltsy/ltsylogger.h>
-#include "ltsymacros.h"
-
-
-
-CLtsySatHandler::CLtsySatHandler(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	: iCtsyDispatcherCallback(aCtsyDispatcherCallback)
-	{
-	}
-
-	
-CLtsySatHandler::~CLtsySatHandler()
-	{
-	}
-
-
-CLtsySatHandler* CLtsySatHandler::NewLC(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsySatHandler* self = new (ELeave) CLtsySatHandler(aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-
-CLtsySatHandler* CLtsySatHandler::NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsySatHandler* self=
-			CLtsySatHandler::NewLC(aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-
-void CLtsySatHandler::ConstructL()
-/**
- * Second phase constructor.
- */
-	{
-	TSYLOGENTRYEXIT;
-	
-	
-	} // CLtsySatHandler::ConstructL
-
-TBool CLtsySatHandler::IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId)
-/**
- * Returns whether a Dispatch Interface APi is supported or not.
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- * 
- * @param aDispatchApiId Id of Dispatch interface being queried
- * @return indication whether interface is supported or not
- */
-	{
-
-	switch(aDispatchApiId)
-		{
-		// Insert ApiIds when support is provided in LTSY e.g.
-		// case MLtsyDispatchPhoneBootNotifySimStatusReady::KLtsyDispatchPhoneBootNotifySimStatusReadyApiId: return ETrue;
-		
-		default:
-			return EFalse;
-		}
-	}
-
-void CLtsySatHandler::IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup /*aIdGroup*/, TUint32& /*aIndIdBitMask*/)
-/**
- * Returns the set of callback indicators that are supported.
- * 
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *  
- * @param aIdGroup ID of group that is being queried e.g. aIdGroup=EIndIdGroup1
- * @param aIndIdBitMask [out] argument that should return a bitmask indicating which indicator callbacks are supported.
- */
-	{
-
-	//Create bitmask with bitset for each indicator ID that is supported. E.g.
-	/*
-	if(aIdGroup == EIndIdGroup1)
-		aIndIdBitMask = KLtsyDispatchPhoneNotifyNetworkModeChangeIndId | 
-						KLtsyDispatchPhoneNotifyEgprsInfoChangeIndId | 
-						KLtsyDispatchPhoneNotifySignalStrengthChangeIndId;
-	else
-		aIndIdBitMask = 0; //no indicators from other groups supported
-	*/
-	}
-
-
-TInt CLtsySatHandler::HandleSmsDeliverReportReqL(const TDesC8& /*aSmsDeliverReportTpdu*/)
-/**
- * This request has no associated callback.
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @param aSmsDeliverReportTpdu The SMS-DELIVER-REPORT TPDU element to be contained in a 
- * RP-ERROR-PDU (negative acknowledgement) or RP-ACK-PDU (a positive acknowledgement) to a
- * SMS DELIVER or SMS STATUS REPORT.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleSmsDeliverReportReqL
-
-
-TInt CLtsySatHandler::HandleGetImageInstanceReqL(TUint8 /*aEfImgRecordNumber*/, TUint8 /*aInstanceNumberInEfImgRecord*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSatGetImageInstanceComp
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- * 
- * @param aEfImgRecordNumber 			The record number of the icons EF(Img) record for the 
- * 										icon image instance being retrieved. 
- * @param aInstanceNumberInEfImgRecord 	The record number of the icon instance, in the icons EF(Img) record
- * 										for the icon image instance being retrieved. 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;    
-	//TSYLOGENTRYEXITARGS(_L8("aEfImgRecordNumber=%d, aInstanceNumberInEfImgRecord=%d"), aEfImgRecordNumber, aInstanceNumberInEfImgRecord);
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleGetImageInstanceReqL
-
-TInt CLtsySatHandler::HandleGetIconDataReqL(TUint8 /*aEfImgRecordNumber*/, const TDesC8& /*aSimFilePath*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSatGetIconDataComp
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @param aEfImgRecordNumber 	EF(img) record number of the icon to retrieve. 
- * @param aSimFilePath 			The full file path to the EF(Img). 
- * 								Bytes 	0-1 MF 			(0x3F00)
- * 								Bytes	2-3 DF(Telecom) (0x7F10) 
- * 								Bytes	4-5 DF(Graphics)(0x5F50)
- * 								Bytes	6-7 EF(Ef(Img)) 	(0x4F20)
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	//TSYLOGENTRYEXITARGS(_L8("aEfImgRecordNumber=%d"), aEfImgRecordNumber);
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleGetIconDataReqL
-
-
-TInt CLtsySatHandler::HandleGetClutReqL(TUint8 /*aEfImgRecordNumber*/, TUint8 /*aInstanceNumberInEfImgRecord*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSatGetClutComp
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @param aEfImgRecordNumber 			The record number of the icons EF(Img) record for the 
- * 										CLUT being retrieved. 
- * @param aInstanceNumberInEfImgRecord 	The record number of the icon instance, in the icons EF(Img) record
- * 										for the CLUT being retrieved. 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	//TSYLOGENTRYEXITARGS(_L8("aEfImgRecordNumber=%d, aInstanceNumberInEfImgRecord=%d"), aEfImgRecordNumber, aInstanceNumberInEfImgRecord);
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleGetClutReqL
-
-
-TInt CLtsySatHandler::HandleGetDefaultBearerCapabilityReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSatGetDefaultBearerCapabilityComp
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleGetDefaultBearerCapabilityReqL
-
-
-TInt CLtsySatHandler::HandleGetSmsPpDownloadSupportedReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSatGetSmsPpDownloadSupportedComp
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleGetSmsPpDownloadSupportedReqL
-
-
-TInt CLtsySatHandler::HandleGetSmsControlActivatedReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSatGetSmsControlActivatedComp
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	
-	// TODO: Add implementation here.......
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleGetSmsControlActivatedReqL
-
-
-TInt CLtsySatHandler::HandleCellBroadcastEnvelopeReqL(const TDesC8& /*aEnvelope*/)
-/**
- * This request has no associated callback.
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @param aEnvelope BER-TLV encoded data containing an (CELL BROADCAST DOWNLOAD) ENVELOPE command.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleCellBroadcastEnvelopeReqL
-
-TInt CLtsySatHandler::HandleGetAccessTechnologyReqL()
-/**
-* This request is completed by invoking
-* CCtsyDispatcherCallback::CallbackSatGetAccessTechnologyComp
-*
-* This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
-*
-* @return KErrNone on success, KErrNotSupported if this request is not supported,
-* or another error code to indicate the failure otherwise.
-*/
-	{
-	TSYLOGENTRYEXIT;
-	
-	TInt ret = KErrNotSupported;
-	
-	// TODO: Add implementation here.......
-	
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleGetAccessTechnologyReqL
-
-TInt CLtsySatHandler::HandleTimingAdvanceReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSatTimingAdvanceComp
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleTimingAdvanceReqL
-
-
-TInt CLtsySatHandler::HandleSmControlResponseDataReqL(TUint8 /*aResult*/, const TDesC8& /*aRpDestinationAddress*/, const TDesC8& /*aTpDestinationAddress*/)
-/**
- * This request has no associated callback.
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @param aResult MO short message control result the SIM gives to the ME concerning whether to 
- * allow, bar or modify the proposed short message, encoded as defined in "3GPP TS 11.10-4, 27.22.8 MO SHORT MESSAGE CONTROL BY SIM"
- * @param aRpDestinationAddress RP Destination Address of the Service Centre to which the ME is proposing to send the short message.
- * If the address data is not present (zero length), then assume the RP Destination Address of the Service Centre is not to be modified.
- * @param aTpDestinationAddress TP Destination Address to which the ME is proposing to send the short message.
- * If the address data is not present (zero length), then assume the TP Destination Address is not to be modified.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleSmControlResponseDataReqL
-
-
-TInt CLtsySatHandler::HandleProvideLocationInfoReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSatProvideLocationInfoComp
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleProvideLocationInfoReqL
-
-
-TInt CLtsySatHandler::HandleSetPollingIntervalReqL(TUint8 /*aPollingInterval*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSatSetPollingIntervalComp
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @param aPollingInterval The polling interval in seconds indicating how often the 
- * terminal sends STATUS commands related to Proactive Polling 
- * (zero indicates Polling should be turned off)
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleSetPollingIntervalReqL
-
-
-TInt CLtsySatHandler::HandleSmsPpDownloadEnvelopeReqL(const TDesC8& /*aEnvelope*/)
-/**
- * This request has no associated callback.
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @param aEnvelope BER-TLV encoded data containing an (SMS-PP DOWNLOAD) ENVELOPE command.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleSmsPpDownloadEnvelopeReqL
-
-
-TInt CLtsySatHandler::HandleLocalInformationNmrReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSatLocalInformationNmrComp
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	
-	// TODO: Add implementation here.......
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleLocalInformationNmrReqL
-
-
-TInt CLtsySatHandler::HandleGetUssdControlSupportedReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSatGetUssdControlSupportedComp
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleGetUssdControlSupportedReqL
-
-
-TInt CLtsySatHandler::HandleCallAndSmsControlEnvelopeReqL(const TDesC8& /*aEnvelope*/)
-/**
- * This request has no associated callback.
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @param aEnvelope BER-TLV encoded data containing a Call Control or MO SMS control by SIM ENVELOPE command
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleCallAndSmsControlEnvelopeReqL
-
-
-TInt CLtsySatHandler::HandleRefreshAllowedReqL(const TDesC8& /*aRefreshFileList*/, const TDesC8& /*aAid*/, TUint16 /*aTsyCache*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSatRefreshAllowed
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @param aRefreshFileList The list of files (full path) that have been changed by the UICC (see ETSI 102 221 or ETSI 151 011) 
- * @param aAid Indicates the application on the UICC to be refreshed (as defined ETSI TS 101 220) . 
- * @param aTsyCache Bit field of files that are cached in SIM ATK TSY (examine using CSatNotificationsTsy::TCachedSimAtkFiles) 
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleRefreshAllowedReqL
-
-
-TInt CLtsySatHandler::HandleReadyReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSatReady
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * A call to this function indicates that the CTSY is ready to receive proactive commands from the LTSY. 
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleReadyReqL
-
-
-TInt CLtsySatHandler::HandlePCmdNotificationReqL(TUint8 /*aPCmdType*/)
-/**
- * This request has no associated callback.
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @param aPCmdType The number of the proactive command for which notification is being requested (e.g. KSetUpMenu),
- *  as defined in ETSI 102 223 etc.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandlePCmdNotificationReqL
-
-
-TInt CLtsySatHandler::HandleUssdControlEnvelopeErrorReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSatUssdControlEnvelopeError
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleUssdControlEnvelopeErrorReqL
-
-
-TInt CLtsySatHandler::HandleTimerExpirationEnvelopeReqL(const TDesC8& /*aEnvelope*/)
-/**
- * This request has no associated callback.
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @param aEnvelope BER-TLV encoded Timer expiration ENVELOPE command
- * see "ETSI TS 102 223" under "ENVELOPE commands" "Timer expiration" 
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleTimerExpirationEnvelopeReqL
-
-
-TInt CLtsySatHandler::HandleTerminalRspReqL(const TDesC8& /*aTerminalRsp*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSatTerminalRsp
- * 
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- * 
- * @param aTerminalRsp The terminal response TLV as formatted in "ETSI TS 102 223" Under "Structure of TERMINAL RESPONSE"
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleTerminalRspReqL
-
-
-TInt CLtsySatHandler::HandleMenuSelectionEnvelopeReqL(const TDesC8& /*aEnvelope*/)
-/**
- * This request has no associated callback.
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @param aEnvelope BER-TLV encoded Envelope comprising a notification from
- * the ME that the user has either requested help about, or has selected a menu item
- * that was previously provided by the SIM application via the SETUP MENU proactive
- * command. 
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleMenuSelectionEnvelopeReqL
-
-
-TInt CLtsySatHandler::HandleEventDownloadEnvelopeReqL(const TDesC8& /*aEnvelope*/)
-/**
- * This request has no associated callback.
- *
- * This API is optional and should only be used if the licensee wishes to including the Dispatcher beneath their own SIM ATK TSY.
- *
- * @param aEnvelope BER-TLV encoded Event Download ENVELOPE command
- * see "ETSI TS 102 223" under "ENVELOPE commands" "Event Download" 
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySatHandler::HandleEventDownloadSyncL
-
-
-
-
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/src/cltsysecurityhandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,374 +0,0 @@
-// 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:
-// CLtsySecurityHandler
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mmtsy_ipcdefs.h>
-
-#include "cltsysecurityhandler.h"
-#include <ctsy/ltsy/ltsylogger.h>
-#include "ltsymacros.h"
-
-
-
-CLtsySecurityHandler::CLtsySecurityHandler(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	: iCtsyDispatcherCallback(aCtsyDispatcherCallback)
-	{
-	}
-
-	
-CLtsySecurityHandler::~CLtsySecurityHandler()
-	{
-	}
-
-
-CLtsySecurityHandler* CLtsySecurityHandler::NewLC(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsySecurityHandler* self = new (ELeave) CLtsySecurityHandler(aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-
-CLtsySecurityHandler* CLtsySecurityHandler::NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsySecurityHandler* self=
-			CLtsySecurityHandler::NewLC(aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-
-void CLtsySecurityHandler::ConstructL()
-/**
- * Second phase constructor.
- */
-	{
-	TSYLOGENTRYEXIT;
-	
-	
-	} // CLtsySecurityHandler::ConstructL
-
-TBool CLtsySecurityHandler::IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId)
-/**
- * Returns whether a Dispatch Interface APi is supported or not.
- * 
- * @param aDispatchApiId Id of Dispatch interface being queried
- * @return indication whether interface is supported or not
- */
-	{
-
-	switch(aDispatchApiId)
-		{
-		// Insert ApiIds when support is provided in LTSY e.g.
-		// case MLtsyDispatchPhoneBootNotifySimStatusReady::KLtsyDispatchPhoneBootNotifySimStatusReadyApiId: return ETrue;
-		
-		default:
-			return EFalse;
-		}
-	}
-
-void CLtsySecurityHandler::IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup /*aIdGroup*/, TUint32& /*aIndIdBitMask*/)
-/**
- * Returns the set of callback indicators that are supported.
- * 
-* @param aIdGroup ID of group that is being queried e.g. aIdGroup=EIndIdGroup1
-* @param aIndIdBitMask [out] argument that should return a bitmask indicating which indicator callbacks are supported.
- */
-	{
-
-	//Create bitmask with bitset for each indicator ID that is supported. E.g.
-	/*
-	if(aIdGroup == EIndIdGroup1)
-		aIndIdBitMask = KLtsyDispatchPhoneNotifyNetworkModeChangeIndId | 
-						KLtsyDispatchPhoneNotifyEgprsInfoChangeIndId | 
-						KLtsyDispatchPhoneNotifySignalStrengthChangeIndId;
-	else
-		aIndIdBitMask = 0; //no indicators from other groups supported
-	*/
-	}
-
-
-TInt CLtsySecurityHandler::HandleGetSecurityCodeInfoReqL(RMobilePhone::TMobilePhoneSecurityCode /*aSecCode*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSecurityGetSecurityCodeInfoComp()
- *
- * @param aSecCode Security code.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySecurityHandler::HandleGetSecurityCodeInfoReqL
-
-
-TInt CLtsySecurityHandler::HandleGetLockInfoReqL(RMobilePhone::TMobilePhoneLock /*aLockType*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSecurityGetLockInfoComp()
- *
- * @param aLockType Phone lock type.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySecurityHandler::HandleGetLockInfoReqL
-
-
-TInt CLtsySecurityHandler::HandleAbortSecurityCodeReqL(RMobilePhone::TMobilePhoneSecurityCode /*aSecCode*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSecurityAbortSecurityCodeComp()
- *
- * @param aSecCode Security code.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySecurityHandler::HandleAbortSecurityCodeReqL
-
-
-TInt CLtsySecurityHandler::HandleGetCurrentActivePinReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSecurityGetCurrentActivePinComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySecurityHandler::HandleGetCurrentActivePinReqL
-
-
-TInt CLtsySecurityHandler::HandleSetLockSettingReqL(RMobilePhone::TMobilePhoneLock /*aLock*/, RMobilePhone::TMobilePhoneLockSetting /*aSetting*/, const TDesC& /*aPassword*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSecuritySetLockSettingComp()
- *
- * @param aLock The lock to change.
- * @param aSetting The new settings for the lock.
- * @param aPassword The password paramaters.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySecurityHandler::HandleSetLockSettingReqL
-
-
-TInt CLtsySecurityHandler::HandleVerifySecurityCodeReqL(
-		RMobilePhone::TMobilePhoneSecurityCode /*aSecCode*/,
-		const RMobilePhone::TCodeAndUnblockCode& /*aCodes*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSecurityVerifySecurityCodeComp()
- *
- * @param aSecCode Security code.
- * @param aCodes Code and unblock code.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySecurityHandler::HandleVerifySecurityCodeReqL
-
-TInt CLtsySecurityHandler::HandleGetPin1DisableSupportedReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSecurityGetPin1DisableSupportedComp()
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	//TO DO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySecurityHandler::HandleGetPin1DisableSupportedReqL
-
-TInt CLtsySecurityHandler::HandleCheckSecurityCodeReqL(DispatcherSecurity::TSecurityCodeId /*aSecCodeID*/, const TDes& /*aSecCode*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSecurityCheckSecurityCodeComp()
- *
- * @param aSecCodeID Code ID.
- * @param aSecCode Security code (maximum length = KMaxMobilePasswordSize).
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySecurityHandler::HandleCheckSecurityCodeReqL
-
-
-TInt CLtsySecurityHandler::HandleDisablePhoneLockReqL(const TDesC& /*aSecCode*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSecurityDisablePhoneLockComp()
- *
- * @param aSecCode Security password (maximum length = KMaxMobilePasswordSize).
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySecurityHandler::HandleDisablePhoneLockReqL
-
-
-TInt CLtsySecurityHandler::HandleGetCipheringInfoReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSecurityGetCipheringInfoComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySecurityHandler::HandleGetCipheringInfoReqL
-
-
-TInt CLtsySecurityHandler::HandleIsSecurityCodeBlockedReqL(DispatcherSecurity::TSecurityCodeId /*aSecCodeID*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSecurityIsSecurityCodeBlockedComp()
- *
- * @param aSecCodeID Code ID.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySecurityHandler::HandleIsSecurityCodeBlockedReqL
-
-TInt CLtsySecurityHandler::HandleCheckSecurityCodeCancelReqL(DispatcherSecurity::TSecurityCodeId /*aSecCodeID*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSecurityCheckSecurityCodeCancelComp()
- *
- * @param aCodeID Code ID.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySecurityHandler::HandleCheckSecurityCodeCancelReqL

--- a/cbsref/telephonyrefplugins/atltsy/handler/src/cltsysimhandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,732 +0,0 @@
-// 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:
-// CLtsySimHandler
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mmtsy_ipcdefs.h>
-
-
-
-#include "cltsysimhandler.h"
-#include <ctsy/ltsy/ltsylogger.h>
-#include "ltsymacros.h"
-
-
-
-CLtsySimHandler::CLtsySimHandler(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	: iCtsyDispatcherCallback(aCtsyDispatcherCallback)
-	{
-	}
-
-	
-CLtsySimHandler::~CLtsySimHandler()
-	{
-	}
-
-
-CLtsySimHandler* CLtsySimHandler::NewLC(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsySimHandler* self = new (ELeave) CLtsySimHandler(aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-
-CLtsySimHandler* CLtsySimHandler::NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsySimHandler* self=
-			CLtsySimHandler::NewLC(aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-
-void CLtsySimHandler::ConstructL()
-/**
- * Second phase constructor.
- */
-	{
-	TSYLOGENTRYEXIT;
-	
-	
-	} // CLtsySimHandler::ConstructL
-
-TBool CLtsySimHandler::IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId)
-/**
- * Returns whether a Dispatch Interface APi is supported or not.
- * 
- * @param aDispatchApiId Id of Dispatch interface being queried.
- * @return indication whether interface is supported or not.
- */
-	{
-
-	
-	switch(aDispatchApiId)
-		{
-		// Insert ApiIds when support is provided in LTSY e.g.
-		// case MLtsyDispatchPhoneBootNotifySimStatusReady::KLtsyDispatchPhoneBootNotifySimStatusReadyApiId: return ETrue;
-		
-		default:
-			return EFalse;
-		}
-	}
-
-void CLtsySimHandler::IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup /*aIdGroup*/, TUint32& /*aIndIdBitMask*/)
-/**
- * Returns the set of callback indicators that are supported.
- * 
-* @param aIdGroup ID of group that is being queried e.g. aIdGroup=EIndIdGroup1.
-* @param aIndIdBitMask [out] argument that should return a bitmask indicating which indicator callbacks are supported.
- */
-	{
-
-	//Create bitmask with bitset for each indicator ID that is supported. E.g.
-	/*
-	if(aIdGroup == EIndIdGroup1)
-		aIndIdBitMask = KLtsyDispatchPhoneNotifyNetworkModeChangeIndId | 
-						KLtsyDispatchPhoneNotifyEgprsInfoChangeIndId | 
-						KLtsyDispatchPhoneNotifySignalStrengthChangeIndId;
-	else
-		aIndIdBitMask = 0; //no indicators from other groups supported
-	*/
-	}
-
-
-TInt CLtsySimHandler::HandleGetApnControlListServiceStatusReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimGetApnControlListServiceStatusComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleGetApnControlListServiceStatusReqL
-
-
-TInt CLtsySimHandler::HandleDeleteApnNameReqL(TUint32 /*aIndex*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimDeleteApnNameComp()
- *
- * @param aIndex The index of the entry to delete.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleDeleteApnNameReqL
-
-
-TInt CLtsySimHandler::HandleEnumerateApnEntriesReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimEnumerateApnEntriesComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleEnumerateApnEntriesReqL
-
-
-TInt CLtsySimHandler::HandleChangeSecurityCodeReqL(RMobilePhone::TMobilePhoneSecurityCode /*aSecCode*/,
-												   const RMobilePhone::TMobilePhonePasswordChangeV1& /*aPasswds*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimChangeSecurityCodeComp()
- *
- * @param aSecCode The security code to be changed.
- * @param aPasswds The old and the new values of the security code.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleChangeSecurityCodeReqL
-
-
-TInt CLtsySimHandler::HandleSetFdnSettingReqL(RMobilePhone::TMobilePhoneFdnSetting /*aFdnSetting*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimSetFdnSettingComp()
- *
- * @param aFdnSetting The FDN setting.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleSetFdnSettingReqL
-
-
-TInt CLtsySimHandler::HandleGetCustomerServiceProfileReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimGetCustomerServiceProfileComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleGetCustomerServiceProfileReqL
-
-
-TInt CLtsySimHandler::HandleGetSubscriberIdReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimGetSubscriberIdComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleGetSubscriberIdReqL
-
-
-TInt CLtsySimHandler::HandleAppendApnNameReqL(const RMobilePhone::TAPNEntryV3& /*aEntry*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimAppendApnNameComp()
- *
- * @param aEntry The entry to append to the APN list.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleAppendApnNameReqL
-
-
-TInt CLtsySimHandler::HandleGetActiveIccApplicationTypeReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimGetActiveIccApplicationTypeComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleGetActiveIccApplicationTypeReqL
-
-
-TInt CLtsySimHandler::HandleSetIccMessageWaitingIndicatorsReqL(const RMobilePhone::TMobilePhoneMessageWaitingV1& /*aIndicators*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimSetIccMessageWaitingIndicatorsComp()
- *
- * @param aIndicators The message waiting indicators to set.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleSetIccMessageWaitingIndicatorsReqL
-
-
-TInt CLtsySimHandler::HandleSetApnControlListServiceStatusReqL(RMobilePhone::TAPNControlListServiceStatus /*aStatus*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimSetApnControlListServiceStatusComp()
- *
- * @param aStatus The service status to set.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleSetApnControlListServiceStatusReqL
-
-
-TInt CLtsySimHandler::HandleGetApnNameReqL(TUint32 /*aIndex*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimGetApnNameComp()
- *
- * @param aIndex The index of the APN entry to get from LTSY.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleGetApnNameReqL
-
-
-TInt CLtsySimHandler::HandleSimRefreshDoneReqL(TInt /*aError*/)
-/**
- * This request has no associated callback.
- *
- * @param aError The error which has occured during a SIM refresh, KErrNone if no error.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleSimRefreshDoneSyncL
-
-TInt CLtsySimHandler::HandleGetServiceTableReqL(
-							RMobilePhone::TMobilePhoneServiceTable /*aServiceTable*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimGetServiceTableComp()
- * 
- * @param aServiceTable Service table to get information about.
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	//TO DO: Add implementation here.......
-
-
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleGetServiceTableReqL
-
-TInt CLtsySimHandler::HandleGetIccMessageWaitingIndicatorsReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimGetIccMessageWaitingIndicatorsComp()
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise. 
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-	
-	//TO DO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleGetIccMessageWaitingIndicatorsReqL
-
-TInt CLtsySimHandler::HandleSimLockActivateReqL(const TDesC& /*aPassword*/, RMmCustomAPI::TLockNumber /*aLockNumber*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimSimLockActivateComp()
- *
- * @param aPassword The password used for the SIM Lock activation.
- * @param aLockNumber The lock number that defines SIM Lock types.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	//TO DO: Add implementation here.......
-	
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleSimLockActivateReqL
-
-
-TInt CLtsySimHandler::HandleSimLockDeActivateReqL(const TDesC& /*aPassword*/, RMmCustomAPI::TLockNumber /*aLockNumber*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimSimLockDeActivateComp()
- *
- * @param aPassword The password used for the SIM Lock deactivation.
- * @param aLockNumber The lock number that defines SIM Lock types.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	//TO DO: Add implementation here.......
-	
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleSimLockDeActivateReqL
-
-
-TInt CLtsySimHandler::HandleGetAnswerToResetReqL(const TDesC8& /*aAnswerToReset*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimGetAnswerToResetComp()
- *
- * @param aAnswerToReset The answer to reset information which contains details of the request.
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	//TO DO: Add implementation here.......
-	
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleGetAnswerToResetReqL
-
-
-TInt CLtsySimHandler::HandleGetSimCardReaderStatusReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimGetSimCardReaderStatusComp()
- *
- * @param aSimCardReaderStatus The sim card reader status information which contains details of the request.
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	//TO DO: Add implementation here.......
-	
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleGetSimCardReaderStatusReqL
-
-
-TInt CLtsySimHandler::HandleGetSimAuthenticationEapSimDataReqL(const TDesC8& /*aRandomParameters*/, TInt /*aRFStateInfo*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimGetSimAuthenticationEapSimDataComp()
- *
- * @param aRandomParameters The random parameters from the client.
- * @param aRFStateInfo The RF state info.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	//TO DO: Add implementation here.......
-	
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleGetSimAuthenticationEapSimDataReqL
-
-TInt CLtsySimHandler::HandleGetSimAuthenticationEapAkaDataReqL(const TDesC8& /*aRandomParameters*/, const TDesC8& /*aAUTN*/, TInt /*aRFStateInfo*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimGetSimAuthenticationEapAkaDataComp()
- *
- * @param aRandomParameters The random parameters from the client.
- * @param aAUTN The AUTN parameter. AUTN is an authentication value generated by
- *        the Authentication Centre, which, together with the random parameters, authenticates the server to the peer, 128 bits.
- * @param aRFStateInfo The RF state info.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	//TO DO: Add implementation here.......
-	
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleGetSimAuthenticationEapAkaDataReqL
-
-
-TInt CLtsySimHandler::HandlePowerSimOffReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimPowerSimOffComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandlePowerSimOffReqL
-
-
-TInt CLtsySimHandler::HandlePowerSimOnReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimPowerSimOnComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandlePowerSimOnReqL
-
-TInt CLtsySimHandler::HandleReadSimFileReqL(const TDesC8& /*aPath*/, TUint16 /*aOffset*/, TUint16 /*aSize*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimReadSimFileComp()
- *
- * @param aPath The absolute file path of the SIM file in the file system of the SIM.
- * see ETSI TS 131 102 Under "Files of USIM"
- * @param aOffset The value of the Offset, the offset is related with the type of SIM file being read.
- * @param aSize The amount of bytes to be read from the SIM file.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleReadSimFileReqL
-
-TInt CLtsySimHandler::HandleSimSendApduRequestReqL(TUint8 /*aServiceType*/, TUint8 /*aCardReaderNumber*/, TUint8 /*aApplicationType*/, const TDesC8& /*aCommandData*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimSendApduRequestComp()
- *
- * @param aServiceType The value for the service type of the request.
- * @param aCardReaderNumber The value for the card reader number of the request.
- * @param aApplicationType The value for the application type of the request.
- * @param aCommandData The transparent data to be conveyed to the Baseband.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleSimSendApduRequestReqL
-
-TInt CLtsySimHandler::HandleSimSendApduRequestV2ReqL(TUint8 /*aCardReaderId*/, const TDesC8& /*aCommandData*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimSendApduRequestV2Comp()
- *
- * @param aCardReaderId The value for the card reader Id of the request.
- * @param aCommandData The transparent data to be conveyed to the Baseband.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleSimSendApduRequestV2ReqL
-
-
-TInt CLtsySimHandler::HandleSimWarmResetReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimSimWarmResetComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleSimWarmResetReqL
-
-
-TInt CLtsySimHandler::HandleSetSimMessageStatusReadReqL(const TTime& /*aTimestamp*/, TInt /*aTimezoneDiff*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSimSetSimMessageStatusRead()
- *
- * No error code is returned to the ETel client - if no SMS message with matching timestamp is identified
- * on the SIM then this error will be silently ignored.
- *
- * @param aTimestamp timestamp that uniquely identifies a particular message in the message store.
- * @param aTimezoneDiff the difference, expressed in quarters of an hour, between the service centre local time and GMT
- *
- * @return KErrNone on success, otherwise another error code indicating the
- * failure.
- * 
- * @see RMmCustomAPI::SetSimMessageStatusRead()
- **/
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySimHandler::HandleSetSimMessageStatusReadReqL

--- a/cbsref/telephonyrefplugins/atltsy/handler/src/cltsysmshandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,450 +0,0 @@
-// 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:
-// CLtsySmsHandler/
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mmtsy_ipcdefs.h>
-
-
-
-#include "cltsysmshandler.h"
-#include <ctsy/ltsy/ltsylogger.h>
-#include "ltsymacros.h"
-#include "globalphonemanager.h"
-#include "atmessagestoreinfo.h"
-#include "atsmssend.h"
-#include "atsmsreceive.h"
-#include "atsmsack.h"
-#include "mslogger.h"
-#include "asynchelperrequest.h"
-CLtsySmsHandler::CLtsySmsHandler(CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone)
-	:iCtsyDispatcherCallback(aCtsyDispatcherCallback),iGloblePhone(aGloblePhone)
-	{
-	
-	}
-
-	
-CLtsySmsHandler::~CLtsySmsHandler()
-	{
-	if ( iAtSmsReceive )
-		{
-	    delete iAtSmsReceive;
-		}
-	}
-
-
-CLtsySmsHandler* CLtsySmsHandler::NewLC(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsySmsHandler* self = new (ELeave) CLtsySmsHandler(aCtsyDispatcherCallback,aGloblePhone);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-
-CLtsySmsHandler* CLtsySmsHandler::NewL(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback,CGlobalPhonemanager* aGloblePhone)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsySmsHandler* self=
-			CLtsySmsHandler::NewLC(aCtsyDispatcherCallback,aGloblePhone);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-
-void CLtsySmsHandler::ConstructL()
-/**
- * Second phase constructor.
- */
-	{
-	TSYLOGENTRYEXIT;
-	iAsyncHelperRequest = CAsyncHelperRequest::NewL((*iGloblePhone), iCtsyDispatcherCallback);
-	iAtSmsReceive = CAtSmsReceive::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-	iAtSmsReceive->StartRequest();
-
-	} // CLtsySmsHandler::ConstructL
-
-TBool CLtsySmsHandler::IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId)
-/**
- * Returns whether a Dispatch Interface APi is supported or not.
- * 
- * @param aDispatchApiId Id of Dispatch interface being queried
- * @return indication whether interface is supported or not
- */
-	{
-	switch(aDispatchApiId)
-		{
-		// Insert ApiIds when support is provided in LTSY 
-		case KLtsyDispatchSmsGetSmsStoreInfoApiId:
-		    return ETrue;
-		case KLtsyDispatchSmsNackSmsStoredApiId:
-			return ETrue;
-		case KLtsyDispatchSmsAckSmsStoredApiId:
-			return ETrue;
-		case KLtsyDispatchSmsSendSmsMessageApiId:
-			return ETrue;
-		case KLtsyDispatchSmsSetMoSmsBearerApiId:
-			return ETrue;
-		default:
-			return EFalse;
-		}
-	}
-
-void CLtsySmsHandler::IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup aIdGroup, TUint32& aIndIdBitMask)
-/**
- * Returns the set of callback indicators that are supported.
- * 
-* @param aIdGroup ID of group that is being queried e.g. aIdGroup=EIndIdGroup1
-* @param aIndIdBitMask [out] argument that should return a bitmask indicating which indicator callbacks are supported.
- */
-	{
-	//Create bitmask with bitset for each indicator ID that is supported. E.g.
-	
-	if(aIdGroup == EIndIdGroup1)
-		aIndIdBitMask = KLtsyDispatchSmsNotifyReceiveSmsMessageIndId;
-	else
-		aIndIdBitMask = 0; //no indicators from other groups supported
-	
-	}
-
-
-TInt CLtsySmsHandler::HandleSendSatSmsReqL( const TDesC8& /*aSmsTpdu*/,
-		   RMobileSmsMessaging::TMobileSmsDataFormat /*aDataFormat*/,
-		   const RMobilePhone::TMobileAddress& /*aGsmServiceCentre*/,
-		   TBool /*aMoreMessages*/
-		  )
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSmsSendSatSmsComp
- *
- * @param aDestination The mobile telephone number.
- * @param aSmsTpdu The SMS TPDU.
- * @param aDataFormat The SMS data format.
- * @param aGsmServiceCentre The service centre number.
- * @param aMore  This indicates whether the client is going to send another SMS immediately 
-	                 after this one.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySmsHandler::HandleSendSatSmsReqL
-
-
-TInt CLtsySmsHandler::HandleGetSmsStoreInfoReqL(/* TODO: Add correct parameteres here */)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSmsGetSmsStoreInfoComp
- *
- * @param TODO: Add parameter in-source documentation here
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtMessageStoreInfo* atMessageStoreInfo = CAtMessageStoreInfo::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atMessageStoreInfo);
-		atMessageStoreInfo->StartRequest();
-		}
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySmsHandler::HandleGetSmsStoreInfoReqL
-
-
-TInt CLtsySmsHandler::HandleGetSmspListReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSmsGetSmspListComp
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySmsHandler::HandleGetSmspListReqL
-
-
-TInt CLtsySmsHandler::HandleNackSmsStoredReqL(const TDesC8& aMsgPtr, TInt /*aRpCause*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSmsNackSmsStoredComp
- *
- * @param aMsgPtr Reference to TPDU data.
- * @param aRpCause RP cause.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtSmsNack* atSmsNack = CAtSmsNack::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		atSmsNack->SetNackTpdu(aMsgPtr);
-		iGloblePhone->SetActiveRequest(atSmsNack);
-		atSmsNack->StartRequest();
-		}
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySmsHandler::HandleNackSmsStoredReqL
-
-TInt CLtsySmsHandler::HandleNackSmsStoredReqL( TInt /*aRpCause*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSmsNackSmsStoredComp
- *
- * @param aMsgPtr Reference to TPDU data.
- * @param aRpCause RP cause.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-    {
-    TSYLOGENTRYEXIT;
-
-    TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-    if( KErrNone == ret )
-        {
-        CAtSmsNack* atSmsNack = CAtSmsNack::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-        //Setting Port active
-        iGloblePhone->iEventSignalActive = ETrue;
-        //atSmsNack->SetNackTpdu(aMsgPtr);
-        iGloblePhone->SetActiveRequest(atSmsNack);
-        atSmsNack->StartRequest();
-        }
-
-    return TSYLOGSETEXITERR(ret);
-    } // CLtsySmsHandler::HandleNackSmsStoredReqL
-
-TInt CLtsySmsHandler::HandleAckSmsStoredReqL(const TDesC8& /*aMsgPtr*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSmsAckSmsStoredComp
- *
- * @param aMsgPtr Contains the TPDU defined for a SMS-DELIVER-REPORT.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtSmsAck* atSmsAck = CAtSmsAck::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atSmsAck);
-		atSmsAck->StartRequest();
-		}
-	
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySmsHandler::HandleAckSmsStoredReqL
-
-TInt CLtsySmsHandler::HandleAckSmsStoredReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSmsAckSmsStoredComp
- *
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-    {
-    TSYLOGENTRYEXIT;
-
-    TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-    if( KErrNone == ret )
-        {
-        CAtSmsAck* atSmsAck = CAtSmsAck::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-        //Setting Port active
-        iGloblePhone->iEventSignalActive = ETrue;
-        iGloblePhone->SetActiveRequest(atSmsAck);
-        atSmsAck->StartRequest();
-        }
-    
-    return TSYLOGSETEXITERR(ret);
-    }
-
-TInt CLtsySmsHandler::HandleResumeSmsReceptionReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSmsResumeSmsReceptionComp
- *
- * @param TODO: Add parameter in-source documentation here
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySmsHandler::HandleResumeSmsReceptionReqL
-
-
-TInt CLtsySmsHandler::HandleSendSmsMessageReqL( const RMobilePhone::TMobileAddress& aDestination,
-	     									    const TDesC8& aSmsTpdu,
-	     									    RMobileSmsMessaging::TMobileSmsDataFormat aDataFormat,
-	     										const RMobilePhone::TMobileAddress& aGsmServiceCentre,
-	     										TBool aMoreMessages
-	   										   ) 
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSmsSendSmsMessageComp
- *
- * @param aDestination The mobile telephone number.
- * @param aSmsTpdu The SMS TPDU.
- * @param aDataFormat The SMS data format.
- * @param aGsmServiceCentre The service centre number.
- * @param aMore This indicates whether the client is going to send another SMS immediately 
-	            after this one. 
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-	if(aSmsTpdu.Length() > KGsmTpduSize)
-		{
-		return TSYLOGSETEXITERR(KErrArgument);
-		}
-	TSmsSendParam msgParam;
-	msgParam.iDataFormat = aDataFormat;
-	msgParam.iDestination = aDestination;
-	msgParam.iSmsTpdu = aSmsTpdu;
-	msgParam.iGsmServiceCentre = aGsmServiceCentre;
-	msgParam.iMoreMessages = aMoreMessages;
-	TInt ret = iGloblePhone->CheckGlobalPhoneStatus();
-	if( KErrNone == ret )
-		{
-		CAtSmsSend* atSmsSend = CAtSmsSend::NewL(*iGloblePhone,iCtsyDispatcherCallback);
-		//Setting Port active
-		iGloblePhone->iEventSignalActive = ETrue;
-		iGloblePhone->SetActiveRequest(atSmsSend);
-		atSmsSend->SetMessageParam(msgParam);
-		atSmsSend->StartRequest();
-		}
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySmsHandler::HandleSendSmsMessageReqL
-
-TInt CLtsySmsHandler::HandleSendSmsMessageNoFdnCheckReqL( const RMobilePhone::TMobileAddress& /*aDestination*/,
-	     												  const TDesC8& /*aSmsTpdu*/,
-	     												  RMobileSmsMessaging::TMobileSmsDataFormat /*aDataFormat*/,
-	     												  const RMobilePhone::TMobileAddress& /*aGsmServiceCentre*/,
-	     												  TBool /*aMoreMessages*/
-	   													) 
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSmsSendSmsMessageNoFdnCheckComp
- *
- * @param aDestination The mobile telephone number.
- * @param aSmsTpdu The SMS TPDU.
- * @param aDataFormat The SMS data format.
- * @param aGsmServiceCentre The service centre number.
- * @param aMore This indicates whether the client is going to send another SMS immediately 
-	            after this one. 
-	                 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-	
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySmsHandler::HandleSendSmsMessageNoFdnCheckReqL
-
-TInt CLtsySmsHandler::HandleSetMoSmsBearerReqL(RMobileSmsMessaging::TMobileSmsBearer /*aBearer*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSmsSetMoSmsBearerComp
- *
- * 
- * @param aBearer The SMS bearer.
- * 
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNone;
-	iAsyncHelperRequest->SetRequestId(MLtsyDispatchSmsSetMoSmsBearer::KLtsyDispatchSmsSetMoSmsBearerApiId);
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySmsHandler::HandleSetMoSmsBearerReqL
-
-
-TInt CLtsySmsHandler::HandleStoreSmspListEntryReqL(const RMobileSmsMessaging::TMobileSmspEntryV1& /*aSmsParam*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSmsStoreSmspListEntryComp
- *
- * @param aSmsParam Defines a set of SMS parameters.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNone;
-
-	// TODO: Add implementation here.......
-
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySmsHandler::HandleStoreSmspListReqL
-

--- a/cbsref/telephonyrefplugins/atltsy/handler/src/cltsysupplementaryserviceshandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,415 +0,0 @@
-// 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:
-// CLtsySupplementaryServicesHandler
-
-#include <ctsy/ltsy/cctsydispatchercallback.h>
-#include <mmtsy_ipcdefs.h>
-
-
-
-#include "cltsysupplementaryserviceshandler.h"
-#include <ctsy/ltsy/ltsylogger.h>
-#include "ltsymacros.h"
-
-
-
-CLtsySupplementaryServicesHandler::CLtsySupplementaryServicesHandler(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	: iCtsyDispatcherCallback(aCtsyDispatcherCallback)
-	{
-	}
-
-	
-CLtsySupplementaryServicesHandler::~CLtsySupplementaryServicesHandler()
-	{
-	}
-
-
-CLtsySupplementaryServicesHandler* CLtsySupplementaryServicesHandler::NewLC(
-	CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsySupplementaryServicesHandler* self = new (ELeave) CLtsySupplementaryServicesHandler(aCtsyDispatcherCallback);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-
-CLtsySupplementaryServicesHandler* CLtsySupplementaryServicesHandler::NewL(CCtsyDispatcherCallback& aCtsyDispatcherCallback)
-	{
-	TSYLOGENTRYEXIT;
-	CLtsySupplementaryServicesHandler* self=
-			CLtsySupplementaryServicesHandler::NewLC(aCtsyDispatcherCallback);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-
-void CLtsySupplementaryServicesHandler::ConstructL()
-/**
- * Second phase constructor.
- */
-	{
-	TSYLOGENTRYEXIT;
-	
-	
-	} // CLtsySupplementaryServicesHandler::ConstructL
-
-TBool CLtsySupplementaryServicesHandler::IsInterfaceSupported(TLtsyDispatchInterfaceApiId aDispatchApiId)
-/**
- * Returns whether a Dispatch Interface APi is supported or not.
- * 
- * @param aDispatchApiId Id of Dispatch interface being queried.
- * @return indication whether interface is supported or not.
- */
-	{
-
-	switch(aDispatchApiId)
-		{
-		// Insert ApiIds when support is provided in LTSY e.g.
-		// case MLtsyDispatchPhoneBootNotifySimStatusReady::KLtsyDispatchPhoneBootNotifySimStatusReadyApiId: return ETrue;
-		
-		default:
-			return EFalse;
-		}
-	}
-
-void CLtsySupplementaryServicesHandler::IsCallbackIndicatorSupported(TLtsyDispatchIndIdGroup /*aIdGroup*/, TUint32& /*aIndIdBitMask*/)
-/**
- * Returns the set of callback indicators that are supported.
- * 
-* @param aIdGroup ID of group that is being queried e.g. aIdGroup=EIndIdGroup1.
-* @param aIndIdBitMask [out] argument that should return a bitmask indicating which indicator callbacks are supported.
- */
-	{
-
-	//Create bitmask with bitset for each indicator ID that is supported. E.g.
-	/*
-	if(aIdGroup == EIndIdGroup1)
-		aIndIdBitMask = KLtsyDispatchPhoneNotifyNetworkModeChangeIndId | 
-						KLtsyDispatchPhoneNotifyEgprsInfoChangeIndId | 
-						KLtsyDispatchPhoneNotifySignalStrengthChangeIndId;
-	else
-		aIndIdBitMask = 0; //no indicators from other groups supported
-	*/
-	}
-
-
-TInt CLtsySupplementaryServicesHandler::HandleSendNetworkServiceRequestNoFdnCheckReqL(const TDesC& /*aRequest*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSupplementaryServicesSendNetworkServiceRequestNoFdnCheckComp()
- *
- * @param aRequest The supplementary services string that was entered by the user and need to be send to the network.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySupplementaryServicesHandler::HandleSendNetworkServiceRequestNoFdnCheckReqL
-
-
-TInt CLtsySupplementaryServicesHandler::HandleGetCallWaitingStatusReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSupplementaryServicesGetCallWaitingStatusComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySupplementaryServicesHandler::HandleGetCallWaitingStatusReqL
-
-
-TInt CLtsySupplementaryServicesHandler::HandleSendNetworkServiceRequestReqL(const TDesC& /*aRequest*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSupplementaryServicesSendNetworkServiceRequestComp()
- *
- * @param aRequest The supplementary services string that was entered by the user and need to be send to the network.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySupplementaryServicesHandler::HandleSendNetworkServiceRequestReqL
-
-
-TInt CLtsySupplementaryServicesHandler::HandleGetCallBarringStatusReqL(RMobilePhone::TMobilePhoneCBCondition /*aCondition*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSupplementaryServicesGetCallBarringStatusComp()
- *
- * @param aCondition The barring conditions to interrogate.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySupplementaryServicesHandler::HandleGetCallBarringStatusReqL
-
-
-TInt CLtsySupplementaryServicesHandler::HandleSetCallBarringStatusReqL(RMobilePhone::TMobilePhoneCBCondition /*aCondition*/,
-        RMobilePhone::TMobilePhoneServiceAction /*aAction*/,
-        RMobilePhone::TMobileService /*aGroup*/,
-        const TDesC& /*aPassword*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSupplementaryServicesSetCallBarringStatusComp()
- *
- * @param aCondition the call barring condition to set.
- * @param aAction the call barring action.
- * @param aGroup the call barring service group.
- * @param aPassword the password of the call barring service.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySupplementaryServicesHandler::HandleSetCallBarringStatusReqL
-
-
-TInt CLtsySupplementaryServicesHandler::HandleSetCallForwardingStatusReqL(RMobilePhone::TMobilePhoneCFCondition /*aCondition*/,
-		RMobilePhone::TMobileService /*aServiceGroup*/,
-		RMobilePhone::TMobilePhoneServiceAction /*aAction*/,
-		const TDesC& /*aNumber*/,
-		TInt /*aTimeout*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSupplementaryServicesSetCallForwardingStatusComp()
- *
- * @param aCondition the call forwarding condition to set.
- * @param aServiceGroup The basic service group to apply the CF status change to.
- * @param aAction The action to take.
- * @param aNumber The forwarding number.
- * @param aTimeout The time out when aCondition is ECallForwardingNoReply.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySupplementaryServicesHandler::HandleSetCallForwardingStatusReqL
-
-
-TInt CLtsySupplementaryServicesHandler::HandleSetCallWaitingStatusReqL(RMobilePhone::TMobileService /*aServiceGroup*/,
-		RMobilePhone::TMobilePhoneServiceAction /*aAction*/) 
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSupplementaryServicesSetCallWaitingStatusComp()
- *
- * @param aServiceGroup The service group to change.
- * @param aAction The action to do with that service group.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySupplementaryServicesHandler::HandleSetCallWaitingStatusReqL
-
-
-TInt CLtsySupplementaryServicesHandler::HandleSetSsPasswordReqL(const TDesC& /*aOldPassword*/,
-		const TDesC& /*aNewPassword*/,
-		MLtsyDispatchSupplementaryServicesSetSsPassword::TServiceType /*aService*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSupplementaryServicesSetSsPasswordComp()
- *
- * @param aOldPassword The old password.
- * @param aNewPassword The new password.
- * @param aService The service.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySupplementaryServicesHandler::HandleSetSsPasswordReqL
-
-
-TInt CLtsySupplementaryServicesHandler::HandleGetCallForwardingStatusReqL(RMobilePhone::TMobilePhoneCFCondition /*aCondition*/, RMobilePhone::TMobileService /*aService*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSupplementaryServicesGetCallForwardingStatusComp()
- *
- * @param aCondition the call forwarding condition.
- * @param aService The service group.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySupplementaryServicesHandler::HandleGetCallForwardingStatusReqL
-
-
-TInt CLtsySupplementaryServicesHandler::HandleSendUssdMessageReqL(const TDesC8& /*aData*/, TUint8 /*aDcs*/, 
-		RMobileUssdMessaging::TMobileUssdDataFormat /*aFormat*/, RMobileUssdMessaging::TMobileUssdMessageType /*aType*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSupplementaryServicesSendUssdMessageComp()
- *
- * @param aData The data to send in the message.
- * @param aDcs The data coding scheme of the message.
- * @param aFormat The message format.
- * @param aType The message type.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySupplementaryServicesHandler::HandleSendUssdMessageReqL
-
-TInt CLtsySupplementaryServicesHandler::HandleSendUssdMessageNoFdnCheckReqL(const TDesC8& /*aData*/, TUint8 /*aDcs*/, 
-		RMobileUssdMessaging::TMobileUssdDataFormat /*aFormat*/, RMobileUssdMessaging::TMobileUssdMessageType /*aType*/)
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSupplementaryServicesSendUssdMessageNoFdnCheckComp()
- *
- * @param aData The data to send in the message.
- * @param aDcs The data coding scheme of the message.
- * @param aFormat The message format.
- * @param aType The message type.
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySupplementaryServicesHandler::HandleSendUssdMessageNoFdnCheckReqL
-
-TInt CLtsySupplementaryServicesHandler::HandleSendUssdReleaseReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSupplementaryServicesSendUssdReleaseComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySupplementaryServicesHandler::HandleSendUssdReleaseReqL
-
-
-TInt CLtsySupplementaryServicesHandler::HandleClearBlacklistReqL()
-/**
- * This request is completed by invoking
- * CCtsyDispatcherCallback::CallbackSupplementaryServicesClearBlacklistComp()
- *
- * @return KErrNone on success, KErrNotSupported if this request is not supported,
- * or another error code to indicate the failure otherwise.
- */
-	{
-	TSYLOGENTRYEXIT;
-
-	TInt ret = KErrNotSupported;
-
-	// TODO: Add implementation here.......
-
-	return TSYLOGSETEXITERR(ret);
-	} // CLtsySupplementaryServicesHandler::HandleClearBlacklistReqL
-
-
-
-
-

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_EXPORTS
-
-PRJ_TESTEXPORTS
-./te_integration_stltsysuite.iby   				    /epoc32/rom/include/te_integration_stltsysuite.iby
-
-../scripts/te_integration_stltsysuite.script			/epoc32/release/winscw/udeb/z/systemtest/stltsy/te_integration_stltsysuite.script
-../scripts/te_integration_stltsysuite.script			/epoc32/release/winscw/urel/z/systemtest/stltsy/te_integration_stltsysuite.script
-
-../testdata/te_integration_stltsysuite.ini				/epoc32/release/winscw/udeb/z/systemtest/stltsy/te_integration_stltsysuite.ini	
-../testdata/te_integration_stltsysuite.ini				/epoc32/release/winscw/urel/z/systemtest/stltsy/te_integration_stltsysuite.ini	
-
-../scripts/te_integration_stllsycallcontrol.script	    /epoc32/release/winscw/udeb/z/systemtest/stltsy/te_integration_stllsycallcontrol.script
-../scripts/te_integration_stllsycallcontrol.script		/epoc32/release/winscw/urel/z/systemtest/stltsy/te_integration_stllsycallcontrol.script
-
-../testdata/te_integration_stllsycallcontrol.ini		/epoc32/release/winscw/udeb/z/systemtest/stltsy/te_integration_stllsycallcontrol.ini	
-../testdata/te_integration_stllsycallcontrol.ini		/epoc32/release/winscw/urel/z/systemtest/stltsy/te_integration_stllsycallcontrol.ini	
-
-../scripts/te_integration_stltsyphonecontrol.script			/epoc32/release/winscw/udeb/z/systemtest/stltsy/te_integration_stltsyphonecontrol.script
-../scripts/te_integration_stltsyphonecontrol.script			/epoc32/release/winscw/urel/z/systemtest/stltsy/te_integration_stltsyphonecontrol.script
-
-../testdata/te_integration_stltsyphonecontrol.ini				/epoc32/release/winscw/udeb/z/systemtest/stltsy/te_integration_stltsyphonecontrol.ini	
-../testdata/te_integration_stltsyphonecontrol.ini				/epoc32/release/winscw/urel/z/systemtest/stltsy/te_integration_stltsyphonecontrol.ini	
-
-../scripts/te_integration_stltsypktcontrol.script			/epoc32/release/winscw/udeb/z/systemtest/stltsy/te_integration_stltsypktcontrol.script
-../scripts/te_integration_stltsypktcontrol.script			/epoc32/release/winscw/urel/z/systemtest/stltsy/te_integration_stltsypktcontrol.script
-
-../testdata/te_integration_stltsypktcontrol.ini				/epoc32/release/winscw/udeb/z/systemtest/stltsy/te_integration_stltsypktcontrol.ini	
-../testdata/te_integration_stltsypktcontrol.ini				/epoc32/release/winscw/urel/z/systemtest/stltsy/te_integration_stltsypktcontrol.ini
-
-../scripts/te_integration_stllsysmscontrol.script			/epoc32/release/winscw/udeb/z/systemtest/stltsy/te_integration_stllsysmscontrol.script
-../scripts/te_integration_stllsysmscontrol.script			/epoc32/release/winscw/urel/z/systemtest/stltsy/te_integration_stllsysmscontrol.script
-
-../testdata/te_integration_stllsysmscontrol.ini				/epoc32/release/winscw/udeb/z/systemtest/stltsy/te_integration_stllsysmscontrol.ini	
-../testdata/te_integration_stllsysmscontrol.ini				/epoc32/release/winscw/urel/z/systemtest/stltsy/te_integration_stllsysmscontrol.ini	
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-te_integration_stltsySuite.mmp

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/group/te_integration_stltsysuite.iby	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-#ifndef __TE_INTEGRATION_STLTSY_SUITE_IBY__
-#define __TE_INTEGRATION_STLTSY_SUITE_IBY__
-
-#include <testexecute.iby>
-
-file=ABI_DIR\BUILD_DIR\te_integration_stltsySuite.exe		sys\bin\te_integration_stltsySuite.exe
-data=EPOCROOT##Epoc32\winscw\c\TestData\configs\te_integration_stllsycallcontrol.ini TestData\configs\te_integration_stllsycallcontrol.ini
-data=EPOCROOT##Epoc32\winscw\c\TestData\scripts\te_integration_stllsycallcontrol.script TestData\Scripts\te_integration_stllsycallcontrol.script
-
-data=EPOCROOT##Epoc32\winscw\c\TestData\configs\te_integration_stllsysmscontrol.ini TestData\configs\te_integration_stllsysmscontrol.ini
-data=EPOCROOT##Epoc32\winscw\c\TestData\scripts\te_integration_stllsysmscontrol.script TestData\Scripts\te_integration_stllsysmscontrol.script
-
-data=EPOCROOT##Epoc32\winscw\c\TestData\configs\te_integration_stltsyphonecontrol.ini TestData\configs\te_integration_stltsyphonecontrol.ini
-data=EPOCROOT##Epoc32\winscw\c\TestData\scripts\te_integration_stltsyphonecontrol.script TestData\Scripts\te_integration_stltsyphonecontrol.script
-
-data=EPOCROOT##Epoc32\winscw\c\TestData\configs\te_integration_stltsypktcontrol.ini TestData\configs\te_integration_stltsypktcontrol.ini
-data=EPOCROOT##Epoc32\winscw\c\TestData\scripts\te_integration_stltsypktcontrol.script TestData\Scripts\te_integration_stltsypktcontrol.script
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/group/te_integration_stltsysuite.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-TARGET      Te_integration_stltsySuite.exe
-TARGETTYPE  exe
-UID         0x1000007A 0x10287282
-CAPABILITY ALL -TCB
-//Please add any change under here
-USERINCLUDE   ../inc
-USERINCLUDE   ../../atcommand/sms/inc
-
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
-OS_LAYER_ESTLIB_SYSTEMINCLUDE SYSTEMINCLUDE
-
-
-SOURCEPATH  ../src
-
-SOURCE	            te_integration_stltsysuiteserver.cpp
-SOURCE	            te_integration_stltsysuitestepbase.cpp
-SOURCE              testltsysmscontrolreceivesmscase1step.cpp
-SOURCE              testltsysmscontrolsendsmscase1step.cpp
-SOURCE              testltsymodel.cpp
-SOURCE              testltsyasyncoperation.cpp
-
-//Test phone
-SOURCE              testltsyshareddata.cpp
-SOURCE              testltsyphonestepbase.cpp
-SOURCE              testltsyclosephone.cpp
-SOURCE              testltsyopenphone.cpp
-SOURCE              testltsygetphonebatteryinfo.cpp
-SOURCE              testltsygetphonesignalstrength.cpp
-SOURCE              testltsygetphonebatterycap.cpp
-SOURCE              testltsygetphonesignalcap.cpp
-SOURCE              testltsyphonegetfdnstatus.cpp
-SOURCE              testltsyphonegetnetworkregistrationstatus.cpp
-SOURCE              testltsyphonegetphoneid.cpp
-SOURCE              testltsyphonedetectednetworks.cpp
-SOURCE              testltsyphonedetectednetworkscancel.cpp
-SOURCE              testltsyphonesetnetworkselectionsetting.cpp
-SOURCE              testltsyphoneselectnetwork.cpp
-SOURCE              testltsyphonegethomenetwork.cpp
-SOURCE              testltsyphonegetcurrentnetworkinfo.cpp
-SOURCE              testltsyphonegetcellinfo.cpp
-SOURCE              testltsyphoneregistercellinfochangenotification.cpp
-//Test call 
-SOURCE              testltsycallshareddata.cpp
-SOURCE				testltsycallcontrolbase.cpp
-SOURCE              testltsycallcontroldialhangupcase.cpp
-SOURCE              testltsycallcontrolnotifyincomingcallcase1.cpp
-SOURCE              testltsycallcontrolnotifyincomingcallcase2.cpp
-SOURCE              testltsycallcontrolnotifyincomingcallcase3.cpp
-SOURCE              testltsycallcontrolcustomapiterminateallcalls.cpp
-SOURCE              testltsycallcontrolswapcalls.cpp
-SOURCE              testltsycallcontrolphoneterminateallcalls.cpp
-SOURCE              testltsycallcontroldialemergencycall.cpp
-SOURCE              testltsycallcontroldialbadcall.cpp
-SOURCE              testltsycallcontroldialselfcall.cpp 
-SOURCE              testltsycallcontroldialemergencycallstopallcalls.cpp 
-//Test phone store 
-SOURCE              testltsyphonestoreshareddata.cpp
-//Test packet
-SOURCE              testltsypktshareddata.cpp
-SOURCE              testltsypktteststepbase.cpp
-SOURCE              testltsypktopenpacket.cpp
-SOURCE              testltsypktclosepacket.cpp
-SOURCE              testltsypktopencontext.cpp
-SOURCE              testltsypktinitialsecontext.cpp
-SOURCE              testltsypktclosecontext.cpp
-SOURCE              testltsypktattachnetwork.cpp
-SOURCE              testltsypktdetachnetwork.cpp
-SOURCE              testltsypktactivatecontext.cpp
-SOURCE              testltsypktdeactivatecontext.cpp
-SOURCE              testltsypktdeletecontext.cpp
-SOURCE              testltsypktgetservicestatus.cpp
-SOURCE              testltsypktgetnwkregistrationstatus.cpp
-SOURCE              testltsypktgetcontextconfig.cpp
-SOURCE              testltsypktgetdefaultparams.cpp
-SOURCE              testltsypktsetdefaultparams.cpp
-SOURCE              testltsypktgetcontextinfo.cpp
-SOURCE              testltsypktsetcontextconfig.cpp
-SOURCE              testltsypktopencontextqos.cpp
-SOURCE              testltsypktclosecontextqos.cpp
-SOURCE              testltsypktgetcontextqosprofile.cpp
-SOURCE              testltsypktsetcontextqosprofile.cpp
-SOURCE              testltsypktgetstaticcapabilities.cpp
-SOURCE              testltsypktgetdynamiccapabilities.cpp
-//Test sms 
-SOURCE              testltsysmsatutil.cpp
-SOURCE              testltsysmsshareddata.cpp
-SOURCE              testltsysmsbase.cpp 
-SOURCE              testltsyopensms.cpp
-SOURCE              testltsyopensmsstore.cpp
-SOURCE              testltsyclosesms.cpp
-SOURCE              testltsyclosesmsstore.cpp
-SOURCE              testltsygetmessagestoreinfo.cpp
-SOURCE              testltsysmsstoregetinfo.cpp
-SOURCE              testltsysmssend.cpp
-SOURCE              testltsysmsreceive.cpp
-SOURCE              testltsysmsack.cpp
-SOURCE              testltsysmsnack.cpp 
-SOURCE              testltsysmsdelete.cpp
-SOURCE              testltsysmsdeleteinvalidindex.cpp
-SOURCE              testltsysmsdeleteall.cpp
-SOURCE              testltsysmsread.cpp
-SOURCE              testltsysmsreadinvalidindex.cpp
-SOURCE              testltsysmswrite.cpp
-SOURCE              testltsysmswriteinvalidparam.cpp
-SOURCE              testltsysmsstore.cpp
-SOURCE              testltsysmssendinvalidparam.cpp
-//Test PhoneBook
-SOURCE              testltsyphonestorebase.cpp       
-SOURCE              testltsyphbkopen.cpp
-SOURCE              testltsyphbkclose.cpp
-SOURCE              testltsyphbkgetstoreinfo.cpp
-SOURCE              testltsyphbkdelete.cpp
-SOURCE              testltsyphbkdeleteinvalidindex.cpp
-SOURCE              testltsyphbkwrite.cpp
-SOURCE              testltsyphbkwriteinvalidindex.cpp
-SOURCE              testltsyphbkread.cpp
-SOURCE              testltsyphbkreadinvalidindex.cpp
-
-//Please add your system include under here. 
-//Please add your libraries under here. For example:
-LIBRARY        euser.lib
-LIBRARY			efsrv.lib
-LIBRARY			cntmodel.lib
-LIBRARY			esock.lib
-LIBRARY			etel.lib
-LIBRARY			etelmm.lib
-LIBRARY			etelpckt.lib 
-LIBRARY			commdb.lib
-LIBRARY			commsdat.lib
-LIBRARY			systemtest_commdbutil.lib 
-LIBRARY			testexecuteutils.lib 
-LIBRARY			testexecutelogclient.lib 
-LIBRARY			systemtest_utils.lib 
-LIBRARY			etel3rdparty.lib
-LIBRARY         estor.lib 
-LIBRARY         libc.lib 
-LIBRARY         bafl.lib
-LIBRARY         customapi.lib
-
-SMPSAFE

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/te_integration_stltsysuitedefs.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/**
-* Copyright (c) 2004-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:
-* This file define all the common values thoughout your test project
-* 
-*
-*/
-
-
-
-/**
- @file Te_integration_stltsySuiteDefs.h
- @internalTechnology
-*/
-#if (!defined __TE_INTEGRATION_STLTSY_SUITEDEFS_H__)
-#define __TE_INTEGRATION_STLTSY_SUITEDEFS_H__
-
-// Please modify below value with your project and must match with your configuration ini file which is required to be modified as well
-_LIT(KTe_integration_stltsySuiteString,"TheString");
-_LIT(KTe_integration_stltsySuiteInt,"TheInt");
-_LIT(KTe_integration_stltsySuiteBool,"TheBool");
-
-// For test step panics
-_LIT(KTe_integration_stltsySuitePanic,"Te_integration_stltsySuite");
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/te_integration_stltsysuiteserver.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/**
-* Copyright (c) 2004-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 Te_integration_stltsySuiteServer.h
- @internalTechnology
-*/
-
-#if (!defined __TE_INTEGRATION_STLTSY_SERVER_H__)
-#define __TE_INTEGRATION_STLTSY_SERVER_H__
-
-#include <TestExecuteServerBase.h>
-
-// For shared data
-#include "TestLtsySharedData.h"
-
-#include "TestLtsyModel.h"
-
-class CTe_integration_stltsySuite : public CTestServer
-	{
-public:
-	static CTe_integration_stltsySuite* NewL();
-	// Base class pure virtual override
-	virtual CTestStep* CreateTestStep(const TDesC& aStepName);
-	~CTe_integration_stltsySuite();
-
-// Please Add/modify your class members
-private:
-	CTe_integration_stltsySuite();
-	void ConstructL(const TDesC& aName);
-public:
-	CTestLtsySharedData* iSharedData;
-	CTestLtsyModel* iTestModel;
-	};
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/te_integration_stltsysuitestepbase.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/**
-* Copyright (c) 2004-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 Te_integration_stltsySuiteStepBase.h
- @internalTechnology
-*/
-
-#if (!defined __TE_INTEGRATION_STLTSY_STEP_BASE__)
-#define __TE_INTEGRATION_STLTSY_STEP_BASE__
-#include <TestExecuteStepBase.h>
-// Please add your include here if you have 
-
-/****************************************************************************
-* The reason to have a new step base is that it is very much possible
-* that the all individual test steps have project related common variables 
-* and members 
-* and this is the place to define these common variable and members.
-* 
-****************************************************************************/
-class CTe_integration_stltsySuiteStepBase : public CTestStep
-	{
-public:
-	virtual ~CTe_integration_stltsySuiteStepBase();
-	CTe_integration_stltsySuiteStepBase();
-	virtual TVerdict doTestStepPreambleL(); 
-	virtual TVerdict doTestStepPostambleL();
-
-//Please add your class members which will be common to all individual test steps:
-protected:
-	HBufC8*		iReadData;
-	HBufC8*		iWriteData;
-	};
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyasyncoperation.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-// TestTelephonyAsyncOperation.h
-//
-// Copyright (c) 2004-2008 Symbian Software Ltd.  All rights reserved.
-//
-// Active object derived class for asynchronous operation
-//
-
-
-#if (!defined __TEST_TELEPHONY_ASYNC_OPERATION_H__)
-#define  __TEST_TELEPHONY_ASYNC_OPERATION_H__
-
-// EPOC include
-#include <e32base.h>
-#include <etel3rdparty.h>
-
-/*@{*/
-///constants
-enum TTestAsyncOperation
-	{
-	KNotifyLineStatusChange,
-	};
-/*@}*/
-
-class CTelephonyAsyncOperation : public CActive
-/**
-@internalAll
-@test
-@class CTelephonyAsyncOperation
-
-Active object for executing the asynchronous requests. 
-*/
-	{
-public:
-	CTelephonyAsyncOperation(CTestStep& aTestStep);
-	~CTelephonyAsyncOperation();
-
-	virtual void	DoCancel();
-	virtual void	RunL();
-
-	TInt	SetOperation();
-	
-private:
-	CTestStep&	iTestStep;
-	};
-
-#endif /* __TEST_TELEPHONY_ASYNC_OPERATION_H__ */

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsycallcontrolbase.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-// 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:
-// @file testltsycallcontrolbase.h
-//  
-
-#ifndef TESTLTSYCALLCONTROLBASE_H_
-#define TESTLTSYCALLCONTROLBASE_H_
-
-//System include
-#include "te_integration_stltsysuitestepbase.h"
-#include "testltsycallshareddata.h"
-#include "testltsymodel.h"
-
-
-/**
- * This is the test step base class of Call Control test 
- * category which provides methods
- */
-
-class CTestLtsyCallControlBase : public CTe_integration_stltsySuiteStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	virtual ~CTestLtsyCallControlBase();
-	
-	CTestLtsyCallControlBase(CTestLtsyModel& aModel);
-	
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	
-	virtual TVerdict doTestStepPostambleL();
-	
-	virtual TVerdict doTestStepL();
-	
-	void OpenPhoneL();
-	
-	void OpenLineL();
-	
-	void CloseLine();
-	
-	void OpenCustomAPIL();
-	
-	void CloseCustomAPI();
-	
-	void CustomAPITerminateAllCallsL();
-	
-	void PhoneTerminateAllCallsL();
-	
-	void CreateThirtyPartyTelephonyL();
-
-	void OpenCallOneL();
-	
-	void OpenCallTwoL();
-	
-	void CloseCallOne();
-	
-	void CloseCallTwo();	
-	
-	void DialCallOne();
-	
-	void CallOneDialBadNumberL();
-	
-	void CallOneDialSelfNumberL();
-	
-	void DialCallTwo();
-	
-	void HangupCallOneL();
-	
-	void HangupCallTwoL();
-	
-	void HoldCallOne();
-	
-	void HoldCallTwo();
-	
-	void ResumeCallOne();
-	
-	void ResumeCallTwo();
-	
-	void SwapCallOne();
-	void NotifyCallOne();
-
-	void SwapCallTwo();
-	void NotifyCallTwo();
-	
-	void NotifyIncomingCallOneL();
-	
-	void NotifyIncomingCallTwoL();
-	
-	void AnswerIncomingCallOneL();
-	
-	void AnswerIncomingCallTwoL();
-	
-protected:
-	
-	CTestLtsyModel& iLtsyModel;
-	};
-
-_LIT(KTestLtsyCallControlBase,   "CTestLtsyCallControlBase");
-#endif /*TESTLTSYCALLCONTROLBASE_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsycallcontrolcustomapiterminateallcalls.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-// 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:
-// @file testltsycallcontrolcustomapiterminateallcalls.h
-// 
-
-#ifndef TESTLTSYCALLCONTROLCUSTOMAPITERMINATEALLCALLS_H_
-#define TESTLTSYCALLCONTROLCUSTOMAPITERMINATEALLCALLS_H_
-
-
-//user include
-#include "testltsycallcontrolbase.h"
-
-class CTestLtsyCallControlCustomAPITerminateAllCalls : public CTestLtsyCallControlBase
-	{
-	
-public:
-	virtual ~CTestLtsyCallControlCustomAPITerminateAllCalls();
-	
-	CTestLtsyCallControlCustomAPITerminateAllCalls(CTestLtsyModel& aModel);
-	
-protected:
-	virtual TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyCallControlCustomAPITerminateAllCalls,   "CTestLtsyCallControlCustomAPITerminateAllCalls");
-#endif /*TESTLTSYCALLCONTROLCUSTOMAPITERMINATEALLCALLS_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsycallcontroldialbadcall.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-// 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:
-// @file testltsycallcontrolbase.h
-// 
-
-#ifndef TESTLTSYCALLCONTROLDIALBADCALL_H_
-#define TESTLTSYCALLCONTROLDIALBADCALL_H_
-
-//user include
-#include "testltsycallcontrolbase.h"
-
-class CTestLtsyCallControlDialBadCall : public CTestLtsyCallControlBase
-	{
-public:
-	virtual ~CTestLtsyCallControlDialBadCall();
-	
-	CTestLtsyCallControlDialBadCall(CTestLtsyModel& aModel);
-	
-protected:
-	virtual TVerdict doTestStepL();	
-	};
-
-_LIT(KTestLtsyCallControlDialBadCall,   "CTestLtsyCallControlDialBadCall");
-
-#endif /*TESTLTSYCALLCONTROLDIALBADCALL_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsycallcontroldialemergencycall.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-// 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:
-// @file testltsycallcontroldialemergencycall.h
-// 
-
-#ifndef TESTLTSYCALLCONTROLDIALEMERGENCYCALL_H_
-#define TESTLTSYCALLCONTROLDIALEMERGENCYCALL_H_
-
-//user include
-#include "testltsycallcontrolbase.h"
-
-class CTestLtsyCallControlDialEmergencyCall : public CTestLtsyCallControlBase
-	{
-	
-public:
-	virtual ~CTestLtsyCallControlDialEmergencyCall();
-	
-	CTestLtsyCallControlDialEmergencyCall(CTestLtsyModel& aModel);
-	
-protected:
-	virtual TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyCallControlDialEmergencyCall,   "CTestLtsyCallControlDialEmergencyCall");
-
-#endif /*TESTLTSYCALLCONTROLDIALEMERGENCYCALL_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsycallcontroldialemergencycallstopallcalls.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-// 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:
-// @file testltsycallcontroldialemergencycallstopallcalls.h
-// 
-
-#ifndef TESTLTSYCALLCONTROLDIALEMERGENCYCALLSTOPALLCALLS_H_
-#define TESTLTSYCALLCONTROLDIALEMERGENCYCALLSTOPALLCALLS_H_
-
-//user include
-#include "testltsycallcontrolbase.h"
-
-class CTestLtsyCallControlDialEmergencyCallStopAllCall : public CTestLtsyCallControlBase
-	{
-	
-public:
-	virtual ~CTestLtsyCallControlDialEmergencyCallStopAllCall();
-	
-	CTestLtsyCallControlDialEmergencyCallStopAllCall(CTestLtsyModel& aModel);
-	
-protected:
-	virtual TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyCallControlDialEmergencyCallStopAllCall,   "CTestLtsyCallControlDialEmergencyCallStopAllCall");
-
-#endif /*TESTLTSYCALLCONTROLDIALEMERGENCYCALLSTOPALLCALLS_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsycallcontroldialhangupcase.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-// 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:
-// @file testltsycallcontroldialhangupcase.h
-// 
-
-#ifndef TESTLTSYCALLCONTROLDIALHANGUPCASE_H_
-#define TESTLTSYCALLCONTROLDIALHANGUPCASE_H_
-
-//user include
-#include "testltsycallcontrolbase.h"
-
-class CTestLtsyCallControlDialHangupCase : public CTestLtsyCallControlBase
-	{
-	
-public:
-	virtual ~CTestLtsyCallControlDialHangupCase();
-	
-	CTestLtsyCallControlDialHangupCase(CTestLtsyModel& aModel);
-	
-protected:
-	virtual TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyCallControlDialHangupCase,   "CTestLtsyCallControlDialHangupCase");
-#endif /*TESTLTSYCALLCONTROLDIALHANGUPCASE_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsycallcontroldialselfcall.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-// 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:
-// @file testltsycallcontroldialselfcall.h
-// 
-
-#ifndef TESTLTSYCALLCONTROLDIALSELFCALL_H_
-#define TESTLTSYCALLCONTROLDIALSELFCALL_H_
-
-//user include
-#include "testltsycallcontrolbase.h"
-
-class CTestLtsyCallControlDialSelfCall : public CTestLtsyCallControlBase
-	{
-public:
-	virtual ~CTestLtsyCallControlDialSelfCall();
-	
-	CTestLtsyCallControlDialSelfCall(CTestLtsyModel& aModel);
-	
-protected:
-	virtual TVerdict doTestStepL();	
-	};
-
-_LIT(KTestLtsyCallControlDialSelfCall,   "CTestLtsyCallControlDialSelfCall");
-
-
-#endif /*TESTLTSYCALLCONTROLDIALSELFCALL_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsycallcontrolnotifyincomingcallcase1.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-// 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:
-// @file testltsycallcontrolnotifyincomingcallcase1.h
-// 
-
-#ifndef TESTLTSYCALLCONTROLNOTIFYINCOMINGCALLCASE1_H_
-#define TESTLTSYCALLCONTROLNOTIFYINCOMINGCALLCASE1_H_
-
-//user include
-#include "testltsycallcontrolbase.h"
-
-class CTestLtsyCallControlNotifyIncomingCallCase1 : public CTestLtsyCallControlBase
-	{
-public:
-	virtual ~CTestLtsyCallControlNotifyIncomingCallCase1();
-	
-	CTestLtsyCallControlNotifyIncomingCallCase1(CTestLtsyModel& aModel);
-	
-protected:
-	virtual TVerdict doTestStepL();	
-	};
-
-_LIT(KTestLtsyCallControlNotifyIncomingCallCase1,   "CTestLtsyCallControlNotifyIncomingCallCase1");
-#endif /*TESTLTSYCALLCONTROLNOTIFYINCOMINGCALLCASE1_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsycallcontrolnotifyincomingcallcase2.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-// 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:
-// @file testltsycallcontrolnotifyincomingcallcase2.h
-// 
-
-#ifndef TESTLTSYCALLCONTROLNOTIFYINCOMINGCALLCASE2_H_
-#define TESTLTSYCALLCONTROLNOTIFYINCOMINGCALLCASE2_H_
-
-//user include
-#include "testltsycallcontrolbase.h"
-
-class CTestLtsyCallControlNotifyIncomingCallCase2 : public CTestLtsyCallControlBase
-	{
-public:
-	virtual ~CTestLtsyCallControlNotifyIncomingCallCase2();
-	
-	CTestLtsyCallControlNotifyIncomingCallCase2(CTestLtsyModel& aModel);
-	
-protected:
-	virtual TVerdict doTestStepL();	
-	};
-
-_LIT(KTestLtsyCallControlNotifyIncomingCallCase2,   "CTestLtsyCallControlNotifyIncomingCallCase2");
-
-#endif /*TESTLTSYCALLCONTROLNOTIFYINCOMINGCALLCASE2_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsycallcontrolnotifyincomingcallcase3.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-// 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:
-// @file testltsycallcontrolnotifyincomingcallcase3.h
-// 
-
-#ifndef TESTLTSYCALLCONTROLNOTIFYINCOMINGCALLCASE3_H_
-#define TESTLTSYCALLCONTROLNOTIFYINCOMINGCALLCASE3_H_
-
-//user include
-#include "testltsycallcontrolbase.h"
-
-class CTestLtsyCallControlNotifyIncomingCallCase3 : public CTestLtsyCallControlBase
-	{
-public:
-	virtual ~CTestLtsyCallControlNotifyIncomingCallCase3();
-	
-	CTestLtsyCallControlNotifyIncomingCallCase3(CTestLtsyModel& aModel);
-	
-protected:
-	virtual TVerdict doTestStepL();	
-	};
-
-_LIT(KTestLtsyCallControlNotifyIncomingCallCase3,   "CTestLtsyCallControlNotifyIncomingCallCase3");
-
-#endif /*TESTLTSYCALLCONTROLNOTIFYINCOMINGCALLCASE3_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsycallcontrolphoneterminateallcalls.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-// 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:
-// @file testltsycallcontrolphoneterminateallcalls.h
-// 
-
-#ifndef TESTLTSYCALLCONTROLPHONETERMINATEALLCALLS_H_
-#define TESTLTSYCALLCONTROLPHONETERMINATEALLCALLS_H_
-
-//user include
-#include "testltsycallcontrolbase.h"
-
-class CTestLtsyCallControlPhoneTerminateAllCalls : public CTestLtsyCallControlBase
-	{
-	
-public:
-	virtual ~CTestLtsyCallControlPhoneTerminateAllCalls();
-	
-	CTestLtsyCallControlPhoneTerminateAllCalls(CTestLtsyModel& aModel);
-	
-protected:
-	virtual TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyCallControlPhoneTerminateAllCalls,   "CTestLtsyCallControlPhoneTerminateAllCalls");
-
-#endif /*TESTLTSYCALLCONTROLPHONETERMINATEALLCALLS_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsycallcontrolswapcalls.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-// 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:
-// @file testltsycallcontrolswapcalls.h
-// 
-
-#ifndef TESTLTSYCALLCONTROLSWAPCALLS_H_
-#define TESTLTSYCALLCONTROLSWAPCALLS_H_
-
-//user include
-#include "testltsycallcontrolbase.h"
-
-class CTestLtsyCallControlSwapCalls : public CTestLtsyCallControlBase
-	{
-public:
-	virtual ~CTestLtsyCallControlSwapCalls();
-	
-	CTestLtsyCallControlSwapCalls(CTestLtsyModel& aModel);
-	
-protected:
-	virtual TVerdict doTestStepL();		
-	};
-
-_LIT(KTestLtsyCallControlSwapCalls,   "CTestLtsyCallControlSwapCalls");
-#endif /*TESTLTSYCALLCONTROLSWAPCALLS_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsycallshareddata.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-// 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:
-// @file testltsycallshareddata.h
-// 
-
-#ifndef TESTTELEPHONYCALLSHAREDDATA_H
-#define TESTTELEPHONYCALLSHAREDDATA_H
-
-// system include
-#include <e32cmn.h>
-#include <e32base.h>
-#include <etelmm.h>
-#include <etel3rdparty.h>
-#include <RMmCustomAPI.h>
-
-/**
- * This class defines the shared data related to phone call among test steps.
- * 
- */
-
-class CTestLtsyCallSharedData : public CBase
-	{
-/**
- * @internalAll
- * @test
- */	
-	
-public:
-	static CTestLtsyCallSharedData* NewL();
-	virtual ~CTestLtsyCallSharedData();
-	RLine& VoiceLine();
-	RMobileCall& VoiceCallOne();
-	RMobileCall& VoiceCallTwo();
-	RMobileCall& EmergencyCall();
-	RMmCustomAPI& MmCustomAPI();
-	CTelephony*& ThirdPartyTelephony();
-	
-protected:
-	CTestLtsyCallSharedData();
-	void ConstructL();
-	
-private:
-	RLine iVoiceLine;
-	RMobileCall iVoiceCallOne;
-	RMobileCall iVoiceCallTwo;
-	RMobileCall iEmergencyCall;
-	RMmCustomAPI iMmCustomAPI;
-	CTelephony* iThirdPartyTel;
-	};
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyclosephone.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-// 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:
-// @file testltsyclosephone.h
-// 
-
-#ifndef TESTTELEPHONYCLOSEPHONE_H_
-#define TESTTELEPHONYCLOSEPHONE_H_
-
-// user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the step to close the shared phone.
- * 
- */
-class CTestLtsyClosePhone : public CTestLtsyPhoneStepBase
-/**
- * @internalAll
- * @test
- */
-/**
- * @internalAll
- * @test
- */
-{
-public:
-	virtual ~CTestLtsyClosePhone();
-	CTestLtsyClosePhone(CTestLtsyModel& aTestModel);
-protected:
-	TVerdict doTestStepL();
-};
-
-_LIT(KTestLtsyClosePhone,   "TestLtsyClosePhone");
-
-#endif /*TESTTELEPHONYCLOSEPHONE_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyclosesms.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// 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:
-// @file testltsyclosesms.h
-// 
-
-#ifndef TESTLTSYCLOSESMS_H
-#define TESTLTSYCLOSESMS_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsyCloseSms
- *
- */
-class CTestLtsyCloseSms : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsyCloseSms();
-	static CTestLtsyCloseSms* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsyCloseSms* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsyCloseSms(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-private:
-
-	}; // class CTestLtsyCloseSms
-_LIT(KCTestLtsyCloseSms,"CTestLtsyCloseSms");
-
-#endif // TESTLTSYCLOSESMS_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyclosesmsstore.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// 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:
-// @file testltsyclosesmsstore.h
-// 
-
-#ifndef TESTLTSYCLOSESMSSTORE_H
-#define TESTLTSYCLOSESMSSTORE_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsyCloseSmsStore
- *
- */
-class CTestLtsyCloseSmsStore : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsyCloseSmsStore();
-	static CTestLtsyCloseSmsStore* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsyCloseSmsStore* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsyCloseSmsStore(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-private:
-
-	}; // class CTestLtsyCloseSmsStore
-_LIT(KCTestLtsyCloseSmsStore,"CTestLtsyCloseSmsStore");
-
-#endif // TESTLTSYCLOSESMSSTORE_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsygetmessagestoreinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-// 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:
-// @file testltsygetmessagestoreinfo.h
-// 
-
-#ifndef TESTLTSYGETMESSAGESTOREINFO_H
-#define TESTLTSYGETMESSAGESTOREINFO_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsyGetMessageStoreInfo
- *
- */
-class CTestLtsyGetMessageStoreInfo : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsyGetMessageStoreInfo();
-	static CTestLtsyGetMessageStoreInfo* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsyGetMessageStoreInfo* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsyGetMessageStoreInfo(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void GetMessageStoreInfoL();
-	void CheckMessageStoreInfoL();
-private:
-   	RMobilePhoneStore::TMobilePhoneStoreInfoV1       iInfo;	
-
-	}; // class CTestLtsyGetMessageStoreInfo
-_LIT(KCTestLtsyGetMessageStoreInfo,"CTestLtsyGetMessageStoreInfo");
-
-#endif // TESTLTSYGETMESSAGESTOREINFO_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsygetphonebatterycap.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// TestTelephonyGetPhoneBatteryInfo.h
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyGetPhoneBatteryCap
-
-
-#ifndef TESTTELEPHONYGETPHONEBATTERYCAP_H_
-#define TESTTELEPHONYGETPHONEBATTERYCAP_H_
-
-//user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the function to get battery info
- * 
- */
-class CTestLtsyGetPhoneBatteryCap : public CTestLtsyPhoneStepBase  
-/**
-@internalAll
-@test
-*/
-{
-public:
-	CTestLtsyGetPhoneBatteryCap(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyGetPhoneBatteryCap();
-	virtual TVerdict doTestStepL();
-
-};
-
-_LIT(KTestLtsyGetPhoneBatteryCap,           "TestLtsyGetPhoneBatteryCap");
-
-#endif /*TESTTELEPHONYGETPHONEBATTERYCAP_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsygetphonebatteryinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-// TestTelephonyGetPhoneBatteryInfo.h
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestTelephonyGetPhoneBatteryInfo
-
-
-#ifndef TESTTELEPHONYGETPHONEBATTERYINFO_H_
-#define TESTTELEPHONYGETPHONEBATTERYINFO_H_
-
-//user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the function to get battery info
- * 
- */
-class CTestLtsyGetPhoneBatteryInfo : public CTestLtsyPhoneStepBase  
-/**
-@internalAll
-@test
-*/
-{
-public:
-	CTestLtsyGetPhoneBatteryInfo(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyGetPhoneBatteryInfo();
-	virtual TVerdict doTestStepL();
-private:
-	void GetBatteryCaps();
-	void NotifyBatteryInfoChangeL();
-
-private:
-	RMobilePhone::TMobilePhoneBatteryInfoV1      iBatteryInfo;
-};
-
-_LIT(KTestLtsyGetPhoneBatteryInfo,           "TestLtsyGetPhoneBatteryInfo");
-
-#endif /*TESTTELEPHONYGETPHONEBATTERYINFOSTEP_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsygetphonesignalcap.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-// TestLtsyGetPhoneSignalCap.h
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyGetPhoneSignalCap
-
-#ifndef TESTTELEPHONYGETPHONESIGNALCAP_H_
-#define TESTTELEPHONYGETPHONESIGNALCAP_H_
-
-//user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the function to get signal strength
- * 
- */
-class CTestLtsyGetPhoneSignalCap : public CTestLtsyPhoneStepBase  
-/**
-@internalAll
-@test
-*/
-{
-public:
-	CTestLtsyGetPhoneSignalCap(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyGetPhoneSignalCap();	
-	virtual TVerdict doTestStepL();
-};
-
-_LIT(KTestLtsyGetPhoneSingalCap,          "TestLtsyGetPhoneSingalCap");
-
-#endif /*TESTTELEPHONYGETPHONESIGNALCAP_H_*/
-
-

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsygetphonesignalstrength.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-// TestTelephonyGetPhoneSingalStrength.h
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestTelephonyGetPhoneSingalStrength
-
-#ifndef TESTTELEPHONYGETPHONESIGNALSTRENGTH_H_
-#define TESTTELEPHONYGETPHONESIGNALSTRENGTH_H_
-
-//user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the function to get signal strength
- * 
- */
-class CTestLtsyGetPhoneSignalStrength : public CTestLtsyPhoneStepBase  
-/**
-@internalAll
-@test
-*/
-{
-public:
-	CTestLtsyGetPhoneSignalStrength(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyGetPhoneSignalStrength();	
-	virtual TVerdict doTestStepL();
-private:
-	void   GetSignalCaps();
-	void   NotifySignalStrengthChangeL();
-
-private:
-	TInt32                                       iSignalStrength;
-	TInt8                                        iBar;
-};
-
-_LIT(KTestLtsyGetPhoneSingalStrength,          "TestLtsyGetPhoneSingalStrength");
-
-#endif /*TESTTELEPHONYGETPHONESIGNALSTRENGTH_H_*/
-
-

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsymodel.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-//  TestTelephonyModel.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestTelephonyModel
-//
-#ifndef TESTTELEPHONYMODEL_H_
-#define TESTTELEPHONYMODEL_H_
-
-// system include
-#include <e32cmn.h>
-#include <e32des8.h>
-#include <etelmm.h>
-#include <etel.h>
-#include <etel3rdparty.h> 
-
-// forward class
-class CTestLtsySharedEnv;
-class CTestLtsyCallSharedData;
-class CTestLtsyPktSharedData;
-class CTestLtsySmsSharedData;
-class CTestLtsyPhoneStoreSharedData;
-
-// define the module name length
-const TUint8 KModuleNameLen = 200;
-
-
-/**
- * This class acts as a proxy to provide the functions to return the shared data
- * accross the steps.
- * 
- */
-class CTestLtsyModel : public CBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	static CTestLtsyModel* NewL();
-	~CTestLtsyModel();
-	inline CTestLtsySharedEnv& SharedEnv();
-	inline CTestLtsyCallSharedData& CallSharedData();
-	inline CTestLtsyPktSharedData&  PktSharedData();
-	inline CTestLtsySmsSharedData&  SmsSharedData();
-	inline CTestLtsyPhoneStoreSharedData& PhoneStoreSharedData();
-private:
-	void ConstructL();
-private:
-	CTestLtsySharedEnv* iSharedPhoneEnv;
-	CTestLtsyCallSharedData* iCallSharedData;
-	CTestLtsyPktSharedData*  iPktSharedData;
-	CTestLtsySmsSharedData* iSmsSharedData;
-	CTestLtsyPhoneStoreSharedData* iPhoneStoreSharedData;
-	};
-/**
- * This calss define a shared phone environment
- * 
- */
-class CTestLtsySharedEnv : public CBase
-/**
- * @internalAll
- * @test
- */
-    { 
-public:
-    ~CTestLtsySharedEnv();
-	static CTestLtsySharedEnv* NewL();
-    inline RMobilePhone& Phone();
-    inline RTelServer& ETelServer();
-    inline TBool PhoneOpened();
-    inline void IncreasePhoneReference();
-    inline void DecreasePhoneReference();
-    inline TInt PhoneRefCount();
-	void LoadModuleL(const TDesC& aModuleName);
-	void OpenPhoneL(const TDesC& aModuleName);
-	// must be called by client thread if it call OpenPhoneL()
-	void ClosePhone();
-	void CreateTelephonyL();
-	void DestroyTelephony();
-	CTelephony* Telephony();
-private:
-    CTestLtsySharedEnv();
-    void ConstructL();	
-    TBool FindPhoneIndex();
-private:
-	TBuf<KModuleNameLen> iModuleName;
-	RMobilePhone* iSharedPhone;
-	TBool iPhoneInitialized;
-	RTelServer iSharedTelServer;
-	TInt iPhoneRef;
-	TInt iPhoneIndex;
-	CTelephony *iTelephony;
-//	RMmCustomAPI     *iRmmCustomAPI;
-	CActiveScheduler*  iActiveSchaduler;
-//    TBuf<KCommsDbSvrMaxFieldLength> iTsyNameFromCommdb;
-	};	
-
-#include "TestLtsyModel.inl"
-
-#endif /*TESTTELEPHONYMODEL_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsymodel.inl	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-//  TestTelephonyModel.inl
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  The inline function implementation of CTestTelephonyModel
-
-#ifndef TESTTELEPHONYMODEL_INL_
-#define TESTTELEPHONYMODEL_INL_
-
-// user include
-#include "TestLtsyModel.h"
-
-/**
- * Get the shared phone environment
- * 
- */
-CTestLtsySharedEnv& CTestLtsyModel::SharedEnv()
-	{
-	return *iSharedPhoneEnv;
-	}
-
-/**
- * Get the packet shared data
- *
- */
-CTestLtsyPktSharedData& CTestLtsyModel::PktSharedData()
-	{
-	return *iPktSharedData;
-	}
-
-/**
- * Get the call shared data
- * 
- */
-CTestLtsyCallSharedData& CTestLtsyModel::CallSharedData()
-	{
-	return *iCallSharedData;
-	}	
-
-/**
- * Get the sms shared data
- * 
- */
-CTestLtsySmsSharedData& CTestLtsyModel::SmsSharedData()
-	{
-	return *iSmsSharedData;
-	}
-	
-/**
- * Get the phone store shared data
- * 
- */
-
-
-CTestLtsyPhoneStoreSharedData& CTestLtsyModel::PhoneStoreSharedData()
-	{
-	return *iPhoneStoreSharedData; 
-	}
-
-///**
-// * Get the Tsy Adaptor
-// * 
-// */
-//CTestTelephonyTsyAdaptor& CTestLtsySharedEnv::TsyAdaptor()
-//	{
-//	return *iTsyAdaptor;
-//	}
-
-/**
- * Get the shared phone
- * 
- */
-RMobilePhone& CTestLtsySharedEnv::Phone() 
-	{
-	return *iSharedPhone;
-	}
-
-/**
- * Get the shared ETel server
- * 
- */
-RTelServer& CTestLtsySharedEnv::ETelServer() 
-	{
-	return iSharedTelServer;
-	}
-
-/**
- * Check if the shared phone has arleady been opened before
- * 
- */
-TBool CTestLtsySharedEnv::PhoneOpened()
-	{
-	return iPhoneInitialized;
-	}
-
-/**
- * Increase the shared phone reference number when a client used the shared phone
- * 
- */
-void CTestLtsySharedEnv::IncreasePhoneReference()
-	{
-	iPhoneRef++;
-	}
-
-/**
- * Decrease the shared phone reference number
- * 
- */
-void CTestLtsySharedEnv::DecreasePhoneReference()
-	{
-	iPhoneRef--;
-	}
-
-/**
- * Get the phone reference count
- * 
- */
-TInt CTestLtsySharedEnv::PhoneRefCount()
-	{
-	return iPhoneRef;
-	}
-
-#endif /*TESTTELEPHONYMODEL_INL_*/
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyopenphone.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-//  TestTelephonyOpenPhone.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestTelephonyOpenPhone
-//
-#ifndef TESTTELEPHONYOPENPHONE_H_
-#define TESTTELEPHONYOPENPHONE_H_
-
-// user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the funcition to open a shared phone.
- * 
- */
-class CTestLtsyOpenPhone : public CTestLtsyPhoneStepBase
-/**
- * @internalAll
- * @test
- */
-{
-public:
-	virtual ~CTestLtsyOpenPhone();
-	CTestLtsyOpenPhone(CTestLtsyModel& aTestModel);
-protected:
-	TVerdict doTestStepL();
-};
-
-_LIT(KTestLtsyOpenPhone,   "TestLtsyOpenPhone");
-#endif /*TESTTELEPHONYOPENPHONE_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyopensms.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// 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:
-// @file testltsyopensmsstore.h
-// 
-
-#ifndef TESTLTSYOPENSMS_H
-#define TESTLTSYOPENSMS_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsyOpenSms
- *
- */
-class CTestLtsyOpenSms : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsyOpenSms();
-	static CTestLtsyOpenSms* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsyOpenSms* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsyOpenSms(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-private:
-	
-	}; // class CTestLtsyOpenSms
-_LIT(KCTestLtsyOpenSms,"CTestLtsyOpenSms");
-
-#endif // TESTLTSYOPENSMS_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyopensmsstore.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// 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:
-// @file testltsyopensmsstore.h
-// 
-
-#ifndef TESTLTSYOPENSMSSTORE_H
-#define TESTLTSYOPENSMSSTORE_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsyOpenSmsStore
- *
- */
-class CTestLtsyOpenSmsStore : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsyOpenSmsStore();
-	static CTestLtsyOpenSmsStore* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsyOpenSmsStore* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsyOpenSmsStore(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-private:
-	
-	}; // class CTestLtsyOpenSmsStore
-_LIT(KCTestLtsyOpenSmsStore,"CTestLtsyOpenSmsStore");
-
-#endif // TESTLTSYOPENSMSSTORE_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphbkclose.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// @file testltsyphbkclose.h
-// 
-
-#ifndef TESTLTSYPHBKCLOSE_H
-#define TESTLTSYPHBKCLOSE_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsyphonestorebase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsyPhbkClose
- *
- */
-class CTestLtsyPhbkClose : public CTestLtsyPhoneStoreBase
-	{
-public:
-
-	~CTestLtsyPhbkClose();
-	static CTestLtsyPhbkClose* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsyPhbkClose* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsyPhbkClose(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void ClosePhonebookL();
-private:
-	
-	}; // class CTestLtsyPhbkClose
-_LIT(KCTestLtsyPhbkClose,"CTestLtsyPhbkClose");
-
-#endif // TESTLTSYPHBKCLOSE_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphbkdelete.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// @file testltsyphbkdelete.h
-// 
-
-#ifndef TESTLTSYPHBKDELETE_H
-#define TESTLTSYPHBKDELETE_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsyphonestorebase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsyPhbkDelete
- *
- */
-class CTestLtsyPhbkDelete : public CTestLtsyPhoneStoreBase
-	{
-public:
-
-	~CTestLtsyPhbkDelete();
-	static CTestLtsyPhbkDelete* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsyPhbkDelete* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsyPhbkDelete(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void DeletePhonebookL(TInt aIndex);
-private:
-	
-	}; // class CTestLtsyPhbkDelete
-_LIT(KCTestLtsyPhbkDelete,"CTestLtsyPhbkDelete");
-
-#endif // TESTLTSYPHBKDELETE_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphbkdeleteinvalidindex.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// @file testltsyphbkdeleteinvalidindex.h
-// 
-
-#ifndef TESTLTSYPHBKDELETEINVALIDINDEX_H
-#define TESTLTSYPHBKDELETEINVALIDINDEX_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsyphonestorebase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsyPhbkDeleteInvalidIndex
- *
- */
-class CTestLtsyPhbkDeleteInvalidIndex : public CTestLtsyPhoneStoreBase
-	{
-public:
-
-	~CTestLtsyPhbkDeleteInvalidIndex();
-	static CTestLtsyPhbkDeleteInvalidIndex* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsyPhbkDeleteInvalidIndex* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsyPhbkDeleteInvalidIndex(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void DeletePhonebookL(TInt aIndex);
-private:
-	
-	}; // class CTestLtsyPhbkDeleteInvalidIndex
-_LIT(KCTestLtsyPhbkDeleteInvalidIndex,"CTestLtsyPhbkDeleteInvalidIndex");
-
-#endif // TESTLTSYPHBKDELETEINVALIDINDEX_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphbkgetstoreinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// @file testltsyphbkgetstoreinfo.h
-// 
-
-#ifndef TESTLTSYPHBKGETSTOREINFO_H
-#define TESTLTSYPHBKGETSTOREINFO_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsyphonestorebase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsyPhbkGetStoreInfo
- *
- */
-class CTestLtsyPhbkGetStoreInfo : public CTestLtsyPhoneStoreBase
-	{
-public:
-
-	~CTestLtsyPhbkGetStoreInfo();
-	static CTestLtsyPhbkGetStoreInfo* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsyPhbkGetStoreInfo* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsyPhbkGetStoreInfo(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void GetStoreInfoL();
-private:
-	
-	}; // class CTestLtsyPhbkGetStoreInfo
-_LIT(KCTestLtsyPhbkGetStoreInfo,"CTestLtsyPhbkGetStoreInfo");
-
-#endif // TESTLTSYPHBKGETSTOREINFO_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphbkopen.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// @file testltsyphbkopen.h
-// 
-
-#ifndef TESTLTSYPHBKOPEN_H
-#define TESTLTSYPHBKOPEN_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsyphonestorebase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsyPhbkOpen
- *
- */
-class CTestLtsyPhbkOpen : public CTestLtsyPhoneStoreBase
-	{
-public:
-
-	~CTestLtsyPhbkOpen();
-	static CTestLtsyPhbkOpen* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsyPhbkOpen* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsyPhbkOpen(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void OpenPhonebookL();
-private:
-	
-	}; // class CTestLtsyPhbkOpen
-_LIT(KCTestLtsyPhbkOpen,"CTestLtsyPhbkOpen");
-
-#endif // TESTLTSYPHBKOPEN_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphbkread.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// @file testltsyphbkread.h
-// 
-
-#ifndef TESTLTSYPHBKREAD_H
-#define TESTLTSYPHBKREAD_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsyphonestorebase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsyPhbkRead
- *
- */
-class CTestLtsyPhbkRead : public CTestLtsyPhoneStoreBase
-	{
-public:
-
-	~CTestLtsyPhbkRead();
-	static CTestLtsyPhbkRead* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsyPhbkRead* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsyPhbkRead(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void ReadEntryL(TInt aIndex);
-private:
-	
-	}; // class CTestLtsyPhbkRead
-_LIT(KCTestLtsyPhbkRead,"CTestLtsyPhbkRead");
-
-#endif // TESTLTSYPHBKREAD_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphbkreadinvalidindex.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// @file testltsyphbkreadinvalidindex.h
-// 
-
-#ifndef TESTLTSYPHBKREADINVALIDINDEX_H
-#define TESTLTSYPHBKREADINVALIDINDEX_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsyphonestorebase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsyPhbkReadInvalidIndex
- *
- */
-class CTestLtsyPhbkReadInvalidIndex : public CTestLtsyPhoneStoreBase
-	{
-public:
-
-	~CTestLtsyPhbkReadInvalidIndex();
-	static CTestLtsyPhbkReadInvalidIndex* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsyPhbkReadInvalidIndex* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsyPhbkReadInvalidIndex(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void ReadEntryL(TInt aIndex);
-private:
-	
-	}; // class CTestLtsyPhbkReadInvalidIndex
-_LIT(KCTestLtsyPhbkReadInvalidIndex,"CTestLtsyPhbkReadInvalidIndex");
-
-#endif // TESTLTSYPHBKREADINVALIDINDEX_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphbkwrite.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// @file testltsyphbkwrite.h
-// 
-
-#ifndef TESTLTSYPHBKWRITE_H
-#define TESTLTSYPHBKWRITE_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsyphonestorebase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsyPhbkWrite
- *
- */
-class CTestLtsyPhbkWrite : public CTestLtsyPhoneStoreBase
-	{
-public:
-
-	~CTestLtsyPhbkWrite();
-	static CTestLtsyPhbkWrite* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsyPhbkWrite* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsyPhbkWrite(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void WriteEntryL(TInt aIndex);
-private:
-	
-	}; // class CTestLtsyPhbkWrite
-_LIT(KCTestLtsyPhbkWrite,"CTestLtsyPhbkWrite");
-
-#endif // TESTLTSYPHBKWRITE_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphbkwriteinvalidindex.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// @file testltsyphbkwriteinvalidindex.h
-// 
-
-#ifndef TESTLTSYPHBKWRITEINVALIDINDEX_H
-#define TESTLTSYPHBKWRITEINVALIDINDEX_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsyphonestorebase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsyPhbkWriteInvalidIndex
- *
- */
-class CTestLtsyPhbkWriteInvalidIndex : public CTestLtsyPhoneStoreBase
-	{
-public:
-
-	~CTestLtsyPhbkWriteInvalidIndex();
-	static CTestLtsyPhbkWriteInvalidIndex* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsyPhbkWriteInvalidIndex* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsyPhbkWriteInvalidIndex(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void WriteEntryL(TInt aIndex);
-private:
-	
-	}; // class CTestLtsyPhbkWriteInvalidIndex
-_LIT(KCTestLtsyPhbkWriteInvalidIndex,"CTestLtsyPhbkWriteInvalidIndex");
-
-#endif // TESTLTSYPHBKWRITEINVALIDINDEX_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphonegetcellinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-//  TestLtsyGetCellInfo.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetCellInfo
-//
-#ifndef TESTLTSYPHONEGETCELLINFO_H_
-#define TESTLTSYPHONEGETCELLINFO_H_
-
-// user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the funcition to open a shared phone.
- * 
- */
-class CTestLtsyPhoneGetCellInfo : public CTestLtsyPhoneStepBase
-/**
- * @internalAll
- * @test
- */
-{
-public:
-	virtual ~CTestLtsyPhoneGetCellInfo();
-	CTestLtsyPhoneGetCellInfo(CTestLtsyModel& aTestModel);
-protected:
-	TVerdict doTestStepL();
-};
-
-_LIT(KTestLtsyPhoneGetCellInfo,   "TestLtsyPhoneGetCellInfo");
-#endif /*TESTLTSYPHONEGETCELLINFO_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphonegetcurrentnetworkinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-//  TestLtsyGetCurrentNetworkInfo.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetCurrentNetworkInfo
-//
-#ifndef TESTLTSYPHONEGETCURRENTNWKINFO_H_
-#define TESTLTSYPHONEGETCURRENTNWKINFO_H_
-
-// user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the funcition to open a shared phone.
- * 
- */
-class CTestLtsyPhoneGetCurrentNetworkInfo : public CTestLtsyPhoneStepBase
-/**
- * @internalAll
- * @test
- */
-{
-public:
-	virtual ~CTestLtsyPhoneGetCurrentNetworkInfo();
-	CTestLtsyPhoneGetCurrentNetworkInfo(CTestLtsyModel& aTestModel);
-protected:
-	TVerdict doTestStepL();
-};
-
-_LIT(KTestLtsyPhoneGetCurrentNetworkInfo,   "TestLtsyPhoneGetCurrentNetworkInfo");
-#endif /*TESTLTSYPHONEGETCURRENTNWKINFO_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphonegetdetectednetworks.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-//  TestLtsyGetDetectedNetworks.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetDetectedNetworks
-//
-#ifndef TESTLTSYPHONEGETDETTECTEDNWKS_H_
-#define TESTLTSYPHONEGETDETTECTEDNWKS_H_
-
-// user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the funcition to open a shared phone.
- * 
- */
-class CTestLtsyPhoneGetDetectedNetworks : public CTestLtsyPhoneStepBase
-/**
- * @internalAll
- * @test
- */
-{
-public:
-	virtual ~CTestLtsyPhoneGetDetectedNetworks();
-	CTestLtsyPhoneGetDetectedNetworks(CTestLtsyModel& aTestModel);
-protected:
-	TVerdict doTestStepL();
-};
-
-_LIT(KTestLtsyPhoneGetDetectedNetworks,   "TestLtsyPhoneGetDetectedNetworks");
-#endif /*TESTLTSYPHONEGETDETTECTEDNWKS_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphonegetdetectednetworkscancel.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-//  TestLtsyGetDetectedNetworksCancel.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetDetectedNetworksCancel
-//
-#ifndef TESTLTSYPHONEGETDETTECTEDNWKSCANCEL_H_
-#define TESTLTSYPHONEGETDETTECTEDNWKSCANCEL_H_
-
-// user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the funcition to open a shared phone.
- * 
- */
-class CTestLtsyPhoneGetDetectedNetworksCancelCancel : public CTestLtsyPhoneStepBase
-/**
- * @internalAll
- * @test
- */
-{
-public:
-	virtual ~CTestLtsyPhoneGetDetectedNetworksCancelCancel();
-	CTestLtsyPhoneGetDetectedNetworksCancelCancel(CTestLtsyModel& aTestModel);
-protected:
-	TVerdict doTestStepL();
-};
-
-_LIT(KTestLtsyPhoneGetDetectedNetworksCancelCancel,   "TestLtsyPhoneGetDetectedNetworksCancel");
-#endif /*TESTLTSYPHONEGETDETTECTEDNWKSCANCEL_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphonegetfdnstatus.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-//  TestTelephonyOpenPhone.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetFdnStatus
-//
-#ifndef TESTLTSYPHONEGETFDNSTATUS_H_
-#define TESTLTSYPHONEGETFDNSTATUS_H_
-
-// user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the funcition to open a shared phone.
- * 
- */
-class CTestLtsyPhoneGetFdnStatus : public CTestLtsyPhoneStepBase
-/**
- * @internalAll
- * @test
- */
-{
-public:
-	virtual ~CTestLtsyPhoneGetFdnStatus();
-	CTestLtsyPhoneGetFdnStatus(CTestLtsyModel& aTestModel);
-protected:
-	TVerdict doTestStepL();
-};
-
-_LIT(KTestLtsyPhoneGetFdnStatus,   "TestLtsyPhoneGetFdnStatus");
-#endif /*TESTLTSYPHONEGETFDNSTATUS_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphonegethomenetwork.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-//  TestLtsyGetHomeNetwork.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetHomeNetwork
-//
-#ifndef TESTLTSYPHONEGETHOMENWK_H_
-#define TESTLTSYPHONEGETHOMENWK_H_
-
-// user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the funcition to open a shared phone.
- * 
- */
-class CTestLtsyPhoneGetHomeNetwork : public CTestLtsyPhoneStepBase
-/**
- * @internalAll
- * @test
- */
-{
-public:
-	virtual ~CTestLtsyPhoneGetHomeNetwork();
-	CTestLtsyPhoneGetHomeNetwork(CTestLtsyModel& aTestModel);
-protected:
-	TVerdict doTestStepL();
-};
-
-_LIT(KTestLtsyPhoneGetHomeNetwork,   "TestLtsyPhoneGetHomeNetwork");
-#endif /*TESTLTSYPHONEGETHOMENWK_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphonegetnetworkregistrationstatus.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-//  TestLtsyPhoneGetNetworkRegistrationStatus.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetNetworkRegistrationStatus
-//
-#ifndef TESTLTSYPHONEGETNWKREGISTSTATUS_H_
-#define TESTLTSYPHONEGETNWKREGISTSTATUS_H_
-
-// user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the funcition to open a shared phone.
- * 
- */
-class CTestLtsyPhoneGetNetworkRegistrationStatus : public CTestLtsyPhoneStepBase
-/**
- * @internalAll
- * @test
- */
-{
-public:
-	virtual ~CTestLtsyPhoneGetNetworkRegistrationStatus();
-	CTestLtsyPhoneGetNetworkRegistrationStatus(CTestLtsyModel& aTestModel);
-protected:
-	TVerdict doTestStepL();
-};
-
-_LIT(KTestLtsyPhoneGetNetworkRegistrationStatus,   "TestLtsyPhoneGetNetworkRegistrationStatus");
-#endif /*TESTLTSYPHONEGETNWKREGISTSTATUS_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphonegetphoneid.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-//  TestLtsyPhoneGetPhoneID.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetPhoneID
-//
-#ifndef TESTLTSYPHONEGETPHONEID_H_
-#define TESTLTSYPHONEGETPHONEID_H_
-
-// user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the funcition to open a shared phone.
- * 
- */
-class CTestLtsyPhoneGetPhoneID : public CTestLtsyPhoneStepBase
-/**
- * @internalAll
- * @test
- */
-{
-public:
-	virtual ~CTestLtsyPhoneGetPhoneID();
-	CTestLtsyPhoneGetPhoneID(CTestLtsyModel& aTestModel);
-protected:
-	TVerdict doTestStepL();
-};
-
-_LIT(KTestLtsyPhoneGetPhoneID,   "TestLtsyPhoneGetPhoneID");
-#endif /*TESTLTSYPHONEGETPHONEID_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphoneregistercellinfochangenotification.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-//  TestLtsyRegisterCellInfoChangeNotification.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneRegisterCellInfoChangeNotification
-//
-#ifndef TESTLTSYPHONEREGCELLINFOCHANGENOTIFICTION_H_
-#define TESTLTSYPHONEREGCELLINFOCHANGENOTIFICTION_H_
-
-// user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the funcition to open a shared phone.
- * 
- */
-class CTestLtsyPhoneRegisterCellInfoChangeNotification : public CTestLtsyPhoneStepBase
-/**
- * @internalAll
- * @test
- */
-{
-public:
-	virtual ~CTestLtsyPhoneRegisterCellInfoChangeNotification();
-	CTestLtsyPhoneRegisterCellInfoChangeNotification(CTestLtsyModel& aTestModel);
-protected:
-	TVerdict doTestStepL();
-};
-
-_LIT(KTestLtsyPhoneRegisterCellInfoChangeNotification,   "TestLtsyPhoneRegisterCellInfoChangeNotification");
-#endif /*TESTLTSYPHONEREGCELLINFOCHANGENOTIFICTION_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphoneselectnetwork.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-//  TestLtsySelectNetwork.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneSelectNetwork
-//
-#ifndef TESTLTSYPHONESELECTNETWORK_H_
-#define TESTLTSYPHONESELECTNETWORK_H_
-
-// user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the funcition to open a shared phone.
- * 
- */
-class CTestLtsyPhoneSelectNetwork : public CTestLtsyPhoneStepBase
-/**
- * @internalAll
- * @test
- */
-{
-public:
-	virtual ~CTestLtsyPhoneSelectNetwork();
-	CTestLtsyPhoneSelectNetwork(CTestLtsyModel& aTestModel);
-protected:
-	TVerdict doTestStepL();
-};
-
-_LIT(KTestLtsyPhoneSelectNetwork,   "TestLtsyPhoneSelectNetwork");
-#endif /*TESTLTSYPHONESELECTNETWORK_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphonesetnetworkselectionsetting.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-//  TestLtsySetNetworkSelectionSetting.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneSetNetworkSelectionSetting
-//
-#ifndef TESTLTSYPHONESETNWKSETTING_H_
-#define TESTLTSYPHONESETNWKSETTING_H_
-
-// user include
-#include "TestLtsyPhoneStepBase.h"
-
-/**
- * This class provide the funcition to open a shared phone.
- * 
- */
-class CTestLtsyPhoneSetNetworkSelectionSetting : public CTestLtsyPhoneStepBase
-/**
- * @internalAll
- * @test
- */
-{
-public:
-	virtual ~CTestLtsyPhoneSetNetworkSelectionSetting();
-	CTestLtsyPhoneSetNetworkSelectionSetting(CTestLtsyModel& aTestModel);
-protected:
-	TVerdict doTestStepL();
-};
-
-_LIT(KTestLtsyPhoneSetNetworkSelectionSetting,   "TestLtsyPhoneSetNetworkSelectionSetting");
-#endif /*TESTLTSYPHONESETNWKSETTING_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphonestepbase.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-//  TestTelephonyPktTestStepBase.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestTelephonyPktTestStepBase
-
-#ifndef TESTLTSYPHONESTEPBASE_H_
-#define TESTLTSYPHONESTEPBASE_H_
-
-
-#include <e32base.h>
-#include <es_sock.h>
-#include <es_enum.h>
-
-// user include
-#include "te_integration_stltsysuitestepbase.h"
-#include "TestLtsyModel.h"
-
-const TInt	KOneSecond = 1000000;
-
-/**
- * This is the test step base class of phone test 
- * category which provides methods
- */
-class CTestLtsyPhoneStepBase : public CTe_integration_stltsySuiteStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepPostambleL();
-	
-protected:
-	CTestLtsyPhoneStepBase(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPhoneStepBase();
-	
-	RMobilePhone& SharedPhone();
-	
-	void TestOpenPhoneL();
-	void TestClosePhone();
-	void GetFdnStatus();
-	void GetNetworkRegistrationStatus();
-	void GetPhoneId();
-	void GetDetectedNetworksL();
-	void GetDetectedNetworksCancelL(); //NO
-	void SetNetworkSelectionSetting();
-	void SelectNetwork();
-	void SetAndSelectNetwork(); //NO
-	
-	void GetBatteryInfo();
-	void GetBatteryCaps();
-	void NotifyBatteryInfoChange();
-	void GetBatteryStrengthCancel();
-	
-	void GetSignalStrength();
-	void GetSignalCaps();
-	void NotifySignalStrengthChange();
-	void GetSignalStrengthCancel();
-	
-	void GetHomeNetwork();
-	void GetServiceProviderName();//NO
-
-	
-	void GetCurrentNetworkInfo();
-//	void GetNetworkMode();
-	void GetNitzInfo();//no
-	
-//	void GetCurrentSystemNetworkModes();  //RMmCustomAPI
-//	void GetNetworkProviderName(); //RMmCustomAPI
-//	void GetOperatorName();  //RMmCustomAPI
-	void RegisterCellInfoChangeNotification();
-	void GetCellInfo();
-//	void GetPhoneCellInfo(); //RMmCustomAPI
-	
-	
-protected:
-	CTestLtsyModel& iModel;
-	RMobilePhone& iSharedPhone;
-	
-private:
-
-	};
-
-#endif // TESTLTSYPHONESTEPBASE_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphonestorebase.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// @file testltsyphonestorebase.h
-// 
-
-#ifndef TESTLTSYPHONESTOREBASE_H_
-#define TESTLTSYPHONESTOREBASE_H_
-
-class CTestLtsyModel;
-// user include
-#include "te_integration_stltsysuitestepbase.h"
-#include "testltsymodel.h"
-
-
-// class declaration
-/**
- * This class provide the common functionalities related to the PhoneStore
- * 
- */
-class CTestLtsyPhoneStoreBase : public CTe_integration_stltsySuiteStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	virtual ~CTestLtsyPhoneStoreBase();
-	         CTestLtsyPhoneStoreBase(CTestLtsyModel& aTestModel);
-protected:
-	TVerdict doTestStepPreambleL();
-	TVerdict doTestStepPostambleL();
-	RMobileONStore& PhoneONStore();
-	RMobileENStore& PhoneENStore();	
-	RMobilePhoneBookStore& PhoneBookStore();
-	void OpenPhoneL();
-
-protected:
-	CTestLtsyModel& iModel;
-	};
-
-#endif /*TESTLTSYPHONESTOREBASE_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyphonestoreshareddata.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-// TestTelephonyPhoneStoreSharedData.h
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestTelephonyPhoneStoreSharedData
-
-#ifndef TESTTELEPHONYPHONESTORESHAREDDATA_H_
-#define TESTTELEPHONYPHONESTORESHAREDDATA_H_
-// system include
-#include <e32cmn.h>
-#include <e32base.h>
-#include <etelmm.h>
-
-/**
- * This class defines the shared data of phone store test category between 
- * different test steps.
- */
-class CTestLtsyPhoneStoreSharedData : public CBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPhoneStoreSharedData();
-	virtual ~CTestLtsyPhoneStoreSharedData();
-	static CTestLtsyPhoneStoreSharedData* NewL();	
-	RMobileENStore& PhoneENStore();	
-	RMobileONStore& PhoneONStore();	
-	RMobilePhoneBookStore& PhoneBookStore();
-	void   Reset();	
-private:
-	void ConstructL();
-private:
-	RMobileONStore iONStore;
-	RMobileENStore iENStore;
-	RMobilePhoneBookStore iPhBkStore;
-	};
-#endif /*TESTTELEPHONYPHONESTORESHAREDDATA_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktactivatecontext.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktActivateContext.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktActivateContext
-
-
-#ifndef TESTLTSYPKTACTIVATECONTEXT_H_
-#define TESTLTSYPKTACTIVATECONTEXT_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to activate a primary packet context
- */
-class CTestLtsyPktActivateContext : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktActivateContext(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktActivateContext();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktActivateContext, "TestLtsyPktActivateContext");
-
-#endif // TESTLTSYPKTACTIVATECONTEXT_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktattachnetwork.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-//  TestLtsyPktAttachNetwork.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktAttachNetwork
-
-#ifndef TESTLTSYPKTATTACHNETWORK_H_
-#define TESTLTSYPKTATTACHNETWORK_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-// const define
-const TInt KMaxAllowedContextNum = 11;
-
-/**
- * This is the test step class which calls methods of base class
- * to attach packet service to network
- */
-class CTestLtsyPktAttachNetwork : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktAttachNetwork(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktAttachNetwork();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktAttachNetwork, "TestLtsyPktAttachNetwork");
-
-#endif // TESTLTSYPKTATTACHNETWORK_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktclosecontext.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktCloseContext.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktCloseContext
-
-
-#ifndef TESTLTSYPKTCLOSECONTEXT_H_
-#define TESTLTSYPKTCLOSECONTEXT_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to close packet context
- */
-class CTestLtsyPktCloseContext : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktCloseContext(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktCloseContext();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktCloseContext, "TestLtsyPktCloseContext");
-
-#endif // TESTLTSYPKTCLOSECONTEXT_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktclosecontextqos.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktCloseContextQos.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktCloseContextQos
-
-
-#ifndef TESTLTSYPKTCLOSECONTEXTQOS_H_
-#define TESTLTSYPKTCLOSECONTEXTQOS_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to open packet context
- */
-class CTestLtsyPktCloseContextQos : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktCloseContextQos(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktCloseContextQos();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktCloseContextQos, "TestLtsyPktCloseContextQos");
-
-#endif // TESTLTSYPKTCLOSECONTEXTQOS_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktclosepacket.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktClosePacket.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktClosePacket
-
-
-#ifndef TESTLTSYPKTCLOSEPACKET_H_
-#define TESTLTSYPKTCLOSEPACKET_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to open packet service
- */
-class CTestLtsyPktClosePacket : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktClosePacket(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktClosePacket();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktClosePacket, "TestLtsyPktClosePacket");
-
-#endif // TESTLTSYPKTCLOSEPACKET_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktdeactivatecontext.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktDeactivateContext.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktDeactivateContext
-
-
-#ifndef TESTLTSYPKTDEACTIVATECONTEXT_H_
-#define TESTLTSYPKTDEACTIVATECONTEXT_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to deactivate a packet context
- */
-class CTestLtsyPktDeactivateContext : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktDeactivateContext(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktDeactivateContext();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktDeactivateContext, "TestLtsyPktDeactivateContext");
-
-#endif // TESTLTSYPKTDEACTIVATECONTEXT_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktdeletecontext.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktDeleteContext.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktDeleteContext
-
-
-#ifndef TESTLTSYPKTDELETECONTEXT_H_
-#define TESTLTSYPKTDELETECONTEXT_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to activate a primary packet context
- */
-class CTestLtsyPktDeleteContext : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktDeleteContext(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktDeleteContext();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktDeleteContext, "TestLtsyPktDeleteContext");
-
-#endif // TESTLTSYPKTDELETECONTEXT_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktdetachnetwork.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktDetachNetwork.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktDetachNetwork
-
-
-#ifndef TESTLTSYPKTDETACHNETWORK_H_
-#define TESTLTSYPKTDETACHNETWORK_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to detach packet service from network
- */
-class CTestLtsyPktDetachNetwork : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktDetachNetwork(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktDetachNetwork();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktDetachNetwork, "TestLtsyPktDetachNetwork");
-
-#endif // TESTLTSYPKTDETACHNETWORK_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktgetcontextconfig.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktGetContextConfig.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktGetContextConfig
-
-
-#ifndef TESTLTSYPKTGETCONTEXTCONFIG_H_
-#define TESTLTSYPKTGETCONTEXTCONFIG_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to activate a primary packet context
- */
-class CTestLtsyPktGetContextConfig : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktGetContextConfig(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktGetContextConfig();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktGetContextConfig, "TestLtsyPktGetContextConfig");
-
-#endif // TESTLTSYPKTGETCONTEXTCONFIG_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktgetcontextinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktGetContextInfo.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktGetContextInfo
-
-
-#ifndef TESTLTSYPKTGETCONTEXTINFO_H_
-#define TESTLTSYPKTGETCONTEXTINFO_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to activate a primary packet context
- */
-class CTestLtsyPktGetContextInfo : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktGetContextInfo(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktGetContextInfo();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktGetContextInfo, "TestLtsyPktGetContextInfo");
-
-#endif // TESTLTSYPKTGETCONTEXTINFO_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktgetcontextqosprofile.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktGetContextQoSProfile.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktGetContextQoSProfile
-
-
-#ifndef TESTLTSYPKTGETCONTEXTQOSPROFILE_H_
-#define TESTLTSYPKTGETCONTEXTQOSPROFILE_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to activate a primary packet context
- */
-class CTestLtsyPktGetContextQoSProfile : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktGetContextQoSProfile(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktGetContextQoSProfile();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktGetContextQoSProfile, "TestLtsyPktGetContextQoSProfile");
-
-#endif // TESTLTSYPKTGETCONTEXTQOSPROFILE_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktgetdefaultparams.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktGetDefaultParams.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktGetDefaultParams
-
-
-#ifndef TESTLTSYPKTGETDEFAULTPARAMS_H_
-#define TESTLTSYPKTGETDEFAULTPARAMS_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to activate a primary packet context
- */
-class CTestLtsyPktGetDefaultParams : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktGetDefaultParams(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktGetDefaultParams();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktGetDefaultParams, "TestLtsyPktGetDefaultParams");
-
-#endif // TESTLTSYPKTGETDEFAULTPARAMS_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktgetdynamiccapabilities.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktGetDynamicCapabilities.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktGetDynamicCapabilities
-
-
-#ifndef TESTLTSYPKTGETDYNAICCAP_H_
-#define TESTLTSYPKTGETDYNAICCAP_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to open packet context
- */
-class CTestLtsyPktGetDynamicCapabilities : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktGetDynamicCapabilities(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktGetDynamicCapabilities();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktGetDynamicCapabilities, "TestLtsyPktGetDynamicCapabilities");
-
-#endif // TESTLTSYPKTGETDYNAICCAP_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktgetnwkregistrationstatus.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktNetworkRegistrationStatus.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktNetworkRegistrationStatus
-
-
-#ifndef TESTLTSYPKTNWKREGSTATUS_H_
-#define TESTLTSYPKTNWKREGSTATUS_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to activate a primary packet context
- */
-class CTestLtsyPktNetworkRegistrationStatus : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktNetworkRegistrationStatus(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktNetworkRegistrationStatus();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktNetworkRegistrationStatus, "TestLtsyPktNetworkRegistrationStatus");
-
-#endif // TESTLTSYPKTNWKREGSTATUS_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktgetservicestatus.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktGetServiceStatus.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktGetServiceStatus
-
-
-#ifndef TESTLTSYPKTGETSERVICESTATUS_H_
-#define TESTLTSYPKTGETSERVICESTATUS_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to activate a primary packet context
- */
-class CTestLtsyPktGetServiceStatus : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktGetServiceStatus(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktGetServiceStatus();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktGetServiceStatust, "TestLtsyPktGetServiceStatust");
-
-#endif // TESTLTSYPKTGETSERVICESTATUS_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktgetstaticcapabilities.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktGetStaticCapabilities.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktGetStaticCapabilities
-
-
-#ifndef TESTLTSYPKTGETSTATICCAP_H_
-#define TESTLTSYPKTGETSTATICCAP_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to open packet context
- */
-class CTestLtsyPktGetStaticCapabilities : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktGetStaticCapabilities(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktGetStaticCapabilities();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktGetStaticCapabilities, "TestLtsyPktGetStaticCapabilities");
-
-#endif // TESTLTSYPKTGETSTATICCAP_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktinitialisecontext.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktInitialiseContext.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktInitialiseContext
-
-
-#ifndef TESTLTSYPKTINITIALISECONTEXT_H_
-#define TESTLTSYPKTINITIALISECONTEXT_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to open packet context
- */
-class CTestLtsyPktInitialiseContext : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktInitialiseContext(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktInitialiseContext();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktInitialiseContext, "TestLtsyPktInitialiseContext");
-
-#endif // TESTLTSYPKTINITIALISECONTEXT_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktopencontext.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktOpenContext.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktOpenContext
-
-
-#ifndef TESTLTSYPKTOPENCONTEXT_H_
-#define TESTLTSYPKTOPENCONTEXT_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to open packet context
- */
-class CTestLtsyPktOpenContext : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktOpenContext(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktOpenContext();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktOpenContext, "TestLtsyPktOpenContext");
-
-#endif // TESTLTSYPKTOPENCONTEXT_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktopencontextqos.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktOpenContextQos.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktOpenContextQos
-
-
-#ifndef TESTLTSYPKTOPENCONTEXTQOS_H_
-#define TESTLTSYPKTOPENCONTEXTQOS_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to open packet context
- */
-class CTestLtsyPktOpenContextQos : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktOpenContextQos(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktOpenContextQos();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktOpenContextQos, "TestLtsyPktOpenContextQos");
-
-#endif // TESTLTSYPKTOPENCONTEXTQOS_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktopenpacket.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktOpenPacket.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktOpenPacket
-
-
-#ifndef TESTLTSYPKTOPENPACKET_H_
-#define TESTLTSYPKTOPENPACKET_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to open packet service
- */
-class CTestLtsyPktOpenPacket : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktOpenPacket(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktOpenPacket();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktOpenPacket, "TestLtsyPktOpenPacket");
-
-#endif // TESTTELEPHONYPKTACTIVATECONTEXT_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktsetcontextconfig.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktSetContextConfig.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktSetContextConfig
-
-
-#ifndef TESTLTSYPKTSETCONTEXTCONFIG_H_
-#define TESTLTSYPKTSETCONTEXTCONFIG_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to activate a primary packet context
- */
-class CTestLtsyPktSetContextConfig : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktSetContextConfig(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktSetContextConfig();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktSetContextConfig, "TestLtsyPktSetContextConfig");
-
-#endif // TESTLTSYPKTSETCONTEXTCONFIG_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktsetcontextqosprofile.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktSetContextQoSProfile.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktSetContextQoSProfile
-
-
-#ifndef TESTLTSYPKTSETCONTEXTQOSPROFILE_H_
-#define TESTLTSYPKTSETCONTEXTQOSPROFILE_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to activate a primary packet context
- */
-class CTestLtsyPktSetContextQoSProfile : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktSetContextQoSProfile(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktSetContextQoSProfile();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktSetContextQoSProfile, "TestLtsyPktSetContextQoSProfile");
-
-#endif // TESTLTSYPKTSETCONTEXTQOSPROFILE_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktsetdefaultparams.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//  TestLtsyPktSetDefaultParams.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktSetDefaultParams
-
-
-#ifndef TESTLTSYPKTSETDEFAULTPARAMS_H_
-#define TESTLTSYPKTSETDEFAULTPARAMS_H_
-
-// user include
-#include "TestLtsyPktTestStepBase.h"
-
-/**
- * This is the test step class which calls methods of base class
- * to activate a primary packet context
- */
-class CTestLtsyPktSetDefaultParams : public CTestLtsyPktTestStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsyPktSetDefaultParams(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktSetDefaultParams();
-	
-protected:
-	TVerdict doTestStepL();
-	};
-
-_LIT(KTestLtsyPktSetDefaultParams, "TestLtsyPktSetDefaultParams");
-
-#endif // TESTLTSYPKTSETDEFAULTPARAMS_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktshareddata.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-// CTestTelephonyPktSharedData.h
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestTelephonyPktSharedData
-
-#ifndef TESTTELEPHONYPKTSHAREDDATA_H_
-#define TESTTELEPHONYPKTSHAREDDATA_H_
-
-// system include
-#include <etelqos.h>
-#include <pcktcs.h>
-
-// const define
-const TInt KTFTFiltersGranularity 	= 1;
-const TInt KMaxServiceNum 			= 1;
-const TInt KMaxContextNum 			= 11;
-
-/**
- * This class defines the shared data of PACKET test category between 
- * different test steps.
- */
-class CTestLtsyPktSharedData : public CBase
-/**
- * @internalAll
- * @test
- */
-	{
-public: 
-	virtual ~CTestLtsyPktSharedData();
-	static CTestLtsyPktSharedData* NewL();	
-private:
-	CTestLtsyPktSharedData();
-	void ConstructL();
-
-public:
-	RPacketService                      iPacket;
-	RPacketService::TStatus             iPacketStatus;
-	RPacketService::TRegistrationStatus iRegistrationStatus;
-	RPacketService::TMSClass            iCurrentMobileStationClass;
-	RPacketService::TMSClass            iMaxMobileStationClass;
-	TUint                               iStaticCaps;
-	RPacketService::TDynamicCapsFlags   iDynamicCaps;
-	RPacketService::TAttachMode         iCurrentAttachMode;
-	TInt                                iNumContexts;
-	TInt                                iMaxContextsAllowed;
-	RPacketContext                      iContext1;
-	RPacketContext                      iContext2;
-	RPacketContext                      iContext3;
-	RPacketService::TContextInfo        iContextInfo;
-	RPacketService::TContextInfo        iContextInfo2;
-	TName                               iContextName;
-	TName                               iContextName1;
-	RPacketContext::TContextStatus      iContextStatus;
-	RPacketQoS                          iQoS;
-	TName                               iQoSName;
-	RPacketQoS::TQoSCapsGPRS        iQoSCapabilities;
-	RPacketQoS::TQoSGPRSRequested   iQoSRequested;
-	RPacketQoS::TQoSGPRSNegotiated  iQoSNegotiated;
-	};
-
-#endif // TESTTELEPHONYPKTSHAREDDATA_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktshareddata.inl	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-//  TestTelephonyPktSharedData.inl
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  The inline function implementation of CTestTelephonyPktSharedData
-
-#ifndef TESTTELEPHONYPKTSHAREDDATA_INL_
-#define TESTTELEPHONYPKTSHAREDDATA_INL_
-
-// user include
-#include "TestLtsyPktSharedData.h"
-
-/**
- * Get the reference of specified packet context
- * aServiceIndex - the index in the packet service array
- * aContextIndex - the index in the packet context array
- * @return - the reference of the RPacketContext object
- */
-RPacketContext& CTestLtsyPktSharedData::PacketContext(TInt aServiceIndex, TInt aContextIndex)
-	{
-	return iServices[aServiceIndex].iContexts[aContextIndex].iPktContext;
-	}
-
-/**
- * Get the reference of specified packet QoS profile
- * aServiceIndex - the index in the packet service array
- * aContextIndex - the index in the packet context array
- * @return - the reference of the QoS profile object
- */
-RPacketQoS& CTestLtsyPktSharedData::PacketQos(TInt aServiceIndex, TInt aContextIndex)
-	{
-	return iServices[aServiceIndex].iContexts[aContextIndex].iPktQos;
-	}
-
-/**
- * Get the reference of specified packet service
- * aServiceIndex - the index in the packet service array
- * @return - the reference of the RPacketService object
- */
-RPacketService& CTestLtsyPktSharedData::PacketService(TInt aServiceIndex)
-	{
-	return iServices[aServiceIndex].iPktService;
-	}
-
-/**
- * Get the reference of specified context data
- * aServiceIndex - the index in the packet service array
- * aContextIndex - the index in the packet context array
- * @return - the reference of the TContextData object
- */
-CTestLtsyPktSharedData::TContextData& CTestLtsyPktSharedData::ContextData(TInt aServiceIndex, TInt aContextIndex)
-	{
-	return iServices[aServiceIndex].iContexts[aContextIndex];
-	}
-
-#endif /*TESTTELEPHONYPKTSHAREDDATA_INL_*/
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsypktteststepbase.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-//  TestTelephonyPktTestStepBase.h
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestTelephonyPktTestStepBase
-
-#ifndef TESTTELEPHONYPKTTESTSTEPBASE_H_
-#define TESTTELEPHONYPKTTESTSTEPBASE_H_
-
-// user include
-#include "te_integration_stltsysuitestepbase.h"
-#include "TestLtsyPktSharedData.h"
-#include "TestLtsyModel.h"
-
-/**
- * This is the test step base class of PACKET test 
- * category which provides methods
- */
-class CTestLtsyPktTestStepBase : public CTe_integration_stltsySuiteStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepPostambleL();
-protected:
-
-	CTestLtsyPktTestStepBase(CTestLtsyModel& aModel);
-	virtual ~CTestLtsyPktTestStepBase();
-	
-	RMobilePhone& SharedPhone();
-	TBool IsOpenedPktService();
-	
-	void OpenPacketobject();
-	void ClosePacketobject();
-	
-	
-	void DisplayPacketServiceStatus();
-	void DisplayNetworkRegistrationStatus();
-	void DisplayContextInfo();
-	void DisplayContextStatus(RPacketContext::TContextStatus aContextStatus);
-	void DisplayContextStatus(RPacketContext& aContext, RPacketContext::TContextStatus& aContextStatus);
-	
-	void GprsContextAttachTest();
-	void GprsContextDetachTest();
-	
-	void GprsNetWorkTest();
-	
-	void GprsContextSetConfigTest();
-	void GprsContextGetConfigTest();
-	
-	void GprsGetDefaultContextParamsTest();
-	void GprsSetDefaultContextParamsTest();
-	
-	void DisplayStaticCapabilities();
-	void DisplayDynamicCapabilities();
-	
-	void GprsContextActivateTest();
-	void GprsContextDeactivateTest();
-	
-	void GprsSetQoSProfileTest();
-	void GprsGetQoSProfileTest();
-	
-	void NotificationContextAdded();
-	void NotificationContextAddedCancel();
-	
-	void OpenNewContext();
-	void CloseExistContext();
-	
-	void OpenExistingContext();
-	void OpenContextUsingUnknownName();
-	
-	void GprsContextDeleteTest();
-	
-	void GprsInitialiseContext();
-	
-	void NotificationContextStatusChange();
-	void NotificationContextStatusChangeCancel();
-	
-	void OpenNewContextQos();
-	void CloseExistContextQos();
-	
-
-	void GprsContextSetConfigTest1();
-	void GprsContextSetConfigTest2();
-	void GprsContextSetConfigTest3();
-	void GprsContextSetConfigTest4();
-
-	void GprsSetQoSProfileTest1();
-	void GprsSetQoSProfileTest2();
-	void GprsSetQoSProfileTest3();
-	void GprsSetQoSProfileTest4();
-	void GprsSetQoSProfileTest5();
-	void GprsSetQoSProfileTest6();
-	void GprsSetQoSProfileTest7();
-	void GprsSetQoSProfileTest8();
-	void GprsSetQoSProfileTest9();
-	void GprsSetQoSProfileTest10();
-	void GprsSetQoSProfileTest11();
-	void GprsSetQoSProfileTest12();
-	void GprsSetQoSProfileTest13();
-	void GprsSetQoSProfileTest14();
-	void GprsSetQoSProfileTest15();
-	void GprsSetQoSProfileTest16();
-	void GprsSetQoSProfileTest17();
-	void GprsSetQoSProfileTest18();
-	void GprsSetQoSProfileTest19();
-	void GprsSetQoSProfileTest20();
-
-protected:
-	CTestLtsyModel& iModel;
-	RMobilePhone& iSharedPhone;
-	};
-
-#endif // TESTTELEPHONYPKTTESTSTEPBASE_H_

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsyshareddata.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-// TestTelephonySharedData.h
-//
-// Copyright (c) 2003-2008 Symbian Software Ltd.  All rights reserved.
-//
-// This contains TestTelephonySharedData
-#if (!defined __TEST_TELEPHONY_SHARED_DATA_H__)
-#define __TEST_TELEPHONY_SHARED_DATA_H__
-
-// CDMA specific Conditional compilation
-//#include "../../group/configuration.cfg"
-
-// EPOC include
-#include <etelmm.h>
-#include <etel.h>
-#if (defined CDMA_API_ENABLED)
-#include <etelcdma.h>
-#endif
-#include <testexecutestepbase.h>
-
-#include "TestLtsyAsyncOperation.h"
-
-class CTestLtsySharedData : public CBase
-/**
-@internalAll
-@test
-@class CTestLtsySharedData
-
-For creating the shared data object and to access the object across
-the test steps.. 
-*/
-	{
-public:
-	static CTestLtsySharedData*	NewL();
-
-	~CTestLtsySharedData();
-	TInt		OpenPhone(const TName& aTsyName, CTestStep& aTestStep);
-	void		ClosePhone();
-	TInt		ReopenPhone();
-	TBool		PhoneOpened() const { return iPhoneOpened; }
-	CTelephony&	Telephony() const { return *iTelephony; }
-
-protected:
-	CTestLtsySharedData();
-	virtual void	ConstructL();
-
-public:
-	/** Holding Calld Id of line1 */
-	CTelephony::TCallId			iCallId;
-	/** Holding Calld Id of line2 */
-	CTelephony::TCallId			iCallId1;
-	/** Pointer to the RMobileCall object */
-	RMobileCall					iMobileCall;
-	/** Pointer to the RMobileLine object */
-	RMobileLine					iMobileLine;
-	/** Holds the TST name to be loaded */
-	TName						iTSYName;
-	/** For RTelServer connection */
-	TBool						iTelServerConnected;
-	/** For Phone module loading */
-	TBool						iPhoneModuleLoaded;
-	/** For RMobilePhone connection */
-	TBool						iPhoneOpened;
-	/** For RMobilePhone initialization */
-	TBool						iPhoneInitialised;
-	/** For RMobileLine connection */
-	TBool						iLineOpened;
-	/** For RMobileCall connection */
-	TBool						iCallOpened;
-	/** Holds RTelServer */
-	RTelServer					iServer;
-	RMobilePhone				iMobilePhone;
-private:
-	/** Pointer shared CTelephony object */
-	CTelephony*					iTelephony;
-	/** Holds pointer to the ActiveScheduler */
-	CActiveScheduler*			iActiveScheduler;
-};
-
-#endif //__TEST_TELEPHONY_SHARED_DATA_H__

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmsack.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// @file testltsysmsatutil.h
-// 
-
-#ifndef TESTLTSYSMSACK_H
-#define TESTLTSYSMSACK_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsySmsAck
- *
- */
-class CTestLtsySmsAck : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsySmsAck();
-	static CTestLtsySmsAck* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsySmsAck* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsySmsAck(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void AckSmsStoredL();
-private:
-
-	}; // class CTestLtsySmsAck
-_LIT(KCTestLtsySmsAck,"CTestLtsySmsAck");
-
-#endif // TESTLTSYSMSACK_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmsatutil.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-// 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:
-// @file testltsysmsatutil.h
-// This contains SmsAtUtil which is util for Sms At command
-// 
-
-#ifndef TESTLTSYSMSATUTIL_H
-#define TESTLTSYSMSATUTIL_H
-// system include
-#include <e32std.h>
-#include <e32base.h>
-#include <etelmm.h>
-
-
-/**
-*  SmsAtUtil
-* 
-*/
-class SmsAtUtil : public CBase
-	{
-public:
-	
-	 /**
-	 * Converts aAscii ASCII chars to Semi Octets in aData.
-	 * One ASCII char (8bits in aAscii) is translated to one Semi-Octet (4bits in aData).
-	 * 
-	 * @param aAscii input ascii string
-	 * @param aData  output binary data 
-	 * @return Standard KErr... values 
-	 */	
-	static TInt ConvertAsciiToBinary(const TDesC8& aAscii,TDes8& aData);
-	
-	
-	 /**
-	 * Appends the binary data (aData) onto the end of an ASCII string (aAscii) in ASCII format.
-	 * 
-	 * @param aAscii  an ascii string 
-	 * @param aData   a  binary string 
-	 */
-	static void AppendDataToAscii(TDes8& aAscii,const TDesC8& aData);
-	
-	 /**
-	 * Reads an address from the front of the ASCII string (aAscii) and fills up Address structure (aAddress).
-	 * The address read from the ASCII string is removed from the ASCII string.
-	 * 
-	 * @param aAscii an ascii string 
-	 * @param aAddress  a SCA address
-	 * @return Standard KErr... values
-	 */
-	static TBool IsAddressChar(TChar aChar);
-
-private:
-	
-	 /**
-	 * @param aValue should be an ETSI Numbering-Plan-Identification field
-	 * @return The equivalent RMobilePhone::TMobileNPI value for aValue
-	 */
-	static RMobilePhone::TMobileNPI ConvertNumberingPlan(TInt aValue);
-	
-	 /**
-	 * @param aValue should be an ETSI Type-Of-Number field
-	 * @return The equivalent RMobilePhone::TMobileTON value for aValue
-	 */
-	static RMobilePhone::TMobileTON ConvertTypeOfNumber(TInt aValue); 
-	
-	 /**
-	 * Converts a TInt octet value into ASCII representation and then appends that
-	 * ASCII representation to the end of the given ASCII string.
-	 *
-	 * @param aOctet the octet value to append
-	 * @param aAscii the ASCII string to which aOctet value should be appended
-	 */	
-	static void AppendOctet(TInt aOctet,TDes8& aAscii);
-	
-	 /**
-	 * Returns the equivalent numeric value for a given ASCII address character.
-	 *
-	 * @param aChar the address character to be converted
-	 * @return The numeric value equivalent of the given address character.
-	 */
-	static TInt ConvertAddressChar(TChar aChar);
-	
-	 /**
-	 * Returns the equivalent ASCII address character for a given address value.
-	 *
-	 * @param aBinary the numerix value of the address character to be returned
-	 * @return The ASCII charcater which represents the given address numeric value.
-	 */
-	static TChar ConvertAddressChar(TInt aBinary);
-	
-	};
-
-#endif // TESTLTSYSMSATUTIL_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmsbase.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-// Copyright (c) 2008-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:
-// Implementation of the Class CTestLtsySmsBase
-// 
-//
-
-#ifndef TESTLTSYSMSBASE_H_
-#define TESTLTSYSMSBASE_H_
-
-// user include
-class CTestLtsyModel;
-#include "te_integration_stltsysuitestepbase.h"
-#include "testltsymodel.h"
-
-//constant defination
-const TInt16 KMessageLen(165);
-
-// class declaration
-/**
- * This class provide the common functionalities related to the sms.
- * 
- */
-class CTestLtsySmsBase : public CTe_integration_stltsySuiteStepBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	virtual ~CTestLtsySmsBase();
-	CTestLtsySmsBase(CTestLtsyModel& aTestModel);
-protected:
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepPostambleL();
-	RMobileSmsMessaging& Sms();
-	RMobileSmsStore& SmsStore();
-	void OpenPhoneL();
-	void OpenSmsL();
-	void OpenSmsStoreL();
-	void CloseSmsL();
-	void CloseSmsStoreL();
-	void GetIndex();
-protected:
-	CTestLtsyModel& iModel;
-	TInt iIndexNum;
-	TInt iStoreIndex;
-	};
-
-#endif /*TESTLTSYSMSBASE_H_*/

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmscontrolreceivesmscase1step.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/**
-* Copyright (c) 2002-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 CTestLtsySmsControlReceiveSmsCase1Step.h
- @internalTechnology
-*/
-#if (!defined __CTESTLTSYSMSCONTROLRECEIVESMSCASE1_STEP_H__)
-#define __CTESTLTSYSMSCONTROLRECEIVESMSCASE1_STEP_H__
-#include <TestExecuteStepBase.h>
-#include "te_integration_stltsysuitestepbase.h"
-
-class CCTestLtsySmsControlReceiveSmsCase1Step : public CTe_integration_stltsySuiteStepBase
-	{
-public:
-	CCTestLtsySmsControlReceiveSmsCase1Step();
-	~CCTestLtsySmsControlReceiveSmsCase1Step();
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-
-// Please add/modify your class members here:
-private:
-	};
-
-_LIT(KCTestLtsySmsControlReceiveSmsCase1Step,"CTestLtsySmsControlReceiveSmsCase1Step");
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmscontrolsendsmscase1step.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/**
-* Copyright (c) 2002-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 CTestLtsySmsControlSendSmsCase1Step.h
- @internalTechnology
-*/
-#if (!defined __CTESTLTSYSMSCONTROLSENDSMSCASE1_STEP_H__)
-#define __CTESTLTSYSMSCONTROLSENDSMSCASE1_STEP_H__
-#include <TestExecuteStepBase.h>
-#include "te_integration_stltsysuitestepbase.h"
-
-class CCTestLtsySmsControlSendSmsCase1Step : public CTe_integration_stltsySuiteStepBase
-	{
-public:
-	CCTestLtsySmsControlSendSmsCase1Step();
-	~CCTestLtsySmsControlSendSmsCase1Step();
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-
-// Please add/modify your class members here:
-private:
-	};
-
-_LIT(KCTestLtsySmsControlSendSmsCase1Step,"CTestLtsySmsControlSendSmsCase1Step");
-
-#endif

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmsdelete.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// @file testltsysmsdeleteall.h
-// 
-
-#ifndef TESTLTSYSMSDELETE_H
-#define TESTLTSYSMSDELETE_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsySmsDelete
- *
- */
-class CTestLtsySmsDelete : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsySmsDelete();
-	static CTestLtsySmsDelete* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsySmsDelete* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsySmsDelete(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void DeleteSmsL(TInt aIndex);
-private:
-
-	}; // class CTestLtsySmsDelete
-_LIT(KCTestLtsySmsDelete,"CTestLtsySmsDelete");
-
-#endif // TESTLTSYSMSDELETE_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmsdeleteall.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// @file testltsysmsdeleteall.h
-// 
-
-#ifndef TESTLTSYSMSDELETEALL_H
-#define TESTLTSYSMSDELETEALL_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsySmsDeleteAll
- *
- */
-class CTestLtsySmsDeleteAll : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsySmsDeleteAll();
-	static CTestLtsySmsDeleteAll* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsySmsDeleteAll* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsySmsDeleteAll(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void DeleteAllSmsL();
-private:
-
-	}; // class CTestLtsySmsDeleteAll
-_LIT(KCTestLtsySmsDeleteAll,"CTestLtsySmsDeleteAll");
-
-#endif // TESTLTSYSMSDELETEALL_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmsdeleteinvalidindex.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// @file testltsysmsdeleteinvalidindex.h
-// 
-
-#ifndef TESTLTSYSMSDELETEINVALIDINDEX_H
-#define TESTLTSYSMSDELETEINVALIDINDEX_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsySmsDeleteInvalidIndex
- *
- */
-class CTestLtsySmsDeleteInvalidIndex : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsySmsDeleteInvalidIndex();
-	static CTestLtsySmsDeleteInvalidIndex* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsySmsDeleteInvalidIndex* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsySmsDeleteInvalidIndex(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void DeleteSmsL(TInt aIndex);
-private:
-
-	}; // class CTestLtsySmsDeleteInvalidIndex
-_LIT(KCTestLtsySmsDeleteInvalidIndex,"CTestLtsySmsDeleteInvalidIndex");
-
-#endif // TESTLTSYSMSDELETEINVALIDINDEX_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmsnack.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// 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:
-// @file testltsysmsnack.h
-// 
-
-#ifndef TESTLTSYSMSNACK_H
-#define TESTLTSYSMSNACK_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsySmsNack
- *
- */
-class CTestLtsySmsNack : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsySmsNack();
-	static CTestLtsySmsNack* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsySmsNack* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsySmsNack(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void NackSmsStoredL();
-private:
-
-	}; // class CTestLtsySmsNack
-_LIT(KCTestLtsySmsNack,"CTestLtsySmsNack");
-
-#endif // TESTLTSYSMSNACK_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmsread.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-// 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:
-// @file testltsysmsread.h
-// 
-
-#ifndef TESTLTSYSMSREAD_H
-#define TESTLTSYSMSREAD_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsySmsRead
- *
- */
-class CTestLtsySmsRead : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsySmsRead();
-	static CTestLtsySmsRead* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsySmsRead* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsySmsRead(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void ReadSmsL(TInt aIndex);
-private:
-
-	RMobileSmsStore::TMobileGsmSmsEntryV1 iEntryV1;
-	}; // class CTestLtsySmsRead
-_LIT(KCTestLtsySmsRead,"CTestLtsySmsRead");
-
-#endif // TESTLTSYSMSREAD_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmsreadinvalidindex.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-// 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:
-// @file testltsysmsreadinvalidindex.h
-// 
-
-#ifndef TESTLTSYSMSREADINVALIDINDEX_H
-#define TESTLTSYSMSREADINVALIDINDEX_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsySmsReadInvalidIndex
- *
- */
-class CTestLtsySmsReadInvalidIndex : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsySmsReadInvalidIndex();
-	static CTestLtsySmsReadInvalidIndex* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsySmsReadInvalidIndex* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsySmsReadInvalidIndex(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void ReadSmsL(TInt aIndex);
-private:
-
-	RMobileSmsStore::TMobileGsmSmsEntryV1 iEntryV1;
-	}; // class CTestLtsySmsReadInvalidIndex
-_LIT(KCTestLtsySmsReadInvalidIndex,"CTestLtsySmsReadInvalidIndex");
-
-#endif // TESTLTSYSMSREADINVALIDINDEX_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmsreceive.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-//
-// testltsysmsreceive.h
-//
-// Copyright (c) Symbian Software Ltd. Your copyright notice.  All rights reserved.
-//
-
-#ifndef TESTLTSYSMSRECEIVE_H
-#define TESTLTSYSMSRECEIVE_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-
-/**
- * CTestLtsySmsReceive
- *
- */
-class CTestLtsySmsReceive : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsySmsReceive();
-	static CTestLtsySmsReceive* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsySmsReceive* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsySmsReceive(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void ReceiveSmsL();
-private:
-
-	/**
-	*  Receiving message's TPDU
-	*/
-	TBuf8<KMessageLen> iRecvMsg;
-	}; // class CTestLtsySmsReceive
-_LIT(KCTestLtsySmsReceive,"CTestLtsySmsReceive");
-
-#endif // TESTLTSYSMSRECEIVE_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmssend.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-//
-// testltsysmssend.h
-//
-// Copyright (c) Symbian Software Ltd. Your copyright notice.  All rights reserved.
-//
-
-#ifndef TESTLTSYSMSSEND_H
-#define TESTLTSYSMSSEND_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsySmsSend
- *
- */
-class CTestLtsySmsSend : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsySmsSend();
-	static CTestLtsySmsSend* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsySmsSend* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsySmsSend(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void SendSmsL();
-	void FillSmsAttibutes(const TDesC& aTelNumber);
-private:
-	RMobileSmsMessaging::TMobileSmsSendAttributesV1 iSmsAttr;
-
-	}; // class CTestLtsySmsSend
-_LIT(KCTestLtsySmsSend,"CTestLtsySmsSend");
-
-#endif // TESTLTSYSMSSEND_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmssendinvalidparam.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-//
-// testltsysmssendinvalidparam.h
-//
-// Copyright (c) Symbian Software Ltd. Your copyright notice.  All rights reserved.
-//
-
-#ifndef TESTLTSYSMSSENDINVALIDPARAM_H
-#define TESTLTSYSMSSENDINVALIDPARAM_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsySmsSendInvalidParam
- *
- */
-class CTestLtsySmsSendInvalidParam : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsySmsSendInvalidParam();
-	static CTestLtsySmsSendInvalidParam* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsySmsSendInvalidParam* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsySmsSendInvalidParam(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void SendSmsL();
-	void FillSmsAttibutes(const TDesC& aTelNumber);
-	void SendSms1L();
-	void FillSmsAttibutes1(const TDesC& aTelNumber);
-	void SendSms2L();
-	void FillSmsAttibutes2(const TDesC& aTelNumber);
-private:
-	RMobileSmsMessaging::TMobileSmsSendAttributesV1 iSmsAttr;
-	}; // class CTestLtsySmsSendInvalidParam
-_LIT(KCTestLtsySmsSendInvalidParam,"CTestLtsySmsSendInvalidParam");
-
-#endif // TESTLTSYSMSSENDINVALIDPARAM_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmsshareddata.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-// TestTelephonySmsSharedData.h
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestTelephonySmsSharedData
-
-#ifndef TESTTELEPHONYSMSSHAREDDATA_H
-#define TESTTELEPHONYSMSSHAREDDATA_H
-
-// system include
-#include <e32cmn.h>
-#include <e32base.h>
-#include <etelmm.h>
-
-/**
- * This class defines the shared data of sms test category between 
- * different test steps.
- */
-class CTestLtsySmsSharedData : public CBase
-/**
- * @internalAll
- * @test
- */
-	{
-public:
-	CTestLtsySmsSharedData();
-	virtual ~CTestLtsySmsSharedData();
-	static CTestLtsySmsSharedData* NewL();
-	RArray<RMobileSmsMessaging>& SmsMessagingArray();
-	RArray<RMobileSmsStore>& SmsStoreArray();
-	void Reset();
-	void InitializeL();
-private:
-	void ConstructL();
-private:
-	RArray<RMobileSmsMessaging> iMessaging;
-	RArray<RMobileSmsStore> iSmsStore;
-	};
-
-#endif // TESTTELEPHONYSMSSHAREDDATA_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmsstore.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-// 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:
-// @file testltsysmsstore.h
-// 
-
-#ifndef TESTLTSYSMSSTORE_H
-#define TESTLTSYSMSSTORE_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsySmsStore
- *
- */
-class CTestLtsySmsStore : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsySmsStore();
-	static CTestLtsySmsStore* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsySmsStore* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsySmsStore(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void StoreSmsL();
-	void ReceiveSmsL();
-	void WriteSmsL();
-	void AckSmsStoredL();
-	void NackSmsStoredL();
-private:
-	void FillWriteSmsAttibutesL(TBuf8<400> aTpdu,RMobilePhone::TMobileAddress  aMsgSca);
-	/**
-	*  Receiving message's attributs
-	*/ 
-	RMobileSmsMessaging::TMobileSmsReceiveAttributesV1 iReceiveAttr;
-	/**
-	*  Receiving message's TPDU
-	*/
-	TBuf8<KMessageLen> iRecvMsg;
-	
-	}; // class CTestLtsySmsStore
-_LIT(KCTestLtsySmsStore,"CTestLtsySmsStore");
-
-#endif // TESTLTSYSMSSTORE_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmsstoregetinfo.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-//
-// testltsygetmessagestoreinfo.h
-//
-// Copyright (c) Symbian Software Ltd. Your copyright notice.  All rights reserved.
-//
-
-#ifndef TESTLTSYSMSSTOREGETINFO_H
-#define TESTLTSYSMSSTOREGETINFO_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsySmsStoreGetInfo
- *
- */
-class CTestLtsySmsStoreGetInfo : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsySmsStoreGetInfo();
-	static CTestLtsySmsStoreGetInfo* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsySmsStoreGetInfo* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsySmsStoreGetInfo(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void GetSmsStoreInfoL();
-	void CheckSmsStoreInfoL();
-private:
-	RMobilePhoneBookStore::TMobilePhoneBookInfoV1   iInfo;	
-	}; // class CTestLtsySmsStoreGetInfo
-_LIT(KCTestLtsySmsStoreGetInfo,"CTestLtsySmsStoreGetInfo");
-
-#endif // TESTLTSYSMSSTOREGETINFO_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmswrite.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-//
-// testltsysmswrite.h
-//
-// Copyright (c) Symbian Software Ltd. Your copyright notice.  All rights reserved.
-//
-
-#ifndef TESTLTSYSMSWRITE_H
-#define TESTLTSYSMSWRITE_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsySmsWrite
- *
- */
-class CTestLtsySmsWrite : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsySmsWrite();
-	static CTestLtsySmsWrite* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsySmsWrite* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsySmsWrite(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void WriteSmsL();
-private:
-
-	void FillWriteSmsAttibutesL(TBuf8<400> aTpdu,RMobilePhone::TMobileAddress  aMsgSca);
-	}; // class CTestLtsySmsWrite
-_LIT(KCTestLtsySmsWrite,"CTestLtsySmsWrite");
-
-#endif // TESTLTSYSMSWRITE_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/inc/testltsysmswriteinvalidparam.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-//
-// testltsysmswriteinvalidparam.h
-//
-// Copyright (c) Symbian Software Ltd. Your copyright notice.  All rights reserved.
-//
-
-#ifndef TESTLTSYSMSWRITEINVALIDPARAM_H
-#define TESTLTSYSMSWRITEINVALIDPARAM_H
-
-//system include 
-#include <e32std.h>
-#include <e32base.h>
-
-//user include
-#include "testltsysmsbase.h"
-#include "testltsymodel.h"
-// CLASS DECLARATION
-
-/**
- * CTestLtsySmsWriteInvalidParam
- *
- */
-class CTestLtsySmsWriteInvalidParam : public CTestLtsySmsBase
-	{
-public:
-
-	~CTestLtsySmsWriteInvalidParam();
-	static CTestLtsySmsWriteInvalidParam* NewL(CTestLtsyModel& aTestModel);
-	static CTestLtsySmsWriteInvalidParam* NewLC(CTestLtsyModel& aTestModel);
-	CTestLtsySmsWriteInvalidParam(CTestLtsyModel& aTestModel);
-	void ConstructL();
-protected:	
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepL();
-	virtual TVerdict doTestStepPostambleL();
-	void WriteSmsL();
-	void WriteSms1L();
-	void WriteSms2L();
-	void WriteSms3L();
-	void WriteSms4L();
-private:
-	void FillWriteSmsAttibutesL(TBuf8<400> aTpdu,RMobilePhone::TMobileAddress  aMsgSca);
-	}; // class CTestLtsySmsWriteInvalidParam
-_LIT(KCTestLtsySmsWriteInvalidParam,"CTestLtsySmsWriteInvalidParam");
-
-#endif // TESTLTSYSMSWRITEINVALIDPARAM_H

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/scripts/te_integration_stllsycallcontrol.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-//
-PRINT Run all te_integration_stltsy Suite Tests
-
-//
-LOAD_SUITE te_integration_stltsySuite -SharedData
-//
-//Please add or make change of you test steps, here is sample only:
-
-PRINT ************************
-PRINT Start case 1
-PRINT Dial->Hold->Resume->Hold->Resume->Hang up
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlBase
-
-PRINT ************************
-PRINT Start case 2
-PRINT Dial->Hang up->Close
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlDialHangupCase
-
-PRINT ************************
-PRINT Start case 3
-PRINT Notify incoming call
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlNotifyIncomingCallCase1
-
-PRINT ************************
-PRINT Start case 4
-PRINT Dial emergency call
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlDialEmergencyCall
-
-PRINT ************************
-PRINT Start case 5
-PRINT Notify incoming call->Answer->RCustomAPI close all
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlCustomAPITerminateAllCalls
-
-
-PRINT ************************
-PRINT Start case 6
-PRINT Dial one->Dial two->Phone close all
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlPhoneTerminateAllCalls
-
-PRINT ************************
-PRINT Start case 7
-PRINT Notify incoming call 1
-PRINT Answer call 1
-PRINT Notify incoming call 2
-PRINT Answer call 2
-PRINT Hangup call 1->Hangup call 2
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlNotifyIncomingCallCase2
-
-PRINT ************************
-PRINT Start case 8
-PRINT Notify incoming call 1
-PRINT Answer call 1
-PRINT Hold 1
-PRINT Resume 1
-PRINT Hang up 1
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlNotifyIncomingCallCase3
-
-PRINT ************************
-PRINT Start case 9
-PRINT Notify incoming call 1
-PRINT Answer call 1
-PRINT Notify incoming call 2
-PRINT Answer call 2
-PRINT Swap call 1
-PRINT Swap call 2
-PRINT Hang up call 1
-PRINT Hang up call 2
-PRINT Close call 1
-PRINT Close call 2
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlSwapCalls
-
-PRINT ************************
-PRINT Start case 10
-PRINT Dial call number 11
-PRINT Close call
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlDialBadCall
-
-PRINT ************************
-PRINT Start case 11
-PRINT Dial call self number 
-PRINT Close call
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlDialSelfCall
-
-PRINT ************************
-PRINT Start case 12
-PRINT Dial normal call
-PRINT Dial emergency call
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlDialEmergencyCallStopAllCall
-
-PRINT Complate_te_integration_stltsy_Tests

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/scripts/te_integration_stllsysmscontrol.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//
-PRINT Run all te_integration_stltsy Suite Tests
-
-//
-LOAD_SUITE te_integration_stltsySuite  -SharedData
-//
-//Please add or make change of you test steps, here is sample only:
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyOpenPhone
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyOpenSms 
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyOpenSmsStore
-RUN_TEST_STEP 20 te_integration_stltsySuite CTestLtsySmsSend 
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyGetMessageStoreInfo
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsySmsStoreGetInfo
-RUN_TEST_STEP 200 te_integration_stltsySuite CTestLtsySmsReceive
-delay 2000
-RUN_TEST_STEP 30 te_integration_stltsySuite CTestLtsySmsAck
-RUN_TEST_STEP 30 te_integration_stltsySuite CTestLtsySmsNack
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsySmsSendInvalidParam
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsySmsRead
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsySmsReadInvalidIndex
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsySmsDelete
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsySmsDeleteInvalidIndex
-delay 5000
-RUN_TEST_STEP 200 te_integration_stltsySuite CTestLtsySmsDeleteAll
-delay 5000
-RUN_TEST_STEP 200 te_integration_stltsySuite CTestLtsySmsStore
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsySmsWrite
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsySmsWriteInvalidParam
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyCloseSms  
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyCloseSmsStore                             
-                             
-
-PRINT Complate_te_integration_stltsy_Tests

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/scripts/te_integration_stltsySuite.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-//
-PRINT Run all te_integration_stltsy Suite Tests
-
-//
-LOAD_SUITE te_integration_stltsySuite
-//
-//Please add or make change of you test steps, here is sample only:
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlDiallCase1Step c:\testdata\configs\te_integration_stltsySuite.ini Section0
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsySmsControlReceiveSmsCase1Step c:\testdata\configs\te_integration_stltsySuite.ini Section1
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsySmsControlSendSmsCase1Step c:\testdata\configs\te_integration_stltsySuite.ini Section2
-
-PRINT Complate_te_integration_stltsy_Tests

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/scripts/te_integration_stltsyphonebook.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-//
-PRINT Run all te_integration_stltsy Suite Tests
-
-//
-LOAD_SUITE te_integration_stltsySuite  -SharedData
-//
-//Please add or make change of you test steps, here is sample only:
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyOpenPhone
-delay 5000
-RUN_TEST_STEP 120 te_integration_stltsySuite CTestLtsyPhbkGetStoreInfo
-delay 2000
-RUN_TEST_STEP 120 te_integration_stltsySuite CTestLtsyPhbkOpen 
-delay 10000
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyPhbkDelete 
-delay 2000
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyPhbkDeleteInvalidIndex
-delay 2000
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyPhbkWrite      
-delay 1000
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyPhbkWriteInvalidIndex
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyPhbkRead    
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyPhbkReadInvalidIndex
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyPhbkClose                       
-                           
-
-PRINT Complate_te_integration_stltsy_Tests

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/scripts/te_integration_stltsyphonecontrol.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-//
-PRINT Run all te_integration_stltsy Suite Tests
-
-//
-LOAD_SUITE te_integration_stltsySuite -SharedData
-//
-//Please add or make change of you test steps, here is sample only:
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyOpenPhone
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyPhoneGetFdnStatus
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyPhoneGetNetworkRegistrationStatus
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyGetPhoneSingalCap
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyGetPhoneSingalStrength
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyGetPhoneBatteryCap
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyGetPhoneBatteryInfo
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyPhoneGetCellInfo
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyPhoneGetPhoneID
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyPhoneSetNetworkSelectionSetting
-RUN_TEST_STEP 30 te_integration_stltsySuite TestLtsyPhoneSelectNetwork
-//RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyClosePhone
-
-
-PRINT Complate_te_integration_stltsy_Tests

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/scripts/te_integration_stltsypktcontrol.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-//
-PRINT Run all te_integration_stltsy Suite Tests
-
-//
-LOAD_SUITE te_integration_stltsySuite -SharedData
-//
-//Please add or make change of you test steps, here is sample only:
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktOpenPacket
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetServiceStatust
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktNetworkRegistrationStatus
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetServiceStatust
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktAttachNetwork
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetServiceStatust
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktNetworkRegistrationStatus
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetServiceStatust
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktDetachNetwork
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetServiceStatust
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktNetworkRegistrationStatus
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktAttachNetwork
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktNetworkRegistrationStatus
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetServiceStatust
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetStaticCapabilities
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetDynamicCapabilities
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktOpenContext
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktInitialiseContext
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetContextInfo
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktSetContextConfig
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetContextInfo
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktOpenContextQos
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktSetContextQoSProfile
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktActivateContext
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetContextInfo
-RUN_TEST_STEP 150 te_integration_stltsySuite TestLtsyPktDeactivateContext
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetContextInfo
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktCloseContextQos
-RUN_TEST_STEP 100 te_integration_stltsySuite TestLtsyPktDeleteContext
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktCloseContext
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktClosePacket
-
-
-PRINT Complate_te_integration_stltsy_Tests

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/te_integration_stltsysuiteserver.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,389 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Example file/test code to demonstrate how to develop a TestExecute Server
-// Developers should take this project as a template and substitute their own
-// for (WINS && !EKA2) versions will be xxxServer.Dll and require a thread to be started
-// in the process of the client. The client initialises the server by calling the
-// one and only ordinal.
-// 
-//
-
-/**
- @file Te_integration_stltsySuiteServer.cpp
- @internalTechnology
-*/
-
-#include "te_integration_stltsysuiteserver.h"
-#include "testltsysmscontrolreceivesmscase1step.h"
-#include "testltsysmscontrolsendsmscase1step.h"
-#include "testltsycallcontrolbase.h"
-#include "testltsycallcontroldialhangupcase.h"
-#include "testltsycallcontrolnotifyincomingcallcase1.h"
-#include "testltsycallcontrolnotifyincomingcallcase2.h"
-#include "testltsycallcontrolnotifyincomingcallcase3.h"
-#include "testltsycallcontrolswapcalls.h"
-#include "testltsycallcontrolcustomapiterminateallcalls.h"
-#include "testltsycallcontrolphoneterminateallcalls.h"
-#include "testltsycallcontroldialemergencycall.h"
-#include "testltsycallcontroldialbadcall.h"
-#include "testltsycallcontroldialselfcall.h"
-#include "testltsycallcontroldialemergencycallstopallcalls.h"
-
-#include "testltsyopenphone.h"
-#include "testltsyclosephone.h"
-#include "testltsyclosephone.h"
-#include "testltsyopenphone.h"
-#include "testltsygetphonebatteryinfo.h"
-#include "testltsygetphonesignalstrength.h"
-#include "testltsygetphonebatterycap.h"
-#include "testltsygetphonesignalcap.h"
-#include "testltsyphonegetfdnstatus.h"
-#include "testltsyphonegetnetworkregistrationstatus.h"
-#include "testltsyphonegetphoneid.h"
-#include "testltsyphonegetdetectednetworks.h"
-#include "testltsyphonegetdetectednetworkscancel.h"
-#include "testltsyphonesetnetworkselectionsetting.h"
-#include "testltsyphoneselectnetwork.h"
-#include "testltsyphonegethomenetwork.h"
-#include "testltsyphonegetcurrentnetworkinfo.h"
-#include "testltsyphonegetcellinfo.h"
-#include "testltsyphoneregistercellinfochangenotification.h"
-
-
-#include "testltsypktopenpacket.h"
-#include "testltsypktclosepacket.h"
-#include "testltsypktopencontext.h"
-#include "testltsypktinitialisecontext.h"
-#include "testltsypktclosecontext.h"
-#include "testltsypktattachnetwork.h"
-#include "testltsypktdetachnetwork.h"
-#include "testltsypktactivatecontext.h"
-#include "testltsypktdeactivatecontext.h"
-#include "testltsypktdeletecontext.h"
-#include "testltsypktgetservicestatus.h"
-#include "testltsypktgetnwkregistrationstatus.h"
-#include "testltsypktgetcontextconfig.h"
-#include "testltsypktgetdefaultparams.h"
-#include "testltsypktsetdefaultparams.h"
-#include "testltsypktgetcontextinfo.h"
-#include "testltsypktsetcontextconfig.h"
-#include "testltsypktopencontextqos.h"
-#include "testltsypktclosecontextqos.h"
-#include "testltsypktgetcontextqosprofile.h"
-#include "testltsypktsetcontextqosprofile.h"
-#include "testltsypktgetstaticcapabilities.h"
-#include "testltsypktgetdynamiccapabilities.h"
-
-#include "testltsyopensms.h"
-#include "testltsysmssend.h"
-#include "testltsyopensmsstore.h"
-#include "testltsyclosesms.h"
-#include "testltsyclosesmsstore.h"
-#include "testltsygetmessagestoreinfo.h"
-#include "testltsysmsstoregetinfo.h"
-#include "testltsysmsack.h"
-#include "testltsysmsnack.h"
-#include "testltsysmsreceive.h"
-#include "testltsysmssendinvalidparam.h"
-#include "testltsysmsread.h"
-#include "testltsysmsreadinvalidindex.h"
-#include "testltsysmsdelete.h"
-#include "testltsysmsdeleteinvalidindex.h"
-#include "testltsysmsdeleteall.h"
-#include "testltsysmsstore.h"
-#include "testltsysmswrite.h"
-#include "testltsysmswriteinvalidparam.h"
-
-#include "testltsyphbkopen.h"
-#include "testltsyphbkclose.h"
-#include "testltsyphbkgetstoreinfo.h"
-#include "testltsyphbkdelete.h"
-#include "testltsyphbkdeleteinvalidindex.h"
-#include "testltsyphbkwrite.h"
-#include "testltsyphbkwriteinvalidindex.h"
-#include "testltsyphbkread.h"
-#include "testltsyphbkreadinvalidindex.h"
-
-_LIT(KServerName,"Te_integration_stltsySuite");
-CTe_integration_stltsySuite* CTe_integration_stltsySuite::NewL()
-/**
- * @return - Instance of the test server
- * Same code for Secure and non-secure variants
- * Called inside the MainL() function to create and start the
- * CTestServer derived server.
- */
-	{
-	CTe_integration_stltsySuite * server = new (ELeave) CTe_integration_stltsySuite();
-	CleanupStack::PushL(server);
-
-	server->ConstructL(KServerName);
-	CleanupStack::Pop(server);
-	return server;
-	}
-CTe_integration_stltsySuite::CTe_integration_stltsySuite()
-:	CTestServer()
-,	iSharedData(NULL)
-/**
-Constructor
-*/
-	{
-	}
-
-void CTe_integration_stltsySuite::ConstructL(const TDesC& aName)
-/**
-  Constructs a CTestTelephonySharedData ojbect to 
-  hold the shared data (CTelephony object)
-*/
-	{
-	CTestServer::ConstructL(aName);
-	iSharedData = CTestLtsySharedData::NewL();
-	iTestModel = CTestLtsyModel::NewL();
-	}
-
-CTe_integration_stltsySuite::~CTe_integration_stltsySuite()
-/**
-  Destructor deleting the CTestTelephonySharedData ojbect. 
-*/
-	{
-	delete iSharedData;
-	delete iTestModel;
-	}
-
-// Secure variants much simpler
-// For EKA2, just an E32Main and a MainL()
-LOCAL_C void MainL()
-/**
- * Secure variant
- * Much simpler, uses the new Rendezvous() call to sync with the client
- */
-	{
-	// Leave the hooks in for platform security
-#if (defined __DATA_CAGING__)
-	RProcess().DataCaging(RProcess::EDataCagingOn);
-	RProcess().DataCaging(RProcess::ESecureApiOn);
-#endif
-	CActiveScheduler* sched=NULL;
-	sched=new(ELeave) CActiveScheduler;
-	CActiveScheduler::Install(sched);
-	CTe_integration_stltsySuite* server = NULL;
-	// Create the CTestServer derived server
-	TRAPD(err,server = CTe_integration_stltsySuite::NewL());
-	if(!err)
-		{
-		// Sync with the client and enter the active scheduler
-		RProcess::Rendezvous(KErrNone);
-		sched->Start();
-		}
-	delete server;
-	delete sched;
-	}
-
-
-
-GLDEF_C TInt E32Main()
-/**
- * @return - Standard Epoc error code on process exit
- * Secure variant only
- * Process entry point. Called by client using RProcess API
- */
-	{
-	__UHEAP_MARK;
-	CTrapCleanup* cleanup = CTrapCleanup::New();
-	if(cleanup == NULL)
-		{
-		return KErrNoMemory;
-		}
-	TRAPD(err,MainL());
-	delete cleanup;
-	__UHEAP_MARKEND;
-	return err;
-    }
-
-
-CTestStep* CTe_integration_stltsySuite::CreateTestStep(const TDesC& aStepName)
-/**
- * @return - A CTestStep derived instance
- * Secure and non-secure variants
- * Implementation of CTestServer pure virtual
- */
-	{
-	CTestStep* testStep = NULL;
-	
-	  if(aStepName == KCTestLtsySmsControlReceiveSmsCase1Step)
-	      testStep = new CCTestLtsySmsControlReceiveSmsCase1Step();
-	  else if(aStepName == KCTestLtsySmsControlSendSmsCase1Step)
-	      testStep = new CCTestLtsySmsControlSendSmsCase1Step();
-	  else if(aStepName==KTestLtsyOpenPhone)
-		  testStep = new CTestLtsyOpenPhone(*iTestModel);
-	  else if(aStepName==KTestLtsyClosePhone)
-	      testStep = new CTestLtsyClosePhone(*iTestModel);
-	  else if(aStepName==KTestLtsyPhoneGetFdnStatus)
-	      testStep = new CTestLtsyPhoneGetFdnStatus(*iTestModel);
-	  else if(aStepName==KTestLtsyPhoneGetNetworkRegistrationStatus)
-	      testStep = new CTestLtsyPhoneGetNetworkRegistrationStatus(*iTestModel);
-	  else if(aStepName==KTestLtsyPhoneGetPhoneID)
-	      testStep = new CTestLtsyPhoneGetPhoneID(*iTestModel);
-	  else if(aStepName==KTestLtsyPhoneGetDetectedNetworks)
-	      testStep = new CTestLtsyPhoneGetDetectedNetworks(*iTestModel);
-	  else if(aStepName==KTestLtsyPhoneGetDetectedNetworksCancelCancel)
-	      testStep = new CTestLtsyPhoneGetDetectedNetworksCancelCancel(*iTestModel);
-	  else if(aStepName==KTestLtsyPhoneSetNetworkSelectionSetting)
-	      testStep = new CTestLtsyPhoneSetNetworkSelectionSetting(*iTestModel);
-	  else if(aStepName==KTestLtsyPhoneSelectNetwork)
-	      testStep = new CTestLtsyPhoneSelectNetwork(*iTestModel);
-	  else if(aStepName==KTestLtsyGetPhoneBatteryInfo)
-	      testStep = new CTestLtsyGetPhoneBatteryInfo(*iTestModel);
-	  else if(aStepName==KTestLtsyGetPhoneSingalStrength)
-	      testStep = new CTestLtsyGetPhoneSignalStrength(*iTestModel);
-	  else if(aStepName==KTestLtsyGetPhoneBatteryCap)
-	      testStep = new CTestLtsyGetPhoneBatteryCap(*iTestModel);
-	  else if(aStepName==KTestLtsyGetPhoneSingalCap)
-	      testStep = new CTestLtsyGetPhoneSignalCap(*iTestModel);
-	  else if(aStepName==KTestLtsyPhoneGetHomeNetwork)
-	      testStep = new CTestLtsyPhoneGetHomeNetwork(*iTestModel);
-	  else if(aStepName==KTestLtsyPhoneGetCurrentNetworkInfo)
-	      testStep = new CTestLtsyPhoneGetCurrentNetworkInfo(*iTestModel);
-	  else if(aStepName==KTestLtsyPhoneRegisterCellInfoChangeNotification)
-	      testStep = new CTestLtsyPhoneRegisterCellInfoChangeNotification(*iTestModel);
-	  else if(aStepName==KTestLtsyPhoneGetCellInfo)
-	      testStep = new CTestLtsyPhoneGetCellInfo(*iTestModel);
-	  else if(aStepName==KTestLtsyPktActivateContext)
-	      testStep = new CTestLtsyPktActivateContext(*iTestModel);
-	  else if(aStepName==KTestLtsyPktAttachNetwork)
-	      testStep = new CTestLtsyPktAttachNetwork(*iTestModel);
-	  else if(aStepName==KTestLtsyPktCloseContext)
-	      testStep = new CTestLtsyPktCloseContext(*iTestModel);
-	  else if(aStepName==KTestLtsyPktCloseContextQos)
-	      testStep = new CTestLtsyPktCloseContextQos(*iTestModel);
-	  else if(aStepName==KTestLtsyPktClosePacket)
-	      testStep = new CTestLtsyPktClosePacket(*iTestModel);
-	  else if(aStepName==KTestLtsyPktDeactivateContext)
-	      testStep = new CTestLtsyPktDeactivateContext(*iTestModel);
-	  else if(aStepName==KTestLtsyPktDeleteContext)
-	      testStep = new CTestLtsyPktDeleteContext(*iTestModel);
-	  else if(aStepName==KTestLtsyPktDetachNetwork)
-	      testStep = new CTestLtsyPktDetachNetwork(*iTestModel);
-	  else if(aStepName==KTestLtsyPktGetContextConfig)
-	      testStep = new CTestLtsyPktGetContextConfig(*iTestModel);
-	  else if(aStepName==KTestLtsyPktGetContextInfo)
-	      testStep = new CTestLtsyPktGetContextInfo(*iTestModel);
-	  else if(aStepName==KTestLtsyPktGetContextQoSProfile)
-	      testStep = new CTestLtsyPktGetContextQoSProfile(*iTestModel);
-	  else if(aStepName==KTestLtsyPktGetDefaultParams)
-	      testStep = new CTestLtsyPktGetDefaultParams(*iTestModel);
-	  else if(aStepName==KTestLtsyPktNetworkRegistrationStatus)
-	      testStep = new CTestLtsyPktNetworkRegistrationStatus(*iTestModel);
-	  else if(aStepName==KTestLtsyPktGetServiceStatust)
-	      testStep = new CTestLtsyPktGetServiceStatus(*iTestModel);
-	  else if(aStepName==KTestLtsyPktInitialiseContext)
-	      testStep = new CTestLtsyPktInitialiseContext(*iTestModel);
-	  else if(aStepName==KTestLtsyPktGetStaticCapabilities)
-	      testStep = new CTestLtsyPktGetStaticCapabilities(*iTestModel);
-	  else if(aStepName==KTestLtsyPktGetDynamicCapabilities)
-	      testStep = new CTestLtsyPktGetDynamicCapabilities(*iTestModel);
-	  else if(aStepName==KTestLtsyPktOpenContext)
-	      testStep = new CTestLtsyPktOpenContext(*iTestModel);
-	  else if(aStepName==KTestLtsyPktOpenContextQos)
-	      testStep = new CTestLtsyPktOpenContextQos(*iTestModel);
-	  else if(aStepName==KTestLtsyPktOpenPacket)
-	      testStep = new CTestLtsyPktOpenPacket(*iTestModel);
-	  else if(aStepName==KTestLtsyPktSetContextConfig)
-	      testStep = new CTestLtsyPktSetContextConfig(*iTestModel);
-	  else if(aStepName==KTestLtsyPktSetContextQoSProfile)
-	      testStep = new CTestLtsyPktSetContextQoSProfile(*iTestModel);
-	  else if(aStepName==KTestLtsyPktSetDefaultParams)
-	      testStep = new CTestLtsyPktSetDefaultParams(*iTestModel);
-     else if (aStepName == KTestLtsyCallControlNotifyIncomingCallCase1)
-    	 testStep = new CTestLtsyCallControlNotifyIncomingCallCase1(*iTestModel);
-     else if (aStepName == KTestLtsyCallControlDialHangupCase)
-    	 testStep = new CTestLtsyCallControlDialHangupCase(*iTestModel);
-     else if (aStepName == KTestLtsyCallControlNotifyIncomingCallCase2)
-    	 testStep = new CTestLtsyCallControlNotifyIncomingCallCase2(*iTestModel);
-     else if (aStepName == KTestLtsyCallControlNotifyIncomingCallCase3)
-    	 testStep = new CTestLtsyCallControlNotifyIncomingCallCase3(*iTestModel);
-     else if (aStepName == KTestLtsyCallControlSwapCalls)
-    	 testStep = new CTestLtsyCallControlSwapCalls(*iTestModel);
-     else if (aStepName == KTestLtsyCallControlCustomAPITerminateAllCalls)
-    	 testStep = new CTestLtsyCallControlCustomAPITerminateAllCalls(*iTestModel);
-     else if (aStepName == KTestLtsyCallControlPhoneTerminateAllCalls)
-    	 testStep = new CTestLtsyCallControlPhoneTerminateAllCalls(*iTestModel);
-     else if (aStepName == KTestLtsyCallControlDialEmergencyCall)
-    	 testStep = new CTestLtsyCallControlDialEmergencyCall(*iTestModel);
-     else if (aStepName == KTestLtsyCallControlBase)
-    	 testStep = new CTestLtsyCallControlBase(*iTestModel);
-     else if(aStepName == KCTestLtsyOpenSms) 
-       	 testStep = new CTestLtsyOpenSms(*iTestModel);
-        else if(aStepName == KCTestLtsyOpenSmsStore) 
-       	 testStep = new CTestLtsyOpenSmsStore(*iTestModel);
-        else if(aStepName == KCTestLtsySmsSend)
-       	 testStep = new CTestLtsySmsSend(*iTestModel);	
-        else if(aStepName == KCTestLtsyCloseSms) 
-            testStep = new CTestLtsyCloseSms(*iTestModel);
-        else if(aStepName == KCTestLtsyCloseSmsStore) 
-       	 testStep = new CTestLtsyCloseSmsStore(*iTestModel);
-        else if(aStepName == KCTestLtsyGetMessageStoreInfo) 
-            testStep = new CTestLtsyGetMessageStoreInfo(*iTestModel);
-        else if(aStepName == KCTestLtsySmsStoreGetInfo) 
-       	 testStep = new CTestLtsySmsStoreGetInfo(*iTestModel); 
-        else if(aStepName == KCTestLtsySmsReceive) 
-            testStep = new CTestLtsySmsReceive(*iTestModel);
-        else if(aStepName == KCTestLtsySmsAck) 
-            testStep = new CTestLtsySmsAck(*iTestModel);
-        else if(aStepName == KCTestLtsySmsNack) 
-          	 testStep = new CTestLtsySmsNack(*iTestModel);  
-        else if(aStepName == KCTestLtsySmsSendInvalidParam) 
-            testStep = new CTestLtsySmsSendInvalidParam(*iTestModel);  
-        else if(aStepName == KCTestLtsySmsRead) 
-            testStep = new CTestLtsySmsRead(*iTestModel);
-        else if(aStepName == KCTestLtsySmsReadInvalidIndex) 
-         	 testStep = new CTestLtsySmsReadInvalidIndex(*iTestModel); 
-        else if(aStepName == KCTestLtsySmsDelete) 
-                testStep = new CTestLtsySmsDelete(*iTestModel);
-        else if(aStepName == KCTestLtsySmsDeleteInvalidIndex) 
-          	 testStep = new CTestLtsySmsDeleteInvalidIndex(*iTestModel);  
-        else if(aStepName == KCTestLtsySmsDeleteAll) 
-            testStep = new CTestLtsySmsDeleteAll(*iTestModel);  
-        else if(aStepName == KCTestLtsySmsStore) 
-            testStep = new CTestLtsySmsStore(*iTestModel);
-        else if(aStepName == KCTestLtsySmsWrite) 
-            testStep = new CTestLtsySmsWrite(*iTestModel);  
-        else if(aStepName == KCTestLtsySmsWriteInvalidParam) 
-            testStep = new CTestLtsySmsWriteInvalidParam(*iTestModel); 
-        else if(aStepName == KCTestLtsyPhbkOpen) 
-            testStep = new CTestLtsyPhbkOpen(*iTestModel);
-        else if(aStepName == KCTestLtsyPhbkClose) 
-            testStep = new CTestLtsyPhbkClose(*iTestModel); 
-        else if(aStepName == KCTestLtsyPhbkGetStoreInfo) 
-            testStep = new CTestLtsyPhbkGetStoreInfo(*iTestModel);  
-        else if(aStepName == KCTestLtsyPhbkDelete) 
-            testStep = new CTestLtsyPhbkDelete(*iTestModel); 
-        else if(aStepName == KCTestLtsyPhbkDeleteInvalidIndex) 
-            testStep = new CTestLtsyPhbkDeleteInvalidIndex(*iTestModel); 
-        else if(aStepName == KCTestLtsyPhbkWrite) 
-            testStep = new CTestLtsyPhbkWrite(*iTestModel); 
-        else if(aStepName == KCTestLtsyPhbkWriteInvalidIndex) 
-            testStep = new CTestLtsyPhbkWriteInvalidIndex(*iTestModel); 
-        else if(aStepName == KCTestLtsyPhbkRead) 
-            testStep = new CTestLtsyPhbkRead(*iTestModel); 
-        else if(aStepName == KCTestLtsyPhbkReadInvalidIndex) 
-            testStep = new CTestLtsyPhbkReadInvalidIndex(*iTestModel);   	 
-        else if (aStepName == KTestLtsyCallControlDialBadCall)
-    	   testStep = new CTestLtsyCallControlDialBadCall(*iTestModel);
-        else if (aStepName == KTestLtsyCallControlDialSelfCall)
-    	   testStep = new CTestLtsyCallControlDialSelfCall(*iTestModel);
-        else if (aStepName == KTestLtsyCallControlDialEmergencyCallStopAllCall)
-    	    testStep = new CTestLtsyCallControlDialEmergencyCallStopAllCall(*iTestModel);
-	  
-	return testStep;
-	}

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/te_integration_stltsysuitestepbase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file Te_integration_stltsySuiteStepBase.cpp
- @internalTechnology
-*/
-
-#include "te_integration_stltsysuitestepbase.h"
-#include "te_integration_stltsysuitedefs.h"
-
-// Device driver constants
-
-TVerdict CTe_integration_stltsySuiteStepBase::doTestStepPreambleL()
-/**
- * @return - TVerdict
- * Implementation of CTestStep base class virtual
- * It is used for doing all initialisation common to derived classes in here.
- * Make it being able to leave if there are any errors here as there's no point in
- * trying to run a test step if anything fails.
- * The leave will be picked up by the framework.
- */
-	{
-
-	// process some common pre setting to test steps then set SetTestStepResult to EFail or Epass.
-	INFO_PRINTF1(_L("Please delete this line or modify me!! I am in doTestStepPreambleL() of the class CTe_integration_stltsySuiteStepBase!"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTe_integration_stltsySuiteStepBase::doTestStepPostambleL()
-/**
- * @return - TVerdict
- * Implementation of CTestStep base class virtual
- * It is used for doing all after test treatment common to derived classes in here.
- * Make it being able to leave
- * The leave will be picked up by the framework.
- */
-	{
-
-	// process some common post setting to test steps then set SetTestStepResult to EFail or Epass.
-	INFO_PRINTF1(_L("Please delete this line or modify me!! I am in doTestStepPostambleL() of the class CTe_integration_stltsySuiteStepBase!"));
-	//SetTestStepResult(EPass);  // or EFail
-	return TestStepResult();
-	}
-
-CTe_integration_stltsySuiteStepBase::~CTe_integration_stltsySuiteStepBase()
-	{
-	}
-
-CTe_integration_stltsySuiteStepBase::CTe_integration_stltsySuiteStepBase()
-	{
-	}

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyasyncoperation.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-// TestTelephonyAsyncOperation.cpp
-//
-// Copyright (c) 2004-2007 Symbian Ltd.  All rights reserved.
-//
-// The active object derived class for asynchronous requests
-//
-
-// Epoc includes
-#include <testproperty.h>
-#include <e32property.h>
-#include <sacls.h>
-
-// User includes
-#include "TestLtsyAsyncOperation.h"
-
-CTelephonyAsyncOperation::CTelephonyAsyncOperation(CTestStep& aTestStep)
-/*
-Constructor
-
-Adds the active object to active scheduler.
-
-@param aInt Operation id
-*/
-:	CActive(EPriorityStandard)
-,	iTestStep(aTestStep)
-	{
-	CActiveScheduler::Add(this);
-	}
-
-CTelephonyAsyncOperation::~CTelephonyAsyncOperation()
-/*
-Destructor
-*/
-	{
-	}
-
-void CTelephonyAsyncOperation::DoCancel()
-/*
-For canceling the request
-*/
-	{
-	}
-
-void CTelephonyAsyncOperation::RunL()
-/*
-Stop the active scheduler
-*/
-	{
-	CActiveScheduler::Stop();
-	}
-
-TInt CTelephonyAsyncOperation::SetOperation()
-/*
-Set the active object request and start the active scheduler
-*/
-	{
-	SetActive();
-	CActiveScheduler::Start();
-	return iStatus.Int();
-	}

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsycallcontrolbase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,868 +0,0 @@
-// 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:
-// 
-// 
-
-#include "te_integration_stltsysuitestepbase.h"
-#include "te_integration_stltsysuitedefs.h"
-#include "testltsycallcontrolbase.h"
-
-//const define
-_LIT16(KPhoneTSY, "phonetsy");
-_LIT16(KLtsyTelNumOne, "58848158");
-_LIT16(KLtsyTelNumTwo, "58848157");
-_LIT16(KLtsyBadNumber, "11");
-_LIT16(KLtsySelfNumber, "15901279603");
-
-
-CTestLtsyCallControlBase::CTestLtsyCallControlBase(CTestLtsyModel& aModel) : iLtsyModel(aModel)
-	{
-	
-	}
-
-CTestLtsyCallControlBase::~CTestLtsyCallControlBase()
-	{
-	CloseLine();
-	
-	CloseCallOne();
-	
-	CloseCallTwo();	
-	}
-
-TVerdict CTestLtsyCallControlBase::doTestStepPreambleL()
-	{
-	
-	OpenPhoneL();
-	
-	OpenLineL();
-	
-	OpenCustomAPIL();
-	
-	return EPass;
-	}
-
-TVerdict CTestLtsyCallControlBase::doTestStepPostambleL()
-	{
-	
-	CloseLine();
-	
-	CloseCallOne();
-	
-	CloseCallTwo();
-	
-	CloseCustomAPI();
-	
-	return EPass;
-	}
-
-TVerdict CTestLtsyCallControlBase::doTestStepL()
-	{
-	//Open Call
-	OpenCallOneL();
-	
-	//Dial Call
-	DialCallOne();
-	
-	User::After(1000*1000);
-	
-	//Hold call
-	HoldCallOne();
-	
-	User::After(1000*1000);
-	
-	//Resume call
-	ResumeCallOne();
-	
-	User::After(1000*1000);
-	
-	//Hold call
-	HoldCallOne();
-	
-	User::After(1000*1000);
-	
-	//Resume call
-	ResumeCallOne();
-	
-	User::After(1000*1000);
-	
-	//Hang up call
-	HangupCallOneL();
-	
-	User::After(1000*1000);
-	
-	//Close call
-	CloseCallOne();
-	
-	return EPass;
-	}
-
-void CTestLtsyCallControlBase::OpenPhoneL()
-	{
-	INFO_PRINTF1(_L("starting opne phone"));
-	
-	if (!iLtsyModel.SharedEnv().PhoneOpened())
-		{
-		iLtsyModel.SharedEnv().OpenPhoneL(KPhoneTSY);
-		}
-	}
-
-void CTestLtsyCallControlBase::OpenLineL()
-	{
-	INFO_PRINTF1(_L("starting opne line"));	
-	
-	if (iLtsyModel.SharedEnv().PhoneOpened())
-		{
-		TInt numberLines = 0;
-		User::LeaveIfError(iLtsyModel.SharedEnv().Phone().EnumerateLines(numberLines));
-		RPhone::TLineInfo lineInfo;
-		TBool foundLine = EFalse;
-		for (TInt a = 0; a < numberLines; a++)
-			{
-			User::LeaveIfError(iLtsyModel.SharedEnv().Phone().GetLineInfo(a, lineInfo));
-			if (lineInfo.iLineCapsFlags & RLine::KCapsVoice)
-				{
-				foundLine = ETrue;
-				break;
-				}
-			}
-		if (!foundLine)
-			{
-			INFO_PRINTF1(_L("The phone has opened fail"));	
-			User::Leave(KErrNotFound);
-			}
-		
-		User::LeaveIfError(iLtsyModel.CallSharedData().VoiceLine().Open(iLtsyModel.SharedEnv().Phone(), lineInfo.iName));
-		INFO_PRINTF1(_L("The line open successful"));	
-		}
-	else
-		{
-		INFO_PRINTF1(_L("The phone has opened fail"));	
-		}
-	}
-
-void CTestLtsyCallControlBase::CloseLine()
-	{
-	iLtsyModel.CallSharedData().VoiceLine().Close();
-	}
-
-void CTestLtsyCallControlBase::OpenCustomAPIL()
-	{
-	INFO_PRINTF1(_L("starting opne custom API"));
-	
-	
-	if (iLtsyModel.SharedEnv().PhoneOpened())
-		{
-		User::LeaveIfError(iLtsyModel.CallSharedData().MmCustomAPI().Open(iLtsyModel.SharedEnv().Phone()));
-		INFO_PRINTF1(_L("The custom API open successfully"));
-		}
-	else
-		{
-		INFO_PRINTF1(_L("The phone has opened fail"));
-		}
-	}
-
-void CTestLtsyCallControlBase::CloseCustomAPI()
-	{
-	INFO_PRINTF1(_L("starting close custom API"));
-	iLtsyModel.CallSharedData().MmCustomAPI().Close();
-	}
-
-void CTestLtsyCallControlBase::CustomAPITerminateAllCallsL()
-	{
-	INFO_PRINTF1(_L("RCustomAPI start terminate all calls"));
-	
-	TBuf<128> allcall(_L("ALL_CALLS"));
-	TRequestStatus iStatus;
-	iLtsyModel.CallSharedData().MmCustomAPI().TerminateCall(iStatus, allcall);
-	User::WaitForRequest(iStatus);
-	
-	INFO_PRINTF2(_L("RCustomAPI terminate all calls result = %d"), iStatus.Int());
-	
-	if (iStatus.Int() != KErrNone)
-		{
-		User::LeaveIfError(iStatus.Int());
-		}	
-	}
-
-void CTestLtsyCallControlBase::PhoneTerminateAllCallsL()
-	{
-	INFO_PRINTF1(_L("phone start terminate all calls"));
-	
-	TRequestStatus iStatus;
-	iLtsyModel.SharedEnv().Phone().TerminateAllCalls(iStatus);
-	User::WaitForRequest(iStatus);
-	
-	INFO_PRINTF2(_L("phone terminate all calls result = %d"), iStatus.Int());
-	
-	if (iStatus.Int() != KErrNone)
-		{
-		User::LeaveIfError(iStatus.Int());
-		}		
-	}
-
-//It must open RCustomAPI before create CTelephony
-void CTestLtsyCallControlBase::CreateThirtyPartyTelephonyL()
-	{
-	iLtsyModel.CallSharedData().ThirdPartyTelephony() = CTelephony::NewL();
-	}
-
-void CTestLtsyCallControlBase::DialCallOne()
-	{
-	INFO_PRINTF1(_L("starting dial call one"));
-	INFO_PRINTF2(_L("starting dial number %S..."), &KLtsyTelNumOne);
-	INFO_PRINTF1(_L("If ring please pick up your telephone "));
-	
-	TRequestStatus tDialStatus;
-	TRequestStatus tNotifyStatus;
-	
-	RMobileCall::TMobileCallStatus tCallStatus;
-	iLtsyModel.CallSharedData().VoiceCallOne().NotifyMobileCallStatusChange(tNotifyStatus, tCallStatus);
-	
-	iLtsyModel.CallSharedData().VoiceCallOne().Dial(tDialStatus, KLtsyTelNumOne);
-	User::WaitForRequest(tDialStatus);
-	
-	INFO_PRINTF3(_L("Dial number %S\t Result = %d"), &KLtsyTelNumOne, tDialStatus.Int());
-	
-	if (tDialStatus.Int() == KErrNone)
-		{
-		User::WaitForRequest(tNotifyStatus);
-		if (tNotifyStatus.Int() == KErrNone)
-			{
-			INFO_PRINTF2(_L("Dial number first call status = %d"), tCallStatus);
-			}
-		else
-			{
-			INFO_PRINTF1(_L("Dial call notify call status fail"));
-			return;
-			}
-		
-		iLtsyModel.CallSharedData().VoiceCallOne().NotifyMobileCallStatusChange(tNotifyStatus, tCallStatus);
-		User::WaitForRequest(tNotifyStatus);
-		if (tNotifyStatus.Int() == KErrNone)
-			{
-			INFO_PRINTF2(_L("Dial number second call status = %d"), tCallStatus);
-			}
-		else
-			{
-			INFO_PRINTF1(_L("Dial call notify call status fail"));
-			return;
-			}
-		
-		iLtsyModel.CallSharedData().VoiceCallOne().NotifyMobileCallStatusChange(tNotifyStatus, tCallStatus);
-		User::WaitForRequest(tNotifyStatus);
-		if (tNotifyStatus.Int() == KErrNone)
-			{
-			INFO_PRINTF2(_L("Dial number three call status = %d"), tCallStatus);
-			}
-		else
-			{
-			INFO_PRINTF1(_L("Dial call notify call status fail"));
-			return;
-			}		
-		}
-	else
-		{
-		iLtsyModel.CallSharedData().VoiceCallOne().CancelAsyncRequest(EMobileCallNotifyMobileCallStatusChange);
-		}
-	}
-
-void CTestLtsyCallControlBase::CallOneDialBadNumberL()
-	{
-	INFO_PRINTF1(_L("starting dial call one"));
-	INFO_PRINTF2(_L("starting dial bad number %S..."), &KLtsyBadNumber);
-	
-	TRequestStatus tDialStatus;
-	iLtsyModel.CallSharedData().VoiceCallOne().Dial(tDialStatus, KLtsyBadNumber);
-	User::WaitForRequest(tDialStatus);	
-	
-	User::LeaveIfError(tDialStatus.Int());
-	}
-
-void CTestLtsyCallControlBase::CallOneDialSelfNumberL()
-	{
-	INFO_PRINTF1(_L("starting dial call one"));
-	INFO_PRINTF2(_L("starting dial bad number %S..."), &KLtsySelfNumber);
-	
-	TRequestStatus tDialStatus;
-	iLtsyModel.CallSharedData().VoiceCallOne().Dial(tDialStatus, KLtsySelfNumber);
-	User::WaitForRequest(tDialStatus);	
-	
-	User::LeaveIfError(tDialStatus.Int());	
-	}
-
-void CTestLtsyCallControlBase::DialCallTwo()
-	{
-	INFO_PRINTF1(_L("starting dial call two"));
-	INFO_PRINTF2(_L("starting dial number %S..."), &KLtsyTelNumTwo);
-	
-	TRequestStatus tDialStatus;
-	TRequestStatus tNotifyStatus;
-	
-	RMobileCall::TMobileCallStatus tCallStatus;
-	iLtsyModel.CallSharedData().VoiceCallTwo().NotifyMobileCallStatusChange(tNotifyStatus, tCallStatus);
-	
-	iLtsyModel.CallSharedData().VoiceCallTwo().Dial(tDialStatus, KLtsyTelNumTwo);
-	User::WaitForRequest(tDialStatus);
-	
-	INFO_PRINTF3(_L("Dial number %S\t Result = %d"), &KLtsyTelNumTwo, tDialStatus.Int());
-	
-	if (tDialStatus.Int() == KErrNone)
-		{
-		User::WaitForRequest(tNotifyStatus);
-		if (tNotifyStatus.Int() == KErrNone)
-			{
-			INFO_PRINTF2(_L("Dial number first call status = %d"), tCallStatus);
-			}
-		else
-			{
-			INFO_PRINTF1(_L("Dial call notify call status fail"));
-			return;
-			}
-		
-		iLtsyModel.CallSharedData().VoiceCallTwo().NotifyMobileCallStatusChange(tNotifyStatus, tCallStatus);
-		User::WaitForRequest(tNotifyStatus);
-		if (tNotifyStatus.Int() == KErrNone)
-			{
-			INFO_PRINTF2(_L("Dial number second call status = %d"), tCallStatus);
-			}
-		else
-			{
-			INFO_PRINTF1(_L("Dial call notify call status fail"));
-			return;
-			}
-		
-		iLtsyModel.CallSharedData().VoiceCallTwo().NotifyMobileCallStatusChange(tNotifyStatus, tCallStatus);
-		User::WaitForRequest(tNotifyStatus);
-		if (tNotifyStatus.Int() == KErrNone)
-			{
-			INFO_PRINTF2(_L("Dial number three call status = %d"), tCallStatus);
-			}
-		else
-			{
-			INFO_PRINTF1(_L("Dial call notify call status fail"));
-			return;
-			}		
-		}
-	else
-		{
-		iLtsyModel.CallSharedData().VoiceCallTwo().CancelAsyncRequest(EMobileCallNotifyMobileCallStatusChange);
-		}
-	}
-
-void CTestLtsyCallControlBase::HangupCallOneL()
-	{
-	INFO_PRINTF1(_L("starting hang up call one"));
-	
-	TRequestStatus tHangupStatus;
-	TRequestStatus tNotifyStatus;	
-	
-	RMobileCall::TMobileCallStatus tCallStatus;
-	iLtsyModel.CallSharedData().VoiceCallOne().NotifyMobileCallStatusChange(tNotifyStatus, tCallStatus);
-	
-	iLtsyModel.CallSharedData().VoiceCallOne().HangUp(tHangupStatus);
-	User::WaitForRequest(tHangupStatus);
-	
-	INFO_PRINTF2(_L("Hang up call one result = %d"), tHangupStatus.Int());
-	
-	if (tHangupStatus.Int() == KErrNone)
-		{
-		User::WaitForRequest(tNotifyStatus);
-		if (tNotifyStatus.Int() == KErrNone)
-			{
-			INFO_PRINTF2(_L("Hang up notify call status = %d"), tCallStatus);
-			}
-		else
-			{
-			INFO_PRINTF1(_L("Hang up notify call status fail"));
-			User::LeaveIfError(tNotifyStatus.Int());
-			}
-		
-		RMobileCall::TMobileCallStatus tCallStatus;
-		iLtsyModel.CallSharedData().VoiceCallOne().NotifyMobileCallStatusChange(tNotifyStatus, tCallStatus);
-		if (tNotifyStatus.Int() == KErrNone)
-			{
-			INFO_PRINTF2(_L("Hang up notify call status = %d"), tCallStatus);
-			}
-		else
-			{
-			INFO_PRINTF1(_L("Hang up notify call status fail"));
-			User::LeaveIfError(tNotifyStatus.Int());
-			}
-		}
-	else
-		{
-		iLtsyModel.CallSharedData().VoiceCallOne().CancelAsyncRequest(EMobileCallNotifyMobileCallStatusChange);
-		User::LeaveIfError(tHangupStatus.Int());
-		}
-	}
-
-void CTestLtsyCallControlBase::HangupCallTwoL()
-	{
-	INFO_PRINTF1(_L("starting hang up call two"));
-	
-	TRequestStatus tHangupStatus;
-	TRequestStatus tNotifyStatus;	
-	
-	RMobileCall::TMobileCallStatus tCallStatus;
-	iLtsyModel.CallSharedData().VoiceCallTwo().NotifyMobileCallStatusChange(tNotifyStatus, tCallStatus);
-	
-	iLtsyModel.CallSharedData().VoiceCallTwo().HangUp(tHangupStatus);
-	User::WaitForRequest(tHangupStatus);
-	
-	INFO_PRINTF2(_L("Hang up call one result = %d"), tHangupStatus.Int());
-	
-	if (tHangupStatus.Int() == KErrNone)
-		{
-		User::WaitForRequest(tNotifyStatus);
-		if (tNotifyStatus.Int() == KErrNone)
-			{
-			INFO_PRINTF2(_L("Hang up notify call status = %d"), tCallStatus);
-			}
-		else
-			{
-			INFO_PRINTF1(_L("Hang up notify call status fail"));
-			User::LeaveIfError(tNotifyStatus.Int());
-			}
-		
-		RMobileCall::TMobileCallStatus tCallStatus;
-		iLtsyModel.CallSharedData().VoiceCallTwo().NotifyMobileCallStatusChange(tNotifyStatus, tCallStatus);
-		if (tNotifyStatus.Int() == KErrNone)
-			{
-			INFO_PRINTF2(_L("Hang up notify call status = %d"), tCallStatus);
-			}
-		else
-			{
-			INFO_PRINTF1(_L("Hang up notify call status fail"));
-			User::LeaveIfError(tNotifyStatus.Int());
-			}
-		}
-	else
-		{
-		iLtsyModel.CallSharedData().VoiceCallTwo().CancelAsyncRequest(EMobileCallNotifyMobileCallStatusChange);
-		User::LeaveIfError(tHangupStatus.Int());
-		}	
-	}
-
-void CTestLtsyCallControlBase::CloseCallOne()
-	{
-	INFO_PRINTF1(_L("starting close call one"));
-	
-	iLtsyModel.CallSharedData().VoiceCallOne().Close();
-	}
-
-void CTestLtsyCallControlBase::CloseCallTwo()
-	{
-	INFO_PRINTF1(_L("starting close call two"));
-	
-	iLtsyModel.CallSharedData().VoiceCallTwo().Close();	
-	}
-
-void CTestLtsyCallControlBase::OpenCallOneL()
-	{
-	INFO_PRINTF1(_L("starting open call one"));
-	
-	User::LeaveIfError(iLtsyModel.CallSharedData().VoiceCallOne().OpenNewCall(iLtsyModel.CallSharedData().VoiceLine()));
-	}
-
-void CTestLtsyCallControlBase::OpenCallTwoL()
-	{
-	INFO_PRINTF1(_L("starting open call two"));
-	
-	User::LeaveIfError(iLtsyModel.CallSharedData().VoiceCallTwo().OpenNewCall(iLtsyModel.CallSharedData().VoiceLine()));	
-	}
-
-void CTestLtsyCallControlBase::HoldCallOne()
-	{
-	INFO_PRINTF1(_L("starting hold call one"));
-	
-	TRequestStatus iStatus;
-	TRequestStatus iCallChangeStatus;
-	TRequestStatus iCallEvent;
-	
-	RMobileCall::TMobileCallStatus tCallStatus;
-	RMobileCall::TMobileCallEvent tCallEvent;
-	
-	iLtsyModel.CallSharedData().VoiceCallOne().NotifyMobileCallStatusChange(iCallChangeStatus, tCallStatus);	
-	iLtsyModel.CallSharedData().VoiceCallOne().NotifyCallEvent(iCallEvent, tCallEvent);	
-	
-	iLtsyModel.CallSharedData().VoiceCallOne().Hold(iStatus);
-	User::WaitForRequest(iStatus);
-	INFO_PRINTF2(_L("Hold call one result = %d"), iStatus.Int());
-	
-	if (iStatus.Int() == KErrNone)
-		{
-		User::WaitForRequest(iCallChangeStatus);
-		INFO_PRINTF2(_L("Hold call notify call status = %d"), tCallStatus);
-		
-		User::WaitForRequest(iCallEvent);
-		INFO_PRINTF2(_L("Hold call notify call Event = %d"), tCallEvent);
-		}
-	else
-		{
-		iLtsyModel.CallSharedData().VoiceCallOne().CancelAsyncRequest(EMobileCallNotifyMobileCallStatusChange);
-		iLtsyModel.CallSharedData().VoiceCallOne().CancelAsyncRequest(EMobileCallNotifyCallEvent);
-		}
-	}
-
-void CTestLtsyCallControlBase::HoldCallTwo()
-	{
-	INFO_PRINTF1(_L("starting hold call two"));
-	
-	TRequestStatus iStatus;
-	TRequestStatus iCallChangeStatus;
-	TRequestStatus iCallEvent;
-	
-	RMobileCall::TMobileCallStatus tCallStatus;
-	RMobileCall::TMobileCallEvent tCallEvent;
-	
-	iLtsyModel.CallSharedData().VoiceCallTwo().NotifyMobileCallStatusChange(iCallChangeStatus, tCallStatus);	
-	iLtsyModel.CallSharedData().VoiceCallTwo().NotifyCallEvent(iCallEvent, tCallEvent);	
-	
-	iLtsyModel.CallSharedData().VoiceCallTwo().Hold(iStatus);
-	User::WaitForRequest(iStatus);
-	INFO_PRINTF2(_L("Hold call two result = %d"), iStatus.Int());
-	
-	if (iStatus.Int() == KErrNone)
-		{
-		User::WaitForRequest(iCallChangeStatus);
-		INFO_PRINTF2(_L("Hold call notify call status = %d"), tCallStatus);
-		
-		User::WaitForRequest(iCallEvent);
-		INFO_PRINTF2(_L("Hold call notify call Event = %d"), tCallEvent);
-		}
-	else
-		{
-		iLtsyModel.CallSharedData().VoiceCallTwo().CancelAsyncRequest(EMobileCallNotifyMobileCallStatusChange);
-		iLtsyModel.CallSharedData().VoiceCallOne().CancelAsyncRequest(EMobileCallNotifyCallEvent);
-		}	
-	}
-	
-void CTestLtsyCallControlBase::ResumeCallOne()
-	{
-	INFO_PRINTF1(_L("starting resume call one"));
-	
-	TRequestStatus iStatus;
-	
-	TRequestStatus iCallChangeStatus;
-	RMobileCall::TMobileCallStatus tCallStatus;
-	
-	TRequestStatus iCallEvent;
-	RMobileCall::TMobileCallEvent tCallEvent;
-	
-	iLtsyModel.CallSharedData().VoiceCallOne().NotifyMobileCallStatusChange(iCallChangeStatus, tCallStatus);
-	
-	iLtsyModel.CallSharedData().VoiceCallOne().NotifyCallEvent(iCallEvent, tCallEvent);
-	
-	iLtsyModel.CallSharedData().VoiceCallOne().Resume(iStatus);
-	User::WaitForRequest(iStatus);
-	
-	INFO_PRINTF2(_L("Resume call one result = %d"), iStatus.Int());
-	
-	if (iStatus.Int() == KErrNone)
-		{
-		User::WaitForRequest(iCallChangeStatus);
-		INFO_PRINTF2(_L("Resume call one status = %d"), tCallStatus);
-		
-		User::WaitForRequest(iCallEvent);
-		INFO_PRINTF2(_L("Resume call one call event = %d"), tCallEvent);
-		}
-	else
-		{
-		iLtsyModel.CallSharedData().VoiceCallOne().CancelAsyncRequest(EMobileCallNotifyMobileCallStatusChange);
-		iLtsyModel.CallSharedData().VoiceCallOne().CancelAsyncRequest(EMobileCallNotifyCallEvent);
-		}
-	}
-
-void CTestLtsyCallControlBase::ResumeCallTwo()
-	{
-	INFO_PRINTF1(_L("starting resume call two"));
-	
-	TRequestStatus iStatus;
-	
-	TRequestStatus iCallChangeStatus;
-	RMobileCall::TMobileCallStatus tCallStatus;
-	
-	TRequestStatus iCallEvent;
-	RMobileCall::TMobileCallEvent tCallEvent;
-	
-	iLtsyModel.CallSharedData().VoiceCallTwo().NotifyMobileCallStatusChange(iCallChangeStatus, tCallStatus);
-	
-	iLtsyModel.CallSharedData().VoiceCallTwo().NotifyCallEvent(iCallEvent, tCallEvent);
-	
-	iLtsyModel.CallSharedData().VoiceCallTwo().Resume(iStatus);
-	User::WaitForRequest(iStatus);
-	
-	INFO_PRINTF2(_L("Resume call two result = %d"), iStatus.Int());
-	
-	if (iStatus.Int() == KErrNone)
-		{
-		User::WaitForRequest(iCallChangeStatus);
-		INFO_PRINTF2(_L("Resume call two status = %d"), tCallStatus);
-		
-		User::WaitForRequest(iCallEvent);
-		INFO_PRINTF2(_L("Resume call two call event = %d"), tCallEvent);
-		}
-	else
-		{
-		iLtsyModel.CallSharedData().VoiceCallTwo().CancelAsyncRequest(EMobileCallNotifyMobileCallStatusChange);
-		iLtsyModel.CallSharedData().VoiceCallTwo().CancelAsyncRequest(EMobileCallNotifyCallEvent);
-		}	
-	}
-
-void CTestLtsyCallControlBase::SwapCallOne()
-	{
-	INFO_PRINTF1(_L("starting swap call one"));
-	
-	TRequestStatus iStatus;
-	TRequestStatus iCallChangeStatus;
-	
-	RMobileCall::TMobileCallStatus tCallStatus;
-	iLtsyModel.CallSharedData().VoiceCallOne().NotifyMobileCallStatusChange(iCallChangeStatus, tCallStatus);
-	
-	iLtsyModel.CallSharedData().VoiceCallOne().Swap(iStatus);
-	User::WaitForRequest(iStatus);
-	
-	INFO_PRINTF2(_L("call one swap result = %d"), iStatus.Int());
-	
-	if (iStatus.Int() == KErrNone)
-		{
-		User::WaitForRequest(iCallChangeStatus);
-		INFO_PRINTF2(_L("call one swap status = %d"), tCallStatus);
-		}
-	else
-		{
-		iLtsyModel.CallSharedData().VoiceCallOne().CancelAsyncRequest(EMobileCallNotifyMobileCallStatusChange);
-		}
-	}
-	
-void CTestLtsyCallControlBase::NotifyCallOne()
-	{
-	INFO_PRINTF1(_L("starting notify call one"));
-	
-	TRequestStatus iCallChangeStatus;
-	RMobileCall::TMobileCallStatus tCallStatus;
-	iLtsyModel.CallSharedData().VoiceCallOne().NotifyMobileCallStatusChange(iCallChangeStatus, tCallStatus);
-	User::WaitForRequest(iCallChangeStatus);
-	INFO_PRINTF3(_L("call one after swap result = %d\tstatus = %d"), iCallChangeStatus.Int(), tCallStatus);	
-	}
-
-void CTestLtsyCallControlBase::NotifyCallTwo()
-	{
-	INFO_PRINTF1(_L("starting notify call two"));
-	
-	TRequestStatus iCallChangeStatus;
-	RMobileCall::TMobileCallStatus tCallStatus;
-	iLtsyModel.CallSharedData().VoiceCallTwo().NotifyMobileCallStatusChange(iCallChangeStatus, tCallStatus);
-	User::WaitForRequest(iCallChangeStatus);
-	INFO_PRINTF3(_L("call two after swap result = %d\tstatus = %d"), iCallChangeStatus.Int(), tCallStatus);		
-	}
-
-void CTestLtsyCallControlBase::SwapCallTwo()
-	{
-	INFO_PRINTF1(_L("starting swap call two"));
-	
-	TRequestStatus iStatus;
-	TRequestStatus iCallChangeStatus;
-	
-	RMobileCall::TMobileCallStatus tCallStatus;
-	iLtsyModel.CallSharedData().VoiceCallTwo().NotifyMobileCallStatusChange(iCallChangeStatus, tCallStatus);
-	
-	iLtsyModel.CallSharedData().VoiceCallTwo().Swap(iStatus);
-	User::WaitForRequest(iStatus);
-	
-	INFO_PRINTF2(_L("call two swap result = %d"), iStatus.Int());
-	
-	if (iStatus.Int() == KErrNone)
-		{
-		User::WaitForRequest(iCallChangeStatus);
-		INFO_PRINTF2(_L("call two swap status = %d"), tCallStatus);
-		}
-	else
-		{
-		iLtsyModel.CallSharedData().VoiceCallTwo().CancelAsyncRequest(EMobileCallNotifyMobileCallStatusChange);
-		}	
-	}
-
-void CTestLtsyCallControlBase::NotifyIncomingCallOneL()
-	{
-	INFO_PRINTF1(_L("starting notify incoming call one"));
-	
-	TName name;
-	TRequestStatus iNotifyIncomingCallStatus;
-	iLtsyModel.CallSharedData().VoiceLine().NotifyIncomingCall(iNotifyIncomingCallStatus, name);
-	User::WaitForRequest(iNotifyIncomingCallStatus);
-	
-	INFO_PRINTF2(_L("Notify incoming call result = %d"), iNotifyIncomingCallStatus.Int());
-	
-	if (iNotifyIncomingCallStatus.Int() == KErrNone)
-		{
-		INFO_PRINTF3(_L("Notify incoming call %S Result = %d"), &name, iNotifyIncomingCallStatus.Int());
-		
-		INFO_PRINTF1(_L("Starting Open Call one for incoming call..."));
-		
-		TInt nRes = iLtsyModel.CallSharedData().VoiceCallOne().OpenExistingCall(iLtsyModel.CallSharedData().VoiceLine(), name);
-
-		//Get Call info
-		RMobileCall::TMobileCallInfoV1 tCallInfo;
-		RMobileCall::TMobileCallInfoV1Pckg tCallInfoPckg(tCallInfo);
-		iLtsyModel.CallSharedData().VoiceCallOne().GetMobileCallInfo(tCallInfoPckg);
-		
-		INFO_PRINTF2(_L("Remote call service(voice=1,data=3,fax=5) = %d"), tCallInfo.iService);
-
-		INFO_PRINTF2(_L("Remote call telnum = %S"), &(tCallInfo.iRemoteParty.iRemoteNumber.iTelNumber));
-		
-		}
-	else
-		{
-		User::LeaveIfError(iNotifyIncomingCallStatus.Int());
-		}
-	}
-
-void CTestLtsyCallControlBase::AnswerIncomingCallOneL()
-	{
-	INFO_PRINTF1(_L("starting answering incoming call one"));
-	
-	TRequestStatus iStatus;
-	TRequestStatus iCallChangeStatus;
-	
-	RMobileCall::TMobileCallStatus tCallStatus;
-	iLtsyModel.CallSharedData().VoiceCallOne().NotifyMobileCallStatusChange(iCallChangeStatus, tCallStatus);
-	
-	iLtsyModel.CallSharedData().VoiceCallOne().AnswerIncomingCall(iStatus);
-	User::WaitForRequest(iStatus);
-	
-	INFO_PRINTF2(_L("answering call result = %d"), iStatus.Int());
-	
-	if (iStatus.Int() == KErrNone)
-		{
-		User::WaitForRequest(iCallChangeStatus);
-		if (iCallChangeStatus.Int() == KErrNone)
-			{
-			INFO_PRINTF2(_L("first answering call status = %d"), tCallStatus);
-			}
-		else
-			{
-			User::LeaveIfError(iCallChangeStatus.Int());
-			}
-		
-		iLtsyModel.CallSharedData().VoiceCallOne().NotifyMobileCallStatusChange(iCallChangeStatus, tCallStatus);
-		User::WaitForRequest(iCallChangeStatus);
-		if (iCallChangeStatus.Int() == KErrNone)
-			{
-			INFO_PRINTF2(_L("second answering call status = %d"), tCallStatus);
-			}
-		else
-			{
-			User::LeaveIfError(iCallChangeStatus.Int());
-			}
-		}
-	else
-		{
-		User::LeaveIfError(iStatus.Int());
-		}
-	}
-
-void CTestLtsyCallControlBase::AnswerIncomingCallTwoL()
-	{
-	INFO_PRINTF1(_L("starting answering incoming call two"));
-	
-	TRequestStatus iStatus;
-	TRequestStatus iCallChangeStatus;
-	
-	RMobileCall::TMobileCallStatus tCallStatus;
-	iLtsyModel.CallSharedData().VoiceCallTwo().NotifyMobileCallStatusChange(iCallChangeStatus, tCallStatus);
-	
-	iLtsyModel.CallSharedData().VoiceCallTwo().AnswerIncomingCall(iStatus);
-	User::WaitForRequest(iStatus);
-	
-	INFO_PRINTF2(_L("answering call result = %d"), iStatus.Int());
-	
-	if (iStatus.Int() == KErrNone)
-		{
-		User::WaitForRequest(iCallChangeStatus);
-		if (iCallChangeStatus.Int() == KErrNone)
-			{
-			INFO_PRINTF2(_L("first answering call status = %d"), tCallStatus);
-			}
-		else
-			{
-			User::LeaveIfError(iCallChangeStatus.Int());
-			}
-		
-		iLtsyModel.CallSharedData().VoiceCallTwo().NotifyMobileCallStatusChange(iCallChangeStatus, tCallStatus);
-		User::WaitForRequest(iCallChangeStatus);
-		if (iCallChangeStatus.Int() == KErrNone)
-			{
-			INFO_PRINTF2(_L("second answering call status = %d"), tCallStatus);
-			}
-		else
-			{
-			User::LeaveIfError(iCallChangeStatus.Int());
-			}
-		
-		
-		iLtsyModel.CallSharedData().VoiceCallOne().NotifyMobileCallStatusChange(iCallChangeStatus, tCallStatus);
-		User::WaitForRequest(iCallChangeStatus);
-		if (iCallChangeStatus.Int() == KErrNone)
-			{
-			INFO_PRINTF2(_L("call one swith call status = %d"), tCallStatus);
-			}
-		else
-			{
-			User::LeaveIfError(iCallChangeStatus.Int());
-			}
-		
-		}
-	else
-		{
-		User::LeaveIfError(iStatus.Int());
-		}	
-	}
-
-void CTestLtsyCallControlBase::NotifyIncomingCallTwoL()
-	{
-	INFO_PRINTF1(_L("starting notify incoming call two"));
-	
-	TName name;
-	TRequestStatus iNotifyIncomingCallStatus;
-	iLtsyModel.CallSharedData().VoiceLine().NotifyIncomingCall(iNotifyIncomingCallStatus, name);
-	User::WaitForRequest(iNotifyIncomingCallStatus);
-	
-	INFO_PRINTF2(_L("Notify incoming call result = %d"), iNotifyIncomingCallStatus.Int());
-	
-	if (iNotifyIncomingCallStatus.Int() == KErrNone)
-		{
-		INFO_PRINTF3(_L("Notify incoming call %S Result = %d"), &name, iNotifyIncomingCallStatus.Int());
-		
-		INFO_PRINTF1(_L("Starting Open Call one for incoming call..."));
-		
-		TInt nRes = iLtsyModel.CallSharedData().VoiceCallTwo().OpenExistingCall(iLtsyModel.CallSharedData().VoiceLine(), name);
-
-		//Get Call info
-		RMobileCall::TMobileCallInfoV1 tCallInfo;
-		RMobileCall::TMobileCallInfoV1Pckg tCallInfoPckg(tCallInfo);
-		iLtsyModel.CallSharedData().VoiceCallTwo().GetMobileCallInfo(tCallInfoPckg);
-		
-		INFO_PRINTF2(_L("Remote call service(voice=1,data=3,fax=5) = %d"), tCallInfo.iService);
-
-		INFO_PRINTF2(_L("Remote call telnum = %S"), &(tCallInfo.iRemoteParty.iRemoteNumber.iTelNumber));
-		
-		}	
-	else
-		{
-		User::LeaveIfError(iNotifyIncomingCallStatus.Int());
-		}
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsycallcontrolcustomapiterminateallcalls.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-// 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:
-// 
-// 
-
-#include "testltsycallcontrolcustomapiterminateallcalls.h"
-
-CTestLtsyCallControlCustomAPITerminateAllCalls::CTestLtsyCallControlCustomAPITerminateAllCalls(CTestLtsyModel& aModel)
-	: CTestLtsyCallControlBase(aModel)
-	{
-	
-	}
-
-CTestLtsyCallControlCustomAPITerminateAllCalls::~CTestLtsyCallControlCustomAPITerminateAllCalls()
-	{
-	
-	}
-
-TVerdict CTestLtsyCallControlCustomAPITerminateAllCalls::doTestStepL()
-	{
-	INFO_PRINTF1(_L("starting CTestLtsyCallControlCustomAPITerminateAllCalls::doTestStepL()"));
-	
-	if(TestStepResult() == EPass)
-		{
-		TRAPD(err,NotifyIncomingCallOneL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when notify incoming call one"),err);
-			return TestStepResult();
-			}
-		
-		TRAP(err, AnswerIncomingCallOneL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when answer incoming call one"),err);
-			return TestStepResult();
-			}
-		
-		TRAP(err, CustomAPITerminateAllCallsL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when terminat all calls"),err);
-			return TestStepResult();
-			}
-		
-		//Close call
-		CloseCallOne();
-		}
-	
-	return TestStepResult();
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsycallcontroldialbadcall.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsycallcontroldialbadcall.h"
-
-CTestLtsyCallControlDialBadCall::CTestLtsyCallControlDialBadCall(CTestLtsyModel& aModel)
-	: CTestLtsyCallControlBase(aModel)
-	{
-	
-	}
-
-CTestLtsyCallControlDialBadCall::~CTestLtsyCallControlDialBadCall()
-	{
-	
-	}
-
-TVerdict CTestLtsyCallControlDialBadCall::doTestStepL()
-	{
-	INFO_PRINTF1(_L("starting CTestLtsyCallControlDialBadCall::doTestStepL()"));
-	
-	if(TestStepResult() == EPass)
-		{
-		//Open Call
-		TRAPD(err,OpenCallOneL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when opne call two"),err);
-			return TestStepResult();
-			}
-				
-		TRAP(err, CallOneDialBadNumber());
-		if (err == KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when dial bad telephone number"),err);
-			return TestStepResult();			
-			}
-						
-		//Close call
-		CloseCallOne();
-		}
-	
-	return TestStepResult();
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsycallcontroldialemergencycall.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-// 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:
-// 
-// 
-
-#include "testltsycallcontroldialemergencycall.h"
-
-//const define
-_LIT16(KLtsyEmergencyNum, "58848158");
-
-
-CTestLtsyCallControlDialEmergencyCall::CTestLtsyCallControlDialEmergencyCall(CTestLtsyModel& aModel)
-	: CTestLtsyCallControlBase(aModel)
-	{
-	
-	}
-
-
-CTestLtsyCallControlDialEmergencyCall::~CTestLtsyCallControlDialEmergencyCall()
-	{
-	
-	}
-
-TVerdict CTestLtsyCallControlDialEmergencyCall::doTestStepL()
-	{
-	INFO_PRINTF1(_L("starting CTestLtsyCallControlDialEmergencyCall::doTestStepL()"));
-	
-	if(TestStepResult() == EPass)
-		{
-		TRAPD(err,iLtsyModel.CallSharedData().EmergencyCall().OpenNewCall(iLtsyModel.CallSharedData().VoiceLine()));
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when open emergency call"),err);
-			return TestStepResult();			
-			}
-		}
-	
-	TRequestStatus iStatus;
-	iLtsyModel.CallSharedData().EmergencyCall().DialEmergencyCall(iStatus, KLtsyEmergencyNum);
-	User::WaitForRequest(iStatus);
-	
-	INFO_PRINTF2(_L("Dial emergency call result = %d"),iStatus.Int());
-	
-	User::After(1000*4000);
-	
-	iLtsyModel.CallSharedData().EmergencyCall().Close();
-	
-	return TestStepResult();
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsycallcontroldialemergencycallstopallcalls.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsycallcontroldialemergencycallstopallcalls.h"
-
-_LIT16(KLtsyEmergencyTelNum, "58848157");
-
-CTestLtsyCallControlDialEmergencyCallStopAllCall::CTestLtsyCallControlDialEmergencyCallStopAllCall(CTestLtsyModel& aModel)
-	: CTestLtsyCallControlBase(aModel)
-	{
-	
-	}
-
-
-CTestLtsyCallControlDialEmergencyCallStopAllCall::~CTestLtsyCallControlDialEmergencyCallStopAllCall()
-	{
-	
-	}
-
-TVerdict CTestLtsyCallControlDialEmergencyCallStopAllCall::doTestStepL()
-	{
-	INFO_PRINTF1(_L("starting CTestLtsyCallControlDialEmergencyCallStopAllCall::doTestStepL()"));
-	
-	TRAPD(err,OpenCallOneL());
-	if (err != KErrNone)
-		{
-		SetTestStepResult(EFail);
-		INFO_PRINTF2(_L("The error was %d when opne call one"),err);
-		return TestStepResult();
-		}			
-	
-	DialCallOne();
-	
-	User::After(1000*2000);
-
-	if(TestStepResult() == EPass)
-		{
-		TRAPD(err,iLtsyModel.CallSharedData().EmergencyCall().OpenNewCall(iLtsyModel.CallSharedData().VoiceLine()));
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when open emergency call"),err);
-			return TestStepResult();			
-			}
-		}	
-	
-	TRequestStatus iStatus;
-	iLtsyModel.CallSharedData().EmergencyCall().DialEmergencyCall(iStatus, KLtsyEmergencyTelNum);
-	User::WaitForRequest(iStatus);
-	
-	INFO_PRINTF2(_L("Dial emergency call result = %d"),iStatus.Int());
-	
-	User::After(1000*4000);
-	
-	iLtsyModel.CallSharedData().EmergencyCall().Close();
-	
-	CloseCallOne();
-	
-	return TestStepResult();
-	}	
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsycallcontroldialhangupcase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsycallcontroldialhangupcase.h"
-
-CTestLtsyCallControlDialHangupCase::CTestLtsyCallControlDialHangupCase(CTestLtsyModel& aModel)
-	: CTestLtsyCallControlBase(aModel)
-	{
-	
-	}
-
-CTestLtsyCallControlDialHangupCase::~CTestLtsyCallControlDialHangupCase()
-	{
-	
-	}
-
-TVerdict CTestLtsyCallControlDialHangupCase::doTestStepL()
-	{
-	INFO_PRINTF1(_L("starting CTestLtsyCallControlDialHangupCase::doTestStepL()"));
-	
-	if(TestStepResult() == EPass)
-		{
-		//Open Call
-		TRAPD(err,OpenCallTwoL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when opne call two"),err);
-			return TestStepResult();
-			}
-		
-		DialCallTwo();
-		
-		User::After(1000*1000);
-		
-		//Hang up call
-		TRAP(err, HangupCallTwoL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when hang up call two"),err);
-			return TestStepResult();
-			}
-		
-		//Close call
-		CloseCallTwo();
-		}
-	
-	return TestStepResult();
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsycallcontroldialselfcall.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsycallcontroldialselfcall.h"
-
-CTestLtsyCallControlDialSelfCall::CTestLtsyCallControlDialSelfCall(CTestLtsyModel& aModel)
-	: CTestLtsyCallControlBase(aModel)
-	{
-	
-	}
-
-CTestLtsyCallControlDialSelfCall::~CTestLtsyCallControlDialSelfCall()
-	{
-	
-	}
-
-TVerdict CTestLtsyCallControlDialSelfCall::doTestStepL()
-	{
-	INFO_PRINTF1(_L("starting CTestLtsyCallControlDialSelfCall::doTestStepL()"));
-	
-	if(TestStepResult() == EPass)
-		{
-		//Open Call
-		TRAPD(err,OpenCallOneL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when opne call two"),err);
-			return TestStepResult();
-			}
-				
-		TRAP(err, CallOneDialSelfNumber());
-		if (err == KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when dial bad telephone number"),err);
-			return TestStepResult();			
-			}
-						
-		//Close call
-		CloseCallOne();
-		}
-	
-	return TestStepResult();
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsycallcontrolnotifyincomingcallcase1.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsycallcontrolnotifyincomingcallcase1.h"
-
-
-CTestLtsyCallControlNotifyIncomingCallCase1::CTestLtsyCallControlNotifyIncomingCallCase1(CTestLtsyModel& aModel)
-	: CTestLtsyCallControlBase(aModel)
-	{
-	
-	}
-
-
-CTestLtsyCallControlNotifyIncomingCallCase1::~CTestLtsyCallControlNotifyIncomingCallCase1()
-	{
-	
-	}
-
-TVerdict CTestLtsyCallControlNotifyIncomingCallCase1::doTestStepL()
-	{
-	INFO_PRINTF1(_L("starting CTestLtsyCallControlNotifyIncomingCallCase1::doTestStepL()"));
-	
-	if(TestStepResult() == EPass)
-		{
-		TRAPD(err,NotifyIncomingCallOneL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when notify incoming call"),err);
-			return TestStepResult();
-			}
-		
-		TRAP(err, AnswerIncomingCallOneL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when answer incoming call"),err);
-			return TestStepResult();
-			}
-		
-		//Close call
-		CloseCallOne();
-		}
-	
-	return TestStepResult();
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsycallcontrolnotifyincomingcallcase2.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsycallcontrolnotifyincomingcallcase2.h"
-
-
-CTestLtsyCallControlNotifyIncomingCallCase2::CTestLtsyCallControlNotifyIncomingCallCase2(CTestLtsyModel& aModel)
-	: CTestLtsyCallControlBase(aModel)
-	{
-	
-	}
-
-
-CTestLtsyCallControlNotifyIncomingCallCase2::~CTestLtsyCallControlNotifyIncomingCallCase2()
-	{
-	
-	}
-
-
-TVerdict CTestLtsyCallControlNotifyIncomingCallCase2::doTestStepL()
-	{
-	INFO_PRINTF1(_L("starting CTestLtsyCallControlNotifyIncomingCallCase2::doTestStepL()"));
-	
-	if(TestStepResult() == EPass)
-		{
-		TRAPD(err,NotifyIncomingCallOneL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when notify incoming call one"),err);
-			return TestStepResult();
-			}
-		
-		TRAP(err, AnswerIncomingCallOneL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when answer incoming call one"),err);
-			return TestStepResult();
-			}
-		
-		User::After(1000*1000);
-		
-		TRAP(err, NotifyIncomingCallTwoL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when notify incoming call two"),err);
-			return TestStepResult();
-			}
-		
-		TRAP(err, AnswerIncomingCallTwoL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when answer incoming call two"),err);
-			return TestStepResult();
-			}		
-		
-		TRAP(err ,HangupCallOneL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when hang up call one"),err);
-			return TestStepResult();
-			}	
-		
-		TRAP(err ,HangupCallTwoL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when hang up call two"),err);
-			return TestStepResult();
-			}			
-		
-		//Close call one
-		CloseCallOne();
-		
-		//Close call two
-		CloseCallTwo();
-		}
-	
-	return TestStepResult();
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsycallcontrolnotifyincomingcallcase3.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsycallcontrolnotifyincomingcallcase3.h"
-
-
-CTestLtsyCallControlNotifyIncomingCallCase3::CTestLtsyCallControlNotifyIncomingCallCase3(CTestLtsyModel& aModel)
-	: CTestLtsyCallControlBase(aModel)
-	{
-	
-	}
-
-
-CTestLtsyCallControlNotifyIncomingCallCase3::~CTestLtsyCallControlNotifyIncomingCallCase3()
-	{
-	
-	}
-
-
-TVerdict CTestLtsyCallControlNotifyIncomingCallCase3::doTestStepL()
-	{
-	INFO_PRINTF1(_L("starting CTestLtsyCallControlNotifyIncomingCallCase3::doTestStepL()"));
-	
-	if(TestStepResult() == EPass)
-		{
-		TRAPD(err,NotifyIncomingCallOneL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when notify incoming call one"),err);
-			return TestStepResult();
-			}
-		
-		TRAP(err, AnswerIncomingCallOneL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when answer incoming call one"),err);
-			return TestStepResult();
-			}
-		
-		User::After(1000*1000);
-		
-		HoldCallOne();
-		
-		ResumeCallOne();
-		
-		TRAP(err, HangupCallOneL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when Hang up call one"),err);
-			return TestStepResult();
-			}		
-		
-		//Close call one
-		CloseCallOne();
-		}
-	
-	return TestStepResult();
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsycallcontrolphoneterminateallcalls.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsycallcontrolphoneterminateallcalls.h"
-
-CTestLtsyCallControlPhoneTerminateAllCalls::CTestLtsyCallControlPhoneTerminateAllCalls(CTestLtsyModel& aModel)
-	: CTestLtsyCallControlBase(aModel)
-	{
-	
-	}
-
-
-CTestLtsyCallControlPhoneTerminateAllCalls::~CTestLtsyCallControlPhoneTerminateAllCalls()
-	{
-	
-	}
-
-TVerdict CTestLtsyCallControlPhoneTerminateAllCalls::doTestStepL()
-	{
-	INFO_PRINTF1(_L("starting CTestLtsyCallControlPhoneTerminateAllCalls::doTestStepL()"));
-	
-	TRAPD(err,OpenCallOneL());
-	if (err != KErrNone)
-		{
-		SetTestStepResult(EFail);
-		INFO_PRINTF2(_L("The error was %d when opne call one"),err);
-		return TestStepResult();
-		}			
-	
-	DialCallOne();
-
-	TRAP(err,OpenCallTwoL());
-	if (err != KErrNone)
-		{
-		SetTestStepResult(EFail);
-		INFO_PRINTF2(_L("The error was %d when opne call two"),err);
-		return TestStepResult();
-		}		
-	
-	DialCallTwo();
-
-	TRAP(err, PhoneTerminateAllCallsL());
-	if (err != KErrNone)
-		{
-		SetTestStepResult(EFail);
-		INFO_PRINTF2(_L("The error was %d when phone terminate all calls"),err);
-		return TestStepResult();			
-		}	
-	
-	CloseCallOne();
-	
-	CloseCallTwo();
-	
-	return TestStepResult();
-	}	
-	
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsycallcontrolswapcalls.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsycallcontrolswapcalls.h"
-
-CTestLtsyCallControlSwapCalls::CTestLtsyCallControlSwapCalls(CTestLtsyModel& aModel)
-	: CTestLtsyCallControlBase(aModel)
-	{
-	
-	}
-
-
-CTestLtsyCallControlSwapCalls::~CTestLtsyCallControlSwapCalls()
-	{
-	
-	}
-
-TVerdict CTestLtsyCallControlSwapCalls::doTestStepL()
-	{
-	INFO_PRINTF1(_L("starting CTestLtsyCallControlSwapCalls::doTestStepL()"));
-	
-	if(TestStepResult() == EPass)
-		{
-		TRAPD(err,NotifyIncomingCallOneL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when notify incoming call"),err);
-			return TestStepResult();
-			}
-		
-		TRAP(err, AnswerIncomingCallOneL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when answer incoming call"),err);
-			return TestStepResult();
-			}
-		
-		User::After(1000*1000);
-		
-		TRAP(err,NotifyIncomingCallTwoL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when notify incoming call"),err);
-			return TestStepResult();
-			}		
-
-		TRAP(err, AnswerIncomingCallTwoL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when answer incoming call"),err);
-			return TestStepResult();
-			}		
-		
-		SwapCallOne();
-		
-		NotifyCallTwo();
-		
-		SwapCallTwo();
-		
-		NotifyCallOne();
-		
-		TRAP(err, HangupCallOneL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when hang up call  one"),err);
-			return TestStepResult();			
-			}
-		
-		
-		TRAP(err, HangupCallTwoL());
-		if (err != KErrNone)
-			{
-			SetTestStepResult(EFail);
-			INFO_PRINTF2(_L("The error was %d when hang up call  two"),err);
-			return TestStepResult();			
-			}
-		
-		//Close call
-		CloseCallOne();
-		
-		//Close call
-		CloseCallTwo();
-		}
-	
-	return TestStepResult();
-	}
-
-//End of file
-
-

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsycallshareddata.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-// TestTelephonyCallSharedData.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestTelephonyCallSharedData
-
-// CTSY include
-
-// user include
-#include "testltsycallshareddata.h"
-
-
-CTestLtsyCallSharedData* CTestLtsyCallSharedData::NewL()
-	{
-	CTestLtsyCallSharedData* self = new (ELeave) CTestLtsyCallSharedData;
-	CleanupStack::PushL(self);
-	
-	self->ConstructL();
-	
-	CleanupStack::Pop();
-	return self;
-	}
-
-CTestLtsyCallSharedData::~CTestLtsyCallSharedData()
-	{
-	iVoiceLine.Close();
-	
-	iVoiceCallOne.Close();
-	
-	iVoiceCallTwo.Close();
-	
-	iEmergencyCall.Close();
-	
-	iMmCustomAPI.Close();
-	
-	delete iThirdPartyTel;
-	iThirdPartyTel = NULL;
-	}
-
-
-CTestLtsyCallSharedData::CTestLtsyCallSharedData()
-	{
-	
-	}
-
-
-void CTestLtsyCallSharedData::ConstructL()
-	{
-	
-	}
-
-RLine& CTestLtsyCallSharedData::VoiceLine()
-	{
-	return iVoiceLine;
-	}
-
-RMobileCall& CTestLtsyCallSharedData::VoiceCallOne()
-	{
-	return iVoiceCallOne;
-	}
-
-RMobileCall& CTestLtsyCallSharedData::VoiceCallTwo()
-	{
-	return iVoiceCallTwo;
-	}
-
-RMobileCall& CTestLtsyCallSharedData::EmergencyCall()
-	{
-	return iEmergencyCall;
-	}
-
-RMmCustomAPI& CTestLtsyCallSharedData::MmCustomAPI()
-	{
-	return iMmCustomAPI;
-	}
-
-CTelephony*& CTestLtsyCallSharedData::ThirdPartyTelephony()
-	{
-	return iThirdPartyTel;
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyclosephone.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-//  TestTelephonyClosePhone.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestTelephonyClosePhone
-
-// user include
-#include "TestLtsyClosePhone.h"
-
-// member functions
-
-/**
-* Constructor
-* 
-*/
-CTestLtsyClosePhone::CTestLtsyClosePhone( CTestLtsyModel& aTestModel) 
-    :CTestLtsyPhoneStepBase(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyClosePhone::~CTestLtsyClosePhone()
-	{
-	
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will close the shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyClosePhone::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TestClosePhone();
-		}
-
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyclosesms.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsyclosesms.h"
-
-CTestLtsyCloseSms::CTestLtsyCloseSms(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsyCloseSms::~CTestLtsyCloseSms()
-	{
-	}
-
-CTestLtsyCloseSms* CTestLtsyCloseSms::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyCloseSms* self = new (ELeave)CTestLtsyCloseSms(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsyCloseSms* CTestLtsyCloseSms::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyCloseSms* self=CTestLtsyCloseSms::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsyCloseSms::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsyCloseSms::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyCloseSms::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyCloseSms::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyCloseSms::doTestStepL called"));
-	TRAPD(err,CloseSmsL(););
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when close sms"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyCloseSms::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyCloseSms::doTestStepPostambleL called"));
-	return TestStepResult();
-	}

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyclosesmsstore.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsyclosesmsstore.h"
-
-CTestLtsyCloseSmsStore::CTestLtsyCloseSmsStore(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsyCloseSmsStore::~CTestLtsyCloseSmsStore()
-	{
-	}
-
-CTestLtsyCloseSmsStore* CTestLtsyCloseSmsStore::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyCloseSmsStore* self = new (ELeave)CTestLtsyCloseSmsStore(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsyCloseSmsStore* CTestLtsyCloseSmsStore::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyCloseSmsStore* self=CTestLtsyCloseSmsStore::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsyCloseSmsStore::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsyCloseSmsStore::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyCloseSmsStore::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyCloseSmsStore::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyCloseSmsStore::doTestStepL called"));
-	TRAPD(err,CloseSmsStoreL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when close sms store"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyCloseSmsStore::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyCloseSmsStore::doTestStepPostambleL called"));
-	return TestStepResult();
-	}

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsygetmessagestoreinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-//
-// testltsygetmessagestoreinfo.cpp
-//
-// Copyright (c) Symbian Software Ltd. Your copyright notice.  All rights reserved.
-//
-
-#include "testltsygetmessagestoreinfo.h"
-
-CTestLtsyGetMessageStoreInfo::CTestLtsyGetMessageStoreInfo(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsyGetMessageStoreInfo::~CTestLtsyGetMessageStoreInfo()
-	{
-	}
-
-CTestLtsyGetMessageStoreInfo* CTestLtsyGetMessageStoreInfo::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyGetMessageStoreInfo* self = new (ELeave)CTestLtsyGetMessageStoreInfo(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsyGetMessageStoreInfo* CTestLtsyGetMessageStoreInfo::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyGetMessageStoreInfo* self=CTestLtsyGetMessageStoreInfo::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsyGetMessageStoreInfo::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsyGetMessageStoreInfo::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyGetMessageStoreInfo::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyGetMessageStoreInfo::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyGetMessageStoreInfo::doTestStepL called"));
-	TRAPD(err,GetMessageStoreInfoL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when get message store info"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyGetMessageStoreInfo::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyGetMessageStoreInfo::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsyGetMessageStoreInfo::GetMessageStoreInfoL()
-	{
-	TInt  smsIndex(0);             //smsIndex always is zero
-	TRequestStatus status;
-	RMobilePhoneStore::TMobilePhoneStoreInfoV1Pckg smsInfoPckg(iInfo);
-	Sms().GetMessageStoreInfo(status,smsIndex,smsInfoPckg);
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	INFO_PRINTF2(_L("GetMessageStoreInfo() request status = %d"),r);
-	CheckMessageStoreInfoL();
-	INFO_PRINTF4(_L("GetMessageStoreInfo MobileTypeName = %S, TotalEntries=%d,UsedEntries=%d\n"),&iInfo.iName,iInfo.iTotalEntries,iInfo.iUsedEntries );
-	}
-
-void CTestLtsyGetMessageStoreInfo::CheckMessageStoreInfoL()
-	{
-	TBool matched = ETrue;
-	if (!iInfo.iName.Compare(KETelIccSmsStore) == 0)
-		{
-		INFO_PRINTF2(_L("The tel sms store name %s could not match with expect one"),&(iInfo.iName));
-		matched = EFalse;
-		}
-	if(!matched)
-		{
-		SetTestStepResult(EFail);
-		}
-	}

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsygetphonebatterycap.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-// TestLtsyGetPhoneBatteryCap.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyGetPhoneBatteryCap
-
-//system include
-#include <etelmm.h>
-#include <e32std.h>
-
-//user include
-
-#include "TestLtsyGetPhoneBatteryCap.h"
-
-
-/** Supported battery information capabilities. The supported 
-* capabilities are returned to the client when it requests them by calling
-* CMmPhoneTsy::GetBatteryCaps() 
-*/
-/**
- * Constructor
- * 
- */
-CTestLtsyGetPhoneBatteryCap::CTestLtsyGetPhoneBatteryCap(CTestLtsyModel& aModel) 
-    : CTestLtsyPhoneStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- * 
- */
-CTestLtsyGetPhoneBatteryCap::~CTestLtsyGetPhoneBatteryCap()
-	{
-	}
-
-/**
- * Invoked by the test execute framework for exercising functionality under test
- * @return	EPass: The test passed succesfully;
- EFail: The test failed;
- EInconclusive: The result of the test was inconclusive;
- ETestSuiteError: Error in the test suite;
- EAbort: The test was aborted;
- EIgnore: The test was unexecuted
- */
-TVerdict CTestLtsyGetPhoneBatteryCap::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyGetPhoneInfo::doTestStepL Begin"));
-	if (TestStepResult() == EPass)
-		{
-    	TRAPD(err,GetBatteryCaps());
-    	if(err != KErrNone)
-    		{
-    		ERR_PRINTF2(_L("The error was returned %d!! when open Phone"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsygetphonebatteryinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-// TestTelephonyGetPhoneTime.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestTelephonyGetPhoneTime
-
-//system include
-#include <etelmm.h>
-#include <e32std.h>
-
-//user include
-
-#include "TestLtsyGetPhoneBatteryInfo.h"
-
-
-/** Supported battery information capabilities. The supported 
-* capabilities are returned to the client when it requests them by calling
-* CMmPhoneTsy::GetBatteryCaps() 
-*/
-/**
- * Constructor
- * 
- */
-CTestLtsyGetPhoneBatteryInfo::CTestLtsyGetPhoneBatteryInfo(CTestLtsyModel& aModel) 
-    : CTestLtsyPhoneStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- * 
- */
-CTestLtsyGetPhoneBatteryInfo::~CTestLtsyGetPhoneBatteryInfo()
-	{
-	}
-
-/**
- * Invoked by the test execute framework for exercising functionality under test
- * @return	EPass: The test passed succesfully;
- EFail: The test failed;
- EInconclusive: The result of the test was inconclusive;
- ETestSuiteError: Error in the test suite;
- EAbort: The test was aborted;
- EIgnore: The test was unexecuted
- */
-TVerdict CTestLtsyGetPhoneBatteryInfo::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyGetPhoneInfo::doTestStepL Begin"));
-	if (TestStepResult() == EPass)
-		{
-		GetBatteryCaps();
-		TRequestStatus reqStatus;
-		SharedPhone().GetBatteryInfo(reqStatus, iBatteryInfo);
-		User::WaitForRequest(reqStatus);
-		if (reqStatus==KErrNone)
-			{
-			INFO_PRINTF2(_L("Battery status : %d\n"), iBatteryInfo.iStatus);
-			INFO_PRINTF2(_L("Battery charge level : %d\n"), iBatteryInfo.iChargeLevel);
-			}
-		else
-			{
-			INFO_PRINTF2(_L("Battery charge, Error %d returned.\n"), reqStatus.Int());
-			}
-		}
-	return TestStepResult();
-	}
-
-/**
- * 
- * Get battery caps
- * 
- */
-void CTestLtsyGetPhoneBatteryInfo::GetBatteryCaps()
-	{
-	TUint32 caps;
-	TInt res = SharedPhone().GetBatteryCaps(caps);
-	if (res != KErrNone)
-		{
-		ERR_PRINTF1(_L("Failed to Check return value."));
-		}
-	}
-
-/**
- * 
- * Notify battery info change or not
- * 
- */
-void CTestLtsyGetPhoneBatteryInfo::NotifyBatteryInfoChangeL()
-	{
-	TRequestStatus status;
-	RMobilePhone::TMobilePhoneBatteryInfoV1 batInfo;
-	TUint twentyCharge = 20;
-	SharedPhone().NotifyBatteryInfoChange(status, batInfo);
-
-	User::WaitForRequest(status);
-	if(batInfo.iStatus != RMobilePhone::EBatteryConnectedButExternallyPowered)
-		{
-		INFO_PRINTF1(_L("Failed to Check Phone battery status."));
-		}
-	if(batInfo.iChargeLevel != twentyCharge)
-		{
-		INFO_PRINTF1(_L("Failed to Check Phone battery charge level."));
-		}
-	}

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsygetphonesignalcap.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-// TestLtsyGetPhoneSignalCap.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyGetPhoneSignalCap
-
-//system include
-#include <etelmm.h>
-
-//user include
-
-#include "TestLtsyGetPhoneSignalCap.h"
-
-/**
- * Constructor
- * 
- */
-CTestLtsyGetPhoneSignalCap::CTestLtsyGetPhoneSignalCap(CTestLtsyModel& aModel)
-    :CTestLtsyPhoneStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- * 
- */
-CTestLtsyGetPhoneSignalCap::~CTestLtsyGetPhoneSignalCap()
-	{
-	}
-
-/**
- * Invoked by the test execute framework for exercising functionality under test
- * @return	EPass: The test passed succesfully;
-		    EFail: The test failed;
-		    EInconclusive: The result of the test was inconclusive;
-		    ETestSuiteError: Error in the test suite;
-		    EAbort: The test was aborted;
-		    EIgnore: The test was unexecuted
- */	
-
-TVerdict CTestLtsyGetPhoneSignalCap::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestTelePhonyGetPhoneInfo::doTestStepL Begin"));
-	if (TestStepResult() == EPass)
-		{
-    	TRAPD(err,GetSignalCaps());
-    	if(err != KErrNone)
-    		{
-    		ERR_PRINTF2(_L("The error was returned %d!! when open Phone"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsygetphonesignalstrength.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-// TestTelephonyGetPhonesingalStrength.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestTelephonyGetPhonesingalStrength
-
-//system include
-#include <etelmm.h>
-
-//user include
-
-#include "TestLtsyGetPhoneSignalStrength.h"
-
-/**
- * Constructor
- * 
- */
-CTestLtsyGetPhoneSignalStrength::CTestLtsyGetPhoneSignalStrength(CTestLtsyModel& aModel)
-    :CTestLtsyPhoneStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- * 
- */
-CTestLtsyGetPhoneSignalStrength::~CTestLtsyGetPhoneSignalStrength()
-	{
-	}
-
-/**
- * Invoked by the test execute framework for exercising functionality under test
- * @return	EPass: The test passed succesfully;
-		    EFail: The test failed;
-		    EInconclusive: The result of the test was inconclusive;
-		    ETestSuiteError: Error in the test suite;
-		    EAbort: The test was aborted;
-		    EIgnore: The test was unexecuted
- */	
-
-TVerdict CTestLtsyGetPhoneSignalStrength::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestTelePhonyGetPhoneInfo::doTestStepL Begin"));
-	if (TestStepResult() == EPass)
-		{
-		
-		GetSignalCaps();
-		TRequestStatus reqStatus;
-		SharedPhone().GetSignalStrength(reqStatus, iSignalStrength, iBar);
-		User::WaitForRequest(reqStatus);
-		if (reqStatus==KErrNone)
-			{
-			INFO_PRINTF2(_L("Signal strength (in dBm) : %d\n"), iSignalStrength);
-			INFO_PRINTF2(_L("Signal strength (in display bars) : %d\n"), iBar);
-			}
-		else
-			{
-			INFO_PRINTF2(_L("Signal strength, Error %d returned.\n"), reqStatus.Int());
-			}
-	
-		}
-	return TestStepResult();
-	}
-
-/**
- * Get signal caps
- * 
- */
-void CTestLtsyGetPhoneSignalStrength::GetSignalCaps()
-	{
-	TUint32 caps;
-	TInt res = SharedPhone().GetSignalCaps(caps);
-	if (res != KErrNone)
-		{
-		ERR_PRINTF2(_L("The result is not expect %d"),&res);
-		SetTestStepResult(EFail);
-		}
-	}
-
-/**
- * Notify signal strength change
- * 
- */
-void CTestLtsyGetPhoneSignalStrength::NotifySignalStrengthChangeL()
-	{
-	TRequestStatus reqStatus;
-	TInt32 signalStrength(0);
-	TInt8 bar(0);
-	TInt32 completeSignalStrength(70);
-	TInt8 completeBar(3);
-	SharedPhone().NotifySignalStrengthChange(reqStatus, signalStrength, bar);
-	User::WaitForRequest(reqStatus);
-	if(bar != completeBar)
-		{
-		ERR_PRINTF1(_L("bar is not expect."));
-		SetTestStepResult(EFail);
-		}
-	if(signalStrength != completeSignalStrength)
-		{
-		ERR_PRINTF1(_L("signalStrength is not expect."));
-		SetTestStepResult(EFail);
-		}
-	}
-

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsymodel.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,276 +0,0 @@
-//  TestTelephonyModel.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestTelephonyModel
-
-// CTSY include
-#include <bautils.h>
-
-#include "TestLtsyModel.h"
-#include "testltsycallshareddata.h"
-#include "TestLtsyPktSharedData.h"
-#include "TestLtsySmsSharedData.h"
-#include "TestLtsyPhoneStoreSharedData.h"
-
-// the file used to identify if we run on real environment
-//_LIT(KCTsyRealEnvFilePath,    "z:\\systemtest\\testdata\\telephony\\ctsyrealenv.txt");
-//_LIT(KMmTsyModuleName, "PhoneTsy");
-
-/**
- * Factory function
- * 
- */
-CTestLtsyModel* CTestLtsyModel::NewL()
-	{
-	CTestLtsyModel* self = new (ELeave) CTestLtsyModel();
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop();
-	return self;
-	}
-
-/**
- * Destructor
- * 
- */
-CTestLtsyModel::~CTestLtsyModel()
-	{
-	delete iSharedPhoneEnv;
-	delete iCallSharedData;
-	delete iPktSharedData;
-	delete iSmsSharedData;
-	delete iPhoneStoreSharedData;
-	}
-
-/**
- * 2nd Constructor 
- * 
- */
-void CTestLtsyModel::ConstructL()
-	{
-	iSharedPhoneEnv = CTestLtsySharedEnv::NewL();
-	iCallSharedData = CTestLtsyCallSharedData::NewL();
-	iPktSharedData 	= CTestLtsyPktSharedData::NewL();
-	iSmsSharedData = CTestLtsySmsSharedData::NewL();
-	iPhoneStoreSharedData = CTestLtsyPhoneStoreSharedData::NewL();
-	}
-	
-//=============================================================================
-// class CTestTelephonyAdaptorEnv
-//=============================================================================	
-/**
- * Constructor
- * 
- */
-CTestLtsySharedEnv::CTestLtsySharedEnv()
-    {
-    // reset iPhoneInitialized
-    iPhoneInitialized = EFalse;
-    iPhoneIndex = -1;
-	}
-
-/**
- * Destructor
- */
-CTestLtsySharedEnv::~CTestLtsySharedEnv()
-    {     
-    ClosePhone();
-    DestroyTelephony();
-    }
-
-/**
- * Factory function
- * 
- */
-CTestLtsySharedEnv* CTestLtsySharedEnv::NewL()
-    {
-    CTestLtsySharedEnv* self = new (ELeave) CTestLtsySharedEnv();
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop();
-	return self;
-	}
-
-/**
- * 2nd constructor
- */
-void CTestLtsySharedEnv::ConstructL()
-    {
-    }
-	
-/**
- * Load phone module
- * 
- * @param const TDesC& aModuleName The phone module used by ETel server for loading a specific TSY
- */
-void CTestLtsySharedEnv::LoadModuleL(const TDesC& aModuleName)
-    {	
-
-	RFs fs;
-	User::LeaveIfError(fs.Connect());
-	CleanupClosePushL(fs);
-	CleanupStack::PopAndDestroy(&fs);
-    
-	TInt ret = iSharedTelServer.LoadPhoneModule(aModuleName);
-
-	if (ret != KErrNone)
-		{
-		iSharedTelServer.Close();
-		User::Leave(ret);
-		}
-    }
-
-/**
- * Open the shared phone
- * 
- * @param const TDesC& aModuleName The phone module used by ETel server for loading a specific TSY
- */
-void CTestLtsySharedEnv::OpenPhoneL(const TDesC& aModuleName)
-    {
-    THandleInfo handleInfo;
-    iSharedTelServer.HandleInfo(&handleInfo);
-	if(iPhoneInitialized)
-	    {
-	    // a panic occurs if handleInfo.iNumThreads <= 0
-	    if(handleInfo.iNumThreads <= 0)
-	    	{
-	    	iSharedPhone = NULL;
-	        iPhoneInitialized = EFalse;
-	        iSharedTelServer.Close();
-	    	}
-		else
-		    {
-			// return if phone has already been opened before
-			return;
-			}
-	    }
-	
-	// make sure this pointer was NULL
-	ASSERT(iSharedPhone == NULL);
-	
-	// make a copy of module name
-	iModuleName.Copy(aModuleName);
-	
-	// start connect to ETel server
-	User::LeaveIfError(iSharedTelServer.Connect());
-	User::LeaveIfError(iSharedTelServer.ShareAuto());	
-
-	// start load module	
-	LoadModuleL(aModuleName);
-	
-	// check if we can find corresponding phone object according to passed TSY module name
-	if(!FindPhoneIndex())
-		{
-		// the phone index could not be found
-        User::Leave(KErrNotFound);		
- 		}
-		
-	// create a new RMobilePhone instance
-	iSharedPhone = new (ELeave) RMobilePhone();
-	RTelServer::TPhoneInfo phoneInfo;
-	User::LeaveIfError(iSharedTelServer.GetPhoneInfo(iPhoneIndex,phoneInfo));
-	
-	// start openning phone
-	TInt ret = iSharedPhone->Open(iSharedTelServer,phoneInfo.iName);
-	if(ret != KErrNone)
-	    {
-		User::Leave(ret);
-		}
-	
-	iPhoneInitialized = ETrue;
-	}
-
-/**
- * Find the phone index according to TSY name
- * 
- */
-TBool CTestLtsySharedEnv::FindPhoneIndex()
-	{
-	TInt phoneNum = 0;
-	TInt err = iSharedTelServer.EnumeratePhones(phoneNum);
-	if(err != KErrNone)
-		{
-		return EFalse;
-		}
-	
-	TBool found = EFalse;
-	for(TInt i = 0; i < phoneNum; i++)
-		{
-		RTelServer::TPhoneInfo phoneInfo;
-		TBuf<KModuleNameLen> moduleName;
-		err = iSharedTelServer.GetTsyName(i,moduleName);
-		if(err != KErrNone)
-			{
-			return EFalse;
-			}
-		else
-			{
-			if(moduleName.CompareF(iModuleName) == 0)
-				{
-				iPhoneIndex = i;
-				found = ETrue;
-				break;
-				}
-			}
-		}
-	
-	return found;
-	}
-
-/**
- * Close the shared phone and server
- * Client must call this function, if it has called OpenPhoneL().
- * 
- */
-void CTestLtsySharedEnv::ClosePhone()
-	{
-	// close and delete the shared phone
-	iSharedPhone->Close();
-	delete iSharedPhone;
-	iSharedPhone = NULL;
-	
-	// unload the phone module
-	iSharedTelServer.UnloadPhoneModule(iModuleName);
-	iSharedTelServer.Close();
-	
-	// reset iPhoneInitialized
-	iPhoneInitialized = EFalse;
-	}
-
-/**
- * Create a CTelephony object and related resource. 
- * 
- */
-void CTestLtsySharedEnv::CreateTelephonyL()
-	{
-	iActiveSchaduler = new (ELeave) CActiveScheduler();
-	CActiveScheduler::Install(iActiveSchaduler);
-	
-	iTelephony = CTelephony::NewL();
-	}
-
-/**
- * Delete CTelephony object related source.
- * 
- */
-void CTestLtsySharedEnv::DestroyTelephony()
-	{
-	
-	delete iActiveSchaduler;
-	iActiveSchaduler = NULL;
-	delete iTelephony;
-	iTelephony       = NULL;
-
-	delete iSharedPhone;
-	iSharedPhone = NULL;
-	
-	// reset iPhoneInitialized
-	iPhoneInitialized = EFalse;
-	}
-
-CTelephony* CTestLtsySharedEnv::Telephony()
-	{
-	return iTelephony;
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyopenphone.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-//  TestTelephonyOpenPhone.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestTelephonyOpenPhone
-
-// user include
-#include "TestLtsyOpenPhone.h"
-#include "TestLtsyCallSharedData.h"
-#include "TestLtsySmsSharedData.h"
-#include "TestLtsyPktSharedData.h"
-#include "TestLtsyPhoneStoreSharedData.h"
-
-
-/**
-* Constructor
-* 
-*/
-CTestLtsyOpenPhone::CTestLtsyOpenPhone( CTestLtsyModel& aTestModel) 
-    :CTestLtsyPhoneStepBase(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyOpenPhone::~CTestLtsyOpenPhone()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyOpenPhone::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,TestOpenPhoneL());
-    	if(err != KErrNone)
-    		{
-    		ERR_PRINTF2(_L("The error was returned %d!! when open Phone"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	
-	return TestStepResult();
-	}
-
-	
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyopensms.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsyopensms.h"
-
-CTestLtsyOpenSms::CTestLtsyOpenSms(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsyOpenSms::~CTestLtsyOpenSms()
-	{
-	}
-
-CTestLtsyOpenSms* CTestLtsyOpenSms::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyOpenSms* self = new (ELeave)CTestLtsyOpenSms(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsyOpenSms* CTestLtsyOpenSms::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyOpenSms* self=CTestLtsyOpenSms::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsyOpenSms::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsyOpenSms::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyOpenSms::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyOpenSms::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyOpenSms::doTestStepL called"));
-	TRAPD(err,OpenSmsL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when open sms"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyOpenSms::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyOpenSms::doTestStepPostambleL called"));
-	return TestStepResult();
-	}

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyopensmsstore.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsyopensmsstore.h"
-
-CTestLtsyOpenSmsStore::CTestLtsyOpenSmsStore(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsyOpenSmsStore::~CTestLtsyOpenSmsStore()
-	{
-	}
-
-CTestLtsyOpenSmsStore* CTestLtsyOpenSmsStore::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyOpenSmsStore* self = new (ELeave)CTestLtsyOpenSmsStore(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsyOpenSmsStore* CTestLtsyOpenSmsStore::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyOpenSmsStore* self=CTestLtsyOpenSmsStore::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsyOpenSmsStore::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsyOpenSmsStore::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyOpenSmsStore::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyOpenSmsStore::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyOpenSmsStore::doTestStepL called"));
-	TRAPD(err,OpenSmsStoreL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when open sms store"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyOpenSmsStore::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyOpenSmsStore::doTestStepPostambleL called"));
-	return TestStepResult();
-	}

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphbkclose.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsyphbkclose.h"
-
-CTestLtsyPhbkClose::CTestLtsyPhbkClose(CTestLtsyModel& aTestModel)
-    : CTestLtsyPhoneStoreBase(aTestModel)
-	{
-
-	}
-
-CTestLtsyPhbkClose::~CTestLtsyPhbkClose()
-	{
-	}
-
-CTestLtsyPhbkClose* CTestLtsyPhbkClose::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkClose* self = new (ELeave)CTestLtsyPhbkClose(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsyPhbkClose* CTestLtsyPhbkClose::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkClose* self=CTestLtsyPhbkClose::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsyPhbkClose::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsyPhbkClose::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkClose::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkClose::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkClose::doTestStepL called"));
-	TRAPD(err,ClosePhonebookL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when close phonebook"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkClose::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkClose::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsyPhbkClose::ClosePhonebookL()
-	{
-	PhoneBookStore().Close();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphbkdelete.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsyphbkdelete.h"
-
-CTestLtsyPhbkDelete::CTestLtsyPhbkDelete(CTestLtsyModel& aTestModel)
-	: CTestLtsyPhoneStoreBase(aTestModel)
-	{
-
-	}
-
-CTestLtsyPhbkDelete::~CTestLtsyPhbkDelete()
-	{
-	}
-
-CTestLtsyPhbkDelete* CTestLtsyPhbkDelete::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkDelete* self = new (ELeave)CTestLtsyPhbkDelete(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsyPhbkDelete* CTestLtsyPhbkDelete::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkDelete* self=CTestLtsyPhbkDelete::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsyPhbkDelete::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsyPhbkDelete::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkDelete::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkDelete::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkDelete::doTestStepL called"));
-	TInt index = 10;
-	TRAPD(err,DeletePhonebookL(index));
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when delete phonebook"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkDelete::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkDelete::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsyPhbkDelete::DeletePhonebookL(TInt aIndex)
-	{
-	TRequestStatus status;
-	PhoneBookStore().Delete(status,aIndex);
-	User::WaitForRequest(status);
-	TInt r=status.Int();
-	INFO_PRINTF2(_L("Delete() request status = %d"),r);
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphbkdeleteinvalidindex.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsyphbkdeleteinvalidindex.h"
-
-CTestLtsyPhbkDeleteInvalidIndex::CTestLtsyPhbkDeleteInvalidIndex(CTestLtsyModel& aTestModel)
-	: CTestLtsyPhoneStoreBase(aTestModel)
-	{
-
-	}
-
-CTestLtsyPhbkDeleteInvalidIndex::~CTestLtsyPhbkDeleteInvalidIndex()
-	{
-	}
-
-CTestLtsyPhbkDeleteInvalidIndex* CTestLtsyPhbkDeleteInvalidIndex::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkDeleteInvalidIndex* self = new (ELeave)CTestLtsyPhbkDeleteInvalidIndex(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsyPhbkDeleteInvalidIndex* CTestLtsyPhbkDeleteInvalidIndex::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkDeleteInvalidIndex* self=CTestLtsyPhbkDeleteInvalidIndex::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsyPhbkDeleteInvalidIndex::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsyPhbkDeleteInvalidIndex::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkDeleteInvalidIndex::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkDeleteInvalidIndex::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkDeleteInvalidIndex::doTestStepL called"));
-	TInt index = 251;
-	TRAPD(err,DeletePhonebookL(index));
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when delete phonebook"),err);
-	    SetTestStepResult(EFail);
-		}
-	
-	index = 0;
-	TRAPD(err1,DeletePhonebookL(index));
-	if(err1 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when delete phonebook"),err1);
-	    SetTestStepResult(EFail);
-		}
-	
-	index = -5;
-	TRAPD(err2,DeletePhonebookL(index));
-	if(err2 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when delete phonebook"),err2);
-	    SetTestStepResult(EFail);
-		}
-		
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkDeleteInvalidIndex::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkDeleteInvalidIndex::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsyPhbkDeleteInvalidIndex::DeletePhonebookL(TInt aIndex)
-	{
-	TRequestStatus status;
-	PhoneBookStore().Delete(status,aIndex);
-	User::WaitForRequest(status);
-	TInt r=status.Int();
-	INFO_PRINTF2(_L("Delete() request status = %d"),r);
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphbkgetstoreinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsyphbkgetstoreinfo.h"
-
-CTestLtsyPhbkGetStoreInfo::CTestLtsyPhbkGetStoreInfo(CTestLtsyModel& aTestModel)
-	: CTestLtsyPhoneStoreBase(aTestModel)
-	{
-
-	}
-
-CTestLtsyPhbkGetStoreInfo::~CTestLtsyPhbkGetStoreInfo()
-	{
-	}
-
-CTestLtsyPhbkGetStoreInfo* CTestLtsyPhbkGetStoreInfo::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkGetStoreInfo* self = new (ELeave)CTestLtsyPhbkGetStoreInfo(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsyPhbkGetStoreInfo* CTestLtsyPhbkGetStoreInfo::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkGetStoreInfo* self=CTestLtsyPhbkGetStoreInfo::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsyPhbkGetStoreInfo::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsyPhbkGetStoreInfo::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkGetStoreInfo::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkGetStoreInfo::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkGetStoreInfo::doTestStepL called"));
-	TRAPD(err,GetStoreInfoL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when get phonebook store info"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkGetStoreInfo::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkGetStoreInfo::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsyPhbkGetStoreInfo::GetStoreInfoL()
-	{
-	TRequestStatus status;
-	RMobilePhoneStore::TMobilePhoneStoreInfoV1 phoneStoreInfo;
-	RMobilePhoneStore::TMobilePhoneStoreInfoV1Pckg phoneStoreInfoPckg(phoneStoreInfo);
-	iModel.SharedEnv().Phone().GetPhoneStoreInfo(status, phoneStoreInfoPckg, KETelIccSmsStore);
-//	iModel.SharedEnv().Phone().GetPhoneStoreInfo(status, phoneStoreInfoPckg, KETelIccFdnPhoneBook);
-//	iiModel.SharedEnv().Phone().GetPhoneStoreInfo(status, phoneStoreInfoPckg, KETelIccAdnPhoneBook);
-	User::WaitForRequest(status);
-	TInt r=status.Int();
-	INFO_PRINTF2(_L("GetPhoneStoreInfo() request status = %d"),r);
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphbkopen.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsyphbkopen.h"
-
-CTestLtsyPhbkOpen::CTestLtsyPhbkOpen(CTestLtsyModel& aTestModel)
-	: CTestLtsyPhoneStoreBase(aTestModel)
-	{
-
-	}
-
-CTestLtsyPhbkOpen::~CTestLtsyPhbkOpen()
-	{
-	}
-
-CTestLtsyPhbkOpen* CTestLtsyPhbkOpen::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkOpen* self = new (ELeave)CTestLtsyPhbkOpen(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsyPhbkOpen* CTestLtsyPhbkOpen::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkOpen* self=CTestLtsyPhbkOpen::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsyPhbkOpen::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsyPhbkOpen::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkOpen::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkOpen::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkOpen::doTestStepL called"));
-	TRAPD(err,OpenPhonebookL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when open phonebook"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkOpen::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkOpen::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsyPhbkOpen::OpenPhonebookL()
-	{
-	PhoneBookStore().Open(iModel.SharedEnv().Phone(),  KETelIccAdnPhoneBook);
-//	PhoneBookStore().Open(iModel.SharedEnv().Phone(),  KETelIccFdnPhoneBook);
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphbkread.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-// 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:
-// 
-// 
-
-//system include 
-#include <mpbutil.h> 
-//user include
-#include "testltsyphbkread.h"
-//const defination
-_LIT(KExpectedText, "TelNo 010");
-_LIT(KExpectedNumber,"+123456010");
-const TUint KExpectedIndex = 10;
-
-CTestLtsyPhbkRead::CTestLtsyPhbkRead(CTestLtsyModel& aTestModel)
-	: CTestLtsyPhoneStoreBase(aTestModel)
-	{
-
-	}
-
-CTestLtsyPhbkRead::~CTestLtsyPhbkRead()
-	{
-	}
-
-CTestLtsyPhbkRead* CTestLtsyPhbkRead::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkRead* self = new (ELeave)CTestLtsyPhbkRead(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsyPhbkRead* CTestLtsyPhbkRead::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkRead* self=CTestLtsyPhbkRead::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsyPhbkRead::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsyPhbkRead::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkRead::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkRead::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkRead::doTestStepL called"));
-	TInt index = 10;
-	TRAPD(err,ReadEntryL(index));
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when read phonebook"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkRead::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkRead::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsyPhbkRead::ReadEntryL(TInt aIndex)
-	{
-	TRequestStatus status;
-	TBuf8<800> outputPbData;
-	TUint16 index(0);
-	TUint8 tonNpi;
-	TPtrC16 number(NULL,0);
-	TPtrC16 text(NULL,0);
-	TUint8 tagValue(0);
-	CPhoneBookBuffer::TPhBkTagType dataType;
-	
-	CPhoneBookBuffer* pbBuffer=new(ELeave) CPhoneBookBuffer(); // used to read phonebook data
-	CleanupStack::PushL(pbBuffer);
-	PhoneBookStore().Read(status,aIndex,1,outputPbData);
-	User::WaitForRequest(status);
-	TInt r=status.Int();
-	INFO_PRINTF2(_L("Write() request status = %d"),r);
-	// Set pbBuffer to point to received phonebook data
-	pbBuffer->Set(&outputPbData); 
-	// Start reading received phonebook data
-	pbBuffer->StartRead();       
-	while (pbBuffer->GetTagAndType(tagValue,dataType)==KErrNone)
-		{
-		switch (tagValue)
-			{
-		case RMobilePhoneBookStore::ETagPBAdnIndex:
-			pbBuffer->GetValue(index);			
-			break;
-		case RMobilePhoneBookStore::ETagPBTonNpi:
-			pbBuffer->GetValue(tonNpi);			
-			break;
-		case RMobilePhoneBookStore::ETagPBText:
-			pbBuffer->GetValue(text);			
-			break;
-		case RMobilePhoneBookStore::ETagPBNumber:
-			pbBuffer->GetValue(number);			
-			break;
-		default:
-			// An unsupported field type - just skip this value
-			pbBuffer->SkipValue(dataType);
-			break;
-			}
-		}
-	if((index != KExpectedIndex)||(text.MatchF(KExpectedText)==KErrNotFound)||
-			                      (number.MatchF(KExpectedNumber)==KErrNotFound))
-		{
-		SetTestStepResult(EFail);
-		}
-	CleanupStack::PopAndDestroy();             
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphbkreadinvalidindex.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-// 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:
-// 
-// 
-
-//system include 
-#include <mpbutil.h> 
-//user include
-#include "testltsyphbkreadinvalidindex.h"
-
-
-
-CTestLtsyPhbkReadInvalidIndex::CTestLtsyPhbkReadInvalidIndex(CTestLtsyModel& aTestModel)
-	: CTestLtsyPhoneStoreBase(aTestModel)
-	{
-
-	}
-
-CTestLtsyPhbkReadInvalidIndex::~CTestLtsyPhbkReadInvalidIndex()
-	{
-	}
-
-CTestLtsyPhbkReadInvalidIndex* CTestLtsyPhbkReadInvalidIndex::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkReadInvalidIndex* self = new (ELeave)CTestLtsyPhbkReadInvalidIndex(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsyPhbkReadInvalidIndex* CTestLtsyPhbkReadInvalidIndex::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkReadInvalidIndex* self=CTestLtsyPhbkReadInvalidIndex::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsyPhbkReadInvalidIndex::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsyPhbkReadInvalidIndex::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkReadInvalidIndex::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkReadInvalidIndex::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkReadInvalidIndex::doTestStepL called"));
-	TInt index = 0;
-	TRAPD(err,ReadEntryL(index));
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when read phonebook"),err);
-	    SetTestStepResult(EFail);
-		}
-	
-	index = -2;
-	TRAPD(err1,ReadEntryL(index));
-	if(err1 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when read phonebook"),err1);
-	    SetTestStepResult(EFail);
-		}
-	
-    index = 600;
-	TRAPD(err2,ReadEntryL(index));
-	if(err2 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when read phonebook"),err2);
-	    SetTestStepResult(EFail);
-		}
-	
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkReadInvalidIndex::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkReadInvalidIndex::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsyPhbkReadInvalidIndex::ReadEntryL(TInt aIndex)
-	{
-	TRequestStatus status;
-	TBuf8<800> outputPbData;
-	PhoneBookStore().Read(status,aIndex,1,outputPbData);
-	User::WaitForRequest(status);
-	TInt r=status.Int();
-	INFO_PRINTF2(_L("Write() request status = %d"),r);
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphbkwrite.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-// 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:
-// 
-// 
-
-//system include 
-#include <mpbutil.h> 
-//user include
-#include "testltsyphbkwrite.h"
-//const define
-const TUint8 KTypeOfNumber=0x81;
-
-CTestLtsyPhbkWrite::CTestLtsyPhbkWrite(CTestLtsyModel& aTestModel)
-	: CTestLtsyPhoneStoreBase(aTestModel)
-	{
-
-	}
-
-CTestLtsyPhbkWrite::~CTestLtsyPhbkWrite()
-	{
-	}
-
-CTestLtsyPhbkWrite* CTestLtsyPhbkWrite::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkWrite* self = new (ELeave)CTestLtsyPhbkWrite(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsyPhbkWrite* CTestLtsyPhbkWrite::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkWrite* self=CTestLtsyPhbkWrite::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsyPhbkWrite::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsyPhbkWrite::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkWrite::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkWrite::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkWrite::doTestStepL called"));
-	TInt index = 10;
-	TRAPD(err,WriteEntryL(index));
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when write phonebook"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkWrite::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkWrite::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsyPhbkWrite::WriteEntryL(TInt aIndex)
-	{
-	TRequestStatus status;
-	TBuf8<800> pbData; // Client reserved space for phonebook data
-	TInt ret;
-	    
-	_LIT16(KTel,"123456%03d");
-	_LIT16(KText,"TelNo %03d");
-	TBuf16<20> text(KTel), number(KText);
-
-	CPhoneBookBuffer* pbBuffer = new(ELeave) CPhoneBookBuffer(); // used to write phonebook data
-	CleanupStack::PushL(pbBuffer);
-	pbBuffer->Set(&pbData); // Set it to point to the Client buffer
-	pbBuffer->AddNewEntryTag();
-	// convert number into TLV format and append it to allocated buffer
-	TInt index = aIndex;
-	ret = pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBAdnIndex,(TUint16)index);
-	if( ret != KErrNone )
-		{
-		CleanupStack::PopAndDestroy();
-		SetTestStepResult(EFail);
-		}
-	number.Format(KTel(), index);
-	ret=pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBNumber, number);
-//	ret=pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBNewEntry, number);
-	if( ret != KErrNone )
-		{
-		CleanupStack::PopAndDestroy();
-		SetTestStepResult(EFail);
-		}
-	// convert number type into TLV format and append it to allocated buffer
-	TUint8 tonNpi=KTypeOfNumber; 
-	ret=pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBTonNpi, tonNpi);
-	if(ret!=KErrNone)
-		{
-		CleanupStack::PopAndDestroy();
-		SetTestStepResult(EFail);
-		}
-
-	text.Format(KText(), index);
-// convert text into TLV format and append it to allocated buffer
-	ret=pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBText, text);
-	if(ret != KErrNone)
-		{
-		CleanupStack::PopAndDestroy();
-		SetTestStepResult(EFail);
-		}
-	PhoneBookStore().Write(status, pbData,index);
-	User::WaitForRequest(status);
-	TInt r=status.Int();
-	INFO_PRINTF2(_L("Write() request status = %d"),r);
-	CleanupStack::PopAndDestroy();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphbkwriteinvalidindex.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +0,0 @@
-// 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:
-// 
-// 
-
-//system include 
-#include <mpbutil.h> 
-//user include
-#include "testltsyphbkwriteinvalidindex.h"
-//const define
-const TUint8 KTypeOfNumber=0x81;
-
-CTestLtsyPhbkWriteInvalidIndex::CTestLtsyPhbkWriteInvalidIndex(CTestLtsyModel& aTestModel)
-	: CTestLtsyPhoneStoreBase(aTestModel)
-	{
-
-	}
-
-CTestLtsyPhbkWriteInvalidIndex::~CTestLtsyPhbkWriteInvalidIndex()
-	{
-	}
-
-CTestLtsyPhbkWriteInvalidIndex* CTestLtsyPhbkWriteInvalidIndex::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkWriteInvalidIndex* self = new (ELeave)CTestLtsyPhbkWriteInvalidIndex(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsyPhbkWriteInvalidIndex* CTestLtsyPhbkWriteInvalidIndex::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsyPhbkWriteInvalidIndex* self=CTestLtsyPhbkWriteInvalidIndex::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsyPhbkWriteInvalidIndex::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsyPhbkWriteInvalidIndex::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkWriteInvalidIndex::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkWriteInvalidIndex::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkWriteInvalidIndex::doTestStepL called"));
-	TInt index = -1;
-	TRAPD(err,WriteEntryL(index));
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when write phonebook"),err);
-	    SetTestStepResult(EFail);
-		}
-	
-	index = 0;
-	TRAPD(err1,WriteEntryL(index));
-	if(err1 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when write phonebook"),err1);
-	    SetTestStepResult(EFail);
-		}
-	
-	index = 256;
-	TRAPD(err2,WriteEntryL(index));
-	if(err2 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when write phonebook"),err2);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhbkWriteInvalidIndex::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhbkWriteInvalidIndex::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsyPhbkWriteInvalidIndex::WriteEntryL(TInt aIndex)
-	{
-	TRequestStatus status;
-	TBuf8<800> pbData; // Client reserved space for phonebook data
-	TInt ret;
-	    
-	_LIT16(KTel,"123456%03d");
-	_LIT16(KText,"TelNo %03d");
-	TBuf16<20> text(KTel), number(KText);
-
-	CPhoneBookBuffer* pbBuffer = new(ELeave) CPhoneBookBuffer(); // used to write phonebook data
-	CleanupStack::PushL(pbBuffer);
-	pbBuffer->Set(&pbData); // Set it to point to the Client buffer
-	pbBuffer->AddNewEntryTag();
-	// convert number into TLV format and append it to allocated buffer
-	TInt index = aIndex;
-	ret = pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBAdnIndex,(TUint16)index);
-	if( ret != KErrNone )
-		{
-		CleanupStack::PopAndDestroy();
-		SetTestStepResult(EFail);
-		}
-	number.Format(KTel(), index);
-	ret=pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBNumber, number);
-//	ret=pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBNewEntry, number);
-	if( ret != KErrNone )
-		{
-		CleanupStack::PopAndDestroy();
-		SetTestStepResult(EFail);
-		}
-	// convert number type into TLV format and append it to allocated buffer
-	TUint8 tonNpi=KTypeOfNumber; 
-	ret=pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBTonNpi, tonNpi);
-	if(ret!=KErrNone)
-		{
-		CleanupStack::PopAndDestroy();
-		SetTestStepResult(EFail);
-		}
-
-	text.Format(KText(), index);
-// convert text into TLV format and append it to allocated buffer
-	ret=pbBuffer->PutTagAndValue(RMobilePhoneBookStore::ETagPBText, text);
-	if(ret != KErrNone)
-		{
-		CleanupStack::PopAndDestroy();
-		SetTestStepResult(EFail);
-		}
-	PhoneBookStore().Write(status, pbData,index);
-	User::WaitForRequest(status);
-	TInt r=status.Int();
-	INFO_PRINTF2(_L("Write() request status = %d"),r);
-	CleanupStack::PopAndDestroy();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphonedetectednetworks.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-//  TestLtsyPhoneGetDetectedNetworks.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetDetectedNetworks
-
-// user include
-#include "TestLtsyPhoneGetDetectedNetworks.h"
-
-
-/**
-* Constructor
-* 
-*/
-CTestLtsyPhoneGetDetectedNetworks::CTestLtsyPhoneGetDetectedNetworks( CTestLtsyModel& aTestModel) 
-    :CTestLtsyPhoneStepBase(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyPhoneGetDetectedNetworks::~CTestLtsyPhoneGetDetectedNetworks()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPhoneGetDetectedNetworks::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GetDetectedNetworksL());
-    	if(err != KErrNone)
-    		{
-    		ERR_PRINTF2(_L("The error was returned %d!! when open Phone"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	
-	return TestStepResult();
-	}
-
-	
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphonedetectednetworkscancel.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-//  TestLtsyPhoneGetDetectedNetworksCancel.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetDetectedNetworksCancel
-
-// user include
-#include "TestLtsyPhoneGetDetectedNetworksCancel.h"
-
-
-/**
-* Constructor
-* 
-*/
-CTestLtsyPhoneGetDetectedNetworksCancelCancel::CTestLtsyPhoneGetDetectedNetworksCancelCancel( CTestLtsyModel& aTestModel) 
-    :CTestLtsyPhoneStepBase(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyPhoneGetDetectedNetworksCancelCancel::~CTestLtsyPhoneGetDetectedNetworksCancelCancel()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPhoneGetDetectedNetworksCancelCancel::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GetDetectedNetworksCancelL());
-    	if(err != KErrNone)
-    		{
-    		ERR_PRINTF2(_L("The error was returned %d!! when open Phone"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	
-	return TestStepResult();
-	}
-
-	
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphonegetcellinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-//  TestLtsyPhoneGetCellInfo.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetCellInfo
-
-// user include
-#include "TestLtsyPhoneGetCellInfo.h"
-
-
-/**
-* Constructor
-* 
-*/
-CTestLtsyPhoneGetCellInfo::CTestLtsyPhoneGetCellInfo( CTestLtsyModel& aTestModel) 
-    :CTestLtsyPhoneStepBase(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyPhoneGetCellInfo::~CTestLtsyPhoneGetCellInfo()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPhoneGetCellInfo::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GetCellInfo());
-    	if(err != KErrNone)
-    		{
-    		ERR_PRINTF2(_L("The error was returned %d!! when open Phone"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	
-	return TestStepResult();
-	}
-
-	
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphonegetcurrentnetworkinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-//  TestLtsyPhoneGetCurrentNetworkInfo.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetCurrentNetworkInfo
-
-// user include
-#include "TestLtsyPhoneGetCurrentNetworkInfo.h"
-
-
-/**
-* Constructor
-* 
-*/
-CTestLtsyPhoneGetCurrentNetworkInfo::CTestLtsyPhoneGetCurrentNetworkInfo( CTestLtsyModel& aTestModel) 
-    :CTestLtsyPhoneStepBase(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyPhoneGetCurrentNetworkInfo::~CTestLtsyPhoneGetCurrentNetworkInfo()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPhoneGetCurrentNetworkInfo::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GetCurrentNetworkInfo());
-    	if(err != KErrNone)
-    		{
-    		ERR_PRINTF2(_L("The error was returned %d!! when open Phone"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	
-	return TestStepResult();
-	}
-
-	
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphonegetfdnstatus.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-//  TestLtsyPhoneGetFdnStatus.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetFdnStatus
-
-// user include
-#include "TestLtsyPhoneGetFdnStatus.h"
-
-
-/**
-* Constructor
-* 
-*/
-CTestLtsyPhoneGetFdnStatus::CTestLtsyPhoneGetFdnStatus( CTestLtsyModel& aTestModel) 
-    :CTestLtsyPhoneStepBase(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyPhoneGetFdnStatus::~CTestLtsyPhoneGetFdnStatus()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPhoneGetFdnStatus::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GetFdnStatus());
-    	if(err != KErrNone)
-    		{
-    		ERR_PRINTF2(_L("The error was returned %d!! when open Phone"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	
-	return TestStepResult();
-	}
-
-	
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphonegethomenetwork.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-//  TestLtsyPhoneGetHomeNetwork.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetHomeNetwork
-
-// user include
-#include "TestLtsyPhoneGetHomeNetwork.h"
-
-
-/**
-* Constructor
-* 
-*/
-CTestLtsyPhoneGetHomeNetwork::CTestLtsyPhoneGetHomeNetwork( CTestLtsyModel& aTestModel) 
-    :CTestLtsyPhoneStepBase(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyPhoneGetHomeNetwork::~CTestLtsyPhoneGetHomeNetwork()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPhoneGetHomeNetwork::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GetHomeNetwork());
-    	if(err != KErrNone)
-    		{
-    		ERR_PRINTF2(_L("The error was returned %d!! when open Phone"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	
-	return TestStepResult();
-	}
-
-	
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphonegetnetworkregistrationstatus.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-//  TestLtsyPhoneGetNetworkRegistrationStatus.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetNetworkRegistrationStatus
-
-// user include
-#include "TestLtsyPhoneGetNetworkRegistrationStatus.h"
-
-
-/**
-* Constructor
-* 
-*/
-CTestLtsyPhoneGetNetworkRegistrationStatus::CTestLtsyPhoneGetNetworkRegistrationStatus( CTestLtsyModel& aTestModel) 
-    :CTestLtsyPhoneStepBase(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyPhoneGetNetworkRegistrationStatus::~CTestLtsyPhoneGetNetworkRegistrationStatus()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPhoneGetNetworkRegistrationStatus::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GetNetworkRegistrationStatus());
-    	if(err != KErrNone)
-    		{
-    		ERR_PRINTF2(_L("The error was returned %d!! when open Phone"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	
-	return TestStepResult();
-	}
-
-	
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphonegetphoneid.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-//  TestLtsyPhoneGetPhoneID.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneGetPhoneID
-
-// user include
-#include "TestLtsyPhoneGetPhoneID.h"
-
-
-/**
-* Constructor
-* 
-*/
-CTestLtsyPhoneGetPhoneID::CTestLtsyPhoneGetPhoneID( CTestLtsyModel& aTestModel) 
-    :CTestLtsyPhoneStepBase(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyPhoneGetPhoneID::~CTestLtsyPhoneGetPhoneID()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPhoneGetPhoneID::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GetPhoneId());
-    	if(err != KErrNone)
-    		{
-    		ERR_PRINTF2(_L("The error was returned %d!! when open Phone"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	
-	return TestStepResult();
-	}
-
-	
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphoneregistercellinfochangenotification.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-//  TestLtsyPhoneRegisterCellInfoChangeNotification.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneRegisterCellInfoChangeNotification
-
-// user include
-#include "testltsyphoneregistercellinfochangenotification.h"
-
-
-/**
-* Constructor
-* 
-*/
-CTestLtsyPhoneRegisterCellInfoChangeNotification::CTestLtsyPhoneRegisterCellInfoChangeNotification( CTestLtsyModel& aTestModel) 
-    :CTestLtsyPhoneStepBase(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyPhoneRegisterCellInfoChangeNotification::~CTestLtsyPhoneRegisterCellInfoChangeNotification()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPhoneRegisterCellInfoChangeNotification::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,RegisterCellInfoChangeNotification());
-    	if(err != KErrNone)
-    		{
-    		ERR_PRINTF2(_L("The error was returned %d!! when open Phone"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	
-	return TestStepResult();
-	}
-
-	
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphoneselectnetwork.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-//  TestLtsyPhoneSelectNetwork.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneSelectNetwork
-
-// user include
-#include "TestLtsyPhoneSelectNetwork.h"
-
-
-/**
-* Constructor
-* 
-*/
-CTestLtsyPhoneSelectNetwork::CTestLtsyPhoneSelectNetwork( CTestLtsyModel& aTestModel) 
-    :CTestLtsyPhoneStepBase(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyPhoneSelectNetwork::~CTestLtsyPhoneSelectNetwork()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPhoneSelectNetwork::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,SelectNetwork());
-    	if(err != KErrNone)
-    		{
-    		ERR_PRINTF2(_L("The error was returned %d!! when open Phone"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	
-	return TestStepResult();
-	}
-
-	
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphonesetnetworkselectionsetting.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-//  TestLtsyPhoneSetNetworkSelectionSetting.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPhoneSetNetworkSelectionSetting
-
-// user include
-#include "TestLtsyPhoneSetNetworkSelectionSetting.h"
-
-
-/**
-* Constructor
-* 
-*/
-CTestLtsyPhoneSetNetworkSelectionSetting::CTestLtsyPhoneSetNetworkSelectionSetting( CTestLtsyModel& aTestModel) 
-    :CTestLtsyPhoneStepBase(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyPhoneSetNetworkSelectionSetting::~CTestLtsyPhoneSetNetworkSelectionSetting()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPhoneSetNetworkSelectionSetting::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,SetNetworkSelectionSetting());
-    	if(err != KErrNone)
-    		{
-    		ERR_PRINTF2(_L("The error was returned %d!! when open Phone"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	
-	return TestStepResult();
-	}
-
-	
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphonestepbase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,431 +0,0 @@
-// TestTelephonyPktTestStepBase.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestTelephonyPktTestStepBase
-#include <mmlist.h>
-#include <mmretrieve.h>
-// 	user include
-#include "TestLtsyPhoneStepBase.h"
-#include "te_integration_stltsysuitestepbase.h"
-#include "te_integration_stltsysuitedefs.h"
-
-// 
-_LIT(KTsyModuleName, "PhoneTsy");
-/**
- * Constructor
- */
-CTestLtsyPhoneStepBase::CTestLtsyPhoneStepBase(CTestLtsyModel& aModel)
-	:iModel(aModel),iSharedPhone(aModel.SharedEnv().Phone())
-	{
-	}
-
-/**
- * Destructor
- * 
- */
-CTestLtsyPhoneStepBase::~CTestLtsyPhoneStepBase()
-	{
-
-	}
-/**
- * Get the shared phone
- * 
- */
-RMobilePhone& CTestLtsyPhoneStepBase::SharedPhone() 
-	{
-	return iSharedPhone;
-	}
-	
-TVerdict CTestLtsyPhoneStepBase::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhoneStepBase::doTestStepPreambleL()"));
-	// uncomment the following 3 lines if you have common pre setting to all the test steps in there
-	// CTe_integration_stltsySuiteStepBase::doTestStepPreambleL();
-	// if (TestStepResult()!=EPass)
-	//    return   TestStepResult();
-	// process some pre setting to this test step then set SetTestStepResult to EFail or Epass.
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-TVerdict CTestLtsyPhoneStepBase::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPhoneStepBase::doTestStepPostambleL()"));
-	// process something post setting to the test step
-	// uncomment the following line if you have common post setting to all the test steps in there
-	// CTe_integration_stltsySuiteStepBase::doTestStepPostambleL();
-	// uncomment the following line if you have post process or remove the following line if no post process
-	// SetTestStepResult(EPass);		// or EFail
-	return TestStepResult();
-	}
-void CTestLtsyPhoneStepBase::TestOpenPhoneL()
-	{
-	// reset all shared data to make sure we are going to run on a clean environment
-	//Open the shared phone
-	iModel.SharedEnv().OpenPhoneL(KTsyModuleName);
-	}
-void CTestLtsyPhoneStepBase::TestClosePhone()
-	{
-	iModel.SharedEnv().ClosePhone();	
-	}
-
-void CTestLtsyPhoneStepBase::GetFdnStatus()
-	{
-	INFO_PRINTF1(_L("GetFdnStatus() invoked......\n"));
-	TRequestStatus Status;
-	RMobilePhone::TMobilePhoneFdnStatus FdnStatus;
-	iSharedPhone.GetFdnStatus(Status,FdnStatus);
-	User::WaitForRequest(Status);
-	INFO_PRINTF2(_L("GetFdnStatus() complete = %d\n"), Status.Int());
-	}
-void CTestLtsyPhoneStepBase::GetNetworkRegistrationStatus()
-	{
-	TRequestStatus Status;
-	INFO_PRINTF1(_L("GetNetworkRegistrationStatus() invoked......\n"));
-	RMobilePhone::TMobilePhoneRegistrationStatus RegStatus;
-	iSharedPhone.GetNetworkRegistrationStatus(Status,RegStatus);
-	User::WaitForRequest(Status);
-	INFO_PRINTF2(_L("GetNetworkRegistrationStatus() complete = %d\n"), Status.Int());
-	}
-void CTestLtsyPhoneStepBase::GetHomeNetwork()
-	{
-	TRequestStatus Status;
-	INFO_PRINTF1(_L("GetHomeNetwork() invoked......\n"));
-	RMobilePhone::TMobilePhoneNetworkInfoV1  aNetworkInfo;
-	RMobilePhone::TMobilePhoneNetworkInfoV1Pckg aNetworkInfoBuf(aNetworkInfo); // package TMobilePhoneNetworkInfoV1 into a buffer
-	RMobilePhone::TMobilePhoneLocationAreaV1 aArea;
-	iSharedPhone.GetHomeNetwork(Status, aNetworkInfoBuf) ;
-	User::WaitForRequest(Status);
-	INFO_PRINTF2(_L("GetHomeNetwork() complete = %d\n"), Status.Int());
-	}
-
-//void CTestLtsyPhoneStepBase::GetServiceProviderName()
-//	{
-//	
-//	}
-void CTestLtsyPhoneStepBase::GetPhoneId()
-	{
-	TRequestStatus Status;
-	INFO_PRINTF1(_L("GetPhoneId() invoked......\n"));
-	RMobilePhone::TMobilePhoneIdentityV1 aPhoneId;
-	iSharedPhone.GetPhoneId(Status,aPhoneId);
-	User::WaitForRequest(Status);
-	INFO_PRINTF2(_L("GetPhoneId() complete = %d\n"), Status.Int());
-	
-	}
-void CTestLtsyPhoneStepBase::GetDetectedNetworksL()
-	{
-	TRequestStatus Status;
-	INFO_PRINTF1(_L("GetDetectedNetworks() invoked......\n"));
-	CRetrieveMobilePhoneDetectedNetworks* Retriever = CRetrieveMobilePhoneDetectedNetworks::NewL(iSharedPhone);
-	Retriever->StartV2(Status);
-	User::After(50*1000*1000);
-	delete Retriever;
-	INFO_PRINTF1(_L("GetDetectedNetworks() invoked......OK\n"));
-	
-//	iList = iRetriever->RetrieveListV2L();
-	}
-void CTestLtsyPhoneStepBase::GetDetectedNetworksCancelL()
-	{
-	TRequestStatus Status;
-	INFO_PRINTF1(_L("GetDetectedNetworksCancel() invoked......\n"));
-	CRetrieveMobilePhoneDetectedNetworks* Retriever = CRetrieveMobilePhoneDetectedNetworks::NewL(iSharedPhone);
-	Retriever->StartV2(Status);
-	Retriever->Cancel();
-	User::After(50*1000*1000);
-	delete Retriever;
-	INFO_PRINTF1(_L("GetDetectedNetworksCancel() invoked......OK\n"));
-	}
-void CTestLtsyPhoneStepBase::SetNetworkSelectionSetting()
-/**
-*	3.10.12 Set Network Selection Setting
-*	void RMobilePhone::SetNetworkSelectionSetting(TRequestStatus& aReqStatus,
-*		const TDes8& aSetting) const
-*	This method is used by client application to set the way a phone will select a
-*	network. The new setting is supplied within the aSetting parameter, which is a
-*	packaged version of the TMobilePhoneNetworkSelectionV1V1 class above.
-*	In manual network selection, the user is able to select a network to camp on to
-*	from a list of detected networks. The selected network has to be accessible by the
-*	user, i.e. it is not a forbidden network.
-*	When a phone is using manual network selection, at power-up or after signal loss,
-*	it will try to register to the network that the user last selected. If this network
-*	is not available then it is up to the phone whether it tries to fall-back to
-*	automatic selection or leaves the phone in no service.
-*
-*/
-	{
-	TRequestStatus Status;
-	INFO_PRINTF1(_L("GetNetworkSelectionSetting() invoked......\n"));
-	RMobilePhone::TMobilePhoneNetworkSelectionV1  localNetworkSel;
-	localNetworkSel.iMethod = RMobilePhone::ENetworkSelectionManual;
-	
-	RMobilePhone::TMobilePhoneNetworkSelectionV1Pckg localNetworkSelBuf(localNetworkSel) ;
-    
-	INFO_PRINTF1(_L("SetNetworkSelectionSetting() invoked......\n"));
-	iSharedPhone.SetNetworkSelectionSetting(Status, localNetworkSelBuf) ;
-	User::WaitForRequest(Status);
-	INFO_PRINTF2(_L("SetNetworkSelectionSetting() complete = %d\n"), Status.Int());
-	}
-void CTestLtsyPhoneStepBase::SelectNetwork()
-	{
-	TRequestStatus Status;
-	RMobilePhone::TMobilePhoneNetworkManualSelection tempsel;
-	tempsel.iCountry = _L("460");
-	tempsel.iNetwork = _L("00");
-	INFO_PRINTF1(_L("SelectNetwork() invoked......\n"));
-	iSharedPhone.SelectNetwork(Status,ETrue,tempsel);
-//	iSharedPhone.CancelAsyncRequest(Status);
-	User::WaitForRequest(Status);
-	INFO_PRINTF2(_L("SelectNetwork() complete = %d\n"), Status.Int());
-	
-	}
-void CTestLtsyPhoneStepBase::SetAndSelectNetwork()
-	{
-	INFO_PRINTF1(_L("SetAndSelectNetwork() invoked......\n"));
-	SetNetworkSelectionSetting();
-	SelectNetwork();
-	}
-void CTestLtsyPhoneStepBase::GetCurrentNetworkInfo()
-	{
-	TRequestStatus Status;
-	INFO_PRINTF1(_L("GetCurrentNetworkInfo() invoked......\n"));	
-	RMobilePhone::TMobilePhoneNetworkInfoV5  aNetworkInfo;
-	RMobilePhone::TMobilePhoneNetworkInfoV5Pckg aNetworkInfoBuf(aNetworkInfo); // package TMobilePhoneNetworkInfoV1 into a buffer
-	RMobilePhone::TMobilePhoneLocationAreaV1 aArea;
-	iSharedPhone.GetCurrentNetwork(Status, aNetworkInfoBuf, aArea);
-	User::WaitForRequest(Status);
-
-	if (Status==KErrNone)
-		{
-		INFO_PRINTF1(_L("Get Get Current Network Information OK\n"));
-		}
-	else
-		{
-		INFO_PRINTF2(_L("Get Get Current Network Information, Error %d returned.\n"), Status.Int());
-		}
-
-	}
-//void CTestLtsyPhoneStepBase::GetNetworkMode()
-//	{
-//	TRequestStatus Status;
-//	INFO_PRINTF1(_L("SetAndSelectNetwork() invoked......\n")));
-//	User::WaitForRequest(Status);
-//	INFO_PRINTF1(_L("SetAndSelectNetwork() complete = %d\n")), Status.Int());
-//	}
-void CTestLtsyPhoneStepBase::GetNitzInfo()
-	{
-	TRequestStatus Status;
-	INFO_PRINTF1(_L("SetAndSelectNetwork() invoked......\n"));
-	RMobilePhone::TMobilePhoneNITZ NITZInfo;
-	iSharedPhone.GetNITZInfo(NITZInfo);
-	
-    User::After(15*1000*1000);
-	INFO_PRINTF1(_L("SetAndSelectNetwork() invoked......OK\n"));
-	
-	}
-void CTestLtsyPhoneStepBase::GetSignalStrength()
-	{
-	TRequestStatus Status;
-	INFO_PRINTF1(_L("GetSignalStrength() invoked......\n"));
-	TInt32 signalStrength;
-	TInt8 bars;
-
-	iSharedPhone.GetSignalStrength(Status, signalStrength, bars);
-	User::WaitForRequest(Status);
-	
-	if (Status==KErrNone)
-		{
-		INFO_PRINTF2(_L("Signal strength (in dBm) : %d\n"), signalStrength);
-		INFO_PRINTF2(_L("Signal strength (in display bars) : %d\n"), bars);
-		}
-	else
-		{
-		INFO_PRINTF2(_L("Signal strength, Error %d returned.\n"), Status.Int());
-		}
-		
-	User::After(3000000);		// Give user time to see the test results 
-	}
-void CTestLtsyPhoneStepBase::GetSignalCaps()
-	{
-	TRequestStatus Status;
-	INFO_PRINTF1(_L("GetSignalCaps() invoked......\n"));
-	// Signal Caps
-    TUint32 mmSignalCaps;
-	TInt retCap;
-	retCap = iSharedPhone.GetSignalCaps(mmSignalCaps);
-	if (retCap==KErrNotSupported)
-		{
-		INFO_PRINTF1(_L("Signal Capabilities NOT Supported\n"));		
-		}
-	else
-		{
-		INFO_PRINTF2(_L("Phone Signal Strength Caps = 0x%x\n"), mmSignalCaps);
-		if (mmSignalCaps & RMobilePhone::KCapsGetSignalStrength)
-			{
-			INFO_PRINTF1(_L("  Get Signal Strength Supported\n"));
-			}
-		if (mmSignalCaps & RMobilePhone::KCapsNotifySignalStrengthChange)
-			{
-			INFO_PRINTF1(_L("  Notify Signal Strength Supported\n"));
-			}
-		}
-	}
-void CTestLtsyPhoneStepBase::GetBatteryInfo()
-	{
-	TRequestStatus Status;
-	INFO_PRINTF1(_L("GetBatteryInfo() invoked......\n"));
-	RMobilePhone::TMobilePhoneBatteryInfoV1 battery;
-	iSharedPhone.GetBatteryInfo(Status, battery);
-	User::WaitForRequest(Status);
-	if (Status==KErrNone)
-		{
-		INFO_PRINTF2(_L("Battery status : %d\n"), battery.iStatus);
-		INFO_PRINTF2(_L("Battery charge level : %d\n"), battery.iChargeLevel);
-		}
-	else
-		{
-		INFO_PRINTF2(_L("Battery charge, Error %d returned.\n"), Status.Int());
-		}
-	}
-
-void CTestLtsyPhoneStepBase::GetSignalStrengthCancel()
-/** 
- * This method retrieves a phone's Signal and Battery Strength Information.
- */
-	{
-	TRequestStatus Status;
-	// Cancel Requests
-	INFO_PRINTF1(_L("GetSignalStrengthCancel() invoked......\n"));
-	TInt32 signalStrength;
-	TInt8 bars;
-	iSharedPhone.GetSignalStrength(Status, signalStrength, bars);
-	iSharedPhone.CancelAsyncRequest(EMobilePhoneGetSignalStrength);
-	User::WaitForRequest(Status);
-	INFO_PRINTF2(_L("GetSignalStrength Cancel status = %d\n\n"), Status.Int());
-	}
-
-/**
- * Notify signal strength change
- * 
- */
-void CTestLtsyPhoneStepBase::NotifySignalStrengthChange()
-	{
-	TRequestStatus reqStatus;
-	TInt32 signalStrength(0);
-	TInt8 bar(0);
-	TInt32 completeSignalStrength(70);
-	TInt8 completeBar(3);
-	SharedPhone().NotifySignalStrengthChange(reqStatus, signalStrength, bar);
-	User::WaitForRequest(reqStatus);
-	if(bar != completeBar)
-		{
-		ERR_PRINTF1(_L("bar is not expect."));
-		}
-	if(signalStrength != completeSignalStrength)
-		{
-		ERR_PRINTF1(_L("signalStrength is not expect."));
-		}
-	}
-void CTestLtsyPhoneStepBase::GetBatteryCaps()
-	{
-	TRequestStatus Status;
-	INFO_PRINTF1(_L("GetBatteryCaps() invoked......\n"));
-	// Battery Caps
-    TUint32 mmBatteryCaps;
-	TInt retCap;
-	retCap = iSharedPhone.GetBatteryCaps(mmBatteryCaps);
-
-	if (retCap==KErrNotSupported)
-		{
-		INFO_PRINTF1(_L("Battery Capabilities NOT Supported\n"));		
-		}
-	else
-		{
-		INFO_PRINTF2(_L("Phone Battery Caps = 0x%x\n"), mmBatteryCaps);
-		}
-	}
-void CTestLtsyPhoneStepBase::GetBatteryStrengthCancel()
-/** 
- * This method retrieves a phone's Signal and Battery Strength Information.
- */
-	{
-	TRequestStatus Status;
-	// Cancel Requests
-	INFO_PRINTF1(_L("GetBatteryStrengthCancel() invoked......\n"));
-	RMobilePhone::TMobilePhoneBatteryInfoV1 battery;
-
-	iSharedPhone.GetBatteryInfo(Status, battery);
-	iSharedPhone.CancelAsyncRequest(EMobilePhoneGetBatteryInfo);
-	User::WaitForRequest(Status);
-	INFO_PRINTF2(_L("GetBatteryInfo Cancel status = %d\n"), Status.Int());
-	}
-/**
- * 
- * Notify battery info change or not
- * 
- */
-void CTestLtsyPhoneStepBase::NotifyBatteryInfoChange()
-	{
-	TRequestStatus status;
-	RMobilePhone::TMobilePhoneBatteryInfoV1 batInfo;
-	TUint twentyCharge = 20;
-	iSharedPhone.NotifyBatteryInfoChange(status, batInfo);
-
-	User::WaitForRequest(status);
-	if(batInfo.iStatus != RMobilePhone::EBatteryConnectedButExternallyPowered)
-		{
-		INFO_PRINTF1(_L("Failed to Check Phone battery status."));
-		}
-	if(batInfo.iChargeLevel != twentyCharge)
-		{
-		INFO_PRINTF1(_L("Failed to Check Phone battery charge level."));
-		}
-	}
-//void CTestLtsyPhoneStepBase::GetCurrentSystemNetworkModes()
-//	{
-//	TRequestStatus Status;
-//	INFO_PRINTF1(_L("GetCellInfo() invoked......\n")));
-//	User::WaitForRequest(Status);
-//	INFO_PRINTF1(_L("GetCellInfo() complete = %d\n")), Status.Int());	
-//	}
-//void CTestLtsyPhoneStepBase::GetNetworkProviderName()
-//	{
-//	TRequestStatus Status;
-//	INFO_PRINTF1(_L("GetCellInfo() invoked......\n")));
-//	User::WaitForRequest(Status);
-//	INFO_PRINTF1(_L("GetCellInfo() complete = %d\n")), Status.Int());	
-//	}
-//void CTestLtsyPhoneStepBase::GetOperatorName()
-//	{
-//	TRequestStatus Status;
-//	INFO_PRINTF1(_L("GetCellInfo() invoked......\n")));
-//	User::WaitForRequest(Status);
-//	INFO_PRINTF1(_L("GetCellInfo() complete = %d\n")), Status.Int());	
-//	}
-void CTestLtsyPhoneStepBase::RegisterCellInfoChangeNotification()
-	{
-	TRequestStatus Status;
-	INFO_PRINTF1(_L("NotifyCellInfoChange() invoked......\n"));
-	RMobilePhone::TMobilePhoneCellInfoV9 phoneCellinfo1;
-	RMobilePhone::TMobilePhoneCellInfoV9Pckg Packaged1(phoneCellinfo1);
-	iSharedPhone.NotifyCellInfoChange(Status,Packaged1);
-	User::WaitForRequest(Status);
-	INFO_PRINTF2(_L("NotifyCellInfoChange() complete = %d\n"), Status.Int());
-	
-	}
-void CTestLtsyPhoneStepBase::GetCellInfo()
-	{
-	TRequestStatus Status;
-	RMobilePhone::TMobilePhoneCellInfoV9 phoneCellinfo;
-	RMobilePhone::TMobilePhoneCellInfoV9Pckg Packaged(phoneCellinfo);
-	
-	INFO_PRINTF1(_L("GetCellInfo() invoked......\n"));
-	iSharedPhone.GetCellInfo(Status,Packaged);
-	User::WaitForRequest(Status);
-	INFO_PRINTF2(_L("GetCellInfo() complete = %d\n"), Status.Int());	
-	}
-//void CTestLtsyPhoneStepBase::GetPhoneCellInfo()
-//	{
-//	}
-
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphonestorebase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-// 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:
-// 
-// 
-
-// user include
-#include "testltsyphonestorebase.h"
-#include "testltsyphonestoreshareddata.h"
-
-//const define
-_LIT16(KPhoneTSY, "phonetsy");
-
-// member functions
-
-/**
-* Constructor
-* 
-*/
-CTestLtsyPhoneStoreBase::CTestLtsyPhoneStoreBase(CTestLtsyModel& aTestModel)
-    : iModel(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyPhoneStoreBase::~CTestLtsyPhoneStoreBase()
-	{
-	
-	}
-
-TVerdict CTestLtsyPhoneStoreBase::doTestStepPreambleL()
-	{
-	OpenPhoneL();
-	if(TestStepResult() == EPass)
-		{		
-		
-		}
-	
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsyPhoneStoreBase::doTestStepPostambleL()
-	{
-
-	return TestStepResult();
-	}
-
-/**
- * Get the PhoneON object
- * 
- */
-RMobileONStore& CTestLtsyPhoneStoreBase::PhoneONStore()
-	{
-	return iModel.PhoneStoreSharedData().PhoneONStore();	
-	}
-
-/**
- * Get the Enstore object
- * 
- */
-RMobileENStore& CTestLtsyPhoneStoreBase::PhoneENStore()
-	{
-    return iModel.PhoneStoreSharedData().PhoneENStore();	
-	}
-
-/**
- * Get the PhoneBook store object
- * 
- */
-RMobilePhoneBookStore& CTestLtsyPhoneStoreBase::PhoneBookStore()
-	{
-	 return iModel.PhoneStoreSharedData().PhoneBookStore();	
-	}
-
-void CTestLtsyPhoneStoreBase::OpenPhoneL()
-	{
-	INFO_PRINTF1(_L("starting opne phone"));
-		
-	if (!iModel.SharedEnv().PhoneOpened())
-		{
-		iModel.SharedEnv().OpenPhoneL(KPhoneTSY);
-		}
-	}
-
-// end of file
-
-

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyphonestoreshareddata.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-// TestTelephonyPhoneStoreSharedData.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestTelephonyPhoneStoreSharedData
-
-// CTSY include
-
-// user include
-#include "TestLtsyPhoneStoreSharedData.h"
-
-/**
- * Constructor
- * 
- */
-CTestLtsyPhoneStoreSharedData::CTestLtsyPhoneStoreSharedData()
-	{
-	}
-
-/**
- * Factory function to create a new CTestTelephonySmsSharedData object
- * 
- */
-CTestLtsyPhoneStoreSharedData*CTestLtsyPhoneStoreSharedData::NewL()
-	{
-	CTestLtsyPhoneStoreSharedData* self = new (ELeave) CTestLtsyPhoneStoreSharedData();
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop();
-	return self;
-	}
-
-/**
- * Destructor
- * 
- */
-CTestLtsyPhoneStoreSharedData::~CTestLtsyPhoneStoreSharedData()
-	{
-	Reset();
-	}
-
-/**
- * ConstructL
- * 
- */
-void CTestLtsyPhoneStoreSharedData::ConstructL()
-	{
-	}
-
-/**
- * Delete all store objects
- * 
- */
-void CTestLtsyPhoneStoreSharedData::Reset()
-	{
-	iENStore.Close();
-	iONStore.Close();
-	iPhBkStore.Close();
-	}
-
-/**
- * return ENStore 
- * 
- */
-RMobileENStore& CTestLtsyPhoneStoreSharedData::PhoneENStore()
-	{
-	return iENStore;
-	}
-
-
-/**
- * return ONStore
- * 
- */
-RMobileONStore& CTestLtsyPhoneStoreSharedData::PhoneONStore()
-	{
-	return iONStore;
-	}
-
-/**
- * return PhoneBookStore
- * 
- */
-RMobilePhoneBookStore& CTestLtsyPhoneStoreSharedData::PhoneBookStore()
-	{
-	return iPhBkStore;
-	}
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktactivatecontext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// TestLtsyPktActivateContext.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktActivateContext
-
-// 	user include
-#include "TestLtsyPktActivateContext.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktActivateContext::CTestLtsyPktActivateContext(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktActivateContext::~CTestLtsyPktActivateContext()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktActivateContext::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GprsContextActivateTest());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktattachnetwork.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// TestLtsyPktAttachNetwork.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktAttachNetwork
-
-// 	user include
-#include "TestLtsyPktAttachNetwork.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktAttachNetwork::CTestLtsyPktAttachNetwork(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktAttachNetwork::~CTestLtsyPktAttachNetwork()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktAttachNetwork::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GprsContextAttachTest());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktclosecontext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-// TestLtsyPktCloseContext.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktCloseContext
-
-// 	user include
-#include "TestLtsyPktCloseContext.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktCloseContext::CTestLtsyPktCloseContext(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktCloseContext::~CTestLtsyPktCloseContext()
-	{
-	}
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktCloseContext::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-		CloseExistContext();
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktclosecontextqos.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-// TestLtsyPktCloseContextQos.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktCloseContextQos
-
-// 	user include
-#include "TestLtsyPktCloseContextQos.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktCloseContextQos::CTestLtsyPktCloseContextQos(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktCloseContextQos::~CTestLtsyPktCloseContextQos()
-	{
-	}
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktCloseContextQos::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	CloseExistContextQos();
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktclosepacket.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-//  TestLtsyPktClosePacket.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktClosePacket
-
-// user include
-
-#include "TestLtsyPktClosePacket.h"
-
-/**
-* Constructor
-* 
-*/
-CTestLtsyPktClosePacket::CTestLtsyPktClosePacket( CTestLtsyModel& aTestModel) 
-    :CTestLtsyPktTestStepBase(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyPktClosePacket::~CTestLtsyPktClosePacket()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktClosePacket::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-//		if (iModel.SharedEnv().PhoneOpened())
-//			{
-//			iModel.SharedEnv().ClosePhone();	
-//			}
-    	ClosePacketobject();
-		}
-	
-	return TestStepResult();
-	}
-
-	
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktdeactivatecontext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// TestLtsyPktDeactivateContext.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktDeactivateContext
-
-// 	user include
-#include "TestLtsyPktDeactivateContext.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktDeactivateContext::CTestLtsyPktDeactivateContext(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- * 
- */
-CTestLtsyPktDeactivateContext::~CTestLtsyPktDeactivateContext()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktDeactivateContext::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GprsContextDeactivateTest());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktdeletecontext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// TestLtsyPktDeleteContext.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktDeleteContext
-
-// 	user include
-#include "TestLtsyPktDeleteContext.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktDeleteContext::CTestLtsyPktDeleteContext(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	SetTestStepName(KTestLtsyPktDeleteContext);
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktDeleteContext::~CTestLtsyPktDeleteContext()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktDeleteContext::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GprsContextDeleteTest());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktdetachnetwork.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// TestLtsyPktDetachNetwork.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktDetachNetwork
-
-// 	user include
-#include "TestLtsyPktDetachNetwork.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktDetachNetwork::CTestLtsyPktDetachNetwork(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- * 
- */
-CTestLtsyPktDetachNetwork::~CTestLtsyPktDetachNetwork()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktDetachNetwork::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GprsContextDetachTest());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktgetcontextconfig.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// TestLtsyPktGetContextConfig.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktGetContextConfig
-
-// 	user include
-#include "TestLtsyPktGetContextConfig.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktGetContextConfig::CTestLtsyPktGetContextConfig(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	SetTestStepName(KTestLtsyPktGetContextConfig);
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktGetContextConfig::~CTestLtsyPktGetContextConfig()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktGetContextConfig::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GprsContextGetConfigTest());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktgetcontextinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// TestLtsyPktGetContextInfo.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktGetContextInfo
-
-// 	user include
-#include "TestLtsyPktGetContextInfo.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktGetContextInfo::CTestLtsyPktGetContextInfo(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktGetContextInfo::~CTestLtsyPktGetContextInfo()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktGetContextInfo::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,DisplayContextInfo());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktgetcontextqosprifile.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// TestLtsyPktGetContextQoSProfile.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktGetContextQoSProfile
-
-// 	user include
-#include "TestLtsyPktGetContextQoSProfile.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktGetContextQoSProfile::CTestLtsyPktGetContextQoSProfile(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	SetTestStepName(KTestLtsyPktGetContextQoSProfile);
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktGetContextQoSProfile::~CTestLtsyPktGetContextQoSProfile()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktGetContextQoSProfile::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GprsGetQoSProfileTest());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktgetcontextqosprofile.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// TestLtsyPktGetContextQoSProfile.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktGetContextQoSProfile
-
-// 	user include
-#include "TestLtsyPktGetContextQoSProfile.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktGetContextQoSProfile::CTestLtsyPktGetContextQoSProfile(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	SetTestStepName(KTestLtsyPktGetContextQoSProfile);
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktGetContextQoSProfile::~CTestLtsyPktGetContextQoSProfile()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktGetContextQoSProfile::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GprsGetQoSProfileTest());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktgetdefaultparams.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// TestLtsyPktGetDefaultParams.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktGetDefaultParams
-
-// 	user include
-#include "TestLtsyPktGetDefaultParams.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktGetDefaultParams::CTestLtsyPktGetDefaultParams(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	SetTestStepName(KTestLtsyPktGetDefaultParams);
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktGetDefaultParams::~CTestLtsyPktGetDefaultParams()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktGetDefaultParams::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GprsGetDefaultContextParamsTest());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktgetdynamiccapabilities.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-// TestLtsyPktGetDynamicCapabilities.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktGetDynamicCapabilities
-
-// 	user include
-#include "TestLtsyPktGetDynamicCapabilities.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktGetDynamicCapabilities::CTestLtsyPktGetDynamicCapabilities(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktGetDynamicCapabilities::~CTestLtsyPktGetDynamicCapabilities()
-	{
-	}
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktGetDynamicCapabilities::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-		TRAPD(err,DisplayDynamicCapabilities());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktgetnwkregistrationstatus.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// testltsypktgetnwkregistrationstatus.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktNetworkRegistrationStatus
-
-// 	user include
-#include "testltsypktgetnwkregistrationstatus.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktNetworkRegistrationStatus::CTestLtsyPktNetworkRegistrationStatus(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	SetTestStepName(KTestLtsyPktNetworkRegistrationStatus);
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktNetworkRegistrationStatus::~CTestLtsyPktNetworkRegistrationStatus()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktNetworkRegistrationStatus::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,DisplayNetworkRegistrationStatus());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktgetservicestatus.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// TestLtsyPktGetServiceStatus.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktGetServiceStatus
-
-// 	user include
-#include "testltsypktgetservicestatus.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktGetServiceStatus::CTestLtsyPktGetServiceStatus(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktGetServiceStatus::~CTestLtsyPktGetServiceStatus()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktGetServiceStatus::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,DisplayPacketServiceStatus());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktgetstaticcapabilities.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-// TestLtsyPktGetStaticCapabilities.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktGetStaticCapabilities
-
-// 	user include
-#include "TestLtsyPktGetStaticCapabilities.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktGetStaticCapabilities::CTestLtsyPktGetStaticCapabilities(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktGetStaticCapabilities::~CTestLtsyPktGetStaticCapabilities()
-	{
-	}
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktGetStaticCapabilities::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-		TRAPD(err,DisplayStaticCapabilities());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktinitialsecontext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-// TestLtsyPktInitialiseContext.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktInitialiseContext
-
-// 	user include
-#include "testltsypktinitialisecontext.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktInitialiseContext::CTestLtsyPktInitialiseContext(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktInitialiseContext::~CTestLtsyPktInitialiseContext()
-	{
-	}
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktInitialiseContext::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GprsInitialiseContext());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktopencontext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-// TestLtsyPktOpenContext.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktOpenContext
-
-// 	user include
-#include "TestLtsyPktOpenContext.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktOpenContext::CTestLtsyPktOpenContext(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktOpenContext::~CTestLtsyPktOpenContext()
-	{
-	}
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktOpenContext::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-		if (!IsOpenedPktService())
-			{
-			OpenPacketobject();
-			}
-    	TRAPD(err,OpenNewContext());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktopencontextqos.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-// TestLtsyPktOpenContextQos.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktOpenContextQos
-
-// 	user include
-#include "TestLtsyPktOpenContextQos.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktOpenContextQos::CTestLtsyPktOpenContextQos(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktOpenContextQos::~CTestLtsyPktOpenContextQos()
-	{
-	}
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktOpenContextQos::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,OpenNewContextQos());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktopenpacket.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-//  TestLtsyPktOpenPPacket.cpp
-//  Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-//  Implementation of the Class CTestLtsyPktOpenPacket
-
-// user include
-
-#include "TestLtsyPktOpenPacket.h"
-_LIT(KTsyModuleName, "PhoneTsy");
-/**
-* Constructor
-* 
-*/
-CTestLtsyPktOpenPacket::CTestLtsyPktOpenPacket( CTestLtsyModel& aTestModel) 
-    :CTestLtsyPktTestStepBase(aTestModel)
-	{
-	}
-
-/**
-* Destructor
-*
-*/	
-CTestLtsyPktOpenPacket::~CTestLtsyPktOpenPacket()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktOpenPacket::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-		if (!iModel.SharedEnv().PhoneOpened())
-			{
-			iModel.SharedEnv().OpenPhoneL(KTsyModuleName);
-			}
-    	TRAPD(err,OpenPacketobject());
-    	if(err != KErrNone)
-    		{
-    		ERR_PRINTF2(_L("The error was returned %d!! when open Phone"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	
-	return TestStepResult();
-	}
-
-	
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktsetcontextconfig.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// TestLtsyPktSetContextConfig.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktSetContextConfig
-
-// 	user include
-#include "TestLtsyPktSetContextConfig.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktSetContextConfig::CTestLtsyPktSetContextConfig(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	SetTestStepName(KTestLtsyPktSetContextConfig);
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktSetContextConfig::~CTestLtsyPktSetContextConfig()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktSetContextConfig::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GprsContextSetConfigTest());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktsetcontextqosprofile.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// TestLtsyPktSetContextQoSProfile.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktSetContextQoSProfile
-
-// 	user include
-#include "TestLtsyPktSetContextQoSProfile.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktSetContextQoSProfile::CTestLtsyPktSetContextQoSProfile(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	SetTestStepName(KTestLtsyPktSetContextQoSProfile);
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktSetContextQoSProfile::~CTestLtsyPktSetContextQoSProfile()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktSetContextQoSProfile::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GprsSetQoSProfileTest());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktsetdefaultparams.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-// CTestLtsyPktSetDefaultParams.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestLtsyPktSetDefaultParams
-
-// 	user include
-#include "TestLtsyPktSetDefaultParams.h"
-
-/**
- * Constructor
- */
-CTestLtsyPktSetDefaultParams::CTestLtsyPktSetDefaultParams(CTestLtsyModel& aModel)
-	:CTestLtsyPktTestStepBase(aModel)
-	{
-	SetTestStepName(KTestLtsyPktSetDefaultParams);
-	}
-
-/**
- * Destructor
- */
-CTestLtsyPktSetDefaultParams::~CTestLtsyPktSetDefaultParams()
-	{
-	}
-
-/**
- * It implements the required functionality of the test step.
- * This step will open a shared phone
- * @return TVerdict - result of the test step
- * @leave - System wide error codes
- */
-TVerdict CTestLtsyPktSetDefaultParams::doTestStepL()
-	{
-	if(TestStepResult() == EPass)
-		{
-    	TRAPD(err,GprsSetDefaultContextParamsTest());
-    	if(err != KErrNone)
-    		{
-    		INFO_PRINTF2(_L("The error was returned %d!! when open Context"),err);
-    	    SetTestStepResult(EFail);
-    		}
-		}
-	return TestStepResult();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktshareddata.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-// TestTelephonyPktSharedData.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestTelephonyPktSharedData
-
-// user include
-#include "TestLtsyPktSharedData.h"
-
-/**
- * Factory function
- */
-CTestLtsyPktSharedData* CTestLtsyPktSharedData::NewL()
-	{
-	CTestLtsyPktSharedData* ret = new(ELeave) CTestLtsyPktSharedData();
-	CleanupStack::PushL(ret);
-	ret->ConstructL();
-	CleanupStack::Pop(ret);
-	
-	return ret;
-	}
-
-/**
- * Constructor
- * 
- * @param CTestStep& aTestStep The test step used for logging and reading info from ini
- * @param CTestTelephonyTsyAdaptor& aTestEnvAdaptor The telephony tsy adaptor
- */
-CTestLtsyPktSharedData::CTestLtsyPktSharedData()
-	{
-	}
-
-/**
- * Destructor
- * 
- */
-CTestLtsyPktSharedData::~CTestLtsyPktSharedData()
-	{
-	}
-
-
-/**
- * ConstructL
- * 
- */
-void CTestLtsyPktSharedData::ConstructL()
-	{
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsypktteststepbase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1114 +0,0 @@
-// TestTelephonyPktTestStepBase.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestTelephonyPktTestStepBase
-
-// 	user include
-#include "TestLtsyPktTestStepBase.h"
-#include "te_integration_stltsysuitestepbase.h"
-#include "te_integration_stltsysuitedefs.h"
-
-_LIT8(KName, "internet");
-/**
- * Constructor
- */
-CTestLtsyPktTestStepBase::CTestLtsyPktTestStepBase(CTestLtsyModel& aModel)
-	:iModel(aModel),iSharedPhone(aModel.SharedEnv().Phone())
-	{
-	}
-
-/**
- * Destructor
- * 
- */
-CTestLtsyPktTestStepBase::~CTestLtsyPktTestStepBase()
-	{
-
-	}
-
-TVerdict CTestLtsyPktTestStepBase::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPktTestStepBase::doTestStepPreambleL()."));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-TVerdict CTestLtsyPktTestStepBase::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsyPktTestStepBase::doTestStepPostambleL()"));
-	return TestStepResult();
-	}
-
-/**
- * Get the shared phone
- * 
- */
-RMobilePhone& CTestLtsyPktTestStepBase::SharedPhone() 
-	{
-	return iSharedPhone;
-	}
-/**
- * Check if the RPacketService has been opened
- * @return - the result
- */
-TBool CTestLtsyPktTestStepBase::IsOpenedPktService()
-	{
-	return (NULL != iModel.PktSharedData().iPacket.SubSessionHandle());
-	}
-void CTestLtsyPktTestStepBase::OpenPacketobject()
-	{
-	TInt           returnStatus;
-	INFO_PRINTF1(_L("Close packet\n"));
-	// Open Packet object
-	iModel.PktSharedData().iPacket.Close();
-	INFO_PRINTF1(_L("packet closeed \n"));
-	INFO_PRINTF1(_L("To open Packet Object\n"));
-
-	returnStatus = iModel.PktSharedData().iPacket.Open(iModel.SharedEnv().Phone());
-	if(returnStatus == KErrNone)
-		{
-		INFO_PRINTF1(_L("packet opened \n"));
-		}
-	else
-		{
-		INFO_PRINTF1(_L("Opened packet error\n"));
-		INFO_PRINTF2(_L("Opened packet error = %d\n"), returnStatus);
-		}
-	}
-void CTestLtsyPktTestStepBase::ClosePacketobject()
-	{
-	INFO_PRINTF1(_L("Close packet\n"));
-	User::After(1000000);
-	iModel.PktSharedData().iPacket.Close();
-	INFO_PRINTF1(_L("packet closeed \n"));
-	}
-void CTestLtsyPktTestStepBase::DisplayPacketServiceStatus()
-/**
- * Test the TSY's functionality to retrieve the packet service status.
- */
-	{
-	TInt returnStatus = iModel.PktSharedData().iPacket.GetStatus(iModel.PktSharedData().iPacketStatus);
-	if(returnStatus==KErrNone)
-		{
-		switch (iModel.PktSharedData().iPacketStatus)
-			{
-			case RPacketService::EStatusUnattached:
-				INFO_PRINTF1(_L("Packet Service status = Unattached\n"));
-				break;
-			case RPacketService::EStatusAttached:
-				INFO_PRINTF1(_L("Packet Service status = Attached\n"));
-				break;
-			case RPacketService::EStatusActive:
-				INFO_PRINTF1(_L("Packet Service status = Active\n"));
-				break;
-			case RPacketService::EStatusSuspended:
-				INFO_PRINTF1(_L("Packet Service status = Suspended\n"));
-				break;
-			default:
-				INFO_PRINTF1(_L("Packet Service error\n"));
-				break;
-			}
-		}
-	else
-		{
-		INFO_PRINTF1(_L("Packet Service error\n"));
-		}
-	}
-
-void CTestLtsyPktTestStepBase::GprsNetWorkTest()
-	{
-	INFO_PRINTF1(_L("Open Packet Object"));
-
-	TInt           returnStatus;
-	TRequestStatus requestStatus;
-	INFO_PRINTF1(_L("Close packet\n"));
-	// Open Packet object
-	iModel.PktSharedData().iPacket.Close();
-	INFO_PRINTF1(_L("packet closeed \n"));
-	INFO_PRINTF1(_L("To open Packet Object\n"));
-	returnStatus = iModel.PktSharedData().iPacket.Open(iSharedPhone);
-	if(returnStatus == KErrNone)
-		{
-		INFO_PRINTF1(_L("packet opened \n"));
-		}
-	else
-		{
-		INFO_PRINTF1(_L("Opened packet error\n"));
-		}
-	requestStatus = KErrNone;
-	INFO_PRINTF1((_L("RPacket::GetNtwkRegStatus() invoked...\n")));
-	iModel.PktSharedData().iPacket.GetNtwkRegStatus(requestStatus, iModel.PktSharedData().iRegistrationStatus);
-	User::WaitForRequest(requestStatus);
-	
-	if(requestStatus == KErrNone)
-		{
-		switch (iModel.PktSharedData().iRegistrationStatus)
-			{
-			case RPacketService::ENotRegisteredNotSearching:
-				INFO_PRINTF1(_L("Netw Reg status = Not Registered Not Searching\n"));
-				break;
-			case RPacketService::ERegisteredOnHomeNetwork:
-				INFO_PRINTF1(_L("Netw Reg status = Registered On Home Network\n"));
-				break;
-			case RPacketService::ENotRegisteredSearching:
-				INFO_PRINTF1(_L("Netw Reg status = Not Registered Searching\n"));
-				break;
-			case RPacketService::ERegistrationDenied:
-				INFO_PRINTF1(_L("Netw Reg status = Registration Denied\n"));
-				break;
-			case RPacketService::EUnknown:
-				INFO_PRINTF1(_L("Netw Reg status = Unknown\n"));
-				break;
-			case RPacketService::ERegisteredRoaming:
-				INFO_PRINTF1(_L("Netw Reg status = RegisteredRoaming\n"));
-				break;
-			case RPacketService::ENotRegisteredButAvailable:
-				INFO_PRINTF1(_L("Netw Reg status = Not Registered But Available\n"));
-				break;
-			case RPacketService::ENotRegisteredAndNotAvailable:
-				INFO_PRINTF1(_L("Netw Reg status = Not Registered And Not Available\n"));
-				break;
-			default:
-				INFO_PRINTF1(_L("Network Registration Status Error\n"));
-				break;
-			}
-		}
-	else
-		{
-		INFO_PRINTF1(_L("Network Registration Status Error\n"));
-		}
-	iModel.PktSharedData().iPacket.Close();
-	}
-void CTestLtsyPktTestStepBase::DisplayNetworkRegistrationStatus()
-/**
- * Test the TSY's functionality to retrieve the network registration status.
- */
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1((_L("RPacket::GetNtwkRegStatus() invoked...\n")));
-	iModel.PktSharedData().iPacket.GetNtwkRegStatus(requestStatus, iModel.PktSharedData().iRegistrationStatus);
-	User::WaitForRequest(requestStatus);
-	
-	if(requestStatus == KErrNone)
-		{
-		switch (iModel.PktSharedData().iRegistrationStatus)
-			{
-			case RPacketService::ENotRegisteredNotSearching:
-				INFO_PRINTF1(_L("Netw Reg status = Not Registered Not Searching\n"));
-				break;
-			case RPacketService::ERegisteredOnHomeNetwork:
-				INFO_PRINTF1(_L("Netw Reg status = Registered On Home Network\n"));
-				break;
-			case RPacketService::ENotRegisteredSearching:
-				INFO_PRINTF1(_L("Netw Reg status = Not Registered Searching\n"));
-				break;
-			case RPacketService::ERegistrationDenied:
-				INFO_PRINTF1(_L("Netw Reg status = Registration Denied\n"));
-				break;
-			case RPacketService::EUnknown:
-				INFO_PRINTF1(_L("Netw Reg status = Unknown\n"));
-				break;
-			case RPacketService::ERegisteredRoaming:
-				INFO_PRINTF1(_L("Netw Reg status = RegisteredRoaming\n"));
-				break;
-			case RPacketService::ENotRegisteredButAvailable:
-				INFO_PRINTF1(_L("Netw Reg status = Not Registered But Available\n"));
-				break;
-			case RPacketService::ENotRegisteredAndNotAvailable:
-				INFO_PRINTF1(_L("Netw Reg status = Not Registered And Not Available\n"));
-				break;
-			default:
-				INFO_PRINTF1(_L("Network Registration Status Error\n"));
-				break;
-			}
-		}
-	else
-		{
-		INFO_PRINTF1(_L("Network Registration Status Error\n"));
-		}
-	}
-
-void CTestLtsyPktTestStepBase::DisplayContextInfo()
-/**
- * Test the TSY's functionality to retrieve the packet context information
- * using the packet service object.
- */
-	{
-	// Enumerate Contexts & Get Context Info
-	INFO_PRINTF1(_L("Display the packet context information\n"));
-
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketService::EnumerateContexts() invoked....\n"));
-	iModel.PktSharedData().iPacket.EnumerateContexts(requestStatus, iModel.PktSharedData().iNumContexts, iModel.PktSharedData().iMaxContextsAllowed);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketService::EnumerateContexts() completed %d\n"), requestStatus.Int());
-	INFO_PRINTF2(_L("Number of Contexts   = %d\n"), iModel.PktSharedData().iNumContexts);
-	INFO_PRINTF2(_L("Max Contexts Allowed = %d\n"), iModel.PktSharedData().iMaxContextsAllowed);
-
-	requestStatus = KErrNone;
-	INFO_PRINTF1(_L("Sync RPacket::GetContextInfo() invoked...\n"));
-	iModel.PktSharedData().iPacket.GetContextInfo(requestStatus, 0, iModel.PktSharedData().iContextInfo);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("Sync RPacket::GetContextInfo() completed %d\n"), requestStatus.Int());
-	if (requestStatus == KErrNone)
-		{
-		INFO_PRINTF2(_L("Context Name   = %S\n"), &iModel.PktSharedData().iContextInfo.iName);
-		DisplayContextStatus(iModel.PktSharedData().iContextInfo.iStatus);
-		}
-
-
-/********************************************************************
-	console->Printf(TRefByValue<const TDesC>(_L("Execute Async RPacket::GetContextInfo()\n")));
-	TRequestStatus requestStatus;
-	iPacket.GetContextInfo(requestStatus, 0, iContextInfo2);
-	User::WaitForRequest(requestStatus);
-	console->Printf(TRefByValue<const TDesC>(_L("RPacketService::GetContextInfo() ret = %d\n")), requestStatus);
-	if (requestStatus == KErrNone)
-		{
-		console->Printf(TRefByValue<const TDesC>(_L("Context Name   = %S\n")), iContextInfo2.iName);
-		console->Printf(TRefByValue<const TDesC>(_L("Context Status = %d\n")), iContextInfo2.iStatus);
-		}
-*********************************************************************/
-	}
-
-
-void CTestLtsyPktTestStepBase::DisplayContextStatus(RPacketContext::TContextStatus aContextStatus)
-	{
-	switch (aContextStatus)
-		{
-		case RPacketContext::EStatusUnknown:
-			INFO_PRINTF1(_L("Context Status = Unknown\n"));
-			break;
-		case RPacketContext::EStatusInactive:
-			INFO_PRINTF1(_L("Context Status = Inactive\n"));
-			break;
-		case RPacketContext::EStatusActivating:
-			INFO_PRINTF1(_L("Context Status = Activating\n"));
-			break;
-		case RPacketContext::EStatusActive:
-			INFO_PRINTF1(_L("Context Status = Active\n"));
-			break;
-		case RPacketContext::EStatusDeactivating:
-			INFO_PRINTF1(_L("Context Status = Deactivating\n"));
-			break;
-		case RPacketContext::EStatusSuspended:
-			INFO_PRINTF1(_L("Context Status = Suspended\n"));
-			break;
-		case RPacketContext::EStatusDeleted:
-			INFO_PRINTF1(_L("Context Status = Deleted\n"));
-			break;
-		default:
-			INFO_PRINTF1(_L("Error - Context Status\n"));
-			break;
-		}
-	}
-
-
-void CTestLtsyPktTestStepBase::DisplayContextStatus(RPacketContext& aContext, RPacketContext::TContextStatus& aContextStatus)
-	{
-	TRequestStatus returnStatus = aContext.GetStatus(aContextStatus);
-	if(returnStatus == KErrNone)
-		{
-		INFO_PRINTF1(_L("RPacketContext::GetStatus() OK\n"));
-		}
-	else
-		{
-		INFO_PRINTF1(_L("Error - Context Status\n"));
-		}
-	DisplayContextStatus(aContextStatus);
-	}
-
-void  CTestLtsyPktTestStepBase::GprsContextAttachTest()
-	{
-	INFO_PRINTF1(_L("GprsContextAttachTest\n"));
-	TRequestStatus requestStatus = KErrNone;
-	iModel.PktSharedData().iPacket.Attach(requestStatus);
-	User::WaitForRequest(requestStatus);
-	if(requestStatus == KErrNone)
-		{
-		INFO_PRINTF1(_L("GprsContextAttachTest OK \n"));
-		}
-	else
-		{
-		INFO_PRINTF1(_L("GprsContextAttachTest Error\n"));
-		INFO_PRINTF2(_L("GprsContextAttachTest Error = %d\n"), requestStatus.Int());
-		}
-
-	}
-void  CTestLtsyPktTestStepBase::GprsContextDetachTest()
-	{
-	INFO_PRINTF1(_L("GprsContextDetachTest\n"));
-	TRequestStatus requestStatus = KErrNone;
-	iModel.PktSharedData().iPacket.Detach(requestStatus);
-	User::WaitForRequest(requestStatus);
-	if(requestStatus == KErrNone)
-		{
-		INFO_PRINTF1(_L("GprsContextDetachTest OK \n"));
-		}
-	else
-		{
-		INFO_PRINTF1(_L("GprsContextDetachTest Error\n"));
-		INFO_PRINTF2(_L("GprsContextDetachTest Error = %d\n"), requestStatus.Int());
-		}
-
-	}
-void  CTestLtsyPktTestStepBase::DisplayStaticCapabilities()
-	{
-	// Static Capabilities
-	TRequestStatus returnStatus = KErrNone;
-	returnStatus = iModel.PktSharedData().iPacket.GetStaticCaps(iModel.PktSharedData().iStaticCaps, RPacketContext::EPdpTypeCDPD);
-	INFO_PRINTF2(_L("RPacketService::GetStaticCaps() ret = %d\n"), returnStatus.Int());
-	INFO_PRINTF2(_L("Static Caps = %d\n"), iModel.PktSharedData().iStaticCaps);
-	INFO_PRINTF2(_L("Static Caps = %xH\n"), iModel.PktSharedData().iStaticCaps);
-	}
-void  CTestLtsyPktTestStepBase::DisplayDynamicCapabilities()
-	{
-	// Dynamic Capabilities
-	TRequestStatus returnStatus = KErrNone;
-	returnStatus = iModel.PktSharedData().iPacket.GetDynamicCaps(iModel.PktSharedData().iDynamicCaps);
-	INFO_PRINTF2(_L("RPacketService::GetDynamicCaps() ret = %d\n"), returnStatus.Int());
-	INFO_PRINTF2(_L("Dynamic Caps = %d\n"), iModel.PktSharedData().iDynamicCaps);
-	INFO_PRINTF2(_L("Dynamic Caps = %xH\n"), iModel.PktSharedData().iDynamicCaps);
-	}
-
-void  CTestLtsyPktTestStepBase::GprsGetDefaultContextParamsTest()
-	{
-	TRequestStatus reqStatusContextParams = KErrNone;
-	RPacketContext::TContextConfigGPRS contextConfig01;
-	TPckg<RPacketContext::TContextConfigGPRS> contextConfigPckg01(contextConfig01);
-	INFO_PRINTF1(_L("RPacketContext::GetDefaultContextParams() invoked...\n"));
-	iModel.PktSharedData().iPacket.GetDefaultContextParams(reqStatusContextParams, contextConfigPckg01);
-	User::WaitForRequest(reqStatusContextParams);
-	if(reqStatusContextParams == KErrNone)
-		{
-		INFO_PRINTF1(_L("RPacketContext::GetDefaultContextParams() complete\n"));
-		}
-	else
-		{
-		INFO_PRINTF1(_L("RPacketContext::GetDefaultContextParams() Error\n"));
-		INFO_PRINTF2(_L("RPacketService::GprsgetDefaultContextParamsTest() completed %d\n"), reqStatusContextParams.Int());
-		}
-	}
-void  CTestLtsyPktTestStepBase::GprsSetDefaultContextParamsTest()
-	{
-	// Set Context Config
-	TRequestStatus reqStatusContextParams = KErrNone;
-	RPacketContext::TContextConfigGPRS contextConfig02;
-	//contextConfig2.iServiceOption = RPacketContext::KLowSpeedData;
-	contextConfig02.iPdpType  = RPacketContext::EPdpTypeIPv6;
-	TPckg<RPacketContext::TContextConfigGPRS> contextConfigPckg02(contextConfig02);
-	INFO_PRINTF1(_L("RPacketContext::SetDefaultContextParams() invoked...\n"));
-	iModel.PktSharedData().iPacket.SetDefaultContextParams(reqStatusContextParams, contextConfigPckg02);
-	User::WaitForRequest(reqStatusContextParams);
-	if(reqStatusContextParams == KErrNone)
-		{
-		INFO_PRINTF1(_L("RPacketContext::GprsContextSetConfigTest() complete\n"));
-		}
-	else
-		{
-		INFO_PRINTF1(_L("RPacketContext::GprsContextSetConfigTest() Error\n"));
-		INFO_PRINTF2(_L("RPacketService::GprsSetDefaultContextParamsTest() completed %d\n"), reqStatusContextParams.Int());
-		}
-	}
-void  CTestLtsyPktTestStepBase::GprsContextActivateTest()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketContext::Activate() invoked...\n"));
-	iModel.PktSharedData().iContext1.Activate(requestStatus);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::Activate() completed %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsContextDeactivateTest()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketContext::Deactivate() invoked...\n"));
-	iModel.PktSharedData().iContext1.Deactivate(requestStatus);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::Deactivate() completed %d\n"), requestStatus.Int());
-	}
-
-void CTestLtsyPktTestStepBase::GprsContextSetConfigTest()
-	{
-	// Set Context Config
-	TRequestStatus reqStatusContextConfig = KErrNone;
-	RPacketContext::TContextConfigGPRS contextConfig2;
-	//contextConfig2.iServiceOption = RPacketContext::KLowSpeedData;
-	contextConfig2.iPdpType  = RPacketContext::EPdpTypeIPv6;
-	contextConfig2.iAccessPointName = KName;
-	//contextConfig2.iPdpAddress = ;
-	TPckg<RPacketContext::TContextConfigGPRS> contextConfigPckg2(contextConfig2);
-	INFO_PRINTF1(_L("RPacketContext::SetConfig() invoked...\n"));
-	iModel.PktSharedData().iContext1.SetConfig(reqStatusContextConfig, contextConfigPckg2);
-	User::WaitForRequest(reqStatusContextConfig);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig() complete = %d\n"), reqStatusContextConfig.Int());
-	}
-
-void CTestLtsyPktTestStepBase::GprsContextGetConfigTest()
-	{
-	TRequestStatus reqStatusContextConfig = KErrNone;
-	RPacketContext::TContextConfigGPRS contextConfig3;
-	TPckg<RPacketContext::TContextConfigGPRS> contextConfigPckg3(contextConfig3);
-	INFO_PRINTF1(_L("RPacketContext::GetConfig() invoked...\n"));
-	iModel.PktSharedData().iContext1.GetConfig(reqStatusContextConfig, contextConfigPckg3);
-	User::WaitForRequest(reqStatusContextConfig);
-	INFO_PRINTF2(_L("RPacketContext::GetConfig() complete = %d\n"), reqStatusContextConfig.Int());
-	contextConfig3 = contextConfigPckg3();
-	}
-void CTestLtsyPktTestStepBase::NotificationContextAddedCancel()
-	{
-	TName contextAddedContextId;
-	TRequestStatus reqStatusContextAdded = KErrNone;
-	INFO_PRINTF1(_L("Test Notify Context Added Cancel\n"));
-	iModel.PktSharedData().iPacket.NotifyContextAdded(reqStatusContextAdded, contextAddedContextId);
-	iModel.PktSharedData().iPacket.CancelAsyncRequest(EPacketNotifyContextAdded);
-	User::WaitForRequest(reqStatusContextAdded);
-	if (reqStatusContextAdded == KErrCancel)
-		{
-		INFO_PRINTF1(_L("Notify Context Added is KErrCancel\n"));
-		}
-	else 
-		{
-		INFO_PRINTF1(_L("Error - Notify Context Added status\n"));
-		INFO_PRINTF2(_L("Error - Notify Context Added status = %d\n"), reqStatusContextAdded.Int());
-		}
-	}
-void CTestLtsyPktTestStepBase::NotificationContextAdded()
-	{
-	TName contextAddedContextId;
-	TRequestStatus reqStatusContextAdded = KErrNone;
-	// Notify Context Added
-	reqStatusContextAdded = KErrNone;
-	contextAddedContextId = _L("ABCDEFGHIJKLMNOP");
-	iModel.PktSharedData().iPacket.NotifyContextAdded(reqStatusContextAdded, contextAddedContextId);
-	if (reqStatusContextAdded == KRequestPending)
-		{
-		INFO_PRINTF1(_L("Notify Context Added is KRequestPending\n"));
-		}
-	else
-		{
-		INFO_PRINTF1(_L("Notify Context Added request status\n"));
-		INFO_PRINTF2(_L("Error - Notify Context Added status = %d\n"), reqStatusContextAdded.Int());
-		}
-	}
-void CTestLtsyPktTestStepBase::OpenNewContext()
-	{
-	TInt returnStatus;
-	// check if the slot is free to open
-	if (NULL != iModel.PktSharedData().iContext1.SubSessionHandle())
-		{
-		ERR_PRINTF1(_L("Can't open the packet context before it's closed, aborting..."));
-		}
-	else
-		{
-	    returnStatus = iModel.PktSharedData().iContext1.OpenNewContext(iModel.PktSharedData().iPacket, iModel.PktSharedData().iContextName);
-		if (KErrNone != returnStatus)
-			{
-			INFO_PRINTF2(_L("RPacketContext::OpenNewContext() ret = %d\n"), returnStatus);
-			}
-	    INFO_PRINTF2(_L("RPacketContext::OpenNewContext() ret = %d\n"), returnStatus);
-	    INFO_PRINTF2(_L("Context Name = %S\n"), &iModel.PktSharedData().iContextName);
-		}
-	}
-void CTestLtsyPktTestStepBase::OpenExistingContext()
-	{
-	// Open an existing context
-	TInt returnStatus;
-	returnStatus = iModel.PktSharedData().iContext3.OpenExistingContext(iModel.PktSharedData().iPacket, iModel.PktSharedData().iContextName);
-	INFO_PRINTF2(_L("RPacketContext::OpenExistingContext() ret = %d\n"), returnStatus);
-	INFO_PRINTF2(_L("Context3 Name = %S\n"), &iModel.PktSharedData().iContextName);
-	}
-void CTestLtsyPktTestStepBase::OpenContextUsingUnknownName()
-
-{
-	// Attempt to open a Context using an unknown name
-	TInt returnStatus;
-	TName bogusContextName;
-	bogusContextName.Append(_L("Context"));
-	bogusContextName.AppendNum(10);
-	returnStatus = iModel.PktSharedData().iContext2.OpenExistingContext(iModel.PktSharedData().iPacket, bogusContextName);
-	INFO_PRINTF2(_L("RPacketContext::OpenExistingContext() returnStatus = %d\n"), returnStatus);
-}
-void CTestLtsyPktTestStepBase::CloseExistContext()
-	{
-	// Close Exist Context
-	User::After(1000000);
-	INFO_PRINTF1(_L("CloseExistContext() invoked...\n"));
-	iModel.PktSharedData().iContext1.Close();
-	INFO_PRINTF1(_L("CloseExistContext() OK...\n"));
-	}
-void CTestLtsyPktTestStepBase::GprsInitialiseContext()
-	{
-	TRequestStatus requestStatusInit = KErrNone;
-	INFO_PRINTF1(_L("RPacketContext::InitialiseContext() invoked...\n"));
-    RPacketContext::TDataChannelV2 dataChannel;
-    TPckg<RPacketContext::TDataChannelV2> dataChannelPckg(dataChannel);
-	//iContext1.LoanCommPort(requestStatusLoanCommPort, commPort);
-    iModel.PktSharedData().iContext1.InitialiseContext(requestStatusInit,dataChannelPckg);
-	User::WaitForRequest(requestStatusInit);
-	INFO_PRINTF2(_L("RPacketContext::InitialiseContext() completed %d \n"), requestStatusInit.Int());
-	}
-
-void CTestLtsyPktTestStepBase::NotificationContextStatusChangeCancel()
-	{
-	// cancel the context status change notification request
-	TRequestStatus requestStatusContextStatusChange;
-	INFO_PRINTF1(_L("RPacketContext::NotifyStatusChangeCancel() invoked...\n"));
-	iModel.PktSharedData().iContext1.CancelAsyncRequest(EPacketContextNotifyStatusChange);
-	User::WaitForRequest(requestStatusContextStatusChange);
-	if (requestStatusContextStatusChange == KErrCancel)
-		{
-		INFO_PRINTF1(_L("Notify Context Status Change is KErrCancel\n"));
-		}
-	else
-		{
-		INFO_PRINTF2(_L("Error - Notify Context Status Change status  = %d\n"), requestStatusContextStatusChange.Int());
-		}
-	}
-
-void CTestLtsyPktTestStepBase::NotificationContextStatusChange()
-	{
-	// request notification when context status changes
-	INFO_PRINTF1(_L("RPacketContext::NotifyStatusChange() invoked...\n"));
-	TRequestStatus requestStatusContextStatusChange;
-	RPacketContext::TContextStatus newContextStatus;
-	iModel.PktSharedData().iContext1.NotifyStatusChange(requestStatusContextStatusChange, newContextStatus);
-	if (requestStatusContextStatusChange == KErrNone)
-		{
-		INFO_PRINTF1(_L("Context Status Changed\n"));
-		}
-	else
-		{
-		INFO_PRINTF2(_L("Error - Notify Context Status Change status  = %d\n"), requestStatusContextStatusChange.Int());
-		}
-	}
-void CTestLtsyPktTestStepBase::OpenNewContextQos()
-	{
-	// Create QoS
-	TInt returnStatus;
-	INFO_PRINTF1(_L("OpenNewQoS() invoked...\n"));
-	returnStatus = iModel.PktSharedData().iQoS.OpenNewQoS(iModel.PktSharedData().iContext1, iModel.PktSharedData().iQoSName);
-	INFO_PRINTF2(_L("RPacketQoS::OpenNewQoS() ret = %d\n"), returnStatus);
-	INFO_PRINTF2(_L("Context Name = %S\n"), &iModel.PktSharedData().iQoSName);
-	}
-void CTestLtsyPktTestStepBase::CloseExistContextQos()
-	{
-	// Close QoS
-	INFO_PRINTF1(_L("CloseExistContextQos() invoked...\n"));
-	iModel.PktSharedData().iQoS.Close();
-	User::After(1000000);
-	INFO_PRINTF1(_L("CloseExistContextQos() OK...\n"));
-	}
-void CTestLtsyPktTestStepBase::GprsContextDeleteTest()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("GprsContextDeleteTest() invoked...\n"));
-	iModel.PktSharedData().iContext1.Delete(requestStatus);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketQoS::OpenNewQoS() ret = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked...\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput200000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput200000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	}
-void  CTestLtsyPktTestStepBase::GprsGetQoSProfileTest()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::GetProfileParameters() invoked...\n"));
-	TPckg<RPacketQoS::TQoSGPRSNegotiated> qosNegotiatedPckg(iModel.PktSharedData().iQoSNegotiated);   // pack
-	iModel.PktSharedData().iQoS.GetProfileParameters(requestStatus, qosNegotiatedPckg);
-	User::WaitForRequest(requestStatus);
-	// iQoSNegotiated = qosNegotiatedPckg();   // unpack necessary ???
-	INFO_PRINTF2(_L("    MinPrecedence       = %d\n"), iModel.PktSharedData().iQoSRequested.iMinPrecedence);
-	INFO_PRINTF2(_L("    ReqPrecedence           = %d\n"), iModel.PktSharedData().iQoSRequested.iReqPrecedence);
-	INFO_PRINTF2(_L("    ReqDelay           = %d\n"), iModel.PktSharedData().iQoSRequested.iReqDelay);
-	INFO_PRINTF2(_L("    MinDelay        = %d\n"), iModel.PktSharedData().iQoSRequested.iMinDelay);
-	INFO_PRINTF2(_L("    ReqReliability      = %d\n"), iModel.PktSharedData().iQoSRequested.iReqReliability);
-	INFO_PRINTF2(_L("    MinReliability = %d\n"), iModel.PktSharedData().iQoSRequested.iMinReliability);
-	INFO_PRINTF2(_L("    ReqPeakThroughput = %d\n"), iModel.PktSharedData().iQoSRequested.iReqPeakThroughput);
-	INFO_PRINTF2(_L("    MinPeakThroughput      = %d\n"), iModel.PktSharedData().iQoSRequested.iMinPeakThroughput);
-	INFO_PRINTF2(_L("    ReqMeanThroughput      = %d\n"), iModel.PktSharedData().iQoSRequested.iReqMeanThroughput);
-	INFO_PRINTF2(_L("    MinMeanThroughput      = %d\n"), iModel.PktSharedData().iQoSRequested.iMinMeanThroughput);
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest1()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.1..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EPriorityHighPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EPriorityHighPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass1;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass1;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass1;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass1;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput100;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput100;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest2()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.2..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EPriorityMediumPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EPriorityMediumPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass2;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass2;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput2000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput2000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput200;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput200;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest3()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.3..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EPriorityLowPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EPriorityLowPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass3;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass3;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass3;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass3;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput4000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput4000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput500;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput500;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest4()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.4..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass4;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass4;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput8000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput8000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput1000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest5()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.5..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass5;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass5;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput16000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput16000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput2000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput2000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest6()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.6..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput32000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput32000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput5000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput5000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest7()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.7..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput64000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput64000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput10000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput10000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest8()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.8..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput128000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput128000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput20000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput20000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest9()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.9..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput256000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput256000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput50000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput50000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest10()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.10..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput100000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput100000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest11()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.11..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput200000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput200000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest12()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.12..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput500000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput500000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest13()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.13..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput1000000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput1000000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest14()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.14..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput2000000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput2000000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest15()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.15..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput5000000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput5000000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest16()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.16..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput10000000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput10000000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest17()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.17..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput20000000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput20000000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest18()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.18..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput50000000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput50000000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest19()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.29..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-	iModel.PktSharedData().iQoSRequested.iMinPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqPrecedence = RPacketQoS::EUnspecifiedPrecedence;
-	iModel.PktSharedData().iQoSRequested.iReqDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iMinDelay = RPacketQoS::EDelayClass2;
-	iModel.PktSharedData().iQoSRequested.iReqReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iMinReliability = RPacketQoS::EReliabilityClass4;
-	iModel.PktSharedData().iQoSRequested.iReqPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iMinPeakThroughput = RPacketQoS::EPeakThroughput1000;
-	iModel.PktSharedData().iQoSRequested.iReqMeanThroughput = RPacketQoS::EMeanThroughput200000;
-	iModel.PktSharedData().iQoSRequested.iMinMeanThroughput = RPacketQoS::EMeanThroughput200000;
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void  CTestLtsyPktTestStepBase::GprsSetQoSProfileTest20()
-	{
-	TRequestStatus requestStatus = KErrNone;
-	INFO_PRINTF1(_L("RPacketQoS::SetProfileParameters() invoked.20..\n"));
-	INFO_PRINTF1(_L("  Use Assured Mode = True\n"));
-
-	TPckg<RPacketQoS::TQoSGPRSRequested> qosRequestedPckg(iModel.PktSharedData().iQoSRequested);   // pack
-	iModel.PktSharedData().iQoS.SetProfileParameters(requestStatus, qosRequestedPckg);
-	User::WaitForRequest(requestStatus);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), requestStatus.Int());
-	}
-void CTestLtsyPktTestStepBase::GprsContextSetConfigTest1()
-	{
-	// Set Context Config
-	TRequestStatus reqStatusContextConfig = KErrNone;
-	RPacketContext::TContextConfigGPRS contextConfig2;
-	//contextConfig2.iServiceOption = RPacketContext::KLowSpeedData;
-	contextConfig2.iPdpType  = RPacketContext::EPdpTypeIPv4;
-	contextConfig2.iAccessPointName = KName;
-	//contextConfig2.iPdpAddress = ;
-	TPckg<RPacketContext::TContextConfigGPRS> contextConfigPckg2(contextConfig2);
-	INFO_PRINTF1(_L("RPacketContext::SetConfig1() invoked...\n"));
-	iModel.PktSharedData().iContext1.SetConfig(reqStatusContextConfig, contextConfigPckg2);
-	User::WaitForRequest(reqStatusContextConfig);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig1() complete = %d\n"), reqStatusContextConfig.Int());
-	}
-void CTestLtsyPktTestStepBase::GprsContextSetConfigTest2()
-	{
-	// Set Context Config
-	TRequestStatus reqStatusContextConfig = KErrNone;
-	RPacketContext::TContextConfigGPRS contextConfig2;
-	//contextConfig2.iServiceOption = RPacketContext::KLowSpeedData;
-	contextConfig2.iPdpType  = RPacketContext::EPdpTypeIPv6;
-	contextConfig2.iAccessPointName = KName;
-	//contextConfig2.iPdpAddress = ;
-	TPckg<RPacketContext::TContextConfigGPRS> contextConfigPckg2(contextConfig2);
-	INFO_PRINTF1(_L("RPacketContext::SetConfig2() invoked...\n"));
-	iModel.PktSharedData().iContext1.SetConfig(reqStatusContextConfig, contextConfigPckg2);
-	User::WaitForRequest(reqStatusContextConfig);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig2() complete = %d\n"), reqStatusContextConfig.Int());
-	}
-void CTestLtsyPktTestStepBase::GprsContextSetConfigTest3()
-	{
-	// Set Context Config
-	TRequestStatus reqStatusContextConfig = KErrNone;
-	RPacketContext::TContextConfigGPRS contextConfig2;
-	//contextConfig2.iServiceOption = RPacketContext::KLowSpeedData;
-	contextConfig2.iPdpType  = RPacketContext::EPdpTypeX25;
-	contextConfig2.iAccessPointName = KName;
-	//contextConfig2.iPdpAddress = ;
-	TPckg<RPacketContext::TContextConfigGPRS> contextConfigPckg2(contextConfig2);
-	INFO_PRINTF1(_L("RPacketContext::SetConfig3() invoked...\n"));
-	iModel.PktSharedData().iContext1.SetConfig(reqStatusContextConfig, contextConfigPckg2);
-	User::WaitForRequest(reqStatusContextConfig);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig3() complete = %d\n"), reqStatusContextConfig.Int());
-	}
-void CTestLtsyPktTestStepBase::GprsContextSetConfigTest4()
-	{
-	// Set Context Config
-	TRequestStatus reqStatusContextConfig = KErrNone;
-	RPacketContext::TContextConfigGPRS contextConfig2;
-	contextConfig2.iAccessPointName = KName;
-	//contextConfig2.iPdpAddress = ;
-	TPckg<RPacketContext::TContextConfigGPRS> contextConfigPckg2(contextConfig2);
-	INFO_PRINTF1(_L("RPacketContext::SetConfig4() invoked...\n"));
-	iModel.PktSharedData().iContext1.SetConfig(reqStatusContextConfig, contextConfigPckg2);
-	User::WaitForRequest(reqStatusContextConfig);
-	INFO_PRINTF2(_L("RPacketContext::SetConfig4() complete = %d\n"), reqStatusContextConfig.Int());
-	}
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsyshareddata.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-// @file TestTelephonySharedData.cpp
-//
-// Copyright (c) 2004-2007 Symbian Software Ltd. All rights reserved.
-//
-// This contains implementation of Shared Data
-
-// User include
-#include "TestLtsySharedData.h"
-
-// Epoc include
-#include <etelmm.h>
-
-/*@{*/
-/// Literal constants
-_LIT(KSimTsyName,		"SIM");
-_LIT(KPhoneName,		"SimulatorPhone");
-_LIT(KDummyTsyName,		"DMM");
-_LIT(KDMobile,			"DMobile");
-/*@}*/
-
-CTestLtsySharedData* CTestLtsySharedData::NewL()
-	{
-	CTestLtsySharedData*	self=new(ELeave) CTestLtsySharedData();
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop();
-	return self;
-	}
-
-CTestLtsySharedData::CTestLtsySharedData()
-:	CBase()
-,	iCallId(CTelephony::EISVCall1)
-,	iCallId1(CTelephony::EISVCall2)
-,	iTelServerConnected(EFalse)
-,	iPhoneModuleLoaded(EFalse)
-,	iPhoneOpened(EFalse)
-,	iPhoneInitialised(EFalse)
-,	iLineOpened(EFalse)
-,	iCallOpened(EFalse)
-,	iTelephony(NULL)
-,	iActiveScheduler(NULL)
-/*
-Constructor
-*/
-	{
-	}
-
-CTestLtsySharedData::~CTestLtsySharedData()
-/*
-Destructor
-*/
-	{
-	ClosePhone();
-	}
-
-void CTestLtsySharedData::ConstructL()
-	{
-	}
-
-TInt CTestLtsySharedData::OpenPhone(const TName& aTsyName, CTestStep& aTestStep)
-/*
-This function will load TSY depending on the comms db
-settings and opens the phone for making a call.
-
-@param - TSY to be loaded
-@param - CTestStep instance
-@leave - system wide error codes
-*/
-	{
-	ClosePhone();
-
-	// Load the phone module depending on the comms DB settings
-	TInt	ret=KErrNone;
-	if(aTsyName.Compare(KSimTsyName) == 0 )
-		{
-		iTSYName = aTsyName;
-		}
-	else if (aTsyName.Compare(KDummyTsyName) == 0 )
-		{
-		iTSYName = aTsyName;
-		}
-	else
-		{
-		ret=KErrArgument;
-		}
-
-	if ( ret==KErrNone )
-		{
-		ret = ReopenPhone();
-		}
-
-	if ( ret!=KErrNone )
-		{
-		aTestStep.ERR_PRINTF2(_L("Failed to open phone. Error code = %d"), ret);
-		aTestStep.SetTestStepResult(EFail);
-		}
-
-	return ret;
-	}
-
-TInt CTestLtsySharedData::ReopenPhone()
-/*
-This function will load TSY depending on the comms db
-settings and opens the phone for making a call.
-
-@param - CTestStep instance
-@leave - system wide error codes
-*/
-	{
-	TRAPD(ret, iActiveScheduler=new (ELeave) CActiveScheduler());
-
-	if ( ret==KErrNone )
-		{
-		CActiveScheduler::Install(iActiveScheduler);
-		ret=iServer.Connect();
-		}
-
-	if ( ret==KErrNone )
-		{
-		iTelServerConnected = ETrue;
-		ret=iServer.LoadPhoneModule(iTSYName);
-		}
-
-	if ( ret==KErrNone )
-		{
-		iPhoneModuleLoaded = ETrue;
-		TRAP(ret, iTelephony=CTelephony::NewL());
-		}
-
-	if ( ret==KErrNone )
-		{
-		// Open the phone
-		if ( iTSYName.Compare(KDummyTsyName) == 0 )
-			{
-			// Open the phone with the Dummy mobile phone name
-			ret = iMobilePhone.Open(iServer, KDMobile);
-			}
-		else
-			{
-			// open the phone with the simuplator phone
-			ret = iMobilePhone.Open(iServer, KPhoneName);
-			}
-		iPhoneOpened = ret==KErrNone;
-		}
-
-	return ret;
-	}
-
-void CTestLtsySharedData::ClosePhone()
-/*
-Closes the RTelServer, RmobilePhone,RMobileCall and RMobileLine opened sessions.
-*/
-	{
-	if ( iCallOpened )
-		{
-		iMobileCall.Close();
-		iCallOpened=EFalse;
-		}
-
-	if ( iLineOpened )
-		{
-		iMobileLine.Close();
-		iLineOpened=EFalse;
-		}
-
-	if ( iPhoneOpened )
-		{
-		iMobilePhone.Close();
-		iPhoneOpened = EFalse;
-		}
-
-	if ( iTelephony!= NULL )
-		{
-		delete iTelephony;
-		iTelephony=NULL;
-		}
-
-	if ( iPhoneModuleLoaded )
-		{
-		iServer.UnloadPhoneModule(iTSYName);
-		iPhoneModuleLoaded = EFalse;
-		}
-
-	if ( iTelServerConnected )
-		{
-		iServer.Close();
-		iTelServerConnected = EFalse;
-		}
-
-	CActiveScheduler::Install(NULL);
-	delete iActiveScheduler;
-	iActiveScheduler=NULL;
-	}

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmsack.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsysmsack.h"
-
-CTestLtsySmsAck::CTestLtsySmsAck(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsySmsAck::~CTestLtsySmsAck()
-	{
-	}
-
-CTestLtsySmsAck* CTestLtsySmsAck::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsAck* self = new (ELeave)CTestLtsySmsAck(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsySmsAck* CTestLtsySmsAck::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsAck* self=CTestLtsySmsAck::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsySmsAck::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsySmsAck::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsAck::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsAck::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsAck::doTestStepL called"));
-	TRAPD(err,AckSmsStoredL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when ack sms store"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsAck::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsAck::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsySmsAck::AckSmsStoredL()
-	{
-	TBool full(EFalse);
-	TRequestStatus status;
-	_LIT8(KNullAck,"00");
-	Sms().AckSmsStored(status,KNullAck(),full);
-	User::WaitForRequest(status);
-	TInt r=status.Int();
-	INFO_PRINTF2(_L("AckSmsStored() request status = %d"),r);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmsatutil.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-// 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:
-// @file testltsysmsatutil.cpp
-// This contains SmsAtUtil which is util for Sms At command
-// 
-
-// user include
-#include "testltsysmsatutil.h"
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::ConvertAsciiToBinary
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt SmsAtUtil::ConvertAsciiToBinary(const TDesC8& aAscii,TDes8& aData)
-	{
-	aData.Zero();
-	TLex8 lex;
-	TUint8 val;
-	TInt ret;
-	const TInt count(aAscii.Length());
-	for(TInt i = 0;i < count;i = i + 2)
-		{
-		lex = aAscii.Mid(i,2);
-		ret = lex.Val(val,EHex);
-		if(ret != KErrNone)
-			{
-			return ret;
-			}
-		aData.Append(val);
-		}
-	return KErrNone;
-	}
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::AppendDataToAscii
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void SmsAtUtil::AppendDataToAscii(TDes8& aAscii,const TDesC8& aData)
- 	{
-	const TInt count(aData.Length());
-//	__ASSERT_DEBUG((aAscii.MaxLength()-aAscii.MaxLength())<=(count*2),Panic(EATSmsUtilsDescriptorOverflow));
-
-	for(TInt i = 0; i < count; ++i)
-		{
-		AppendOctet(aData[i],aAscii);
-		}
-		
-//	__ASSERT_DEBUG(aAscii.Length()%2==0,Panic(EATSmsUtilsOddNumberOfSemiOctets));
-	}
-
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::IsAddressChar
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TBool SmsAtUtil::IsAddressChar(TChar aChar)
- 	{
-	if(aChar.IsDigit())
-		{
-		return ETrue;
-		}
-	if(aChar == TChar('*') ||
-	   aChar == TChar('#') ||
-	   aChar == TChar('a') ||
-	   aChar == TChar('b') ||
-	   aChar == TChar('c'))
-		{
-		return ETrue;
-		}
-	return EFalse;
-	}
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::ConvertNumberingPlan
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-RMobilePhone::TMobileNPI SmsAtUtil::ConvertNumberingPlan(TInt aValue)
-	{
-	switch(aValue)
-		{
-		// The below 'magic numbers' come from the ETSI 03.40
-		// specification for Address Fields (section 9.1.2.5)
-	case 1:
-		return RMobilePhone::EIsdnNumberPlan;
-	case 3:
-		return RMobilePhone::EDataNumberPlan;
-	case 4:
-		return RMobilePhone::ETelexNumberPlan;
-	case 8:
-		return RMobilePhone::ENationalNumberPlan;
-	case 9:
-		return RMobilePhone::EPrivateNumberPlan;
-	default:
-		return RMobilePhone::EUnknownNumberingPlan;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::ConvertTypeOfNumber
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-RMobilePhone::TMobileTON SmsAtUtil::ConvertTypeOfNumber(TInt aValue) 
-	{
-	switch(aValue)
-		{
-		// The below 'magic numbers' come from the ETSI 03.40
-		// specification for Address Fields (section 9.1.2.5)
-	case 0:		
-		return RMobilePhone::EUnknownNumber;
-	case 1:		
-		return RMobilePhone::EInternationalNumber;
-	case 2:
-		return RMobilePhone::ENationalNumber;
-	case 3:
-		return RMobilePhone::ENetworkSpecificNumber;
-	case 4:
-		return RMobilePhone::ESubscriberNumber;
-	default:
-		return RMobilePhone::EUnknownNumber;
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::AppendOctet
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-void SmsAtUtil::AppendOctet(TInt aOctet,TDes8& aAscii)
-	{
-	// Ensure client has only passed us a octet (ie. low 8 bits only)
-	aOctet = aOctet&0xff;
-	// Append octet 
-	// (prefix '0' if the octets value only uses one digit as final 
-    //  octet coding must use two digits)
-	if(aOctet <= 0x0f)
-		{
-		aAscii.Append(TChar('0'));
-		}
-	
-	aAscii.AppendNum(aOctet,EHex);
-	}
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::ConvertAddressChar
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TInt SmsAtUtil::ConvertAddressChar(TChar aChar)
- 	{
-	aChar.LowerCase();
-	if(aChar-TChar('0') <= 9)
-		{
-		// it should be digital number from 0~9
-		return aChar-TChar('0');
-		}
-	else if(aChar == TChar('*'))
-		{
-		return 10;
-		}
-	else if(aChar == TChar('#'))
-		{
-		return 11;
-		}
-	else if(aChar == TChar('a'))
-		{
-		return 12;
-		}
-	else if(aChar == TChar('b'))
-		{
-		return 13;
-		}
-	else if(aChar == TChar('c'))
-		{
-		return 14;
-		}
-	return 15;
-	}	
-
-// ---------------------------------------------------------------------------
-// SmsAtUtil::ConvertAddressChar
-// other items were commented in a header
-// ---------------------------------------------------------------------------
-TChar SmsAtUtil::ConvertAddressChar(TInt aBinary)
-	{
-	if(aBinary >= 0 && aBinary <= 9)
-		{
-		return TChar(aBinary) + TChar('0');  	// Assumes digit characters are one after each other
-		}
-	else if(aBinary == 10)
-		{
-		return TChar('*');
-		}
-	else if(aBinary == 11)
-		{
-		return TChar('#');
-		}
-	else if(aBinary == 12)
-		{
-		return TChar('a');
-		}
-	else if(aBinary == 13)
-		{
-		return TChar('b');
-		}
-	else if(aBinary == 14)
-		{
-		return TChar('c');
-		}
-	return TChar(0);		// This is the cloest I can find to a NULL char 
-	}
-
-// End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmsbase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-// Copyright (c) 2008-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:
-// Implementation of the Class CTestLtsySmsBase
-// 
-//
-
-// user include
-#include "testltsysmsbase.h"
-#include "testltsysmsshareddata.h"
-
-//const define
-_LIT16(KPhoneTSY, "phonetsy");
-
-
-/**
- * Constructor
- * 
- */
-CTestLtsySmsBase::CTestLtsySmsBase(CTestLtsyModel& aTestModel):
-                                   iModel(aTestModel)
-	{
-	}
-
-/**
- * Destructor
- *
- */
-CTestLtsySmsBase::~CTestLtsySmsBase()
-	{
-
-	}
-
-TVerdict CTestLtsySmsBase::doTestStepPreambleL()
-	{
-	OpenPhoneL();
-	
-	if (TestStepResult() == EPass)
-		{
-		GetIndex();
-		}
-
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsBase::doTestStepPostambleL()
-	{
-	return TestStepResult();
-	}
-
-/**
- * Get sms message number
- * 
- */
-void CTestLtsySmsBase::GetIndex()
-	{
-	iIndexNum = 0;
-	iStoreIndex = 0;
-	}
-
-void CTestLtsySmsBase::OpenPhoneL()
-	{
-	INFO_PRINTF1(_L("starting opne phone"));
-		
-	if (!iModel.SharedEnv().PhoneOpened())
-		{
-		iModel.SharedEnv().OpenPhoneL(KPhoneTSY);
-		}
-	}
-/**
- * Open sms message
- * 
- */
-void CTestLtsySmsBase::OpenSmsL()
-	{
-	RMobileSmsMessaging smsMsg;
-	iModel.SmsSharedData().SmsMessagingArray().AppendL(smsMsg);
-    
-	iIndexNum = iModel.SmsSharedData().SmsMessagingArray().Count()-1;
-    
-	TInt ret( KErrNone );
-    ret = Sms().Open(iModel.SharedEnv().Phone());
-	if (KErrNone != ret)
-		{
-		INFO_PRINTF1(_L("Can't open the RMobileSmsMessaging service"));
-		SetTestStepResult(EFail);
-		}
-	}
-
-/**
- * Get the sms object
- * 
- */
-RMobileSmsMessaging& CTestLtsySmsBase::Sms()
-	{
-	return iModel.SmsSharedData().SmsMessagingArray()[iIndexNum];
-	}
-
-/**
- * Get the sms store object
- * 
- */
-RMobileSmsStore& CTestLtsySmsBase::SmsStore()
-	{
-	return iModel.SmsSharedData().SmsStoreArray()[iStoreIndex];
-	}
-
-/**
- * Open sms message store
- * 
- */
-void CTestLtsySmsBase::OpenSmsStoreL()
-	{
-	RMobileSmsStore smsStore;
-	iModel.SmsSharedData().SmsStoreArray().AppendL(smsStore);
-
-	iStoreIndex = iModel.SmsSharedData().SmsStoreArray().Count()-1;
-
-	TInt ret = SmsStore().Open(Sms(), KETelIccSmsStore);
-	if (KErrNone != ret)
-		{
-		ERR_PRINTF1(_L("Can't open the RMobileSmsStore service"));
-		SetTestStepResult(EFail);
-		}
-	}
-
-/**
- * Close sms
- */
-void CTestLtsySmsBase::CloseSmsL()
-	{
-	Sms().Close();
-	iModel.SmsSharedData().SmsMessagingArray().Remove(iIndexNum);
-	iModel.SmsSharedData().SmsMessagingArray().Compress();
-	}
-
-/**
- * Close sms store
- * 
- */
-void CTestLtsySmsBase::CloseSmsStoreL()
-	{
-	SmsStore().Close();
-	iModel.SmsSharedData().SmsStoreArray().Remove(iStoreIndex);
-	iModel.SmsSharedData().SmsStoreArray().Compress();
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmscontrolreceivesmscase1step.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Example CTestStep derived implementation
-// 
-//
-
-/**
- @file CTestLtsySmsControlReceiveSmsCase1Step.cpp
- @internalTechnology
-*/
-#include "testltsysmscontrolreceivesmscase1step.h"
-#include "te_integration_stltsysuitedefs.h"
-
-CCTestLtsySmsControlReceiveSmsCase1Step::~CCTestLtsySmsControlReceiveSmsCase1Step()
-/**
- * Destructor
- */
-	{
-	}
-
-CCTestLtsySmsControlReceiveSmsCase1Step::CCTestLtsySmsControlReceiveSmsCase1Step()
-/**
- * Constructor
- */
-	{
-	// **MUST** call SetTestStepName in the constructor as the controlling
-	// framework uses the test step name immediately following construction to set
-	// up the step's unique logging ID.
-	SetTestStepName(KCTestLtsySmsControlReceiveSmsCase1Step);
-	}
-
-TVerdict CCTestLtsySmsControlReceiveSmsCase1Step::doTestStepPreambleL()
-/**
- * @return - TVerdict code
- * Override of base class virtual
- */
-	{
-	INFO_PRINTF1(_L("Please delete this line or modify it. I am in Test Step Preamble in Class CCTestLtsySmsControlReceiveSmsCase1Step"));
-	// uncomment the following 3 lines if you have common pre setting to all the test steps in there
-	// CTe_integration_stltsySuiteStepBase::doTestStepPreambleL();
-	// if (TestStepResult()!=EPass)
-	//    return   TestStepResult();
-	// process some pre setting to this test step then set SetTestStepResult to EFail or Epass.
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-
-TVerdict CCTestLtsySmsControlReceiveSmsCase1Step::doTestStepL()
-/**
- * @return - TVerdict code
- * Override of base class pure virtual
- * Our implementation only gets called if the base class doTestStepPreambleL() did
- * not leave. That being the case, the current test result value will be EPass.
- */
-	{
-	  if (TestStepResult()==EPass)
-		{
-
-		//  ************** Delete the Block, the block start ****************
-		INFO_PRINTF1(_L("Please modify me. I am in CCTestLtsySmsControlReceiveSmsCase1Step::doTestStepL() in the file CTestLtsySmsControlReceiveSmsCase1Step.cpp"));  //Block start
-		TPtrC TheString;
-		TBool TheBool;
-		TInt TheInt;
-		if(!GetStringFromConfig(ConfigSection(),KTe_integration_stltsySuiteString, TheString) ||
-			!GetBoolFromConfig(ConfigSection(),KTe_integration_stltsySuiteBool,TheBool) ||
-			!GetIntFromConfig(ConfigSection(),KTe_integration_stltsySuiteInt,TheInt)
-			)
-			{
-			// Leave if there's any error.
-			User::Leave(KErrNotFound);
-			}
-		else
-			{
-			INFO_PRINTF4(_L("The test step is %S, The Bool is %d, The int-value is %d"), &TheString, TheBool,TheInt); // Block end
-			}
-
-		//  **************   Block end ****************
-
-		SetTestStepResult(EPass);
-		}
-	  return TestStepResult();
-	}
-
-
-
-TVerdict CCTestLtsySmsControlReceiveSmsCase1Step::doTestStepPostambleL()
-/**
- * @return - TVerdict code
- * Override of base class virtual
- */
-	{
-	INFO_PRINTF1(_L("Please delete this line or modify it. I am in Test Step Postamble in Class CCTestLtsySmsControlReceiveSmsCase1Step"));
-	// process something post setting to the test step
-	// uncomment the following line if you have common post setting to all the test steps in there
-	// CTe_integration_stltsySuiteStepBase::doTestStepPostambleL();
-	// uncomment the following line if you have post process or remove the following line if no post process
-	// SetTestStepResult(EPass);		// or EFail
-	return TestStepResult();
-	}

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmscontrolsendsmscase1step.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Example CTestStep derived implementation
-// 
-//
-
-/**
- @file CTestLtsySmsControlSendSmsCase1Step.cpp
- @internalTechnology
-*/
-#include "testltsysmscontrolsendsmscase1step.h"
-#include "te_integration_stltsysuitedefs.h"
-
-CCTestLtsySmsControlSendSmsCase1Step::~CCTestLtsySmsControlSendSmsCase1Step()
-/**
- * Destructor
- */
-	{
-	}
-
-CCTestLtsySmsControlSendSmsCase1Step::CCTestLtsySmsControlSendSmsCase1Step()
-/**
- * Constructor
- */
-	{
-	// **MUST** call SetTestStepName in the constructor as the controlling
-	// framework uses the test step name immediately following construction to set
-	// up the step's unique logging ID.
-	SetTestStepName(KCTestLtsySmsControlSendSmsCase1Step);
-	}
-
-TVerdict CCTestLtsySmsControlSendSmsCase1Step::doTestStepPreambleL()
-/**
- * @return - TVerdict code
- * Override of base class virtual
- */
-	{
-	INFO_PRINTF1(_L("Please delete this line or modify it. I am in Test Step Preamble in Class CCTestLtsySmsControlSendSmsCase1Step"));
-	// uncomment the following 3 lines if you have common pre setting to all the test steps in there
-	// CTe_integration_stltsySuiteStepBase::doTestStepPreambleL();
-	// if (TestStepResult()!=EPass)
-	//    return   TestStepResult();
-	// process some pre setting to this test step then set SetTestStepResult to EFail or Epass.
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-
-TVerdict CCTestLtsySmsControlSendSmsCase1Step::doTestStepL()
-/**
- * @return - TVerdict code
- * Override of base class pure virtual
- * Our implementation only gets called if the base class doTestStepPreambleL() did
- * not leave. That being the case, the current test result value will be EPass.
- */
-	{
-	  if (TestStepResult()==EPass)
-		{
-
-		//  ************** Delete the Block, the block start ****************
-		INFO_PRINTF1(_L("Please modify me. I am in CCTestLtsySmsControlSendSmsCase1Step::doTestStepL() in the file CTestLtsySmsControlSendSmsCase1Step.cpp"));  //Block start
-		TPtrC TheString;
-		TBool TheBool;
-		TInt TheInt;
-		if(!GetStringFromConfig(ConfigSection(),KTe_integration_stltsySuiteString, TheString) ||
-			!GetBoolFromConfig(ConfigSection(),KTe_integration_stltsySuiteBool,TheBool) ||
-			!GetIntFromConfig(ConfigSection(),KTe_integration_stltsySuiteInt,TheInt)
-			)
-			{
-			// Leave if there's any error.
-			User::Leave(KErrNotFound);
-			}
-		else
-			{
-			INFO_PRINTF4(_L("The test step is %S, The Bool is %d, The int-value is %d"), &TheString, TheBool,TheInt); // Block end
-			}
-
-		//  **************   Block end ****************
-
-		SetTestStepResult(EPass);
-		}
-	  return TestStepResult();
-	}
-
-
-
-TVerdict CCTestLtsySmsControlSendSmsCase1Step::doTestStepPostambleL()
-/**
- * @return - TVerdict code
- * Override of base class virtual
- */
-	{
-	INFO_PRINTF1(_L("Please delete this line or modify it. I am in Test Step Postamble in Class CCTestLtsySmsControlSendSmsCase1Step"));
-	// process something post setting to the test step
-	// uncomment the following line if you have common post setting to all the test steps in there
-	// CTe_integration_stltsySuiteStepBase::doTestStepPostambleL();
-	// uncomment the following line if you have post process or remove the following line if no post process
-	// SetTestStepResult(EPass);		// or EFail
-	return TestStepResult();
-	}

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmsdelete.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsysmsdelete.h"
-
-CTestLtsySmsDelete::CTestLtsySmsDelete(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsySmsDelete::~CTestLtsySmsDelete()
-	{
-	}
-
-CTestLtsySmsDelete* CTestLtsySmsDelete::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsDelete* self = new (ELeave)CTestLtsySmsDelete(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsySmsDelete* CTestLtsySmsDelete::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsDelete* self=CTestLtsySmsDelete::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsySmsDelete::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsySmsDelete::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsDelete::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsDelete::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsDelete::doTestStepL called"));
-	TInt index(6);
-	TRAPD(err,DeleteSmsL(index));
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when delete sms"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsDelete::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsDelete::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-void CTestLtsySmsDelete::DeleteSmsL(TInt aIndex)
-	{
-	TRequestStatus status;
-	SmsStore().Delete(status,aIndex);
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	INFO_PRINTF2(_L("Delete() request status = %d"),r);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmsdeleteall.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsysmsdeleteall.h"
-
-CTestLtsySmsDeleteAll::CTestLtsySmsDeleteAll(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsySmsDeleteAll::~CTestLtsySmsDeleteAll()
-	{
-	}
-
-CTestLtsySmsDeleteAll* CTestLtsySmsDeleteAll::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsDeleteAll* self = new (ELeave)CTestLtsySmsDeleteAll(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsySmsDeleteAll* CTestLtsySmsDeleteAll::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsDeleteAll* self=CTestLtsySmsDeleteAll::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsySmsDeleteAll::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsySmsDeleteAll::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsDeleteAll::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsDeleteAll::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsDeleteAll::doTestStepL called"));
-	TRAPD(err,DeleteAllSmsL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when delete all"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsDeleteAll::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsDeleteAll::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-void CTestLtsySmsDeleteAll::DeleteAllSmsL()
-	{
-	TRequestStatus status;
-	SmsStore().DeleteAll( status );
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	INFO_PRINTF2(_L("DeleteAll() request status = %d"),r);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmsdeleteinvalidindex.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsysmsdeleteinvalidindex.h"
-
-CTestLtsySmsDeleteInvalidIndex::CTestLtsySmsDeleteInvalidIndex(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsySmsDeleteInvalidIndex::~CTestLtsySmsDeleteInvalidIndex()
-	{
-	}
-
-CTestLtsySmsDeleteInvalidIndex* CTestLtsySmsDeleteInvalidIndex::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsDeleteInvalidIndex* self = new (ELeave)CTestLtsySmsDeleteInvalidIndex(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsySmsDeleteInvalidIndex* CTestLtsySmsDeleteInvalidIndex::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsDeleteInvalidIndex* self=CTestLtsySmsDeleteInvalidIndex::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsySmsDeleteInvalidIndex::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsySmsDeleteInvalidIndex::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsDeleteInvalidIndex::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsDeleteInvalidIndex::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsDeleteInvalidIndex::doTestStepL called"));
-	TInt index(0);
-	TRAPD(err,DeleteSmsL(index));
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when delete sms"),err);
-	    SetTestStepResult(EFail);
-		}
-	index = 46;
-	TRAPD(err1,DeleteSmsL(index));
-	if(err1 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when delete sms"),err1);
-	    SetTestStepResult(EFail);
-		}
-	
-	index = -1;
-	TRAPD(err2,DeleteSmsL(index));
-	if(err2 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when delete sms"),err2);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsDeleteInvalidIndex::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsDeleteInvalidIndex::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-void CTestLtsySmsDeleteInvalidIndex::DeleteSmsL(TInt aIndex)
-	{
-	TRequestStatus status;
-	SmsStore().Delete(status,aIndex);
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	INFO_PRINTF2(_L("Delete() request status = %d"),r);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmsnack.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsysmsnack.h"
-#include "testltsysmsatutil.h"
-
-CTestLtsySmsNack::CTestLtsySmsNack(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsySmsNack::~CTestLtsySmsNack()
-	{
-	}
-
-CTestLtsySmsNack* CTestLtsySmsNack::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsNack* self = new (ELeave)CTestLtsySmsNack(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsySmsNack* CTestLtsySmsNack::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsNack* self=CTestLtsySmsNack::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsySmsNack::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsySmsNack::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsNack::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsNack::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsNack::doTestStepL called"));
-	TRAPD(err,NackSmsStoredL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when nack sms store"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsNack::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsNack::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsySmsNack::NackSmsStoredL()
-	{
-	_LIT8(KTest,"9f05");
-	TBuf8<12> nackAsciiTest = KTest();
-	TBuf8<12> nackTest;
-	SmsAtUtil::ConvertAsciiToBinary(nackAsciiTest,nackTest);
-	TRequestStatus status;
-	TInt rpCause(2);  
-	
-	Sms().NackSmsStored(status,nackTest,rpCause);
-	User::WaitForRequest(status);
-	TInt r=status.Int();
-	INFO_PRINTF2(_L("AckSmsStored() request status = %d"),r);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmsread.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsysmsread.h"
-#include "testltsysmsatutil.h"
-
-CTestLtsySmsRead::CTestLtsySmsRead(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsySmsRead::~CTestLtsySmsRead()
-	{
-	}
-
-CTestLtsySmsRead* CTestLtsySmsRead::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsRead* self = new (ELeave)CTestLtsySmsRead(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsySmsRead* CTestLtsySmsRead::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsRead* self=CTestLtsySmsRead::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsySmsRead::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsySmsRead::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsRead::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsRead::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsRead::doTestStepL called"));
-	TInt index(6);
-	TRAPD(err,ReadSmsL(index));
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when delete sms"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsRead::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsRead::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-void CTestLtsySmsRead::ReadSmsL(TInt aIndex)
-	{
-	TRequestStatus status;
-	TPckg<RMobileSmsStore::TMobileGsmSmsEntryV1> pckgEntryV1(iEntryV1);
-	iEntryV1.iIndex = aIndex;		
-	SmsStore().Read(status, pckgEntryV1);
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	INFO_PRINTF2(_L("Delete() request status = %d"),r);
-	TBuf<400>  msgAsciiData;
-	TBuf8<400> msgAscii; 
-	SmsAtUtil::AppendDataToAscii(msgAscii,iEntryV1.iMsgData);
-	msgAsciiData.Copy( msgAscii );
-	INFO_PRINTF4(_L("SmsStoreRead index=%d,status=%d,msgData=%S\n"),
-			        iEntryV1.iIndex,iEntryV1.iMsgStatus,&msgAsciiData);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmsreadinvalidindex.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsysmsreadinvalidindex.h"
-#include "testltsysmsatutil.h"
-
-CTestLtsySmsReadInvalidIndex::CTestLtsySmsReadInvalidIndex(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsySmsReadInvalidIndex::~CTestLtsySmsReadInvalidIndex()
-	{
-	}
-
-CTestLtsySmsReadInvalidIndex* CTestLtsySmsReadInvalidIndex::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsReadInvalidIndex* self = new (ELeave)CTestLtsySmsReadInvalidIndex(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsySmsReadInvalidIndex* CTestLtsySmsReadInvalidIndex::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsReadInvalidIndex* self=CTestLtsySmsReadInvalidIndex::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsySmsReadInvalidIndex::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsySmsReadInvalidIndex::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsReadInvalidIndex::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsReadInvalidIndex::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsReadInvalidIndex::doTestStepL called"));
-	TInt index(0);
-	TRAPD(err,ReadSmsL(index));
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when delete sms"),err);
-	    SetTestStepResult(EFail);
-		}
-	
-	index = -2;
-	TRAPD(err1,ReadSmsL(index));
-	if(err1 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when delete sms"),err1);
-	    SetTestStepResult(EFail);
-		}
-	
-	index = 50;
-	TRAPD(err2,ReadSmsL(index));
-	if(err2 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when delete sms"),err2);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsReadInvalidIndex::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsReadInvalidIndex::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-void CTestLtsySmsReadInvalidIndex::ReadSmsL(TInt aIndex)
-	{
-	TRequestStatus status;
-	TPckg<RMobileSmsStore::TMobileGsmSmsEntryV1> pckgEntryV1(iEntryV1);
-	iEntryV1.iIndex = aIndex;		
-	SmsStore().Read(status, pckgEntryV1);
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	INFO_PRINTF2(_L("Delete() request status = %d"),r);
-	TBuf<400>  msgAsciiData;
-	TBuf8<400> msgAscii; 
-	SmsAtUtil::AppendDataToAscii(msgAscii,iEntryV1.iMsgData);
-	msgAsciiData.Copy( msgAscii );
-	INFO_PRINTF4(_L("SmsStoreRead index=%d,status=%d,msgData=%S\n"),
-			        iEntryV1.iIndex,iEntryV1.iMsgStatus,&msgAsciiData);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmsreceive.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-//
-// testltsysmsreceive.cpp
-//
-// Copyright (c) Symbian Software Ltd. Your copyright notice.  All rights reserved.
-//
-
-//user include
-#include "testltsysmsreceive.h"
-#include "smsatutil.h"
-
-
-CTestLtsySmsReceive::CTestLtsySmsReceive(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsySmsReceive::~CTestLtsySmsReceive()
-	{
-	}
-
-CTestLtsySmsReceive* CTestLtsySmsReceive::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsReceive* self = new (ELeave)CTestLtsySmsReceive(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsySmsReceive* CTestLtsySmsReceive::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsReceive* self=CTestLtsySmsReceive::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsySmsReceive::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsySmsReceive::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsReceive::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsReceive::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsReceive::doTestStepL called"));
-	TRAPD(err,ReceiveSmsL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when receive sms"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsReceive::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsReceive::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsySmsReceive::ReceiveSmsL()
-	{
-	TRequestStatus status;
-	RMobileSmsMessaging::TMobileSmsReceiveAttributesV1 receiveAttr;
-	RMobileSmsMessaging::TMobileSmsReceiveAttributesV1Pckg receiveAttrPckg(receiveAttr);
-	Sms().ReceiveMessage(status, iRecvMsg, receiveAttrPckg);
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	TBuf<200>  outReceive;
-	outReceive.Copy(iRecvMsg);
-	INFO_PRINTF2(_L("Receiveing TPDU=%S"),&outReceive);
-	INFO_PRINTF2(_L("ReceiveMessage() request status = %d"),r);
-	}
-
-

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmssend.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-//
-// testltsysmssend.cpp
-//
-// Copyright (c) Symbian Software Ltd. Your copyright notice.  All rights reserved.
-//
-
-//user include
-#include "testltsysmssend.h"
-#include "testltsysmsatutil.h"
-//constant defination
-_LIT8(KSmsMessagingData,"11000D91683156211075f6000800064F60597D0021");
-_LIT(KSmsSCA,"8613800100500");  
-
-CTestLtsySmsSend::CTestLtsySmsSend(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsySmsSend::~CTestLtsySmsSend()
-	{
-	}
-
-CTestLtsySmsSend* CTestLtsySmsSend::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsSend* self = new (ELeave)CTestLtsySmsSend(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsySmsSend* CTestLtsySmsSend::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsSend* self=CTestLtsySmsSend::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsySmsSend::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsySmsSend::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsSend::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsSend::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsSend::doTestStepL called"));
-	TRAPD(err,SendSmsL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when send message"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsSend::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsSend::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsySmsSend::SendSmsL()
-	{
-	TRequestStatus status;
-	RMobileSmsMessaging::TMobileSmsSendAttributesV1Pckg smsAttPckg(iSmsAttr);
-	TPtrC8 smsAsciiPdu(KSmsMessagingData);
-	TBuf8<200>  smsPdu;
-	SmsAtUtil::ConvertAsciiToBinary(smsAsciiPdu,smsPdu);
-	FillSmsAttibutes(KSmsSCA());
-	Sms().SendMessage(status,smsPdu,smsAttPckg);   
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	INFO_PRINTF2(_L("SendMessage() request status = %d"),r);
-	}
-
-void CTestLtsySmsSend::FillSmsAttibutes(const TDesC& aTelNumber)
-	{
-	_LIT8(KSubmit, "Submit");
-    iSmsAttr.iGsmServiceCentre.iTypeOfNumber = RMobilePhone::EInternationalNumber;
-    iSmsAttr.iGsmServiceCentre.iNumberPlan = RMobilePhone::EIsdnNumberPlan;
-    iSmsAttr.iGsmServiceCentre.iTelNumber.Copy(aTelNumber);
-    iSmsAttr.iCdmaServiceCategory = 0;
-    iSmsAttr.iCdmaTeleservice = 0;
-    iSmsAttr.iDataFormat = RMobileSmsMessaging::EFormatGsmTpdu;
-    iSmsAttr.iFlags = 0;
-    iSmsAttr.iMsgRef = 0;
-    iSmsAttr.iSubmitReport = KSubmit;
-    iSmsAttr.iMore = EFalse;
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmssendinvalidparam.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-//
-// testltsysmssendinvalidparam.cpp
-//
-// Copyright (c) Symbian Software Ltd. Your copyright notice.  All rights reserved.
-//
-
-//user include
-#include "testltsysmssendinvalidparam.h"
-#include "testltsysmsatutil.h"
-//constant defination
-_LIT8(KSmsMessagingData,"11000D91683156211075f6000800064F60597D0021");
-_LIT8(KSmsMessagingData1,"11000D91683156211075f6000800064F60597D002111000D91683156211075f6000800064F60597D002111000D91683156211075f6000800064F60597D002111000D91683156211075f6000800064F60597D002111000D91683156211075f6000800064F60597D002111000D91683156211075f6000800064F60597D002111000D91683156211075f6000800064F60597D002111000D91683156211075f6000800064F6059");
-_LIT(KSmsSCA,"8613800100500");  
-_LIT(KSmsSCA1,"8613800100500138001005001380010050013800100500138001005001380010050013800100500138001005001380010050");   
-_LIT(KSmsSCA2,"86138*#abc0W0"); 
-
-CTestLtsySmsSendInvalidParam::CTestLtsySmsSendInvalidParam(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsySmsSendInvalidParam::~CTestLtsySmsSendInvalidParam()
-	{
-	}
-
-CTestLtsySmsSendInvalidParam* CTestLtsySmsSendInvalidParam::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsSendInvalidParam* self = new (ELeave)CTestLtsySmsSendInvalidParam(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsySmsSendInvalidParam* CTestLtsySmsSendInvalidParam::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsSendInvalidParam* self=CTestLtsySmsSendInvalidParam::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsySmsSendInvalidParam::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsySmsSendInvalidParam::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsSendInvalidParam::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsSendInvalidParam::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsSendInvalidParam::doTestStepL called"));
-	TRAPD(err,SendSmsL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when send message"),err);
-	    SetTestStepResult(EFail);
-		}
-	
-	TRAPD(err1,SendSms1L());
-	if(err1 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when send message"),err1);
-	    SetTestStepResult(EFail);
-		}
-	
-	TRAPD(err2,SendSmsL());
-	if(err2 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when send message"),err2);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsSendInvalidParam::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsSendInvalidParam::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsySmsSendInvalidParam::SendSmsL()
-	{
-	TRequestStatus status;
-	RMobileSmsMessaging::TMobileSmsSendAttributesV1Pckg smsAttPckg(iSmsAttr);
-	//There is too long data
-	TPtrC8 smsAsciiPdu(KSmsMessagingData1);
-	TBuf8<200>  smsPdu;
-	SmsAtUtil::ConvertAsciiToBinary(smsAsciiPdu,smsPdu);
-	FillSmsAttibutes(KSmsSCA());
-	Sms().SendMessage(status,smsPdu,smsAttPckg);   
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	INFO_PRINTF2(_L("SendMessage() request status = %d"),r);
-	}
-
-void CTestLtsySmsSendInvalidParam::FillSmsAttibutes(const TDesC& aTelNumber)
-	{
-	_LIT8(KSubmit, "Submit");
-    iSmsAttr.iGsmServiceCentre.iTypeOfNumber = RMobilePhone::ENationalNumber;
-    iSmsAttr.iGsmServiceCentre.iNumberPlan = RMobilePhone::ENationalNumberPlan; 
-    iSmsAttr.iGsmServiceCentre.iTelNumber.Copy(aTelNumber);
-    iSmsAttr.iCdmaServiceCategory = 0;
-    iSmsAttr.iCdmaTeleservice = 0;
-    iSmsAttr.iDataFormat = RMobileSmsMessaging::EFormatGsmTpdu;
-    iSmsAttr.iFlags = 0;
-    iSmsAttr.iMsgRef = 0;
-    iSmsAttr.iSubmitReport = KSubmit;
-    iSmsAttr.iMore = EFalse;
-	}
-void CTestLtsySmsSendInvalidParam::SendSms1L()
-	{
-	TRequestStatus status;
-	RMobileSmsMessaging::TMobileSmsSendAttributesV1Pckg smsAttPckg(iSmsAttr);
-	TPtrC8 smsAsciiPdu(KSmsMessagingData);
-	TBuf8<200>  smsPdu;
-	SmsAtUtil::ConvertAsciiToBinary(smsAsciiPdu,smsPdu);
-	//There is too long sca
-	FillSmsAttibutes(KSmsSCA1());
-	Sms().SendMessage(status,smsPdu,smsAttPckg);   
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	INFO_PRINTF2(_L("SendMessage() request status = %d"),r);
-	}
-
-void CTestLtsySmsSendInvalidParam::FillSmsAttibutes1(const TDesC& aTelNumber)
-	{
-	_LIT8(KSubmit, "Submit");
-    iSmsAttr.iGsmServiceCentre.iTypeOfNumber = RMobilePhone::EInternationalNumber;
-    iSmsAttr.iGsmServiceCentre.iNumberPlan = RMobilePhone::EIsdnNumberPlan;
-    iSmsAttr.iGsmServiceCentre.iTelNumber.Copy(aTelNumber);
-    iSmsAttr.iCdmaServiceCategory = 0;
-    iSmsAttr.iCdmaTeleservice = 0;
-    iSmsAttr.iDataFormat = RMobileSmsMessaging::EFormatGsmTpdu;
-    iSmsAttr.iFlags = 0;
-    iSmsAttr.iMsgRef = 0;
-    iSmsAttr.iSubmitReport = KSubmit;
-    iSmsAttr.iMore = EFalse;
-	}
-void CTestLtsySmsSendInvalidParam::SendSms2L()
-	{
-	TRequestStatus status;
-	RMobileSmsMessaging::TMobileSmsSendAttributesV1Pckg smsAttPckg(iSmsAttr);
-	TPtrC8 smsAsciiPdu(KSmsMessagingData);
-	TBuf8<200>  smsPdu;
-	SmsAtUtil::ConvertAsciiToBinary(smsAsciiPdu,smsPdu);
-	//There is special sca
-	FillSmsAttibutes(KSmsSCA2());
-	Sms().SendMessage(status,smsPdu,smsAttPckg);   
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	INFO_PRINTF2(_L("SendMessage() request status = %d"),r);
-	}
-
-void CTestLtsySmsSendInvalidParam::FillSmsAttibutes2(const TDesC& aTelNumber)
-	{
-	_LIT8(KSubmit, "Submit");
-	//There is different TypeOfNumber and NumberPlan
-    iSmsAttr.iGsmServiceCentre.iTypeOfNumber = RMobilePhone::EUnknownNumber;
-    iSmsAttr.iGsmServiceCentre.iNumberPlan = RMobilePhone::EUnknownNumberingPlan;
-    iSmsAttr.iGsmServiceCentre.iTelNumber.Copy(aTelNumber);
-    iSmsAttr.iCdmaServiceCategory = 0;
-    iSmsAttr.iCdmaTeleservice = 0;
-    iSmsAttr.iDataFormat = RMobileSmsMessaging::EFormatGsmTpdu;
-    iSmsAttr.iFlags = 0;
-    iSmsAttr.iMsgRef = 0;
-    iSmsAttr.iSubmitReport = KSubmit;
-    iSmsAttr.iMore = EFalse;
-	}
-
-//End of file
-

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmsshareddata.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-// TestTelephonySmsSharedData.cpp
-// Copyright (c) Symbian Software Ltd 2008. All rights reserved.
-//
-// Implementation of the Class CTestTelephonySmsSharedData
-
-// CTSY include
-
-// user include
-#include "TestLtsySmsSharedData.h"
-
-/**
- * Constructor
- * 
- */
-CTestLtsySmsSharedData::CTestLtsySmsSharedData()
-	{
-	}
-
-/**
- * Factory function to create a new CTestLtsySmsSharedData object
- * 
- */
-CTestLtsySmsSharedData*CTestLtsySmsSharedData:: NewL()
-	{
-	CTestLtsySmsSharedData* self = new (ELeave) CTestLtsySmsSharedData();
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop();
-	return self;
-	}
-
-/**
- * Destructor
- * 
- */
-CTestLtsySmsSharedData::~CTestLtsySmsSharedData()
-	{
-	Reset();
-	}
-
-/**
- * Delete all message, message store objects
- * 
- */
-void CTestLtsySmsSharedData::Reset()
-	{
-	for(TInt i = iMessaging.Count()-1; i >= 0; i--)
-		{
-		iMessaging[i].Close();
-		}
-	
-	for(TInt j = iSmsStore.Count()-1; j >= 0; j--)
-		{
-		iSmsStore[j].Close();
-		}
-	
-	iMessaging.Reset();
-	iSmsStore.Reset();
-	}
-
-/**
- * ConstructL
- * 
- */
-void CTestLtsySmsSharedData::ConstructL()
-	{
-	}
-
-/**
- * return sms array
- * 
- */
-RArray<RMobileSmsMessaging>& CTestLtsySmsSharedData::SmsMessagingArray()
-	{
-	return iMessaging;
-	}
-
-/**
- * return sms store array
- * 
- */
-RArray<RMobileSmsStore>& CTestLtsySmsSharedData::SmsStoreArray()
-	{
-	return iSmsStore;
-	}
-
-// end of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmsstore.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +0,0 @@
-// 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:
-// 
-// 
-
-//user include
-#include "testltsysmsstore.h"
-#include "testltsysmsatutil.h"
-
-CTestLtsySmsStore::CTestLtsySmsStore(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsySmsStore::~CTestLtsySmsStore()
-	{
-	}
-
-CTestLtsySmsStore* CTestLtsySmsStore::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsStore* self = new (ELeave)CTestLtsySmsStore(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsySmsStore* CTestLtsySmsStore::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsStore* self=CTestLtsySmsStore::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsySmsStore::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsySmsStore::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsStore::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsStore::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsStore::doTestStepL called"));
-	TRAPD(err,StoreSmsL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when store sms"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsStore::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsStore::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-void CTestLtsySmsStore::StoreSmsL()
-	{
-	ReceiveSmsL();
-	TRAPD(err,WriteSmsL());
-	if(err != KErrNone)
-		{
-		NackSmsStoredL();
-		}
-	else
-		{
-		AckSmsStoredL();
-		}
-	}
-
-void CTestLtsySmsStore::ReceiveSmsL()
-	{
-	TRequestStatus status;
-	RMobileSmsMessaging::TMobileSmsReceiveAttributesV1Pckg receiveAttrPckg(iReceiveAttr);
-	Sms().ReceiveMessage(status, iRecvMsg, receiveAttrPckg);
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	TBuf<200>  outReceive;
-	outReceive.Copy(iRecvMsg);
-	INFO_PRINTF2(_L("Receiveing TPDU=%S"),&outReceive);
-	INFO_PRINTF2(_L("ReceiveMessage() request status = %d"),r);
-	}
-
-void CTestLtsySmsStore::WriteSmsL()
-	{
-	TRequestStatus status;
-	RMobilePhone::TMobileAddress smsWriteAddr;
-	smsWriteAddr.iTypeOfNumber = iReceiveAttr.iGsmServiceCentre.iTypeOfNumber;
-	smsWriteAddr.iNumberPlan = iReceiveAttr.iGsmServiceCentre.iNumberPlan;
-	smsWriteAddr.iTelNumber = iReceiveAttr.iGsmServiceCentre.iTelNumber;
-	
-	//For GsmTpdu
-    TBuf8<400>   writePduData; 
-    writePduData =  iRecvMsg;
-    FillWriteSmsAttibutesL(writePduData,smsWriteAddr);
-	}
-
-void CTestLtsySmsStore::AckSmsStoredL()
-	{
-	TBool full(EFalse);
-	TRequestStatus status;
-	_LIT8(KNullAck,"00");
-	Sms().AckSmsStored(status,KNullAck(),full);
-	User::WaitForRequest(status);
-	TInt r=status.Int();
-	INFO_PRINTF2(_L("AckSmsStored() request status = %d"),r);
-	}
-
-void CTestLtsySmsStore::NackSmsStoredL()
-	{
-	TRequestStatus status;
-	TInt rpCause(2);  
-	
-	Sms().NackSmsStored(status,iRecvMsg,rpCause);
-	User::WaitForRequest(status);
-	TInt r=status.Int();
-	INFO_PRINTF2(_L("AckSmsStored() request status = %d"),r);
-	}
-
-void CTestLtsySmsStore::FillWriteSmsAttibutesL(TBuf8<400> aTpdu,RMobilePhone::TMobileAddress  aMsgSca)
-	{
-	TRequestStatus status;
-	RMobileSmsStore::TMobileGsmSmsEntryV1 smsEntry;
-	RMobileSmsStore::TMobileGsmSmsEntryV1Pckg smsEntryPckg(smsEntry);
-	smsEntry.iMsgStatus=RMobileSmsStore::EStoredMessageUnsent;
-	smsEntry.iMsgData = aTpdu;
-	smsEntry.iServiceCentre = aMsgSca;
-	SmsStore().Write(status, smsEntryPckg);
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	INFO_PRINTF2(_L("Write() request status = %d"),r);
-	}

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmsstoregetinfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-//
-// testltsygetmessagestoreinfo.cpp
-//
-// Copyright (c) Symbian Software Ltd. Your copyright notice.  All rights reserved.
-//
-
-#include "testltsysmsstoregetinfo.h"
-
-CTestLtsySmsStoreGetInfo::CTestLtsySmsStoreGetInfo(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsySmsStoreGetInfo::~CTestLtsySmsStoreGetInfo()
-	{
-	}
-
-CTestLtsySmsStoreGetInfo* CTestLtsySmsStoreGetInfo::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsStoreGetInfo* self = new (ELeave)CTestLtsySmsStoreGetInfo(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsySmsStoreGetInfo* CTestLtsySmsStoreGetInfo::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsStoreGetInfo* self=CTestLtsySmsStoreGetInfo::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsySmsStoreGetInfo::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsySmsStoreGetInfo::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsStoreGetInfo::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsStoreGetInfo::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsStoreGetInfo::doTestStepL called"));
-	TRAPD(err,GetSmsStoreInfoL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when get sms store info"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsStoreGetInfo::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsStoreGetInfo::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsySmsStoreGetInfo::GetSmsStoreInfoL()
-	{
-	TRequestStatus status;
-	TPckg<RMobilePhoneBookStore::TMobilePhoneBookInfoV1> smsInfoPckg(iInfo);
-	SmsStore().GetInfo(status,smsInfoPckg);
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	INFO_PRINTF2(_L("GetInfo() request status = %d"),r);
-	CheckSmsStoreInfoL();
-	INFO_PRINTF4(_L("GetInfo() MobileTypeName = %S, TotalEntries=%d,UsedEntries=%d\n"),&iInfo.iName,iInfo.iTotalEntries,iInfo.iUsedEntries );
-	}
-
-void CTestLtsySmsStoreGetInfo::CheckSmsStoreInfoL()
-	{
-	TBool matched = ETrue;
-	if (!iInfo.iName.Compare(KETelIccSmsStore) == 0)
-		{
-		INFO_PRINTF2(_L("The tel sms store name %s could not match with expect one"),&(iInfo.iName));
-		matched = EFalse;
-		}
-	if(!matched)
-		{
-		SetTestStepResult(EFail);
-		}
-	}

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmswrite.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-//
-// testltsysmswrite.cpp
-//
-// Copyright (c) Symbian Software Ltd. Your copyright notice.  All rights reserved.
-//
-
-//user include
-#include "testltsysmswrite.h"
-#include "testltsysmsatutil.h"
-
-//constant defination
-_LIT8(KSmsMessagingData,"11000D91683156211075f6000800064F60597D0021");
-_LIT(KSmsSCA,"8613800100500");  
-
-CTestLtsySmsWrite::CTestLtsySmsWrite(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsySmsWrite::~CTestLtsySmsWrite()
-	{
-	}
-
-CTestLtsySmsWrite* CTestLtsySmsWrite::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsWrite* self = new (ELeave)CTestLtsySmsWrite(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsySmsWrite* CTestLtsySmsWrite::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsWrite* self=CTestLtsySmsWrite::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsySmsWrite::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsySmsWrite::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsWrite::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsWrite::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsWrite::doTestStepL called"));
-	TRAPD(err,WriteSmsL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when write message"),err);
-	    SetTestStepResult(EFail);
-		}
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsWrite::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsWrite::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsySmsWrite::WriteSmsL()
-	{
-
-	RMobilePhone::TMobileAddress smsWriteAddr;
-	smsWriteAddr.iTypeOfNumber = RMobilePhone::EInternationalNumber;
-	smsWriteAddr.iNumberPlan = RMobilePhone::EIsdnNumberPlan;
-	smsWriteAddr.iTelNumber = KSmsSCA;
-	//For GsmTpdu
-	TBuf8<400>   writePduAscii(KSmsMessagingData);                        
-	TBuf8<400>   writePduData; 
-	writePduData.Zero();
-    SmsAtUtil::ConvertAsciiToBinary(writePduAscii,writePduData);
-    FillWriteSmsAttibutesL(writePduData,smsWriteAddr);
- 	}
-
-void CTestLtsySmsWrite::FillWriteSmsAttibutesL(TBuf8<400> aTpdu,RMobilePhone::TMobileAddress  aMsgSca)
-	{
-	TRequestStatus status;
-	RMobileSmsStore::TMobileGsmSmsEntryV1 smsEntry;
-	RMobileSmsStore::TMobileGsmSmsEntryV1Pckg smsEntryPckg(smsEntry);
-	smsEntry.iMsgStatus=RMobileSmsStore::EStoredMessageUnsent;
-	smsEntry.iMsgData = aTpdu;
-	smsEntry.iServiceCentre = aMsgSca;
-	SmsStore().Write(status, smsEntryPckg);
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	INFO_PRINTF2(_L("Write() request status = %d"),r);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/src/testltsysmswriteinvalidparam.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,196 +0,0 @@
-//
-// testltsysmswriteinvalidparam.cpp
-//
-// Copyright (c) Symbian Software Ltd. Your copyright notice.  All rights reserved.
-//
-
-//user include
-#include "testltsysmswriteinvalidparam.h"
-#include "testltsysmsatutil.h"
-
-//constant defination
-_LIT8(KSmsMessagingData,"11000D91683156211075f6000800064F60597D0021");
-_LIT(KSmsSCA,"8613800100500"); 
-_LIT(KSmsSCA1,"8613800100500138001005001380010050013800100500138001005001380010050013800100500138001005001380010050");  
-_LIT(KSmsSCA2,"86138*#abc0W0");
-
-CTestLtsySmsWriteInvalidParam::CTestLtsySmsWriteInvalidParam(CTestLtsyModel& aTestModel)
-	: CTestLtsySmsBase(aTestModel)
-	{
-
-	}
-
-CTestLtsySmsWriteInvalidParam::~CTestLtsySmsWriteInvalidParam()
-	{
-	}
-
-CTestLtsySmsWriteInvalidParam* CTestLtsySmsWriteInvalidParam::NewLC(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsWriteInvalidParam* self = new (ELeave)CTestLtsySmsWriteInvalidParam(aTestModel);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-
-CTestLtsySmsWriteInvalidParam* CTestLtsySmsWriteInvalidParam::NewL(CTestLtsyModel& aTestModel)
-	{
-	CTestLtsySmsWriteInvalidParam* self=CTestLtsySmsWriteInvalidParam::NewLC(aTestModel);
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-void CTestLtsySmsWriteInvalidParam::ConstructL()
-	{
-
-	}
-
-TVerdict CTestLtsySmsWriteInvalidParam::doTestStepPreambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsWriteInvalidParam::doTestStepPreambleL called"));
-	SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsWriteInvalidParam::doTestStepL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsWriteInvalidParam::doTestStepL called"));
-	TRAPD(err,WriteSmsL());
-	if(err != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when write message"),err);
-	    SetTestStepResult(EFail);
-		}
-	
-	TRAPD(err1,WriteSms1L());
-	if(err1 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when write message"),err1);
-	    SetTestStepResult(EFail);
-		}
-	
-	TRAPD(err2,WriteSms2L());
-	if(err2 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when write message"),err2);
-	    SetTestStepResult(EFail);
-		}
-	
-	TRAPD(err3,WriteSms3L());
-	if(err3 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when write message"),err3);
-	    SetTestStepResult(EFail);
-		}
-	
-	TRAPD(err4,WriteSms4L());
-	if(err4 != KErrNone)
-		{
-		INFO_PRINTF2(_L("The error was returned %d!! when write message"),err4);
-	    SetTestStepResult(EFail);
-		}
-	
-	return TestStepResult();
-	}
-
-TVerdict CTestLtsySmsWriteInvalidParam::doTestStepPostambleL()
-	{
-	INFO_PRINTF1(_L("CTestLtsySmsWriteInvalidParam::doTestStepPostambleL called"));
-	return TestStepResult();
-	}
-
-void CTestLtsySmsWriteInvalidParam::WriteSmsL()
-	{
-	//There is too long sca
-	RMobilePhone::TMobileAddress smsWriteAddr;
-	    
-    smsWriteAddr.iTypeOfNumber = RMobilePhone::EInternationalNumber;
-  	smsWriteAddr.iNumberPlan = RMobilePhone::EIsdnNumberPlan;
-  	
-  	smsWriteAddr.iTelNumber = KSmsSCA1;
-  	TBuf8<400>   writePduAscii(KSmsMessagingData);                         //For GsmTpdu
-  	TBuf8<400>   writePduData; 
-  	writePduData.Zero();
-  	SmsAtUtil::ConvertAsciiToBinary(writePduAscii,writePduData);
-  	FillWriteSmsAttibutesL(writePduData,smsWriteAddr);
-   	}
-
-void CTestLtsySmsWriteInvalidParam::WriteSms1L()
-	{
-	//different TypeOfNumber and NumberPlan
-	RMobilePhone::TMobileAddress smsWriteAddr;
-	smsWriteAddr.iTypeOfNumber = RMobilePhone::ENetworkSpecificNumber;
-	smsWriteAddr.iNumberPlan = RMobilePhone::EDataNumberPlan;
-	
-	smsWriteAddr.iTelNumber = KSmsSCA;
-	 //For GsmTpdu
-	TBuf8<400>   writePduAscii(KSmsMessagingData);                        
-	TBuf8<400>   writePduData; 
-	writePduData.Zero();
-	SmsAtUtil::ConvertAsciiToBinary(writePduAscii,writePduData);
-  	FillWriteSmsAttibutesL(writePduData,smsWriteAddr);
-	}
-
-void CTestLtsySmsWriteInvalidParam::WriteSms2L()
-	{
-	//different TypeOfNumber,NumberPlan and sca
-	RMobilePhone::TMobileAddress smsWriteAddr;
-	smsWriteAddr.iTypeOfNumber = RMobilePhone::ESubscriberNumber;
-	smsWriteAddr.iNumberPlan = RMobilePhone::EPrivateNumberPlan;
-	
-	smsWriteAddr.iTelNumber = KSmsSCA2;
-	 //For GsmTpdu
-	TBuf8<400>   writePduAscii(KSmsMessagingData);                        
-	TBuf8<400>   writePduData; 
-	writePduData.Zero();
-	SmsAtUtil::ConvertAsciiToBinary(writePduAscii,writePduData);
-  	FillWriteSmsAttibutesL(writePduData,smsWriteAddr);
-	}
-void CTestLtsySmsWriteInvalidParam::WriteSms3L()
-	{
-	//different TypeOfNumber and NumberPlan
-	RMobilePhone::TMobileAddress smsWriteAddr;
-	
-	smsWriteAddr.iTypeOfNumber = RMobilePhone::ENationalNumber;
-	smsWriteAddr.iNumberPlan = RMobilePhone::ENationalNumberPlan;
-	
-	smsWriteAddr.iTelNumber = KSmsSCA;
-	 //For GsmTpdu
-	TBuf8<400>   writePduAscii(KSmsMessagingData);                        
-	TBuf8<400>   writePduData; 
-	writePduData.Zero();
-	
-	SmsAtUtil::ConvertAsciiToBinary(writePduAscii,writePduData);
-  	FillWriteSmsAttibutesL(writePduData,smsWriteAddr);
-	}
-
-void CTestLtsySmsWriteInvalidParam::WriteSms4L()
-	{
-	//different TypeOfNumber and NumberPlan
-	RMobilePhone::TMobileAddress smsWriteAddr;
-	
-	smsWriteAddr.iTypeOfNumber = RMobilePhone::EUnknownNumber;
-	smsWriteAddr.iNumberPlan = RMobilePhone::RMobilePhone::EUnknownNumberingPlan;
-	
-	smsWriteAddr.iTelNumber = KSmsSCA;
-	 //For GsmTpdu
-	TBuf8<400>   writePduAscii(KSmsMessagingData);                        
-	TBuf8<400>   writePduData; 
-	writePduData.Zero();
-	SmsAtUtil::ConvertAsciiToBinary(writePduAscii,writePduData);
-  	FillWriteSmsAttibutesL(writePduData,smsWriteAddr);
-	}
-void CTestLtsySmsWriteInvalidParam::FillWriteSmsAttibutesL(TBuf8<400> aTpdu,RMobilePhone::TMobileAddress  aMsgSca)
-	{
-	TRequestStatus status;
-	RMobileSmsStore::TMobileGsmSmsEntryV1 smsEntry;
-	RMobileSmsStore::TMobileGsmSmsEntryV1Pckg smsEntryPckg(smsEntry);
-	smsEntry.iMsgStatus=RMobileSmsStore::EStoredMessageUnsent;
-	smsEntry.iMsgData = aTpdu;
-	smsEntry.iServiceCentre = aMsgSca;
-	SmsStore().Write(status, smsEntryPckg);
-	User::WaitForRequest(status);
-	TInt r = status.Int();
-	INFO_PRINTF2(_L("Write() request status = %d"),r);
-	}
-
-//End of file

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/testdata/te_integration_stllsycallcontrol.ini	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-
-[Section0]
-TheString=CTestLtsyCallControlBase
-TheInt=0
-TheBool=False
-
-[Section1]
-TheString=CTestLtsySmsControlReceiveSmsCase1Step
-TheInt=1
-TheBool=True
-
-[Section2]
-TheString=CTestLtsySmsControlSendSmsCase1Step
-TheInt=2
-TheBool=False
-
-[Section50]
-TheString=CTestLtsyCallControlBase
-TheInt=0
-TheBool=False
-
-[Section51]
-TheString=CTestLtsyCallControlDialHangupCase
-TheInt=0
-TheBool=False
-
-
-[Section52]
-TheString=CTestLtsyCallControlNotifyIncomingCallCase1
-TheInt=0
-TheBool=False
-
-[Section53]
-TheString=CTestLtsyCallControlDialEmergencyCall
-TheInt=0
-TheBool=False
-
-[Section54]
-TheString=CTestLtsyCallControlCustomAPITerminateAllCalls
-TheInt=0
-TheBool=False
-
-[Section55]
-TheString=CTestLtsyCallControlPhoneTerminateAllCalls
-TheInt=0
-TheBool=False
-
-
-[Section56]
-TheString=CTestLtsyCallControlNotifyIncomingCallCase2
-TheInt=0
-TheBool=False
-
-[Section57]
-TheString=CTestLtsyCallControlNotifyIncomingCallCase3
-TheInt=0
-TheBool=False
-
-[Section58]
-TheString=CTestLtsyCallControlSwapCalls
-TheInt=0
-TheBool=False
-

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/testdata/te_integration_stllsycallcontrol.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-//
-PRINT Run all te_integration_stltsy Suite Tests
-
-//
-LOAD_SUITE te_integration_stltsySuite -SharedData
-//
-//Please add or make change of you test steps, here is sample only:
-
-PRINT ************************
-PRINT Start case 1
-PRINT Dial->Hold->Resume->Hold->Resume->Hang up
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlBase
-
-PRINT ************************
-PRINT Start case 2
-PRINT Dial->Hang up->Close
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlDialHangupCase
-
-PRINT ************************
-PRINT Start case 3
-PRINT Notify incoming call
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlNotifyIncomingCallCase1
-
-PRINT ************************
-PRINT Start case 4
-PRINT Dial emergency call
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlDialEmergencyCall
-
-PRINT ************************
-PRINT Start case 5
-PRINT Notify incoming call->Answer->RCustomAPI close all
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlCustomAPITerminateAllCalls
-
-
-PRINT ************************
-PRINT Start case 6
-PRINT Dial one->Dial two->Phone close all
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlPhoneTerminateAllCalls
-
-PRINT ************************
-PRINT Start case 7
-PRINT Notify incoming call 1
-PRINT Answer call 1
-PRINT Notify incoming call 2
-PRINT Answer call 2
-PRINT Hangup call 1->Hangup call 2
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlNotifyIncomingCallCase2
-
-PRINT ************************
-PRINT Start case 8
-PRINT Notify incoming call 1
-PRINT Answer call 1
-PRINT Hold 1
-PRINT Resume 1
-PRINT Hang up 1
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlNotifyIncomingCallCase3
-
-PRINT ************************
-PRINT Start case 9
-PRINT Notify incoming call 1
-PRINT Answer call 1
-PRINT Notify incoming call 2
-PRINT Answer call 2
-PRINT Swap call 1
-PRINT Swap call 2
-PRINT Hang up call 1
-PRINT Hang up call 2
-PRINT Close call 1
-PRINT Close call 2
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlSwapCalls
-
-PRINT ************************
-PRINT Start case 10
-PRINT Dial call number 11
-PRINT Close call
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlDialBadCall
-
-PRINT ************************
-PRINT Start case 11
-PRINT Dial call self number 
-PRINT Close call
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlDialSelfCall
-
-PRINT ************************
-PRINT Start case 12
-PRINT Dial normal call
-PRINT Dial emergency call
-PRINT ************************
-DELAY 2000
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsyCallControlDialEmergencyCallStopAllCall
-
-PRINT Complate_te_integration_stltsy_Tests

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/testdata/te_integration_stllsysmscontrol.ini	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-
-[Section0]
-TheString=CTestLtsyCallControlDiallCase1Step
-TheInt=0
-TheBool=False
-
-[Section1]
-TheString=CTestLtsySmsControlReceiveSmsCase1Step
-TheInt=1
-TheBool=True
-
-[Section2]
-TheString=CTestLtsySmsControlSendSmsCase1Step
-TheInt=2
-TheBool=False

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/testdata/te_integration_stllsysmscontrol.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-//
-PRINT Run all te_integration_stltsy Suite Tests
-
-//
-LOAD_SUITE te_integration_stltsySuite  -SharedData
-//
-//Please add or make change of you test steps, here is sample only:
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyOpenPhone
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyOpenSms 
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyOpenSmsStore
-RUN_TEST_STEP 20 te_integration_stltsySuite CTestLtsySmsSend 
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyGetMessageStoreInfo
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsySmsStoreGetInfo
-RUN_TEST_STEP 200 te_integration_stltsySuite CTestLtsySmsReceive
-delay 2000
-RUN_TEST_STEP 30 te_integration_stltsySuite CTestLtsySmsAck
-RUN_TEST_STEP 30 te_integration_stltsySuite CTestLtsySmsNack
-RUN_TEST_STEP 100 te_integration_stltsySuite CTestLtsySmsSendInvalidParam
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsySmsRead
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsySmsReadInvalidIndex
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsySmsDelete
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsySmsDeleteInvalidIndex
-delay 5000
-RUN_TEST_STEP 200 te_integration_stltsySuite CTestLtsySmsDeleteAll
-delay 5000
-RUN_TEST_STEP 200 te_integration_stltsySuite CTestLtsySmsStore
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsySmsWrite
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsySmsWriteInvalidParam
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyCloseSms  
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyCloseSmsStore                             
-                             
-
-PRINT Complate_te_integration_stltsy_Tests

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/testdata/te_integration_stltsyphonebook.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-//
-PRINT Run all te_integration_stltsy Suite Tests
-
-//
-LOAD_SUITE te_integration_stltsySuite  -SharedData
-//
-//Please add or make change of you test steps, here is sample only:
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyOpenPhone
-delay 5000
-RUN_TEST_STEP 120 te_integration_stltsySuite CTestLtsyPhbkGetStoreInfo
-delay 2000
-RUN_TEST_STEP 120 te_integration_stltsySuite CTestLtsyPhbkOpen 
-delay 10000
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyPhbkDelete 
-delay 2000
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyPhbkDeleteInvalidIndex
-delay 2000
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyPhbkWrite      
-delay 1000
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyPhbkWriteInvalidIndex
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyPhbkRead    
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyPhbkReadInvalidIndex
-RUN_TEST_STEP 10 te_integration_stltsySuite CTestLtsyPhbkClose                       
-                           
-
-PRINT Complate_te_integration_stltsy_Tests

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/testdata/te_integration_stltsyphonecontrol.ini	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-
-[Section0]
-TheString=CTestLtsyCallControlDiallCase1Step
-TheInt=0
-TheBool=False
-
-[Section1]
-TheString=CTestLtsySmsControlReceiveSmsCase1Step
-TheInt=1
-TheBool=True
-
-[Section2]
-TheString=CTestLtsySmsControlSendSmsCase1Step
-TheInt=2
-TheBool=False

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/testdata/te_integration_stltsyphonecontrol.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-//
-PRINT Run all te_integration_stltsy Suite Tests
-
-//
-LOAD_SUITE te_integration_stltsySuite -SharedData
-//
-//Please add or make change of you test steps, here is sample only:
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyOpenPhone
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyPhoneGetFdnStatus
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyPhoneGetNetworkRegistrationStatus
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyGetPhoneSingalCap
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyGetPhoneSingalStrength
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyGetPhoneBatteryCap
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyGetPhoneBatteryInfo
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyPhoneGetCellInfo
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyPhoneGetPhoneID
-RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyPhoneSetNetworkSelectionSetting
-RUN_TEST_STEP 30 te_integration_stltsySuite TestLtsyPhoneSelectNetwork
-//RUN_TEST_STEP 10 te_integration_stltsySuite TestLtsyClosePhone
-
-
-PRINT Complate_te_integration_stltsy_Tests

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/testdata/te_integration_stltsypktcontrol.ini	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-
-[Section0]
-TheString=CTestLtsyCallControlDiallCase1Step
-TheInt=0
-TheBool=False
-
-[Section1]
-TheString=CTestLtsySmsControlReceiveSmsCase1Step
-TheInt=1
-TheBool=True
-
-[Section2]
-TheString=CTestLtsySmsControlSendSmsCase1Step
-TheInt=2
-TheBool=False

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/testdata/te_integration_stltsypktcontrol.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-//
-PRINT Run all te_integration_stltsy Suite Tests
-
-//
-LOAD_SUITE te_integration_stltsySuite -SharedData
-//
-//Please add or make change of you test steps, here is sample only:
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktOpenPacket
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetServiceStatust
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktNetworkRegistrationStatus
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetServiceStatust
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktAttachNetwork
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetServiceStatust
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktNetworkRegistrationStatus
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetServiceStatust
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktDetachNetwork
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetServiceStatust
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktNetworkRegistrationStatus
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktAttachNetwork
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktNetworkRegistrationStatus
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetServiceStatust
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetStaticCapabilities
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetDynamicCapabilities
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktOpenContext
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktInitialiseContext
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetContextInfo
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktSetContextConfig
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetContextInfo
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktOpenContextQos
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktSetContextQoSProfile
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktActivateContext
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetContextInfo
-RUN_TEST_STEP 150 te_integration_stltsySuite TestLtsyPktDeactivateContext
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktGetContextInfo
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktCloseContextQos
-RUN_TEST_STEP 100 te_integration_stltsySuite TestLtsyPktDeleteContext
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktCloseContext
-RUN_TEST_STEP 50 te_integration_stltsySuite TestLtsyPktClosePacket
-
-
-PRINT Complate_te_integration_stltsy_Tests

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/testdata/te_integration_stltsysuite.ini	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-
-[Section0]
-TheString=CTestLtsyCallControlDiallCase1Step
-TheInt=0
-TheBool=False
-
-[Section1]
-TheString=CTestLtsySmsControlReceiveSmsCase1Step
-TheInt=1
-TheBool=True
-
-[Section2]
-TheString=CTestLtsySmsControlSendSmsCase1Step
-TheInt=2
-TheBool=False

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/xml/te_integration_stltsysuite.xml	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testSuite>
-  <name>te_integration_stltsySuite</name>
-  <testItems>
-    <test>te_integration_stltsyTest</test>
-  </testItems>
-  <testExecuteServers>
-    <server>te_integration_stltsySuite</server>
-  </testExecuteServers>
-</testSuite>
-

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/xml/te_integration_stltsysuite/te_integration_stltsytest.xml	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testExecuteTest>
-  <name>te_integration_stltsyTest</name>
-  <timeout>10000</timeout>
-  <testScripts>
-    <script>
-      <hostPath>\te_integration_stltsy\scripts\te_integration_stltsySuite.script</hostPath>
-      <devicePath>c:\te_integration_stltsySuite.script</devicePath>
-    </script>
-  </testScripts>
-  <testServers>
-    <server>te_integration_stltsySuite</server>
-  </testServers>
-  <dependencies>
-    <data>
-      <hostPath>\te_integration_stltsy\testdata\te_integration_stltsySuite.ini</hostPath>
-      <devicePath>c:\testdata\configs\te_integration_stltsySuite.ini</devicePath>
-    </data>
-  </dependencies>
-</testExecuteTest>

--- a/cbsref/telephonyrefplugins/atltsy/integrationtest/xml/te_integration_stltsysuite/testexecuteservers/te_integration_stltsysuite.xml	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testExecuteServer>
-  <name>te_integration_stltsySuite</name>
-  <mmpFile>te_integration_stltsySuite.mmp</mmpFile>
-  <bldInfPath>\te_integration_stltsy\group\bld.inf</bldInfPath>
-</testExecuteServer>

--- a/cbsref/telephonyrefplugins/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-// Copyright (c) 1999-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
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-#include "../atltsy/group/bld.inf"

Binary file cellularsrv_info/doc_pub/How_to_write_a_TSY.doc has changed

Binary file cellularsrv_info/doc_pub/Telephony_Subsystem_Architectural_Description.doc has changed

Binary file cellularsrv_info/doc_pub/Telephony_Subsystem_Functional_Specification.doc has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXCLI/CFAXSET.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,252 @@
+// 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:
+//
+
+#include "CFAX32.H"
+#include "faxsettings.h"
+
+ #include <commsdattypesv1_1.h>
+ 
+ using namespace CommsDat;
+
+// amended August 1998 as follows :
+
+// 1. TFaxSettings is defined, with its internalize and externalize functions,
+ // in this module solely for use by the apps that use faxtrans.  They should
+ // decide where the setting are stored and get or set them using the
+ // functions here. A reference to the settings to use are passed to
+ // faxtrans as parameters on instantiation of the CFaxTransfer object - eg
+ //
+ // CFaxTransfer * session =  CFaxTransfer::NewL (aFaxSettings);
+ //
+ // 2. A number of items previous part of TFaxSettings are now kept as part of
+ // the modem definitions by Dialstor - these include both ModemInitString
+ // and FaxInitString, together with the CSY module name and the comm port
+ // name and number.  Most importantly, the fax modem class is now part of the
+ // Dialstor data. A TDialstorModemPreferences object with this information in it is now
+ // part of the TFaxSettings, but this need NOT be initialized in the
+ // reference passed to CFaxTransfer on instantiation.  If the modem class
+ // does happen to be unknown, then a special CFaxModemDriver is used which
+ // does autodetection and nothing else.
+ //
+ // 3. As a conseqence, CFaxSettings no longer has Get or Set functions
+ // for TFaxSettings.  Instead, we have a ValidateAndGetClass function to
+ // validate the passed values in TFaxSettings (in case they are
+ // nonsense) and get the values from DialStore.
+ //
+
+/********************************************************************/
+
+EXPORT_C TFaxSettings& TFaxSettings::operator=(const TFaxSettings& aFaxSettings)
+/** Assignment operator.
+
+Copies the content of one TFaxSettings into another, replacing the existing 
+content.
+
+@param aFaxSettings A reference to the TFaxSettings to be copied. 
+@return A reference to this TFaxSettings. 
+@capability None
+*/
+	{
+	iFaxId = aFaxSettings.iFaxId;
+	iMaxSpeed = aFaxSettings.iMaxSpeed;
+	iMinSpeed = aFaxSettings.iMinSpeed;
+	iPreferredResolution = aFaxSettings.iPreferredResolution;
+	iPreferredCompression = aFaxSettings.iPreferredCompression;
+	iPreferredECM = aFaxSettings.iPreferredECM;
+	iVerbose = aFaxSettings.iVerbose;
+	iFaxOnDemandDelay = aFaxSettings.iFaxOnDemandDelay;
+	iFaxClass = aFaxSettings.iFaxClass;
+	return (*this);
+	}
+
+/********************************************************************/
+
+EXPORT_C void TFaxSettings::ExternalizeL (RWriteStream & inifile) const
+/** Externalises the TFaxSettings object to a write stream. The presence of this
+function means that the standard templated operator<<() (defined in s32strm.h) is available
+to externalise objects of this class.
+
+@param inifile  The stream to which the object should be externalised. 
+@capability None
+*/
+   {
+   inifile << iFaxId;
+   inifile.WriteInt32L (iMaxSpeed);
+   inifile.WriteInt32L (iMinSpeed);
+   inifile.WriteInt32L (iPreferredResolution);
+   inifile.WriteInt32L (iPreferredCompression);
+   inifile.WriteInt32L (iPreferredECM);
+   inifile.WriteInt32L (iVerbose);
+   inifile.WriteInt32L (iFaxOnDemandDelay);
+   inifile.WriteInt32L (iFaxClass);
+   }
+/********************************************************************/
+
+EXPORT_C void TFaxSettings::InternalizeL (RReadStream & inifile)
+/** Internalises the TFaxSettings object from a read stream. The presence of this
+function means that the standard templated operator>>() (defined in s32strm.h) is 
+available to internalise objects of this class. This function may leave if there 
+is a problem reading from the stream, or if internalisation causes an out of memory 
+error. 
+@param inifile  The stream from which the object should be internalised. 
+@capability None
+*/
+   {
+   inifile >> iFaxId;
+   iMaxSpeed = inifile.ReadInt32L ();
+   iMinSpeed = inifile.ReadInt32L ();
+   iPreferredResolution = (TFaxResolution) inifile.ReadInt32L ();
+   iPreferredCompression = (TFaxCompression) inifile.ReadInt32L ();
+   iPreferredECM = inifile.ReadInt32L ();
+   iVerbose = inifile.ReadInt32L ();
+   iFaxOnDemandDelay = inifile.ReadInt32L ();
+   iFaxClass = (TFaxClass) inifile.ReadInt32L ();
+   }
+/********************************************************************/
+
+CFaxSettings *CFaxSettings::NewLC ()
+   {
+   CFaxSettings *self = new (ELeave) CFaxSettings;
+   CleanupStack::PushL (self);
+   self->ConstructL ();
+   return self;
+   }
+/********************************************************************/
+
+CFaxSettings *CFaxSettings::NewL ()
+   {
+   CFaxSettings *self = NewLC ();
+   CleanupStack::Pop ();
+   return self;
+   }
+/********************************************************************/
+
+void CFaxSettings::ConstructL()
+	{
+
+	}
+/********************************************************************/
+
+CFaxSettings::~CFaxSettings ()
+   {
+   }
+/********************************************************************/
+
+void CFaxSettings::ValidateAndSetClassL (TFaxSettings * aFaxSettings)
+	{
+	TInt badspeed;
+
+	TFaxClass passedFaxClass = aFaxSettings->iFaxClass;
+	// first we check that the settings we are making are within range
+
+	badspeed = aFaxSettings->iMaxSpeed % 2400;
+	if (badspeed)
+		aFaxSettings->iMaxSpeed -= badspeed;
+	if ((aFaxSettings->iMaxSpeed > 14400) || (aFaxSettings->iMaxSpeed < 2400))
+		aFaxSettings->iMaxSpeed = 9600;
+
+	badspeed = aFaxSettings->iMinSpeed % 2400;
+	if (badspeed)
+		aFaxSettings->iMinSpeed -= badspeed;
+	if ((aFaxSettings->iMinSpeed > 14400) || (aFaxSettings->iMinSpeed < 2400))
+		aFaxSettings->iMinSpeed = 2400;
+
+	if (aFaxSettings->iMinSpeed > aFaxSettings->iMaxSpeed)
+		aFaxSettings->iMinSpeed = aFaxSettings->iMaxSpeed;
+
+	if (aFaxSettings->iPreferredResolution != EFaxNormal)
+		aFaxSettings->iPreferredResolution = (TFaxResolution)EFaxFine;
+
+	if (aFaxSettings->iPreferredCompression != (TFaxCompression)EModifiedHuffman)
+		aFaxSettings->iPreferredCompression = (TFaxCompression)EModifiedRead;
+
+	// second we read the current modem class
+
+	// AnnW, 9/8/99 - This all assumes that we are taking the modem settings from the 
+	// dial out IAP, which is fince for now, but may not be in the future?  This may also 
+	// need modifying for Linda?
+
+	CMDBSession* db = CMDBSession::NewL(KCDVersion1_1);
+	CleanupStack::PushL(db);
+	
+	// Read the currently selected connection preference and find preferred IAP
+	TInt prefRank  = 1;
+	
+	CCDConnectionPrefsRecord *connectionPrefs =
+		static_cast<CCDConnectionPrefsRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdConnectionPrefsRecord));
+	CleanupStack::PushL(connectionPrefs);
+	connectionPrefs->iRanking = prefRank;
+	connectionPrefs->iDirection = ECommDbConnectionDirectionOutgoing;
+	connectionPrefs->FindL(*db);
+	
+	// The following code is a temporary solution until an issue has been resolved in CommsDat
+	// start
+	CCDIAPRecord* tempPIapRecord =
+		static_cast<CCDIAPRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdIAPRecord));
+	tempPIapRecord->SetRecordId(connectionPrefs->iDefaultIAP);
+	connectionPrefs->iDefaultIAP.iLinkedRecord = tempPIapRecord;
+	
+	CCDIAPRecord* pIapRecord = (CCDIAPRecord*)connectionPrefs->iDefaultIAP.iLinkedRecord;
+	pIapRecord->SetRecordId(connectionPrefs->iDefaultIAP);
+	pIapRecord->LoadL(*db);
+	
+	CCDBearerRecordBase* tempBearerRecord =
+		static_cast<CCDBearerRecordBase*>(CCDRecordBase::RecordFactoryL(KCDTIdModemBearerRecord));
+	tempBearerRecord->SetRecordId(pIapRecord->iBearer);
+	pIapRecord->iBearer.iLinkedRecord = tempBearerRecord;
+
+	CCDBearerRecordBase* pBearerRecord = (CCDBearerRecordBase*) pIapRecord->iBearer.iLinkedRecord;
+	pBearerRecord->SetRecordId(pIapRecord->iBearer);
+	pBearerRecord->LoadL(*db);
+	// end
+	
+	TUint32 iapId = pBearerRecord->iRecordTag;
+	
+	CMDBField<TUint32>* bearerField = new(ELeave) CMDBField<TUint32>(KCDTIdIAPBearer);
+	CleanupStack::PushL(bearerField);
+	bearerField->SetRecordId(iapId);
+	bearerField->LoadL(*db);
+	TUint32 modemId = *bearerField;
+	CleanupStack::PopAndDestroy(bearerField);
+		
+	CMDBField<TUint32>* faxField = new(ELeave) CMDBField<TUint32>(KCDTIdFaxClassPref);
+	CleanupStack::PushL(faxField);
+	faxField->SetRecordId(modemId);
+	faxField->LoadL(*db);
+	TUint32 faxClass;
+	faxClass = *faxField;
+	aFaxSettings->iFaxClass = static_cast<TFaxClass>(faxClass);
+		
+	// finally we validate the modem class - if not class 1 or 2 or 2.0 we
+	// write back the class we came in with, which is assumed to be correct
+	// - this is how we update the Comms database  - other settings are ignored
+	
+	if ((aFaxSettings->iFaxClass != EClass1)
+		&& (aFaxSettings->iFaxClass != EClass2)
+		&& (aFaxSettings->iFaxClass != EClass2point0))
+		{
+		aFaxSettings->iFaxClass = passedFaxClass;
+		db->OpenTransactionL();
+		*faxField = aFaxSettings->iFaxClass;
+		faxField->ModifyL(*db);
+		db->CommitTransactionL();
+		}
+	CleanupStack::PopAndDestroy(faxField);
+		
+	CleanupStack::PopAndDestroy(2);		// db, connectionPrefs 
+		
+	}
+
+/********************************************************************/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXCLI/CFAXTSRC.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,262 @@
+// 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
+*/
+
+
+#include "CFAX32.H"
+
+/********************************************************************/
+
+CFaxTransferSource *CFaxTransferSource::NewLC()
+	{
+	CFaxTransferSource *self = new(ELeave) CFaxTransferSource;
+	CleanupStack::PushL(self);
+	self->ConstructL();
+	return self;
+	}
+/********************************************************************/
+
+CFaxTransferSource *CFaxTransferSource::NewL()
+	{
+	CFaxTransferSource *self = NewLC();
+	CleanupStack::Pop();
+	return self;
+	}
+/********************************************************************/
+
+void CFaxTransferSource::ConstructL ()
+   {
+   iSources = CBufSeg::NewL (256);
+   }
+/********************************************************************/
+
+CFaxTransferSource::~CFaxTransferSource ()
+   {
+   delete iSources;
+   iSources = NULL;
+   }
+/********************************************************************/
+
+// we come here with a document and a page or range of pages
+//EXPORT_C void CFaxTransferSource::AddSourceL (const TFileName & aFaxPageStore, const TFileName & aFaxPageStore2)
+//	{
+//	AddSourceL(aFaxPageStore,1);
+//	AddSourceL(aFaxPageStore2,1);
+//	iFaxPages=iFaxPages/2;
+//	}
+
+EXPORT_C void CFaxTransferSource::AddSourceL (const TFileName & aFaxPageStore, TFaxPreferredCompression aPreferredCompression)
+/**
+@capability WriteUserData
+*/
+   {
+   AddSourceL (aFaxPageStore, 1, aPreferredCompression);
+   }
+
+EXPORT_C void CFaxTransferSource::AddSourceL (const TFileName & aFaxPageStore, TInt aStartPage, TFaxPreferredCompression aPreferredCompression)
+/**
+@capability WriteUserData
+*/
+   {
+   if (aStartPage < 1)
+      User::Leave (KErrUnderflow);
+   TInt lastPage = OpenFaxOutL (aFaxPageStore);
+   CloseFaxStore ();
+   AddSourceL (aFaxPageStore, aStartPage, lastPage, aPreferredCompression);
+   }
+
+EXPORT_C void CFaxTransferSource::AddSourceL (const TFileName & aFaxPageStore, TInt aStartPage, TInt aEndPage, TFaxPreferredCompression aPreferredCompression)
+/**
+@capability WriteUserData
+*/
+   {
+   iPage = 0;
+   if (aStartPage < 1)
+      User::Leave (KErrUnderflow);
+   else
+      {
+      if (aStartPage > aEndPage)
+         User::Leave (KErrOverflow);
+      else
+         {
+         iOurFaxEntry.iFaxPageStore = aFaxPageStore;
+         iOurFaxEntry.iStartPage = aStartPage;
+         iOurFaxEntry.iPageCount = (aEndPage - aStartPage + 1);
+
+         iOutstream.Append (*iSources);
+         iOutstream << iOurFaxEntry;
+         iOutstream.CommitL ();
+
+         iFaxListEntries++;
+         iFaxPages += iOurFaxEntry.iPageCount;
+		 iOurPreferredCompression=aPreferredCompression;
+         }
+      }
+   }
+/********************************************************************/
+
+EXPORT_C void CFaxTransferSource::RemoveAllSources ()
+/**
+@capability WriteUserData
+*/
+   {
+   iFaxPages = 0;
+   iFaxListEntries = 0;
+   iSources->Reset ();
+   }
+/********************************************************************/
+
+// this gets the next page of the fax
+// and makes it all ready to be sent
+
+// the iInstream is opened already, and
+// we never call this if iFaxListEntries
+// and iOurFaxEntry.iPageCount are both zero
+
+void CFaxTransferSource::GetNextPageReadyL ()
+   {
+   // if no pages in a current open document we need to get the next doc
+
+   if (iOurFaxEntry.iPageCount == 0)
+      {
+
+      // if page count is 0 we haven't started yet
+      // otherwise close the finished document
+      // then read the next entry in
+      // mark one less entry to deal with
+      // and open the next document
+
+      if (iPage != 0)
+         CloseFaxStore ();
+
+      iInstream >> iOurFaxEntry;
+
+      --iFaxListEntries;
+      OpenFaxOutL (iOurFaxEntry.iFaxPageStore);
+
+      // skip pages if we don't send from page 1
+
+      for (--iOurFaxEntry.iStartPage; iOurFaxEntry.iStartPage; --iOurFaxEntry.iStartPage)
+         ReadPageParmsL ();
+      }
+   ReadPageParmsL ();
+   iPage++;
+   --iOurFaxEntry.iPageCount;
+   }
+/********************************************************************/
+
+void CFaxTransferSource::OpenFaxInL (const TDesC & aFileName)
+   {
+   if (iWriteFaxFile == NULL)
+      iWriteFaxFile = CWriteFaxFile::NewL ();
+   iWriteFaxFile->OpenL (aFileName, 0);
+   }
+
+void CFaxTransferSource::PagePrepare ()
+   {
+   iLines = 0;
+   ++iPage;
+   }
+
+void CFaxTransferSource::WriteFaxDataL (const TDesC8 & aBuffer)
+   {
+   iWriteFaxFile->iWriteFaxPages->AddEncodedScanLineL (aBuffer);
+   if (aBuffer.Length () != KMaxT4Des)
+      iLines++;
+   }
+
+void CFaxTransferSource::WritePageParmsL (TFaxBufSenderId & aSenderId)
+   {
+   iWriteFaxFile->iWriteFaxPages->EndPageL (TFaxResolution (iResolu), aSenderId, TFaxCompression (iCompression));
+   iWriteFaxFile->CommitL ();
+   }
+
+void CFaxTransferSource::CloseFaxInStore ()
+   {
+   iWriteFaxFile->Close ();     // was CloseL till 6/3/97
+   delete iWriteFaxFile;
+   iWriteFaxFile = NULL;
+   }
+/*******************************************************************/
+
+TInt CFaxTransferSource::OpenFaxOutL (const TDesC & aFileName)
+   {
+   CReadFaxFile *fax = iReadFaxFile;
+   if (fax == NULL)
+      iReadFaxFile = fax = CReadFaxFile::NewL ();
+   fax->OpenL (aFileName);
+   iPageInCurrentFile = 0;
+   return (fax->iReadFaxPages->NumPages ());
+   }
+
+TInt CFaxTransferSource::NextPageFind ()
+   {
+   return (iReadFaxFile->iReadFaxPages->NumPages ()) - iPageInCurrentFile;
+   }
+
+void CFaxTransferSource::ReadPageParmsL ()
+   {
+   CReadFaxPages & pages = *iReadFaxFile->iReadFaxPages;
+   pages.SetPageL (iPageInCurrentFile++);
+   const TFaxPageInfo & info = pages.CurrentPageInfo ();
+   iLines = info.iNumScanLines;
+   iResolu = info.iResolution;
+   iCompression = info.iCompression;
+   }
+
+void CFaxTransferSource::ReadFaxData(TDes8& aBuffer)
+	{
+	// Discard the following error
+	TRAP_IGNORE(iReadFaxFile->iReadFaxPages->GetEncodedScanLineL(aBuffer));
+	}
+
+void CFaxTransferSource::PreviousPageFindL()
+	{
+	--iPageInCurrentFile;
+	ReadPageParmsL();
+	}
+
+void CFaxTransferSource::CloseFaxStore ()
+   {
+   if (iReadFaxFile != NULL)
+      {
+      iReadFaxFile->Close ();
+      delete iReadFaxFile;
+      iReadFaxFile = NULL;
+      }
+   }
+
+
+/*******************************************************************/
+
+// we've also got a small subclass to handle the details of pages in the fax
+
+void TFaxEntry::ExternalizeL (RWriteStream & aStream) const
+   {
+   aStream << iFaxPageStore;
+   aStream.WriteUint8L (iStartPage);
+   aStream.WriteUint8L (iPageCount);
+   }
+
+void TFaxEntry::InternalizeL (RReadStream & aStream)
+   {
+   aStream >> iFaxPageStore;
+   iStartPage = aStream.ReadUint8L ();
+   iPageCount = aStream.ReadUint8L ();
+   }
+/********************************************************************/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXCLI/FAXCLI.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,1338 @@
+// 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:
+//
+
+#include "CFAX32.H"
+#include "dial.h"	                      // we no longer depend on DialStor, so must depend directly on Dial
+
+#include "FAXLOG.H"
+#include "faxsettings.h"
+
+ #include <commsdattypesv1_1.h>
+ #include <commsdatutils.h>
+ #include <commsdat_partner.h>
+
+ using namespace CommsDat;
+
+TInt FaxClientThread (TAny * session);  // function declaration needed here
+//TInt FaxConverterThread (TAny *);
+//RSemaphore jerry;
+/********************************************************************/
+
+
+/********************************************************************/
+
+CFaxTransfer::CFaxTransfer()
+	: CBase()
+	{}
+
+EXPORT_C CFaxTransfer *CFaxTransfer::NewLC (const TFaxSettings & aFaxSettings)
+/** Constructs a CFaxTransfer object, which offers the publicly exported 
+Symbian OS Fax Client API. 
+As is usual in Symbian OS, the only difference between this function and 
+NewL() is that this variant pushes the object to the cleanup stack.
+
+@param aFaxSettings  A reference to a TFaxSettings object which contains 
+persistent information applicable to all fax sessions. 
+@return  Pointer to the newly created object. 
+@leave KErrNoMemory There is insufficient memory to perform the operation. 
+@capability None
+*/
+   {
+   CFaxTransfer *self = new (ELeave) CFaxTransfer;
+   CleanupStack::PushL (self);
+   self->ConstructL (aFaxSettings);
+   return self;
+   }
+
+EXPORT_C CFaxTransfer *CFaxTransfer::NewL (const TFaxSettings & aFaxSettings)
+/** Constructs a CFaxTransfer object, which offers the publicly exported 
+Symbian OS Fax Client API.
+
+@param aFaxSettings A reference to a TFaxSettings object, which
+contains persistent information applicable to all fax sessions. 
+@return A pointer to the newly created object. 
+@leave KErrNoMemory There is insufficient memory to perform the operation. 
+@capability None
+*/
+   {
+   CFaxTransfer *self = NewLC (aFaxSettings);
+   CleanupStack::Pop ();
+   return self;
+   }
+/********************************************************************/
+
+void CFaxTransfer::ConstructL (const TFaxSettings & aFaxSettings)
+   {
+   // we now copy the TFaxSettings passed to us - we then
+   // validate the contents and fill in the DialStor bits.
+   // if we don't know the modem class we find it our here
+   iFaxSettings = aFaxSettings;
+   CFaxSettings *currentsettings;
+   currentsettings = CFaxSettings::NewL ();     // bug fix thanks to MartinA
+   CleanupStack::PushL (currentsettings);       // currentsettings saved
+   currentsettings->ValidateAndSetClassL (&iFaxSettings);       // since this could leave
+   CleanupStack::PopAndDestroy ();      // currentsettings deleted
+
+	//   if (((TFaxClass) iFaxSettings.iFaxClass != EClass1) &&
+	//     ((TFaxClass) iFaxSettings.iFaxClass != EClass2) &&
+	//       ((TFaxClass) iFaxSettings.iFaxClass != EClass2point0))
+	//      User::Leave (KFaxCannotAutodetect);
+
+   iFaxSessionSettings.iFaxClass = (TFaxClass) iFaxSettings.iFaxClass;
+   iFaxSessionSettings.iFaxId.Copy (iFaxSettings.iFaxId);
+   iFaxSessionSettings.iMaxSpeed = iFaxSettings.iMaxSpeed;
+   iFaxSessionSettings.iMinSpeed = iFaxSettings.iMinSpeed;
+   iFaxSessionSettings.iRxResolution = iFaxSettings.iPreferredResolution;
+   iFaxSessionSettings.iRxCompression = iFaxSettings.iPreferredCompression;
+   iFaxSessionSettings.iPreferredECM = iFaxSettings.iPreferredECM;
+   iFaxSessionSettings.iFaxOnDemandDelay = iFaxSettings.iFaxOnDemandDelay;
+
+   iSource = CFaxTransferSource::NewL ();
+   }
+/********************************************************************/
+
+CFaxTransfer::~CFaxTransfer ()
+/** Destructor
+
+Frees all resources owned by the object, prior to its destruction. */
+   {
+   delete iSource;
+   }
+/********************************************************************/
+
+// this function updates the TFaxTransferProgress structure for the
+// caller. It should be prior to inspection.
+
+EXPORT_C TInt CFaxTransfer::Progress ()
+/** Causes ETel to update the fax progress information in RFax::TProgress.
+
+It should be called prior to displaying the fax progress information.
+
+@return KErrNone if successful, otherwise another of the system-wide error 
+codes. 
+@capability None
+*/
+{
+	if (iFaxStarted)
+		{
+		iFaxClientProgress=EProgressRxTx;
+		return (iFax.GetProgress (iProgress));
+		}
+	if (iConverting)
+		{
+		iFaxClientProgress=EProgressConverting;
+		//aProgress=EProgressPreparing;
+		return (KErrNone);
+		}
+
+	//aProgress=EProgressInitialising;
+	return (KErrNone);
+}
+/********************************************************************/
+
+// this function tells faxtrans what phone number to dial
+// obviously only useful in a dialling mode !
+// the phone number is translated for the modem and service
+// and location required using dialstor facilities if they are
+// available - if not, the number is used in its raw state
+//
+// if use of a raw phonenumber is required then the inline function
+// SetPhoneNumber should be called instead.
+
+EXPORT_C void CFaxTransfer::SetPhoneNumberL (TDesC8 & aNumber)
+/** Resolves a local telephone number into an international number by 
+taking account of the current location and country.
+The alternative SetPhoneNumber() should be used if the phone number 
+must be used in its raw state. One of these functions must be called 
+before CFaxTransfer::Start() when a fax is to be sent. 
+This function may leave with KErrNoMemory if there is insufficient 
+memory to perform the operation. The leave code is one of the system 
+error codes: see system-wide error codes. 
+The current location and country information is obtained from the 
+location table in the communications database.
+The resolved number is then set as the actual phone number to dial.
+
+@param aNumber  Descriptor containing the phone number to be resolved. 
+@capability WriteUserData
+*/
+	{
+	SetPhoneNumber (aNumber);
+	TBuf < KMaxDialString > rawPhoneNumber;
+	rawPhoneNumber.Copy (aNumber);
+
+#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
+	CMDBSession* db = CMDBSession::NewL(KCDVersion1_2);
+#else
+	CMDBSession* db = CMDBSession::NewL(KCDVersion1_1);
+#endif
+	CleanupStack::PushL(db);
+		
+	// Read the currently selected connection preference and find preferred IAP
+	TInt prefRank  = 1;
+	
+	CCDConnectionPrefsRecord *connectionPrefs =
+		static_cast<CCDConnectionPrefsRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdConnectionPrefsRecord));
+	CleanupStack::PushL(connectionPrefs);
+	connectionPrefs->iRanking = prefRank;
+	connectionPrefs->iDirection = ECommDbConnectionDirectionOutgoing;
+	TBool error = connectionPrefs->FindL(*db);	
+	
+	// The following code is a temporary solution until an issue has been resolved in CommsDat
+	// start
+	CCDIAPRecord* tempPIapRecord =
+		static_cast<CCDIAPRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdIAPRecord));
+	tempPIapRecord->SetRecordId(connectionPrefs->iDefaultIAP);
+	connectionPrefs->iDefaultIAP.iLinkedRecord = tempPIapRecord;
+	
+	CCDIAPRecord* pIapRecord = (CCDIAPRecord*)connectionPrefs->iDefaultIAP.iLinkedRecord;
+	pIapRecord->SetRecordId(connectionPrefs->iDefaultIAP);
+	pIapRecord->LoadL(*db);
+	
+	CCDBearerRecordBase* tempBearerRecord =
+		static_cast<CCDBearerRecordBase*>(CCDRecordBase::RecordFactoryL(KCDTIdModemBearerRecord));
+	tempBearerRecord->SetRecordId(pIapRecord->iBearer);
+	pIapRecord->iBearer.iLinkedRecord = tempBearerRecord;
+
+	CCDBearerRecordBase* pBearerRecord = (CCDBearerRecordBase*) pIapRecord->iBearer.iLinkedRecord;
+	pBearerRecord->SetRecordId(pIapRecord->iBearer);
+	pBearerRecord->LoadL(*db);
+	// end
+	
+	TUint32 iapId = pBearerRecord->iRecordTag;
+	
+	CCDIAPRecord *iapRecord =
+		static_cast<CCDIAPRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdIAPRecord));
+	CleanupStack::PushL(iapRecord);
+	iapRecord->SetRecordId(iapId);
+	iapRecord->LoadL(*db);
+
+	// more temporary code
+	// start	
+	CCDBearerRecordBase* tempLocationRecord =
+		static_cast<CCDBearerRecordBase*>(CCDRecordBase::RecordFactoryL(KCDTIdLocationRecord));
+	tempLocationRecord->SetRecordId(iapRecord->iLocation);
+	iapRecord->iLocation.iLinkedRecord = tempLocationRecord;
+	
+	CCDLocationRecord* pLocationRecord = (CCDLocationRecord*)iapRecord->iLocation.iLinkedRecord;
+	pLocationRecord->SetRecordId(iapRecord->iLocation);
+	pLocationRecord->LoadL(*db);
+	// end
+	
+	//CommsDat Migration: Would this be the correct way to check whether or not a linked record exists:
+	if (pLocationRecord == NULL)	
+		{
+		iPhoneNumber.Copy(rawPhoneNumber);
+		}
+	else
+		{
+		TBuf<32> serviceType;
+		serviceType.Copy(iapRecord->iServiceType);
+
+		if (!serviceType.Compare(TBuf<32>(DIAL_OUT_ISP)))	// Chargecard only valid for dial out ISP
+			{
+			// Get service type id
+			TUint32 serviceId = iapRecord->iService;
+			
+			CCDDialOutISPRecord *ispRecord =
+				static_cast<CCDDialOutISPRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdDialOutISPRecord));
+			CleanupStack::PushL(ispRecord);
+			ispRecord->SetRecordId(serviceId);
+			ispRecord->LoadL(*db);
+			TUint32 locationId = 0;
+			TUint32 chargecardId = 0;
+			TRAPD(err,CommsDatUtils::CCommsDatUtils::ResolvePhoneNumberL(rawPhoneNumber, iPhoneNumber, TParseMode(EForDialing), locationId, chargecardId));
+			// if resolving the phone number fails, use the raw phone number
+			if (err)
+				{
+				iPhoneNumber.Copy(rawPhoneNumber);
+				}
+			
+			CleanupStack::PopAndDestroy(ispRecord);
+			}
+		else
+			{
+			iPhoneNumber.Copy(rawPhoneNumber);
+			}
+		}
+	CleanupStack::PopAndDestroy(3); // db, connectionPrefs, iapRecord
+	}
+/********************************************************************/
+
+// in order to cancel a fax session we set a cancel flag in the lowest
+// level (CFaxModem) - if this has not yet been fully created then we set
+// a flag in the next level up (CFaxModemDriver) instead, which is always
+// going to be there as it is created via CFaxTransfer::ConstructL
+//
+// because of the way that the CFaxModem monitors its request flag
+// we need to avoid multiple cancel requests, so only the first call to
+// Cancel has any effect on it
+
+EXPORT_C void CFaxTransfer::Cancel ()
+/** Tells the fax engine to cancel the fax session at the first convenient 
+opportunity.
+
+The caller should wait for cancellation to complete, which will usually be 
+signalled by the fax thread's TRequestStatus completing with a KFaxCancelRequested 
+error code. After the fax thread completes, Stop() should be called in the 
+normal way.
+
+The function can be called at any time after the call to Start(). 
+@capability None
+*/
+   {
+   if ((iClientCancel == KRequestPending) || (iClientCancel == KErrNone))
+      {
+      TRequestStatus *cancelClient = &iClientCancel;
+      iDriverThread.RequestComplete (cancelClient, KErrCancel);
+      }
+   }
+/********************************************************************/
+
+EXPORT_C TInt CFaxTransfer::Start (TRequestStatus & aThreadStat)
+/**
+Start fax sending or receiving session by launching a separate high priority thread.
+A call to Start must be paired with a call to Stop as this is an EPOC32 requirement.
+
+@param     aThreadStat  thread logon request status
+@return    thread creation code
+@capability NetworkServices
+@capability ReadUserData
+@capability WriteUserData
+*/
+   {
+    // the heap and stack sizes set here (4K each) are pure guesswork
+    // CFaxModemDriver has allocated heap space in the parent thread
+    // for any objects it needs to create after this stage
+    // stack sizes increased by 512K to allow etel to connect
+
+   TInt state = KErrNone;
+   TInt heapSize = 0x14000;
+   TInt stackSize = 0x14000;
+
+	__FLOG_FAXCLI(_L8(" "));
+	__FLOG_FAXCLI(_L8("-------------------------- new log --------------------------"));
+	__FLOG_FAXCLI(_L8("CFaxTransfer::Start, starting FaxClientThread"));
+	__FLOG_FAXCLI(_L8(" "));
+
+   state = iDriverThread.Create ((_L ("FaxClientThread")), FaxClientThread, stackSize, heapSize, heapSize, this, EOwnerThread);
+   if (state)
+      {
+      state = KFaxThreadError;
+      }
+   else
+      {
+      aThreadStat = KRequestPending;
+      if (iClientCancel != KErrCancel)
+         iClientCancel = KRequestPending;
+      iDriverThread.Logon (aThreadStat);
+      iDriverThread.SetPriority (EPriorityRealTime);
+      iDriverThread.Resume ();
+      }
+   return (state);
+   }
+/*********************************************************************/
+
+EXPORT_C void CFaxTransfer::Stop ()
+/** Kills the fax thread once it has completed. 
+
+Fax threads do not kill themselves, so every successful call to CFaxTransfer::Start() 
+must be paired with a call to CFaxTransfer::Stop(). 
+@capability NetworkServices
+@capability ReadUserData
+@capability WriteUserData
+*/
+   {
+   iDriverThread.Close ();
+   }
+/*********************************************************************/
+
+// this is a utility function which is the entry to our thread
+// it isn't part of any class, but we pass the address
+// of our CFaxTransfer in so that we can check the
+// session parameter and get back to the required function
+//
+// All possible leaves should be trapped as the return
+// from this function is the TRequestStatus which the
+// caller to CFaxTransfer::Start is waiting for.
+
+TInt FaxClientThread (TAny * session)
+   {
+
+
+   // start of unecessary bureaucracy - error checking left out
+/*#define CSY_NAME _L("ECUART")
+#define LDD_NAME _L("ECOMM")
+#if defined (__WINS__)
+#define PDD_NAME _L("ECDRV")
+#else
+#define PDD_NAME _L("EUART1")
+#endif*/
+
+/*
+   User::LoadPhysicalDevice (PDD_NAME);
+   User::LoadLogicalDevice (LDD_NAME);*/
+// jerry.CreateGlobal(_L("FaxCliSem"),0,EOwnerProcess);
+   
+   RCommServ server;
+   // coverity[check_return]
+   server.Connect ();
+// end of unecessary bureaucracy
+
+   TInt state;
+   CTrapCleanup *cleanup = CTrapCleanup::New ();
+// CFaxTransfer *faxsession = (CFaxTransfer *) session;
+   CFaxTransfer *faxsession =reinterpret_cast<CFaxTransfer *>(session);
+	__FLOG_FAXCLI(_L8("FaxClientThread entering..."));
+
+   state = faxsession->iTelServer.Connect ();
+   if (state == KErrNone)
+   {
+   TBuf<KCommsDbSvrMaxFieldLength> tsyName;
+   TRAP(state,faxsession->GetPhoneModuleNameL(tsyName));
+   if (state==KErrNone)
+	{
+      state = faxsession->iTelServer.LoadPhoneModule (tsyName);
+      if (state == KErrNone)
+         {
+		 RTelServer::TPhoneInfo phoneInfo;
+		 state = faxsession->GetPhoneInfoForTsy(tsyName,phoneInfo);
+		 if (state == KErrNone)
+			{
+			
+			__FLOG_FAXCLI(_L8("FaxClientThread iPhone.Open"));
+			state = faxsession->iPhone.Open (faxsession->iTelServer, phoneInfo.iName);
+            if (state == KErrNone)
+				{
+				
+				__FLOG_FAXCLI(_L8("FaxClientThread iLine.Open"));
+				state = faxsession->iLine.Open (faxsession->iPhone, _L ("Fax"));
+				if (state == KErrNone)
+					{
+					//
+					// If the call name has been provided, then open the
+					// existing call, otherwise open a new call.
+					//
+					if (faxsession->iCallName.Length() == 0)
+						{
+						__FLOG_FAXCLI(_L8("FaxClientThread iCall.OpenNewCall"));
+						state = faxsession->iCall.OpenNewCall (faxsession->iLine);
+						}
+					else
+						{
+						__FLOG_FAXCLI(_L8("FaxClientThread iCall.OpenExistingCall"));
+						state = faxsession->iCall.OpenExistingCall(faxsession->iLine, faxsession->iCallName);
+						}
+
+					if (state == KErrNone)
+						{
+						faxsession->iSource->iPage = 0;
+						if (faxsession->iMode & KFaxReceive)
+							{
+							faxsession->iFaxSessionSettings.iMode = RCall::EReceive;
+							TRAP (state, faxsession->FaxReceiveL ());
+							
+							__FLOG_FAXCLI1(_L8("FaxClientThread FaxReceiveL exited state=%d"),state);
+							
+							faxsession->iSource->CloseFaxInStore ();
+							}		
+			            else
+					        {
+							faxsession->iFaxSessionSettings.iMode = RCall::ETransmit;
+							TRAP (state, faxsession->FaxTransmitL ());
+							faxsession->iSource->iInstream.Close ();
+							}
+
+	                    // we tidy up by deleting any objects created
+						// (it does no harm if their pointers are already NULL)
+						// and we close any streams (which also does no harm
+						// if they have already been closed)
+
+						faxsession->iFaxStarted = EFalse;
+						faxsession->iFax.Close ();
+						faxsession->iSource->CloseFaxStore ();
+						delete faxsession->iSource->iWriteFaxFile;
+						faxsession->iSource->iWriteFaxFile = NULL;
+		                delete faxsession->iSource->iReadFaxFile;
+						faxsession->iSource->iReadFaxFile = NULL;
+						
+						faxsession->iSource->iOutstream.Close ();
+						faxsession->iSource->iInstream.Close ();
+						
+						RCall::TStatus callStatus;
+						faxsession->iCall.GetStatus(callStatus);
+						
+						__FLOG_FAXCLI1(_L8("FaxClientThread callStatus=%d"),callStatus);
+
+						if (callStatus!=RCall::EStatusIdle)
+							faxsession->iCall.HangUp ();
+						
+						__FLOG_FAXCLI(_L8("FaxClientThread iCall.Close"));
+						faxsession->iCall.Close ();
+						}
+					
+					__FLOG_FAXCLI(_L8("FaxClientThread iLine.Close"));
+					faxsession->iLine.Close ();
+					}
+				
+				__FLOG_FAXCLI(_L8("FaxClientThread iPhone.Close"));
+				faxsession->iPhone.Close ();
+				}
+			}
+		faxsession->iTelServer.UnloadPhoneModule (tsyName);
+		}
+		}
+    faxsession->iTelServer.Close ();
+    }
+
+   delete cleanup;
+
+// intercept the etel wrong modem type error
+   if (state == KErrEtelWrongModemType) state = KFaxErrWrongModemType;
+
+   return (state);
+   }
+
+/*********************************************************************/
+
+void CFaxTransfer::GetPhoneModuleNameL(TDes& aModuleName) const
+	{
+	// AnnW, 9/8/99 - This all assumes that we are taking the modem settings from the 
+	// dial out IAP, which is fince for now, but may not be in the future?  This may also 
+	// need modifying for Linda?
+	
+	CMDBSession* db = CMDBSession::NewL(KCDVersion1_1);
+	CleanupStack::PushL(db);
+	
+	// Read the currently selected connection preference and find preferred IAP
+	TInt prefRank  = 1;
+	
+	CCDConnectionPrefsRecord *connectionPrefs = 
+		static_cast<CCDConnectionPrefsRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdConnectionPrefsRecord));
+	CleanupStack::PushL(connectionPrefs);
+	connectionPrefs->iRanking = prefRank;
+	connectionPrefs->iDirection = ECommDbConnectionDirectionOutgoing;
+	connectionPrefs->FindL(*db);
+	
+	// The following code is a temporary solution until an issue has been resolved in CommsDat
+	// start
+	CCDIAPRecord* tempPIapRecord =
+		static_cast<CCDIAPRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdIAPRecord));
+	tempPIapRecord->SetRecordId(connectionPrefs->iDefaultIAP);
+	connectionPrefs->iDefaultIAP.iLinkedRecord = tempPIapRecord;
+	
+	CCDIAPRecord* pIapRecord = (CCDIAPRecord*)connectionPrefs->iDefaultIAP.iLinkedRecord;
+	pIapRecord->SetRecordId(connectionPrefs->iDefaultIAP);
+	pIapRecord->LoadL(*db);
+	
+	CCDBearerRecordBase* tempBearerRecord =
+		static_cast<CCDBearerRecordBase*>(CCDRecordBase::RecordFactoryL(KCDTIdModemBearerRecord));
+	tempBearerRecord->SetRecordId(pIapRecord->iBearer);
+	pIapRecord->iBearer.iLinkedRecord = tempBearerRecord;
+
+	CCDBearerRecordBase* pBearerRecord = (CCDBearerRecordBase*) pIapRecord->iBearer.iLinkedRecord;
+	pBearerRecord->SetRecordId(pIapRecord->iBearer);
+	pBearerRecord->LoadL(*db);
+	// end
+	
+	TUint32 iapId = pBearerRecord->iRecordTag;
+	
+	CMDBField<TUint32>* bearerField = new(ELeave) CMDBField<TUint32>(KCDTIdIAPBearer);
+	CleanupStack::PushL(bearerField);
+	bearerField->SetRecordId(iapId);
+	bearerField->LoadL(*db);
+	TUint32 modemId = *bearerField;
+	CleanupStack::PopAndDestroy(bearerField);
+
+	CMDBField<TDesC>* tsyField = new(ELeave) CMDBField<TDesC>(KCDTIdTsyName);
+	CleanupStack::PushL(tsyField);
+	tsyField->SetRecordId(modemId);
+	tsyField->SetMaxLengthL(KMaxTextLength);
+	tsyField->LoadL(*db);
+	aModuleName = *tsyField;
+	CleanupStack::PopAndDestroy(tsyField);
+	
+	CleanupStack::PopAndDestroy(2); // db, connectionPrefs
+	}
+
+void CFaxTransfer::CancelFaxServerSession ()
+   {
+   if (iMode & KFaxWaitForRing)
+      iCall.AnswerIncomingCallCancel ();
+   else
+      {
+      if (iMode & KFaxOffHook)
+         iCall.ConnectCancel ();
+      else
+         iCall.DialCancel ();
+      }
+   }
+/*********************************************************************/
+// receiving a fax is easy because it is passive
+// just open the file for receiving and off we go
+
+void CFaxTransfer::FaxReceiveL ()
+   {
+
+	__FLOG_FAXCLI(_L8("CFaxTransfer::FaxReceiveL entering"));
+
+   if (iMode & KFaxPoll)
+      iFaxSessionSettings.iFaxRetrieveType = RCall::EFaxPoll;
+   else
+      iFaxSessionSettings.iFaxRetrieveType = RCall::EFaxOnDemand;
+
+   iSource->OpenFaxInL (iReceiveFileName);
+
+   SetFaxSettingsL();
+
+   if (iMode & KFaxWaitForRing)
+      {//-- answering incoming call if fax is waiting for a call
+	  iCall.AnswerIncomingCall (iTransferStatus);	
+      if (iClientCancel != KRequestPending)
+         {//-- cancel request, leave
+         iCall.AnswerIncomingCallCancel ();
+		 User::WaitForRequest(iTransferStatus);
+         User::Leave (KFaxCancelRequested);
+         }
+      }
+   else	//if (iMode & KFaxWaitForRing) 
+      {//-- if fax is not waiting for a call, dial
+      if (iMode & KFaxOffHook)
+         iCall.Connect (iTransferStatus);
+      else
+         {
+         if (iPhoneNumber.Length() == 0)
+            User::Leave (KErrCouldNotConnect);
+         iCall.Dial (iTransferStatus, iPhoneNumber);
+         }
+      }
+
+   TRequestStatus reqStatus;
+   RCall::TStatus callStatus;
+   iCall.NotifyStatusChange (reqStatus, callStatus);
+
+   for (;;)
+      {
+      User::WaitForAnyRequest ();
+      if (reqStatus != KRequestPending)
+         {
+         //-- Call status changed
+         if (reqStatus.Int () != KErrNone)
+            {
+            CancelFaxServerSession ();
+            User::Leave (reqStatus.Int ());
+            }
+         if (iMode & KFaxWaitForRing)
+            {//-- Fax is waiting for a ring
+			if (callStatus == RCall::EStatusRinging)
+				{//-- Call status is 'Ringing', continue waiting 
+				iCall.NotifyStatusChange(reqStatus, callStatus);
+				reqStatus = KRequestPending;
+				continue;
+				}
+			else 
+			 //-- due to PIA-586KGE fix (changes in CATAnswerFax::Start()) 'Connecting' may be not noticed here
+			 //-- so EStatusConnected state is ok
+			 if (callStatus != RCall::EStatusAnswering && callStatus != RCall::EStatusConnected )
+					{
+					iCall.AnswerIncomingCallCancel ();
+					User::Leave (KFaxEtelServerError);
+					} //if (callStatus != RCall::EStatusAnswering)
+            } //if (iMode & KFaxWaitForRing)
+         else
+            {//-- Fax is not waiting for a ring 
+            if (iMode & KFaxOffHook)
+               {
+               if (callStatus != RCall::EStatusConnecting)
+                  {
+                  iCall.ConnectCancel ();
+                  User::Leave (KFaxEtelServerError);
+                  }
+               }
+            else if (callStatus != RCall::EStatusDialling)
+               {
+               iCall.DialCancel ();
+               User::Leave (KFaxEtelServerError);
+               }
+            }
+         TInt ret = iFax.Open (iCall);
+         if (ret != KErrNone)
+            {
+            CancelFaxServerSession ();
+            User::Leave (ret);
+            }
+         iFaxStarted = ETrue;
+         reqStatus = KRequestPending;
+         }//if (reqStatus != KRequestPending)
+      else if (iClientCancel != KRequestPending)
+         {//-- Fax cancel request
+         if (iFaxStarted == EFalse)
+            iCall.NotifyStatusChangeCancel ();
+         CancelFaxServerSession ();
+         User::Leave (KFaxCancelRequested);
+         }
+      else if (iTransferStatus != KRequestPending)
+         {//--iCall.AnswerIncomingCall status changed
+         if (iFaxStarted == EFalse)
+            iCall.NotifyStatusChangeCancel ();
+         User::LeaveIfError (iTransferStatus.Int ());
+         break;
+         }
+      else
+         {
+         if (iFaxStarted == EFalse)
+            iCall.NotifyStatusChangeCancel ();
+         CancelFaxServerSession ();
+         User::Leave (KErrCompletion);  // stray event handle
+         }
+      }
+
+   //-- Data transfer phase
+   User::LeaveIfError (iFax.GetProgress (iProgress));
+   while (iProgress.iPhase == EDataTransfer)
+      {
+      iSource->iResolu = iProgress.iResolution;
+      iSource->iCompression = iProgress.iCompression;
+      for (;;)
+         {
+         iFax.Read (iTransferStatus, iDataBuf);
+         User::WaitForRequest (iTransferStatus, iClientCancel);
+         if (iClientCancel != KRequestPending)
+            {
+            iFax.TerminateFaxSession ();
+            User::Leave (KFaxCancelRequested);
+            }
+         User::LeaveIfError (iTransferStatus.Int ());
+
+         // the server has buffered up lines to minimize interaction
+         // iDataBuf starts with a TInt containing the number of lines
+         // Each line follows, preceded with a TInt containing its length
+         // which must be copied as it might not be aligned on a 4-byte
+         // boundary - a line of zero length indicates we have reached
+         // the end of the page
+
+         TUint8 *nextLine = CONST_CAST (TUint8 *, iDataBuf.Ptr ());
+         TInt lengthOfLine=0;
+         TInt numberOfLines;
+
+         Mem::Copy (&numberOfLines, nextLine, sizeof (TInt));
+         nextLine += sizeof (TInt);
+
+         while (numberOfLines--)
+            {
+            Mem::Copy (&lengthOfLine, nextLine, sizeof (TInt));
+            if (lengthOfLine == 0)
+               break;
+            nextLine += sizeof (TInt);
+            TPtrC8 currentLine (nextLine, lengthOfLine);
+            iSource->WriteFaxDataL (currentLine);
+            nextLine += lengthOfLine;
+            }
+         if (lengthOfLine == 0)
+            break;
+         }
+      iSource->WritePageParmsL (iProgress.iAnswerback);
+      iFax.WaitForEndOfPage (iTransferStatus);
+      User::WaitForRequest (iTransferStatus, iClientCancel);
+      if (iClientCancel != KRequestPending)
+         {
+         iFax.TerminateFaxSession ();
+         User::Leave (KFaxCancelRequested);
+         }
+      User::LeaveIfError (iTransferStatus.Int ());
+      User::LeaveIfError (iFax.GetProgress (iProgress));
+	  	  
+      }
+//	iSource->CloseFaxInStore ();
+    if (iProgress.iCompression==EModifiedRead)
+		 Convert1dL ();
+   }
+/*********************************************************************/
+
+// sending a fax is rather more complex
+//
+// we need a valid phone number (we don't do polling)
+//
+// we need a valid list of pages to send
+//
+// we need to set the resolution we require to that of the
+// fax we want to send (use the last page)
+//
+
+void CFaxTransfer::FaxTransmitL ()
+   {
+   
+   
+   __FLOG_FAXCLI(_L8("CFaxTransfer::FaxTransmitL entering"));
+
+   TBool ConversionStatus=FALSE;
+   //TInt err=0;
+   if (iSource->iOurPreferredCompression==Prefer2D)
+		{	
+		TRAPD (retcode,Convert2dL());
+		if (retcode==KErrNone)
+			ConversionStatus=TRUE;
+		else
+			{
+			ConversionStatus=FALSE;
+			iSource->iOurPreferredCompression=Prefer1D;		// if anything goes wrong during conversion
+			}												// try the 1D version.
+		}
+   if ((iSource->iFaxPages == 0) || (iSource->iFaxListEntries == 0))
+      User::Leave (KErrNotFound);
+   iSource->iSavedFaxListEntries = iSource->iFaxListEntries;
+   iSource->iOurFaxEntry.iPageCount = 0; 
+   iSource->iInstream.Open (*iSource->iSources);
+   iSource->GetNextPageReadyL ();
+
+   if (iSource->iOurPreferredCompression==Prefer1D)
+	   iFaxSessionSettings.iTxPages=iSource->iFaxPages;
+
+   // we pass in to the server the resolution of the last added source page
+
+   iFaxSessionSettings.iTxResolution = (TFaxResolution) iSource->iResolu;
+   if ((iSource->iOurPreferredCompression==Prefer2D) && ConversionStatus==TRUE)
+		iFaxSessionSettings.iTxCompression = (TFaxCompression) EModifiedRead;	
+   else
+	   iFaxSessionSettings.iTxCompression = (TFaxCompression) iSource->iCompression;
+
+   SetFaxSettingsL();	// pass the settings to the Fax Server
+   SetSharedFileHandlesL();
+
+   if (iMode & KFaxOffHook)
+      iCall.Connect (iTransferStatus);
+   else
+      {
+      if (iPhoneNumber.Length() == 0)
+         User::Leave (KErrCouldNotConnect);
+      iCall.Dial (iTransferStatus, iPhoneNumber);
+      }
+
+   TRequestStatus reqStatus;
+   RCall::TStatus callStatus;
+   iCall.NotifyStatusChange (reqStatus, callStatus);
+
+   for (;;)
+      {
+      User::WaitForAnyRequest ();
+      if (reqStatus != KRequestPending)
+         {
+         if (reqStatus.Int () != KErrNone)
+														// initialisation and comm port errors
+            {
+            CancelFaxServerSession ();
+            User::Leave (reqStatus.Int ());
+            }
+         if (iMode & KFaxOffHook)
+            {
+            if (callStatus != RCall::EStatusConnecting)
+               {
+               iCall.ConnectCancel ();
+               User::Leave (KFaxEtelServerError);
+               }
+            }
+         else if (callStatus != RCall::EStatusDialling)
+            {
+            iCall.DialCancel ();
+            User::Leave (KFaxEtelServerError);
+            }
+         TInt ret = iFax.Open (iCall);
+         if (ret != KErrNone)
+            {
+            CancelFaxServerSession ();
+            User::Leave (ret);
+            }
+         iFaxStarted = ETrue;
+         reqStatus = KRequestPending;   // to prevent first scenario being
+										// chosen each time any request comes in
+         }
+      else if (iClientCancel != KRequestPending)
+         {
+         if (iFaxStarted == EFalse)
+            iCall.NotifyStatusChangeCancel ();
+         CancelFaxServerSession ();
+         User::Leave (KFaxCancelRequested);
+         }
+      else if (iTransferStatus != KRequestPending)
+         {
+         if (iFaxStarted == EFalse)
+            iCall.NotifyStatusChangeCancel ();
+         User::LeaveIfError (iTransferStatus.Int ());
+         break;
+         }
+      else
+         {
+         if (iFaxStarted == EFalse)
+            iCall.NotifyStatusChangeCancel ();
+         CancelFaxServerSession ();
+         User::Leave (KErrCompletion);  // stray event handle
+         }
+      }
+
+   for (;;)
+      {
+      User::LeaveIfError (iFax.GetProgress (iProgress));
+      TInt thispage = iProgress.iPage;
+      TInt thisline = 1;
+      ASSERT (iSource->iLines);
+
+		if ((iProgress.iCompression) && (iSource->iSavedFaxListEntries>=1))
+			{
+			while (iSource->iCompression == EModifiedHuffman)		// loop until we 
+			iSource->GetNextPageReadyL ();							// find the 2D document
+			}
+	  
+      //we buffer up lines to minimize client-server interaction
+      //iDataBuf starts with a TInt containing the number of lines
+      //Each line follows, preceded with a TInt containing its length
+      //which must be copied as it might not be aligned on a 4-byte boundary
+
+      TUint8 *startData;
+      TUint8 *lineData;
+      TInt numberOfLines;
+      const TUint8 *maxData;
+
+      TUint8 *currentLineData;
+      TInt currentLineLength;
+
+      for (;;)
+         {
+         lineData = startData = CONST_CAST (TUint8 *, iDataBuf.Ptr ());
+         maxData = startData + iDataBuf.MaxLength () - KMaxT4Des - sizeof (TInt);
+
+         iDataBuf.SetMax ();
+         numberOfLines = 0;
+         lineData += sizeof (TInt);
+         for (;;)
+            {
+            if (thisline > iSource->iLines)
+               break;
+            thisline++;
+            numberOfLines++;
+            currentLineData = lineData + sizeof (TInt);
+            *currentLineData = 0x0;
+            TPtr8 currentLine (currentLineData + 1, 0, KMaxT4Des - 1);
+            iSource->ReadFaxData (currentLine);
+            currentLineLength = currentLine.Length () + 1;
+            Mem::Copy (lineData, &currentLineLength, sizeof (TInt));
+            lineData += sizeof (TInt);
+            lineData += currentLineLength;
+            if (lineData > maxData)
+               break;
+            }
+         Mem::Copy (startData, &numberOfLines, sizeof (TInt));
+         iDataBuf.SetLength (lineData - startData);
+         iFax.Write (iTransferStatus, iDataBuf);
+         User::WaitForRequest (iTransferStatus, iClientCancel);
+         if (iClientCancel != KRequestPending)
+            {
+            iFax.TerminateFaxSession ();
+            User::Leave (KFaxCancelRequested);
+            }
+         User::LeaveIfError (iTransferStatus.Int ());
+         if (thisline > iSource->iLines)
+            break;
+         }
+      iDataBuf.Zero ();
+      iFax.WaitForEndOfPage (iTransferStatus);
+      User::WaitForRequest (iTransferStatus, iClientCancel);
+      if (iClientCancel != KRequestPending)
+         {
+         iFax.TerminateFaxSession ();
+         User::Leave (KFaxCancelRequested);
+         }
+      User::LeaveIfError (iTransferStatus.Int ());
+      User::LeaveIfError (iFax.GetProgress (iProgress));
+      if (iProgress.iPhase != EDataTransfer)
+         break;
+      if (thispage == iProgress.iPage)
+         iSource->PreviousPageFindL ();
+      else
+         iSource->GetNextPageReadyL ();
+      }
+   if ((iProgress.iCompression==EModifiedHuffman) && (iSource->iOurPreferredCompression==Prefer2D))
+   {
+	   for (TInt i=0; i<(iSource->iFaxPages/2);i++)
+	   iSource->GetNextPageReadyL ();						
+   }
+}
+
+void CFaxTransfer::SetFaxSettingsL()
+	{
+   TInt error;
+   RPhone::TStatus phoneStatus;
+   
+   error=iPhone.GetStatus(phoneStatus);
+	if (error == KErrNone)
+		{
+		if ((phoneStatus.iModemDetected == RPhone::EDetectedNotPresent) || (phoneStatus.iModemDetected == RPhone::EDetectedUnknown))
+			{
+			TRequestStatus initialiseStatus;
+			iPhone.Initialise(initialiseStatus);
+			User::WaitForAnyRequest();
+			if (iClientCancel != KRequestPending)
+				{
+				iPhone.InitialiseCancel();					// issue initialiseCancel command
+				User::WaitForRequest(initialiseStatus);		// wait for it to complete
+				User::Leave(KFaxCancelRequested);			// leave with  KFaxCancelRequested
+				}	
+			User::LeaveIfError(initialiseStatus.Int());
+			}
+		}   
+   TInt ret=KErrNone;	// so communication with modem has begun...
+   TInt count=0;		// we have a loop where we try three times to set fax settings in the
+						// unlikely event that the initialisation sequence has just started
+						// so the phoneStatus gives ModemDetected Present, but the supported fax
+						// classes have not yet been ascertained.
+   do 
+	{
+	ret=iCall.SetFaxSettings (iFaxSessionSettings);	// retry until init sequence has found out what
+													// the fax classes supported are.
+	if (ret==KErrEtelUnknownModemCapability)
+		User::After(500000);
+	}
+   while (ret==KErrEtelUnknownModemCapability && iClientCancel==KRequestPending && count++<3);
+   if (iClientCancel!=KRequestPending)
+	   ret=KFaxCancelRequested;
+   User::LeaveIfError(ret);
+   }
+void CFaxTransfer::SetSharedFileHandlesL()
+	{
+	//Open a file server session and a file handle on the private header file to be shared.
+	RFs sharedFs;
+	RFile sharedHeaderFile;
+	
+	User::LeaveIfError(sharedFs.Connect());
+	CleanupClosePushL(sharedFs);
+	//allow it to be shared
+	User::LeaveIfError(sharedFs.ShareProtected());
+	
+	//get path 
+	TFileName headerFullPath;
+	CFaxHeaderLines::GeneratePathForHeaderFileL(headerFullPath);
+	
+	//Open the file in read-only mode
+	User::LeaveIfError(sharedHeaderFile.Open(sharedFs, headerFullPath, EFileRead));
+	CleanupClosePushL(sharedHeaderFile);
+	
+	User::LeaveIfError(iCall.AdoptFaxSharedHeaderFile(sharedHeaderFile));
+	CleanupStack::PopAndDestroy();//sharedHeaderFile
+	CleanupStack::PopAndDestroy();//sharedFs
+	}
+	
+TInt CFaxTransfer::GetPhoneInfoForTsy(const TDes& aTsyName, RTelServer::TPhoneInfo& aPhoneInfo) const
+//
+//	Finds the index of the phone which belongs to TSY named "aTsyName", and retrieves its info.
+//
+	{
+	 TInt count=0;
+	 iTelServer.EnumeratePhones(count);
+	 TName matchTsyName;
+	 TInt ret = iTelServer.GetTsyName(0,matchTsyName);
+	 if (ret == KErrNone)
+		{
+		 TInt i=0;
+		 if (count>1)
+			{
+			while (matchTsyName.CompareF(aTsyName)!=KErrNone && i++<count && ret==KErrNone)
+				ret = iTelServer.GetTsyName(i,matchTsyName);
+			}
+		 ASSERT(matchTsyName.CompareF(aTsyName)==KErrNone);
+		 iTelServer.GetPhoneInfo(i,aPhoneInfo);
+		}
+	 return ret;
+	}
+
+/********************************************************************/
+
+EXPORT_C void CFaxTransfer::AddSourceL (const TFileName & aFaxPageStore, TFaxPreferredCompression aPreferredCompression)
+/** Specifies which pages of a fax store file should be sent. 
+It can be called more than once to add multiple pages from different files. Typically, 
+this function is called twice for each transmission: once to queue the cover sheet, 
+and a second time to queue the remainder of the fax.
+The overloaded variants are supplied primarily to help error recovery in cases when 
+a fax transmission is either incomplete or when specific pages need to be resent. 
+When transmitting a fax, at least one variant of this function must be called before 
+CFaxTransfer::Start().
+
+@param aFaxPageStore  Name of the fax store file from which to take pages.
+@param  aPreferredCompression Preferred compression.
+@capability WriteUserData
+*/
+   {
+   iSource->AddSourceL (aFaxPageStore, 1,aPreferredCompression);
+   }
+
+EXPORT_C void CFaxTransfer::AddSourceL (const TFileName & aFaxPageStore, TInt aStartPage,TFaxPreferredCompression aPreferredCompression)
+/** Specifies which pages of a fax store file should be sent. 
+It can be called more than once to add multiple pages from different files. 
+Typically, this function is called twice for each transmission: once to queue 
+the cover sheet, and a second time to queue the remainder of the fax.
+The overloaded variants are supplied primarily to help error recovery in cases 
+when a fax transmission is either incomplete or when specific pages need to be 
+resent. When transmitting a fax, at least one variant of this function must be 
+called before CFaxTransfer::Start().
+
+@param aFaxPageStore  Name of the fax store file from which to take pages. 
+@param aStartPage  Page in file to start from. If omitted, the file is sent 
+from the start. 
+@param  aPreferredCompression Preferred compression.
+@capability WriteUserData
+*/
+   {
+   iSource->AddSourceL (aFaxPageStore, aStartPage, aPreferredCompression);
+   }
+
+EXPORT_C void CFaxTransfer::AddSourceL (const TFileName & aFaxPageStore, TInt aStartPage, TInt aEndPage, TFaxPreferredCompression aPreferredCompression)
+/**Specifies which pages of a fax store file should be sent. 
+It can be called more than once to add multiple pages from different files. 
+Typically, this function is called twice for each transmission: once to queue 
+the cover sheet, and a second time to queue the remainder of the fax.
+The overloaded variants are supplied primarily to help error recovery in cases 
+when a fax transmission is either incomplete or when specific pages need to be 
+resent. When transmitting a fax, at least one variant of this function must be 
+called before CFaxTransfer::Start().
+
+@param aFaxPageStore  Name of the fax store file from which to take pages. 
+@param aStartPage  Page in file to start from. If omitted, the file is sent from the start. 
+@param aEndPage  Page in file to stop sending. If omitted, transmission continues to the end. 
+@param  aPreferredCompression Preferred compression.
+@capability WriteUserData
+*/
+   {
+   iSource->AddSourceL (aFaxPageStore, aStartPage, aEndPage, aPreferredCompression);
+   }
+
+//EXPORT_C void CFaxTransfer::AddSourceL (const TFileName & aFaxPageStore, const TFileName & aFaxPageStore2)
+//	{
+//	iSource->AddSourceL(aFaxPageStore, aFaxPageStore2);
+//	}
+
+EXPORT_C void CFaxTransfer::RemoveAllSources ()
+/** Clears the complete list of pages previously selected for faxing using one 
+of the variants of AddSourceL(). 
+
+Removal of individual items from the list of pages to be fax is not possible. 
+
+This function must be used between successive fax transmissions if previously 
+sent pages aren't to be sent again. 
+@capability WriteUserData
+*/
+   {
+   iSource->RemoveAllSources ();
+   }
+
+/********************************************************************/
+void CFaxTransfer::Convert2dL ()
+	{	
+	TInt err=0;
+	TInt k=0;
+	TBuf<64> filename;
+	CWriteFaxFile*  writeFaxFile;
+	CReadFaxFile*   readFaxFile;
+	TRawScanLine	decodedScanLine;
+	//TFaxBufSenderId sd;
+	TFaxBufSenderId senderId;
+
+
+	writeFaxFile = CWriteFaxFile::NewL();
+	CleanupStack::PushL(writeFaxFile);
+	readFaxFile  = CReadFaxFile::NewL();
+	CleanupStack::PushL(readFaxFile);
+	iConverting=TRUE;
+	
+	TRAP (err,readFaxFile->OpenL(iSource->iOurFaxEntry.iFaxPageStore));
+	if (err!=KErrNone)
+		{
+		iConverting=FALSE;
+		User::Leave(err);
+		}
+
+ 	readFaxFile->iReadFaxPages->SetPageL(0);
+	TFaxPageInfo info = readFaxFile->iReadFaxPages->CurrentPageInfo();
+	if (info.iCompression != EModifiedHuffman)
+		User::Panic(_L("Not a 1D file"),1);
+
+	//writeFaxFile->OpenL(_L("c:\\blank2D.fax"),64);
+	filename.Copy(iSource->iOurFaxEntry.iFaxPageStore);
+	filename.Append(_L("2d"));
+	// the second push in OpenL doesn't cause a double deletion of writeFaxFile, since it is pushed by using TCleanupItem.
+	// coverity [double_push]
+	writeFaxFile->OpenL(filename,64);
+	//writeFaxFile->OpenL(iSource->iOurFaxEntry.iFaxPageStore,64);
+	
+
+	for (k=0; k<iSource->iFaxPages; k++)
+	{
+	readFaxFile->iReadFaxPages->SetPageL(k);
+	TFaxPageInfo info = readFaxFile->iReadFaxPages->CurrentPageInfo();
+	if (info.iCompression != EModifiedHuffman)
+		User::Panic(_L("Not a 1D file"),1);
+	writeFaxFile->iWriteFaxPages->StartPage(info.iResolution, EModifiedRead);
+	for (TInt n = info.iNumScanLines ; n  ; n--)
+		{
+		readFaxFile->iReadFaxPages->GetScanLineL(decodedScanLine);	
+		writeFaxFile->iWriteFaxPages->AddScanLineL(decodedScanLine);
+		}
+
+	writeFaxFile->iWriteFaxPages->EndPageL(info.iResolution,senderId, EModifiedRead);
+	}// end of for statement
+		
+	writeFaxFile->CommitL();
+	writeFaxFile->Close();
+	readFaxFile->Close();
+		
+	AddSourceL(filename,Prefer2D);
+	iFaxSessionSettings.iTxPages = (iSource->iFaxPages/2);	// sent only the 2d version of the document
+															// which means half the attached pages
+	CleanupStack::PopAndDestroy(2);
+	iConverting=FALSE;
+}	
+
+
+
+/***********************************************************************************/
+// This function takes the received 2D file and converts it to 1D
+// The 2D file will be deleted and the 1D version of the file will 
+// inherit the name of the received 2D version
+/************************************************************************************/
+void CFaxTransfer::Convert1dL ()
+	{	
+	TInt err=0;
+	TInt k=0;
+	TBuf<64> filename;
+	CWriteFaxFile* writeFaxFile;
+	CReadFaxFile*  readFaxFile;
+	TRawScanLine decodedScanLine;
+	//TFaxBufSenderId sd;
+	TFaxBufSenderId senderId;
+
+	writeFaxFile = CWriteFaxFile::NewL();
+	CleanupStack::PushL(writeFaxFile);
+	readFaxFile  = CReadFaxFile::NewL();
+	CleanupStack::PushL(readFaxFile);	
+	iConverting=TRUE;
+
+	//TRAP (err,readFaxFile->OpenL(iSource->iOurFaxEntry.iFaxPageStore));
+	TRAP (err,readFaxFile->OpenL(iReceiveFileName));
+	if (err!=KErrNone)
+		User::Leave(err);
+		
+ 	readFaxFile->iReadFaxPages->SetPageL(0);
+	TFaxPageInfo info = readFaxFile->iReadFaxPages->CurrentPageInfo();
+	//if (info.iCompression != EModifiedHuffman)
+	if (info.iCompression != EModifiedRead)
+		User::Panic(_L("Not a 2D file"),1);
+	
+	//filename.Copy(iSource->iOurFaxEntry.iFaxPageStore);
+	filename.Copy(iReceiveFileName);
+	filename.Append(_L("1d"));
+	// the second push in OpenL doesn't cause a double deletion of writeFaxFile, since it is pushed by using TCleanupItem.
+	// coverity [double_push]
+	writeFaxFile->OpenL(filename,64);
+	//	writeFaxFile->OpenL(iSource->iOurFaxEntry.iFaxPageStore,64);
+	
+
+	TInt iRxPages=readFaxFile->iReadFaxPages->NumPages();
+
+	for (k=0; k<iRxPages; k++)
+	{
+	readFaxFile->iReadFaxPages->SetPageL(k);
+	TFaxPageInfo info = readFaxFile->iReadFaxPages->CurrentPageInfo();
+	//if (info.iCompression != EModifiedHuffman)
+	if (info.iCompression != EModifiedRead)
+		User::Panic(_L("Not a 2D file"),1);
+	//writeFaxFile->iWriteFaxPages->StartPage(info.iResolution, EModifiedRead);
+	writeFaxFile->iWriteFaxPages->StartPage(info.iResolution, EModifiedHuffman);
+	for (TInt n = info.iNumScanLines ; n  ; n--)
+		{
+		readFaxFile->iReadFaxPages->GetScanLineL(decodedScanLine);	
+		writeFaxFile->iWriteFaxPages->AddScanLineL(decodedScanLine);
+		}
+
+	//writeFaxFile->iWriteFaxPages->EndPageL(info.iResolution,senderId, EModifiedRead);
+	writeFaxFile->iWriteFaxPages->EndPageL(info.iResolution,senderId, EModifiedHuffman);
+	}// end of for statement
+		
+	writeFaxFile->CommitL();
+	writeFaxFile->Close();
+	readFaxFile->Close();
+	
+	RFs FileServer;
+	err = FileServer.Connect();
+	if (err !=KErrNone)
+		User::Leave(err);
+	User::LeaveIfError(FileServer.Delete(iReceiveFileName));
+
+	User::LeaveIfError(FileServer.Rename(filename,iReceiveFileName));
+	
+	FileServer.Close();
+
+	CleanupStack::PopAndDestroy(2);	
+	iConverting=FALSE;
+//	AddSourceL(filename,Prefer2D);
+//	iFaxSessionSettings.iTxPages = (iSource->iFaxPages/2);	// sent only the 2d version of the document
+	}	
+
+
+/*
+
+CFaxTransfer::StartThread()
+	{
+	TInt state = KErrNone;
+	TInt heapSize = 0x14000;	
+	TInt stackSize = 0x14000;
+
+	reinterpret_cast<TAny*>(this);  // this points to a CFaxTransfer Object
+	state = iConverterThread.Create ((_L ("FaxConverterThread")), FaxConverterThread, stackSize, heapSize, heapSize, this, EOwnerThread);
+	if (state)
+		{
+		state = KFaxThreadError;
+		}
+	else
+		{
+		//aThreadStat = KRequestPending;
+		//if (iClientCancel != KErrCancel)
+		//iClientCancel = KRequestPending;
+		//iDriverThread.Logon (aThreadStat);
+		
+		iConverterThread.SetPriority (EPriorityRealTime);
+		iConverterThread.Resume ();
+		}
+	return state;
+	}
+
+TInt FaxConverterThread (TAny * session)
+	{
+	TInt m;
+	CTrapCleanup *cleanup = CTrapCleanup::New ();
+	CFaxTransfer *faxtransfer =reinterpret_cast<CFaxTransfer *>(session);
+	RSemaphore aSemaphore;
+	TFindSemaphore mysemaphore(_L("FaxCli*"));
+
+    TFullName      theName (_L("FaxCliSem"));
+//  RSemaphore     theSem;             // derived from RHandleBase
+    
+  if ((mysemaphore.Next(theName))==KErrNone)
+        {
+        aSemaphore.Open(mysemaphore,EOwnerThread);
+        }
+
+
+	TRAP(m,faxtransfer->Convert2dL());
+
+	aSemaphore.Signal();	
+	return KErrNone;
+	}
+*/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/CFAX1.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,1855 @@
+// 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:
+//
+
+#include "FAXSERV.H"
+#include "fax_reversebytes.h"
+#include "FAXMDRV.H"
+#include "FAXMODEM.H"
+
+
+// this module has three parts
+// first receive routines rx
+// second transmit routines tx
+// third utilities
+
+/********************************************************************/
+
+CFaxModemDriver *CFaxClass1::NewLC (TFaxServerSessionSettings * aFaxServerSessionSettings, RFax::TProgress & aProgress)
+{
+	CFaxModemDriver *self = new (ELeave) CFaxClass1;
+	CleanupStack::PushL (self);
+	self->ConstructL (aFaxServerSessionSettings, aProgress);
+	return self;
+}
+
+CFaxModemDriver *CFaxClass1::NewL (TFaxServerSessionSettings * aFaxServerSessionSettings, RFax::TProgress & aProgress)
+{
+	CFaxModemDriver *self = NewLC (aFaxServerSessionSettings, aProgress);
+	CleanupStack::Pop ();
+	return self;
+}
+/********************************************************************/
+
+// here we set up a fax receive - Phase A
+// this does require HDLC frames to be sent
+
+TInt CFaxClass1::RxConnectL ()
+{
+	TInt faxIdFcf;               // CSI or CIG
+	TInt capabilityFcf;          // DIS or DTC
+	TBuf8 < 3 > faxIdTxt;        // CSI or CIG
+	TBuf8 < 3 > capabilityTxt;   // DIS or DTC
+
+	TInt i, x;
+	iDisBytes = 3;
+	iOldFrame.Zero ();
+
+	// we query the modem to find out what its speed capabilities are
+
+    CheckCadenceExportL (_L8 ("AT+FRM=?\r"));
+    // coverity[check_return]
+    iModem->ImportL (iResults, 2);
+    iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+    iModem->ProgressUpdateL ();
+    iModem->GetMatchL (_L8 ("OK"), 1);
+
+	// the available speeds are stored in iResults
+	// we set our proposed speed to the highest compatible with faxini settings
+
+	if ((iResults.FindF (_L8 ("24"))) >= 0)
+		iActualFaxSpeed = 24;
+	else
+		return (KFaxErrModemNotWorking);
+	if ((iFaxServerSessionSettings->iMaxSpeed) > 2400)
+		if ((iResults.FindF (_L8 ("48"))) >= 0)
+			iActualFaxSpeed = 48;
+	if ((iFaxServerSessionSettings->iMaxSpeed) > 4800)
+		if ((iResults.FindF (_L8 ("96"))) >= 0)
+			iActualFaxSpeed = 96;
+	if ((iFaxServerSessionSettings->iMaxSpeed) > 9600)
+		if ((iResults.FindF (_L8 ("145"))) >= 0)
+			iActualFaxSpeed = 145;
+
+	// we now prepare our DIS/DTC answer capabilities frame
+	// the resolution and compression are taken from our settings
+
+	for (x = 0; x < 5; x++)
+		iDisFrame.byte[x] = 0;
+	iDisFrame.bit.b09 = 0;
+	iDisFrame.bit.b10 = 1;
+	iDisFrame.bit.b20 = 1;
+	iDisFrame.bit.b21 = 1;
+	iDisFrame.bit.b22 = 1;
+	iDisFrame.bit.b23 = 1;
+	if (iFaxServerSessionSettings->iRxResolution == EFaxFine)
+		iDisFrame.bit.b15 = 1;
+	if (iFaxServerSessionSettings->iRxCompression == EModifiedRead)
+		iDisFrame.bit.b16 = 1;
+
+//	if (iFaxServerSessionSettings->iMode & KFaxWaitForRing)
+//		{
+	//	while ((iModem->GetMatchL (_L8 ("RING"), 3)) == 0);
+	//	iTimeOfLastRing.UniversalTime();
+//		}
+//	else
+//		{
+		if (((iFaxServerSessionSettings->iMode & KFaxOffHook) == 0) && (!(iFaxServerSessionSettings->iMode & KFaxWaitForRing)))
+//		if ((iFaxServerSessionSettings->iMode & KFaxOffHook) == 0)
+			DialFaxOnDemandL ();
+//		}
+
+	// if we a trying to poll, we've dialled, so we wait for a DIS from the answerer
+	// otherwise we do an answer ourselves
+
+	if (iFaxServerSessionSettings->iMode & KFaxPoll)
+		{
+		faxIdFcf = KT30_CIG;
+		faxIdTxt.Copy (_L8 ("CIG"));
+		capabilityFcf = KT30_DTC;
+		capabilityTxt.Copy (_L8 ("DTC"));
+		iModem->iOurMessage.Format (_L8 ("about to poll fax"));
+
+		}
+	else
+		{
+		faxIdFcf = KT30_CSI;
+		faxIdTxt.Copy (_L8 ("CSI"));
+		capabilityFcf = KT30_DIS;
+		capabilityTxt.Copy (_L8 ("DIS"));
+		CheckCadenceExportL (_L8 ("ATA\r"));
+		iModem->iOurMessage.Format (_L8 ("about to receive fax"));
+		}
+
+	iModem->iProgress.iPhase = ECallEstablishment;
+	iModem->ProgressUpdateL ();
+
+	for (;;)
+		{
+		if (!(iModem->ImportL (iResults, KT30_T1)))
+			return (KFaxErrCannotConnect);
+		iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+		iModem->ProgressUpdateL ();
+		if ((iResults.FindF (_L8 ("NO DIALTONE"))) >= 0 ||
+			iResults.FindF (_L8 ("NO DIAL TONE")) >= 0)
+			return (KFaxErrNoDialTone);
+		if ((iResults.FindF (_L8 ("BUSY"))) >= 0)
+			return (KFaxErrBusy);
+		if ((iResults.FindF (_L8 ("NO ANSWER"))) >= 0)
+			return (KFaxErrNoAnswer);
+		if ((iResults.FindF (_L8 ("NO CARRIER"))) >= 0)
+			return (KFaxErrNoCarrier);
+		if ((iResults.FindF (_L8 ("CONNECT"))) >= 0)
+			break;
+		}
+
+	if (iFaxServerSessionSettings->iMode & KFaxPoll)
+		User::LeaveIfError (RxPrePollL ());
+	else
+		{
+		iModem->iOurMessage.Format (_L8 ("Fax call detected"));
+		iModem->ProgressUpdateL ();
+		}
+
+	iModem->iOurMessage.Format (_L8 ("sending %S"), &faxIdTxt);
+	iModem->ProgressUpdateL ();
+	iFrame.Zero ();
+	iFrame.Append (KT30_CTLNXT);
+	iFrame.Append (faxIdFcf);
+	for (i = 20; i > iFaxServerSessionSettings->iFaxId.Length (); i--)
+		iFrame.Append (0x20);
+	for (i = iFaxServerSessionSettings->iFaxId.Length (); i;)
+	iFrame.Append (iFaxServerSessionSettings->iFaxId[--i]);
+	if (SendframeL (iFrame) != 1)
+		return (KFaxErrCSIorCIG);
+
+	// we follow that with our DIS frame
+
+	iModem->iOurMessage.Format (_L8 ("sending %S"), &capabilityTxt);
+	iModem->iProgress.iPhase = ESessionNegotiation;
+	iModem->ProgressUpdateL ();
+	iDisFrame.byte[1] &= 0xc3;
+	switch (iActualFaxSpeed)
+		{
+		case 48:
+			iDisFrame.byte[1] |= 0x08;
+			break;                 /* V.27 4800+2400            */
+		case 96:
+			iDisFrame.byte[1] |= 0x0c;
+			break;                 /* & V.29 9600+7200            */
+		case 145:
+			iDisFrame.byte[1] |= 0x2c;
+			break;                 /* & V.17 14400+1200+9600+7200 */
+		default:
+			iDisFrame.byte[1] |= 0x00;     /* V.27 fallback 2400 only     */
+		}
+	iFrame.Zero ();
+	iFrame.Append (KT30_CTLLST);
+	iFrame.Append (capabilityFcf);
+	for (i = 0; i < iDisBytes; i++)
+		iFrame.Append (iDisFrame.byte[i]);
+	if (SendframeL (iFrame) != 1)
+		return (KFaxErrDISorDTC);
+
+	// and now we await the negotiation from the caller
+	// note that we'll resend the last frame (DIS or DTC) if we get no reply
+	// until we get a TSI or a DCS (which show the DIS or DTC was received)
+
+	return (RxPrePageL ());
+}
+
+/********************************************************************/
+
+// here we prepare for receiving via a poll
+ // we have received a DIS in iResults, so check the polling bit
+ // iResults[0] is the address
+ // iResults[1] is the control
+ // iResults[2] is the FCF
+ // iResults[3] has bits 1-8 of the FIF
+ // iResults[4] has bits 9-16 of the FIF
+ // the polling bit is bit 9
+
+TInt CFaxClass1::RxPrePollL ()
+{
+	TInt pollDocsAvailable = 0;
+	TInt i;
+	iResults.Copy (_L8 ("CALL JUST ANSWERED"));
+	for (;;)
+		{
+		if (GetframeL (iResults) == 0)
+			return (KFaxErrFrameFail);
+		iModem->ProgressUpdateL ();
+
+		// the third byte in the frame is the FCF (fax control field)
+
+		switch ((TUint8) iResults[2])
+			{
+			case 0x20:            // this marks a non-standard frame, which we ignore
+				iModem->iOurMessage.Format (_L8 ("NSF nonstandard facilities Frame"));
+				iModem->ProgressUpdateL ();
+				break;
+
+			case 0x40:            // this marks the receiver ID
+				iModem->iOurMessage.Format (_L8 ("CSI identity Frame"));
+				iModem->ProgressUpdateL ();
+				iModem->iProgress.iAnswerback.Zero ();
+				for (i = 22; i > 2; i--)
+					iModem->iProgress.iAnswerback.Append (iResults[i]);
+				iModem->iOurMessage.Format (_L8 ("Remote fax ID is %S"), &iModem->iProgress.iAnswerback);
+				iModem->ProgressUpdateL ();
+				break;              // the capability frame should follows
+
+			case 0x80:            // this marks the receiver capability frame
+				iModem->iOurMessage.Format (_L8 ("DIS capability Frame"));
+				iModem->ProgressUpdateL ();
+				iFcfXbit = 1;       // we've received a DIS, so set the X bit
+				pollDocsAvailable = iResults[4] & 0x01;     // and record the polling bit too
+				break;
+
+			case 0xfa:            // this means we were asked to disconnect
+				RxDCNL ();
+				return (KFaxErrRemoteDCN);
+
+			default:;
+			}
+
+		// if a final frame we return
+		// else we just issue AT+FRH=3 and continue
+
+		if (iResults[1] & 0x10)
+			break;
+		iModem->ExportL (_L8 ("AT+FRH=3\r"));
+		}
+
+	if (pollDocsAvailable)
+		{
+		iModem->iOurMessage.Format (_L8 ("Polling bit set"));
+		iModem->ProgressUpdateL ();
+		return (KErrNone);
+		}
+	return (KFaxNothingToPoll);  // if the other machine isn't pollable we exit
+}
+/********************************************************************/
+
+// here we negotiate a fax reception - Phase B
+ // this function is always called after we have connected. However,
+ // it can be called at other times if we have requested a renegotiation
+ // or if the sender want to change the fax parameters
+
+TInt CFaxClass1::RxPrePageL ()
+{
+	TInt x, z, i, nullCounter;
+	TUint8 thisChar, lastChar;
+	TInt ticks;
+
+	for (;;)
+		{
+		iModem->ExportL (_L8 ("AT+FRH=3\r"));
+		if (GetframeL (iResults) == 0)
+			return (KFaxErrFrameFail);
+		iModem->iOurMessage.Format (_L8 ("Response received"));
+		iModem->ProgressUpdateL ();
+
+		// analyse the possible responses
+
+		switch ((TUint8) iResults[2])
+			{
+			case 0x42:            // this is the sender ID - their capability should follow
+
+				iModem->iOurMessage.Format (_L8 ("TSI identity Frame"));
+				iModem->ProgressUpdateL ();
+				iModem->iProgress.iAnswerback.Zero ();
+				for (i = 22; i > 2; i--)
+					iModem->iProgress.iAnswerback.Append (iResults[i]);
+				iModem->iOurMessage.Format (_L8 ("Remote fax ID is %S"), &iModem->iProgress.iAnswerback);
+				iModem->ProgressUpdateL ();
+				break;
+
+			case 0x82:            // here's the sender capability frame - the most complex case
+
+				iModem->iOurMessage.Format (_L8 ("DCS capability Frame"));
+				iModem->ProgressUpdateL ();
+				for (i = 0; i < 5; i++)
+					iDcsFrame.byte[i] = (TUint8) iResults[i + 3];
+
+				// we have the DCS saved - we analyse it for speed and resolution and compression
+
+				if (iDcsFrame.bit.b24 == 0)
+					iDcsFrame.byte[3] = 0;
+
+				iModem->iProgress.iResolution = TFaxResolution (iDcsFrame.bit.b15);
+				iModem->iProgress.iCompression = TFaxCompression (iDcsFrame.bit.b16);
+
+				switch (iDcsFrame.byte[1] & 0x3c)
+					{
+				case 0x08:
+					iActualFaxSpeed = 48;
+					break;        /* 4800  V.27 */
+				case 0x04:
+					iActualFaxSpeed = 96;
+					break;        /* 9600  V.29 */
+				case 0x0c:
+					iActualFaxSpeed = 72;
+					break;        /* 7200  V.29 */
+				case 0x24:
+					iActualFaxSpeed = 97;
+					break;        /* 9600  V.17 */
+				case 0x2c:
+					iActualFaxSpeed = 73;
+					break;        /* 7200  V.17 */
+				case 0x20:
+					iActualFaxSpeed = 145;
+					break;        /* 14400 V.17 */
+				case 0x28:
+					iActualFaxSpeed = 121;
+					break;        /* 12000 V.17 */
+				default:
+					iActualFaxSpeed = 24; /* 2400  V.27 */
+					}
+
+				i = (iActualFaxSpeed & (~1));
+
+				// now we prepare to recieve the training frame that follows the DCS
+				// we try to get the carrier at this speed three times before giving up
+
+				for (x = 0; x < 3; x++)
+					{
+					iModem->iOurMessage.Format (_L8 ("setting %d00"), i);
+					iModem->iProgress.iSpeed = (i * 100);
+					iModem->ProgressUpdateL ();
+
+					iResults.Copy (_L8 ("AT+FRM="));
+					iResults.AppendNum (iActualFaxSpeed);
+					iResults.Append (_L8 ("\r"));
+					iModem->ExportL (iResults);
+					z = FramestatL ();
+					if (z == 1)
+						break;
+				if (z != 0)
+					{
+					iModem->TxcharL (Kcan);
+					if (FramestatL () < 0)
+						iModem->TxcharL (Kreturn);
+					ReceiveSilenceL ();
+					iModem->iOurMessage.Format (_L8 ("sending FTT"));
+					iModem->ProgressUpdateL ();
+					iFrame.Append (KT30_FTT);
+					if (SendframeL (iFrame) == 0)
+						return (KFaxErrTrainFail);
+					break;
+					}
+					}
+				if (x == 3)
+					return (KFaxErrAtNegotiatedSpeed);
+
+				// once we have a carrier, we start receiving the training frame
+				// we look for a clear 750 milliseconds of zeros ending in <dle><etx>
+				// this is determined by calculating the number of number of null bytes
+				// taken at any given speed
+
+				iModem->iOurMessage.Format (_L8 ("training .... "));
+				iModem->ProgressUpdateL ();
+
+				ticks = (CLK_TCK * 165) / 100;	// bug fix - was originally "CLK_TICK * (165/100)"
+												// This failed because 165/100 is rounded to 1 because
+												// ticks is an integer and that made the fax server
+												// training for 1 second instead of 1.5
+				for (lastChar = 0, nullCounter = 0;;)
+					{
+					if (iModem->RxcharWaitL (ticks) == 0)
+						{
+						break;
+						}
+					thisChar = iModem->iReadone[0];
+					if (nullCounter != (i * 75 / 8))
+						{
+						if (thisChar != 0)
+							nullCounter = 0;
+						else
+							++nullCounter;
+						}
+					if ((thisChar == Ketx) && (lastChar == Kdle))
+						break;
+				lastChar = thisChar;
+					}
+				if (FramestatL () < 0)
+					{
+					iModem->TxcharL (Kcan);
+					if (FramestatL () < 0)
+						iModem->TxcharL (Kreturn);
+					}
+
+				// now we check the count of null bytes and either send FTT
+				// (in which case the sender will send a new DCS and try again)
+				// or else send CFR confirmation and wait for the first page
+
+				iFrame.Zero ();
+				iFrame.Append (KT30_CTLLST);
+				if (nullCounter == (i * 75 / 8))
+					{
+					iModem->iOurMessage.Format (_L8 ("training OK"));
+					iModem->ProgressUpdateL ();
+					}
+				else
+					{
+					ReceiveSilenceL ();
+					iModem->iOurMessage.Format (_L8 ("sending FTT"));
+					iModem->ProgressUpdateL ();
+					iFrame.Append (KT30_FTT);
+					if (SendframeL (iFrame) == 0)
+						return (KFaxErrTrainFail);
+					break;
+					}
+
+				iModem->iOurMessage.Format (_L8 ("sending CFR"));
+				iModem->ProgressUpdateL ();
+
+				iFrame.Append (KT30_CFR);
+				if (SendframeL (iFrame) == 0)
+					return (KFaxErrCFR);
+
+				// after we send a CFR, we interpret a failure to
+				// establish a high-speed carrier as an indication
+				// that the sender didn't get our CFR, and will
+				// act as if they received an FTT
+
+				if (RxSetHighSpeedL () != KErrNone)
+					break;
+			return (KErrNone);
+
+			// lastly, we cater for the sender disconnecting us,
+			// either because we couldn't train or because our
+			// capabilities were wrong, or because they were only trying
+			// to hack our fax machine
+
+			case 0xfa:
+				RxDCNL ();
+				return (KFaxErrRemoteDCN);
+
+			default:;
+			}
+		}
+}
+/********************************************************************/
+
+// this is a small function to set a class 1 fax modem to phase C
+ // reception speed (found in iActualFaxSpeed) in preparation for
+ // receiving data.  This is called before the first page and also
+ // between pages.  If the modem can't find a high speed carrier, we
+ // leave the caller to decide what action to take - if we'd just sent a
+ // page confirmation we should try resending our last negotiating frame
+ // in case it was lost, but if we have just sent a CFR, we wait for the
+ // sender to retrain.
+
+// If the protocol is out of sync and we get a low speed carrier
+ // then we'll get a +FCERROR response (same as ERROR)
+
+TInt CFaxClass1::RxSetHighSpeedL ()
+{
+	TInt x, portSpeed;
+	switch (iActualFaxSpeed)
+		{
+		case 145:
+			x = 144;
+			portSpeed = 146;
+			break;
+		case 121:
+			x = 120;
+			portSpeed = 122;
+			break;
+		case 97:
+			x = 96;
+			portSpeed = 98;
+			break;
+		case 73:
+			x = 72;
+			portSpeed = 74;
+			break;
+		default:
+			x = portSpeed = iActualFaxSpeed;
+		}
+
+	iModem->iOurMessage.Format (_L8 ("setting %d00"), x);
+	iModem->iProgress.iSpeed = (x * 100);
+	iModem->ProgressUpdateL ();
+
+	iResults.Copy (_L8 ("AT+FRM="));
+	iResults.AppendNum (portSpeed);
+	iResults.Append (_L8 ("\r"));
+	iModem->ExportL (iResults);
+
+	x = FramestatL (KT30_T2);     // always wait 6 seconds before a timeout
+	if (x == 1)
+		{
+		return (RxStartPageL ());
+		}
+	if (x != 0)
+		{
+		iModem->TxcharL (Kcan);
+		if (FramestatL () < 0)
+			iModem->TxcharL (Kreturn);
+		}
+	return (KFaxErrAtNegotiatedSpeed);
+}
+/********************************************************************/
+
+// after page data has been received, we go back to 300 bps negotiation
+// for the post-page message which the transmitter sends 75ms after the
+// end of the data
+
+TInt CFaxClass1::RxPostPageL ()
+{
+	TInt i, x = 0;
+	iOldFrame.Zero ();
+	iModem->iProgress.iPhase = EPostPageStatus;
+	iModem->ProgressUpdateL ();
+
+	// wait for the modem to react to the end of fax data before proceeding
+
+	if ((iModem->GetMatchL (_L8 ("NO CARRIER"), 5)) == 0)
+		return (KFaxErrCannotEndData);
+
+	for (;;)
+		{
+
+		// we start by requesting a frame
+
+		iModem->ExportL (_L8 ("AT+FRH=3\r"));
+		if (GetframeL (iResults) == 0)
+			{
+			if (x++ == 3)
+				return (KFaxErrFrameFail);
+			continue;
+			}
+
+		iModem->iOurMessage.Format (_L8 ("Response received"));
+		iModem->ProgressUpdateL ();
+
+		// now we work out what it is
+
+		switch ((TUint8) iResults[2])
+			{
+
+			// the first case is where the last page was the end of the fax
+
+			case 0x3e:            // we recognize PRI-Q frames but treat them like non-PRI-Q variants
+				iModem->iOurMessage.Format (_L8 ("PRI-Q bit set"));
+				iModem->ProgressUpdateL ();
+				// fallthrough
+			case 0x2e:
+				iModem->iOurMessage.Format (_L8 ("EOP end of page %u and transmission"), iModem->iProgress.iPage);
+				iModem->ProgressUpdateL ();
+				iModem->iOurMessage.Format (_L8 ("sending MCF"));
+				iModem->ProgressUpdateL ();
+				iFrame.Zero ();
+				iFrame.Append (KT30_CTLLST);
+				iFrame.Append (KT30_MCF);
+				if (SendframeL (iFrame) == 0)
+					return (KFaxErrMCF);
+
+				// now it isn't an error if get a DCN and hang up
+				// so, loop and wait for it
+
+				iModem->iProgress.iPhase = EDisconnection;
+				continue;
+
+				// the second case is where the sender demands a renegotiation
+
+			case 0x9e:            // we recognize PRI-Q frames but treat them like non-PRI-Q variants
+				iModem->iOurMessage.Format (_L8 ("PRI-Q bit set"));
+				iModem->ProgressUpdateL ();
+				// fallthrough
+			case 0x8e:
+				iModem->iOurMessage.Format (_L8 ("EOM end of page %u and document"), iModem->iProgress.iPage);
+				iModem->ProgressUpdateL ();
+				iModem->iOurMessage.Format (_L8 ("sending MCF"));
+				iModem->ProgressUpdateL ();
+				iFrame.Zero ();
+				iFrame.Append (KT30_CTLLST);
+				iFrame.Append (KT30_MCF);
+				if (SendframeL (iFrame) == 0)
+					return (KFaxErrMCF);
+				iModem->iProgress.iPhase = ESessionNegotiation;
+				iOldFrame.Zero ();
+				iOldFrame.Append (KT30_CTLLST);
+				iOldFrame.Append (KT30_DIS);
+				for (i = 0; i < iDisBytes; i++)
+					iOldFrame.Append (iDisFrame.byte[i]);
+				return (RxPrePageL ());
+
+				// the third case is where another page is going to follow
+
+			case 0x5e:            // we recognize PRI-Q frames but treat them like non-PRI-Q variants
+
+				iModem->iOurMessage.Format (_L8 ("PRI-Q bit set"));
+				iModem->ProgressUpdateL ();
+				// fallthrough
+			case 0x4e:
+				iModem->iOurMessage.Format (_L8 ("MPS end of page %u"), iModem->iProgress.iPage);
+				iModem->ProgressUpdateL ();
+
+				iModem->iOurMessage.Format (_L8 ("sending MCF"));
+				iModem->ProgressUpdateL ();
+
+				iFrame.Zero ();
+				iFrame.Append (KT30_CTLLST);
+				iFrame.Append (KT30_MCF);
+				if (SendframeL (iFrame) == 0)
+					return (KFaxErrMCF);
+
+				for (x = 0; x < 3; x++)
+					{
+				if (RxSetHighSpeedL () == KErrNone)
+					return (KErrNone);
+				iModem->iOurMessage.Format (_L8 ("Resending last response .... "));
+				iModem->ProgressUpdateL ();
+				if (SendframeL (iOldFrame) == 0)
+					return (KFaxErrMCF);
+					}
+				return (KFaxErrMCF);
+
+				// the fourth case is where we are told to disconnect
+				// it's an error if we hadn't been expecting it
+
+			case 0xfa:
+				if (iModem->iProgress.iPhase == EDisconnection)
+					{
+					RxDCNL ();
+					return (KErrNone);
+					}
+
+				RxDCNL ();
+				return (KFaxErrRemoteDCN);
+
+				// the fifth case is where we see a negotiation frame
+				// the sixth case is where we see a negotiation frame
+				// our supposed page may have been a mistake
+				// just go back to phase B and try to recover that way
+
+			case 0x42:            // TSI frame
+			case 0x82:            // DCS frame
+				if ((TUint8) iResults[2] == 0x42)
+					iModem->iOurMessage.Format (_L8 ("TSI identity"));
+				else
+					iModem->iOurMessage.Format (_L8 ("DCS capability"));
+				iModem->iOurMessage.Append (_L8 (" Frame - renegotiating session parameters"));
+				iModem->ProgressUpdateL ();
+				iModem->iProgress.iPhase = ESessionNegotiation;
+				return (RxPrePageL ());
+
+				// the last case is where we see an unsupported frame
+				// if it is a final frame we ask for a repeat via CRP
+
+			default:
+				if (SendCRPL () != KErrNone)
+					return (KFaxErrCRP);
+			}
+		}
+}
+/********************************************************************/
+
+// here we have detected a disconnection frame so we hang up the modem
+
+void CFaxClass1::RxDCNL ()
+{
+	iModem->iOurMessage.Format (_L8 ("DCN disconnect Frame"));
+	iModem->iProgress.iPhase = EDisconnection;
+	iModem->ProgressUpdateL ();
+}
+/********************************************************************/
+
+// here we send a DCN disconnect frame and then hang up the modem
+
+TInt CFaxClass1::TxDCNL ()
+{
+	iModem->iOurMessage.Format (_L8 ("sending DCN"));
+	iModem->iProgress.iPhase = EDisconnection;
+	iModem->ProgressUpdateL ();
+	ReceiveSilenceL ();
+	iFrame.Zero ();
+	iFrame.Append (KT30_CTLLST);
+	iFrame.Append (KT30_DCN);
+	if (SendframeL (iFrame) == 0)
+		return (KFaxErrDCN);
+	return (KErrNone);
+}
+/********************************************************************/
+
+// here we set up a fax transmit - Phase A
+ // there's no HDLC stuff here
+
+TInt CFaxClass1::TxConnectL ()
+{
+
+	// we query the modem to find out what its speed capabilities are
+    iModem->ExportL (_L8 ("AT+FTM=?\r"));
+    // coverity[check_return]
+    iModem->ImportL (iResults, 2);
+    iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+    iModem->ProgressUpdateL ();
+    iModem->GetMatchL (_L8 ("OK"), 1);
+    
+	// the available speeds are stored in iResults
+	// we set our proposed speed to the highest compatible with faxini settings
+
+	if ((iResults.FindF (_L8 ("24"))) >= 0)
+		iActualFaxSpeed = 24;
+	else
+		return (KFaxErrModemNotWorking);
+	if ((iFaxServerSessionSettings->iMaxSpeed) > 2400)
+		if ((iResults.FindF (_L8 ("48"))) >= 0)
+			iActualFaxSpeed = 48;
+	if ((iFaxServerSessionSettings->iMaxSpeed) > 4800)
+		if ((iResults.FindF (_L8 ("96"))) >= 0)
+			iActualFaxSpeed = 96;
+	if ((iFaxServerSessionSettings->iMaxSpeed) > 9600)
+		if ((iResults.FindF (_L8 ("145"))) >= 0)
+			iActualFaxSpeed = 145;
+
+	// we now issue our ATD command, and if we aren't in immediate
+	// transmit mode (already off hook) then we dial a number
+
+	iModem->ExportL (_L8 ("ATD"));
+	if ((iFaxServerSessionSettings->iMode & KFaxOffHook) == 0)
+		iModem->ExportL (iFaxServerSessionSettings->iPhoneNumber);
+	iModem->TxcharL (Kreturn);
+	iModem->iOurMessage.Format (_L8 ("Call has been dialled"));
+	iModem->iProgress.iPhase = ECallEstablishment;
+	iModem->ProgressUpdateL ();
+
+	// now we wait up to KDialTimeout seconds for the modem to connect
+
+	for (;;)
+		{
+		if (!(iModem->ImportL (iResults, KDialTimeout)))
+			return (KFaxErrNoDial);
+		iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+		iModem->ProgressUpdateL ();
+		if ((iResults.FindF (_L8 ("NO DIALTONE"))) >= 0 ||
+			iResults.FindF (_L8 ("NO DIAL TONE")) >= 0)
+			return (KFaxErrNoDialTone);
+		if ((iResults.FindF (_L8 ("BUSY"))) >= 0)
+			return (KFaxErrBusy);
+		if ((iResults.FindF (_L8 ("NO ANSWER"))) >= 0)
+			return (KFaxErrNoAnswer);
+		if ((iResults.FindF (_L8 ("NO CARRIER"))) >= 0)
+			return (KFaxErrNoCarrier);
+		if ((iResults.FindF (_L8 ("CONNECT"))) >= 0)
+			break;
+		}
+
+	// we can now go on to phase B
+
+	iResults.Copy (_L8 ("CALL JUST ANSWERED"));
+	return (TxPrePageL ());
+}
+/********************************************************************/
+
+// here we negotiate a fax transmission, or a polled reception - Phase B
+// this function is always called after we have connected. However,
+// it can be called at other times if the receiver has requested a
+// renegotiation or if we want to change the fax parameters, in which
+// case we would enter with iModem->iProgress.iPhase == RFax::EPostPageStatus
+
+TInt CFaxClass1::TxPrePageL ()
+{
+	TInt i;
+	//TInt x;
+	TInt successiveErrors = 0;
+	TInt trainingAttempts = 0;
+	iDcsBytes = 3;
+	iOldFrame.Zero ();
+	TInt ticks;
+	TInt trainbytes;
+
+	// this routine is one big frame waiting loop - note that on first entry
+	// here we have set the length of the last frame stored in iOldFrame to
+	// zero, so we don't resend any last frame on first entry here.
+	// Subsequent iterations of our receive loop will resend the iOldFrame
+	// if nothing is received, in an attempt at error recovery, unless of
+	// course we have deliberately reset iOldFrame to zero again
+
+	//x = 0;
+	for (;;)
+		{
+		if (iModem->iProgress.iPhase != EPostPageStatus)
+			{
+			if (GetframeL (iResults) == 0)
+				{
+				if (successiveErrors++ > 3)
+					return (KFaxErrFrameFail);
+
+				 if (iModem->iProgress.iPhase == ECallEstablishment)
+				 // no point in carrying on without any capability frame
+				{
+				iModem->ExportL (_L8 ("AT+FRH=3\r"));
+				continue;
+				}
+		//		if (iModem->iProgress.iPhase == ECallEstablishment)
+		//			{
+		//			if (x++ == 3)
+		//				return (KFaxErrFrameFail);
+		//			
+		//			iModem->ExportL (_L8 ("AT+FRH=3\r"));
+		//			continue;
+		//			}
+
+				// no point in carrying on without any capability frame
+				// else
+
+				iResults[1] = 0x10;
+				iResults[2] = 0xff;
+
+				// this is a nonexistent response
+				// the effect of this is to force a retransmission of the TSI and DCS
+				// with (hopefully) a subsequent retrain in an attempt to resync
+				}
+			else 
+			    successiveErrors = 0;
+
+
+			
+			if (iResults[2] != 0xff)
+			{
+			
+			iModem->iOurMessage.Format (_L8 ("Response received"));
+			iModem->ProgressUpdateL ();
+
+			// the third byte in the frame is the FCF (fax control field)
+
+			switch ((TUint8) iResults[2])
+				{
+				case 0xff:         // this is our dummy octet to force a restart
+					break;
+
+				case 0x40:         // this marks the receiver ID
+					iModem->iOurMessage.Format (_L8 ("CSI identity Frame"));
+					iModem->ProgressUpdateL ();
+					iModem->iProgress.iAnswerback.Zero ();
+					for (i = 22; i > 2; i--)
+						iModem->iProgress.iAnswerback.Append (iResults[i]);
+					iModem->iOurMessage.Format (_L8 ("Remote fax ID is %S"), &iModem->iProgress.iAnswerback);
+					iModem->ProgressUpdateL ();
+					break;           // the capability frame should follows
+
+				case 0x80:         // this marks the receiver capability frame
+					iFcfXbit = 1;    // we've received a DIS, so set the X bit
+					iModem->iOurMessage.Format (_L8 ("DIS capability Frame"));
+					iModem->ProgressUpdateL ();
+					AnalyseDISL ();   // analyse the DIS and compose a DCS
+					if (iDisFrame.bit.b10 != 1)
+						return (KFaxErrRemoteCannotReceive);  // if the other machine can't receive we exit
+					break;
+
+				case 0x84:         // this marks a good train and is the normal exit from this loop
+					iModem->iOurMessage.Format (_L8 ("CFR confirmation Frame"));
+					iModem->ProgressUpdateL ();
+					return (TxSetHighSpeedL ());
+
+				case 0x44:         // this marks a failed train so we drop the speed
+					iModem->iOurMessage.Format (_L8 ("FTT failure to train Frame"));
+					iModem->ProgressUpdateL ();
+					if (++trainingAttempts & 1)      // train down on failures 2 4 6 8
+						break;
+				if (iActualFaxSpeed == 73)
+					iActualFaxSpeed = 96;
+				else
+					iActualFaxSpeed -= 24;
+				if (iActualFaxSpeed < (iFaxServerSessionSettings->iMinSpeed / 100))
+					{
+				TxDCNL ();
+				return (KFaxBelowMinSpeed);
+					}
+				break;
+
+				case 0xfa:         // this means we were asked to disconnect
+					RxDCNL ();
+					return (KFaxErrRemoteDCN);
+
+				case 0x20:         // this marks a non-standard frame, which we ignore
+					iModem->iOurMessage.Format (_L8 ("NSF nonstandard facilities Frame"));
+					iModem->ProgressUpdateL ();
+					break;
+
+				// the last case is where we see an unsupported frame
+				// if it is a final frame we ask for a repeat via CRP
+
+				default:
+					if (SendCRPL () != KErrNone)
+						return (KFaxErrCRP);
+				}
+
+			// if not a final frame we just issue AT+FRH=3 and continue
+
+			if (!(iResults[1] & 0x10))
+				{
+				iModem->ExportL (_L8 ("AT+FRH=3\r"));
+				continue;
+				}
+			// otherwise we send our proposals, starting with our own ID
+
+			iModem->iOurMessage.Format (_L8 ("Final frame received"));
+			iModem->ProgressUpdateL ();
+			}
+		}// if (iResults[2] !=0) statement
+		if (iModem->iProgress.iPhase == ECallEstablishment)
+			{
+			iModem->iOurMessage.Format (_L8 ("sending TSI"));
+			iModem->ProgressUpdateL ();
+			iFrame.Zero ();
+			iFrame.Append (KT30_CTLNXT);
+			iFrame.Append (KT30_TSI);
+			for (i = 20; i > iFaxServerSessionSettings->iFaxId.Length (); i--)
+				iFrame.Append (0x20);
+			for (i = iFaxServerSessionSettings->iFaxId.Length (); i;)
+			iFrame.Append (iFaxServerSessionSettings->iFaxId[--i]);
+			if (SendframeL (iFrame) != 1)
+				return (KFaxErrHDLC);
+			}
+		else
+			{
+			iModem->ExportL (_L8 ("AT+FTH=3\r"));
+			if (FramestatL () != 1)
+				return (KFaxErrHDLC);
+			}
+
+		iModem->iProgress.iPhase = ESessionNegotiation;
+
+		// before sending our DCS frame we ensure the speeds bits match what we want
+
+		iDcsFrame.byte[1] &= 0xc3;
+		switch (iActualFaxSpeed)
+			{
+			case 48:
+				iDcsFrame.byte[1] |= 0x08;
+				break;						/* 4800 */
+			case 96:
+				iDcsFrame.byte[1] |= 0x04;
+				break;						/* 9600 V.29 */
+			case 97:
+				iDcsFrame.byte[1] |= 0x24;
+				break;						/* 9600 V.17 */
+			case 72:
+				iDcsFrame.byte[1] |= 0x0c;
+				break;						/* 7200 V.29 */
+			case 73:
+				iDcsFrame.byte[1] |= 0x2c;
+				break;						/* 7200 V.17 */
+			case 145:
+				iDcsFrame.byte[1] |= 0x20;
+				break;						/* 14400 */
+			case 121:
+				iDcsFrame.byte[1] |= 0x28;
+				break;						/* 12000 */
+			default:
+				iDcsFrame.byte[1] |= 0x00;  /* 2400 */
+			}
+		iModem->iOurMessage.Format (_L8 ("sending DCS "));
+		iModem->ProgressUpdateL ();
+		iFrame.Zero ();
+		iFrame.Append (KT30_CTLLST);
+		iFrame.Append (KT30_DCS);
+		//x = 3;
+		for (i = 0; i < iDcsBytes; i++)
+			iFrame.Append (iDcsFrame.byte[i]);
+		if (SendframeL (iFrame) != 1)
+			return (KFaxErrHDLC);
+
+		// after sending our DCS frame we wait fot 75 ms before training
+		//
+		// Note on the 75 millisecond delays
+		// =================================
+		// At this point we need to introduce a 75 ms delay (+-20%).
+		// this is usually done with the AT+FTS=8 command and the code
+		// would normally run as follows :
+		//
+		// iModem->ExportL (_L8 ("AT+FTS=8\r"));
+		// if ((iModem->GetMatchL (_L8 ("OK"), 3)) == 0)
+		// return (KFaxErrStopAndWait);
+		//
+		// or, alternatively, we could use our own routines to delay
+		// for this amount of time using
+		//
+		// iModem->Silence (75000);
+		//
+		// However, the innards of the comms driver in EPOC32 introduces
+		// 2-tick delays on timed reads and writes - in other words, there
+		// was a 2-tick delay before the OK from our last frame was received
+		// and there will also be a 2-tick delay before the next command
+		// reaches the modem. Note that a 2-tick delay could be from 15
+		// to 30 ms - we want a delay from 60ms to 90 ms (75 ms +- 20%) -
+		// which must be between 4 and 6 ticks.  All the delays we use
+		// here are empirically arrived at via Faxlab testing rather
+		// than being worked out in advance.
+
+		// NOTE : these delays are really applicable ONLY to Protea/ARM7100
+		// the machine dependency is unavoidable under the
+		// circumstances. Protea ticks @ 64 Hz, which gives
+		// us 15.625 ms per tick.  WINS ticks @ 10 Hz,
+		// which gives us 100 microseconds per tick - clearly a
+		// significant difference - the delta timers in the comms
+		// kernel are therefore also very different
+
+		iModem->iOurMessage.Format (_L8 ("delaying for 75 ms"));
+		iModem->ProgressUpdateL ();
+		
+	//	iModem->Silence ((iModem->iGranularity - 125) * 4);       // 4 ticks pre-TCF - below iModem->iGranularity x 1
+		
+		TInt delay=iModem->iCalls*37;		//iCalls for 2ms *37 to get an approximatelly 75ms delay
+		TInt k=0;
+
+		for (k=0;k<delay;k++)		// this loop will  generate the 75ms delay
+		iModem->clock();
+		
+		i = (iActualFaxSpeed & 0xfe);
+		iModem->iOurMessage.Format (_L8 ("setting %d00"), i);
+		iModem->iProgress.iSpeed = (i * 100);
+		iModem->ProgressUpdateL ();
+		iResults.Copy (_L8 ("AT+FTM="));
+		iResults.AppendNum (iActualFaxSpeed);
+		iResults.Append (_L8 ("\r"));
+		iModem->ExportL (iResults);
+
+		// say how many bytes in the 1.5 second TCF
+		// prepare a null filled transmit buffer length and get length to maxnulls
+		// calculate minimum scan line times
+		// wait for the modem CONNECT
+
+		trainbytes = (i * 150 / 8);
+		iModem->iOurMessage.Format (_L8 ("training sequence for %d bytes"), trainbytes);
+
+		iModem->iTransmitBuffer.SetMax ();
+		iModem->iTransmitBuffer.FillZ ();
+		TInt maxnulls = iModem->iTransmitBuffer.Length ();
+		iModem->ProgressUpdateL ();
+		if (iMinscan == 0)
+			iMinlinelength = 0;
+		else
+			iMinlinelength = ((iModem->iProgress.iSpeed / (1000 / iMinscan)) / 8) + 1;
+		if ((iModem->GetMatchL (_L8 ("CONNECT"), 5)) == 0)
+			return (KFaxErrAtNegotiatedSpeed);
+
+		// now we send our TCF with flow control
+
+		iModem->Xonon ();
+		
+		iModem->iOurMessage.Format (_L8 ("Entering training loop"));
+		iModem->ProgressUpdateL ();
+		
+		while (trainbytes != 0)
+			{
+			if (maxnulls > trainbytes)
+				{
+				iModem->iTransmitBuffer.SetLength (trainbytes);
+				trainbytes = 0;
+				}
+			else
+				{
+				iModem->iTransmitBuffer.SetMax ();
+				trainbytes -= maxnulls;
+				}
+			iModem->CommitTransmitBufferL ();
+			}
+
+		iModem->iTransmitBuffer.Append (Kdle);
+		iModem->iTransmitBuffer.Append (Ketx);
+		iModem->CommitTransmitBufferL ();
+
+
+		iModem->iOurMessage.Format (_L8 ("Train complete"));
+		iModem->ProgressUpdateL ();
+
+		// now wait for the modem to return to command mode
+
+		while (iModem->Rxstat () != 0)
+			{
+			ticks = CLK_TCK;
+			iModem->RxcharWaitL (ticks);
+			}
+		if ((iModem->GetMatchL (_L8 ("OK"), 5)) == 0)
+			return (KFaxErrTrainStop);
+
+		iModem->Xonoff ();
+		// there's no frame to resend, so we prepare a CRP in case of
+		// any errors before looping for the response
+
+		iOldFrame.Zero ();
+		iModem->ExportL (_L8 ("AT+FRH=3\r"));
+		}
+}
+/********************************************************************/
+
+// this is a small function to set a class 1 fax modem to phase C
+ // transmission speed (found in iActualFaxSpeed) in preparation for
+ // sending data.  This function is called before the first page
+ // and also between pages. Class 1 modems require that we delay for
+ // 75 ms before going to phase C transmission - see the note
+ // earlier on method of achieving a 75 ms delay here
+
+TInt CFaxClass1::TxSetHighSpeedL ()
+{
+	TInt x, portSpeed;
+	iFrame.SetMax ();
+	iModem->iOurMessage.Format (_L8 ("delaying for 75 ms"));
+	iModem->ProgressUpdateL ();
+//	iModem->Silence ((iModem->iGranularity - 125) * 4);  // 4 ticks pre-T4 - below iModem->iGranularity x 3
+
+	TInt delay=iModem->iCalls*37;		//iCalls for 2ms *37 to get an approximatelly 75ms delay
+	TInt k=0;
+
+	for (k=0;k<delay;k++)		// this loop will  generate the 75ms delay
+		iModem->clock();
+
+	switch (iActualFaxSpeed)
+		{
+		case 145:
+			x = 144;
+			portSpeed = 146;
+			break;
+		case 121:
+			x = 120;
+			portSpeed = 122;
+			break;
+		case 97:
+			x = 96;
+			portSpeed = 98;
+			break;
+		case 73:
+			x = 72;
+			portSpeed = 74;
+			break;
+		default:
+			x = portSpeed = iActualFaxSpeed;
+		}
+	iModem->iOurMessage.Format (_L8 ("setting %d00"), x);
+	iModem->iProgress.iSpeed = (x * 100);
+	iModem->ProgressUpdateL ();
+	iResults.Copy (_L8 ("AT+FTM="));
+	iResults.AppendNum (portSpeed);
+	iResults.Append (_L8 ("\r"));
+	iModem->ExportL (iResults);
+	if (FramestatL () != 1)
+		return (KFaxErrAtNegotiatedSpeed);
+	return (TxStartPageL ());
+}
+/********************************************************************/
+
+// here's where we wait after sending a page and the postpage
+// message to see what the receiver thought - there are five responses
+// MCF RTP PIP = good page         RTN PIN = bad page
+//
+// TxPostPage should return either with
+//
+// a) an error code and iPhase set to RFax::EPostPageStatus, in which case the send returns with the error
+// b) KErrNone and iPhase set to RFax::EDataTransfer, in which case we send the next page
+// c) KErrNone and iPhase set to RFax::EDisconnection, in which case the send returns with KErrNone
+//
+
+TInt CFaxClass1::TxPostPageL ()
+{
+	if (iModem->iProgress.iCompression == EModifiedRead)
+		{
+		iModem->iTransmitBuffer.Append (0x00);
+		iModem->iTransmitBuffer.Append (0x60);
+		iModem->iTransmitBuffer.Append (0x00);
+		iModem->iTransmitBuffer.Append (0x0C);
+		iModem->iTransmitBuffer.Append (0x80);
+		iModem->iTransmitBuffer.Append (0x01);
+		iModem->iTransmitBuffer.Append (0x30);
+		iModem->iTransmitBuffer.Append (0x00);
+		iModem->iTransmitBuffer.Append (0x06);
+		iModem->iTransmitBuffer.Append (0xC0);
+		}
+	else
+		{
+		for (TInt x = 3; x; x--)
+			{
+			iModem->iTransmitBuffer.Append (0x0);
+			iModem->iTransmitBuffer.Append (0x08);
+			iModem->iTransmitBuffer.Append (0x80);
+			}
+		}
+	iModem->iTransmitBuffer.Append (Kdle);
+	iModem->iTransmitBuffer.Append (Ketx);
+	iModem->CommitTransmitBufferL ();
+
+	iModem->iOurMessage.Format (_L8 ("<dle><etx> transmitted after %d lines"), iModem->iProgress.iLines);
+	iModem->iProgress.iPhase = EPostPageStatus;
+	iModem->ProgressUpdateL ();
+	while (iModem->Txstat () != 0)
+		;
+
+	// we've just ended phase C data, so we need to wait for the modem to respond with OK
+
+	if (iModem->GetMatchL (_L8 ("OK"), (32 * 1024) / (iModem->iProgress.iSpeed / 10)) == 0)
+		return (KFaxErrCannotEndData);
+
+	iModem->Xonoff ();
+
+	iModem->iOurMessage.Format (_L8 ("delaying for 75 ms"));
+	iModem->ProgressUpdateL ();
+
+
+/*************************************          NOTE       *******************************************************	
+// see the note earlier on reason for the lack of an explicit 75 ms delay here
+
+
+//	iModem->Silence ((iModem->iGranularity - 125) * 4);   4 ticks post-T4 - below iModem->iGranularity x 1
+//  The above line of code was removed because the Silence function calls User::After which is fairly inaccurate
+//  Faxlab revealed that we were actually waiting for 432 ms !!! instead of the recomended 75ms +- 20%
+//  The delay is now generated using the timing callibration loop
+//  This is more CPU intensive than the User::After call because essentially is a aoftware delay loop but 
+//  will enhance the reliability of fax class 1 especially over GSM
+*****************************************************************************************************************/
+	TInt delay=iModem->iCalls*30;		//iCalls for 2ms *37 to get an approximatelly 75ms delay
+	TInt k=0;
+
+	for (k=0;k<delay;k++)		// this loop will  generate the 75ms delay
+		iModem->clock();
+
+	iOldFrame.Zero ();
+	iFrame.Zero ();
+	iFrame.Append (KT30_CTLLST);
+
+
+	if ((iFaxServerSessionSettings->iTxPages) == iModem->iProgress.iPage)
+		{
+		iModem->iOurMessage.Format (_L8 ("sending EOP"));
+		iModem->ProgressUpdateL ();
+
+		iFrame.Append ((KT30_EOP));
+		if (SendframeL (iFrame) == 0)
+			return (KFaxErrEOP);
+
+		iModem->iOurMessage.Format (_L8 ("End of document transmitted"));
+		iModem->ProgressUpdateL ();
+		}
+	else
+		{
+		iModem->iOurMessage.Format (_L8 ("sending MPS"));
+		iModem->ProgressUpdateL ();
+
+		iFrame.Append ((KT30_MPS));
+		if (SendframeL (iFrame) == 0)
+			return (KFaxErrMPS);
+
+		iModem->iOurMessage.Format (_L8 ("End of page %u transmitted"), iModem->iProgress.iPage);
+		iModem->ProgressUpdateL ();
+		}
+
+	// now we await the post-page response from the receiver
+	// we loop here because we need a final frame
+
+	for (;;)
+		{
+		iModem->ExportL (_L8 ("AT+FRH=3\r"));
+		if (GetframeL (iResults) == 0)
+			return (KFaxErrFrameFail);
+		iModem->iOurMessage.Format (_L8 ("Response received"));
+		iModem->ProgressUpdateL ();
+
+		// the third byte in the frame is the FCF (fax control field)
+		// for those we recognize straight off, we say so
+		// for any others, we either loop immediately or after a CRP request
+
+		switch ((TUint8) iResults[2])
+			{
+			case 0x8c:
+				iModem->iOurMessage.Format (_L8 ("MCF"));
+				break;
+			case 0xcc:
+				iModem->iOurMessage.Format (_L8 ("RTP"));
+				break;
+			case 0xac:
+				iModem->iOurMessage.Format (_L8 ("PIP"));
+				break;
+			case 0x4c:
+				iModem->iOurMessage.Format (_L8 ("RTN"));
+				break;
+			case 0x2c:
+				iModem->iOurMessage.Format (_L8 ("PIN"));
+				break;
+
+			// the last case is where we see an unsupported frame
+			// if it is a final frame we ask for a repeat via CRP
+
+			default:
+				if (SendCRPL () != KErrNone)
+					return (KFaxErrCRP);
+				continue;
+			}
+
+		// now back to look at the FCF some more
+		switch ((TUint8) iResults[2])
+			{
+			case 0x8c:
+			case 0xcc:            // for good pages we say confirmed
+			case 0xac:
+				iModem->iOurMessage.Append (_L8 (" message confirmation"));
+				iModem->ProgressUpdateL ();
+				break;
+
+			case 0x4c:            // for bad pages we say no good
+			case 0x2c:            // if we haven't done so, resent last page
+				iModem->iOurMessage.Append (_L8 (" : page not confirmed"));
+				iModem->ProgressUpdateL ();
+				if (iRepeatPage == 0)
+					{
+				iRepeatPage++;
+				iModem->iProgress.iPage--;
+				return (TxPrePageL ());
+					}
+
+			default:;
+			}
+
+		// we aren't going to resend the last page now
+
+		iRepeatPage = 0;
+
+		// if we've reached the end, we just quit
+
+		if ((iFaxServerSessionSettings->iTxPages) == iModem->iProgress.iPage)
+			{
+			return (TxDCNL ());
+			}
+
+		// if we've received an MCF we carry on with phase C
+
+		if (iResults[2] == KT30_MCF)      // carry on with phase C only if MCF
+
+			{
+			return (TxSetHighSpeedL ());
+			}
+
+		// we renegotiate if PIP or RTP, or PIN or RTN with no resend
+
+		iModem->iOurMessage.Format (_L8 ("Renegotiating session parameters"));
+		iModem->ProgressUpdateL ();
+		return (TxPrePageL ());
+		}
+}
+/********************************************************************/
+
+// the analysis of the DIS frame and composition of the DCS frame
+ // has been moved here for readability
+
+inline void CFaxClass1::AnalyseDISL ()
+{
+	TInt i;
+
+	// we copy iResults to our iDisFrame and compose our reply in iDcsFrame
+
+	for (i = 0; i < 5; i++)
+		iDisFrame.byte[i] = (TUint8) iResults[i + 3];
+
+	for (i = 0; i < 5; i++)
+		iDcsFrame.byte[i] = 0;
+
+	// we always set T.4
+
+	iDcsFrame.bit.b10 = 1;
+
+	// we check the speed capability next and reset our iActualFaxSpeed
+
+	switch (iDisFrame.byte[1] & 0x3c)
+		{
+		case 0x08:
+			i = 48;
+			break;                 /* V.27 ter 4800 2400 */
+		case 0x0c:
+			i = 96;
+			break;                 /* V.29 9600 7200 + V.27 */
+		case 0x2c:
+			i = 145;
+			break;                 /* V.17 14400 + V.29 + V.27 */
+		default:
+			i = 24;                /* V.27 fallback 2400 only */
+		}
+	if (i < (iActualFaxSpeed))
+		iActualFaxSpeed = i;
+
+	// we set our resolution to that of the fax we want to send
+	// but if the receiver can only understand normal resolution
+	// then we send all our faxes as normal and resign ourselves
+	// to stretching them to double length
+
+	iDcsFrame.bit.b15 = iFaxServerSessionSettings->iTxResolution;
+	if (iDisFrame.bit.b15 == 0)
+		iDcsFrame.bit.b15 = 0;
+	iModem->iProgress.iResolution = TFaxResolution (iDcsFrame.bit.b15);
+
+	// we set our compression to that of the fax we want to send
+	// unless the receiver can only understand 1D compression - in
+	// which case the sender should be able to compensate from the 
+	// progress settings
+
+	iDcsFrame.bit.b16 = iFaxServerSessionSettings->iTxCompression;
+	if (iDisFrame.bit.b16 == 0)
+		{
+		iDcsFrame.bit.b16 = 0;
+		}
+	
+	if ((iDisFrame.bit.b16==1) && ((iFaxServerSessionSettings->iTxCompression==EModifiedRead)))
+		{
+		iDcsFrame.bit.b16 = 1;
+		}
+
+	iModem->iProgress.iCompression = TFaxCompression (iDcsFrame.bit.b16);
+
+	if (iModem->iProgress.iCompression==0)
+		{
+		iModem->iOurMessage.Format (_L8("DCS frame set to 1D"));
+		iModem->ProgressUpdateL();
+		}
+	else 
+		{
+		iModem->iOurMessage.Format (_L8("DCS frame set to 2D"));
+		iModem->ProgressUpdateL();
+		}
+
+
+	// we set the minumum scan line time to that of the receiver
+
+	iDcsFrame.byte[2] &= 0x8f;
+	switch (iDisFrame.byte[2] & 0x70)
+		{
+		case 0x70:
+                                        			iMinscan = 0;
+			iDcsFrame.byte[2] |= 0x70;
+			break;                 /* b21=1 b22=1 b23=1 */
+		case 0x50:
+			if (iDcsFrame.bit.b15 == 0)
+				{
+			iMinscan = 40;
+			iDcsFrame.byte[2] |= 0x40;
+				}
+			else
+				{
+				iMinscan = 20;
+				}
+			break;                 /* b21=1 b22=0 b23=1 - for fine res, /by 2 */
+		case 0x30:
+			if (iDcsFrame.bit.b15 == 0)
+				{
+				iMinscan = 20;
+				}
+			else
+				{
+				iMinscan = 10;
+				iDcsFrame.byte[2] |= 0x20;
+				}
+			break;                 /* b21=1 b22=1 b23=0 - for fine res, /by 2 */
+		case 0x60:
+			if (iDcsFrame.bit.b15 == 0)
+				{
+				iMinscan = 10;
+				iDcsFrame.byte[2] |= 0x20;
+				}
+			else
+				{
+				iMinscan = 5;
+				iDcsFrame.byte[2] |= 0x10;
+				}
+			break;                 /* b21=0 b22=1 b23=1 - for fine res, /by 2 */
+		case 0x10:
+			iMinscan = 5;
+			iDcsFrame.byte[2] |= 0x10;
+			break;                 /* b21=1 b22=0 b23=0 */
+		case 0x20:
+			iMinscan = 10;
+			iDcsFrame.byte[2] |= 0x20;
+			break;                 /* b21=0 b22=1 b23=0 */
+		case 0x40:
+			iMinscan = 40;
+			iDcsFrame.byte[2] |= 0x40;
+			break;                 /* b21=0 b22=0 b23=1 */
+		default:
+			iMinscan = 20;         /* b21=0 b22=0 b23=0 */
+		}
+
+	// lastly, we always match our page length to the receiver page length
+
+	iDcsFrame.bit.b19 = iDisFrame.bit.b19;
+	iDcsFrame.bit.b20 = iDisFrame.bit.b20;
+}
+/********************************************************************/
+
+// this is where we wait for modem responses
+
+ // this function can be called either with a timeout in seconds
+ // or with nothing, in which case we use a default as follows :
+
+ // when we wait for the frame data we use a 6 second timeout
+ // as specified in T.30 as timer T2 if we are waiting for
+ // a command or a 3 second timer as specified in timer T4
+ // if we are waiting for a response, with the presence of
+ // a resendable frame in iOldFrame being the test
+
+ // notice that importL() takes a timeout specified in seconds
+
+ // normally OK and CONNECT are good with ERROR or NO CARRIER being bad
+ // we save the actual result for inspection as ERROR codes after
+ // frame reception with AT+FRH needs special handling via GETFRAMESTAT
+
+TInt CFaxClass1::FramestatL ()
+{
+	TInt ticks;
+	if (iOldFrame.Length () == 0)
+		ticks = KT30_T2;
+	else
+		ticks = KT30_T4;
+	return (FramestatL (ticks));
+}
+/********************************************************************/
+
+TInt CFaxClass1::FramestatL (TInt aTicks)
+{
+	for (;;)
+		{
+		iModemString.SetMax ();
+		if (iModem->ImportL (iModemString, aTicks) == 0)
+			return (-1);;
+
+		iModem->iOurMessage.Format (_L8 ("%S"), &iModemString);
+		iModem->ProgressUpdateL ();
+
+		if ((iModemString.FindF (_L8 ("OK"))) >= 0)
+			return (1);
+		if ((iModemString.FindF (_L8 ("CONNECT"))) >= 0)
+			return (1);
+		if ((iModemString.FindF (_L8 ("ERROR"))) >= 0)
+			return (0);
+		if ((iModemString.FindF (_L8 ("NO CARRIER"))) >= 0)
+			return (0);
+		}
+}
+/********************************************************************/
+
+// if we have an ERROR result on receiving a frame it means that
+ // the CRC was incorrect - the action is to wait until 200 ms of
+ // silence have elapsed before resending the last frame - we use
+ // the ReceiveSilenceL function for this
+
+TInt CFaxClass1::GetFramestatL ()
+{
+	TInt code = FramestatL ();
+	if ((iModemString.FindF (_L8 ("ERROR"))) >= 0)
+		ReceiveSilenceL ();
+	return (code);
+}
+/********************************************************************/
+
+// this is the HDLC frame reception handler after AT+FRH commands
+
+TInt CFaxClass1::GetframeL (TDes8 & aResult)
+{
+	TInt i, retries = 0, frameStatus = 1;
+	TInt ticks;
+	TUint8 thisChar, lastChar;
+	TBuf8 < 4 > iHexchar;
+
+	iModem->iOurMessage.Format (_L8 ("Waiting for Frame"));
+	iModem->ProgressUpdateL ();
+
+	// framestat is set to 1 for no error before entry to the loop
+
+	for (;;)
+		{
+
+		// we only try three times before giving up
+
+		retries++;
+		if (retries > 3)
+			return (0);
+
+		// if we timed out, cancel the frame before proceeding
+
+		if (frameStatus < 0)
+			{
+			iModem->TxcharL (Kcan);
+			iModem->iOurMessage.Format (_L8 ("Frame timed out"));
+			iModem->ProgressUpdateL ();
+			GetFramestatL ();
+			}
+
+		// on any error, we resend the last frame if possible before
+		// waiting for another go
+
+		if (frameStatus != 1)
+			{
+			if (SendframeL (iOldFrame) == 0)
+				{
+				iModem->iOurMessage.Format (_L8 ("Cannot resend Frame"));
+				iModem->ProgressUpdateL ();
+				return (0);
+				}
+			iModem->iOurMessage.Format (_L8 ("Frame has been resent"));
+			iModem->ProgressUpdateL ();
+			iModem->ExportL (_L8 ("AT+FRH=3\r"));
+			}
+
+		// if we've just answered the phone, we don't wait for a result
+		// otherwise we must have an OK or CONNECT before proceeding
+
+		if ((aResult.Compare (_L8 ("CALL JUST ANSWERED"))) == 0)
+			{
+			frameStatus = 1;
+			}
+		else
+			{
+			frameStatus = GetFramestatL ();
+			}
+
+		aResult.FillZ ();
+		aResult.SetMax ();
+
+		// if we got NO CARRIER or ERROR then we have to try again
+
+		if (frameStatus != 1)
+			continue;
+
+		// when we wait for the frame data we use a 6 second timeout
+		// as specified in T.30 as timer T2 if we are waiting for
+		// a command or a 3 second timer as specified in timer T4
+		// if we are waiting for a response, with the presence of
+		// a resendable frame in iOldFrame being the test
+
+		// note that RxcharWaitL () takes a timeout in microseconds
+
+		if (iOldFrame.Length () == 0)
+			ticks = CLK_TCK * KT30_T2;
+		else
+			ticks = CLK_TCK * KT30_T4;
+
+		// we expect data with dle shielding, ending with dle etx,
+		// and with a hex dump for our session log
+
+		// there is a 3 second maximum length to a frame but
+		// the modem will detect bad HDLC frames for us and
+		// flag with ERROR
+
+		for (i = 0, lastChar = 0; i < 64;)
+			{
+			if ((iModem->RxcharWaitL (ticks)) == 0)
+				{
+				frameStatus = (-1);
+				break;
+				}
+			thisChar = iModem->iReadone[0];
+			if (lastChar == Kdle)
+				{
+				if (thisChar == Ketx)
+					break;
+				lastChar = 0;
+				if (thisChar != Kdle)
+					continue;
+				}
+			else if (thisChar == Kdle)
+				{
+				lastChar = Kdle;
+				continue;
+				}
+			aResult[i++] = thisChar;
+
+			iHexchar.Format (_L8 ("%x "), thisChar);
+			if ((iModem->iOurMessage.Length () + iHexchar.Length ()) + 18 < iModem->iOurMessage.MaxLength ())
+				iModem->iOurMessage.Append (iHexchar);
+			}
+
+		iModem->ProgressUpdateL ();
+
+		// if we timed out during the wait, then go round again and handle it
+
+		if (frameStatus != 1)
+			continue;
+
+		// otherwise we wait for the result code following the dle etx
+		// and handle any errors from that
+
+		frameStatus = GetFramestatL ();
+		if (frameStatus != 1)
+			continue;
+
+		// the third byte in the frame is the FCF (fax control field)
+		// we don't care whether we originated or answered the call
+		// so we always knock off the T.30 X bit (LSB)
+
+		aResult[2] &= 0xfe;
+
+		// if we have been asked for a frame repeat we do that in here
+
+		if (aResult[2] == 0x1a)
+			{
+			iModem->iOurMessage.Format (_L8 ("CRP command repeat Frame"));
+			iModem->ProgressUpdateL ();
+			ReceiveSilenceL ();
+			frameStatus = 0;       // treat as a timeout and resend
+			continue;
+			}
+
+		// otherwise we can now return with success
+
+		return (1);
+		}
+}
+/********************************************************************/
+
+// this is the send HDLC frame handler following AT+FTH commands
+
+TInt CFaxClass1::SendframeL (TDes8 & newframe)
+{
+	TUint8 i;
+	TInt frameSize;
+	TBuf8 < 4 > iHexchar;
+
+	// we take a copy of the frame we've been passed in case we want
+	// to resend for error recovery during GetFrame - it's the copy
+	// we work with
+
+	if (&newframe != &iOldFrame)
+		iOldFrame.Copy (newframe);
+	frameSize = iOldFrame.Length ();
+	if (frameSize < 2)
+		return (0);
+
+	// all frames must be at least three characters
+	// note that calling SendframeL with an empty frame disables
+	// resends - iOldFrame.Zero() is rather quicker though
+
+	// we don't need to tell the modem that we're going to send a frame
+	// if we're sending DCS or CSI or DIS/DTC for the first time after a CONNECT response
+	// (not a resend) - in all other cases we need to send AT+FTH
+
+	iOldFrame[1] |= iFcfXbit;    // combine the FCF with the X bit
+	i = iOldFrame[1];
+
+	if (!((&newframe != &iOldFrame) && (i == (KT30_DCS|iFcfXbit)) || (i == KT30_CSI) || (i == (KT30_DIS|iFcfXbit))))
+		{
+		iModem->ExportL (_L8 ("AT+FTH=3\r"));
+		if (FramestatL () != 1)
+			return (0);
+		}
+
+	// we have a short delay before sending data here after any modem response
+
+	iModem->ExportL (_L8 (""));
+
+	// we now send the frame, starting with the fixed address followed
+	// by the data we have been passed.  We use dle shielding and end
+	// with dle etx and a hex dump before returning with the modem
+	// response code
+
+	iModem->TxcharL (KT30_ADDR);
+	iModem->iOurMessage.Format (_L8 ("%x "), KT30_ADDR);
+	for (i = 0; i < frameSize; i++)
+		{
+		iModem->TxcharL (iOldFrame[i]);
+		iHexchar.Format (_L8 ("%x "), iOldFrame[i]);
+		if ((iModem->iOurMessage.Length () + iHexchar.Length ()) + 18 < iModem->iOurMessage.MaxLength ())
+			iModem->iOurMessage.Append (iHexchar);
+		if (iOldFrame[i] == Kdle)
+			iModem->TxcharL (Kdle);
+		}
+	iModem->TxcharL (Kdle);
+	iModem->TxcharL (Ketx);
+	iModem->ProgressUpdateL ();
+	return (FramestatL ());
+}
+/********************************************************************/
+
+// this is short routine to request a resend of a frame
+
+TInt CFaxClass1::SendCRPL ()
+{
+	iModem->iOurMessage.Format (_L8 ("Inappropriate frame %x"), (TUint8) iResults[2]);
+	iModem->ProgressUpdateL ();
+	if (iResults[1] & 0x10)
+		{
+		iModem->iOurMessage.Format (_L8 ("sending CRP"));
+		iModem->ProgressUpdateL ();
+		ReceiveSilenceL ();
+		iFrame.Zero ();
+		iFrame.Append (KT30_CTLLST);
+		iFrame.Append (KT30_CRP);
+		if (SendframeL (iFrame) == 0)
+			return (KFaxErrCRP);
+		iResults[1] = 0x0;
+		}
+	return (KErrNone);
+}
+/********************************************************************/
+
+// this utility waits for 200 ms of silence before proceeding. We allow
+// a three second timeout here in case we are waiting for a train to
+// finish.  we used the modem AT+FRS command - if it fails we'll have
+// waited for three seconds in any case, so why bother with an error ? -
+// this code is used mostly for error recovery purposes but note that
+// not all modems support the +FRS command properly for example the
+// Megahertz PCMCIA sportster
+
+void CFaxClass1::ReceiveSilenceL ()
+{
+	iModem->ExportL (_L8 ("AT+FRS=20\r"));
+	if ((iModem->GetMatchL (_L8 ("OK"), 3)) == 0)
+		{
+		iModem->iOurMessage.Format (_L8 ("Timeout waiting for silence"));
+		iModem->ProgressUpdateL ();
+		iModem->TxcharL (Kcan);
+		if (iModem->GetMatchL (_L8 ("OK"), 1) == 0)
+			iModem->TxcharL (Kreturn);
+		}
+}
+/********************************************************************/
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/CFAX2.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,609 @@
+// 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:
+//
+
+#include "FAXSERV.H"
+#include "fax_reversebytes.h"
+#include "FAXMODEM.H"
+#include "FAXMDRV.H"
+
+#include "FAXLOG.H"
+
+
+const TInt KClass2HangupStatusTimer=20;	// < Time used to wait for final +FHNG: report.
+
+// this module has three parts
+// first receive routines rx
+// second transmit routines tx
+// third utilities
+
+/********************************************************************/
+
+CFaxModemDriver *CFaxClass2::NewLC (TFaxServerSessionSettings * aFaxServerSessionSettings, RFax::TProgress & aProgress)
+{
+	CFaxModemDriver *self = new (ELeave) CFaxClass2;
+	CleanupStack::PushL (self);
+	self->ConstructL (aFaxServerSessionSettings, aProgress);
+	return self;
+}
+
+CFaxModemDriver *CFaxClass2::NewL (TFaxServerSessionSettings * aFaxServerSessionSettings, RFax::TProgress & aProgress)
+{
+	CFaxModemDriver *self = NewLC (aFaxServerSessionSettings, aProgress);
+	CleanupStack::Pop ();
+	return self;
+}
+/********************************************************************/
+
+TInt CFaxClass2::RxConnectL ()
+{
+	__FLOG_FAXSRV( _L8("CFaxClass2::RxConnectL entering"));
+	
+	CheckCadenceExportL (_L8 ("AT+FDCC=?\r"));
+	if (!(iModem->ImportL (iResults, 35)))
+		return (KFaxErrModemNotWorking);
+
+	iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+	iModem->ProgressUpdateL ();
+	ParseResults (iResults);
+
+	iModem->GetMatchL (_L8 ("OK"), 2);
+
+	if (iFaxServerSessionSettings->iRxResolution == EFaxNormal)
+		iModem->iProgress.iResolution = EFaxNormal;
+	else
+		iModem->iProgress.iResolution = EFaxFine;
+
+	if (iFaxServerSessionSettings->iRxCompression == EModifiedRead)
+		iModem->iProgress.iCompression = EModifiedRead;
+	else
+		iModem->iProgress.iCompression = EModifiedHuffman;
+	iActualFaxSpeed = iModem->iProgress.iSpeed;
+	if (iActualFaxSpeed > iFaxServerSessionSettings->iMaxSpeed)
+		iActualFaxSpeed = iFaxServerSessionSettings->iMaxSpeed;
+
+	iResults.Copy (_L8 ("AT+FDCC=0,0,0,2,0,0,0,0\r"));
+
+	iResults[8] = (TUint8) (iResults[8] + iModem->iProgress.iResolution);
+	iResults[10] = (TUint8) (((iActualFaxSpeed / 2400) - 1) + '0');
+	iResults[16] = (TUint8) (iResults[16] + iModem->iProgress.iCompression);
+	CheckCadenceExportL (iResults);
+	if ((iModem->GetMatchL (_L8 ("OK"), 3)) == 0)
+		return (KFaxErrModemNotWorking);
+	CheckCadenceExportL (_L8 ("AT+FAA=0\r"));
+	if ((iModem->GetMatchL (_L8 ("OK"), 5)) == 0)
+		return (KFaxErrNoReceiveMode);
+	
+	TBuf8<RCall::KFaxIdUserNameMaxSize> narrowBuf;
+	narrowBuf.Copy(iFaxServerSessionSettings->iFaxId);
+	
+	//-- By Dmitry Lyokhin. concerns PIA-58ELQK defect.
+	if( narrowBuf.Length() < 1 ) narrowBuf.Append(' ');
+
+
+	if (iFaxServerSessionSettings->iMode & KFaxPoll)
+		{
+		iModem->ExportL (_L8 ("AT+FSPL=1\r"));
+		if ((iModem->GetMatchL (_L8 ("OK"), 5)) == 0)
+			return (KFaxPollingUnsupported);
+		iModem->ExportL (_L8 ("AT+FCIG=\""));
+		iModem->ExportL (narrowBuf);
+		iModem->ExportL (_L8 ("\"\r"));
+		if ((iModem->GetMatchL (_L8 ("OK"), 3)) == 0)
+			return (KFaxPollingUnsupported);
+		}
+	else
+		{
+		CheckCadenceExportL (_L8 ("AT+FCR=1\r"));
+		if ((iModem->GetMatchL (_L8 ("OK"), 5)) == 0)
+			return (KFaxErrNoReceiveMode);
+		CheckCadenceExportL (_L8 ("AT+FLID=\""));
+		iModem->ExportL (narrowBuf);
+		iModem->ExportL (_L8 ("\"\r"));
+		if ((iModem->GetMatchL (_L8 ("OK"), 3)) == 0)
+			return (KFaxErrModemNotWorking);
+		}
+
+	if (iFaxServerSessionSettings->iMode & KFaxWaitForRing)
+		{
+//		while ((iModem->GetMatchL (_L8 ("RING"), 3)) == 0);
+//		iTimeOfLastRing.UniversalTime();
+		}
+	else
+		{
+		if ((iFaxServerSessionSettings->iMode & KFaxOffHook) == 0)
+			DialFaxOnDemandL ();
+		}
+
+	if ((iFaxServerSessionSettings->iMode & KFaxPoll) == 0)
+		{
+		iModem->Silence (CLK_TCK);
+		CheckCadenceExportL (_L8 ("ATA\r"));
+		}
+
+	iModem->iProgress.iPhase = ECallEstablishment;
+
+	TInt pollDocsAvailable = 0;
+
+	for (;;)
+		{
+		if (!(iModem->ImportL (iResults, 35)))
+			return (KFaxErrCannotAnswer);
+
+		iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+		iModem->ProgressUpdateL ();
+
+		if ((iResults.FindF (_L8 ("NO DIALTONE"))) >= 0 ||
+			iResults.FindF (_L8 ("NO DIAL TONE")) >= 0)
+			return (KFaxErrNoDialTone);
+		if ((iResults.FindF (_L8 ("BUSY"))) >= 0)
+			return (KFaxErrBusy);
+		if ((iResults.FindF (_L8 ("NO ANSWER"))) >= 0)
+			return (KFaxErrNoAnswer);
+		if ((iResults.FindF (_L8 ("NO CARRIER"))) >= 0)
+			return (KFaxErrNoCarrier);
+		if ((iResults.FindF (_L8 ("OK"))) >= 0)
+			break;
+		if ((iResults.FindF (_L8 ("FHNG"))) >= 0)
+			return (KFaxErrPrematureHangup);
+		if ((iResults.FindF (_L8 ("FCON"))) >= 0)
+			iModem->iProgress.iPhase = ESessionNegotiation;
+		else if ((iResults.FindF (_L8 ("FPOLL"))) >= 0)
+			pollDocsAvailable = 1;
+		else if ((iResults.FindF (_L8 ("FTSI"))) >= 0)
+			ExtractAnswerback (iResults);
+		else if ((iResults.FindF (_L8 ("FDCS"))) >= 0)
+			ParseResults (iResults);
+		}
+
+	if ((iFaxServerSessionSettings->iMode & KFaxPoll) && (pollDocsAvailable == 0))
+		return (KFaxNothingToPoll);
+
+	iModem->iOurMessage.Format (_L8 ("about to receive fax"));
+	iModem->ProgressUpdateL ();
+	return (RxPrePageL ());
+}
+
+/********************************************************************/
+TInt CFaxClass2::RxPrePageL ()
+{
+	__FLOG_FAXSRV( _L8("CFaxClass2::RxPrePageL entering"));
+
+	iModem->ExportL (_L8 ("AT+FDR\r"));
+	for (;;)
+		{
+		if (!(iModem->ImportL (iResults, 35)))
+			return (KFaxErrCannotConnect);
+
+		iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+		iModem->ProgressUpdateL ();
+
+		if ((iResults.FindF (_L8 ("ERROR"))) >= 0)
+			return (KFaxErrNoReceiveMode);
+		if ((iResults.FindF (_L8 ("FHNG"))) >= 0)
+			return (KFaxErrPrematureHangup);
+		if ((iResults.FindF (_L8 ("CONNECT"))) >= 0)
+			break;
+		if ((iResults.FindF (_L8 ("FDCS"))) >= 0)
+			ParseResults (iResults);
+		}
+
+	iModem->TxcharL (Kdc2);
+	return (RxStartPageL ());
+}
+/********************************************************************/
+TInt CFaxClass2::RxPostPageL ()
+{
+	__FLOG_FAXSRV(_L8("CFaxClass2::RxPostPageL entering"));
+
+	iModem->iProgress.iPhase = EPostPageStatus;
+	iModem->ProgressUpdateL ();
+	for (;;)
+		{
+		if (!(iModem->ImportL (iResults, 20)))
+			return (KFaxErrModemResponse);
+
+		iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+		iModem->ProgressUpdateL ();
+
+		if ((iResults.FindF (_L8 ("OK"))) >= 0)
+			return (KFaxErrPrematureOK);
+		if ((iResults.FindF (_L8 ("FHNG"))) >= 0)
+			return (KFaxErrPrematureHangup);
+		if ((iResults.FindF (_L8 ("FET"))) >= 0)
+			break;
+		}
+	if (iModem->GetMatchL (_L8 ("OK"), 5) == 0)
+		return (KFaxErrNoFinalOK);
+
+	if ((iResults.FindF (_L8 ("0"))) >= 0)
+		{
+		iModem->iOurMessage.Format (_L8 ("page %u successfully received"), iModem->iProgress.iPage);
+		iModem->ProgressUpdateL ();
+		return (RxPrePageL ());
+		}
+	if ((iResults.FindF (_L8 ("1"))) >= 0)
+		{
+		iModem->iOurMessage.Format (_L8 ("page %u successfully received : end of document"), iModem->iProgress.iPage);
+		iModem->ProgressUpdateL ();
+		iModem->iOurMessage.Format (_L8 ("Next fax awaited"));
+		iModem->ProgressUpdateL ();
+		return (RxPrePageL ());
+		}
+	if ((iResults.FindF (_L8 ("2"))) >= 0)
+		{
+		iModem->iOurMessage.Format (_L8 ("Final page %u successfully received"), iModem->iProgress.iPage);
+		iModem->ProgressUpdateL ();
+		iModem->iProgress.iPhase = EDisconnection;
+		iModem->ExportL (_L8 ("AT+FDR\r"));
+		if (iModem->GetMatchL (_L8 ("FHNG"), KClass2HangupStatusTimer) == 0)
+			return (KFaxErrNoHangup);
+		if (iModem->GetMatchL (_L8 ("OK"), 5) == 0)
+			return (KFaxErrNoFinalOK);
+		return (KErrNone);
+		}
+	return (KFaxErrUnknownPageCode);
+}
+/********************************************************************/
+
+TInt CFaxClass2::TxConnectL ()
+{
+	// we always use direct bit order when sending
+	// we always use reversed bit order when receiving
+	// this is in accordance with the rockwell bug.
+	// if a modem doesn't have the rockwell bug then
+	// the fax init string AT+FBOR=1 will force the
+	// use of reversed bit ordering on reception.
+	// since we have here a hardwired default AT+FBOR=0
+	// on transmission this will override the init string
+	// which will therefore only be used (as needed) for
+	// reception, and everything will work again
+
+    __FLOG_FAXSRV( _L8("CFaxClass2::TxConnectL entering"));
+
+	iModem->ExportL (_L8 ("AT+FBOR=0\r"));
+	iModem->GetMatchL (_L8 ("OK"), 3);
+
+	TBuf8<RCall::KFaxIdUserNameMaxSize> narrowBuf;
+	narrowBuf.Copy(iFaxServerSessionSettings->iFaxId);
+	
+	//-- if the fax local id string is empty, insert blank
+	//-- PIA-58ELQK defect fix by Dmitry Lyokhin 26.03.2001
+	if( narrowBuf.Length() < 1 ) narrowBuf.Append(' ');
+
+
+	iModem->ExportL (_L8 ("AT+FLID=\""));
+	iModem->ExportL (narrowBuf);
+	iModem->ExportL (_L8 ("\"\r"));
+	if ((iModem->GetMatchL (_L8 ("OK"), 3)) == 0)
+		return (KFaxErrModemNotWorking);
+
+	iModem->ExportL (_L8 ("AT+FDCC=?\r"));
+	if (!(iModem->ImportL (iResults, 35)))
+		return (KFaxErrModemNotWorking);
+
+	iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+	iModem->ProgressUpdateL ();
+	ParseResults (iResults);
+
+	iModem->GetMatchL (_L8 ("OK"), 2);
+
+	iActualFaxSpeed = iModem->iProgress.iSpeed;
+	if (iActualFaxSpeed > iFaxServerSessionSettings->iMaxSpeed)
+		iActualFaxSpeed = iFaxServerSessionSettings->iMaxSpeed;
+
+	iResults.Copy (_L8 ("AT+FDCC=0,0,0,2,0,0,0,0\r"));
+
+	iResults[8] = (TUint8) (iResults[8] + iFaxServerSessionSettings->iTxResolution);
+	iResults[10] = (TUint8) (((iActualFaxSpeed / 2400) - 1) + '0');
+
+
+	// added to support 2Dfaxing using class 2
+	if (iModem->iProgress.iCompression==EModifiedRead)
+		iResults[16] = (TUint8) (iResults[16] + iFaxServerSessionSettings->iTxCompression);
+	else
+		iResults[16] = (TUint8) (iResults[16] + EModifiedHuffman);
+
+	iModem->ExportL (iResults);
+	if ((iModem->GetMatchL (_L8 ("OK"), 3)) == 0)
+		return (KFaxErrModemNotWorking);
+
+	iModem->ExportL (_L8 ("ATD"));
+	if ((iFaxServerSessionSettings->iMode & KFaxOffHook) == 0)
+		iModem->ExportL (iFaxServerSessionSettings->iPhoneNumber);
+	iModem->TxcharL (Kreturn);
+
+	iModem->iProgress.iPhase = ECallEstablishment;
+	for (;;)
+		{
+		if (!(iModem->ImportL (iResults, KDialTimeout)))
+			return (KFaxErrNoDial);
+
+		iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+		iModem->ProgressUpdateL ();
+
+		if ((iResults.FindF (_L8 ("NO DIALTONE"))) >= 0 ||
+			iResults.FindF (_L8 ("NO DIAL TONE")) >= 0)
+			return (KFaxErrNoDialTone);
+		if ((iResults.FindF (_L8 ("BUSY"))) >= 0)
+			return (KFaxErrBusy);
+		if ((iResults.FindF (_L8 ("NO ANSWER"))) >= 0)
+			return (KFaxErrNoAnswer);
+		if ((iResults.FindF (_L8 ("NO CARRIER"))) >= 0)
+			return (KFaxErrNoCarrier);
+		if ((iResults.FindF (_L8 ("FHNG"))) >= 0)
+			return (KFaxErrNoNegotiate);
+		if ((iResults.FindF (_L8 ("OK"))) >= 0)
+			break;
+		if ((iResults.FindF (_L8 ("FCON"))) >= 0)
+			iModem->iProgress.iPhase = ESessionNegotiation;
+		else if ((iResults.FindF (_L8 ("FCSI"))) >= 0)
+			ExtractAnswerback (iResults);
+		}
+	return (TxPrePageL ());
+}
+/********************************************************************/
+TInt CFaxClass2::TxPrePageL ()
+{
+    __FLOG_FAXSRV( _L8("CFaxClass2::TxPrePageL entering"));
+
+	iModem->ExportL (_L8 ("AT+FDT\r"));
+	for (;;)
+		{
+		if (!(iModem->ImportL (iResults, 30)))
+			return (KFaxErrNoNegotiate);
+
+		iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+		iModem->ProgressUpdateL ();
+
+		if ((iResults.FindF (_L8 ("FHNG"))) >= 0)
+			return (KFaxErrNoNegotiate);
+		if ((iResults.FindF (_L8 ("CONNECT"))) >= 0)
+			break;
+		if ((iResults.FindF (_L8 ("FDCS"))) >= 0)
+			ParseResults (iResults);
+		}
+
+	for (;;)
+		{
+		
+		//TInt ticks = CLK_TCK * 10;
+		//-- PIA-58ELQK defect fix by Dmitry Lyokhin 26.03.2001
+		TInt XonTimeoutSec = CLK_TCK * 3; 
+		
+		if ((iModem->RxcharWaitL (XonTimeoutSec)) == 0)
+		{
+			//-- XON character sending timeout. Ignore. 
+			//-- PIA-58ELQK defect fix by Dmitry Lyokhin 26.03.2001
+			//return (KFaxNoClass2Xon);
+			break;
+		}
+
+		if (iModem->iReadone[0] == Kxon)
+			break;
+		}
+	return (TxStartPageL ());
+}
+/********************************************************************/
+
+//
+ // TxPostPage should return either with
+ //
+ // a) an error code and iPhase set to RFax::EPostPageStatus, in which case the send returns with the error
+ // b) KErrNone and iPhase set to RFax::EDataTransfer, in which case we send the next page
+ // c) KErrNone and iPhase set to RFax::EDisconnection, in which case the send returns with KErrNone
+ //
+
+TInt CFaxClass2::TxPostPageL ()
+{
+	
+	iModem->iTransmitBuffer.Append (Kdle);
+	iModem->iTransmitBuffer.Append (Ketx);
+	iModem->CommitTransmitBufferL ();
+
+	iModem->iOurMessage.Format (_L8 ("<dle><etx> transmitted after %d lines"), iModem->iProgress.iLines);
+	
+    __FLOG_FAXSRV(iModem->iOurMessage);
+
+	iModem->iProgress.iPhase = EPostPageStatus;
+	iModem->ProgressUpdateL ();
+	while (iModem->Txstat () != 0)
+		;
+
+	// we've just ended phase C data, so we need to wait for the modem to respond with OK
+
+
+
+	if (iModem->GetMatchL (_L8 ("OK"), (32 * 1024) / (iModem->iProgress.iSpeed / 10)) == 0)
+		return (KFaxErrCannotEndData);
+
+	iModem->Xonoff ();
+
+	if (iFaxServerSessionSettings->iTxPages == iModem->iProgress.iPage)
+		{
+		iModem->ExportL (_L8 ("AT+FET=2\r"));
+		iModem->iOurMessage.Format (_L8 ("End of document transmitted EOP frame"));
+		}
+	else
+		{
+		iModem->ExportL (_L8 ("AT+FET=0\r"));
+		iModem->iOurMessage.Format (_L8 ("End of page %u transmitted MPS frame"), iModem->iProgress.iPage);
+		}
+	iModem->ProgressUpdateL ();
+
+	for (;;)
+		{
+		
+//#if defined (__WINS__)
+//		RDebug::Print(_L("NOW"));
+//#endif
+
+
+		if (!(iModem->ImportL (iResults, 30)))
+		{
+			return (KFaxErrModemResponse);
+		}
+
+		iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+		iModem->ProgressUpdateL ();
+
+		if ((iResults.FindF (_L8 ("FHNG"))) >= 0)
+			{
+			if (iResults[7] == '0')
+				break;
+			return (KFaxErrNoNegotiate);
+			}
+
+		if ((iResults.FindF (_L8 ("FPTS"))) >= 0)
+			{
+				
+				if (iResults.FindF (_L8("1"))==6)		// 6 is the position of the error code in descriptor
+					{
+						iModem->iOurMessage.Append (_L8("FPTS:1  MCF frame"));
+						iModem->ProgressUpdateL ();	
+						break;
+					}
+				else if (iResults.FindF(_L8("2"))==6)
+					{
+						iModem->iOurMessage.Append (_L8("FPTS:2  RTN frame"));
+						iModem->ProgressUpdateL ();	
+						break;
+					}
+				else if (iResults.FindF(_L8("3"))==6)
+					{
+						iModem->iOurMessage.Append (_L8("FPTS:3  RTP frame"));
+						iModem->ProgressUpdateL ();	
+						break;
+					}
+				else if (iResults.FindF(_L8("4"))==6)
+					{
+						iModem->iOurMessage.Append (_L8("FPTS:4  PIN frame"));
+						iModem->ProgressUpdateL ();	
+						break;
+					}
+				else if (iResults.FindF(_L8("5"))==6)
+					{
+						iModem->iOurMessage.Append (_L8("FPTS:5  PIP frame"));
+						iModem->ProgressUpdateL ();	
+						break;
+					}  
+				break;
+	
+			}
+	} // for(;;) ends here
+
+	if (iModem->GetMatchL (_L8 ("OK"), 5) == 0)
+		return (KFaxErrNoFinalOK);
+
+	if ((((iResults.FindF (_L8 ("2"))) >= 0) || (iResults.FindF (_L8 ("4")) >= 0)) && (iRepeatPage <= 3))  //RTN and 
+	{																								       //PIN  responses
+		iModem->iProgress.iPhase = ESessionNegotiation;
+		iRepeatPage++;
+		iModem->iProgress.iPage--;
+		return (TxPrePageL ());
+		}
+	if (iFaxServerSessionSettings->iTxPages != iModem->iProgress.iPage)
+		{
+		iRepeatPage = 0;
+		return (TxPrePageL ());
+		}
+	iModem->iProgress.iPhase = EDisconnection;
+	return (KErrNone);
+}
+/********************************************************************/
+
+// this routine parses both class 2 and class 2.0
+ // T.30 session subparameter strings, from both interrogatories
+ // and reports - for interrogatories, we assume that later capabilities
+ // (inside the brackets) are preferable to earlier ones
+
+// amended July 1998 to support ECM for class 2.0
+
+void CFaxClass2::ParseResults (TDesC8 & aResults)
+{
+	TInt x, field, inbracket;
+	static const TInt minscans[][2] =
+		{
+			{0, 0
+			},
+			{5, 5
+			},
+			{10, 5
+			},
+			{10, 10
+			},
+			{20, 10
+			},
+			{20, 20
+			},
+			{40, 20
+			},
+			{40, 40
+			}
+		};
+
+	for ( x = 0, field = 0, inbracket = 0; x < aResults.Length (); x++)
+		{
+		if ((aResults[x] > '0' - 1) && (aResults[x] < '9' + 1))
+			{
+			if (field == 0)
+				iModem->iProgress.iResolution = TFaxResolution (aResults[x] & 1);
+			else if (field == 1)
+				iModem->iProgress.iSpeed = (aResults[x] - '0' + 1) * 2400;
+			else if (field == 4)
+				iModem->iProgress.iCompression = TFaxCompression (aResults[x] & 1);
+			else if (field == 5)
+				iModem->iProgress.iECM = (aResults[x] - '0');
+			else if (field == 7)
+				{
+				iMinscan = minscans[aResults[x] - '0'][iModem->iProgress.iResolution];
+				if (iMinscan == 0)
+					iMinlinelength = 0;
+				else
+					iMinlinelength = ((iModem->iProgress.iSpeed / (1000 / iMinscan)) / 8) + 1;
+				}
+			}
+		if (aResults[x] == 0)
+			break;
+		if (aResults[x] == 0x28)
+			inbracket = 1;
+		if (aResults[x] == 0x29)
+			inbracket = 0;
+		if ((aResults[x] == 0x2c) && (inbracket == 0))
+			field++;
+		if (field == 8)
+			break;
+		}
+	if (iFaxServerSessionSettings->iFaxClass == EClass2)
+		iModem->iProgress.iECM = 0;       // no ECM using class 2
+	if (iModem->iProgress.iECM)
+		iModem->iProgress.iECM = 1;       // and treat EC as a boolean
+}
+/********************************************************************/
+
+// this routine extract an ID string from a result code
+
+void CFaxClass2::ExtractAnswerback (TDesC8 & aResults)
+{
+	TInt startID = aResults.Locate (0x22);
+	if (startID != KErrNotFound)
+		{
+		startID++;
+		TInt maxIDlength = (aResults.Length () - startID);
+		if (maxIDlength > 20)
+			maxIDlength = 20;
+		iModem->iProgress.iAnswerback.Copy (aResults.Mid (startID, maxIDlength));
+		}
+}
+/********************************************************************/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/CFAX20.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,520 @@
+// 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:
+//
+
+#include "FAXSERV.H"
+#include "fax_reversebytes.h"
+#include "FAXMODEM.H"
+#include "FAXMDRV.H"
+
+#include "FAXLOG.H"
+
+const TInt KClass20HangupStatusTimer=20;	// < Time used to wait for final +FHS: report.  Was 5s, but typical GSM delays range between 4s and 10s.
+
+// this module has two parts
+// first receive routines rx
+// second transmit routines tx
+
+/********************************************************************/
+
+CFaxModemDriver* CFaxClass20::NewLC(TFaxServerSessionSettings * aFaxServerSessionSettings, RFax::TProgress & aProgress)
+	{
+	CFaxModemDriver* self = new(ELeave) CFaxClass20;
+	CleanupStack::PushL(self);
+	self->ConstructL(aFaxServerSessionSettings, aProgress);
+	return self;
+	}
+
+CFaxModemDriver* CFaxClass20::NewL(TFaxServerSessionSettings * aFaxServerSessionSettings, RFax::TProgress & aProgress)
+	{
+	CFaxModemDriver* self = NewLC(aFaxServerSessionSettings, aProgress);
+	CleanupStack::Pop();
+	return self;
+	}
+/********************************************************************/
+
+TInt CFaxClass20::RxConnectL()
+	{
+	__FLOG_FAXSRV( _L8("CFaxClass20::RxConnectL entering"));
+
+	CheckCadenceExportL (_L8 ("AT+FNR=1,1,1,0\r"));
+	if ((iModem->GetMatchL (_L8 ("OK"), 5)) == 0)
+		return (KFaxErrModemNotWorking);
+
+	CheckCadenceExportL(_L8("AT+FCC=?\r"));
+	if (!(iModem->ImportL (iResults, 35)))
+		return (KFaxErrModemNotWorking);
+
+	iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+	iModem->ProgressUpdateL ();
+	ParseResults (iResults);
+
+	iModem->GetMatchL (_L8 ("OK"), 2);
+
+	if (iFaxServerSessionSettings->iRxResolution == EFaxNormal)
+		iModem->iProgress.iResolution = EFaxNormal;
+	else
+		iModem->iProgress.iResolution = EFaxFine;
+
+	if (iFaxServerSessionSettings->iRxCompression == EModifiedRead)
+		iModem->iProgress.iCompression = EModifiedRead;
+	else
+		iModem->iProgress.iCompression = EModifiedHuffman;
+
+	iActualFaxSpeed = iModem->iProgress.iSpeed;
+	if (iActualFaxSpeed > iFaxServerSessionSettings->iMaxSpeed)
+		iActualFaxSpeed = iFaxServerSessionSettings->iMaxSpeed;
+
+	if (iFaxServerSessionSettings->iPreferredECM == 0)
+		iModem->iProgress.iECM = 0;
+
+	iResults.Copy(_L8("AT+FCC=0,0,0,2,0,0,0,0\r"));
+
+	iResults[7] = (TUint8) (iResults[7] + iModem->iProgress.iResolution);
+	iResults[9] = (TUint8) (((iActualFaxSpeed / 2400) - 1) + '0');
+	iResults[15] = (TUint8) (iResults[15] + iModem->iProgress.iCompression);
+	iResults[17] = (TUint8) (iModem->iProgress.iECM + '0');
+	CheckCadenceExportL(iResults);
+	if ((iModem->GetMatchL(_L8("OK"), 3)) == 0)
+		{
+		return (KFaxErrModemNotWorking);
+		}
+	CheckCadenceExportL(_L8 ("AT+FAA=0\r"));
+	if ((iModem->GetMatchL(_L8("OK"), 5)) == 0)
+		{
+		return (KFaxErrNoReceiveMode);
+		}
+
+	TBuf8<RCall::KFaxIdUserNameMaxSize> narrowBuf;
+	narrowBuf.Copy(iFaxServerSessionSettings->iFaxId);	 // convert from unicode to narrow
+	
+	//-- By Dmitry Lyokhin. concerns PIA-58ELQK defect.
+	if( narrowBuf.Length() < 1 )
+		{
+		narrowBuf.Append(' ');
+		}
+
+	if (iFaxServerSessionSettings->iMode & KFaxPoll)
+		{
+		iModem->ExportL(_L8 ("AT+FSP=1\r"));
+		if ((iModem->GetMatchL(_L8("OK"), 5)) == 0)
+			{
+			return (KFaxPollingUnsupported);
+			}
+		iModem->ExportL(_L8("AT+FPI=\""));
+		iModem->ExportL(narrowBuf);
+		iModem->ExportL(_L8 ("\"\r"));
+		if ((iModem->GetMatchL(_L8("OK"), 3)) == 0)
+			{
+			return (KFaxPollingUnsupported);
+			}
+		}
+	else
+		{
+		CheckCadenceExportL(_L8("AT+FCR=1\r"));
+		if ((iModem->GetMatchL(_L8("OK"), 5)) == 0)
+			{
+			return (KFaxErrNoReceiveMode);
+			}
+		CheckCadenceExportL(_L8("AT+FLI=\""));
+		iModem->ExportL(narrowBuf);
+		iModem->ExportL(_L8("\"\r"));
+		if ((iModem->GetMatchL(_L8("OK"), 3)) == 0)
+			{
+			return (KFaxErrModemNotWorking);
+			}
+		}
+
+	if (iFaxServerSessionSettings->iMode & KFaxWaitForRing)
+		{
+//		while ((iModem->GetMatchL(_L8("RING"), 3)) == 0);
+//		iTimeOfLastRing.UniversalTime();
+		}
+	else
+		{
+		if ((iFaxServerSessionSettings->iMode & KFaxOffHook) == 0)
+			{
+			DialFaxOnDemandL();
+			}
+		}
+
+	if ((iFaxServerSessionSettings->iMode & KFaxPoll) == 0)
+		{
+		CheckCadenceExportL(_L8("ATA\r"));
+		}
+
+	iModem->iProgress.iPhase = ECallEstablishment;
+
+	TInt pollDocsAvailable = 0;
+
+	for (;;)
+		{
+		if(!(iModem->ImportL(iResults, 35)))
+			{
+			return KFaxErrCannotAnswer;
+			}
+
+		iModem->iOurMessage.Format(_L8("%S"), &iResults);
+		iModem->ProgressUpdateL();
+
+		if ((iResults.FindF(_L8("NO DIALTONE"))) >= 0 ||
+			iResults.FindF(_L8("NO DIAL TONE")) >= 0)
+			return (KFaxErrNoDialTone);
+		if ((iResults.FindF(_L8("BUSY"))) >= 0)
+			return (KFaxErrBusy);
+		if ((iResults.FindF(_L8("NO ANSWER"))) >= 0)
+			return (KFaxErrNoAnswer);
+		if ((iResults.FindF(_L8("NO CARRIER"))) >= 0)
+			return (KFaxErrNoCarrier);
+		if ((iResults.FindF(_L8("OK"))) >= 0)
+			break;
+		if ((iResults.FindF(_L8("FHS"))) >= 0)
+			return (KFaxErrPrematureHangup);
+		if ((iResults.FindF(_L8("FCO"))) >= 0)
+			iModem->iProgress.iPhase = ESessionNegotiation;
+		else if ((iResults.FindF(_L8("FPO"))) >= 0)
+			pollDocsAvailable = 1;
+		else if ((iResults.FindF(_L8("FTI"))) >= 0)
+			ExtractAnswerback(iResults);
+		else if ((iResults.FindF(_L8("FCS"))) >= 0)
+			ParseResults(iResults);
+		}
+
+	if ((iFaxServerSessionSettings->iMode & KFaxPoll) && (pollDocsAvailable == 0))
+		return (KFaxNothingToPoll);
+
+	iModem->iOurMessage.Format(_L8 ("about to receive fax"));
+	iModem->ProgressUpdateL();
+	return RxPrePageL();
+	}
+
+/********************************************************************/
+TInt CFaxClass20::RxPrePageL()
+	{
+	__FLOG_FAXSRV( _L8("CFaxClass20::RxPrePageL entering"));
+
+	iModem->ExportL(_L8 ("AT+FDR\r"));
+	for (;;)
+		{
+		if (!(iModem->ImportL (iResults, 35)))
+			return (KFaxErrCannotConnect);
+
+		iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+		iModem->ProgressUpdateL ();
+
+		if ((iResults.FindF (_L8 ("ERROR"))) >= 0)
+			return (KFaxErrNoReceiveMode);
+		if ((iResults.FindF (_L8 ("FHS"))) >= 0)
+			return (KFaxErrPrematureHangup);
+		if ((iResults.FindF (_L8 ("CONNECT"))) >= 0)
+			break;
+		if ((iResults.FindF (_L8 ("FCS"))) >= 0)
+			ParseResults (iResults);
+		}
+
+	iModem->TxcharL (Kdc2);
+	return (RxStartPageL ());
+}
+/********************************************************************/
+TInt CFaxClass20::RxPostPageL ()
+{
+    __FLOG_FAXSRV( _L8("CFaxClass20::RxPostPageL entering"));
+
+	iModem->iProgress.iPhase = EPostPageStatus;
+	iModem->ProgressUpdateL ();
+	for (;;)
+		{
+		if (iModem->iProgress.iECM == 0)
+			{
+			if (!(iModem->ImportL (iResults, 20)))
+				return (KFaxErrModemResponse);
+			}
+        else
+            {
+            // coverity[check_return]
+            iModem->ImportL (iResults, 0x7fff);     // no timeout if ECM enabled
+            }
+
+		iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+		iModem->ProgressUpdateL ();
+
+		if ((iResults.FindF (_L8 ("OK"))) >= 0)
+			return (KFaxErrPrematureOK);
+		if ((iResults.FindF (_L8 ("FHS"))) >= 0)
+			return (KFaxErrPrematureHangup);
+		if ((iResults.FindF (_L8 ("FET"))) >= 0)
+			break;
+		}
+	if (iModem->GetMatchL (_L8 ("OK"), 5) == 0)
+		return (KFaxErrNoFinalOK);
+
+	if ((iResults.FindF (_L8 ("0"))) >= 0)
+		{
+		iModem->iOurMessage.Format (_L8 ("page %u successfully received"), iModem->iProgress.iPage);
+		iModem->ProgressUpdateL ();
+		return (RxPrePageL ());
+		}
+	if ((iResults.FindF (_L8 ("1"))) >= 0)
+		{
+		iModem->iOurMessage.Format (_L8 ("page %u successfully received : end of document"), iModem->iProgress.iPage);
+		iModem->ProgressUpdateL ();
+		iModem->iOurMessage.Format (_L8 ("Next fax awaited"));
+		iModem->ProgressUpdateL ();
+		return (RxPrePageL ());
+		}
+	if ((iResults.FindF (_L8 ("2"))) >= 0)
+		{
+		iModem->iOurMessage.Format (_L8 ("Final page %u successfully received"), iModem->iProgress.iPage);
+		iModem->ProgressUpdateL ();
+		iModem->iProgress.iPhase = EDisconnection;
+		iModem->ExportL (_L8 ("AT+FDR\r"));
+		if (iModem->GetMatchL (_L8 ("FHS"), KClass20HangupStatusTimer) == 0)
+			return (KFaxErrNoHangup);
+		if (iModem->GetMatchL (_L8 ("OK"), 5) == 0)
+			return (KFaxErrNoFinalOK);
+		return (KErrNone);
+		}
+	return (KFaxErrUnknownPageCode);
+}
+/********************************************************************/
+
+TInt CFaxClass20::TxConnectL ()
+{
+    __FLOG_FAXSRV( _L8("CFaxClass20::TxConnectL entering"));
+
+	iModem->ExportL (_L8 ("AT+FNR=1,1,1,0\r"));
+	if ((iModem->GetMatchL (_L8 ("OK"), 5)) == 0)
+		return (KFaxErrModemNotWorking);
+	TBuf8<RCall::KFaxIdUserNameMaxSize> narrowBuf;
+	narrowBuf.Copy(iFaxServerSessionSettings->iFaxId);	 // convert from unicode to narrow
+	
+	//-- By Dmitry Lyokhin. concerns PIA-58ELQK defect.
+	if( narrowBuf.Length() < 1 ) narrowBuf.Append(' ');
+
+	
+	iModem->ExportL (_L8 ("AT+FLI=\""));
+	iModem->ExportL (narrowBuf);
+	iModem->ExportL (_L8 ("\"\r"));
+	if ((iModem->GetMatchL (_L8 ("OK"), 3)) == 0)
+		return (KFaxErrModemNotWorking);
+
+	iModem->ExportL (_L8 ("AT+FCC=?\r"));
+	if (!(iModem->ImportL (iResults, 35)))
+		return (KFaxErrModemNotWorking);
+
+	iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+	iModem->ProgressUpdateL ();
+	ParseResults (iResults);
+
+	iModem->GetMatchL (_L8 ("OK"), 2);
+
+	iActualFaxSpeed = iModem->iProgress.iSpeed;
+	if (iActualFaxSpeed > iFaxServerSessionSettings->iMaxSpeed)
+		iActualFaxSpeed = iFaxServerSessionSettings->iMaxSpeed;
+
+	if (iFaxServerSessionSettings->iPreferredECM == 0)
+		iModem->iProgress.iECM = 0;
+
+	iResults.Copy (_L8 ("AT+FCC=0,0,0,2,0,0,0,0\r"));
+
+	iResults[7] = (TUint8) (iResults[7] + iFaxServerSessionSettings->iTxResolution);
+	iResults[9] = (TUint8) (((iActualFaxSpeed / 2400) - 1) + '0');
+
+	
+	// added to support 2Dfaxing using class 2.0
+	if (iModem->iProgress.iCompression)
+		iResults[15] = (TUint8) (iResults[15] + iFaxServerSessionSettings->iTxCompression);
+	else
+		iResults[15] = (TUint8) (iResults[15] + EModifiedHuffman);
+	
+	//iResults[15] = (TUint8) (iResults[15] + iFaxServerSessionSettings->iTxCompression);
+	
+		
+	iResults[17] = (TUint8) (iModem->iProgress.iECM + '0');
+	iModem->ExportL (iResults);
+	if ((iModem->GetMatchL (_L8 ("OK"), 3)) == 0)
+		return (KFaxErrModemNotWorking);
+
+	iModem->ExportL (_L8 ("ATD"));
+	if ((iFaxServerSessionSettings->iMode & KFaxOffHook) == 0)
+		iModem->ExportL (iFaxServerSessionSettings->iPhoneNumber);
+	iModem->TxcharL (Kreturn);
+
+	iModem->iProgress.iPhase = ECallEstablishment;
+	for (;;)
+		{
+		if (!(iModem->ImportL (iResults, KDialTimeout)))
+			return (KFaxErrNoDial);
+
+		iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+		iModem->ProgressUpdateL ();
+
+		if ((iResults.FindF (_L8 ("NO DIALTONE"))) >= 0 ||
+			iResults.FindF (_L8 ("NO DIAL TONE")) >= 0)
+			return (KFaxErrNoDialTone);
+		if ((iResults.FindF (_L8 ("BUSY"))) >= 0)
+			return (KFaxErrBusy);
+		if ((iResults.FindF (_L8 ("NO ANSWER"))) >= 0)
+			return (KFaxErrNoAnswer);
+		if ((iResults.FindF (_L8 ("NO CARRIER"))) >= 0)
+			return (KFaxErrNoCarrier);
+		if ((iResults.FindF (_L8 ("FHS"))) >= 0)
+			return (KFaxErrNoNegotiate);
+		if ((iResults.FindF (_L8 ("OK"))) >= 0)
+			break;
+		if ((iResults.FindF (_L8 ("FCO"))) >= 0)
+			iModem->iProgress.iPhase = ESessionNegotiation;
+		else if ((iResults.FindF (_L8 ("FCI"))) >= 0)
+			ExtractAnswerback (iResults);
+		}
+	return (TxPrePageL ());
+}
+/********************************************************************/
+TInt CFaxClass20::TxPrePageL ()
+{
+    __FLOG_FAXSRV(_L8("CFaxClass20::TxPrePageL entering"));
+
+	iModem->ExportL (_L8 ("AT+FDT\r"));
+	for (;;)
+		{
+		if (!(iModem->ImportL (iResults, 30)))
+			return (KFaxErrNoNegotiate);
+
+		iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+		iModem->ProgressUpdateL ();
+
+		if ((iResults.FindF (_L8 ("FHS"))) >= 0)
+			return (KFaxErrNoNegotiate);
+		if ((iResults.FindF (_L8 ("CONNECT"))) >= 0)
+			break;
+		if ((iResults.FindF (_L8 ("FCS"))) >= 0)
+			ParseResults (iResults);
+		}
+
+	for (;;)
+		{
+		TInt XonTimeoutSec = CLK_TCK * 3; 
+		
+		if ((iModem->RxcharWaitL(XonTimeoutSec)) == 0)
+			{
+			break;
+			}
+
+		if (iModem->iReadone[0] == Kxon)
+			{
+			break;
+			}
+		}
+	return (TxStartPageL());
+}
+/********************************************************************/
+
+//
+ // TxPostPageL should return either with
+ //
+ // a) an error code and iPhase set to RFax::EPostPageStatus, in which case the send returns with the error
+ // b) KErrNone and iPhase set to RFax::EDataTransfer, in which case we send the next page
+ // c) KErrNone and iPhase set to RFax::EDisconnection, in which case the send returns with KErrNone
+ //
+
+TInt CFaxClass20::TxPostPageL ()
+{
+	if (iModem->iProgress.iCompression == EModifiedRead)
+		{
+		iModem->iTransmitBuffer.Append (0x00);
+		iModem->iTransmitBuffer.Append (0x60);
+		iModem->iTransmitBuffer.Append (0x00);
+		iModem->iTransmitBuffer.Append (0x0C);
+		iModem->iTransmitBuffer.Append (0x80);
+		iModem->iTransmitBuffer.Append (0x01);
+		iModem->iTransmitBuffer.Append (0x30);
+		iModem->iTransmitBuffer.Append (0x00);
+		iModem->iTransmitBuffer.Append (0x06);
+		iModem->iTransmitBuffer.Append (0xC0);
+		}
+	else
+		{
+		for (TInt x = 3; x; x--)
+			{
+			iModem->iTransmitBuffer.Append (0x0);
+			iModem->iTransmitBuffer.Append (0x08);
+			iModem->iTransmitBuffer.Append (0x80);
+			}
+		}
+
+	iModem->iTransmitBuffer.Append (Kdle);
+	iModem->iOurMessage.Format (_L8 ("RTC transmitted after %d lines"), iModem->iProgress.iLines);
+	iModem->ProgressUpdateL ();
+	if (iFaxServerSessionSettings->iTxPages == iModem->iProgress.iPage)
+		{
+		iModem->iTransmitBuffer.Append (0x2e);
+		iModem->iOurMessage.Format (_L8 ("End of document transmitted <dle><eop>"));
+		}
+	else
+		{
+		iModem->iTransmitBuffer.Append (0x2c);
+		iModem->iOurMessage.Format (_L8 ("End of page %u transmitted <dle><mps>"), iModem->iProgress.iPage);
+		}
+    __FLOG_FAXSRV( iModem->iOurMessage);
+
+	iModem->CommitTransmitBufferL ();
+
+	iModem->iProgress.iPhase = EPostPageStatus;
+	iModem->ProgressUpdateL ();
+	while (iModem->Txstat () != 0)
+		;
+	iModem->Xonoff ();
+
+	// we've just ended phase C data, so we need to wait for the modem to respond with OK or ERROR
+
+	for (;;)
+		{
+		if (iModem->iProgress.iECM == 0)
+			{
+			if (!(iModem->ImportL (iResults, (32 * 1024) / (iModem->iProgress.iSpeed / 10))))
+				return (KFaxErrCannotEndData);
+			}
+        else
+            {
+            // coverity[check_return]
+            iModem->ImportL (iResults, 0x7fff);     // no timeout if ECM enabled, but NO CARRIER possible from some mobile phones
+            if ((iResults.FindF (_L8 ("NO CARRIER"))) >= 0)
+                return (KFaxErrCannotEndData);
+            }
+
+		iModem->iOurMessage.Format (_L8 ("%S"), &iResults);
+		iModem->ProgressUpdateL ();
+
+		if ((iResults.FindF (_L8 ("ERROR"))) >= 0)
+			break;
+		if ((iResults.FindF (_L8 ("OK"))) >= 0)
+			break;
+		}
+	if (((iResults.FindF (_L8 ("ERROR"))) >= 0) && (iRepeatPage == 0))
+		{
+		iModem->iProgress.iPhase = ESessionNegotiation;
+		iRepeatPage++;
+		iModem->iProgress.iPage--;
+		return (TxPrePageL ());
+		}
+	if (iFaxServerSessionSettings->iTxPages != iModem->iProgress.iPage)
+		{
+		iRepeatPage = 0;
+		return (TxPrePageL ());
+		}
+	iModem->iProgress.iPhase = EDisconnection;
+	return (KErrNone);
+}
+/********************************************************************/
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/CFAXMDRV.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,701 @@
+// 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:
+//
+
+#include "FAXSERV.H"
+#include "fax_reversebytes.h"
+#include "FONT8X16.DAT"
+#include "ZEROS.DAT"
+#include "FAXMDRV.H"
+#include "FAXMODEM.H"
+
+#include "FAXLOG.H"
+#include <et_phone.h>
+
+const TInt KLineReadTimeout=6;				// < The time-out (in secs) for a line read
+const TInt KECMLineReadTimeout=132;			// < The time-out (in secs) for a line read when using Error Correction Mode
+const TInt KSubsequentLineReadTimeout=10;	// < The time-out (in secs) for a subsequent line read
+const TInt KSubsequentECMLineReadTimeout=140;	// < The time-out (in secs) for a subsequent line read when using Error Correction Mode
+
+/********************************************************************/
+
+// we need to keep a local pointer to the current TDialstorModemPreferences in order to
+ // do whatever is required
+
+void CFaxModemDriver::ConstructL (TFaxServerSessionSettings * iFaxServerSessionSettings, RFax::TProgress & aProgress)
+{
+	iModem = CFaxModem::NewL (iFaxServerSessionSettings, aProgress);
+}
+/********************************************************************/
+
+
+CFaxModemDriver::CFaxModemDriver()
+                :CBase(), iSharedHandles(NULL)
+{
+}
+
+CFaxModemDriver::~CFaxModemDriver ()
+{
+	delete iModem;
+}
+/********************************************************************/
+
+// function to check that we don't send commands out when there's less than half a second
+// before the next RING comes in
+
+
+/**
+*	function to check that we don't send commands out when there's less than half a second
+*	before the next RING comes in.
+*	This function has been modified by Dmitry Lyokhin for the sake of PIA-586KGE defect fix
+*
+* @param	aCommand	-	contains the command to be sent to the modem.
+*
+* @see	ExportL function
+*
+* @return	number of symbols sent to the modem.
+*			
+*
+*/
+TInt CFaxModemDriver::CheckCadenceExportL(const TDesC8 & aCommand)
+{
+	
+	
+	const TInt RingTimeout_Sec	= 5;		//-- 5 sec. waiting for 'RING' timeout
+	const TInt RingCadence_uSec	= 3000000;	//-- 3 sec. time span after 'RING' receiving during that commands 
+											//-- can be sent to the modem
+
+	const TInt CmdSendDelay_uSec= 100000;	//-- 100 ms delay between adjacent commands to the modem
+
+	TTime CurrentTime;
+
+    __FLOG_FAXSRV( _L8("-CFaxModemDriver::CheckCadenceExportL entering"));
+  
+  	
+	//-- @note iCadence now is used like a flag. If its value is 0 (thai is set initially) we will
+	//-- try to wait for 'RING' indication i.e synchronize with incoming rings. Otherwise - no.
+	while( iCadence.Int64() == 0 )
+	{
+		if(iTimeOfLastRing.Int64() == 0) 
+		{//-- we need to wait for 'RING' from the modem
+
+            __FLOG_FAXSRV( _L8("-CFaxModemDriver::CheckCadenceExportL waiting for RING"));
+	  
+			//-- wait for 'RING' from modem
+			if( iModem->GetMatchL (_L8 ("RING"), RingTimeout_Sec) == 0) 
+			{	//User::Leave(KFaxErrReceiveTimeout); //-- 'RING' waiting timeout, leaving
+				
+				//-- There is no 'RING'indication, no we will not leave, instead of that
+				//-- disable sync. with incoming rings and pass on to sending commands to the modem straightforward.
+				iCadence = 1;
+				break;
+			}
+
+			iTimeOfLastRing.UniversalTime(); //-- note the time
+		}
+
+		//-- get current time and check if we are in time to send a command to the modem
+		CurrentTime.UniversalTime ();
+	
+		if( CurrentTime < iTimeOfLastRing + TTimeIntervalMicroSeconds32(RingCadence_uSec) )
+			break; //-- send the command
+		else
+		{	//-- wait for the next 'RING'
+            __FLOG_FAXSRV( _L8("-CFaxModemDriver::CheckCadenceExportL Resetting"));
+			iTimeOfLastRing = 0;
+		}
+	}
+
+	//-- I had to introduce this delay between sending adjacent commands to the modem because
+	//-- some modems (e.g. Nokia9210) lose data.
+	iModem->Silence(CmdSendDelay_uSec);
+
+	//-- send the command
+	return iModem->ExportL (aCommand);
+}
+
+/********************************************************************/
+
+// if we have called FaxInL with a dial request, it calls this routine
+ // to dial up a fax on demand service
+ //
+ // if not polling, we end with a colon to return to command mode and then
+ // we delay for whatever time has been requested by the user
+ // before returning, at which point FaxInL continues with ATA
+
+void CFaxModemDriver::DialFaxOnDemandL ()
+{
+	iModem->ExportL (_L8 ("ATD"));
+	iModem->ExportL (iFaxServerSessionSettings->iPhoneNumber);
+
+	if (iFaxServerSessionSettings->iMode & KFaxPoll)
+		iModem->TxcharL (Kreturn);
+	else
+		{
+		iModem->ExportL (_L8 (";"));
+		iModem->TxcharL (Kreturn);
+		if ((iModem->GetMatchL (_L8 ("OK"), KDialTimeout)) == 0)
+			User::Leave (KFaxErrNoDial);
+		iModem->Silence (CLK_TCK * iFaxServerSessionSettings->iFaxOnDemandDelay);
+		}
+}
+/********************************************************************/
+
+// now the routines to add a header line to the top of each fax page
+
+/********************************************************************/
+
+// we send four blank scan lines
+ // we create a line of text containing time and date,
+ // the Fax ID and Username,
+ // the page number and total number of pages,
+ // we digitize that, and send it out
+ // our font height is 16 so that means 20 scan lines
+ // are added to the top of each sent fax
+
+void CFaxModemDriver::SendFaxHeaderL ()
+{
+	TFaxHeaderInfo faxHeader;
+	TRawScanLine headline;
+	TRawScanLine fontline;
+	TBuf8 < KFaxT4MaxDesLength > encodedHeadLine;
+	TTime timeOfTransmission;
+	TBuf < 12 > timeText;
+
+	timeOfTransmission.HomeTime();
+	timeOfTransmission.FormatL (timeText, (_L ("%F%D%M%Y%H%T")));
+
+	iModem->iOurMessage.Format (_L8 ("Sending page header"));
+	iModem->ProgressUpdateL ();
+
+	for (TInt r = iModem->iProgress.iResolution ; r >= 0; r--)
+		{
+		for (TInt x = 0, y = 4 ; x < 4; x++)
+			{
+			iModem->iTransmitBuffer.Append (0x00);
+			if (iModem->iProgress.iCompression)
+				{
+				iModem->iTransmitBuffer.Append (Invert (0x00));
+				iModem->iTransmitBuffer.Append (Invert (0x34));
+				y = 5;
+				}
+			else
+				iModem->iTransmitBuffer.Append (Invert (0x14));
+			iModem->iTransmitBuffer.Append (Invert (0xD9));
+			iModem->iTransmitBuffer.Append (Invert (0xA8));
+			padLineL (y);
+			}
+		}
+
+	CFaxT4 * faxT4 =CFaxT4::NewLC();
+	faxT4->PageInitialize (iModem->iProgress.iResolution, iModem->iProgress.iCompression);
+	if(!iSharedHandles)
+		{
+		User::Leave(KErrBadHandle);
+		}
+	CFaxHeaderLines * faxheader = CFaxHeaderLines::NewLC (&iSharedHandles->File());	
+
+	faxheader->ReadFaxHeaderInfoL (faxHeader);
+	for (TInt n = 0; n < 12; n++)
+		timeText[n] -= '0';
+
+	// Forces 2 digit day - 2 digit month - 4 digit year - 2 digit hour - 2 digit minute
+
+	for (TInt scanline = 0; scanline < faxHeader.iHeaderFontHeightInLines; scanline++)
+		{
+		faxheader->ReadRawHeaderLineL (scanline, headline);
+		faxheader->ReadRawFontLineL (scanline, fontline);
+		for (TInt fontByte = 0; fontByte < faxHeader.iHeaderFontWidthInBytes; fontByte++)
+			{
+			headline[((faxHeader.iOffsetToDay) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[0] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			headline[((faxHeader.iOffsetToDay + 1) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[1] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			headline[((faxHeader.iOffsetToMonth) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[2] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			headline[((faxHeader.iOffsetToMonth + 1) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[3] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			headline[((faxHeader.iOffsetToYear) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[4] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			headline[((faxHeader.iOffsetToYear + 1) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[5] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			headline[((faxHeader.iOffsetToYear + 2) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[6] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			headline[((faxHeader.iOffsetToYear + 3) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[7] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			headline[((faxHeader.iOffsetToHour) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[8] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			headline[((faxHeader.iOffsetToHour + 1) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[9] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			headline[((faxHeader.iOffsetToMinute) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[10] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			headline[((faxHeader.iOffsetToMinute + 1) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[11] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+
+			// put the page info in
+
+
+			if (iModem->iProgress.iPage > 9)
+				headline[((faxHeader.iOffsetToCurrentPage) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[((iModem->iProgress.iPage / 10) * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			headline[((faxHeader.iOffsetToCurrentPage + 1) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[((iModem->iProgress.iPage % 10) * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			if (iFaxServerSessionSettings->iTxPages > 9)
+				headline[((faxHeader.iOffsetToTotalPages) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[((iFaxServerSessionSettings->iTxPages / 10) * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			headline[((faxHeader.iOffsetToTotalPages + 1) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[((iFaxServerSessionSettings->iTxPages % 10) * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			}
+
+		// we send the line once in normal resolution but twice in fine resolution
+
+		for (TInt r = iModem->iProgress.iResolution ; r >= 0; r--)
+			{
+			faxT4->EncodeScanLine (headline, encodedHeadLine);
+
+			// always add the extra null at the start for the initial eol
+
+			iModem->iTransmitBuffer.Append (Knul);
+
+			// and then invert and finally send the encoded line
+
+			const TUint8 *px = CONST_CAST (TUint8 *, encodedHeadLine.Ptr ());
+			const TUint8 *ex = px + encodedHeadLine.Length ();;
+			TUint8 thisChar;
+			TInt bytesSent = 0;
+			while (px < ex)
+				{
+				thisChar = Invert (*px++);
+				iModem->iTransmitBuffer.Append (thisChar);
+				if (thisChar == Kdle)
+					iModem->iTransmitBuffer.Append (Kdle);
+				iModem->SendTransmitBufferL ();
+				bytesSent++;
+				}
+			padLineL (bytesSent);
+			}
+		}
+
+	CleanupStack::PopAndDestroy(faxheader);
+    CleanupStack::PopAndDestroy(faxT4);
+}
+
+/********************************************************************/
+
+// this function handles line padding out for minimum scan line times
+ // this feature should really only be needed on class 1 modems ...
+ // it takes a single integer parameter, which is the number of bytes sent
+
+void CFaxModemDriver::padLineL (TInt aByteCount)
+{
+	if (iFaxServerSessionSettings->iFaxClass == EClass1)
+		{
+		while (iMinlinelength > aByteCount)
+			{
+			aByteCount++;
+			iModem->iTransmitBuffer.Append (Knul);
+			iModem->SendTransmitBufferL ();
+			}
+		}
+}
+/********************************************************************/
+
+// rewritten to avoid using any AT commands August 1997 Andrew Margolis
+ // pointer arithmetic courtesy of Andrew Thoelke
+ // Though this doesn't use any AT command but it does need to know
+ // about the various modem classes ... GetFaxDataL is in the same boat
+
+// the client has buffered up lines to minimize interaction
+ // aData starts with a TInt containing the number of lines
+ // Each line follows, preceded with a TInt containing its length
+ // which must be copied as it might not be aligned on a 4-byte
+ // boundary
+
+TInt CFaxModemDriver::SendFaxDataL (const TDesC8 * aData)
+{
+	TUint8 thisChar;
+	TInt ticks;
+	TInt numberOfLines;
+	TInt lengthOfLine;
+
+	TUint8 *thisLine = CONST_CAST (TUint8 *, (*aData).Ptr ());
+	Mem::Copy (&numberOfLines, thisLine, sizeof (TInt));
+	thisLine += sizeof (TInt);
+
+	// buffering debug message
+
+	iModem->iOurMessage.Format (_L8 ("%u lines in buffer taking up %u bytes"), numberOfLines, (*aData).Length ());
+	iModem->ProgressUpdateL ();
+
+	while (numberOfLines--)
+		{
+		Mem::Copy (&lengthOfLine, thisLine, sizeof (TInt));
+		thisLine += sizeof (TInt);
+		iModem->iProgress.iLines++;
+
+		TInt bytesSent = 0;
+		const TUint8 *px = thisLine;
+		const TUint8 *ex = px + lengthOfLine;
+		while (px < ex)
+			{
+			thisChar = Invert (*px++);
+			iModem->iTransmitBuffer.Append (thisChar);
+			if (thisChar == Kdle)
+				iModem->iTransmitBuffer.Append (Kdle);
+			iModem->SendTransmitBufferL ();
+			bytesSent++;
+			}
+		padLineL (bytesSent);
+
+		// we must check for cancel commands from the modem in class 2.0 transmission
+
+		if (iFaxServerSessionSettings->iFaxClass == EClass2point0)
+			{
+			while (iModem->Rxstat () != 0)
+				{
+				ticks = CLK_TCK;
+				iModem->RxcharWaitL (ticks);
+				if (iModem->iReadone[0] == Kcan)
+					{
+					iModem->TxcharL (Kdle);
+					iModem->TxcharL (Ketx);
+					iModem->CommitTransmitBufferL ();
+					iModem->Xonoff ();
+					iModem->GetMatchL (_L8 ("OK"), 5);
+					return (KFaxErrModemDisconnect);
+					}
+				}
+			}
+		thisLine += lengthOfLine;
+		}
+	return (KErrNone);
+}
+/********************************************************************/
+ // This function takes a pointer to a binary data buffer.
+ // We are guaranteed that the buffer is big enough to take
+ // two entire scan lines up to KMaxT4Des in size.
+
+ // We call GetLineL to fill the buffer up with scan lines, and
+ // we keep a count of the number of lines received as an integer
+ // at the start of the buffer.  We return when either we haven't
+ // enough room to guarantee another line, or when we have received
+ // a line of zero length, which means an end of page. The descriptor
+ // is set to the correct length on return
+
+ // So on return, aData starts with a TInt containing the number of lines
+ // Each line follows, preceded with a TInt containing its length
+ // which must be copied as it might not be aligned on a 4-byte
+ // boundary - a line of zero length indicates we have reached
+ // the end of the page
+
+void CFaxModemDriver::GetFaxDataL (TDes8 * aData)
+{
+	TUint8 *startData;
+	TUint8 *lineData;
+	const TUint8 *maxData;
+	TInt lineLength;
+	TInt numberOfLines = 0;
+
+	lineData = startData = CONST_CAST (TUint8 *, (*aData).Ptr ());
+	maxData = startData + (*aData).MaxLength () - KMaxT4Des - sizeof (TInt);
+
+	(*aData).SetMax ();
+	lineData += sizeof (TInt);
+
+	for (;;)
+		{
+		numberOfLines++;
+		lineLength = GetLineL (lineData);
+		Mem::Copy (lineData, &lineLength, sizeof (TInt));
+		lineData += sizeof (TInt);
+		lineData += lineLength;
+		if (lineData > maxData)
+			break;
+		if (lineLength == 0)
+			break;
+		}
+	Mem::Copy (startData, &numberOfLines, sizeof (TInt));
+	(*aData).SetLength (lineData - startData);
+
+	// buffering debug message
+
+	iModem->iOurMessage.Format (_L8 ("%u lines in buffer taking up %u bytes"), numberOfLines, (*aData).Length ());
+	iModem->ProgressUpdateL ();
+}
+/********************************************************************/
+// This function takes a pointer to a binary data buffer.
+ // We are guaranteed that the buffer is big enough to take
+ // an entire scan line up to KMaxT4Des in size.
+ // We receive the scan line, with a leave if we timeout.
+ // We return with the length of the scan line and the buffer has
+ // a space for this to be placed as an integer by the caller,
+ // followed by the scan line data.  If the length of the scan line
+ // is zero, we have reached the end of the page
+
+TInt CFaxModemDriver::GetLineL (TUint8 * aFaxData)
+{
+	TUint8 *lineStart;
+	TUint8 *lineEnd;
+	TUint8 *currentByte;
+
+	lineStart = currentByte = (aFaxData + sizeof (TInt));
+	lineEnd = lineStart + KMaxT4Des;
+
+	TUint8 thisChar = 0;
+	TUint8 leading0s = 0;
+	TUint8 trailing0s = 0;
+	TInt nullcount = 0;
+
+	TInt ticks = CLK_TCK * KLineReadTimeout;
+	if (iModem->iProgress.iECM != 0)
+		ticks = CLK_TCK * KECMLineReadTimeout;
+
+	iModem->iProgress.iLines++;
+
+	TInt bol = 1;
+	TUint8 lastChar = 0xff;
+
+	// lastChar set to 0xff flags the entry to the function
+	// during iterations lastChar must be either 0 or 1
+	// we always come here just after detecting an EOL, and the character
+	// which contains the EOL bit is guaranteed to be re-readable
+	// lastChar set to 0xff indicates that's is not been read,
+	// so we re-read it, set its trailing0s, and put it in the buffer
+	// without bothering to do any dle checking (we already know it's ok)
+
+	for (;;)
+		{
+		if (lastChar == 0xff)
+			{
+			lastChar = 0;
+			thisChar = iModem->iReadone[0];
+			}
+		else
+			{
+			if ((iModem->RxcharWaitL (ticks)) == 0)
+				User::Leave (KFaxErrReceiveTimeout);
+			thisChar = iModem->iReadone[0];
+
+			// check if we have the character after a leading dle
+			// if we have unmark the last character as being a dle -
+			// dle etx is end of data
+			// dle dle is a shielded dle
+			// dle sub is two times dle for class 2.0 only
+			// dle and anything else we ignore
+
+			if (lastChar == Kdle)
+				{
+				lastChar = 0;
+
+				if (thisChar == Ketx)
+					{
+					iModem->iOurMessage.Format (_L8 ("<dle><etx> detected after %u lines"), iModem->iProgress.iLines);
+					iModem->ProgressUpdateL ();
+					return (0);
+					}
+
+				if (iFaxServerSessionSettings->iFaxClass == EClass2point0)
+					{
+					if (thisChar == 0x1a)
+						{
+						thisChar = Kdle;
+						*currentByte++ = Invert (thisChar);   // invert class 2.0
+						if (currentByte == lineEnd)
+							{
+							return (KMaxT4Des);
+							}
+						trailing0s = 4;
+						}
+					}
+
+				if (thisChar != Kdle)
+					continue;
+				}                   // drop through only with a data dle
+
+			// if not a trailing dle
+			// check if this character is itself a leading dle
+			// drop through only if it isn't
+
+			else if (thisChar == Kdle)
+				{
+				lastChar = Kdle;
+				continue;
+				}
+			}
+
+		// if we've received six EOL codes already, ignore everything
+		// till dle etx arrives
+
+		if (bol == 6)
+			continue;
+
+		// have we a null ? if yes we ignore nulls if they come in
+		// anything more than pairs - if no, we zero nullcount and
+		// invert the byte back the right way for non-class 2 modems
+		// THIS LAST IS IMPORTANT
+
+		if (thisChar == Knul)
+			{
+			if (nullcount == 2)
+				continue;
+			else
+				nullcount++;
+			}
+		else
+			{
+			nullcount = 0;
+			if (iFaxServerSessionSettings->iFaxClass != EClass2)
+				thisChar = Invert (thisChar);
+			}
+
+		// count the leading zeros in this byte
+
+		leading0s = zerotable[thisChar][0];
+
+		// if the leading zeros in this byte and the trailing zeros in the
+		// previous byte total 11 or more we have ourselves an EOL
+		// so we write the data we have so far as an entire line
+		// we are guaranteed than an eol will span at least two bytes
+		// so the data we have must include the end of the last line
+		// if this is a nul we don't write anything yet as we haven't
+		// detected a proper eol code
+		// we don't write anything for consecutibe eols
+
+		if (((trailing0s + leading0s) > 10) && (thisChar != Knul))
+			{
+			bol++;
+			if ((bol == 1) && (currentByte != lineStart))
+				{
+				return (currentByte - lineStart);
+				}
+			if (iModem->iProgress.iECM == 0)
+				ticks = CLK_TCK * KSubsequentLineReadTimeout;
+			else
+				ticks = CLK_TCK * KSubsequentECMLineReadTimeout;				// 11/1/01 AMC: ECM requires longer time-outs due to retries
+			}
+
+		// else if we had received an eol and this character is not nul
+		// we have ourselves a new line start
+
+		else
+			{
+			if (bol)
+				if (thisChar != Knul)
+					bol = 0;
+			}
+
+		// if we have a nul, add 8 to our trailing zero bits
+		// else count them by hand
+
+		if (thisChar == Knul)
+			trailing0s += 8;
+		else
+			trailing0s = zerotable[thisChar][1];
+
+		// ignore multiple eols
+
+		if (bol > 1)
+			continue;
+
+		// save everything else - we've already inverted the data if needed
+
+		*currentByte++ = thisChar;
+		if (currentByte == lineEnd)
+			{
+			return (KMaxT4Des);
+			}
+		}
+}
+/********************************************************************/
+
+TInt CFaxModemDriver::TxStartPageL ()
+{
+	iModem->iProgress.iPhase = EDataTransfer;
+	iModem->iProgress.iLines = 0;
+	iModem->iOurMessage.Format (_L8 ("About to send page %u"), ++iModem->iProgress.iPage);
+	iModem->ProgressUpdateL ();
+	iModem->Xonon ();
+
+	// for class 1 modems we start each page with a short burst of binary 1s
+
+	if (iFaxServerSessionSettings->iFaxClass == EClass1)
+		{
+		for (TInt x = (iActualFaxSpeed * 20 / 8); x; x--)
+			{
+			iModem->iTransmitBuffer.Append (0xff);
+			iModem->SendTransmitBufferL ();
+			}
+		iModem->CommitTransmitBufferL ();
+		}
+
+	// we're now in phase C so we start the page by sending the fax header
+
+	SendFaxHeaderL ();
+	return (KErrNone);
+}
+/********************************************************************/
+
+TInt CFaxModemDriver::RxStartPageL ()
+{
+	TUint8 thisChar, leading0s, trailing0s = 0;
+	TInt ticks = CLK_TCK * KLineReadTimeout;
+	if (iModem->iProgress.iECM != 0)
+		ticks = CLK_TCK * KECMLineReadTimeout;  // ECM mode requires longer time-outs due to retries
+
+	iModem->iProgress.iPhase = EDataTransfer;
+	iModem->iProgress.iLines = 0;
+	iModem->iOurMessage.Format (_L8 ("Awaiting page %u"), ++iModem->iProgress.iPage);
+	iModem->ProgressUpdateL ();
+	trailing0s = 0;
+
+	// this function looks for the start of the received fax
+	// this is the first EOL code - we invert bytes for non-class 2 modems
+
+	for (;;)
+		{
+		if ((iModem->RxcharWaitL (ticks)) == 0)
+			return (KFaxErrReceiveTimeout);
+		thisChar = iModem->iReadone[0];
+		if (iFaxServerSessionSettings->iFaxClass != EClass2)
+			thisChar = Invert (thisChar);
+		leading0s = zerotable[thisChar][0];
+		if (((trailing0s + leading0s) > 10) && (thisChar != 0))
+			break;
+		if (thisChar == Knul)
+			trailing0s += 8;
+		else
+			trailing0s = zerotable[thisChar][1];
+		}
+
+	// we've found the first EOL - it's left in iModem->iReadone[0]
+
+	iModem->iOurMessage.Format (_L8 ("Receiving data .... "));
+	iModem->ProgressUpdateL ();
+	return (KErrNone);
+}
+/********************************************************************/
+
+TInt CFaxModemDriver::RxConnectL ()
+{
+	return (KFaxErrWrongModemType);
+}
+TInt CFaxModemDriver::RxPrePageL ()
+{
+	return (KFaxErrWrongModemType);
+}
+TInt CFaxModemDriver::RxPostPageL ()
+{
+	return (KFaxErrWrongModemType);
+}
+TInt CFaxModemDriver::TxConnectL ()
+{
+	return (KFaxErrWrongModemType);
+}
+TInt CFaxModemDriver::TxPrePageL ()
+{
+	return (KFaxErrWrongModemType);
+}
+TInt CFaxModemDriver::TxPostPageL ()
+{
+	return (KFaxErrWrongModemType);
+}
+/********************************************************************/
+
+
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/CFAXMODM.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,985 @@
+// 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:
+// CFaxModem class implementation
+// 
+//
+
+/**
+ @file
+*/
+
+
+#include "FAXSERV.H"
+#include <e32hal.h>
+#include "FAXMODEM.H"
+
+#include "FAXLOG.H"
+
+// we embed this so that the session log tells us the version used
+
+#define FaxTransVersionString "FAX SERVER SESSION LOG (Release 033)" 
+
+/********************************************************************/
+
+CFaxModem::CFaxModem (RFax::TProgress & aProgress)      
+:iProgress (aProgress)
+   {
+   }
+/********************************************************************/
+
+CFaxModem *CFaxModem::NewLC (TFaxServerSessionSettings * aFaxServerSessionSettings, RFax::TProgress & aProgress)
+   {
+   CFaxModem *self = new (ELeave) CFaxModem (aProgress);
+   CleanupStack::PushL (self);
+   self->ConstructL (aFaxServerSessionSettings);
+   return self;
+   }
+/********************************************************************/
+
+CFaxModem *CFaxModem::NewL (TFaxServerSessionSettings * aFaxServerSessionSettings, RFax::TProgress & aProgress)
+   {
+   CFaxModem *self = NewLC (aFaxServerSessionSettings, aProgress);
+   CleanupStack::Pop ();
+   return self;
+   }
+/********************************************************************/
+
+void CFaxModem::ConstructL (TFaxServerSessionSettings * aFaxServerSessionSettings)
+   {
+   TInt r;
+//   TBufC < 24 > logname (_L ("C:\\SYSTEM\\FAXLOG.TXT"));
+//   RFsBase closefile;
+
+    __FLOG_FAXSRV( _L8("CFaxModem::ConstructL entering"));
+
+   iVerbose = 1;
+
+// we start off with our timer functions
+
+   iStartTime.UniversalTime();
+
+// work out the granularity of the clock
+
+   TTimeIntervalMicroSeconds32 ourGranularity;
+   if (UserHal::TickPeriod (ourGranularity) == KErrNotSupported)
+      User::Leave (KErrNotSupported);
+   iGranularity = ourGranularity.Int ();
+
+// calibrate a 2 ms timing loop - see notes at start of cfaxTransfer::ExportL
+// this is only used for class 1 when iTimingLoopDelay is true
+
+   iCalls = 0;
+   TInt t;
+   t = clock () + iGranularity;
+   while (t > clock ())
+	   ;        // wait for the clock to tick once
+   t = clock () + iGranularity; // reset target
+   while (t > clock ())         // wait for it to tick again
+      iCalls++;                 // this time counting calls to clock
+   iCalls *= (CLK_TCK / iGranularity);  // work out calls per second
+   iCalls /= 500;               // and work out calls per 2 ms
+   if (iCalls == 0)
+      iCalls++;
+
+#if defined (__WINS__)
+#define PDD_NAME _L("ECDRV")
+#define LDD_NAME _L("ECOMM")
+#else
+#define PDD_NAME _L("EUART1")
+#define LDD_NAME _L("ECOMM")
+#endif
+
+   r = iFileSession.Connect (); // we may need the RFs link for PDD/LDD loading as well as the log
+   if (r)
+      User::Leave (KFaxFileSessionError);
+   iFileSessionOpen = ETrue;
+
+   if (iVerbose)
+      {
+      
+      
+//This is a log file that would normally only be created in debug builds, however due to the time critical nature of fax it is always generated
+//to avoid timing differences between debug and release builds.
+//With the introduction of platform security it not advisable to have a log file in a public directory so will now be created in the private dir 
+//of the fax server.
+
+	//create log in private path of server
+	TFileName logfile;
+	TDriveUnit driveUnit(EDriveC);	
+	TDriveName drive=driveUnit.Name();
+	logfile.Insert(0, drive);	
+	//append private path
+	TPath privatePath;
+	iFileSession.PrivatePath(privatePath);
+	logfile.Append(privatePath);
+	//append subdir & file name
+	logfile.Append(_L("fax\\FAXLOG.TXT"));	
+	
+	//generate dir
+	TInt kerr(iFileSession.MkDirAll(logfile)); //the directory may not exist, So create one.
+	if(kerr != KErrAlreadyExists)
+		{
+		User::LeaveIfError(kerr);
+		}
+	r = iFile.Replace(iFileSession, logfile, EFileWrite | EFileShareAny);
+	if (r)
+		{
+		User::Leave (KFaxLogCreateError);	
+		}
+	iFileOpen = ETrue;
+
+      }
+/*
+   r = User::LoadPhysicalDevice (PDD_NAME);
+   if ((r != KErrNone) && (r != KErrAlreadyExists))
+     User::Leave (KFaxPDDError);
+
+   r = User::LoadLogicalDevice (LDD_NAME);
+   if ((r != KErrNone) && (r != KErrAlreadyExists))
+      User::Leave (KFaxLDDError);  
+*/
+
+   RCommServ s;
+   r = s.Connect ();
+   if (r)
+      User::Leave (KFaxCommsServerError);
+
+   
+   r = s.LoadCommModule (aFaxServerSessionSettings->iPortDriverName);
+   if (r)
+      User::Leave (KFaxCommsPortError);   
+
+   r = iCommSession.Open (s, aFaxServerSessionSettings->iCommPortName, ECommShared);
+   if (r)
+      User::Leave (KFaxCannotOpenPort);  
+
+   iPortOpen = ETrue;
+
+   iCommSession.Config (iRS232Settings);
+
+   iRS232Settings ().iRate = EBps19200;
+
+   iRS232Settings ().iHandshake = 0;
+
+   iRS232Settings ().iTerminator[0] = Ketx;
+   iRS232Settings ().iTerminator[1] = Kxon;
+   iRS232Settings ().iTerminator[2] = Klinefeed;
+   iRS232Settings ().iTerminatorCount = 3;
+
+   r = iCommSession.SetConfig (iRS232Settings);
+   if (r)
+      User::Leave (KFaxConfigError);
+
+   iCommSession.SetSignals (KSignalDTR, 0);
+   iCommSession.SetSignals (KSignalRTS, 0);
+
+   iCommSession.SetReceiveBufferLength (KBufSize);
+   iCommSession.ResetBuffers();
+	
+   iTransmitBuffer.Zero ();
+   iSendone.Zero ();
+   SendL (iSendone);            // activate port -  switch on DTR/RTS
+   iSendone.SetMax ();          // we send single characters via iSendone[0]
+
+   TBuf8 < 20 > thisclass;
+   thisclass.SetMax ();
+
+   iOurMessage.Format (_L8 (FaxTransVersionString));
+   ProgressUpdateL ();
+   iOurMessage.Format (_L8 ("The clock ticks at %d Hz"), CLK_TCK / iGranularity);
+   ProgressUpdateL ();
+   iOurMessage.Format (_L8 ("Calibration of 2 ms timer at %u calls"), iCalls);
+   ProgressUpdateL ();
+
+   Speed (EBps19200);
+   iOurMessage.Format (_L8 ("Initialising at 19200 bps ...."));
+   ProgressUpdateL ();
+
+
+// added by JerryC from faxtrans cfaxmodm.cpp
+
+   
+	  Silence (CLK_TCK);
+      TxcharL (Kreturn);
+      Silence ();
+//	  Silence ();
+//	  Silence ();
+	  //  GetMatchL(_L8("OK"),3);
+	  
+
+//   while (iCommSession.QueryReceiveBuffer()!=0) GetMatch (_L8 ("OK"), 1);
+//   ExportL (_L8 ("AT+FCLASS=?\r"));
+//   GetMatchL (_L8 ("OK"), 3);
+      
+//   GetMatchL (_L8 ("OK"), 3);
+
+
+   //r = CLK_TCK;
+   //while (RxcharWaitL (r));
+
+// the addition ends here
+
+//   TxcharL (Kreturn);
+
+   iModemSet = ETrue;
+   iTimingLoopDelay = EFalse;
+
+   //-- Switch modem into command mode and clear its buffer. 
+   SetModemCommandModeL(); 
+
+   if ((aFaxServerSessionSettings->iFaxClass) == (TFaxClass) EClassAuto)
+      {
+      ExportL (_L8 ("AT+FCLASS=?\r"));
+      if(0 == ImportL (thisclass, 2))
+    	  {
+    	  User::Leave (KFaxErrWrongModemType);
+    	  }
+
+      iOurMessage.Format (_L8 ("%S"), &thisclass);
+      ProgressUpdateL ();
+      if ((thisclass.FindF (_L8 ("ERROR"))) >= 0)
+         User::Leave (KFaxErrWrongModemType);
+      GetMatchL (_L8 ("OK"), 1);
+
+      if ((thisclass.FindF (_L8 ("2.0"))) >= 0)
+         {
+         aFaxServerSessionSettings->iFaxClass = EClass2point0;
+         }
+      else if ((thisclass.FindF (_L8 ("2.1"))) >= 0)
+         {
+         aFaxServerSessionSettings->iFaxClass = EClass2point0;
+         }
+      else if ((thisclass.FindF (_L8 ("2"))) >= 0)
+         {
+         aFaxServerSessionSettings->iFaxClass = EClass2;
+         }
+      else if ((thisclass.FindF (_L8 ("1"))) >= 0)
+         {
+         aFaxServerSessionSettings->iFaxClass = EClass1;
+         }
+      else if ((thisclass.FindF (_L8 ("1.0"))) >= 0)
+         {
+         aFaxServerSessionSettings->iFaxClass = EClass1;
+         }
+      else
+         User::Leave (KFaxErrWrongModemType);
+
+      User::Leave (KFaxOnlyJustAutoDetected);
+      }
+
+   thisclass.Copy (_L8 ("AT+FCLASS="));
+   if (aFaxServerSessionSettings->iFaxClass == EClass2point0)
+      {
+      thisclass.Append (_L8 ("2.0\r"));
+      }
+   else if (aFaxServerSessionSettings->iFaxClass == EClass2)
+      {
+      thisclass.Append (_L8 ("2\r"));
+      }
+   else if (aFaxServerSessionSettings->iFaxClass == EClass1)
+      {
+      thisclass.Append (_L8 ("1\r"));
+      iTimingLoopDelay = ETrue;
+      }
+   else
+      User::Leave (KFaxErrWrongModemType);
+
+   Silence ();
+   ExportL (thisclass);
+   if ((GetMatchL (_L8 ("OK"), 1)) == 0)		
+      User::Leave (KFaxErrWrongModemType);
+
+   //Speed (EBps19200);
+
+   if (aFaxServerSessionSettings->iFaxInitString.Length ())
+      {
+      ExportL (aFaxServerSessionSettings->iFaxInitString);
+      ExportL (_L8 ("\r"));
+      //GetMatchL (_L8 ("OK"), 3);
+      }
+	else 
+		{
+		ExportL (_L8 ("AT\r"));
+		}
+   if ((GetMatchL (_L8 ("OK"), 3)) == 0)
+      User::Leave (KFaxBadInitialization);
+   
+    __FLOG_FAXSRV( _L8("CFaxModem::ConstructL exiting"));
+
+   }
+  
+/********************************************************************/
+
+CFaxModem::~CFaxModem ()
+	{
+//	iOurMessage.Format (_L8 ("Entering CFaxModem Destructor"));
+//	ProgressUpdateL ();
+	
+    __FLOG_FAXSRV( _L8("CFaxModem::~CFaxModem"));
+
+	iCancel = 2;
+
+	if (iModemSet)
+		{
+		Xonoff ();
+		Dropdtr ();
+		
+		TRAPD(ret, SetModemCommandModeL()); //-- Switch modem into command mode and clear its buffer. 
+		TRAP (ret, HangupProcedureL());		//-- Issue hung up commands
+		
+		Silence ();
+		}
+
+	if (iPortOpen)
+		{
+		iCommSession.ResetBuffers ();
+		iCommSession.Close ();
+		}
+
+	if (iFileOpen)
+		{
+		iFile.Close ();
+		}
+
+	if (iFileSessionOpen)
+		iFileSession.Close ();
+	}
+
+/**
+* Hang up. Senda 'ATH' command to the modem and sets Echo off, fax class = 0
+*
+* @note		This function can leave
+*/
+void CFaxModem::HangupProcedureL()
+	{
+	ExportL (_L8 ("ATH\r"));
+	GetMatchL (_L8 ("OK"), 2);
+	ExportL (_L8 ("ATE0+FCLASS=0\r"));  // Defect fix PBN-4ZLLX7, NM 23/07/01
+	GetMatchL (_L8 ("OK"), 2);
+	ExportL (_L8 ("\r"));
+	}
+
+
+/**
+* Switch modem into command mode and clear its buffer. 
+* LYN-585JMR defect fix. By Dmitry Lyokhin. 11.03.02
+*
+* @note		This function can leave
+*/
+void CFaxModem::SetModemCommandModeL(void)
+{
+	const TInt K_uS_ComWait=500000;			//-- used in cleaning up buffer. 0.5 sec timeout.
+	
+	ExportL (_L8("+++")); //-- switch the  modem to command mode
+   
+  	//-- clear modem's buffer by reading data
+    while(iCommSession.QueryReceiveBuffer() > 0)
+	 {
+	  iCommSession.Read (iRecstat, K_uS_ComWait ,iReceiveBuffer);    // read data from the serial port
+      User::WaitForRequest (iRecstat);
+	 }
+
+	Silence();
+}
+
+/********************************************************************/
+/*
+TBool CFaxModem::CheckModemL (TFaxSettings * aFaxSettings)
+   {
+   TInt len = aFaxSettings->iDialStoreData.iModemInitString.Length ();
+   for (TInt attempt = 0; attempt < 3; attempt++)
+      {
+      ExportL (_L8 ("ATH\r"));
+      GetMatchL (_L8 ("OK"), 1);
+      if (len)
+         {
+         ExportL (aFaxSettings->iDialStoreData.iModemInitString);
+         ExportL (_L8 ("\r"));
+         GetMatchL (_L8 ("OK"), 1);
+         }
+      iOurMessage.Format (_L8 ("ATE0X0Q0V1M%uL%uS0=0S8=%u\r"),
+                          (TUint) aFaxSettings->iDialStoreData.iSpeaker,
+                          (TUint) aFaxSettings->iDialStoreData.iSpeakerVolume,
+                          aFaxSettings->iDialStoreData.iPauseTime);
+      ExportL (iOurMessage);
+      if (GetMatchL (_L8 ("OK"), 1) != 0)
+         {
+         Silence ();            // allow s-l-o-w modems to catch up with us
+         return (ETrue);
+         }
+      }
+   return (EFalse);
+   }*/
+/********************************************************************/
+
+
+/**
+*
+* @return	number of microseconds elapsed since calling CFaxModem::ConstructL().
+*			
+*/
+TInt CFaxModem::clock ()
+   {
+   TTime now;
+   now.UniversalTime ();
+   TInt64 runningTime = now.MicroSecondsFrom (iStartTime).Int64 ();
+   return I64LOW(runningTime);
+   }
+
+/********************************************************************/
+
+/**
+*	Searches for a given substring in modem's answer.
+*	also calls ProgressUpdate().
+*
+* @param	aMatstring	- sample string.
+* @param	aMattime	- timeout in seconds.
+*
+* @see	ImportL function
+*
+* @return	0 -	given string (see param aMatstring) is found in modem answer.
+*       	1 - sample not found or answer timeout.
+*
+* @leave	This function can leave
+*/
+TInt CFaxModem::GetMatchL (const TDesC8 & aMatstring, TInt aMattime)
+
+   {
+   TBuf8 < 64 > modemstring;
+   TBuf8 < 64 > copymodemstring;
+   modemstring.SetMax ();
+
+   while (ImportL (modemstring, aMattime))
+      {
+      copymodemstring.Copy (modemstring);
+      iOurMessage.Format (_L8 ("%S"), &copymodemstring);
+      ProgressUpdateL ();
+
+      if ((modemstring.FindF (aMatstring)) >= 0)
+         return (1);
+
+
+      }
+   ProgressUpdateL ();
+   return (0);
+   }
+
+
+/********************************************************************/
+/**
+*	Gets textual answer from the modem.
+*	Calls SubImportL() and ProgressUpdateL().
+*
+* @param	aLine	-	ref. to the string descriptor that will accept data from modem if any.
+						will contain string in upper case without terminating 0x0d, 0x0a. 
+* @param	aTimeout -	Timeout in seconds.
+*
+* @see	SubImport function
+*
+* @return	0 - if timeout occured or wrong input descriptor. Otherwise -
+*				number of characters in string descriptor.
+*
+* @note		This function can leave
+*/
+TInt CFaxModem::ImportL (TDes8 & aLine, TInt aTimeout)
+{
+	const	TInt SubTimeout = 3; //-- modem response 3 seconds timeout 
+	TInt	linestate		= 0;
+	TInt	CurrTimeout;
+	
+   while( aTimeout > 0 )
+   {
+   	 if (aTimeout <= SubTimeout)	CurrTimeout = aTimeout;
+	 else							CurrTimeout = SubTimeout;
+
+     linestate = SubImportL (aLine, CurrTimeout);
+    
+		if (linestate) 
+		{//-- a response from modem received
+            __FLOG_FAXSRV2(_L8("mdm imp[%d]: %S"), aTimeout, &aLine);
+		
+			//-- look for '+CREG' or '+CGREG' answers from modem.
+			//-- if found, ignore them and continue waiting.
+			//-- these unwanted answers represent network registration status (unsolicited result code)
+			//-- and interfere with fax modem responses. For more information see mm.tsy and gprs.tsy
+			if ((aLine.FindF(_L8("REG"))) >= 0)
+			{
+				aLine.FillZ();
+				aLine.Zero ();
+			}
+			else break; 
+	 
+		}//if (linestate) 
+
+		aTimeout -= SubTimeout;
+
+		ProgressUpdateL ();
+    }// while
+	
+	if (!linestate)
+		{
+        __FLOG_FAXSRV2(_L8("mdm imp[%d]: %S"), aTimeout, &aLine);
+		}
+
+   return (linestate);
+}
+
+
+/********************************************************************/
+
+/**
+*	Gets textual answer from the modem.
+* 
+* @param	aLine	- ref. to the string descriptor that will accept data from modem if any.
+*						will contain string in upper case without terminating 0x0d, 0x0a
+* @param	aTimeout -	Timeout in seconds.
+*
+* @see		RxcharWait function, iReadone
+*
+* @return	0 - if timeout occured or wrong input descriptor. Otherwise -
+*				number of characters in string descriptor
+*
+* @note		This function can leave
+*/
+TInt CFaxModem::SubImportL (TDes8 & aLine, TInt aTimeout)
+
+   {
+   TInt i;
+   TInt8 k;
+   TInt t;
+
+   if (aLine.MaxLength () == 0)
+      return (0);
+   aLine.FillZ ();
+   aLine.Zero ();
+
+   t = aTimeout * CLK_TCK;
+
+   do
+      {
+      if ((RxcharWaitL (t)) == 0)
+         return (0);
+      k = iReadone[0];
+      }
+
+
+   while (k < 32);
+
+   for (i = 0; i < aLine.MaxLength (); i++)
+      {
+      aLine.Append (k);
+      aLine.UpperCase ();
+      t = aTimeout * CLK_TCK;
+      if ((RxcharWaitL (t)) == 0)
+         return (0);
+      k = iReadone[0];
+      if (k < 32)
+         break;
+      }
+
+   if (k == 0x0d)
+      for (;;)
+         {
+         t = CLK_TCK;
+         if ((RxcharWaitL (t)) == 0)
+            break;
+         if (iReadone[0] == 0x0a)
+            break;
+         }
+
+   return (i);
+   }
+/********************************************************************/
+
+/**
+Sends a textual string to the modem with delay.
+
+@param aLine - const. ref. to the string descriptor to be sent to modem.
+
+@see SendL function
+
+@return number of symbols sent to modem.
+			
+@note This function can leave
+*/
+TInt CFaxModem::ExportL(const TDesC8& aLine)
+	{
+	__FLOG_FAXSRV1(_L8("mdm exp: %S"), &aLine);
+
+	TInt i = 0;
+
+   // we need to guarantee a delay here before sending characters
+   // lots of modems ignore commands that come in too quickly
+   // we need to wait for at least twice the clock granularity to ensure
+   // a decent wait interval as the clock may be just about to tick
+
+   // example :
+
+   // Silence ((iGranularity * 2) + 2);
+
+   // BUT ...
+
+   // on Protea, the clock ticks at 64 beats per second
+   // that's every 15 ms or to be precise every 15625 microseconds
+   // iGranularity actually does return this value of 15625
+   // our maximum wait will be 30 ms (with a minumum of 15 ms)
+   // there's also a maximum 35 ms overhead on any timer call or active
+   // object or whatever - so we could have a delay here of up to 65 ms
+
+   // with the time the modem takes to respond, this leads to too much
+   // unreliability as we have a strict 75 ms +/- 20% T.30 requirement
+   // for class 1 modems. (For class 2 and 2.0 modems this isn't a
+   // problem so we happily delay for iGranularity*2).
+
+   // this applies also to WINS on the PC ticks 10 times per second
+   // this gives us a maximum delay of 200 ms, which is rather long
+   // so we resort to a timing loop we calibrate on first entry
+
+   for (;;)
+      {
+      i = Rxstat ();
+      if (iTimingLoopDelay != EFalse)
+         {
+         for (TInt x = 0; x < iCalls; x++)
+            clock ();
+         }
+      else
+         {
+         Silence ((iGranularity * 2) + 2);
+         }
+      if (i == Rxstat ())
+         break;
+      }
+
+	if (aLine.Length())
+		{
+#ifdef _DEBUG
+		TRAPD(modemUnplugged, SendL(aLine));
+		__FLOG_FAXSRV1(_L8("CFaxModem::ExportL SendL leave error code: %d"), modemUnplugged);
+#else
+		TRAP_IGNORE(SendL(aLine));
+#endif
+
+		iOurMessage.Format(_L8("%S"), &aLine);
+		i = iOurMessage.Length();
+		if ((i != 0) && (iOurMessage[i - 1] == 0x0d))
+			{
+			iOurMessage.Delete(i - 1, 1);
+			}
+		ProgressUpdateL();
+		}
+	return i;
+	}
+/********************************************************************/
+
+void CFaxModem::Dropdtr ()
+   {
+   
+   __FLOG_FAXSRV( _L8("CFaxModem::Dropdtr"));
+   
+   LowerDTR ();
+   Silence (CLK_TCK);
+   RaiseDTR ();
+   Silence (CLK_TCK);
+   }
+/********************************************************************/
+
+   
+/**
+* Wait approximately 75 ms
+*/
+void CFaxModem::Silence ()
+   {
+   Silence (CLK_TCK / 13);      // wait approx 75 milliseconds
+   }
+
+/********************************************************************/
+
+/**
+* Wait given number of microseconds
+*/
+void CFaxModem::Silence (TInt ticks) const
+   {
+   User::After (ticks);         // wait however long
+   }
+/********************************************************************/
+
+void CFaxModem::Speed (TBps aSpeed)
+   {
+   iRS232Settings ().iRate = aSpeed;
+   iCommSession.SetConfig (iRS232Settings);
+   }
+/********************************************************************/
+
+/**
+* Turns on obeying XON, XOFF characters and CTS signal
+*/
+void CFaxModem::Xonon ()
+   {
+   iRS232Settings ().iHandshake = (KConfigObeyXoff | KConfigObeyCTS | KConfigWriteBufferedComplete);
+   iCommSession.SetConfig (iRS232Settings);
+   }
+/********************************************************************/
+
+/**
+Turns off handshaking
+*/
+void CFaxModem::Xonoff()
+	{
+	iSendone.Zero(); // sending a null descriptor
+#ifdef _DEBUG
+	TRAPD(modemUnplugged, SendL(iSendone)); // waits till all pending transmits have gone
+	__FLOG_FAXSRV1(_L8("CFaxModem::Xonoff SendL leave error code: %d"), modemUnplugged);
+#else
+	TRAP_IGNORE(SendL(iSendone)); // waits till all pending transmits have gone
+#endif
+
+	iSendone.SetMax(); // we send single characters via iSendone[0]
+
+	iRS232Settings().iHandshake = 0;
+	iCommSession.SetConfig(iRS232Settings);
+	}
+/********************************************************************/
+
+void CFaxModem::LowerDTR()
+   {
+   iCommSession.SetSignals (0, KSignalDTR);     // SetSignals(SetMask,ClearMask) ;
+   }
+/********************************************************************/
+
+void CFaxModem::RaiseDTR()
+   {
+   iCommSession.SetSignals (KSignalDTR, 0);     // SetSignals(SetMask,ClearMask) ;
+   }
+/********************************************************************/
+
+/**
+* @return	0 - if there are no data waiting in driver's input buffer and receiver's buffer to be read.
+*        	otherwise - number of bytes to be read.
+*/
+TInt CFaxModem::Rxstat (void)
+   {
+   if (iReceiveBuffer.Length () != 0)
+      return (1);
+   else
+      return (iCommSession.QueryReceiveBuffer ());
+   }
+/********************************************************************/
+
+/**
+* Does nothing. Just returns 0.
+*/
+TInt CFaxModem::Txstat()
+   {
+   return 0;
+   }
+/********************************************************************/
+
+/**
+* Sends 1 byte to modem. 
+*
+* @param	aChar	-Byte to be sent.
+*
+* @note		This function can leave.
+*
+* @see	SendL() function
+*
+* @return	none.
+*/
+void CFaxModem::TxcharL (TUint8 aChar)
+   {
+   iSendone[0] = aChar;
+   SendL (iSendone);
+   }
+/********************************************************************/
+
+
+// this routine amended July 1998 to offer infinite timeouts when sending data in fax ECM
+
+void CFaxModem::SendL(const TDesC8 & astring)
+    {
+    TTimeIntervalMicroSeconds32 timeout = CLK_TCK * 10;
+    if ((iProgress.iECM) && (iProgress.iPhase == EDataTransfer))
+        {
+        iCommSession.Write(iTranstat, timeout, astring);
+        User::WaitForRequest(iTranstat);
+        if (iTranstat == KErrTimedOut)
+            {
+            TInt ticks = 1;
+            while (Rxstat() != 0)
+                {
+                RxcharWaitL(ticks);
+                if (iReadone[0] == Kcan)
+                    User::Leave(KFaxErrModemDisconnect);
+                }
+            }
+        else if (iTranstat != KErrNone)
+            iCommSession.ResetBuffers(KCommResetTx);
+        }
+    else
+        {
+        iCommSession.Write(iTranstat, timeout, astring);
+        User::WaitForRequest(iTranstat);
+        if (iTranstat != KErrNone)
+            {
+            iCommSession.ResetBuffers(KCommResetTx);
+            if (iTranstat == KErrTimedOut)
+                User::Leave(KFaxTransmitterStalled);
+            }
+        }
+    }
+/********************************************************************/
+
+/**
+*	Transmits iTransmitBuffer by calling SendL. After sending sets buffer's
+*	length to zero.
+*
+* @note		This function can leave.
+*
+* @see	SendL() function
+*/
+void CFaxModem::CommitTransmitBufferL ()
+   {
+   SendL (iTransmitBuffer);
+   iTransmitBuffer.Zero ();
+   }
+/********************************************************************/
+
+
+/**
+*  Reads 1 byte from serial port (or iReceiveBuffer) and puts it to iReadone buffer.
+*
+* @param	atimeout	-	timeout in microseconds.
+*
+* @return	0 - timeout, 
+*       	1 -	byte read and put into iReadone
+*
+* @note		This function can leave. See comments in CFAXMODM.CPP 
+*
+*/
+
+// this is our basic get char function with timeout
+
+// Note that this function *can* leave, despite not being named as an L
+// function.  This is because the leave is as a result of a user request
+// to end the entire fax thread and could occur at any time.  This
+// function (to read a character) is used at some point by virtually
+// every part of the fax system and consequently, were the normal
+// convention to be followed, every function would have to be an L
+// function - this destroys the whole point of having a separate
+// nomenclature.  Therefore, I declare that the possibility of a leave
+// as a result of the user cancel request is henceforth regarded as an
+// exception to the rule than a function which leaves must be called an
+// L function.  The new rule is that any fax session must be run inside
+// a trap harness - not simply because the modem and port need tidying up.
+
+// Note to the note : The check for user cancel request has been moved to
+// ProgressUpdate().  However, this function can still leave if the
+// rx buffer overruns, in which case we use the standard iCancel flag to
+// check if it is safe to leave and do so.  The original note still applies
+// but to be honest, I'm less happy about it now.
+
+TInt CFaxModem::RxcharWaitL (TInt & atimeout)
+   {
+   iReadone.Zero ();
+   if (atimeout == 0)
+      return (0);
+   if (iReceiveBuffer.Length () == 0)			//iReceiveBuffer == Receive descriptor
+      {
+      for (;;)
+         {
+         TInt timeBegin = clock ();
+         iCommSession.Read (iRecstat, atimeout, iReceiveBuffer, KBufSize);    // read data from the serial port
+         User::WaitForRequest (iRecstat);
+         if ((iRecstat == KErrCommsOverrun) && (iCancel == 0))  // check for overrun and user cancel request
+            {
+            iCancel = 2;
+            iCommSession.ResetBuffers (KCommResetRx);			//Reset serial port buffers
+            User::Leave (KErrCommsOverrun);
+            }
+            
+		 if ((iReceiveBuffer.Length () == 0) && (iRecstat == KErrTimedOut))
+			{
+			if (iCommSession.QueryReceiveBuffer () != 0 )
+				{
+					iCommSession.ReadOneOrMore (iRecstat, iReceiveBuffer);
+					User::WaitForRequest (iRecstat);
+				}
+			}	
+		 atimeout -= (clock () - timeBegin);					//decrement timeout 
+		 
+		 if (iReceiveBuffer.Length () != 0)
+            break;
+         if (atimeout > 0)
+            continue;
+         atimeout = 0;
+         return (0);
+         }
+      if (atimeout < 1)
+         atimeout = 1;
+      }
+   iReadone.Append (iReceiveBuffer[0]);
+   iReceiveBuffer.Delete (0, 1);
+   return (1);
+   }
+/********************************************************************/
+
+void CFaxModem::ProgressUpdateL ()
+   {
+// Commented out by AMC 13/3/00.  Pending complete deletion.  Not completely removed as removal of function from
+// Base has not yet propagated down Device Drivers.  Until the device drivers support it there's a chance it
+// will have to be re-introduced.
+
+//	UserHal::ResetAutoSwitchOffTimer (); // required to stop powerdown
+   if (iCancel == 1)
+      {
+      iCancel++;
+      User::Leave (KFaxCancelRequested);
+      }
+
+   TTime now;
+   now.UniversalTime ();
+
+   iProgress.iLastUpdateTime = now;
+
+   if (iVerbose)
+      {
+      if (iOurMessage.Length ())
+         {
+#ifdef _DEBUG
+         //
+         // Write the log message also to the main log file...
+         //
+         TBuf8<256> temp;
+
+         temp.Copy(iOurMessage);
+         __FLOG_FAXSRV1(_L8("ProgressUpdateL: %S"), &temp);
+#endif
+		 
+         TDateTime dateTime;
+         TBuf8 < 16 > datestamp;
+         dateTime = now.DateTime ();
+         datestamp.Format (_L8 ("%02d.%02d:%02d:%06d "), dateTime.Hour (), dateTime.Minute (), dateTime.Second (), dateTime.MicroSecond ());
+         iOurMessage.Insert (0, datestamp);
+         iOurMessage.Append (13);
+         iOurMessage.Append (10);
+		 
+		 if (iFileOpen)
+			iFile.Write (iOurMessage);
+
+		 iOurMessage.Zero ();
+         }
+      }
+   }
+/*********************************************************************/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/FAXMDRV.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,190 @@
+// 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:
+// Contents :  fax s/r header file
+// 
+//
+
+/**
+ @file
+ @internalComponent 
+*/
+
+#ifndef __FAXMDRV_H
+#define __FAXMDRV_H
+
+// class 1 T.30 frame stuff
+
+#include "FRAMES.H"
+/**
+@internalComponent
+*/
+const TInt KDialTimeout (100);
+
+/********************************************************************/
+
+// now the CFaxModemDriver abstract class
+class CFaxModem;
+class CFaxModemDriver : public CBase
+/**
+@internalComponent
+*/
+   {
+
+ public:
+   static CFaxModemDriver * NewLC (TFaxServerSessionSettings *,RFax::TProgress& aProgress);
+   static CFaxModemDriver * NewL (TFaxServerSessionSettings *,RFax::TProgress& aProgress);
+   void ConstructL (TFaxServerSessionSettings *,RFax::TProgress& aProgress);
+    CFaxModemDriver ();
+   ~CFaxModemDriver ();
+
+   void GetFaxDataL (TDes8 *);
+   TInt GetLineL (TUint8 *);
+   virtual TInt RxConnectL () = 0;
+   virtual TInt RxPrePageL () = 0;
+   virtual TInt RxPostPageL () = 0;
+
+   TInt SendFaxDataL (const TDesC8 *);
+   virtual TInt TxConnectL () = 0;
+   virtual TInt TxPrePageL () = 0;
+   virtual TInt TxPostPageL () = 0;
+
+   inline void SetSharedFileHandles(CFaxSharedFileHandles* aSharedHandles) 
+	   {
+	   iSharedHandles = aSharedHandles;
+	   }
+
+ protected:
+   inline TUint8 Invert (TUint8);
+   void DialFaxOnDemandL ();
+   void WriteFaxStoreL (TInt);
+   TInt RxStartPageL();
+   TInt TxStartPageL();
+   void SendFaxHeaderL ();
+   void padLineL (TInt);
+   TInt CheckCadenceExportL(const TDesC8 &);
+
+ public:
+   CFaxModem * iModem;
+   TFaxServerSessionSettings * iFaxServerSessionSettings;
+   TInt iRepeatPage;
+   TTimeIntervalMicroSeconds iCadence;
+   TTime iTimeOfLastRing;
+
+ protected:
+   TInt iActualFaxSpeed;
+   TInt iMinscan;
+   TInt iMinlinelength;        // worked out from iMinscan and iActualFaxSpeed
+   TBuf8 < 128 > iResults;
+   CFaxSharedFileHandles* iSharedHandles;
+   };
+
+/********************************************************************/
+
+// Here we have the derived classes for various types of fax modems
+// class one is the only complicated one
+
+/********************************************************************/
+
+class CFaxClass1 : public CFaxModemDriver
+/**
+@internalComponent
+*/
+   {
+
+ public:
+   static CFaxModemDriver * NewL (TFaxServerSessionSettings *,RFax::TProgress& aProgress);
+   static CFaxModemDriver * NewLC (TFaxServerSessionSettings *,RFax::TProgress& aProgress);
+
+   TInt RxConnectL ();
+   TInt RxPrePageL ();
+   TInt RxPostPageL ();
+   TInt TxConnectL ();
+   TInt TxPrePageL ();
+   TInt TxPostPageL ();
+
+ private:
+   TInt RxPrePollL ();
+   TInt RxSetHighSpeedL ();
+   void RxDCNL ();
+   TInt TxSetHighSpeedL ();
+   TInt TxDCNL ();
+
+   TInt GetframeL (TDes8 &);
+   TInt SendframeL (TDes8 &);
+   TInt GetFramestatL ();
+   TInt FramestatL ();
+   TInt FramestatL (TInt);
+   void ReceiveSilenceL ();
+   TInt SendCRPL ();
+   inline void AnalyseDISL ();
+
+   union faxparms iDisFrame;
+   union faxparms iDcsFrame;
+   union faxparms iDtcFrame;
+   TInt iDcsBytes ;
+   TInt iDisBytes ;
+   TInt iFcfXbit ;             // the fcf X bit, see T.30/5.3.6.1
+   TBuf8 < 16 > iModemString;  // HDLC post-frame modem status
+   TBuf8 < 36 > iOldFrame;     // last frame resend for class 1
+   TBuf8 < 36 > iFrame;        // current frame data space
+   };
+/********************************************************************/
+
+class CFaxClass2 : public CFaxModemDriver
+/**
+@internalComponent
+*/
+   {
+ public:
+   static CFaxModemDriver * NewL (TFaxServerSessionSettings *,RFax::TProgress& aProgress);
+   static CFaxModemDriver * NewLC (TFaxServerSessionSettings *,RFax::TProgress& aProgress);
+
+   TInt RxConnectL ();
+   TInt RxPrePageL ();
+   TInt RxPostPageL ();
+   TInt TxConnectL ();
+   TInt TxPrePageL ();
+   TInt TxPostPageL ();
+
+ protected:
+   void ParseResults (TDesC8 &) ;
+   void ExtractAnswerback (TDesC8 &);
+   void AnalyseFHNG(void);
+
+   };
+/********************************************************************/
+
+class CFaxClass20 : public CFaxClass2
+/**
+@internalComponent
+*/
+   {
+ public:
+   static CFaxModemDriver * NewL (TFaxServerSessionSettings *,RFax::TProgress& aProgress);
+   static CFaxModemDriver * NewLC (TFaxServerSessionSettings *,RFax::TProgress& aProgress);
+
+   TInt RxConnectL ();
+   TInt RxPrePageL ();
+   TInt RxPostPageL ();
+   TInt TxConnectL ();
+   TInt TxPrePageL ();
+   TInt TxPostPageL ();
+   };
+
+/********************************************************************/
+
+#include "FAXMDRV.INL"
+
+#endif
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/FAXMDRV.INL	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,34 @@
+// 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 __FAXMDRV_INL
+#define __FAXMDRV_INL
+
+/********************************************************************/
+
+inline TUint8 CFaxModemDriver::Invert (TUint8 aOctet)
+   {
+   return (KReverseByte[aOctet]);
+   }
+
+/********************************************************************/
+
+#endif
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/FAXMODEM.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,103 @@
+// 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:
+// Contents :  fax s/r header file
+// 
+//
+
+/**
+ @file
+ @internalComponent 
+*/
+
+#ifndef __FAXMODEM_H
+#define __FAXMODEM_H
+
+#include "FAXLOG.H"
+// high level modem control functions
+
+class CFaxModem : public CBase
+/**
+@internalComponent
+*/
+	{
+public:
+	static CFaxModem * NewL (TFaxServerSessionSettings *,RFax::TProgress& aProgress);
+	static CFaxModem * NewLC (TFaxServerSessionSettings *,RFax::TProgress& aProgress);
+	CFaxModem (RFax::TProgress& aProgress);	// added by MattS
+	~CFaxModem ();
+
+private:
+	void ConstructL (TFaxServerSessionSettings *);
+	TInt SubImportL (TDes8 &, TInt);	// chop up long timeouts
+	void Dropdtr (void);				// drop DTR for a second
+	void LowerDTR (void);				// do this to hang up modem
+	void RaiseDTR (void);				// normal port state
+	void Speed (TBps);					// set port speed
+	void SendL (const TDesC8 &);		// Send a descriptor
+	void HangupProcedureL();			// Destructor Hangup procedure
+	void SetModemCommandModeL(void);	// Switch modem into command mode and clear its buffer.
+
+public:
+	TInt GetMatchL (const TDesC8 &, TInt);
+	TInt ImportL (TDes8 &, TInt);
+	TInt ExportL (const TDesC8 &);
+	TInt clock (void);					// get ticks since start
+	void Silence (void);
+	void Silence (TInt) const;
+	void Xonon (void);					// set Kxon/Kxoff
+	void Xonoff (void);					// no handshaking, normal port state
+	TInt Rxstat (void);					// Any character waiting to be read ?
+	TInt Txstat (void);					// Any characters waiting to be sent ?
+	void TxcharL (TUint8);				// this sends a byte
+	inline void SendTransmitBufferL (void);
+	void CommitTransmitBufferL (void);
+	TInt RxcharWaitL (TInt &);
+	void ProgressUpdateL ();
+
+	TInt iVerbose;
+	TInt iCancel;
+	RFax::TProgress& iProgress;			// was TFaxTransferProgress. MattS.
+	TBuf8 < 256 > iOurMessage;			// for feedback
+
+	TInt iGranularity;					// for looking up timer granularity
+	TInt iCalls;						// call calibration for high granularity
+	TBuf8 < 1 > iReadone;				// for single character reads
+	TBuf8 < KBufSize+16 > iTransmitBuffer;	// send data i/o buffer
+	TBuf8 < KBufSize > iReceiveBuffer;		// read data i/o buffer
+
+protected:									// all these will default to EFalse
+	TBool iFileSessionOpen;
+	TBool iFileOpen;
+	TBool iPortOpen;
+	TBool iModemSet;
+	TBool iTimingLoopDelay;
+
+	TCommConfig iRS232Settings;
+
+	TRequestStatus iRecstat;				// for reads
+	TRequestStatus iTranstat;				// for sends
+	TBuf8 < 1 > iSendone;					// for single character sends
+	TTime iStartTime;						// time we started at
+
+	RComm iCommSession;
+	RFs iFileSession;
+	RFile iFile;
+	};
+
+/********************************************************************/
+
+#include "FAXMODEM.INL"
+
+#endif
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/FAXMODEM.INL	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,36 @@
+// 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 __FAXMODEM_INL
+#define __FAXMODEM_INL
+
+/********************************************************************/
+
+inline void CFaxModem::SendTransmitBufferL ()
+   {
+   if (iTransmitBuffer.Length () < KBufSize)
+      return;
+   CommitTransmitBufferL ();
+   }
+/********************************************************************/
+
+#endif
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/FAXSERV.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,500 @@
+// 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:
+//
+
+#include "FAXSERV.H"
+#include "fax_reversebytes.h"
+#include "FAXMDRV.H"
+#include "FAXMODEM.H"
+#include <et_phone.h>
+
+#include "FAXLOG.H"
+
+
+/*********************************************************************/
+
+CFaxSession *CFaxSession::NewLC ()
+	{
+	CFaxSession *self = new (ELeave) CFaxSession;
+	CleanupStack::PushL (self);
+	return self;
+	}
+
+CFaxSession *CFaxSession::NewL ()
+	{
+	CFaxSession *self = NewLC ();
+	CleanupStack::Pop ();
+	return self;
+	}
+/********************************************************************/
+CFaxSession::CFaxSession(void)
+            :CBase()
+{
+}
+
+CFaxSession::~CFaxSession ()
+	{
+	FxClose ();
+	delete iSharedFileHandles;
+	}
+
+void CFaxSession::SetCallBack(MFaxCompletionBase* aCompletionBase)
+	{
+	iCompletionBase = aCompletionBase;
+	}
+
+/********************************************************************/
+
+// this kicks off the send or receive session by launching a separate high
+ // priority faxthread.  A FxOpen must be paired with a call to FxClose
+ // as this is an EPOC32 requirement
+ //
+ // we are part of c32 here, so we cannot set a thread priority
+ //
+ // the heap and stack sizes set here (4K each) are pure guesswork
+ // we need a handle to this parent thread so that our child thread
+ // is able to signal back to us via a TRequestStatus
+
+TInt CFaxSession::FxOpen (TFaxServerSessionSettings & aSettings,RFax::TProgress* aProgress)
+{
+	
+    __FLOG_FAXSRV( _L8("CFaxSession::FxOpen entering"));
+
+	ASSERT (iFaxRequest == NULL);
+	iFaxServerSessionSettings = aSettings;
+
+// Initialise the Progress Settings
+	iProgress = aProgress;
+	iProgress->iLastUpdateTime=0;
+	iProgress->iAnswerback.Zero();
+	iProgress->iPhase = ENotYetStarted;
+	iProgress->iSpeed = 9600;
+	iProgress->iResolution = EFaxNormal;
+	iProgress->iCompression = EModifiedHuffman;
+	iProgress->iECM = 0;
+ 	iProgress->iPage = 0;
+	iProgress->iLines = 0;
+
+	TRAPD (state, iFaxRequest = CFaxRequest::NewL (this));
+	if (state == KErrNone)
+		{
+		iFaxRequest->iChildThread.Logon (iChildDeath);
+		iFaxRequest->iChildThread.Resume ();
+		User::WaitForRequest (iFaxRequest->iThreadStat);
+		CActiveScheduler::Add (iFaxRequest);
+		}
+	return (state);
+}
+/********************************************************************/
+
+TInt CFaxSession::FxClose ()
+{
+    __FLOG_FAXSRV( _L8("CFaxSession::FxClose entering"));
+
+	if (iFaxRequest)
+		{
+		if (iFaxRequest->IsActive ())
+			{
+			Cancel ();
+			}
+		iFaxRequest->FaxRequest (EFxClose);
+		User::WaitForRequest (iChildDeath);
+		delete iFaxRequest;
+		iFaxRequest = NULL;
+		}
+	if (!iAmDestructing)
+		{
+		iAmDestructing = ETrue;
+		delete this;
+		}
+	return (KErrNone);
+}
+/********************************************************************/
+
+MFaxCompletionBase* CFaxSession::ReturnCompletionBase ()
+{
+	return (iCompletionBase);
+}
+
+/*******************************************************************/
+
+void CFaxSession::RxConnect ()
+{
+	iFaxRequest->FaxRequest (ERxConnect);
+}
+/********************************************************************/
+
+void CFaxSession::RxFaxData (TDes8 & aData)
+{
+	iRxData = &aData;
+	iFaxRequest->FaxRequest (ERxFaxData);
+}
+/********************************************************************/
+
+void CFaxSession::RxPostPage ()
+{
+	iFaxRequest->FaxRequest (ERxPostPage);
+}
+/********************************************************************/
+
+void CFaxSession::TxConnect ()
+{
+	iFaxRequest->FaxRequest (ETxConnect);
+}
+/********************************************************************/
+
+void CFaxSession::TxFaxData (const TDesC8 & aData)
+{
+	iTxData = &aData;
+	iFaxRequest->FaxRequest (ETxFaxData);
+}
+/********************************************************************/
+
+void CFaxSession::TxPostPage ()
+{
+	iFaxRequest->FaxRequest (ETxPostPage);
+}
+
+void CFaxSession::Cancel ()
+{
+	iFaxRequest->Cancel ();
+}
+
+void CFaxSession::StartModemL ()
+{
+    __FLOG_FAXSRV( _L8("CFaxSession::StartModemL entering"));
+
+	if (iModemDriver != NULL)
+		return;
+
+	if (iFaxServerSessionSettings.iFaxClass == EClass1)
+		iModemDriver = CFaxClass1::NewL (&iFaxServerSessionSettings,*iProgress);
+	else if (iFaxServerSessionSettings.iFaxClass == EClass2)
+		iModemDriver = CFaxClass2::NewL (&iFaxServerSessionSettings,*iProgress);
+	else if (iFaxServerSessionSettings.iFaxClass == EClass2point0)
+		iModemDriver = CFaxClass20::NewL (&iFaxServerSessionSettings,*iProgress);
+	else
+		User::Leave (KFaxCannotAutodetect);
+
+	iModemDriver->iFaxServerSessionSettings = &iFaxServerSessionSettings;
+   iCompletionBase->GetCadenceAndTimeOfLastRing(iModemDriver->iCadence, iModemDriver->iTimeOfLastRing);
+}
+
+void CFaxSession::SetFaxHeaderFile(CFaxSharedFileHandles* aSharedFileHandles)
+	{
+	//if we already have an object then delete it and use this one instead
+	if(iSharedFileHandles)
+	{
+		delete iSharedFileHandles;
+		iSharedFileHandles=NULL;
+	}
+	//we are now owners of this object and are responsible for its deletion.
+	iSharedFileHandles = aSharedFileHandles;
+	}
+
+/********************************************************************/
+
+// the CFaxRequest class is our Fax Server Active Object
+
+/*********************************************************************/
+
+CFaxSession::CFaxRequest::CFaxRequest ()
+:CActive (1)
+{
+}
+/********************************************************************/
+
+CFaxSession::CFaxRequest *CFaxSession::CFaxRequest::NewLC (CFaxSession * aFaxSession)
+{
+	CFaxSession::CFaxRequest *self = new (ELeave) CFaxSession::CFaxRequest ();
+	CleanupStack::PushL (self);
+	self->ConstructL (aFaxSession);
+	return self;
+}
+/********************************************************************/
+
+CFaxSession::CFaxRequest *CFaxSession::CFaxRequest::NewL (CFaxSession * aFaxSession)
+{
+	CFaxSession::CFaxRequest *self = NewLC (aFaxSession);
+	CleanupStack::Pop ();
+	return self;
+}
+/********************************************************************/
+
+void CFaxSession::CFaxRequest::ConstructL (CFaxSession * aFaxSession)
+{
+	TInt stackSize = 0x1400;
+	_LIT(KFaxThread,"FaxServerThread");
+
+	iFaxSession = aFaxSession;
+	TInt res = iFaxSession->iParentThread.Duplicate (RThread ());
+	if (res == KErrNone)
+		res = iChildThread.Create (KFaxThread,
+			FaxServerThread,
+			stackSize,
+			NULL,
+			iFaxSession,
+			EOwnerProcess);
+	if (res)
+		User::Leave (KFaxThreadError);
+}
+/********************************************************************/
+
+CFaxSession::CFaxRequest::~CFaxRequest ()
+{
+	iFaxSession->iParentThread.Close ();
+	iChildThread.Close ();
+}
+/********************************************************************/
+
+// once we have our active object, we simply call its FaxRequest
+ // it re-activates the faxserver thread to process the request
+ // and sets the FaxRequest object active before returning
+
+void CFaxSession::CFaxRequest::FaxRequest (CFaxSession::TFaxThreadRequest aFaxThreadRequest)
+{
+	TRequestStatus *threadStatus = &iThreadStat;
+	iFaxThreadRequest = aFaxThreadRequest;
+	if (iFaxThreadRequest != EFxClose)
+		{
+		iStatus = KRequestPending;
+		SetActive ();
+		}
+	iChildThread.RequestComplete (threadStatus, aFaxThreadRequest);
+}
+/********************************************************************/
+
+// here we request a cancel of a fax call
+
+void CFaxSession::CFaxRequest::DoCancel ()
+{
+	iCancel = 1;
+	if (iFaxSession->iModemDriver)
+		{
+		if (iFaxSession->iModemDriver->iModem->iCancel == 0)
+			iFaxSession->iModemDriver->iModem->iCancel++;
+		}
+}
+/********************************************************************/
+
+void CFaxSession::CFaxRequest::RunL ()
+{
+	switch (iFaxThreadRequest)
+		{
+		case ERxConnect:
+				{
+			iFaxSession->ReturnCompletionBase()->RxConnectComplete (iStatus.Int ());
+			break;
+				}
+
+		case ERxFaxData:
+				{
+				iFaxSession->ReturnCompletionBase()->RxFaxDataComplete (iStatus.Int ());
+			break;
+				}
+
+		case ERxPostPage:
+				{
+				iFaxSession->ReturnCompletionBase()->RxPostPageComplete (iStatus.Int ());
+				break;
+				}
+
+		case ETxConnect:
+				{
+				iFaxSession->ReturnCompletionBase()->TxConnectComplete (iStatus.Int ());
+				break;
+				}
+
+		case ETxFaxData:
+				{
+				iFaxSession->ReturnCompletionBase()->TxFaxDataComplete (iStatus.Int ());
+				break;
+				}
+
+		case ETxPostPage:
+				{
+				iFaxSession->ReturnCompletionBase()->TxPostPageComplete (iStatus.Int ());
+				break;
+				}
+		default:;
+		}
+}
+/********************************************************************/
+// this is a utility function which is the entry to our thread
+ // it isn't part of any class, but we pass the address
+ // of our CFaxModemDriver in so that we can check the
+ // session parameter and get back to the required function
+ //
+ // it also has the thread service request dispatcher
+
+TInt FaxServerThread (TAny * session)
+	{
+	TInt state=0;
+	TInt ret;
+	TBool terminateThread=EFalse;
+	CTrapCleanup *cleanup = CTrapCleanup::New ();
+	CFaxSession *faxsession = (CFaxSession *) session;
+	TRequestStatus *openStatus = &faxsession->iFaxRequest->iThreadStat;
+	faxsession->iParentThread.RequestComplete (openStatus, state);
+
+	FOREVER
+		{
+		User::WaitForRequest (faxsession->iFaxRequest->iThreadStat);
+		state = ret = KErrNone;
+		
+        __FLOG_FAXSRV1( _L8("FaxServerThread: iThreadStat=%d"), faxsession->iFaxRequest->iThreadStat.Int ());
+		
+		switch (faxsession->iFaxRequest->iThreadStat.Int ())
+			{
+			case CFaxSession::ERxConnect:
+				TRAP (state, faxsession->StartModemL ());
+							
+				if (state == KErrNone)
+					{
+					faxsession->iModemDriver->iModem->iCancel = faxsession->iFaxRequest->iCancel;
+					TRAP (state, ret = faxsession->iModemDriver->RxConnectL ());
+                    __FLOG_FAXSRV2(_L8("FaxServerThread state: ERxConnect returned ret=%d, state=%d"), ret, state);
+					}
+				break;
+			
+			case CFaxSession::ERxFaxData:
+				if(faxsession->iModemDriver)
+					{
+					TRAP (state, faxsession->iModemDriver->GetFaxDataL (faxsession->iRxData));
+					__FLOG_FAXSRV2( _L8("FaxServerThread state: ERxFaxData returned ret=%d, state=%d"), ret, state);
+					}
+				else
+					__FLOG_FAXSRV( _L8("FaxServerThread state: ERxFaxData - faxsession->iModemDriver=NULL"));
+				break;
+			
+			case CFaxSession::ERxPostPage:
+				if(faxsession->iModemDriver)
+					{			
+					TRAP (state, ret = faxsession->iModemDriver->RxPostPageL ());
+					__FLOG_FAXSRV2( _L8("FaxServerThread: iModemDriver->RxPostPageL returned ret=%d, state=%d"), ret, state);
+					}
+				else
+					__FLOG_FAXSRV( _L8("FaxServerThread: iModemDriver->RxPostPageL - faxsession->iModemDriver = NULL"));
+				break;
+			
+			case CFaxSession::ETxConnect:
+				__FLOG_FAXSRV(_L8("FaxServerThread state: ETxConnect"));
+				TRAP (state, faxsession->StartModemL ());		//creates an instance of the appropriate 
+																//modem driver (CFax1, CFax2, CFax2.0)
+				if (state == KErrNone)
+					{
+					faxsession->iModemDriver->iModem->iCancel = faxsession->iFaxRequest->iCancel; // added now
+					faxsession->iModemDriver->SetSharedFileHandles(faxsession->iSharedFileHandles);
+					TRAP (state, ret = faxsession->iModemDriver->TxConnectL ());
+					}
+				break;
+			
+			case CFaxSession::ETxFaxData:
+				if(faxsession->iModemDriver)
+					{			
+					TRAP (state, ret = faxsession->iModemDriver->SendFaxDataL (faxsession->iTxData));
+					__FLOG_FAXSRV2(_L8("FaxServerThread state: ETxFaxData, state =%d, ret=%d"),state, ret);
+					}
+				else
+					__FLOG_FAXSRV(_L8("FaxServerThread state: ETxFaxData, faxsession->iModemDriver = NULL"));
+				break;
+			
+			case CFaxSession::ETxPostPage:
+                __FLOG_FAXSRV(_L8("FaxServerThread state: ETxPostPage"));
+				if(faxsession->iModemDriver)
+					{			
+					TRAP (state, ret = faxsession->iModemDriver->TxPostPageL ());
+					}
+				else
+					{
+					__FLOG_FAXSRV(_L8("FaxServerThread state: ETxPostPage, faxsession->iModemDriver = NULL"));
+					}
+				break;
+			
+			case CFaxSession::EFxClose:
+                __FLOG_FAXSRV(_L8("FaxServerThread state: EFxClose:"));
+
+				delete faxsession->iModemDriver;
+				faxsession->iModemDriver = NULL;
+				terminateThread=ETrue;
+				state = KErrNone;
+				ret   = KErrNone;
+				break;
+			
+			default:
+				state = KErrNone;
+				ret   = KErrNone;
+                break;
+			}
+		if (state == KErrNone)
+			state = ret;
+		if (faxsession->iFaxRequest->iCancel)
+			{
+			
+			__FLOG_FAXSRV1(_L8("FaxServerThread: iCancel=%d"), faxsession->iFaxRequest->iCancel);
+			
+			state = KFaxCancelRequested;
+			delete faxsession->iModemDriver;
+			faxsession->iModemDriver = NULL;
+			}
+		if (faxsession->iFaxRequest->IsActive ())
+			{
+			TRequestStatus *returnStatus = &faxsession->iFaxRequest->iStatus;
+			faxsession->iParentThread.RequestComplete (returnStatus, state);
+			}
+		if(terminateThread)
+			break;
+//		if (faxsession->iModemDriver == NULL)
+//			break;
+		}
+	delete cleanup;
+	return (state);
+}
+/*********************************************************************/
+
+TFaxServerSessionSettings& TFaxServerSessionSettings::operator=(const TFaxServerSessionSettings& aSettings)
+	{
+	iPhoneNumber = aSettings.iPhoneNumber;
+	iLogging = aSettings.iLogging;
+	iFaxInitString = aSettings.iFaxInitString;
+	iMode = aSettings.iMode;;
+	iFaxClass = aSettings.iFaxClass;
+	iPortDriverName = aSettings.iPortDriverName;
+	iCommPortName = aSettings.iCommPortName;
+	iFaxId = aSettings.iFaxId;
+	iMaxSpeed = aSettings.iMaxSpeed;
+	iMinSpeed = aSettings.iMinSpeed;
+	iPreferredECM = aSettings.iPreferredECM;
+	iFaxOnDemandDelay = aSettings.iFaxOnDemandDelay;
+	iTxResolution = aSettings.iTxResolution;
+	iTxCompression = aSettings.iTxCompression;
+	iTxPages = aSettings.iTxPages;
+	iRxResolution = aSettings.iRxResolution;
+	iRxCompression = aSettings.iRxCompression;
+	return(*this);
+	}
+ 
+//
+// First Ordinal Functions
+//
+extern "C"
+	{
+	IMPORT_C CFaxSession* LibEntry(void);	// Force "Proper Name" export
+	}
+
+EXPORT_C CFaxSession* LibEntry()
+	{
+	return CFaxSession::NewL();
+	}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/FAXSERV.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,213 @@
+// 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 
+*/
+
+#if !defined(__FaxServ_H__)
+#define __FaxServ_H__
+
+#include <f32file.h>
+#include <s32file.h>
+#include <s32mem.h>
+
+#if !defined(__FAXSTORE_H__)
+#include <faxstore.h>
+#endif
+	  
+#if !defined(__FAXHUFF_H__)
+#include <faxhuff.h>
+#endif
+
+#if !defined(__ETEL_H__)
+#include "ETEL.H"
+#endif
+
+#include <faxstd.h>
+/**
+@internalTechnology
+*/
+const TUint KUidDynamicFaxServer = 0x10004C88;		
+const TUint KUidUnicodeDynamicFaxServer = 0x10004C89;
+/**
+@internalComponent
+*/
+TInt FaxServerThread (TAny * session);  // function declaration needed here
+/**
+@internalComponent
+*/
+#define KMaxDialLength		50		
+#define KConfigStringLength 32		
+
+
+//**********************************
+// TFaxServerSessionSettings
+//**********************************
+/**
+@internalTechnology
+*/	   
+struct TFaxServerSessionSettings
+	{
+	TFaxServerSessionSettings& operator=(const TFaxServerSessionSettings& aSettings);
+	TBuf8<KMaxDialLength> iPhoneNumber;
+	TBool iLogging;
+	TBuf8<KConfigStringLength> iFaxInitString;
+	TFaxMode iMode;
+	TFaxClass iFaxClass;
+	TFileName iPortDriverName;
+	TName iCommPortName;
+	TBuf<RCall::KFaxIdUserNameMaxSize> iFaxId;
+	TInt iMaxSpeed;
+	TInt iMinSpeed;
+	TInt iPreferredECM;
+	TInt iFaxOnDemandDelay;
+// Tx Settings
+	TFaxResolution iTxResolution;
+	TFaxCompression iTxCompression;
+	TInt iTxPages;
+// Rx Settings
+	TFaxResolution iRxResolution;
+	TFaxCompression iRxCompression;
+	};
+
+class MFaxCompletionBase
+/**
+@internalTechnology
+*/
+	{
+public:
+	virtual void RxConnectComplete(TInt aError)=0;		
+	virtual void RxFaxDataComplete(TInt aError)=0;		
+	virtual void RxPostPageComplete(TInt aError)=0;
+	virtual void TxConnectComplete(TInt aError)=0;
+    virtual void TxFaxDataComplete(TInt aError)=0;
+	virtual void TxPostPageComplete(TInt aError)=0;		
+
+	virtual void GetCadenceAndTimeOfLastRing(TTimeIntervalMicroSeconds& aCadence,TTime& aTime)=0;
+	};	
+
+
+class CFaxModemDriver;
+class CFaxSharedFileHandles;
+class CFaxSession : public CBase
+/**
+@internalTechnology
+*/
+   {
+ public:
+     virtual TInt FxOpen(TFaxServerSessionSettings&,RFax::TProgress* aProgress);
+	 virtual TInt FxClose();
+	 virtual void RxConnect();
+	 virtual void RxFaxData(TDes8 & aData);
+	 virtual void RxPostPage();
+	 virtual void TxConnect();
+	 virtual void TxFaxData(const TDesC8 & aData);
+	 virtual void TxPostPage();
+	 virtual void Cancel();
+	 virtual void SetCallBack(MFaxCompletionBase* aBase);
+	 virtual void SetFaxHeaderFile(CFaxSharedFileHandles* iSharedFileHandles);
+
+     static CFaxSession * NewL ();
+     static CFaxSession * NewLC ();
+     ~CFaxSession ();
+     CFaxSession(void);
+
+	 MFaxCompletionBase* ReturnCompletionBase(void);		// added by JerryC
+     void StartModemL ();
+
+
+  enum TFaxThreadRequest
+     {
+     ERxConnect,
+     ERxFaxData,
+     ERxPostPage,
+     ETxConnect,
+     ETxFaxData,
+     ETxPostPage,
+     EFxClose
+     };
+
+	/********************************************************************/
+	// CFaxRequest active object
+	/********************************************************************/
+
+  class CFaxRequest : public CActive
+  /**
+  @internalComponent
+  */
+     {
+   public:
+     CFaxRequest();
+     ~CFaxRequest ();
+     static CFaxRequest * NewL (CFaxSession *);
+     static CFaxRequest * NewLC (CFaxSession *);
+     void ConstructL (CFaxSession *);
+     void DoCancel();
+     void FaxRequest (TFaxThreadRequest);
+     void RunL ();
+  
+   public:
+     RThread iChildThread;
+     TRequestStatus iThreadStat;
+     TInt iCancel;
+
+   private:
+     CFaxSession  * iFaxSession;
+     TFaxThreadRequest iFaxThreadRequest;
+     };
+
+ public:
+   RThread iParentThread;
+   CFaxModemDriver * iModemDriver;
+   TDes8 * iRxData;
+   const TDesC8 * iTxData;
+   CFaxRequest * iFaxRequest;
+   TFaxServerSessionSettings iFaxServerSessionSettings;
+   RFax::TProgress* iProgress;
+   CFaxSharedFileHandles* iSharedFileHandles;
+ private:
+   TRequestStatus iChildDeath;
+   MFaxCompletionBase* iCompletionBase;					// added by JerryC
+   TBool iAmDestructing;
+   };
+
+
+/********************************************************************/
+
+/* 
+class MFaxSession 
+	{
+public:
+     virtual TInt FxOpen(TFaxServerSessionSettings&,RFax::TProgress* aProgress)=0;
+	 virtual TInt FxClose()=0;
+
+	 virtual void RxConnect()=0;
+	 virtual void RxFaxData(TDes8 & aData)=0;
+	 virtual void RxPostPage()=0;
+
+	 virtual void TxConnect()=0;
+	 virtual void TxFaxData(const TDesC8 & aData)=0;
+	 virtual void TxPostPage()=0;
+
+	 virtual void Cancel()=0;
+
+	 virtual void SetCallBack(MFaxCompletionBase* aCompletionBase)=0;
+	};
+
+  */
+
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/FAXSTUB.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,311 @@
+// 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:
+//
+
+#include "FAXSTUB.H"
+
+TTsyTimer::TTsyTimer()
+	{
+	iPending=EFalse;
+	}
+
+CFaxSession *CFaxSession::NewLC ()
+	{
+	return NULL;
+	}
+
+CFaxSession *CFaxSession::NewL ()
+	{
+	CFaxSession* faxstub=new(ELeave) CFaxSession();
+	CleanupStack::PushL(faxstub);
+	faxstub->ConstructL();
+	CleanupStack::Pop();
+	return faxstub;
+	}
+
+CFaxSession::CFaxSession()
+	: CBase()
+	{}
+
+void CFaxSession::SetCallBack(MFaxCompletionBase* aCompletionBase)
+	{
+	iCompletion = aCompletionBase;
+	}
+
+void CFaxSession::ConstructL()
+	{
+	iFaxTimer = CFaxTimer::NewL();
+	}
+
+CFaxSession::~CFaxSession()
+	{
+	
+		if(iFaxTimer) //-- LYN-585JX9, code improvements by Dmitry Lyokhin. 11.03.02
+		{
+			iFaxTimer->RemoveTimer(iRxConnect);
+			iFaxTimer->RemoveTimer(iRxFaxData);
+			iFaxTimer->RemoveTimer(iRxPostPage);
+			iFaxTimer->RemoveTimer(iTxConnect);
+			iFaxTimer->RemoveTimer(iTxFaxData);
+			iFaxTimer->RemoveTimer(iTxPostPage);
+
+			delete iFaxTimer;
+		}
+
+
+	}
+
+
+TInt CFaxSession::FxOpen(TFaxServerSessionSettings& aFaxSettings,RFax::TProgress* aProgress)
+	{
+	iTransferProgress = aProgress;
+	iTransferProgress->iLastUpdateTime = KDefaultLastUpdateTime;
+	iTransferProgress->iAnswerback = KDefaultAnswerBack;
+	iTransferProgress->iPhase = KDefaultPhase;
+	iTransferProgress->iResolution = KDefaultResolution;
+	iTransferProgress->iCompression = KDefaultCompression;
+	iTransferProgress->iPage = KDefaultPageNumber;
+	iTransferProgress->iLines = KDefaultLinesNumber;
+	iTransferProgress->iSpeed = KDefaultSpeed;
+	TFaxServerSessionSettings copy;
+	copy = aFaxSettings;
+    TBuf8<KMaxFileName> tmpName;    
+            
+	__FLOG_FAXSTUB (_L8("FaxStub:\tFxOpen called."));
+	__FLOG_FAXSTUB (_L8("FaxStub:\tFax settings received: "));
+	__FLOG_FAXSTUB1(_L8("Phone Number : %S"),&copy.iPhoneNumber);
+	__FLOG_FAXSTUB1(_L8("Fax Init String : %S"),&copy.iFaxInitString);
+	__FLOG_FAXSTUB1(_L8("Fax Mode: %d"),copy.iMode);
+	__FLOG_FAXSTUB1(_L8("Fax Class: %d"),copy.iFaxClass);
+	
+     
+    tmpName.Copy(_L8("Port Driver Name: "));
+    tmpName.Append(copy.iPortDriverName);
+    __FLOG_FAXSTUB(tmpName);
+
+	tmpName.Copy(_L8("Comm Port Name: "));
+    tmpName.Append(copy.iCommPortName);
+    __FLOG_FAXSTUB(tmpName);
+	
+    tmpName.Copy(_L8("Fax ID: "));
+    tmpName.Append(copy.iFaxId);
+    __FLOG_FAXSTUB(tmpName);
+
+
+	__FLOG_FAXSTUB1(_L8("Max speed: %d"),copy.iMaxSpeed);
+	__FLOG_FAXSTUB1(_L8("Min speed: %d"),copy.iMinSpeed);
+	__FLOG_FAXSTUB1(_L8("Tx compression: %d"),copy.iTxCompression);
+	__FLOG_FAXSTUB1(_L8("Rx compression: %d"),copy.iRxCompression);
+	__FLOG_FAXSTUB1(_L8("Fax on demand delay: %d"),copy.iFaxOnDemandDelay);
+	__FLOG_FAXSTUB1(_L8("Tx Fax Res: %d"),copy.iTxResolution);
+	__FLOG_FAXSTUB1(_L8("Tx pages: %d"),copy.iTxPages);
+	__FLOG_FAXSTUB1(_L8("Rx Fax Res: %d"),copy.iRxResolution);
+	return KErrNone;
+	}
+
+TInt CFaxSession::FxClose()
+	{
+	__FLOG_FAXSTUB(_L8("FaxStub:\tFxClose called."));
+	delete this;
+	return KErrNone;
+	}
+
+// Rx Fax
+void CFaxSession::RxConnect()
+	{
+	__FLOG_FAXSTUB(_L8("FaxStub:\tRxConnect called."));	
+	iFaxTimer->QueueTimer(iRxConnect,ASYNC_TIMEOUT,CFaxSession::RxConnectHandler,this);
+	iFaxTimer->QueueTimer(iProgressChanger,ASYNC_LONGTIMEOUT,CFaxSession::ProgressChanger,this);
+	}
+
+TInt CFaxSession::RxConnectHandler(TAny* aPtr)
+	{
+	CFaxSession* faxHayes = REINTERPRET_CAST(CFaxSession*,aPtr);
+	TTime timeAtLastRing;
+	TTimeIntervalMicroSeconds cadence;
+	faxHayes->iCompletion->GetCadenceAndTimeOfLastRing(cadence,timeAtLastRing);
+	
+	__FLOG_FAXSTUB2(_L8("FaxStub:\tTime at last RING is %d:%d"),timeAtLastRing.DateTime().Second(),timeAtLastRing.DateTime().MicroSecond());
+	__FLOG_FAXSTUB1(_L8("FaxStub:\tCadence is %d microseconds"),cadence.Int64());
+
+	faxHayes->iCompletion->RxConnectComplete(KErrNone);
+	faxHayes->iFaxTimer->ResetPending(((CFaxSession*)aPtr)->iRxConnect);
+	return KErrNone;
+	}
+
+void CFaxSession::RxFaxData(TDes8& aData)
+	{
+	__FLOG_FAXSTUB(_L8("FaxStub:\tRxFaxData called."));	
+	aData = _L8("INCOMING FAX DATA!!");
+	iFaxTimer->QueueTimer(iRxFaxData,ASYNC_TIMEOUT,CFaxSession::RxFaxDataHandler,this);
+	}
+
+TInt CFaxSession::RxFaxDataHandler(TAny* aPtr)
+	{
+	CFaxSession* faxHayes = REINTERPRET_CAST(CFaxSession*,aPtr);
+	faxHayes->iCompletion->RxFaxDataComplete(KErrNone);
+	faxHayes->iFaxTimer->ResetPending(((CFaxSession*)aPtr)->iRxFaxData);
+	return KErrNone;
+	}
+
+void CFaxSession::RxPostPage()
+	{
+	__FLOG_FAXSTUB(_L8("FaxStub:\tRxPostPage called."));	
+	iFaxTimer->QueueTimer(iRxPostPage,ASYNC_TIMEOUT,CFaxSession::RxPostPageHandler,this);
+	}
+
+TInt CFaxSession::RxPostPageHandler(TAny* aPtr)
+	{
+	CFaxSession* faxHayes = REINTERPRET_CAST(CFaxSession*,aPtr);
+	faxHayes->iCompletion->RxPostPageComplete(KErrNone);
+	faxHayes->iFaxTimer->ResetPending(((CFaxSession*)aPtr)->iRxPostPage);
+	return KErrNone;
+	}
+
+// Tx Fax
+
+void CFaxSession::TxConnect()
+	{
+	__FLOG_FAXSTUB(_L8("FaxStub:\tTxConnect called."));
+	iFaxTimer->QueueTimer(iTxConnect,ASYNC_TIMEOUT,CFaxSession::TxConnectHandler,this);
+	}
+
+TInt CFaxSession::TxConnectHandler(TAny* aPtr)
+	{
+	CFaxSession* faxHayes = REINTERPRET_CAST(CFaxSession*,aPtr);
+	faxHayes->iCompletion->TxConnectComplete(KErrNone);
+	faxHayes->iFaxTimer->ResetPending(((CFaxSession*)aPtr)->iTxConnect);
+	return KErrNone;
+	}
+
+void CFaxSession::TxFaxData(const TDesC8& /*aData*/)
+	{
+	__FLOG_FAXSTUB(_L8("FaxStub:\tTxFaxData called."));	
+	iFaxTimer->QueueTimer(iTxFaxData,ASYNC_TIMEOUT,CFaxSession::TxFaxDataHandler,this);
+	}
+
+TInt CFaxSession::TxFaxDataHandler(TAny* aPtr)
+	{
+	CFaxSession* faxHayes = REINTERPRET_CAST(CFaxSession*,aPtr);
+	faxHayes->iCompletion->TxFaxDataComplete(KErrNone);
+	faxHayes->iFaxTimer->ResetPending(((CFaxSession*)aPtr)->iTxFaxData);
+	return KErrNone;
+	}
+
+void CFaxSession::TxPostPage()
+	{
+	__FLOG_FAXSTUB(_L8("FaxStub:\tTxPostPage called."));	
+	iFaxTimer->QueueTimer(iTxPostPage,ASYNC_TIMEOUT,CFaxSession::TxPostPageHandler,this);
+	}
+
+TInt CFaxSession::TxPostPageHandler(TAny* aPtr)
+	{
+	CFaxSession* faxHayes = REINTERPRET_CAST(CFaxSession*,aPtr);
+	faxHayes->iCompletion->TxPostPageComplete(KErrNone);
+	faxHayes->iFaxTimer->ResetPending(((CFaxSession*)aPtr)->iTxPostPage);
+	return KErrNone;
+	}
+
+void CFaxSession::Cancel()
+	{
+	__FLOG_FAXSTUB(_L8("FaxStub:\tCancel called - set iTransferProgress.iPhase to EDisconnection"));
+	iTransferProgress->iPhase = EDisconnection;
+	}
+
+TInt CFaxSession::ProgressChanger(TAny* aPtr)
+	{
+	CFaxSession* faxHayes = REINTERPRET_CAST(CFaxSession*,aPtr);	
+	faxHayes->iTransferProgress->iLines++;
+	return KErrNone;
+	}
+
+// CFaxTimer
+
+CFaxTimer* CFaxTimer::NewL()
+	{
+	CFaxTimer* faxTimer = new(ELeave)CFaxTimer();
+	CleanupStack::PushL(faxTimer);
+	faxTimer->ConstructL();
+	CleanupStack::Pop();
+	return faxTimer;
+	}
+
+CFaxTimer::CFaxTimer()
+	{}
+
+void CFaxTimer::ConstructL()
+	{
+	iTimer=CDeltaTimer::NewL(CActive::EPriorityHigh,KEtelFaxTimerGranularity);
+	}
+
+CFaxTimer::~CFaxTimer()
+	{
+	delete iTimer;
+	}
+
+void CFaxTimer::QueueTimer(TTsyTimer& aTsyTimer,
+						TTimeIntervalMicroSeconds32 aTimeInMicroSeconds,
+						TInt (*aFunction)(TAny *aPtr),TAny* aPtr)
+	{
+	TCallBack callBackFn(aFunction,aPtr);
+	aTsyTimer.iEntry.Set(callBackFn);
+
+	aTsyTimer.iPending=ETrue;
+	aTimeInMicroSeconds=aTimeInMicroSeconds.Int()+(KEtelFaxTimerGranularity>>2);
+	if(aTimeInMicroSeconds.Int()<100000)
+		aTimeInMicroSeconds=aTimeInMicroSeconds.Int()+KEtelFaxTimerGranularity;
+	iTimer->Queue(aTimeInMicroSeconds,aTsyTimer.iEntry);
+	}
+
+TBool CFaxTimer::RemoveTimer(TTsyTimer& aTsyTimer)
+	{
+	if (aTsyTimer.iPending)
+		{
+		aTsyTimer.iPending=EFalse;
+		iTimer->Remove(aTsyTimer.iEntry);
+		return ETrue;
+		}
+	return EFalse;
+	}
+
+void CFaxTimer::ResetPending(TTsyTimer& aTsyTimer)
+	{
+	aTsyTimer.iPending=EFalse;
+	}
+
+TFaxServerSessionSettings& 
+	TFaxServerSessionSettings::operator=(const TFaxServerSessionSettings& aSettings)
+	{
+	iPhoneNumber = aSettings.iPhoneNumber; iLogging = aSettings.iLogging;
+	iFaxInitString = aSettings.iFaxInitString; iMode = aSettings.iMode;;
+	iFaxClass = aSettings.iFaxClass;
+	iPortDriverName = aSettings.iPortDriverName; iCommPortName = aSettings.iCommPortName; iFaxId = aSettings.iFaxId;
+	iMaxSpeed = aSettings.iMaxSpeed;
+	iMinSpeed = aSettings.iMinSpeed;
+	iPreferredECM = aSettings.iPreferredECM; iFaxOnDemandDelay = aSettings.iFaxOnDemandDelay; iTxResolution = aSettings.iTxResolution; iTxCompression = aSettings.iTxCompression; iTxPages = aSettings.iTxPages;
+	iRxResolution = aSettings.iRxResolution; iRxCompression = aSettings.iRxCompression; return(*this);
+	}
+
+//
+// First Ordinal Functions
+//
+extern "C"
+	{
+	IMPORT_C CFaxSession* LibEntry(void);	// Force "Proper Name" export
+	}
+
+EXPORT_C CFaxSession* LibEntry()
+	{
+	return CFaxSession::NewL();
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/FAXSTUB.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,190 @@
+// 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 __FAXSTUB_H
+#define __FAXSTUB_H
+
+#if !defined(__E32STD_H__)
+#include <e32std.h>
+#endif
+
+#include "etel.h"
+#include "FAXLOG.H"
+
+#if !defined(__E32BASE_H__)
+#include <e32base.h>
+#endif
+
+#include "FAXSTD.H"
+/**
+@internalComponent
+*/
+#define KMaxDialLength		50		
+#define KConfigStringLength 32		
+
+//**********************************
+// TFaxServerSessionSettings
+//**********************************
+/**
+@internalComponent
+*/	   
+struct TFaxServerSessionSettings
+	{
+	TFaxServerSessionSettings& operator=(const TFaxServerSessionSettings& aSettings);
+	TBuf8<KMaxDialLength> iPhoneNumber;
+	TBool iLogging;
+	TBuf8<KConfigStringLength> iFaxInitString;
+	TFaxMode iMode;
+	TFaxClass iFaxClass;
+	TFileName iPortDriverName;
+	TName iCommPortName;
+	TBuf<RCall::KFaxIdUserNameMaxSize> iFaxId;
+	TInt iMaxSpeed;
+	TInt iMinSpeed;
+	TInt iPreferredECM;
+	TInt iFaxOnDemandDelay;
+// Tx Settings
+	TFaxResolution iTxResolution;
+	TFaxCompression iTxCompression;
+	TInt iTxPages;
+// Rx Settings
+	TFaxResolution iRxResolution;
+	TFaxCompression iRxCompression;
+	};
+
+class MFaxCompletionBase
+/**
+@internalTechnology
+*/
+	{
+public:
+	virtual void RxConnectComplete(TInt aError)=0;		
+	virtual void RxFaxDataComplete(TInt aError)=0;		
+	virtual void RxPostPageComplete(TInt aError)=0;
+	virtual void TxConnectComplete(TInt aError)=0;
+    virtual void TxFaxDataComplete(TInt aError)=0;
+	virtual void TxPostPageComplete(TInt aError)=0;		
+
+	virtual void GetCadenceAndTimeOfLastRing(TTimeIntervalMicroSeconds& aCadence,TTime& aTime)=0;
+	};	
+
+
+#ifdef __MARM__
+/**
+@internalComponent
+*/
+const TInt KEtelFaxTimerGranularity = 31000;
+#else
+const TInt KEtelFaxTimerGranularity = 80000;
+#endif
+/**
+@internalComponent
+*/
+#define KDefaultLastUpdateTime  5
+#define KDefaultAnswerBack  _L("01814590381")
+#define KDefaultPhase  ENotYetStarted
+#define KDefaultResolution  EFaxNormal;
+#define KDefaultCompression  EModifiedHuffman;
+#define KDefaultPageNumber  1
+#define KDefaultLinesNumber  3
+#define KDefaultSpeed  9600
+
+#define ASYNC_TIMEOUT		10000
+#define ASYNC_LONGTIMEOUT	500000
+
+class TTsyTimer
+/**
+@internalTechnology
+*/
+	{
+public:
+	TTsyTimer();
+	TBool iPending;
+	TDeltaTimerEntry iEntry;
+	};
+
+class CFaxTimer;
+class CFaxSession : public CBase
+/**
+@internalTechnology
+*/
+	{
+public:
+    static CFaxSession * NewL ();
+    static CFaxSession * NewLC ();
+
+	CFaxSession();
+	void ConstructL();
+	~CFaxSession();
+
+	virtual TInt FxOpen(TFaxServerSessionSettings& aFaxSettings,RFax::TProgress* aProgress);
+	virtual TInt FxClose();
+
+// Rx Fax
+	virtual void RxConnect();
+	virtual void RxFaxData(TDes8& aData);
+	virtual void RxPostPage();
+// Tx Fax
+	virtual void TxConnect();
+	virtual void TxFaxData(const TDesC8& aData);
+	virtual void TxPostPage();
+	virtual void Cancel();
+	virtual void SetCallBack(MFaxCompletionBase* aBase);
+
+	static TInt RxConnectHandler(TAny* aPtr);
+	static TInt RxFaxDataHandler(TAny* aPtr);
+	static TInt RxPostPageHandler(TAny* aPtr);
+	static TInt TxConnectHandler(TAny* aPtr);
+	static TInt TxFaxDataHandler(TAny* aPtr);
+	static TInt TxPostPageHandler(TAny* aPtr);
+	static TInt ProgressChanger(TAny* aPtr);
+public:
+	RFax::TProgress* iTransferProgress;
+
+	// Timer
+	CFaxTimer* iFaxTimer;
+	TTsyTimer iRxConnect;
+	TTsyTimer iRxFaxData;
+	TTsyTimer iRxPostPage;
+	TTsyTimer iTxConnect;
+	TTsyTimer iTxFaxData;
+	TTsyTimer iTxPostPage;
+	TTsyTimer iProgressChanger;	
+	MFaxCompletionBase* iCompletion;
+	};
+
+class CFaxTimer: public CBase
+/**
+@internalTechnology
+*/
+	{
+public:
+	static CFaxTimer* NewL();
+	CFaxTimer();
+	void ConstructL();
+	~CFaxTimer();
+
+	void QueueTimer(TTsyTimer& aTsyTimer,
+						TTimeIntervalMicroSeconds32 aTimeInMicroSeconds,
+						TInt (*aFunction)(TAny *aPtr), TAny* aPtr);
+	TBool RemoveTimer(TTsyTimer& aHandle);
+	void ResetPending(TTsyTimer& aHandle);
+private:
+	CDeltaTimer* iTimer;
+	};
+
+#endif //__FAXSTUB_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/FONT8X16.DAT	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,224 @@
+// FONT8x16.DAT
+//
+// started by Andrew Margolis January 1997
+//
+// 8x16 256 font table for generating fax headers. 
+// The only characters included are those from 32 to 128.
+
+// Size of each font table = 96 x 16 = 1536 bytes
+
+#ifndef __FONT8X16_DAT
+#define __FONT8X16_DAT
+
+
+/***************************************************************************
+
+const TUint8 bigfont [][16] =
+  {
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 32 
+    {0x00,0x00,0x18,0x3c,0x3c,0x3c,0x18,0x18,0x18,0x00,0x18,0x18,0x00,0x00,0x00,0x00}, // '!' 
+    {0x00,0x66,0x66,0x66,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // '"' 
+    {0x00,0x00,0x00,0x6c,0x6c,0xfe,0x6c,0x6c,0x6c,0xfe,0x6c,0x6c,0x00,0x00,0x00,0x00}, // '#' 
+    {0x18,0x18,0x7c,0xc6,0xc2,0xc0,0x7c,0x06,0x06,0x86,0xc6,0x7c,0x18,0x18,0x00,0x00}, // '$' 
+    {0x00,0x00,0x00,0x00,0xc2,0xc6,0x0c,0x18,0x30,0x60,0xc6,0x86,0x00,0x00,0x00,0x00}, // '%' 
+    {0x00,0x00,0x38,0x6c,0x6c,0x38,0x76,0xdc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00}, // '&' 
+    {0x00,0x30,0x30,0x30,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // ''' 
+    {0x00,0x00,0x0c,0x18,0x30,0x30,0x30,0x30,0x30,0x30,0x18,0x0c,0x00,0x00,0x00,0x00}, // '(' 
+    {0x00,0x00,0x30,0x18,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x18,0x30,0x00,0x00,0x00,0x00}, // ')' 
+    {0x00,0x00,0x00,0x00,0x00,0x66,0x3c,0xff,0x3c,0x66,0x00,0x00,0x00,0x00,0x00,0x00}, // '*' 
+    {0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x7e,0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00}, // '+' 
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x18,0x30,0x00,0x00,0x00}, // ',' 
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // '-' 
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00}, // '.' 
+    {0x00,0x00,0x00,0x00,0x02,0x06,0x0c,0x18,0x30,0x60,0xc0,0x80,0x00,0x00,0x00,0x00}, // '/' 
+    {0x00,0x00,0x3c,0x66,0xc3,0xc3,0xdb,0xdb,0xc3,0xc3,0x66,0x3c,0x00,0x00,0x00,0x00}, // '0' 
+    {0x00,0x00,0x18,0x38,0x78,0x18,0x18,0x18,0x18,0x18,0x18,0x7e,0x00,0x00,0x00,0x00}, // '1' 
+    {0x00,0x00,0x7c,0xc6,0x06,0x0c,0x18,0x30,0x60,0xc0,0xc6,0xfe,0x00,0x00,0x00,0x00}, // '2' 
+    {0x00,0x00,0x7c,0xc6,0x06,0x06,0x3c,0x06,0x06,0x06,0xc6,0x7c,0x00,0x00,0x00,0x00}, // '3' 
+    {0x00,0x00,0x0c,0x1c,0x3c,0x6c,0xcc,0xfe,0x0c,0x0c,0x0c,0x1e,0x00,0x00,0x00,0x00}, // '4' 
+    {0x00,0x00,0xfe,0xc0,0xc0,0xc0,0xfc,0x06,0x06,0x06,0xc6,0x7c,0x00,0x00,0x00,0x00}, // '5' 
+    {0x00,0x00,0x38,0x60,0xc0,0xc0,0xfc,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00}, // '6' 
+    {0x00,0x00,0xfe,0xc6,0x06,0x06,0x0c,0x18,0x30,0x30,0x30,0x30,0x00,0x00,0x00,0x00}, // '7' 
+    {0x00,0x00,0x7c,0xc6,0xc6,0xc6,0x7c,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00}, // '8' 
+    {0x00,0x00,0x7c,0xc6,0xc6,0xc6,0x7e,0x06,0x06,0x06,0x0c,0x78,0x00,0x00,0x00,0x00}, // '9' 
+    {0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00,0x00}, // ':' 
+    {0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x30,0x00,0x00,0x00,0x00}, // ';' 
+    {0x00,0x00,0x00,0x06,0x0c,0x18,0x30,0x60,0x30,0x18,0x0c,0x06,0x00,0x00,0x00,0x00}, // '<' 
+    {0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // '=' 
+    {0x00,0x00,0x00,0x60,0x30,0x18,0x0c,0x06,0x0c,0x18,0x30,0x60,0x00,0x00,0x00,0x00}, // '>' 
+    {0x00,0x00,0x7c,0xc6,0xc6,0x0c,0x18,0x18,0x18,0x00,0x18,0x18,0x00,0x00,0x00,0x00}, // '?' 
+    {0x00,0x00,0x00,0x7c,0xc6,0xc6,0xde,0xde,0xde,0xdc,0xc0,0x7c,0x00,0x00,0x00,0x00}, // '@' 
+    {0x00,0x00,0x10,0x38,0x6c,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00}, // 'A' 
+    {0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x66,0x66,0x66,0x66,0xfc,0x00,0x00,0x00,0x00}, // 'B' 
+    {0x00,0x00,0x3c,0x66,0xc2,0xc0,0xc0,0xc0,0xc0,0xc2,0x66,0x3c,0x00,0x00,0x00,0x00}, // 'C' 
+    {0x00,0x00,0xf8,0x6c,0x66,0x66,0x66,0x66,0x66,0x66,0x6c,0xf8,0x00,0x00,0x00,0x00}, // 'D' 
+    {0x00,0x00,0xfe,0x66,0x62,0x68,0x78,0x68,0x60,0x62,0x66,0xfe,0x00,0x00,0x00,0x00}, // 'E' 
+    {0x00,0x00,0xfe,0x66,0x62,0x68,0x78,0x68,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00}, // 'F' 
+    {0x00,0x00,0x3c,0x66,0xc2,0xc0,0xc0,0xde,0xc6,0xc6,0x66,0x3a,0x00,0x00,0x00,0x00}, // 'G' 
+    {0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00}, // 'H' 
+    {0x00,0x00,0x3c,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00}, // 'I' 
+    {0x00,0x00,0x1e,0x0c,0x0c,0x0c,0x0c,0x0c,0xcc,0xcc,0xcc,0x78,0x00,0x00,0x00,0x00}, // 'J' 
+    {0x00,0x00,0xe6,0x66,0x66,0x6c,0x78,0x78,0x6c,0x66,0x66,0xe6,0x00,0x00,0x00,0x00}, // 'K' 
+    {0x00,0x00,0xf0,0x60,0x60,0x60,0x60,0x60,0x60,0x62,0x66,0xfe,0x00,0x00,0x00,0x00}, // 'L' 
+    {0x00,0x00,0xc3,0xe7,0xff,0xff,0xdb,0xc3,0xc3,0xc3,0xc3,0xc3,0x00,0x00,0x00,0x00}, // 'M' 
+    {0x00,0x00,0xc6,0xe6,0xf6,0xfe,0xde,0xce,0xc6,0xc6,0xc6,0xc6,0x00,0x00,0x00,0x00}, // 'N' 
+    {0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00}, // 'O' 
+    {0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x60,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00}, // 'P' 
+    {0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xd6,0xde,0x7c,0x0c,0x0e,0x00,0x00}, // 'Q' 
+    {0x00,0x00,0xfc,0x66,0x66,0x66,0x7c,0x6c,0x66,0x66,0x66,0xe6,0x00,0x00,0x00,0x00}, // 'R' 
+    {0x00,0x00,0x7c,0xc6,0xc6,0x60,0x38,0x0c,0x06,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00}, // 'S' 
+    {0x00,0x00,0xff,0xdb,0x99,0x18,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00}, // 'T' 
+    {0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00}, // 'U' 
+    {0x00,0x00,0xc3,0xc3,0xc3,0xc3,0xc3,0xc3,0xc3,0x66,0x3c,0x18,0x00,0x00,0x00,0x00}, // 'V' 
+    {0x00,0x00,0xc3,0xc3,0xc3,0xc3,0xc3,0xdb,0xdb,0xff,0x66,0x66,0x00,0x00,0x00,0x00}, // 'W' 
+    {0x00,0x00,0xc3,0xc3,0x66,0x3c,0x18,0x18,0x3c,0x66,0xc3,0xc3,0x00,0x00,0x00,0x00}, // 'X' 
+    {0x00,0x00,0xc3,0xc3,0xc3,0x66,0x3c,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00}, // 'Y' 
+    {0x00,0x00,0xff,0xc3,0x86,0x0c,0x18,0x30,0x60,0xc1,0xc3,0xff,0x00,0x00,0x00,0x00}, // 'Z' 
+    {0x00,0x00,0x3c,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x3c,0x00,0x00,0x00,0x00}, // '[' 
+    {0x00,0x00,0x00,0x80,0xc0,0xe0,0x70,0x38,0x1c,0x0e,0x06,0x02,0x00,0x00,0x00,0x00}, // '\' 
+    {0x00,0x00,0x3c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x0c,0x3c,0x00,0x00,0x00,0x00}, // ']' 
+    {0x10,0x38,0x6c,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // '^' 
+    {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x00,0x00}, // '_' 
+    {0x30,0x30,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // '`' 
+    {0x00,0x00,0x00,0x00,0x00,0x78,0x0c,0x0c,0x7c,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00}, // 'a' 
+    {0x00,0x00,0xe0,0x60,0x60,0x78,0x6c,0x66,0x66,0x66,0x66,0x7c,0x00,0x00,0x00,0x00}, // 'b' 
+    {0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0xc0,0xc0,0xc0,0xc6,0x7c,0x00,0x00,0x00,0x00}, // 'c' 
+    {0x00,0x00,0x1c,0x0c,0x0c,0x3c,0x6c,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00}, // 'd' 
+    {0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0xc6,0xfc,0xc0,0xc2,0x7e,0x00,0x00,0x00,0x00}, // 'e' 
+    {0x00,0x00,0x38,0x6c,0x64,0x60,0xf0,0x60,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00}, // 'f' 
+    {0x00,0x00,0x00,0x00,0x00,0x76,0xcc,0xcc,0xcc,0xcc,0xcc,0x7c,0x0c,0xcc,0x78,0x00}, // 'g' 
+    {0x00,0x00,0xe0,0x60,0x60,0x6c,0x76,0x66,0x66,0x66,0x66,0xe6,0x00,0x00,0x00,0x00}, // 'h' 
+    {0x00,0x00,0x18,0x18,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00}, // 'i' 
+    {0x00,0x00,0x06,0x06,0x00,0x0e,0x06,0x06,0x06,0x06,0x06,0x06,0x66,0x66,0x3c,0x00}, // 'j' 
+    {0x00,0x00,0xe0,0x60,0x60,0x66,0x6c,0x78,0x78,0x6c,0x66,0xe6,0x00,0x00,0x00,0x00}, // 'k' 
+    {0x00,0x00,0x38,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x3c,0x00,0x00,0x00,0x00}, // 'l' 
+    {0x00,0x00,0x00,0x00,0x00,0xe6,0xff,0xdb,0xdb,0xdb,0xdb,0xdb,0x00,0x00,0x00,0x00}, // 'm' 
+    {0x00,0x00,0x00,0x00,0x00,0xdc,0x66,0x66,0x66,0x66,0x66,0x66,0x00,0x00,0x00,0x00}, // 'n' 
+    {0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0xc6,0xc6,0xc6,0xc6,0x7c,0x00,0x00,0x00,0x00}, // 'o' 
+    {0x00,0x00,0x00,0x00,0x00,0xdc,0x66,0x66,0x66,0x66,0x66,0x7c,0x60,0x60,0xf0,0x00}, // 'p' 
+    {0x00,0x00,0x00,0x00,0x00,0x76,0xcc,0xcc,0xcc,0xcc,0xcc,0x7c,0x0c,0x0c,0x1e,0x00}, // 'q' 
+    {0x00,0x00,0x00,0x00,0x00,0xdc,0x76,0x66,0x60,0x60,0x60,0xf0,0x00,0x00,0x00,0x00}, // 'r' 
+    {0x00,0x00,0x00,0x00,0x00,0x7c,0xc6,0x60,0x38,0x0c,0xc6,0x7c,0x00,0x00,0x00,0x00}, // 's' 
+    {0x00,0x00,0x10,0x30,0x30,0xfc,0x30,0x30,0x30,0x30,0x36,0x1c,0x00,0x00,0x00,0x00}, // 't' 
+    {0x00,0x00,0x00,0x00,0x00,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x76,0x00,0x00,0x00,0x00}, // 'u' 
+    {0x00,0x00,0x00,0x00,0x00,0xc3,0xc3,0xc3,0xc3,0x66,0x3c,0x18,0x00,0x00,0x00,0x00}, // 'v' 
+    {0x00,0x00,0x00,0x00,0x00,0xc3,0xc3,0xc3,0xdb,0xdb,0xff,0x66,0x00,0x00,0x00,0x00}, // 'w' 
+    {0x00,0x00,0x00,0x00,0x00,0xc3,0x66,0x3c,0x18,0x3c,0x66,0xc3,0x00,0x00,0x00,0x00}, // 'x' 
+    {0x00,0x00,0x00,0x00,0x00,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x7e,0x06,0x0c,0xf8,0x00}, // 'y' 
+    {0x00,0x00,0x00,0x00,0x00,0xfe,0xcc,0x18,0x30,0x60,0xc6,0xfe,0x00,0x00,0x00,0x00}, // 'z' 
+    {0x00,0x00,0x0e,0x18,0x18,0x18,0x70,0x18,0x18,0x18,0x18,0x0e,0x00,0x00,0x00,0x00}, // '{' 
+    {0x00,0x00,0x18,0x18,0x18,0x18,0x00,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0x00,0x00}, // '|' 
+    {0x00,0x00,0x70,0x18,0x18,0x18,0x0e,0x18,0x18,0x18,0x18,0x70,0x00,0x00,0x00,0x00}, // '}' 
+    {0x00,0x00,0x76,0xdc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // '~' 
+    {0x00,0x00,0x00,0x00,0x10,0x38,0x6c,0xc6,0xc6,0xc6,0xfe,0x00,0x00,0x00,0x00,0x00}  // 128 
+  } ;
+
+**************************************************************************/
+
+/*************************************************************************/
+
+const TUint8 thinfont [][16] =
+  {
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // 32 
+	{0x00,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,0x10,0x10,0x00,0x00,0x00,0x00}, // '!' 
+	{0x00,0x24,0x24,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // '"' 
+	{0x00,0x42,0x42,0x42,0xFF,0x42,0x42,0x42,0xFF,0x42,0x42,0x42,0x00,0x00,0x00,0x00}, // '#' 
+	{0x00,0x10,0x7E,0x90,0x90,0x90,0x7C,0x12,0x12,0x12,0xFC,0x10,0x00,0x00,0x00,0x00}, // '$' 
+	{0x00,0x00,0x61,0x91,0x92,0x64,0x08,0x10,0x26,0x49,0x89,0x86,0x00,0x00,0x00,0x00}, // '%' 
+	{0x00,0x70,0x88,0x88,0x88,0x50,0x60,0x91,0x8A,0x84,0x4A,0x31,0x00,0x00,0x00,0x00}, // '&' 
+	{0x00,0x18,0x18,0x10,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // ''' 
+	{0x00,0x06,0x18,0x20,0x40,0x40,0x40,0x40,0x40,0x20,0x18,0x06,0x00,0x00,0x00,0x00}, // '(' 
+	{0x00,0x60,0x18,0x04,0x02,0x02,0x02,0x02,0x02,0x04,0x18,0x60,0x00,0x00,0x00,0x00}, // ')' 
+	{0x00,0x00,0x10,0x92,0x54,0x38,0xFE,0x38,0x54,0x92,0x10,0x00,0x00,0x00,0x00,0x00}, // '*' 
+	{0x00,0x00,0x00,0x10,0x10,0x10,0xFE,0x10,0x10,0x10,0x00,0x00,0x00,0x00,0x00,0x00}, // '+' 
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x10,0x20,0x00,0x00}, // ',' 
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // '-' 
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00}, // '.' 
+	{0x00,0x00,0x01,0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80,0x80,0x00,0x00,0x00,0x00}, // '/' 
+	{0x00,0x3C,0x42,0x83,0x85,0x89,0x91,0xA1,0xC1,0x81,0x42,0x3C,0x00,0x00,0x00,0x00}, // '0' 
+	{0x00,0x10,0x30,0x50,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x7C,0x00,0x00,0x00,0x00}, // '1' 
+	{0x00,0x3C,0x42,0x81,0x01,0x02,0x3C,0x40,0x80,0x80,0x80,0xFF,0x00,0x00,0x00,0x00}, // '2' 
+	{0x00,0x3C,0x42,0x81,0x01,0x02,0x3C,0x02,0x01,0x81,0x42,0x3C,0x00,0x00,0x00,0x00}, // '3' 
+	{0x00,0x02,0x06,0x0A,0x12,0x22,0x42,0x82,0xFF,0x02,0x02,0x02,0x00,0x00,0x00,0x00}, // '4' 
+	{0x00,0xFF,0x80,0x80,0x80,0xFC,0x02,0x01,0x01,0x81,0x42,0x3C,0x00,0x00,0x00,0x00}, // '5' 
+	{0x00,0x3C,0x42,0x81,0x80,0xBC,0xC2,0x81,0x81,0x81,0x42,0x3C,0x00,0x00,0x00,0x00}, // '6' 
+	{0x00,0xFF,0x81,0x01,0x02,0x04,0x08,0x10,0x10,0x10,0x10,0x10,0x00,0x00,0x00,0x00}, // '7' 
+	{0x00,0x3C,0x42,0x81,0x81,0x42,0x3C,0x42,0x81,0x81,0x42,0x3C,0x00,0x00,0x00,0x00}, // '8' 
+	{0x00,0x3C,0x42,0x81,0x81,0x43,0x3D,0x01,0x01,0x81,0x42,0x3C,0x00,0x00,0x00,0x00}, // '9' 
+	{0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x00}, // ':' 
+	{0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x18,0x18,0x10,0x20,0x00,0x00}, // ';' 
+	{0x00,0x02,0x04,0x08,0x10,0x20,0x40,0x20,0x10,0x08,0x04,0x02,0x00,0x00,0x00,0x00}, // '<' 
+	{0x00,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // '=' 
+	{0x00,0x40,0x20,0x10,0x08,0x04,0x02,0x04,0x08,0x10,0x20,0x40,0x00,0x00,0x00,0x00}, // '>' 
+	{0x00,0x38,0x44,0x82,0x82,0x04,0x08,0x10,0x10,0x00,0x10,0x10,0x00,0x00,0x00,0x00}, // '?' 
+	{0x00,0x3C,0x42,0x81,0x99,0xA5,0xA5,0xA5,0x9E,0x80,0x41,0x3E,0x00,0x00,0x00,0x00}, // '@' 
+	{0x00,0x18,0x24,0x42,0x81,0x81,0xFF,0x81,0x81,0x81,0x81,0x81,0x00,0x00,0x00,0x00}, // 'A' 
+	{0x00,0xFC,0x42,0x41,0x41,0x42,0x7C,0x42,0x41,0x41,0x42,0xFC,0x00,0x00,0x00,0x00}, // 'B' 
+	{0x00,0x3C,0x42,0x81,0x81,0x80,0x80,0x80,0x80,0x81,0x42,0x3C,0x00,0x00,0x00,0x00}, // 'C' 
+	{0x00,0xFC,0x42,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x42,0xFC,0x00,0x00,0x00,0x00}, // 'D' 
+	{0x00,0xFF,0x80,0x80,0x80,0x80,0xFC,0x80,0x80,0x80,0x80,0xFF,0x00,0x00,0x00,0x00}, // 'E' 
+	{0x00,0xFF,0x80,0x80,0x80,0x80,0xFC,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00}, // 'F' 
+	{0x00,0x3C,0x42,0x81,0x81,0x80,0x9F,0x81,0x81,0x81,0x42,0x3C,0x00,0x00,0x00,0x00}, // 'G' 
+	{0x00,0x81,0x81,0x81,0x81,0x81,0xFF,0x81,0x81,0x81,0x81,0x81,0x00,0x00,0x00,0x00}, // 'H' 
+	{0x00,0x38,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x38,0x00,0x00,0x00,0x00}, // 'I' 
+	{0x00,0x07,0x02,0x02,0x02,0x02,0x02,0x02,0x82,0x82,0x44,0x38,0x00,0x00,0x00,0x00}, // 'J' 
+	{0x00,0x81,0x82,0x84,0x88,0x90,0xE0,0x90,0x88,0x84,0x82,0x81,0x00,0x00,0x00,0x00}, // 'K' 
+	{0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0xFF,0x00,0x00,0x00,0x00}, // 'L' 
+	{0x00,0x81,0xC3,0xA5,0x99,0x99,0x81,0x81,0x81,0x81,0x81,0x81,0x00,0x00,0x00,0x00}, // 'M' 
+	{0x00,0x81,0xC1,0xA1,0x91,0x89,0x85,0x83,0x81,0x81,0x81,0x81,0x00,0x00,0x00,0x00}, // 'N' 
+	{0x00,0x3C,0x42,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x42,0x3C,0x00,0x00,0x00,0x00}, // 'O' 
+	{0x00,0xFC,0x82,0x81,0x81,0x82,0xFC,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00}, // 'P' 
+	{0x00,0x3C,0x42,0x81,0x81,0x81,0x81,0x81,0x89,0x85,0x42,0x3D,0x00,0x00,0x00,0x00}, // 'Q' 
+	{0x00,0xFC,0x82,0x81,0x81,0x82,0xFC,0x90,0x88,0x84,0x82,0x81,0x00,0x00,0x00,0x00}, // 'R' 
+	{0x00,0x3C,0x42,0x81,0x80,0x40,0x3C,0x02,0x01,0x81,0x42,0x3C,0x00,0x00,0x00,0x00}, // 'S' 
+	{0x00,0xFE,0x92,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,0x00,0x00}, // 'T' 
+	{0x00,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x42,0x3C,0x00,0x00,0x00,0x00}, // 'U' 
+	{0x00,0x81,0x81,0x81,0x81,0x81,0x42,0x42,0x24,0x24,0x18,0x18,0x00,0x00,0x00,0x00}, // 'V' 
+	{0x00,0x81,0x81,0x81,0x81,0x81,0x81,0x99,0x99,0xA5,0xA5,0x42,0x00,0x00,0x00,0x00}, // 'W' 
+	{0x00,0x81,0x81,0x81,0x42,0x24,0x18,0x24,0x42,0x81,0x81,0x81,0x00,0x00,0x00,0x00}, // 'X' 
+	{0x00,0x82,0x82,0x82,0x82,0x44,0x28,0x10,0x10,0x10,0x10,0x10,0x00,0x00,0x00,0x00}, // 'Y' 
+	{0x00,0xFF,0x01,0x01,0x02,0x04,0x18,0x20,0x40,0x80,0x80,0xFF,0x00,0x00,0x00,0x00}, // 'Z' 
+	{0x00,0x7E,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x7E,0x00,0x00,0x00,0x00}, // '[' 
+	{0x00,0x00,0x80,0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01,0x01,0x00,0x00,0x00,0x00}, // '\' 
+	{0x00,0x7E,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x7E,0x00,0x00,0x00,0x00}, // ']' 
+	{0x00,0x18,0x24,0x42,0x81,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // '^' 
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00}, // '_' 
+	{0x00,0x08,0x04,0x02,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // '`' 
+	{0x00,0x00,0x00,0x00,0x00,0x7C,0x02,0x02,0x7E,0x82,0x82,0x7D,0x00,0x00,0x00,0x00}, // 'a' 
+	{0x00,0x80,0x80,0x80,0x80,0xBC,0xC2,0x81,0x81,0x81,0xC2,0xBC,0x00,0x00,0x00,0x00}, // 'b' 
+	{0x00,0x00,0x00,0x00,0x00,0x3C,0x42,0x80,0x80,0x80,0x42,0x3C,0x00,0x00,0x00,0x00}, // 'c' 
+	{0x00,0x01,0x01,0x01,0x01,0x3D,0x43,0x81,0x81,0x81,0x43,0x3D,0x00,0x00,0x00,0x00}, // 'd' 
+	{0x00,0x00,0x00,0x00,0x00,0x3C,0x42,0x81,0xFF,0x80,0x40,0x3E,0x00,0x00,0x00,0x00}, // 'e' 
+	{0x00,0x0E,0x11,0x10,0x10,0xFE,0x10,0x10,0x10,0x10,0x10,0x10,0x00,0x00,0x00,0x00}, // 'f' 
+	{0x00,0x00,0x00,0x00,0x00,0x3D,0x43,0x81,0x81,0x43,0x3D,0x01,0x02,0x7C,0x00,0x00}, // 'g' 
+	{0x00,0x80,0x80,0x80,0x80,0xBC,0xC2,0x81,0x81,0x81,0x81,0x81,0x00,0x00,0x00,0x00}, // 'h' 
+	{0x00,0x00,0x08,0x08,0x00,0x38,0x08,0x08,0x08,0x08,0x08,0x3E,0x00,0x00,0x00,0x00}, // 'i' 
+	{0x00,0x00,0x02,0x02,0x00,0x06,0x02,0x02,0x02,0x02,0x02,0x82,0x44,0x38,0x00,0x00}, // 'j' 
+	{0x00,0x80,0x80,0x80,0x80,0x82,0x84,0x88,0x90,0xA8,0xC4,0x82,0x00,0x00,0x00,0x00}, // 'k' 
+	{0x38,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x3E,0x00,0x00,0x00,0x00}, // 'l' 
+	{0x00,0x00,0x00,0x00,0x00,0xEC,0x92,0x92,0x92,0x92,0x92,0x92,0x00,0x00,0x00,0x00}, // 'm' 
+	{0x00,0x00,0x00,0x00,0x00,0xB8,0xC4,0x82,0x82,0x82,0x82,0x82,0x00,0x00,0x00,0x00}, // 'n' 
+	{0x00,0x00,0x00,0x00,0x00,0x3C,0x42,0x81,0x81,0x81,0x42,0x3C,0x00,0x00,0x00,0x00}, // 'o' 
+	{0x00,0x00,0x00,0x00,0x00,0xBC,0xC2,0x81,0x81,0x81,0xC2,0xBC,0x80,0x80,0x00,0x00}, // 'p' 
+	{0x00,0x00,0x00,0x00,0x00,0x3D,0x43,0x81,0x81,0x81,0x43,0x3D,0x01,0x01,0x00,0x00}, // 'q' 
+	{0x00,0x00,0x00,0x00,0x00,0xBE,0xC1,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00}, // 'r' 
+	{0x00,0x00,0x00,0x00,0x00,0x7E,0x81,0x80,0x7E,0x01,0x81,0x7E,0x00,0x00,0x00,0x00}, // 's' 
+	{0x10,0x10,0x10,0x10,0x10,0xFE,0x10,0x10,0x10,0x10,0x11,0x0E,0x00,0x00,0x00,0x00}, // 't' 
+	{0x00,0x00,0x00,0x00,0x00,0x81,0x81,0x81,0x81,0x81,0x43,0x3D,0x00,0x00,0x00,0x00}, // 'u' 
+	{0x00,0x00,0x00,0x00,0x00,0x81,0x81,0x81,0x81,0x42,0x24,0x18,0x00,0x00,0x00,0x00}, // 'v' 
+	{0x00,0x00,0x00,0x00,0x00,0x82,0x82,0x92,0x92,0x92,0xAA,0x44,0x00,0x00,0x00,0x00}, // 'w' 
+	{0x00,0x00,0x00,0x00,0x00,0x81,0x42,0x24,0x18,0x24,0x42,0x81,0x00,0x00,0x00,0x00}, // 'x' 
+	{0x00,0x00,0x00,0x00,0x00,0x81,0x81,0x81,0x81,0x43,0x3D,0x01,0x02,0x7C,0x00,0x00}, // 'y' 
+	{0x00,0x00,0x00,0x00,0x00,0xFF,0x02,0x04,0x18,0x20,0x40,0xFF,0x00,0x00,0x00,0x00}, // 'z' 
+	{0x00,0x04,0x08,0x10,0x10,0x10,0x20,0x10,0x10,0x10,0x08,0x04,0x00,0x00,0x00,0x00}, // '{' 
+	{0x00,0x10,0x10,0x10,0x10,0x00,0x00,0x10,0x10,0x10,0x10,0x00,0x00,0x00,0x00,0x00}, // '|' 
+	{0x00,0x40,0x20,0x10,0x10,0x10,0x08,0x10,0x10,0x10,0x20,0x40,0x00,0x00,0x00,0x00}, // '}' 
+	{0x00,0x00,0x70,0x99,0x0E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, // '~' 
+	{0x00,0x00,0x00,0x00,0x08,0x1C,0x36,0x63,0x63,0x7F,0x00,0x00,0x00,0x00,0x00,0x00}  // 128 
+  } ;
+
+#endif
+
+/*************************************************************************/
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/FRAMES.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,136 @@
+// 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:
+// The bytes are all inverted as the T.30 spec indicates that all frame 
+// data should be transmitted from MSB -> LSB ( i.e. left to right just 
+// as printed).   However, asynchronous data is always send LSB -> MSB  
+// which would be the wrong way round.   Note that in the faxparms.bit  
+// structure the fields are declared in MSB -> LSB order, which is OK.  
+// ID strings are an exception : they are always transmitted completely 
+// backwards (LSB of last byte -> MSB of first byte.        
+// Where the MSB is listed as an x this should be set to 1 if we    
+// received KT30_DIS or left at to 0 if we received a response to our KT30_DIS
+// We have a mask on incoming data to knock this bit off
+// 
+//
+
+/**
+ @file
+ @internalComponent 
+*/
+
+#ifndef __FRAMES_H
+#define __FRAMES_H
+/**
+@internalComponent
+*/
+const TUint8 KT30_DISMASK (0xfe);
+
+const TUint8 KT30_TCF     (0x00);
+const TUint8 KT30_FILL    (0x00);
+
+const TUint8 KT30_T1        (35);  // this is the T1 35 second timeout
+const TUint8 KT30_T2         (6);  // this is the T2 6 second timeout
+const TUint8 KT30_T4         (3);  // this is the T4 3 second timeout (5.2E/T.30)
+
+const TUint8 KT30_ADDR    (0xff);  // HDLC address is palindromic 
+const TUint8 KT30_CTLNXT  (0x03);  // intermediate frame control field 11000000 
+const TUint8 KT30_CTLLST  (0x13);  // final control field 11001000 
+
+const TUint8 KT30_DIS     (0x80);  // answering capability follows 00000001 
+const TUint8 KT30_CSI     (0x40);  // answering station identity follows 00000010 
+const TUint8 KT30_NSF     (0x20);  // answering nonstandard facilities 00000100 
+
+const TUint8 KT30_DTC     (0x81);  // polling capability follows 10000001 
+const TUint8 KT30_CIG     (0x41);  // polling station identity follows 10000010 
+const TUint8 KT30_NSC     (0x21);  // polling nonstandard facilities 10000100 
+
+const TUint8 KT30_DCS     (0x82);  // transmitter capability follows x1000001 
+const TUint8 KT30_TSI     (0x42);  // transmitter station identity follows x1000010 
+const TUint8 KT30_NSS     (0x22);  // transmitter nonstandard facilities x1000100 
+
+const TUint8 KT30_CFR     (0x84);  // confirmation to received x0100001 
+const TUint8 KT30_FTT     (0x44);  // failure to train x0100010 
+
+const TUint8 KT30_EOM     (0x8e);  // end of document x1110001 
+const TUint8 KT30_MPS     (0x4e);  // end of page x1110010 
+const TUint8 KT30_EOP     (0x2e);  // end of transmission x1110100 
+const TUint8 KT30_PRIEOM  (0x9e);  // end of document - operator pls x1111001 
+const TUint8 KT30_PRIMPS  (0x5e);  // end of page - operator pls x1111010 
+const TUint8 KT30_PRIEOP  (0x3e);  // end of transmission - operator pls x1111100 
+
+const TUint8 KT30_MCF     (0x8c);  // message confirmation x0110001 
+const TUint8 KT30_RTP     (0xcc);  // message confirmation with retrain x0110011 
+const TUint8 KT30_PIP     (0xac);  // message confirmation - operator pls x0110101 
+const TUint8 KT30_RTN     (0x4c);  // message not received with retrain x0110010 
+const TUint8 KT30_PIN     (0x2c);  // message not received - operator pls x0110100 
+
+const TUint8 KT30_DCN     (0xfa);  // disconnect x1011111 
+const TUint8 KT30_CRP     (0x1a);  // command repeat x1011000 
+/**
+@internalComponent
+*/
+union faxparms
+   {
+   TUint8 byte[5] ;
+   struct
+      {
+      unsigned b01: 1 ; // transmitter T2 
+      unsigned b02: 1 ; // receiver T2 
+      unsigned b03: 1 ; // T2 IOC 
+      unsigned b04: 1 ; // transmitter T3 
+      unsigned b05: 1 ; // receiver T3 
+      unsigned b06: 1 ; // reserved 
+      unsigned b07: 1 ; // reserved 
+      unsigned b08: 1 ; // reserved 
+
+      unsigned b09: 1 ; // transmitter T4 
+      unsigned b10: 1 ; // receiver T4 
+      unsigned b11: 1 ; // data signalling rate b 1 
+      unsigned b12: 1 ; // data signalling rate b 2 
+      unsigned b13: 1 ; // data signalling rate b 3 
+      unsigned b14: 1 ; // data signalling rate b 4 
+      unsigned b15: 1 ; // fine vertical resolution 
+      unsigned b16: 1 ; // two dimensional coding 
+
+      unsigned b17: 1 ; // fax width b 1 
+      unsigned b18: 1 ; // fax width b 2 
+      unsigned b19: 1 ; // fax length b 1 
+      unsigned b20: 1 ; // fax length b 2 
+      unsigned b21: 1 ; // minimum scan line line b 1 
+      unsigned b22: 1 ; // minimum scan line line b 2 
+      unsigned b23: 1 ; // minimum scan line line b 3 
+      unsigned b24: 1 ; // extend field 
+
+      unsigned b25: 1 ; // 2400 bps handshake 
+      unsigned b26: 1 ; // uncompressed mode 
+      unsigned b27: 1 ; // error correction 
+      unsigned b28: 1 ; // frame size 64 octets 
+      unsigned b29: 1 ; // error limiting mode 
+      unsigned b30: 1 ; // G4 
+      unsigned b31: 1 ; // T6 coding 
+      unsigned b32: 1 ; // extend field 
+
+      unsigned b33: 1 ; // validity of width bs 17,18 
+      unsigned b34: 1 ; // width 1216 pels/151mm 
+      unsigned b35: 1 ; // width 864 pels/107mm 
+      unsigned b36: 1 ; // width 1728 pels/151mm 
+      unsigned b37: 1 ; // width 1728 pels/107mm 
+      unsigned b38: 1 ; // reserved 
+      unsigned b39: 1 ; // reserved 
+      unsigned b40: 1 ; // extend 
+      } bit ;
+   } ;
+
+#endif
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/FAXSVR/ZEROS.DAT	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,279 @@
+// ZEROS.DAT
+//
+// started by Andrew Margolis January 1997
+//
+
+// table for finding embedded t4 eols in data streams
+// leading zeros first, trailing zeros second
+
+// so, for any character c
+// leading0s  = zerotable[c][0];
+// trailing0s = zerotable[c][1];
+
+
+#ifndef __ZEROS_DAT
+#define __ZEROS_DAT
+
+const TUint8 zerotable [][2] =
+   {
+      {8,8}, // 0x0
+      {7,0}, // 0x1
+      {6,1}, // 0x2
+      {6,0}, // 0x3
+      {5,2}, // 0x4
+      {5,0}, // 0x5
+      {5,1}, // 0x6
+      {5,0}, // 0x7
+      {4,3}, // 0x8
+      {4,0}, // 0x9
+      {4,1}, // 0xa
+      {4,0}, // 0xb
+      {4,2}, // 0xc
+      {4,0}, // 0xd
+      {4,1}, // 0xe
+      {4,0}, // 0xf
+      {3,4}, // 0x10
+      {3,0}, // 0x11
+      {3,1}, // 0x12
+      {3,0}, // 0x13
+      {3,2}, // 0x14
+      {3,0}, // 0x15
+      {3,1}, // 0x16
+      {3,0}, // 0x17
+      {3,3}, // 0x18
+      {3,0}, // 0x19
+      {3,1}, // 0x1a
+      {3,0}, // 0x1b
+      {3,2}, // 0x1c
+      {3,0}, // 0x1d
+      {3,1}, // 0x1e
+      {3,0}, // 0x1f
+      {2,5}, // 0x20
+      {2,0}, // 0x21
+      {2,1}, // 0x22
+      {2,0}, // 0x23
+      {2,2}, // 0x24
+      {2,0}, // 0x25
+      {2,1}, // 0x26
+      {2,0}, // 0x27
+      {2,3}, // 0x28
+      {2,0}, // 0x29
+      {2,1}, // 0x2a
+      {2,0}, // 0x2b
+      {2,2}, // 0x2c
+      {2,0}, // 0x2d
+      {2,1}, // 0x2e
+      {2,0}, // 0x2f
+      {2,4}, // 0x30
+      {2,0}, // 0x31
+      {2,1}, // 0x32
+      {2,0}, // 0x33
+      {2,2}, // 0x34
+      {2,0}, // 0x35
+      {2,1}, // 0x36
+      {2,0}, // 0x37
+      {2,3}, // 0x38
+      {2,0}, // 0x39
+      {2,1}, // 0x3a
+      {2,0}, // 0x3b
+      {2,2}, // 0x3c
+      {2,0}, // 0x3d
+      {2,1}, // 0x3e
+      {2,0}, // 0x3f
+      {1,6}, // 0x40
+      {1,0}, // 0x41
+      {1,1}, // 0x42
+      {1,0}, // 0x43
+      {1,2}, // 0x44
+      {1,0}, // 0x45
+      {1,1}, // 0x46
+      {1,0}, // 0x47
+      {1,3}, // 0x48
+      {1,0}, // 0x49
+      {1,1}, // 0x4a
+      {1,0}, // 0x4b
+      {1,2}, // 0x4c
+      {1,0}, // 0x4d
+      {1,1}, // 0x4e
+      {1,0}, // 0x4f
+      {1,4}, // 0x50
+      {1,0}, // 0x51
+      {1,1}, // 0x52
+      {1,0}, // 0x53
+      {1,2}, // 0x54
+      {1,0}, // 0x55
+      {1,1}, // 0x56
+      {1,0}, // 0x57
+      {1,3}, // 0x58
+      {1,0}, // 0x59
+      {1,1}, // 0x5a
+      {1,0}, // 0x5b
+      {1,2}, // 0x5c
+      {1,0}, // 0x5d
+      {1,1}, // 0x5e
+      {1,0}, // 0x5f
+      {1,5}, // 0x60
+      {1,0}, // 0x61
+      {1,1}, // 0x62
+      {1,0}, // 0x63
+      {1,2}, // 0x64
+      {1,0}, // 0x65
+      {1,1}, // 0x66
+      {1,0}, // 0x67
+      {1,3}, // 0x68
+      {1,0}, // 0x69
+      {1,1}, // 0x6a
+      {1,0}, // 0x6b
+      {1,2}, // 0x6c
+      {1,0}, // 0x6d
+      {1,1}, // 0x6e
+      {1,0}, // 0x6f
+      {1,4}, // 0x70
+      {1,0}, // 0x71
+      {1,1}, // 0x72
+      {1,0}, // 0x73
+      {1,2}, // 0x74
+      {1,0}, // 0x75
+      {1,1}, // 0x76
+      {1,0}, // 0x77
+      {1,3}, // 0x78
+      {1,0}, // 0x79
+      {1,1}, // 0x7a
+      {1,0}, // 0x7b
+      {1,2}, // 0x7c
+      {1,0}, // 0x7d
+      {1,1}, // 0x7e
+      {1,0}, // 0x7f
+      {0,7}, // 0x80
+      {0,0}, // 0x81
+      {0,1}, // 0x82
+      {0,0}, // 0x83
+      {0,2}, // 0x84
+      {0,0}, // 0x85
+      {0,1}, // 0x86
+      {0,0}, // 0x87
+      {0,3}, // 0x88
+      {0,0}, // 0x89
+      {0,1}, // 0x8a
+      {0,0}, // 0x8b
+      {0,2}, // 0x8c
+      {0,0}, // 0x8d
+      {0,1}, // 0x8e
+      {0,0}, // 0x8f
+      {0,4}, // 0x90
+      {0,0}, // 0x91
+      {0,1}, // 0x92
+      {0,0}, // 0x93
+      {0,2}, // 0x94
+      {0,0}, // 0x95
+      {0,1}, // 0x96
+      {0,0}, // 0x97
+      {0,3}, // 0x98
+      {0,0}, // 0x99
+      {0,1}, // 0x9a
+      {0,0}, // 0x9b
+      {0,2}, // 0x9c
+      {0,0}, // 0x9d
+      {0,1}, // 0x9e
+      {0,0}, // 0x9f
+      {0,5}, // 0xa0
+      {0,0}, // 0xa1
+      {0,1}, // 0xa2
+      {0,0}, // 0xa3
+      {0,2}, // 0xa4
+      {0,0}, // 0xa5
+      {0,1}, // 0xa6
+      {0,0}, // 0xa7
+      {0,3}, // 0xa8
+      {0,0}, // 0xa9
+      {0,1}, // 0xaa
+      {0,0}, // 0xab
+      {0,2}, // 0xac
+      {0,0}, // 0xad
+      {0,1}, // 0xae
+      {0,0}, // 0xaf
+      {0,4}, // 0xb0
+      {0,0}, // 0xb1
+      {0,1}, // 0xb2
+      {0,0}, // 0xb3
+      {0,2}, // 0xb4
+      {0,0}, // 0xb5
+      {0,1}, // 0xb6
+      {0,0}, // 0xb7
+      {0,3}, // 0xb8
+      {0,0}, // 0xb9
+      {0,1}, // 0xba
+      {0,0}, // 0xbb
+      {0,2}, // 0xbc
+      {0,0}, // 0xbd
+      {0,1}, // 0xbe
+      {0,0}, // 0xbf
+      {0,6}, // 0xc0
+      {0,0}, // 0xc1
+      {0,1}, // 0xc2
+      {0,0}, // 0xc3
+      {0,2}, // 0xc4
+      {0,0}, // 0xc5
+      {0,1}, // 0xc6
+      {0,0}, // 0xc7
+      {0,3}, // 0xc8
+      {0,0}, // 0xc9
+      {0,1}, // 0xca
+      {0,0}, // 0xcb
+      {0,2}, // 0xcc
+      {0,0}, // 0xcd
+      {0,1}, // 0xce
+      {0,0}, // 0xcf
+      {0,4}, // 0xd0
+      {0,0}, // 0xd1
+      {0,1}, // 0xd2
+      {0,0}, // 0xd3
+      {0,2}, // 0xd4
+      {0,0}, // 0xd5
+      {0,1}, // 0xd6
+      {0,0}, // 0xd7
+      {0,3}, // 0xd8
+      {0,0}, // 0xd9
+      {0,1}, // 0xda
+      {0,0}, // 0xdb
+      {0,2}, // 0xdc
+      {0,0}, // 0xdd
+      {0,1}, // 0xde
+      {0,0}, // 0xdf
+      {0,5}, // 0xe0
+      {0,0}, // 0xe1
+      {0,1}, // 0xe2
+      {0,0}, // 0xe3
+      {0,2}, // 0xe4
+      {0,0}, // 0xe5
+      {0,1}, // 0xe6
+      {0,0}, // 0xe7
+      {0,3}, // 0xe8
+      {0,0}, // 0xe9
+      {0,1}, // 0xea
+      {0,0}, // 0xeb
+      {0,2}, // 0xec
+      {0,0}, // 0xed
+      {0,1}, // 0xee
+      {0,0}, // 0xef
+      {0,4}, // 0xf0
+      {0,0}, // 0xf1
+      {0,1}, // 0xf2
+      {0,0}, // 0xf3
+      {0,2}, // 0xf4
+      {0,0}, // 0xf5
+      {0,1}, // 0xf6
+      {0,0}, // 0xf7
+      {0,3}, // 0xf8
+      {0,0}, // 0xf9
+      {0,1}, // 0xfa
+      {0,0}, // 0xfb
+      {0,2}, // 0xfc
+      {0,0}, // 0xfd
+      {0,1}, // 0xfe
+      {0,0}  // 0xff
+   } ;
+
+#endif
+
+/*************************************************************************/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Group/FAXCLI.MMP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,42 @@
+// 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:
+// faxcli.dll Fax client API 
+// 
+//
+
+/**
+ @file
+*/
+
+target          faxcli.dll
+CAPABILITY      All -Tcb
+targettype      dll
+UID             0x1000008d 0x10003D47
+VENDORID        0x70000001
+SOURCEPATH      ../FAXCLI
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+userinclude     ../Inc
+userinclude     ../FAXCLI
+
+source          FAXCLI.CPP CFAXTSRC.CPP CFAXSET.CPP
+library         faxstrm.lib  euser.lib estor.lib etel.lib c32.lib efsrv.lib 
+library         commsdat.lib
+library faxio.lib
+DEBUGLIBRARY    comsdbgutil.lib
+
+start           wins
+baseaddress     0x44a00000
+end
+
+UNPAGED

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Group/FAXIO.MMP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,43 @@
+// Copyright (c) 2004-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:
+// faxio.dll Fax encoding/decoding
+// 
+//
+
+/**
+ @file
+*/
+
+TARGET        faxio.dll
+CAPABILITY All -Tcb
+TARGETTYPE    DLL
+
+UID    0x1000008d 0x10004F87
+VENDORID 0x70000001
+
+
+SOURCEPATH		../faxio
+SOURCE        FAXIO.CPP FAXHEAD.CPP
+
+USERINCLUDE   	../faxio
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY       euser.lib efsrv.lib
+
+START WINS
+BASEADDRESS   0x41e00000
+END
+
+UNPAGED
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Group/FAXSTB.MMP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,30 @@
+// 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:
+//
+
+TARGET        	faxstb.dll
+CAPABILITY      CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData 
+TARGETTYPE	DLL
+UID      	0x10004C89 0x10004C8A
+SOURCEPATH	../FAXSVR
+SOURCE	      	FAXSTUB.CPP
+
+USERINCLUDE   	../Inc
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY       	euser.lib
+DEBUGLIBRARY    comsdbgutil.lib
+
+UNPAGED
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Group/FAXSVR.MMP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,44 @@
+// 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:
+// faxsvr.dll Fax server 
+// 
+//
+
+/**
+ @file
+*/
+
+TARGET          faxsvr.dll
+CAPABILITY      CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData 
+TARGETTYPE      dll
+UID             0x10004C89 0x10004C8A
+VENDORID        0x70000001
+SOURCEPATH      ../FAXSVR
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+USERINCLUDE     ../FAXSVR
+USERINCLUDE     ../Inc
+USERINCLUDE     ../../../telephonyserver/etelserverandcore/INC
+
+SOURCE          FAXSERV.CPP CFAXMDRV.CPP CFAXMODM.CPP
+SOURCE          CFAX1.CPP CFAX2.CPP CFAX20.CPP
+
+LIBRARY         euser.lib c32.lib efsrv.lib faxio.lib 
+LIBRARY etel.lib
+DEBUGLIBRARY    comsdbgutil.lib
+
+START           wins
+BASEADDRESS     0x44a00000
+END
+
+UNPAGED

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Group/Fax.iby	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,37 @@
+/*
+* 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:
+*
+*/
+
+#ifndef __FAX_ENGINE_IBY__
+#define __FAX_ENGINE_IBY__
+
+REM Fax Engine
+
+#ifdef SYMBIAN_EXCLUDE_FAX 
+REM The Following features are not included in this ROM:
+REM faxio.dll
+REM faxstrm.dll
+REM faxsvr.DLL
+REM faxcli.DLL
+#else
+file=ABI_DIR\BUILD_DIR\faxio.dll	SYSTEM_BINDIR\Faxio.dll 
+file=ABI_DIR\BUILD_DIR\faxstrm.dll	SYSTEM_BINDIR\Faxstrm.dll 
+file=ABI_DIR\BUILD_DIR\faxsvr.DLL	SYSTEM_BINDIR\FaxSvr.dll
+file=ABI_DIR\BUILD_DIR\faxcli.DLL	SYSTEM_BINDIR\FaxCli.dll
+#endif
+
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Group/FaxIO.iby	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,28 @@
+/*
+* 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:
+*
+*/
+
+
+//-- This is for backward compatibility with messaging's gtfaxmtm.iby only.
+//-- This file is supposed to be removed soon. And gtfaxmtm.iby will include <Fax.iby>
+//-- instead of this file.
+
+#ifndef __FAXIO_IBY__
+#define __FAXIO_IBY__
+
+#include <Fax.iby>
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,97 @@
+// Copyright (c) 1999-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:
+// Toplevel build information for FAX engine
+// Fax Engine 
+// 
+//
+
+/**
+ @file
+*/
+
+PRJ_EXPORTS
+
+//###### FaxIO 
+
+../faxio/CFAXIO.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cfaxio.h)		
+../faxio/FAXHUFF.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(faxhuff.h)		
+
+
+//###### FaxStrm 
+
+../faxstrm/FAXSTORE.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(faxstore.h)
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../faxstrm/faxpageinfo.h  /epoc32/include/faxpageinfo.h
+#endif
+
+//###### FaxSvr 
+../FAXSVR/FAXSERV.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(faxserv.h)
+
+//###### Common fax headers
+
+../Inc/CFAX32.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cfax32.h)
+../Inc/CFAX32.INL SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cfax32.inl)
+../Inc/FAXSET.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(faxset.h)
+../Inc/FAXTSRC.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(faxtsrc.h)
+../Inc/FAXSTD.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(faxstd.h)
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../Inc/faxsettings.h /epoc32/include/faxsettings.h
+#endif
+
+../Inc/faxerr.ra		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(errors/generic/faxerr.ra)
+../Inc/faxerr.rls		SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(errors/generic/faxerr.rls)
+
+//###### *.iby files 
+
+../Group/Fax.iby		/epoc32/rom/include/fax.iby
+
+
+PRJ_TESTEXPORTS
+
+../Test/TE_FAX/TE_Fax.iby           		/epoc32/rom/include/te_fax.iby
+../Test/TE_FAX/TE_Fax_9210_comm0.cfg		z:/testdata/configs/te_fax_9210_comm0.cfg
+../Test/TE_FAX/TE_Fax_9210_comm1.cfg		z:/testdata/configs/te_fax_9210_comm1.cfg
+../Test/TE_FAX/TE_Fax_9210_IR.cfg		z:/testdata/configs/te_fax_9210_ir.cfg
+../Test/TE_FAX/TE_Fax.ini			z:/testdata/configs/te_fax.ini
+../Test/TE_FAX/TE_Fax_Setup_Comm0.script  	z:/testdata/scripts/te_fax_setup_comm0.script
+../Test/TE_FAX/TE_Fax_Setup_Comm1.script  	z:/testdata/scripts/te_fax_setup_comm1.script
+../Test/TE_FAX/TE_Fax_Setup_IR.script           z:/testdata/scripts/te_fax_setup_ir.script
+../Test/TE_FAX/TE_Fax_Transmit_Comm0.script     z:/testdata/scripts/te_fax_transmit_comm0.script
+../Test/TE_FAX/TE_Fax_Transmit_Comm1.script     z:/testdata/scripts/te_fax_transmit_comm1.script
+../Test/TE_FAX/TE_Fax_Transmit_IR.script        z:/testdata/scripts/te_fax_transmit_ir.script
+../Test/TE_FAX/TE_Fax_Receive_Comm0.script      z:/testdata/scripts/te_fax_receive_comm0.script
+../Test/TE_FAX/TE_Fax_Receive_Comm1.script      z:/testdata/scripts/te_fax_receive_comm1.script
+../Test/TE_FAX/TE_Fax_Receive_IR.script         z:/testdata/scripts/te_fax_receive_ir.script
+../Test/TE_FAX/TE_Fax_No_Phone.script           z:/testdata/scripts/te_fax_no_phone.script
+../Test/TE_FAX/TE_Fax_Test.FAX			z:/testdata/data/te_fax_test.fax
+../Test/TE_FAX/TE_Fax_One.FAX			z:/testdata/data/te_fax_one.fax
+../Test/TE_FAX/TE_Fax_Two.FAX			z:/testdata/data/te_fax_two.fax
+../Test/TE_FAX/TE_Fax_Six.FAX			z:/testdata/data/te_fax_six.fax
+../Test/TE_FAX/TE_Fax_Blank.FAX			z:/testdata/data/te_fax_blank.fax
+../Test/TE_FAX/TE_Fax_BadPage.FAX		z:/testdata/data/te_fax_badpage.fax
+../Test/TE_FAX/TE_Fax_Chart4.FAX		z:/testdata/data/te_fax_chart4.fax
+
+PRJ_MMPFILES
+
+FAXIO.MMP	//-- Fax IO     [FaxIO.dll	]
+faxstrm.mmp //-- Fax Streams[FaxStrm.dll]
+FAXCLI.MMP	//-- Fax Client [faxcli.dll	]
+FAXSVR.MMP  //-- Fax Server [faxsvr.dll	]
+
+
+PRJ_TESTMMPFILES
+
+FAXSTB.MMP						support
+../Test/TE_FAX/TE_Fax.mmp
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Group/faxstrm.iby	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,27 @@
+/*
+* 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:
+*
+*/
+
+//-- This is for backward compatibility with messaging's gtfaxmtm.iby only.
+//-- This file is supposed to be removed soon. And gtfaxmtm.iby will include <Fax.iby>
+//-- instead of this file
+
+#ifndef __FAXSTRM_IBY__
+#define __FAXSTRM_IBY__
+
+#include <Fax.iby>
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Group/faxstrm.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,41 @@
+// Copyright (c) 2004-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:
+// faxstrm.dll Fax streaming and storage
+// 
+//
+
+/**
+ @file
+*/
+
+TARGET        faxstrm.dll
+CAPABILITY All -Tcb
+TARGETTYPE    DLL
+UID    0x1000008d 0x1000180a
+VENDORID 0x70000001
+
+SOURCEPATH		../faxstrm
+SOURCE        	FAXSTRM.CPP
+
+USERINCLUDE   	../faxstrm
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+library       	euser.lib efsrv.lib estor.lib faxio.lib
+
+START WINS
+	BASEADDRESS   0x7D460000
+END
+
+UNPAGED
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Group/telephony_fax.history.xml	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<relnotes name="Fax Client and Server">
+  <purpose>
+    Fax server side APIs and protocol stack, loaded (with Fax Client, its driver) by ETel Telephony Server, run as a thread within the Comms process. Drives the Fax Server, managing fax transmission and reception requests from potential application clients. Loaded (with Fax Server) by Etel.
+  </purpose>
+</relnotes>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Group/telephony_fax.mrp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,10 @@
+component	telephony_fax
+source	\sf\os\cellularsrv\fax\faxclientandserver
+binary	\sf\os\cellularsrv\fax\faxclientandserver\Group	all
+exports	\sf\os\cellularsrv\fax\faxclientandserver\Group
+notes_source	\component_defs\release.src
+
+
+ipr E 
+ipr T \sf\os\cellularsrv\fax\faxclientandserver\Test
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Inc/CFAX32.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,172 @@
+// 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:
+// Contents :  fax s/r header file
+// 
+//
+
+/**
+ @file
+*/
+
+#ifndef __cfax32_h
+#define __cfax32_h
+
+/********************************************************************/
+
+/********************************************************************/
+
+// These are the other include files used when sending and receiving
+// faxes.  The order of inclusion should not be changed.  Unfortunately,
+// the design of the engine means that there's a very close coupling
+// between the various classes involved, and while each class doesn't
+// need to know how the other work, they all need to know what the others
+// have to offer.  The fax settings need to be accessible from modem for
+// autodetection to work, and since the modem handles the session log
+// and progress reporting, the the cfaxtransfersource and
+// cfaxmodemdriver classes need to be able know about that.  The inline
+// functions at the end of this faxtrans.h file clearly won't compile if
+// they don't know about cfaxtransfersource either. Ah well. So much for
+// neat modular encapsulation.
+
+
+#include <f32file.h>
+
+#include <c32comm.h>
+#include <s32file.h>
+#include <s32mem.h>
+
+#include <cdblen.h> 
+#include <faxstore.h>
+#include <faxdefn.h>
+
+ #include <dial_consts.h>
+
+#include <etel.h>
+#include <faxtsrc.h>
+#include <faxset.h>
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <faxsettings.h>
+#endif
+#include <faxstd.h>
+
+/********************************************************************/
+
+// now the CFaxTransfer class
+
+
+//***************************** comment for 2D faxing****************************
+// The TFaxCompression parameter required by the AddSourceL() function is an enum type defined as 
+// enum TFaxCompression
+//		{
+//		Prefer1D,Prefer2D
+//		}
+// this enum is defined in faxtsrc.h
+
+/**
+@publishedPartner
+*/
+enum TFaxClientProgress
+	{
+	EProgressConverting,	// Fax Progress Information not yet available
+	EProgressRxTx			// Refer to Fax Progress Chunck for more detailed information
+	};
+
+/**
+Send or receive a fax
+
+Contains the public Fax Client API.
+
+The API includes a number of functions for setting up a fax, and then for 
+sending it. Functions to set up a fax allow the client to launch a fax client 
+session, set the fax mode, set the fax destination number, define the fax 
+pages to be sent, and declare a file in which received faxes are to be stored. 
+After setting up, the client can send, cancel and monitor the progress of 
+the fax. 
+
+This class is not intended for user derivation. 
+
+@publishedPartner
+@released
+*/
+class CFaxTransfer : public CBase
+	{
+public:
+	~CFaxTransfer ();							//< destructor
+	IMPORT_C static CFaxTransfer * NewL (const TFaxSettings &);
+	IMPORT_C static CFaxTransfer * NewLC (const TFaxSettings &);
+
+	IMPORT_C TInt Start (TRequestStatus &);		// starts the Fax Client thread		
+	IMPORT_C TInt Progress ();					// Gets the progress of the fax session (updates the global progress chunk
+	IMPORT_C void SetPhoneNumberL (TDesC8 &);	// sets the phone number to dial to
+	IMPORT_C void Cancel ();					// cancels the fax session
+	IMPORT_C void Stop ();						// calls Close() to the thread handle
+
+	IMPORT_C void AddSourceL (const TFileName &,TFaxPreferredCompression=Prefer1D);			// TFaxPreferredCompression can be 
+	IMPORT_C void AddSourceL (const TFileName &, TInt, TFaxPreferredCompression=Prefer1D);   // one of Prefer1D or Prefer2D
+	IMPORT_C void AddSourceL (const TFileName &, TInt, TInt, TFaxPreferredCompression=Prefer1D);	// use this function to 
+																			// indicate the fax document for sending
+	IMPORT_C void RemoveAllSources ();						// Remove all fax pages from the sent list
+	inline void SetReceiveFileName (const TFileName &);		// Set the name of the filename for fax reception
+	inline void SetMode (TFaxMode);
+	inline void SetPhoneNumber (TDesC8 &);
+	inline void SetCallObjectName(TDesC& aName);
+	TInt GetPhoneInfoForTsy(const TDes& aTsyName, RTelServer::TPhoneInfo& aPhoneInfo) const;
+	void GetPhoneModuleNameL(TDes& aModuleName) const;
+	void FaxReceiveL ();		
+	void FaxTransmitL ();
+
+	TFaxClientProgress iFaxClientProgress;
+	RTelServer iTelServer;
+	RLine iLine ;
+	RCall iCall ;
+	RPhone iPhone ;
+	RFax iFax ;
+	TBool iFaxStarted;
+	CFaxTransferSource * iSource;
+	TFaxMode iMode;
+
+	/** The fax progress. 
+	There are a number of data members with public access, 
+	however only the progress information variable is part 
+	of the public API.
+	*/
+	RFax::TProgress iProgress ;
+	RCall::TFaxSessionSettings iFaxSessionSettings;
+	TName iCallName;		
+
+protected:
+	RThread iDriverThread;						// fax client thread handle
+//	RThread iConverterThread;
+	CFaxTransfer();								// CFaxTransfer Constructor
+	TBool iConverting;							// flag used when preparing the 2D version of the fax document
+	TRequestStatus iTransferStatus ;			// status of the fax data transfer
+	TRequestStatus iClientCancel;				// status of the cancel request
+	TBuf8 < KMaxFaxBuf > iDataBuf;				// buffer to store 
+	TFaxSettings iFaxSettings;
+	TFileName iReceiveFileName ;				// only used when receiving
+	TBuf<KMaxDialString> iPhoneNumber ; 		// only used when dialling
+	void Convert2dL ();		// convert from 1D to 2D
+	void Convert1dL ();		// convert from 2D to 1D
+
+
+	TInt StartThread();
+	void ConstructL (const TFaxSettings &);
+	void CancelFaxServerSession ();
+	void SetFaxSettingsL();
+	void SetSharedFileHandlesL();
+	};
+
+#include <cfax32.inl>
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Inc/CFAX32.INL	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,102 @@
+// 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
+*/
+
+#ifndef __cfax32_INL
+#define __cfax32_INL
+
+/********************************************************************/
+
+/** Sets the mode of operation during the fax session. 
+There are three possible transmission modes: 
+A standard fax machine style dial and transmit.
+An immediate transmit mode which is used if the phone is already off-hook on a voice call. 
+A polling mode, in which the fax is set up as an answering machine. It sends the fax on request when
+dialled by a remote modem.
+There are four possible reception modes:
+A standard fax machine style wait for a ring and receive.
+An immediate receive which is used if the phone is already off-hook on a voice call.
+A dial and receive mode in which the modem dials up in voice mode and then switches to immediate receive. 
+It is intended for use with faxback services which require users to dial manually and then press the start 
+button on their fax machine. The number of seconds between the voice mode dial and the switch to fax receive 
+mode is determined by TFaxSettings::iFaxOnDemandDelay.
+An automatic polling mode, in which the fax dials a remote answering machine, and requests it to send a fax.
+
+Notes:
+Some GSM networks do not allow switching between voice and fax or data modes, and hence cannot support the 
+immediate transmit and immediate receive modes. This includes all networks in the UK. 
+
+@param aMode  Type of fax operation for the current session. 
+
+@publishedPartner
+@released
+*/
+inline void CFaxTransfer::SetMode (TFaxMode aMode)
+	{
+	iMode = aMode;
+	}
+
+/** Sets the telephone number to be dialled when sending a fax. 
+This function does not check the validity of the number, which is simply sent to the modem 
+as part of an ATD dial command in its raw state.
+The alternative function SetPhoneNumberL() should be used to resolve the phone number according to
+the current location and country. One of these functions must be called before CFaxTransfer::Start()
+when a fax is to be sent. 
+
+@param aNumber  Descriptor containing the phone number to be dialled. 
+@publishedPartner
+@released
+*/
+inline void CFaxTransfer::SetPhoneNumber (TDesC8 & aNumber)
+	{
+	iPhoneNumber.Copy (aNumber);
+	}
+
+/**
+Sets the RCall object name to use when transfering a fax.  This method allows
+a client to use other ETel functionality to discover the incoming call name and
+then open it for its own use.  If this function is not used, the fax server will
+open a new RCall object to send or receive the Fax.
+
+@see RLine::NotifyIncomingCall()
+
+@param aName  Descriptor containing the RCall object name.
+@publishedPartner
+@released
+*/
+inline void CFaxTransfer::SetCallObjectName(TDesC& aName)
+	{
+	iCallName.Copy(aName);
+	}
+
+/**
+Specifies the name of the fax store file in which to save incoming pages.
+If the file already exists the previous contents are lost.
+
+@param aName  The name of a file in which to save received faxes.
+@publishedPartner
+@released 
+*/
+inline void CFaxTransfer::SetReceiveFileName (const TFileName & aName)
+	{
+	iReceiveFileName.Copy (aName);
+	}
+
+/********************************************************************/
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Inc/FAXLOG.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,85 @@
+// 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 __FAXLOG_H
+#define __FAXLOG_H
+
+
+#include <comms-infras/commsdebugutility.h>
+
+//-------------------------------------------------------------------------------------------
+//
+//  some logging macros definition.
+//  Unfortunately it is necessarily to use static logging functions because 
+//  Fax client and server can not use the same logging object from their multiple threads
+//
+//-------------------------------------------------------------------------------------------
+
+#ifdef _DEBUG
+
+_LIT8(KFaxSubSystem,        "fax");      //-- Fax subsystem name for logging
+_LIT8(KFaxCliComponent,     "FaxCli");   //-- Fax Client component name for logging
+_LIT8(KFaxServerComponent,  "FaxSrv");   //-- Fax server component name for logging (CFaxSession class etc.)
+_LIT8(KFaxStubComponent,    "FaxStub");  //-- Fax server stub component
+
+
+//-- N.B. It's necessary to use static logging macros because FaxServer and FaxClient use 
+//-- logging from different threads.
+
+//-- logging macros for Fax Server
+#define __FLOG_FAXSRV(AAA)           __FLOG_STATIC0(KFaxSubSystem,KFaxServerComponent,(AAA))
+#define __FLOG_FAXSRV1(AAA,BBB)      __FLOG_STATIC1(KFaxSubSystem,KFaxServerComponent,(AAA),(BBB))
+#define __FLOG_FAXSRV2(AAA,BBB,CCC)  __FLOG_STATIC2(KFaxSubSystem,KFaxServerComponent,(AAA),(BBB),(CCC))
+                                     
+//-- logging macros for Fax Client
+#define __FLOG_FAXCLI(AAA)           __FLOG_STATIC0(KFaxSubSystem,KFaxCliComponent,(AAA))
+#define __FLOG_FAXCLI1(AAA,BBB)      __FLOG_STATIC1(KFaxSubSystem,KFaxCliComponent,(AAA),(BBB))
+#define __FLOG_FAXCLI2(AAA,BBB,CCC)  __FLOG_STATIC2(KFaxSubSystem,KFaxCliComponent,(AAA),(BBB),(CCC))
+
+//-- logging macros for Fax Stub
+#define __FLOG_FAXSTUB(AAA)          __FLOG_STATIC0(KFaxSubSystem,KFaxStubComponent,(AAA))
+#define __FLOG_FAXSTUB1(AAA,BBB)     __FLOG_STATIC1(KFaxSubSystem,KFaxStubComponent,(AAA),(BBB))
+#define __FLOG_FAXSTUB2(AAA,BBB,CCC) __FLOG_STATIC2(KFaxSubSystem,KFaxStubComponent,(AAA),(BBB),(CCC))
+
+#else  //_DEBUG
+
+#define __FLOG_FAXSRV(AAA)
+#define __FLOG_FAXSRV1(AAA,BBB)
+#define __FLOG_FAXSRV2(AAA,BBB,CCC)
+/**                                     
+logging macros for Fax Client
+@internalComponent
+*/
+#define __FLOG_FAXCLI(AAA)
+#define __FLOG_FAXCLI1(AAA,BBB)
+#define __FLOG_FAXCLI2(AAA,BBB,CCC)
+
+/**
+logging macros for Fax Stub
+@internalComponent
+*/
+#define __FLOG_FAXSTUB(AAA)
+#define __FLOG_FAXSTUB1(AAA,BBB)
+#define __FLOG_FAXSTUB2(AAA,BBB,CCC)
+
+
+#endif	//_DEBUG
+
+#endif  // __FAXLOG_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Inc/FAXSET.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,72 @@
+// 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:
+// Contents : for saving/restoring persistent fax settings
+// 
+//
+
+/**
+ @file
+*/
+
+#ifndef __FAXSET_H
+#define __FAXSET_H
+
+#include <cdblen.h> 
+#include <cdbcols.h>
+
+#include <s32strm.h>
+#include <f32file.h>
+
+/********************************************************************/
+
+/**
+Fax configuration information.
+
+Contains persistent information applicable to all fax sessions. 
+
+@publishedPartner
+@released
+*/
+class TFaxSettings
+	{
+public:
+	IMPORT_C void ExternalizeL (RWriteStream &) const;
+	IMPORT_C void InternalizeL (RReadStream &);
+	IMPORT_C TFaxSettings& operator=(const TFaxSettings& aFaxSettings);
+	/** The local Fax ID string, which must be exactly 20 characters, with only 0-9, 
+	space, and + permissible for exact conformance with ITU T.30. */
+	TBuf8 < 20 > iFaxId ;
+	/** Maximum speed of fax session in bps. */
+	TInt iMaxSpeed;
+	/** Minimum speed of fax session in bps. */
+	TInt iMinSpeed;
+	/** Preferred resolution. */
+	TFaxResolution iPreferredResolution;
+	/** Preferred compression. */
+	TFaxCompression iPreferredCompression;
+	/** If 1, use error correction mode (ECM), else 0. */
+	TInt iPreferredECM;
+	/** Switches fax logging on or off. This must be left on. */
+	TInt iVerbose;
+	/** The delay between dialling and receiving from a faxback service (seconds). */
+	TInt iFaxOnDemandDelay ;
+	/** The fax class. */
+	TFaxClass iFaxClass;
+	};
+
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <faxsettings.h>
+#endif
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Inc/FAXSTD.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,564 @@
+// 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
+ @publishedPartner
+*/
+
+#if !defined(__FaxStd_H__)
+#define __FaxStd_H__
+
+// we start off with data constants
+
+// error codes
+
+/**
+Could not connect to the fax machine. The fax modem has failed. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrModemNotWorking = -101;    
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrCannotConnect = -102;       
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrCSIorCIG = -103;            
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrDISorDTC = -104;            
+
+/**
+The connection to the fax machine has been broken. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrFrameFail = -105;           
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrAtNegotiatedSpeed = -106;   
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrCFR = -107;                 
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrMCF = -108;                 
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrCRP = -109;                 
+
+/**
+Could not connect to the fax machine. Could not dial fax number. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrNoDial = -110;              
+
+/**
+Could not connect to the fax machine. No dial tone was detected. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrNoDialTone = -111;          
+
+/**
+Could not connect to the fax machine. The line is busy. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrBusy = -112;                
+
+/**
+Could not connect to the fax machine. The call was not answered. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrNoAnswer = -113;            
+
+/**
+Could not connect to the fax machine. The call was not answered by a fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrNoCarrier = -114;           
+
+/**
+Could not send to the fax machine. The fax machine is unable to receive faxes. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrRemoteCannotReceive = -115; 
+
+/**
+Panic. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrCompression = -116;         
+
+/**
+Panic. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrPageTooLong = -117;         
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrDCN = -118;                 
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrRemoteDCN = -119;           
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrHDLC = -120;                
+
+/**
+Panic. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrStopAndWait = -121;         
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrTrainStop = -122;           
+
+/**
+Could not send to the fax machine. The connection has timed out. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrReceiveTimeout = -123;      
+
+/**
+The connection to the fax machine has been broken. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrCannotEndData = -124;       
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrEOP = -125;                 
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrMPS = -126;                 
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrNoReceiveMode = -127;       
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrCannotAnswer = -128;        
+
+/**
+Could not receive fax. The fax machine ended the call. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrPrematureHangup = -129;     
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrModemResponse = -130;       
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrPrematureOK = -131;         
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrNoFinalOK = -132;           
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrUnknownPageCode = -133;     
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrNoHangup = -134;            
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrNoNegotiate = -135;         
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrModemDisconnect = -136;     
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrWrongModemType = -137;      
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxErrTrainFail = -138;           
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxTransmitterStalled = -139;     
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxReceiverOverflow = -140;       
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxCannotOpenPort = -141;         
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxCannotCloseStore = -142;       
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxCannotOpenStore = -143;        
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxThreadError = -144;            
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxFileSessionError = -145;       
+
+/**
+Could not connect to the fax machine.  Was KFaxFileCreateError till 7/10/97.
+@publishedPartner
+@released
+*/
+const TInt KFaxLogCreateError = -146;         
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxFileSeekError = -147;          
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxPDDError = -148;               
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxLDDError = -149;               
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxC32Error = -150;               
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxCommsServerError = -151;       
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxCommsPortError = -152;         
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxCancelRequested = -153;        
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxNoClass2Xon = -154;            
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxConfigError = -155;            
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxCannotAutodetect = -156;       
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KCannotFindFirstPage = -157;       
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxBadInitialization = -158;      
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxOnlyJustAutoDetected = -159;   
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxBelowMinSpeed = -160;          
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxPollingUnsupported = -161;     
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxNothingToPoll = -162;          
+
+/**
+Could not connect to the fax machine. 
+@publishedPartner
+@released
+*/
+const TInt KFaxEtelServerError = -163;        
+					
+/**
+standard communication bytes
+*/
+const TUint8 Knul = 0x00;
+const TUint8 Kdle = 0x10;
+const TUint8 Ketx = 0x03;
+const TUint8 Kbackspace = 0x08;
+const TUint8 Kreturn = 0x0d;
+const TUint8 Klinefeed = 0x0a;
+const TUint8 Kxon = 0x11;
+const TUint8 Kxoff = 0x13;
+const TUint8 Kdc2 = 0x12;
+const TUint8 Kcan = 0x18;
+
+/**
+apparent clock granularity
+*/
+const TInt CLK_TCK = 1000000;
+
+// maximum size of a descriptor for reading and writing T4 scan lines
+
+// the longest possible encoded scan line is alternating black and white dots
+// that's 8 bits, as single white dot = 00111 single black dot = 010
+// there's a maximum of 864 such pairs in a 1728 dot scan line
+// let's be generous and allow for eols and padding - 896
+// this is sufficient for faxes we generate ourselves
+
+// On the other hand, a scan line can take up to 5 seconds to transmit
+// At 14400 bps, it could contain 72000 bits = 9000 bytes
+// There could be internal line padding = alternate run lengths of zero)
+// So this bigger figure is needed for faxes which we receive via the line
+
+// we also use this when sending phase C data to the modem
+// we also use this when receiving phase C data from the modem
+const TInt KMaxT4Des = 896;
+const TInt KMaxFaxBuf ((KMaxT4Des + sizeof (TInt)) * 2);
+
+// base for sizing buffers
+//-- LYN-593JT3 defect fix by Dmitry Lyokhin. 16.04.02
+const TInt KBufSize = 2048; 
+
+/**
+Major version number.
+A version must be specified when creating a session with the server.
+*/
+const TUint KEtelFaxMajorVersionNumber = 1;
+/** Minor version number.
+A version must be specified when creating a session with the server.
+@publishedPartner
+*/
+const TUint KEtelFaxMinorVersionNumber = 0;
+/** Build version number. 
+A version must be specified when creating a session with the server.
+*/
+const TUint KEtelFaxVersionNumber = 601;
+
+IMPORT_C TInt StartThread ();
+
+
+/********************************************************************/
+
+// fax structures
+/********************************************************************/ 
+
+//The next enumerations are bitmapped, giving useful TFaxMode masks.
+const TUint KFaxReceive = 0x01;
+const TUint KFaxOffHook = 0x02;
+const TUint KFaxWaitForRing = 0x04;
+const TUint KFaxNoDial = 0x06;
+const TUint KFaxPoll = 0x08;
+
+/**
+Defines the seven fax session modes supported by the fax client.
+
+The enumerations do not progress from 0 to 6, as might be expected, but rather 
+as 0, 1, 2, 3, 4, 5, 9. 
+*/
+enum TFaxMode
+	{
+	/** Normal fax machine type send mode. */
+	EDialAndTransmit=0,				// this is a normal fax machine type send
+	/** Dial and receive fax back mode calling a fax on demand service. */
+	EDialAndReceiveFaxBack=1,  		// this dials a fax on demand service
+	/** Immediate transmit mode  for switching from voice to send. */
+	EImmediateTransmit=2,	  		// for switching from voice to send
+	/** Immediate receive mode for switching from voice to receive. */
+	EImmediateReceive=3,				// for switching from voice to receive
+	/** Ring and transmit mode for providing fax on demand. */
+	EWaitForRingAndTransmit=4, 		// this make us into a fax on demand 
+	/** Normal fax machine type receive mode. */
+	EWaitForRingAndReceive=5,		// this is a normal fax machine type receive
+	/** Fax polling mode */
+	EDialAndReceivePoll=9			// this is for fax polling
+	};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Inc/FAXTSRC.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,111 @@
+// 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:
+// Contents : for sending faxes from fax stores
+// 
+//
+
+/**
+ @file
+ @internalComponent
+*/
+
+#ifndef __FAXTSRC_H
+#define __FAXTSRC_H
+
+/**
+@internalComponent
+*/
+enum TFaxPreferredCompression
+	{
+	Prefer1D, Prefer2D 
+	};
+
+
+/********************************************************************/
+
+/**
+@internalComponent
+*/
+class TFaxEntry
+	{
+public:
+	void InternalizeL (RReadStream &);
+	void ExternalizeL (RWriteStream &) const;
+
+	TInt iNameLength;
+	TFileName iFaxPageStore;
+	TInt iStartPage;
+	TInt iPageCount;
+	};
+
+/********************************************************************/
+
+/**
+@internalComponent
+*/
+class CFaxTransferSource : public CBase
+	{
+public:
+	static CFaxTransferSource * NewL ();
+	static CFaxTransferSource * NewLC ();
+	~CFaxTransferSource ();
+
+protected:
+	void ConstructL ();
+
+public:
+	IMPORT_C void AddSourceL (const TFileName &, TFaxPreferredCompression);
+	IMPORT_C void AddSourceL (const TFileName &, TInt, TFaxPreferredCompression);
+	IMPORT_C void AddSourceL (const TFileName &, TInt, TInt, TFaxPreferredCompression);
+	IMPORT_C void RemoveAllSources ();
+
+	void GetNextPageReadyL ();
+
+	void OpenFaxInL (const TDesC & aFileName);
+	void PagePrepare ();
+	void WriteFaxDataL (const TDesC8 & aBuffer);
+	void WritePageParmsL (TFaxBufSenderId & aSenderId);
+	void CloseFaxInStore ();
+
+	TInt OpenFaxOutL (const TDesC & aFileName); // returns the number of pages in the file
+	TInt NextPageFind ();
+	void ReadPageParmsL ();
+	void ReadFaxData (TDes8 & aBuffer);
+	void PreviousPageFindL ();
+	void CloseFaxStore ();
+
+	TInt iLines;                 // length of image in lines
+	TInt iResolu;                // resolution of image
+	TInt iCompression;           // type of compression
+	TInt iBitOrder;              // little or big endian ordering of bits in a byte
+	TInt iPage;                  // page number of image in fax
+
+	TStreamId iOurStreamID;
+	CBufSeg * iSources;
+	RBufReadStream iInstream;
+	RBufWriteStream iOutstream;
+
+	CWriteFaxFile * iWriteFaxFile;
+	CReadFaxFile * iReadFaxFile;
+
+	TInt iFaxListEntries;
+	TInt iSavedFaxListEntries;
+	TInt iFaxPages;
+	TInt iPageInCurrentFile;
+
+	TFaxPreferredCompression  iOurPreferredCompression;
+	TFaxEntry iOurFaxEntry;
+	};
+
+#endif // __FAXTSRC_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Inc/faxerr.ra	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,288 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#include <errors/generic/faxerr.rls>
+
+RESOURCE ARRAY r_error_res_fax_errors
+	{
+	items=
+		{
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_modem_not_working;			// -101
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -102
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -103
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -104
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_frame_fail;				// -105
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -106
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -107
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -108
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -109
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_no_dial;					// -110
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_no_dial_tone;				// -111
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_busy;						// -112
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_no_answer;					// -113
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_no_carrier;				// -114
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_remote_no_receive;			// -115
+			},
+		SINGLE_ERROR
+			{
+			flags=EErrorResPanicErrorFlag;					// -116
+			},
+		SINGLE_ERROR
+			{
+			flags=EErrorResPanicErrorFlag;					// -117
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -118
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -119
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -120
+			},
+		SINGLE_ERROR
+			{
+			flags=EErrorResPanicErrorFlag;					// -121
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -122
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_receive_timeout;			// -123
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_end;				// -124
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -125
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -126
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -127
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -128
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_premature_hangup;			// -129
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -130
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -131
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -132
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -133
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -134
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -135
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -136
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -137
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -138
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -139
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -140
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -141
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -142
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -143
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -144
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -145
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -146
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -147
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -148
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -149
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -150
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -151
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -152
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -153
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -154
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -155
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -156
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -157
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -158
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -159
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -160
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -161
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -162
+			},
+		SINGLE_ERROR
+			{
+			text=r_error_res_fax_cannot_connect;			// -163
+			}
+		};
+	}
+
+RESOURCE TBUF r_error_res_fax_modem_not_working		{ buf=STRING_r_error_res_fax_modem_not_working	; }
+RESOURCE TBUF r_error_res_fax_cannot_connect		{ buf=STRING_r_error_res_fax_cannot_connect	; }
+RESOURCE TBUF r_error_res_fax_frame_fail			{ buf=STRING_r_error_res_fax_frame_fail		; }
+RESOURCE TBUF r_error_res_fax_no_dial				{ buf=STRING_r_error_res_fax_no_dial			; }
+RESOURCE TBUF r_error_res_fax_no_dial_tone			{ buf=STRING_r_error_res_fax_no_dial_tone		; }
+RESOURCE TBUF r_error_res_fax_busy					{ buf=STRING_r_error_res_fax_busy				; }
+RESOURCE TBUF r_error_res_fax_no_answer				{ buf=STRING_r_error_res_fax_no_answer			; }
+RESOURCE TBUF r_error_res_fax_no_carrier			{ buf=STRING_r_error_res_fax_no_carrier		; }
+RESOURCE TBUF r_error_res_fax_remote_no_receive		{ buf=STRING_r_error_res_fax_remote_no_receive	; }
+RESOURCE TBUF r_error_res_fax_receive_timeout		{ buf=STRING_r_error_res_fax_receive_timeout	; }
+RESOURCE TBUF r_error_res_fax_cannot_end			{ buf=STRING_r_error_res_fax_cannot_end		; }
+RESOURCE TBUF r_error_res_fax_premature_hangup		{ buf=STRING_r_error_res_fax_premature_hangup	; }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Inc/faxerr.rls	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,27 @@
+// Copyright (c) 2003-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:
+//
+
+rls_string STRING_r_error_res_fax_modem_not_working	 "Could not connect to the fax machine. The fax modem has failed" 
+rls_string STRING_r_error_res_fax_cannot_connect	 "Could not connect to the fax machine." 
+rls_string STRING_r_error_res_fax_frame_fail		 "The connection to the fax machine has been broken." 
+rls_string STRING_r_error_res_fax_no_dial			 "Could not connect to the fax machine. Could not dial fax number" 
+rls_string STRING_r_error_res_fax_no_dial_tone		 "Could not connect to the fax machine. No dial tone was detected" 
+rls_string STRING_r_error_res_fax_busy				 "Could not connect to the fax machine. The line is busy" 
+rls_string STRING_r_error_res_fax_no_answer			 "Could not connect to the fax machine. The call was not answered" 
+rls_string STRING_r_error_res_fax_no_carrier		 "Could not connect to the fax machine. The call was not answered by a fax machine" 
+rls_string STRING_r_error_res_fax_remote_no_receive	 "Could not send to the fax machine. The fax machine is unable to receive faxes" 
+rls_string STRING_r_error_res_fax_receive_timeout	 "Could not send to the fax machine. The connection timed out" 
+rls_string STRING_r_error_res_fax_cannot_end		 "The connection to the fax machine has been broken" 
+rls_string STRING_r_error_res_fax_premature_hangup	 "Could not receive fax. The fax machine ended the call"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Inc/faxsettings.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,53 @@
+// 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
+ @released
+*/
+
+#if !defined(__FAXSETTINGS_H__)
+#define __FAXSETTINGS_H__
+
+/**
+@internalComponent
+*/
+
+/********************************************************************/
+
+// the CFaxSettings class
+
+/**
+@internalComponent
+*/
+class CFaxSettings : public CBase
+   {
+public:
+   static CFaxSettings * NewL ();
+   static CFaxSettings * NewLC ();
+   ~CFaxSettings ();
+   void ValidateAndSetClassL (TFaxSettings *);
+
+protected:
+   void ConstructL ();
+ protected:
+   RFs iFileSession;
+   };
+
+/********************************************************************/
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax.iby	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,50 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __TE_FAX_IBY__
+#define __TE_FAX_IBY__
+
+#include <testexecute.iby>
+#include <testconfigfileparser.iby>
+#include <fax.iby>
+
+// TE_Fax Test harness EXE
+file=ABI_DIR\DEBUG_DIR\TE_Fax.exe		                                   SYSTEM_BINDIR\TE_Fax.exe
+
+// Scripts
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_Fax_Transmit_comm0.script   TestData\scripts\TE_Fax_Transmit_comm0.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_Fax_Transmit_comm1.script   TestData\scripts\TE_Fax_Transmit_comm1.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_Fax_Transmit_IR.script      TestData\scripts\TE_Fax_Transmit_IR.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_Fax_Receive_comm0.script    TestData\scripts\TE_Fax_Receive_comm0.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_Fax_Receive_comm1.script    TestData\scripts\TE_Fax_Receive_comm1.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_Fax_Receive_IR.script       TestData\scripts\TE_Fax_Receive_IR.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_Fax_No_Phone.script         TestData\scripts\TE_Fax_No_Phone.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_Fax_setup_comm0.script      TestData\scripts\TE_Fax_setup_comm0.script 
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_Fax_setup_comm1.script      TestData\scripts\TE_Fax_setup_comm1.script 
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_Fax_setup_IR.script         TestData\scripts\TE_Fax_setup_IR.script 
+data=EPOCROOT##epoc32\data\z\testdata\Configs\TE_Fax_9210_comm0.cfg          TestData\Configs\TE_Fax_9210_comm0.cfg
+data=EPOCROOT##epoc32\data\z\testdata\Configs\TE_Fax_9210_comm1.cfg          TestData\Configs\TE_Fax_9210_comm1.cfg
+data=EPOCROOT##epoc32\data\z\testdata\Configs\TE_Fax_9210_IR.cfg             TestData\Configs\TE_Fax_9210_IR.cfg
+data=EPOCROOT##epoc32\data\z\testdata\Configs\TE_Fax.ini                     TestData\Configs\TE_Fax.ini
+data=EPOCROOT##epoc32\data\z\TestData\Data\TE_Fax_Test.FAX                   TestData\Data\TE_Fax_Test.FAX
+data=EPOCROOT##epoc32\data\z\TestData\Data\TE_Fax_One.FAX                    TestData\Data\TE_Fax_One.FAX
+data=EPOCROOT##epoc32\data\z\TestData\Data\TE_Fax_Two.FAX                    TestData\Data\TE_Fax_Two.FAX
+data=EPOCROOT##epoc32\data\z\TestData\Data\TE_Fax_Six.FAX                    TestData\Data\TE_Fax_Six.FAX
+data=EPOCROOT##epoc32\data\z\TestData\Data\TE_Fax_Blank.FAX                  TestData\Data\TE_Fax_Blank.FAX
+data=EPOCROOT##epoc32\data\z\TestData\Data\TE_Fax_BadPage.FAX                TestData\Data\TE_Fax_BadPage.FAX
+data=EPOCROOT##epoc32\data\z\TestData\Data\TE_Fax_Chart4.FAX                 TestData\Data\TE_Fax_Chart4.FAX
+
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax.ini	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,18 @@
+# Copyright (c) 2004-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:
+# Parameter configuration file for the TE_Fax test.
+# 
+#
+
+DestPhoneNumber: 123

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,45 @@
+// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+TARGET        te_fax.exe
+CAPABILITY    ReadDeviceData WriteDeviceData NetworkControl NetworkServices ReadUserData WriteUserData
+TARGETTYPE    exe
+UID           0x1000007A 0x102042BB
+VENDORID      0x70000001
+
+SOURCEPATH     .
+SOURCE         TE_FaxBase.cpp
+SOURCE         TE_FaxServer.cpp
+SOURCE         TE_FaxTest.cpp
+
+USERINCLUDE    ../../Inc 
+USERINCLUDE    .
+USERINCLUDE    ..
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY        faxcli.lib
+LIBRARY        faxio.lib
+LIBRARY        faxstrm.lib
+LIBRARY        euser.lib
+LIBRARY        etel.lib
+LIBRARY        etelmm.lib
+LIBRARY        efsrv.lib
+LIBRARY        testexecutelogclient.lib
+LIBRARY        testexecuteutils.lib
+LIBRARY        commsdat.lib
+
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_FaxBase.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,490 @@
+// 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:
+// Telephony Fax Test base test code.
+// 
+//
+
+/**
+ @file
+ @internalComponent
+*/
+
+#include "faxdefn.h"
+#include "fax_reversebytes.h"
+#include "FAXSET.H"
+#include "CFAX32.H"
+
+#include "TE_FaxBase.h"
+
+ #include <commsdattypesv1_1.h>
+
+ using namespace CommsDat;
+
+
+//
+// Constants...
+//
+const TInt KFaxTestLogPeriod = 5*1000000;
+_LIT(KTEFaxINIFileName, "Z:\\TestData\\Configs\\TE_Fax.INI");
+_LIT8(KTEFaxINIDestNumber, "DestPhoneNumber");
+
+
+/**
+ *  Default constructor.
+ */	
+CFaxTestStep::CFaxTestStep()
+	{
+	// NOP
+	} // CFaxTestStep::CFaxTestStep
+
+
+/**
+ *  Default destructor.
+ */	
+CFaxTestStep::~CFaxTestStep()
+	{
+	// NOP
+	} // CFaxTestStep::~CFaxTestStep
+
+
+/**
+ *  Pre-amble function called before all tests.
+ *
+ *  @return Test verdict for this test.
+ */	
+TVerdict CFaxTestStep::doTestStepPreambleL()
+	{
+	//
+	// Mark for memory leaks!!!
+	//
+	__UHEAP_MARK;
+
+	//
+	// Create an Active Scheduler...
+	//
+	iScheduler = new(ELeave) CActiveScheduler();
+	CActiveScheduler::Install(iScheduler);
+
+	return TestStepResult();
+	} // CFaxTestStep::doTestStepPreambleL
+
+
+/**
+ *  Post-amble function called before all tests.
+ *
+ *  @return Test verdict for this test.
+ */	
+TVerdict CFaxTestStep::doTestStepPostambleL()
+	{
+	delete iScheduler;
+	iScheduler = NULL;
+	
+	//
+	// Check the heap for memory leaks...
+	//
+	__UHEAP_MARKEND;
+
+	return TestStepResult();
+	} // CFaxTestStep::doTestStepPostambleL
+
+
+/**
+ *  Initialise the Fax settings based on default values and CommDB settings.
+ *
+ *  @param aFaxSettings  Fax Settings stucture to initialise.
+ */	
+void CFaxTestStep::ReadDestPhoneNumberFromIniFileL(TDes8& aPhoneNumber)
+	{
+	//
+	// Open the INI file...
+	//
+	RFs  fs;
+	RFile  file;
+	TInt  result;
+
+	result = fs.Connect();
+	TESTCHECKL(result, KErrNone);
+	CleanupClosePushL(fs);
+
+	result = file.Open(fs, KTEFaxINIFileName, EFileShareAny | EFileRead);
+	if (result != KErrNone)
+		{
+		INFO_PRINTF2(_L("Cannot load TE_Fax.ini file! (Error %d)"), result);
+		TESTCHECKL(result, KErrNone);
+		}
+	CleanupClosePushL(file);
+
+	//
+	// Get the file size and and then load the file into memory...
+	//
+	TInt  fileSize;
+
+	result = file.Size(fileSize);
+	TESTCHECKL(result, KErrNone);
+	TESTL(fileSize > 0);
+
+	HBufC8*  fileContents = HBufC8::NewLC(fileSize);
+	TPtr8  fileContentsPtr(fileContents->Des());
+
+	result = file.Read(0, fileContentsPtr);
+	TESTCHECKL(result, KErrNone);
+
+	//
+	// Parse the contents of the file...
+	//
+	TLex8  lexInput(fileContentsPtr);
+
+	while (!lexInput.Eos())
+		{
+		TPtrC8  token(lexInput.NextToken());
+		lexInput.SkipSpace();
+
+		if (token.Find(KTEFaxINIDestNumber) == KErrNone) 
+			{
+			lexInput.SkipSpaceAndMark();
+
+			TPtrC8  phoneNumberPtr(lexInput.NextToken());
+			TBuf<32>  phoneNumber;
+
+			phoneNumber.Copy(phoneNumberPtr);
+			INFO_PRINTF2(_L("Phone number read from INI file as \"%S\"."), &phoneNumber);
+
+			aPhoneNumber.Copy(phoneNumber);
+			}
+		}
+
+	//
+	// Done, clean up...
+	//
+	CleanupStack::PopAndDestroy(fileContents);
+	CleanupStack::PopAndDestroy(&file);
+	CleanupStack::PopAndDestroy(&fs);
+	} // CFaxTestStep::ReadDestPhoneNumberFromIniFileL
+
+
+/**
+ *  Initialise the Fax settings based on default values and CommDB settings.
+ *
+ *  @param aFaxSettings  Fax Settings stucture to initialise.
+ */	
+void CFaxTestStep::ReadFaxCommDBSettingsL(TFaxSettings& aFaxSettings)
+	{
+	INFO_PRINTF1(_L("Reading Fax settings from the CommDB."));
+
+	//
+	// Initialise the default values...
+	//
+	aFaxSettings.iFaxId.Zero();
+	aFaxSettings.iMaxSpeed             = 14400;
+	aFaxSettings.iMinSpeed             = 2400;
+	aFaxSettings.iPreferredResolution  = EFaxFine;
+	aFaxSettings.iPreferredCompression = EModifiedHuffman;
+	aFaxSettings.iPreferredECM         = EFalse;
+	aFaxSettings.iFaxOnDemandDelay     = 20;
+	aFaxSettings.iVerbose              = 1;
+
+	//
+	// Now we now read the Comm DB modem settings - we must have
+	// these to run...
+	//
+#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
+	CMDBSession* db = CMDBSession::NewL(KCDVersion1_2);
+#else
+	CMDBSession* db = CMDBSession::NewL(KCDVersion1_1);
+#endif
+	CleanupStack::PushL(db);
+
+	//
+	// Read the currently selected connection preference and find preferred IAP...
+	//
+	TInt prefRank = 1;
+	
+	CCDConnectionPrefsRecord *connectionPrefs =
+		static_cast<CCDConnectionPrefsRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdConnectionPrefsRecord));
+	CleanupStack::PushL(connectionPrefs);
+	connectionPrefs->iRanking = prefRank;
+	connectionPrefs->iDirection = ECommDbConnectionDirectionOutgoing;
+	connectionPrefs->FindL(*db);
+	
+	// The following code is a temporary solution until an issue has been resolved in CommsDat
+	// start
+	CCDIAPRecord* tempPIapRecord =
+		static_cast<CCDIAPRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdIAPRecord));
+	tempPIapRecord->SetRecordId(connectionPrefs->iDefaultIAP);
+	connectionPrefs->iDefaultIAP.iLinkedRecord = tempPIapRecord;
+	
+	CCDIAPRecord* pIapRecord = (CCDIAPRecord*)connectionPrefs->iDefaultIAP.iLinkedRecord;
+	pIapRecord->SetRecordId(connectionPrefs->iDefaultIAP);
+	pIapRecord->LoadL(*db);
+	
+	CCDBearerRecordBase* tempBearerRecord =
+		static_cast<CCDBearerRecordBase*>(CCDRecordBase::RecordFactoryL(KCDTIdModemBearerRecord));
+	tempBearerRecord->SetRecordId(pIapRecord->iBearer);
+	pIapRecord->iBearer.iLinkedRecord = tempBearerRecord;
+
+	CCDBearerRecordBase* pBearerRecord = (CCDBearerRecordBase*) pIapRecord->iBearer.iLinkedRecord;
+	pBearerRecord->SetRecordId(pIapRecord->iBearer);
+	pBearerRecord->LoadL(*db);
+	// end
+	
+	TUint32 iapId = pBearerRecord->iRecordTag;
+
+	//
+	// Get bearer number from IAP table, it is assumed bearer type will be a modem...
+	//
+	CMDBField<TUint32>* bearerField = new(ELeave) CMDBField<TUint32>(KCDTIdIAPBearer);
+	CleanupStack::PushL(bearerField);
+	bearerField->SetRecordId(iapId);
+	bearerField->LoadL(*db);
+	TUint32 modemId = *bearerField;
+	CleanupStack::PopAndDestroy(bearerField);
+	
+	//
+	// Get modem parameters...
+	//
+	CCDModemBearerRecord *modemRecord =
+		static_cast<CCDModemBearerRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdModemBearerRecord));
+	CleanupStack::PushL(modemRecord);
+	modemRecord->SetRecordId(modemId);
+	modemRecord->LoadL(*db);
+	iPortDriverName = modemRecord->iCsyName;
+	iCommPortName = modemRecord->iPortName;
+	iFaxInitString = modemRecord->iFaxInitString;
+	iModemInitString = modemRecord->iModemInitString;
+	
+	TUint32 faxClass;
+	faxClass = modemRecord->iFaxClassPref;
+	aFaxSettings.iFaxClass = (TFaxClass) faxClass;
+
+	CleanupStack::PopAndDestroy(3); // db, connectionPrefs, modemId
+	
+	} // CFaxTestStep::ReadFaxCommDBSettingsL
+
+
+/**
+ *  Begin Fax Transfer.  We only launch it once the elements of
+ *  session->iFaxSessionParameters are all set up.  We call it with a
+ *  TRequestStatus and while waiting for the fax to end, we also display
+ *  the status of the fax every second.
+ *
+ *  @param aFaxSession   Fax Session already in use.
+ */	
+TInt CFaxTestStep::BeginFaxTransfer(CFaxTransfer* aFaxSession)
+	{
+	TRequestStatus  threadStatus;
+	TRequestStatus  timerStatus;
+	RTimer  timer;
+	TFaxPhase  lastPhase = ENotYetStarted;
+	TInt  result;
+
+	result = aFaxSession->Start(threadStatus);
+	if (result == KErrNone)
+		{
+		timer.CreateLocal ();
+		timer.After(timerStatus, KFaxTestLogPeriod);
+
+		for (;;)
+			{
+			User::WaitForRequest(timerStatus, threadStatus);
+			if (timerStatus != KRequestPending)
+				{
+				if (aFaxSession->Progress())
+					{
+					INFO_PRINTF1(_L("Cancelling - no progress!"));
+					aFaxSession->Cancel();
+					}
+				else
+					{
+					lastPhase = aFaxSession->iProgress.iPhase;
+					if (lastPhase != ENotYetStarted)
+						{
+						INFO_PRINTF6(_L("Phase %c Speed %d Resolution %d Compression %dD ECM %d"),
+									 aFaxSession->iProgress.iPhase,
+									 aFaxSession->iProgress.iSpeed,
+									 aFaxSession->iProgress.iResolution,
+									 aFaxSession->iProgress.iCompression+1,
+									 aFaxSession->iProgress.iECM);
+						INFO_PRINTF4(_L("Line %d Page %d Connected to \"%S\""),
+									 aFaxSession->iProgress.iLines,
+									 aFaxSession->iProgress.iPage,
+									 &aFaxSession->iProgress.iAnswerback);
+						}
+					timer.After(timerStatus, KFaxTestLogPeriod);
+					}
+				}
+			else if (threadStatus != KRequestPending)
+				{
+				aFaxSession->Stop();
+
+				timer.Cancel();
+				User::WaitForRequest(timerStatus);
+				timer.Close ();
+
+				result = threadStatus.Int();
+				break;
+				}
+			}
+		}
+
+	if (result == KFaxErrNoHangup)
+		{
+		//
+		// KFaxErrNoHangup is a phase E error and can be safely ignored.
+		//
+		result = KErrNone;
+		}
+
+	return (result);
+	} // CFaxTestStep::BeginFaxTransfer()
+
+
+void CFaxTestStep::GenerateHeaderFileL(TFaxSettings& aFaxSettings, const TUint8* aFont,
+									   TInt aWidth, TInt aHeight)
+{
+	TFaxHeaderInfo  faxHeader;
+
+	//
+	// Declare the font size...
+	//
+	faxHeader.iHeaderFontWidthInBytes  = aWidth;
+	faxHeader.iHeaderFontHeightInLines = aHeight;
+
+	//
+	// Work out the number of characters we can get in the scan line, so that we can
+	// create a modifiable buffer to hold the header line and fill it with spaces
+	//
+	TInt  charactersPerLine = KFaxBytesPerScanLine / faxHeader.iHeaderFontWidthInBytes;
+	HBufC8*  textBuff = HBufC8::New(charactersPerLine);
+	CleanupStack::PushL(textBuff);
+
+	if (!textBuff)
+		{
+		User::Leave (KErrNoMemory);
+		}
+
+	TPtr8  textLine = textBuff->Des();
+	textLine.Fill(' ', charactersPerLine);
+
+	//
+	// Work out the margin we leave on each side of the page in characters
+	// this is specified as 74 pixels in T.4.
+	//
+	TInt  margin = (74 / (8 * faxHeader.iHeaderFontWidthInBytes));
+
+	//
+	// THE FOLLOWING LAYOUT IS PURELY FOR TEST PURPOSES AND SHOULDN'T
+	// BE TAKEN TO BE A DEFINITIVE HEADER LAYOUT
+	//
+	//
+	// assume we have the date and time on the lefthand side as dd/mm/yyyy hh:mm
+	// 0000000001111111
+	// 1234567890123456
+	// fill in the separators
+	//
+	textLine.Replace(margin + 3, 1, _L8 ("/"));
+	textLine.Replace(margin + 6, 1, _L8 ("/"));
+	textLine.Replace(margin + 14, 1, _L8 (":"));
+
+	//
+	// Set up the offsets to the data...
+	//
+	faxHeader.iOffsetToDay    = margin + 1;
+	faxHeader.iOffsetToMonth  = margin + 4;
+	faxHeader.iOffsetToYear   = margin + 7;
+	faxHeader.iOffsetToHour   = margin + 12;
+	faxHeader.iOffsetToMinute = margin + 15;
+
+	//
+	// Assume we have the page info on the righthand side as pp/tt
+	// 54321
+	// fill in the separator
+	//
+	textLine.Replace(charactersPerLine - margin - 3, 1, _L8 ("/"));
+
+	//
+	// Set up the offsets to the data
+	//
+	faxHeader.iOffsetToTotalPages  = charactersPerLine - margin - 2;
+	faxHeader.iOffsetToCurrentPage = charactersPerLine - margin - 5;
+
+	//
+	// Fill the header line with appropriate information
+	//
+	textLine.Replace(faxHeader.iOffsetToMinute + 4, aFaxSettings.iFaxId.Length (),
+					 aFaxSettings.iFaxId);
+
+	//
+	// HEADER LAYOUT NOW FINISHED
+	//
+	// Now we can write the fax header info to the header info file
+	//
+	CFaxHeaderLines*  testheader = CFaxHeaderLines::NewL();
+	CleanupStack::PushL(testheader);
+
+	testheader->WriteFaxHeaderInfoL(faxHeader);
+
+	//
+	// Now we generate the scan line and write the header line bitmap
+	// via a loop for each rowInFont in the font.
+	//
+	TInt rowInFont;
+
+	for (rowInFont = 0;  rowInFont < faxHeader.iHeaderFontHeightInLines;  rowInFont++)
+		{
+		TRawScanLine  image;
+
+		image.SetMax ();
+		image.FillZ ();
+		
+		TInt offsetInImage = 0;
+
+		for (TInt characterPosition = 0;  characterPosition < charactersPerLine;  characterPosition++)
+			{
+			for (TInt fontByte = 0;  fontByte < faxHeader.iHeaderFontWidthInBytes;  fontByte++)
+				{
+				image[offsetInImage++] = (TUint8) ~ KReverseByte[*(aFont + ((textLine[characterPosition] - 32) * faxHeader.iHeaderFontHeightInLines * faxHeader.iHeaderFontWidthInBytes) + (rowInFont * faxHeader.iHeaderFontWidthInBytes) + fontByte)];
+				}
+			}
+		testheader->WriteRawHeaderLineL(rowInFont, image);
+		}
+
+	//
+	// Now we replace the first ten characters in the header text line with digits
+	// and write out the font line...
+	//
+	textLine.Replace(0, 10, _L8 ("0123456789"));	
+
+	for (rowInFont = 0;  rowInFont < faxHeader.iHeaderFontHeightInLines;  rowInFont++)
+		{
+		TRawScanLine image;
+
+		image.SetMax ();
+		image.FillZ ();
+
+		TInt offsetInImage = 0;
+
+		for (TInt characterPosition = 0;  characterPosition < charactersPerLine;  characterPosition++)
+			{
+			for (TInt fontByte = 0;  fontByte < faxHeader.iHeaderFontWidthInBytes;  fontByte++)
+				{
+				image[offsetInImage++] = (TUint8) ~ KReverseByte[*(aFont + ((textLine[characterPosition] - 32) * faxHeader.iHeaderFontHeightInLines * faxHeader.iHeaderFontWidthInBytes) + (rowInFont * faxHeader.iHeaderFontWidthInBytes) + fontByte)];
+				}
+			}
+		testheader->WriteRawFontLineL(rowInFont, image);
+		}
+
+	CleanupStack::PopAndDestroy(testheader);
+	CleanupStack::PopAndDestroy(textBuff);
+	} // CFaxTestStep::GenerateHeaderFileL
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_FaxBase.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,424 @@
+// 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:
+// Telephony Fax Test base header file.
+// 
+//
+
+/**
+ @file
+ @internalComponent
+*/
+
+#ifndef _TE_FAXBASE_H_
+#define _TE_FAXBASE_H_
+
+#include <testconfigfileparser.h>
+#include <test/testexecuteserverbase.h>
+
+
+//
+// Test macros
+//
+#define TESTCHECKL(a, b) \
+    { \
+    if((a)!=(b)) \
+	    { \
+	    INFO_PRINTF3(_L("Failed: Got %d while expecting %d."),a,b); \
+        SetTestStepResult(EFail); \
+        User::Leave(EFail); \
+        } \
+    }
+
+#define TESTCHECKCONDITIONL(a) \
+    { \
+    if (!(a)) \
+	    { \
+	    INFO_PRINTF1(_L("Failed: Condition was false.")); \
+        SetTestStepResult(EFail); \
+        User::Leave(EFail); \
+        } \
+    }
+    
+#define TESTCHECKSTRL(a, b) \
+    { \
+    if((a)!=(b)) \
+	    { \
+	    TBuf<255> temp = a ; \
+	    INFO_PRINTF3(_L("Failed: Got \"%S\" while expecting \"%S\"."), &temp,&(b)); \
+        SetTestStepResult(EFail); \
+        User::Leave(EFail); \
+        } \
+    }
+    
+#define TESTCHECK(a, b) \
+    { \
+    if((a)!=(b)) \
+	    { \
+	    INFO_PRINTF3(_L("Failed: Got %d while expecting %d."),a,b); \
+        SetTestStepResult(EFail); \
+        } \
+    }
+
+#define TESTCHECKCONDITION(a) \
+    { \
+    if (!(a)) \
+	    { \
+	    INFO_PRINTF1(_L("Failed: Condition was false.")); \
+        SetTestStepResult(EFail); \
+        } \
+    }
+    
+#define TESTCHECKSTR(a, b) \
+    { \
+    if((a)!=(b)) \
+	    { \
+	    INFO_PRINTF3(_L("Failed: Got \"%S\" while expecting \"%S\"."), &(a),&(b)); \
+        SetTestStepResult(EFail); \
+        } \
+    }
+
+
+//
+// Test font data containing an 8 bit wide font, a 16 bit wide font and a 24 bit wide font
+// for testing out header digitization.
+//
+// 8x16 256 font table for generating fax headers.
+// The only characters included are those from 32 to 128.
+//
+const TUint8 font8x16[][16] =
+   {
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},    // ' '
+   {0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},    // '!'
+   {0x00, 0x24, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},    // '"'
+   {0x00, 0x42, 0x42, 0x42, 0xFF, 0x42, 0x42, 0x42, 0xFF, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00},    // '#'
+   {0x00, 0x10, 0x7E, 0x90, 0x90, 0x90, 0x7C, 0x12, 0x12, 0x12, 0xFC, 0x10, 0x00, 0x00, 0x00, 0x00},    // '$'
+   {0x00, 0x00, 0x61, 0x91, 0x92, 0x64, 0x08, 0x10, 0x26, 0x49, 0x89, 0x86, 0x00, 0x00, 0x00, 0x00},    // '%'
+   {0x00, 0x70, 0x88, 0x88, 0x88, 0x50, 0x60, 0x91, 0x8A, 0x84, 0x4A, 0x31, 0x00, 0x00, 0x00, 0x00},    // '&'
+   {0x00, 0x18, 0x18, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},    // '''
+   {0x00, 0x06, 0x18, 0x20, 0x40, 0x40, 0x40, 0x40, 0x40, 0x20, 0x18, 0x06, 0x00, 0x00, 0x00, 0x00},    // '('
+   {0x00, 0x60, 0x18, 0x04, 0x02, 0x02, 0x02, 0x02, 0x02, 0x04, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00},    // ')'
+   {0x00, 0x00, 0x10, 0x92, 0x54, 0x38, 0xFE, 0x38, 0x54, 0x92, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},    // '*'
+   {0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0xFE, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},    // '+'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x10, 0x20, 0x00, 0x00},    // ','
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},    // '-'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},    // '.'
+   {0x00, 0x00, 0x01, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00},    // '/'
+   {0x00, 0x3C, 0x42, 0x83, 0x85, 0x89, 0x91, 0xA1, 0xC1, 0x81, 0x42, 0x3C, 0x00, 0x00, 0x00, 0x00},    // '0'
+   {0x00, 0x10, 0x30, 0x50, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x7C, 0x00, 0x00, 0x00, 0x00},    // '1'
+   {0x00, 0x3C, 0x42, 0x81, 0x01, 0x02, 0x3C, 0x40, 0x80, 0x80, 0x80, 0xFF, 0x00, 0x00, 0x00, 0x00},    // '2'
+   {0x00, 0x3C, 0x42, 0x81, 0x01, 0x02, 0x3C, 0x02, 0x01, 0x81, 0x42, 0x3C, 0x00, 0x00, 0x00, 0x00},    // '3'
+   {0x00, 0x02, 0x06, 0x0A, 0x12, 0x22, 0x42, 0x82, 0xFF, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00},    // '4'
+   {0x00, 0xFF, 0x80, 0x80, 0x80, 0xFC, 0x02, 0x01, 0x01, 0x81, 0x42, 0x3C, 0x00, 0x00, 0x00, 0x00},    // '5'
+   {0x00, 0x3C, 0x42, 0x81, 0x80, 0xBC, 0xC2, 0x81, 0x81, 0x81, 0x42, 0x3C, 0x00, 0x00, 0x00, 0x00},    // '6'
+   {0x00, 0xFF, 0x81, 0x01, 0x02, 0x04, 0x08, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},    // '7'
+   {0x00, 0x3C, 0x42, 0x81, 0x81, 0x42, 0x3C, 0x42, 0x81, 0x81, 0x42, 0x3C, 0x00, 0x00, 0x00, 0x00},    // '8'
+   {0x00, 0x3C, 0x42, 0x81, 0x81, 0x43, 0x3D, 0x01, 0x01, 0x81, 0x42, 0x3C, 0x00, 0x00, 0x00, 0x00},    // '9'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},    // ':'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x10, 0x20, 0x00, 0x00},    // ';'
+   {0x00, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00},    // '<'
+   {0x00, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},    // '='
+   {0x00, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00},    // '>'
+   {0x00, 0x38, 0x44, 0x82, 0x82, 0x04, 0x08, 0x10, 0x10, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},    // '?'
+   {0x00, 0x3C, 0x42, 0x81, 0x99, 0xA5, 0xA5, 0xA5, 0x9E, 0x80, 0x41, 0x3E, 0x00, 0x00, 0x00, 0x00},    // '@'
+   {0x00, 0x18, 0x24, 0x42, 0x81, 0x81, 0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00},    // 'A'
+   {0x00, 0xFC, 0x42, 0x41, 0x41, 0x42, 0x7C, 0x42, 0x41, 0x41, 0x42, 0xFC, 0x00, 0x00, 0x00, 0x00},    // 'B'
+   {0x00, 0x3C, 0x42, 0x81, 0x81, 0x80, 0x80, 0x80, 0x80, 0x81, 0x42, 0x3C, 0x00, 0x00, 0x00, 0x00},    // 'C'
+   {0x00, 0xFC, 0x42, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x42, 0xFC, 0x00, 0x00, 0x00, 0x00},    // 'D'
+   {0x00, 0xFF, 0x80, 0x80, 0x80, 0x80, 0xFC, 0x80, 0x80, 0x80, 0x80, 0xFF, 0x00, 0x00, 0x00, 0x00},    // 'E'
+   {0x00, 0xFF, 0x80, 0x80, 0x80, 0x80, 0xFC, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00},    // 'F'
+   {0x00, 0x3C, 0x42, 0x81, 0x81, 0x80, 0x9F, 0x81, 0x81, 0x81, 0x42, 0x3C, 0x00, 0x00, 0x00, 0x00},    // 'G'
+   {0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00},    // 'H'
+   {0x00, 0x38, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00},    // 'I'
+   {0x00, 0x07, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x82, 0x82, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00},    // 'J'
+   {0x00, 0x81, 0x82, 0x84, 0x88, 0x90, 0xE0, 0x90, 0x88, 0x84, 0x82, 0x81, 0x00, 0x00, 0x00, 0x00},    // 'K'
+   {0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xFF, 0x00, 0x00, 0x00, 0x00},    // 'L'
+   {0x00, 0x81, 0xC3, 0xA5, 0x99, 0x99, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00},    // 'M'
+   {0x00, 0x81, 0xC1, 0xA1, 0x91, 0x89, 0x85, 0x83, 0x81, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00},    // 'N'
+   {0x00, 0x3C, 0x42, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x42, 0x3C, 0x00, 0x00, 0x00, 0x00},    // 'O'
+   {0x00, 0xFC, 0x82, 0x81, 0x81, 0x82, 0xFC, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00},    // 'P'
+   {0x00, 0x3C, 0x42, 0x81, 0x81, 0x81, 0x81, 0x81, 0x89, 0x85, 0x42, 0x3D, 0x00, 0x00, 0x00, 0x00},    // 'Q'
+   {0x00, 0xFC, 0x82, 0x81, 0x81, 0x82, 0xFC, 0x90, 0x88, 0x84, 0x82, 0x81, 0x00, 0x00, 0x00, 0x00},    // 'R'
+   {0x00, 0x3C, 0x42, 0x81, 0x80, 0x40, 0x3C, 0x02, 0x01, 0x81, 0x42, 0x3C, 0x00, 0x00, 0x00, 0x00},    // 'S'
+   {0x00, 0xFE, 0x92, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},    // 'T'
+   {0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x42, 0x3C, 0x00, 0x00, 0x00, 0x00},    // 'U'
+   {0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00},    // 'V'
+   {0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x99, 0x99, 0xA5, 0xA5, 0x42, 0x00, 0x00, 0x00, 0x00},    // 'W'
+   {0x00, 0x81, 0x81, 0x81, 0x42, 0x24, 0x18, 0x24, 0x42, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00},    // 'X'
+   {0x00, 0x82, 0x82, 0x82, 0x82, 0x44, 0x28, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},    // 'Y'
+   {0x00, 0xFF, 0x01, 0x01, 0x02, 0x04, 0x18, 0x20, 0x40, 0x80, 0x80, 0xFF, 0x00, 0x00, 0x00, 0x00},    // 'Z'
+   {0x00, 0x7E, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x7E, 0x00, 0x00, 0x00, 0x00},    // '['
+   {0x00, 0x00, 0x80, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00},    // '\'
+   {0x00, 0x7E, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x7E, 0x00, 0x00, 0x00, 0x00},    // ']'
+   {0x00, 0x18, 0x24, 0x42, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},    // '^'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00},    // '_'
+   {0x00, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},    // '`'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x02, 0x02, 0x7E, 0x82, 0x82, 0x7D, 0x00, 0x00, 0x00, 0x00},    // 'a'
+   {0x00, 0x80, 0x80, 0x80, 0x80, 0xBC, 0xC2, 0x81, 0x81, 0x81, 0xC2, 0xBC, 0x00, 0x00, 0x00, 0x00},    // 'b'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x42, 0x80, 0x80, 0x80, 0x42, 0x3C, 0x00, 0x00, 0x00, 0x00},    // 'c'
+   {0x00, 0x01, 0x01, 0x01, 0x01, 0x3D, 0x43, 0x81, 0x81, 0x81, 0x43, 0x3D, 0x00, 0x00, 0x00, 0x00},    // 'd'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x42, 0x81, 0xFF, 0x80, 0x40, 0x3E, 0x00, 0x00, 0x00, 0x00},    // 'e'
+   {0x00, 0x0E, 0x11, 0x10, 0x10, 0xFE, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00},    // 'f'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x43, 0x81, 0x81, 0x43, 0x3D, 0x01, 0x02, 0x7C, 0x00, 0x00},    // 'g'
+   {0x00, 0x80, 0x80, 0x80, 0x80, 0xBC, 0xC2, 0x81, 0x81, 0x81, 0x81, 0x81, 0x00, 0x00, 0x00, 0x00},    // 'h'
+   {0x00, 0x00, 0x08, 0x08, 0x00, 0x38, 0x08, 0x08, 0x08, 0x08, 0x08, 0x3E, 0x00, 0x00, 0x00, 0x00},    // 'i'
+   {0x00, 0x00, 0x02, 0x02, 0x00, 0x06, 0x02, 0x02, 0x02, 0x02, 0x02, 0x82, 0x44, 0x38, 0x00, 0x00},    // 'j'
+   {0x00, 0x80, 0x80, 0x80, 0x80, 0x82, 0x84, 0x88, 0x90, 0xA8, 0xC4, 0x82, 0x00, 0x00, 0x00, 0x00},    // 'k'
+   {0x38, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x3E, 0x00, 0x00, 0x00, 0x00},    // 'l'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0xEC, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x00, 0x00, 0x00, 0x00},    // 'm'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0xB8, 0xC4, 0x82, 0x82, 0x82, 0x82, 0x82, 0x00, 0x00, 0x00, 0x00},    // 'n'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x42, 0x81, 0x81, 0x81, 0x42, 0x3C, 0x00, 0x00, 0x00, 0x00},    // 'o'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0xBC, 0xC2, 0x81, 0x81, 0x81, 0xC2, 0xBC, 0x80, 0x80, 0x00, 0x00},    // 'p'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x43, 0x81, 0x81, 0x81, 0x43, 0x3D, 0x01, 0x01, 0x00, 0x00},    // 'q'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0xBE, 0xC1, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00},    // 'r'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x81, 0x80, 0x7E, 0x01, 0x81, 0x7E, 0x00, 0x00, 0x00, 0x00},    // 's'
+   {0x10, 0x10, 0x10, 0x10, 0x10, 0xFE, 0x10, 0x10, 0x10, 0x10, 0x11, 0x0E, 0x00, 0x00, 0x00, 0x00},    // 't'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0x43, 0x3D, 0x00, 0x00, 0x00, 0x00},    // 'u'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x81, 0x81, 0x81, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00},    // 'v'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x82, 0x92, 0x92, 0x92, 0xAA, 0x44, 0x00, 0x00, 0x00, 0x00},    // 'w'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x42, 0x24, 0x18, 0x24, 0x42, 0x81, 0x00, 0x00, 0x00, 0x00},    // 'x'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x81, 0x81, 0x81, 0x43, 0x3D, 0x01, 0x02, 0x7C, 0x00, 0x00},    // 'y'
+   {0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x02, 0x04, 0x18, 0x20, 0x40, 0xFF, 0x00, 0x00, 0x00, 0x00},    // 'z'
+   {0x00, 0x04, 0x08, 0x10, 0x10, 0x10, 0x20, 0x10, 0x10, 0x10, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00},    // '{'
+   {0x00, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00},    // '|'
+   {0x00, 0x40, 0x20, 0x10, 0x10, 0x10, 0x08, 0x10, 0x10, 0x10, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00},    // '}'
+   {0x00, 0x00, 0x70, 0x99, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},    // '~'
+   {0x00, 0x00, 0x00, 0x00, 0x08, 0x1C, 0x36, 0x63, 0x63, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}     // 128
+   };
+
+const TUint8 font16x16[][32] =
+   {
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // ' '
+	{0x00,0x00,0x00,0x00,0x03,0xc0,0x0f,0xf0,0x0f,0xf0,0x0f,0xf0,0x03,0xc0,0x03,0xc0,0x00,0x00,0x03,0xc0,0x03,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '!'
+	{0x00,0x00,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x0c,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '"'
+	{0x00,0x00,0x00,0x00,0x0f,0x3c,0x0f,0x3c,0x3f,0xff,0x0f,0x3c,0x0f,0x3c,0x0f,0x3c,0x3f,0xff,0x0f,0x3c,0x0f,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '#'
+	{0x00,0xf0,0x00,0xf0,0x0f,0xfc,0x3c,0x0f,0x3c,0x03,0x3c,0x00,0x0f,0xfc,0x00,0x0f,0x30,0x0f,0x3c,0x0f,0x0f,0xfc,0x00,0xf0,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00},    // '$'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x03,0x3c,0x0f,0x00,0x3c,0x00,0xf0,0x03,0xc0,0x0f,0x0f,0x3c,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '%'
+	{0x00,0x00,0x00,0x00,0x03,0xf0,0x0f,0x3c,0x0f,0x3c,0x03,0xf0,0x0f,0xcf,0x3c,0xfc,0x3c,0x3c,0x3c,0x3c,0x0f,0xcf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '&'
+	{0x00,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '''
+	{0x00,0x00,0x00,0x00,0x00,0xf0,0x03,0xc0,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x03,0xc0,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '('
+	{0x00,0x00,0x00,0x00,0x03,0xc0,0x00,0xf0,0x00,0x3c,0x00,0x3c,0x00,0x3c,0x00,0x3c,0x00,0x3c,0x00,0xf0,0x03,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // ')'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x3c,0x0f,0xf0,0xff,0xff,0x0f,0xf0,0x3c,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '*'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xc0,0x03,0xc0,0x03,0xc0,0xff,0xff,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '+'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // ','
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '-'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xc0,0x03,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '.'
+	{0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x0f,0x00,0x3c,0x00,0xf0,0x03,0xc0,0x0f,0x00,0x3c,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '/'
+	{0x00,0x00,0x00,0x00,0x0f,0xfc,0x3c,0x0f,0x3c,0x3f,0x3c,0xff,0x3f,0xcf,0x3f,0x0f,0x3c,0x0f,0x3c,0x0f,0x0f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '0'
+	{0x00,0x00,0x00,0x00,0x00,0xf0,0x03,0xf0,0x0f,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '1'
+	{0x00,0x00,0x00,0x00,0x3f,0xfc,0x00,0x0f,0x00,0x0f,0x00,0x3c,0x00,0xf0,0x03,0xc0,0x0f,0x00,0x3c,0x00,0x3f,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '2'
+	{0x00,0x00,0x00,0x00,0x0f,0xfc,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x03,0xfc,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x0f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '3'
+	{0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0xfc,0x03,0xfc,0x0f,0x3c,0x3c,0x3c,0x3f,0xff,0x00,0x3c,0x00,0x3c,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '4'
+	{0x00,0x00,0x00,0x00,0x3f,0xff,0x3c,0x00,0x3c,0x00,0x3c,0x00,0x3f,0xfc,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x3f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '5'
+	{0x00,0x00,0x00,0x00,0x03,0xf0,0x0f,0x00,0x3c,0x00,0x3c,0x00,0x3f,0xfc,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x0f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '6'
+	{0x00,0x00,0x00,0x00,0x3f,0xff,0x00,0x0f,0x00,0x0f,0x00,0x3c,0x00,0xf0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '7'
+	{0x00,0x00,0x00,0x00,0x0f,0xfc,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x0f,0xfc,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x0f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '8'
+	{0x00,0x00,0x00,0x00,0x0f,0xfc,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x0f,0xff,0x00,0x0f,0x00,0x0f,0x00,0x3c,0x0f,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '9'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xc0,0x03,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xc0,0x03,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // ':'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xc0,0x03,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xc0,0x03,0xc0,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // ';'
+	{0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0xf0,0x03,0xc0,0x0f,0x00,0x3c,0x00,0x0f,0x00,0x03,0xc0,0x00,0xf0,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '<'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0xfc,0x00,0x00,0x00,0x00,0x3f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '='
+	{0x00,0x00,0x00,0x00,0x3c,0x00,0x0f,0x00,0x03,0xc0,0x00,0xf0,0x00,0x3c,0x00,0xf0,0x03,0xc0,0x0f,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '>'
+	{0x00,0x00,0x00,0x00,0x0f,0xfc,0x3c,0x0f,0x3c,0x0f,0x00,0x3c,0x00,0xf0,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '?'
+	{0x00,0x00,0x00,0x00,0x0f,0xfc,0x3c,0x0f,0x3c,0x0f,0x3c,0xff,0x3c,0xff,0x3c,0xff,0x3c,0xfc,0x3c,0x00,0x0f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '@'
+	{0x00,0x00,0x00,0x00,0x00,0xc0,0x03,0xf0,0x0f,0x3c,0x3c,0x0f,0x3c,0x0f,0x3f,0xff,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'A'
+	{0x00,0x00,0x00,0x00,0x0f,0xfc,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0xfc,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'B'
+	{0x00,0x00,0x00,0x00,0x03,0xfc,0x0f,0x0f,0x3c,0x03,0x3c,0x00,0x3c,0x00,0x3c,0x00,0x3c,0x03,0x0f,0x0f,0x03,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'C'
+	{0x00,0x00,0x00,0x00,0x0f,0xf0,0x0f,0x3c,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x3c,0x0f,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'D'
+	{0x00,0x00,0x00,0x00,0x0f,0xff,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0xfc,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'E'
+	{0x00,0x00,0x00,0x00,0x0f,0xff,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0xfc,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'F'
+	{0x00,0x00,0x00,0x00,0x03,0xfc,0x0f,0x0f,0x3c,0x00,0x3c,0x00,0x3c,0x00,0x3c,0xff,0x3c,0x0f,0x0f,0x0f,0x03,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'G'
+	{0x00,0x00,0x00,0x00,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x3f,0xff,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'H'
+	{0x00,0x00,0x00,0x00,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'I'
+	{0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x3c,0x00,0x3c,0x00,0x3c,0x00,0x3c,0x00,0x3c,0x3c,0x3c,0x3c,0x3c,0x0f,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'J'
+	{0x00,0x00,0x00,0x00,0x0f,0x0f,0x0f,0x0f,0x0f,0x3c,0x0f,0x3c,0x0f,0xf0,0x0f,0x3c,0x0f,0x3c,0x0f,0x0f,0x0f,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'K'
+	{0x00,0x00,0x00,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'L'
+	{0x00,0x00,0x00,0x00,0xf0,0x0f,0xfc,0x3f,0xff,0xff,0xf3,0xcf,0xf0,0x0f,0xf0,0x0f,0xf0,0x0f,0xf0,0x0f,0xf0,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'M'
+	{0x00,0x00,0x00,0x00,0x3c,0x0f,0x3f,0x0f,0x3f,0xcf,0x3f,0xff,0x3c,0xff,0x3c,0x3f,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'N'
+	{0x00,0x00,0x00,0x00,0x03,0xf0,0x0f,0x3c,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x0f,0x3c,0x03,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'O'
+	{0x00,0x00,0x00,0x00,0x0f,0xfc,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0xfc,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'P'
+	{0x00,0x00,0x00,0x00,0x0f,0xfc,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x3c,0xff,0x0f,0xfc,0x00,0x3c,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'Q'
+	{0x00,0x00,0x00,0x00,0x0f,0xfc,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0xfc,0x0f,0x3c,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'R'
+	{0x00,0x00,0x00,0x00,0x0f,0xfc,0x3c,0x0f,0x3c,0x0f,0x0f,0x00,0x03,0xf0,0x00,0x3c,0x3c,0x0f,0x3c,0x0f,0x0f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'S'
+	{0x00,0x00,0x00,0x00,0xff,0xff,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'T'
+	{0x00,0x00,0x00,0x00,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x0f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'U'
+	{0x00,0x00,0x00,0x00,0xf0,0x0f,0xf0,0x0f,0xf0,0x0f,0xf0,0x0f,0xf0,0x0f,0xf0,0x0f,0x3c,0x3c,0x0f,0xf0,0x03,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'V'
+	{0x00,0x00,0x00,0x00,0xf0,0x0f,0xf0,0x0f,0xf0,0x0f,0xf0,0x0f,0xf0,0x0f,0xf3,0xcf,0xff,0xff,0x3c,0x3c,0x3c,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'W'
+	{0x00,0x00,0x00,0x00,0xf0,0x0f,0xf0,0x0f,0x3c,0x3c,0x0f,0xf0,0x03,0xc0,0x0f,0xf0,0x3c,0x3c,0xf0,0x0f,0xf0,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'X'
+	{0x00,0x00,0x00,0x00,0xf0,0x0f,0xf0,0x0f,0xf0,0x0f,0x3c,0x3c,0x0f,0xf0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'Y'
+	{0x00,0x00,0x00,0x00,0xff,0xff,0x00,0x0f,0x00,0x3c,0x00,0xf0,0x03,0xc0,0x0f,0x00,0x3c,0x00,0xf0,0x00,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'Z'
+	{0x00,0x00,0x00,0x00,0x0f,0xf0,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '['
+	{0x00,0x00,0x00,0x00,0x30,0x00,0x3c,0x00,0x3f,0x00,0x0f,0xc0,0x03,0xf0,0x00,0xfc,0x00,0x3f,0x00,0x0f,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '\'
+	{0x00,0x00,0x00,0x00,0x0f,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x0f,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // ']'
+	{0x00,0xc0,0x03,0xf0,0x0f,0x3c,0x3c,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '^'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00},    // '_'
+	{0x03,0xc0,0x03,0xc0,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '`'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f,0xf0,0x00,0x3c,0x0f,0xfc,0x3c,0x3c,0x3c,0x3c,0x0f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'a'
+	{0x00,0x00,0x00,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0xf0,0x0f,0x3c,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x3c,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'b'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f,0xfc,0x3c,0x0f,0x3c,0x00,0x3c,0x00,0x3c,0x0f,0x0f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'c'
+	{0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x3c,0x00,0x3c,0x03,0xfc,0x0f,0x3c,0x3c,0x3c,0x3c,0x3c,0x3c,0x3c,0x0f,0xcf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'd'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f,0xfc,0x3c,0x0f,0x3f,0xff,0x3c,0x00,0x3c,0x0f,0x0f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'e'
+	{0x00,0x00,0x00,0x00,0x03,0xf0,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x3f,0xf0,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'f'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f,0xcf,0x3c,0x3c,0x3c,0x3c,0x3c,0x3c,0x0f,0xfc,0x00,0x3c,0x00,0x3c,0x0f,0xf0,0x00,0x00,0x00,0x00,0x00,0x00},    // 'g'
+	{0x00,0x00,0x00,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x3c,0x0f,0xcf,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'h'
+	{0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'i'
+	{0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x3c,0x00,0x00,0x00,0x3c,0x00,0x3c,0x00,0x3c,0x00,0x3c,0x00,0x3c,0x00,0x3c,0x0f,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'j'
+	{0x00,0x00,0x00,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x0f,0x0f,0x0f,0x3c,0x0f,0xf0,0x0f,0x3c,0x0f,0x0f,0x0f,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'k'
+	{0x00,0x00,0x00,0x00,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'l'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x3c,0xf3,0xcf,0xf3,0xcf,0xf3,0xcf,0xf3,0xcf,0xf3,0xcf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'm'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0xfc,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'n'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f,0xfc,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x0f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'o'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0xfc,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0xfc,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'p'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f,0xcf,0x3c,0x3c,0x3c,0x3c,0x3c,0x3c,0x0f,0xfc,0x00,0x3c,0x00,0x3c,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00},    // 'q'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0xfc,0x0f,0x0f,0x0f,0x0f,0x0f,0x00,0x0f,0x00,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'r'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f,0xfc,0x3c,0x0f,0x0f,0xc0,0x00,0xfc,0x3c,0x0f,0x0f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 's'
+	{0x00,0x00,0x00,0x00,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x3f,0xfc,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 't'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x3c,0x3c,0x3c,0x3c,0x3c,0x3c,0x3c,0x3c,0x3c,0x0f,0xcf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'u'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x0f,0xf0,0x0f,0xf0,0x0f,0x3c,0x3c,0x0f,0xf0,0x03,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'v'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf0,0x0f,0xf0,0x0f,0xf3,0xcf,0xf3,0xcf,0x3f,0xfc,0x3c,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'w'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x0f,0x0f,0x3c,0x03,0xf0,0x03,0xf0,0x0f,0x3c,0x3c,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'x'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x3c,0x0f,0x0f,0xff,0x00,0x0f,0x00,0x3c,0x00,0xf0,0x00,0x00,0x00,0x00,0x00,0x00},    // 'y'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0xff,0x00,0x3c,0x00,0xf0,0x03,0xc0,0x0f,0x00,0x3f,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'z'
+	{0x00,0x00,0x00,0x00,0x00,0xfc,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x3f,0x00,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '{'
+	{0x00,0x00,0x00,0x00,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x00,0x00,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '|'
+	{0x00,0x00,0x00,0x00,0x3f,0x00,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x03,0xfc,0x03,0xc0,0x03,0xc0,0x03,0xc0,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '}'
+	{0x00,0x00,0x00,0x00,0x0f,0xcf,0x3c,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '~'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x03,0xf0,0x0f,0x3c,0x3c,0x0f,0x3c,0x0f,0x3f,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}    // 128
+   };
+
+const TUint8 font24x16[][48] =
+   {
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // ' '
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '!'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xf1,0xff,0x1f,0x81,0xf8,0xfc,0x0f,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '"'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x8f,0xc0,0x1f,0x8f,0xc0,0xff,0xff,0xf8,0x1f,0x8f,0xc0,0x1f,0x8f,0xc0,0x1f,0x8f,0xc0,0xff,0xff,0xf8,0x1f,0x8f,0xc0,0x1f,0x8f,0xc0,0x1f,0x8f,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '#'
+	{0x00,0x00,0x00,0x00,0x70,0x00,0x00,0x70,0x00,0x1f,0xff,0xc0,0xfc,0x71,0xf8,0xfc,0x70,0x00,0xfc,0x70,0x00,0x1f,0xff,0xc0,0x00,0x71,0xf8,0x00,0x71,0xf8,0xfc,0x71,0xf8,0x1f,0xff,0xc0,0x00,0x70,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '$'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xf8,0xfc,0x01,0xc0,0x00,0x0f,0xc0,0x00,0x0e,0x00,0x00,0x7e,0x00,0x03,0xf0,0x00,0x03,0x80,0x00,0x1f,0x80,0x00,0x1c,0x01,0xf8,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '%'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xfe,0x00,0x1f,0x8f,0xc0,0x1f,0x8f,0xc0,0x03,0xfe,0x00,0x1f,0xf1,0xf8,0xfc,0x7f,0xc0,0xfc,0x0f,0xc0,0xfc,0x0f,0xc0,0xfc,0x0f,0xc0,0x1f,0xf1,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '&'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7f,0xc0,0x00,0x7e,0x00,0x03,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '''
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f,0xc0,0x00,0x7e,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x00,0x7e,0x00,0x00,0x0f,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '('
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xf0,0x00,0x00,0x7e,0x00,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x7e,0x00,0x03,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // ')'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x81,0xf8,0x03,0xff,0xc0,0xff,0xff,0xff,0x03,0xff,0xc0,0x1f,0x81,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '*'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x1f,0xff,0xf8,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '+'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7f,0xc0,0x00,0x7e,0x00,0x03,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // ','
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '-'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '.'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xf8,0x00,0x01,0xc0,0x00,0x0f,0xc0,0x00,0x0e,0x00,0x00,0x7e,0x00,0x00,0x70,0x00,0x03,0xf0,0x00,0x03,0x80,0x00,0x1f,0x80,0x00,0x1c,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '/'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x71,0xf8,0xfc,0x71,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '0'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x03,0xfe,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x1f,0xff,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '1'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xc0,0xfc,0x01,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x0f,0xc0,0x00,0x7e,0x00,0x03,0xf0,0x00,0x1f,0x80,0x00,0xfc,0x00,0x00,0xff,0xff,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '2'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xc0,0xfc,0x01,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x03,0xff,0xc0,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '3'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f,0xc0,0x00,0x7f,0xc0,0x03,0xff,0xc0,0x1f,0x8f,0xc0,0xfc,0x0f,0xc0,0xff,0xff,0xf8,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '4'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xf8,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xff,0xff,0xc0,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '5'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xff,0xc0,0x1f,0x80,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xff,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '6'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x0f,0xc0,0x00,0x7e,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '7'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '8'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x0f,0xc0,0x1f,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '9'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // ':'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x03,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // ';'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xf8,0x00,0x0f,0xc0,0x00,0x7e,0x00,0x03,0xf0,0x00,0x1f,0x80,0x00,0x1f,0x80,0x00,0x03,0xf0,0x00,0x00,0x7e,0x00,0x00,0x0f,0xc0,0x00,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '<'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '='
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x80,0x00,0x03,0xf0,0x00,0x00,0x7e,0x00,0x00,0x0f,0xc0,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x0f,0xc0,0x00,0x7e,0x00,0x03,0xf0,0x00,0x1f,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '>'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xc0,0xfc,0x01,0xf8,0x00,0x01,0xf8,0x00,0x0f,0xc0,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '?'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x7f,0xf8,0xfc,0x7f,0xf8,0xfc,0x7f,0xf8,0xfc,0x7f,0xf8,0xfc,0x7f,0xc0,0xfc,0x00,0x00,0x1f,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '@'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x03,0xfe,0x00,0x1f,0x8f,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xff,0xff,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'A'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xff,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xff,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'B'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xff,0xc0,0x1f,0x81,0xf8,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0x1f,0x81,0xf8,0x03,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'C'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xfe,0x00,0xfc,0x0f,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x0f,0xc0,0xff,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'D'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xf8,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xff,0xff,0xc0,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xff,0xff,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'E'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xf8,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xff,0xff,0xc0,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'F'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xff,0xc0,0x1f,0x81,0xf8,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x0f,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0x81,0xf8,0x03,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'G'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xff,0xff,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'H'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xff,0xc0,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x03,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'I'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7f,0xf8,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0xfc,0x0f,0xc0,0xfc,0x0f,0xc0,0x1f,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'J'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xf8,0xfc,0x0f,0xc0,0xfc,0x7e,0x00,0xff,0xf0,0x00,0xff,0x80,0x00,0xff,0x80,0x00,0xff,0xf0,0x00,0xfc,0x7e,0x00,0xfc,0x0f,0xc0,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'K'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xff,0xff,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'L'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xf8,0xff,0x8f,0xf8,0xff,0xff,0xf8,0xff,0xff,0xf8,0xfc,0x71,0xf8,0xfc,0x71,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'M'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xf8,0xff,0x81,0xf8,0xff,0xf1,0xf8,0xff,0xff,0xf8,0xfc,0x7f,0xf8,0xfc,0x0f,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'N'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'O'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xff,0xff,0xc0,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'P'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xff,0xf1,0xf8,0xfc,0x7f,0xf8,0x1f,0xff,0xc0,0x00,0x0f,0xc0,0x00,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00},    // 'Q'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xff,0xff,0xc0,0xfc,0x7e,0x00,0xfc,0x0f,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'R'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x00,0x00,0x1f,0x80,0x00,0x03,0xfe,0x00,0x00,0x0f,0xc0,0x00,0x01,0xf8,0x00,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'S'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xf8,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'T'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'U'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0x8f,0xc0,0x03,0xfe,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'V'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x71,0xf8,0xfc,0x71,0xf8,0xff,0xff,0xf8,0xff,0x8f,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'W'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0x8f,0xc0,0x1f,0x8f,0xc0,0x03,0xfe,0x00,0x03,0xfe,0x00,0x1f,0x8f,0xc0,0x1f,0x8f,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'X'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x81,0xf8,0x1f,0x81,0xf8,0x1f,0x81,0xf8,0x1f,0x81,0xf8,0x03,0xff,0xc0,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'Y'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x0f,0xc0,0x00,0x7e,0x00,0x03,0xf0,0x00,0x1f,0x80,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xff,0xff,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'Z'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xff,0xc0,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '['
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0x1c,0x00,0x00,0x1f,0x80,0x00,0x03,0x80,0x00,0x03,0xf0,0x00,0x00,0x70,0x00,0x00,0x7e,0x00,0x00,0x0e,0x00,0x00,0x0f,0xc0,0x00,0x01,0xc0,0x00,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '\'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xff,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x00,0x0f,0xc0,0x03,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // ']'
+	{0x00,0x00,0x00,0x00,0x70,0x00,0x03,0xfe,0x00,0x1f,0x8f,0xc0,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '^'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00},    // '_'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xf0,0x00,0x03,0xf0,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '`'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xc0,0x00,0x01,0xf8,0x1f,0xff,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'a'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xff,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xff,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'b'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x01,0xf8,0x1f,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'c'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x1f,0xff,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'd'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xc0,0xfc,0x01,0xf8,0xff,0xff,0xf8,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x01,0xf8,0x1f,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'e'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xff,0xc0,0x1f,0x81,0xf8,0x1f,0x80,0x00,0x1f,0x80,0x00,0xff,0xf0,0x00,0x1f,0x80,0x00,0x1f,0x80,0x00,0x1f,0x80,0x00,0x1f,0x80,0x00,0x1f,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'f'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x1f,0xff,0xc0,0x00,0x00,0x00},    // 'g'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xff,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'h'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'i'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x00,0x00,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x1f,0x81,0xf8,0x03,0xff,0xc0,0x00,0x00,0x00},    // 'j'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x01,0xf8,0xfc,0x0f,0xc0,0xfc,0x7e,0x00,0xff,0xf0,0x00,0xfc,0x7e,0x00,0xfc,0x0f,0xc0,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'k'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xfe,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x03,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'l'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x8f,0xc0,0xfc,0x71,0xf8,0xfc,0x71,0xf8,0xfc,0x71,0xf8,0xfc,0x71,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'm'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'n'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'o'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xff,0xff,0xc0,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00},    // 'p'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x00,0x00},    // 'q'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xfc,0x01,0xf8,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'r'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xff,0xc0,0xfc,0x00,0x00,0x1f,0xf0,0x00,0x00,0x7f,0xc0,0x00,0x01,0xf8,0x00,0x01,0xf8,0x1f,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 's'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0xff,0xff,0xc0,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x03,0xf0,0x00,0x00,0x7f,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 't'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'u'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0x8f,0xc0,0x03,0xfe,0x00,0x00,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'v'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x71,0xf8,0xfc,0x71,0xf8,0xff,0xff,0xf8,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'w'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xf8,0x1f,0x8f,0xc0,0x03,0xfe,0x00,0x03,0xfe,0x00,0x03,0xfe,0x00,0x1f,0x8f,0xc0,0xfc,0x01,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'x'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0x1f,0xff,0xf8,0x00,0x01,0xf8,0x00,0x01,0xf8,0x1f,0xff,0xc0,0x00,0x00,0x00},    // 'y'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xf8,0x00,0x01,0xf8,0x00,0x0f,0xc0,0x00,0x7e,0x00,0x03,0xf0,0x00,0x1f,0x80,0x00,0xff,0xff,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // 'z'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f,0xf8,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x1f,0x80,0x00,0x1f,0x80,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x0f,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '{'
+	{0x00,0x00,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '|'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xf0,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x01,0xf8,0x00,0x01,0xf8,0x00,0x7e,0x00,0x00,0x7e,0x00,0x00,0x7e,0x00,0x1f,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '}'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0xf1,0xf8,0xfc,0x7f,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},    // '~'
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x03,0xfe,0x00,0x1f,0x8f,0xc0,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xfc,0x01,0xf8,0xff,0xff,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}     // 128
+   };
+
+
+class CFaxTestStep : public CTestStep
+{
+public:
+	CFaxTestStep();
+	~CFaxTestStep();
+ 	virtual TVerdict doTestStepPreambleL();
+	virtual TVerdict doTestStepPostambleL();
+
+protected:
+	void ReadDestPhoneNumberFromIniFileL(TDes8& aPhoneNumber);
+	void ReadFaxCommDBSettingsL(TFaxSettings& aFaxSettings);
+	TInt BeginFaxTransfer(CFaxTransfer* aFaxSession);
+	void GenerateHeaderFileL(TFaxSettings& aFaxSettings, const TUint8* aFont,
+							 TInt aWidth, TInt aHeight);
+
+protected:
+	CActiveScheduler*  iScheduler;
+	TBuf<32>   iPortDriverName;
+	TBuf<32>   iCommPortName;
+	TBuf8<32>  iModemInitString;
+	TBuf8<32>  iFaxInitString;
+};
+
+
+#endif // __TE_FAXBASE_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_FaxServer.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,198 @@
+// Copyright (c) 2004-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:
+// Telephony Fax Test server test code.
+// 
+//
+
+/**
+ @file
+ @internalComponent
+*/
+
+#include "faxdefn.h"
+#include "FAXSET.H"
+#include "CFAX32.H"
+
+#include "TE_FaxServer.h"
+#include "TE_FaxTest.h"
+
+
+_LIT(KServerName,"TE_Fax");
+
+
+/**
+ *  Called inside the MainL() function to create and start the CTestServer
+ *  derived server.
+ *
+ *  @return Instance of the test server
+ */
+CFaxTestServer* CFaxTestServer::NewL()
+	{
+	CFaxTestServer*  server = new(ELeave) CFaxTestServer();
+	CleanupStack::PushL(server);
+	// CServer base class call
+	server->StartL(KServerName);
+	CleanupStack::Pop(server);
+	return server;
+	} // CFaxTestIntServer::NewL
+
+
+/**
+ *  Much simpler, uses the new Rendezvous() call to sync with the client.
+ */
+LOCAL_C void MainL()
+	{
+	//
+	// Start an active scheduler...
+	//
+	CActiveScheduler* scheduler = new(ELeave) CActiveScheduler;
+	CleanupStack::PushL(scheduler);
+	CActiveScheduler::Install(scheduler);
+
+	//
+	// Create the CTestServer derived server...
+	//
+	CFaxTestServer* server = NULL;
+
+	TRAPD(err, server = CFaxTestServer::NewL());
+	if (err == KErrNone)
+		{
+		//
+		// Sync with the client and enter the active scheduler
+		//
+		RProcess::Rendezvous(KErrNone);
+		scheduler->Start();
+		}
+
+	//
+	// Clean up...
+	//
+	CleanupStack::Pop(scheduler);
+	delete server;
+	delete scheduler;
+	} // MainL
+/**
+ *  @return Standard Epoc error code on exit.
+ */
+GLDEF_C TInt E32Main()
+	{
+	CTrapCleanup*  cleanup = CTrapCleanup::New();
+
+	if (cleanup == NULL)
+		{
+		return KErrNoMemory;
+		}
+
+	TRAPD(err, MainL());
+
+	delete cleanup;
+
+	return err;
+	} // E32Main
+
+
+/**
+ *  Implementation of CTestServer pure virtual.
+ *
+ *  @return A CTestStep derived instance.
+ */
+CTestStep* CFaxTestServer::CreateTestStep(const TDesC& aStepName)
+	{
+	CTestStep*  testStep = NULL;
+
+    //
+	// Create the required test step...
+	//
+	if (aStepName == _L("TestFaxDefinition"))
+		{
+		testStep = new CFaxTestFaxDefinition();
+		}
+
+	if (aStepName == _L("TestFaxStorage"))
+		{
+		testStep = new CFaxTestFaxStorage();
+		}
+
+	if (aStepName == _L("TestFaxCoding"))
+		{
+		testStep = new CFaxTestFaxCoding();
+		}
+
+	if (aStepName == _L("TestFaxHeaderDefinition"))
+		{
+		testStep = new CFaxTestFaxHeaderDefinition();
+		}
+
+	if (aStepName == _L("TestTransmitFax01"))
+		{
+		testStep = new CFaxTestTransmitFax01();
+		}
+
+	if (aStepName == _L("TestTransmitFax02"))
+		{
+		testStep = new CFaxTestTransmitFax02();
+		}
+
+	if (aStepName == _L("TestTransmitFax03"))
+		{
+		testStep = new CFaxTestTransmitFax03();
+		}
+
+	if (aStepName == _L("TestTransmitFax04"))
+		{
+		testStep = new CFaxTestTransmitFax04();
+		}
+
+	if (aStepName == _L("TestTransmitFax05"))
+		{
+		testStep = new CFaxTestTransmitFax05();
+		}
+
+	if (aStepName == _L("TestTransmitFax06"))
+		{
+		testStep = new CFaxTestTransmitFax06();
+		}
+
+	if (aStepName == _L("TestReceiveFax01"))
+		{
+		testStep = new CFaxTestReceiveFax01();
+		}
+
+	if (aStepName == _L("TestReceiveFax02"))
+		{
+		testStep = new CFaxTestReceiveFax02();
+		}
+
+	if (aStepName == _L("TestReceiveFax03"))
+		{
+		testStep = new CFaxTestReceiveFax03();
+		}
+
+	if (aStepName == _L("TestReceiveFax04"))
+		{
+		testStep = new CFaxTestReceiveFax04();
+		}
+
+	if (aStepName == _L("TestReceiveFax05"))
+		{
+		testStep = new CFaxTestReceiveFax05();
+		}
+
+	if (aStepName == _L("TestReceiveFax06"))
+		{
+		testStep = new CFaxTestReceiveFax06();
+		}
+
+	return testStep;
+	} // CFaxTestServer::CreateTestStep

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_FaxServer.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,39 @@
+// Copyright (c) 2004-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:
+// Telephony Fax Test server header file.
+// 
+//
+
+/**
+ @file
+ @internalComponent
+*/
+
+#ifndef __TE_FAXSERVER_H__
+#define __TE_FAXSERVER_H__
+
+#include <test/testexecuteserverbase.h>
+#include "TE_FaxBase.h"
+
+
+class CFaxTestServer : public CTestServer
+	{
+public:
+	static CFaxTestServer* NewL();
+	virtual CTestStep* CreateTestStep(const TDesC& aStepName);
+
+private:
+	};
+
+#endif // __TE_FAXSERVER_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_FaxTest.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,2443 @@
+// 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:
+// Telephony Fax Test main test code.
+// 
+//
+
+/**
+ @file
+ @internalComponent
+*/
+
+#include "faxdefn.h"
+#include "fax_reversebytes.h"
+#include "FAXSET.H"
+#include "CFAX32.H"
+#include "etel.h"
+#include "etelmm.h"
+#include "faxhuff.h"
+
+#include "TE_FaxBase.h"
+#include "TE_FaxTest.h"
+
+
+//
+// Constants...
+//
+_LIT(KTEFaxTestStoreFileName, "C:\\TestStore.Fax");
+_LIT(KTEFaxTestEncodeFileName, "C:\\TestEncode.Fax");
+_LIT(KTEFaxTestHeaderFileName, "C:\\TestHeader.Fax");
+_LIT(KTEFaxTSYName, "MM");
+_LIT(KTEFaxPhoneName, "GsmPhone1");
+_LIT(KTEFaxLineName, "Fax");
+
+
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestFaxDefinition::CFaxTestFaxDefinition()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestFaxDefinition"));
+	} // CFaxTestFaxDefinition::CFaxTestFaxDefinition
+
+
+/**
+ *  This tests the definition of a fax it's variables types.
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestFaxDefinition::doTestStepL()
+	{
+#ifdef __EABI__
+	//
+	// Removed due to RVCT warnings!!!
+	//
+	INFO_PRINTF1(_L("Note: This test is not fully run on RVCT compiled platforms!"));
+#else
+	TFaxClass  faxClass = EClassAuto;
+	faxClass = EClass1;
+
+	TFaxPhase  faxPhase = ENotYetStarted;
+	faxPhase = ECallEstablishment;
+
+	TFaxResolution  faxResolution = EFaxNormal;
+	faxResolution = EFaxFine;
+
+	TFaxCompression  faxCompression = EModifiedHuffman;
+	faxCompression = EModifiedRead;
+
+	TInt  tmpValue;
+	tmpValue = KFaxPixelsPerScanLine;
+	tmpValue = KFaxBytesPerScanLine;
+	tmpValue = KFaxCmPerScanLine;
+	tmpValue = KFaxScanLinesPer10Cm;
+	tmpValue = KFaxFineScanLinesPer10Cm;
+	tmpValue = KFaxT4MaxDesLength;
+	tmpValue = KFaxLinesPerBand;
+#endif
+
+	TFaxBufSenderId  faxBufSenderId;
+	faxBufSenderId.Copy(_L8("Test"));
+
+    TRawScanLine rawscanline;
+
+	rawscanline.Zero();
+	rawscanline.SetMax();
+	rawscanline.FillZ();
+	
+	return TestStepResult();
+	} // CFaxTestFaxDefinition::doTestStepL
+
+
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestFaxStorage::CFaxTestFaxStorage()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestFaxStorage"));
+	} // CFaxTestFaxStorage::CFaxTestFaxStorage
+
+
+/**
+ *  This tests the definition of a fax it's variables types.
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestFaxStorage::doTestStepL()
+	{
+	INFO_PRINTF1(_L("Started fax store tests"));
+
+    iWriteFaxFile = CWriteFaxFile::NewL();
+	CleanupStack::PushL(iWriteFaxFile);
+	iReadFaxFile = CReadFaxFile::NewL();
+	CleanupStack::PushL(iReadFaxFile);
+
+	iSenderId.Copy(_L("sender's number"));
+
+	TBuf8<216>  scanlineBlack, scanlineWhite, scanlineAlt, scanlineCount;
+	TInt  index;
+
+	scanlineBlack.SetLength(216);
+	scanlineBlack.Fill(TChar(0));
+	scanlineWhite.SetLength(216);
+	scanlineWhite.Fill(TChar(255));
+	scanlineAlt.SetLength(216);
+	scanlineAlt.Fill(TChar(255));
+	
+	for (index = 0;  index < 216; index += 2)
+		{
+		scanlineAlt[index] = 0;
+		}
+	scanlineCount.SetLength(216);
+
+	for (index = 0;  index < 216;  index++)
+		{
+		scanlineCount[index] = TUint8(index);
+		}
+
+	TInt  numberLines, startnol(124), endnol(132);
+
+	//
+	// test 1
+	//
+	INFO_PRINTF3(_L("Test 1 - %d to %d repeated lines"), startnol, endnol);
+
+	INFO_PRINTF1(_L("All black - Resolution Fine"));
+	for (numberLines=startnol; numberLines<=endnol; numberLines++)
+		{
+		Test1L(numberLines, scanlineBlack, EFaxFine);
+		}
+
+	INFO_PRINTF1(_L("All white - Resolution Fine"));
+	for (numberLines=startnol; numberLines<=endnol; numberLines++)
+		{
+		Test1L(numberLines, scanlineWhite, EFaxFine);
+		}
+
+	INFO_PRINTF1(_L("Black & White - Resolution Fine"));
+	for (numberLines=startnol; numberLines<=endnol; numberLines++)
+		{
+		Test1L(numberLines, scanlineAlt, EFaxFine);
+		}
+
+	INFO_PRINTF1(_L("Counting - Resolution Fine"));
+	for (numberLines=startnol; numberLines<=endnol; numberLines++)
+		{
+		Test1L(numberLines, scanlineCount, EFaxFine);
+		}
+
+	INFO_PRINTF1(_L("Black & White - Resolution Normal"));
+	for (numberLines=startnol; numberLines<=endnol; numberLines++)
+		{
+		Test1L(numberLines, scanlineAlt, EFaxNormal);
+		}
+
+	INFO_PRINTF1(_L("Counting - Resolution Normal"));
+	for (numberLines=startnol; numberLines<=endnol; numberLines++)
+		{
+		Test1L(numberLines, scanlineCount, EFaxNormal);
+		}
+
+	//
+	// test 2
+	//
+	INFO_PRINTF3(_L("Test 2 - %d to %d alternated lines"), startnol, endnol);
+	INFO_PRINTF1(_L("White and Black & White - Resolution Fine"));
+	for (numberLines = startnol;  numberLines <= endnol;  numberLines++)
+		{
+		Test2L(numberLines, scanlineWhite, scanlineAlt, EFaxFine);
+		}
+
+	INFO_PRINTF1(_L("Black and Black & White - Resolution Fine"));
+	for (numberLines = startnol;  numberLines <= endnol;  numberLines++)
+		{
+		Test2L(numberLines, scanlineBlack, scanlineAlt, EFaxFine);
+		}
+
+	INFO_PRINTF1(_L("Counting and Black & White - Resolution Fine"));
+	for (numberLines = startnol;  numberLines <= endnol;  numberLines++)
+		{
+		Test2L(numberLines, scanlineCount, scanlineAlt, EFaxFine);
+		}
+
+	//
+	// test 3
+	//
+	TInt  numberPages, maxNumberPages=5;
+
+	INFO_PRINTF2(_L("Test 3 - 2 to %d pages"), maxNumberPages);
+	for (numberPages = 2;  numberPages <= maxNumberPages;  numberPages++) 
+		{
+		INFO_PRINTF2(_L("%d pages"),numberPages);
+
+		for (numberLines = startnol;  numberLines <= endnol;  numberLines++)
+			{
+			Test3L(numberLines, numberPages);
+			}
+		}
+
+	//
+	// test 4
+	//
+	INFO_PRINTF1(_L("Test 4 - seeking lines"));
+	for (numberLines = startnol;  numberLines <= startnol;  numberLines++)
+		{
+		Test4L(numberLines);
+		}
+
+	//
+	// test 5
+	//
+	TFaxBufSenderId  sd;
+
+	INFO_PRINTF1(_L("Test 5 - writing and reading page info"));
+	sd.Copy(_L8("+34345 4354"));
+	Test5L(EFaxNormal,sd,EModifiedHuffman,TInt(2434));
+	sd.Copy(_L8("+34345 4354"));
+	Test5L(EFaxFine,sd,EModifiedHuffman,TInt(0));
+	sd.Copy(_L8(""));
+	Test5L(EFaxNormal,sd,EModifiedHuffman,TInt(1));
+	sd.Copy(_L8(" + 4545 9"));
+	Test5L(EFaxFine,sd,EModifiedHuffman,TInt(-1));
+
+	//
+	// Done!
+	//
+	CleanupStack::PopAndDestroy(iReadFaxFile);
+	CleanupStack::PopAndDestroy(iWriteFaxFile);
+
+	return TestStepResult();
+	} // CFaxTestFaxStorage::doTestStepL
+
+
+void CFaxTestFaxStorage::Test1L(TInt aNumberLines, TBuf8<216>& aScanLineWrite,
+								TFaxResolution aRes)
+	{
+	TInt  row;
+	TBuf8<216>  scanlineRead;
+
+	iWriteFaxFile->OpenL(KTEFaxTestStoreFileName, 64);
+	
+	for (row = 0;  row < aNumberLines;  row++)
+		{
+		iWriteFaxFile->iWriteFaxPages->AddScanLineL(aScanLineWrite);
+		}
+
+	iWriteFaxFile->iWriteFaxPages->EndPageL(aRes, iSenderId);
+	iWriteFaxFile->CommitL();
+	iWriteFaxFile->Close();
+
+	iReadFaxFile->OpenL(KTEFaxTestStoreFileName);
+
+	for (row = 0;  row < aNumberLines;  row++)
+		{
+		iReadFaxFile->iReadFaxPages->GetScanLineL(scanlineRead);
+		TESTCHECKSTR(scanlineRead, aScanLineWrite);
+		}
+	iReadFaxFile->Close();
+	} // CFaxTestFaxStorage::Test1L
+
+
+void CFaxTestFaxStorage::Test2L(TInt aNumberLines, TBuf8<216>& aScanLineWrite1,
+								TBuf8<216>&  aScanLineWrite2, TFaxResolution aRes)
+	{
+	TInt  row;
+	TBuf8<216>  scanlineRead;
+
+	iWriteFaxFile->OpenL(KTEFaxTestStoreFileName, 64);
+	for (row = 0; row < aNumberLines;  row++)
+		{
+		// line1
+		iWriteFaxFile->iWriteFaxPages->AddScanLineL(aScanLineWrite1);
+		row++;
+		if (row >= aNumberLines)
+			{
+			break;
+			}
+
+		// line2
+		iWriteFaxFile->iWriteFaxPages->AddScanLineL(aScanLineWrite2);
+		}
+
+	iWriteFaxFile->iWriteFaxPages->EndPageL(aRes, iSenderId);
+	iWriteFaxFile->CommitL();
+	iWriteFaxFile->Close();
+
+	iReadFaxFile->OpenL(KTEFaxTestStoreFileName);
+	for (row = 0;  row < aNumberLines;  row++)
+		{
+		// line1
+		iReadFaxFile->iReadFaxPages->GetScanLineL(scanlineRead);
+		TESTCHECKSTR(scanlineRead, aScanLineWrite1);
+		row++;
+		if (row >= aNumberLines)
+			{
+			break;
+			}
+
+		// line2
+		iReadFaxFile->iReadFaxPages->GetScanLineL(scanlineRead);
+		TESTCHECKSTR(scanlineRead, aScanLineWrite2);
+		}
+	iReadFaxFile->Close();
+	} // CFaxTestFaxStorage::Test2L
+
+
+void CFaxTestFaxStorage::Test3L(TInt aNumberLines, TInt aNumberPages)
+	{
+	TInt  row;
+	TBuf8<216>  scanlineRead, scanlineWrite;
+
+	scanlineWrite.SetLength(216);
+
+	iWriteFaxFile->OpenL(KTEFaxTestStoreFileName, 64);
+	TInt page;
+	
+	for (page = 0;  page < aNumberPages;  page++)
+		{
+		scanlineWrite.SetLength(216);
+		scanlineWrite.Fill(TChar(255));
+		
+		for (TInt t=0; t<216; t+=2)
+			{
+			scanlineWrite[t] = 0;
+			}
+		
+		scanlineWrite[0] = TUint8(page);
+		
+		for (row = 0;  row < aNumberLines;  row++)
+			{
+			iWriteFaxFile->iWriteFaxPages->AddScanLineL(scanlineWrite);
+			}
+
+		iWriteFaxFile->iWriteFaxPages->EndPageL(EFaxFine, iSenderId);
+		iWriteFaxFile->CommitL();
+		}
+	iWriteFaxFile->Close();
+
+	iReadFaxFile->OpenL(KTEFaxTestStoreFileName);
+
+	for (page = 0;  page < aNumberPages;  page++)
+		{
+		iReadFaxFile->iReadFaxPages->SetPageL(page);
+
+		for (row = 0;  row < aNumberLines;  row++)
+			{
+			iReadFaxFile->iReadFaxPages->GetScanLineL(scanlineRead);	
+			TESTCHECK(scanlineRead[0], page);
+			}
+		}
+	iReadFaxFile->Close();
+	} // CFaxTestFaxStorage::Test3L
+
+
+void CFaxTestFaxStorage::Test4L(TInt aNumberLines)
+	{
+	TInt  row;
+	TBuf8<216>  scanlineRead, scanlineWrite;
+
+	scanlineWrite.SetLength(216);
+
+	iWriteFaxFile->OpenL(KTEFaxTestStoreFileName, 64);
+
+	for (row = 0;  row < aNumberLines;  row++)
+		{
+		scanlineWrite[0] = TUint8(row);
+
+		iWriteFaxFile->iWriteFaxPages->AddScanLineL(scanlineWrite);
+		}
+
+	iWriteFaxFile->iWriteFaxPages->EndPageL(EFaxFine, iSenderId);
+	iWriteFaxFile->CommitL();
+	iWriteFaxFile->Close();
+
+	iReadFaxFile->OpenL(KTEFaxTestStoreFileName);
+
+	for (row = 0;  row < aNumberLines;  row++)
+		{
+		iReadFaxFile->iReadFaxPages->SeekScanLineL(row);
+		iReadFaxFile->iReadFaxPages->GetScanLineL(scanlineRead);
+		TESTCHECK(scanlineRead[0], row);
+		}
+
+	for (row = aNumberLines - 1;  row >= 0;  row--)
+		{
+		iReadFaxFile->iReadFaxPages->SeekScanLineL(row);
+		iReadFaxFile->iReadFaxPages->GetScanLineL(scanlineRead);
+		TESTCHECK(scanlineRead[0], row);
+		}
+
+	iReadFaxFile->Close();
+	} // CFaxTestFaxStorage::Test4L
+
+
+void CFaxTestFaxStorage::Test5L(TFaxResolution aRes, TFaxBufSenderId& aSenderId,
+								TFaxCompression aF1, TInt aF2)
+{
+	TInt  row;
+	TBuf8<216>  scanLineWrite;
+
+	scanLineWrite.SetLength(216);
+
+	iWriteFaxFile->OpenL(KTEFaxTestStoreFileName, 64);
+
+	for (row=0; row<100; row++)
+		{
+		iWriteFaxFile->iWriteFaxPages->AddScanLineL(scanLineWrite);
+		}
+
+	iWriteFaxFile->iWriteFaxPages->EndPageL(aRes, aSenderId, aF1, aF2);
+	iWriteFaxFile->CommitL();
+	iWriteFaxFile->Close();
+
+	iReadFaxFile->OpenL(KTEFaxTestStoreFileName);
+
+	TFaxPageInfo info = iReadFaxFile->iReadFaxPages->CurrentPageInfo();
+
+	TESTCHECK(info.iNumScanLines, 100);
+	TESTCHECK(info.iResolution, aRes);
+	TESTCHECKSTR(info.iSenderId, aSenderId);
+	TESTCHECK(info.iCompression, aF1);
+	TESTCHECK(info.iReservedFlag2, aF2);
+
+	iReadFaxFile->Close();
+}
+
+
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestFaxCoding::CFaxTestFaxCoding()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestFaxCoding"));
+	} // CFaxTestFaxCoding::CFaxTestFaxCoding
+
+
+/**
+ *  This tests the fax coding.
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestFaxCoding::doTestStepL()
+	{
+	TInt  result, pos;
+	TInt  blackrun;
+	TBool  flag(EFalse);
+	RFile  enFile;
+	RFs  fs;
+	TRawScanLine  rawScanLine;
+	TBuf8<KFaxT4MaxDesLength>  encodedScanLine;
+	TBuf8<50>  leftOvers;
+	TRawScanLine  decodedScanLine;
+	TTime  then;
+	TTime  now;
+	TInt64  timetaken;
+
+	CFaxT4* faxT4 = CFaxT4::NewL();
+	CleanupStack::PushL(faxT4);
+
+	result = fs.Connect();
+	CleanupClosePushL(fs);
+	TESTCHECKL(result, KErrNone);
+	result = enFile.Replace(fs, KTEFaxTestEncodeFileName, EFileShareAny);
+	CleanupClosePushL(enFile);
+	TESTCHECKL(result, KErrNone);
+
+	INFO_PRINTF1(_L("Testing 1D coding methods"));
+
+	faxT4->PageInitialize(EFaxFine, EModifiedHuffman);
+	rawScanLine.Fill(KFaxWhite, KFaxBytesPerScanLine);
+	for (blackrun = 0;  blackrun <= 1728;  blackrun++)
+		{
+		Mem::Fill(&rawScanLine[0], blackrun/8, KFaxBlack);
+		if (blackrun%8)
+			{
+			rawScanLine[(blackrun/8)] = (TUint8)(KFaxWhite << blackrun%8);
+			}
+		faxT4->EncodeScanLine(rawScanLine, encodedScanLine);
+		encodedScanLine.Append(0);
+		encodedScanLine.Append(1);
+		enFile.Write(encodedScanLine);
+		}
+	
+	enFile.Flush();
+	CleanupStack::PopAndDestroy(&enFile);
+
+	result = enFile.Open(fs, KTEFaxTestEncodeFileName, EFileShareAny);
+	CleanupClosePushL(enFile);
+	TESTCHECKL(result, KErrNone);
+
+	// now encoded.fax contains the encoded RawScanLines from the jerry.fax file
+	// and now we are going to decode them again
+
+	encodedScanLine.Zero();
+
+	then.UniversalTime();
+    faxT4->PageInitialize(EFaxFine,EModifiedHuffman);
+	rawScanLine.Fill(KFaxWhite, KFaxBytesPerScanLine);
+	for (blackrun = 0;  blackrun <= 1728;  blackrun++)
+		{
+		pos = FindEndOfLine(encodedScanLine);
+		if (pos == KErrNotFound)
+			{
+			flag = ETrue;
+			if (encodedScanLine.Length() != 0)
+				{
+				leftOvers.Copy(encodedScanLine);
+				enFile.Read(encodedScanLine, (encodedScanLine.MaxLength()-leftOvers.Length()));
+
+				if (FindEndOfLine(encodedScanLine) == KErrNotFound)
+				{
+					User::Leave(KErrNotFound);
+				}
+			
+				encodedScanLine.Insert(0, leftOvers);
+				leftOvers.Zero();
+				pos = FindEndOfLine(encodedScanLine);
+				flag = EFalse;
+				}
+			
+			if (flag)
+				{
+				enFile.Read(encodedScanLine);
+				pos = FindEndOfLine(encodedScanLine);
+				}
+			}
+
+		result = faxT4->DecodeScanLine(decodedScanLine, encodedScanLine.Left(pos));
+		TESTCHECKL(result, KErrNone);
+		
+		Mem::Fill(&rawScanLine[0], blackrun/8, KFaxBlack);
+		if (blackrun%8)
+			{
+			rawScanLine[(blackrun/8)] = (TUint8)(KFaxWhite << blackrun%8);
+			}
+
+		TEST(!rawScanLine.Compare(decodedScanLine));
+		encodedScanLine.Delete(0,pos+2);	//2 is the length of the delimiter character.
+		}
+	now.UniversalTime();
+	timetaken = now.MicroSecondsFrom(then).Int64();
+	INFO_PRINTF2(_L("%dms to 1D encode all possible run lengths"), I64LOW(timetaken)/1000);
+
+	enFile.Flush();
+	CleanupStack::PopAndDestroy(&enFile);
+
+	//
+	// Again, for this test, we'll instantiate our own CFaxT4 object and generate
+	// the fax file using the raw functions  - this is purely done for testing
+	// and in real life we'd do a 2D fax via the StartPage() function 
+	// as used in test8L
+	//
+	result = enFile.Replace(fs, KTEFaxTestEncodeFileName, EFileShareAny);
+	CleanupClosePushL(enFile);
+	TESTCHECKL(result, KErrNone);
+
+	INFO_PRINTF1(_L("Test 2D coding methods"));
+
+	//writeFaxFile->OpenL(_L("c:\\test.fax"),64);
+	
+	faxT4->PageInitialize(EFaxFine, EModifiedRead);
+	rawScanLine.Fill(KFaxBlack, KFaxBytesPerScanLine);      // prepare a black reference line
+	faxT4->EncodeScanLine(rawScanLine, encodedScanLine);
+	
+	//writeFaxFile->iWriteFaxPages->AddEncodedScanLineL(encodedScanLine);
+	encodedScanLine.Append(0);
+	encodedScanLine.Append(1);
+	enFile.Write(encodedScanLine);
+
+	rawScanLine[0] = KFaxWhite ;                             // start with a white run
+	rawScanLine[KFaxBytesPerScanLine-1] = KFaxWhite ;        // end with a white run
+	rawScanLine[(KFaxBytesPerScanLine/2)-1] = KFaxWhite ;    // with a white run halfway through
+	rawScanLine[(KFaxBytesPerScanLine/2)-10] = KFaxWhite ;    // and a white run 10 before the end
+	faxT4->EncodeScanLine(rawScanLine, encodedScanLine);      // horizontal mode encoding
+
+
+	//writeFaxFile->iWriteFaxPages->AddEncodedScanLineL(encodedScanLine);
+	encodedScanLine.Append(0);
+	encodedScanLine.Append(1);
+	enFile.Write(encodedScanLine);
+
+	rawScanLine[0] = KFaxWhite;                             // first run identical for v0
+	rawScanLine[(KFaxBytesPerScanLine/2)-1] = 0x1c ;         // 00011100 test v+3 v-2 
+	rawScanLine[(KFaxBytesPerScanLine/2)-10] = 0x3e ;        // 00111110 test v+2 v-1 
+	rawScanLine[KFaxBytesPerScanLine-1] = 0x78 ;             // 01111000 test v+1 v-3
+	faxT4->EncodeScanLine(rawScanLine, encodedScanLine);      // vertical mode encoding
+	encodedScanLine.Append(0);
+	encodedScanLine.Append(1);
+	enFile.Write(encodedScanLine);
+	
+	
+	//writeFaxFile->iWriteFaxPages->AddEncodedScanLineL(encodedScanLine);
+	rawScanLine[0] = KFaxBlack ;                             // for pass mode
+	faxT4->EncodeScanLine(rawScanLine, encodedScanLine);      // pass mode encoding
+	encodedScanLine.Append(0);
+	encodedScanLine.Append(1);
+	enFile.Write(encodedScanLine);
+	//writeFaxFile->iWriteFaxPages->AddEncodedScanLineL(encodedScanLine);
+
+	// same again in opposite colours
+
+	faxT4->PageInitialize(EFaxFine, EModifiedRead);
+	rawScanLine.Fill(KFaxWhite, KFaxBytesPerScanLine);      // prepare a white reference line
+	faxT4->EncodeScanLine(rawScanLine, encodedScanLine);
+	encodedScanLine.Append(0);
+	encodedScanLine.Append(1);
+	enFile.Write(encodedScanLine);
+	//writeFaxFile->iWriteFaxPages->AddEncodedScanLineL(encodedScanLine);
+	
+	rawScanLine[0] = KFaxBlack ;                             // start with a black run
+	rawScanLine[KFaxBytesPerScanLine-1] = KFaxBlack ;        // end with a black run
+	rawScanLine[(KFaxBytesPerScanLine/2)-1] = KFaxBlack ;    // with a black run halfway through
+	rawScanLine[(KFaxBytesPerScanLine/2)-10] = KFaxBlack ;    // and a blacke run 10 before the end
+	faxT4->EncodeScanLine(rawScanLine, encodedScanLine);      // horizontal mode encoding
+	encodedScanLine.Append(0);
+	encodedScanLine.Append(1);
+	enFile.Write(encodedScanLine);
+
+	//writeFaxFile->iWriteFaxPages->AddEncodedScanLineL(encodedScanLine);
+	
+	rawScanLine[0] = KFaxBlack ;                             // first run identical for v0
+	rawScanLine[(KFaxBytesPerScanLine/2)-1] = 0xe3 ;         // 11100011 test v+3 v-2 
+	rawScanLine[(KFaxBytesPerScanLine/2)-10] = 0xc1 ;        // 11000001 test v+2 v-1 
+	rawScanLine[KFaxBytesPerScanLine-1] = 0x87 ;             // 10000111 test v+1 v-3
+	faxT4->EncodeScanLine(rawScanLine, encodedScanLine);      // vertical mode encoding
+	encodedScanLine.Append(0);
+	encodedScanLine.Append(1);
+	enFile.Write(encodedScanLine);
+	//writeFaxFile->iWriteFaxPages->AddEncodedScanLineL(encodedScanLine);
+	
+	rawScanLine[0] = KFaxWhite ;                             // for pass mode
+	faxT4->EncodeScanLine(rawScanLine, encodedScanLine);      // pass mode encoding
+	//writeFaxFile->iWriteFaxPages->AddEncodedScanLineL(encodedScanLine);
+	encodedScanLine.Append(0);
+	encodedScanLine.Append(1);
+	enFile.Write(encodedScanLine);
+
+	then.UniversalTime();
+	faxT4->PageInitialize (EFaxFine, EModifiedRead);         // now start again
+	rawScanLine.Fill (KFaxWhite, KFaxBytesPerScanLine);
+	for (blackrun=0; blackrun <= 1728 ; blackrun++)
+		{
+		Mem::Fill(&rawScanLine[0], blackrun/8, KFaxBlack);
+		if (blackrun%8)
+			{
+			rawScanLine[(blackrun/8)] = (TUint8)(KFaxWhite << blackrun%8);
+			}
+		faxT4->EncodeScanLine(rawScanLine, encodedScanLine);
+		//writeFaxFile->iWriteFaxPages->AddEncodedScanLineL(encodedScanLine);
+		encodedScanLine.Append(0);
+		encodedScanLine.Append(1);
+		enFile.Write(encodedScanLine);
+		}
+	now.UniversalTime();
+	timetaken = now.MicroSecondsFrom (then).Int64 ();
+	INFO_PRINTF2(_L("%dms to 2D encode all possible run lengths"), I64LOW(timetaken)/1000);
+
+	enFile.Flush();
+	CleanupStack::PopAndDestroy(&enFile);
+
+	/*
+	writeFaxFile->iWriteFaxPages->EndPageL(EFaxFine,senderId, EModifiedRead);
+	writeFaxFile->CommitL();
+	writeFaxFile->Close();
+	*/
+
+	//readFaxFile->OpenL(_L("c:\\test.fax"));
+	//readFaxFile->iReadFaxPages->SetPageL(0);
+	//TFaxPageInfo info = readFaxFile->iReadFaxPages->CurrentPageInfo();
+
+	INFO_PRINTF1(_L("Test 2D decoding methods"));
+
+	result = enFile.Open(fs, KTEFaxTestEncodeFileName, EFileShareAny);
+	CleanupClosePushL(enFile);
+	TESTCHECKL(result, KErrNone);
+
+	rawScanLine.Fill(KFaxBlack, KFaxBytesPerScanLine);      // prepare a black line as the reference line
+	//readFaxFile->iReadFaxPages->GetEncodedScanLineL(encodedScanLine);
+
+	enFile.Read(encodedScanLine);
+	pos = FindEndOfLine(encodedScanLine);
+
+	result = faxT4->DecodeScanLine(decodedScanLine, encodedScanLine.Left(pos));
+	//err = faxT4->DecodeScanLine(decodedScanLine, encodedScanLine);
+	TESTCHECKL(result, KErrNone);
+	result = rawScanLine.Compare(decodedScanLine);
+	TESTCHECKL(result, KErrNone);
+	encodedScanLine.Delete(0,pos+2);
+
+	rawScanLine[0] = KFaxWhite ;
+	rawScanLine[KFaxBytesPerScanLine-1] = KFaxWhite ;
+	rawScanLine[(KFaxBytesPerScanLine/2)-1] = KFaxWhite ;    // test horizontal mode codec
+	rawScanLine[(KFaxBytesPerScanLine/2)-10] = KFaxWhite ;   // and a white run 10 before the end
+	
+	//enFile.Read(encodedScanLine);
+	pos = FindEndOfLine(encodedScanLine);
+
+	//err = faxT4->DecodeScanLine(decodedScanLine,encodedScanLine.Left(pos));
+	//readFaxFile->iReadFaxPages->GetEncodedScanLineL(encodedScanLine);
+	
+	result = faxT4->DecodeScanLine(decodedScanLine,encodedScanLine.Left(pos));
+	TESTCHECKL(result, KErrNone);
+	result = rawScanLine.Compare(decodedScanLine);
+	TESTCHECKL(result, KErrNone);
+	encodedScanLine.Delete(0,pos+2);
+
+	rawScanLine[(KFaxBytesPerScanLine/2)-1] = 0x1c ;         // test v+3 v-2
+	rawScanLine[(KFaxBytesPerScanLine/2)-10] = 0x3e ;        // test v+2 v-1 coded 
+	rawScanLine[KFaxBytesPerScanLine-1] = 0x78 ;             // test v+1 v-3 codec
+
+	//readFaxFile->iReadFaxPages->GetEncodedScanLineL(encodedScanLine);	
+	pos=FindEndOfLine(encodedScanLine);
+	result = faxT4->DecodeScanLine(decodedScanLine,encodedScanLine.Left(pos));
+	TESTCHECKL(result, KErrNone);
+	result = rawScanLine.Compare(decodedScanLine);
+	TESTCHECKL(result, KErrNone);
+	encodedScanLine.Delete(0,pos+2);
+	
+	rawScanLine[0] = KFaxBlack ;                      // test pass and v0 codec
+	//readFaxFile->iReadFaxPages->GetEncodedScanLineL(encodedScanLine);	
+	pos=FindEndOfLine(encodedScanLine);
+	result = faxT4->DecodeScanLine(decodedScanLine,encodedScanLine.Left(pos));
+	TESTCHECKL(result, KErrNone);
+	result = rawScanLine.Compare(decodedScanLine);
+	TESTCHECKL(result, KErrNone);
+	encodedScanLine.Delete(0,pos+2);
+	// same again in opposite colours
+
+	rawScanLine.Fill (KFaxWhite, KFaxBytesPerScanLine);      // prepare a white line as the reference line
+	pos=FindEndOfLine(encodedScanLine);
+	//readFaxFile->iReadFaxPages->GetEncodedScanLineL(encodedScanLine);	
+	result = faxT4->DecodeScanLine(decodedScanLine,encodedScanLine.Left(pos));
+	TESTCHECKL(result, KErrNone);
+	rawScanLine.Compare(decodedScanLine);
+	TESTCHECKL(result, KErrNone);
+	encodedScanLine.Delete(0,pos+2);
+
+
+	rawScanLine[0] = KFaxBlack ;
+	rawScanLine[KFaxBytesPerScanLine-1] = KFaxBlack ;
+	rawScanLine[(KFaxBytesPerScanLine/2)-1] = KFaxBlack ;    // test horizontal mode codec
+	rawScanLine[(KFaxBytesPerScanLine/2)-10] = KFaxBlack ;   // and a black run 10 before the end
+	//readFaxFile->iReadFaxPages->GetEncodedScanLineL(encodedScanLine);
+	pos=FindEndOfLine(encodedScanLine);
+	result = faxT4->DecodeScanLine(decodedScanLine,encodedScanLine.Left(pos));
+	TESTCHECKL(result, KErrNone);
+	result = rawScanLine.Compare(decodedScanLine);
+	TESTCHECKL(result, KErrNone);
+	encodedScanLine.Delete(0,pos+2);
+	
+	rawScanLine[(KFaxBytesPerScanLine/2)-1] = 0xe3 ;         // 11100011 test v+3 v-2 
+	rawScanLine[(KFaxBytesPerScanLine/2)-10] = 0xc1 ;        // 11000001 test v+2 v-1 
+	rawScanLine[KFaxBytesPerScanLine-1] = 0x87 ;             // 10000111 test v+1 v-3
+	//readFaxFile->iReadFaxPages->GetEncodedScanLineL(encodedScanLine);	
+
+	pos=FindEndOfLine(encodedScanLine);
+	result = faxT4->DecodeScanLine(decodedScanLine,encodedScanLine.Left(pos));
+	TESTCHECKL(result, KErrNone);
+	result = rawScanLine.Compare(decodedScanLine);
+	TESTCHECKL(result, KErrNone);
+	encodedScanLine.Delete(0,pos+2);
+
+	rawScanLine[0] = KFaxWhite ;                             // test pass and v0 codec
+	//readFaxFile->iReadFaxPages->GetEncodedScanLineL(encodedScanLine);	
+	pos=FindEndOfLine(encodedScanLine);
+	result = faxT4->DecodeScanLine(decodedScanLine,encodedScanLine.Left(pos));
+	TESTCHECKL(result, KErrNone);
+	result = rawScanLine.Compare(decodedScanLine);
+	TESTCHECKL(result, KErrNone);
+	encodedScanLine.Delete(0,pos+2);
+	
+	// now do all run lengths
+
+	then.UniversalTime();
+	//faxT4->PageInitialize (info.iResolution, info.iCompression);
+//	enFile.Close();
+
+//	err=enFile.Open(fs,_L("c:\\test.fax"),EFileShareAny);
+//	if (err!=KErrNone)
+//		User::Leave(err);
+
+//	encodedScanLine.Zero();
+	flag = EFalse;
+
+    
+	faxT4->PageInitialize(EFaxFine,EModifiedRead);
+	rawScanLine.Fill(KFaxWhite, KFaxBytesPerScanLine);
+	for (blackrun=0;  blackrun <= 1728;  blackrun++)
+		{
+		pos = FindEndOfLine(encodedScanLine);
+		if (pos == KErrNotFound)
+			{
+			flag = ETrue;
+			if (encodedScanLine.Length() != 0)
+				{
+				leftOvers.Copy(encodedScanLine);
+				enFile.Read(encodedScanLine, (encodedScanLine.MaxLength()-leftOvers.Length()));
+				if (FindEndOfLine(encodedScanLine) == KErrNotFound)
+					{
+					User::Leave(KErrNotFound);
+					}
+			
+				encodedScanLine.Insert(0, leftOvers);
+				leftOvers.Zero();
+				pos = FindEndOfLine(encodedScanLine);
+				flag = EFalse;
+				}
+			
+			if (flag)
+				{
+				enFile.Read(encodedScanLine);
+				pos = FindEndOfLine(encodedScanLine);
+				}
+			}
+
+		result = faxT4->DecodeScanLine(decodedScanLine,encodedScanLine.Left(pos));
+		TESTCHECKL(result, KErrNone);
+		
+		Mem::Fill(&rawScanLine[0], blackrun/8, KFaxBlack);
+		if (blackrun%8)
+			{
+			rawScanLine[(blackrun/8)] = (TUint8)(KFaxWhite << blackrun%8);
+			}
+		result = rawScanLine.Compare(decodedScanLine);
+		TESTCHECKL(result, KErrNone);
+		encodedScanLine.Delete(0,pos+2);	//2 is the length of the delimiter character.
+		}
+	enFile.Flush();
+
+	CleanupStack::PopAndDestroy(&enFile);
+	CleanupStack::PopAndDestroy(&fs);
+	CleanupStack::PopAndDestroy(faxT4);
+
+	return TestStepResult();
+	} // CFaxTestFaxCoding::doTestStepL
+
+
+TInt CFaxTestFaxCoding::FindEndOfLine(TDes8& aEncodedDes)
+	{
+	TInt  maxlength;
+	TUint  compareWord(0);
+
+	maxlength = aEncodedDes.Length();
+	if (aEncodedDes.Length() == 0)
+		{
+		return KErrNotFound;
+		}
+
+	TInt  index;
+
+	for (index = 0;  index <= maxlength - 2;  index++)
+		{
+		compareWord = aEncodedDes[index];
+		if (compareWord == 0)
+			{
+			compareWord = aEncodedDes[index + 1];
+			if (compareWord == 1)
+				{
+				return index;
+				}
+			}
+		}		
+		
+	return KErrNotFound;
+	}
+
+	
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestFaxHeaderDefinition::CFaxTestFaxHeaderDefinition()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestFaxHeaderDefinition"));
+	} // CFaxTestFaxHeaderDefinition::CFaxTestFaxHeaderDefinition
+
+
+/**
+ *  This tests the fax header definition...
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestFaxHeaderDefinition::doTestStepL()
+	{
+	//
+    // this test is in two halves
+	//
+    // firstly we generate a header file - we don't do this via an Epoc print, but
+    // directly using one of the test fonts in testfont.h.  However, the functions
+    // we need are all exercised (writing font information and writing series of
+    // TRawScanLines.  (Getting epoc printing to generate the correct data is not
+    // part of this test.)  The test function here takes a pointer to the font
+    // together with its dimensions as paramters, so that fonts 1 2 and 3 bytes
+    // wide can be tested out all at te same time.  The fonts are in testfont.h
+    //
+    // secondly we use the header file we've just generate to create encoded scan lines
+    // for a header, which we'll write to TEST.FAX as a fax file.  Naturally, in
+    // real use, we'd send our encodes scan lines as part of the T.4 image at the start
+    // of each pages, but generating a fax image (which is just a series of encoded scan
+    // lines) is just as good a test.  So, we pass a pointer to the fax store as a parameters.
+    // Again, we run this once for each font we test.
+	//
+	RFs  fs;
+	TInt  result;
+	RFile  file;
+
+	result = fs.Connect();
+	CleanupClosePushL(fs);
+	TESTCHECKL(result, KErrNone);
+	
+	result = file.Replace(fs, KTEFaxTestHeaderFileName, EFileShareAny);
+	CleanupClosePushL(file);
+	TESTCHECKL(result, KErrNone);
+
+	INFO_PRINTF1(_L("Generating header file using one byte wide font"));
+    GenerateHeaderFileL(*font8x16, 1, 16);
+	INFO_PRINTF1(_L("Writing fax header to TestHeader.Fax using current time and date")) ;
+    GenerateFaxFileL(file);
+
+	INFO_PRINTF1(_L("Generating header file using two bytes wide font"));
+    GenerateHeaderFileL(*font16x16, 2, 16);
+	INFO_PRINTF1(_L("Writing fax header to TestHeader.Fax using current time and date"));
+	GenerateFaxFileL(file);
+
+	INFO_PRINTF1(_L("Generating header file using three bytes wide font")) ;
+    GenerateHeaderFileL(*font24x16, 3, 16);
+	INFO_PRINTF1(_L("Writing fax header to TestHeader.Fax using current time and date")) ;
+	GenerateFaxFileL(file);
+	
+	file.Flush();
+
+	CleanupStack::PopAndDestroy(&file);
+	CleanupStack::PopAndDestroy(&fs);
+
+	return TestStepResult();
+	} // CFaxTestFaxHeaderDefinition::doTestStepL
+
+
+void CFaxTestFaxHeaderDefinition::GenerateFaxFileL(RFile& aFile)
+   {
+    // use the header to generate a *.FAX file
+    TFaxHeaderInfo faxHeader;
+
+	CFaxT4*  faxT4 = CFaxT4::NewL();
+	CleanupStack::PushL(faxT4);
+    CFaxHeaderLines*  testheader = CFaxHeaderLines::NewL();
+	CleanupStack::PushL(testheader);
+
+    testheader->ReadFaxHeaderInfoL(faxHeader);
+
+    TRawScanLine  headline;
+    TRawScanLine  fontline;
+    TBuf8<KFaxT4MaxDesLength>  encodedHeadLine;
+
+    TTime  timeOfTransmission;
+    TBuf<12>  timeText;
+
+	timeOfTransmission.HomeTime ();
+    timeOfTransmission.FormatL(timeText, _L("%F%D%M%Y%H%T"));
+
+	for (TInt index = 0;  index < 12;  index++)
+		{
+        timeText[index] -= '0';
+		}
+
+    // Forces 2 digit day - 2 digit month - 4 digit year - 2 digit hour - 2 digit minute
+
+	for (TInt scanline = 0;  scanline < faxHeader.iHeaderFontHeightInLines;  scanline++)
+		{
+        testheader->ReadRawHeaderLineL(scanline, headline);
+        testheader->ReadRawFontLineL(scanline, fontline);
+
+        for (TInt fontByte = 0; fontByte < faxHeader.iHeaderFontWidthInBytes; fontByte++)
+			{
+			headline[((faxHeader.iOffsetToDay) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[0] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+            headline[((faxHeader.iOffsetToDay + 1) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[1] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+            headline[((faxHeader.iOffsetToMonth) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[2] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+            headline[((faxHeader.iOffsetToMonth + 1) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[3] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+            headline[((faxHeader.iOffsetToYear) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[4] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+            headline[((faxHeader.iOffsetToYear + 1) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[5] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+            headline[((faxHeader.iOffsetToYear + 2) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[6] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+            headline[((faxHeader.iOffsetToYear + 3) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[7] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+            headline[((faxHeader.iOffsetToHour) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[8] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+            headline[((faxHeader.iOffsetToHour + 1) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[9] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+            headline[((faxHeader.iOffsetToMinute) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[10] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+            headline[((faxHeader.iOffsetToMinute + 1) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(timeText[11] * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+
+            // put the page info in as 12/34
+
+            headline[((faxHeader.iOffsetToCurrentPage) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(1 * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+            headline[((faxHeader.iOffsetToCurrentPage + 1) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(2 * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+            headline[((faxHeader.iOffsetToTotalPages) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(3 * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+            headline[((faxHeader.iOffsetToTotalPages + 1) * faxHeader.iHeaderFontWidthInBytes) + fontByte] = fontline[(4 * faxHeader.iHeaderFontWidthInBytes) + fontByte];
+			}
+
+      faxT4->EncodeScanLine(headline, encodedHeadLine);
+	  aFile.Write(encodedHeadLine);
+      }
+
+	CleanupStack::PopAndDestroy(testheader);
+	CleanupStack::PopAndDestroy(faxT4);
+	} // CFaxTestFaxHeaderDefinition::GenerateFaxFileL
+
+
+void CFaxTestFaxHeaderDefinition::GenerateHeaderFileL(const TUint8* aFont,
+													  TInt aWidth, TInt aHeight)
+	{
+    TFaxHeaderInfo  faxHeader;
+
+    //
+	// declare the font size
+	//
+    faxHeader.iHeaderFontWidthInBytes  = aWidth;
+    faxHeader.iHeaderFontHeightInLines = aHeight;
+
+    //
+	// Work out the number of characters we can get in the scan line, so that we can
+    // create a modifiable buffer to hold the header line and fill it with spaces
+    //
+	TInt  charactersPerLine = KFaxBytesPerScanLine / faxHeader.iHeaderFontWidthInBytes;
+    HBufC8*  textBuff = HBufC8::NewL(charactersPerLine);
+	CleanupStack::PushL(textBuff);
+
+    TPtr8  textLine = textBuff->Des();
+    textLine.Fill(0x20, charactersPerLine);
+
+    //
+	// Work out the margin we leave on each side of the page in characters
+    // this is specified as 74 pixels in T.4
+	//
+	TInt  margin = (74 / (8 * faxHeader.iHeaderFontWidthInBytes));
+
+	//
+	// THE FOLLOWING LAYOUT IS PURELY FOR TEST PURPOSES AND SHOULDN'T
+    // BE TAKEN TO BE A DEFINITIVE HEADER LAYOUT
+	//
+    // assume we have the date and time on the lefthand side as dd/mm/yyyy hh:mm
+    // 0000000001111111
+    // 1234567890123456
+    // fill in the separators
+	textLine.Replace(margin + 3, 1, _L8 ("/"));
+    textLine.Replace(margin + 6, 1, _L8 ("/"));
+    textLine.Replace(margin + 14, 1, _L8 (":"));
+
+    //
+	// set up the offsets to the data
+	//
+	faxHeader.iOffsetToDay = margin + 1;
+    faxHeader.iOffsetToMonth = margin + 4;
+    faxHeader.iOffsetToYear = margin + 7;
+    faxHeader.iOffsetToHour = margin + 12;
+    faxHeader.iOffsetToMinute = margin + 15;
+
+    //
+	// assume we have the page info on the righthand side as pp/tt
+    // 54321
+    // fill in the separator
+	//
+    textLine.Replace (charactersPerLine - margin - 3, 1, _L8 ("/"));
+
+    //
+	// set up the offsets to the data
+	//
+    faxHeader.iOffsetToTotalPages = charactersPerLine - margin - 2;
+    faxHeader.iOffsetToCurrentPage = charactersPerLine - margin - 5;
+
+    //
+    // read in the fax settings, because we want the fax ID and the user ID
+    //
+    TFaxSettings  ourFaxSettings;
+    TBuf8<20>  userName;
+   
+    ourFaxSettings.iFaxId.Copy(_L("+++01234 56789+++"));
+    userName.Copy(_L("Symbian Test Header"));
+
+    TInt  lenID = ourFaxSettings.iFaxId.Length ();
+    TInt  lenUser = userName.Length ();
+
+    //
+    // Fill the header line with appropriate information
+	//
+    textLine.Replace (faxHeader.iOffsetToMinute + 4, lenID, ourFaxSettings.iFaxId);
+    textLine.Replace (faxHeader.iOffsetToCurrentPage - lenUser -2, lenUser, userName);
+
+    //
+	// HEADER LAYOUT NOW FINISHED
+	//
+    // now we can write the fax header info to the header info file
+    //
+    CFaxHeaderLines*  testheader = CFaxHeaderLines::NewL();
+	CleanupStack::PushL(testheader);
+    testheader->WriteFaxHeaderInfoL(faxHeader);
+
+	//
+    // Now we generate the scan line and write the header line bitmap
+    // via a loop for each rowInFont in the font
+	//
+    TInt rowInFont;
+
+	for (rowInFont = 0;  rowInFont < faxHeader.iHeaderFontHeightInLines;  rowInFont++)
+		{
+		TRawScanLine  image;
+        image.SetMax();
+        image.FillZ();
+        TInt  offsetInImage = 0;
+ 
+        offsetInImage = 0;
+        for (TInt characterPosition = 0;  characterPosition < charactersPerLine;  characterPosition++)
+			{
+            for (TInt fontByte = 0;  fontByte < faxHeader.iHeaderFontWidthInBytes;  fontByte++)
+				{
+				image[offsetInImage++] = (TUint8)~KReverseByte[*(aFont + ((textLine[characterPosition] - 32) * faxHeader.iHeaderFontHeightInLines * faxHeader.iHeaderFontWidthInBytes) + (rowInFont * faxHeader.iHeaderFontWidthInBytes) + fontByte)];
+				}
+			}
+        testheader->WriteRawHeaderLineL (rowInFont, image);
+		}
+
+	//
+    // now we replace the first ten characters in the header text line with digits
+	//
+    textLine.Replace(0, 10, _L8("0123456789"));
+
+	//
+    // and write out the font line
+	//
+	for (rowInFont = 0; rowInFont < faxHeader.iHeaderFontHeightInLines; rowInFont++)
+		{
+		TRawScanLine  image;
+		image.SetMax();
+		image.FillZ();
+		TInt  offsetInImage = 0;
+
+		offsetInImage = 0;
+		for (TInt characterPosition = 0;  characterPosition < charactersPerLine;  characterPosition++)
+			{
+			for (TInt fontByte = 0;  fontByte < faxHeader.iHeaderFontWidthInBytes;  fontByte++)
+				{
+				image[offsetInImage++] = (TUint8)~KReverseByte[*(aFont + ((textLine[characterPosition] - 32) * faxHeader.iHeaderFontHeightInLines * faxHeader.iHeaderFontWidthInBytes) + (rowInFont * faxHeader.iHeaderFontWidthInBytes) + fontByte)];
+				}
+			}
+		testheader->WriteRawFontLineL (rowInFont, image);
+		// we can add the test code to generate the panic here
+		}
+
+	CleanupStack::PopAndDestroy(testheader);
+	CleanupStack::PopAndDestroy(textBuff);
+	} // CFaxTestFaxHeaderDefinition::GenerateHeaderFileL
+
+
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestTransmitFax01::CFaxTestTransmitFax01()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestTransmitFax01"));
+	} // CFaxTestTransmitFax01::CFaxTestTransmitFax01
+
+
+/**
+ *  This tests the transmission of a straight forward test fax.
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestTransmitFax01::doTestStepL()
+	{
+	TFaxSettings  faxSettings;
+
+	//
+	// Before instantiating CFaxTransfer we have to have a valid set of
+	// TFaxSettings to pass in to it - so our first step must always be
+	// to read the fax settings or set up suitable defaults.
+	//
+	TRAPD(leaveCode, ReadFaxCommDBSettingsL(faxSettings));
+	if (leaveCode != KErrNone)
+		{
+		INFO_PRINTF2(_L("ReadFaxCommDBSettingsL() error %d!"), leaveCode);
+		}
+	TESTCHECKL(leaveCode, KErrNone);
+
+	//
+	// Set the Fax parameters...
+	//
+	faxSettings.iFaxClass             = EClassAuto;
+	faxSettings.iPreferredECM         = 0;
+	faxSettings.iMaxSpeed             = 14400;
+	faxSettings.iMinSpeed             = 2400;
+	faxSettings.iPreferredResolution  = EFaxNormal;
+	faxSettings.iPreferredCompression = EModifiedHuffman;
+	faxSettings.iFaxId.Copy(_L8("+441632960000"));
+
+	//
+	// Start the Fax session...
+	//
+	CFaxTransfer*  faxSession = NULL;
+
+	TRAPD(startSessionResult, faxSession = CFaxTransfer::NewL(faxSettings));
+	TESTCHECKL(startSessionResult, KErrNone);
+	TESTL(faxSession != NULL);
+
+	faxSession->SetMode(EDialAndTransmit);
+
+	//
+	// Generate a Fax header for transmitting...
+	//
+	TFaxHeaderInfo  faxHeader;
+
+	faxHeader.iHeaderFontWidthInBytes = 0;
+	
+	CFaxHeaderLines*  testheader = CFaxHeaderLines::NewL();
+	TRAP_IGNORE(testheader->ReadFaxHeaderInfoL(faxHeader));
+	delete testheader;
+
+	GenerateHeaderFileL(faxSettings, *font8x16, 1, 16);
+
+	//
+	// Add the source file to the session...
+	//
+	faxSession->AddSourceL(_L("C:\\TEST.FAX"), Prefer1D);
+
+	//
+	// Set the destination phone number if needed...
+	//
+	if ((faxSession->iMode & KFaxNoDial) == 0)
+		{
+		TBuf8<32>  phoneNumber;
+
+		ReadDestPhoneNumberFromIniFileL(phoneNumber);
+		faxSession->SetPhoneNumberL(phoneNumber);
+		}
+	
+	//
+	// Begin transfering the fax...
+	//
+	INFO_PRINTF1(_L("Starting fax transmission of TEST.FAX a simple test fax..."));
+	TInt  transferResult = BeginFaxTransfer(faxSession);
+	INFO_PRINTF2(_L("Fax transmission completed with return code %d"), transferResult);
+	TESTCHECK(transferResult, KErrNone);
+
+	//
+	// Clean up the Fax session...
+	//
+	faxSession->RemoveAllSources();
+	delete faxSession;
+	faxSession = NULL;
+
+	return TestStepResult();
+	} // CFaxTestTransmitFax01::doTestStepL
+
+
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestTransmitFax02::CFaxTestTransmitFax02()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestTransmitFax02"));
+	} // CFaxTestTransmitFax02::CFaxTestTransmitFax02
+
+
+/**
+ *  This tests the transmission of a straight forward test fax.
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestTransmitFax02::doTestStepL()
+	{
+	TFaxSettings  faxSettings;
+
+	//
+	// Before instantiating CFaxTransfer we have to have a valid set of
+	// TFaxSettings to pass in to it - so our first step must always be
+	// to read the fax settings or set up suitable defaults.
+	//
+	TRAPD(leaveCode, ReadFaxCommDBSettingsL(faxSettings));
+	if (leaveCode != KErrNone)
+		{
+		INFO_PRINTF2(_L("ReadFaxCommDBSettingsL() error %d!"), leaveCode);
+		}
+	TESTCHECKL(leaveCode, KErrNone);
+
+	//
+	// Set the Fax parameters...
+	//
+	faxSettings.iFaxClass             = EClassAuto;
+	faxSettings.iPreferredECM         = 0;
+	faxSettings.iMaxSpeed             = 9600;
+	faxSettings.iMinSpeed             = 2400;
+	faxSettings.iPreferredResolution  = EFaxFine;
+	faxSettings.iPreferredCompression = EModifiedRead;
+	faxSettings.iFaxId.Copy(_L8("+441632960000"));
+
+	//
+	// Start the Fax session...
+	//
+	CFaxTransfer*  faxSession = NULL;
+
+	TRAPD(startSessionResult, faxSession = CFaxTransfer::NewL(faxSettings));
+	TESTCHECKL(startSessionResult, KErrNone);
+	TESTL(faxSession != NULL);
+
+	faxSession->SetMode(EDialAndTransmit); // Or EImmediateTransmit
+
+	//
+	// Generate a Fax header for transmitting...
+	//
+	TFaxHeaderInfo  faxHeader;
+
+	faxHeader.iHeaderFontWidthInBytes = 0;
+	
+	CFaxHeaderLines*  testheader = CFaxHeaderLines::NewL();
+	TRAP_IGNORE(testheader->ReadFaxHeaderInfoL(faxHeader));
+	delete testheader;
+
+	GenerateHeaderFileL(faxSettings, *font16x16, 2, 16);
+
+	//
+	// Add the source file to the session. "CHART4.FAX" is an ITU test chart.
+	//
+	faxSession->AddSourceL(_L("C:\\CHART4.FAX"), Prefer2D);
+
+	//
+	// Set the destination phone number if needed...
+	//
+	if ((faxSession->iMode & KFaxNoDial) == 0)
+		{
+		TBuf8<32>  phoneNumber;
+
+		ReadDestPhoneNumberFromIniFileL(phoneNumber);
+		faxSession->SetPhoneNumberL(phoneNumber);
+		}
+	
+	//
+	// Begin transfering the fax...
+	//
+	INFO_PRINTF1(_L("Starting fax transmission of CHART4.FAX an ITU test chart..."));
+	TInt  transferResult = BeginFaxTransfer(faxSession);
+	INFO_PRINTF2(_L("Fax transmission completed with return code %d"), transferResult);
+	TESTCHECK(transferResult, KErrNone);
+
+	//
+	// Clean up the Fax session...
+	//
+	faxSession->RemoveAllSources();
+	delete faxSession;
+	faxSession = NULL;
+
+	return TestStepResult();
+	} // CFaxTestTransmitFax02::doTestStepL
+
+
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestTransmitFax03::CFaxTestTransmitFax03()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestTransmitFax03"));
+	} // CFaxTestTransmitFax03::CFaxTestTransmitFax03
+
+
+/**
+ *  This tests the transmission of a straight forward test fax.
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestTransmitFax03::doTestStepL()
+	{
+	TFaxSettings  faxSettings;
+
+	//
+	// Before instantiating CFaxTransfer we have to have a valid set of
+	// TFaxSettings to pass in to it - so our first step must always be
+	// to read the fax settings or set up suitable defaults.
+	//
+	TRAPD(leaveCode, ReadFaxCommDBSettingsL(faxSettings));
+	if (leaveCode != KErrNone)
+		{
+		INFO_PRINTF2(_L("ReadFaxCommDBSettingsL() error %d!"), leaveCode);
+		}
+	TESTCHECKL(leaveCode, KErrNone);
+
+	//
+	// Set the Fax parameters...
+	//
+	faxSettings.iFaxClass             = EClass2;
+	faxSettings.iMaxSpeed             = 9600;
+	faxSettings.iMinSpeed             = 14400;
+	faxSettings.iPreferredResolution  = EFaxNormal;
+	faxSettings.iPreferredCompression = EModifiedRead;
+	faxSettings.iFaxId.Copy(_L8("+441632960000"));
+
+	//
+	// Start the Fax session...
+	//
+	CFaxTransfer*  faxSession = NULL;
+
+	TRAPD(startSessionResult, faxSession = CFaxTransfer::NewL(faxSettings));
+	TESTCHECKL(startSessionResult, KErrNone);
+	TESTL(faxSession != NULL);
+
+	faxSession->SetMode(EDialAndTransmit); // Or EImmediateTransmit
+
+	//
+	// Generate a Fax header for transmitting...
+	//
+	TFaxHeaderInfo  faxHeader;
+
+	faxHeader.iHeaderFontWidthInBytes = 0;
+	
+	CFaxHeaderLines*  testheader = CFaxHeaderLines::NewL();
+	TRAP_IGNORE(testheader->ReadFaxHeaderInfoL(faxHeader));
+	delete testheader;
+
+	GenerateHeaderFileL(faxSettings, *font24x16, 3, 16);
+
+	//
+	// Add the source file to the session. The "BLANK.FAX" all-white short run
+	// length file.
+	//
+	faxSession->AddSourceL(_L("C:\\BLANK.FAX"), Prefer2D);
+
+	//
+	// Set the destination phone number if needed...
+	//
+	if ((faxSession->iMode & KFaxNoDial) == 0)
+		{
+		TBuf8<32>  phoneNumber;
+
+		ReadDestPhoneNumberFromIniFileL(phoneNumber);
+		faxSession->SetPhoneNumberL(phoneNumber);
+		}
+	
+	//
+	// Begin transfering the fax...
+	//
+	INFO_PRINTF1(_L("Starting fax transmission of BLANK.FAX an all-white short run length file..."));
+	TInt  transferResult = BeginFaxTransfer(faxSession);
+	INFO_PRINTF2(_L("Fax transmission completed with return code %d"), transferResult);
+	TESTCHECK(transferResult, KErrNone);
+
+	//
+	// Clean up the Fax session...
+	//
+	faxSession->RemoveAllSources();
+	delete faxSession;
+	faxSession = NULL;
+
+	return TestStepResult();
+	} // CFaxTestTransmitFax03::doTestStepL
+
+
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestTransmitFax04::CFaxTestTransmitFax04()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestTransmitFax04"));
+	} // CFaxTestTransmitFax04::CFaxTestTransmitFax04
+
+
+/**
+ *  This tests the transmission of a straight forward test fax.
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestTransmitFax04::doTestStepL()
+	{
+	TFaxSettings  faxSettings;
+
+	//
+	// Before instantiating CFaxTransfer we have to have a valid set of
+	// TFaxSettings to pass in to it - so our first step must always be
+	// to read the fax settings or set up suitable defaults.
+	//
+	TRAPD(leaveCode, ReadFaxCommDBSettingsL(faxSettings));
+	if (leaveCode != KErrNone)
+		{
+		INFO_PRINTF2(_L("ReadFaxCommDBSettingsL() error %d!"), leaveCode);
+		}
+	TESTCHECKL(leaveCode, KErrNone);
+
+	//
+	// Set the Fax parameters...
+	//
+	faxSettings.iFaxClass             = EClass2point0;
+	faxSettings.iPreferredECM         = 1;
+	faxSettings.iMaxSpeed             = 2400;
+	faxSettings.iMinSpeed             = 2400;
+	faxSettings.iPreferredResolution  = EFaxNormal;
+	faxSettings.iPreferredCompression = EModifiedHuffman;
+	faxSettings.iFaxId.Copy(_L8("+441632960000"));
+
+	//
+	// Start the Fax session...
+	//
+	CFaxTransfer*  faxSession = NULL;
+
+	TRAPD(startSessionResult, faxSession = CFaxTransfer::NewL(faxSettings));
+	TESTCHECKL(startSessionResult, KErrNone);
+	TESTL(faxSession != NULL);
+
+	faxSession->SetMode(EDialAndTransmit); // Or EImmediateTransmit
+
+	//
+	// Generate a Fax header for transmitting...
+	//
+	TFaxHeaderInfo  faxHeader;
+
+	faxHeader.iHeaderFontWidthInBytes = 0;
+	
+	CFaxHeaderLines*  testheader = CFaxHeaderLines::NewL();
+	TRAP_IGNORE(testheader->ReadFaxHeaderInfoL(faxHeader));
+	delete testheader;
+
+	GenerateHeaderFileL(faxSettings, *font8x16, 1, 16);
+
+	//
+	// Add the source file to the session...
+	//
+	faxSession->AddSourceL(_L("C:\\TWO.FAX"), Prefer2D);
+
+	//
+	// Set the destination phone number if needed...
+	//
+	if ((faxSession->iMode & KFaxNoDial) == 0)
+		{
+		TBuf8<32>  phoneNumber;
+
+		ReadDestPhoneNumberFromIniFileL(phoneNumber);
+		faxSession->SetPhoneNumberL(phoneNumber);
+		}
+
+	//
+	// Begin transfering the fax...
+	//
+	INFO_PRINTF1(_L("Starting fax transmission of TWO.FAX a two page fax..."));
+	TInt  transferResult = BeginFaxTransfer(faxSession);
+	INFO_PRINTF2(_L("Fax transmission completed with return code %d"), transferResult);
+	TESTCHECK(transferResult, KErrNone);
+
+	//
+	// Clean up the Fax session...
+	//
+	faxSession->RemoveAllSources();
+	delete faxSession;
+	faxSession = NULL;
+
+	return TestStepResult();
+	} // CFaxTestTransmitFax04::doTestStepL
+
+
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestTransmitFax05::CFaxTestTransmitFax05()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestTransmitFax05"));
+	} // CFaxTestTransmitFax05::CFaxTestTransmitFax05
+
+
+/**
+ *  This tests the transmission of a straight forward test fax.
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestTransmitFax05::doTestStepL()
+	{
+	TFaxSettings  faxSettings;
+
+	//
+	// Before instantiating CFaxTransfer we have to have a valid set of
+	// TFaxSettings to pass in to it - so our first step must always be
+	// to read the fax settings or set up suitable defaults.
+	//
+	TRAPD(leaveCode, ReadFaxCommDBSettingsL(faxSettings));
+	if (leaveCode != KErrNone)
+		{
+		INFO_PRINTF2(_L("ReadFaxCommDBSettingsL() error %d!"), leaveCode);
+		}
+	TESTCHECKL(leaveCode, KErrNone);
+
+	//
+	// Set the Fax parameters...
+	//
+	faxSettings.iFaxClass             = EClassAuto;
+	faxSettings.iPreferredECM         = 1;
+	faxSettings.iMaxSpeed             = 14400;
+	faxSettings.iMinSpeed             = 2400;
+	faxSettings.iPreferredResolution  = EFaxNormal;
+	faxSettings.iPreferredCompression = EModifiedRead;
+	faxSettings.iFaxId.Copy(_L8("+441632960000"));
+
+	//
+	// Start the Fax session...
+	//
+	CFaxTransfer*  faxSession = NULL;
+
+	TRAPD(startSessionResult, faxSession = CFaxTransfer::NewL(faxSettings));
+	TESTCHECKL(startSessionResult, KErrNone);
+	TESTL(faxSession != NULL);
+
+	faxSession->SetMode(EDialAndTransmit); // Or EImmediateTransmit
+
+	//
+	// Generate a Fax header for transmitting...
+	//
+	TFaxHeaderInfo  faxHeader;
+
+	faxHeader.iHeaderFontWidthInBytes = 0;
+	
+	CFaxHeaderLines*  testheader = CFaxHeaderLines::NewL();
+	TRAP_IGNORE(testheader->ReadFaxHeaderInfoL(faxHeader));
+	delete testheader;
+
+	GenerateHeaderFileL(faxSettings, *font24x16, 3, 16);
+
+	//
+	// Add the source files to the session. This will test out the multi page
+	// sends and also the overall sending of large complex fax images
+	// by sending whole of CHART4.FAX, pages 3 to 5 from SIX.FAX, followed by
+	// TWO.FAX starting from page 2 and followed by page 1 of BLANK.FAX.
+	//
+	faxSession->AddSourceL(_L("C:\\chart4.fax"), Prefer2D);
+	faxSession->AddSourceL(_L("C:\\SIX.FAX"), 3, 5);
+	faxSession->AddSourceL(_L("C:\\TWO.FAX"), 2);
+	faxSession->AddSourceL(_L("C:\\BLANK.FAX"), 1, 1);
+
+	//
+	// Set the destination phone number if needed...
+	//
+	if ((faxSession->iMode & KFaxNoDial) == 0)
+		{
+		TBuf8<32>  phoneNumber;
+
+		ReadDestPhoneNumberFromIniFileL(phoneNumber);
+		faxSession->SetPhoneNumberL(phoneNumber);
+		}
+	
+	//
+	// Begin transfering the fax...
+	//
+	INFO_PRINTF1(_L("Starting fax transmission of a large complex fax set..."));
+	TInt  transferResult = BeginFaxTransfer(faxSession);
+	INFO_PRINTF2(_L("Fax transmission completed with return code %d"), transferResult);
+	TESTCHECK(transferResult, KErrNone);
+
+	//
+	// Clean up the Fax session...
+	//
+	faxSession->RemoveAllSources();
+	delete faxSession;
+	faxSession = NULL;
+
+	return TestStepResult();
+	} // CFaxTestTransmitFax05::doTestStepL
+
+
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestTransmitFax06::CFaxTestTransmitFax06()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestTransmitFax06"));
+	} // CFaxTestTransmitFax06::CFaxTestTransmitFax06
+
+
+/**
+ *  This tests the transmission of a straight forward test fax.
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestTransmitFax06::doTestStepL()
+	{
+	TFaxSettings  faxSettings;
+
+	//
+	// Before instantiating CFaxTransfer we have to have a valid set of
+	// TFaxSettings to pass in to it - so our first step must always be
+	// to read the fax settings or set up suitable defaults.
+	//
+	TRAPD(leaveCode, ReadFaxCommDBSettingsL(faxSettings));
+	if (leaveCode != KErrNone)
+		{
+		INFO_PRINTF2(_L("ReadFaxCommDBSettingsL() error %d!"), leaveCode);
+		}
+	TESTCHECKL(leaveCode, KErrNone);
+
+	//
+	// Set the Fax parameters...
+	//
+	faxSettings.iFaxClass             = EClassAuto;
+	faxSettings.iPreferredECM         = 0;
+	faxSettings.iMaxSpeed             = 14400;
+	faxSettings.iMinSpeed             = 2400;
+	faxSettings.iPreferredResolution  = EFaxFine;
+	faxSettings.iPreferredCompression = EModifiedHuffman;
+	faxSettings.iFaxId.Copy(_L8("+441632960000"));
+
+	//
+	// Start the Fax session...
+	//
+	CFaxTransfer*  faxSession = NULL;
+
+	TRAPD(startSessionResult, faxSession = CFaxTransfer::NewL(faxSettings));
+	TESTCHECKL(startSessionResult, KErrNone);
+	TESTL(faxSession != NULL);
+
+	faxSession->SetMode(EDialAndTransmit); // Or EImmediateTransmit
+
+	//
+	// Generate a Fax header for transmitting...
+	//
+	TFaxHeaderInfo  faxHeader;
+
+	faxHeader.iHeaderFontWidthInBytes = 0;
+	
+	CFaxHeaderLines*  testheader = CFaxHeaderLines::NewL();
+	TRAP_IGNORE(testheader->ReadFaxHeaderInfoL(faxHeader));
+	delete testheader;
+
+	GenerateHeaderFileL(faxSettings, *font24x16, 3, 16);
+
+	//
+	// Add the source files to the session. This tests a bad page fax.
+	//
+	faxSession->AddSourceL(_L("C:\\BADPAGE.FAX"), Prefer1D);
+
+	//
+	// Set the destination phone number if needed...
+	//
+	if ((faxSession->iMode & KFaxNoDial) == 0)
+		{
+		TBuf8<32>  phoneNumber;
+
+		ReadDestPhoneNumberFromIniFileL(phoneNumber);
+		faxSession->SetPhoneNumberL(phoneNumber);
+		}
+	
+	//
+	// Begin transfering the fax...
+	//
+	INFO_PRINTF1(_L("Starting fax transmission of a bad page fax..."));
+	TInt  transferResult = BeginFaxTransfer(faxSession);
+	INFO_PRINTF2(_L("Fax transmission completed with return code %d"), transferResult);
+	TESTCHECK(transferResult, KErrNone);
+
+	//
+	// Clean up the Fax session...
+	//
+	faxSession->RemoveAllSources();
+	delete faxSession;
+	faxSession = NULL;
+
+	return TestStepResult();
+	} // CFaxTestTransmitFax06::doTestStepL
+
+
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestReceiveFax01::CFaxTestReceiveFax01()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestReceiveFax01"));
+	} // CFaxTestReceiveFax01::CFaxTestReceiveFax01
+
+
+/**
+ *  This tests the reception of a straight forward test fax.
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestReceiveFax01::doTestStepL()
+	{
+	TFaxSettings  faxSettings;
+
+	//
+	// Before instantiating CFaxTransfer we have to have a valid set of
+	// TFaxSettings to pass in to it - so our first step must always be
+	// to read the fax settings or set up suitable defaults.
+	//
+	TRAPD(leaveCode, ReadFaxCommDBSettingsL(faxSettings));
+	if (leaveCode != KErrNone)
+		{
+		INFO_PRINTF2(_L("ReadFaxCommDBSettingsL() error %d!"), leaveCode);
+		}
+	TESTCHECKL(leaveCode, KErrNone);
+
+	//
+	// Set the Fax parameters...
+	//
+	faxSettings.iFaxClass = EClassAuto;  // Or EClass1, EClass2, EClass2point0
+	if (faxSettings.iFaxClass == EClass2point0  ||
+		faxSettings.iFaxClass == EClassAuto)
+		{
+		faxSettings.iPreferredECM = 0; // Or 1
+		}
+
+	faxSettings.iMaxSpeed = 14400; // 2400 to 14400 % 2400
+	faxSettings.iMinSpeed = 2400; // 2400 to 14400 % 2400
+	faxSettings.iPreferredResolution = EFaxNormal; // Or EFaxFine
+	faxSettings.iPreferredCompression = EModifiedHuffman;
+	faxSettings.iFaxId.Copy(_L8("+441632960000"));
+
+	//
+	// Start the Fax session...
+	//
+	CFaxTransfer*  faxSession = NULL;
+
+	TRAPD(startSessionResult, faxSession = CFaxTransfer::NewL(faxSettings));
+	TESTCHECKL(startSessionResult, KErrNone);
+	TESTL(faxSession != NULL);
+
+	faxSession->SetMode(EWaitForRingAndReceive); // Or EDialAndReceiveFaxBack, EDialAndReceivePoll, EImmediateReceive
+	faxSession->SetReceiveFileName(_L("C:\\RECEIVE01.FAX"));
+
+	//
+	// Set the destination phone number if needed...
+	//
+	if ((faxSession->iMode & KFaxNoDial) == 0)
+		{
+		TBuf8<32>  phoneNumber;
+
+		ReadDestPhoneNumberFromIniFileL(phoneNumber);
+		faxSession->SetPhoneNumberL(phoneNumber);
+		}
+
+	//
+	// Begin transfering the fax...
+	//
+	INFO_PRINTF1(_L("Starting fax reception..."));
+	TInt  transferResult = BeginFaxTransfer(faxSession);
+	INFO_PRINTF2(_L("Fax reception completed with return code %d"), transferResult);
+	TESTCHECK(transferResult, KErrNone);
+
+	//
+	// Clean up the Fax session...
+	//
+	faxSession->RemoveAllSources();
+	delete faxSession;
+	faxSession = NULL;
+
+	return TestStepResult();
+	} // CFaxTestReceiveFax01::doTestStepL
+
+
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestReceiveFax02::CFaxTestReceiveFax02()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestTransmitFax02"));
+	} // CFaxTestReceiveFax02::CFaxTestReceiveFax02
+
+
+/**
+ *  This tests the reception of a fax, specifying the call object name first.
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestReceiveFax02::doTestStepL()
+	{
+	TFaxSettings  faxSettings;
+
+	//
+	// Before instantiating CFaxTransfer we have to have a valid set of
+	// TFaxSettings to pass in to it - so our first step must always be
+	// to read the fax settings or set up suitable defaults.
+	//
+	TRAPD(leaveCode, ReadFaxCommDBSettingsL(faxSettings));
+	if (leaveCode != KErrNone)
+		{
+		INFO_PRINTF2(_L("ReadFaxCommDBSettingsL() error %d!"), leaveCode);
+		}
+	TESTCHECKL(leaveCode, KErrNone);
+
+	//
+	// Set the Fax parameters...
+	//
+	faxSettings.iFaxClass = EClassAuto;  // Or EClass1, EClass2, EClass2point0
+	if (faxSettings.iFaxClass == EClass2point0  ||
+		faxSettings.iFaxClass == EClassAuto)
+		{
+		faxSettings.iPreferredECM = 0; // Or 1
+		}
+
+	faxSettings.iMaxSpeed = 14400; // 2400 to 14400 % 2400
+	faxSettings.iMinSpeed = 2400; // 2400 to 14400 % 2400
+	faxSettings.iPreferredResolution = EFaxNormal; // Or EFaxFine
+	faxSettings.iPreferredCompression = EModifiedHuffman;
+	faxSettings.iFaxId.Copy(_L8("+441632960000"));
+
+	//
+	// Start the Fax session...
+	//
+	CFaxTransfer*  faxSession = NULL;
+
+	TRAPD(startSessionResult, faxSession = CFaxTransfer::NewL(faxSettings));
+	TESTCHECKL(startSessionResult, KErrNone);
+	TESTL(faxSession != NULL);
+
+
+	faxSession->SetMode(EWaitForRingAndReceive); // Or EDialAndReceiveFaxBack, EDialAndReceivePoll, EImmediateReceive
+	faxSession->SetReceiveFileName(_L("C:\\RECEIVE02.FAX"));
+
+	//
+	// For this test, find the name of the incoming call and request the fax
+	// session to open that call...
+	//
+	RTelServer  telServer;
+	RMobilePhone  phone;
+	RLine  line;
+	RCall  call;
+	TName  incomingCallName;
+	RCall::TStatus  callStatus;
+
+	TInt  result = telServer.Connect();
+	TESTCHECKL(result, KErrNone);
+	CleanupClosePushL(telServer);
+
+	result = telServer.LoadPhoneModule(KTEFaxTSYName);
+	TESTCHECKL(result, KErrNone);
+
+	result = phone.Open(telServer, KTEFaxPhoneName);
+	TESTCHECKL(result, KErrNone);
+	CleanupClosePushL(phone);
+
+	result = line.Open(phone, KTEFaxLineName);
+	TESTCHECKL(result, KErrNone);
+	CleanupClosePushL(line);
+
+	TRequestStatus  status;
+
+	line.NotifyIncomingCall(status, incomingCallName);
+	User::WaitForRequest(status);
+	TESTCHECKL(status.Int(), KErrNone);
+	INFO_PRINTF2(_L("Incoming fax call is \"%S\"..."), &incomingCallName);
+
+	faxSession->SetCallObjectName(incomingCallName);
+
+	//
+	// Open the incoming call and request a notification of state change. If
+	// the Fax Server were to open a different RCall object then this would
+	// not work - thus it is a good test of SetCallObjectName()...
+	//
+	result = call.OpenExistingCall(line, incomingCallName);
+	TESTCHECKL(result, KErrNone);
+	CleanupClosePushL(call);
+
+	callStatus = RCall::EStatusUnknown;
+	call.NotifyStatusChange(status, callStatus);
+	TESTCHECK(status.Int(), KRequestPending);
+
+	//
+	// Set the destination phone number if needed...
+	//
+	if ((faxSession->iMode & KFaxNoDial) == 0)
+		{
+		TBuf8<32>  phoneNumber;
+
+		ReadDestPhoneNumberFromIniFileL(phoneNumber);
+		faxSession->SetPhoneNumberL(phoneNumber);
+		}
+	
+	//
+	// Begin transfering the fax...
+	//
+	INFO_PRINTF1(_L("Starting fax reception..."));
+	TInt  transferResult = BeginFaxTransfer(faxSession);
+	INFO_PRINTF2(_L("Fax reception completed with return code %d"), transferResult);
+	TESTCHECK(transferResult, KErrNone);
+
+	//
+	// Check that the notify operation returned as the fax server answered the
+	// call...
+	//
+	User::WaitForRequest(status);
+	TESTCHECK(status.Int(), KErrNone);
+	TESTCHECK(callStatus, RCall::EStatusAnswering);
+
+	//
+	// Clean up Etel handles...
+	//
+	CleanupStack::PopAndDestroy(&call);
+	CleanupStack::PopAndDestroy(&line);
+	CleanupStack::PopAndDestroy(&phone);
+	CleanupStack::PopAndDestroy(&telServer);
+
+	//
+	// Clean up the Fax session...
+	//
+	faxSession->RemoveAllSources();
+	delete faxSession;
+	faxSession = NULL;
+
+	return TestStepResult();
+	} // CFaxTestReceiveFax02::doTestStepL
+
+
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestReceiveFax03::CFaxTestReceiveFax03()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestReceiveFax03"));
+	} // CFaxTestReceiveFax03::CFaxTestReceiveFax03
+
+
+/**
+ *  This tests the reception of a straight forward test fax.
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestReceiveFax03::doTestStepL()
+	{
+	TFaxSettings  faxSettings;
+
+	//
+	// Before instantiating CFaxTransfer we have to have a valid set of
+	// TFaxSettings to pass in to it - so our first step must always be
+	// to read the fax settings or set up suitable defaults.
+	//
+	TRAPD(leaveCode, ReadFaxCommDBSettingsL(faxSettings));
+	if (leaveCode != KErrNone)
+		{
+		INFO_PRINTF2(_L("ReadFaxCommDBSettingsL() error %d!"), leaveCode);
+		}
+	TESTCHECKL(leaveCode, KErrNone);
+
+	//
+	// Set the Fax parameters...
+	//
+	faxSettings.iFaxClass = EClassAuto;  // Or EClass1, EClass2, EClass2point0
+	if (faxSettings.iFaxClass == EClass2point0  ||
+		faxSettings.iFaxClass == EClassAuto)
+		{
+		faxSettings.iPreferredECM = 0; // Or 1
+		}
+
+	faxSettings.iMaxSpeed = 14400; // 2400 to 14400 % 2400
+	faxSettings.iMinSpeed = 2400; // 2400 to 14400 % 2400
+	faxSettings.iPreferredResolution = EFaxNormal; // Or EFaxFine
+	faxSettings.iPreferredCompression = EModifiedHuffman;
+	faxSettings.iFaxId.Copy(_L8("+441632960000"));
+
+	//
+	// Start the Fax session...
+	//
+	CFaxTransfer*  faxSession = NULL;
+
+	TRAPD(startSessionResult, faxSession = CFaxTransfer::NewL(faxSettings));
+	TESTCHECKL(startSessionResult, KErrNone);
+	TESTL(faxSession != NULL);
+
+	faxSession->SetMode(EWaitForRingAndReceive); // Or EDialAndReceiveFaxBack, EDialAndReceivePoll, EImmediateReceive
+	faxSession->SetReceiveFileName(_L("C:\\RECEIVE03.FAX"));
+
+	//
+	// Set the destination phone number if needed...
+	//
+	if ((faxSession->iMode & KFaxNoDial) == 0)
+		{
+		TBuf8<32>  phoneNumber;
+
+		ReadDestPhoneNumberFromIniFileL(phoneNumber);
+		faxSession->SetPhoneNumberL(phoneNumber);
+		}
+	
+	//
+	// Begin transfering the fax...
+	//
+	INFO_PRINTF1(_L("Starting fax reception..."));
+	TInt  transferResult = BeginFaxTransfer(faxSession);
+	INFO_PRINTF2(_L("Fax reception completed with return code %d"), transferResult);
+	TESTCHECK(transferResult, KErrNone);
+
+	//
+	// Clean up the Fax session...
+	//
+	faxSession->RemoveAllSources();
+	delete faxSession;
+	faxSession = NULL;
+
+	return TestStepResult();
+	} // CFaxTestReceiveFax03::doTestStepL
+
+
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestReceiveFax04::CFaxTestReceiveFax04()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestReceiveFax04"));
+	} // CFaxTestReceiveFax04::CFaxTestReceiveFax04
+
+
+/**
+ *  This tests the reception of a straight forward test fax.
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestReceiveFax04::doTestStepL()
+	{
+	TFaxSettings  faxSettings;
+
+	//
+	// Before instantiating CFaxTransfer we have to have a valid set of
+	// TFaxSettings to pass in to it - so our first step must always be
+	// to read the fax settings or set up suitable defaults.
+	//
+	TRAPD(leaveCode, ReadFaxCommDBSettingsL(faxSettings));
+	if (leaveCode != KErrNone)
+		{
+		INFO_PRINTF2(_L("ReadFaxCommDBSettingsL() error %d!"), leaveCode);
+		}
+	TESTCHECKL(leaveCode, KErrNone);
+
+	//
+	// Set the Fax parameters...
+	//
+	faxSettings.iFaxClass = EClassAuto;  // Or EClass1, EClass2, EClass2point0
+	if (faxSettings.iFaxClass == EClass2point0  ||
+		faxSettings.iFaxClass == EClassAuto)
+		{
+		faxSettings.iPreferredECM = 0; // Or 1
+		}
+
+	faxSettings.iMaxSpeed = 14400; // 2400 to 14400 % 2400
+	faxSettings.iMinSpeed = 2400; // 2400 to 14400 % 2400
+	faxSettings.iPreferredResolution = EFaxNormal; // Or EFaxFine
+	faxSettings.iPreferredCompression = EModifiedHuffman;
+	faxSettings.iFaxId.Copy(_L8("+441632960000"));
+
+	//
+	// Start the Fax session...
+	//
+	CFaxTransfer*  faxSession = NULL;
+
+	TRAPD(startSessionResult, faxSession = CFaxTransfer::NewL(faxSettings));
+	TESTCHECKL(startSessionResult, KErrNone);
+	TESTL(faxSession != NULL);
+
+
+	faxSession->SetMode(EWaitForRingAndReceive); // Or EDialAndReceiveFaxBack, EDialAndReceivePoll, EImmediateReceive
+	faxSession->SetReceiveFileName(_L("C:\\RECEIVE04.FAX"));
+
+	//
+	// Set the destination phone number if needed...
+	//
+	if ((faxSession->iMode & KFaxNoDial) == 0)
+		{
+		TBuf8<32>  phoneNumber;
+
+		ReadDestPhoneNumberFromIniFileL(phoneNumber);
+		faxSession->SetPhoneNumberL(phoneNumber);
+		}
+	
+	//
+	// Begin transfering the fax...
+	//
+	INFO_PRINTF1(_L("Starting fax reception..."));
+	TInt  transferResult = BeginFaxTransfer(faxSession);
+	INFO_PRINTF2(_L("Fax reception completed with return code %d"), transferResult);
+	TESTCHECK(transferResult, KErrNone);
+
+	//
+	// Clean up the Fax session...
+	//
+	faxSession->RemoveAllSources();
+	delete faxSession;
+	faxSession = NULL;
+
+	return TestStepResult();
+	} // CFaxTestReceiveFax04::doTestStepL
+
+
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestReceiveFax05::CFaxTestReceiveFax05()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestReceiveFax05"));
+	} // CFaxTestReceiveFax05::CFaxTestReceiveFax05
+
+
+/**
+ *  This tests the reception of a straight forward test fax.
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestReceiveFax05::doTestStepL()
+	{
+	TFaxSettings  faxSettings;
+
+	//
+	// Before instantiating CFaxTransfer we have to have a valid set of
+	// TFaxSettings to pass in to it - so our first step must always be
+	// to read the fax settings or set up suitable defaults.
+	//
+	TRAPD(leaveCode, ReadFaxCommDBSettingsL(faxSettings));
+	if (leaveCode != KErrNone)
+		{
+		INFO_PRINTF2(_L("ReadFaxCommDBSettingsL() error %d!"), leaveCode);
+		}
+	TESTCHECKL(leaveCode, KErrNone);
+
+	//
+	// Set the Fax parameters...
+	//
+	faxSettings.iFaxClass = EClassAuto;  // Or EClass1, EClass2, EClass2point0
+	if (faxSettings.iFaxClass == EClass2point0  ||
+		faxSettings.iFaxClass == EClassAuto)
+		{
+		faxSettings.iPreferredECM = 0; // Or 1
+		}
+
+	faxSettings.iMaxSpeed = 14400; // 2400 to 14400 % 2400
+	faxSettings.iMinSpeed = 2400; // 2400 to 14400 % 2400
+	faxSettings.iPreferredResolution = EFaxNormal; // Or EFaxFine
+	faxSettings.iPreferredCompression = EModifiedHuffman;
+	faxSettings.iFaxId.Copy(_L8("+441632960000"));
+
+	//
+	// Start the Fax session...
+	//
+	CFaxTransfer*  faxSession = NULL;
+
+	TRAPD(startSessionResult, faxSession = CFaxTransfer::NewL(faxSettings));
+	TESTCHECKL(startSessionResult, KErrNone);
+	TESTL(faxSession != NULL);
+
+
+	faxSession->SetMode(EWaitForRingAndReceive); // Or EDialAndReceiveFaxBack, EDialAndReceivePoll, EImmediateReceive
+	faxSession->SetReceiveFileName(_L("C:\\RECEIVE05.FAX"));
+
+	//
+	// Set the destination phone number if needed...
+	//
+	if ((faxSession->iMode & KFaxNoDial) == 0)
+		{
+		TBuf8<32>  phoneNumber;
+
+		ReadDestPhoneNumberFromIniFileL(phoneNumber);
+		faxSession->SetPhoneNumberL(phoneNumber);
+		}
+
+	//
+	// Begin transfering the fax...
+	//
+	INFO_PRINTF1(_L("Starting fax reception..."));
+	TInt  transferResult = BeginFaxTransfer(faxSession);
+	INFO_PRINTF2(_L("Fax reception completed with return code %d"), transferResult);
+	TESTCHECK(transferResult, KErrNone);
+
+	//
+	// Clean up the Fax session...
+	//
+	faxSession->RemoveAllSources();
+	delete faxSession;
+	faxSession = NULL;
+
+	return TestStepResult();
+	} // CFaxTestReceiveFax05::doTestStepL
+
+
+/**
+ *  Each test step initialises it's own name
+ */
+CFaxTestReceiveFax06::CFaxTestReceiveFax06()
+	{
+	//
+	// Store the name of this test case.  This is the name that is used by
+	// the script file.
+	//
+	SetTestStepName(_L("TestReceiveFax06"));
+	} // CFaxTestReceiveFax06::CFaxTestReceiveFax06
+
+
+/**
+ *  This tests the reception of a straight forward test fax.
+ *
+ *  @return Test verdict for this test.
+ */	
+enum TVerdict CFaxTestReceiveFax06::doTestStepL()
+	{
+	TFaxSettings  faxSettings;
+
+	//
+	// Before instantiating CFaxTransfer we have to have a valid set of
+	// TFaxSettings to pass in to it - so our first step must always be
+	// to read the fax settings or set up suitable defaults.
+	//
+	TRAPD(leaveCode, ReadFaxCommDBSettingsL(faxSettings));
+	if (leaveCode != KErrNone)
+		{
+		INFO_PRINTF2(_L("ReadFaxCommDBSettingsL() error %d!"), leaveCode);
+		}
+	TESTCHECKL(leaveCode, KErrNone);
+
+	//
+	// Set the Fax parameters...
+	//
+	faxSettings.iFaxClass = EClassAuto;  // Or EClass1, EClass2, EClass2point0
+	if (faxSettings.iFaxClass == EClass2point0  ||
+		faxSettings.iFaxClass == EClassAuto)
+		{
+		faxSettings.iPreferredECM = 0; // Or 1
+		}
+
+	faxSettings.iMaxSpeed = 14400; // 2400 to 14400 % 2400
+	faxSettings.iMinSpeed = 2400; // 2400 to 14400 % 2400
+	faxSettings.iPreferredResolution = EFaxNormal; // Or EFaxFine
+	faxSettings.iPreferredCompression = EModifiedHuffman;
+	faxSettings.iFaxId.Copy(_L8("+441632960000"));
+
+	//
+	// Start the Fax session...
+	//
+	CFaxTransfer*  faxSession = NULL;
+
+	TRAPD(startSessionResult, faxSession = CFaxTransfer::NewL(faxSettings));
+	TESTCHECKL(startSessionResult, KErrNone);
+	TESTL(faxSession != NULL);
+
+
+	faxSession->SetMode(EWaitForRingAndReceive); // Or EDialAndReceiveFaxBack, EDialAndReceivePoll, EImmediateReceive
+	faxSession->SetReceiveFileName(_L("C:\\RECEIVE06.FAX"));
+
+	//
+	// Set the destination phone number if needed...
+	//
+	if ((faxSession->iMode & KFaxNoDial) == 0)
+		{
+		TBuf8<32>  phoneNumber;
+
+		ReadDestPhoneNumberFromIniFileL(phoneNumber);
+		faxSession->SetPhoneNumberL(phoneNumber);
+		}
+
+	//
+	// Begin transfering the fax...
+	//
+	INFO_PRINTF1(_L("Starting fax reception..."));
+	TInt  transferResult = BeginFaxTransfer(faxSession);
+	INFO_PRINTF2(_L("Fax reception completed with return code %d"), transferResult);
+	TESTCHECK(transferResult, KErrNone);
+
+	//
+	// Clean up the Fax session...
+	//
+	faxSession->RemoveAllSources();
+	delete faxSession;
+	faxSession = NULL;
+
+	return TestStepResult();
+	} // CFaxTestReceiveFax06::doTestStepL
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_FaxTest.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,174 @@
+// Copyright (c) 2004-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:
+// Telephony Fax Test header file.
+// 
+//
+
+/**
+ @file
+ @internalComponent
+*/
+
+#ifndef __TE_FAX_H__
+#define __TE_FAX_H__
+
+
+class CFaxTestFaxDefinition : public CFaxTestStep
+	{
+public:
+	CFaxTestFaxDefinition();
+	virtual enum TVerdict doTestStepL();
+	};
+
+
+class CFaxTestFaxStorage : public CFaxTestStep
+	{
+public:
+	CFaxTestFaxStorage();
+	virtual enum TVerdict doTestStepL();
+ 
+	void Test1L(TInt aNumberLines, TBuf8<216>& aScanLineWrite, TFaxResolution aRes);
+	void Test2L(TInt aNumberLines, TBuf8<216>& aScanLineWrite1,
+				TBuf8<216>&  aScanLineWrite2, TFaxResolution aRes);
+	void Test3L(TInt aNumberLines, TInt aNumberPages);
+	void Test4L(TInt aNumberLines);
+	void Test5L(TFaxResolution aRes, TFaxBufSenderId& aSenderId,
+				TFaxCompression aF1, TInt aF2);
+
+private:
+    CWriteFaxFile*  iWriteFaxFile;
+	CReadFaxFile*  iReadFaxFile;
+	TFaxBufSenderId  iSenderId;
+	};
+
+
+class CFaxTestFaxCoding : public CFaxTestStep
+	{
+public:
+	CFaxTestFaxCoding();
+	virtual enum TVerdict doTestStepL();
+
+	TInt FindEndOfLine(TDes8& aEncodedDes);
+	};
+
+
+class CFaxTestFaxHeaderDefinition : public CFaxTestStep
+	{
+public:
+	CFaxTestFaxHeaderDefinition();
+	virtual enum TVerdict doTestStepL();
+
+	void GenerateFaxFileL(RFile& aFile);
+	void GenerateHeaderFileL(const TUint8* aFont, TInt aWidth, TInt aHeight);
+	};
+
+
+class CFaxTestTransmitFax01 : public CFaxTestStep
+	{
+public:
+	CFaxTestTransmitFax01();
+	virtual enum TVerdict doTestStepL();
+	};
+
+
+class CFaxTestTransmitFax02 : public CFaxTestStep
+	{
+public:
+	CFaxTestTransmitFax02();
+	virtual enum TVerdict doTestStepL();
+	};
+
+
+class CFaxTestTransmitFax03 : public CFaxTestStep
+	{
+public:
+	CFaxTestTransmitFax03();
+	virtual enum TVerdict doTestStepL();
+	};
+
+
+class CFaxTestTransmitFax04 : public CFaxTestStep
+	{
+public:
+	CFaxTestTransmitFax04();
+	virtual enum TVerdict doTestStepL();
+	};
+
+
+class CFaxTestTransmitFax05 : public CFaxTestStep
+	{
+public:
+	CFaxTestTransmitFax05();
+	virtual enum TVerdict doTestStepL();
+	};
+
+
+class CFaxTestTransmitFax06 : public CFaxTestStep
+	{
+public:
+	CFaxTestTransmitFax06();
+	virtual enum TVerdict doTestStepL();
+	};
+
+
+class CFaxTestReceiveFax01 : public CFaxTestStep
+	{
+public:
+	CFaxTestReceiveFax01();
+	virtual enum TVerdict doTestStepL();
+	};
+
+
+class CFaxTestReceiveFax02 : public CFaxTestStep
+	{
+public:
+	CFaxTestReceiveFax02();
+	virtual enum TVerdict doTestStepL();
+	};
+
+
+class CFaxTestReceiveFax03 : public CFaxTestStep
+	{
+public:
+	CFaxTestReceiveFax03();
+	virtual enum TVerdict doTestStepL();
+	};
+
+
+class CFaxTestReceiveFax04 : public CFaxTestStep
+	{
+public:
+	CFaxTestReceiveFax04();
+	virtual enum TVerdict doTestStepL();
+	};
+
+
+class CFaxTestReceiveFax05 : public CFaxTestStep
+	{
+public:
+	CFaxTestReceiveFax05();
+	virtual enum TVerdict doTestStepL();
+	};
+
+
+class CFaxTestReceiveFax06 : public CFaxTestStep
+	{
+public:
+	CFaxTestReceiveFax06();
+	virtual enum TVerdict doTestStepL();
+	};
+
+
+#endif // __TE_FAXTEST_H__
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax_9210_IR.cfg	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,2317 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommDB Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## Network
+## 
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Intranet
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=mRouter
+	FIELD_COUNT=1
+END_ADD
+
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Name=Default Modem
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Null Modem 115200bps
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=IRCOMM::0
+	TSYName=MM
+	CSYName=IRCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=US Robotics Sportster
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=57600
+	Handshaking=196
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=AFTERDIALUNTILANSWER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT&F1
+	DataInitString=AT
+	FaxInitString=AT&d2
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Dacom Surfer
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=57600
+	Handshaking=196
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=AFTERDIALUNTILANSWER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT&F
+	DataInitString=AT
+	FaxInitString=AT&d2
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=GSM Mobile Phone via Infrared
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=IRCOMM::0
+	TSYName=MM
+	CSYName=IRCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=196
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=GSM Mobile Phone via Serial
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=196
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=GPRS Ericsson R520m via IR
+	Agent=PSD.agt
+	IfName=PPP
+	PortName=IRCOMM::0
+	TSYName=MM
+	CSYName=IRCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=GPRS Ericsson R520m/T68i via Serial
+	Agent=PSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	IspInitString=*99***1#
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=70
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=GPRS Motorola Mobile Phone via Serial
+	Agent=PSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=57600
+	Handshaking=4
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=WinTunnel Modem
+	Agent=null.agt
+	IfName=PPP
+	PortName=COMM::6
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=52
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=mRouterWinsBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=WINS::0
+	TSYName=MM
+	CSYName=WINSCSY
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=52
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=mRouterRs232Bearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Name=mRouterIrBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=IRCOMM::0
+	TSYName=MM
+	CSYName=IRCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=52
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+	Name=mRouterBtBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=BTCOMM::0
+	TSYName=MM
+	CSYName=BTCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=52
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 15
+	Name=mRouterUsbBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=ACM::0
+	TSYName=MM
+	CSYName=ECACM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=52
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+
+############################################################
+## LANBearer
+## 
+[LANBearer]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=EKA1 Assabet on-board Ethernet
+	Agent=nullagt.agt
+	IfName=ethint
+	LDDFilename=ethercard
+	LDDName=EtherCard
+	PDDFilename=EtherSmc
+	PDDName=EtherCard.Smc
+	PacketDriverName=EtherPkt.drv
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=EKA2 Assabet on-board Ethernet
+	Agent=nullagt.agt
+	IfName=ethint
+	LDDFilename=enet
+	LDDName=Ethernet
+	PDDFilename=ethernet
+	PDDName=Ethernet.Assabet
+	PacketDriverName=EtherPkt.drv
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=EKA1 emulator Ethernet
+	Agent=nullagt.agt
+	IfName=ethint
+	LDDFilename=ethercard
+	LDDName=Ethercard
+	PDDFilename=etherwins
+	PDDName=Ethercard.wins
+	PacketDriverName=EtherPkt.drv
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=EKA2 emulator Ethernet
+	Agent=nullagt.agt
+	IfName=ethint
+	LDDFilename=enet
+	LDDName=Ethernet
+	PDDFilename=ethernet
+	PDDName=Ethernet.Wins
+	PacketDriverName=EtherPkt.drv
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=11
+END_ADD
+
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=8
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Office
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	DialOutCode=,
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Office Direct Dial
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=Home
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=181
+	Mobile=FALSE
+	UsePulseDial=TRUE
+	WaitForDialTone=TRUE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## Chargecard
+## 
+[Chargecard]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Dummy BT Chargecard
+	AccountNumber=144,12345678
+	Pin=0000
+	LocalRule=HG
+	NatRule=HFG
+	IntlRule=HEFG
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Dummy Mercury Chargecard
+	AccountNumber=0500800800,,12345678
+	Pin=****
+	LocalRule=HG
+	NatRule=J,K,0FG
+	IntlRule=HEFG
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_SECTION
+	WAPAccessPoint=1
+	RedialAttempts=3
+	SmsBearer=1
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ConnectionAttempts=2
+	ModemForDataAndFax=2
+	ModemForPhoneServicesAndSMS=2
+	LocationForDataAndFax=2
+	LocationForPhoneServicesAndSMS=2
+	DefaultNetwork=1
+	BearerAvailabilityCheckTSY=mm
+	FIELD_COUNT=14
+END_ADD
+
+
+############################################################
+## DialOutISP
+## 
+[DialOutISP]
+ADD_TEMPLATE
+	Name=Default Dial Out ISP
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=TRUE
+	DisplayPCT=FALSE
+	IfPromptForAuth=TRUE
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=28
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=NT RAS
+	Description=Test
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=TRUE
+	LoginScript=CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=35
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=ISP01
+	Description=PlaceHolder for ISP01
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=ISP02
+	Description=PlaceHolder for ISP02
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=ISP03
+	Description=PlaceHolder for ISP03
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=ISP04
+	Description=PlaceHolder for ISP04
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=ISP05
+	Description=PlaceHolder for ISP05
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=mRouterDialOutIsp
+	Description=mRouterDialOutIsp
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=IfAuthPass=
+	IfAuthPass=AuthRetries=0
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+
+############################################################
+## DialInISP
+## 
+[DialInISP]
+ADD_TEMPLATE
+	Name=Default Dial In ISP
+	UseLoginScript=FALSE
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=9
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Dial In ISP01
+	UseLoginScript=FALSE
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=GPRS01
+	APN=gprs01APNPlaceHolder
+	PDPType=IPV4
+	ReqPrecedence=0
+	ReqDelay=0
+	ReqReliability=0
+	ReqPeakThroughput=0
+	ReqMeanThroughput=0
+	MinPrecedence=0
+	MinDelay=0
+	MinReliability=0
+	MinPeakThroughput=0
+	MinMeanThroughput=0
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=1
+	IpDNSAddrFromServer=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	IpAddrFromServer=TRUE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=26
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=GPRS02
+	APN=gprs02APNPlaceHolder
+	PDPType=IPV4
+	ReqPrecedence=0
+	ReqDelay=0
+	ReqReliability=0
+	ReqPeakThroughput=0
+	ReqMeanThroughput=0
+	MinPrecedence=0
+	MinDelay=0
+	MinReliability=0
+	MinPeakThroughput=0
+	MinMeanThroughput=0
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=1
+	IpDNSAddrFromServer=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	IpAddrFromServer=TRUE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=26
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=GPRS03
+	APN=gprs03APNPlaceHolder
+	PDPType=IPV4
+	ReqPrecedence=0
+	ReqDelay=0
+	ReqReliability=0
+	ReqPeakThroughput=0
+	ReqMeanThroughput=0
+	MinPrecedence=0
+	MinDelay=0
+	MinReliability=0
+	MinPeakThroughput=0
+	MinMeanThroughput=0
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=1
+	IpDNSAddrFromServer=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	IpAddrFromServer=TRUE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=26
+END_ADD
+
+
+############################################################
+## IncomingGPRS
+## 
+[IncomingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Incoming GPRS Settings PlaceHolder
+	APN=Test
+	PDPType=IPV4
+	ReqPrecedence=1
+	ReqDelay=1
+	ReqReliability=1
+	ReqPeakThroughput=1
+	ReqMeanThroughput=1
+	MinPrecedence=1
+	MinDelay=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	AuthRetries=1
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=0.0.0.0
+	IpNameServer2=0.0.0.0
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	PDPAddress=0.0.0.0
+	IpAddrFromServer=TRUE
+	FIELD_COUNT=29
+END_ADD
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	APN=Access point name
+	PDPType=IPV6
+	PDPAddress=www.wid.com
+	Precedence=1
+	Delay=1
+	Reliability=1
+	PeakThroughput=1
+	MeanThroughput=1
+	MinPrecedence=1
+	MinDelay=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=TRUE
+	HeaderCompression=TRUE
+	GprsUseEdge=FALSE
+	AnonymousAccess=TRUE
+	FIELD_COUNT=19
+END_ADD
+
+
+############################################################
+## CDMA2000PacketServiceTable
+## 
+[CDMA2000PacketServiceTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=test name cdma2000
+	IwfName=Test2000
+	ServiceOption=HIGHSPEEDCDMA2000DATA
+	PdpType=IPV4
+	ReqFwdPriority=PRIORITY04
+	ReqRevPriority=PRIORITY04
+	ReqFwdBitrate=32KBPS
+	ReqRevBitrate=32KBPS
+	ReqFwdLoss=LOSS1
+	ReqRevLoss=LOSS1
+	ReqFwdMaxdelay=40MS
+	ReqRevMaxdelay=40MS
+	MinFwdBitrate=32KBPS
+	MinRevBitrate=32KBPS
+	AccptFwdLoss=LOSS2
+	AccptRevLoss=LOSS2
+	AccptFwdMaxdelay=120MS
+	AccptRevMaxdelay=120MS
+	DataCompression=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	AuthRetries=1
+	IpNetMask=0.255.255.255
+	IpGateway=10.0.0.1
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableLCPExtension=TRUE
+	DisablePlainTextAuth=TRUE
+	ApType=2
+	QosWarningTimeout=1000000
+	RlpMode=TRANSPARENT
+	CDMAMobileIP=FALSE
+	CDMAMobileIPTimeout=10000000
+	CDMANaiType=0
+	FIELD_COUNT=37
+END_ADD
+
+
+############################################################
+## DefaultCDMA2000SettingsTable
+## 
+[DefaultCDMA2000SettingsTable]
+
+############################################################
+## LANService
+## 
+[LANService]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Ethernet
+	IfNetworks=ip,ip6
+	IpNetMask=255.255.255.0
+	IpGateway=194.72.6.1
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.0.100
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## IAP
+## 
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=NT RAS with Null Modem
+	IAPService=2
+	IAPServiceType=DialOutISP
+	IAPBearer=2
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=CSD IAP PlaceHolder01
+	IAPService=3
+	IAPServiceType=DialOutISP
+	IAPBearer=2
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=CSD IAP PlaceHolder02
+	IAPService=4
+	IAPServiceType=DialOutISP
+	IAPBearer=2
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=GPRS IAP PlaceHolder01
+	IAPService=1
+	IAPServiceType=OutgoingGPRS
+	IAPBearer=8
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=GPRS IAP PlaceHolder02
+	IAPService=2
+	IAPServiceType=OutgoingGPRS
+	IAPBearer=8
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=mRouter Rs232
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=12
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=mRouter Ir
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=13
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=mRouter BT
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=14
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=mRouter USB
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=15
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=mRouter Wins
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=11
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=VPN IAP
+	IAPService=2
+	IAPServiceType=VpnService
+	IAPBearer=2
+	IAPBearerType=VirtualBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=EKA1 Assabet on-board ethernet
+	IAPService=1
+	IAPServiceType=LANService
+	IAPBearer=1
+	IAPBearerType=LANBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Name=EKA2 Assabet on-board ethernet
+	IAPService=1
+	IAPServiceType=LANService
+	IAPBearer=2
+	IAPBearerType=LANBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+	Name=EKA1 emulator ethernet
+	IAPService=1
+	IAPServiceType=LANService
+	IAPBearer=3
+	IAPBearerType=LANBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 15
+	Name=EKA2 emulator ethernet
+	IAPService=1
+	IAPServiceType=LANService
+	IAPBearer=4
+	IAPBearerType=LANBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+	Ranking=0
+	Direction=OUTGOING
+	DialogPref=PROMPT
+	BearerSet=CSD
+	IAP=1
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+	Ranking=1
+	Direction=OUTGOING
+	DialogPref=PROMPT
+	BearerSet=CSD
+	IAP=1
+	FIELD_COUNT=5
+END_ADD
+
+
+############################################################
+## BTDeviceTable
+## 
+[BTDeviceTable]
+
+############################################################
+## BTSecurityTable
+## 
+[BTSecurityTable]
+
+############################################################
+## BTDefaultTable
+## 
+[BTDefaultTable]
+
+############################################################
+## Proxies
+## 
+[Proxies]
+ADD_SECTION
+# COMMDB_ID = 1
+	ISP=2
+	ProxyServiceType=DialOutISP
+	UseProxyServer=TRUE
+	ProxyServerName=www.dummyproxy.com
+	ProtocolName=http
+	PortNumber=80
+	Exceptions=www.dummyproxy.com/exception
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## AgentLookup
+## 
+[AgentLookup]
+
+############################################################
+## WAPAccessPoint
+## 
+[WAPAccessPoint]
+ADD_TEMPLATE
+	Name=Default Dial In ISP
+	CurrentBearer=WAPIPBearer
+	FIELD_COUNT=2
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Dummy WAP Settings
+	CurrentBearer=WAPIPBearer
+	StartPage=www.wapstart.com
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## WAPIPBearer
+## 
+[WAPIPBearer]
+ADD_TEMPLATE
+	AccessPointId=0
+	IAP=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	ProxyPortNumber=0
+	FIELD_COUNT=5
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	AccessPointId=2
+	GatewayAddress=www.wapgateway.com
+	IAP=2
+	WSPOption=CONNECTIONORIENTED
+	Security=FALSE
+	ProxyPortNumber=1
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## WAPSMSBearer
+## 
+[WAPSMSBearer]
+ADD_TEMPLATE
+	AccessPointId=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	FIELD_COUNT=3
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	AccessPointId=2
+	GatewayAddress=+441632960000
+	ServiceCentreAddress=+441632960000
+	WSPOption=CONNECTIONORIENTED
+	Security=FALSE
+	FIELD_COUNT=5
+END_ADD
+
+
+############################################################
+## SecureSocketTable
+## 
+[SecureSocketTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	ProtocolName=ssl3.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	ProtocolName=tls1.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## BTPersistTable
+## 
+[BTPersistTable]
+############################################################
+## ERROR
+## AccessTypeTable
+############################################################
+############################################################
+## ERROR
+## Error opening table
+############################################################
+############################################################
+## ERROR
+## Unable to find the specified object or missing required field values
+############################################################
+
+############################################################
+## VirtualBearer
+## 
+[VirtualBearer]
+ADD_TEMPLATE
+	Name=Default VPN Bearer
+	Agent=VPN.agt
+	IfName=VPN.nif
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	FIELD_COUNT=6
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=VPN Bearer1
+	Agent=ntras.agt
+	IfName=ppp.nif
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## VpnService
+## 
+[VpnService]
+ADD_TEMPLATE
+	Name=Default VPN
+	Policy=DefaultVPNpolicy
+	HomeIAP=1
+	HomeNetwork=0
+	FIELD_COUNT=4
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=VPN1
+	Policy=VPNpolicy1
+	HomeIAP=2
+	HomeNetwork=1
+	FIELD_COUNT=4
+END_ADD
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax_9210_comm0.cfg	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,2317 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommDB Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## Network
+## 
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Intranet
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=mRouter
+	FIELD_COUNT=1
+END_ADD
+
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Name=Default Modem
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Null Modem 19200bps
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=US Robotics Sportster
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=57600
+	Handshaking=196
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=AFTERDIALUNTILANSWER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT&F1
+	DataInitString=AT
+	FaxInitString=AT&d2
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Dacom Surfer
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=57600
+	Handshaking=196
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=AFTERDIALUNTILANSWER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT&F
+	DataInitString=AT
+	FaxInitString=AT&d2
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=GSM Mobile Phone via Infrared
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=IRCOMM::0
+	TSYName=MM
+	CSYName=IRCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=196
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=GSM Mobile Phone via Serial
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=196
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=GPRS Ericsson R520m via IR
+	Agent=PSD.agt
+	IfName=PPP
+	PortName=IRCOMM::0
+	TSYName=MM
+	CSYName=IRCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=GPRS Ericsson R520m/T68i via Serial
+	Agent=PSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	IspInitString=*99***1#
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=70
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=GPRS Motorola Mobile Phone via Serial
+	Agent=PSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=57600
+	Handshaking=4
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=WinTunnel Modem
+	Agent=null.agt
+	IfName=PPP
+	PortName=COMM::6
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=52
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=mRouterWinsBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=WINS::0
+	TSYName=MM
+	CSYName=WINSCSY
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=52
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=mRouterRs232Bearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Name=mRouterIrBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=IRCOMM::0
+	TSYName=MM
+	CSYName=IRCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=52
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+	Name=mRouterBtBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=BTCOMM::0
+	TSYName=MM
+	CSYName=BTCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=52
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 15
+	Name=mRouterUsbBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=ACM::0
+	TSYName=MM
+	CSYName=ECACM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=52
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+
+############################################################
+## LANBearer
+## 
+[LANBearer]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=EKA1 Assabet on-board Ethernet
+	Agent=nullagt.agt
+	IfName=ethint
+	LDDFilename=ethercard
+	LDDName=EtherCard
+	PDDFilename=EtherSmc
+	PDDName=EtherCard.Smc
+	PacketDriverName=EtherPkt.drv
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=EKA2 Assabet on-board Ethernet
+	Agent=nullagt.agt
+	IfName=ethint
+	LDDFilename=enet
+	LDDName=Ethernet
+	PDDFilename=ethernet
+	PDDName=Ethernet.Assabet
+	PacketDriverName=EtherPkt.drv
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=EKA1 emulator Ethernet
+	Agent=nullagt.agt
+	IfName=ethint
+	LDDFilename=ethercard
+	LDDName=Ethercard
+	PDDFilename=etherwins
+	PDDName=Ethercard.wins
+	PacketDriverName=EtherPkt.drv
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=EKA2 emulator Ethernet
+	Agent=nullagt.agt
+	IfName=ethint
+	LDDFilename=enet
+	LDDName=Ethernet
+	PDDFilename=ethernet
+	PDDName=Ethernet.Wins
+	PacketDriverName=EtherPkt.drv
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=11
+END_ADD
+
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=8
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Office
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	DialOutCode=,
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Office Direct Dial
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=Home
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=181
+	Mobile=FALSE
+	UsePulseDial=TRUE
+	WaitForDialTone=TRUE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## Chargecard
+## 
+[Chargecard]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Dummy BT Chargecard
+	AccountNumber=144,12345678
+	Pin=0000
+	LocalRule=HG
+	NatRule=HFG
+	IntlRule=HEFG
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Dummy Mercury Chargecard
+	AccountNumber=0500800800,,12345678
+	Pin=****
+	LocalRule=HG
+	NatRule=J,K,0FG
+	IntlRule=HEFG
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_SECTION
+	WAPAccessPoint=1
+	RedialAttempts=3
+	SmsBearer=1
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ConnectionAttempts=2
+	ModemForDataAndFax=2
+	ModemForPhoneServicesAndSMS=2
+	LocationForDataAndFax=2
+	LocationForPhoneServicesAndSMS=2
+	DefaultNetwork=1
+	BearerAvailabilityCheckTSY=mm
+	FIELD_COUNT=14
+END_ADD
+
+
+############################################################
+## DialOutISP
+## 
+[DialOutISP]
+ADD_TEMPLATE
+	Name=Default Dial Out ISP
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=TRUE
+	DisplayPCT=FALSE
+	IfPromptForAuth=TRUE
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=28
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=NT RAS
+	Description=Test
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=TRUE
+	LoginScript=CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=35
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=ISP01
+	Description=PlaceHolder for ISP01
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=ISP02
+	Description=PlaceHolder for ISP02
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=ISP03
+	Description=PlaceHolder for ISP03
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=ISP04
+	Description=PlaceHolder for ISP04
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=ISP05
+	Description=PlaceHolder for ISP05
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=mRouterDialOutIsp
+	Description=mRouterDialOutIsp
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=IfAuthPass=
+	IfAuthPass=AuthRetries=0
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+
+############################################################
+## DialInISP
+## 
+[DialInISP]
+ADD_TEMPLATE
+	Name=Default Dial In ISP
+	UseLoginScript=FALSE
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=9
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Dial In ISP01
+	UseLoginScript=FALSE
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=GPRS01
+	APN=gprs01APNPlaceHolder
+	PDPType=IPV4
+	ReqPrecedence=0
+	ReqDelay=0
+	ReqReliability=0
+	ReqPeakThroughput=0
+	ReqMeanThroughput=0
+	MinPrecedence=0
+	MinDelay=0
+	MinReliability=0
+	MinPeakThroughput=0
+	MinMeanThroughput=0
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=1
+	IpDNSAddrFromServer=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	IpAddrFromServer=TRUE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=26
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=GPRS02
+	APN=gprs02APNPlaceHolder
+	PDPType=IPV4
+	ReqPrecedence=0
+	ReqDelay=0
+	ReqReliability=0
+	ReqPeakThroughput=0
+	ReqMeanThroughput=0
+	MinPrecedence=0
+	MinDelay=0
+	MinReliability=0
+	MinPeakThroughput=0
+	MinMeanThroughput=0
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=1
+	IpDNSAddrFromServer=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	IpAddrFromServer=TRUE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=26
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=GPRS03
+	APN=gprs03APNPlaceHolder
+	PDPType=IPV4
+	ReqPrecedence=0
+	ReqDelay=0
+	ReqReliability=0
+	ReqPeakThroughput=0
+	ReqMeanThroughput=0
+	MinPrecedence=0
+	MinDelay=0
+	MinReliability=0
+	MinPeakThroughput=0
+	MinMeanThroughput=0
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=1
+	IpDNSAddrFromServer=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	IpAddrFromServer=TRUE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=26
+END_ADD
+
+
+############################################################
+## IncomingGPRS
+## 
+[IncomingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Incoming GPRS Settings PlaceHolder
+	APN=Test
+	PDPType=IPV4
+	ReqPrecedence=1
+	ReqDelay=1
+	ReqReliability=1
+	ReqPeakThroughput=1
+	ReqMeanThroughput=1
+	MinPrecedence=1
+	MinDelay=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	AuthRetries=1
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=0.0.0.0
+	IpNameServer2=0.0.0.0
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	PDPAddress=0.0.0.0
+	IpAddrFromServer=TRUE
+	FIELD_COUNT=29
+END_ADD
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	APN=Access point name
+	PDPType=IPV6
+	PDPAddress=www.wid.com
+	Precedence=1
+	Delay=1
+	Reliability=1
+	PeakThroughput=1
+	MeanThroughput=1
+	MinPrecedence=1
+	MinDelay=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=TRUE
+	HeaderCompression=TRUE
+	GprsUseEdge=FALSE
+	AnonymousAccess=TRUE
+	FIELD_COUNT=19
+END_ADD
+
+
+############################################################
+## CDMA2000PacketServiceTable
+## 
+[CDMA2000PacketServiceTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=test name cdma2000
+	IwfName=Test2000
+	ServiceOption=HIGHSPEEDCDMA2000DATA
+	PdpType=IPV4
+	ReqFwdPriority=PRIORITY04
+	ReqRevPriority=PRIORITY04
+	ReqFwdBitrate=32KBPS
+	ReqRevBitrate=32KBPS
+	ReqFwdLoss=LOSS1
+	ReqRevLoss=LOSS1
+	ReqFwdMaxdelay=40MS
+	ReqRevMaxdelay=40MS
+	MinFwdBitrate=32KBPS
+	MinRevBitrate=32KBPS
+	AccptFwdLoss=LOSS2
+	AccptRevLoss=LOSS2
+	AccptFwdMaxdelay=120MS
+	AccptRevMaxdelay=120MS
+	DataCompression=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	AuthRetries=1
+	IpNetMask=0.255.255.255
+	IpGateway=10.0.0.1
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableLCPExtension=TRUE
+	DisablePlainTextAuth=TRUE
+	ApType=2
+	QosWarningTimeout=1000000
+	RlpMode=TRANSPARENT
+	CDMAMobileIP=FALSE
+	CDMAMobileIPTimeout=10000000
+	CDMANaiType=0
+	FIELD_COUNT=37
+END_ADD
+
+
+############################################################
+## DefaultCDMA2000SettingsTable
+## 
+[DefaultCDMA2000SettingsTable]
+
+############################################################
+## LANService
+## 
+[LANService]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Ethernet
+	IfNetworks=ip,ip6
+	IpNetMask=255.255.255.0
+	IpGateway=194.72.6.1
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.0.100
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## IAP
+## 
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=NT RAS with Null Modem
+	IAPService=2
+	IAPServiceType=DialOutISP
+	IAPBearer=2
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=CSD IAP PlaceHolder01
+	IAPService=3
+	IAPServiceType=DialOutISP
+	IAPBearer=2
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=CSD IAP PlaceHolder02
+	IAPService=4
+	IAPServiceType=DialOutISP
+	IAPBearer=2
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=GPRS IAP PlaceHolder01
+	IAPService=1
+	IAPServiceType=OutgoingGPRS
+	IAPBearer=8
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=GPRS IAP PlaceHolder02
+	IAPService=2
+	IAPServiceType=OutgoingGPRS
+	IAPBearer=8
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=mRouter Rs232
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=12
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=mRouter Ir
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=13
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=mRouter BT
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=14
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=mRouter USB
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=15
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=mRouter Wins
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=11
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=VPN IAP
+	IAPService=2
+	IAPServiceType=VpnService
+	IAPBearer=2
+	IAPBearerType=VirtualBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=EKA1 Assabet on-board ethernet
+	IAPService=1
+	IAPServiceType=LANService
+	IAPBearer=1
+	IAPBearerType=LANBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Name=EKA2 Assabet on-board ethernet
+	IAPService=1
+	IAPServiceType=LANService
+	IAPBearer=2
+	IAPBearerType=LANBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+	Name=EKA1 emulator ethernet
+	IAPService=1
+	IAPServiceType=LANService
+	IAPBearer=3
+	IAPBearerType=LANBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 15
+	Name=EKA2 emulator ethernet
+	IAPService=1
+	IAPServiceType=LANService
+	IAPBearer=4
+	IAPBearerType=LANBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+	Ranking=0
+	Direction=OUTGOING
+	DialogPref=PROMPT
+	BearerSet=CSD
+	IAP=1
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+	Ranking=1
+	Direction=OUTGOING
+	DialogPref=PROMPT
+	BearerSet=CSD
+	IAP=1
+	FIELD_COUNT=5
+END_ADD
+
+
+############################################################
+## BTDeviceTable
+## 
+[BTDeviceTable]
+
+############################################################
+## BTSecurityTable
+## 
+[BTSecurityTable]
+
+############################################################
+## BTDefaultTable
+## 
+[BTDefaultTable]
+
+############################################################
+## Proxies
+## 
+[Proxies]
+ADD_SECTION
+# COMMDB_ID = 1
+	ISP=2
+	ProxyServiceType=DialOutISP
+	UseProxyServer=TRUE
+	ProxyServerName=www.dummyproxy.com
+	ProtocolName=http
+	PortNumber=80
+	Exceptions=www.dummyproxy.com/exception
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## AgentLookup
+## 
+[AgentLookup]
+
+############################################################
+## WAPAccessPoint
+## 
+[WAPAccessPoint]
+ADD_TEMPLATE
+	Name=Default Dial In ISP
+	CurrentBearer=WAPIPBearer
+	FIELD_COUNT=2
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Dummy WAP Settings
+	CurrentBearer=WAPIPBearer
+	StartPage=www.wapstart.com
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## WAPIPBearer
+## 
+[WAPIPBearer]
+ADD_TEMPLATE
+	AccessPointId=0
+	IAP=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	ProxyPortNumber=0
+	FIELD_COUNT=5
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	AccessPointId=2
+	GatewayAddress=www.wapgateway.com
+	IAP=2
+	WSPOption=CONNECTIONORIENTED
+	Security=FALSE
+	ProxyPortNumber=1
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## WAPSMSBearer
+## 
+[WAPSMSBearer]
+ADD_TEMPLATE
+	AccessPointId=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	FIELD_COUNT=3
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	AccessPointId=2
+	GatewayAddress=+441632960000
+	ServiceCentreAddress=+441632960000
+	WSPOption=CONNECTIONORIENTED
+	Security=FALSE
+	FIELD_COUNT=5
+END_ADD
+
+
+############################################################
+## SecureSocketTable
+## 
+[SecureSocketTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	ProtocolName=ssl3.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	ProtocolName=tls1.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## BTPersistTable
+## 
+[BTPersistTable]
+############################################################
+## ERROR
+## AccessTypeTable
+############################################################
+############################################################
+## ERROR
+## Error opening table
+############################################################
+############################################################
+## ERROR
+## Unable to find the specified object or missing required field values
+############################################################
+
+############################################################
+## VirtualBearer
+## 
+[VirtualBearer]
+ADD_TEMPLATE
+	Name=Default VPN Bearer
+	Agent=VPN.agt
+	IfName=VPN.nif
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	FIELD_COUNT=6
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=VPN Bearer1
+	Agent=ntras.agt
+	IfName=ppp.nif
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## VpnService
+## 
+[VpnService]
+ADD_TEMPLATE
+	Name=Default VPN
+	Policy=DefaultVPNpolicy
+	HomeIAP=1
+	HomeNetwork=0
+	FIELD_COUNT=4
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=VPN1
+	Policy=VPNpolicy1
+	HomeIAP=2
+	HomeNetwork=1
+	FIELD_COUNT=4
+END_ADD
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax_9210_comm1.cfg	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,2317 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommDB Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## Network
+## 
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Intranet
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=mRouter
+	FIELD_COUNT=1
+END_ADD
+
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Name=Default Modem
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::1
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Null Modem 19200bps
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::1
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=US Robotics Sportster
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=57600
+	Handshaking=196
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=AFTERDIALUNTILANSWER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT&F1
+	DataInitString=AT
+	FaxInitString=AT&d2
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Dacom Surfer
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=57600
+	Handshaking=196
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=AFTERDIALUNTILANSWER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT&F
+	DataInitString=AT
+	FaxInitString=AT&d2
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=GSM Mobile Phone via Infrared
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=IRCOMM::0
+	TSYName=MM
+	CSYName=IRCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=196
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=GSM Mobile Phone via Serial
+	Agent=CSD.agt
+	IfName=PPP
+	PortName=COMM::1
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=196
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=GPRS Ericsson R520m via IR
+	Agent=PSD.agt
+	IfName=PPP
+	PortName=IRCOMM::0
+	TSYName=MM
+	CSYName=IRCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=GPRS Ericsson R520m/T68i via Serial
+	Agent=PSD.agt
+	IfName=PPP
+	PortName=COMM::1
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=19200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	IspInitString=*99***1#
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=70
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=GPRS Motorola Mobile Phone via Serial
+	Agent=PSD.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=57600
+	Handshaking=4
+	SpecialRate=0
+	XonChar=17
+	XoffChar=19
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=ATZ
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=WinTunnel Modem
+	Agent=null.agt
+	IfName=PPP
+	PortName=COMM::6
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=52
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=mRouterWinsBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=WINS::0
+	TSYName=MM
+	CSYName=WINSCSY
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=52
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=mRouterRs232Bearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=COMM::0
+	TSYName=MM
+	CSYName=ECUART
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=4
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Name=mRouterIrBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=IRCOMM::0
+	TSYName=MM
+	CSYName=IRCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=52
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+	Name=mRouterBtBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=BTCOMM::0
+	TSYName=MM
+	CSYName=BTCOMM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=52
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 15
+	Name=mRouterUsbBearer
+	Agent=mRouterAgent.agt
+	IfName=PPP
+	PortName=ACM::0
+	TSYName=MM
+	CSYName=ECACM
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=52
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOn=Q1
+	QuietOff=Q0
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageCentreNumber=+441632960000
+	MessageValidityPeriod=1440
+	MessageDeliveryReport=FALSE
+	MinimumSignalLevel=9905
+	LastSocketActivityTimeout=9999
+	LastSessionClosedTimeout=180
+	LastSocketClosedTimeout=30
+	SIRSettings=0
+	CommRole=0
+	FIELD_COUNT=69
+END_ADD
+
+
+############################################################
+## LANBearer
+## 
+[LANBearer]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=EKA1 Assabet on-board Ethernet
+	Agent=nullagt.agt
+	IfName=ethint
+	LDDFilename=ethercard
+	LDDName=EtherCard
+	PDDFilename=EtherSmc
+	PDDName=EtherCard.Smc
+	PacketDriverName=EtherPkt.drv
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=EKA2 Assabet on-board Ethernet
+	Agent=nullagt.agt
+	IfName=ethint
+	LDDFilename=enet
+	LDDName=Ethernet
+	PDDFilename=ethernet
+	PDDName=Ethernet.Assabet
+	PacketDriverName=EtherPkt.drv
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=EKA1 emulator Ethernet
+	Agent=nullagt.agt
+	IfName=ethint
+	LDDFilename=ethercard
+	LDDName=Ethercard
+	PDDFilename=etherwins
+	PDDName=Ethercard.wins
+	PacketDriverName=EtherPkt.drv
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=EKA2 emulator Ethernet
+	Agent=nullagt.agt
+	IfName=ethint
+	LDDFilename=enet
+	LDDName=Ethernet
+	PDDFilename=ethernet
+	PDDName=Ethernet.Wins
+	PacketDriverName=EtherPkt.drv
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=11
+END_ADD
+
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=8
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Office
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	DialOutCode=,
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Office Direct Dial
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=Home
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=181
+	Mobile=FALSE
+	UsePulseDial=TRUE
+	WaitForDialTone=TRUE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## Chargecard
+## 
+[Chargecard]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Dummy BT Chargecard
+	AccountNumber=144,12345678
+	Pin=0000
+	LocalRule=HG
+	NatRule=HFG
+	IntlRule=HEFG
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Dummy Mercury Chargecard
+	AccountNumber=0500800800,,12345678
+	Pin=****
+	LocalRule=HG
+	NatRule=J,K,0FG
+	IntlRule=HEFG
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_SECTION
+	WAPAccessPoint=1
+	RedialAttempts=3
+	SmsBearer=1
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ConnectionAttempts=2
+	ModemForDataAndFax=2
+	ModemForPhoneServicesAndSMS=2
+	LocationForDataAndFax=2
+	LocationForPhoneServicesAndSMS=2
+	DefaultNetwork=1
+	BearerAvailabilityCheckTSY=mm
+	FIELD_COUNT=14
+END_ADD
+
+
+############################################################
+## DialOutISP
+## 
+[DialOutISP]
+ADD_TEMPLATE
+	Name=Default Dial Out ISP
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=TRUE
+	DisplayPCT=FALSE
+	IfPromptForAuth=TRUE
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=28
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=NT RAS
+	Description=Test
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=TRUE
+	LoginScript=CHARMAP \[windows-1252\]\nLOOP 10\n{\nSEND "CLIENT"+<0x0d>\nWAIT 3\n{\n"SERVER" OK\n}\n}\nEXIT KErrNoAnswer$\n\nOK:\nEXIT\n
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=35
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=ISP01
+	Description=PlaceHolder for ISP01
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=ISP02
+	Description=PlaceHolder for ISP02
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=ISP03
+	Description=PlaceHolder for ISP03
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=ISP04
+	Description=PlaceHolder for ISP04
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=ISP05
+	Description=PlaceHolder for ISP05
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=TRUE
+	IfAuthName=xxx
+	IfAuthPass=yyy
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=mRouterDialOutIsp
+	Description=mRouterDialOutIsp
+	Type=INTERNETONLY
+	DialResolution=TRUE
+	UseLoginScript=FALSE
+	PromptForLogin=FALSE
+	DisplayPCT=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=IfAuthPass=
+	IfAuthPass=AuthRetries=0
+	AuthRetries=0
+	IfCallbackEnabled=FALSE
+	CallbackTimeout=0
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	BearerService=0
+	BearerProtocol=UNSPECIFIED
+	RlpVersion=0
+	IwfToMs=0
+	MsToIwf=0
+	AckTimer=0
+	RetransmissionAttempts=0
+	ResequencePeriod=0
+	V42Compression=0
+	V42Codewords=0
+	V42MaxLength=0
+	Asymmetry=0
+	UserInitUpgrade=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=34
+END_ADD
+
+
+############################################################
+## DialInISP
+## 
+[DialInISP]
+ADD_TEMPLATE
+	Name=Default Dial In ISP
+	UseLoginScript=FALSE
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=9
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Dial In ISP01
+	UseLoginScript=FALSE
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableIPHeaderComp=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	EnableSWComp=FALSE
+	UseEdge=FALSE
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=GPRS01
+	APN=gprs01APNPlaceHolder
+	PDPType=IPV4
+	ReqPrecedence=0
+	ReqDelay=0
+	ReqReliability=0
+	ReqPeakThroughput=0
+	ReqMeanThroughput=0
+	MinPrecedence=0
+	MinDelay=0
+	MinReliability=0
+	MinPeakThroughput=0
+	MinMeanThroughput=0
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=1
+	IpDNSAddrFromServer=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	IpAddrFromServer=TRUE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=26
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=GPRS02
+	APN=gprs02APNPlaceHolder
+	PDPType=IPV4
+	ReqPrecedence=0
+	ReqDelay=0
+	ReqReliability=0
+	ReqPeakThroughput=0
+	ReqMeanThroughput=0
+	MinPrecedence=0
+	MinDelay=0
+	MinReliability=0
+	MinPeakThroughput=0
+	MinMeanThroughput=0
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=1
+	IpDNSAddrFromServer=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	IpAddrFromServer=TRUE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=26
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=GPRS03
+	APN=gprs03APNPlaceHolder
+	PDPType=IPV4
+	ReqPrecedence=0
+	ReqDelay=0
+	ReqReliability=0
+	ReqPeakThroughput=0
+	ReqMeanThroughput=0
+	MinPrecedence=0
+	MinDelay=0
+	MinReliability=0
+	MinPeakThroughput=0
+	MinMeanThroughput=0
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	AuthRetries=1
+	IpDNSAddrFromServer=FALSE
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	IpAddrFromServer=TRUE
+	GprsAccessPointType=0
+	QosWarningTimeout=0
+	FIELD_COUNT=26
+END_ADD
+
+
+############################################################
+## IncomingGPRS
+## 
+[IncomingGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Incoming GPRS Settings PlaceHolder
+	APN=Test
+	PDPType=IPV4
+	ReqPrecedence=1
+	ReqDelay=1
+	ReqReliability=1
+	ReqPeakThroughput=1
+	ReqMeanThroughput=1
+	MinPrecedence=1
+	MinDelay=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	AuthRetries=1
+	IpDNSAddrFromServer=TRUE
+	IpNameServer1=0.0.0.0
+	IpNameServer2=0.0.0.0
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	PDPAddress=0.0.0.0
+	IpAddrFromServer=TRUE
+	FIELD_COUNT=29
+END_ADD
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	APN=Access point name
+	PDPType=IPV6
+	PDPAddress=www.wid.com
+	Precedence=1
+	Delay=1
+	Reliability=1
+	PeakThroughput=1
+	MeanThroughput=1
+	MinPrecedence=1
+	MinDelay=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=TRUE
+	HeaderCompression=TRUE
+	GprsUseEdge=FALSE
+	AnonymousAccess=TRUE
+	FIELD_COUNT=19
+END_ADD
+
+
+############################################################
+## CDMA2000PacketServiceTable
+## 
+[CDMA2000PacketServiceTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=test name cdma2000
+	IwfName=Test2000
+	ServiceOption=HIGHSPEEDCDMA2000DATA
+	PdpType=IPV4
+	ReqFwdPriority=PRIORITY04
+	ReqRevPriority=PRIORITY04
+	ReqFwdBitrate=32KBPS
+	ReqRevBitrate=32KBPS
+	ReqFwdLoss=LOSS1
+	ReqRevLoss=LOSS1
+	ReqFwdMaxdelay=40MS
+	ReqRevMaxdelay=40MS
+	MinFwdBitrate=32KBPS
+	MinRevBitrate=32KBPS
+	AccptFwdLoss=LOSS2
+	AccptRevLoss=LOSS2
+	AccptFwdMaxdelay=120MS
+	AccptRevMaxdelay=120MS
+	DataCompression=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	IfAuthPass=pass
+	AuthRetries=1
+	IpNetMask=0.255.255.255
+	IpGateway=10.0.0.1
+	IpAddrFromServer=TRUE
+	IpDNSAddrFromServer=TRUE
+	EnableLCPExtension=TRUE
+	DisablePlainTextAuth=TRUE
+	ApType=2
+	QosWarningTimeout=1000000
+	RlpMode=TRANSPARENT
+	CDMAMobileIP=FALSE
+	CDMAMobileIPTimeout=10000000
+	CDMANaiType=0
+	FIELD_COUNT=37
+END_ADD
+
+
+############################################################
+## DefaultCDMA2000SettingsTable
+## 
+[DefaultCDMA2000SettingsTable]
+
+############################################################
+## LANService
+## 
+[LANService]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Ethernet
+	IfNetworks=ip,ip6
+	IpNetMask=255.255.255.0
+	IpGateway=194.72.6.1
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.0.100
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.52
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## IAP
+## 
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=NT RAS with Null Modem
+	IAPService=2
+	IAPServiceType=DialOutISP
+	IAPBearer=2
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=CSD IAP PlaceHolder01
+	IAPService=3
+	IAPServiceType=DialOutISP
+	IAPBearer=2
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=CSD IAP PlaceHolder02
+	IAPService=4
+	IAPServiceType=DialOutISP
+	IAPBearer=2
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=GPRS IAP PlaceHolder01
+	IAPService=1
+	IAPServiceType=OutgoingGPRS
+	IAPBearer=8
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=GPRS IAP PlaceHolder02
+	IAPService=2
+	IAPServiceType=OutgoingGPRS
+	IAPBearer=8
+	IAPBearerType=ModemBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=4
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=mRouter Rs232
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=12
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=mRouter Ir
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=13
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=mRouter BT
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=14
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=mRouter USB
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=15
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=mRouter Wins
+	IAPService=8
+	IAPServiceType=DialOutISP
+	IAPBearer=11
+	IAPBearerType=ModemBearer
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=VPN IAP
+	IAPService=2
+	IAPServiceType=VpnService
+	IAPBearer=2
+	IAPBearerType=VirtualBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=EKA1 Assabet on-board ethernet
+	IAPService=1
+	IAPServiceType=LANService
+	IAPBearer=1
+	IAPBearerType=LANBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Name=EKA2 Assabet on-board ethernet
+	IAPService=1
+	IAPServiceType=LANService
+	IAPBearer=2
+	IAPBearerType=LANBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+	Name=EKA1 emulator ethernet
+	IAPService=1
+	IAPServiceType=LANService
+	IAPBearer=3
+	IAPBearerType=LANBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 15
+	Name=EKA2 emulator ethernet
+	IAPService=1
+	IAPServiceType=LANService
+	IAPBearer=4
+	IAPBearerType=LANBearer
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+	Ranking=0
+	Direction=OUTGOING
+	DialogPref=PROMPT
+	BearerSet=CSD
+	IAP=1
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+	Ranking=1
+	Direction=OUTGOING
+	DialogPref=PROMPT
+	BearerSet=CSD
+	IAP=1
+	FIELD_COUNT=5
+END_ADD
+
+
+############################################################
+## BTDeviceTable
+## 
+[BTDeviceTable]
+
+############################################################
+## BTSecurityTable
+## 
+[BTSecurityTable]
+
+############################################################
+## BTDefaultTable
+## 
+[BTDefaultTable]
+
+############################################################
+## Proxies
+## 
+[Proxies]
+ADD_SECTION
+# COMMDB_ID = 1
+	ISP=2
+	ProxyServiceType=DialOutISP
+	UseProxyServer=TRUE
+	ProxyServerName=www.dummyproxy.com
+	ProtocolName=http
+	PortNumber=80
+	Exceptions=www.dummyproxy.com/exception
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## AgentLookup
+## 
+[AgentLookup]
+
+############################################################
+## WAPAccessPoint
+## 
+[WAPAccessPoint]
+ADD_TEMPLATE
+	Name=Default Dial In ISP
+	CurrentBearer=WAPIPBearer
+	FIELD_COUNT=2
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Dummy WAP Settings
+	CurrentBearer=WAPIPBearer
+	StartPage=www.wapstart.com
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## WAPIPBearer
+## 
+[WAPIPBearer]
+ADD_TEMPLATE
+	AccessPointId=0
+	IAP=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	ProxyPortNumber=0
+	FIELD_COUNT=5
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	AccessPointId=2
+	GatewayAddress=www.wapgateway.com
+	IAP=2
+	WSPOption=CONNECTIONORIENTED
+	Security=FALSE
+	ProxyPortNumber=1
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## WAPSMSBearer
+## 
+[WAPSMSBearer]
+ADD_TEMPLATE
+	AccessPointId=0
+	WSPOption=CONNECTIONLESS
+	Security=FALSE
+	FIELD_COUNT=3
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	AccessPointId=2
+	GatewayAddress=+441632960000
+	ServiceCentreAddress=+441632960000
+	WSPOption=CONNECTIONORIENTED
+	Security=FALSE
+	FIELD_COUNT=5
+END_ADD
+
+
+############################################################
+## SecureSocketTable
+## 
+[SecureSocketTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	ProtocolName=ssl3.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	ProtocolName=tls1.0
+	ProtoLibrary=ssladaptor.dll
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## BTPersistTable
+## 
+[BTPersistTable]
+############################################################
+## ERROR
+## AccessTypeTable
+############################################################
+############################################################
+## ERROR
+## Error opening table
+############################################################
+############################################################
+## ERROR
+## Unable to find the specified object or missing required field values
+############################################################
+
+############################################################
+## VirtualBearer
+## 
+[VirtualBearer]
+ADD_TEMPLATE
+	Name=Default VPN Bearer
+	Agent=VPN.agt
+	IfName=VPN.nif
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=30
+	LastSocketClosedTimeout=60
+	FIELD_COUNT=6
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=VPN Bearer1
+	Agent=ntras.agt
+	IfName=ppp.nif
+	LastSocketActivityTimeout=-1
+	LastSessionClosedTimeout=-1
+	LastSocketClosedTimeout=-1
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## VpnService
+## 
+[VpnService]
+ADD_TEMPLATE
+	Name=Default VPN
+	Policy=DefaultVPNpolicy
+	HomeIAP=1
+	HomeNetwork=0
+	FIELD_COUNT=4
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=VPN1
+	Policy=VPNpolicy1
+	HomeIAP=2
+	HomeNetwork=1
+	FIELD_COUNT=4
+END_ADD
+

Binary file fax/faxclientandserver/Test/TE_FAX/TE_Fax_BadPage.FAX has changed

Binary file fax/faxclientandserver/Test/TE_FAX/TE_Fax_Blank.FAX has changed

Binary file fax/faxclientandserver/Test/TE_FAX/TE_Fax_Chart4.FAX has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax_No_Phone.script	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,68 @@
+// Copyright (c) 2004-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:
+// TE_Fax_Transmit.script
+// 
+//
+
+RUN_SCRIPT z:\TestData\Scripts\TE_Fax_Setup_Comm0.script
+
+LOAD_SUITE TE_Fax
+
+START_TESTCASE TEL-FAX-NA-0001
+//!@SYMTestCaseID TEL-FAX-NA-0001
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Creation of fax definition
+//!@SYMTestPriority Critical
+//!@SYMTestActions  This test simply tests the initialisation of fax variables and nothing else. On Armv5 due to compiler warnings half the test is ifdef'd out
+//!@SYMTestExpectedResults Pass  
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxDefinition
+
+END_TESTCASE TEL-FAX-NA-0001
+
+START_TESTCASE TEL-FAX-NA-0002
+//!@SYMTestCaseID TEL-FAX-NA-0002
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Tests Storage of fax data on local disk
+//!@SYMTestPriority
+//!@SYMTestActions Creates a fax file using the fax api  
+//!@SYMTestExpectedResults Pass 
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxStorage
+
+END_TESTCASE TEL-FAX-NA-0002
+
+START_TESTCASE TEL-FAX-NA-0003
+//!@SYMTestCaseID TEL-FAX-NA-0003
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Fax Coding
+//!@SYMTestPriority Critical
+//!@SYMTestActions   Tests the encoding of 1D and 2D fax data   
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxCoding
+
+END_TESTCASE TEL-FAX-NA-0003
+
+START_TESTCASE TEL-FAX-NA-0004
+//!@SYMTestCaseID TEL-FAX-NA-0004
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Fax header Definition 
+//!@SYMTestPriority Critical 
+//!@SYMTestActions Tests Creation of a fax header using a the 3 different font sizes   
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxHeaderDefinition
+END_TESTCASE TEL-FAX-NA-0004
+

Binary file fax/faxclientandserver/Test/TE_FAX/TE_Fax_One.FAX has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax_Receive_Comm0.script	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,151 @@
+// Copyright (c) 2004-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:
+// TE_Fax_Receive.script
+// 
+//
+
+RUN_SCRIPT z:\TestData\Scripts\TE_Fax_Setup_Comm0.script
+
+LOAD_SUITE TE_Fax
+
+START_TESTCASE TEL-FAX-NA-0001
+//!@SYMTestCaseID TEL-FAX-NA-0001
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Creation of fax definition
+//!@SYMTestPriority Critical
+//!@SYMTestActions  This test simply tests the initialisation of fax variables and nothing else. On Armv5 due to compiler warnings half the test is ifdef'd out
+//!@SYMTestExpectedResults Pass  
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxDefinition
+
+END_TESTCASE TEL-FAX-NA-0001
+
+START_TESTCASE TEL-FAX-NA-0002
+//!@SYMTestCaseID TEL-FAX-NA-0002
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Tests Storage of fax data on local disk
+//!@SYMTestPriority
+//!@SYMTestActions Creates a fax file using the fax api  
+//!@SYMTestExpectedResults Pass 
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxStorage
+
+END_TESTCASE TEL-FAX-NA-0002
+
+START_TESTCASE TEL-FAX-NA-0003
+//!@SYMTestCaseID TEL-FAX-NA-0003
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Fax Coding
+//!@SYMTestPriority Critical
+//!@SYMTestActions   Tests the encoding of 1D and 2D fax data   
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxCoding
+
+END_TESTCASE TEL-FAX-NA-0003
+
+START_TESTCASE TEL-FAX-NA-0004
+//!@SYMTestCaseID TEL-FAX-NA-0004
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Fax header Definition 
+//!@SYMTestPriority Critical 
+//!@SYMTestActions Tests Creation of a fax header using a the 3 different font sizes   
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxHeaderDefinition
+
+
+END_TESTCASE TEL-FAX-NA-0004
+
+START_TESTCASE TEL-FAX-NA-5000
+//!@SYMTestCaseID TEL-FAX-NA-5000
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax01
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-5000
+
+START_TESTCASE TEL-FAX-NA-5001
+//!@SYMTestCaseID TEL-FAX-NA-5001
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax02
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-5001
+
+START_TESTCASE TEL-FAX-NA-5002
+//!@SYMTestCaseID TEL-FAX-NA-5002
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax03
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-5002
+
+START_TESTCASE TEL-FAX-NA-5003
+//!@SYMTestCaseID TEL-FAX-NA-5003
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax04
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-5003
+
+START_TESTCASE TEL-FAX-NA-5004
+//!@SYMTestCaseID TEL-FAX-NA-5004
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax05
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-5004
+
+START_TESTCASE TEL-FAX-NA-5005
+//!@SYMTestCaseID TEL-FAX-NA-5005
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax06
+END_TESTCASE TEL-FAX-NA-5005
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax_Receive_Comm1.script	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,152 @@
+// Copyright (c) 2004-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:
+// TE_Fax_Receive.script
+// 
+//
+
+RUN_SCRIPT z:\TestData\Scripts\TE_Fax_Setup_Comm1.script
+
+LOAD_SUITE TE_Fax
+
+
+START_TESTCASE TEL-FAX-NA-0001
+//!@SYMTestCaseID TEL-FAX-NA-0001
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Creation of fax definition
+//!@SYMTestPriority Critical
+//!@SYMTestActions  This test simply tests the initialisation of fax variables and nothing else. On Armv5 due to compiler warnings half the test is ifdef'd out
+//!@SYMTestExpectedResults Pass  
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxDefinition
+
+END_TESTCASE TEL-FAX-NA-0001
+
+START_TESTCASE TEL-FAX-NA-0002
+//!@SYMTestCaseID TEL-FAX-NA-0002
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Tests Storage of fax data on local disk
+//!@SYMTestPriority
+//!@SYMTestActions Creates a fax file using the fax api  
+//!@SYMTestExpectedResults Pass 
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxStorage
+
+END_TESTCASE TEL-FAX-NA-0002
+
+START_TESTCASE TEL-FAX-NA-0003
+//!@SYMTestCaseID TEL-FAX-NA-0003
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Fax Coding
+//!@SYMTestPriority Critical
+//!@SYMTestActions   Tests the encoding of 1D and 2D fax data   
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxCoding
+
+END_TESTCASE TEL-FAX-NA-0003
+
+START_TESTCASE TEL-FAX-NA-0004
+//!@SYMTestCaseID TEL-FAX-NA-0004
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Fax header Definition 
+//!@SYMTestPriority Critical 
+//!@SYMTestActions Tests Creation of a fax header using a the 3 different font sizes   
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxHeaderDefinition
+
+
+END_TESTCASE TEL-FAX-NA-0004
+
+START_TESTCASE TEL-FAX-NA-5000
+//!@SYMTestCaseID TEL-FAX-NA-5000
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax01
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-5000
+
+START_TESTCASE TEL-FAX-NA-5001
+//!@SYMTestCaseID TEL-FAX-NA-5001
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax02
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-5001
+
+START_TESTCASE TEL-FAX-NA-5002
+//!@SYMTestCaseID TEL-FAX-NA-5002
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax03
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-5002
+
+START_TESTCASE TEL-FAX-NA-5003
+//!@SYMTestCaseID TEL-FAX-NA-5003
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax04
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-5003
+
+START_TESTCASE TEL-FAX-NA-5004
+//!@SYMTestCaseID TEL-FAX-NA-5004
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax05
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-5004
+
+START_TESTCASE TEL-FAX-NA-5005
+//!@SYMTestCaseID TEL-FAX-NA-5005
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax06
+END_TESTCASE TEL-FAX-NA-5005
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax_Receive_IR.script	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,148 @@
+// Copyright (c) 2004-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:
+//
+
+RUN_SCRIPT z:\TestData\Scripts\TE_Fax_Setup_IR.script
+
+LOAD_SUITE TE_Fax
+
+START_TESTCASE TEL-FAX-NA-0001
+//!@SYMTestCaseID TEL-FAX-NA-0001
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Creation of fax definition
+//!@SYMTestPriority Critical
+//!@SYMTestActions  This test simply tests the initialisation of fax variables and nothing else. On Armv5 due to compiler warnings half the test is ifdef'd out
+//!@SYMTestExpectedResults Pass  
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxDefinition
+
+END_TESTCASE TEL-FAX-NA-0001
+
+START_TESTCASE TEL-FAX-NA-0002
+//!@SYMTestCaseID TEL-FAX-NA-0002
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Tests Storage of fax data on local disk
+//!@SYMTestPriority
+//!@SYMTestActions Creates a fax file using the fax api  
+//!@SYMTestExpectedResults Pass 
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxStorage
+
+END_TESTCASE TEL-FAX-NA-0002
+
+START_TESTCASE TEL-FAX-NA-0003
+//!@SYMTestCaseID TEL-FAX-NA-0003
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Fax Coding
+//!@SYMTestPriority Critical
+//!@SYMTestActions   Tests the encoding of 1D and 2D fax data   
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxCoding
+
+END_TESTCASE TEL-FAX-NA-0003
+
+START_TESTCASE TEL-FAX-NA-0004
+//!@SYMTestCaseID TEL-FAX-NA-0004
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Fax header Definition 
+//!@SYMTestPriority Critical 
+//!@SYMTestActions Tests Creation of a fax header using a the 3 different font sizes   
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxHeaderDefinition
+
+END_TESTCASE TEL-FAX-NA-0004
+
+START_TESTCASE TEL-FAX-NA-5000
+//!@SYMTestCaseID TEL-FAX-NA-5000
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax01
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-5000
+
+START_TESTCASE TEL-FAX-NA-5001
+//!@SYMTestCaseID TEL-FAX-NA-5001
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax02
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-5001
+
+START_TESTCASE TEL-FAX-NA-5002
+//!@SYMTestCaseID TEL-FAX-NA-5002
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax03
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-5002
+
+START_TESTCASE TEL-FAX-NA-5003
+//!@SYMTestCaseID TEL-FAX-NA-5003
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax04
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-5003
+
+START_TESTCASE TEL-FAX-NA-5004
+//!@SYMTestCaseID TEL-FAX-NA-5004
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax05
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-5004
+
+START_TESTCASE TEL-FAX-NA-5005
+//!@SYMTestCaseID TEL-FAX-NA-5005
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Receives a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Receives a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_Fax TestReceiveFax06
+END_TESTCASE TEL-FAX-NA-5005
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax_Setup_Comm0.script	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,39 @@
+// Copyright (c) 2004-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:
+// TE_Fax_setup.script
+// 
+//
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_Test.FAX c:\Test.FAX
+RUN_UTILS MakeReadWrite c:\Test.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_One.FAX c:\One.FAX
+RUN_UTILS MakeReadWrite c:\One.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_Two.FAX c:\Two.FAX
+RUN_UTILS MakeReadWrite c:\Two.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_Six.FAX c:\Six.FAX
+RUN_UTILS MakeReadWrite c:\Six.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_Blank.FAX c:\Blank.FAX
+RUN_UTILS MakeReadWrite c:\Blank.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_BadPage.FAX c:\BadPage.FAX
+RUN_UTILS MakeReadWrite c:\BadPage.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_Chart4.FAX c:\Chart4.FAX
+RUN_UTILS MakeReadWrite c:\Chart4.FAX
+
+ced -i z:\TestData\configs\TE_Fax_9210_comm0.cfg ced.log

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax_Setup_Comm1.script	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,39 @@
+// Copyright (c) 2004-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:
+// TE_Fax_setup.script
+// 
+//
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_Test.FAX c:\Test.FAX
+RUN_UTILS MakeReadWrite c:\Test.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_One.FAX c:\One.FAX
+RUN_UTILS MakeReadWrite c:\One.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_Two.FAX c:\Two.FAX
+RUN_UTILS MakeReadWrite c:\Two.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_Six.FAX c:\Six.FAX
+RUN_UTILS MakeReadWrite c:\Six.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_Blank.FAX c:\Blank.FAX
+RUN_UTILS MakeReadWrite c:\Blank.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_BadPage.FAX c:\BadPage.FAX
+RUN_UTILS MakeReadWrite c:\BadPage.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_Chart4.FAX c:\Chart4.FAX
+RUN_UTILS MakeReadWrite c:\Chart4.FAX
+
+ced -i z:\TestData\configs\TE_Fax_9210_comm1.cfg ced.log

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax_Setup_IR.script	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,37 @@
+// Copyright (c) 2004-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:
+//
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_Test.FAX c:\Test.FAX
+RUN_UTILS MakeReadWrite c:\Test.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_One.FAX c:\One.FAX
+RUN_UTILS MakeReadWrite c:\One.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_Two.FAX c:\Two.FAX
+RUN_UTILS MakeReadWrite c:\Two.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_Six.FAX c:\Six.FAX
+RUN_UTILS MakeReadWrite c:\Six.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_Blank.FAX c:\Blank.FAX
+RUN_UTILS MakeReadWrite c:\Blank.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_BadPage.FAX c:\BadPage.FAX
+RUN_UTILS MakeReadWrite c:\BadPage.FAX
+
+RUN_UTILS CopyFile z:\TestData\Data\TE_Fax_Chart4.FAX c:\Chart4.FAX
+RUN_UTILS MakeReadWrite c:\Chart4.FAX
+
+ced -i z:\TestData\configs\TE_Fax_9210_IR.cfg ced.log

Binary file fax/faxclientandserver/Test/TE_FAX/TE_Fax_Six.FAX has changed

Binary file fax/faxclientandserver/Test/TE_FAX/TE_Fax_Test.FAX has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax_Transmit_Comm0.script	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,151 @@
+// Copyright (c) 2004-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:
+// TE_Fax_Transmit.script
+// 
+//
+
+RUN_SCRIPT z:\TestData\Scripts\TE_Fax_Setup_Comm0.script
+
+LOAD_SUITE TE_Fax
+
+START_TESTCASE TEL-FAX-NA-0001
+//!@SYMTestCaseID TEL-FAX-NA-0001
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Creation of fax definition
+//!@SYMTestPriority Critical
+//!@SYMTestActions  This test simply tests the initialisation of fax variables and nothing else. On Armv5 due to compiler warnings half the test is ifdef'd out
+//!@SYMTestExpectedResults Pass  
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxDefinition
+
+END_TESTCASE TEL-FAX-NA-0001
+
+START_TESTCASE TEL-FAX-NA-0002
+//!@SYMTestCaseID TEL-FAX-NA-0002
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Tests Storage of fax data on local disk
+//!@SYMTestPriority
+//!@SYMTestActions Creates a fax file using the fax api  
+//!@SYMTestExpectedResults Pass 
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxStorage
+
+END_TESTCASE TEL-FAX-NA-0002
+
+START_TESTCASE TEL-FAX-NA-0003
+//!@SYMTestCaseID TEL-FAX-NA-0003
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Fax Coding
+//!@SYMTestPriority Critical
+//!@SYMTestActions   Tests the encoding of 1D and 2D fax data   
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxCoding
+
+END_TESTCASE TEL-FAX-NA-0003
+
+START_TESTCASE TEL-FAX-NA-0004
+//!@SYMTestCaseID TEL-FAX-NA-0004
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Fax header Definition 
+//!@SYMTestPriority Critical 
+//!@SYMTestActions Tests Creation of a fax header using a the 3 different font sizes   
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxHeaderDefinition
+
+
+END_TESTCASE TEL-FAX-NA-0004
+
+START_TESTCASE TEL-FAX-NA-0005
+//!@SYMTestCaseID TEL-FAX-NA-0005
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax01
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-0005
+
+START_TESTCASE TEL-FAX-NA-0006
+//!@SYMTestCaseID TEL-FAX-NA-0006
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax02
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-0006
+
+START_TESTCASE TEL-FAX-NA-0007
+//!@SYMTestCaseID TEL-FAX-NA-0007
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax03
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-0007
+
+START_TESTCASE TEL-FAX-NA-0008
+//!@SYMTestCaseID TEL-FAX-NA-0008
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax04
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-0008
+
+START_TESTCASE TEL-FAX-NA-0009
+//!@SYMTestCaseID TEL-FAX-NA-0009
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax05
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-0009
+
+START_TESTCASE TEL-FAX-NA-0010
+//!@SYMTestCaseID TEL-FAX-NA-0010
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax06
+END_TESTCASE TEL-FAX-NA-0010
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax_Transmit_Comm1.script	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,150 @@
+// Copyright (c) 2004-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:
+// TE_Fax_Transmit.script
+// 
+//
+
+RUN_SCRIPT z:\TestData\Scripts\TE_Fax_Setup_Comm1.script
+
+LOAD_SUITE TE_Fax
+
+START_TESTCASE TEL-FAX-NA-0001
+//!@SYMTestCaseID TEL-FAX-NA-0001
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Creation of fax definition
+//!@SYMTestPriority Critical
+//!@SYMTestActions  This test simply tests the initialisation of fax variables and nothing else. On Armv5 due to compiler warnings half the test is ifdef'd out
+//!@SYMTestExpectedResults Pass  
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxDefinition
+
+END_TESTCASE TEL-FAX-NA-0001
+
+START_TESTCASE TEL-FAX-NA-0002
+//!@SYMTestCaseID TEL-FAX-NA-0002
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Tests Storage of fax data on local disk
+//!@SYMTestPriority
+//!@SYMTestActions Creates a fax file using the fax api  
+//!@SYMTestExpectedResults Pass 
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxStorage
+
+END_TESTCASE TEL-FAX-NA-0002
+
+START_TESTCASE TEL-FAX-NA-0003
+//!@SYMTestCaseID TEL-FAX-NA-0003
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Fax Coding
+//!@SYMTestPriority Critical
+//!@SYMTestActions   Tests the encoding of 1D and 2D fax data   
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxCoding
+
+END_TESTCASE TEL-FAX-NA-0003
+
+START_TESTCASE TEL-FAX-NA-0004
+//!@SYMTestCaseID TEL-FAX-NA-0004
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Fax header Definition 
+//!@SYMTestPriority Critical 
+//!@SYMTestActions Tests Creation of a fax header using a the 3 different font sizes   
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxHeaderDefinition
+
+END_TESTCASE TEL-FAX-NA-0004
+
+START_TESTCASE TEL-FAX-NA-0005
+//!@SYMTestCaseID TEL-FAX-NA-0005
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax01
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-0005
+
+START_TESTCASE TEL-FAX-NA-0006
+//!@SYMTestCaseID TEL-FAX-NA-0006
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax02
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-0006
+
+START_TESTCASE TEL-FAX-NA-0007
+//!@SYMTestCaseID TEL-FAX-NA-0007
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax03
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-0007
+
+START_TESTCASE TEL-FAX-NA-0008
+//!@SYMTestCaseID TEL-FAX-NA-0008
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax04
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-0008
+
+START_TESTCASE TEL-FAX-NA-0009
+//!@SYMTestCaseID TEL-FAX-NA-0009
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax05
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-0009
+
+START_TESTCASE TEL-FAX-NA-0010
+//!@SYMTestCaseID TEL-FAX-NA-0010
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax06
+END_TESTCASE TEL-FAX-NA-0010
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/TE_FAX/TE_Fax_Transmit_IR.script	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,148 @@
+// Copyright (c) 2004-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:
+//
+
+RUN_SCRIPT z:\TestData\Scripts\TE_Fax_Setup_IR.script
+
+LOAD_SUITE TE_Fax
+
+START_TESTCASE TEL-FAX-NA-0001
+//!@SYMTestCaseID TEL-FAX-NA-0001
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc
+//!@SYMTestPriority critical
+//!@SYMTestActions
+//!@SYMTestExpectedResults Pass - If anthing fails the step will leave with error code 
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxDefinition
+
+END_TESTCASE TEL-FAX-NA-0001
+
+START_TESTCASE TEL-FAX-NA-0002
+//!@SYMTestCaseID TEL-FAX-NA-0002
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Initialises the test 
+//!@SYMTestPriority critical
+//!@SYMTestActions - Parses a config file to retreive phone numbers and initialises comms  
+//!@SYMTestExpectedResults Pass - If anthing fails the step will leave with error code 
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxStorage
+
+END_TESTCASE TEL-FAX-NA-0002
+
+START_TESTCASE TEL-FAX-NA-0003
+//!@SYMTestCaseID TEL-FAX-NA-0003
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Initialises the test 
+//!@SYMTestPriority critical
+//!@SYMTestActions - Parses a config file to retreive phone numbers and initialises comms  
+//!@SYMTestExpectedResults Pass - If anthing fails the step will leave with error code 
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxCoding
+
+END_TESTCASE TEL-FAX-NA-0003
+
+START_TESTCASE TEL-FAX-NA-0004
+//!@SYMTestCaseID TEL-FAX-NA-0004
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Initialises the test 
+//!@SYMTestPriority critical
+//!@SYMTestActions - Parses a config file to retreive phone numbers and initialises comms  
+//!@SYMTestExpectedResults Pass - If anthing fails the step will leave with error code 
+//!@SYMTestType CT
+RUN_TEST_STEP 120 TE_Fax TestFaxHeaderDefinition
+
+END_TESTCASE TEL-FAX-NA-0004
+
+START_TESTCASE TEL-FAX-NA-0005
+//!@SYMTestCaseID TEL-FAX-NA-0005
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax01
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-0005
+
+START_TESTCASE TEL-FAX-NA-0006
+//!@SYMTestCaseID TEL-FAX-NA-0006
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax02
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-0006
+
+START_TESTCASE TEL-FAX-NA-0007
+//!@SYMTestCaseID TEL-FAX-NA-0007
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax03
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-0007
+
+START_TESTCASE TEL-FAX-NA-0008
+//!@SYMTestCaseID TEL-FAX-NA-0008
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax04
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-0008
+
+START_TESTCASE TEL-FAX-NA-0009
+//!@SYMTestCaseID TEL-FAX-NA-0009
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT 
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax05
+DELAY 5000
+
+
+END_TESTCASE TEL-FAX-NA-0009
+
+START_TESTCASE TEL-FAX-NA-0010
+//!@SYMTestCaseID TEL-FAX-NA-0010
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Transmits a fax
+//!@SYMTestPriority High
+//!@SYMTestActions Transmits a fax using various settings and test files  
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+RUN_TEST_STEP 600 TE_Fax TestTransmitFax06
+END_TESTCASE TEL-FAX-NA-0010
+

Binary file fax/faxclientandserver/Test/TE_FAX/TE_Fax_Two.FAX has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/Test/bwins/TE_FAXU.DEF	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,3 @@
+EXPORTS
+	?NewServer@@YAHXZ @ 1 NONAME ; int NewServer(void)
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/bwins/FAXCLIU.DEF	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,20 @@
+EXPORTS
+	??4TFaxSettings@@QAEAAV0@ABV0@@Z @ 1 NONAME ; public: class TFaxSettings & __thiscall TFaxSettings::operator=(class TFaxSettings const &)
+	?AddSourceL@CFaxTransfer@@QAEXABV?$TBuf@$0BAA@@@HHW4TFaxPreferredCompression@@@Z @ 2 NONAME ; public: void __thiscall CFaxTransfer::AddSourceL(class TBuf<256> const &,int,int,enum TFaxPreferredCompression)
+	?AddSourceL@CFaxTransfer@@QAEXABV?$TBuf@$0BAA@@@HW4TFaxPreferredCompression@@@Z @ 3 NONAME ; public: void __thiscall CFaxTransfer::AddSourceL(class TBuf<256> const &,int,enum TFaxPreferredCompression)
+	?AddSourceL@CFaxTransfer@@QAEXABV?$TBuf@$0BAA@@@W4TFaxPreferredCompression@@@Z @ 4 NONAME ; public: void __thiscall CFaxTransfer::AddSourceL(class TBuf<256> const &,enum TFaxPreferredCompression)
+	?AddSourceL@CFaxTransferSource@@QAEXABV?$TBuf@$0BAA@@@HHW4TFaxPreferredCompression@@@Z @ 5 NONAME ; public: void __thiscall CFaxTransferSource::AddSourceL(class TBuf<256> const &,int,int,enum TFaxPreferredCompression)
+	?AddSourceL@CFaxTransferSource@@QAEXABV?$TBuf@$0BAA@@@HW4TFaxPreferredCompression@@@Z @ 6 NONAME ; public: void __thiscall CFaxTransferSource::AddSourceL(class TBuf<256> const &,int,enum TFaxPreferredCompression)
+	?AddSourceL@CFaxTransferSource@@QAEXABV?$TBuf@$0BAA@@@W4TFaxPreferredCompression@@@Z @ 7 NONAME ; public: void __thiscall CFaxTransferSource::AddSourceL(class TBuf<256> const &,enum TFaxPreferredCompression)
+	?Cancel@CFaxTransfer@@QAEXXZ @ 8 NONAME ; public: void __thiscall CFaxTransfer::Cancel(void)
+	?ExternalizeL@TFaxSettings@@QBEXAAVRWriteStream@@@Z @ 9 NONAME ; public: void __thiscall TFaxSettings::ExternalizeL(class RWriteStream &)const 
+	?InternalizeL@TFaxSettings@@QAEXAAVRReadStream@@@Z @ 10 NONAME ; public: void __thiscall TFaxSettings::InternalizeL(class RReadStream &)
+	?NewL@CFaxTransfer@@SAPAV1@ABVTFaxSettings@@@Z @ 11 NONAME ; public: static class CFaxTransfer * __cdecl CFaxTransfer::NewL(class TFaxSettings const &)
+	?NewLC@CFaxTransfer@@SAPAV1@ABVTFaxSettings@@@Z @ 12 NONAME ; public: static class CFaxTransfer * __cdecl CFaxTransfer::NewLC(class TFaxSettings const &)
+	?Progress@CFaxTransfer@@QAEHXZ @ 13 NONAME ; public: int __thiscall CFaxTransfer::Progress(void)
+	?RemoveAllSources@CFaxTransfer@@QAEXXZ @ 14 NONAME ; public: void __thiscall CFaxTransfer::RemoveAllSources(void)
+	?RemoveAllSources@CFaxTransferSource@@QAEXXZ @ 15 NONAME ; public: void __thiscall CFaxTransferSource::RemoveAllSources(void)
+	?SetPhoneNumberL@CFaxTransfer@@QAEXAAVTDesC8@@@Z @ 16 NONAME ; public: void __thiscall CFaxTransfer::SetPhoneNumberL(class TDesC8 &)
+	?Start@CFaxTransfer@@QAEHAAVTRequestStatus@@@Z @ 17 NONAME ; public: int __thiscall CFaxTransfer::Start(class TRequestStatus &)
+	?Stop@CFaxTransfer@@QAEXXZ @ 18 NONAME ; public: void __thiscall CFaxTransfer::Stop(void)
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/bwins/FAXIOU.DEF	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,19 @@
+EXPORTS ?DecodeScanLine1D@CFaxT4@@QAEHAAVTDes8@@ABVTDesC8@@@Z @1 NONAME
+EXPORTS ?DecodeScanLine2D@CFaxT4@@QAEHAAVTDes8@@ABVTDesC8@@@Z @2 NONAME
+EXPORTS ?DecodeScanLine@CFaxT4@@QAEHAAVTDes8@@ABVTDesC8@@@Z @3 NONAME
+EXPORTS ?EncodeScanLine1D@CFaxT4@@QAEXABVTDesC8@@AAVTDes8@@@Z @4 NONAME
+EXPORTS ?EncodeScanLine2D@CFaxT4@@QAEXABVTDesC8@@AAVTDes8@@@Z @5 NONAME
+EXPORTS ?EncodeScanLine@CFaxT4@@QAEXABVTDesC8@@AAVTDes8@@@Z @6 NONAME
+EXPORTS ?NewL@CFaxHeaderLines@@SAPAV1@XZ @7 NONAME
+EXPORTS ?NewL@CFaxT4@@SAPAV1@XZ @8 NONAME
+EXPORTS ?NewLC@CFaxHeaderLines@@SAPAV1@XZ @9 NONAME
+EXPORTS ?NewLC@CFaxT4@@SAPAV1@XZ @10 NONAME
+EXPORTS ?PageInitialize@CFaxT4@@QAEXW4TFaxResolution@@W4TFaxCompression@@H@Z @11 NONAME
+EXPORTS ?ReadFaxHeaderInfoL@CFaxHeaderLines@@QAEXAAVTFaxHeaderInfo@@@Z @12 NONAME
+EXPORTS ?ReadRawFontLineL@CFaxHeaderLines@@QAEXHAAV?$TBuf8@$0NI@@@@Z @13 NONAME
+EXPORTS ?ReadRawHeaderLineL@CFaxHeaderLines@@QAEXHAAV?$TBuf8@$0NI@@@@Z @14 NONAME
+EXPORTS ?WriteFaxHeaderInfoL@CFaxHeaderLines@@QAEXAAVTFaxHeaderInfo@@@Z @15 NONAME
+EXPORTS ?WriteRawFontLineL@CFaxHeaderLines@@QAEXHAAV?$TBuf8@$0NI@@@@Z @16 NONAME
+EXPORTS ?WriteRawHeaderLineL@CFaxHeaderLines@@QAEXHAAV?$TBuf8@$0NI@@@@Z @17 NONAME
+?NewLC@CFaxHeaderLines@@SAPAV1@PAVRFile@@@Z @ 18 NONAME ; class CFaxHeaderLines * CFaxHeaderLines::NewLC(class RFile *)
+?GeneratePathForHeaderFileL@CFaxHeaderLines@@SAXAAVTDes16@@@Z @ 19 NONAME ; void CFaxHeaderLines::GeneratePathForHeaderFileL(class TDes16 &)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/bwins/FAXSTBU.DEF	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,1 @@
+EXPORTS LibEntry @1 NONAME

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/bwins/FAXSTRMU.DEF	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,37 @@
+EXPORTS ??0TFaxBandHeader@@QAE@VTStreamId@@@Z @1 NONAME
+EXPORTS ??0TFaxBandHeader@@QAE@XZ @2 NONAME
+EXPORTS ??1CFaxPageInfo@@UAE@XZ @3 NONAME
+EXPORTS ??1CFaxPages@@UAE@XZ @4 NONAME
+EXPORTS ??1CReadFaxFile@@UAE@XZ @5 NONAME
+EXPORTS ??1CReadFaxPages@@UAE@XZ @6 NONAME
+EXPORTS ??1CWriteFaxFile@@UAE@XZ @7 NONAME
+EXPORTS ??1CWriteFaxPages@@UAE@XZ @8 NONAME
+EXPORTS ?AbortWrite@CWriteFaxFile@@QAEXXZ @9 NONAME
+EXPORTS ?AddEncodedScanLineL@CWriteFaxPages@@QAEXABVTDesC8@@@Z @10 NONAME
+EXPORTS ?AddScanLineL@CWriteFaxPages@@QAEXABVTDesC8@@@Z @11 NONAME
+EXPORTS ?Close@CReadFaxFile@@QAEXXZ @12 NONAME
+EXPORTS ?Close@CWriteFaxFile@@QAEXXZ @13 NONAME
+EXPORTS ?CommitL@CWriteFaxFile@@QAEXXZ @14 NONAME
+EXPORTS ?CommitPageL@CWriteFaxPages@@QAE?AVTStreamId@@XZ @15 NONAME
+EXPORTS ?CurrentPageInfo@CReadFaxPages@@QBE?AVTFaxPageInfo@@XZ @16 NONAME
+EXPORTS ?EndPageL@CWriteFaxPages@@QAEXW4TFaxResolution@@AAV?$TBuf@$0BE@@@W4TFaxCompression@@H@Z @17 NONAME
+EXPORTS ?ExternalizeL@CFaxPageInfo@@QBEXAAVRWriteStream@@@Z @18 NONAME
+EXPORTS ?ExternalizeL@CFaxPages@@QBEXAAVRWriteStream@@@Z @19 NONAME
+EXPORTS ?ExternalizeL@TFaxBandHeader@@QBEXAAVRWriteStream@@@Z @20 NONAME
+EXPORTS ?GetEncodedScanLineL@CReadFaxPages@@QAEXAAVTDes8@@@Z @21 NONAME
+EXPORTS ?GetScanLineL@CReadFaxPages@@QAEHAAVTDes8@@@Z @22 NONAME
+EXPORTS ?InternalizeL@CFaxPageInfo@@QAEXAAVRReadStream@@@Z @23 NONAME
+EXPORTS ?InternalizeL@CFaxPages@@QAEXAAVRReadStream@@@Z @24 NONAME
+EXPORTS ?InternalizeL@TFaxBandHeader@@QAEXAAVRReadStream@@@Z @25 NONAME
+EXPORTS ?NewL@CFaxPageInfo@@SAPAV1@XZ @26 NONAME
+EXPORTS ?NewL@CFaxPages@@SAPAV1@XZ @27 NONAME
+EXPORTS ?NewL@CReadFaxFile@@SAPAV1@XZ @28 NONAME
+EXPORTS ?NewL@CReadFaxPages@@SAPAV1@AAVCStreamStore@@VTStreamId@@@Z @29 NONAME
+EXPORTS ?NewL@CWriteFaxFile@@SAPAV1@XZ @30 NONAME
+EXPORTS ?NewL@CWriteFaxPages@@SAPAV1@AAVCStreamStore@@H@Z @31 NONAME
+EXPORTS ?NumPages@CReadFaxPages@@QBEHXZ @32 NONAME
+EXPORTS ?OpenL@CReadFaxFile@@QAEXABVTDesC16@@@Z @33 NONAME
+EXPORTS ?OpenL@CWriteFaxFile@@QAEXABVTDesC16@@H@Z @34 NONAME
+EXPORTS ?SeekScanLineL@CReadFaxPages@@QAEXH@Z @35 NONAME
+EXPORTS ?SetPageL@CReadFaxPages@@QAEXH@Z @36 NONAME
+EXPORTS ?StartPage@CWriteFaxPages@@QAEXW4TFaxResolution@@W4TFaxCompression@@H@Z @37 NONAME

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/bwins/FAXSVRU.DEF	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,3 @@
+EXPORTS
+	LibEntry @ 1 NONAME
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/eabi/FAXCLIU.DEF	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,26 @@
+EXPORTS
+	_ZN12CFaxTransfer10AddSourceLERK4TBufILi256EE24TFaxPreferredCompression @ 1 NONAME
+	_ZN12CFaxTransfer10AddSourceLERK4TBufILi256EEi24TFaxPreferredCompression @ 2 NONAME
+	_ZN12CFaxTransfer10AddSourceLERK4TBufILi256EEii24TFaxPreferredCompression @ 3 NONAME
+	_ZN12CFaxTransfer15SetPhoneNumberLER6TDesC8 @ 4 NONAME
+	_ZN12CFaxTransfer16RemoveAllSourcesEv @ 5 NONAME
+	_ZN12CFaxTransfer4NewLERK12TFaxSettings @ 6 NONAME
+	_ZN12CFaxTransfer4StopEv @ 7 NONAME
+	_ZN12CFaxTransfer5NewLCERK12TFaxSettings @ 8 NONAME
+	_ZN12CFaxTransfer5StartER14TRequestStatus @ 9 NONAME
+	_ZN12CFaxTransfer6CancelEv @ 10 NONAME
+	_ZN12CFaxTransfer8ProgressEv @ 11 NONAME
+	_ZN12TFaxSettings12InternalizeLER11RReadStream @ 12 NONAME
+	_ZN12TFaxSettingsaSERKS_ @ 13 NONAME
+	_ZN18CFaxTransferSource10AddSourceLERK4TBufILi256EE24TFaxPreferredCompression @ 14 NONAME
+	_ZN18CFaxTransferSource10AddSourceLERK4TBufILi256EEi24TFaxPreferredCompression @ 15 NONAME
+	_ZN18CFaxTransferSource10AddSourceLERK4TBufILi256EEii24TFaxPreferredCompression @ 16 NONAME
+	_ZN18CFaxTransferSource16RemoveAllSourcesEv @ 17 NONAME
+	_ZNK12TFaxSettings12ExternalizeLER12RWriteStream @ 18 NONAME
+	_ZTI12CFaxSettings @ 19 NONAME ; #<TI>#
+	_ZTI12CFaxTransfer @ 20 NONAME ; #<TI>#
+	_ZTI18CFaxTransferSource @ 21 NONAME ; #<TI>#
+	_ZTV12CFaxSettings @ 22 NONAME ; #<VT>#
+	_ZTV12CFaxTransfer @ 23 NONAME ; #<VT>#
+	_ZTV18CFaxTransferSource @ 24 NONAME ; #<VT>#
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/eabi/FAXSTRMU.def	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,65 @@
+EXPORTS
+	_ZN12CFaxPageInfo12InternalizeLER11RReadStream @ 1 NONAME
+	_ZN12CFaxPageInfo4NewLEv @ 2 NONAME
+	_ZN12CFaxPageInfoD0Ev @ 3 NONAME
+	_ZN12CFaxPageInfoD1Ev @ 4 NONAME
+	_ZN12CFaxPageInfoD2Ev @ 5 NONAME
+	_ZN12CReadFaxFile4NewLEv @ 6 NONAME
+	_ZN12CReadFaxFile5CloseEv @ 7 NONAME
+	_ZN12CReadFaxFile5OpenLERK7TDesC16 @ 8 NONAME
+	_ZN12CReadFaxFileD0Ev @ 9 NONAME
+	_ZN12CReadFaxFileD1Ev @ 10 NONAME
+	_ZN12CReadFaxFileD2Ev @ 11 NONAME
+	_ZN13CReadFaxPages12GetScanLineLER5TDes8 @ 12 NONAME
+	_ZN13CReadFaxPages13SeekScanLineLEi @ 13 NONAME
+	_ZN13CReadFaxPages19GetEncodedScanLineLER5TDes8 @ 14 NONAME
+	_ZN13CReadFaxPages4NewLER12CStreamStore9TStreamId @ 15 NONAME
+	_ZN13CReadFaxPages8SetPageLEi @ 16 NONAME
+	_ZN13CReadFaxPagesD0Ev @ 17 NONAME
+	_ZN13CReadFaxPagesD1Ev @ 18 NONAME
+	_ZN13CReadFaxPagesD2Ev @ 19 NONAME
+	_ZN13CWriteFaxFile10AbortWriteEv @ 20 NONAME
+	_ZN13CWriteFaxFile4NewLEv @ 21 NONAME
+	_ZN13CWriteFaxFile5CloseEv @ 22 NONAME
+	_ZN13CWriteFaxFile5OpenLERK7TDesC16i @ 23 NONAME
+	_ZN13CWriteFaxFile7CommitLEv @ 24 NONAME
+	_ZN13CWriteFaxFileD0Ev @ 25 NONAME
+	_ZN13CWriteFaxFileD1Ev @ 26 NONAME
+	_ZN13CWriteFaxFileD2Ev @ 27 NONAME
+	_ZN14CWriteFaxPages11CommitPageLEv @ 28 NONAME
+	_ZN14CWriteFaxPages12AddScanLineLERK6TDesC8 @ 29 NONAME
+	_ZN14CWriteFaxPages19AddEncodedScanLineLERK6TDesC8 @ 30 NONAME
+	_ZN14CWriteFaxPages4NewLER12CStreamStorei @ 31 NONAME
+	_ZN14CWriteFaxPages8EndPageLE14TFaxResolutionR4TBufILi20EE15TFaxCompressioni @ 32 NONAME
+	_ZN14CWriteFaxPages9StartPageE14TFaxResolution15TFaxCompressioni @ 33 NONAME
+	_ZN14CWriteFaxPagesD0Ev @ 34 NONAME
+	_ZN14CWriteFaxPagesD1Ev @ 35 NONAME
+	_ZN14CWriteFaxPagesD2Ev @ 36 NONAME
+	_ZN14TFaxBandHeader12InternalizeLER11RReadStream @ 37 NONAME
+	_ZN14TFaxBandHeaderC1E9TStreamId @ 38 NONAME
+	_ZN14TFaxBandHeaderC1Ev @ 39 NONAME
+	_ZN14TFaxBandHeaderC2E9TStreamId @ 40 NONAME
+	_ZN14TFaxBandHeaderC2Ev @ 41 NONAME
+	_ZN9CFaxPages12InternalizeLER11RReadStream @ 42 NONAME
+	_ZN9CFaxPages4NewLEv @ 43 NONAME
+	_ZN9CFaxPagesD0Ev @ 44 NONAME
+	_ZN9CFaxPagesD1Ev @ 45 NONAME
+	_ZN9CFaxPagesD2Ev @ 46 NONAME
+	_ZNK12CFaxPageInfo12ExternalizeLER12RWriteStream @ 47 NONAME
+	_ZNK13CReadFaxPages15CurrentPageInfoEv @ 48 NONAME
+	_ZNK13CReadFaxPages8NumPagesEv @ 49 NONAME
+	_ZNK14TFaxBandHeader12ExternalizeLER12RWriteStream @ 50 NONAME
+	_ZNK9CFaxPages12ExternalizeLER12RWriteStream @ 51 NONAME
+	_ZTI12CFaxPageInfo @ 52 NONAME ; #<TI>#
+	_ZTI12CReadFaxFile @ 53 NONAME ; #<TI>#
+	_ZTI13CReadFaxPages @ 54 NONAME ; #<TI>#
+	_ZTI13CWriteFaxFile @ 55 NONAME ; #<TI>#
+	_ZTI14CWriteFaxPages @ 56 NONAME ; #<TI>#
+	_ZTI9CFaxPages @ 57 NONAME ; #<TI>#
+	_ZTV12CFaxPageInfo @ 58 NONAME ; #<VT>#
+	_ZTV12CReadFaxFile @ 59 NONAME ; #<VT>#
+	_ZTV13CReadFaxPages @ 60 NONAME ; #<VT>#
+	_ZTV13CWriteFaxFile @ 61 NONAME ; #<VT>#
+	_ZTV14CWriteFaxPages @ 62 NONAME ; #<VT>#
+	_ZTV9CFaxPages @ 63 NONAME ; #<VT>#
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/eabi/FAXSVRU.DEF	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,17 @@
+EXPORTS
+	LibEntry @ 1 NONAME
+	_ZTI10CFaxClass1 @ 2 NONAME ; #<TI>#
+	_ZTI10CFaxClass2 @ 3 NONAME ; #<TI>#
+	_ZTI11CFaxClass20 @ 4 NONAME ; #<TI>#
+	_ZTI11CFaxSession @ 5 NONAME ; #<TI>#
+	_ZTI15CFaxModemDriver @ 6 NONAME ; #<TI>#
+	_ZTI9CFaxModem @ 7 NONAME ; #<TI>#
+	_ZTIN11CFaxSession11CFaxRequestE @ 8 NONAME ; #<TI>#
+	_ZTV10CFaxClass1 @ 9 NONAME ; #<VT>#
+	_ZTV10CFaxClass2 @ 10 NONAME ; #<VT>#
+	_ZTV11CFaxClass20 @ 11 NONAME ; #<VT>#
+	_ZTV11CFaxSession @ 12 NONAME ; #<VT>#
+	_ZTV15CFaxModemDriver @ 13 NONAME ; #<VT>#
+	_ZTV9CFaxModem @ 14 NONAME ; #<VT>#
+	_ZTVN11CFaxSession11CFaxRequestE @ 15 NONAME ; #<VT>#
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/eabi/FaxIOU.def	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,23 @@
+EXPORTS
+	_ZN15CFaxHeaderLines16ReadRawFontLineLEiR5TBuf8ILi216EE @ 1 NONAME
+	_ZN15CFaxHeaderLines17WriteRawFontLineLEiR5TBuf8ILi216EE @ 2 NONAME
+	_ZN15CFaxHeaderLines18ReadFaxHeaderInfoLER14TFaxHeaderInfo @ 3 NONAME
+	_ZN15CFaxHeaderLines18ReadRawHeaderLineLEiR5TBuf8ILi216EE @ 4 NONAME
+	_ZN15CFaxHeaderLines19WriteFaxHeaderInfoLER14TFaxHeaderInfo @ 5 NONAME
+	_ZN15CFaxHeaderLines19WriteRawHeaderLineLEiR5TBuf8ILi216EE @ 6 NONAME
+	_ZN15CFaxHeaderLines4NewLEv @ 7 NONAME
+	_ZN15CFaxHeaderLines5NewLCEv @ 8 NONAME
+	_ZN6CFaxT414DecodeScanLineER5TDes8RK6TDesC8 @ 9 NONAME
+	_ZN6CFaxT414EncodeScanLineERK6TDesC8R5TDes8 @ 10 NONAME
+	_ZN6CFaxT414PageInitializeE14TFaxResolution15TFaxCompressioni @ 11 NONAME
+	_ZN6CFaxT416DecodeScanLine1DER5TDes8RK6TDesC8 @ 12 NONAME
+	_ZN6CFaxT416DecodeScanLine2DER5TDes8RK6TDesC8 @ 13 NONAME
+	_ZN6CFaxT416EncodeScanLine1DERK6TDesC8R5TDes8 @ 14 NONAME
+	_ZN6CFaxT416EncodeScanLine2DERK6TDesC8R5TDes8 @ 15 NONAME
+	_ZN6CFaxT44NewLEv @ 16 NONAME
+	_ZN6CFaxT45NewLCEv @ 17 NONAME
+	_ZTI15CFaxHeaderLines @ 18 NONAME ; #<TI>#
+	_ZTV15CFaxHeaderLines @ 19 NONAME ; #<VT>#
+	_ZN15CFaxHeaderLines26GeneratePathForHeaderFileLER6TDes16 @ 20 NONAME
+	_ZN15CFaxHeaderLines5NewLCEP5RFile @ 21 NONAME
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/eabi/faxstbu.def	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,7 @@
+EXPORTS
+	LibEntry @ 1 NONAME
+	_ZTI11CFaxSession @ 2 NONAME ; #<TI>#
+	_ZTI9CFaxTimer @ 3 NONAME ; #<TI>#
+	_ZTV11CFaxSession @ 4 NONAME ; #<VT>#
+	_ZTV9CFaxTimer @ 5 NONAME ; #<VT>#
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/faxio/CFAXIO.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,206 @@
+// Copyright (c) 1999-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
+ @publishedPartner
+ @released
+*/
+
+#if defined(__VC32__) && _MSC_VER==1100
+// Disable MSVC++ 5.0 aggressive warnings about non-expansion of inline functions. 
+#pragma warning(disable : 4710)	// function '...' not expanded
+#endif
+
+#if !defined(__CFAXIO_H__)
+#define __CFAXIO_H__
+
+#if !defined(__E32STD_H__)
+#include <e32std.h>
+#endif // __E32STD_H__
+
+#if !defined(__E32BASE_H__)
+#include <e32base.h>
+#endif // __E32BASE_H__
+
+#if !defined(__F32FILE_H__)
+#include <f32file.h>
+#endif // __F32FILE_H__
+
+#if !defined(__FAXDEFN_H__)
+#include <faxdefn.h>
+#endif // __FAXDEFN_H__
+
+/**
+@internalComponent
+*/
+typedef TUint32 TCodeDef;
+
+/**
+@publishedPartner
+@released
+*/
+const TInt KFaxFileStoreUidVal(268435712);
+
+class CFileWriteStream;
+class CFileReadStream;
+
+
+/**
+Fax line coding/decoding.
+
+Provides utility functions for encoding and decoding fax scan lines. The lines 
+can be encoded/decoded as 1 dimensional modified Huffman or 2 dimensional 
+modified Read.
+
+Users must first create a CFaxT4 object using NewL() or NewLC(). Specific 
+functions are provided to encode/decode scan lines using the two coding schemes. 
+In addition, general functions are provided which determine the coding type 
+from the values specified when the object is initialised - using PageInitialise().
+
+In pre-v5.1 releases of Symbian OS, this class was defined in faxstore.h and 
+its import library was faxst2.lib.
+
+@publishedPartner
+@released 
+*/
+class CFaxT4 : public CBase // replaces FaxT4 class used up to faxstore 013
+	{
+public:
+	IMPORT_C static CFaxT4 * NewL ();
+	IMPORT_C static CFaxT4 * NewLC ();
+	IMPORT_C void EncodeScanLine(const TDesC8& aScanLine,TDes8& anEncodedScanLine);
+	IMPORT_C TInt DecodeScanLine(TDes8& aScanLine,const TDesC8& anEncodedScanLine);
+	IMPORT_C void EncodeScanLine1D(const TDesC8& aScanLine,TDes8& anEncodedScanLine);
+	IMPORT_C TInt DecodeScanLine1D(TDes8& aScanLine,const TDesC8& anEncodedScanLine);
+	IMPORT_C void EncodeScanLine2D(const TDesC8& aScanLine,TDes8& anEncodedScanLine);
+	IMPORT_C TInt DecodeScanLine2D(TDes8& aScanLine,const TDesC8& anEncodedScanLine);
+	IMPORT_C void PageInitialize (TFaxResolution aResolution, TFaxCompression aCompression, TInt aFlag2 = 0);
+
+private:
+	inline CFaxT4();
+
+	void DoEncodeScanLine2D (const TDesC8 & aScanLine, TDes8 & anEncodedScanLine);
+	void DecodeHuffman(const TDesC8 & aEncodedScanLine);
+
+private:
+	TFaxResolution iResolution;
+	TFaxCompression iCompression;
+	TInt iLineCount;
+	TInt iK;
+	TInt iReservedFlag2;
+	const TUint8* iEndRef;
+	TUint8 iRef[KFaxPixelsPerScanLine+4];
+	};
+
+/**
+Fax header line information.
+
+Contains the information needed to generate a fax header line from a font 
+bitmap line and a header line template. For a detailed discussion of how this 
+class interacts with others to generate the fax header line.
+
+In pre-v5.1 releases of Symbian OS, this class was defined in faxstore.h.
+
+The iOffset members specify an offset in a TRawScanLine. In other words, the 
+offsets are specified in bytes rather than in characters or bits. 
+
+@publishedPartner
+@released
+*/
+class TFaxHeaderInfo
+	{
+public:
+	/** Width of the font in bytes. */
+	TInt iHeaderFontWidthInBytes;	
+	/** Height of the font in lines. */
+	TInt iHeaderFontHeightInLines;
+	/** Offset to two digit day of month. */
+	TInt iOffsetToDay;           
+	/** Offset to two digits month of year. */
+	TInt iOffsetToMonth;         
+	/** Offset to four digits year. */
+	TInt iOffsetToYear;         
+	/** Offset to two digits hour (24 hour clock). */
+	TInt iOffsetToHour;       
+	/** Offset to two digits minute. */
+	TInt iOffsetToMinute;        
+	/** Offset to two digits for total pages. */
+	TInt iOffsetToTotalPages;   
+	/** Offset to two digits for current page. */
+	TInt iOffsetToCurrentPage;   
+	};
+
+/**
+Packages fax header information for transferring across the client-server boundary. 
+
+@internalComponent
+*/
+typedef TPckgBuf < TFaxHeaderInfo > TFaxHeaderInfoPckg;
+
+
+/**
+Read/write fax header line data
+
+Allows applications to read and write information from the fax header line 
+data file: including the header line template, a font bitmap, and character 
+offset information. This data can be used to generate a fax header line -
+which contains send-time information - in real time. 
+
+This class is not intended for user derivation.
+
+In pre-v5.1 releases of Symbian OS, this class was defined in faxstore.h and 
+had an import library faxst2.lib. 
+
+@publishedPartner
+@released
+*/
+class CFaxHeaderLines : public CBase
+	{
+public:
+	IMPORT_C static CFaxHeaderLines * NewL ();
+	IMPORT_C static CFaxHeaderLines * NewLC ();
+	~CFaxHeaderLines ();
+
+	IMPORT_C void WriteRawFontLineL (const TInt alineNumber,TRawScanLine & aUncompressedDataLine);
+	IMPORT_C void WriteRawHeaderLineL (const TInt alineNumber,TRawScanLine & aUncompressedDataLine);
+	IMPORT_C void WriteFaxHeaderInfoL (TFaxHeaderInfo & aFaxHeaderInfo);
+	IMPORT_C void ReadRawFontLineL (const TInt alineNumber,TRawScanLine & aUncompressedDataLine);
+	IMPORT_C void ReadRawHeaderLineL (const TInt alineNumber,TRawScanLine & aUncompressedDataLine);
+	IMPORT_C void ReadFaxHeaderInfoL (TFaxHeaderInfo & aFaxHeaderInfo);
+	IMPORT_C static CFaxHeaderLines * NewLC (RFile* aHeaderFile);
+	IMPORT_C static void GeneratePathForHeaderFileL(TDes& aPrivatePath);
+
+protected:
+	CFaxHeaderLines(RFile* aHeaderFile);
+	CFaxHeaderLines();
+	void ConstructL ();
+	static void GenerateHeaderPathL(TDes& aPrivatePath);
+	inline RFile& File();
+
+private:
+	RFs iFileSession;
+	RFile iFile;
+	TInt iSeekpos;
+	TInt iLineNumber;
+	RFile* iAdoptedHeaderFile;
+	TBool iUseAdpotedFileHandle;
+
+public:
+	/** The fax header information package. */
+	TFaxHeaderInfoPckg iOurFaxHeaderInfoPckg;
+	};
+
+#endif // __CFAXIO_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/faxio/FAXHEAD.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,322 @@
+// 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:
+// Contents : for routine for saving/restoring fax header information
+// amended 26/10/98  -  replaced sizeof(TRawScanLine) with KFaxBytesPerScanLine
+// 
+//
+
+#include <e32std.h>
+#include <e32base.h>
+#include <f32file.h>
+
+#include "CFAXIO.H"		//public header
+
+_LIT(KHeaderFile, "FAXHEAD.DAT");
+const TDriveNumber KDriveNumber = EDriveC;
+
+/********************************************************************/
+
+EXPORT_C CFaxHeaderLines *CFaxHeaderLines::NewLC ()
+/** Constructs a CFaxHeaderLines object, which is used to read and write the fax 
+header line data file.
+
+As is usual in Symbian OS, the only difference between this function and NewL() 
+is that this variant pushes the object to the cleanup stack.
+
+As part of the construction process, the object opens a session with the file 
+server.
+
+@leave KErrNoMemory There is insufficient memory to perform the operation. 
+@return Pointer to the newly created object. 
+@capability None
+*/
+   {
+   CFaxHeaderLines *self = new (ELeave) CFaxHeaderLines;
+   CleanupStack::PushL (self);
+   self->ConstructL ();
+   return self;
+   }
+/********************************************************************/
+
+EXPORT_C CFaxHeaderLines *CFaxHeaderLines::NewL ()
+/** Constructs a CFaxHeaderLines object, which is used to read and write the fax 
+header line data file.
+
+As part of the construction process, the object opens a session with the file 
+server.
+
+@leave KErrNoMemory There is insufficient memory to perform the operation. 
+@return A pointer to the newly created object. 
+@capability None
+*/
+   {
+   CFaxHeaderLines *self = NewLC ();
+   CleanupStack::Pop ();
+   return self;
+   }
+/********************************************************************/
+/**
+Default constructor
+*/
+CFaxHeaderLines::CFaxHeaderLines()
+: iAdoptedHeaderFile(NULL), iUseAdpotedFileHandle(EFalse)
+{
+//Empty	
+}
+
+/**
+Overloaded constructor
+*/
+CFaxHeaderLines::CFaxHeaderLines(RFile* aHeaderFile)
+: iAdoptedHeaderFile(aHeaderFile), iUseAdpotedFileHandle(ETrue)
+{
+//Empty	
+}
+
+void CFaxHeaderLines::ConstructL ()
+   {
+   if(!iUseAdpotedFileHandle)   
+	   	{	
+	   	User::LeaveIfError (iFileSession.Connect ());
+	   	}
+   }
+/********************************************************************/
+
+CFaxHeaderLines::~CFaxHeaderLines ()
+/** Closes the open header line data file and shuts down the file server session. */
+   {
+   if(!iUseAdpotedFileHandle)
+   	{
+   	iFile.Close ();
+    iFileSession.Close ();
+   	}
+   
+   }
+/********************************************************************/
+
+EXPORT_C void CFaxHeaderLines::WriteRawFontLineL (const TInt alineNumber,TRawScanLine & aUncompressedDataLine)
+/** Writes header line font bitmap scan lines to the header line data file. 
+
+It should be called to add every scan line in the font bitmap.
+
+@param alineNumber The line number of the current scan line. 
+@param aUncompressedDataLine A reference to a raw font bitmap scan line to 
+be added to the header line data file. 
+@capability None
+*/
+   {
+   iSeekpos=sizeof (TFaxHeaderInfo);
+   iSeekpos+=KFaxBytesPerScanLine*iOurFaxHeaderInfoPckg().iHeaderFontHeightInLines;
+   iSeekpos+=KFaxBytesPerScanLine*alineNumber;
+   User::LeaveIfError (File().Seek (ESeekStart, iSeekpos));
+   User::LeaveIfError (File().Write (aUncompressedDataLine, KFaxBytesPerScanLine));		
+   }
+/********************************************************************/
+
+EXPORT_C void CFaxHeaderLines::WriteRawHeaderLineL (const TInt alineNumber,TRawScanLine & aUncompressedDataLine)
+/** Writes the header line template's scan lines to the header line data file. 
+It should be called to add every scan line in the template.
+
+@param alineNumber The line number of the current scan line. 
+@param aUncompressedDataLine A reference to a raw header line template scan 
+line to be added to the header line data file. 
+@capability None
+*/
+   {
+   iSeekpos=sizeof (TFaxHeaderInfo);
+   iSeekpos+=KFaxBytesPerScanLine*alineNumber;
+   User::LeaveIfError (File().Seek (ESeekStart, iSeekpos));
+   User::LeaveIfError (File().Write (aUncompressedDataLine, KFaxBytesPerScanLine));
+   }
+/********************************************************************/
+
+EXPORT_C void CFaxHeaderLines::WriteFaxHeaderInfoL (TFaxHeaderInfo & aFaxHeaderInfo)
+/** Creates and opens the fax header data file, and then writes font and character 
+offset information to it.
+
+The font and character offset information is used by the fax server to determine 
+at which position the font bitmap characters should be inserted in the header 
+line template to create the send-time header line for a page.
+
+Since this function creates and opens the file, it should be called before 
+the other write functions.
+
+@param aFaxHeaderInfo The fax header line information to be written to the 
+file. 
+@capability None
+*/
+   {
+   iOurFaxHeaderInfoPckg() = aFaxHeaderInfo;
+   iSeekpos=0;
+   if(!iUseAdpotedFileHandle)
+	   {
+	   TFileName headerFileName;
+   	   GenerateHeaderPathL(headerFileName);
+	   User::LeaveIfError (iFile.Replace (iFileSession, headerFileName, EFileWrite));
+	   }
+   User::LeaveIfError (File().Seek (ESeekStart, iSeekpos));
+   User::LeaveIfError (File().Write (iOurFaxHeaderInfoPckg, sizeof (TFaxHeaderInfo)));
+   }
+/********************************************************************/
+
+EXPORT_C void CFaxHeaderLines::ReadRawFontLineL (const TInt alineNumber,TRawScanLine & aUncompressedDataLine)
+/** Reads the font bitmap's scan lines from the header line data file. 
+
+It should be called to read every scan line in the bitmap.
+
+In normal operation the function is called by the fax server prior to sending 
+a page.
+
+@param alineNumber The line number to be read. 
+@param aUncompressedDataLine On return, contains a reference to the raw scan 
+line. 
+@capability None
+*/
+   {
+   iSeekpos=sizeof (TFaxHeaderInfo);
+   iSeekpos+=KFaxBytesPerScanLine*iOurFaxHeaderInfoPckg().iHeaderFontHeightInLines;
+   iSeekpos+=KFaxBytesPerScanLine*alineNumber;
+   User::LeaveIfError (File().Seek (ESeekStart, iSeekpos));
+   User::LeaveIfError (File().Read (aUncompressedDataLine, KFaxBytesPerScanLine));
+} 
+/********************************************************************/
+
+EXPORT_C void CFaxHeaderLines::ReadRawHeaderLineL (const TInt alineNumber,TRawScanLine & aUncompressedDataLine)
+/** Reads the header line template's scan lines from the header line data file. 
+It should be called to read every scan line in the template.
+
+In normal operation the function is called by the fax server prior to sending 
+a page.
+
+@param alineNumber The line number of the scan line to be read. 
+@param aUncompressedDataLine On return, contains the scan line. 
+@capability None
+*/
+   {
+   iSeekpos=sizeof (TFaxHeaderInfo);
+   iSeekpos+=KFaxBytesPerScanLine*alineNumber;
+   User::LeaveIfError (File().Seek (ESeekStart, iSeekpos));
+   User::LeaveIfError (File().Read (aUncompressedDataLine, KFaxBytesPerScanLine));
+   }
+/********************************************************************/
+
+EXPORT_C void CFaxHeaderLines::ReadFaxHeaderInfoL (TFaxHeaderInfo & aFaxHeaderInfo)
+/** Opens the fax header data file, and then reads font and character offset information 
+from it.
+
+The font and character offset information is used by the fax server to determine 
+at which position the font bitmap characters should be inserted in the header 
+line template to create the send time header line for a page.
+
+Since this function opens the file, it should be called before the other read 
+functions.
+
+@param aFaxHeaderInfo On return, contains header line information from the 
+header data file. 
+@capability None
+*/
+   {
+   iSeekpos=0;
+   if(!iUseAdpotedFileHandle)
+	   {
+	   TFileName headerFileName;
+   	   GenerateHeaderPathL(headerFileName);
+   	   User::LeaveIfError (iFile.Open (iFileSession, headerFileName, EFileRead));
+	   }
+   User::LeaveIfError (File().Seek (ESeekStart, iSeekpos));
+   User::LeaveIfError (File().Read (iOurFaxHeaderInfoPckg, sizeof (TFaxHeaderInfo)));
+   aFaxHeaderInfo = iOurFaxHeaderInfoPckg();
+   }
+   
+/**
+Constructs a CFaxHeaderLines object, which is used to read and write the fax 
+header line data file.
+
+This overload allows an already open file handle to be passed in which is used to access the file.  
+This function is not intended for public use.
+
+@internalTechnology
+@param aHeaderFile Pointer to file handle.
+@return Pointer to the newly created object.
+@capability None
+@released
+*/
+EXPORT_C CFaxHeaderLines* CFaxHeaderLines::NewLC (RFile* aHeaderFile)
+	{
+	CFaxHeaderLines *self = new (ELeave) CFaxHeaderLines(aHeaderFile);
+    CleanupStack::PushL (self);
+    self->ConstructL ();
+    return self;
+	}
+		
+/**
+Generates the header path to place the faxhead.dat file.  
+If platform security is enforced this path will be the private path of the client process.  As this directory structure may not exist 
+This function will generate the directory structure if it does not exist.
+If platform security is not enforced this path will be c:\system\...
+
+
+@internalTechnology
+@param aHeaderPath contains the generated private path
+@capability None
+@released
+*/
+EXPORT_C void CFaxHeaderLines::GeneratePathForHeaderFileL(TDes& aHeaderPath)
+	{
+	GenerateHeaderPathL(aHeaderPath);
+	}
+
+/**
+Return reference to open file handle.
+*/
+inline RFile& CFaxHeaderLines::File()
+	{
+	if(iUseAdpotedFileHandle)
+		{
+		return *iAdoptedHeaderFile;
+		}
+	else
+		{
+		return iFile;
+		}
+	}
+
+/**
+Generates the header path to place the faxhead.dat file.
+*/
+void CFaxHeaderLines::GenerateHeaderPathL(TDes& aHeaderPath)
+	{	
+	TDriveUnit driveUnit(KDriveNumber);
+	TDriveName drive=driveUnit.Name();
+	aHeaderPath.Insert(0, drive);
+	TPath headerPath;
+	//append private path	
+	RFs rfs;
+	User::LeaveIfError(rfs.Connect());
+	CleanupClosePushL(rfs);	
+	rfs.PrivatePath(headerPath);		
+	//generate directory structure.
+	TInt ret = rfs.CreatePrivatePath(driveUnit);
+	if(ret != KErrNone && ret!=KErrAlreadyExists)
+		{
+		User::Leave(ret);
+		}
+	CleanupStack::PopAndDestroy();	//rfs
+
+	aHeaderPath.Append(headerPath);
+	aHeaderPath.Append(KHeaderFile);
+	}
+
+/********************************************************************/
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/faxio/FAXHUFF.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,251 @@
+// 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
+ @publishedPartner
+ @released
+*/
+
+#if !defined(__FAXHUFF_H__)
+#define __FAXHUFF_H__
+
+#define KFaxBlack 0		// Mask for CFbsBitmap bytes
+#define KFaxWhite 0xFF	// Reversing gives a negative image
+
+typedef TUint32 TCodeDef;
+
+#define HUFF(len,bits) (TUint(len)<<16)|(bits)
+#define HUFFLEN(def) (TUint(def)>>16)
+#define HUFFBITS(def) (TUint(def)<<16)
+
+const TCodeDef KCodes[] =
+	{
+	// interleaved black/white runs
+	HUFF(10,0x0dc0),  // 0 black = 10 bit code is 0000110111
+	HUFF(8,0x3500),// 0 white = 8 bit code is 00110101
+	HUFF(3,0x4000),// 1 black = 3 bit code is 010
+	HUFF(6,0x1c00),// 1 white = 6 bit code is 000111
+	HUFF(2,0xc000),// 2 black = 2 bit code is 11
+	HUFF(4,0x7000),// 2 white = 4 bit code is 0111
+	HUFF(2,0x8000),// 3 black = 2 bit code is 10
+	HUFF(4,0x8000),// 3 white = 4 bit code is 1000
+	HUFF(3,0x6000),// 4 black = 3 bit code is 011
+	HUFF(4,0xb000),// 4 white = 4 bit code is 1011
+	HUFF(4,0x3000),// 5 black = 4 bit code is 0011
+	HUFF(4,0xc000),// 5 white = 4 bit code is 1100
+	HUFF(4,0x2000),// 6 black = 4 bit code is 0010
+	HUFF(4,0xe000),// 6 white = 4 bit code is 1110
+	HUFF(5,0x1800),// 7 black = 5 bit code is 00011
+	HUFF(4,0xf000),// 7 white = 4 bit code is 1111
+	HUFF(6,0x1400),// 8 black = 6 bit code is 000101
+	HUFF(5,0x9800),// 8 white = 5 bit code is 10011
+	HUFF(6,0x1000),// 9 black = 6 bit code is 000100
+	HUFF(5,0xa000),// 9 white = 5 bit code is 10100
+	HUFF(7,0x0800),// 10 black = 7 bit code is 0000100
+	HUFF(5,0x3800),// 10 white = 5 bit code is 00111
+	HUFF(7,0x0a00),// 11 black = 7 bit code is 0000101
+	HUFF(5,0x4000),// 11 white = 5 bit code is 01000
+	HUFF(7,0x0e00),// 12 black = 7 bit code is 0000111
+	HUFF(6,0x2000),// 12 white = 6 bit code is 001000
+	HUFF(8,0x0400),// 13 black = 8 bit code is 00000100
+	HUFF(6,0x0c00),// 13 white = 6 bit code is 000011
+	HUFF(8,0x0700),// 14 black = 8 bit code is 00000111
+	HUFF(6,0xd000),// 14 white = 6 bit code is 110100
+	HUFF(9,0x0c00),// 15 black = 9 bit code is 000011000
+	HUFF(6,0xd400),// 15 white = 6 bit code is 110101
+	HUFF(10,0x05c0),  // 16 black = 10 bit code is 0000010111
+	HUFF(6,0xa800),// 16 white = 6 bit code is 101010
+	HUFF(10,0x0600),  // 17 black = 10 bit code is 0000011000
+	HUFF(6,0xac00),// 17 white = 6 bit code is 101011
+	HUFF(10,0x0200),  // 18 black = 10 bit code is 0000001000
+	HUFF(7,0x4e00),// 18 white = 7 bit code is 0100111
+	HUFF(11,0x0ce0),  // 19 black = 11 bit code is 00001100111
+	HUFF(7,0x1800),// 19 white = 7 bit code is 0001100
+	HUFF(11,0x0d00),  // 20 black = 11 bit code is 00001101000
+	HUFF(7,0x1000),// 20 white = 7 bit code is 0001000
+	HUFF(11,0x0d80),  // 21 black = 11 bit code is 00001101100
+	HUFF(7,0x2e00),// 21 white = 7 bit code is 0010111
+	HUFF(11,0x06e0),  // 22 black = 11 bit code is 00000110111
+	HUFF(7,0x0600),// 22 white = 7 bit code is 0000011
+	HUFF(11,0x0500),  // 23 black = 11 bit code is 00000101000
+	HUFF(7,0x0800),// 23 white = 7 bit code is 0000100
+	HUFF(11,0x02e0),  // 24 black = 11 bit code is 00000010111
+	HUFF(7,0x5000),// 24 white = 7 bit code is 0101000
+	HUFF(11,0x0300),  // 25 black = 11 bit code is 00000011000
+	HUFF(7,0x5600),// 25 white = 7 bit code is 0101011
+	HUFF(12,0x0ca0),  // 26 black = 12 bit code is 000011001010
+	HUFF(7,0x2600),// 26 white = 7 bit code is 0010011
+	HUFF(12,0x0cb0),  // 27 black = 12 bit code is 000011001011
+	HUFF(7,0x4800),// 27 white = 7 bit code is 0100100
+	HUFF(12,0x0cc0),  // 28 black = 12 bit code is 000011001100
+	HUFF(7,0x3000),// 28 white = 7 bit code is 0011000
+	HUFF(12,0x0cd0),  // 29 black = 12 bit code is 000011001101
+	HUFF(8,0x0200),// 29 white = 8 bit code is 00000010
+	HUFF(12,0x0680),  // 30 black = 12 bit code is 000001101000
+	HUFF(8,0x0300),// 30 white = 8 bit code is 00000011
+	HUFF(12,0x0690),  // 31 black = 12 bit code is 000001101001
+	HUFF(8,0x1a00),// 31 white = 8 bit code is 00011010
+	HUFF(12,0x06a0),  // 32 black = 12 bit code is 000001101010
+	HUFF(8,0x1b00),// 32 white = 8 bit code is 00011011
+	HUFF(12,0x06b0),  // 33 black = 12 bit code is 000001101011
+	HUFF(8,0x1200),// 33 white = 8 bit code is 00010010
+	HUFF(12,0x0d20),  // 34 black = 12 bit code is 000011010010
+	HUFF(8,0x1300),// 34 white = 8 bit code is 00010011
+	HUFF(12,0x0d30),  // 35 black = 12 bit code is 000011010011
+	HUFF(8,0x1400),// 35 white = 8 bit code is 00010100
+	HUFF(12,0x0d40),  // 36 black = 12 bit code is 000011010100
+	HUFF(8,0x1500),// 36 white = 8 bit code is 00010101
+	HUFF(12,0x0d50),  // 37 black = 12 bit code is 000011010101
+	HUFF(8,0x1600),// 37 white = 8 bit code is 00010110
+	HUFF(12,0x0d60),  // 38 black = 12 bit code is 000011010110
+	HUFF(8,0x1700),// 38 white = 8 bit code is 00010111
+	HUFF(12,0x0d70),  // 39 black = 12 bit code is 000011010111
+	HUFF(8,0x2800),// 39 white = 8 bit code is 00101000
+	HUFF(12,0x06c0),  // 40 black = 12 bit code is 000001101100
+	HUFF(8,0x2900),// 40 white = 8 bit code is 00101001
+	HUFF(12,0x06d0),  // 41 black = 12 bit code is 000001101101
+	HUFF(8,0x2a00),// 41 white = 8 bit code is 00101010
+	HUFF(12,0x0da0),  // 42 black = 12 bit code is 000011011010
+	HUFF(8,0x2b00),// 42 white = 8 bit code is 00101011
+	HUFF(12,0x0db0),  // 43 black = 12 bit code is 000011011011
+	HUFF(8,0x2c00),// 43 white = 8 bit code is 00101100
+	HUFF(12,0x0540),  // 44 black = 12 bit code is 000001010100
+	HUFF(8,0x2d00),// 44 white = 8 bit code is 00101101
+	HUFF(12,0x0550),  // 45 black = 12 bit code is 000001010101
+	HUFF(8,0x0400),// 45 white = 8 bit code is 00000100
+	HUFF(12,0x0560),  // 46 black = 12 bit code is 000001010110
+	HUFF(8,0x0500),// 46 white = 8 bit code is 00000101
+	HUFF(12,0x0570),  // 47 black = 12 bit code is 000001010111
+	HUFF(8,0x0a00),// 47 white = 8 bit code is 00001010
+	HUFF(12,0x0640),  // 48 black = 12 bit code is 000001100100
+	HUFF(8,0x0b00),// 48 white = 8 bit code is 00001011
+	HUFF(12,0x0650),  // 49 black = 12 bit code is 000001100101
+	HUFF(8,0x5200),// 49 white = 8 bit code is 01010010
+	HUFF(12,0x0520),  // 50 black = 12 bit code is 000001010010
+	HUFF(8,0x5300),// 50 white = 8 bit code is 01010011
+	HUFF(12,0x0530),  // 51 black = 12 bit code is 000001010011
+	HUFF(8,0x5400),// 51 white = 8 bit code is 01010100
+	HUFF(12,0x0240),  // 52 black = 12 bit code is 000000100100
+	HUFF(8,0x5500),// 52 white = 8 bit code is 01010101
+	HUFF(12,0x0370),  // 53 black = 12 bit code is 000000110111
+	HUFF(8,0x2400),// 53 white = 8 bit code is 00100100
+	HUFF(12,0x0380),  // 54 black = 12 bit code is 000000111000
+	HUFF(8,0x2500),// 54 white = 8 bit code is 00100101
+	HUFF(12,0x0270),  // 55 black = 12 bit code is 000000100111
+	HUFF(8,0x5800),// 55 white = 8 bit code is 01011000
+	HUFF(12,0x0280),  // 56 black = 12 bit code is 000000101000
+	HUFF(8,0x5900),// 56 white = 8 bit code is 01011001
+	HUFF(12,0x0580),  // 57 black = 12 bit code is 000001011000
+	HUFF(8,0x5a00),// 57 white = 8 bit code is 01011010
+	HUFF(12,0x0590),  // 58 black = 12 bit code is 000001011001
+	HUFF(8,0x5b00),// 58 white = 8 bit code is 01011011
+	HUFF(12,0x02b0),  // 59 black = 12 bit code is 000000101011
+	HUFF(8,0x4a00),// 59 white = 8 bit code is 01001010
+	HUFF(12,0x02c0),  // 60 black = 12 bit code is 000000101100
+	HUFF(8,0x4b00),// 60 white = 8 bit code is 01001011
+	HUFF(12,0x05a0),  // 61 black = 12 bit code is 000001011010
+	HUFF(8,0x3200),// 61 white = 8 bit code is 00110010
+	HUFF(12,0x0660),  // 62 black = 12 bit code is 000001100110
+	HUFF(8,0x3300),// 62 white = 8 bit code is 00110011
+	HUFF(12,0x0670),  // 63 black = 12 bit code is 000001100111
+	HUFF(8,0x3400),// 63 white = 8 bit code is 00110100
+	// code 0x80 and 0x81 not used for makeup.. use for tag codes instead!
+	HUFF(9,0x0180),	// two-dimensional EOL plus singleton 1 tag bit = 000000011
+	HUFF(9,0x0100), // two-dimensional EOL plus singleton 0 tag bit = 000000010
+	// interleaved black/white makeup
+	HUFF(10,0x03c0),  // 64 black = 10 bit code is 0000001111
+	HUFF(5,0xd800),// 64 white = 5 bit code is 11011
+	HUFF(12,0x0c80),  // 128 black = 12 bit code is 000011001000
+	HUFF(5,0x9000),// 128 white = 5 bit code is 10010
+	HUFF(12,0x0c90),  // 192 black = 12 bit code is 000011001001
+	HUFF(6,0x5c00),// 192 white = 6 bit code is 010111
+	HUFF(12,0x05b0),  // 256 black = 12 bit code is 000001011011
+	HUFF(7,0x6e00),// 256 white = 7 bit code is 0110111
+	HUFF(12,0x0330),  // 320 black = 12 bit code is 000000110011
+	HUFF(8,0x3600),// 320 white = 8 bit code is 00110110
+	HUFF(12,0x0340),  // 384 black = 12 bit code is 000000110100
+	HUFF(8,0x3700),// 384 white = 8 bit code is 00110111
+	HUFF(12,0x0350),  // 448 black = 12 bit code is 000000110101
+	HUFF(8,0x6400),// 448 white = 8 bit code is 01100100
+	HUFF(13,0x0360),  // 512 black = 13 bit code is 0000001101100
+	HUFF(8,0x6500),// 512 white = 8 bit code is 01100101
+	HUFF(13,0x0368),  // 576 black = 13 bit code is 0000001101101
+	HUFF(8,0x6800),// 576 white = 8 bit code is 01101000
+	HUFF(13,0x0250),  // 640 black = 13 bit code is 0000001001010
+	HUFF(8,0x6700),// 640 white = 8 bit code is 01100111
+	HUFF(13,0x0258),  // 704 black = 13 bit code is 0000001001011
+	HUFF(9,0x6600),// 704 white = 9 bit code is 011001100
+	HUFF(13,0x0260),  // 768 black = 13 bit code is 0000001001100
+	HUFF(9,0x6680),// 768 white = 9 bit code is 011001101
+	HUFF(13,0x0268),  // 832 black = 13 bit code is 0000001001101
+	HUFF(9,0x6900),// 832 white = 9 bit code is 011010010
+	HUFF(13,0x0390),  // 896 black = 13 bit code is 0000001110010
+	HUFF(9,0x6980),// 896 white = 9 bit code is 011010011
+	HUFF(13,0x0398),  // 960 black = 13 bit code is 0000001110011
+	HUFF(9,0x6a00),// 960 white = 9 bit code is 011010100
+	HUFF(13,0x03a0),  // 1024 black = 13 bit code is 0000001110100
+	HUFF(9,0x6a80),// 1024 white = 9 bit code is 011010101
+	HUFF(13,0x03a8),  // 1088 black = 13 bit code is 0000001110101
+	HUFF(9,0x6b00),// 1088 white = 9 bit code is 011010110
+	HUFF(13,0x03b0),  // 1152 black = 13 bit code is 0000001110110
+	HUFF(9,0x6b80),// 1152 white = 9 bit code is 011010111
+	HUFF(13,0x03b8),  // 1216 black = 13 bit code is 0000001110111
+	HUFF(9,0x6c00),// 1216 white = 9 bit code is 011011000
+	HUFF(13,0x0290),  // 1280 black = 13 bit code is 0000001010010
+	HUFF(9,0x6c80),// 1280 white = 9 bit code is 011011001
+	HUFF(13,0x0298),  // 1344 black = 13 bit code is 0000001010011
+	HUFF(9,0x6d00),// 1344 white = 9 bit code is 011011010
+	HUFF(13,0x02a0),  // 1408 black = 13 bit code is 0000001010100
+	HUFF(9,0x6d80),// 1408 white = 9 bit code is 011011011
+	HUFF(13,0x02a8),  // 1472 black = 13 bit code is 0000001010101
+	HUFF(9,0x4c00),// 1472 white = 9 bit code is 010011000
+	HUFF(13,0x02d0),  // 1536 black = 13 bit code is 0000001011010
+	HUFF(9,0x4c80),// 1536 white = 9 bit code is 010011001
+	HUFF(13,0x02d8),  // 1600 black = 13 bit code is 0000001011011
+	HUFF(9,0x4d00),// 1600 white = 9 bit code is 010011010
+	HUFF(13,0x0320),  // 1664 black = 13 bit code is 0000001100100
+	HUFF(6,0x6000),// 1664 white = 6 bit code is 011000
+	HUFF(13,0x0328),  // 1728 black = 13 bit code is 0000001100101
+	HUFF(9,0x4d80), // 1728 white = 9 bit code is 010011011
+	// extra codes
+	HUFF(8,0x0100),	  // one-dimensional EOL = 00000001
+	HUFF(4,0x1000),   // pass mode = 4 bit code is 0001
+	HUFF(3,0x2000),   // horizontal mode = 3 bit code is 001 followed by run lengths (a1-a0) (a2-a1)
+	// vertical mode codes
+	HUFF(7,0x0600),   // +3 b1-a1 = 7 bit code is 0000011
+	HUFF(6,0x0c00),   // +2 b1-a1 = 6 bit code is 000011 
+	HUFF(3,0x6000),   // +1 b1-a1 = 3 bit code is 011 
+	HUFF(1,0x8000),   //  0 b1=a1 = 1 bit code is 1 
+	HUFF(3,0x4000),   // -1 b1-a1 = 3 bit code is 010
+	HUFF(6,0x0800),   // -2 b1-a1 = 6 bit code is 000010
+	HUFF(7,0x0400)    // -3 b1-a1 = 7 bit code is 0000010
+	};
+
+const TInt KRleBlack=0;
+const TInt KRleWhite=1;
+const TInt KRleMakeup=128;
+const TInt KRleTag1D=KRleMakeup;	// exploit the two holes in the table
+const TInt KRleTag2D=KRleMakeup+1;
+const TInt KRleExtra=KRleMakeup+2*(1+(1728>>6));
+const TInt KRleStd1D=KRleExtra;
+const TInt KRlePassMode=KRleExtra+1;
+const TInt KRleHorzMode=KRleExtra+2;
+const TInt KRleVertMode0=KRleExtra+6;
+
+
+const TInt KRleMakeupMask=~(KRleWhite|KRleMakeup);
+
+#endif // __FAXHUFF_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/faxio/FAXIO.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,763 @@
+// 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:
+//
+
+#include <s32mem.h>
+#include "CFAXIO.H"
+
+#include "FAXSTPAN.H"
+#include "FAXUHUFF.H"
+#include "FAXHUFF.H"
+
+// COPIED function from pdrutil
+
+GLDEF_C void Panic (TFaxStorePanic aPanic)
+// Panic the process with ETEXT as the category.
+ //
+
+{
+	User::Panic (_L ("FaxStore"), aPanic);
+}
+
+// END OF COPIED
+
+//#define KFaxFileName _L("c:\\temp.fax")
+
+/********************************************************************/
+
+#define RLE_MAKEUP(aTable,aRun) TUint8((aTable)+KRleMakeup+((aRun)>>6<<1))
+#define RLE_RUN(aTable,aRun) TUint8((aTable)+((aRun)<<1))
+
+#define WRITE_RLE(ptr,table,run) {if (run>63) {*ptr++=RLE_MAKEUP(table,run);run&=0x3f;} *ptr++=RLE_RUN(table,run);}
+#define READ_RLE(ptr,pos) {TInt x=*ptr++;if (x>=KRleMakeup) {pos+=(x&KRleMakeupMask)<<5;x=*ptr++;}pos+=x>>1;}
+
+LOCAL_C TUint8* RleEncoding(const TUint32 * aScan, TUint8* aRleEncoding)
+//
+// RLE encode a 1728 pixel scanline into the buffer, and return the end-of-rle data
+// The edge detection algorithm is almost optimal for ARM
+//
+	{
+	// the edge detection looks at multiple pixels at a time
+	// tests show that for ARM, testing 8 is only 1-2% faster than testing 6
+	// testing only 6 makes for a smaller lookup table
+
+	// The FirstBit table is (5 - bitpos) of the least significant
+	// bit that is set in the array index value
+
+	const TInt KTestBitCount=6;
+	const TInt KTestBitMask=(1u<<KTestBitCount)-1;
+	const TInt KRunBias=KTestBitCount-2;
+	static const TUint8 KFirstBit[64]=
+		{
+		0,5,4,5,3,5,4,5,2,5,4,5,3,5,4,5,1,5,4,5,3,5,4,5,2,5,4,5,3,5,4,5,
+		0,5,4,5,3,5,4,5,2,5,4,5,3,5,4,5,1,5,4,5,3,5,4,5,2,5,4,5,3,5,4,5
+		};
+
+	const TUint32 *end = aScan + (KFaxPixelsPerScanLine >> 5);
+	TUint32 color = ~0u;			// white at start
+	TInt table=KRleWhite;
+	TInt run = KRunBias;			// initialise run length
+	const TUint8* lookup=KFirstBit;	// force the table to be in a register
+
+	nextword:
+	while (aScan < end)
+		{
+		run += 32;
+		TUint32 pixels = *aScan++ ^ color;
+		if (pixels)      // do no work if there is no edge
+			{
+			TInt bit = 31 + KTestBitCount;
+			for (;;)
+				{
+				TUint pix;
+				do
+					{
+					if ((bit-=KTestBitCount) < 0)
+						goto nextword;	// finished processing the word
+					// now examine the next 6 pixels
+					// break out if we have found an edge
+					pix=(pixels>>(31-bit))&KTestBitMask;
+					} while (pix==0);
+				// there is an edge, use the table to discover which pixel
+				bit+=lookup[pix];
+				// store the run-length
+				run-=bit;
+				WRITE_RLE(aRleEncoding,table,run);
+				// flip color and look for the next edge
+				color = ~color;
+				table=KRleWhite-table;
+				pixels=~pixels;
+				run = bit;
+				}
+			}
+		}
+	// store the final run
+	run-=KRunBias;
+	WRITE_RLE(aRleEncoding,table,run);
+	return aRleEncoding;
+	}
+
+LOCAL_C TUint8* RleEncoding (const TUint32 *aScanline,TInt aLength,TUint8* aRleEncoding)
+//
+// Justify the scanline into a full size buffer before encoding
+//
+	{
+	__ASSERT_DEBUG(aLength < (KFaxPixelsPerScanLine >> 3),User::Invariant());
+//
+	TUint32 justified[KFaxPixelsPerScanLine/32];
+//
+	TInt margin = ((KFaxPixelsPerScanLine >> 3) - aLength) / 2;
+	Mem::Fill (justified, sizeof(justified), 0xff);       // white fill
+	Mem::Copy ((TUint8*)justified + margin, aScanline, aLength);
+	return RleEncoding(justified,aRleEncoding);
+	}
+
+LOCAL_C TUint8* RleEncoding (const TDesC8& aScanLine, TUint8* aRleEncoding)
+//
+// Build the RLE encoding for aScanline, handling wrong-sized scanlines
+//
+	{
+	TInt len = aScanLine.Length ();
+	const TUint32 *scan = (const TUint32 *) aScanLine.Ptr ();
+	__ASSERT_DEBUG ((TUint (scan) & 3) == 0, Panic (EFaxEncodeScanlineAlignment));
+	if (len >= (KFaxPixelsPerScanLine >> 3))
+		return RleEncoding(scan + ((len - (KFaxPixelsPerScanLine >> 3)) >> 3),aRleEncoding);  // margin in words
+	else
+		return RleEncoding(scan,len,aRleEncoding);
+	}
+
+LOCAL_C void EncodeHuffman(TDes8 & anEncodedScanLine,TInt aTagCode,const TUint8* aRleEncoding,const TUint8* aRleEnd)
+//
+// Starting with the tag code, encode all codes in the rle data using the single huffman table
+//
+	{
+	TUint8 *t4 = (TUint8 *) anEncodedScanLine.Ptr ();
+	TUint8 *const e4 = t4;
+	// start with tag code
+	TCodeDef huff=KCodes[aTagCode];
+	TUint code=HUFFBITS(huff);
+	TInt bits=HUFFLEN(huff)-16;
+	while (aRleEncoding<aRleEnd)
+		{
+		__ASSERT_DEBUG (bits < 0, User::Invariant ());
+		TUint8 c=*aRleEncoding++;
+		TCodeDef huff=KCodes[c];
+		code|=HUFFBITS(huff)>>(bits+16);
+		bits+=HUFFLEN(huff);
+		if (bits<0)
+			continue;
+		*t4++=TUint8(code>>24);
+		*t4++=TUint8(code>>16);
+		code<<=16;
+		bits-=16;
+		}
+	if (bits>-16)
+		{	// flush out the remaining bits
+		*t4++=TUint8(code>>24);
+		if (bits>-8)
+			*t4++=TUint8(code>>16);
+		}
+	anEncodedScanLine.SetLength (t4 - e4);
+	}
+
+/********************************************************************/
+
+inline CFaxT4::CFaxT4 ()
+	{PageInitialize(EFaxNormal,EModifiedHuffman);}
+
+EXPORT_C CFaxT4 *CFaxT4::NewLC ()
+/** Constructs a CFaxT4 object, which provides utility functions to encode and 
+decode fax scan lines. 
+
+As is usual in Symbian OS, the only difference between this function and NewL() 
+is that this variant pushes the object to the cleanup stack.
+
+The new object is constructed with the default compression and resolution: 
+EModifiedHuffman and EFaxNormal respectively.
+
+@leave KErrNoMemory There is insufficient memory to perform the operation.
+@return A pointer to the newly created object. 
+@capability None
+*/
+	{
+	CFaxT4 *self = NewL ();
+	CleanupStack::PushL (self);
+	return self;
+	}
+
+EXPORT_C CFaxT4 *CFaxT4::NewL ()
+/** Constructs a CFaxT4 object, which provides utility functions to encode and 
+decode fax scan lines. 
+
+The function is exactly the same as NewLC() except that the new object is 
+popped from the cleanup stack.
+
+The new object is constructed with the default compression and resolution: 
+EModifiedHuffman and EFaxNormal respectively.
+
+@leave KErrNoMemory There is insufficient memory to perform the operation. 
+@return A pointer to the newly created object. 
+@capability None
+*/
+	{
+	return new (ELeave) CFaxT4;
+	}
+
+EXPORT_C void CFaxT4::PageInitialize (TFaxResolution aResolution, TFaxCompression aCompression, TInt aFlag2)
+/**
+Initialize fax page, set page parameters.
+
+@param   aResolution     defines fax resolution
+@param   aCompression    defines fax compression
+@param   aFlag2          reserved flag.
+@capability None
+*/
+	{
+	__ASSERT_ALWAYS (((aCompression == EModifiedHuffman) || (aCompression == EModifiedRead)), Panic (EFaxUnsupportedCompression));
+	iCompression = aCompression;
+	iResolution = aResolution;
+	iReservedFlag2 = aFlag2;
+	iK = iResolution == EFaxFine ? 4 : 2;
+	iLineCount = 1;
+	// an all-white reference line
+	iRef[0]=RLE_MAKEUP(KRleWhite,KFaxBytesPerScanLine);
+	iRef[1]=RLE_RUN(KRleWhite,0);
+	iEndRef=iRef+2;
+	}
+
+EXPORT_C void CFaxT4::EncodeScanLine (const TDesC8 & aScanLine, TDes8 & anEncodedScanLine)
+/** Encodes a scan line using either one dimensional Modified Huffman (MH) or two 
+dimensional Modified Read (MR) encoding. 
+
+The type of encoding used depends on the compression type specified when the 
+object was initialised - using PageInitialize(). If the object was not initialised, 
+then the default compression is MH.
+
+@param aScanLine The raw scan line to be encoded. 
+@param anEncodedScanLine On return, contains the encoded scan line. 
+@capability None
+*/
+	{
+	if (iCompression == EModifiedRead)
+		EncodeScanLine2D (aScanLine, anEncodedScanLine);
+	else
+		EncodeScanLine1D(aScanLine,anEncodedScanLine);
+	}
+
+EXPORT_C void CFaxT4::EncodeScanLine1D (const TDesC8 & aScanLine, TDes8 & anEncodedScanLine)
+/** Encodes a scan line using Modified Huffman compression.
+
+@param aScanLine The scan line to be encoded. 
+@param anEncodedScanLine On return, contains the MH encoded scan line. 
+@capability None
+*/
+	{
+	iEndRef=RleEncoding(aScanLine,iRef);
+	EncodeHuffman(anEncodedScanLine,iCompression == EModifiedHuffman ? KRleStd1D : KRleTag1D,iRef,iEndRef);
+	}
+
+EXPORT_C void CFaxT4::EncodeScanLine2D (const TDesC8 & aScanLine, TDes8 & anEncodedScanLine)
+/** Encodes a scan line using Modified Read compression.
+
+@param aScanLine The scan line to be encoded. 
+@param anEncodedScanLine On return, contains the MR encoded scan line. 
+@capability None
+*/
+	{
+	// initialize our own scan line
+	TInt lc=iLineCount-1;
+	if (lc==0)
+		{	// 1D reference line
+		iLineCount=iK;
+		EncodeScanLine1D(aScanLine,anEncodedScanLine);
+		}
+	else
+		{	// 2D line
+		iLineCount=lc;
+		DoEncodeScanLine2D(aScanLine,anEncodedScanLine);
+		}
+	}
+
+void CFaxT4::DoEncodeScanLine2D (const TDesC8 & aScanLine, TDes8 & aEncodedScanLine)
+	{
+	TUint8 rlebuf[KFaxPixelsPerScanLine*3/2 + 16]; // for output + reference line
+
+	// the buffer is big enough that the 2d coding output into the buffer will not
+	// catch the reference coding before it is used
+
+	// copy the reference line into the end of the stack buffer
+
+	TInt len=iEndRef-iRef;
+	TUint8* ref=rlebuf+sizeof(rlebuf)-len;
+	Mem::Copy(ref,iRef,len);
+
+	// Do the standard RLE encoding of the current line
+	iEndRef=RleEncoding(aScanLine,iRef);
+	const TUint8* cur=iRef;
+
+	TUint8* rle=rlebuf;
+	TInt a0=-1;			// previous edge on current line
+	TInt a1=0;			// current edge on current line
+	TInt b0;			// previous edge on reference line
+	TInt b1=0;			// current edge on reference line
+	TInt b2=0;			// look-ahead edge on reference line
+	TInt color=KRleWhite;	// color at a0 (initially white)
+
+	// the reference color is not tracked. Instead the number of reference edges
+	// traversed is monitored (modulo 2) to ensure that edge b1 is of the same
+	// color to a1 at "gotB2"
+
+	READ_RLE(cur,a1);		// find the first edge
+
+	for (;;)
+		{
+		do
+			{	// find the new current and next edges on reference line
+			b0=b1;
+			b1=b2;
+			if (b1==KFaxPixelsPerScanLine)
+				break;			// end of line
+			READ_RLE(ref,b2);
+refMove1:	//	find just the look-ahead edge on the reference line
+			b0=b1;
+			b1=b2;
+			if (b1==KFaxPixelsPerScanLine)
+				break;
+			READ_RLE(ref,b2);
+			} while(b1<=a0);		// ensure that we have the right reference edge
+
+gotB2:	if (b2 < a1)
+			{	// pass mode detected
+			*rle++=KRlePassMode;
+			a0=b2;	// move along by 2 edges
+			continue;
+			}
+
+		if (TUint(b1-a1+3)<=6u)
+			{	// vertical mode
+			*rle++=TUint8(KRleVertMode0 + (b1 - a1));
+			if (a1==KFaxPixelsPerScanLine)
+				break;		// complete
+			if (b0>a1)
+				{
+				// special case of vertical mode edge "cross-over"
+				// the next edge may match an earlier reference edge than this!
+				// rewind the reference line by 2 edges
+				// we know that [b0,b1] is small, and so only uses 1 byte in the rle
+				// we check for [b1,b2] requiring a makeup byte as well
+				ref-=2;
+				if (b2-b1>=64)
+					--ref;
+				b2=b0;
+				b1=0;	// no longer know b0, but this cannot happen again without traversing 2 edges
+				}
+			a0 = a1;	// traverse a single edge
+			READ_RLE(cur,a1);
+			color=KRleWhite-color;
+			goto refMove1;
+			}
+
+		// we must be in horizontal mode - write out the RLE codes for remainder
+		// and copy RLE codes for next edge from current coding
+
+		*rle++=KRleHorzMode;
+		a0=Max(0,a0);			// deal with start-effects (a0==-1)
+		TInt run=a1-a0;
+		WRITE_RLE(rle,color,run);
+		// copy the next run
+		if (a1==KFaxPixelsPerScanLine)
+			{	// complete, need a zero-length, other-color, run to finish
+			*rle++=RLE_RUN(KRleWhite-color,0);
+			break;
+			}
+		// copy the next RLE code directly from the current line
+		TInt x=*cur++;
+		__ASSERT_DEBUG((x&KRleWhite)==KRleWhite-color,User::Invariant());
+		if (x>=KRleMakeup)
+			{
+			*rle++=TUint8(x);
+			a1+=(x&KRleMakeupMask)<<5;
+			x=*cur++;
+			}
+		*rle++=TUint8(x);
+		a1+=x>>1;
+		if (a1==KFaxPixelsPerScanLine)
+			break;	// complete
+		a0=a1;
+		READ_RLE(cur,a1);	// traverse another edge
+		if (b1>a0)
+			goto gotB2;
+		}
+	EncodeHuffman(aEncodedScanLine,KRleTag2D,rlebuf,rle);
+	}
+
+EXPORT_C TInt CFaxT4::DecodeScanLine (TDes8 & aScanLine, const TDesC8 & anEncodedScanLine)
+/** Decodes a scan line. 
+
+The decoding method depends on the compression type specified when the object 
+was initialised - using PageInitialize(). If the object was not initialised, 
+then the scan line is decoded as Modified Huffman.
+
+The fax client can determine the type of compression used in a fax from its 
+header, and can hence use PageInitialize() to set the correct decoding method. 
+KErrUnderflow is returned if the wrong type of compression is specified.
+
+@param aScanLine On return, contains the decoded scan line. 
+@param anEncodedScanLine The encoded scan line to be decoded. 
+@return KErrNone if successful, otherwise another of the system-wide error 
+codes. 
+@capability None
+*/
+	{
+	if (iCompression == EModifiedHuffman)
+		return (DecodeScanLine1D (aScanLine, anEncodedScanLine));
+	else
+		return (DecodeScanLine2D (aScanLine, anEncodedScanLine));
+	}
+
+void CFaxT4::DecodeHuffman(const TDesC8 & aEncodedScanLine)
+	{
+	// If all goes wrong then the reference line is unchanged and will be
+	// used for the current line
+
+	const TUint8* t4=aEncodedScanLine.Ptr();
+	const TUint8* endt4=t4+aEncodedScanLine.Length();
+	TUint bits=0;
+
+	// store the basic RLE data locally, and copy to the member data if the decode
+	// is successful
+
+	TUint8 rlebuf[KFaxPixelsPerScanLine+4];
+	TUint8* rle=rlebuf;
+
+	// Keep track of where we have got to on the reference (previous) line
+	const TUint8* ref=iRef;
+	TInt b1=0;		// pixel position on the reference line
+	TInt a0=0;		// previous position on the current line
+	TInt a1=0;		// current position on the current line
+
+	// start decoding using the tag-tree, which finds the first 1-bit
+	// and then determines the encoding (1D or 2D) based on the next bit
+	const TNode* tree=KTagTree;
+
+	// "color" stores the current line color (in bit 0), the reference line
+	// color (in bit 1), and the number of white/black codes to expect (x4)
+	// if color<0, then we are in 2d-tree mode
+	// initially unused until the encoding type is known
+
+	TInt color=0;
+	TInt code;
+
+	for (;;)
+		{
+		// the structure of the following code maxmises the speed of the
+		// huffman decoder. Don't change it.
+		code = 0;		// start at the root of the tree
+nextBit2d:
+		if (((bits <<= 1) & 0x80000000)==0)
+			goto nextByte2d;		// run out of bits in the current byte
+decode2d:
+		code = CODE (tree, code, bits & 0x80);
+		if (ISBRANCH (code))
+			goto nextBit2d;			// a branch code
+
+		// We have the huffman code
+
+		if (code<KOurEol)
+			{	// the code was a white/black length code
+			__ASSERT_DEBUG(color>=0,User::Invariant());
+			TInt v=CODEVALUE(code);
+			a1+=v;
+			if (a1>KFaxPixelsPerScanLine)
+				return;		// overflow
+			if (v < 64)
+				{	// a run code (as opposed to make-up code). Emit the RLE
+				a0=a1-a0;
+				WRITE_RLE(rle,(color&1),a0);
+				a0=a1;
+				color^=KRleWhite;	// switch color
+				color-=4;			// one less white/black code
+				tree=color>=0 ? color&KRleWhite ? KWhiteTree : KBlackTree : KTwoTree;
+				}
+			continue;
+			}
+		if (code<KPassMode)
+			{
+			if (code == KHorzMode)
+				{	// expect two white/black codes to follow
+				color+=8;
+				tree = color&KRleWhite ? KWhiteTree : KBlackTree;
+				continue;
+				}
+			if (code==KTag1D)
+				{	// 1d decoding: set color to maximum positive value
+					// as all codes are standard white/black code.
+				color=KMaxTInt;		// current and reference color both 1 (white)
+				tree=KWhiteTree;
+				continue;
+				}
+			if (code==KTag2D)
+				{	// 2d decoding: set color negative to indicate 2d-tree
+				color=-1;			// current and reference color both 1 (white)
+				tree=KTwoTree;
+				continue;
+				}
+			if (code==KOurEol)
+				goto eol2d;
+			__ASSERT_DEBUG(code == KBadRun,User::Invariant());
+			return;			// bad run, give up
+			}
+
+		// The remaining 2D possibilities all require that we know the various 2D determinants
+		// so we proceed as follows :
+
+		// b0 tracks the previous "edge" in the reference line
+		TInt b0=0;
+		// find the next "edge" on the reference line after a1
+		// if we've just started decoding (rle==rlebuf), b1 boundary at 0 is correct
+		if (rle!=rlebuf)
+			{
+			while (b1<=a1)
+				{
+				color^=KRleWhite<<1;
+				b0=b1;
+				if (b1!=KFaxPixelsPerScanLine)
+					READ_RLE(ref,b1);
+				}
+			}
+		// the b1 "edge" must match the colors of a1, so move one more edge if
+		// the a0 color (color&1) is the same as the b1 color (color&2)
+		if (((color^(color>>1))&1)==0)
+			{
+			b0=b1;
+			if (b1!=KFaxPixelsPerScanLine)
+				READ_RLE(ref,b1);
+			color^=KRleWhite<<1;
+			}
+
+		// If the code is below PASSMODE then it is one of the vertical code words
+		// which are pretty easy to decipher as we have all the data. Vertical mode
+		// flips the colour and then continues
+
+		if (code==KPassMode)
+			{
+			// we need to identify the next reference "edge"
+			if (b1==KFaxPixelsPerScanLine)
+				return;		// overflow
+			READ_RLE(ref,b1);
+			if (b1==KFaxPixelsPerScanLine)
+				return;		// overflow
+			color^=KRleWhite<<1;
+			a1=b1;
+			continue;
+			}
+
+		__ASSERT_DEBUG(code>=KVtMode3n && code<=KVtMode3p,User::Invariant());
+		// vertical mode
+		a1=b1+(code-(KVtMode0));
+		if (a1>KFaxPixelsPerScanLine)
+			return;		// overflow
+		if (b0>a1)
+			{
+			// special case of vertical mode cross-over
+			// rewind the reference line to the previous "edge"
+			b1=b0;
+			--ref;
+			color^=KRleWhite<<1;
+			}
+		a0=a1-a0;
+		WRITE_RLE(rle,(color&1),a0);
+		a0=a1;
+		color^=KRleWhite;
+		}
+nextByte2d:
+	if (t4 < endt4)
+		{
+		bits = 0xff000000u | *t4++;
+		goto decode2d;
+		}
+eol2d:
+	if (a0==KFaxPixelsPerScanLine)
+		iEndRef=Mem::Copy(iRef,rlebuf,rle-rlebuf);
+	}
+
+EXPORT_C TInt CFaxT4::DecodeScanLine2D (TDes8 & aScanLine, const TDesC8 & aEncodedScanLine)
+/** Decodes a Modified Read encoded scan line.
+	
+@param aScanLine On return, contains the decoded scan line. 
+@param anEncodedScanLine The 2D encoded scan line to be decoded. 
+@return KErrNone if successful, KErrUnderflow if the scan line is encoded as 
+MR, otherwise another of the system-wide error codes. 
+@capability None
+*/
+	{
+	DecodeHuffman(aEncodedScanLine);
+//
+//	decode the RLE into the scanline
+//
+	aScanLine.SetLength (KFaxPixelsPerScanLine / 8);
+	TUint32 *scan = (TUint32 *) aScanLine.Ptr ();
+	__ASSERT_DEBUG ((TUint (scan) & 3) == 0, Panic (EFaxDecodeScanlineAlignment));
+
+	const TUint8* rle=iRef;
+	const TUint8* const end=iEndRef;
+
+	TUint color = ~0u;		// start white
+	TUint out = 0;			// output pixels in accumulation
+	TInt bits = 0;          // this is the number of used bits in out
+
+	while (rle<end)
+		{
+		TInt run=*rle++;
+		__ASSERT_DEBUG(TUint((run&1))==(color&1),User::Invariant());	// rle-data correct
+		if (run<KRleMakeup)
+			{	// run length code (x2)
+			out += color << bits;		// complete the current 32-bits
+			bits += run >> 1;			// add the run length
+			if (bits < 32)				// hasn't completed the word
+				out -= color << bits;	// remove the trailing bits
+			else
+				{
+				*scan++ = out;			// write the 32-bits
+				bits -= 64;
+				if (bits >= 0)
+					*scan++ = color;	// + another 32 bits
+				else
+					bits += 32;			// no extra
+				out = color - (color<<bits);	// bits remaining
+				}
+			color = ~color;				// swap color
+			}
+		else
+			{
+			// make-up code. (run-KRleMakeup)>>1 is the multiple of 64 bits
+			out += color << bits;		// complete the current 32-bits
+			*scan++ = out;				// output
+			*scan++ = color;			// +32 bits of color
+			for (run -= KRleMakeup+4;run >= 0;run -= 2)
+				{	// extra multiples of 64 bits
+				*scan++ = color;
+				*scan++ = color;
+				}
+			out = color - (color<<bits);	// remainder bits
+			}
+		}
+	return KErrNone;
+	}
+
+EXPORT_C TInt CFaxT4::DecodeScanLine1D (TDes8 & aScanLine, const TDesC8 & anEncodedScanLine)
+//
+// This could be done through DecodeScanLine2D, but this is an optimized version for 1D
+// The intermediate rle encoding is skipped
+//
+/** Decodes a Modified Huffman encoded scan line.
+
+@param aScanLine On return, contains the decoded scan line. 
+@param anEncodedScanLine The MH encoded scan line to be decoded. 
+@return KErrNone if successful, KErrUnderflow if the scan line is encoded as 
+MR, otherwise another of the system-wide error codes. 
+@capability None
+*/
+	{
+	const TUint8 *t4 = anEncodedScanLine.Ptr ();
+	const TUint8 *const endt4 = t4 + anEncodedScanLine.Length ();
+	//
+	aScanLine.SetLength (KFaxPixelsPerScanLine / 8);
+	TUint32 *scan = (TUint32 *) aScanLine.Ptr ();
+	__ASSERT_DEBUG ((TUint (scan) & 3) == 0, Panic (EFaxDecodeScanlineAlignment));
+	TUint out = 0;
+	TInt bits = 0;               // this is the number ofused bits
+	//
+	TInt dotsleft = KFaxPixelsPerScanLine;
+	const TNode *tree = KSynchTree;
+	TUint octet=0;
+	TUint color = 0xffffffffu;
+
+nextCode1d:
+	TInt code = 0;
+nextBit1d:
+	if (((octet <<= 1) & 0x80000000)==0)
+		goto nextByte1d;
+decode1d:
+	code = CODE (tree, code, octet & 0x80);
+	if (ISBRANCH (code))
+		goto nextBit1d;
+
+	// end of huffman code
+
+	if (code<KEndCode+0x40)
+		{
+		code-=KEndCode;
+		if ((dotsleft -= code) < 0)
+			return KErrOverflow;
+		out += color<<bits;
+		bits+=code;
+		if (bits<32)
+			out -= color<<bits;	// output word not full
+		else
+			{	// out is full
+			*scan++=out;
+			bits-=64;
+			if (bits>=0)
+				*scan++=color;
+			else
+				bits+=32;
+			out=color-(color<<bits);
+			}
+		color = ~color;
+		if (color)
+			tree=KWhiteTree;
+		else
+			tree=KBlackTree;
+		goto nextCode1d;
+		}
+	else if (code<=KEndCode+KMaxRun)
+		{	// makeup (multiple of 64)
+		code-=KEndCode+0x40;
+		if ((dotsleft -= code<<6) < 0)
+			return KErrOverflow;
+		out += color << bits;
+		*scan++=out;
+		*scan++=color;
+		for (code-=2;code>=0;--code)
+			{
+			*scan++=color;
+			*scan++=color;
+			}
+		out = color-(color<<bits);
+		goto nextCode1d;
+		}
+	else if (code == KOurEol)
+		goto eol1d;
+	else if (code == KStd1D)
+		{
+		tree=KWhiteTree;
+		goto nextCode1d;
+		}
+	else
+		{
+		__ASSERT_DEBUG (code == KBadRun, User::Invariant ());
+		return KErrCorrupt;
+		}
+nextByte1d:
+	if (t4 < endt4)
+		{
+		octet = 0xff000000u | *t4++;
+		goto decode1d;
+		}
+eol1d:
+	__ASSERT_DEBUG (dotsleft || (TUint8 *) scan - aScanLine.Ptr () == KFaxPixelsPerScanLine / 8, User::Invariant ());
+	return dotsleft ? KErrUnderflow : KErrNone;
+	}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/faxio/FAXSTPAN.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,45 @@
+// 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
+*/
+
+#if !defined(__FAXSTPAN_H__)
+#define __FAXSTPAN_H__
+#if !defined(__E32STD_H__)
+#include <e32std.h>
+#endif // __E32STD_H__
+
+/**
+@internalComponent
+*/
+enum TFaxStorePanic
+	{
+	EFaxScanLineIndexOutOfRange,
+	EFaxBandIndexOutOfRange,
+	EFaxPageIndexOutOfRange,
+	EFaxDecodeScanlineAlignment,
+	EFaxEncodeScanlineAlignment,
+	EFaxUnsupportedCompression
+	};
+
+/**
+@publishedPartner
+*/
+GLREF_C void Panic(TFaxStorePanic aPanic);
+
+#endif // __FAXSTPAN_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/faxio/FAXUHUFF.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,302 @@
+// 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:
+// Header FAXUHUFF.H	 
+// 
+//
+
+/**
+ @file
+ @internalComponent
+*/
+
+#if !defined(__FAXUHUFF_H__)
+#define __FAXUHUFF_H__
+
+/**
+@internalComponent
+*/
+typedef TUint8 TNode[2];
+typedef TUint TCode;
+
+// 1728    = 11011000000
+// 1728>>6 = 11011       = 27
+/**
+@internalComponent
+*/
+const TInt KEndCode=0x80;			// 0x080 = 128
+const TInt KMaxRun=(1728>>6)+64;	// 0x05b = 91 = 27+64
+
+/**
+@internalComponent
+*/
+enum
+	{
+	KOurEol=KEndCode+KMaxRun+1,	// 0x0db = 219 = 128+90+1
+	KBadRun,
+	KStd1D,
+	KTag1D=KStd1D,
+	KTag2D,
+	KHorzMode,
+	KPassMode,
+	KVtMode3n,
+	KVtMode2n,
+	KVtMode1n,
+	KVtMode0, 
+	KVtMode1p,
+	KVtMode2p,
+	KVtMode3p
+	};
+
+/**
+@internalComponent
+*/
+#define NODE(left,right) {(left),(right)}
+#define LEAF(val) (KEndCode|(val<64?val:0x40|(val>>6)))
+#define CODE(tree,node,bit) (tree[node][bit?1:0])
+#define ISBRANCH(code) (!(code&KEndCode))
+#define ISERROR(code) (code>(KEndCode|KMaxRun))
+#define CODEVALUE(code) (code&0x40 ? (code&0x3f)<<6 : code&0x3f)
+
+/**
+@internalComponent
+*/
+const TNode KWhiteTree [] =
+	{
+	NODE(1, 80),    // 0 
+	NODE(40, 2),    // 1 
+	NODE(21, 3),    // 2 
+	NODE(4, LEAF(2)),    // 3 
+	NODE(16, 5),    // 4 
+	NODE(10, 6),    // 5 
+	NODE(7, LEAF(256)),  // 6 
+	NODE(9, 8),     // 7 
+	NODE(LEAF(1344), LEAF(1408)),   // 8 
+	NODE(LEAF(1216), LEAF(1280)),   // 9 
+	NODE(11, 13),   // 10 
+	NODE(LEAF(576), 12), // 11 
+	NODE(LEAF(832), LEAF(896)),     // 12 
+	NODE(14, 15),   // 13 
+	NODE(LEAF(960), LEAF(1024)),    // 14 
+	NODE(LEAF(1088), LEAF(1152)),   // 15 
+	NODE(LEAF(1664), 17),// 16 
+	NODE(18, 19),   // 17 
+	NODE(LEAF(448), LEAF(512)),     // 18 
+	NODE(20, LEAF(640)), // 19 
+	NODE(LEAF(704), LEAF(768)),     // 20 
+	NODE(32, 22),   // 21 
+	NODE(23, 28),   // 22 
+	NODE(24, 26),   // 23 
+	NODE(LEAF(24), 25),  // 24 
+	NODE(LEAF(49), LEAF(50)), // 25 
+	NODE(27, LEAF(25)),  // 26 
+	NODE(LEAF(51), LEAF(52)), // 27 
+	NODE(29, LEAF(192)), // 28 
+	NODE(30, 31),   // 29 
+	NODE(LEAF(55), LEAF(56)), // 30 
+	NODE(LEAF(57), LEAF(58)), // 31 
+	NODE(LEAF(11), 33),  // 32 
+	NODE(34, 36),   // 33 
+	NODE(LEAF(27), 35),  // 34 
+	NODE(LEAF(59), LEAF(60)), // 35 
+	NODE(37, LEAF(18)),  // 36 
+	NODE(38, 39),   // 37 
+	NODE(LEAF(1472), LEAF(1536)),   // 38 
+	NODE(LEAF(1600), LEAF(1728)),   // 39 
+	NODE(59, 41),   // 40 
+	NODE(49, 42),   // 41 
+	NODE(43, LEAF(10)),  // 42 
+	NODE(47, 44),   // 43 
+	NODE(46, 45),   // 44 
+	NODE(LEAF(320), LEAF(384)),     // 45 
+	NODE(LEAF(63), LEAF(0)),   // 46 
+	NODE(LEAF(28), 48),  // 47 
+	NODE(LEAF(61), LEAF(62)), // 48 
+	NODE(56, 50),   // 49 
+	NODE(53, 51),   // 50 
+	NODE(52, LEAF(21)),  // 51 
+	NODE(LEAF(43), LEAF(44)), // 52 
+	NODE(55, 54),   // 53 
+	NODE(LEAF(41), LEAF(42)), // 54 
+	NODE(LEAF(39), LEAF(40)), // 55 
+	NODE(LEAF(12), 57),  // 56 
+	NODE(58, LEAF(26)),  // 57 
+	NODE(LEAF(53), LEAF(54)), // 58 
+	NODE(70, 60),   // 59 
+	NODE(64, 61),   // 60 
+	NODE(62, LEAF(1)),   // 61 
+	NODE(LEAF(19), 63),  // 62 
+	NODE(LEAF(31), LEAF(32)), // 63 
+	NODE(68, 65),   // 64 
+	NODE(67, 66),   // 65 
+	NODE(LEAF(37), LEAF(38)), // 66 
+	NODE(LEAF(35), LEAF(36)), // 67 
+	NODE(LEAF(20), 69),  // 68 
+	NODE(LEAF(33), LEAF(34)), // 69 
+	NODE(74, 71),   // 70 
+	NODE(72, LEAF(13)),  // 71 
+	NODE(LEAF(23), 73),  // 72 
+	NODE(LEAF(47), LEAF(48)), // 73 
+	NODE(77, 75),   // 74 
+	NODE(76, LEAF(22)),  // 75 
+	NODE(LEAF(45), LEAF(46)), // 76 
+	NODE(79, 78),   // 77 
+	NODE(LEAF(29), LEAF(30)), // 78 
+	NODE(KOurEol, KBadRun), // 79 
+	NODE(86, 81),   // 80 
+	NODE(83, 82),   // 81 
+	NODE(LEAF(6), LEAF(7)),   // 82 
+	NODE(LEAF(5), 84),   // 83 
+	NODE(85, LEAF(64)),  // 84 
+	NODE(LEAF(14), LEAF(15)), // 85 
+	NODE(90, 87),   // 86 
+	NODE(88, LEAF(4)),   // 87 
+	NODE(LEAF(9), 89),   // 88 
+	NODE(LEAF(16), LEAF(17)), // 89 
+	NODE(LEAF(3), 91),   // 90 
+	NODE(LEAF(128), LEAF(8))  // 91 
+	} ;
+
+/**
+@internalComponent
+*/
+const TNode KBlackTree [] =
+	{
+	NODE(2, 1),     // 0 
+	NODE(LEAF(3), LEAF(2)),   // 1 
+	NODE(4, 3),     // 2 
+	NODE(LEAF(1), LEAF(4)),   // 3 
+	NODE(6, 5),     // 4 
+	NODE(LEAF(6), LEAF(5)),   // 5 
+	NODE(9, 7),     // 6 
+	NODE(8, LEAF(7)),    // 7 
+	NODE(LEAF(9), LEAF(8)),   // 8 
+	NODE(31, 10),   // 9 
+	NODE(30, 11),   // 10 
+	NODE(12, LEAF(12)),  // 11 
+	NODE(23, 13),   // 12 
+	NODE(17, 14),   // 13 
+	NODE(15, LEAF(0)),    // 14 
+	NODE(LEAF(21), 16),  // 15 
+	NODE(LEAF(42), LEAF(43)), // 16 
+	NODE(21, 18),   // 17 
+	NODE(20, 19),   // 18 
+	NODE(LEAF(38), LEAF(39)), // 19 
+	NODE(LEAF(36), LEAF(37)), // 20 
+	NODE(LEAF(20), 22),  // 21 
+	NODE(LEAF(34), LEAF(35)), // 22 
+	NODE(LEAF(15), 24),  // 23 
+	NODE(27, 25),   // 24 
+	NODE(26, LEAF(19)),  // 25 
+	NODE(LEAF(28), LEAF(29)), // 26 
+	NODE(29, 28),   // 27 
+	NODE(LEAF(26), LEAF(27)), // 28 
+	NODE(LEAF(128), LEAF(192)),     // 29 
+	NODE(LEAF(10), LEAF(11)), // 30 
+	NODE(57, 32),   // 31 
+	NODE(45, 33),   // 32 
+	NODE(34, LEAF(14)),  // 33 
+	NODE(41, 35),   // 34 
+	NODE(38, 36),   // 35 
+	NODE(37, LEAF(22)),  // 36 
+	NODE(LEAF(40), LEAF(41)), // 37 
+	NODE(40, 39),   // 38 
+	NODE(LEAF(32), LEAF(33)), // 39 
+	NODE(LEAF(30), LEAF(31)), // 40 
+	NODE(LEAF(17), 42),  // 41 
+	NODE(44, 43),   // 42 
+	NODE(LEAF(62), LEAF(63)), // 43 
+	NODE(LEAF(48), LEAF(49)), // 44 
+	NODE(LEAF(13), 46),  // 45 
+	NODE(51, 47),   // 46 
+	NODE(48, LEAF(16)),  // 47 
+	NODE(50, 49),   // 48 
+	NODE(LEAF(61), LEAF(256)),// 49 
+	NODE(LEAF(57), LEAF(58)), // 50 
+	NODE(55, 52),   // 51 
+	NODE(54, 53),   // 52 
+	NODE(LEAF(46), LEAF(47)), // 53 
+	NODE(LEAF(44), LEAF(45)), // 54 
+	NODE(LEAF(23), 56),  // 55 
+	NODE(LEAF(50), LEAF(51)), // 56 
+	NODE(KOurEol, 58),     // 57 
+	NODE(75, 59),   // 58 
+	NODE(67, 60),   // 59 
+	NODE(61, LEAF(64)),  // 60 
+	NODE(65, 62),   // 61 
+	NODE(64, 63),   // 62 
+	NODE(LEAF(1152), LEAF(1216)),   // 63 
+	NODE(LEAF(1024), LEAF(1088)),   // 64 
+	NODE(LEAF(54), 66),  // 65 
+	NODE(LEAF(896), LEAF(960)),     // 66 
+	NODE(72, 68),   // 67 
+	NODE(71, 69),   // 68 
+	NODE(70, LEAF(53)),  // 69 
+	NODE(LEAF(512), LEAF(576)),     // 70 
+	NODE(LEAF(384), LEAF(448)),     // 71 
+	NODE(LEAF(25), 73),  // 72 
+	NODE(74, LEAF(320)), // 73 
+	NODE(LEAF(1664), LEAF(1728)),   // 74 
+	NODE(85, 76),   // 75 
+	NODE(80, 77),   // 76 
+	NODE(78, LEAF(24)),  // 77 
+	NODE(LEAF(60), 79),  // 78 
+	NODE(LEAF(1536), LEAF(1600)),   // 79 
+	NODE(83, 81),   // 80 
+	NODE(82, LEAF(59)),  // 81 
+	NODE(LEAF(1408), LEAF(1472)),   // 82 
+	NODE(LEAF(56), 84),  // 83 
+	NODE(LEAF(1280), LEAF(1344)),   // 84 
+	NODE(LEAF(18), 86),  // 85 
+	NODE(89, 87),   // 86 
+	NODE(88, LEAF(55)),  // 87 
+	NODE(LEAF(768), LEAF(832)),     // 88 
+	NODE(LEAF(52), 90),  // 89 
+	NODE(LEAF(640), LEAF(704))// 90 
+	};
+
+/**
+@internalComponent
+*/
+const TNode KTwoTree [] =
+    {
+    NODE(1, KVtMode0),         // 0
+    NODE(2, 3),                // 1
+    NODE(4, KHorzMode),        // 2
+    NODE(KVtMode1n, KVtMode1p),// 3
+    NODE(5, KPassMode),        // 4
+    NODE(6, 7),                // 5
+    NODE(8, 9),                // 6
+    NODE(KVtMode2n, KVtMode2p),// 7
+    NODE(KOurEol, KBadRun),    // 8
+    NODE(KVtMode3n, KVtMode3p) // 9
+    };
+
+/**
+@internalComponent
+*/
+const TNode KSynchTree[]=
+	{
+	NODE(0,KStd1D)		// any number of 0's followed by a 1
+	};
+
+/**
+@internalComponent
+*/
+const TNode KTagTree[]=
+	{
+	NODE(0,1),
+	NODE(KTag2D,KTag1D)
+	};
+
+#endif // __FAXUHUFF_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/faxstrm/FAXSTORE.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,250 @@
+// 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
+ @publishedPartner
+*/
+
+#if !defined(__FAXSTORE_H__)
+#define __FAXSTORE_H__
+
+#include <faxdefn.h>
+#include <cfaxio.h>
+
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <faxpageinfo.h>
+#endif
+
+class TFaxBandHeader;
+class CFaxPageInfo;
+class CFaxPages;
+
+/**
+Adds pages to a fax file.
+
+The class is used by first calling StartPage() to define the compression and 
+resolution of the fax page, and then calling AddEncodedScanLineL() or AddScanLineL() 
+to add each of the page's encoded or raw scan lines. When the page is complete, 
+the EndPage() function adds the scan line compression, scan line resolution, 
+and sender Id information to the store. 
+
+In pre-v5.1 releases of Symbian OS, the import library was faxst2.lib. 
+
+@publishedPartner
+@released
+*/
+class CWriteFaxPages : public CBase
+	{
+protected:
+	CWriteFaxPages(CStreamStore& aStore,TInt aMaxScanLinesInBand);
+	void ConstructL();
+	TBool BandCompleted();
+public:
+	IMPORT_C static CWriteFaxPages* NewL(CStreamStore& aStore,TInt aMaxScanLinesInBand=0);
+	IMPORT_C ~CWriteFaxPages();
+	IMPORT_C void StartPage(TFaxResolution aResolution, TFaxCompression aCompression, TInt aFlag2 = 0);
+	IMPORT_C void EndPageL(TFaxResolution aResolution, TFaxBufSenderId& aSenderId, TFaxCompression aCompression = EModifiedHuffman, TInt aFlag2 = 0);
+	IMPORT_C void AddScanLineL(const TDesC8& aScanline);
+	IMPORT_C void AddEncodedScanLineL(const TDesC8& anEncodedScanLine);
+	IMPORT_C TStreamId CommitPageL();
+private:
+	TInt iMaxScanLinesInBand;
+	CFaxPages* iFaxPages;
+	CFaxPageInfo* iCurrentPage;
+	CStreamStore* iStore;
+	CFaxT4* iFaxT4;
+	RStoreWriteStream iWriteStream;
+	TBuf8<KFaxT4MaxDesLength> iEncodedScanLine;
+	};
+
+/**
+Creates and open a fax file for writing.
+
+The class provides the functionality to create a fax file, to commit pages 
+to the fax file, to abort and delete the file, and to close the file. The 
+ability to add individual fax pages to the store is provided through the CWriteFaxPages 
+data member, which is created when the file is opened.
+
+In pre-v5.1 releases of Symbian OS, the import library was faxst2.lib. 
+
+@publishedPartner
+@released
+*/
+class CWriteFaxFile : public CBase
+	{
+protected:
+	CWriteFaxFile();
+	void ConstructL();
+	void DoOpenL(TInt aMaxScanLinesInBand);
+public:
+	IMPORT_C static CWriteFaxFile* NewL();  
+	IMPORT_C ~CWriteFaxFile();
+	IMPORT_C void OpenL(const TDesC& aFileName,TInt aMaxScanLinesInBand);
+	IMPORT_C void CommitL();	
+	IMPORT_C void Close();	
+	IMPORT_C void AbortWrite();	 // deletes file, called by OpenL() and CloseL() if they leave
+private:
+	TFileName iFileName;
+	RFs iFs;
+	CDirectFileStore* iFileStore;
+public:
+	/** A pointer to the object which can be used to add pages to the file. Memory 
+	is allocated for the object when the file is opened. */
+	CWriteFaxPages* iWriteFaxPages;
+	};
+
+/**
+Fax page information read from a file.
+
+Stores fax page information which is read from a fax file - see CReadFaxPages::CurrentPageInfo().
+
+@publishedPartner
+@released 
+*/
+class TFaxPageInfo
+	{
+public:
+	/** The number of scan lines. */
+	TInt iNumScanLines;
+	/** The fax page resolution. */
+	TFaxResolution iResolution;
+	/** The sender Id. */
+	TFaxBufSenderId iSenderId;
+	/** The fax page encoding. */
+    TFaxCompression iCompression; // was TInt iReservedFlag1 up to faxstore 013
+	TInt iReservedFlag2;
+	};
+
+/**
+Reads individual pages from a fax file.
+
+The class provides functions to get the number of fax pages in a fax store, 
+the number of scan lines per page, information about the scan line compression 
+and resolution, and the sender Id. It is then possible to iterate through 
+the store by page and by scan line to obtain the fax page.
+
+In pre-v5.1 releases of Symbian OS, the import library was faxst2.lib. 
+
+@publishedPartner
+@released
+*/
+class CReadFaxPages : public CBase
+	{
+protected:
+	CReadFaxPages(CStreamStore& aStore);
+	void ConstructL(TStreamId aStreamId);
+public:
+	IMPORT_C static CReadFaxPages* NewL(CStreamStore& aStore,TStreamId aStreamId);
+	IMPORT_C ~CReadFaxPages();
+	IMPORT_C TInt NumPages() const;
+	IMPORT_C void SetPageL(TInt aNum);
+	IMPORT_C TFaxPageInfo CurrentPageInfo() const;
+	IMPORT_C void SeekScanLineL(TInt anIndex);
+	IMPORT_C TInt GetScanLineL(TDes8& aScanLine);
+	IMPORT_C void GetEncodedScanLineL(TDes8& anEncodedScanLine);
+protected:
+	void SetBandL(TInt anIndex);
+private:
+	TInt iBandIndex;
+	TInt iScanLineOffset;
+	CFaxPages* iFaxPages;
+	CFaxPageInfo* iCurrentPage;
+	CStreamStore* iStore;
+	CFaxT4* iFaxT4;
+	RStoreReadStream iReadStream;
+	TBuf8<KFaxT4MaxDesLength> iEncodedScanLine;
+	};
+
+/**
+Opens a fax file for reading.
+
+The class provides the functionality to open and close a fax file. The ability 
+to read individual fax pages is provided by the CReadFaxPages data member, 
+which is created when the file is opened.
+
+In pre-v5.1 versions of Symbian OS, the import library was faxst2.lib. 
+
+@publishedPartner
+@released
+*/
+class CReadFaxFile : public CBase
+	{
+protected:
+	CReadFaxFile();
+	void ConstructL();
+	void DoOpenL(const TDesC& aFileName);
+public:
+	IMPORT_C static CReadFaxFile* NewL();
+	IMPORT_C ~CReadFaxFile();
+	IMPORT_C void OpenL(const TDesC& aFileName);
+	IMPORT_C void Close();
+private:
+	RFs iFs;
+	CDirectFileStore* iFileStore;
+public:
+	/** A pointer to the object which can be used to access the fax pages stored in 
+	the file. Memory is allocated for the object when the fax file is opened. */
+	CReadFaxPages* iReadFaxPages;
+	};
+
+// now the TFaxHeaderInfo and CFaxHeaderLines classes
+// for saving/restoring fax headers
+// used by fax client and fax server
+/*
+class TFaxHeaderInfo
+	{
+public:
+	TInt iHeaderFontWidthInBytes;	// width of font in bytes
+	TInt iHeaderFontHeightInLines;// height of font in lines
+	TInt iOffsetToDay;            // offset to two digit day of month
+	TInt iOffsetToMonth;          // offset to two digits month of year
+	TInt iOffsetToYear;           // offset to four digits year
+	TInt iOffsetToHour;           // offset to two digits hour (24 hour clock) 
+	TInt iOffsetToMinute;         // offset to two digits minute
+	TInt iOffsetToTotalPages;     // offset to two digits for total pages
+	TInt iOffsetToCurrentPage;    // offset to two digits for current page
+	};
+
+typedef TPckgBuf < TFaxHeaderInfo > TFaxHeaderInfoPckg;
+
+class CFaxHeaderLines : public CBase
+	{
+public:
+	IMPORT_C static CFaxHeaderLines * NewL();
+	IMPORT_C static CFaxHeaderLines * NewLC();
+	~CFaxHeaderLines ();
+
+	IMPORT_C void WriteRawFontLineL (const TInt alineNumber,TRawScanLine & aUncompressedDataLine);
+	IMPORT_C void WriteRawHeaderLineL (const TInt alineNumber,TRawScanLine & aUncompressedDataLine);
+	IMPORT_C void WriteFaxHeaderInfoL (TFaxHeaderInfo & aFaxHeaderInfo);
+	IMPORT_C void ReadRawFontLineL (const TInt alineNumber,TRawScanLine & aUncompressedDataLine);
+	IMPORT_C void ReadRawHeaderLineL (const TInt alineNumber,TRawScanLine & aUncompressedDataLine);
+	IMPORT_C void ReadFaxHeaderInfoL (TFaxHeaderInfo & aFaxHeaderInfo);
+
+protected:
+	void ConstructL();
+
+private:
+	RFs iFileSession;
+	RFile iFile;
+	TInt iSeekpos;
+	TInt iLineNumber;
+
+public:
+	TFaxHeaderInfoPckg iOurFaxHeaderInfoPckg;
+	};*/
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/faxstrm/FAXSTPAN.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,45 @@
+// 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
+*/
+
+#if !defined(__FAXSTPAN_H__)
+#define __FAXSTPAN_H__
+#if !defined(__E32STD_H__)
+#include <e32std.h>
+#endif
+
+/**
+@internalComponent
+*/
+enum TFaxStorePanic
+	{
+	EFaxScanLineIndexOutOfRange,
+	EFaxBandIndexOutOfRange,
+	EFaxPageIndexOutOfRange,
+	EFaxDecodeScanlineAlignment,
+	EFaxEncodeScanlineAlignment,
+	EFaxUnsupportedCompression
+	};
+
+/**
+@publishedPartner
+*/
+GLREF_C void Panic(TFaxStorePanic aPanic);
+
+#endif // __FAXSTPAN_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/faxstrm/FAXSTRM.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,666 @@
+// 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:
+//
+
+#include <e32std.h>
+#include <e32base.h>
+#include <f32file.h>
+
+#include <s32file.h>
+#include <s32mem.h>
+#include "FAXSTPAN.H"
+
+#include "FAXSTORE.H"
+#include "faxpageinfo.h"
+
+
+GLDEF_C void Panic (TFaxStorePanic aPanic)
+// Panic the process with ETEXT as the category.
+ //
+
+{
+	User::Panic (_L ("FaxStrm"), aPanic);
+}
+
+// END OF COPIED
+
+EXPORT_C TFaxBandHeader::TFaxBandHeader ():
+ iNumScanLines (0),
+ iStreamId (KNullStreamId)
+/**
+@capability None
+*/
+{
+}
+
+EXPORT_C TFaxBandHeader::TFaxBandHeader (TStreamId aStreamId):
+ iNumScanLines (0),
+ iStreamId (aStreamId)
+/**
+@capability None
+*/
+{
+}
+
+EXPORT_C void TFaxBandHeader::InternalizeL (RReadStream & aStream)
+/**
+@capability None
+*/
+{
+	iNumScanLines = aStream.ReadInt32L ();
+	aStream >> iStreamId;
+}
+
+EXPORT_C void TFaxBandHeader::ExternalizeL (RWriteStream & aStream) const
+/**
+@capability None
+*/
+{
+	aStream.WriteInt32L (iNumScanLines);
+	aStream << iStreamId;
+}
+
+CFaxPageInfo::CFaxPageInfo ():
+iResolution (EFaxNormal)
+{
+	__DECLARE_NAME (_S ("CFaxPageInfo"));
+}
+
+EXPORT_C CFaxPageInfo *CFaxPageInfo::NewL ()
+/**
+@capability None
+*/
+{
+	CFaxPageInfo *pageinfo = new (ELeave) CFaxPageInfo ();
+	CleanupStack::PushL (pageinfo);
+	pageinfo->iBandHeaderList = new (ELeave) CArrayFixFlat < TFaxBandHeader > (8);
+	CleanupStack::Pop ();
+	return pageinfo;
+}
+
+EXPORT_C CFaxPageInfo::~CFaxPageInfo ()
+{
+	delete iBandHeaderList;
+}
+
+EXPORT_C void CFaxPageInfo::InternalizeL (RReadStream & aStream)
+/**
+@capability None
+*/
+{
+	iResolution = (TFaxResolution) aStream.ReadInt8L ();
+	aStream >> *iBandHeaderList;
+	aStream >> iSenderId;
+	iCompression = (TFaxCompression) aStream.ReadInt32L ();
+	iReservedFlag2 = aStream.ReadInt32L ();
+}
+
+EXPORT_C void CFaxPageInfo::ExternalizeL (RWriteStream & aStream) const
+/**
+@capability None
+*/
+{
+	aStream.WriteInt8L ((TInt8) iResolution);
+	aStream << *iBandHeaderList;
+	aStream << iSenderId;
+	aStream.WriteInt32L (iCompression);
+	aStream.WriteInt32L (iReservedFlag2);
+}
+/********************************************************************/
+
+CFaxPages::CFaxPages ()
+{
+	__DECLARE_NAME (_S ("CFaxPages"));
+}
+
+EXPORT_C CFaxPages *CFaxPages::NewL ()
+/**
+@capability None
+*/
+{
+	CFaxPages *faxpages = new (ELeave) CFaxPages ();
+	CleanupStack::PushL (faxpages);
+	faxpages->iPageStreamIdList = new (ELeave) CArrayFixFlat < TStreamId > (8);
+	CleanupStack::Pop ();
+	return faxpages;
+}
+
+EXPORT_C CFaxPages::~CFaxPages ()
+{
+	delete iPageStreamIdList;
+}
+
+EXPORT_C void CFaxPages::InternalizeL (RReadStream & aStream)
+/**
+@capability None
+*/
+{
+	aStream >> *iPageStreamIdList;
+}
+
+EXPORT_C void CFaxPages::ExternalizeL (RWriteStream & aStream) const
+/**
+@capability None
+*/
+{
+	aStream << *iPageStreamIdList;
+}
+/********************************************************************/
+
+CWriteFaxPages::CWriteFaxPages (CStreamStore & aStore, TInt aMaxScanLinesInBand):
+iMaxScanLinesInBand (aMaxScanLinesInBand ? aMaxScanLinesInBand : 64),
+iStore (&aStore)
+{
+	__DECLARE_NAME (_S ("CWriteFaxPages"));
+}
+
+void CWriteFaxPages::ConstructL ()
+{
+	iFaxPages = CFaxPages::NewL ();
+	iCurrentPage = CFaxPageInfo::NewL ();
+	iFaxT4 = CFaxT4::NewL ();
+}
+
+TBool CWriteFaxPages::BandCompleted ()
+{
+	TInt count = iCurrentPage->iBandHeaderList->Count ();
+	return (!count) || ((*iCurrentPage->iBandHeaderList)[count - 1].iNumScanLines == iMaxScanLinesInBand);
+}
+
+EXPORT_C CWriteFaxPages *CWriteFaxPages::NewL (CStreamStore & aStore, TInt aMaxScanLinesInBand)
+/** Creates a CWriteFaxPages object, which offers the public API for writing fax 
+pages to a stream store. 
+
+This function is called by CWriteFaxFile as part of creating a fax file.
+
+@param aStore The store to which fax pages are to be added. 
+@param aMaxScanLinesInBand The maximum number of scan lines in a band. Faxes 
+pages are stored in bands - to speed up display time. It is recommended 
+that developers use 64 - the value used by CWriteFaxFile. 
+@leave KErrNoMemory There is insufficient memory to perform the operation.
+@return A pointer to the newly created object. 
+@capability None
+*/
+{
+	CWriteFaxPages *writefaxpages = new (ELeave) CWriteFaxPages (aStore, aMaxScanLinesInBand);
+	CleanupStack::PushL (writefaxpages);
+	writefaxpages->ConstructL ();
+	CleanupStack::Pop ();
+	return writefaxpages;
+}
+
+EXPORT_C CWriteFaxPages::~CWriteFaxPages ()
+/** Destructor.
+
+Closes the write stream, and frees all resources owned by the object, prior 
+to its destruction. */
+{
+	iWriteStream.Close ();
+	delete iFaxT4;
+	delete iFaxPages;
+	delete iCurrentPage;
+}
+
+EXPORT_C void CWriteFaxPages::StartPage (TFaxResolution aResolution, TFaxCompression aCompression, TInt aFlag2)
+/**
+Initialize fax page, set page parameters.
+
+@param   aResolution     defines fax resolution
+@param   aCompression    defines fax compression
+@param   aFlag2          reserved flag.
+@capability None
+*/
+{
+	iFaxT4->PageInitialize (aResolution, aCompression, aFlag2);
+}
+
+EXPORT_C void CWriteFaxPages::EndPageL (TFaxResolution aResolution, TFaxBufSenderId & aSenderId, TFaxCompression aCompression, TInt aFlag2)
+/**
+Sets parameters for the current page, writes it to the stream and appends to the fax pages set.
+   
+@param   aResolution     defines fax resolution
+@param   aSenderId       Sender Id.
+@param   aCompression    defines fax compression
+@param   aFlag2          reserved flag.
+@capability None
+*/
+{
+	if (!BandCompleted ())
+		{
+		iWriteStream.CommitL ();
+		iWriteStream.Close ();
+		}
+	iCurrentPage->iResolution = aResolution;
+	iCurrentPage->iSenderId = aSenderId;
+	iCurrentPage->iCompression = aCompression;
+	iCurrentPage->iReservedFlag2 = aFlag2;
+	TStreamId streamid = iWriteStream.CreateL (*iStore);
+	iWriteStream << *iCurrentPage;
+	iWriteStream.CommitL ();
+	iWriteStream.Close ();
+	iFaxPages->iPageStreamIdList->AppendL (streamid);
+	iCurrentPage->iBandHeaderList->Reset ();
+}
+
+EXPORT_C TStreamId CWriteFaxPages::CommitPageL ()
+/**
+Place FaxPages into write stream.
+
+@return Stream Id.
+@capability None
+*/
+{
+	TStreamId streamid = iWriteStream.CreateL (*iStore);
+	iWriteStream << *iFaxPages;
+	iWriteStream.CommitL ();
+	iWriteStream.Close ();
+	iStore->CommitL ();
+	return streamid;
+}
+
+EXPORT_C void CWriteFaxPages::AddScanLineL (const TDesC8 & aScanLine)
+/** Adds raw scan lines to the write stream.
+	
+The function first encodes the scan line, using the format specified in the 
+StartPage() function, and then adds it to the write stream.
+	
+@param aScanline The current raw scan line. 
+@capability None
+*/
+{
+	iFaxT4->EncodeScanLine (aScanLine, iEncodedScanLine);
+	AddEncodedScanLineL (iEncodedScanLine);
+}
+
+EXPORT_C void CWriteFaxPages::AddEncodedScanLineL (const TDesC8 & anEncodedScanLine)
+/** Adds encoded scan lines to the write stream.
+
+@param anEncodedScanLine The encoded scan line (MH or MR). 
+@capability None
+*/
+{
+	if (BandCompleted ())
+		{
+		TStreamId streamid = iWriteStream.CreateL (*iStore);
+		iCurrentPage->iBandHeaderList->AppendL (TFaxBandHeader (streamid));
+		}
+
+	TInt count = iCurrentPage->iBandHeaderList->Count ();
+	TFaxBandHeader *bandheader = &(*iCurrentPage->iBandHeaderList)[count - 1];
+	iWriteStream << anEncodedScanLine;
+	bandheader->iNumScanLines++;
+	bandheader->iNumBytes += anEncodedScanLine.Length ();
+
+	if (BandCompleted ())
+		{
+		iWriteStream.CommitL ();
+		iWriteStream.Close ();
+		}
+}
+ /********************************************************************/
+
+CWriteFaxFile::CWriteFaxFile ()
+{
+	__DECLARE_NAME (_S ("CWriteFaxFile"));
+}
+
+void CWriteFaxFile::ConstructL ()
+{
+	User::LeaveIfError (iFs.Connect ());
+}
+
+const TUid KUidPsiFaxApp = {268435908};
+
+void CWriteFaxFile::DoOpenL (TInt aMaxScanLinesInBand)
+{
+	iFileStore = CDirectFileStore::ReplaceL (iFs, iFileName, EFileWrite);
+	TUidType type (KDirectFileStoreLayoutUid, TUid::Uid (KFaxFileStoreUidVal), KUidPsiFaxApp);
+	iFileStore->SetTypeL (type);
+	iWriteFaxPages = CWriteFaxPages::NewL (*iFileStore, aMaxScanLinesInBand);
+}
+
+EXPORT_C CWriteFaxFile *CWriteFaxFile::NewL ()
+/** Constructs a CWriteFaxFile object, which offers the public API for creating 
+a fax store file.
+
+As part of the construction process, the object opens a session with the file 
+server.
+
+@return A pointer to the newly created object. 
+@capability None
+*/
+{
+	CWriteFaxFile *writefaxfile = new (ELeave) CWriteFaxFile;
+	CleanupStack::PushL (writefaxfile);
+	writefaxfile->ConstructL ();
+	CleanupStack::Pop ();
+	return writefaxfile;
+}
+
+EXPORT_C CWriteFaxFile::~CWriteFaxFile ()
+/** Destructor.
+
+Closes the session with the file server, and frees all resources owned by 
+the object, prior to its destruction. */
+{
+	Close ();
+	iFs.Close ();
+}
+
+LOCAL_C void DoAbort (TAny * aPtr)
+{
+	((CWriteFaxFile *) aPtr)->AbortWrite ();
+}
+
+EXPORT_C void CWriteFaxFile::OpenL (const TDesC & aFileName, TInt aMaxScanLinesInBand)
+/** Creates and opens a fax file for writing.
+
+The function also allocates memory to create a CWriteFaxPages object which 
+is pointed to by the class data member. This object defines the API for writing 
+pages to the file store.
+
+Fax files which have been opened should be paired with a Close() function.
+
+@param aFileName The name of the new fax file. 
+@param aMaxScanLinesInBand The maximum number of scan lines in a band. Fax 
+pages are stored in bands for quick retrieval/display. If zero is passed then 
+it will default to 64 otherwise the passed value will take effect. 
+@capability None
+*/
+{
+
+	iFileName = aFileName;
+	CleanupStack::PushL (TCleanupItem (DoAbort, this));
+	DoOpenL (aMaxScanLinesInBand);
+	CleanupStack::Pop ();
+}
+
+
+EXPORT_C void CWriteFaxFile::CommitL ()
+/** Commits the current fax page created using the CWriteFaxPages API  to 
+the fax file.
+
+Committing a page writes it to the fax file, rather than storing it in temporary 
+memory. The function should be called after each page is added, to ensure 
+that only one fax page can be lost if there is an out of memory error. 
+@capability None
+*/
+{
+	TStreamId streamid = iWriteFaxPages->CommitPageL ();
+	iFileStore->SetRootL (streamid);
+	iFileStore->CommitL ();
+}
+
+
+EXPORT_C void CWriteFaxFile::Close ()
+/** Closes the fax file, and deletes the resources owned by the object. 
+
+Although this function is called in the destructor, it is good programming 
+practice to invoke it manually to pair previous OpenL() calls. 
+@capability None
+*/
+{
+	delete iWriteFaxPages;
+	iWriteFaxPages = NULL;
+	delete iFileStore;
+	iFileStore = NULL;
+}
+
+EXPORT_C void CWriteFaxFile::AbortWrite ()
+/** Aborts the creation of the fax store file, and then deletes the file. 
+
+It can be called by developer programs, and is called automatically if OpenL() 
+leaves. 
+@capability None
+*/
+{
+	Close ();
+	iFs.Delete (iFileName);
+}
+/********************************************************************/
+
+CReadFaxPages::CReadFaxPages (CStreamStore & aStore):
+iStore (&aStore)
+{
+	__DECLARE_NAME (_S ("CReadFaxPages"));
+}
+
+void CReadFaxPages::ConstructL (TStreamId aStreamId)
+{
+	iFaxPages = CFaxPages::NewL ();
+	iCurrentPage = CFaxPageInfo::NewL ();
+	iFaxT4 = CFaxT4::NewL ();
+	iReadStream.OpenL (*iStore, aStreamId);
+	iReadStream >> *iFaxPages;
+	iReadStream.Close ();
+	SetPageL (0);
+}
+
+EXPORT_C CReadFaxPages *CReadFaxPages::NewL (CStreamStore & aStore, TStreamId aStreamId)
+/** Creates a CReadFaxPages object, which offers the public API for reading fax 
+pages from a stream store. 
+
+This function is called by CReadFaxFile when opening a fax file.
+
+@param aStore The store from which fax pages are to be read. 
+@param aStreamId The root ID of the stream store. 
+@leave KErrNoMemory There is insufficient memory to perform the operation. 
+@return A pointer to the newly created object. 
+@capability None
+*/
+{
+	CReadFaxPages *readfaxpages = new (ELeave) CReadFaxPages (aStore);
+	CleanupStack::PushL (readfaxpages);
+	readfaxpages->ConstructL (aStreamId);
+	CleanupStack::Pop ();
+	return readfaxpages;
+}
+
+EXPORT_C CReadFaxPages::~CReadFaxPages ()
+/** Destructor.
+
+Closes the stream, and frees all resources owned by the object, prior to its 
+destruction. */
+{
+	iReadStream.Close ();
+	delete iFaxT4;
+	delete iFaxPages;
+	delete iCurrentPage;
+}
+
+EXPORT_C TInt CReadFaxPages::NumPages () const
+/** Gets the number of pages in the store.
+
+@return The number of fax pages in the store. 
+@capability None
+*/
+{
+	return iFaxPages->iPageStreamIdList->Count ();
+}
+
+EXPORT_C void CReadFaxPages::SetPageL (TInt aNum)
+/** Sets a selected page to be the current page, and resets the current scan line 
+to the first scan line in the page.
+
+@param aNum The number of the new page. 
+@capability None
+*/
+{
+	__ASSERT_DEBUG ((aNum >= 0) && (aNum < iFaxPages->iPageStreamIdList->Count ()), Panic (EFaxPageIndexOutOfRange));
+	iReadStream.Close ();
+	iReadStream.OpenL (*iStore, (*iFaxPages->iPageStreamIdList)[aNum]);
+	iReadStream >> *iCurrentPage;
+	iReadStream.Close ();
+	iFaxT4->PageInitialize (iCurrentPage->iResolution, iCurrentPage->iCompression, iCurrentPage->iReservedFlag2);
+	SeekScanLineL (0);
+}
+
+EXPORT_C TFaxPageInfo CReadFaxPages::CurrentPageInfo () const
+/** Gets the information for the current fax page, where the current page was set 
+in a previous call to the SetPageL() function.
+
+@return The information for the current fax page 
+@capability None
+*/
+{
+	TFaxPageInfo info;
+	info.iResolution = iCurrentPage->iResolution;
+	info.iSenderId = iCurrentPage->iSenderId;
+	info.iCompression = iCurrentPage->iCompression;
+	info.iReservedFlag2 = iCurrentPage->iReservedFlag2;
+	info.iNumScanLines = 0;
+	TInt count = iCurrentPage->iBandHeaderList->Count ();
+	for (TInt i = 0; i < count; i++)
+		info.iNumScanLines += (*iCurrentPage->iBandHeaderList)[i].iNumScanLines;
+	return info;
+}
+
+EXPORT_C void CReadFaxPages::SeekScanLineL (TInt anIndex)
+/** Sets the specified scan line as the current scan line. 
+
+@param anIndex The index of the scan line. 
+@capability None
+*/
+{
+	__ASSERT_DEBUG ((anIndex >= 0) && (anIndex < CurrentPageInfo ().iNumScanLines), Panic (EFaxScanLineIndexOutOfRange));
+	TInt numscanlines = 0;
+	TInt count = iCurrentPage->iBandHeaderList->Count ();
+	for (iBandIndex = 0; (iBandIndex < count) && ((numscanlines + (*iCurrentPage->iBandHeaderList)[iBandIndex].iNumScanLines) <= anIndex); iBandIndex++)
+		numscanlines += (*iCurrentPage->iBandHeaderList)[iBandIndex].iNumScanLines;
+
+	SetBandL (iBandIndex);
+	TBuf8 < KFaxT4MaxDesLength > encodedscanline;
+	for (iScanLineOffset = 0; iScanLineOffset < (anIndex - numscanlines);)
+	GetEncodedScanLineL (encodedscanline);
+}
+
+EXPORT_C TInt CReadFaxPages::GetScanLineL (TDes8 & aScanLine)
+/** Gets the raw scan line specified in a previous call to the SeekScanLineL() 
+function. 
+
+The scan line is stored in compressed form, but is retrieved by this function 
+in raw form for viewing.
+
+@param aScanLine On return, contains the scan line. 
+@return KErrNone if successful, otherwise another of the system-wide error 
+codes. 
+@capability None
+*/
+{
+	GetEncodedScanLineL (iEncodedScanLine);
+	return iFaxT4->DecodeScanLine (aScanLine, iEncodedScanLine);
+}
+
+EXPORT_C void CReadFaxPages::GetEncodedScanLineL (TDes8 & anEncodedScanLine)
+/** Gets the encoded scan line specified in a previous call to the SeekScanLineL() 
+function.
+
+@param anEncodedScanLine On return, contains the encoded scan line. 
+@capability None
+*/
+{
+	if (iScanLineOffset == (*iCurrentPage->iBandHeaderList)[iBandIndex].iNumScanLines)
+		SetBandL (iBandIndex + 1);
+	iReadStream >> anEncodedScanLine;
+	iScanLineOffset++;
+}
+
+void CReadFaxPages::SetBandL (TInt anIndex)
+{
+	__ASSERT_DEBUG ((anIndex >= 0) && (anIndex < iCurrentPage->iBandHeaderList->Count ()), Panic (EFaxBandIndexOutOfRange));
+	iBandIndex = anIndex;
+	iReadStream.Close ();
+	iReadStream.OpenL (*iStore, (*iCurrentPage->iBandHeaderList)[iBandIndex].iStreamId);
+	iScanLineOffset = 0;
+}
+ /********************************************************************/
+
+CReadFaxFile::CReadFaxFile ()
+{
+	__DECLARE_NAME (_S ("CReadFaxFile"));
+}
+
+void CReadFaxFile::ConstructL ()
+{
+	User::LeaveIfError (iFs.Connect ());
+}
+
+void CReadFaxFile::DoOpenL (const TDesC & aFileName)
+{
+	iFileStore = CDirectFileStore::OpenL (iFs, aFileName, EFileStream | EFileRead | EFileShareReadersOnly);
+	if (iFileStore->Type ()[1] != TUid::Uid (KFaxFileStoreUidVal))
+		User::Leave (KErrNotSupported);
+	TStreamId streamid = iFileStore->Root ();
+	iReadFaxPages = CReadFaxPages::NewL (*iFileStore, streamid);
+}
+
+EXPORT_C CReadFaxFile *CReadFaxFile::NewL ()
+/** Constructs a CReadFaxFile object, which offers the public API for opening a 
+fax file for reading. 
+
+As part of the construction process, the object starts a session with the 
+file server.
+
+@return A pointer to the newly created object. 
+@capability None
+*/
+{
+	CReadFaxFile *readfaxfile = new (ELeave) CReadFaxFile;
+	CleanupStack::PushL (readfaxfile);
+	readfaxfile->ConstructL ();
+	CleanupStack::Pop ();
+	return readfaxfile;
+}
+
+EXPORT_C CReadFaxFile::~CReadFaxFile ()
+/** Destructor.
+
+Closes the session with the file server, and frees all resources owned by 
+the object, prior to its destruction. */
+{
+	Close ();
+	iFs.Close ();
+}
+
+EXPORT_C void CReadFaxFile::OpenL (const TDesC & aFileName)
+/** Opens a fax file for reading. 
+
+The function also allocates memory to create a CReadFaxPages object - which 
+is pointed to by the iReadFaxPages class data member. This class defines the 
+API for reading individual pages from the file store.
+
+Fax files which have been opened should be paired with a Close() function.
+
+@param aFileName The name of the fax file. 
+@capability None
+*/
+{
+	CleanupClosePushL (*this);
+	DoOpenL (aFileName);
+	CleanupStack::Pop ();
+}
+
+EXPORT_C void CReadFaxFile::Close ()
+/** Closes the fax file, and deletes the resources owned by the object. 
+
+Although this function is called in the destructor, it is good programming 
+practice to invoke it manually to pair previous OpenL() calls. 
+@capability None
+*/
+	{
+	delete iReadFaxPages;
+	iReadFaxPages = NULL;
+	delete iFileStore;
+	iFileStore = NULL;
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fax/faxclientandserver/faxstrm/faxpageinfo.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,83 @@
+// 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
+ @internalTechnology
+ @released
+*/
+
+#if !defined(__FAXPAGEINFO_H__)
+#define __FAXPAGEINFO_H__
+
+/********************************************************************/
+
+/**
+@internalTechnology
+*/
+class TFaxBandHeader
+	{
+public:
+	IMPORT_C TFaxBandHeader();
+	IMPORT_C TFaxBandHeader(TStreamId aStreamId);
+	IMPORT_C void InternalizeL(RReadStream& aStream);
+	IMPORT_C void ExternalizeL(RWriteStream& aStream) const;
+
+public:
+	TInt iNumScanLines;
+	TInt iNumBytes;
+	TStreamId iStreamId;
+	};
+
+/**
+@internalTechnology
+*/
+class CFaxPageInfo : public CBase
+	{
+protected:
+	CFaxPageInfo();
+public:
+	IMPORT_C static CFaxPageInfo* NewL();
+	IMPORT_C ~CFaxPageInfo();
+	IMPORT_C void InternalizeL(RReadStream& aStream);
+	IMPORT_C void ExternalizeL(RWriteStream& aStream) const;
+public:
+	TFaxResolution iResolution;
+	TFaxCompression iCompression; // was TInt iReservedFlag1 up to faxstore 013
+	TInt iReservedFlag2;
+	TFaxBufSenderId iSenderId;
+	CArrayFixFlat<TFaxBandHeader>* iBandHeaderList;
+	};
+
+/**
+@internalTechnology
+*/
+class CFaxPages	: public CBase
+	{
+protected:
+	CFaxPages();
+public:
+	IMPORT_C static CFaxPages* NewL();
+	IMPORT_C ~CFaxPages();
+	IMPORT_C void InternalizeL(RReadStream& aStream);
+	IMPORT_C void ExternalizeL(RWriteStream& aStream) const;
+public:
+	CArrayFixFlat<TStreamId>* iPageStreamIdList;
+	};
+
+/********************************************************************/
+#endif // __FAXPAGEINFO_H__

--- a/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "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 all project in cellularsrv subsystem 
-*
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-
-#include "../basebandabstraction/basebandchanneladaptor/group/bld.inf"
-#include "../basebandadaptationplugins/basebandchanneladaptorforc32/group/bld.inf"
-#include "../smsprotocols/smsstack/group/bld.inf"
-#include "../telephonyprotocols/csdagt/group/bld.inf"
-#include "../telephonyprotocols/psdagt/group/bld.inf"
-#include "../telephonyprotocols/gprsumtsqosprt/group/bld.inf"
-#include "../telephonyprotocols/gprsumtsqosinterface/group/bld.inf"
-#include "../telephonyprotocols/qosextnapi/group/bld.inf"
-#include "../telephonyprotocols/qos3gppcpr/group/bld.inf"
-#include "../telephonyprotocols/pdplayer/group/bld.inf"
-#include "../telephonyprotocols/rawipnif/group/bld.inf"
-#include "../telephonyserver/etelserverandcore/group/bld.inf"
-#include "../telephonyserver/etelmultimode/group/bld.inf"
-#include "../telephonyserver/etelpacketdata/group/bld.inf"
-#include "../telephonyserver/etelsimtoolkit/group/bld.inf"
-#include "../telephonyserverplugins/common_tsy/group/bld.inf"
-#include "../telephonyserverplugins/licenseetsystub/group/bld.inf"
-#include "../telephonyserverplugins/multimodetsy/group/bld.inf"
-#include "../telephonyserverplugins/simtsy/group/bld.inf"
-#include "../telephonyserverplugins/ctsydispatchlayer/group/bld.inf"
-#include "../telephonyserverplugins/simatktsy/group/bld.inf"
-#include "../telephonyutils/dial/group/bld.inf"
-#include "../telephonyutils/telephonywatchers/group/bld.inf"
-#include "../telephonyutils/etel3rdpartyapi/Group/bld.inf"
-#include "../hwpluginsimulation/mocksy/group/bld.inf"
-#include "../wapstack/wapmessageapi/group/bld.inf"
-
-
-PRJ_TESTMMPFILES

--- a/package_definition.xml	Tue Aug 31 16:23:08 2010 +0300
+++ b/package_definition.xml	Wed Sep 01 12:40:21 2010 +0100
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="cellularsrv" name="Cellular Baseband Services" levels="adaptation hw-if plugin framework server app-if">
-    <meta rel="License">
-      <license type="EPL"><supplier>Nokia</supplier></license>	
-    </meta>
     <collection id="basebandabstraction" name="Baseband Abstraction" level="hw-if">
       <component id="basebandchanneladaptor" name="Baseband Channel Adaptor" introduced="8.1" purpose="optional">
         <unit bldFile="basebandabstraction/basebandchanneladaptor/group" mrp="basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp"/>
       </component>
+      <component id="isc_if" filter="s60" name="Inter-System Communication Interface">
+        <unit bldFile="basebandabstraction/isc_if/group"/>
+      </component>
     </collection>
     <collection id="basebandadaptationplugins" name="Baseband Adaptation Plugins" level="adaptation">
       <component id="basebandchanneladaptorforc32" name="Baseband Channel Adaptor for C32" introduced="8.1" purpose="optional" class="plugin">
         <unit bldFile="basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
       </component>
     </collection>
-   
+    <collection id="fax" name="Fax" level="server">
+      <component id="faxclientandserver" name="Fax Client and Server" purpose="optional">
+        <unit bldFile="fax/faxclientandserver/Group" mrp="fax/faxclientandserver/Group/telephony_fax.mrp"/>
+      </component>
+    </collection>
     <collection id="smsprotocols" name="SMS Protocols" level="framework">
       <component id="smsstack" name="SMS Stack" introduced="6.0" purpose="mandatory" class="plugin">
         <unit bldFile="smsprotocols/smsstack/group" mrp="smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
@@ -36,7 +40,7 @@
       <component id="qosextnapi" name="QoS Extn API" introduced="9.2" purpose="optional">
         <unit bldFile="telephonyprotocols/qosextnapi/group" mrp="telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp"/>
       </component>
-      <component id="secondarypdpcontextumtsdriver" name="Secondary PDP Context UMTS Driver" introduced="8.1" deprecated="^3" purpose="optional" filter="test">
+      <component id="secondarypdpcontextumtsdriver" name="Secondary PDP context UMTS Driver" introduced="8.1" purpose="optional">
         <unit bldFile="telephonyprotocols/secondarypdpcontextumtsdriver/group" mrp="telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp"/>
       </component>
       <component id="qos3gppcpr" name="QoS 3GPP CPR" introduced="9.2" purpose="optional" class="plugin">
@@ -70,7 +74,7 @@
       <component id="common_tsy" name="Common TSY" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="telephonyserverplugins/common_tsy/group" mrp="telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp"/>
       </component>
-      <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="sf_build">
+      <component id="licenseetsystub" name="Licensee TSY Stub" introduced="^2" purpose="development" class="plugin" filter="test">
         <unit mrp="telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp" bldFile="telephonyserverplugins/licenseetsystub/group"/>
       </component>
       <component id="multimodetsy" name="Multimode TSY" purpose="development" class="plugin">
@@ -86,6 +90,14 @@
         <unit bldFile="telephonyserverplugins/simatktsy/group" mrp="telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp"/>
       </component>
     </collection>
+    <collection id="commonnetworkinterface" name="Common Network Interface" level="hw-if">
+      <component id="gennif" filter="s60" name="Generic NIF">
+        <unit bldFile="commonnetworkinterface/gennif/group"/>
+      </component>
+      <component id="gprsumtsagent" filter="s60" name="GPRS UMTS Agent">
+        <unit bldFile="commonnetworkinterface/gprsumtsagent/group"/>
+      </component>
+    </collection>
     <collection id="telephonyutils" name="Telephony Utilities" level="app-if">
       <component id="dial" name="Dial" deprecated="9.1" purpose="optional">
         <unit bldFile="telephonyutils/dial/group" mrp="telephonyutils/dial/group/telephony_dial.mrp"/>
@@ -98,6 +110,9 @@
       </component>
     </collection>
     <collection id="cellularsrv_info" name="Cellular Baseband Services Info" level="app-if">
+      <component id="cellularsrv_plat" filter="s60" name="Cellular Baseband Services Platform Interfaces" class="api">
+        <unit bldFile="cellularsrv_plat/group"/>
+      </component>
       <component id="telephonyconfidentialdocs" name="Telephony Confidential Documentation" purpose="development" class="doc">
         <unit mrp="cellularsrv_info/telephonyconfidentialdocs/telephony_confidential.mrp"/>
       </component>
@@ -124,18 +139,5 @@
 			  <unit mrp="cellularsrvapitest/telephonydevsoundhaitest/group/telephonydevsoundhaitest.mrp" bldFile="cellularsrvapitest/telephonydevsoundhaitest/group"/>
       </component>
     </collection>
-    <collection id="cbsref" name="CBS Reference" level="plugin">
-      <component id="csyrefplugins" name="CSY Reference Plugins" introduced="^3" purpose="development" class="plugin" filter="test">
-        <unit bldFile="cbsref/csyrefplugins/group"/>
-      </component>
-      <component id="telephonyrefplugins" name="TSY Reference Plugins" introduced="^3" purpose="development" class="plugin" filter="test">
-        <unit bldFile="cbsref/telephonyrefplugins/group"/>
-      </component>
-    </collection>        
-    <collection id="wapstack" name="WAP Stack" level="plugin">
-      <component id="wapmessageapi" name="WAP Message API" purpose="optional">
-        <unit bldFile="wapstack/wapmessageapi/group" mrp="wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp" /> 
-      </component>
-    </collection>
   </package>
 </SystemDefinition>

--- a/package_map.xml	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<PackageMap root="sf" layer="os"/>

Binary file smsprotocols/doc_pub/NBProtocols_Subsystem_Architectural_Description.doc has changed

Binary file smsprotocols/doc_pub/NbProtocols_Functional_Specification.doc has changed

--- a/smsprotocols/smsstack/common/inc/smsstacklog.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/common/inc/smsstacklog.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-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"
@@ -16,36 +16,284 @@
 #ifndef _SMSSTACKLOG_H_
 #define _SMSSTACKLOG_H_
 
+/**
+ *  @file
+ *
+ *  Logging macros for SMSStack. These use the Comms Debug Utility framework
+ *  (aka Flogger V2).
+ *
+ *  To enable logging create a file called "comsdbg.ini" in the Symbian OS
+ *  "C:\Logs\" directory which contains the following lines:
+ *
+ *    MEDIA FILE
+ *    LOG SMSStack Common
+ *    LOG SMSStack GSMU
+ *    LOG SMSStack SMSPROT
+ *    LOG SMSStack SMSU
+ *    LOG SMSStack SMSIF
+ *    LOG SMSStack WAPPROT
+ *
+ *  Each line relates to a particular part of the SMS Stack, enabling you to
+ *  log only the interesting bits.
+ *
+ *  By default logging is only present on UDEB builds. To enable UREL logging
+ *  on a device, you will need to rebuild your ROM with UDEB SMS components.
+ *
+ *  To enable logging on a device, place the "comsdbg.ini" file in the ROM
+ *  under the "Z:\Logs\" directory. The log file will be written in the
+ *  "C:\Logs\" directory on the device.
+ *
+ *  To enable logging to the serial port change the "MEDIA FILE" line to
+ *  "MEDIA SERIAL::1" or "MEDIA SERIAL::2". Note that this may no longer
+ *  work due to a defect in the Comms Debug Framework.
+ *
+ *  If you wish to have individual logs for each component, then use the
+ *  extractlog.pl utility found in the %EPOCROOT%\Epoc32\Tools\ directory. E.g.
+ *
+ *    extractlog.pl \EPOC32\WINSCW\C\LOGS\LOG.TXT
+ *
+ *  @internalComponent
+ */
+
+#include <comms-infras/commsdebugutility.h>
 #include <etelmm.h>
 
+#ifdef _DEBUG
+#define _SMS_LOGGING_ENABLED
+#endif
+
+
+#ifdef _SMS_LOGGING_ENABLED
+
+_LIT8(KSMSStackSubSystem, "SMSStack");
+
+#define SMSFLOG1(N,A)                 { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC0(KSMSStackSubSystem,(N),KLogString); \
+									  }
+#define SMSFLOG2(N,A,B)               { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC1(KSMSStackSubSystem,(N),KLogString,(B)); \
+									  }
+#define SMSFLOG3(N,A,B,C)             { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC2(KSMSStackSubSystem,(N),KLogString,(B),(C)); \
+									  }
+#define SMSFLOG4(N,A,B,C,D)           { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC3(KSMSStackSubSystem,(N),KLogString,(B),(C),(D)); \
+									  }
+#define SMSFLOG5(N,A,B,C,D,E)         { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC4(KSMSStackSubSystem,(N),KLogString,(B),(C),(D),(E)); \
+									  }
+#define SMSFLOG6(N,A,B,C,D,E,F)       { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC5(KSMSStackSubSystem,(N),KLogString,(B),(C),(D),(E),(F)); \
+									  }
+#define SMSFLOG7(N,A,B,C,D,E,F,G)     { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC6(KSMSStackSubSystem,(N),KLogString,(B),(C),(D),(E),(F),(G)); \
+									  }
+#define SMSFLOG8(N,A,B,C,D,E,F,G,H)   { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC7(KSMSStackSubSystem,(N),KLogString,(B),(C),(D),(E),(F),(G),(H)); \
+									  }
+
+_LIT8(KSMSStackCommon,  "Common");
+_LIT8(KSMSStackGSMU,    "GSMU");
+_LIT8(KSMSStackSMSPROT, "SMSPROT");
+_LIT8(KSMSStackSMSU,    "SMSU");
+_LIT8(KSMSStackSMSIF,   "SMSIF");
+_LIT8(KSMSStackWAPPROT, "WAPPROT");
+
+
+#define LOGCOMMON1(A)                 SMSFLOG1(KSMSStackCommon,A)
+#define LOGCOMMON2(A,B)               SMSFLOG2(KSMSStackCommon,A,(B))
+#define LOGCOMMON3(A,B,C)             SMSFLOG3(KSMSStackCommon,A,(B),(C))
+#define LOGCOMMON4(A,B,C,D)           SMSFLOG4(KSMSStackCommon,A,(B),(C),(D))
+#define LOGCOMMON5(A,B,C,D,E)         SMSFLOG5(KSMSStackCommon,A,(B),(C),(D),(E))
+#define LOGCOMMON6(A,B,C,D,E,F)       SMSFLOG6(KSMSStackCommon,A,(B),(C),(D),(E),(F))
+#define LOGCOMMON7(A,B,C,D,E,F,G)     SMSFLOG7(KSMSStackCommon,A,(B),(C),(D),(E),(F),(G))
+#define LOGCOMMON8(A,B,C,D,E,F,G,H)   SMSFLOG8(KSMSStackCommon,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGCOMMONTIMESTAMP()		  { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGCOMMON5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+#define LOGGSMU1(A)                   SMSFLOG1(KSMSStackGSMU,A)
+#define LOGGSMU2(A,B)                 SMSFLOG2(KSMSStackGSMU,A,(B))
+#define LOGGSMU3(A,B,C)               SMSFLOG3(KSMSStackGSMU,A,(B),(C))
+#define LOGGSMU4(A,B,C,D)             SMSFLOG4(KSMSStackGSMU,A,(B),(C),(D))
+#define LOGGSMU5(A,B,C,D,E)           SMSFLOG5(KSMSStackGSMU,A,(B),(C),(D),(E))
+#define LOGGSMU6(A,B,C,D,E,F)         SMSFLOG6(KSMSStackGSMU,A,(B),(C),(D),(E),(F))
+#define LOGGSMU7(A,B,C,D,E,F,G)       SMSFLOG7(KSMSStackGSMU,A,(B),(C),(D),(E),(F),(G))
+#define LOGGSMU8(A,B,C,D,E,F,G,H)     SMSFLOG8(KSMSStackGSMU,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGGSMUTIMESTAMP()	          { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGGSMU5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+#define LOGSMSPROT1(A)                SMSFLOG1(KSMSStackSMSPROT,A)
+#define LOGSMSPROT2(A,B)              SMSFLOG2(KSMSStackSMSPROT,A,(B))
+#define LOGSMSPROT3(A,B,C)            SMSFLOG3(KSMSStackSMSPROT,A,(B),(C))
+#define LOGSMSPROT4(A,B,C,D)          SMSFLOG4(KSMSStackSMSPROT,A,(B),(C),(D))
+#define LOGSMSPROT5(A,B,C,D,E)        SMSFLOG5(KSMSStackSMSPROT,A,(B),(C),(D),(E))
+#define LOGSMSPROT6(A,B,C,D,E,F)      SMSFLOG6(KSMSStackSMSPROT,A,(B),(C),(D),(E),(F))
+#define LOGSMSPROT7(A,B,C,D,E,F,G)    SMSFLOG7(KSMSStackSMSPROT,A,(B),(C),(D),(E),(F),(G))
+#define LOGSMSPROT8(A,B,C,D,E,F,G,H)  SMSFLOG8(KSMSStackSMSPROT,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGSMSPROTTIMESTAMP()		  { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGSMSPROT5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+#define LOGSMSU1(A)                   SMSFLOG1(KSMSStackSMSU,A)
+#define LOGSMSU2(A,B)                 SMSFLOG2(KSMSStackSMSU,A,(B))
+#define LOGSMSU3(A,B,C)               SMSFLOG3(KSMSStackSMSU,A,(B),(C))
+#define LOGSMSU4(A,B,C,D)             SMSFLOG4(KSMSStackSMSU,A,(B),(C),(D))
+#define LOGSMSU5(A,B,C,D,E)           SMSFLOG5(KSMSStackSMSU,A,(B),(C),(D),(E))
+#define LOGSMSU6(A,B,C,D,E,F)         SMSFLOG6(KSMSStackSMSU,A,(B),(C),(D),(E),(F))
+#define LOGSMSU7(A,B,C,D,E,F,G)       SMSFLOG7(KSMSStackSMSU,A,(B),(C),(D),(E),(F),(G))
+#define LOGSMSU8(A,B,C,D,E,F,G,H)     SMSFLOG8(KSMSStackSMSU,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGSMSUTIMESTAMP()		      { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGSMSU5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+#define LOGSMSIF1(A)                  SMSFLOG1(KSMSStackSMSIF,A)
+#define LOGSMSIF2(A,B)                SMSFLOG2(KSMSStackSMSIF,A,(B))
+#define LOGSMSIF3(A,B,C)              SMSFLOG3(KSMSStackSMSIF,A,(B),(C))
+#define LOGSMSIF4(A,B,C,D)            SMSFLOG4(KSMSStackSMSIF,A,(B),(C),(D))
+#define LOGSMSIF5(A,B,C,D,E)          SMSFLOG5(KSMSStackSMSIF,A,(B),(C),(D),(E))
+#define LOGSMSIF6(A,B,C,D,E,F)        SMSFLOG6(KSMSStackSMSIF,A,(B),(C),(D),(E),(F))
+#define LOGSMSIF7(A,B,C,D,E,F,G)      SMSFLOG7(KSMSStackSMSIF,A,(B),(C),(D),(E),(F),(G))
+#define LOGSMSIF8(A,B,C,D,E,F,G,H)    SMSFLOG8(KSMSStackSMSIF,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGSMSIFTIMESTAMP()		      { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGSMSIF5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+#define LOGSMSIFPDU(A,B,C)            LogSmsIfPDU((A),(B),(C))
+#define LOGSMSIFHEXBUF(A,B)           LogSmsIfHexBuf((A),(B))
+#define LOGSMSIFTYPEOFNUMBER(A,B)     LogSmsIfTypeOfNumber((A),(B))
+#define LOGSMSIFNUMBERINGPLAN(A,B)    LogSmsIfNumberingPlan((A),(B))
+#define LOGSMSIFSMSENTRY(A,B)         LogSmsIfSmsEntry((A),(B))
+#define LOGSMSIFSENDATTRIBUTES(A,B)   LogSmsIfSendAttributes((A),(B))
+
+#define LOGWAPPROT1(A)                SMSFLOG1(KSMSStackWAPPROT,A)
+#define LOGWAPPROT2(A,B)              SMSFLOG2(KSMSStackWAPPROT,A,(B))
+#define LOGWAPPROT3(A,B,C)            SMSFLOG3(KSMSStackWAPPROT,A,(B),(C))
+#define LOGWAPPROT4(A,B,C,D)          SMSFLOG4(KSMSStackWAPPROT,A,(B),(C),(D))
+#define LOGWAPPROT5(A,B,C,D,E)        SMSFLOG5(KSMSStackWAPPROT,A,(B),(C),(D),(E))
+#define LOGWAPPROT6(A,B,C,D,E,F)      SMSFLOG6(KSMSStackWAPPROT,A,(B),(C),(D),(E),(F))
+#define LOGWAPPROT7(A,B,C,D,E,F,G)    SMSFLOG7(KSMSStackWAPPROT,A,(B),(C),(D),(E),(F),(G))
+#define LOGWAPPROT8(A,B,C,D,E,F,G,H)  SMSFLOG8(KSMSStackWAPPROT,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGWAPPROTTIMESTAMP()		  { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGWAPPROT5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+#else  // _SMS_LOGGING_ENABLED
+
+#define LOGCOMMON1(A)
+#define LOGCOMMON2(A,B)
+#define LOGCOMMON3(A,B,C)
+#define LOGCOMMON4(A,B,C,D)
+#define LOGCOMMON5(A,B,C,D,E)
+#define LOGCOMMON6(A,B,C,D,E,F)
+#define LOGCOMMON7(A,B,C,D,E,F,G)
+#define LOGCOMMON8(A,B,C,D,E,F,G,H)
+#define LOGCOMMONTIMESTAMP()
+
+#define LOGGSMU1(A)
+#define LOGGSMU2(A,B)
+#define LOGGSMU3(A,B,C)
+#define LOGGSMU4(A,B,C,D)
+#define LOGGSMU5(A,B,C,D,E)
+#define LOGGSMU6(A,B,C,D,E,F)
+#define LOGGSMU7(A,B,C,D,E,F,G)
+#define LOGGSMU8(A,B,C,D,E,F,G,H)
+#define LOGGSMUTIMESTAMP()
+
+#define LOGSMSPROT1(A)
+#define LOGSMSPROT2(A,B)
+#define LOGSMSPROT3(A,B,C)
+#define LOGSMSPROT4(A,B,C,D)
+#define LOGSMSPROT5(A,B,C,D,E)
+#define LOGSMSPROT6(A,B,C,D,E,F)
+#define LOGSMSPROT7(A,B,C,D,E,F,G)
+#define LOGSMSPROT8(A,B,C,D,E,F,G,H)
+#define LOGSMSPROTTIMESTAMP()
+
+#define LOGSMSU1(A)
+#define LOGSMSU2(A,B)
+#define LOGSMSU3(A,B,C)
+#define LOGSMSU4(A,B,C,D)
+#define LOGSMSU5(A,B,C,D,E)
+#define LOGSMSU6(A,B,C,D,E,F)
+#define LOGSMSU7(A,B,C,D,E,F,G)
+#define LOGSMSU8(A,B,C,D,E,F,G,H)
+#define LOGSMSUTIMESTAMP()
+
+#define LOGSMSIF1(A)
+#define LOGSMSIF2(A,B)
+#define LOGSMSIF3(A,B,C)
+#define LOGSMSIF4(A,B,C,D)
+#define LOGSMSIF5(A,B,C,D,E)
+#define LOGSMSIF6(A,B,C,D,E,F)
+#define LOGSMSIF7(A,B,C,D,E,F,G)
+#define LOGSMSIF8(A,B,C,D,E,F,G,H)
+#define LOGSMSIFTIMESTAMP()
+#define LOGSMSIFPDU(A,B,C)
+#define LOGSMSIFHEXBUF(A,B)
+#define LOGSMSIFTYPEOFNUMBER(A,B)
+#define LOGSMSIFNUMBERINGPLAN(A,B)
+#define LOGSMSIFSMSENTRY(A,B)
+#define LOGSMSIFSENDATTRIBUTES(A,B)
+
+#define LOGWAPPROT1(A)
+#define LOGWAPPROT2(A,B)
+#define LOGWAPPROT3(A,B,C)
+#define LOGWAPPROT4(A,B,C,D)
+#define LOGWAPPROT5(A,B,C,D,E)
+#define LOGWAPPROT6(A,B,C,D,E,F)
+#define LOGWAPPROT7(A,B,C,D,E,F,G)
+#define LOGWAPPROT8(A,B,C,D,E,F,G,H)
+#define LOGWAPPROTTIMESTAMP()
+
+#endif	// _SMS_LOGGING_ENABLED
+
 
 //
 // Functions to perform specific logging where necessary.
 //
-
-    void LogSmsIfPDUL(const TDesC8& aText, const TDesC8& aPDU, TBool aCommandPdu);
+#ifdef _SMS_LOGGING_ENABLED
+    void LogSmsIfPDU(const TDesC8& aText, const TDesC8& aPDU, TBool aCommandPdu);
     void LogSmsIfHexBuf(const TDesC8& aText, const TDesC8& aHexBuf);
     void LogSmsIfTypeOfNumber(const TDesC8& aText, RMobilePhone::TMobileTON aTON);
     void LogSmsIfNumberingPlan(const TDesC8& aText, RMobilePhone::TMobileNPI aNPI);
     void LogSmsIfSmsEntry(const TDesC8& aText,
-                          const RMobileSmsStore::TMobileGsmSmsEntryV1& aSmsGsmEntryV1);
+    					  const RMobileSmsStore::TMobileGsmSmsEntryV1& aSmsGsmEntryV1);
     void LogSmsIfSendAttributes(const TDesC8& aText,
-                                const RMobileSmsMessaging::TMobileSmsSendAttributesV1& aAttrib);
-    /**
-     * Generates a string with the current time 
-     * 
-     * @param alogStatement TDes& of at least size 40 
-     */
-inline void SmsTimeStampL(TDes& aLogStatement)
-        {
-        TTime now;
-        now.UniversalTime();
-        TDateTime dateTime(now.DateTime());
-        _LIT(KOwnTimeFormat,"TimeStamp=%:0%H%:1%T%:2%S.%*C6%:3");
-        now.FormatL(aLogStatement,KOwnTimeFormat);
-        //aLogStatement
-        };
-
+    							const RMobileSmsMessaging::TMobileSmsSendAttributesV1& aAttrib);
+#endif
 
 // Define macros to disable and restore Code Coverage

--- a/smsprotocols/smsstack/common/src/smsstacklog.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/common/src/smsstacklog.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-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"
@@ -20,20 +20,14 @@
  @internalComponent
 */
  
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smsstacklogTraces.h"
-#endif
-
 #include "gsmupdu.h"
 #include "smsstacklog.h"
-#include <s32mem.h>
+
 
 //
 // All functions in this file are available only if logging is enabled.
 //
-#ifdef OST_TRACE_COMPILER_IN_USE
+#ifdef _SMS_LOGGING_ENABLED
 
 
 /**
@@ -48,7 +42,7 @@
  *  @param aPDU         PDU to log.
  *  @param aCommandPdu  Flag to say if this is a command PDU.
  */
-void LogSmsIfPDUL(const TDesC8& aText, const TDesC8& aPDU, TBool aCommandPdu)
+void LogSmsIfPDU(const TDesC8& aText, const TDesC8& aPDU, TBool aCommandPdu)
 	{
 	TBuf8<128>  tmpBuf;
 
@@ -58,7 +52,7 @@
 	tmpBuf.Copy(aText);
 	tmpBuf.Append(_L8("RAW:  "));
 
-	LogSmsIfHexBuf(tmpBuf, aPDU);
+	LOGSMSIFHEXBUF(tmpBuf, aPDU);
 
 	//
 	// Log the first octet...
@@ -203,8 +197,8 @@
 		tmpBuf.Append(_L8("    -      -"));
 		}
 
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_1, "%s      HEX   MTI        RP UDHI  SRX  MMS   RD     VP", aText);
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_2, "%sFO:   0x%02X  %s", aText, (TUint)firstOctet, tmpBuf);
+	LOGSMSIF2("%S      HEX   MTI        RP UDHI  SRX  MMS   RD     VP", &aText);
+	LOGSMSIF4("%SFO:   0x%02X  %S", &aText, firstOctet, &tmpBuf);
 
 	if (pduType == -1)
 		{
@@ -220,7 +214,7 @@
 	    pduType == CSmsPDU::ESmsStatusReport  ||
 	    pduType == CSmsPDU::ESmsCommand)
 		{
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_3, "%sMR:   0x%02X", aText, aPDU[octetOffset]);
+        LOGSMSIF3("%SMR:   0x%02X", &aText, aPDU[octetOffset]);
         octetOffset++;
 		}
 
@@ -229,13 +223,13 @@
 	//
 	if (pduType == CSmsPDU::ESmsCommand)
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_4, "%sPID:  0x%02X", aText, aPDU[octetOffset]);
+		LOGSMSIF3("%SPID:  0x%02X", &aText, aPDU[octetOffset]);
         octetOffset++;
 
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_5, "%sCT:   0x%02X", aText, aPDU[octetOffset]);
+		LOGSMSIF3("%SCT:   0x%02X", &aText, aPDU[octetOffset]);
         octetOffset++;
 
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_6, "%sMN:   0x%02X", aText, aPDU[octetOffset]);
+		LOGSMSIF3("%SMN:   0x%02X", &aText, aPDU[octetOffset]);
         octetOffset++;
 		}
 
@@ -261,11 +255,11 @@
 		
 		tmpBuf.SetLength(telLength);
 
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_7, "%sTEL:  0x%02X  %s", aText, (TUint)typeOfNumber, tmpBuf);
+		LOGSMSIF4("%STEL:  0x%02X  %S", &aText, typeOfNumber, &tmpBuf);
 		}
 	else
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_8, "%sTEL:  Illegal length value (%d)!", aText, telLength);
+		LOGSMSIF3("%STEL:  Illegal length value (%d)!", &aText, telLength);
 		return;
 		}
 
@@ -274,7 +268,7 @@
 	//
 	if (pduType == CSmsPDU::ESmsSubmit  ||  pduType == CSmsPDU::ESmsDeliver)
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_9, "%sPID:  0x%02X", aText, aPDU[octetOffset]);
+		LOGSMSIF3("%SPID:  0x%02X", &aText, aPDU[octetOffset]);
 		octetOffset++;
 
 		tmpBuf.Zero();
@@ -409,8 +403,8 @@
 			tmpBuf.Append(_L8("-"));
 			}
 
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_10, "%sDCS:  HEX   CLASS      DCS     INDICATION TYPE", aText);
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_11, "%s      0x%02X  %s", aText, (TUint) dcs, tmpBuf);
+		LOGSMSIF2("%SDCS:  HEX   CLASS      DCS     INDICATION TYPE", &aText);
+		LOGSMSIF4("%S      0x%02X  %S", &aText, dcs, &tmpBuf);
 		}
 
 	//
@@ -420,7 +414,7 @@
 		{
 		if (vpf == EVpRel)
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_12, "%sVP:   %d (Relative)", aText, aPDU[octetOffset++]);
+			LOGSMSIF3("%SVP:   %d (Relative)", &aText, aPDU[octetOffset++]);
 			}
 		else if (vpf == EVpAbs)
 			{
@@ -432,7 +426,7 @@
 				tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
 				}
 			
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_13, "%sVP:   %s (Absolute)", aText, tmpBuf);
+			LOGSMSIF3("%SVP:   %S (Absolute)", &aText, &tmpBuf);
 			octetOffset += 7;
 			}
 		else if (vpf == EVpEnh)
@@ -445,7 +439,7 @@
 				tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
 				}
 			
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_14, "%sVP:   %s (Enhanced)", aText, tmpBuf);
+			LOGSMSIF3("%SVP:   %S (Enhanced)", &aText, &tmpBuf);
 			octetOffset += 7;
 			}
 		}
@@ -462,7 +456,7 @@
 			tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
 			}
 			
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_15, "%sSCTS: %s", aText, tmpBuf);
+		LOGSMSIF3("%SSCTS: %S", &aText, &tmpBuf);
 		octetOffset += 7;
 		}
 	
@@ -480,10 +474,10 @@
 			tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
 			}
 			
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_16, "%sDT:   %s", aText, tmpBuf);
+		LOGSMSIF3("%SDT:   %S", &aText, &tmpBuf);
 		octetOffset += 7;
 
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_17, "%sST:   %02X", aText, aPDU[octetOffset]);
+		LOGSMSIF3("%SST:   %02X", &aText, aPDU[octetOffset]);
 		octetOffset++;
 		}
 
@@ -527,56 +521,39 @@
 					}
 				else
 					{
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_18, "%sUDL:  Problems with the ieidl_a %d being less that UDHL",aText, ieidl_a);
+					LOGSMSIF3("%SUDL:  Problems with the ieidl_a %d being less that UDHL",
+							  &aText, ieidl_a);
 					}
 	
 				if ((ieidl_a + 1) > udhl)
 					{
-					OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_19, "%sUDL:  Corrupted or implement decoding for second iei_b, iei_n!",aText);
+					LOGSMSIF2("%SUDL:  Corrupted or implement decoding for second iei_b, iei_n!",
+							  &aText);
 					}
 	
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_20, "%sUDL:  HEX    UDHL   IEI_A  IEIDL_A   ", aText);
-
-				TBuf8<200> data;
-				RDesWriteStream dataStream(data);
-
-				dataStream.WriteInt32L(aText.Length());
-				dataStream.WriteL(aText);
-
-				dataStream.WriteInt32L(udl);
-				dataStream.WriteInt32L(udhl);
-				dataStream.WriteInt32L(iei_a);
-				dataStream.WriteInt32L(ieidl_a);
-
-				dataStream.WriteInt32L(tmpBuf.Length());
-				dataStream.WriteL(tmpBuf);
-
-				dataStream.Close();
-                OstTraceDefData( OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_21, "%s      0x%02X   0x%02X   0x%02X   0x%02X  %s", data.Ptr(), data.Size() );
+				LOGSMSIF2("%SUDL:  HEX    UDHL   IEI_A  IEIDL_A   ", &aText);
+				LOGSMSIF7("%S      0x%02X   0x%02X   0x%02X   0x%02X  %S", &aText,
+						  udl, udhl, iei_a, ieidl_a, &tmpBuf);
 				}
 			else
 				{
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_22, "%sUDL:  Corrupted because TP-UDHP is TRUE and TP-UDHL is less than 1!", aText);
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_23, "%sUDL:  HEX   UDHL   IEI_A", aText);
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_24, "%s      0x%02X    0x%02X", aText, udl, udhl);
+				LOGSMSIF2("%SUDL:  Corrupted because TP-UDHP is TRUE and TP-UDHL is less than 1!", &aText);
+				LOGSMSIF2("%SUDL:  HEX   UDHL   IEI_A", &aText);
+				LOGSMSIF4("%S      0x%02X    0x%02X", &aText, udl, udhl);
 				}
 			}
 		else
 			{
 			TInt  udl  = aPDU[octetOffset++];
 			
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_25, "%sUDL:  HEX    UDHL", aText);
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDUL_26, "%s      0x%02X   -", aText, udl);
+			LOGSMSIF2("%SUDL:  HEX    UDHL", &aText);
+			LOGSMSIF3("%S      0x%02X   -", &aText, udl);
 			}
 		}
-	} // LogSmsIfPDUL
+	} // LogSmsIfPDU
 
 
-#ifdef OST_TRACE_COMPILER_IN_USE
 void LogSmsIfHexBuf(const TDesC8& aText, const TDesC8& aHexBuf)
-#else
-void LogSmsIfHexBuf(const TDesC8& /*aText*/, const TDesC8& aHexBuf)
-#endif
     {
 	//
 	// Print the PDU in hex in rows of upto KHexDumpCharsPerLine bytes...
@@ -602,7 +579,7 @@
 			hexLine.AppendFormat(_L8("%02X"), aHexBuf[position + byteIndex]);
 			}
 
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFHEXBUF_1, "%s%s", aText, hexLine);
+		LOGSMSIF3("%S%S", &aText, &hexLine);
 		}
     } // LogSmsIfHexBuf
 
@@ -612,59 +589,55 @@
  *
  *  @param aTON  Enum to log.
  */
-#ifdef OST_TRACE_COMPILER_IN_USE
 void LogSmsIfTypeOfNumber(const TDesC8& aText, RMobilePhone::TMobileTON aTON)
-#else
-void LogSmsIfTypeOfNumber(const TDesC8& /*aText*/, RMobilePhone::TMobileTON aTON)
-#endif
 	{
 	switch (aTON)
 		{
 		case RMobilePhone::EUnknownNumber:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_1, "%sEUnknownNumber", aText);
+			LOGSMSIF2("%SEUnknownNumber", &aText);
 			}
 			break;
 
 		case RMobilePhone::EInternationalNumber:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_2, "%sEInternationalNumber", aText);
+			LOGSMSIF2("%SEInternationalNumber", &aText);
 			}
 			break;
 
 		case RMobilePhone::ENationalNumber:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_3, "%sENationalNumber", aText);
+			LOGSMSIF2("%SENationalNumber", &aText);
 			}
 			break;
 
 		case RMobilePhone::ENetworkSpecificNumber:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_4, "%sENetworkSpecificNumber", aText);
+			LOGSMSIF2("%SENetworkSpecificNumber", &aText);
 			}
 			break;
 
 		case RMobilePhone::ESubscriberNumber:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_5, "%sESubscriberNumber", aText);
+			LOGSMSIF2("%SESubscriberNumber", &aText);
 			}
 			break;
 
 		case RMobilePhone::EAlphanumericNumber:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_6, "%sEAlphanumericNumber", aText);
+			LOGSMSIF2("%SEAlphanumericNumber", &aText);
 			}
 			break;
 
 		case RMobilePhone::EAbbreviatedNumber:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_7, "%sEAbbreviatedNumber", aText);
+			LOGSMSIF2("%SEAbbreviatedNumber", &aText);
 			}
 			break;
 
 		default:
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_8, "%s<unknown enum %d>", aText, aTON);
+			LOGSMSIF3("%S<unknown enum %d>", &aText, aTON);
 			}
 			break;
 		}
@@ -676,71 +649,67 @@
  *
  *  @param aNPI  Enum to log.
  */
-#ifdef OST_TRACE_COMPILER_IN_USE
 void LogSmsIfNumberingPlan(const TDesC8& aText, RMobilePhone::TMobileNPI aNPI)
-#else
-void LogSmsIfNumberingPlan(const TDesC8& /*aText*/, RMobilePhone::TMobileNPI aNPI)
-#endif
 	{
 	switch (aNPI)
 		{
 		case RMobilePhone::EUnknownNumberingPlan:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_1, "%sEUnknownNumberingPlan", aText);
+			LOGSMSIF2("%SEUnknownNumberingPlan", &aText);
 			}
 			break;
 
 		case RMobilePhone::EIsdnNumberPlan:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_2, "%sEIsdnNumberPlan", aText);
+			LOGSMSIF2("%SEIsdnNumberPlan", &aText);
 			}
 			break;
 
 		case RMobilePhone::EDataNumberPlan:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_3, "%sEDataNumberPlan", aText);
+			LOGSMSIF2("%SEDataNumberPlan", &aText);
 			}
 			break;
 
 		case RMobilePhone::ETelexNumberPlan:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_4, "%sETelexNumberPlan", aText);
+			LOGSMSIF2("%SETelexNumberPlan", &aText);
 			}
 			break;
 
 		case RMobilePhone::EServiceCentreSpecificPlan1:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_5, "%sEServiceCentreSpecificPlan1", aText);
+			LOGSMSIF2("%SEServiceCentreSpecificPlan1", &aText);
 			}
 			break;
 
 		case RMobilePhone::EServiceCentreSpecificPlan2:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_6, "%sEServiceCentreSpecificPlan2", aText);
+			LOGSMSIF2("%SEServiceCentreSpecificPlan2", &aText);
 			}
 			break;
 
 		case RMobilePhone::ENationalNumberPlan:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_7, "%sENationalNumberPlan", aText);
+			LOGSMSIF2("%SENationalNumberPlan", &aText);
 			}
 			break;
 
 		case RMobilePhone::EPrivateNumberPlan:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_8, "%sEPrivateNumberPlan", aText);
+			LOGSMSIF2("%SEPrivateNumberPlan", &aText);
 			}
 			break;
 
 		case RMobilePhone::EERMESNumberPlan:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_9, "%sEERMESNumberPlan", aText);
+			LOGSMSIF2("%SEERMESNumberPlan", &aText);
 			}
 			break;
 
 		default:
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_10, "%s<unknown enum %d>", aText, aNPI);
+			LOGSMSIF3("%S<unknown enum %d>", &aText, aNPI);
 			}
 			break;
 		}
@@ -758,8 +727,9 @@
 	//
 	// Header and index...
 	//
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_1, "%sRMobileSmsStore::TMobileGsmSmsEntryV1:", aText);
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_2, "%s  iIndex=%d (0x%08x)", aText, aSmsGsmEntryV1.iIndex,aSmsGsmEntryV1.iIndex);
+	LOGSMSIF2("%SRMobileSmsStore::TMobileGsmSmsEntryV1:", &aText);
+	LOGSMSIF4("%S  iIndex=%d (0x%08x)", &aText, aSmsGsmEntryV1.iIndex,
+			  aSmsGsmEntryV1.iIndex);
 	
 	//
 	// Message status...
@@ -768,43 +738,44 @@
 		{
 		case RMobileSmsStore::EStoredMessageUnknownStatus:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_3, "%s  iStoreStats=EStoredMessageUnknownStatus", aText);
+			LOGSMSIF2("%S  iStoreStats=EStoredMessageUnknownStatus", &aText);
 			}
 			break;
 
 		case RMobileSmsStore::EStoredMessageUnread:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_4, "%s  iStoreStats=EStoredMessageUnread", aText);
+			LOGSMSIF2("%S  iStoreStats=EStoredMessageUnread", &aText);
 			}
 			break;
 
 		case RMobileSmsStore::EStoredMessageRead:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_5, "%s  iStoreStats=EStoredMessageRead", aText);
+			LOGSMSIF2("%S  iStoreStats=EStoredMessageRead", &aText);
 			}
 			break;
 
 		case RMobileSmsStore::EStoredMessageUnsent:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_6, "%s  iStoreStats=EStoredMessageUnsent", aText);
+			LOGSMSIF2("%S  iStoreStats=EStoredMessageUnsent", &aText);
 			}
 			break;
 
 		case RMobileSmsStore::EStoredMessageSent:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_7, "%s  iStoreStats=EStoredMessageSent", aText);
+			LOGSMSIF2("%S  iStoreStats=EStoredMessageSent", &aText);
 			}
 			break;
 
 		case RMobileSmsStore::EStoredMessageDelivered:
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_8, "%s  iStoreStats=EStoredMessageDelivered", aText);
+			LOGSMSIF2("%S  iStoreStats=EStoredMessageDelivered", &aText);
 			}
 			break;
 
 		default:
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_9, "%s  iStoreStats=<unknown enum %d>", aText,aSmsGsmEntryV1.iMsgStatus);
+			LOGSMSIF3("%S  iStoreStats=<unknown enum %d>", &aText,
+					  aSmsGsmEntryV1.iMsgStatus);
 			}
 			break;
 		}
@@ -815,7 +786,7 @@
 	TBuf8<RMobilePhone::KMaxMobileTelNumberSize>  numberIn8bit;
 
 	numberIn8bit.Copy(aSmsGsmEntryV1.iServiceCentre.iTelNumber);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_10, "%s  SRC Address=\"%s\"", aText, numberIn8bit);
+	LOGSMSIF3("%S  SRC Address=\"%S\"", &aText, &numberIn8bit);
 
 	//
 	// Service Centre Type Of Number...
@@ -825,7 +796,7 @@
 	tmpBuf.Copy(aText);
 	tmpBuf.Append(_L8("  SRC AddrTON="));
 
-	LogSmsIfTypeOfNumber(tmpBuf, aSmsGsmEntryV1.iServiceCentre.iTypeOfNumber);
+	LOGSMSIFTYPEOFNUMBER(tmpBuf, aSmsGsmEntryV1.iServiceCentre.iTypeOfNumber);
 
 	//
 	// Number Plan...
@@ -833,7 +804,7 @@
 	tmpBuf.Copy(aText);
 	tmpBuf.Append(_L8("  SRC AddrNPI="));
 
-	LogSmsIfNumberingPlan(tmpBuf, aSmsGsmEntryV1.iServiceCentre.iNumberPlan);
+	LOGSMSIFNUMBERINGPLAN(tmpBuf, aSmsGsmEntryV1.iServiceCentre.iNumberPlan);
 
 	//
 	// PDU...
@@ -841,7 +812,7 @@
 	tmpBuf.Copy(aText);
 	tmpBuf.Append(_L8("  PDU: "));
 
-	LogSmsIfPDUL(tmpBuf, aSmsGsmEntryV1.iMsgData, EFalse);
+	LOGSMSIFPDU(tmpBuf, aSmsGsmEntryV1.iMsgData, EFalse);
 	} // LogSmsIfSmsEntry
 
 
@@ -853,25 +824,25 @@
 void LogSmsIfSendAttributes(const TDesC8& aText,
 							const RMobileSmsMessaging::TMobileSmsSendAttributesV1& aAttrib)
 	{
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_1, "%sRMobileSmsMessaging::TMobileSmsSendAttributesV1:", aText);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_2, "%s  iFlags=0x%08x", aText, (TInt)(aAttrib.iFlags));
+	LOGSMSIF2("%SRMobileSmsMessaging::TMobileSmsSendAttributesV1:", &aText);
+	LOGSMSIF3("%S  iFlags=0x%08x", &aText, (TInt)(aAttrib.iFlags));
 
 	if (aAttrib.iFlags & RMobileSmsMessaging::KGsmServiceCentre)
 		{
 		TBuf8<128 + RMobilePhone::KMaxMobileTelNumberSize>  tmpBuf;
 		
 		tmpBuf.Copy(aAttrib.iGsmServiceCentre.iTelNumber);
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_3, "%s  SRC Address=%s", aText, tmpBuf);
+		LOGSMSIF3("%S  SRC Address=%S", &aText, &tmpBuf);
 
 		tmpBuf.Copy(aText);
 		tmpBuf.Append(_L8("  SRC AddrTON="));
 
-		LogSmsIfTypeOfNumber(tmpBuf, aAttrib.iGsmServiceCentre.iTypeOfNumber);
+		LOGSMSIFTYPEOFNUMBER(tmpBuf, aAttrib.iGsmServiceCentre.iTypeOfNumber);
 
 		tmpBuf.Copy(aText);
 		tmpBuf.Append(_L8("  SRC AddrNPI="));
 
-		LogSmsIfNumberingPlan(tmpBuf, aAttrib.iGsmServiceCentre.iNumberPlan);
+		LOGSMSIFNUMBERINGPLAN(tmpBuf, aAttrib.iGsmServiceCentre.iNumberPlan);
 		}
 
 	if (aAttrib.iFlags & RMobileSmsMessaging::KSmsDataFormat)
@@ -880,25 +851,26 @@
 			{
 			case RMobileSmsMessaging::EFormatUnspecified:
 				{
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_4, "%s  iDataFormat=EFormatUnspecified", aText);
+				LOGSMSIF2("%S  iDataFormat=EFormatUnspecified", &aText);
 				}
 				break;
 
 			case RMobileSmsMessaging::EFormatGsmTpdu:
 				{
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_5, "%s  iDataFormat=EFormatGsmTpdu", aText);
+				LOGSMSIF2("%S  iDataFormat=EFormatGsmTpdu", &aText);
 				}
 				break;
 
 			case RMobileSmsMessaging::EFormatCdmaTpdu:
 				{
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_6, "%s  iDataFormat=EFormatCdmaTpdu", aText);
+				LOGSMSIF2("%S  iDataFormat=EFormatCdmaTpdu", &aText);
 				}
 				break;
 
 			default:
 				{
-				OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_7, "%s  iDataFormat=<unknown enum %d>", aText,aAttrib.iDataFormat);
+				LOGSMSIF3("%S  iDataFormat=<unknown enum %d>", &aText,
+						  aAttrib.iDataFormat);
 				}
 				break;
 			}
@@ -906,12 +878,12 @@
 
 	if (aAttrib.iFlags & RMobileSmsMessaging::KCdmaTeleservice)
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_8, "%s  iCdmaTeles=0x%08X", aText, (TUint)aAttrib.iCdmaTeleservice);
+		LOGSMSIF3("%S  iCdmaTeles=0x08X", &aText, aAttrib.iCdmaTeleservice);
 		}
 
 	if (aAttrib.iFlags & RMobileSmsMessaging::KCdmaServiceCategory)
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_9, "%s  iCdmaServ=0x%08X", aText, (TUint)aAttrib.iCdmaServiceCategory);
+		LOGSMSIF3("%S  iCdmaServ=0x08X", &aText, aAttrib.iCdmaServiceCategory);
 		}
 
 	if (aAttrib.iFlags & RMobileSmsMessaging::KRemotePartyInfo)
@@ -919,34 +891,34 @@
 		TBuf8<RMobilePhone::KMaxMobileTelNumberSize>  tmpBuf;
 		
 		tmpBuf.Copy(aAttrib.iDestination.iTelNumber);
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_10, "%s  DST Address=%s", aText, tmpBuf);
+		LOGSMSIF3("%S  DST Address=%S", &aText, &tmpBuf);
 
 		tmpBuf.Copy(aText);
 		tmpBuf.Append(_L8("  DST AddrTON="));
 
-		LogSmsIfTypeOfNumber(tmpBuf, aAttrib.iDestination.iTypeOfNumber);
+		LOGSMSIFTYPEOFNUMBER(tmpBuf, aAttrib.iDestination.iTypeOfNumber);
 
 		tmpBuf.Copy(aText);
 		tmpBuf.Append(_L8("  DST AddrNPI="));
 
-		LogSmsIfNumberingPlan(tmpBuf, aAttrib.iDestination.iNumberPlan);
+		LOGSMSIFNUMBERINGPLAN(tmpBuf, aAttrib.iDestination.iNumberPlan);
 		}
 
 	if (aAttrib.iFlags & RMobileSmsMessaging::KMoreToSend)
 		{
 		if (aAttrib.iMore)
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_11, "%s  iMore=ETrue", aText);
+			LOGSMSIF2("%S  iMore=ETrue", &aText);
 			}
 		else
 			{
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_12, "%s  iMore=EFalse", aText);
+			LOGSMSIF2("%S  iMore=EFalse", &aText);
 			}
 		}
 
 	if (aAttrib.iFlags & RMobileSmsMessaging::KMessageReference)
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_13, "%s  iMsgRef=0x%08X", aText, (TUint)aAttrib.iMsgRef);
+		LOGSMSIF3("%S  iMsgRef=0x08X", &aText, aAttrib.iMsgRef);
 		}
 
 	if(aAttrib.iFlags & RMobileSmsMessaging::KGsmSubmitReport)
@@ -956,8 +928,8 @@
 		tmpBuf.Copy(aText);
 		tmpBuf.Append(_L8("  iSubmitReport PDU: "));
 
-		LogSmsIfPDUL(tmpBuf, aAttrib.iSubmitReport, EFalse);
+		LOGSMSIFPDU(tmpBuf, aAttrib.iSubmitReport, EFalse);
 		}
 	} // LogSmsIfSendAttributes
 
-#endif // OST_TRACE_COMPILER_IN_USE
+#endif // _SMS_LOGGING_ENABLED

Binary file smsprotocols/smsstack/doc_pub/SmsStack_GSM_SMS_Use_Case_Analysis.doc has changed

--- a/smsprotocols/smsstack/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -31,4 +31,4 @@
 #include "../smsu/group/bld.inf"
 #include "../smsprot/Group/bld.inf"
 #include "../wapprot/Group/bld.inf"
-#include "../test/group/bld.inf"
+#include "../test/bld.inf"

--- a/smsprotocols/smsstack/gsmu/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"

--- a/smsprotocols/smsstack/gsmu/group/gsmu.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/group/gsmu.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -55,11 +55,11 @@
 
 USERINCLUDE   ../../gsmu/inc
 USERINCLUDE   ../../common/inc
-USERINCLUDE   ../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 LIBRARY       euser.lib etelmm.lib efsrv.lib estor.lib charconv.lib
 LIBRARY	      fbscli.lib bitgdi.lib
+DEBUGLIBRARY  comsdbgutil.lib
 
 START WINS
 	BASEADDRESS 0x7d060000

--- a/smsprotocols/smsstack/gsmu/group/gsmu_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\gsmu\test\te_gsmu\te_gsmu.script"-"c:\testdata\scripts\te_gsmu.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\gsmu\test\te_gsmustor\te_gsmustor.script"-"c:\testdata\scripts\te_gsmustor.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\gsmu\test\te_gsmu_ems\te_gsmu_ems.script"-"c:\testdata\scripts\te_gsmu_ems.script"

--- a/smsprotocols/smsstack/gsmu/inc/Gsmuelem.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/inc/Gsmuelem.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1098,26 +1098,18 @@
 	IMPORT_C TPtrC ConvertToNativeL(const TDesC8& aUDElements);
 	IMPORT_C TPtrC ConvertToNativeL(const TDesC8& aUDElements, TSmsEncoding aEncoding);
 
+	TBool IsSupportedL(TChar aChar);
 	TBool IsSupportedL(const TDesC& aDes, TInt& aNumberOfUnconvertibleCharacters,
 			           TInt& aIndexOfFirstUnconvertibleCharacter);
 
+	TBool IsSupportedL(TChar aChar, TSmsEncoding aEncoding, TBool& aIsDowngrade,
+			           TBool& aRequiresAlternativeEncoding);
 	TBool IsSupportedL(const TDesC& aDes, TSmsEncoding aEncoding,
 			           TInt& aNumberOfUnconvertibleCharacters,
 			           TInt& aNumberOfDowngradedCharacters,
 			           TInt& aNumberRequiringAlternativeEncoding,
 			           TInt& aIndexOfFirstUnconvertibleCharacter);
-
-    void ConvertWith7BitEncodingL(const TDesC& aDes, TDes& aRestoredDes,
-                       TInt& aNumberOfUnconvertibleCharacters,
-                       TInt& aNumberOfDowngradedCharacters,
-                       TInt& aIndexOfFirstUnconvertibleCharacter, TBool aIsCountDowngrade);
-
-    void ConvertWithAlternativeEncodingL(const TDesC& aDes, const TDesC& aRestoredStdDes, TSmsEncoding aEncoding,
-                       TInt& aNumberOfUnconvertibleCharacters,
-                       TInt& aNumberOfDowngradedCharacters,
-                       TInt& aNumberRequiringAlternativeEncoding,
-                       TInt& aIndexOfFirstUnconvertibleCharacter);
-    
+	
 // Alternative Encoding methods
 	TSmsEncoding FindBestAlternativeEncodingL(const TDesC& aNativeCharacters,
 											  TSmsEncoding aSuggestedEncoding);

--- a/smsprotocols/smsstack/gsmu/src/Gsmuelem.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/Gsmuelem.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "GsmuelemTraces.h"
-#endif
-
 #include <gsmuelem.h>
 #include <gsmumsg.h>
 #include "Gsmumain.h"
@@ -188,7 +182,7 @@
 
 CSmsCommandData* CSmsCommandData::NewL(TSmsFirstOctet& aFirstOctet)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_NEWL_1, "CSmsCommandData::NewL()");
+	LOGGSMU1("CSmsCommandData::NewL()");
 
 	CSmsCommandData* commanddata=new(ELeave) CSmsCommandData(aFirstOctet);
 	CleanupStack::PushL(commanddata);
@@ -213,7 +207,7 @@
  */
 CSmsCommandData* CSmsCommandData::DuplicateL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_DUPLICATEL_1, "CSmsCommandData::DuplicateL()");
+	LOGGSMU1("CSmsCommandData::DuplicateL()");
 
 	CSmsCommandData*  smsCommandData = CSmsCommandData::NewL(iFirstOctet);
 	CleanupStack::PushL(smsCommandData);
@@ -234,7 +228,7 @@
 
 CSmsInformationElement& CSmsCommandData::InformationElement(TInt aIndex) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_INFORMATIONELEMENT_1, "CSmsCommandData::InformationElement()");
+	LOGGSMU1("CSmsCommandData::InformationElement()");
 
 	CSmsInformationElement* ie=iInformationElementArray[aIndex];
 	return *ie;
@@ -246,7 +240,7 @@
     // Ignore in code coverage - not used in SMS stack and not exported
     // but cannot be removed as impacts public header.
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_INFORMATIONELEMENTPTR_1, "CSmsCommandData::InformationElementPtr()");
+    LOGGSMU1("CSmsCommandData::InformationElementPtr()");
     return iInformationElementArray[aIndex];
     BULLSEYE_RESTORE
     }
@@ -254,7 +248,7 @@
 TBool CSmsCommandData::InformationElementIndex(CSmsInformationElement::TSmsInformationElementIdentifier aIdentifier,
 		TInt& aIndex) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_INFORMATIONELEMENTINDEX_1, "CSmsCommandData::InformationElementIndex()");
+	LOGGSMU1("CSmsCommandData::InformationElementIndex()");
 
 	TBool found=EFalse;
 	TInt count=NumInformationElements();
@@ -270,7 +264,7 @@
 
 void CSmsCommandData::AddInformationElementL(const TSmsId aIdentifier,const TDesC8& aData)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_ADDINFORMATIONELEMENTL_1, "CSmsCommandData::AddInformationElementL()");
+	LOGGSMU1("CSmsCommandData::AddInformationElementL()");
 
 	//
 	// Currently there is no restriction on how many instances of an information element can be
@@ -290,7 +284,7 @@
 
 void CSmsCommandData::RemoveInformationElement(TInt aIndex)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_REMOVEINFORMATIONELEMENT_1, "CSmsCommandData::RemoveInformationElement()");
+	LOGGSMU1("CSmsCommandData::RemoveInformationElement()");
 	// Since iInformationElementArray[aIndex] is removed from iInformationElementArray, no double free issue.
 	// coverity[double_free]
 	delete iInformationElementArray[aIndex];
@@ -306,7 +300,7 @@
 
 TPtrC8 CSmsCommandData::Data() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_DATA_1, "CSmsCommandData::Data()");
+	LOGGSMU1("CSmsCommandData::Data()");
 
 	TPtrC8 ptr;
 	ptr.Set(iBuffer->Des());
@@ -316,7 +310,7 @@
 
 void CSmsCommandData::SetDataL(const TDesC8& aData)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_SETDATAL_1, "CSmsCommandData::SetDataL()");
+	LOGGSMU1("CSmsCommandData::SetDataL()");
 
 	TInt length=aData.Length();
 	__ASSERT_DEBUG(length<=KSmsMaxDataSize,Panic(KGsmuPanicCommandDataLengthTooLong));
@@ -330,7 +324,7 @@
 
 TUint8* CSmsCommandData::EncodeL(TUint8* aPtr) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_ENCODEL_1, "CSmsCommandData::EncodeL()");
+	LOGGSMU1("CSmsCommandData::EncodeL()");
 
 	__ASSERT_DEBUG(iBuffer->Length()<=MaxDataLength(),Panic(KGsmuPanicCommandDataBufferTooLong));
 	TSmsOctet datalength=iBuffer->Length()+TSmsOctet(TotalHeaderLengthInUDLUnits());
@@ -355,7 +349,7 @@
 
 void CSmsCommandData::DecodeL(TGsmuLex8& aPdu)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_DECODEL_1, "CSmsCommandData::DecodeL()");
+	LOGGSMU1("CSmsCommandData::DecodeL()");
 
 	iInformationElementArray.ResetAndDestroy();
 	const TBool headerPresent=HeaderPresent();
@@ -423,7 +417,7 @@
 
 TInt CSmsCommandData::HeaderLength() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_HEADERLENGTH_1, "CSmsCommandData::HeaderLength()");
+	LOGGSMU1("CSmsCommandData::HeaderLength()");
 
 	TInt headerLength=0;
 	for (TInt i=0; i<NumInformationElements(); i++)
@@ -434,7 +428,7 @@
 
 TInt CSmsCommandData::TotalHeaderLengthInUDLUnits() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_TOTALHEADERLENGTHINUDLUNITS_1, "CSmsCommandData::TotalHeaderLengthInUDLUnits()");
+	LOGGSMU1("CSmsCommandData::TotalHeaderLengthInUDLUnits()");
 
 	if (iInformationElementArray.Count()==0)
 		return 0;
@@ -445,7 +439,7 @@
 
 TBool CSmsCommandData::HeaderPresent() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_HEADERPRESENT_1, "CSmsCommandData::HeaderPresent()");
+	LOGGSMU1("CSmsCommandData::HeaderPresent()");
 
 	return (iFirstOctet&TSmsFirstOctet::ESmsUDHIMask)==TSmsFirstOctet::ESmsUDHIHeaderPresent;
 	} // CSmsCommandData::HeaderPresent
@@ -453,7 +447,7 @@
 
 void CSmsCommandData::SetHeaderPresent(TBool aHeaderPresent)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_SETHEADERPRESENT_1, "CSmsCommandData::SetHeaderPresent()");
+	LOGGSMU1("CSmsCommandData::SetHeaderPresent()");
 
 	iFirstOctet=aHeaderPresent? (iFirstOctet&(~TSmsFirstOctet::ESmsUDHIMask))|TSmsFirstOctet::ESmsUDHIHeaderPresent: (iFirstOctet&(~TSmsFirstOctet::ESmsUDHIMask))|TSmsFirstOctet::ESmsUDHIHeaderNotPresent;
 	} // CSmsCommandData::SetHeaderPresent
@@ -486,7 +480,7 @@
 
 void TSmsProtocolIdentifier::SetTelematicDeviceIndicator(TSmsTelematicDeviceIndicator aIndicator)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSPROTOCOLIDENTIFIER_SETTELEMATICDEVICEINDICATOR_1, "TSmsProtocolIdentifier::SetTelematicDeviceIndicator()");
+	LOGGSMU1("TSmsProtocolIdentifier::SetTelematicDeviceIndicator()");
 
 	__ASSERT_DEBUG(PIDType()==ESmsPIDTelematicInterworking,Panic(KGsmuPanicNoTelematicInterworking));
 
@@ -504,7 +498,7 @@
 
 void TSmsProtocolIdentifier::SetTelematicDeviceType(TSmsTelematicDeviceType aDeviceType)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSPROTOCOLIDENTIFIER_SETTELEMATICDEVICETYPE_1, "TSmsProtocolIdentifier::SetTelematicDeviceType()");
+	LOGGSMU1("TSmsProtocolIdentifier::SetTelematicDeviceType()");
 
 	__ASSERT_DEBUG(TelematicDeviceIndicator()==ESmsTelematicDevice,Panic(KGsmuPanicNoTelematicDevice));
 	iValue=(TUint8) ((iValue&(~ESmsTelematicDeviceTypeMask))|aDeviceType);
@@ -516,7 +510,7 @@
     // Ignore in code coverage - not used in SMS stack and not exported
     // but cannot be removed as impacts public header.
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSPROTOCOLIDENTIFIER_SHORTMESSAGEALPROTOCOL_1, "TSmsProtocolIdentifier::ShortMessageALProtocol()");
+    LOGGSMU1("TSmsProtocolIdentifier::ShortMessageALProtocol()");
     
     __ASSERT_DEBUG(TelematicDeviceIndicator()==ESmsNoTelematicDevice,Panic(KGsmuPanicNoTelematicDevice));
     return (TSmsShortMessageALProtocol) (iValue&ESmsShortMessageALProtocolMask);
@@ -528,7 +522,7 @@
     // Ignore in code coverage - not used in SMS stack and not exported
     // but cannot be removed as impacts public header.
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSPROTOCOLIDENTIFIER_SETSHORTMESSAGEALPROTOCOL_1, "TSmsProtocolIdentifier::SetShortMessageALProtocol()");
+    LOGGSMU1("TSmsProtocolIdentifier::SetShortMessageALProtocol()");
     
     __ASSERT_DEBUG(TelematicDeviceIndicator()==ESmsNoTelematicDevice,Panic(KGsmuPanicNoTelematicDevice));
     iValue=(TUint8) ((iValue&(~ESmsShortMessageALProtocolMask))|aProtocol);
@@ -537,7 +531,7 @@
 
 TInt TSmsProtocolIdentifier::ShortMessageType() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSPROTOCOLIDENTIFIER_SHORTMESSAGETYPE_1, "TSmsProtocolIdentifier::ShortMessageType()");
+	LOGGSMU1("TSmsProtocolIdentifier::ShortMessageType()");
 
 	__ASSERT_DEBUG(PIDType()==ESmsPIDShortMessageType,Panic(KGsmuPanicNoShortMessageType));
 	return (TSmsShortMessageType) (iValue&ESmsShortMessageTypeMask);
@@ -546,7 +540,7 @@
 
 void TSmsProtocolIdentifier::SetShortMessageType(TSmsShortMessageType aShortMessageType)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSPROTOCOLIDENTIFIER_SETSHORTMESSAGETYPE_1, "TSmsProtocolIdentifier::SetShortMessageType()");
+	LOGGSMU1("TSmsProtocolIdentifier::SetShortMessageType()");
 
 	__ASSERT_DEBUG(PIDType()==ESmsPIDShortMessageType,Panic(KGsmuPanicNoShortMessageType));
 	//iValue=(TUint8) ((iValue&(~ESmsPIDTypeMask))|aShortMessageType);
@@ -565,7 +559,7 @@
 
 TBool TSmsDataCodingScheme::TextCompressed() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_TEXTCOMPRESSED_1, "TSmsDataCodingScheme::TextCompressed()");
+	LOGGSMU1("TSmsDataCodingScheme::TextCompressed()");
 
 	TInt bits7to4=Bits7To4();
 	return (bits7to4==ESmsDCSTextCompressedWithNoClassInfo)    || (bits7to4==ESmsDCSTextCompressedWithClassInfo)      ||
@@ -575,7 +569,7 @@
 
 void TSmsDataCodingScheme::SetTextCompressed(TBool aCompressed)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETTEXTCOMPRESSED_1, "TSmsDataCodingScheme::SetTextCompressed()");
+	LOGGSMU1("TSmsDataCodingScheme::SetTextCompressed()");
 
 	TInt bits7to4=Bits7To4();
 	if (aCompressed)
@@ -653,7 +647,7 @@
 
 TSmsDataCodingScheme::TSmsAlphabet TSmsDataCodingScheme::Alphabet() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_ALPHABET_1, "TSmsDataCodingScheme::TSmsAlphabet()");
+	LOGGSMU1("TSmsDataCodingScheme::TSmsAlphabet()");
 
 	TInt bits7to4=Bits7To4();
 	TInt alphabet=ESmsAlphabet7Bit;
@@ -688,7 +682,7 @@
 			break;
 			}
 		default:
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_ALPHABET_2, "TSmsDataCodingScheme::Alphabet() WARNING! default case has been reached");
+		    LOGGSMU1("TSmsDataCodingScheme::Alphabet() WARNING! default case has been reached");
             break;
  		}
 	return (TSmsAlphabet) alphabet;
@@ -696,7 +690,7 @@
 
 void TSmsDataCodingScheme::SetAlphabet(TSmsAlphabet aAlphabet)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETALPHABET_1, "TSmsDataCodingScheme::SetAlphabet()");
+	LOGGSMU1("TSmsDataCodingScheme::SetAlphabet()");
 
 	TInt bits7to4=Bits7To4();
 	switch (bits7to4)
@@ -725,7 +719,7 @@
 			{
             if (aAlphabet!=ESmsAlphabet7Bit)
                 {
-                OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETALPHABET_2, "TSmsDataCodingScheme::SetAlphabet() WARNING! Not Supported With Discard Message  [Bits7To4=%d], [aAlphabet=%d]", bits7to4, aAlphabet);
+                LOGGSMU3("TSmsDataCodingScheme::SetAlphabet() WARNING! Not Supported With Discard Message  [Bits7To4=%d], [aAlphabet=%d]", bits7to4, aAlphabet);
                 }
 			break;
 			}
@@ -737,7 +731,7 @@
  			    }
  			else 
                 {
-        		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETALPHABET_3, "TSmsDataCodingScheme::SetAlphabet() WARNING! Not Supported With Discard Message  [Bits7To4=%d], [aAlphabet=%d]", bits7to4, aAlphabet);
+        		LOGGSMU3("TSmsDataCodingScheme::SetAlphabet() WARNING! Not Supported With Discard Message  [Bits7To4=%d], [aAlphabet=%d]", bits7to4, aAlphabet);
 			    }	     
 			break;
 			}
@@ -749,12 +743,12 @@
 			    }
 			else 
 			    {
-				OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETALPHABET_4, "TSmsDataCodingScheme::SetAlphabet() WARNING! Not Supported With Discard Message  [Bits7To4=%d], [aAlphabet=%d]", bits7to4, aAlphabet);
+				LOGGSMU3("TSmsDataCodingScheme::SetAlphabet() WARNING! Not Supported With Discard Message  [Bits7To4=%d], [aAlphabet=%d]", bits7to4, aAlphabet);
 			    }
 			break;
 			}
 		default:
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETALPHABET_5, "TSmsDataCodingScheme::SetAlphabet() WARNING! default case has been reached");
+		    LOGGSMU1("TSmsDataCodingScheme::SetAlphabet() WARNING! default case has been reached");
             break;
       		}
 	} // TSmsDataCodingScheme::SetAlphabet
@@ -762,7 +756,7 @@
 
 TBool TSmsDataCodingScheme::Class(TSmsClass& aClass) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_CLASS_1, "TSmsDataCodingScheme::Class()");
+	LOGGSMU1("TSmsDataCodingScheme::Class()");
 
 	switch (Bits7To4())
 		{
@@ -781,7 +775,7 @@
 
 void TSmsDataCodingScheme::SetClass(TBool aClassDefined,TSmsDataCodingScheme::TSmsClass aClass)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETCLASS_1, "TSmsDataCodingScheme::SetClass()");
+	LOGGSMU1("TSmsDataCodingScheme::SetClass()");
 
 	TInt bits7to4=Bits7To4();
 	if (aClassDefined)
@@ -819,7 +813,7 @@
 				break;
 				}
 			default:
-		        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETCLASS_2, "WARNING! default case has been reached");
+		        LOGGSMU1("WARNING! default case has been reached");
                 break;
 			}
 		}
@@ -869,7 +863,7 @@
 
 TSmsDataCodingScheme::TSmsIndicationState TSmsDataCodingScheme::IndicationState() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_INDICATIONSTATE_1, "TSmsDataCodingScheme::IndicationState()");
+	LOGGSMU1("TSmsDataCodingScheme::IndicationState()");
 
 	TInt bits7to4=Bits7To4();
 	TSmsIndicationState state=ESmsIndicationInactive;
@@ -883,7 +877,7 @@
 			break;
 			}
 		default:
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_INDICATIONSTATE_2, "WARNING! default case has been reached");
+		    LOGGSMU1("WARNING! default case has been reached");
             break;
   		}
 	return state;
@@ -892,7 +886,7 @@
 
 void TSmsDataCodingScheme::SetIndicationState(TSmsIndicationState aState)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETINDICATIONSTATE_1, "TSmsDataCodingScheme::SetIndicationState()");
+	LOGGSMU1("TSmsDataCodingScheme::SetIndicationState()");
 
 	TInt bits7to4=Bits7To4();
 	switch (bits7to4)
@@ -905,7 +899,7 @@
 			break;
 			}
 		default:
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETINDICATIONSTATE_2, "TSmsDataCodingScheme::SetIndicationState() WARNING! default case has been reached");
+		    LOGGSMU1("TSmsDataCodingScheme::SetIndicationState() WARNING! default case has been reached");
             break;
   		}
 	} // TSmsDataCodingScheme::SetIndicationState
@@ -913,7 +907,7 @@
 
 TSmsDataCodingScheme::TSmsIndicationType TSmsDataCodingScheme::IndicationType() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_INDICATIONTYPE_1, "TSmsDataCodingScheme::IndicationType()");
+	LOGGSMU1("TSmsDataCodingScheme::IndicationType()");
 
 	TInt bits7to4=Bits7To4();
 	TSmsIndicationType type=ESmsVoicemailMessageWaiting;
@@ -927,7 +921,7 @@
 			break;
 			}
 		default:
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_INDICATIONTYPE_2, "TSmsDataCodingScheme::IndicationType() WARNING default case has been reached");
+		    LOGGSMU1("TSmsDataCodingScheme::IndicationType() WARNING default case has been reached");
             break;
 		}
 	return type;
@@ -936,7 +930,7 @@
 
 void TSmsDataCodingScheme::SetIndicationType(TSmsIndicationType aType)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETINDICATIONTYPE_1, "TSmsDataCodingScheme::SetIndicationType()");
+	LOGGSMU1("TSmsDataCodingScheme::SetIndicationType()");
 
 	TInt bits7to4=Bits7To4();
 	switch (bits7to4)
@@ -949,7 +943,7 @@
 			break;
 			}
 		default:
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETINDICATIONTYPE_2, "TSmsDataCodingScheme::SetIndicationType() WARNING! default case has been reached");
+		    LOGGSMU1("TSmsDataCodingScheme::SetIndicationType() WARNING! default case has been reached");
             break;
  		}
 	} // TSmsDataCodingScheme::SetIndicationType
@@ -968,7 +962,7 @@
  */
 EXPORT_C CSmsAlphabetConverter* CSmsAlphabetConverter::NewLC(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs,TSmsDataCodingScheme::TSmsAlphabet aSmsAlphabet,TBool aIsBinary)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSALPHABETCONVERTER_NEWLC_1, "CSmsAlphabetConverter::NewLC()");
+	LOGGSMU1("CSmsAlphabetConverter::NewLC()");
 
 	CSmsAlphabetConverter* converter=new (ELeave)CSmsAlphabetConverter(aCharacterSetConverter,aFs,aSmsAlphabet,aIsBinary);
 	CleanupStack::PushL(converter);
@@ -1009,7 +1003,7 @@
 //
 void CSmsAlphabetConverter::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONSTRUCTL_1, "CSmsAlphabetConverter::ConstructL()");
+	LOGGSMU1("CSmsAlphabetConverter::ConstructL()");
 
 
 	if (!iIsBinary)
@@ -1041,7 +1035,7 @@
 //
 void CSmsAlphabetConverter::ConversionPropertiesL(TSmsAlphabetConversionProperties& aConversionProperties) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERSIONPROPERTIESL_1, "CSmsAlphabetConverter::ConversionPropertiesL()");
+	LOGGSMU1("CSmsAlphabetConverter::ConversionPropertiesL()");
 
 
 	// Set defaults
@@ -1083,7 +1077,7 @@
  */
 EXPORT_C TPtrC8 CSmsAlphabetConverter::ConvertFromNativeL(const TDesC& aNativeCharacters)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL_1, "CSmsAlphabetConverter::ConvertFromNativeL()");
+	LOGGSMU1("CSmsAlphabetConverter::ConvertFromNativeL()");
 
 	TInt  numberOfUnconvertibleCharacters, numberOfDowngradedCharacters;
 
@@ -1113,7 +1107,7 @@
                                                           TInt& aNumberOfUnconvertibleCharacters,
 			                                              TInt& aNumberOfDowngradedCharacters)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL1_1, "CSmsAlphabetConverter::ConvertFromNativeL(): aEncoding=%d", aEncoding);
+	LOGGSMU2("CSmsAlphabetConverter::ConvertFromNativeL(): aEncoding=%d", aEncoding);
 	
 	aNumberOfUnconvertibleCharacters = 0;
 	aNumberOfDowngradedCharacters    = 0;
@@ -1306,7 +1300,7 @@
  */
 EXPORT_C TPtrC CSmsAlphabetConverter::ConvertToNativeL(const TDesC8& aUDElements)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSALPHABETCONVERTER_CONVERTTONATIVEL_1, "CSmsAlphabetConverter::ConvertToNativeL()");
+	LOGGSMU1("CSmsAlphabetConverter::ConvertToNativeL()");
 
 	return ConvertToNativeL(aUDElements, ESmsEncodingNone);
 	} // CSmsAlphabetConverter::ConvertToNativeL
@@ -1326,7 +1320,7 @@
 EXPORT_C TPtrC CSmsAlphabetConverter::ConvertToNativeL(const TDesC8& aUDElements,
 													   TSmsEncoding aEncoding)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSALPHABETCONVERTER_CONVERTTONATIVEL1_1, "CSmsAlphabetConverter::ConvertToNativeL(): aEncoding=%d", aEncoding);
+	LOGGSMU2("CSmsAlphabetConverter::ConvertToNativeL(): aEncoding=%d", aEncoding);
 
 	// Check for some shortcuts
 	if (iIsBinary ||  iSmsAlphabet == TSmsDataCodingScheme::ESmsAlphabet8Bit)
@@ -1399,6 +1393,33 @@
 
 
 /**
+ *  Tests if the character is supported by the current character set.
+ *  This function can be used with 7bit and 8bit alphabets.
+ * 
+ *  @param aChar  Character to investigate.
+ * 
+ *  @return  ETrue if the character is supported.
+ * 
+ *  @note Since the function is based on the old behaviour (pre-PREQ2090)
+ *        it does not accept a downgraded character or alternative encoding
+ *        as being supported.
+ */
+TBool CSmsAlphabetConverter::IsSupportedL(TChar aChar)
+	{
+	LOGGSMU2("[1] CSmsAlphabetConverter::IsSupportedL(aChar=0x%04x)", (TUint) aChar);
+
+	TBool isDowngrade, isRequiresAlternativeEncoding;
+
+    TBool  supported = IsSupportedL(aChar, ESmsEncodingNone,
+            isDowngrade, isRequiresAlternativeEncoding);
+	
+	LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
+
+	return supported;
+	} // CSmsAlphabetConverter::IsSupportedL
+
+
+/**
  *  Tests if the descriptor text is supported by the current character set.
  *  This function can be used with 7bit and 8bit alphabets.
  * 
@@ -1413,32 +1434,133 @@
 TBool CSmsAlphabetConverter::IsSupportedL(const TDesC& aDes, TInt& aNumberOfUnconvertibleCharacters,
                                           TInt& aIndexOfFirstUnconvertibleCharacter)
 	{
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_1, "[1] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", aDes);
+	LOGGSMU2("[2] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", &aDes);
 
 	TInt desLength = aDes.Length();
+	//
+	// Initialise the exit params...
+	//
+	aNumberOfUnconvertibleCharacters    = 0;
+	aIndexOfFirstUnconvertibleCharacter = desLength;
 
     //
-    // Create buffer for restored text string...
+    // Create buffers for the input converted to 7Bit and a buffer for it once
+    // converted back again...
+    //
+    HBufC8* encodedBuf       = HBufC8::NewLC(desLength*2); // worse case
+    HBufC*  backToUnicodeAfterStdBuf = HBufC::NewLC(desLength);
+    TPtr8  encoded(encodedBuf->Des());
+    TPtr  backToUnicodeAfterStd(backToUnicodeAfterStdBuf->Des());
+
     //
-    HBufC*  backToUnicodeAfterStdBuf = HBufC::NewLC(desLength);
-    TPtr  backToUnicodeAfterStd(backToUnicodeAfterStdBuf->Des());
+    // Convert the input string to standard 7bit (with downgrades if needed)...
+    // 
+    PrepareForConversionFromNativeL(ESmsEncodingNone);
+
+    TInt  notConverted = iCharacterSetConverter.ConvertFromUnicode(encoded, aDes);
+
+    if (notConverted > 0)
+        {
+        aNumberOfUnconvertibleCharacters += notConverted;
+        }
+    else if (notConverted < 0)
+        {
+        aNumberOfUnconvertibleCharacters = desLength;
+        }
     
     //
-    // Convert the string...
-    //   
-	TInt numberOfDowngradedCharacters;
-	TBool isCountDowngrade = EFalse; // Don't count downgrades
-	ConvertWith7BitEncodingL(aDes, backToUnicodeAfterStd, 
-            aNumberOfUnconvertibleCharacters, numberOfDowngradedCharacters, 
-            aIndexOfFirstUnconvertibleCharacter, isCountDowngrade);
+    // Convert it back again to the native format...
+    //
+    TInt  state       = CCnvCharacterSetConverter::KStateDefault;
+    TInt  notRestored = iCharacterSetConverter.ConvertToUnicode(backToUnicodeAfterStd, encoded, state);
+
+    if (notRestored > 0)
+        {
+        aNumberOfUnconvertibleCharacters += notRestored;
+        }
+    else if (notRestored < 0)
+        {
+        aNumberOfUnconvertibleCharacters = desLength;
+        }
+
+    //
+    // Work out if the string is acceptable as it is (e.g. no unconvertible
+    // and no downgrades). We only need do this if the previous conversions were
+    // complete with no issues.
+    //
+    for (TInt pos = desLength-1;  pos >= 0;  --pos)
+        {
+        if (backToUnicodeAfterStd[pos] != aDes[pos])
+            {
+            aNumberOfUnconvertibleCharacters++;
+            aIndexOfFirstUnconvertibleCharacter = pos;
+            }
+        }
+    
+    CleanupStack::PopAndDestroy(backToUnicodeAfterStdBuf);
+    CleanupStack::PopAndDestroy(encodedBuf);
 	
-    CleanupStack::PopAndDestroy(backToUnicodeAfterStdBuf);
-	
+	//
+	// Useful logging...
+	//
 	TBool  supported = (aNumberOfUnconvertibleCharacters == 0);
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_2, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_3, "CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_4, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
+	LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
+	LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
+	LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
+
+	return supported;
+	} // CSmsAlphabetConverter::IsSupportedL
+
+
+/**
+ *  Tests if the character is supported by the current character set.
+ *  This function can be used with 7bit and 8bit alphabets.
+ * 
+ *  @param aChar                         Character to investigate.
+ *  @param aEncoding                     Alternative 7bit encoding (if used).
+ *  @param aIsDowngrade                  Exit param set to ETrue if the
+ *                                       character has to be downgraded.
+ *  @param aRequiresAlternativeEncoding  Exit param set to ETrue if the
+ *                                       alternative encoding has to be
+ *                                       used to encode it.
+ * 
+ *  @return  ETrue if the character is supported.
+ */
+TBool CSmsAlphabetConverter::IsSupportedL(TChar aChar, TSmsEncoding aEncoding,
+		                                  TBool& aIsDowngrade,
+                                          TBool& aRequiresAlternativeEncoding)
+	{
+	LOGGSMU2("[3] CSmsAlphabetConverter::IsSupportedL(aChar=0x%04x)", (TUint) aChar);
+
+	//
+	// Convert the character...
+	//
+	TInt  numberOfUnconvertibleCharacters, numberOfDowngradedCharacters, 
+            numberRequiringAlternativeEncoding, indexOfFirstUnconvertibleCharacter;
+	TBuf<4>   toEncode;
+
+	toEncode.SetLength(1);
+	toEncode[0]=(TText)aChar;
+
+	TBool supported = IsSupportedL(toEncode, aEncoding, 
+	        numberOfUnconvertibleCharacters,
+	        numberOfDowngradedCharacters,
+	        numberRequiringAlternativeEncoding,
+	        indexOfFirstUnconvertibleCharacter);
+
+	//
+	// Calculate the exit params...
+	//
+	aIsDowngrade                 = (numberOfDowngradedCharacters > 0);
+	aRequiresAlternativeEncoding = (numberRequiringAlternativeEncoding > 0);
+	    
+	//
+	// Useful logging...
+	//
+	LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aIsDowngrade=%d.", aIsDowngrade);
+	LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aRequiresAlternativeEncoding=%d.", aRequiresAlternativeEncoding);
+	LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
 
 	return supported;
 	} // CSmsAlphabetConverter::IsSupportedL
@@ -1468,28 +1590,77 @@
                                           TInt& aNumberRequiringAlternativeEncoding,
                                           TInt& aIndexOfFirstUnconvertibleCharacter)
 	{
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_1, "[2] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", aDes);
+	LOGGSMU2("[4] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", &aDes);
 
 	TInt desLength = aDes.Length();
 	//
-	// Initialise the exit param...
+	// Initialise the exit params...
 	//
+	aNumberOfUnconvertibleCharacters    = 0;
+	aNumberOfDowngradedCharacters       = 0;
 	aNumberRequiringAlternativeEncoding = 0;
+	aIndexOfFirstUnconvertibleCharacter = desLength;
 	
 	//
-	// Create buffer for restored text string...
+	// Create buffers for the input converted to 7Bit and a buffer for it once
+	// converted back again...
 	//
+    HBufC8* encodedBuf       = HBufC8::NewLC(desLength*2); // worse case
     HBufC*  backToUnicodeAfterStdBuf = HBufC::NewLC(desLength);
+    TPtr8  encoded(encodedBuf->Des());
     TPtr  backToUnicodeAfterStd(backToUnicodeAfterStdBuf->Des());
-    TBool  isCountDowngrade = ETrue; // Count downgraded chars
+
+    //
+    // Convert the input string to standard 7bit (with downgrades if needed)...
+    // 
+    PrepareForConversionFromNativeL(ESmsEncodingNone);
+
+    TInt  notConverted = iCharacterSetConverter.ConvertFromUnicode(encoded, aDes);
+
+    if (notConverted > 0)
+        {
+        aNumberOfUnconvertibleCharacters += notConverted;
+        }
+    else if (notConverted < 0)
+        {
+        aNumberOfUnconvertibleCharacters = desLength;
+        }
     
     //
-    // Convert the character...
-    //   
-    ConvertWith7BitEncodingL(aDes, backToUnicodeAfterStd, 
-            aNumberOfUnconvertibleCharacters, aNumberOfDowngradedCharacters, 
-            aIndexOfFirstUnconvertibleCharacter, isCountDowngrade);
-    
+    // Convert it back again to the native format...
+    //
+    TInt  state       = CCnvCharacterSetConverter::KStateDefault;
+    TInt  notRestored = iCharacterSetConverter.ConvertToUnicode(backToUnicodeAfterStd, encoded, state);
+
+    if (notRestored > 0)
+        {
+        aNumberOfUnconvertibleCharacters += notRestored;
+        }
+    else if (notRestored < 0)
+        {
+        aNumberOfUnconvertibleCharacters = desLength;
+        }
+
+    //
+    // Work out if the string is acceptable as it is (e.g. no unconvertible
+    // and no downgrades).
+    //
+    for (TInt pos = desLength-1;  pos >= 0;  --pos)
+        {
+        if (backToUnicodeAfterStd[pos] != aDes[pos])
+            {
+            if (backToUnicodeAfterStd[pos] != KReplacementCharacter)
+                {
+                aNumberOfDowngradedCharacters++;
+                }
+            else
+                {
+                aNumberOfUnconvertibleCharacters++;
+                aIndexOfFirstUnconvertibleCharacter = pos;
+                }
+            }
+        }
+
     TInt  totalCharFaultsSoFar = aNumberOfUnconvertibleCharacters + 
                                     aNumberOfDowngradedCharacters;
     
@@ -1523,12 +1694,73 @@
         TInt  tmpDowngradedCharacters        = 0;
         TInt  tmpUnconvertibleCharacters     = 0;
         TInt  tmpIndexOfFirstUnconvertibleCharacter = desLength;
-        
-        ConvertWithAlternativeEncodingL(aDes, backToUnicodeAfterStd, aEncoding,
-                tmpUnconvertibleCharacters, tmpDowngradedCharacters,
-                aNumberRequiringAlternativeEncoding,
-                tmpIndexOfFirstUnconvertibleCharacter);       
-        
+		
+        //
+        // Convert the input string to the alternative encoding...
+        //
+        PrepareForConversionFromNativeL(aEncoding);
+
+        notConverted = iCharacterSetConverter.ConvertFromUnicode(encoded, aDes);
+        if (notConverted > 0)
+            {
+            tmpUnconvertibleCharacters = notConverted;
+            }
+        else if (notConverted < 0)
+            {
+            tmpUnconvertibleCharacters = desLength;
+            }
+
+        //
+        // Convert it back again to the native format...
+        //
+        HBufC*  backToUnicodeAfterAltBuf = HBufC::NewLC(desLength);
+        TPtr  backToUnicodeAfterAlt(backToUnicodeAfterAltBuf->Des());
+        TInt  state       = CCnvCharacterSetConverter::KStateDefault;
+        TInt  notRestored = iCharacterSetConverter.ConvertToUnicode(backToUnicodeAfterAlt, encoded, state);
+
+        if (notRestored > 0)
+            {
+            tmpUnconvertibleCharacters += notRestored;
+            }
+        else if (notRestored < 0)
+            {
+            tmpUnconvertibleCharacters = desLength;
+            }
+
+        //
+        // Now work out which characters are downgrades, require alternative encoding
+        // or are unsupported.
+        //
+        for (TInt pos = desLength-1;  pos >= 0;  --pos)
+            {
+            if (backToUnicodeAfterStd[pos] != aDes[pos])
+                {
+                // Not supported by standard encoder...
+                if (backToUnicodeAfterAlt[pos] == aDes[pos])
+                    {
+                    // Supported by alternative encoder...
+                    aNumberRequiringAlternativeEncoding++;
+                    }
+                else if (backToUnicodeAfterStd[pos] != KReplacementCharacter)
+                    {
+                    // Downgraded by standard encoder...
+                    tmpDowngradedCharacters++;
+                    }
+                else if (backToUnicodeAfterAlt[pos] != KReplacementCharacter)
+                    {
+                    // Downgraded by alternative encoder...
+                    tmpDowngradedCharacters++;
+                    aNumberRequiringAlternativeEncoding++;
+                    }
+                else
+                    {
+                    // Unconvertible...
+                    tmpUnconvertibleCharacters++;
+                    tmpIndexOfFirstUnconvertibleCharacter = pos;
+                    }
+                }
+            }
+
         // Is this better?  
         if ( totalCharFaultsSoFar >= (tmpUnconvertibleCharacters + tmpDowngradedCharacters) )
             {
@@ -1542,238 +1774,29 @@
             // Best conversion is the standard conversion
             aNumberRequiringAlternativeEncoding = 0;
             }
+        
+        CleanupStack::PopAndDestroy(backToUnicodeAfterAltBuf);
         }
     
-    CleanupStack::PopAndDestroy(backToUnicodeAfterStdBuf);   
- 
+    CleanupStack::PopAndDestroy(backToUnicodeAfterStdBuf);
+    CleanupStack::PopAndDestroy(encodedBuf);
+
 	//
 	// Useful logging...
 	//
 	TBool  supported = (aNumberOfUnconvertibleCharacters == 0);
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_2, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_3, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfDowngradedCharacters=%d.", aNumberOfDowngradedCharacters);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_4, "CSmsAlphabetConverter::IsSupportedL(): aNumberRequiringAlternativeEncoding=%d.", aNumberRequiringAlternativeEncoding);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_5, "CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_6, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
+	LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
+	LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aNumberOfDowngradedCharacters=%d.", aNumberOfDowngradedCharacters);
+	LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aNumberRequiringAlternativeEncoding=%d.", aNumberRequiringAlternativeEncoding);
+	LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
+	LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
 
 	return supported;
 	} // CSmsAlphabetConverter::IsSupportedL
 
 
 /**
- *  Tests if the descriptor text is supported by the current character set.
- * 
- *  @param aDes                                 Text string to check.
- *  @param aRestoredDes                         Exit restored text string after conversion.
- *  @param aNumberOfUnconvertibleCharacters     Exit param for the number of
- *                                              characters unconvertible.
- *  @param aNumberOfDowngradedCharacters        Exit param for the number of
- *                                              downgraded characters.
- *  @param aIndexOfFirstUnconvertibleCharacter  Exit param for the first
- *                                              unconverted character.
- *  @param aIsCountDowngrade                    Flag for counting downgrades.
- */
-void CSmsAlphabetConverter::ConvertWith7BitEncodingL(const TDesC& aDes, TDes& aRestoredDes,
-                                          TInt& aNumberOfUnconvertibleCharacters,
-                                          TInt& aNumberOfDowngradedCharacters,
-                                          TInt& aIndexOfFirstUnconvertibleCharacter,
-                                          TBool aIsCountDowngrade)
-    {
- 	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_1, "CSmsAlphabetConverter::ConvertWith7BitEncodingL(aDes=\"%S\")", aDes);
-
-    TInt desLength = aDes.Length();
-    //
-    // Initialise the exit params...
-    //
-    aNumberOfUnconvertibleCharacters    = 0;
-    aNumberOfDowngradedCharacters       = 0;
-    aIndexOfFirstUnconvertibleCharacter = desLength;
-    
-    //
-    // Create buffer for the input converted to 7Bit.
-    //
-    HBufC8* encodedBuf       = HBufC8::NewLC(desLength*2); // worse case
-    TPtr8  encoded(encodedBuf->Des());
-
-    //
-    // Convert the input string to standard 7bit (with downgrades if needed)...
-    // 
-    PrepareForConversionFromNativeL(ESmsEncodingNone);
-
-    TInt  notConverted = iCharacterSetConverter.ConvertFromUnicode(encoded, aDes);
-
-    if (notConverted > 0)
-        {
-        aNumberOfUnconvertibleCharacters += notConverted;
-        }
-    else if (notConverted < 0)
-        {
-        aNumberOfUnconvertibleCharacters = desLength;
-        }
-    
-    //
-    // Convert it back again to the native format...
-    //
-    TInt  state       = CCnvCharacterSetConverter::KStateDefault;
-    TInt  notRestored = iCharacterSetConverter.ConvertToUnicode(aRestoredDes, encoded, state);
-
-    if (notRestored > 0)
-        {
-        aNumberOfUnconvertibleCharacters += notRestored;
-        }
-    else if (notRestored < 0)
-        {
-        aNumberOfUnconvertibleCharacters = desLength;
-        }
-
-    //
-    // Work out if the string is acceptable as it is (e.g. no unconvertible
-    // and no downgrades).
-    //
-    for (TInt pos = desLength-1;  pos >= 0;  --pos)
-        {
-        if (aRestoredDes[pos] != aDes[pos])
-            {
-            if (aRestoredDes[pos] != KReplacementCharacter
-                    && aIsCountDowngrade)
-                {
-                ++aNumberOfDowngradedCharacters;
-                }
-            else
-                {
-                ++aNumberOfUnconvertibleCharacters;
-                aIndexOfFirstUnconvertibleCharacter = pos;
-                }
-            }
-        }
-    
-    CleanupStack::PopAndDestroy(encodedBuf);
-    
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_2, "CSmsAlphabetConverter::ConvertWith7BitEncodingL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_3, "CSmsAlphabetConverter::ConvertWith7BitEncodingL(): aNumberOfDowngradedCharacters=%d.", aNumberOfDowngradedCharacters);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_4, "CSmsAlphabetConverter::ConvertWith7BitEncodingL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
-    } // CSmsAlphabetConverter::ConvertWith7BitEncodingL    
-
-/**
- *  Tests if the descriptor text is supported by given encoding.
- *  This function can be used with 7bit and 8bit alphabets.
- * 
- *  @param aDes                                 Text string to check.
- *  @param aRestoredStdDes                      Text string restored from 7bit encoding.
- *  @param aEncoding                            Alternative 7bit encoding.
- *  @param aNumberOfUnconvertibleCharacters     Exit param for the number of
- *                                              characters unconvertible.
- *  @param aNumberOfDowngradedCharacters        Exit param for the number of
- *                                              downgraded characters.
- *  @param aNumberRequiringAlternativeEncoding  Exit param for the number of
- *                                              characters requiring use of
- *                                              the alternative encoder.
- *  @param aIndexOfFirstUnconvertibleCharacter  Exit param for the first
- */
-void CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(const TDesC& aDes, const TDesC& aRestoredStdDes, 
-                                          TSmsEncoding aEncoding,
-                                          TInt& aNumberOfUnconvertibleCharacters,
-                                          TInt& aNumberOfDowngradedCharacters,
-                                          TInt& aNumberRequiringAlternativeEncoding,
-                                          TInt& aIndexOfFirstUnconvertibleCharacter)
-    {
-  	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_1, "CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(aDes=\"%S\")", aDes);
-  
-    TInt desLength = aDes.Length();
-    //
-    // Initialise the exit params...
-    //
-    aNumberOfUnconvertibleCharacters    = 0;
-    aNumberOfDowngradedCharacters       = 0;
-    aNumberRequiringAlternativeEncoding = 0;
-    aIndexOfFirstUnconvertibleCharacter = desLength;
-        
-    //
-    // Create buffer for the input converted to 7Bit.
-    //
-    HBufC8* encodedBuf = HBufC8::NewLC(desLength*2); // worse case
-    TPtr8  encoded(encodedBuf->Des());
- 
-    //
-    // Convert the input string to the alternative encoding...
-    //
-    PrepareForConversionFromNativeL(aEncoding);
-
-    TInt notConverted = iCharacterSetConverter.ConvertFromUnicode(encoded, aDes);
-    if (notConverted > 0)
-        {
-        aNumberOfUnconvertibleCharacters = notConverted;
-        }
-    else if (notConverted < 0)
-        {
-        aNumberOfUnconvertibleCharacters = desLength;
-        }
-
-    //
-    // Create buffer for restored text...
-    //
-    HBufC*  backToUnicodeBuf = HBufC::NewLC(desLength);
-    TPtr  backToUnicode(backToUnicodeBuf->Des());
-
-    //
-    // Convert it back again to the native format...
-    //
-    TInt  state       = CCnvCharacterSetConverter::KStateDefault;
-    TInt  notRestored = iCharacterSetConverter.ConvertToUnicode(backToUnicode, encoded, state);
-
-    if (notRestored > 0)
-        {
-        aNumberOfUnconvertibleCharacters += notRestored;
-        }
-    else if (notRestored < 0)
-        {
-        aNumberOfUnconvertibleCharacters = desLength;
-        }
-
-    //
-    // Now work out which characters are downgrades, require alternative encoding
-    // or are unsupported.
-    //
-    for (TInt pos = desLength-1;  pos >= 0;  --pos)
-        {
-        if (aRestoredStdDes[pos] != aDes[pos])
-            {
-            // Not supported by standard encoder...
-            if (backToUnicode[pos] == aDes[pos])
-                {
-                // Supported by alternative encoder...
-                ++aNumberRequiringAlternativeEncoding;
-                }
-            else if (aRestoredStdDes[pos] != KReplacementCharacter)
-                {
-                // Downgraded by standard encoder...
-                ++aNumberOfDowngradedCharacters;
-                }
-            else if (backToUnicode[pos] != KReplacementCharacter)
-                {
-                // Downgraded by alternative encoder...
-                ++aNumberOfDowngradedCharacters;
-                ++aNumberRequiringAlternativeEncoding;
-                }
-            else
-                {
-                // Unconvertible...
-                ++aNumberOfUnconvertibleCharacters;
-                aIndexOfFirstUnconvertibleCharacter = pos;
-                }
-            }
-        }
-
-    CleanupStack::PopAndDestroy(2, encodedBuf); // backToUnicode, encodedBuf
-    
- 	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_2, "CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_3, "CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(): aNumberOfDowngradedCharacters=%d.", aNumberOfDowngradedCharacters);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_4, "CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(): aNumberRequiringAlternativeEncoding=%d.", aNumberRequiringAlternativeEncoding);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_5, "CSmsAlphabetConverter::ConvertWithAlternativeEncodingL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
-    } // CSmsAlphabetConverter::ConvertWithAlternativeEncodingL    
-
-/**
  *  Given a piece of text and an alternative encoding, this function works out
  *  which encoding is best to use and returns the ID of that converter.
  * 
@@ -1785,7 +1808,8 @@
 TSmsEncoding CSmsAlphabetConverter::FindBestAlternativeEncodingL(const TDesC& aNativeCharacters,
 									                     		 TSmsEncoding aSuggestedEncoding)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_1, "CSmsAlphabetConverter::FindBestAlternativeEncodingL(): aSuggestedEncoding=%d",aSuggestedEncoding);
+	LOGGSMU2("CSmsAlphabetConverter::FindBestAlternativeEncodingL(): aSuggestedEncoding=%d",
+			 aSuggestedEncoding);
 
 	TSmsEncoding  encodingToUse = ESmsEncodingNone;
 
@@ -1796,7 +1820,6 @@
 	if (aSuggestedEncoding != ESmsEncodingNone  &&
 		iSmsAlphabet == TSmsDataCodingScheme::ESmsAlphabet7Bit)
 		{
-        TInt desLength = aNativeCharacters.Length();
 		TInt  numberOfUnconvertibleCharacters, numberOfDowngradedCharacters;
 		TInt  numberRequiringAlternativeEncoding, indexOfFirstUnconvertibleCharacter;
 		
@@ -1804,62 +1827,53 @@
 		// First try the default encoding (but in this case treat downgrades
 		// as unconverted, since later encoders might do better)...
 		//
-		HBufC*  backToUnicodeAfterStdBuf = HBufC::NewLC(desLength);
-	    TPtr  backToUnicodeAfterStd(backToUnicodeAfterStdBuf->Des());
-	    TBool  isCountDowngrade = ETrue; // Count downgraded chars
-		
-	    ConvertWith7BitEncodingL(aNativeCharacters, backToUnicodeAfterStd, 
-	            numberOfUnconvertibleCharacters, numberOfDowngradedCharacters, 
-	            indexOfFirstUnconvertibleCharacter, isCountDowngrade);
-		
+		IsSupportedL(aNativeCharacters, ESmsEncodingNone,
+					 numberOfUnconvertibleCharacters,
+                     numberOfDowngradedCharacters,
+                     numberRequiringAlternativeEncoding,
+                     indexOfFirstUnconvertibleCharacter);
 
 		TInt leastUnconvertibleCharacters = numberOfUnconvertibleCharacters + numberOfDowngradedCharacters;
 
-		if (leastUnconvertibleCharacters > 0)
-		    {
-            //
-            // Create a list of alternative encodings to try...
-            //
-            TSmsEncoding  encodingList[8];
-            TInt          encodingCount = 0;
-            
-            if (aSuggestedEncoding == ESmsEncodingTurkishLockingAndSingleShift)
-                {
-                encodingList[encodingCount++] = ESmsEncodingTurkishSingleShift;
-                encodingList[encodingCount++] = ESmsEncodingTurkishLockingShift;
-                }
-            else if (aSuggestedEncoding == ESmsEncodingPortugueseLockingAndSingleShift)
-                {
-                encodingList[encodingCount++] = ESmsEncodingPortugueseSingleShift;
-                encodingList[encodingCount++] = ESmsEncodingPortugueseLockingShift;
-                }
-            
-            encodingList[encodingCount++] = aSuggestedEncoding;
-
-            //
-            // Now try the all the alternatives...
-            //
-            for (TInt  encoder = 0;  encoder < encodingCount && leastUnconvertibleCharacters > 0;  ++encoder)
-                {
-                ConvertWithAlternativeEncodingL(aNativeCharacters, backToUnicodeAfterStd, 
-                        encodingList[encoder], 
-                        numberOfUnconvertibleCharacters, 
-                        numberOfDowngradedCharacters,
-                        numberRequiringAlternativeEncoding,
-                        indexOfFirstUnconvertibleCharacter);       
-
-                if (numberOfUnconvertibleCharacters + numberOfDowngradedCharacters < leastUnconvertibleCharacters)
-                    {
-                    encodingToUse = encodingList[encoder];
-                    leastUnconvertibleCharacters = numberOfUnconvertibleCharacters + numberOfDowngradedCharacters;
-                    }
-                }
-		    }
+		//
+		// Create a list of alternative encodings to try...
+		//
+		TSmsEncoding  encodingList[8];
+		TInt          encodingCount = 0;
 		
-            CleanupStack::PopAndDestroy(backToUnicodeAfterStdBuf);
+		if (aSuggestedEncoding == ESmsEncodingTurkishLockingAndSingleShift)
+			{
+			encodingList[encodingCount++] = ESmsEncodingTurkishSingleShift;
+			encodingList[encodingCount++] = ESmsEncodingTurkishLockingShift;
+			}
+		else if (aSuggestedEncoding == ESmsEncodingPortugueseLockingAndSingleShift)
+			{
+			encodingList[encodingCount++] = ESmsEncodingPortugueseSingleShift;
+			encodingList[encodingCount++] = ESmsEncodingPortugueseLockingShift;
+			}
+
+		encodingList[encodingCount++] = aSuggestedEncoding;
+		encodingList[encodingCount++] = ESmsEncodingNone;
+
+		//
+		// Now try the all the alternatives...
+		//
+		for (TInt  encoder = 0;  encoder < encodingCount;  encoder++)
+			{
+			IsSupportedL(aNativeCharacters, encodingList[encoder],
+						 numberOfUnconvertibleCharacters,
+	                     numberOfDowngradedCharacters,
+	                     numberRequiringAlternativeEncoding,
+	                     indexOfFirstUnconvertibleCharacter);
+			if (numberOfUnconvertibleCharacters + numberOfDowngradedCharacters < leastUnconvertibleCharacters)
+				{
+				encodingToUse = encodingList[encoder];
+				leastUnconvertibleCharacters = numberOfUnconvertibleCharacters + numberOfDowngradedCharacters;
+				}
+			}
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_2, "CSmsAlphabetConverter::FindBestAlternativeEncodingL(): encodingToUse=%d", encodingToUse);
+	LOGGSMU2("CSmsAlphabetConverter::FindBestAlternativeEncodingL(): encodingToUse=%d", encodingToUse);
 
 	return encodingToUse;
 	} // CSmsAlphabetConverter::FindBestAlternativeEncoding
@@ -1903,7 +1917,8 @@
  */
 void CSmsAlphabetConverter::PrepareForConversionFromNativeL(TSmsEncoding aEncoding)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_1, "CSmsAlphabetConverter::PrepareForConversionFromNativeL(): aEncoding=%d",aEncoding);
+	LOGGSMU2("CSmsAlphabetConverter::PrepareForConversionFromNativeL(): aEncoding=%d",
+			 aEncoding);
 
 	__ASSERT_DEBUG(iIsBinary==EFalse,Panic(KGsmuPanicUnsupportedAlphabet));
 	switch (iSmsAlphabet)
@@ -1923,7 +1938,8 @@
 					{
 					CCnvCharacterSetConverter::TAvailability  availability;
 		
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_2, "CSmsAlphabetConverter::PrepareForConversionFromNativeL(): Converter 0x%08x",alternativeEncoderID);
+					LOGGSMU2("CSmsAlphabetConverter::PrepareForConversionFromNativeL(): Converter 0x%08x",
+							 alternativeEncoderID);
 					
 					availability = iCharacterSetConverter.PrepareToConvertToOrFromL(alternativeEncoderID, iFs);
 					if (availability == CCnvCharacterSetConverter::EAvailable)
@@ -1992,7 +2008,8 @@
  */
 void CSmsAlphabetConverter::PrepareForConversionToNativeL(TSmsEncoding aEncoding)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_1, "CSmsAlphabetConverter::PrepareForConversionToNativeL(): aEncoding=%d",aEncoding);
+	LOGGSMU2("CSmsAlphabetConverter::PrepareForConversionToNativeL(): aEncoding=%d",
+			 aEncoding);
 
 	switch (iSmsAlphabet)
 		{
@@ -2011,7 +2028,8 @@
 					{
 					CCnvCharacterSetConverter::TAvailability  availability;
 		
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_2, "CSmsAlphabetConverter::PrepareForConversionFromNativeL(): Converter 0x%08x",alternativeEncoderID);
+					LOGGSMU2("CSmsAlphabetConverter::PrepareForConversionFromNativeL(): Converter 0x%08x",
+							 alternativeEncoderID);
 					
 					availability = iCharacterSetConverter.PrepareToConvertToOrFromL(alternativeEncoderID, iFs);
 					if (availability == CCnvCharacterSetConverter::EAvailable)
@@ -2066,7 +2084,7 @@
  */
 void CSmsAlphabetConverter::GetAlternativeEncoderIDL(TSmsEncoding aEncoding, TUint& aEncoderID) const
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_GETALTERNATIVEENCODERIDL_1, "CSmsAlphabetConverter::GetAlternativeEncoderIDL(%d)", aEncoding);
+	LOGGSMU2("CSmsAlphabetConverter::GetAlternativeEncoderIDL(%d)", aEncoding);
 
 	aEncoderID = 0;
 	
@@ -2139,7 +2157,7 @@
 //
 TPtr16 CSmsAlphabetConverter::CheckAllocBufferL(HBufC16** aBuffer,TInt aMaxLength,TInt aUsedLength)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL_1, "CSmsAlphabetConverter::CheckAllocBufferL()");
+	LOGGSMU1("CSmsAlphabetConverter::CheckAllocBufferL()");
 
 	if (*aBuffer!=NULL)
 		{
@@ -2162,7 +2180,7 @@
 //
 TPtr8 CSmsAlphabetConverter::CheckAllocBufferL(HBufC8** aBuffer,TInt aMaxLength,TInt aUsedLength)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL1_1, "CSmsAlphabetConverter::CheckAllocBufferL()");
+	LOGGSMU1("CSmsAlphabetConverter::CheckAllocBufferL()");
 
 	if (*aBuffer!=NULL)
 		{
@@ -2190,7 +2208,7 @@
  */
 EXPORT_C TBool TGsmSmsTelNumber::IsInstanceOf(TTypeOfIndicator aType)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TGSMSMSTELNUMBER_ISINSTANCEOF_1, "TGsmSmsTelNumber::IsInstanceOf()");
+    LOGGSMU1("TGsmSmsTelNumber::IsInstanceOf()");
 
     TBool rc = EFalse;
 
@@ -2213,7 +2231,7 @@
 
 CSmsAddress* CSmsAddress::NewL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_NEWL_1, "CSmsAddress::NewL()");
+	LOGGSMU1("CSmsAddress::NewL()");
 
 	CSmsAddress* address=new(ELeave) CSmsAddress(aCharacterSetConverter,aFs);
 	CleanupStack::PushL(address);
@@ -2237,7 +2255,7 @@
  */
 CSmsAddress* CSmsAddress::DuplicateL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_DUPLICATEL_1, "CSmsAddress::DuplicateL()");
+	LOGGSMU1("CSmsAddress::DuplicateL()");
 
 	CSmsAddress*  address = CSmsAddress::NewL(iCharacterSetConverter, iFs);
 	CleanupStack::PushL(address);
@@ -2252,7 +2270,7 @@
 
 TPtrC CSmsAddress::Address() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_ADDRESS_1, "CSmsAddress::Address()");
+	LOGGSMU1("CSmsAddress::Address()");
 
 	TPtrC ptr;
 	if (iBuffer)
@@ -2263,7 +2281,7 @@
 
 void CSmsAddress::SetRawAddressL(TGsmSmsTypeOfAddress aTypeOfAddress, TPtrC aBufferPtr)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_SETRAWADDRESSL_1, "CSmsAddress::SetRawAddressL()");
+    LOGGSMU1("CSmsAddress::SetRawAddressL()");
 
     iTypeOfAddress = aTypeOfAddress;
 
@@ -2275,7 +2293,7 @@
 
 TGsmSmsTypeOfAddress& CSmsAddress::TypeOfAddress()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_TYPEOFADDRESS_1, "CSmsAddress::TypeOfAddress()");
+    LOGGSMU1("CSmsAddress::TypeOfAddress()");
 
     return iTypeOfAddress;
     } // CSmsAddress::TypeOfAddress
@@ -2283,7 +2301,7 @@
 
 void CSmsAddress::SetAddressL(const TDesC& aAddress)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_SETADDRESSL_1, "CSmsAddress::SetAddressL()");
+	LOGGSMU1("CSmsAddress::SetAddressL()");
 
 	TInt length=aAddress.Length();
 	NewBufferL(length);
@@ -2343,7 +2361,7 @@
 
 void CSmsAddress::SetParsedAddressL(const TGsmSmsTelNumber& aParsedAddress)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_SETPARSEDADDRESSL_1, "CSmsAddress::SetParsedAddressL()");
+	LOGGSMU1("CSmsAddress::SetParsedAddressL()");
 
 	iTypeOfAddress=aParsedAddress.iTypeOfAddress;
 	DoSetParsedAddressL(aParsedAddress.iTelNumber);
@@ -2352,7 +2370,7 @@
 
 TUint8 CSmsAddress::SizeL()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_SIZEL_1, "CSmsAddress::SizeL()");
+    LOGGSMU1("CSmsAddress::SizeL()");
 
     TUint8 size = 0;
 
@@ -2712,7 +2730,7 @@
 
 void CSmsAddress::NewBufferL(TInt aLength)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_NEWBUFFERL_1, "CSmsAddress::NewBufferL()");
+	LOGGSMU1("CSmsAddress::NewBufferL()");
 
     HBufC* buffer=HBufC::NewL(aLength);
     delete iBuffer;
@@ -2724,7 +2742,7 @@
 
 void CSmsAddress::DoSetParsedAddressL(const TDesC& aAddress)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_DOSETPARSEDADDRESSL_1, "CSmsAddress::DoSetParsedAddressL() the length of the Address [Length = %d", aAddress.Length());
+	LOGGSMU2("CSmsAddress::DoSetParsedAddressL() the length of the Address [Length = %d", aAddress.Length());
 
 	TInt length=aAddress.Length();
 	if ((iTypeOfAddress.TON()==EGsmSmsTONInternationalNumber) &&
@@ -2758,7 +2776,7 @@
 
 TUint8* TSmsServiceCenterTimeStamp::EncodeL(TUint8* aPtr) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSSERVICECENTERTIMESTAMP_ENCODEL_1, "TSmsServiceCenterTimeStamp::EncodeL()");
+    LOGGSMU1("TSmsServiceCenterTimeStamp::EncodeL()");
 
     TInt numquarterhours=iTimeZoneNumQuarterHours;
 
@@ -2800,7 +2818,7 @@
 
 void TSmsServiceCenterTimeStamp::DecodeL(TGsmuLex8& aPdu, TInt& aTimeError)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSSERVICECENTERTIMESTAMP_DECODEL_1, "TSmsServiceCenterTimeStamp::DecodeL()");
+	LOGGSMU1("TSmsServiceCenterTimeStamp::DecodeL()");
 
 	TSmsOctet octet;
 	octet.DecodeL(aPdu);
@@ -2887,7 +2905,7 @@
 
 TTime TSmsValidityPeriod::Time() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSVALIDITYPERIOD_TIME_1, "TSmsValidityPeriod::Time()");
+	LOGGSMU1("TSmsValidityPeriod::Time()");
 
 	TTime time;
 	time.UniversalTime();
@@ -2898,7 +2916,7 @@
 
 TUint8* TSmsValidityPeriod::EncodeL(TUint8* aPtr) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSVALIDITYPERIOD_ENCODEL_1, "TSmsValidityPeriod::EncodeL()");
+	LOGGSMU1("TSmsValidityPeriod::EncodeL()");
 
 	TInt validityperiodformat=ValidityPeriodFormat();
 	switch (validityperiodformat)
@@ -2944,7 +2962,7 @@
 	
 TUint8* TSmsValidityPeriod::EncodeL(TUint8* aPtr, const TEncodeParams* aEncodeParams) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSVALIDITYPERIOD_ENCODEL1_1, "TSmsValidityPeriod::EncodeL()");
+	LOGGSMU1("TSmsValidityPeriod::EncodeL()");
 
 	TInt validityperiodformat=ValidityPeriodFormat();
 	switch (validityperiodformat)
@@ -2996,7 +3014,7 @@
 
 void TSmsValidityPeriod::DecodeL(TGsmuLex8& aPdu)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSVALIDITYPERIOD_DECODEL_1, "TSmsValidityPeriod::DecodeL()");
+	LOGGSMU1("TSmsValidityPeriod::DecodeL()");
 
 	TInt validityperiodformat=ValidityPeriodFormat();
 	switch (validityperiodformat)
@@ -3051,7 +3069,7 @@
 
 CSmsInformationElement* CSmsInformationElement::NewL(TSmsInformationElementIdentifier aIdentifier,const TDesC8& aData)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSINFORMATIONELEMENT_NEWL_1, "CSmsInformationElement::NewL()");
+	LOGGSMU1("CSmsInformationElement::NewL()");
 
 	CSmsInformationElement* informationelement=new(ELeave) CSmsInformationElement(aIdentifier);
 	CleanupStack::PushL(informationelement);
@@ -3063,7 +3081,7 @@
 
 CSmsInformationElement* CSmsInformationElement::NewL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSINFORMATIONELEMENT_NEWL1_1, "CSmsInformationElement::NewL()");
+	LOGGSMU1("CSmsInformationElement::NewL()");
 
 	CSmsInformationElement* informationelement=new(ELeave) CSmsInformationElement(ESmsIEIConcatenatedShortMessages8BitReference);
 	CleanupStack::PushL(informationelement);
@@ -3091,7 +3109,7 @@
  */
 EXPORT_C TPtr8 CSmsInformationElement::Data()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSINFORMATIONELEMENT_DATA_1, "CSmsInformationElement::Data()");
+	LOGGSMU1("CSmsInformationElement::Data()");
 
 	return iData->Des();
 	} // CSmsInformationElement::Data
@@ -3105,7 +3123,7 @@
  */
 EXPORT_C const TDesC8& CSmsInformationElement::Data() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSINFORMATIONELEMENT_DATA1_1, "CSmsInformationElement::Data()");
+	LOGGSMU1("CSmsInformationElement::Data()");
 
 	return *iData;
 	} // CSmsInformationElement::Data
@@ -3125,7 +3143,7 @@
 
 TUint8* CSmsInformationElement::EncodeL(TUint8* aPtr) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSINFORMATIONELEMENT_ENCODEL_1, "CSmsInformationElement::EncodeL()");
+	LOGGSMU1("CSmsInformationElement::EncodeL()");
 
 	TSmsOctet id=iIdentifier;
 	aPtr=id.EncodeL(aPtr);
@@ -3139,7 +3157,7 @@
 
 void CSmsInformationElement::DecodeL(TGsmuLex8& aPdu)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSINFORMATIONELEMENT_DECODEL_1, "CSmsInformationElement::DecodeL()");
+	LOGGSMU1("CSmsInformationElement::DecodeL()");
 
 	TSmsOctet id;
 	id.DecodeL(aPdu);
@@ -3246,7 +3264,7 @@
 
 void CSmsInformationElement::ConstructL(const TDesC8& aData)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSINFORMATIONELEMENT_CONSTRUCTL_1, "CSmsInformationElement::ConstructL()");
+	LOGGSMU1("CSmsInformationElement::ConstructL()");
 
 	NewDataL(aData.Length());
 	iData->Des().Copy(aData);
@@ -3255,7 +3273,7 @@
 
 void CSmsInformationElement::NewDataL(TInt aLength)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSINFORMATIONELEMENT_NEWDATAL_1, "CSmsInformationElement::NewDataL()");
+	LOGGSMU1("CSmsInformationElement::NewDataL()");
 
 	HBufC8* data=HBufC8::NewL(aLength);
 	delete iData;
@@ -3266,7 +3284,7 @@
 
 TUint CSmsInformationElement::Length()const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSINFORMATIONELEMENT_LENGTH_1, "CSmsInformationElement::Length()");
+	LOGGSMU1("CSmsInformationElement::Length()");
 
 	return 2+iData->Length();  // 2 stands for IEID and IEDL
 	} // CSmsInformationElement::Length
@@ -3287,7 +3305,7 @@
  */
 TBool TSmsInformationElementCategories::TranslateCategoryToIndex(TInformationElementId aId, TInt& aIndex)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSINFORMATIONELEMENTCATEGORIES_TRANSLATECATEGORYTOINDEX_1, "CSmsMessage::TranslateCategoryToIndex");
+    LOGGSMU1("CSmsMessage::TranslateCategoryToIndex");
 
     TBool rc = ETrue;
 
@@ -3366,7 +3384,7 @@
     else
         {
         rc = EFalse;
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSINFORMATIONELEMENTCATEGORIES_TRANSLATECATEGORYTOINDEX_2, "CSmsMessage::TranslateCategoryToIndex id = %d, found = %d", aId, rc);
+        LOGGSMU3("CSmsMessage::TranslateCategoryToIndex id = %d, found = %d", aId, rc);
         }
     return rc;
     } // TSmsInformationElementCategories::TranslateCategoryToIndex
@@ -3387,7 +3405,7 @@
  */
 TBool TSmsInformationElementCategories::GetCategoryDefinition(TInformationElementId aId, TInformationElementCategory& aCategory)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSINFORMATIONELEMENTCATEGORIES_GETCATEGORYDEFINITION_1, "TSmsInformationElementCategories::GetCategoryDefinition");
+    LOGGSMU1("TSmsInformationElementCategories::GetCategoryDefinition");
     TInt index;
 
     if (TranslateCategoryToIndex(aId,index))
@@ -3396,7 +3414,7 @@
         }
     else
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSINFORMATIONELEMENTCATEGORIES_GETCATEGORYDEFINITION_2, "TSmsInformationElementCategories::GetCategoryDefinition, Failure, aId = %d", aId);
+        LOGGSMU2("TSmsInformationElementCategories::GetCategoryDefinition, Failure, aId = %d", aId);
         return EFalse;
         }
 
@@ -3418,7 +3436,7 @@
 
 CSmsUserData* CSmsUserData::NewL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs,TSmsFirstOctet& aFirstOctet,const TSmsDataCodingScheme& aDataCodingScheme)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_NEWL_1, "CSmsUserData::NewL()");
+	LOGGSMU1("CSmsUserData::NewL()");
 
 	CSmsUserData* userdata=new(ELeave) CSmsUserData(aCharacterSetConverter,aFs,aFirstOctet,aDataCodingScheme);
 	CleanupStack::PushL(userdata);
@@ -3447,7 +3465,7 @@
  */
 EXPORT_C  CSmsInformationElement& CSmsUserData::InformationElement(TInt aIndex) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_INFORMATIONELEMENT_1, "CSmsUserData::InformationElement()");
+	LOGGSMU1("CSmsUserData::InformationElement()");
 
 	return *iInformationElementArray[aIndex];
 	} // CSmsUserData::InformationElement
@@ -3455,7 +3473,7 @@
 
 CSmsInformationElement*& CSmsUserData::InformationElementPtr(TInt aIndex)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_INFORMATIONELEMENTPTR_1, "CSmsUserData::InformationElementPtr()");
+    LOGGSMU1("CSmsUserData::InformationElementPtr()");
 
     return iInformationElementArray[aIndex];
     } // CSmsUserData::InformationElementPtr
@@ -3475,7 +3493,7 @@
  */
 EXPORT_C TBool CSmsUserData::InformationElementIndex(CSmsInformationElement::TSmsInformationElementIdentifier aIdentifier,TInt& aIndex) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_INFORMATIONELEMENTINDEX_1, "CSmsUserData::InformationElementIndex()");
+	LOGGSMU1("CSmsUserData::InformationElementIndex()");
 
 	TBool found=EFalse;
 	TInt count=NumInformationElements();
@@ -3503,7 +3521,7 @@
  */
 EXPORT_C TBool CSmsUserData::InformationElementLastIndex(CSmsInformationElement::TSmsInformationElementIdentifier aIdentifier,TInt& aIndex) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_INFORMATIONELEMENTLASTINDEX_1, "CSmsUserData::InformationElementLastIndex()");
+	LOGGSMU1("CSmsUserData::InformationElementLastIndex()");
 
 	TBool found=EFalse;
 	TInt count=NumInformationElements();
@@ -3530,7 +3548,7 @@
  */
 void CSmsUserData::InformationElementIndicesL(CSmsInformationElement::TSmsInformationElementIdentifier aIdentifier, CArrayFixFlat<TInt>& aIndices) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_INFORMATIONELEMENTINDICESL_1, "CSmsUserData::InformationElementIndicesL()");
+    LOGGSMU1("CSmsUserData::InformationElementIndicesL()");
 
     aIndices.Reset();
     
@@ -3553,7 +3571,7 @@
  */
 TBool CSmsUserData::EmsInformationElementWillFitL(CEmsInformationElement* aIe,CSmsEMSBufferSegmenter& aSeg,TUint& aCharsAddedToCurrentPDU)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_EMSINFORMATIONELEMENTWILLFITL_1, "CSmsUserData::EmsInformationElementWillFitL()");
+	LOGGSMU1("CSmsUserData::EmsInformationElementWillFitL()");
 
 	// Before using an EmsInformationElement polymorphically as an SmsIE,
 	// we need to make sure that the IE has been encoded
@@ -3586,7 +3604,7 @@
  */
 TBool CSmsUserData::ControlInformationElementWillFitL(CSmsInformationElement* aIe)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_CONTROLINFORMATIONELEMENTWILLFITL_1, "CSmsUserData::ControlInformationElementWillFitL()");
+    LOGGSMU1("CSmsUserData::ControlInformationElementWillFitL()");
 
     if (aIe == NULL)
         {
@@ -3649,7 +3667,7 @@
  */
 EXPORT_C void CSmsUserData::AddInformationElementL(TSmsId aIdentifier,const TDesC8& aData)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_ADDINFORMATIONELEMENTL_1, "CSmsUserData::AddInformationElementL");
+    LOGGSMU1("CSmsUserData::AddInformationElementL");
 
     if  ((aIdentifier >= 0x21) && (aIdentifier <= 0x23) ||
          (aIdentifier >= 0x26) && (aIdentifier <= 0x6F) ||
@@ -3674,7 +3692,7 @@
  */
 void CSmsUserData::UpdateInformationElementArrayL(TSmsId aIdentifier,const TDesC8& aData)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_1, "CSmsUserData::UpdateInformationElementsL");
+    LOGGSMU1("CSmsUserData::UpdateInformationElementsL");
 
     TInt count=NumInformationElements();
     if(!CEmsFactory::Supported(aIdentifier))
@@ -3696,7 +3714,7 @@
                         {
                         if (InformationElement(i).Identifier() == CSmsInformationElement::ESmsIEISpecialSMSMessageIndication)
                             {
-                            OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_2, "CSmsUserData::AddInformationElementL1 category = %d, identifier = %d",category,aIdentifier);
+                            LOGGSMU3("CSmsUserData::AddInformationElementL1 category = %d, identifier = %d",category,aIdentifier);
 
                             //if Msg type is the same, swap with the most recent value
                             if ((InformationElement(i).Data()[0] & ((TUint8) EGsmSmsSpecialMessageIndicationTypeMask)) ==
@@ -3707,7 +3725,7 @@
                             }
                         else
                             {
-                            OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_3, "CSmsUserData::AddInformationElementL3 category = %d, identifier = %d, data = %s",category,aIdentifier, aData);
+                            LOGGSMU4("CSmsUserData::AddInformationElementL3 category = %d, identifier = %d, data = %S",category,aIdentifier, &aData);
                             User::Leave(KErrArgument);
                             }
                         break;
@@ -3716,18 +3734,18 @@
                     case TSmsInformationElementCategories::ECtrlMandatoryIn1stPDUOnly:
                     case TSmsInformationElementCategories::ECtrlSingleInstanceOnly:
                         {
-                        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_4, "CSmsUserData::AddInformationElementL4 category = %d, identifier = %d",category,aIdentifier);
+                        LOGGSMU3("CSmsUserData::AddInformationElementL4 category = %d, identifier = %d",category,aIdentifier);
                         User::Leave(KErrAlreadyExists);
                         break;
                         }
                     case TSmsInformationElementCategories::ECtrlMultipleInstancesAllowed:
                         {
-                        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_5, "CSmsUserData::AddInformationElementL5 category = %d, identifier = %d",category,aIdentifier);
+                        LOGGSMU3("CSmsUserData::AddInformationElementL5 category = %d, identifier = %d",category,aIdentifier);
                         break;
                         }
                     case TSmsInformationElementCategories::ECtrlMandatoryInEveryPDUButWithValueSpecificToPDU:
                         {
-                        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_6, "CSmsUserData::AddInformationElementL6 category = %d, identifier = %d",category,aIdentifier);
+                        LOGGSMU3("CSmsUserData::AddInformationElementL6 category = %d, identifier = %d",category,aIdentifier);
                         User::Leave(KErrAlreadyExists);
                         // currently the email header is updated in:
                         // void CSmsMessage::DecodeBufferL(CArrayPtr<CSmsPDU>& aSmsPDUArray,CSmsBufferBase& aBuffer)
@@ -3735,7 +3753,7 @@
                         }
                     default:
                         {
-                        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_7, "CSmsUserData::AddInformationElementL8 category = %d, identifier = %d",category,aIdentifier);
+                        LOGGSMU3("CSmsUserData::AddInformationElementL8 category = %d, identifier = %d",category,aIdentifier);
                         User::Leave(KErrNotSupported);
                         break;
                         }
@@ -3754,7 +3772,7 @@
 
 void CSmsUserData::AddEmsInformationElementL(CEmsInformationElement* aIe)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_ADDEMSINFORMATIONELEMENTL_1, "CSmsUserData::AddEmsInformationElementL()");
+	LOGGSMU1("CSmsUserData::AddEmsInformationElementL()");
 
 	// Before using an EmsInformationElement polymorphically as an SmsIE,
 	// we need to make sure that the IE has been encoded
@@ -3772,7 +3790,7 @@
  */
 EXPORT_C void CSmsUserData::RemoveInformationElement(TInt aIndex)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_REMOVEINFORMATIONELEMENT_1, "CSmsUserData::RemoveInformationElement()");
+	LOGGSMU1("CSmsUserData::RemoveInformationElement()");
 	// Since iInformationElementArray[aIndex] pointer is removed from iInformationElementArray, there is no double free issue.
 	// coverity[double_free]
 	delete iInformationElementArray[aIndex];
@@ -3788,7 +3806,7 @@
 
 TInt CSmsUserData::MaxPackedUDUnitsInBodyRemaining() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_MAXPACKEDUDUNITSINBODYREMAINING_1, "CSmsUserData::MaxPackedUDUnitsInBodyRemaining()");
+	LOGGSMU1("CSmsUserData::MaxPackedUDUnitsInBodyRemaining()");
 
 	TInt totalHeaderLengthInUDLUnits=TotalHeaderLengthInUDLUnits();
 	TInt maxPackedUDUnitsInBody=0;
@@ -3814,7 +3832,7 @@
 
 TInt CSmsUserData::MaxPackedUDUnitsInBodyRemaining(TUint aIELen) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_MAXPACKEDUDUNITSINBODYREMAINING1_1, "CSmsUserData::MaxPackedUDUnitsInBodyRemaining()");
+	LOGGSMU1("CSmsUserData::MaxPackedUDUnitsInBodyRemaining()");
 
 	TInt totalHeaderLengthInUDLUnits=TotalHeaderLengthInUDLUnits(aIELen);
 	TInt maxPackedUDUnitsInBody=0;
@@ -3843,7 +3861,7 @@
  */
 EXPORT_C TInt CSmsUserData::MaxBodyLengthInChars() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_MAXBODYLENGTHINCHARS_1, "CSmsUserData::MaxBodyLengthInChars()");
+	LOGGSMU1("CSmsUserData::MaxBodyLengthInChars()");
 
 	TInt totalheaderlengthinudlunits=TotalHeaderLengthInUDLUnits();
 	TInt maxbodylengthinchars=0;
@@ -3871,7 +3889,7 @@
 				break;
 				}
 			default:
-			    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_MAXBODYLENGTHINCHARS_2, "CSmsUserData::MaxBodyLengthInChars() WARNING! default case has been reached");
+			    LOGGSMU1("CSmsUserData::MaxBodyLengthInChars() WARNING! default case has been reached");
                 break;
  			}
 		}
@@ -3887,7 +3905,7 @@
  */
 EXPORT_C TPtrC8 CSmsUserData::Body() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_BODY_1, "CSmsUserData::Body()");
+	LOGGSMU1("CSmsUserData::Body()");
 
 	return iBody->Des();
 	} // CSmsUserData::Body
@@ -3901,7 +3919,7 @@
  */
 EXPORT_C void CSmsUserData::SetBodyL(const TDesC8& aBody)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_SETBODYL_1, "CSmsUserData::SetBodyL()");
+	LOGGSMU1("CSmsUserData::SetBodyL()");
 
 	//Some tests fail with this line in, despite it being a valid condition!
 	//__ASSERT_DEBUG(aBody.Length() <= MaxBodyLengthInChars(), User::Leave(KErrTooBig));
@@ -3913,7 +3931,7 @@
 
 void CSmsUserData::AppendBodyL(const TDesC8& aBody)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_APPENDBODYL_1, "CSmsUserData::AppendBodyL()");
+	LOGGSMU1("CSmsUserData::AppendBodyL()");
 
 	if (iBody)
 		{
@@ -3946,21 +3964,11 @@
  */
 EXPORT_C TBool CSmsUserData::IsSupportedL(TChar aChar)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_ISSUPPORTEDL_1, "CSmsUserData::IsSupportedL()");
-
-	TInt  numberOfUnconvertibleCharacters, numberOfDowngradedCharacters, 
-	           numberRequiringAlternativeEncoding, indexOfFirstUnconvertibleCharacter;	
-	TBuf<4>   toEncode;
-    toEncode.SetLength(1);
-    toEncode[0]=(TText)aChar;
+	LOGGSMU1("CSmsUserData::IsSupportedL()");
 
 	CSmsAlphabetConverter* converter=CSmsAlphabetConverter::NewLC(iCharacterSetConverter,iFs,iDataCodingScheme.Alphabet(),IsBinaryData());
-	TBool result=converter->IsSupportedL(toEncode, ESmsEncodingNone, 
-                                         numberOfUnconvertibleCharacters,
-                                         numberOfDowngradedCharacters,
-                                         numberRequiringAlternativeEncoding,
-                                         indexOfFirstUnconvertibleCharacter);	
-	CleanupStack::PopAndDestroy(converter);
+	TBool result=converter->IsSupportedL(aChar);
+	CleanupStack::PopAndDestroy();
 
 	return result;
 	} // CSmsUserData::IsSupportedL
@@ -3983,7 +3991,7 @@
 EXPORT_C TBool CSmsUserData::IsSupportedL(const TDesC& aDes, TInt& aNumberOfUnconvertibleCharacters,
                                           TInt& aIndexOfFirstUnconvertibleCharacter) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_ISSUPPORTEDL1_1, "[1] CSmsUserData::IsSupportedL()");
+	LOGGSMU1("[1] CSmsUserData::IsSupportedL()");
 
 	CSmsAlphabetConverter* converter=CSmsAlphabetConverter::NewLC(iCharacterSetConverter,iFs,iDataCodingScheme.Alphabet(),IsBinaryData());
 	TBool result=converter->IsSupportedL(aDes, aNumberOfUnconvertibleCharacters,
@@ -4020,7 +4028,7 @@
                                           TInt& aNumberRequiringAlternativeEncoding,
                                           TInt& aIndexOfFirstUnconvertibleCharacter) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_ISSUPPORTEDL2_1, "[2] CSmsUserData::IsSupportedL()");
+	LOGGSMU1("[2] CSmsUserData::IsSupportedL()");
 
 	CSmsAlphabetConverter* converter=CSmsAlphabetConverter::NewLC(iCharacterSetConverter,iFs,iDataCodingScheme.Alphabet(),IsBinaryData());
 	TBool result=converter->IsSupportedL(aDes, aEncoding,
@@ -4036,7 +4044,7 @@
 
 TUint8* CSmsUserData::EncodeL(TUint8* aPtr) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_ENCODEL_1, "CSmsUserData::EncodeL()");
+	LOGGSMU1("CSmsUserData::EncodeL()");
 
 	__ASSERT_DEBUG(0<=MaxPackedUDUnitsInBodyRemaining(),Panic(KGsmuPanicUserDataBodyTooLong));
 	// Encode the user data length
@@ -4070,7 +4078,7 @@
 
 void CSmsUserData::DecodeL(TGsmuLex8& aPdu, TBool aAcceptTruncation)
 	{	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_DECODEL1_1, "CSmsUserData::DecodeL()");
+	LOGGSMU1("CSmsUserData::DecodeL()");
 
 	// Reset current data
 	iInformationElementArray.ResetAndDestroy();
@@ -4174,7 +4182,7 @@
 
 void CSmsUserData::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_CONSTRUCTL_1, "CSmsUserData::ConstructL()");
+	LOGGSMU1("CSmsUserData::ConstructL()");
 
 	NewBodyL(0);
 	} // CSmsUserData::ConstructL
@@ -4188,7 +4196,7 @@
 CSmsUserData* CSmsUserData::DuplicateL(TSmsFirstOctet& aFirstOctet,
 									   const TSmsDataCodingScheme& aDataCodingScheme) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_DUPLICATEL_1, "CSmsUserData::DuplicateL()");
+	LOGGSMU1("CSmsUserData::DuplicateL()");
 
 	CSmsUserData*  userdata = CSmsUserData::NewL(iCharacterSetConverter, iFs,
 	                                             aFirstOctet, aDataCodingScheme);
@@ -4222,7 +4230,7 @@
 
 TInt CSmsUserData::HeaderLength() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_HEADERLENGTH_1, "CSmsUserData::HeaderLength()");
+	LOGGSMU1("CSmsUserData::HeaderLength()");
 
 	TInt numinformationelements=NumInformationElements();
 	TInt headerlength=0;
@@ -4234,7 +4242,7 @@
 
 TInt CSmsUserData::TotalHeaderLengthInUDLUnits() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS_1, "CSmsUserData::TotalHeaderLengthInUDLUnits()");
+	LOGGSMU1("CSmsUserData::TotalHeaderLengthInUDLUnits()");
 
 	TInt totalheaderlengthinudlunits=0;
 	if (iInformationElementArray.Count()>0)
@@ -4260,7 +4268,7 @@
 					break;
 					}
 				default:
-				    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS_2, "CSmsUserData::TotalHeaderLengthInUDLUnits() WARNING default case has been reached");
+				    LOGGSMU1("CSmsUserData::TotalHeaderLengthInUDLUnits() WARNING default case has been reached");
                     break;
 				}
 			}
@@ -4271,7 +4279,7 @@
 
 TInt CSmsUserData::TotalHeaderLengthInUDLUnits(TInt aIElen) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS1_1, "CSmsUserData::TotalHeaderLengthInUDLUnits()");
+	LOGGSMU1("CSmsUserData::TotalHeaderLengthInUDLUnits()");
 
 		TInt totalheaderlengthinudlunits=0;
 		TInt totalheaderlength=aIElen;
@@ -4310,7 +4318,7 @@
 
 TInt CSmsUserData::BodyLengthInUDLUnits() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_BODYLENGTHINUDLUNITS_1, "CSmsUserData::BodyLengthInUDLUnits()");
+	LOGGSMU1("CSmsUserData::BodyLengthInUDLUnits()");
 
 	return iBody->Des().Length();
 	} // CSmsUserData::BodyLengthInUDLUnits
@@ -4318,7 +4326,7 @@
 
 void CSmsUserData::NewBodyL(TInt aLength)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_NEWBODYL_1, "CSmsUserData::NewBodyL()");
+	LOGGSMU1("CSmsUserData::NewBodyL()");
 
 
 		HBufC8* body=HBufC8::NewL(aLength);
@@ -4331,7 +4339,7 @@
 
 TBool CSmsUserData::HeaderPresent() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_HEADERPRESENT_1, "CSmsUserData::HeaderPresent()");
+	LOGGSMU1("CSmsUserData::HeaderPresent()");
 
 	return (iFirstOctet&TSmsFirstOctet::ESmsUDHIMask)==TSmsFirstOctet::ESmsUDHIHeaderPresent;
 	} // CSmsUserData::HeaderPresent
@@ -4339,7 +4347,7 @@
 
 void CSmsUserData::SetHeaderPresent(TBool aHeaderPresent)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_SETHEADERPRESENT_1, "CSmsUserData::SetHeaderPresent()");
+	LOGGSMU1("CSmsUserData::SetHeaderPresent()");
 
 	iFirstOctet=aHeaderPresent? (iFirstOctet&(~TSmsFirstOctet::ESmsUDHIMask))|TSmsFirstOctet::ESmsUDHIHeaderPresent: (iFirstOctet&(~TSmsFirstOctet::ESmsUDHIMask))|TSmsFirstOctet::ESmsUDHIHeaderNotPresent;
 	} // CSmsUserData::SetHeaderPresent
@@ -4347,7 +4355,7 @@
 
 TBool CSmsUserData::IsBinaryData() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_ISBINARYDATA_1, "CSmsUserData::IsBinaryData()");
+	LOGGSMU1("CSmsUserData::IsBinaryData()");
 
 	TInt index=0;
 	return (iDataCodingScheme.TextCompressed()) ||
@@ -4369,7 +4377,7 @@
  */
 EXPORT_C void TGsmSmsTypeOfAddress::ConvertToETelMM(NMobilePhone::TMobileTON& aTon,NMobilePhone::TMobileNPI& aNpi) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TGSMSMSTYPEOFADDRESS_CONVERTTOETELMM_1, "TGsmSmsTypeOfAddress::ConvertToETelMM()");
+    LOGGSMU1("TGsmSmsTypeOfAddress::ConvertToETelMM()");
 
     switch (TON())
     {
@@ -4465,7 +4473,7 @@
  */
 EXPORT_C void TGsmSmsTypeOfAddress::SetFromETelMM(NMobilePhone::TMobileTON aTon,NMobilePhone::TMobileNPI aNpi)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TGSMSMSTYPEOFADDRESS_SETFROMETELMM_1, "TGsmSmsTypeOfAddress::SetFromETelMM()");
+    LOGGSMU1("TGsmSmsTypeOfAddress::SetFromETelMM()");
 
     switch (aTon)
     {
@@ -4563,7 +4571,7 @@
  */
 EXPORT_C TVoiceMailInfoType CEnhancedVoiceMailBoxInformation::Type() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_TYPE_1, "CEnhancedVoiceMailBoxInformation::Type()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::Type()");
 
 	return iType;
 	} // CEnhancedVoiceMailBoxInformation::Type
@@ -4581,7 +4589,7 @@
  */
 EXPORT_C void CEnhancedVoiceMailBoxInformation::SetProfile(TSmsMessageProfileType aProfile)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_SETPROFILE_1, "CEnhancedVoiceMailBoxInformation::SetProfile()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::SetProfile()");
 
 	iProfile = aProfile;
 	} // CEnhancedVoiceMailBoxInformation::SetProfile
@@ -4599,7 +4607,7 @@
  */
 EXPORT_C TSmsMessageProfileType CEnhancedVoiceMailBoxInformation::Profile() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_PROFILE_1, "CEnhancedVoiceMailBoxInformation::Profile()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::Profile()");
 
 	return iProfile;
 	} // CEnhancedVoiceMailBoxInformation::Profile
@@ -4618,7 +4626,7 @@
  */
 EXPORT_C void CEnhancedVoiceMailBoxInformation::SetStorage(TBool aIsStored)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_SETSTORAGE_1, "CEnhancedVoiceMailBoxInformation::SetStorage()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::SetStorage()");
 
 	iStorage = aIsStored;
 	} // CEnhancedVoiceMailBoxInformation::SetStorage
@@ -4637,7 +4645,7 @@
  */
 EXPORT_C TBool CEnhancedVoiceMailBoxInformation::Store() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_STORE_1, "CEnhancedVoiceMailBoxInformation::Store()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::Store()");
 
 	return iStorage;
 	} // CEnhancedVoiceMailBoxInformation::Store
@@ -4656,7 +4664,7 @@
  */
 EXPORT_C void CEnhancedVoiceMailBoxInformation::SetAlmostMaximumCapacity(TBool aIsAlmostFull)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_SETALMOSTMAXIMUMCAPACITY_1, "CEnhancedVoiceMailBoxInformation::SetAlmostMaximumCapacity()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::SetAlmostMaximumCapacity()");
 
 	iAlmostFull = aIsAlmostFull;
 	} // CEnhancedVoiceMailBoxInformation::SetAlmostMaximumCapacity
@@ -4675,7 +4683,7 @@
  */
 EXPORT_C TBool CEnhancedVoiceMailBoxInformation::AlmostMaximumCapacity() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_ALMOSTMAXIMUMCAPACITY_1, "CEnhancedVoiceMailBoxInformation::AlmostMaximumCapacity()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::AlmostMaximumCapacity()");
 
 	return iAlmostFull;
 	} // CEnhancedVoiceMailBoxInformation::AlmostMaximumCapacity
@@ -4694,7 +4702,7 @@
  */
 EXPORT_C void CEnhancedVoiceMailBoxInformation::SetMaximumCapacity(TBool aIsFull)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_SETMAXIMUMCAPACITY_1, "CEnhancedVoiceMailBoxInformation::SetMaximumCapacity()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::SetMaximumCapacity()");
 
 	iFull = aIsFull;
 	} // CEnhancedVoiceMailBoxInformation::SetMaximumCapacity
@@ -4713,7 +4721,7 @@
  */
 EXPORT_C TBool CEnhancedVoiceMailBoxInformation::MaximumCapacity() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_MAXIMUMCAPACITY_1, "CEnhancedVoiceMailBoxInformation::MaximumCapacity()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::MaximumCapacity()");
 
 	return iFull;
 	} // CEnhancedVoiceMailBoxInformation::MaximumCapacity
@@ -4732,7 +4740,7 @@
  */
 EXPORT_C TBool CEnhancedVoiceMailBoxInformation::ExtensionIndicator() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_EXTENSIONINDICATOR_1, "CEnhancedVoiceMailBoxInformation::ExtensionIndicator()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::ExtensionIndicator()");
 
 	return iExtensionIndicator;
 	} // CEnhancedVoiceMailBoxInformation::ExtensionIndicator
@@ -4740,7 +4748,7 @@
 
 void CEnhancedVoiceMailBoxInformation::NewBufferL(TInt aLength)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_NEWBUFFERL_1, "CEnhancedVoiceMailBoxInformation::NewBufferL, length = %d",aLength);
+	LOGGSMU2("CEnhancedVoiceMailBoxInformation::NewBufferL, length = %d",aLength);
 
 	HBufC* buffer=HBufC::NewL(aLength);
 	delete iAccessAddress;
@@ -4762,7 +4770,7 @@
  */
 EXPORT_C void  CEnhancedVoiceMailBoxInformation::SetAccessAddressL(const TDesC& aAddress)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_SETACCESSADDRESSL_1, "CEnhancedVoiceMailBoxInformation::SetAccessAddressL()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::SetAccessAddressL()");
 
 	TInt length=aAddress.Length();
 	NewBufferL(length);
@@ -4785,7 +4793,7 @@
  */
 EXPORT_C TPtrC CEnhancedVoiceMailBoxInformation::AccessAddress() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_ACCESSADDRESS_1, "CEnhancedVoiceMailBoxInformation::AccessAddress()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::AccessAddress()");
 
 	TPtrC ptr;
 	if (iAccessAddress)
@@ -4806,7 +4814,7 @@
  */
 EXPORT_C void  CEnhancedVoiceMailBoxInformation::SetParsedAccessAddressL(const TGsmSmsTelNumber& aParsedAddress)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_SETPARSEDACCESSADDRESSL_1, "CEnhancedVoiceMailBoxInformation::SetParsedAccessAddressL()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::SetParsedAccessAddressL()");
 
    	iTypeOfAddress=aParsedAddress.iTypeOfAddress;
 	DoSetParsedAddressL(aParsedAddress.iTelNumber);
@@ -4825,7 +4833,7 @@
  */
 EXPORT_C void  CEnhancedVoiceMailBoxInformation::ParsedAccessAddress(TGsmSmsTelNumber& aParsedAddress) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_PARSEDACCESSADDRESS_1, "CEnhancedVoiceMailBoxInformation::ParsedAccessAddress()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::ParsedAccessAddress()");
 
 	aParsedAddress.iTypeOfAddress = iTypeOfAddress;
 
@@ -4861,7 +4869,7 @@
 
 void CEnhancedVoiceMailBoxInformation::DoSetParsedAddressL(const TDesC& aAddress)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_DOSETPARSEDADDRESSL_1, "CEnhancedVoiceMailBoxInformation::DoSetParsedAddressL()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::DoSetParsedAddressL()");
 
 	TInt length=aAddress.Length();
 	if ((iTypeOfAddress.TON()==EGsmSmsTONInternationalNumber) &&
@@ -4892,7 +4900,7 @@
  */
 EXPORT_C void   CEnhancedVoiceMailBoxInformation::SetNumberOfVoiceMessages(TUint8 aNumber)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_SETNUMBEROFVOICEMESSAGES_1, "CEnhancedVoiceMailBoxInformation::SetNumberOfVoiceMessages()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::SetNumberOfVoiceMessages()");
 
 	iNumberOfVoiceMessages=aNumber;
 	} // CEnhancedVoiceMailBoxInformation::SetNumberOfVoiceMessages
@@ -4910,7 +4918,7 @@
  */
 EXPORT_C TUint8 CEnhancedVoiceMailBoxInformation::NumberOfVoiceMessages() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_NUMBEROFVOICEMESSAGES_1, "CEnhancedVoiceMailBoxInformation::NumberOfVoiceMessages()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::NumberOfVoiceMessages()");
 
 	return iNumberOfVoiceMessages;
 	} // CEnhancedVoiceMailBoxInformation::NumberOfVoiceMessages
@@ -4925,7 +4933,7 @@
 	        ((((TUint8) iFull)       & EMask1Bit ) << 6) +
 	         (((TUint8) iExtensionIndicator      ) << 7);
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_ENCODEL_1, "CEnhancedVoiceMailBoxInformation::EncodeL 1st byte = %d",*aPtr);
+	LOGGSMU2("CEnhancedVoiceMailBoxInformation::EncodeL 1st byte = %d",*aPtr);
 	aPtr++;
 
 	// Create an address object to encode the mail box access address into the
@@ -4959,7 +4967,7 @@
 	iFull               = (TBool)                   ((Byte1 >> 6) & EMask1Bit);
 	iExtensionIndicator = (TBool)                   ((Byte1 >> 7) & EMask1Bit);
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_DECODEL_1, "CEnhancedVoiceMailBoxInformation::DecodeL 1st byte = %d", Byte1);
+	LOGGSMU2("CEnhancedVoiceMailBoxInformation::DecodeL 1st byte = %d", Byte1);
 
 	// Create an address object to deccode the mail box access address from the
 	// format required by 23.040 v6.5.0 section 9.1.2.5.
@@ -5004,13 +5012,13 @@
 	CleanupStack::PopAndDestroy(decodedAddress);
 
 	iNumberOfVoiceMessages = aVoiceMailInfo.GetL();
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_DECODEL_2, "CEnhancedVoiceMailBoxInformation::DecodeL iNumberOfVoiceMessages = %d", iNumberOfVoiceMessages);
+	LOGGSMU2("CEnhancedVoiceMailBoxInformation::DecodeL iNumberOfVoiceMessages = %d", iNumberOfVoiceMessages);
 	} // CEnhancedVoiceMailBoxInformation::DecodeL
 
 
 CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_CTOR_1, "CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation()");
 
 	// Consider changing this over to a Panic.
 	iType               = EGsmSmsVoiceMailNotification;
@@ -5026,7 +5034,7 @@
 
 CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation(TVoiceMailInfoType aTVoiceMailInfoType)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_CTOR1_1, "CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation()");
 
 	iType               = aTVoiceMailInfoType;
 	iOctet1Bit1         = EFalse;
@@ -5051,7 +5059,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_CTOR2_1, "CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation");
+    LOGGSMU1("CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation");
     Panic(KGsmuPanicMethodBodyNotImplemented);
     BULLSEYE_RESTORE
     }
@@ -5068,7 +5076,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_OPERATOR_1, "CEnhancedVoiceMailBoxInformation::operator==");
+    LOGGSMU1("CEnhancedVoiceMailBoxInformation::operator==");
     Panic(KGsmuPanicMethodBodyNotImplemented);
     return EFalse;
     BULLSEYE_RESTORE
@@ -5086,14 +5094,14 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_OPERATOR1_1, "CEnhancedVoiceMailBoxInformation::operator=");
+    LOGGSMU1("CEnhancedVoiceMailBoxInformation::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented);
     BULLSEYE_RESTORE
     }
 
 void CEnhancedVoiceMailBoxInformation::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_CONSTRUCTL_1, "CEnhancedVoiceMailBoxInformation::ConstructL()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::ConstructL()");
 
 	NewBufferL(0);
 	} // CEnhancedVoiceMailBoxInformation::ConstructL
@@ -5101,14 +5109,14 @@
 
 CEnhancedVoiceMailBoxInformation::~CEnhancedVoiceMailBoxInformation()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_DTOR_1, "CEnhancedVoiceMailBoxInformation::~CEnhancedVoiceMailBoxInformation");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::~CEnhancedVoiceMailBoxInformation");
 	delete iAccessAddress;
 	} // CEnhancedVoiceMailBoxInformation::ConstructL
 
 
 CEnhancedVoiceMailBoxInformation* CEnhancedVoiceMailBoxInformation::NewL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_NEWL_1, "CEnhancedVoiceMailBoxInformation::NewL()");
+	LOGGSMU1("CEnhancedVoiceMailBoxInformation::NewL()");
 
 	CEnhancedVoiceMailBoxInformation* aCEnhancedVoiceMailBoxInformation=new(ELeave) CEnhancedVoiceMailBoxInformation();
 	CleanupStack::PushL(aCEnhancedVoiceMailBoxInformation);
@@ -5130,7 +5138,7 @@
  */
 EXPORT_C void CVoiceMailNotification::SetMessageId(TUint16 aMessageId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_SETMESSAGEID_1, "CVoiceMailNotification::SetMessageId()");
+	LOGGSMU1("CVoiceMailNotification::SetMessageId()");
 
 	iMessageId = aMessageId;
 	} // CVoiceMailNotification::SetMessageId
@@ -5148,7 +5156,7 @@
  */
 EXPORT_C TUint16 CVoiceMailNotification::MessageId() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_MESSAGEID_1, "CVoiceMailNotification::MessageId()");
+	LOGGSMU1("CVoiceMailNotification::MessageId()");
 
 	return iMessageId;
 	} // CVoiceMailNotification::MessageId
@@ -5166,7 +5174,7 @@
  */
 EXPORT_C void CVoiceMailNotification::SetMessageLength(TUint8 aLength)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_SETMESSAGELENGTH_1, "CVoiceMailNotification::SetMessageLength()");
+	LOGGSMU1("CVoiceMailNotification::SetMessageLength()");
 
 	iMessageLength=aLength;
 	} // CVoiceMailNotification::SetMessageLength
@@ -5184,7 +5192,7 @@
  */
 EXPORT_C TUint8 CVoiceMailNotification::MessageLength() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_MESSAGELENGTH_1, "CVoiceMailNotification::MessageLength()");
+	LOGGSMU1("CVoiceMailNotification::MessageLength()");
 
 	return iMessageLength;
 	} // CVoiceMailNotification::MessageLength
@@ -5204,7 +5212,7 @@
  */
 EXPORT_C void CVoiceMailNotification::SetRetentionDays(TUint8 aDays)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_SETRETENTIONDAYS_1, "CVoiceMailNotification::SetRetentionDays()");
+	LOGGSMU1("CVoiceMailNotification::SetRetentionDays()");
 
 	if (aDays > 31)
 	    {
@@ -5229,7 +5237,7 @@
  */
 EXPORT_C TUint8 CVoiceMailNotification::RetentionDays() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_RETENTIONDAYS_1, "CVoiceMailNotification::RetentionDays()");
+	LOGGSMU1("CVoiceMailNotification::RetentionDays()");
 
 	return iRetentionDays;
 	} // CVoiceMailNotification::RetentionDays
@@ -5248,7 +5256,7 @@
  */
 EXPORT_C void CVoiceMailNotification::SetPriorityIndication(TBool aPriority)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_SETPRIORITYINDICATION_1, "CVoiceMailNotification::SetPriorityIndication()");
+	LOGGSMU1("CVoiceMailNotification::SetPriorityIndication()");
 
 	iPriorityIndication=aPriority;
 	} // CVoiceMailNotification::SetPriorityIndication
@@ -5267,7 +5275,7 @@
  */
 EXPORT_C TBool CVoiceMailNotification::PriorityIndication() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_PRIORITYINDICATION_1, "CVoiceMailNotification::PriorityIndication()");
+	LOGGSMU1("CVoiceMailNotification::PriorityIndication()");
 
 	return iPriorityIndication;
 	} // CVoiceMailNotification::PriorityIndication
@@ -5286,7 +5294,7 @@
  */
 EXPORT_C TBool CVoiceMailNotification::MessageExtensionIndication() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_MESSAGEEXTENSIONINDICATION_1, "CVoiceMailNotification::MessageExtensionIndication()");
+	LOGGSMU1("CVoiceMailNotification::MessageExtensionIndication()");
 
 	return iMessageExtensionIndicator;
 	} // CVoiceMailNotification::MessageExtensionIndication
@@ -5294,7 +5302,7 @@
 
 void CVoiceMailNotification::NewBufferL(TInt aLength)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_NEWBUFFERL_1, "CVoiceMailNotification::NewBufferL()");
+	LOGGSMU1("CVoiceMailNotification::NewBufferL()");
 
 	HBufC* buffer=HBufC::NewL(aLength);
 	delete iCallingLineIdentity;
@@ -5315,7 +5323,7 @@
  */
 EXPORT_C void  CVoiceMailNotification::SetCallingLineIdentityL(TDesC& aLineIdentity)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_SETCALLINGLINEIDENTITYL_1, "CVoiceMailNotification::SetCallingLineIdentityL()");
+	LOGGSMU1("CVoiceMailNotification::SetCallingLineIdentityL()");
 
 	TInt length=aLineIdentity.Length();
 	NewBufferL(length);
@@ -5338,7 +5346,7 @@
  */
 EXPORT_C TPtrC CVoiceMailNotification::CallingLineIdentity() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_CALLINGLINEIDENTITY_1, "CVoiceMailNotification::CallingLineIdentity()");
+	LOGGSMU1("CVoiceMailNotification::CallingLineIdentity()");
 
 	TPtrC ptr;
 	if (iCallingLineIdentity)
@@ -5359,7 +5367,7 @@
  */
 EXPORT_C void CVoiceMailNotification::SetParsedCallingLineIdentityL(TGsmSmsTelNumber& aParsedAddress)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_SETPARSEDCALLINGLINEIDENTITYL_1, "CVoiceMailNotification::SetParsedCallingLineIdentityL()");
+	LOGGSMU1("CVoiceMailNotification::SetParsedCallingLineIdentityL()");
 
 	iTypeOfAddress=aParsedAddress.iTypeOfAddress;
 	DoSetParsedAddressL(aParsedAddress.iTelNumber);
@@ -5378,7 +5386,7 @@
  */
 EXPORT_C void CVoiceMailNotification::ParsedCallingLineIdentity(TGsmSmsTelNumber& aParsedAddress) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_PARSEDCALLINGLINEIDENTITY_1, "CVoiceMailNotification::ParsedCallingLineIdentity()");
+	LOGGSMU1("CVoiceMailNotification::ParsedCallingLineIdentity()");
 
 	aParsedAddress.iTypeOfAddress = iTypeOfAddress;
 
@@ -5414,7 +5422,7 @@
 
 void CVoiceMailNotification::NewExtensionL(TInt aLength)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_NEWEXTENSIONL_1, "CVoiceMailNotification::NewExtensionL()");
+	LOGGSMU1("CVoiceMailNotification::NewExtensionL()");
 
 	HBufC* buffer=HBufC::NewL(aLength);
 	delete iExtension;
@@ -5423,6 +5431,27 @@
 	iExtension->Des().FillZ();
 	} // CVoiceMailNotification::NewExtensionL
 
+
+/*void CVoiceMailNotification::SetExtension(TDesC& aExtension)
+	{
+	LOGGSMU1("CVoiceMailNotification::SetExtension()");
+
+	TInt length=aExtension.Length();
+	NewExtensionL(length);
+	iExtension->Des().Copy(aExtension);
+	} // CVoiceMailNotification::SetExtension
+
+TPtrC CVoiceMailNotification::Extension() const
+	{
+	LOGGSMU1("CVoiceMailNotification::Extension()");
+
+	TPtrC ptr;
+	if (iExtension)
+	    ptr.Set(iExtension->Des());
+	return ptr;
+	}*/
+
+
 /**
  *  @internalComponent
  *  
@@ -5436,7 +5465,7 @@
  */
 TUint8 CVoiceMailNotification::SizeL(CCnvCharacterSetConverter& aCharacterSetConverter, RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_SIZEL_1, "CVoiceMailNotification::SizeL()");
+	LOGGSMU1("CVoiceMailNotification::SizeL()");
 
 	const TUint8 KTotalSizeOfFixedLengthAttributes = 4;
 	TUint8 size = KTotalSizeOfFixedLengthAttributes;
@@ -5465,7 +5494,7 @@
 	// When changes are made to this function that affect the
 	// number of bytes that are encoded, this should be reflected in
 	// CVoiceMailNotification::SizeL()
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_ENCODEL_1, "CVoiceMailNotification::EncodeL");
+	LOGGSMU1("CVoiceMailNotification::EncodeL");
 
 
 	*aPtr =   (TUint8)  (iMessageId                         >> 8);  // Message Id MSB
@@ -5499,7 +5528,7 @@
 
 void CVoiceMailNotification::DecodeL(TGsmuLex8& aVoiceMailInfo, CCnvCharacterSetConverter& aCharacterSetConverter, RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_DECODEL_1, "CVoiceMailNotification::DecodeL");
+	LOGGSMU1("CVoiceMailNotification::DecodeL");
 
 	iMessageId = (((TUint16) aVoiceMailInfo.GetL()) << 8);
 	iMessageId += ((TUint16) aVoiceMailInfo.GetL());
@@ -5570,7 +5599,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_CTOR_1, "CVoiceMailNotification::CVoiceMailNotification");
+    LOGGSMU1("CVoiceMailNotification::CVoiceMailNotification");
     Panic(KGsmuPanicMethodBodyNotImplemented);
     BULLSEYE_RESTORE
     }
@@ -5587,7 +5616,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_OPERATOR_1, "CVoiceMailNotification::operator==");
+    LOGGSMU1("CVoiceMailNotification::operator==");
     Panic(KGsmuPanicMethodBodyNotImplemented);
     return EFalse;
     BULLSEYE_RESTORE
@@ -5605,14 +5634,14 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_OPERATOR1_1, "CVoiceMailNotification::operator=");
+    LOGGSMU1("CVoiceMailNotification::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented);
     BULLSEYE_RESTORE
     }
 
 CVoiceMailNotification::CVoiceMailNotification()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_CTOR1_1, "CVoiceMailNotification::CVoiceMailNotification()");
+	LOGGSMU1("CVoiceMailNotification::CVoiceMailNotification()");
 
 	iMessageId                 = 0;
 	iMessageLength             = 0;
@@ -5633,7 +5662,7 @@
  */
 EXPORT_C CVoiceMailNotification::~CVoiceMailNotification()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_DTOR_1, "CVoiceMailNotification::~CVoiceMailNotification");
+	LOGGSMU1("CVoiceMailNotification::~CVoiceMailNotification");
 	delete iCallingLineIdentity;
 	delete iExtension;
 	} // CVoiceMailNotification::CVoiceMailNotification
@@ -5641,7 +5670,7 @@
 
 void CVoiceMailNotification::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_CONSTRUCTL_1, "CVoiceMailNotification::ConstructL()");
+	LOGGSMU1("CVoiceMailNotification::ConstructL()");
 
 	NewBufferL(0);
 	NewExtensionL(0);
@@ -5657,7 +5686,7 @@
  */
 EXPORT_C CVoiceMailNotification* CVoiceMailNotification::NewL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_NEWL_1, "CVoiceMailNotification::NewL()");
+	LOGGSMU1("CVoiceMailNotification::NewL()");
 
 	CVoiceMailNotification* aCVoiceMailNotification=new(ELeave) CVoiceMailNotification();
 	CleanupStack::PushL(aCVoiceMailNotification);
@@ -5669,7 +5698,7 @@
 
 void CVoiceMailNotification::DoSetParsedAddressL(const TDesC& aAddress)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_DOSETPARSEDADDRESSL_1, "CVoiceMailNotification::DoSetParsedAddressL()");
+	LOGGSMU1("CVoiceMailNotification::DoSetParsedAddressL()");
 
 	TInt length=aAddress.Length();
 	if ((iTypeOfAddress.TON()==EGsmSmsTONInternationalNumber) &&
@@ -5701,12 +5730,32 @@
  */
 EXPORT_C TUint8 CEnhancedVoiceMailNotification::NumberOfVoiceMails()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILNOTIFICATION_NUMBEROFVOICEMAILS_1, "CEnhancedVoiceMailNotification::NumberOfVoiceMails()");
+	LOGGSMU1("CEnhancedVoiceMailNotification::NumberOfVoiceMails()");
 
 	return (TUint8) iNotifications->Count();
 	} // CEnhancedVoiceMailNotification::NumberOfVoiceMails
 
 
+/*void CEnhancedVoiceMailNotification::SetExtension(TDesC& aExtension)
+	{
+	LOGGSMU1("CEnhancedVoiceMailNotification::SetExtension()");
+
+	TInt length=aExtension.Length();
+	NewExtensionL(length);
+	iExtension->Des().Copy(aExtension);
+	} // CEnhancedVoiceMailNotification::SetExtension
+
+TPtrC CEnhancedVoiceMailNotification::Extension() const
+	{
+	LOGGSMU1("CEnhancedVoiceMailNotification::Extension()");
+
+	TPtrC ptr;
+	if (iExtension)
+	    ptr.Set(iExtension->Des());
+	return ptr;
+	}*/
+
+
 /**
  *  @publishedAll
  *  
@@ -5722,7 +5771,7 @@
  */
 EXPORT_C RPointerArray<CVoiceMailNotification>& CEnhancedVoiceMailNotification::GetVoiceMailNotifications()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILNOTIFICATION_GETVOICEMAILNOTIFICATIONS_1, "CEnhancedVoiceMailNotification::GetVoiceMailNotifications()");
+	LOGGSMU1("CEnhancedVoiceMailNotification::GetVoiceMailNotifications()");
 
 	return *iNotifications;
 	} // CEnhancedVoiceMailNotification::GetVoiceMailNotifications
@@ -5730,7 +5779,7 @@
 
 void CEnhancedVoiceMailNotification::NewExtensionL(TInt aLength)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILNOTIFICATION_NEWEXTENSIONL_1, "CEnhancedVoiceMailNotification::NewExtensionL()");
+	LOGGSMU1("CEnhancedVoiceMailNotification::NewExtensionL()");
 
 	HBufC* buffer=HBufC::NewL(aLength);
 	delete iExtension;
@@ -5749,7 +5798,7 @@
  */
 EXPORT_C  CEnhancedVoiceMailNotification* CEnhancedVoiceMailNotification::NewL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILNOTIFICATION_NEWL_1, "CEnhancedVoiceMailNotification::NewL()");
+	LOGGSMU1("CEnhancedVoiceMailNotification::NewL()");
 
 	CEnhancedVoiceMailNotification* aCEnhancedVoiceMailNotification=new(ELeave) CEnhancedVoiceMailNotification();
 	CleanupStack::PushL(aCEnhancedVoiceMailNotification);
@@ -5777,7 +5826,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILNOTIFICATION_CTOR1_1, "CEnhancedVoiceMailNotification::CEnhancedVoiceMailNotification");
+    LOGGSMU1("CEnhancedVoiceMailNotification::CEnhancedVoiceMailNotification");
     Panic(KGsmuPanicMethodBodyNotImplemented);
     BULLSEYE_RESTORE
     }
@@ -5794,7 +5843,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILNOTIFICATION_OPERATOR_1, "CEnhancedVoiceMailNotification::operator==");
+    LOGGSMU1("CEnhancedVoiceMailNotification::operator==");
     Panic(KGsmuPanicMethodBodyNotImplemented);
     return EFalse;
     BULLSEYE_RESTORE
@@ -5812,7 +5861,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILNOTIFICATION_OPERATOR1_1, "CEnhancedVoiceMailNotification::operator=");
+    LOGGSMU1("CEnhancedVoiceMailNotification::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented);
     BULLSEYE_RESTORE
     }
@@ -5826,7 +5875,7 @@
  */
 EXPORT_C  CEnhancedVoiceMailNotification::~CEnhancedVoiceMailNotification()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILNOTIFICATION_DTOR_1, "CEnhancedVoiceMailNotification::~CEnhancedVoiceMailNotification");
+	LOGGSMU1("CEnhancedVoiceMailNotification::~CEnhancedVoiceMailNotification");
 	delete iExtension;
 	iNotifications->ResetAndDestroy();
 	iNotifications->Close();
@@ -5836,7 +5885,7 @@
 
 void CEnhancedVoiceMailNotification::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILNOTIFICATION_CONSTRUCTL_1, "CEnhancedVoiceMailNotification::ConstructL()");
+	LOGGSMU1("CEnhancedVoiceMailNotification::ConstructL()");
 
 	NewExtensionL(0);
 	iNotifications = new (ELeave) RPointerArray<CVoiceMailNotification>(KMaxNumberOfNotifications);
@@ -5845,7 +5894,7 @@
 
 TUint8* CEnhancedVoiceMailNotification::EncodeL(TUint8* aCurrentPtr, CCnvCharacterSetConverter& aCharacterSetConverter, RFs& aFs) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILNOTIFICATION_ENCODEL_1, "CEnhancedVoiceMailNotification::EncodeL");
+	LOGGSMU1("CEnhancedVoiceMailNotification::EncodeL");
 
 	TUint8* startPtr   = aCurrentPtr;
 
@@ -5881,7 +5930,7 @@
 
 void CEnhancedVoiceMailNotification::DecodeL(TGsmuLex8& aVoiceMailInfo, CCnvCharacterSetConverter& aCharacterSetConverter, RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILNOTIFICATION_DECODEL_1, "CEnhancedVoiceMailNotification::DecodeL");
+	LOGGSMU1("CEnhancedVoiceMailNotification::DecodeL");
 
 	CEnhancedVoiceMailBoxInformation::DecodeL(aVoiceMailInfo, aCharacterSetConverter, aFs);
 
@@ -5918,7 +5967,7 @@
  */
 EXPORT_C void CVoiceMailDeletion::SetMessageId(TUint16 aMessageId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILDELETION_SETMESSAGEID_1, "CVoiceMailDeletion::SetMessageId()");
+	LOGGSMU1("CVoiceMailDeletion::SetMessageId()");
 
 	iMessageId=aMessageId;
 	} // CVoiceMailDeletion::SetMessageId
@@ -5938,7 +5987,7 @@
  */
 EXPORT_C TUint16 CVoiceMailDeletion::MessageId() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILDELETION_MESSAGEID_1, "CVoiceMailDeletion::MessageId()");
+	LOGGSMU1("CVoiceMailDeletion::MessageId()");
 
 	return iMessageId;
 	} // CVoiceMailDeletion::MessageId
@@ -5957,7 +6006,7 @@
  */
 EXPORT_C TBool CVoiceMailDeletion::MessageExtensionIndication() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILDELETION_MESSAGEEXTENSIONINDICATION_1, "CVoiceMailDeletion::MessageExtensionIndication()");
+	LOGGSMU1("CVoiceMailDeletion::MessageExtensionIndication()");
 
 	return iExtensionIndicator;
 	} // CVoiceMailDeletion::MessageExtensionIndication
@@ -5965,7 +6014,7 @@
 
 TUint8 CVoiceMailDeletion::SizeL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_SIZEL_1, "CVoiceMailDeletion::SizeL()");
+	LOGGSMU1("CVoiceMailDeletion::SizeL()");
 
 	const TUint8 KSizeOfVoiceMailDeletion = 3;
 	return KSizeOfVoiceMailDeletion;
@@ -5977,7 +6026,7 @@
 	// When changes are made which affect the
 	// number of bytes encoded, this should be
 	// reflected in VoiceMailDeletion::SizeL()
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_ENCODEL_1, "CVoiceMailDeletion::EncodeL");
+	LOGGSMU1("CVoiceMailDeletion::EncodeL");
 
 	*aPtr =  (TUint8) (iMessageId >> 8);
 	aPtr++;
@@ -5991,7 +6040,7 @@
 
 void CVoiceMailDeletion::DecodeL(TGsmuLex8& aVoiceMailInfo)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_DECODEL_1, "CVoiceMailDeletion::DecodeL");
+	LOGGSMU1("CVoiceMailDeletion::DecodeL");
 
 	iMessageId = (((TUint16) aVoiceMailInfo.GetL()) << 8) +
 	              ((TUint16) aVoiceMailInfo.GetL());
@@ -6024,7 +6073,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_CTOR1_1, "CVoiceMailDeletion::CVoiceMailDeletion");
+    LOGGSMU1("CVoiceMailDeletion::CVoiceMailDeletion");
     Panic(KGsmuPanicMethodBodyNotImplemented);
     BULLSEYE_RESTORE
     }
@@ -6041,7 +6090,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_OPERATOR_1, "CVoiceMailDeletion::operator==");
+    LOGGSMU1("CVoiceMailDeletion::operator==");
     Panic(KGsmuPanicMethodBodyNotImplemented);
     return EFalse;
     BULLSEYE_RESTORE
@@ -6059,7 +6108,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_OPERATOR1_1, "CVoiceMailDeletion::operator=");
+    LOGGSMU1("CVoiceMailDeletion::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented);
     BULLSEYE_RESTORE
     }
@@ -6073,7 +6122,7 @@
  */
 EXPORT_C CVoiceMailDeletion::~CVoiceMailDeletion()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILDELETION_DTOR_1, "CVoiceMailDeletion::~CVoiceMailDeletion");
+	LOGGSMU1("CVoiceMailDeletion::~CVoiceMailDeletion");
 
 	delete iExtension;
 	} // CVoiceMailDeletion::operator
@@ -6081,7 +6130,7 @@
 
 void CVoiceMailDeletion::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_CONSTRUCTL_1, "CVoiceMailDeletion::ConstructL()");
+	LOGGSMU1("CVoiceMailDeletion::ConstructL()");
 
 	NewBufferL(0);
 	} // CVoiceMailDeletion::ConstructL
@@ -6089,7 +6138,7 @@
 
 void CVoiceMailDeletion::NewBufferL(TInt aLength)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_NEWBUFFERL_1, "CVoiceMailDeletion::NewBufferL()");
+	LOGGSMU1("CVoiceMailDeletion::NewBufferL()");
 
 	HBufC* buffer=HBufC::NewL(aLength);
 	delete iExtension;
@@ -6108,7 +6157,7 @@
  */
 EXPORT_C CVoiceMailDeletion* CVoiceMailDeletion::NewL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILDELETION_NEWL_1, "CVoiceMailDeletion::NewL()");
+	LOGGSMU1("CVoiceMailDeletion::NewL()");
 
 	CVoiceMailDeletion* voiceMailDeletion=new(ELeave) CVoiceMailDeletion();
 	CleanupStack::PushL(voiceMailDeletion);
@@ -6118,9 +6167,31 @@
 	} // CVoiceMailDeletion::NewL
 
 
+/*
+void CVoiceMailDeletion::SetExtension(TDesC& aExtension)
+	{
+	LOGGSMU1("CVoiceMailDeletion::SetExtension()");
+
+	TInt length=aExtension.Length();
+	NewBufferL(length);
+	iExtension->Des().Copy(aExtension);
+	} // CVoiceMailDeletion::SetExtension
+
+
+TPtrC CVoiceMailDeletion::Extension() const
+	{
+	LOGGSMU1("CVoiceMailDeletion::Extension()");
+
+	TPtrC ptr;
+	if (iExtension)
+	    ptr.Set(iExtension->Des());
+	return ptr;
+	}*/
+
+
 void CEnhancedVoiceMailDeleteConfirmations::NewExtensionL(TInt aLength)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILDELETECONFIRMATIONS_NEWEXTENSIONL_1, "CEnhancedVoiceMailDeleteConfirmations::NewExtensionL()");
+	LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::NewExtensionL()");
 
 	HBufC* buffer=HBufC::NewL(aLength);
 	delete iExtension;
@@ -6145,7 +6216,7 @@
  */
 EXPORT_C  CEnhancedVoiceMailDeleteConfirmations::~CEnhancedVoiceMailDeleteConfirmations()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILDELETECONFIRMATIONS_DTOR_1, "CEnhancedVoiceMailDeleteConfirmations::~CEnhancedVoiceMailDeleteConfirmations");
+	LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::~CEnhancedVoiceMailDeleteConfirmations");
 
 	delete iExtension;
 	iVoiceMailDeletions->ResetAndDestroy();
@@ -6166,7 +6237,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILDELETECONFIRMATIONS_CTOR1_1, "CEnhancedVoiceMailDeleteConfirmations::CEnhancedVoiceMailDeleteConfirmations");
+    LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::CEnhancedVoiceMailDeleteConfirmations");
     Panic(KGsmuPanicMethodBodyNotImplemented);
     BULLSEYE_RESTORE
     }
@@ -6183,7 +6254,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILDELETECONFIRMATIONS_OPERATOR_1, "CEnhancedVoiceMailDeleteConfirmations::operator==");
+    LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::operator==");
     Panic(KGsmuPanicMethodBodyNotImplemented);
     return EFalse;
     BULLSEYE_RESTORE
@@ -6201,14 +6272,14 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILDELETECONFIRMATIONS_OPERATOR1_1, "CEnhancedVoiceMailDeleteConfirmations::operator=");
+    LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented);
     BULLSEYE_RESTORE
     }
 
 void CEnhancedVoiceMailDeleteConfirmations::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILDELETECONFIRMATIONS_CONSTRUCTL_1, "CEnhancedVoiceMailDeleteConfirmations::ConstructL()");
+	LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::ConstructL()");
 
 	NewExtensionL(0);
 
@@ -6225,7 +6296,7 @@
  */
 EXPORT_C  CEnhancedVoiceMailDeleteConfirmations* CEnhancedVoiceMailDeleteConfirmations::NewL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILDELETECONFIRMATIONS_NEWL_1, "CEnhancedVoiceMailDeleteConfirmations::NewL()");
+	LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::NewL()");
 
 	CEnhancedVoiceMailDeleteConfirmations* aCEnhancedVoiceMailDeleteConfirmations=new(ELeave) CEnhancedVoiceMailDeleteConfirmations();
 	CleanupStack::PushL(aCEnhancedVoiceMailDeleteConfirmations);
@@ -6248,7 +6319,7 @@
  */
 EXPORT_C TUint8  CEnhancedVoiceMailDeleteConfirmations::NumberOfDeletes()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILDELETECONFIRMATIONS_NUMBEROFDELETES_1, "CEnhancedVoiceMailDeleteConfirmations::NumberOfDeletes()");
+	LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::NumberOfDeletes()");
 
 	return iVoiceMailDeletions->Count();
 	} // CEnhancedVoiceMailDeleteConfirmations::NumberOfDeletes
@@ -6270,15 +6341,39 @@
  */
 EXPORT_C RPointerArray<CVoiceMailDeletion>& CEnhancedVoiceMailDeleteConfirmations::GetVoiceMailDeletions()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILDELETECONFIRMATIONS_GETVOICEMAILDELETIONS_1, "CEnhancedVoiceMailDeleteConfirmations::GetVoiceMailDeletions()");
+	LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::GetVoiceMailDeletions()");
 
 	return *iVoiceMailDeletions;
 	} // CEnhancedVoiceMailDeleteConfirmations::GetVoiceMailDeletions
 
 
+/*
+void CEnhancedVoiceMailDeleteConfirmations::SetExtension(TDesC& aExtension)
+	{
+	LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::SetExtension()");
+
+	TInt length=aExtension.Length();
+	NewBufferL(length);
+	iExtension->Des().Copy(aExtension);
+	} // CEnhancedVoiceMailDeleteConfirmations::SetExtension
+
+
+TPtrC CEnhancedVoiceMailDeleteConfirmations::Extension() const
+	{
+	LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::Extension()");
+
+	TPtrC ptr;
+	if (iExtension)
+		{
+		ptr.Set(iExtension->Des());
+		}
+	return ptr;
+	}*/
+
+
 TUint8* CEnhancedVoiceMailDeleteConfirmations::EncodeL(TUint8* aCurrentPtr, CCnvCharacterSetConverter& aCharacterSetConverter, RFs& aFs) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILDELETECONFIRMATIONS_ENCODEL_1, "CEnhancedVoiceMailDeleteConfirmations::EncodeL");
+	LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::EncodeL");
 
 	TUint8* startPtr   = aCurrentPtr;
 
@@ -6317,7 +6412,7 @@
 
 void CEnhancedVoiceMailDeleteConfirmations::DecodeL(TGsmuLex8& aVoiceMailInfo, CCnvCharacterSetConverter& aCharacterSetConverter, RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILDELETECONFIRMATIONS_DECODEL_1, "CEnhancedVoiceMailDeleteConfirmations::DecodeL");
+	LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::DecodeL");
 
 	CEnhancedVoiceMailBoxInformation::DecodeL(aVoiceMailInfo, aCharacterSetConverter, aFs);

--- a/smsprotocols/smsstack/gsmu/src/Gsmumain.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/Gsmumain.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "GsmumainTraces.h"
-#endif
-
 #include <e32std.h>
 #include "Gsmumain.h"
 #include "Gsmuelem.h"
@@ -37,7 +31,7 @@
     {
     // Ignore in code coverage - panic method
     BULLSEYE_OFF    
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, GSMUMAIN_PANIC_1, "GSMUPANIC %d", aPanic);
+    LOGGSMU2("GSMUPANIC %d", aPanic);
     
     _LIT(KGsmuPanic, "GSMU");
     User::Panic(KGsmuPanic, aPanic);

--- a/smsprotocols/smsstack/gsmu/src/Gsmumsg.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/Gsmumsg.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "GsmumsgTraces.h"
-#endif
-
 #include <gsmumsg.h>
 #include "Gsmumain.h"
 #include <gsmubuf.h>
@@ -34,9 +28,10 @@
 #include <gsmuieoperations.h>
 #include <gsmunonieoperations.h>
 
-#include <logwraplimits.h>
+#include <logwrap.h> //  Used for KLogNullId only
 #include <e32uid.h>
 #include <etelmm.h>
+#include <logwraplimits.h>
 
 #include <emsinformationelement.h>
 #include <emsformatie.h>
@@ -63,7 +58,7 @@
  */
 EXPORT_C CSmsMessage* CSmsMessage::NewL(RFs& aFs, const TGsmSms& aGsmSms,CSmsBufferBase* aBuffer, TBool aIsRPError,TBool aIsMobileTerminated)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_NEWL_1, "CSmsMessage::NewL()");
+	LOGGSMU1("CSmsMessage::NewL()");
 	
 	CleanupStack::PushL(aBuffer);
 	CSmsMessage* smsmessage=new(ELeave) CSmsMessage(aFs, aBuffer);
@@ -90,7 +85,7 @@
  */
 EXPORT_C CSmsMessage* CSmsMessage::NewL(RFs& aFs, CSmsPDU::TSmsPDUType aType,CSmsBufferBase* aBuffer,TBool aIsRPError)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_NEWL1_1, "CSmsMessage::NewL()");
+	LOGGSMU1("CSmsMessage::NewL()");
 
 	CleanupStack::PushL(aBuffer);
 	CSmsMessage* smsmessage=new(ELeave) CSmsMessage(aFs, aBuffer);
@@ -108,7 +103,7 @@
  */
 EXPORT_C CSmsMessage::~CSmsMessage()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_DTOR_1, "CSmsMessage::~CSmsMessage()");
+	LOGGSMU1("CSmsMessage::~CSmsMessage()");
 
 	delete iSmsPDU;
 	delete iBuffer;
@@ -134,7 +129,7 @@
  */
 EXPORT_C void CSmsMessage::InternalizeWithoutBufferL(RReadStream& aStream)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERL_1, "CSmsMessage::InternalizeWithoutBufferL()");
+	LOGGSMU1("CSmsMessage::InternalizeWithoutBufferL()");
 
 	InternalizeWithoutBufferAndVersionL(aStream);
 	InternalizeVersionL(aStream);
@@ -158,7 +153,7 @@
  */
 EXPORT_C void CSmsMessage::ExternalizeWithoutBufferL(RWriteStream& aStream) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERL_1, "CSmsMessage::ExternalizeWithoutBufferL()");
+	LOGGSMU1("CSmsMessage::ExternalizeWithoutBufferL()");
 
 	ExternalizeWithoutBufferAndVersionL(aStream);
 	ExternalizeVersionL(aStream);
@@ -178,7 +173,7 @@
  */
 EXPORT_C void CSmsMessage::InternalizeL(RReadStream& aStream)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_INTERNALIZEL_1, "CSmsMessage::InternalizeL()");
+	LOGGSMU1("CSmsMessage::InternalizeL()");
 
 	InternalizeWithoutBufferAndVersionL(aStream);
 	InternalizeBufferL(aStream);
@@ -200,7 +195,7 @@
  */
 EXPORT_C void CSmsMessage::ExternalizeL(RWriteStream& aStream) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_EXTERNALIZEL_1, "CSmsMessage::ExternalizeL()");
+	LOGGSMU1("CSmsMessage::ExternalizeL()");
 
 	ExternalizeWithoutBufferAndVersionL(aStream);
 	ExternalizeBufferL(aStream);
@@ -221,7 +216,7 @@
  */
 EXPORT_C TBool CSmsMessage::TextPresent() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_TEXTPRESENT_1, "CSmsMessage::TextPresent()");
+	LOGGSMU1("CSmsMessage::TextPresent()");
 
 	CSmsPDU::TSmsPDUType pdutype=SmsPDU().Type();
 	return (pdutype==CSmsPDU::ESmsSubmit) ||
@@ -242,7 +237,7 @@
  */
 EXPORT_C TInt CSmsMessage::NumMessagePDUsL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_NUMMESSAGEPDUSL_1, "CSmsMessage::NumMessagePDUsL()");
+	LOGGSMU1("CSmsMessage::NumMessagePDUsL()");
 
 	TInt nummessagepdus=1;
 	if (IsDecoded())
@@ -263,7 +258,7 @@
 		nummessagepdus=SmsPDU().NumConcatenatedMessagePDUs();
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_NUMMESSAGEPDUSL_2, "CSmsMessage::NumMessagePDUsL() returns %d", nummessagepdus);
+	LOGGSMU2("CSmsMessage::NumMessagePDUsL() returns %d", nummessagepdus);
 
 	return nummessagepdus;
 	} // CSmsMessage::NumMessagePDUsL
@@ -287,7 +282,7 @@
 		maxmessagelength=maxmessagelength*0xFF;
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_MAXMESSAGELENGTH_1, "CSmsMessage::MaxMessageLength() returns %d", maxmessagelength);
+	LOGGSMU2("CSmsMessage::MaxMessageLength() returns %d", maxmessagelength);
 
 	return maxmessagelength;
 	} // CSmsMessage::MaxMessageLength
@@ -303,7 +298,7 @@
     // Ignore in code coverage - not used in SMS stack and not exported
     // but cannot be removed as impacts public header.
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_1, "CSmsMessage::ConvertedBufferLengthL()");
+    LOGGSMU1("CSmsMessage::ConvertedBufferLengthL()");
     
     TInt convertedBufferLength=0;
     CSmsAlphabetConverter* converter=CSmsAlphabetConverter::NewLC(*iCharacterSetConverter,iFs,SmsPDU().Alphabet(),BinaryData());
@@ -311,7 +306,7 @@
     convertedBufferLength=segmenter->TotalConvertedLengthL(iAdditionalInfo->Alternative7bitEncoding());
     CleanupStack::PopAndDestroy(2, converter);
     
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_2, "CSmsMessage::ConvertedBufferLengthL() returns %d", convertedBufferLength);
+    LOGGSMU2("CSmsMessage::ConvertedBufferLengthL() returns %d", convertedBufferLength);
     
     return convertedBufferLength;
     BULLSEYE_RESTORE
@@ -331,7 +326,7 @@
  */
 EXPORT_C TInt CSmsMessage::MessageLengthL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_MESSAGELENGTHL_1, "CSmsMessage::MessageLengthL()");
+	LOGGSMU1("CSmsMessage::MessageLengthL()");
 
 	TInt messagelength=0;
 	if (!SmsPDU().TextCompressed())
@@ -350,7 +345,7 @@
 EXPORT_C void CSmsMessage::GetEncodingInfoL(TInt& aPdus, TInt& aUnconvertedChars,
 		                                    TInt& aDowngradedChars, TInt& aFreeUDUnitsInLastPDU)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETENCODINGINFOL_1, "CSmsMessage::GetEncodingInfoL()");
+	LOGGSMU1("CSmsMessage::GetEncodingInfoL()");
 
 	aPdus                 = 1;
 	aUnconvertedChars     = 0;
@@ -400,10 +395,10 @@
 			}
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETENCODINGINFOL_2, "CSmsMessage::GetEncodingInfoL(): aPdus=%d", aPdus);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETENCODINGINFOL_3, "CSmsMessage::GetEncodingInfoL(): aUnconvertedChars=%d", aUnconvertedChars);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETENCODINGINFOL_4, "CSmsMessage::GetEncodingInfoL(): aDowngradedChars=%d", aDowngradedChars);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETENCODINGINFOL_5, "CSmsMessage::GetEncodingInfoL(): aFreeUDUnitsInLastPDU=%d", aFreeUDUnitsInLastPDU);
+	LOGGSMU2("CSmsMessage::GetEncodingInfoL(): aPdus=%d", aPdus);
+	LOGGSMU2("CSmsMessage::GetEncodingInfoL(): aUnconvertedChars=%d", aUnconvertedChars);
+	LOGGSMU2("CSmsMessage::GetEncodingInfoL(): aDowngradedChars=%d", aDowngradedChars);
+	LOGGSMU2("CSmsMessage::GetEncodingInfoL(): aFreeUDUnitsInLastPDU=%d", aFreeUDUnitsInLastPDU);
 	} // CSmsMessage::GetEncodingInfoL
 
 
@@ -415,7 +410,7 @@
  */
 EXPORT_C void CSmsMessage::UserDataSettings(TSmsUserDataSettings& aSettings) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_USERDATASETTINGS_1, "CSmsMessage::UserDataSettings()");
+	LOGGSMU1("CSmsMessage::UserDataSettings()");
 
 	__ASSERT_DEBUG(TextPresent(),Panic(KGsmuPanicTextNotPresent));
 	aSettings.SetAlphabet(SmsPDU().Alphabet());
@@ -434,7 +429,7 @@
  */
 EXPORT_C void CSmsMessage::SetUserDataSettingsL(const TSmsUserDataSettings& aSettings)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_SETUSERDATASETTINGSL_1, "CSmsMessage::SetUserDataSettingsL()");
+	LOGGSMU1("CSmsMessage::SetUserDataSettingsL()");
 
 	__ASSERT_DEBUG(TextPresent(),Panic(KGsmuPanicTextNotPresent));
 	SmsPDU().SetAlphabet(aSettings.Alphabet());
@@ -470,7 +465,7 @@
  */
 EXPORT_C void CSmsMessage::OptimizeSettingsL(TInt aOptions)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_OPTIMIZESETTINGSL_1, "CSmsMessage::OptimizeSettingsL()");
+	LOGGSMU1("CSmsMessage::OptimizeSettingsL()");
 
 	__ASSERT_DEBUG(TextPresent(),Panic(KGsmuPanicTextNotPresent));
 	__ASSERT_DEBUG(IsDecoded(),Panic(KGsmuPanicNotDecoded));
@@ -527,7 +522,7 @@
  */
 EXPORT_C TSmsEncoding CSmsMessage::Alternative7bitEncoding() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ALTERNATIVE7BITENCODING_1, "CSmsMessage::Alternative7bitEncoding()");
+	LOGGSMU1("CSmsMessage::Alternative7bitEncoding()");
 
 	return iAdditionalInfo->Alternative7bitEncoding();
 	} // CSmsMessage::Alternative7bitEncoding
@@ -548,7 +543,7 @@
  */
 EXPORT_C TInt CSmsMessage::SetAlternative7bitEncoding(TSmsEncoding aEncoding)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_SETALTERNATIVE7BITENCODING_1, "CSmsMessage::SetAlternative7bitEncoding(%d)", aEncoding);
+	LOGGSMU2("CSmsMessage::SetAlternative7bitEncoding(%d)", aEncoding);
 
 	//
 	// Get the encoders that would be used for this encoding method.
@@ -583,7 +578,8 @@
  */
 void CSmsMessage::MergeAlternative7bitEncoding(TSmsEncoding aEncoding) const
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_1, "CSmsMessage::MergeAlternative7bitEncoding(): aEncoding=%d (currently %d)",aEncoding, iAdditionalInfo->Alternative7bitEncoding());
+	LOGGSMU3("CSmsMessage::MergeAlternative7bitEncoding(): aEncoding=%d (currently %d)",
+			 aEncoding, iAdditionalInfo->Alternative7bitEncoding());
 
 	switch (iAdditionalInfo->Alternative7bitEncoding())
 		{
@@ -643,7 +639,8 @@
 			}
 		};
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_2, "CSmsMessage::MergeAlternative7bitEncoding(): New encoding=%d",iAdditionalInfo->Alternative7bitEncoding());
+	LOGGSMU2("CSmsMessage::MergeAlternative7bitEncoding(): New encoding=%d",
+			 iAdditionalInfo->Alternative7bitEncoding());
 	} // CSmsMessage::MergeAlternative7bitEncoding
 
 
@@ -663,7 +660,7 @@
 EXPORT_C TBool CSmsMessage::IsSupportedL(const TDesC& aDes, TInt& aNumberOfUnconvertibleCharacters,
 		                                 TInt& aIndexOfFirstUnconvertibleCharacter)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ISSUPPORTEDL_1, "[1] CSmsMessage::IsSupportedL()");
+	LOGGSMU1("[1] CSmsMessage::IsSupportedL()");
 
 	__ASSERT_DEBUG(TextPresent(), Panic(KGsmuPanicTextNotPresent));
 
@@ -703,7 +700,7 @@
 		                                 TInt& aNumberRequiringAlternativeEncoding,
 		                                 TInt& aIndexOfFirstUnconvertibleCharacter) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ISSUPPORTEDL1_1, "[2] CSmsMessage::IsSupportedL()");
+	LOGGSMU1("[2] CSmsMessage::IsSupportedL()");
 
 	__ASSERT_DEBUG(TextPresent(), Panic(KGsmuPanicTextNotPresent));
 
@@ -737,7 +734,7 @@
  */
 EXPORT_C void CSmsMessage::EncodeMessagePDUsL(CArrayFix<TGsmSms>& aSmsArray, TInt aReference)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ENCODEMESSAGEPDUSL_1, "CSmsMessage::EncodeMessagePDUsL(): aReference=%d", aReference);
+	LOGGSMU2("CSmsMessage::EncodeMessagePDUsL(): aReference=%d", aReference);
 
 	__ASSERT_DEBUG((aSmsArray.Count()==0),Panic(KGsmuPanicSmsArrayNotEmpty));
 	
@@ -794,7 +791,7 @@
  */
 void CSmsMessage::PrepareCommandMessageL()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_PREPARECOMMANDMESSAGEL_1, "CSmsMessage::PrepareCommandMessageL()");
+    LOGGSMU1("CSmsMessage::PrepareCommandMessageL()");
 
     if (SmsPDU().Type()==CSmsPDU::ESmsCommand)
         {
@@ -817,7 +814,7 @@
                     break;
                     }
                 default:
-                OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_PREPARECOMMANDMESSAGEL_2, "CSmsMessage::PrepareCommandMessageL,default switch category = %d", category);
+                LOGGSMU2("CSmsMessage::PrepareCommandMessageL,default switch category = %d, id = %d", category);
                     break;
                 }
             }
@@ -836,7 +833,7 @@
  */
 EXPORT_C void CSmsMessage::DecodeMessagePDUsL(const CArrayFix<TGsmSms>& aSmsArray)
 	{
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_DECODEMESSAGEPDUSL_1, "CSmsMessage::DecodeMessagePDUsL(): PDUs=%d", aSmsArray.Count());
+    LOGGSMU2("CSmsMessage::DecodeMessagePDUsL(): PDUs=%d", aSmsArray.Count());
 
 	TInt count=aSmsArray.Count();
 	SetIsComplete(ETrue);
@@ -894,7 +891,7 @@
  */
 EXPORT_C void CSmsMessage::DecodePartialCompleteMessagePDUsL(const CArrayFix<TGsmSms>& aSmsArray, TBool aLastPartialCompleteMsg)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_DECODEPARTIALCOMPLETEMESSAGEPDUSL_1, "CSmsMessage::DecodePartialCompleteMessagePDUsL(): PDUs=%d", aSmsArray.Count());
+	LOGGSMU2("CSmsMessage::DecodePartialCompleteMessagePDUsL(): PDUs=%d", aSmsArray.Count());
 
 	TInt count=aSmsArray.Count();
 	SetIsComplete(EFalse);
@@ -981,7 +978,7 @@
 
 void CSmsMessage::ConstructL(const TGsmSms& aGsmSms, TBool aIsRPError,TBool aIsMobileTerminated)
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CONSTRUCTL_1, "CSmsMessage::ConstructL()");
+    LOGGSMU1("CSmsMessage::ConstructL()");
 
 	iCharacterSetConverter=CCnvCharacterSetConverter::NewL();
 	iInformationElementArray = new (ELeave) RPointerArray<CEmsInformationElement>(8);
@@ -1040,7 +1037,8 @@
 
 void CSmsMessage::ConstructL(CSmsPDU::TSmsPDUType aType,TBool aIsRPError)
 	{
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CONSTRUCTL1_1, "CSmsMessage::ConstructL(): aType=%d, aIsRPError=%d", (TInt) aType,aIsRPError);
+    LOGGSMU3("CSmsMessage::ConstructL(): aType=%d, aIsRPError=%d", (TInt) aType,
+    		 aIsRPError);
 
 	iCharacterSetConverter=CCnvCharacterSetConverter::NewL();
 	iInformationElementArray = new (ELeave) RPointerArray<CEmsInformationElement>(2);
@@ -1065,7 +1063,7 @@
  */
 TInt CSmsMessage::NumMessageEmsPDUsL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_NUMMESSAGEEMSPDUSL_1, "CSmsMessage::NumMessageEmsPDUsL()");
+	LOGGSMU1("CSmsMessage::NumMessageEmsPDUsL()");
 
 	//
 	// Clear the concatenated flag, EncodeBufferL() will add it if needed.
@@ -1092,7 +1090,7 @@
 
 	CleanupStack::PopAndDestroy(tmpArray);
 	
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_NUMMESSAGEEMSPDUSL_2, "CSmsMessage::NumMessageEmsPDUsL() returns %d", numMsgs);
+    LOGGSMU2("CSmsMessage::NumMessageEmsPDUsL() returns %d", numMsgs);
 
 	return numMsgs;
 	} // CSmsMessage::NumMessageEmsPDUsL
@@ -1110,7 +1108,7 @@
  */
 void CSmsMessage::ResetWorkingPDUL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_RESETWORKINGPDUL_1, "CSmsMessage::ResetWorkingPDUL()");
+	LOGGSMU1("CSmsMessage::ResetWorkingPDUL()");
 	
 	CSmsUserData& uData = SmsPDU().UserData();
 	//remove non-mandatory EMS information elements
@@ -1137,7 +1135,8 @@
 									 RPointerArray<CEmsInformationElement>& aCorrectedFormattingIEArray,
 									 TUint aCharsAlreadyAdded)
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CORRECTFORMATTINGL_1, "CSmsMessage::CorrectFormattingL(): aCharsAddedToCurrentPDU=%u, aCharsAlreadyAdded=%u",aCharsAddedToCurrentPDU, aCharsAlreadyAdded);
+	LOGGSMU3("CSmsMessage::CorrectFormattingL(): aCharsAddedToCurrentPDU=%d, aCharsAlreadyAdded=%d",
+			 aCharsAddedToCurrentPDU, aCharsAlreadyAdded);
 
 	CSmsUserData& uData = SmsPDU().UserData();
 	for (TInt a= 0; a < uData.NumInformationElements(); a++)
@@ -1164,8 +1163,8 @@
 					CleanupStack::PushL(newie);
 					newie->SetFormatLength(oldFormatLen - newFormatLen);
 					newie->SetStartPosition(aCharsAlreadyAdded+aCharsAddedToCurrentPDU);
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CORRECTFORMATTINGL_2, "CSmsMessage::CorrectFormattingL Count=%d",aCorrectedFormattingIEArray.Count());
-					User::LeaveIfError(aCorrectedFormattingIEArray.Append(newie));
+					LOGGSMU2("CSmsMessage::CorrectFormattingL",aCorrectedFormattingIEArray.Count());
+					aCorrectedFormattingIEArray.Append(newie);
 					CleanupStack::Pop(newie);
 					}
 				}
@@ -1176,7 +1175,7 @@
 
 void CSmsMessage::CorrectFormattingInSinglePDUL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CORRECTFORMATTINGINSINGLEPDUL_1, "CSmsMessage::CorrectFormattingInSinglePDUL()");
+	LOGGSMU1("CSmsMessage::CorrectFormattingInSinglePDUL()");
 
 	CSmsUserData& uData = SmsPDU().UserData();
 	for (TInt a= 0; a < uData.NumInformationElements(); a++)
@@ -1210,7 +1209,8 @@
  */
 void CSmsMessage::AddCurrentPDUToPDUArrayL(TBool aDoEncode)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDCURRENTPDUTOPDUARRAYL_1, "CSmsMessage::AddCurrentPDUToPDUArrayL(): Adding PDU number %d",iAdditionalInfo->SmsPDUArray().Count() + 1);
+	LOGGSMU2("CSmsMessage::AddCurrentPDUToPDUArrayL(): Adding PDU number %d",
+			 iAdditionalInfo->SmsPDUArray().Count() + 1);
 	
 	//
 	// Maximum number of PDU is 255, so if we have that already then we cannot
@@ -1261,7 +1261,7 @@
 
 TBool CSmsMessage::AddIEToUserDataL(CEmsInformationElement* aIE, TInt aCharsAlreadyAdded,TUint& aCharsAddedToCurrentPDU,CSmsEMSBufferSegmenter& aSeg)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDIETOUSERDATAL_1, "CSmsMessage::AddIEToUserDataL()");
+	LOGGSMU1("CSmsMessage::AddIEToUserDataL()");
 
 	TBool ieAdded=EFalse;
 	if (SmsPDU().UserData().EmsInformationElementWillFitL(aIE,aSeg,aCharsAddedToCurrentPDU))
@@ -1288,7 +1288,7 @@
  */
 TInt CSmsMessage::FillPduL(CSmsEMSBufferSegmenter& aSeg, TInt aNumChars, TSmsEncoding aEncoding)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_FILLPDUL_1, "CSmsMessage::FillPduL()");
+	LOGGSMU1("CSmsMessage::FillPduL()");
 
 	TUint maxUDUnitsREmaining=SmsPDU().UserData().MaxPackedUDUnitsInBodyRemaining();
 
@@ -1333,7 +1333,7 @@
 void CSmsMessage::AddControlInformationElementsToMultiSegmentMessageL(TSmsInformationElementCategories::TInformationElementCategory aCategory,
 			                                                          TBool aMandatoryInPDU, TBool aDoEncode)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1, "CSmsMessage::AddControlInformationElementsToMultiSegmentMessageL()");
+    LOGGSMU1("CSmsMessage::AddControlInformationElementsToMultiSegmentMessageL()");
 
     TUint numberOfInformationElements = iAdditionalInfo->NumberOfControlInformationElements(aCategory);
 
@@ -1365,7 +1365,7 @@
                 TBool canFit = SmsPDU().UserData().ControlInformationElementWillFitL(cloneInformationElement);
                 if (canFit == EFalse)
                     {
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2, "CSmsMessage::AddControlInformationElementsToMultiSegmentMessage, IE too bit to fit in any PDUL");
+                    LOGGSMU1("CSmsMessage::AddControlInformationElementsToMultiSegmentMessage, IE too bit to fit in any PDUL");
                     User::Leave(KErrArgument);
                     }
                 i--;
@@ -1389,7 +1389,7 @@
  */
 void CSmsMessage::AddControlInformationElementsToMultiSegmentMessageL(TBool aDoEncode)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL1_1, "CSmsMessage::AddControlInformationElementsToMultiSegmentMessageL() 1");
+    LOGGSMU1("CSmsMessage::AddControlInformationElementsToMultiSegmentMessageL() 1");
 
     TBool mandatoryInEachPDU = ETrue;
     AddControlInformationElementsToMultiSegmentMessageL(TSmsInformationElementCategories::ECtrlMandatoryIn1stPDUOnly,
@@ -1425,13 +1425,13 @@
 																   TUint& aCurrEMSIEno,
 																   TUint& aCharsAlreadyAdded)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1, "CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL()");
+	LOGGSMU1("CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL()");
 
 	TUint startPosition=0;
 
 	 // number of chars added to the current PDU
 	TUint no=iInformationElementArray->Count();
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2, "CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL no of IE %d",no);
+	LOGGSMU2("CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL no of IE %d",no);
 	CEmsInformationElement* ie = NULL;
 	TUint msgLen=iBuffer->Length();
 	TUint filledChars=0;
@@ -1472,7 +1472,7 @@
 				aCharsAddedToCurrentPDU+=filledChars;
 				}
 
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_3, "CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL: filled %d chars", filledChars);
+			LOGGSMU2("CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL: filled %d chars", filledChars);
 
 			if (aCharsAddedToCurrentPDU==startPosition)
 				{
@@ -1492,7 +1492,7 @@
 				else
 					{
 					// Information Element will not fit send PDU
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_4, "CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL: ie will not fit send Message");
+					LOGGSMU1("CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL: ie will not fit send Message");
 					CorrectFormattingL(aCharsAddedToCurrentPDU,aCorrectedFormatingIEArray,aCharsAlreadyAdded);
 
 					aCharsAlreadyAdded += aCharsAddedToCurrentPDU;
@@ -1513,7 +1513,7 @@
 			else
 				{
 				// native chars upto start position will not fit send PDu.
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_5, "CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL: PDU is filled with chars sending");
+				LOGGSMU1("CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL: PDU is filled with chars sending");
 
 				CorrectFormattingL(aCharsAddedToCurrentPDU,aCorrectedFormatingIEArray,aCharsAlreadyAdded);
 
@@ -1551,7 +1551,7 @@
 TBool CSmsMessage::AddEMSInformationElementsToSingleSegmentMessageL(CSmsEMSBufferSegmenter& aSegmenter,
 																	TSmsEncoding aEncoding)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOSINGLESEGMENTMESSAGEL_1, "CSmsMessage::AddEMSInformationElementsToSingleSegmentMessageL()");
+	LOGGSMU1("CSmsMessage::AddEMSInformationElementsToSingleSegmentMessageL()");
 
 	TUint charsAddedToCurrentPDU=0;
 	TUint numOfEmsIE=iInformationElementArray->Count();
@@ -1608,7 +1608,7 @@
 								TInt& aUnconvertedChars, TInt& aDowngradedChars,
 						        TInt& aFreeUDUnitsInLastPDU, TBool aDoEncode)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_1, "CSmsMessage::EncodeBufferL()");
+	LOGGSMU1("CSmsMessage::EncodeBufferL()");
 
 	aUnconvertedChars     = 0;
 	aDowngradedChars      = 0;
@@ -1712,13 +1712,13 @@
 	//
 	while (segmenter->MoreL())
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_2, "CSmsMessage::EncodeBufferL - there is MoreL");
+			LOGGSMU1("CSmsMessage::EncodeBufferL - there is MoreL");
 			
 			//
 			// Calculate the space left to use in this PDU...
 			//
 			TInt size = SmsPDU().UserData().MaxPackedUDUnitsInBodyRemaining();
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_3, "CSmsMessage::EncodeBufferL - remaining size in PDU is %d",size);
+			LOGGSMU2("CSmsMessage::EncodeBufferL - remaining size in PDU is %d",size);
 
 			//
 			// While there is no space, correct the formatting (which may
@@ -1755,7 +1755,7 @@
 				// Add any elements that can be placed now (from previous
 				// PDUs and above)... 
 				//
-				OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_4, "CSmsMessage::EncodeBufferL: IE count  %d corrected  count %d",iInformationElementArray->Count(),correctedFormatingIEArray.Count() );
+				LOGGSMU3("CSmsMessage::EncodeBufferL: IE count  %d corrected  count %d",iInformationElementArray->Count(),correctedFormatingIEArray.Count() );
 				if ((TUint)iInformationElementArray->Count() > currEMSIEno  ||
 					correctedFormatingIEArray.Count() > 0)
 					{
@@ -1769,7 +1769,7 @@
 				// Calculate the space left remaining in this new PDU...
 				//
 				size = SmsPDU().UserData().MaxPackedUDUnitsInBodyRemaining();
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_5, "CSmsMessage::EncodeBufferL - remaining size in PDU is %d",size);
+				LOGGSMU2("CSmsMessage::EncodeBufferL - remaining size in PDU is %d",size);
 				}
 			
 			//
@@ -1780,7 +1780,7 @@
 			SmsPDU().UserData().AppendBodyL(ptr);
 
 			TUint charsInSegment= isUnicode ? ptr.Length()/2 : ptr.Length();
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_6, "CSmsMessage::EncodeBufferL: segmenting added %d chars", charsInSegment);
+			LOGGSMU2("CSmsMessage::EncodeBufferL: segmenting added %d chars", charsInSegment);
 
 			//
 			// At this point the working PDU is either full (e.g. we filled the
@@ -1793,7 +1793,7 @@
 			charsAdded2CurrentPDU+=charsInSegment;
 			CorrectFormattingL(charsAdded2CurrentPDU, correctedFormatingIEArray, charsAlreadyAdded);
 			charsAlreadyAdded+=charsAdded2CurrentPDU;
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_7, "CSmsMessage::EncodeBufferL(): charsAlreadyAdded=%d", charsAlreadyAdded);
+			LOGGSMU2("CSmsMessage::EncodeBufferL(): charsAlreadyAdded=%d", charsAlreadyAdded);
 			
 			//
 			// Now store this PDU and reset the working PDU...
@@ -1816,7 +1816,8 @@
 			// Add any elements that can be placed now given we have a new
 			// empty PDU... 
 			//
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_8, "CSmsMessage::EncodeBufferL: IE count  %d corrected  count %d",iInformationElementArray->Count(), correctedFormatingIEArray.Count() );
+			LOGGSMU3("CSmsMessage::EncodeBufferL: IE count  %d corrected  count %d",
+			         iInformationElementArray->Count(), correctedFormatingIEArray.Count() );
 			if ((TUint)iInformationElementArray->Count() > currEMSIEno  ||
 				correctedFormatingIEArray.Count() > 0)
 				{
@@ -1825,11 +1826,11 @@
 																correctedFormatingIEArray,
 																currEMSIEno, charsAlreadyAdded);
 				}
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_9, "CSmsMessage::EncodeBufferL end Moreloop");
+			LOGGSMU1("CSmsMessage::EncodeBufferL end Moreloop");
 			}
 	CleanupStack::PopAndDestroy(buf);
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_10, "CSmsMessage::EncodeBufferL - last PDU");
+	LOGGSMU1("CSmsMessage::EncodeBufferL - last PDU");
 	
 	//
 	// This is the last PDU. We need to check if there is a partial PDU left over
@@ -1864,7 +1865,7 @@
 	//
 	TInt  numPDUs = iAdditionalInfo->SmsPDUArray().Count();
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_11, "CSmsMessage::EncodeBufferL number of PDUs: %d", iAdditionalInfo->SmsPDUArray().Count());
+	LOGGSMU2("CSmsMessage::EncodeBufferL number of PDUs: %d", iAdditionalInfo->SmsPDUArray().Count());
 	
 	if (aDoEncode)
 		{
@@ -1955,7 +1956,7 @@
 TBool CSmsMessage::EncodeIntoSinglePDUL(CArrayFix<TGsmSms>& aSmsArray, TInt& aUnconvertedChars,
 		                                TInt& aDowngradedChars, TInt& aFreeUDUnitsInLastPDU)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEINTOSINGLEPDUL_1, "CSmsMessage::EncodeIntoSinglePDUL()");
+	LOGGSMU1("CSmsMessage::EncodeIntoSinglePDUL()");
 
 	__ASSERT_DEBUG((aSmsArray.Count()==0),Panic(KGsmuPanicSmsArrayNotEmpty));
 
@@ -2002,7 +2003,7 @@
                 break;
             }
         }
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEINTOSINGLEPDUL_2, "CSmsMessage::EncodeIntoSinglePDUL, ctrl elem len = %d", ieLength);
+    LOGGSMU2("CSmsMessage::EncodeIntoSinglePDUL, ctrl elem len = %d", ieLength);
 
 	CEmsInformationElement* emsIE =NULL;
 	for (TInt num=0; num<iInformationElementArray->Count();num++)
@@ -2017,7 +2018,7 @@
 
 	if( msgLength > remainInBody) return EFalse;
 
-    OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEINTOSINGLEPDUL_3, "CSmsMessage::EncodeIntoSinglePDUL, ie len = %d, remainInBody = %d, msgLength = %d", ieLength, msgLength, remainInBody);
+    LOGGSMU4("CSmsMessage::EncodeIntoSinglePDUL, ie len = %d, remainInBody = %d, msgLength = %d", ieLength, msgLength, remainInBody);
     //  add all control information elements into working PDU.
     //
     for (TUint8 category = 0; category <  TSmsInformationElementCategories::ENumberOfCategories; category++)
@@ -2135,7 +2136,7 @@
  */
 EXPORT_C TBool CSmsMessage::EncodeIntoSinglePDUL(CArrayFix<TGsmSms>& aSmsArray)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ENCODEINTOSINGLEPDUL1_1, "CSmsMessage::EncodeIntoSinglePDUL()");
+	LOGGSMU1("CSmsMessage::EncodeIntoSinglePDUL()");
 	
 	TInt  unconvertedChars, downgradedChars, freeUDUnitsInLastPDU;
 	
@@ -2218,7 +2219,7 @@
 void CSmsMessage::DecodeBufferL(CArrayPtr<CSmsPDU>& aSmsPDUArray,
 								CSmsBufferBase& aBuffer)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_DECODEBUFFERL_1, "CSmsMessage::DecodeBufferL()");
+	LOGGSMU1("CSmsMessage::DecodeBufferL()");
 
 	iInformationElementArray->ResetAndDestroy();
 
@@ -2280,7 +2281,7 @@
 void CSmsMessage::DecodeOnlyTextL(CArrayPtr<CSmsPDU>& aSmsPDUArray,
 								CSmsBufferBase& aBuffer)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_DECODEONLYTEXTL_1, "CSmsMessage::DecodeOnlyTextL()");
+	LOGGSMU1("CSmsMessage::DecodeOnlyTextL()");
 
 	for (TInt i=0; i<aSmsPDUArray.Count(); i++)
 		{
@@ -2307,7 +2308,7 @@
  */
 void CSmsMessage::AddIncompleteMessageInfoL(TInt aStartPDU, TInt aEndPDU, TBool aLastPartialCompleteMsg)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDINCOMPLETEMESSAGEINFOL_1, "CSmsMessage::AddIncompleteMessageInfoL()");
+	LOGGSMU1("CSmsMessage::AddIncompleteMessageInfoL()");
 
 	CIncompleteClass0MessageInfo& incompleteClass0MsgInfo = (CIncompleteClass0MessageInfo&) iAdditionalInfo->GetNonIEOperationL(ESmsIncompleteClass0MessageParameter);
 	incompleteClass0MsgInfo.SetVersion(CIncompleteClass0MessageInfo::ESmsIncompleteClass0MessageV0);
@@ -2331,7 +2332,7 @@
 void CSmsMessage::InstallControlInformationElementsL(CSmsUserData& aUserData, TInt aSegmentSequenceNum)
     {
 	// Installs all the information elements within the subsequent PDUs.
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_1, "CSmsMessage::InstallControlInformationElements()");
+	LOGGSMU1("CSmsMessage::InstallControlInformationElements()");
 
     CSmsMessageAdditionalAttributes::CSmsStatusReportScheme& scheme = iAdditionalInfo->GetStatusReportScheme();
     
@@ -2346,7 +2347,8 @@
             switch (category)
                 {
                 case  TSmsInformationElementCategories::ECtrlMandatoryInEveryPDUMultipleInstancesPerPDU: // e.g. Special SMS Message Indication
-                    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_2, "CSmsMessage::InstallControlInformationElements \ECtrlMandatoryInEveryPDUMultipleInstancesPerPDU id = %d", ie.Identifier());
+                    LOGGSMU2("CSmsMessage::InstallControlInformationElements \
+                    ECtrlMandatoryInEveryPDUMultipleInstancesPerPDU id = %d", ie.Identifier());
 
                     if (ie.Identifier()== CSmsInformationElement::ESmsIEISpecialSMSMessageIndication)
                         {
@@ -2378,14 +2380,15 @@
                     else
                         {
                         // Unknown category.
-                        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_3, "CSmsMessage::InstallControlInformationElementsL category = %d, id = %d", category, ie.Identifier());
+                        LOGGSMU3("CSmsMessage::InstallControlInformationElementsL category = %d, id = %d", category, ie.Identifier());
                         User::Leave(KErrArgument);
                         }
                     break;
                 case  TSmsInformationElementCategories::ECtrlMandatoryIn1stPDUOnly:
                 case  TSmsInformationElementCategories::ECtrlSingleInstanceOnly:
                     {
-                    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_4, "CSmsMessage::InstallControlInformationElements ECtrlMandatoryIn1stPDUOnly ""ECtrlSingleInstanceOnly, id = %d", ie.Identifier());
+                    LOGGSMU2("CSmsMessage::InstallControlInformationElements ECtrlMandatoryIn1stPDUOnly "
+                                 "ECtrlSingleInstanceOnly, id = %d", ie.Identifier());
 
                     TUint index = 0;
                     if (iAdditionalInfo->Find1stInstanceOfControlInformationElement(ie.Identifier(), index))
@@ -2410,7 +2413,8 @@
                     }
                 case  TSmsInformationElementCategories::ECtrlMandatoryInEveryPDUAndWithIdenticalValues:
                     {
-                    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_5, "CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUAndWithIdenticalValues ""ECtrlSingleInstanceOnly, id = %d", ie.Identifier());
+                    LOGGSMU2("CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUAndWithIdenticalValues "
+                                 "ECtrlSingleInstanceOnly, id = %d", ie.Identifier());
                     TInt index = 0;
                     if (SmsPDU().UserData().InformationElementIndex(ie.Identifier(),index))
                         {
@@ -2434,7 +2438,8 @@
 
                 case  TSmsInformationElementCategories::ECtrlMultipleInstancesAllowed:
                     {
-                    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_6, "CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUAndWithIdenticalValues ""ECtrlSingleInstanceOnly, id = %d", ie.Identifier() );
+                    LOGGSMU2("CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUAndWithIdenticalValues "
+                                 "ECtrlSingleInstanceOnly, id = %d", ie.Identifier() );
 
                     CSmsInformationElement* cloneInformationElement = CSmsInformationElement::NewL( ie.Identifier(),ie.Data() );
                     CleanupStack::PushL(cloneInformationElement);
@@ -2443,7 +2448,8 @@
                     break;
                     }
                 case  TSmsInformationElementCategories::ECtrlMandatoryInEveryPDUButWithValueSpecificToPDU:
-                    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_7, "CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUButWithValueSpecificToPDU ""ECtrlSingleInstanceOnly, id = %d", ie.Identifier() );
+                    LOGGSMU2("CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUButWithValueSpecificToPDU "
+                                 "ECtrlSingleInstanceOnly, id = %d", ie.Identifier() );
                     
                     if (ie.Identifier() == CSmsInformationElement::ESmsIEISMSCControlParameters)
                     	{
@@ -2470,11 +2476,12 @@
                     // or left as is.
                     break;
                 case  TSmsInformationElementCategories::EEmsInformationElement:
-                    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_8, "CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUButWithValueSpecificToPDU ""ECtrlSingleInstanceOnly, id = %d", ie.Identifier() );
+                    LOGGSMU2("CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUButWithValueSpecificToPDU "
+                                 "ECtrlSingleInstanceOnly, id = %d", ie.Identifier() );
                     // Will be handled in the method InstallEmsInformationElements, nothing to do here
                     break;
                 default:
-                    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_9, "CSmsMessage::InstallControlInformationElementsToMultiSegmentMessageL, default switch, category = %d, id= %d", category, ie.Identifier() );
+                    LOGGSMU3("CSmsMessage::InstallControlInformationElementsToMultiSegmentMessageL, default switch, category = %d, id= %d", category, ie.Identifier() );
                     break;
                 }
             }
@@ -2492,7 +2499,7 @@
 void  CSmsMessage::InstallEmsInformationElementsL(CSmsUserData& aUserData, TInt aCharsAlreadyAdded)
 	{
 	// Installs all the information elements within the subsequent PDUs.
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL_1, "CSmsMessage::InstallEmsInformationElements()");
+	LOGGSMU1("CSmsMessage::InstallEmsInformationElements()");
 
 	CSmsInformationElement::TSmsInformationElementIdentifier id;
 	CEmsInformationElement* newIE =NULL;
@@ -2540,7 +2547,7 @@
     // but cannot be removed as impacts public header.
     BULLSEYE_OFF    
     // Installs all the information elements within the subsequent PDUs.
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL1_1, "CSmsMessage::InstallEmsInformationElements()");
+    LOGGSMU1("CSmsMessage::InstallEmsInformationElements()");
     
     CSmsInformationElement::TSmsInformationElementIdentifier id;
     CEmsInformationElement* newIE=NULL;
@@ -2666,7 +2673,7 @@
  */
 EXPORT_C void CSmsMessage::AddEMSInformationElementL(const CEmsInformationElement& aEmsIE)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ADDEMSINFORMATIONELEMENTL_1, "CSmsMessage::AddEMSInformationElementL()");
+	LOGGSMU1("CSmsMessage::AddEMSInformationElementL()");
 
 	if(aEmsIE.StartPosition() > (TUint)iBuffer->Length())
 		{
@@ -2708,7 +2715,7 @@
 
 TBool CSmsMessage::CanBeRemoved(const CEmsInformationElement& aIE, const TUint aIEIndex)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CANBEREMOVED_1, "CSmsMessage::CanBeRemoved()");
+	LOGGSMU1("CSmsMessage::CanBeRemoved()");
 
 	TBool ret=ETrue;
 	if(CSmsInformationElement::ESmsEnhancedODI == aIE.Identifier())
@@ -2733,7 +2740,7 @@
 		    }
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CANBEREMOVED_2, "CSmsMessage::CanBeRemoved() returns %d", ret);
+	LOGGSMU2("CSmsMessage::CanBeRemoved() returns %d", ret);
 
 	return ret;
 	} // CSmsMessage::CanBeRemoved
@@ -2746,7 +2753,7 @@
  */
 void CSmsMessage::AddEmsUserPromptL(const CEmsUserPrompt& aUserPromptIE)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSUSERPROMPTL_1, "CSmsMessage::AddEmsUserPromptL()");
+	LOGGSMU1("CSmsMessage::AddEmsUserPromptL()");
 
 		if(aUserPromptIE.ObjectCount() == 0 )User::Leave(KErrArgument);
 
@@ -2823,7 +2830,7 @@
  */
 void CSmsMessage::AddEmsObjectDistributionL(const CEmsObjectDistribution& aObjectDistributionIE)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSOBJECTDISTRIBUTIONL_1, "CSmsMessage::AddEmsObjectDistributionL()");
+	LOGGSMU1("CSmsMessage::AddEmsObjectDistributionL()");
 
     TUint count=iInformationElementArray->Count();
     TUint objectDistributionStartPosition=aObjectDistributionIE.StartPosition();
@@ -2875,7 +2882,7 @@
  */
 EXPORT_C CEmsInformationElement* CSmsMessage::RemoveEMSInformationElementL(const TUint aStartPosition,const TSmsId aEmsId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTL_1, "CSmsMessage::RemoveEMSInformationElementL()");
+	LOGGSMU1("CSmsMessage::RemoveEMSInformationElementL()");
 
 	CEmsInformationElement* emsIE=NULL;
 	CEmsInformationElement* ie=NULL;
@@ -2913,7 +2920,7 @@
  */
 EXPORT_C RPointerArray<CEmsInformationElement>* CSmsMessage::RemoveEMSInformationElementsL(const TUint aStartPosition,const TSmsId aEmsId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTSL_1, "CSmsMessage::RemoveEMSInformationElementsL()");
+	LOGGSMU1("CSmsMessage::RemoveEMSInformationElementsL()");
 
 	CEmsInformationElement* ie=NULL;
 	RPointerArray<CEmsInformationElement>* selectedIEs = NULL;
@@ -2944,7 +2951,7 @@
  */
 EXPORT_C void  CSmsMessage::ResetEMSL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_RESETEMSL_1, "CSmsMessage::ResetEMSL()");
+	LOGGSMU1("CSmsMessage::ResetEMSL()");
 
 	iInformationElementArray->ResetAndDestroy();
 	} // CSmsMessage::ResetEMSL
@@ -2958,7 +2965,7 @@
  */
 EXPORT_C const RPointerArray<const CEmsInformationElement>& CSmsMessage::GetEMSInformationElementsL()const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETEMSINFORMATIONELEMENTSL_1, "CSmsMessage::GetEMSInformationElementsL()");
+	LOGGSMU1("CSmsMessage::GetEMSInformationElementsL()");
 
 	 return (const RPointerArray<const CEmsInformationElement>&)(*iInformationElementArray);
 	} // CSmsMessage::GetEMSInformationElementsL
@@ -2966,7 +2973,7 @@
 
 void CSmsMessage::UpdateUserPromptAndODIElementsStartPosition()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_UPDATEUSERPROMPTANDODIELEMENTSSTARTPOSITION_1, "CSmsMessage::UpdateUserPromptAndODIElementsStartPosition()");
+	LOGGSMU1("CSmsMessage::UpdateUserPromptAndODIElementsStartPosition()");
 
 		TUint num=iInformationElementArray->Count();
 		TInt startPosition=-1;
@@ -2994,7 +3001,7 @@
 
 TInt CSmsMessage::AddReceivedEmsInformationElement(CEmsInformationElement* aEmsIE)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDRECEIVEDEMSINFORMATIONELEMENT_1, "CSmsMessage::AddReceivedEmsInformationElement()");
+	LOGGSMU1("CSmsMessage::AddReceivedEmsInformationElement()");
 
 	TInt ret=KErrNone;
 	if(CSmsInformationElement::ESmsEnhancedUserPromptIndicator == aEmsIE->Identifier() || CSmsInformationElement::ESmsEnhancedODI == aEmsIE->Identifier())
@@ -3027,7 +3034,7 @@
  */
 EXPORT_C void CSmsMessage::UpdateSlotsL(TDesC8& aDesc)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_UPDATESLOTSL_1, "CSmsMessage::UpdateSlotsL()");
+	LOGGSMU1("CSmsMessage::UpdateSlotsL()");
 
     TGsmSmsSlotEntry newSlot;
 
@@ -3070,7 +3077,7 @@
  */
 EXPORT_C void CSmsMessage::CopyEmsElementsL(CSmsMessage& aToMessage) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_COPYEMSELEMENTSL_1, "CSmsMessage::CopyEmsElementsL()");
+	LOGGSMU1("CSmsMessage::CopyEmsElementsL()");
 
 	// CSmsMessage extended EMS API method creates array of references to EMS elements in
 	// the source message
@@ -3092,7 +3099,7 @@
  */
 EXPORT_C void CSmsMessage::AddSlotL(const TGsmSmsSlotEntry& aSlot)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ADDSLOTL_1, "CSmsMessage::AddSlotL()");
+	LOGGSMU1("CSmsMessage::AddSlotL()");
 
 		TInt count = iSlotArray.Count();
 		TInt i(0);
@@ -3102,8 +3109,8 @@
 			if(aSlot.iIndex == iSlotArray[i].iIndex)found=ETrue;
 			else ++i;
 		}
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ADDSLOTL_2, "CSmsMessage::AddSlotL current no in: %d, adds index %d", count,aSlot.iIndex );
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ADDSLOTL_3, "found %d at position %d",found,i);
+		LOGGSMU3("CSmsMessage::AddSlotL current no in: %d, adds index %d", count,aSlot.iIndex );
+		LOGGSMU3("found %d at position %d",found,i);
 		iSlotArray.AppendL(aSlot);
 	} // CSmsMessage::AddSlotL
 
@@ -3112,7 +3119,7 @@
  */
 EXPORT_C TBool CSmsMessage::MatchSlots(const CArrayFixFlat<TGsmSmsSlotEntry>& aSlotArray)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_MATCHSLOTS_1, "CSmsMessage::MatchSlots()");
+	LOGGSMU1("CSmsMessage::MatchSlots()");
 
 		TBool match = EFalse;
 		TInt count = aSlotArray.Count();
@@ -3173,7 +3180,7 @@
 void  CSmsMessage::InstallEmailHeaderInformationElementL(CSmsUserData& aUserData,TInt& aHeaderLength)
  	{
  	// Installs all the information elements within the subsequent PDUs.
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL_1, "CSmsMessage::InstallEmailHeaderInformationElementL()");
+ 	LOGGSMU1("CSmsMessage::InstallEmailHeaderInformationElementL()");
 
  	CSmsInformationElement::TSmsInformationElementIdentifier id;
 
@@ -3202,7 +3209,7 @@
     // but cannot be removed as impacts public header.
     BULLSEYE_OFF    
     // Installs all the information elements within the subsequent PDUs.
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL1_1, "CSmsMessage::InstallEmailHeaderInformationElementL()");
+    LOGGSMU1("CSmsMessage::InstallEmailHeaderInformationElementL()");
     
     CSmsInformationElement::TSmsInformationElementIdentifier id;
     
@@ -3233,7 +3240,7 @@
  */
 EXPORT_C void CSmsMessage::AddEmailHeaderL(const TDesC& aEmailHeader, const TDesC& aEmailBody)
  	{
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ADDEMAILHEADERL_1, "CSmsMessage::AddEmailHeaderL()");
+ 	LOGGSMU1("CSmsMessage::AddEmailHeaderL()");
 
  	if(IsEmailHeader())
  		User::Leave(KErrAlreadyExists);
@@ -3281,7 +3288,7 @@
   */
 EXPORT_C TBool CSmsMessage::IsEmailHeader() const
  	{
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ISEMAILHEADER_1, "CSmsMessage::IsEmailHeader()");
+ 	LOGGSMU1("CSmsMessage::IsEmailHeader()");
 
 	TInt emailIndex;
 	return SmsPDU().UserData().InformationElementIndex(CSmsInformationElement::ESmsIEIRFC822EmailHeader,emailIndex);
@@ -3300,7 +3307,7 @@
   */
 EXPORT_C TBool CSmsMessage::GetEmailHeaderL(HBufC** aEmailHeader,HBufC** aEmailBody)
  	{
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETEMAILHEADERL_1, "CSmsMessage::GetEmailHeaderL()");
+ 	LOGGSMU1("CSmsMessage::GetEmailHeaderL()");
 
  	if(IsEmailHeader())
  		{
@@ -3347,7 +3354,7 @@
   */
 EXPORT_C TTimeIntervalSeconds CSmsMessage::UTCOffset() const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_UTCOFFSET_1, "CSmsMessage::UTCOffset()");
+    LOGGSMU1("CSmsMessage::UTCOffset()");
 
     TUint timeZoneOffset = ((iFlags & ESmsUTCOffsetSecondGranularityMask) >> ESecondBitOffset);
 
@@ -3373,7 +3380,7 @@
   */
 EXPORT_C TBool CSmsMessage::SetUTCOffset(const TTimeIntervalSeconds& aTimeOffset)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_SETUTCOFFSET_1, "CSmsMessage::SetUTCOffset()");
+    LOGGSMU1("CSmsMessage::SetUTCOffset()");
 
     TBool rc = ETrue;
 
@@ -3396,7 +3403,7 @@
         }
     else
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_SETUTCOFFSET_2, "CSmsMessage::SetUTCOffset offset [out of range] = %d",timeOffset);
+        LOGGSMU2("CSmsMessage::SetUTCOffset offset [out of range] = %d",timeOffset);
         rc = EFalse;
         }
 
@@ -3410,7 +3417,7 @@
  */
 EXPORT_C TInt CSmsMessage::Version()
  	{
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_VERSION_1, "CSmsMessage::Version()");
+ 	LOGGSMU1("CSmsMessage::Version()");
 
  	return iVersion;
  	} // CSmsMessage::Version
@@ -3426,7 +3433,7 @@
  */
 EXPORT_C TInt CSmsMessage::SetVersion(TInt aVersion)
 	{
- 	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_SETVERSION_1, "CSmsMessage::SetVersion(), version = %d", aVersion);
+ 	LOGGSMU2("CSmsMessage::SetVersion()", aVersion);
 
 	if((aVersion>=ESmsMessageV0) && (aVersion<=ESmsMessageV4))
 		{
@@ -3449,7 +3456,7 @@
  */
 EXPORT_C void CSmsMessage::InternalizeWithoutBufferAndVersionL(RReadStream& aStream)
 	{
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERANDVERSIONL_1, "CSmsMessage::InternalizeWithoutBufferAndVersionL()");
+ 	LOGGSMU1("CSmsMessage::InternalizeWithoutBufferAndVersionL()");
 
 	iFlags=aStream.ReadInt32L();
 	iStatus=(NMobileSmsStore::TMobileSmsStoreStatus) aStream.ReadInt32L();
@@ -3489,7 +3496,7 @@
  */
 EXPORT_C void CSmsMessage::ExternalizeWithoutBufferAndVersionL(RWriteStream& aStream) const
 	{
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERANDVERSIONL_1, "CSmsMessage::ExternalizeWithoutBufferAndVersionL()");
+ 	LOGGSMU1("CSmsMessage::ExternalizeWithoutBufferAndVersionL()");
 
 	aStream.WriteInt32L(iFlags);
 	aStream.WriteInt32L(iStatus);
@@ -3585,11 +3592,11 @@
  */
 EXPORT_C CSmsIEOperation& CSmsMessage::GetOperationsForIEL(CSmsInformationElement::TSmsInformationElementIdentifier aId) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETOPERATIONSFORIEL_1, "CSmsMessage::GetOperationsForIEL()");
+    LOGGSMU1("CSmsMessage::GetOperationsForIEL()");
 
     if (iVersion < CSmsMessage::ESmsMessageV1)
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETOPERATIONSFORIEL_2, "CSmsMessage::GetOperationsForIEL, Operation not supported, Msg Version %d", iVersion);
+        LOGGSMU2("CSmsMessage::GetOperationsForIEL, Operation not supported, Msg Version %d", iVersion);
         User::Leave(KErrNotSupported);
         }
 
@@ -3598,11 +3605,11 @@
 
 EXPORT_C CSmsNonIEOperation& CSmsMessage::GetOperationsForNonIEL(TSmsNonIEIdentifier aId) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETOPERATIONSFORNONIEL_1, "CSmsMessage::GetOperationsForNonIEL");
+	LOGGSMU1("CSmsMessage::GetOperationsForNonIEL");
 
 	if (iVersion < CSmsMessage::ESmsMessageV2)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETOPERATIONSFORNONIEL_2, "GetOperationsForNonIEL not supported, Msg Version %d", iVersion);
+		LOGGSMU2("GetOperationsForNonIEL not supported, Msg Version %d", iVersion);
 		User::Leave(KErrNotSupported);
 		}
 
@@ -3612,7 +3619,7 @@
 
 void CSmsMessage::CreateControlIEOperationsClassesL()
     {
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CREATECONTROLIEOPERATIONSCLASSESL_1, "CSmsMessage::CreateControlIEOperationsClassesL()");
+ 	LOGGSMU1("CSmsMessage::CreateControlIEOperationsClassesL()");
 
     CSmsIEOperation* iEOperation = NULL;
 
@@ -3669,7 +3676,7 @@
  */
 EXPORT_C void  CSmsMessage::SetDecodedOnSIM(TBool aOnSim)
     {
- 	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_SETDECODEDONSIM_1, "CSmsMessage::SetDecodedOnSIM(): %d", aOnSim);
+ 	LOGGSMU2("CSmsMessage::SetDecodedOnSIM(): %d", aOnSim);
 
     if (aOnSim)
         {
@@ -3697,7 +3704,7 @@
  */
 EXPORT_C TBool CSmsMessage::DecodedOnSim()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_DECODEDONSIM_1, "CSmsMessage::DecodedOnSim()");
+    LOGGSMU1("CSmsMessage::DecodedOnSim()");
 
     if (iFlags & EDecodedOnSimBit)
         {
@@ -3723,7 +3730,7 @@
  */
 EXPORT_C void CSmsMessage::SetForwardToClient(TBool aForward)
     {
- 	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_SETFORWARDTOCLIENT_1, "CSmsMessage::SetForwardToClient(): %d", aForward);
+ 	LOGGSMU2("CSmsMessage::SetForwardToClient(): %d", aForward);
 
     if (aForward)
         {
@@ -3750,7 +3757,7 @@
  */
 EXPORT_C TBool CSmsMessage::ForwardToClient()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_FORWARDTOCLIENT_1, "CSmsMessage::ForwardToClient()");
+    LOGGSMU1("CSmsMessage::ForwardToClient()");
 
     if (iFlags & EForwardToClientBit)
         {

--- a/smsprotocols/smsstack/gsmu/src/gsmuieoperations.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmuieoperations.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "gsmuieoperationsTraces.h"
-#endif
-
 #include "Gsmumain.h"
 #include "gsmuieoperations.h"
 #include "Gsmumsg.h"
@@ -46,7 +40,7 @@
  */
 CSmsIEOperation*  CSmsIEOperation::NewL(CSmsInformationElement::TSmsInformationElementIdentifier aId, CSmsMessage& aMessage, CCnvCharacterSetConverter& aCharacterSetConverter, RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSIEOPERATION_NEWL_1, "CSmsIEOperation::NewL()");
+	LOGGSMU1("CSmsIEOperation::NewL()");
 
 	CSmsIEOperation* iEOperation = NULL;
 
@@ -88,7 +82,7 @@
  */
 EXPORT_C CSmsInformationElement::TSmsInformationElementIdentifier CSmsIEOperation::Id() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSIEOPERATION_ID_1, "CSmsIEOperation::Id()");
+	LOGGSMU1("CSmsIEOperation::Id()");
 
 	return iId;
 	} // CSmsInformationElement::TSmsInformationElementIdentifier
@@ -103,7 +97,7 @@
  */
 TBool CSmsIEOperation::MessageTypeSupported() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSIEOPERATION_MESSAGETYPESUPPORTED_1, "CSmsIEOperation::MessageTypeSupported()");
+	LOGGSMU1("CSmsIEOperation::MessageTypeSupported()");
 
 	CSmsPDU::TSmsPDUType type = iMessage.Type();
 
@@ -130,7 +124,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSIEOPERATION_OPERATOR_1, "CSmsIEOperation::operator=");
+    LOGGSMU1("CSmsIEOperation::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     BULLSEYE_RESTORE
     }
@@ -147,7 +141,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSIEOPERATION_OPERATOR1_1, "CSmsIEOperation::operator==");
+    LOGGSMU1("CSmsIEOperation::operator==");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     return EFalse;
     BULLSEYE_RESTORE
@@ -165,7 +159,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCTRLOPERATION_OPERATOR_1, "CSmsCtrlOperation::operator=");
+    LOGGSMU1("CSmsCtrlOperation::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     BULLSEYE_RESTORE
     }
@@ -182,7 +176,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCTRLOPERATION_OPERATOR1_1, "CSmsCtrlOperation::operator==");
+    LOGGSMU1("CSmsCtrlOperation::operator==");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     return EFalse;
     BULLSEYE_RESTORE
@@ -202,7 +196,7 @@
 
 void CSmsIEOperation::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSIEOPERATION_CONSTRUCTL_1, "CSmsIEOperation::ConstructL()");
+	LOGGSMU1("CSmsIEOperation::ConstructL()");
 	} // CSmsIEOperation::ConstructL
 
 
@@ -218,7 +212,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSHYPERLINKOPERATIONS_OPERATOR_1, "CSmsHyperLinkOperations::operator=");
+    LOGGSMU1("CSmsHyperLinkOperations::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     BULLSEYE_RESTORE
     }
@@ -235,7 +229,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSHYPERLINKOPERATIONS_OPERATOR1_1, "CSmsHyperLinkOperations::operator==");
+    LOGGSMU1("CSmsHyperLinkOperations::operator==");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     return EFalse;
     BULLSEYE_RESTORE
@@ -251,17 +245,17 @@
  */
 void CSmsHyperLinkOperations::ValidateOperationL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_1, "CSmsHyperLinkOperations::ValidateOperationL()");
+	LOGGSMU1("CSmsHyperLinkOperations::ValidateOperationL()");
 
 	if (iMessage.Version() < CSmsMessage::ESmsMessageV1)
 	    {
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_2, "CSmsHyperLinkOperations::AddHyperLinkL, Operation not supported, Msg Version %d", iMessage.Version());
+	    LOGGSMU2("CSmsHyperLinkOperations::AddHyperLinkL, Operation not supported, Msg Version %d", iMessage.Version());
 	    User::Leave(KErrNotSupported);
 	    }
 
 	if (!MessageTypeSupported())
 	    {
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_3, "CSmsHyperLinkOperations::AddHyperLinkL, Operation not supported by this PDU type, type = %d", iMessage.Type());
+	    LOGGSMU2("CSmsHyperLinkOperations::AddHyperLinkL, Operation not supported by this PDU type, type = %d", iMessage.Type());
 	    User::Leave(KErrNotSupported);
 	    }
 	} // CSmsHyperLinkOperations::ValidateOperationL
@@ -284,7 +278,7 @@
  */
 EXPORT_C void CSmsHyperLinkOperations::AddHyperLinkL(TUint aPosition, TUint8 aTitleLength,  TUint8  aURLLength) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSHYPERLINKOPERATIONS_ADDHYPERLINKL_1, "CSmsHyperLinkOperations::AddHyperLinkL()");
+	LOGGSMU1("CSmsHyperLinkOperations::AddHyperLinkL()");
 
 	ValidateOperationL();
 
@@ -316,7 +310,7 @@
  */
 EXPORT_C TUint CSmsHyperLinkOperations::NumberOfHyperLinksL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSHYPERLINKOPERATIONS_NUMBEROFHYPERLINKSL_1, "CSmsHyperLinkOperations::NumberOfHyperLinks");
+	LOGGSMU1("CSmsHyperLinkOperations::NumberOfHyperLinks");
 
 	ValidateOperationL();
 
@@ -373,7 +367,7 @@
  */
 EXPORT_C void  CSmsHyperLinkOperations::CopyHyperLinkAtIndexL(TUint aIndex, TUint& aPosition, TUint8& aTitleLength,  TUint8&  aURLLength) const
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSHYPERLINKOPERATIONS_COPYHYPERLINKATINDEXL_1, "CSmsHyperLinkOperations::CopyHyperLinkAtIndexL(): aIndex=%d", aIndex);
+	LOGGSMU2("CSmsHyperLinkOperations::CopyHyperLinkAtIndexL(): aIndex=%d", aIndex);
 
 	ValidateOperationL();
 
@@ -425,7 +419,7 @@
  */
 EXPORT_C void  CSmsHyperLinkOperations::RemoveAllHyperLinksL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSHYPERLINKOPERATIONS_REMOVEALLHYPERLINKSL_1, "CSmsHyperLinkOperations::RemoveAllHyperLinks");
+	LOGGSMU1("CSmsHyperLinkOperations::RemoveAllHyperLinks");
 
 	ValidateOperationL();
 
@@ -470,7 +464,7 @@
  */
 EXPORT_C void  CSmsHyperLinkOperations::RemoveHyperLinkL(TUint aIndex) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSHYPERLINKOPERATIONS_REMOVEHYPERLINKL_1, "CSmsHyperLinkOperations::RemoveHyperLink");
+	LOGGSMU1("CSmsHyperLinkOperations::RemoveHyperLink");
 
 	ValidateOperationL();
 
@@ -520,7 +514,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREPLYADDRESSOPERATIONS_OPERATOR_1, "CSmsReplyAddressOperations::operator=");
+    LOGGSMU1("CSmsReplyAddressOperations::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     BULLSEYE_RESTORE
     }
@@ -537,7 +531,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREPLYADDRESSOPERATIONS_OPERATOR1_1, "CSmsReplyAddressOperations::operator==");
+    LOGGSMU1("CSmsReplyAddressOperations::operator==");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     return EFalse;
     BULLSEYE_RESTORE
@@ -553,17 +547,17 @@
  */
 void CSmsReplyAddressOperations::ValidateOperationL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_1, "CSmsReplyAddressOperations::ValidateOperationL()");
+	LOGGSMU1("CSmsReplyAddressOperations::ValidateOperationL()");
 
 	if (iMessage.Version() < CSmsMessage::ESmsMessageV1)
 	    {
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_2, "CSmsReplyAddressOperations::AddReplyAddressL, Operation not supported, Msg Version %d", iMessage.Version());
+	    LOGGSMU2("CSmsReplyAddressOperations::AddReplyAddressL, Operation not supported, Msg Version %d", iMessage.Version());
 	    User::Leave(KErrNotSupported);
 	    }
 
 	if (!MessageTypeSupported())
 	    {
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_3, "CSmsReplyAddressOperations::AddReplyAddressL, Operation not supported by this PDU type, type = %d", iMessage.Type());
+	    LOGGSMU2("CSmsReplyAddressOperations::AddReplyAddressL, Operation not supported by this PDU type, type = %d", iMessage.Type());
 	    User::Leave(KErrNotSupported);
 	    }
 	} // CSmsReplyAddressOperations::ValidateOperationL
@@ -584,13 +578,13 @@
  */
 EXPORT_C void  CSmsReplyAddressOperations::AddReplyAddressL(const TDesC& aAddress) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_1, "CSmsReplyAddressOperations::AddReplyAddressL()");
+	LOGGSMU1("CSmsReplyAddressOperations::AddReplyAddressL()");
 
 	ValidateOperationL();
 
 	if (ContainsReplyAddressIEL())
 	    {
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_2, "CSmsReplyAddressOperations::AddReplyAddressL, Already Exists");
+	    LOGGSMU1("CSmsReplyAddressOperations::AddReplyAddressL, Already Exists");
 	    User::Leave(KErrAlreadyExists);
 	    }
 
@@ -630,13 +624,13 @@
  */
 EXPORT_C void  CSmsReplyAddressOperations::AddParsedReplyAddressL(const TGsmSmsTelNumber& aParsedAddress) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_1, "CSmsReplyAddressOperations::AddParsedReplyAddressL");
+	LOGGSMU1("CSmsReplyAddressOperations::AddParsedReplyAddressL");
 
 	ValidateOperationL();
 
 	if (ContainsReplyAddressIEL())
 	    {
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_2, "CSmsReplyAddressOperations::AddParsedReplyAddressL, Already Exists");
+	    LOGGSMU1("CSmsReplyAddressOperations::AddParsedReplyAddressL, Already Exists");
 	    User::Leave(KErrAlreadyExists);
 	    }
 
@@ -675,7 +669,7 @@
  */
 EXPORT_C TBool CSmsReplyAddressOperations::ContainsReplyAddressIEL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_CONTAINSREPLYADDRESSIEL_1, "CSmsReplyAddressOperations::ContainsReplyAddressIEL()");
+	LOGGSMU1("CSmsReplyAddressOperations::ContainsReplyAddressIEL()");
 
 	TBool rc = EFalse;
 
@@ -726,7 +720,7 @@
  */
 EXPORT_C HBufC* CSmsReplyAddressOperations::GetReplyAddressL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_GETREPLYADDRESSL_1, "CSmsReplyAddressOperations::GetReplyAddressL");
+	LOGGSMU1("CSmsReplyAddressOperations::GetReplyAddressL");
 
 	ValidateOperationL();
 
@@ -802,7 +796,7 @@
  */
 EXPORT_C TInt  CSmsReplyAddressOperations::GetParsedReplyAddressL(TGsmSmsTelNumber& aParsedAddress) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_GETPARSEDREPLYADDRESSL_1, "CSmsReplyAddressOperations::GetParsedReplyAddressL");
+	LOGGSMU1("CSmsReplyAddressOperations::GetParsedReplyAddressL");
 
 	ValidateOperationL();
 
@@ -876,7 +870,7 @@
  */
 EXPORT_C void  CSmsReplyAddressOperations::RemoveReplyAddressL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_REMOVEREPLYADDRESSL_1, "CSmsReplyAddressOperations::RemoveReplyAddress");
+	LOGGSMU1("CSmsReplyAddressOperations::RemoveReplyAddress");
 
 	ValidateOperationL();
 
@@ -924,17 +918,17 @@
  */
 void CSmsSpecialSMSMessageOperations::ValidateOperationL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_1, "CSmsSpecialSMSMessageOperations::ValidateOperationL()");
+	LOGGSMU1("CSmsSpecialSMSMessageOperations::ValidateOperationL()");
 
 	if (iMessage.Version() < CSmsMessage::ESmsMessageV1)
 	    {
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_2, "CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL, Operation not supported, version %d", iMessage.Version());
+	    LOGGSMU2("CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL, Operation not supported, version %d", iMessage.Version());
 	    User::Leave(KErrNotSupported);
 	    }
 
 	if (!MessageTypeSupported())
 	    {
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_3, "CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL, Operation not supported by this PDU type, type = %d", iMessage.Type());
+	    LOGGSMU2("CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL, Operation not supported by this PDU type, type = %d", iMessage.Type());
 	    User::Leave(KErrNotSupported);
 	    }
 	} // CSmsSpecialSMSMessageOperations::ValidateOperationL
@@ -952,7 +946,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR_1, "CSmsSpecialSMSMessageOperations::operator=");
+    LOGGSMU1("CSmsSpecialSMSMessageOperations::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     BULLSEYE_RESTORE
     }
@@ -967,7 +961,7 @@
  */
 TBool CSmsSpecialSMSMessageOperations::operator==(const CSmsSpecialSMSMessageOperations&)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR1_1, "CSmsSpecialSMSMessageOperations::operator==");
+	LOGGSMU1("CSmsSpecialSMSMessageOperations::operator==");
 	Panic(KGsmuPanicMethodBodyNotImplemented1);
 	return EFalse;
 	} // CSmsSpecialSMSMessageOperations::operator
@@ -998,7 +992,7 @@
                                                                             TSmsMessageProfileType aProfile,
                                                                             TUint8 aMessageCount) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSPECIALSMSMESSAGEOPERATIONS_ADDSPECIALMESSAGEINDICATIONL_1, "CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL");
+	LOGGSMU1("CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL");
 
 	ValidateOperationL();
 
@@ -1055,7 +1049,7 @@
  */
 EXPORT_C TUint CSmsSpecialSMSMessageOperations::GetCountOfSpecialMessageIndicationsL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSPECIALSMSMESSAGEOPERATIONS_GETCOUNTOFSPECIALMESSAGEINDICATIONSL_1, "CSmsSpecialSMSMessageOperations::GetCountOfSpecialMessageIndicationsL()");
+	LOGGSMU1("CSmsSpecialSMSMessageOperations::GetCountOfSpecialMessageIndicationsL()");
 
 	ValidateOperationL();
 
@@ -1101,7 +1095,7 @@
                                                                        TSmsMessageProfileType&  aProfile,
                                                                        TUint8& aMessageCount) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSPECIALSMSMESSAGEOPERATIONS_GETMESSAGEINDICATIONIEL_1, "CSmsSpecialSMSMessageOperations::GetMessageIndicationIEL()");
+	LOGGSMU1("CSmsSpecialSMSMessageOperations::GetMessageIndicationIEL()");
 
 	ValidateOperationL();
 
@@ -1145,7 +1139,7 @@
  */
 EXPORT_C void CSmsSpecialSMSMessageOperations::RemoveSpecialMessageIndicationL(TSmsMessageIndicationType aMessageIndicationType, TExtendedSmsIndicationType aExtendedType) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVESPECIALMESSAGEINDICATIONL_1, "CSmsSpecialSMSMessageOperations::RemoveAllSpecialMessageIndications");
+	LOGGSMU1("CSmsSpecialSMSMessageOperations::RemoveAllSpecialMessageIndications");
 
 	ValidateOperationL();
 
@@ -1187,7 +1181,7 @@
  */
 EXPORT_C void CSmsSpecialSMSMessageOperations::RemoveAllSpecialMessageIndicationsL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVEALLSPECIALMESSAGEINDICATIONSL_1, "CSmsSpecialSMSMessageOperations::RemoveAllSpecialMessageIndicationsL");
+	LOGGSMU1("CSmsSpecialSMSMessageOperations::RemoveAllSpecialMessageIndicationsL");
 
 	ValidateOperationL();
 
@@ -1226,7 +1220,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR_1, "CSmsEnhancedVoiceMailOperations::operator=");
+    LOGGSMU1("CSmsEnhancedVoiceMailOperations::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     BULLSEYE_RESTORE
     }
@@ -1243,7 +1237,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR1_1, "CSmsEnhancedVoiceMailOperations::operator==");
+    LOGGSMU1("CSmsEnhancedVoiceMailOperations::operator==");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     return EFalse;
     BULLSEYE_RESTORE
@@ -1259,17 +1253,17 @@
  */
 void CSmsEnhancedVoiceMailOperations::ValidateOperationL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_1, "CSmsEnhancedVoiceMailOperations::ValidateOperationL()");
+	LOGGSMU1("CSmsEnhancedVoiceMailOperations::ValidateOperationL()");
 
 	if (iMessage.Version() < CSmsMessage::ESmsMessageV1)
 	    {
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_2, "CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL, Operation not supported, Msg Version %d", iMessage.Version());
+	    LOGGSMU2("CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL, Operation not supported, Msg Version %d", iMessage.Version());
 	    User::Leave(KErrNotSupported);
 	    }
 
 	if (!MessageTypeSupported())
 	    {
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_3, "CSmsSpecialSMSMessageOperations::AddEnhancedVoiceMailIEL, Operation not supported by this PDU type, type = %d", iMessage.Type());
+	    LOGGSMU2("CSmsSpecialSMSMessageOperations::AddEnhancedVoiceMailIEL, Operation not supported by this PDU type, type = %d", iMessage.Type());
 	    User::Leave(KErrNotSupported);
 	    }
 	} // CSmsEnhancedVoiceMailOperations::ValidateOperationL
@@ -1295,13 +1289,13 @@
  */
 EXPORT_C void CSmsEnhancedVoiceMailOperations::AddEnhancedVoiceMailIEL(const CEnhancedVoiceMailBoxInformation& aEVMI) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_1, "CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL");
+	LOGGSMU1("CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL");
 
 	ValidateOperationL();
 
 	if (ContainsEnhancedVoiceMailIEL())
 	    {
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_2, "CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL, Already Exists");
+	    LOGGSMU1("CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL, Already Exists");
 	    User::Leave(KErrAlreadyExists);
 	    }
 
@@ -1339,7 +1333,7 @@
  */
 EXPORT_C CEnhancedVoiceMailBoxInformation* CSmsEnhancedVoiceMailOperations::RemoveEnhancedVoiceMailIEL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSENHANCEDVOICEMAILOPERATIONS_REMOVEENHANCEDVOICEMAILIEL_1, "CSmsEnhancedVoiceMailInformation::RemoveEnhancedVoiceMailIE");
+	LOGGSMU1("CSmsEnhancedVoiceMailInformation::RemoveEnhancedVoiceMailIE");
 
 	ValidateOperationL();
 
@@ -1366,7 +1360,7 @@
  */
 EXPORT_C CEnhancedVoiceMailBoxInformation* CSmsEnhancedVoiceMailOperations::CopyEnhancedVoiceMailIEL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSENHANCEDVOICEMAILOPERATIONS_COPYENHANCEDVOICEMAILIEL_1, "CSmsEnhancedVoiceMailInformation::CopyEnhancedVoiceMailIEL");
+	LOGGSMU1("CSmsEnhancedVoiceMailInformation::CopyEnhancedVoiceMailIEL");
 
 	ValidateOperationL();
 
@@ -1392,7 +1386,7 @@
  */
 CEnhancedVoiceMailBoxInformation* CSmsEnhancedVoiceMailOperations::GetEnhancedVoiceMailIEL(TBool aRemove) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_GETENHANCEDVOICEMAILIEL_1, "CSmsEnhancedVoiceMailOperations::GetEnhancedVoiceMailIEL()");
+	LOGGSMU1("CSmsEnhancedVoiceMailOperations::GetEnhancedVoiceMailIEL()");
 
 	TBool found = EFalse;
 
@@ -1461,7 +1455,7 @@
  */
 EXPORT_C TBool CSmsEnhancedVoiceMailOperations::ContainsEnhancedVoiceMailIEL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSENHANCEDVOICEMAILOPERATIONS_CONTAINSENHANCEDVOICEMAILIEL_1, "CSmsEnhancedVoiceMailInformation::ContainsEnhancedVoiceMailIEL");
+	LOGGSMU1("CSmsEnhancedVoiceMailInformation::ContainsEnhancedVoiceMailIEL");
 
 	ValidateOperationL();
 
@@ -1529,7 +1523,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR_1, "CSmsSMSCCtrlParameterOperations::operator=");
+    LOGGSMU1("CSmsSMSCCtrlParameterOperations::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     BULLSEYE_RESTORE
     }
@@ -1546,7 +1540,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR1_1, "CSmsSMSCCtrlParameterOperations::operator==");
+    LOGGSMU1("CSmsSMSCCtrlParameterOperations::operator==");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     return EFalse;
     BULLSEYE_RESTORE
@@ -1564,13 +1558,13 @@
 	{
 	if (iMessage.Version() < CSmsMessage::ESmsMessageV2)
 	    {
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_1, "CSmsSMSCCtrlParameterOperations Operation not supported, Msg Version %d", iMessage.Version());
+	    LOGGSMU2("CSmsSMSCCtrlParameterOperations Operation not supported, Msg Version %d", iMessage.Version());
 	    User::Leave(KErrNotSupported); 
 	    }
 
 	if (!MessageTypeSupported())
 	    {
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_2, "CSmsSMSCCtrlParameterOperations Operation not supported by this PDU type, type = %d", iMessage.Type());
+	    LOGGSMU2("CSmsSMSCCtrlParameterOperations Operation not supported by this PDU type, type = %d", iMessage.Type());
 	    User::Leave(KErrNotSupported);
 	    }
 	} // CSmsSMSCCtrlParameterOperations::ValidateOperationL()

--- a/smsprotocols/smsstack/gsmu/src/gsmumsgadditionattributes.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmumsgadditionattributes.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -15,19 +15,13 @@
 // 
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "gsmumsgadditionattributesTraces.h"
-#endif
-
 #include "gsmumsgadditionalattributes.h"
 #include "smsstacklog.h"
 
 
 CSmsMessageAdditionalAttributes* CSmsMessageAdditionalAttributes::NewL()
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_NEWL_1, "CSmsMessageAdditionalAttributes::NewL()");
+	LOGGSMU1("CSmsMessageAdditionalAttributes::NewL()");
 
 	CSmsMessageAdditionalAttributes* additionalAttributes=new(ELeave) CSmsMessageAdditionalAttributes();
 	CleanupStack::PushL(additionalAttributes);
@@ -45,7 +39,7 @@
 
 CSmsMessageAdditionalAttributes::~CSmsMessageAdditionalAttributes()
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_DTOR_1, "CSmsMessageAdditionalAttributes::~CSmsMessageAdditionalAttributes()");
+	LOGGSMU1("CSmsMessageAdditionalAttributes::~CSmsMessageAdditionalAttributes()");
 
 	iSmsPDUArray.ResetAndDestroy();
 
@@ -72,7 +66,7 @@
 
 void CSmsMessageAdditionalAttributes::ConstructL()
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_CONSTRUCTL_1, "CSmsMessageAdditionalAttributes::ConstructL()");
+	LOGGSMU1("CSmsMessageAdditionalAttributes::ConstructL()");
 
     iStatusReportScheme = new (ELeave) CSmsMessageAdditionalAttributes::CDefaultScheme();
     
@@ -85,7 +79,7 @@
 
 void CSmsMessageAdditionalAttributes::AddControlInformationElementL(CSmsInformationElement* aIE)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_1, "CSmsMessageAdditionalAttributes::AddControlInformationElementL()");
+    LOGGSMU1("CSmsMessageAdditionalAttributes::AddControlInformationElementL()");
 
     TSmsInformationElementCategories::TInformationElementCategory category;
     if (aIE != NULL)
@@ -96,13 +90,13 @@
         	}
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_2, "CSmsMessageAdditionalAttributes::AddControlInformationElementL, aIE->Identifier() is invalid");
+            LOGGSMU1("CSmsMessageAdditionalAttributes::AddControlInformationElementL, aIE->Identifier() is invalid");
             User::Leave(KErrArgument);
             }
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_3, "CSmsMessageAdditionalAttributes::AddControlInformationElementL, aIE == NULL");
+        LOGGSMU1("CSmsMessageAdditionalAttributes::AddControlInformationElementL, aIE == NULL");
         User::Leave(KErrArgument);
         }
     } // CSmsMessageAdditionalAttributes::AddControlInformationElementL
@@ -110,7 +104,7 @@
 
 TBool CSmsMessageAdditionalAttributes::Find1stInstanceOfControlInformationElement(TInformationElementId aId, TUint& aIndex) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_FIND1STINSTANCEOFCONTROLINFORMATIONELEMENT_1, "CSmsMessageAdditionalAttributes::Find1stInstanceOfControlInformationElement()");
+    LOGGSMU1("CSmsMessageAdditionalAttributes::Find1stInstanceOfControlInformationElement()");
     
     TBool rc = EFalse;
     TSmsInformationElementCategories::TInformationElementCategory category;
@@ -134,7 +128,7 @@
 
 TBool CSmsMessageAdditionalAttributes::FindNextInstanceOfControlInformationElement(TInformationElementId aId, TUint aStartIndex, TUint& aIndex) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_FINDNEXTINSTANCEOFCONTROLINFORMATIONELEMENT_1, "CSmsMessageAdditionalAttributes::FindNextInstanceOfControlInformationElement()");
+    LOGGSMU1("CSmsMessageAdditionalAttributes::FindNextInstanceOfControlInformationElement()");
     
     TBool rc = EFalse;
     TSmsInformationElementCategories::TInformationElementCategory category;
@@ -159,7 +153,7 @@
 
 CSmsInformationElement& CSmsMessageAdditionalAttributes::GetControlInformationElementL(TInformationElementId aId, TUint aIndex) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_1, "CSmsMessageAdditionalAttributes::GetControlInformationElementL()");
+    LOGGSMU1("CSmsMessageAdditionalAttributes::GetControlInformationElementL()");
     
 
     TSmsInformationElementCategories::TInformationElementCategory category;
@@ -171,21 +165,21 @@
 
     if (aIndex >= iCollectionOfPointersToIEArrays[category]->Count())
         {
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_2, "CSmsMessageAdditionalAttributes::GetControlInformationElementL  aId = %d , aIndex = %d", aId, aIndex);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_3, "CSmsMessageAdditionalAttributes::GetControlInformationElementL  Count = %d", iCollectionOfPointersToIEArrays[category]->Count());
+        LOGGSMU3("CSmsMessageAdditionalAttributes::GetControlInformationElementL  aId = %d , aIndex = %d", aId, aIndex);
+        LOGGSMU2("CSmsMessageAdditionalAttributes::GetControlInformationElementL  Count = %d", iCollectionOfPointersToIEArrays[category]->Count());
         User::Leave(KErrArgument);
         }
 
     if (iCollectionOfPointersToIEArrays[category]->operator[](aIndex) == NULL)
         {
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_4, "CSmsMessageAdditionalAttributes::GetControlInformationElementL  aId = %d , aIndex = %d", aId, aIndex);
+        LOGGSMU3("CSmsMessageAdditionalAttributes::GetControlInformationElementL  aId = %d , aIndex = %d", aId, aIndex);
         User::Leave(KErrArgument);
         }
 
     if (iCollectionOfPointersToIEArrays[category]->operator[](aIndex)->Identifier()!=aId)
         {
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_5, "CSmsMessageAdditionalAttributes::GetControlInformationElementL aId = %d, aIndex = %d", aId, aIndex);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_6, "CSmsMessageAdditionalAttributes::GetControlInformationElementL  id = %d", iCollectionOfPointersToIEArrays[category]->operator[](aIndex)->Identifier());
+        LOGGSMU3("CSmsMessageAdditionalAttributes::GetControlInformationElementL aId = %d, aIndex = %d", aId, aIndex);
+        LOGGSMU2("CSmsMessageAdditionalAttributes::GetControlInformationElementL  id = %d", iCollectionOfPointersToIEArrays[category]->operator[](aIndex)->Identifier());
         User::Leave(KErrArgument);
         }
 
@@ -196,7 +190,7 @@
 
 TBool CSmsMessageAdditionalAttributes::RemoveControlInformationElement(TInformationElementId aId, TUint aIndex, CSmsInformationElementPtr& aIE)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_REMOVECONTROLINFORMATIONELEMENT_1, "CSmsMessageAdditionalAttributes::RemoveControlInformationElement()");
+    LOGGSMU1("CSmsMessageAdditionalAttributes::RemoveControlInformationElement()");
     
     TBool rc = EFalse;
     TSmsInformationElementCategories::TInformationElementCategory category;
@@ -218,7 +212,7 @@
 
 void CSmsMessageAdditionalAttributes::AddControlInformationElementL(TCategory aCategory, CSmsInformationElementPtr aIE)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL1_1, "CSmsMessageAdditionalAttributes::AddControlInformationElementL()");
+    LOGGSMU1("CSmsMessageAdditionalAttributes::AddControlInformationElementL()");
     
     if ((aIE != NULL) &&
         (aCategory < TSmsInformationElementCategories::ENumberOfCategories))
@@ -234,7 +228,7 @@
 
 TBool CSmsMessageAdditionalAttributes::RemoveNextControlInformationElement(TCategory aCategory, CSmsInformationElementPtr& aIEPtr)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_REMOVENEXTCONTROLINFORMATIONELEMENT_1, "CSmsMessageAdditionalAttributes::RemoveNextControlInformationElement()");
+    LOGGSMU1("CSmsMessageAdditionalAttributes::RemoveNextControlInformationElement()");
 
     TBool rc = EFalse;
     if (aCategory < TSmsInformationElementCategories::ENumberOfCategories)
@@ -253,18 +247,19 @@
 
 CSmsInformationElement& CSmsMessageAdditionalAttributes::GetControlInformationElementL(TCategory aCategory, TUint aIndex) const
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_1, "CSmsMessageAdditionalAttributes::GetControlInformationElementL(): aCategory=%d, aIndex=%d",aCategory, aIndex);
+    LOGGSMU3("CSmsMessageAdditionalAttributes::GetControlInformationElementL(): aCategory=%d, aIndex=%d",
+    		 aCategory, aIndex);
 
     if ((aCategory >= TSmsInformationElementCategories::ENumberOfCategories) ||
         (aIndex    >= iCollectionOfPointersToIEArrays[aCategory]->Count()))
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_2, "CSmsMessageAdditionalAttributes::GetControlInformationElementL: KErrArgument");
+        LOGGSMU1("CSmsMessageAdditionalAttributes::GetControlInformationElementL: KErrArgument");
         User::Leave(KErrArgument);
         }
 
     if  ((iCollectionOfPointersToIEArrays[aCategory])->operator[](aIndex) == NULL)
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_3, "CSmsMessageAdditionalAttributes::GetControlInformationElementL: KErrCorrupt");
+        LOGGSMU1("CSmsMessageAdditionalAttributes::GetControlInformationElementL: KErrCorrupt");
         User::Leave(KErrCorrupt);
         }
 
@@ -274,7 +269,7 @@
 
 void CSmsMessageAdditionalAttributes::DeleteControlInformationElement(TCategory aCategory, TUint8 aIndex)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_DELETECONTROLINFORMATIONELEMENT_1, "CSmsMessageAdditionalAttributes::DeleteControlInformationElement()");
+    LOGGSMU1("CSmsMessageAdditionalAttributes::DeleteControlInformationElement()");
     
     if (aCategory < TSmsInformationElementCategories::ENumberOfCategories)
         {
@@ -293,7 +288,7 @@
 
 TUint CSmsMessageAdditionalAttributes::NumberOfControlInformationElements(TCategory aCategory) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_NUMBEROFCONTROLINFORMATIONELEMENTS_1, "CSmsMessageAdditionalAttributes::NumberOfControlInformationElements1()");
+    LOGGSMU1("CSmsMessageAdditionalAttributes::NumberOfControlInformationElements1()");
 
     TUint count = 0;
 
@@ -308,7 +303,7 @@
 
 void CSmsMessageAdditionalAttributes::ExternalizeL(RWriteStream& aStream, TInt aVersion) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_EXTERNALIZEL_1, "CSmsMessageAdditionalAttributes::ExternalizeL()");
+    LOGGSMU1("CSmsMessageAdditionalAttributes::ExternalizeL()");
 
 	if(aVersion == CSmsMessage::ESmsIncompleteClass0MessageV)
 		{
@@ -372,7 +367,7 @@
 
 void CSmsMessageAdditionalAttributes::InternalizeL(RReadStream& aStream, TInt aVersion)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_INTERNALIZEL_1, "CSmsMessageAdditionalAttributes::InternalizeL()");
+    LOGGSMU1("CSmsMessageAdditionalAttributes::InternalizeL()");
 
 	if(aVersion == CSmsMessage::ESmsIncompleteClass0MessageV)
 		{
@@ -452,7 +447,7 @@
 
 void CSmsMessageAdditionalAttributes::ResetAttributesL()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_RESETATTRIBUTESL_1, "CSmsMessageAdditionalAttributes::ResetAttributesL()");
+    LOGGSMU1("CSmsMessageAdditionalAttributes::ResetAttributesL()");
     
     for (TInt category = 0; category < TSmsInformationElementCategories::ENumberOfCategories; category++)
         {
@@ -473,7 +468,7 @@
 
 CSmsIEOperation& CSmsMessageAdditionalAttributes::GetIEOperationL(TInformationElementId aId) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETIEOPERATIONL_1, "CSmsMessageAdditionalAttributes::GetIEOperation()");
+    LOGGSMU1("CSmsMessageAdditionalAttributes::GetIEOperation()");
 
     CSmsIEOperation* operation = NULL;
 
@@ -512,7 +507,7 @@
  */
 CSmsNonIEOperation& CSmsMessageAdditionalAttributes::GetNonIEOperationL(TSmsNonIEIdentifier aId) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETNONIEOPERATIONL_1, "CSmsMessageAdditionalAttributes::GetNonIEOperationL");
+	LOGGSMU1("CSmsMessageAdditionalAttributes::GetNonIEOperationL");
     
     CSmsNonIEOperation* operation = NULL;
     
@@ -535,14 +530,14 @@
 
 void CSmsMessageAdditionalAttributes::SetIEOperationL(CSmsIEOperation* aOperation)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_1, "CSmsMessageAdditionalAttributes::SetIEOperationL()");
+	LOGGSMU1("CSmsMessageAdditionalAttributes::SetIEOperationL()");
 
     if (aOperation == NULL)
         {
         User::Leave(KErrArgument);
         }
 
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_2, "CSmsMessageAdditionalAttributes::AddIEOperation, operation=%d", aOperation->Id());
+    LOGGSMU2("CSmsMessageAdditionalAttributes::AddIEOperation, operation=%d", aOperation->Id());
 
     switch(aOperation->Id())
         {
@@ -581,7 +576,7 @@
         User::Leave(KErrArgument);        
         }
     
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_SETNONIEOPERATIONL_1, "CSmsMessageAdditionalAttributes::SetNonIEOperationL, operation = %d", aOperation->Id());
+    LOGGSMU2("CSmsMessageAdditionalAttributes::SetNonIEOperationL, operation = %d", aOperation->Id());
     
     if (aOperation->Id() == ESmsTPSRRParameter)
         {

--- a/smsprotocols/smsstack/gsmu/src/gsmunonieoperations.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmunonieoperations.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "gsmunonieoperationsTraces.h"
-#endif
-
 #include "Gsmumain.h" 
 #include "gsmunonieoperations.h" 
 #include "Gsmumsg.h"
@@ -107,7 +101,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSNONIEOPERATION_OPERATOR_1, "CSmsNonIEOperation::operator=");
+    LOGGSMU1("CSmsNonIEOperation::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     BULLSEYE_RESTORE
     }
@@ -124,7 +118,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSNONIEOPERATION_OPERATOR1_1, "CSmsNonIEOperation::operator==");
+    LOGGSMU1("CSmsNonIEOperation::operator==");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     return EFalse;
     BULLSEYE_RESTORE
@@ -142,7 +136,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCTRLNONIEOPERATION_OPERATOR_1, "CSmsCtrlNonIEOperation::operator=");
+    LOGGSMU1("CSmsCtrlNonIEOperation::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     BULLSEYE_RESTORE
     }
@@ -159,7 +153,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCTRLNONIEOPERATION_OPERATOR1_1, "CSmsCtrlNonIEOperation::operator==");
+    LOGGSMU1("CSmsCtrlNonIEOperation::operator==");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     return EFalse;
     BULLSEYE_RESTORE
@@ -200,7 +194,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_OPERATOR_1, "CSmsTPSRROperations::operator=");
+    LOGGSMU1("CSmsTPSRROperations::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     BULLSEYE_RESTORE
     }
@@ -217,7 +211,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_OPERATOR1_1, "CSmsTPSRROperations::operator==");
+    LOGGSMU1("CSmsTPSRROperations::operator==");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     return EFalse;
     BULLSEYE_RESTORE
@@ -234,13 +228,13 @@
 	{
 	if (iMessage.Version() < CSmsMessage::ESmsMessageV2)
 	    {
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_1, "CSmsTPSRROperations Operation not supported, Msg Version %d", iMessage.Version());
+	    LOGGSMU2("CSmsTPSRROperations Operation not supported, Msg Version %d", iMessage.Version());
 	    User::Leave(KErrNotSupported); 
 	    }
 
 	if (!MessageTypeSupported())
 	    {
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_2, "CSmsTPSRROperations Operation not supported by this PDU type, type = %d", iMessage.Type());
+	    LOGGSMU2("CSmsTPSRROperations Operation not supported by this PDU type, type = %d", iMessage.Type());
 	    User::Leave(KErrNotSupported);
 	    }
 	}
@@ -553,7 +547,7 @@
 CIncompleteClass0MessageInfo::CIncompleteClass0MessageInfo(TSmsNonIEIdentifier aId, CSmsMessage& aMessage)
 	: CSmsNonIEOperation(aId, aMessage)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_CTOR_1, "CIncompleteClass0MessageInfo constructor");
+	LOGGSMU1("CIncompleteClass0MessageInfo constructor");
 	}
 
 /** 
@@ -570,7 +564,7 @@
  */			
 EXPORT_C void CIncompleteClass0MessageInfo::GetIncompleteMessageInfoL(TInt& aStartPos, TInt& aEndPos, TBool& aIsLastIncompleteMessage)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CINCOMPLETECLASS0MESSAGEINFO_GETINCOMPLETEMESSAGEINFOL_1, "CIncompleteClass0MessageInfo::GetIncompleteMessageInfoL");
+	LOGGSMU1("CIncompleteClass0MessageInfo::GetIncompleteMessageInfoL");
 	ValidateOperationL();
 	aStartPos = iStartPos;
 	aEndPos = iEndPos;
@@ -591,7 +585,7 @@
  */
 EXPORT_C void CIncompleteClass0MessageInfo::SetIncompleteMessageInfoL(TInt aStartPos, TInt aEndPos, TBool aIsLastIncompleteMessage)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CINCOMPLETECLASS0MESSAGEINFO_SETINCOMPLETEMESSAGEINFOL_1, "CIncompleteClass0MessageInfo::SetIncompleteMessageInfoL");
+	LOGGSMU1("CIncompleteClass0MessageInfo::SetIncompleteMessageInfoL");
 	ValidateOperationL();
 	iStartPos = aStartPos;
 	iEndPos = aEndPos;
@@ -610,7 +604,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_OPERATOR_1, "CIncompleteClass0MessageInfo::operator=");
+    LOGGSMU1("CIncompleteClass0MessageInfo::operator=");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     BULLSEYE_RESTORE
     }
@@ -627,7 +621,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_OPERATOR1_1, "CIncompleteClass0MessageInfo::operator==");
+    LOGGSMU1("CIncompleteClass0MessageInfo::operator==");
     Panic(KGsmuPanicMethodBodyNotImplemented1);
     return EFalse;
     BULLSEYE_RESTORE
@@ -642,7 +636,7 @@
  */
 TBool CIncompleteClass0MessageInfo::MessageTypeSupported() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_MESSAGETYPESUPPORTED_1, "CIncompleteClass0MessageInfo::MessageTypeSupported");
+	LOGGSMU1("CIncompleteClass0MessageInfo::MessageTypeSupported");
 	CSmsPDU::TSmsPDUType type = iMessage.Type();
 	return (type == CSmsPDU::ESmsDeliver);
 	}
@@ -656,17 +650,17 @@
  */
 void CIncompleteClass0MessageInfo::ValidateOperationL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_1, "CIncompleteClass0MessageInfo::ValidateOperationL");
+	LOGGSMU1("CIncompleteClass0MessageInfo::ValidateOperationL");
 
 	if (iMessage.Version() != CSmsMessage::ESmsIncompleteClass0MessageV)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_2, "CIncompleteClass0MessageInfo Operation not supported, Msg Version %d", iMessage.Version());
+		LOGGSMU2("CIncompleteClass0MessageInfo Operation not supported, Msg Version %d", iMessage.Version());
 		User::Leave(KErrNotSupported); 
 		}
 
 	if (!MessageTypeSupported())
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_3, "CIncompleteClass0MessageInfo Operation not supported by this PDU type, type = %d", iMessage.Type());
+		LOGGSMU2("CIncompleteClass0MessageInfo Operation not supported by this PDU type, type = %d", iMessage.Type());
 		User::Leave(KErrNotSupported);
 		}
 	}
@@ -681,7 +675,7 @@
     // class, no need to check the version. Expected to be used if
     // a new version of the class is added
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VERSION_1, "CIncompleteClass0MessageInfo::Version()");
+    LOGGSMU1("CIncompleteClass0MessageInfo::Version()");
     return iVersion;
     BULLSEYE_RESTORE
     }
@@ -695,7 +689,7 @@
  */
 void CIncompleteClass0MessageInfo::SetVersion(TInt aVersion)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_SETVERSION_1, "CIncompleteClass0MessageInfo::SetVersion() version:%d", aVersion);
+	LOGGSMU2("CIncompleteClass0MessageInfo::SetVersion()", aVersion);
 
 	__ASSERT_DEBUG((aVersion<EMaxSmsIncompleteClass0MessageV),Panic(KGsmuPanicVersionNotSupported));
 
@@ -710,7 +704,7 @@
  */
 void CIncompleteClass0MessageInfo::InternalizeL(RReadStream& aStream)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_INTERNALIZEL_1, "CIncompleteClass0MessageInfo::InternalizeL()");
+	LOGGSMU1("CIncompleteClass0MessageInfo::InternalizeL()");
 	iVersion = aStream.ReadInt32L();
 	iStartPos = aStream.ReadInt32L();
 	iEndPos = aStream.ReadInt32L();
@@ -725,7 +719,7 @@
  */
 void CIncompleteClass0MessageInfo::ExternalizeL(RWriteStream& aStream) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_EXTERNALIZEL_1, "CIncompleteClass0MessageInfo::ExternalizeL()");
+	LOGGSMU1("CIncompleteClass0MessageInfo::ExternalizeL()");
 	aStream.WriteInt32L(iVersion);
 	aStream.WriteInt32L(iStartPos);
 	aStream.WriteInt32L(iEndPos);

--- a/smsprotocols/smsstack/gsmu/src/gsmupdu.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmupdu.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "gsmupduTraces.h"
-#endif
-
 #include <etelmm.h>
 #include "gsmuNmspaceMobMsg.h"
 #include "gsmuetel.h"
@@ -49,7 +43,7 @@
  */
 EXPORT_C CSmsPDU* CSmsPDU::NewL(RReadStream& aStream,CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NEWL_1, "CSmsPDU::NewL()");
+	LOGGSMU1("CSmsPDU::NewL()");
 
 	TInt type=aStream.ReadUint8L();
 	CSmsPDU* smspdu=NULL;
@@ -117,7 +111,8 @@
  */
 EXPORT_C CSmsPDU* CSmsPDU::NewL(const TGsmSms& aGsmSms,CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs, TBool aIsRPError,TBool aIsMobileTerminated)
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NEWL1_1, "CSmsPDU::NewL(): aIsRPError=%d, aIsMobileTerminated=%d",aIsRPError, aIsMobileTerminated);
+	LOGGSMU3("CSmsPDU::NewL(): aIsRPError=%d, aIsMobileTerminated=%d",
+			 aIsRPError, aIsMobileTerminated);
 
     const TUint8* ptr1=aGsmSms.Pdu().Ptr();
 
@@ -181,7 +176,7 @@
  */
 EXPORT_C CSmsPDU* CSmsPDU::NewL(TSmsPDUType aType,CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs,TBool aIsRPError)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NEWL2_1, "CSmsPDU::NewL(): aIsRPError=%d", aIsRPError);
+	LOGGSMU2("CSmsPDU::NewL(): aIsRPError=%d", aIsRPError);
 
 	CSmsPDU* smspdu=NULL;
 	switch (aType)
@@ -234,7 +229,7 @@
  */
 EXPORT_C CSmsPDU* CSmsPDU::DuplicateL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_DUPLICATEL_1, "CSmsPDU::DuplicateL()");
+	LOGGSMU1("CSmsPDU::DuplicateL()");
 
 	CSmsPDU*  smsPDU = NULL;
 
@@ -308,7 +303,7 @@
  */
 EXPORT_C void CSmsPDU::EncodeMessagePDUL(TGsmSms& aGsmSms) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_ENCODEMESSAGEPDUL_1, "CSmsPDU::EncodeMessagePDUL()");
+	LOGGSMU1("CSmsPDU::EncodeMessagePDUL()");
 
 	NMobileSmsMessaging::TMobileSmsGsmTpdu pdu;
 	pdu.SetLength(NMobileSmsMessaging::KGsmTpduSize);
@@ -326,7 +321,7 @@
 
 void CSmsPDU::EncodeMessagePDUL(TGsmSms& aGsmSms, const TEncodeParams* aEncodeParams) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_ENCODEMESSAGEPDUL1_1, "CSmsPDU::EncodeMessagePDUL()");
+	LOGGSMU1("CSmsPDU::EncodeMessagePDUL()");
 
 	NMobileSmsMessaging::TMobileSmsGsmTpdu pdu;
 	pdu.SetLength(NMobileSmsMessaging::KGsmTpduSize);
@@ -353,7 +348,7 @@
  */
 EXPORT_C TPtrC CSmsPDU::ServiceCenterAddress() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SERVICECENTERADDRESS_1, "CSmsPDU::ServiceCenterAddress()");
+	LOGGSMU1("CSmsPDU::ServiceCenterAddress()");
 
 	return iServiceCenterAddress->Address();
 	} // CSmsPDU::ServiceCenterAddress
@@ -369,7 +364,7 @@
  */
 EXPORT_C void CSmsPDU::SetServiceCenterAddressL(const TDesC& aAddress)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETSERVICECENTERADDRESSL_1, "CSmsPDU::SetServiceCenterAddressL()");
+	LOGGSMU1("CSmsPDU::SetServiceCenterAddressL()");
 
 	iServiceCenterAddress->SetAddressL(aAddress);
 	} // CSmsPDU::SetServiceCenterAddressL
@@ -385,7 +380,7 @@
  */
 EXPORT_C void CSmsPDU::ParsedServiceCenterAddress(TGsmSmsTelNumber& aParsedAddress) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_PARSEDSERVICECENTERADDRESS_1, "CSmsPDU::ParsedServiceCenterAddress()");
+	LOGGSMU1("CSmsPDU::ParsedServiceCenterAddress()");
 
 	iServiceCenterAddress->ParsedAddress(aParsedAddress);
 	} // CSmsPDU::ParsedServiceCenterAddress
@@ -401,7 +396,7 @@
  */
 EXPORT_C void CSmsPDU::SetParsedServiceCenterAddressL(const TGsmSmsTelNumber& aParsedAddress)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETPARSEDSERVICECENTERADDRESSL_1, "CSmsPDU::SetParsedServiceCenterAddressL()");
+	LOGGSMU1("CSmsPDU::SetParsedServiceCenterAddressL()");
 
 	iServiceCenterAddress->SetParsedAddressL(aParsedAddress);
 	} // CSmsPDU::SetParsedServiceCenterAddressL
@@ -426,7 +421,7 @@
  */
 EXPORT_C TPtrC CSmsPDU::ToFromAddress() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_TOFROMADDRESS_1, "CSmsPDU::SetParsedServiceCenterAddressL()");
+	LOGGSMU1("CSmsPDU::SetParsedServiceCenterAddressL()");
 
 	if (ToFromAddressPtr() == NULL)
 		{
@@ -450,7 +445,7 @@
  */
 EXPORT_C void CSmsPDU::SetToFromAddressL(const TDesC& aAddress)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETTOFROMADDRESSL_1, "CSmsPDU::SetToFromAddressL()");
+	LOGGSMU1("CSmsPDU::SetToFromAddressL()");
 
 	__ASSERT_DEBUG(ToFromAddressPtr()!=NULL,Panic(KGsmuPanicToFromAddressNotPresent));
 	CSmsAddress* tofromaddress=(CSmsAddress*) ToFromAddressPtr();
@@ -468,7 +463,7 @@
  */
 EXPORT_C void CSmsPDU::ParsedToFromAddress(TGsmSmsTelNumber& aParsedAddress) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_PARSEDTOFROMADDRESS_1, "CSmsPDU::ParsedToFromAddress()");
+	LOGGSMU1("CSmsPDU::ParsedToFromAddress()");
 
 	__ASSERT_DEBUG(ToFromAddressPtr()!=NULL,Panic(KGsmuPanicToFromAddressNotPresent));
 	ToFromAddressPtr()->ParsedAddress(aParsedAddress);
@@ -483,7 +478,7 @@
  */
 EXPORT_C void CSmsPDU::SetParsedToFromAddressL(const TGsmSmsTelNumber& aParsedAddress)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETPARSEDTOFROMADDRESSL_1, "CSmsPDU::SetParsedToFromAddressL()");
+	LOGGSMU1("CSmsPDU::SetParsedToFromAddressL()");
 
 	__ASSERT_DEBUG(ToFromAddressPtr()!=NULL,Panic(KGsmuPanicToFromAddressNotPresent));
 	CSmsAddress* tofromaddress=(CSmsAddress*) ToFromAddressPtr();
@@ -502,7 +497,7 @@
  */
 void CSmsPDU::UpdateConcatenationDataL(TInt aRef, TInt aPduIndex, TInt aMaxPdu)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_UPDATECONCATENATIONDATAL_1, "CSmsPDU::UpdateConcatenationDataL()");
+	LOGGSMU1("CSmsPDU::UpdateConcatenationDataL()");
 
 	SetConcatenatedMessageReference(aRef);
 	SetConcatenatedMessagePDUIndex(aPduIndex);
@@ -517,7 +512,7 @@
  */
 void CSmsPDU::UpdateEmailHeaderDataL(TInt& aEmailOverallHeaderLength)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_UPDATEEMAILHEADERDATAL_1, "CSmsPDU::UpdateEmailHeaderDataL()");
+	LOGGSMU1("CSmsPDU::UpdateEmailHeaderDataL()");
 
 	TInt emailIndex(0);
 	TInt udLength=0;
@@ -615,7 +610,7 @@
 
 EXPORT_C TSmsEncoding CSmsPDU::NationalLanguageEncoding() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NATIONALLANGUAGEENCODING_1, "CSmsPDU::NationalLanguageEncoding()");
+	LOGGSMU1("CSmsPDU::NationalLanguageEncoding()");
 	
 	TSmsEncoding  encodingUsed = ESmsEncodingNone;
 	
@@ -725,9 +720,9 @@
 			};
 		}
 	
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NATIONALLANGUAGEENCODING_2, "CSmsPDU::NationalLanguageEncoding(): lockingShift=%d", lockingShiftValue);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NATIONALLANGUAGEENCODING_3, "CSmsPDU::NationalLanguageEncoding(): singleShift=%d", singleShiftValue);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NATIONALLANGUAGEENCODING_4, "CSmsPDU::NationalLanguageEncoding(): encodingUsed=%d", encodingUsed);
+	LOGGSMU2("CSmsPDU::NationalLanguageEncoding(): lockingShift=%d", lockingShiftValue);
+	LOGGSMU2("CSmsPDU::NationalLanguageEncoding(): singleShift=%d", singleShiftValue);
+	LOGGSMU2("CSmsPDU::NationalLanguageEncoding(): encodingUsed=%d", encodingUsed);
 	
 	return encodingUsed;
 	} // CSmsPDU::NationalLanguageEncoding
@@ -735,7 +730,7 @@
 
 EXPORT_C void CSmsPDU::SetNationalLanguageEncodingL(TSmsEncoding aEncoding)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETNATIONALLANGUAGEENCODINGL_1, "CSmsPDU::SetNationalLanguageEncodingL(): aEncoding=%d", aEncoding);
+	LOGGSMU2("CSmsPDU::SetNationalLanguageEncodingL(): aEncoding=%d", aEncoding);
 	
 	//
 	// Convert the encoding enum into two parts: Single Shift and Locking Shift
@@ -815,8 +810,8 @@
 			}
 		};
 	
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETNATIONALLANGUAGEENCODINGL_2, "CSmsPDU::SetNationalLanguageEncodingL(): lockingShift=%d", lockingShiftValue);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETNATIONALLANGUAGEENCODINGL_3, "CSmsPDU::SetNationalLanguageEncodingL(): singleShift=%d", singleShiftValue);
+	LOGGSMU2("CSmsPDU::SetNationalLanguageEncodingL(): lockingShift=%d", lockingShiftValue);
+	LOGGSMU2("CSmsPDU::SetNationalLanguageEncodingL(): singleShift=%d", singleShiftValue);
 	
 	//
 	// Update the locking shift setting...
@@ -904,7 +899,7 @@
  */
 EXPORT_C TSmsDataCodingScheme::TSmsDCSBits7To4 CSmsPDU::Bits7To4() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_BITS7TO4_1, "CSmsPDU::Bits7To4()");
+	LOGGSMU1("CSmsPDU::Bits7To4()");
 
 	__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
 
@@ -926,7 +921,7 @@
  */
 EXPORT_C void CSmsPDU::SetBits7To4(TSmsDataCodingScheme::TSmsDCSBits7To4 aBits7To4)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETBITS7TO4_1, "CSmsPDU::SetBits7To4()");
+	LOGGSMU1("CSmsPDU::SetBits7To4()");
 
 	__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
 	TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -944,7 +939,7 @@
  */
 EXPORT_C TSmsDataCodingScheme::TSmsAlphabet CSmsPDU::Alphabet() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_ALPHABET_1, "CSmsPDU::Alphabet()");
+	LOGGSMU1("CSmsPDU::Alphabet()");
 
 	__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
 	return DataCodingScheme()->Alphabet();
@@ -961,7 +956,7 @@
  */
 EXPORT_C void CSmsPDU::SetAlphabet(TSmsDataCodingScheme::TSmsAlphabet aAlphabet)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETALPHABET_1, "CSmsPDU::SetAlphabet()");
+	LOGGSMU1("CSmsPDU::SetAlphabet()");
 
 	__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
 	TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -980,7 +975,7 @@
  */
 EXPORT_C TBool CSmsPDU::Class(TSmsDataCodingScheme::TSmsClass& aClass) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_CLASS_1, "CSmsPDU::Class()");
+	LOGGSMU1("CSmsPDU::Class()");
 
 	__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
 	return DataCodingScheme()->Class(aClass);
@@ -998,7 +993,7 @@
  */
 EXPORT_C void CSmsPDU::SetClass(TBool aClassDefined,TSmsDataCodingScheme::TSmsClass aClass)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETCLASS_1, "CSmsPDU::SetClass()");
+	LOGGSMU1("CSmsPDU::SetClass()");
 
 	__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
 	TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -1016,7 +1011,7 @@
  */
 EXPORT_C TBool CSmsPDU::TextCompressed() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_TEXTCOMPRESSED_1, "CSmsPDU::TextCompressed()");
+	LOGGSMU1("CSmsPDU::TextCompressed()");
 
 	__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
 	return DataCodingScheme()->TextCompressed();
@@ -1033,7 +1028,7 @@
  */
 EXPORT_C void CSmsPDU::SetTextCompressed(TBool aCompressed)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETTEXTCOMPRESSED_1, "CSmsPDU::SetTextCompressed()");
+	LOGGSMU1("CSmsPDU::SetTextCompressed()");
 
 	__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
 	TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -1051,7 +1046,7 @@
  */
 EXPORT_C TSmsDataCodingScheme::TSmsIndicationState CSmsPDU::IndicationState() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_INDICATIONSTATE_1, "CSmsPDU::IndicationState()");
+	LOGGSMU1("CSmsPDU::IndicationState()");
 
 	__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
 	return DataCodingScheme()->IndicationState();
@@ -1068,7 +1063,7 @@
  */
 EXPORT_C void CSmsPDU::SetIndicationState(TSmsDataCodingScheme::TSmsIndicationState aState)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETINDICATIONSTATE_1, "CSmsPDU::SetIndicationState()");
+	LOGGSMU1("CSmsPDU::SetIndicationState()");
 
 	__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
 	TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -1086,7 +1081,7 @@
  */
 EXPORT_C TSmsDataCodingScheme::TSmsIndicationType CSmsPDU::IndicationType() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_INDICATIONTYPE_1, "CSmsPDU::IndicationType()");
+	LOGGSMU1("CSmsPDU::IndicationType()");
 
 	__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
 	return DataCodingScheme()->IndicationType();
@@ -1103,7 +1098,7 @@
  */
 EXPORT_C void CSmsPDU::SetIndicationType(TSmsDataCodingScheme::TSmsIndicationType aType)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETINDICATIONTYPE_1, "CSmsPDU::SetIndicationType()");
+	LOGGSMU1("CSmsPDU::SetIndicationType()");
 
 	__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
 	TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -1121,7 +1116,7 @@
  */
 EXPORT_C TBool CSmsPDU::TextConcatenated(TBool* aIs16Bit) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_TEXTCONCATENATED_1, "CSmsPDU::TextConcatenated()");
+	LOGGSMU1("CSmsPDU::TextConcatenated()");
 
 	TInt index;
 	return DoTextConcatenated(index,aIs16Bit);
@@ -1140,7 +1135,7 @@
  */
 EXPORT_C void CSmsPDU::SetTextConcatenatedL(TBool aConcatenated,TBool aIs16Bit)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETTEXTCONCATENATEDL_1, "CSmsPDU::SetTextConcatenatedL()");
+	LOGGSMU1("CSmsPDU::SetTextConcatenatedL()");
 
 	TInt index=0;
 	TInt is16bit;
@@ -1178,7 +1173,7 @@
  */
 EXPORT_C TInt CSmsPDU::ConcatenatedMessageReference() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_CONCATENATEDMESSAGEREFERENCE_1, "CSmsPDU::ConcatenatedMessageReference()");
+	LOGGSMU1("CSmsPDU::ConcatenatedMessageReference()");
 
 	TInt index=0;
 	TBool is16bit;
@@ -1206,7 +1201,7 @@
  */
 EXPORT_C void CSmsPDU::SetConcatenatedMessageReference(TInt aReference)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETCONCATENATEDMESSAGEREFERENCE_1, "CSmsPDU::SetConcatenatedMessageReference()");
+	LOGGSMU1("CSmsPDU::SetConcatenatedMessageReference()");
 
 	TInt index=0;
 	TBool is16bit;
@@ -1236,7 +1231,7 @@
  */
 EXPORT_C TInt CSmsPDU::NumConcatenatedMessagePDUs() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NUMCONCATENATEDMESSAGEPDUS_1, "CSmsPDU::NumConcatenatedMessagePDUs()");
+	LOGGSMU1("CSmsPDU::NumConcatenatedMessagePDUs()");
 
 	TInt index=0;
 	TBool is16bit;
@@ -1257,7 +1252,7 @@
  */
 EXPORT_C void CSmsPDU::SetNumConcatenatedMessagePDUs(TInt aNum)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETNUMCONCATENATEDMESSAGEPDUS_1, "CSmsPDU::SetNumConcatenatedMessagePDUs()");
+	LOGGSMU1("CSmsPDU::SetNumConcatenatedMessagePDUs()");
 
 	TInt index=0;
 	TBool is16bit;
@@ -1279,7 +1274,7 @@
  */
 EXPORT_C TInt CSmsPDU::ConcatenatedMessagePDUIndex() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_CONCATENATEDMESSAGEPDUINDEX_1, "CSmsPDU::ConcatenatedMessagePDUIndex()");
+	LOGGSMU1("CSmsPDU::ConcatenatedMessagePDUIndex()");
 
 	TInt index=0;
 	TBool is16bit;
@@ -1300,7 +1295,7 @@
  */
 EXPORT_C void CSmsPDU::SetConcatenatedMessagePDUIndex(TInt aIndex)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETCONCATENATEDMESSAGEPDUINDEX_1, "CSmsPDU::SetConcatenatedMessagePDUIndex()");
+	LOGGSMU1("CSmsPDU::SetConcatenatedMessagePDUIndex()");
 
 	TInt index=0;
 	TBool is16bit;
@@ -1324,7 +1319,7 @@
  */
 EXPORT_C TBool CSmsPDU::ApplicationPortAddressing(TInt& aDestination,TInt& aOriginator,TBool* aIs16Bit) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_APPLICATIONPORTADDRESSING_1, "CSmsPDU::ApplicationPortAddressing()");
+	LOGGSMU1("CSmsPDU::ApplicationPortAddressing()");
 
 	TInt index;
 	return DoApplicationPortAddressing(index,aDestination,aOriginator,aIs16Bit);
@@ -1343,7 +1338,7 @@
  */
 EXPORT_C void CSmsPDU::SetApplicationPortAddressingL(TBool aAddressing,TInt aDestination,TInt aOriginator,TBool aIs16Bit)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETAPPLICATIONPORTADDRESSINGL_1, "CSmsPDU::SetApplicationPortAddressingL()");
+	LOGGSMU1("CSmsPDU::SetApplicationPortAddressingL()");
 
 	TInt index=0;
 	TInt is16bit;
@@ -1381,7 +1376,7 @@
  */
 EXPORT_C TSmsProtocolIdentifier::TSmsPIDType CSmsPDU::PIDType() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_PIDTYPE_1, "CSmsPDU::PIDType()");
+	LOGGSMU1("CSmsPDU::PIDType()");
 
 	__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
 	return ProtocolIdentifier()->PIDType();
@@ -1396,7 +1391,7 @@
  */
 EXPORT_C void CSmsPDU::SetPIDType(TSmsProtocolIdentifier::TSmsPIDType aSmsPIDType)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETPIDTYPE_1, "CSmsPDU::SetPIDType()");
+	LOGGSMU1("CSmsPDU::SetPIDType()");
 
 	__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
 	TSmsProtocolIdentifier* protocolidentifier=(TSmsProtocolIdentifier*) ProtocolIdentifier();
@@ -1412,7 +1407,7 @@
  */
 EXPORT_C TSmsProtocolIdentifier::TSmsTelematicDeviceIndicator CSmsPDU::TelematicDeviceIndicator() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_TELEMATICDEVICEINDICATOR_1, "CSmsPDU::TelematicDeviceIndicator()");
+	LOGGSMU1("CSmsPDU::TelematicDeviceIndicator()");
 
 	__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
 	return ProtocolIdentifier()->TelematicDeviceIndicator();
@@ -1427,7 +1422,7 @@
  */
 EXPORT_C void CSmsPDU::SetTelematicDeviceIndicator(TSmsProtocolIdentifier::TSmsTelematicDeviceIndicator aIndicator)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETTELEMATICDEVICEINDICATOR_1, "CSmsPDU::SetTelematicDeviceIndicator()");
+	LOGGSMU1("CSmsPDU::SetTelematicDeviceIndicator()");
 
 	__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
 	TSmsProtocolIdentifier* protocolidentifier=(TSmsProtocolIdentifier*) ProtocolIdentifier();
@@ -1443,7 +1438,7 @@
  */
 EXPORT_C TSmsProtocolIdentifier::TSmsShortMessageType CSmsPDU::ShortMessageType() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SHORTMESSAGETYPE_1, "CSmsPDU::ShortMessageType()");
+	LOGGSMU1("CSmsPDU::ShortMessageType()");
 
 	__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
 	return (TSmsProtocolIdentifier::TSmsShortMessageType) ProtocolIdentifier()->ShortMessageType();
@@ -1458,7 +1453,7 @@
  */
 EXPORT_C void CSmsPDU::SetShortMessageType(TSmsProtocolIdentifier::TSmsShortMessageType aShortMessageType)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETSHORTMESSAGETYPE_1, "CSmsPDU::SetShortMessageType()");
+	LOGGSMU1("CSmsPDU::SetShortMessageType()");
 
 	__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
 	TSmsProtocolIdentifier* protocolidentifier=(TSmsProtocolIdentifier*) ProtocolIdentifier();
@@ -1474,7 +1469,7 @@
  */
 EXPORT_C TSmsProtocolIdentifier::TSmsTelematicDeviceType CSmsPDU::TelematicDeviceType() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_TELEMATICDEVICETYPE_1, "CSmsPDU::TelematicDeviceType()");
+	LOGGSMU1("CSmsPDU::TelematicDeviceType()");
 
 	__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
 	return ProtocolIdentifier()->TelematicDeviceType();
@@ -1489,7 +1484,7 @@
  */
 EXPORT_C void CSmsPDU::SetTelematicDeviceType(TSmsProtocolIdentifier::TSmsTelematicDeviceType aDeviceType)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETTELEMATICDEVICETYPE_1, "CSmsPDU::SetTelematicDeviceType()");
+	LOGGSMU1("CSmsPDU::SetTelematicDeviceType()");
 
 	__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
 	TSmsProtocolIdentifier* protocolidentifier=(TSmsProtocolIdentifier*) ProtocolIdentifier();
@@ -1507,7 +1502,7 @@
  */
 EXPORT_C TBool CSmsPDU::UserDataPresent() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_USERDATAPRESENT_1, "CSmsPDU::UserDataPresent()");
+	LOGGSMU1("CSmsPDU::UserDataPresent()");
 
 	TBool udPresent=ETrue;
 	switch (iSmsPDUType)
@@ -1540,7 +1535,7 @@
  */
 EXPORT_C void CSmsPDU::SetUserDataPresent(TBool aPresent)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETUSERDATAPRESENT_1, "CSmsPDU::SetUserDataPresent(): aPresent=%d", aPresent);
+	LOGGSMU2("CSmsPDU::SetUserDataPresent(): aPresent=%d", aPresent);
 
 	__ASSERT_DEBUG(ParameterIndicator()!=NULL,Panic(KGsmuPanicParameterIndicatorNotPresent));
 	TSmsParameterIndicator* parameterindicator=(TSmsParameterIndicator*) ParameterIndicator();
@@ -1558,7 +1553,7 @@
  */
 EXPORT_C TBool CSmsPDU::DataCodingSchemePresent() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_DATACODINGSCHEMEPRESENT_1, "CSmsPDU::DataCodingSchemePresent()");
+	LOGGSMU1("CSmsPDU::DataCodingSchemePresent()");
 
 	TBool dcsPresent=ETrue;
 	switch (iSmsPDUType)
@@ -1592,7 +1587,7 @@
  */
 EXPORT_C void CSmsPDU::SetDataCodingSchemePresent(TBool aPresent)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETDATACODINGSCHEMEPRESENT_1, "CSmsPDU::SetDataCodingSchemePresent(): aPresent=%d", aPresent);
+	LOGGSMU2("CSmsPDU::SetDataCodingSchemePresent(): aPresent=%d", aPresent);
 
 	__ASSERT_DEBUG(ParameterIndicator()!=NULL,Panic(KGsmuPanicParameterIndicatorNotPresent));
 	TSmsParameterIndicator* parameterindicator=(TSmsParameterIndicator*) ParameterIndicator();
@@ -1610,7 +1605,7 @@
  */
 EXPORT_C TBool CSmsPDU::ProtocolIdentifierPresent() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_PROTOCOLIDENTIFIERPRESENT_1, "CSmsPDU::ProtocolIdentifierPresent()");
+	LOGGSMU1("CSmsPDU::ProtocolIdentifierPresent()");
 
 	TBool pidPresent=ETrue;
 	switch (iSmsPDUType)
@@ -1644,7 +1639,7 @@
  */
 EXPORT_C void CSmsPDU::SetProtocolIdentifierPresent(TBool aPresent)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETPROTOCOLIDENTIFIERPRESENT_1, "CSmsPDU::SetProtocolIdentifierPresent(): aPresent=%d", aPresent);
+	LOGGSMU2("CSmsPDU::SetProtocolIdentifierPresent(): aPresent=%d", aPresent);
 
 	__ASSERT_DEBUG(ParameterIndicator()!=NULL,Panic(KGsmuPanicParameterIndicatorNotPresent));
 	TSmsParameterIndicator* parameterindicator=(TSmsParameterIndicator*) ParameterIndicator();
@@ -1661,7 +1656,7 @@
  */
 EXPORT_C CSmsUserData& CSmsPDU::UserData()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_USERDATA_1, "CSmsPDU::UserData()");
+	LOGGSMU1("CSmsPDU::UserData()");
 
 	__ASSERT_DEBUG(UserDataPtr()!=NULL,Panic(KGsmuPanicUserDataNotPresent));
 	CSmsUserData* userdata=(CSmsUserData*) UserDataPtr();
@@ -1677,7 +1672,7 @@
  */
 EXPORT_C const CSmsUserData& CSmsPDU::UserData() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_USERDATA1_1, "CSmsPDU::UserData()");
+	LOGGSMU1("CSmsPDU::UserData()");
 
 	__ASSERT_DEBUG(UserDataPtr()!=NULL,Panic(KGsmuPanicUserDataNotPresent));
 	return *UserDataPtr();
@@ -1738,7 +1733,7 @@
 
 TBool CSmsPDU::DoTextConcatenated(TInt& aIndex,TBool* aIs16Bit) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_DOTEXTCONCATENATED_1, "CSmsPDU::DoTextConcatenated()");
+	LOGGSMU1("CSmsPDU::DoTextConcatenated()");
 
 	TBool is8bit=UserData().InformationElementIndex(CSmsInformationElement::ESmsIEIConcatenatedShortMessages8BitReference,aIndex);
 	TBool is16bit=EFalse;
@@ -1752,7 +1747,7 @@
 
 void CSmsPDU::DoSetTextConcatenatedL(TBool aIs16Bit)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_DOSETTEXTCONCATENATEDL_1, "CSmsPDU::DoSetTextConcatenatedL(): aIs16Bit=%d", aIs16Bit);
+	LOGGSMU2("CSmsPDU::DoSetTextConcatenatedL(): aIs16Bit=%d", aIs16Bit);
 
 	if (!aIs16Bit)
 		{
@@ -1778,7 +1773,7 @@
 
 TBool CSmsPDU::DoApplicationPortAddressing(TInt& aIndex,TInt& aDestination,TInt& aOriginator,TBool* aIs16Bit) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_DOAPPLICATIONPORTADDRESSING_1, "CSmsPDU::DoApplicationPortAddressing()");
+	LOGGSMU1("CSmsPDU::DoApplicationPortAddressing()");
 
 	TBool is8bit=UserData().InformationElementIndex(CSmsInformationElement::ESmsIEIApplicationPortAddressing8Bit,aIndex);
 	TBool is16bit=EFalse;
@@ -1808,7 +1803,8 @@
 
 void CSmsPDU::DoSetApplicationPortAddressingL(TInt aDestination,TInt aOriginator,TBool aIs16Bit)
 	{
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_DOSETAPPLICATIONPORTADDRESSINGL_1, "CSmsPDU::DoSetApplicationPortAddressingL(): aDestination=%d, aOriginator=%d, aIs16Bit=%d",aDestination, aOriginator, aIs16Bit);
+	LOGGSMU4("CSmsPDU::DoSetApplicationPortAddressingL(): aDestination=%d, aOriginator=%d, aIs16Bit=%d",
+			 aDestination, aOriginator, aIs16Bit);
 
 	if (!aIs16Bit)
 		{
@@ -1849,7 +1845,7 @@
  */
 EXPORT_C TBool CSmsDeliver::MoreMessagesToSend() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_MOREMESSAGESTOSEND_1, "CSmsDeliver::MoreMessagesToSend");
+	LOGGSMU1("CSmsDeliver::MoreMessagesToSend");
 
 	return (iFirstOctet&TSmsFirstOctet::ESmsMoreMessagesToSendMask)==TSmsFirstOctet::ESmsMoreMessagesToSend;
 	} // CSmsDeliver::MoreMessagesToSend
@@ -1863,7 +1859,7 @@
  */
 EXPORT_C void CSmsDeliver::SetMoreMessagesToSend(TBool aMore)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_SETMOREMESSAGESTOSEND_1, "CSmsDeliver::SetMoreMessagesToSend(): aMore=%d", aMore);
+	LOGGSMU2("CSmsDeliver::SetMoreMessagesToSend(): aMore=%d", aMore);
 
 	iFirstOctet=aMore? (iFirstOctet&(~TSmsFirstOctet::ESmsMoreMessagesToSendMask)|TSmsFirstOctet::ESmsMoreMessagesToSend):
 	                   (iFirstOctet&(~TSmsFirstOctet::ESmsMoreMessagesToSendMask)|TSmsFirstOctet::ESmsNoMoreMessagesToSend);
@@ -1881,7 +1877,7 @@
  */
 EXPORT_C TBool CSmsDeliver::ReplyPath() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_REPLYPATH_1, "CSmsDeliver::ReplyPath");
+	LOGGSMU1("CSmsDeliver::ReplyPath");
 
 	return (iFirstOctet&TSmsFirstOctet::ESmsReplyPathMask)==TSmsFirstOctet::ESmsReplyPathExists;
 	} // CSmsDeliver::ReplyPath
@@ -1895,7 +1891,7 @@
  */
 EXPORT_C void CSmsDeliver::SetReplyPath(TBool aReplyPath)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_SETREPLYPATH_1, "CSmsDeliver::SetReplyPath(): aReplyPath=%d", aReplyPath);
+	LOGGSMU2("CSmsDeliver::SetReplyPath(): aReplyPath=%d", aReplyPath);
 
 	iFirstOctet=aReplyPath? (iFirstOctet&(~TSmsFirstOctet::ESmsReplyPathMask)|TSmsFirstOctet::ESmsReplyPathExists):
 	                        (iFirstOctet&(~TSmsFirstOctet::ESmsReplyPathMask)|TSmsFirstOctet::ESmsReplyPathNone);
@@ -1910,7 +1906,7 @@
  */
 EXPORT_C TBool CSmsDeliver::StatusReportIndication() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_STATUSREPORTINDICATION_1, "CSmsDeliver::StatusReportIndication");
+	LOGGSMU1("CSmsDeliver::StatusReportIndication");
 
 	return (iFirstOctet&TSmsFirstOctet::ESmsStatusReportIndicatorMask)==TSmsFirstOctet::ESmsStatusReportReturned;
 	} // CSmsDeliver::StatusReportIndication
@@ -1924,7 +1920,7 @@
  */
 EXPORT_C void CSmsDeliver::SetStatusReportIndication(TBool aIndication)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_SETSTATUSREPORTINDICATION_1, "CSmsDeliver::SetStatusReportIndication(): aIndication=%d", aIndication);
+	LOGGSMU2("CSmsDeliver::SetStatusReportIndication(): aIndication=%d", aIndication);
 
 	iFirstOctet=aIndication? (iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportIndicatorMask)|TSmsFirstOctet::ESmsStatusReportReturned):
 	                         (iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportIndicatorMask)|TSmsFirstOctet::ESmsStatusReportNotReturned);
@@ -1951,7 +1947,7 @@
  */
 EXPORT_C void CSmsDeliver::ServiceCenterTimeStamp(TTime& aTime,TInt& aNumQuarterHours)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_SERVICECENTERTIMESTAMP_1, "CSmsDeliver::ServiceCenterTimeStamp()");
+	LOGGSMU1("CSmsDeliver::ServiceCenterTimeStamp()");
 
 	aTime=iServiceCenterTimeStamp.Time();
 	aNumQuarterHours=iServiceCenterTimeStamp.TimeOffset();
@@ -1967,7 +1963,7 @@
  */
 EXPORT_C void CSmsDeliver::SetServiceCenterTimeStamp(const TTime& aTime,TInt aNumQuarterHours)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_SETSERVICECENTERTIMESTAMP_1, "CSmsDeliver::ServiceCenterTimeStamp(): aNumQuarterHours=%d", aNumQuarterHours);
+	LOGGSMU2("CSmsDeliver::ServiceCenterTimeStamp(): aNumQuarterHours=%d", aNumQuarterHours);
 
 	iServiceCenterTimeStamp.SetTime(aTime);
 	iServiceCenterTimeStamp.SetTimeOffset(aNumQuarterHours);
@@ -1976,7 +1972,7 @@
 
 void CSmsDeliver::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_CONSTRUCTL_1, "CSmsDeliver::ConstructL()");
+	LOGGSMU1("CSmsDeliver::ConstructL()");
 
 	iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
 	iOriginalAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
@@ -1991,7 +1987,7 @@
  */
 EXPORT_C CSmsDeliver* CSmsDeliver::DuplicateL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_DUPLICATEL_1, "CSmsDeliver::DuplicateL()");
+	LOGGSMU1("CSmsDeliver::DuplicateL()");
 
 	CSmsDeliver*  smsDeliver = new (ELeave) CSmsDeliver();
 	CleanupStack::PushL(smsDeliver);
@@ -2013,7 +2009,7 @@
 
 TUint8* CSmsDeliver::EncodeL(TUint8* aPtr) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_ENCODEL_1, "CSmsDeliver::EncodeL()");
+	LOGGSMU1("CSmsDeliver::EncodeL()");
 
 	aPtr=iFirstOctet.EncodeL(aPtr);
 	aPtr=iOriginalAddress->EncodeL(aPtr);
@@ -2030,7 +2026,7 @@
 
 void CSmsDeliver::DecodeL(TGsmuLex8& aPdu)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_DECODEL_1, "CSmsDeliver::DecodeL()");
+	LOGGSMU1("CSmsDeliver::DecodeL()");
 
 	iFirstOctet.DecodeL(aPdu);
 	iOriginalAddress->DecodeL(aPdu);
@@ -2059,7 +2055,7 @@
 
 void CSmsDeliver::InternalizeMessagePDUL(RReadStream& aStream)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_INTERNALIZEMESSAGEPDUL_1, "CSmsDeliver::InternalizeMessagePDUL()");
+	LOGGSMU1("CSmsDeliver::InternalizeMessagePDUL()");
 
 	iServiceCenterAddress->InternalizeL(aStream);
 
@@ -2078,7 +2074,7 @@
 
 void CSmsDeliver::ExternalizeMessagePDUL(RWriteStream& aStream) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_EXTERNALIZEMESSAGEPDUL_1, "CSmsDeliver::ExternalizeMessagePDUL()");
+	LOGGSMU1("CSmsDeliver::ExternalizeMessagePDUL()");
 
 	iServiceCenterAddress->ExternalizeL(aStream);
 
@@ -2097,7 +2093,7 @@
 
 const TSmsDataCodingScheme* CSmsDeliver::DataCodingScheme() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_DATACODINGSCHEME_1, "CSmsDeliver::DataCodingScheme()");
+	LOGGSMU1("CSmsDeliver::DataCodingScheme()");
 
 	return &iDataCodingScheme;
 	} // CSmsDeliver::DataCodingScheme
@@ -2111,7 +2107,7 @@
  */
 EXPORT_C const TSmsProtocolIdentifier* CSmsDeliver::ProtocolIdentifier() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_PROTOCOLIDENTIFIER_1, "CSmsDeliver::ProtocolIdentifier()");
+	LOGGSMU1("CSmsDeliver::ProtocolIdentifier()");
 
 	return &iProtocolIdentifier;
 	} // CSmsDeliver::ProtocolIdentifier
@@ -2119,7 +2115,7 @@
 
 const CSmsUserData* CSmsDeliver::UserDataPtr() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_USERDATAPTR_1, "CSmsDeliver::UserDataPtr()");
+	LOGGSMU1("CSmsDeliver::UserDataPtr()");
 
 	return iUserData;
 	} // CSmsDeliver::UserDataPtr
@@ -2127,7 +2123,7 @@
 
 const CSmsAddress* CSmsDeliver::ToFromAddressPtr() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_TOFROMADDRESSPTR_1, "CSmsDeliver::ToFromAddressPtr()");
+	LOGGSMU1("CSmsDeliver::ToFromAddressPtr()");
 
 	return iOriginalAddress;
 	} // CSmsDeliver::ToFromAddressPtr
@@ -2163,7 +2159,7 @@
  */
 EXPORT_C TBool CSmsSubmit::RejectDuplicates() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_REJECTDUPLICATES_1, "CSmsSubmit::RejectDuplicates()");
+	LOGGSMU1("CSmsSubmit::RejectDuplicates()");
 
 	return (iFirstOctet&TSmsFirstOctet::ESmsRejectDuplicatesMask)==TSmsFirstOctet::ESmsRejectDuplicates;
 	} // CSmsSubmit::RejectDuplicates
@@ -2177,7 +2173,7 @@
  */
 EXPORT_C void CSmsSubmit::SetRejectDuplicates(TBool aRejectDuplicates)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETREJECTDUPLICATES_1, "CSmsSubmit::SetRejectDuplicates(): aRejectDuplicates=%d", aRejectDuplicates);
+	LOGGSMU2("CSmsSubmit::SetRejectDuplicates(): aRejectDuplicates=%d", aRejectDuplicates);
 
 	iFirstOctet=aRejectDuplicates? (iFirstOctet&(~TSmsFirstOctet::ESmsRejectDuplicatesMask)|TSmsFirstOctet::ESmsRejectDuplicates):
 	                        (iFirstOctet&(~TSmsFirstOctet::ESmsRejectDuplicatesMask)|TSmsFirstOctet::ESmsAcceptDuplicates);
@@ -2192,7 +2188,7 @@
  */
 EXPORT_C TSmsFirstOctet::TSmsValidityPeriodFormat CSmsSubmit::ValidityPeriodFormat() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_VALIDITYPERIODFORMAT_1, "CSmsSubmit::ValidityPeriodFormat()");
+	LOGGSMU1("CSmsSubmit::ValidityPeriodFormat()");
 
 	return iValidityPeriod.ValidityPeriodFormat();
 	} // TSmsFirstOctet::TSmsValidityPeriodFormat
@@ -2206,7 +2202,7 @@
  */
 EXPORT_C void CSmsSubmit::SetValidityPeriodFormat(TSmsFirstOctet::TSmsValidityPeriodFormat aValidityPeriodFormat)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETVALIDITYPERIODFORMAT_1, "CSmsSubmit::SetValidityPeriodFormat()");
+	LOGGSMU1("CSmsSubmit::SetValidityPeriodFormat()");
 
 	iValidityPeriod.SetValidityPeriodFormat(aValidityPeriodFormat);
 	} // CSmsSubmit::SetValidityPeriodFormat
@@ -2223,7 +2219,7 @@
  */
 EXPORT_C TBool CSmsSubmit::ReplyPath() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_REPLYPATH_1, "CSmsSubmit::ReplyPath()");
+	LOGGSMU1("CSmsSubmit::ReplyPath()");
 
 	return (iFirstOctet&TSmsFirstOctet::ESmsReplyPathMask)==TSmsFirstOctet::ESmsReplyPathExists;
 	} // CSmsSubmit::ReplyPath
@@ -2237,7 +2233,7 @@
  */
 EXPORT_C void CSmsSubmit::SetReplyPath(TBool aReplyPath)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETREPLYPATH_1, "CSmsSubmit::SetReplyPath(): aReplyPath=%d", aReplyPath);
+	LOGGSMU2("CSmsSubmit::SetReplyPath(): aReplyPath=%d", aReplyPath);
 
 	iFirstOctet=aReplyPath? (iFirstOctet&(~TSmsFirstOctet::ESmsReplyPathMask)|TSmsFirstOctet::ESmsReplyPathExists):
 	                        (iFirstOctet&(~TSmsFirstOctet::ESmsReplyPathMask)|TSmsFirstOctet::ESmsReplyPathNone);
@@ -2254,7 +2250,7 @@
  */
 EXPORT_C TBool CSmsSubmit::StatusReportRequest() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_STATUSREPORTREQUEST_1, "CSmsSubmit::StatusReportRequest()");
+	LOGGSMU1("CSmsSubmit::StatusReportRequest()");
 
 	return (iFirstOctet&TSmsFirstOctet::ESmsStatusReportRequestMask)==TSmsFirstOctet::ESmsStatusReportRequested;
 	} // CSmsSubmit::StatusReportRequest
@@ -2268,7 +2264,7 @@
  */
 EXPORT_C void CSmsSubmit::SetStatusReportRequest(TBool aRequest)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETSTATUSREPORTREQUEST_1, "CSmsSubmit::SetStatusReportRequest(): aRequest=%d", aRequest);
+	LOGGSMU2("CSmsSubmit::SetStatusReportRequest(): aRequest=%d", aRequest);
 
 	iFirstOctet=aRequest? (iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportRequestMask)|TSmsFirstOctet::ESmsStatusReportRequested):
 	                      (iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportRequestMask)|TSmsFirstOctet::ESmsStatusReportNotRequested);
@@ -2283,7 +2279,7 @@
  */
 EXPORT_C TInt CSmsSubmit::MessageReference() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_MESSAGEREFERENCE_1, "CSmsSubmit::MessageReference()");
+	LOGGSMU1("CSmsSubmit::MessageReference()");
 
 	return iMessageReference;
 	} // CSmsSubmit::MessageReference
@@ -2297,7 +2293,8 @@
  */
 EXPORT_C void CSmsSubmit::SetMessageReference(TInt aMessageReference)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETMESSAGEREFERENCE_1, "CSmsSubmit::SetMessageReference(): aMessageReference=%d",aMessageReference);
+	LOGGSMU2("CSmsSubmit::SetMessageReference(): aMessageReference=%d",
+			 aMessageReference);
 	iMessageReference=aMessageReference;
 	} // CSmsSubmit::SetMessageReference
 
@@ -2310,7 +2307,7 @@
  */
 EXPORT_C const TTimeIntervalMinutes&  CSmsSubmit::ValidityPeriod() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_VALIDITYPERIOD_1, "CSmsSubmit::ValidityPeriod()");
+	LOGGSMU1("CSmsSubmit::ValidityPeriod()");
 
 	return iValidityPeriod.TimeIntervalMinutes();
 	} // CSmsSubmit::ValidityPeriod
@@ -2324,7 +2321,8 @@
  */
 EXPORT_C void CSmsSubmit::SetValidityPeriod(const TTimeIntervalMinutes& aTimeIntervalMinutes)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETVALIDITYPERIOD_1, "CSmsSubmit::SetValidityPeriod(): %d",aTimeIntervalMinutes.Int());
+	LOGGSMU2("CSmsSubmit::SetValidityPeriod(): aTimeIntervalMinutes",
+			 aTimeIntervalMinutes.Int());
 
 	iValidityPeriod.SetTimeIntervalMinutes(aTimeIntervalMinutes);
 	} // CSmsSubmit::SetValidityPeriod
@@ -2332,7 +2330,7 @@
 
 const TSmsDataCodingScheme* CSmsSubmit::DataCodingScheme() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_DATACODINGSCHEME_1, "CSmsSubmit::DataCodingScheme()");
+	LOGGSMU1("CSmsSubmit::DataCodingScheme()");
 
 	return &iDataCodingScheme;
 	} // CSmsSubmit::DataCodingScheme
@@ -2340,7 +2338,7 @@
 
 const TSmsProtocolIdentifier* CSmsSubmit::ProtocolIdentifier() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_PROTOCOLIDENTIFIER_1, "CSmsSubmit::ProtocolIdentifier()");
+	LOGGSMU1("CSmsSubmit::ProtocolIdentifier()");
 
 	return &iProtocolIdentifier;
 	} // CSmsSubmit::ProtocolIdentifier
@@ -2348,7 +2346,7 @@
 
 const CSmsUserData* CSmsSubmit::UserDataPtr() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_USERDATAPTR_1, "CSmsSubmit::UserDataPtr()");
+	LOGGSMU1("CSmsSubmit::UserDataPtr()");
 
 	return iUserData;
 	} // CSmsSubmit::UserDataPtr
@@ -2356,7 +2354,7 @@
 
 const CSmsAddress* CSmsSubmit::ToFromAddressPtr() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_TOFROMADDRESSPTR_1, "CSmsSubmit::ToFromAddressPtr()");
+	LOGGSMU1("CSmsSubmit::ToFromAddressPtr()");
 
 	return iDestinationAddress;
 	} // CSmsSubmit::ToFromAddressPtr
@@ -2364,7 +2362,7 @@
 
 void CSmsSubmit::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_CONSTRUCTL_1, "CSmsSubmit::ConstructL()");
+	LOGGSMU1("CSmsSubmit::ConstructL()");
 
 	iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
 	iDestinationAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
@@ -2379,7 +2377,7 @@
  */
 EXPORT_C CSmsSubmit* CSmsSubmit::DuplicateL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_DUPLICATEL_1, "CSmsSubmit::DuplicateL()");
+	LOGGSMU1("CSmsSubmit::DuplicateL()");
 
 	CSmsSubmit*  smsSubmit = new (ELeave) CSmsSubmit();
 	CleanupStack::PushL(smsSubmit);
@@ -2403,7 +2401,7 @@
 
 TUint8* CSmsSubmit::EncodeL(TUint8* aPtr) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_ENCODEL_1, "CSmsSubmit::EncodeL()");
+	LOGGSMU1("CSmsSubmit::EncodeL()");
 
 	aPtr=iFirstOctet.EncodeL(aPtr);
 	aPtr=iMessageReference.EncodeL(aPtr);
@@ -2416,7 +2414,7 @@
 
 TUint8* CSmsSubmit::EncodeL(TUint8* aPtr, const TEncodeParams* aEncodeParams) const		
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_ENCODEL1_1, "CSmsSubmit::EncodeL()");
+	LOGGSMU1("CSmsSubmit::EncodeL()");
 
 	aPtr=iFirstOctet.EncodeL(aPtr);
 	aPtr=iMessageReference.EncodeL(aPtr);
@@ -2429,7 +2427,7 @@
 
 void CSmsSubmit::DecodeL(TGsmuLex8& aPdu)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_DECODEL_1, "CSmsSubmit::DecodeL()");
+	LOGGSMU1("CSmsSubmit::DecodeL()");
 
 	iFirstOctet.DecodeL(aPdu);
 	iMessageReference.DecodeL(aPdu);
@@ -2449,7 +2447,7 @@
 
 void CSmsSubmit::InternalizeMessagePDUL(RReadStream& aStream)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_INTERNALIZEMESSAGEPDUL_1, "CSmsSubmit::InternalizeMessagePDUL()");
+	LOGGSMU1("CSmsSubmit::InternalizeMessagePDUL()");
 
 	iServiceCenterAddress->InternalizeL(aStream);
 
@@ -2505,7 +2503,7 @@
  */
 EXPORT_C TInt CSmsDeliverReport::FailureCause() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVERREPORT_FAILURECAUSE_1, "CSmsDeliverReport::FailureCause()");
+	LOGGSMU1("CSmsDeliverReport::FailureCause()");
 
 	__ASSERT_DEBUG(iIsRPError,Panic(KGsmuPanicNotRPError));
 	return iFailureCause.Error();
@@ -2520,7 +2518,7 @@
  */
 EXPORT_C void CSmsDeliverReport::SetFailureCause(TSmsFailureCause::TSmsFailureCauseError aFailureCause)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVERREPORT_SETFAILURECAUSE_1, "CSmsDeliverReport::SetFailureCause()");
+	LOGGSMU1("CSmsDeliverReport::SetFailureCause()");
 
 	__ASSERT_DEBUG(iIsRPError,Panic(KGsmuPanicNotRPError));
 	iFailureCause.SetError(aFailureCause);
@@ -2529,7 +2527,7 @@
 
 const TSmsDataCodingScheme* CSmsDeliverReport::DataCodingScheme() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_DATACODINGSCHEME_1, "CSmsDeliverReport::DataCodingScheme()");
+	LOGGSMU1("CSmsDeliverReport::DataCodingScheme()");
 
 	__ASSERT_DEBUG(DataCodingSchemePresent(),Panic(KGsmuPanicDataCodingSchemeNotPresent));
 	return &iDataCodingScheme;
@@ -2538,7 +2536,7 @@
 
 const TSmsProtocolIdentifier* CSmsDeliverReport::ProtocolIdentifier() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_PROTOCOLIDENTIFIER_1, "CSmsDeliverReport::ProtocolIdentifier()");
+	LOGGSMU1("CSmsDeliverReport::ProtocolIdentifier()");
 
 	__ASSERT_DEBUG(ProtocolIdentifierPresent(),Panic(KGsmuPanicProtocolIdentifierNotPresent));
 	return &iProtocolIdentifier;
@@ -2547,7 +2545,7 @@
 
 const TSmsParameterIndicator* CSmsDeliverReport::ParameterIndicator() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_PARAMETERINDICATOR_1, "CSmsDeliverReport::ParameterIndicator()");
+	LOGGSMU1("CSmsDeliverReport::ParameterIndicator()");
 
 	return &iParameterIndicator;
 	} // CSmsDeliverReport::ParameterIndicator
@@ -2555,7 +2553,7 @@
 
 const CSmsUserData* CSmsDeliverReport::UserDataPtr() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_USERDATAPTR_1, "CSmsDeliverReport::UserDataPtr()");
+	LOGGSMU1("CSmsDeliverReport::UserDataPtr()");
 
 	__ASSERT_DEBUG(UserDataPresent(),Panic(KGsmuPanicUserDataNotPresent));
 	return iUserData;
@@ -2564,7 +2562,7 @@
 
 void CSmsDeliverReport::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_CONSTRUCTL_1, "CSmsDeliverReport::ConstructL()");
+	LOGGSMU1("CSmsDeliverReport::ConstructL()");
 
 	iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
 	iUserData=CSmsUserData::NewL(aCharacterSetConverter,aFs,iFirstOctet,iDataCodingScheme);
@@ -2578,7 +2576,7 @@
  */
 EXPORT_C CSmsDeliverReport* CSmsDeliverReport::DuplicateL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVERREPORT_DUPLICATEL_1, "CSmsDeliverReport::DuplicateL()");
+	LOGGSMU1("CSmsDeliverReport::DuplicateL()");
 
 	CSmsDeliverReport*  smsDeliverReport = new (ELeave) CSmsDeliverReport(iIsRPError);
 	CleanupStack::PushL(smsDeliverReport);
@@ -2600,7 +2598,7 @@
 
 TUint8* CSmsDeliverReport::EncodeL(TUint8* aPtr) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_ENCODEL_1, "CSmsDeliverReport::EncodeL()");
+	LOGGSMU1("CSmsDeliverReport::EncodeL()");
 
 	aPtr=iFirstOctet.EncodeL(aPtr);
 	if (iIsRPError)
@@ -2622,7 +2620,7 @@
 
 void CSmsDeliverReport::DecodeL(TGsmuLex8& aPdu)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_DECODEL_1, "CSmsDeliverReport::DecodeL()");
+	LOGGSMU1("CSmsDeliverReport::DecodeL()");
 
 	iFirstOctet.DecodeL(aPdu);
 	if (iIsRPError)
@@ -2719,7 +2717,7 @@
  */
 EXPORT_C TInt CSmsSubmitReport::FailureCause() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMITREPORT_FAILURECAUSE_1, "CSmsSubmitReport::FailureCause()");
+	LOGGSMU1("CSmsSubmitReport::FailureCause()");
 
 	__ASSERT_DEBUG(iIsRPError,Panic(KGsmuPanicNotRPError));
 	return iFailureCause.Error();
@@ -2734,7 +2732,7 @@
  */
 EXPORT_C void CSmsSubmitReport::SetFailureCause(TSmsFailureCause::TSmsFailureCauseError aFailureCause)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMITREPORT_SETFAILURECAUSE_1, "CSmsSubmitReport::SetFailureCause()");
+	LOGGSMU1("CSmsSubmitReport::SetFailureCause()");
 
 	__ASSERT_DEBUG(iIsRPError,Panic(KGsmuPanicNotRPError));
 	iFailureCause.SetError(aFailureCause);
@@ -2743,7 +2741,7 @@
 
 const TSmsDataCodingScheme* CSmsSubmitReport::DataCodingScheme() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_DATACODINGSCHEME_1, "CSmsSubmitReport::DataCodingScheme()");
+	LOGGSMU1("CSmsSubmitReport::DataCodingScheme()");
 
 	__ASSERT_DEBUG(DataCodingSchemePresent(),Panic(KGsmuPanicDataCodingSchemeNotPresent));
 	return &iDataCodingScheme;
@@ -2752,7 +2750,7 @@
 
 const TSmsProtocolIdentifier* CSmsSubmitReport::ProtocolIdentifier() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_PROTOCOLIDENTIFIER_1, "CSmsSubmitReport::ProtocolIdentifier()");
+	LOGGSMU1("CSmsSubmitReport::ProtocolIdentifier()");
 
 	__ASSERT_DEBUG(ProtocolIdentifierPresent(),Panic(KGsmuPanicProtocolIdentifierNotPresent));
 	return &iProtocolIdentifier;
@@ -2761,7 +2759,7 @@
 
 const TSmsParameterIndicator* CSmsSubmitReport::ParameterIndicator() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_PARAMETERINDICATOR_1, "CSmsSubmitReport::ParameterIndicator()");
+	LOGGSMU1("CSmsSubmitReport::ParameterIndicator()");
 
 	return &iParameterIndicator;
 	} // CSmsSubmitReport::ParameterIndicator
@@ -2769,7 +2767,7 @@
 
 const CSmsUserData* CSmsSubmitReport::UserDataPtr() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_USERDATAPTR_1, "CSmsSubmitReport::UserDataPtr()");
+	LOGGSMU1("CSmsSubmitReport::UserDataPtr()");
 
 	__ASSERT_DEBUG(UserDataPresent(),Panic(KGsmuPanicUserDataNotPresent));
 	return iUserData;
@@ -2778,7 +2776,7 @@
 
 void CSmsSubmitReport::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_CONSTRUCTL_1, "CSmsSubmitReport::ConstructL()");
+	LOGGSMU1("CSmsSubmitReport::ConstructL()");
 
 	iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
 	iUserData=CSmsUserData::NewL(aCharacterSetConverter,aFs,iFirstOctet,iDataCodingScheme);
@@ -2792,7 +2790,7 @@
  */
 EXPORT_C CSmsSubmitReport* CSmsSubmitReport::DuplicateL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMITREPORT_DUPLICATEL_1, "CSmsSubmitReport::DuplicateL()");
+	LOGGSMU1("CSmsSubmitReport::DuplicateL()");
 
 	CSmsSubmitReport*  smsSubmitReport = new (ELeave) CSmsSubmitReport(iIsRPError);
 	CleanupStack::PushL(smsSubmitReport);
@@ -2815,7 +2813,7 @@
 
 TUint8* CSmsSubmitReport::EncodeL(TUint8* aPtr) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_ENCODEL_1, "CSmsSubmitReport::EncodeL()");
+	LOGGSMU1("CSmsSubmitReport::EncodeL()");
 
 	aPtr=iFirstOctet.EncodeL(aPtr);
 	if (iIsRPError)
@@ -2838,7 +2836,7 @@
 
 void CSmsSubmitReport::DecodeL(TGsmuLex8& aPdu)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_DECODEL_1, "CSmsSubmitReport::DecodeL()");
+	LOGGSMU1("CSmsSubmitReport::DecodeL()");
 
 	iFirstOctet.DecodeL(aPdu);
 	if (iIsRPError)
@@ -2933,7 +2931,7 @@
  */
 EXPORT_C TBool CSmsStatusReport::MoreMessagesToSend() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_MOREMESSAGESTOSEND_1, "CSmsStatusReport::MoreMessagesToSend()");
+	LOGGSMU1("CSmsStatusReport::MoreMessagesToSend()");
 
 	return (iFirstOctet&TSmsFirstOctet::ESmsMoreMessagesToSendMask)==TSmsFirstOctet::ESmsMoreMessagesToSend;
 	} // CSmsStatusReport::MoreMessagesToSend
@@ -2947,7 +2945,7 @@
  */
 EXPORT_C void CSmsStatusReport::SetMoreMessagesToSend(TBool aMore)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETMOREMESSAGESTOSEND_1, "CSmsStatusReport::SetMoreMessagesToSend()");
+	LOGGSMU1("CSmsStatusReport::SetMoreMessagesToSend()");
 
 	iFirstOctet=aMore? (iFirstOctet&(~TSmsFirstOctet::ESmsMoreMessagesToSendMask)|TSmsFirstOctet::ESmsMoreMessagesToSend):
 	                   (iFirstOctet&(~TSmsFirstOctet::ESmsMoreMessagesToSendMask)|TSmsFirstOctet::ESmsNoMoreMessagesToSend);
@@ -2963,7 +2961,7 @@
  */
 EXPORT_C TSmsFirstOctet::TSmsStatusReportQualifier CSmsStatusReport::StatusReportQualifier() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_STATUSREPORTQUALIFIER_1, "CSmsStatusReport::StatusReportQualifier()");
+	LOGGSMU1("TSmsFirstOctet::TSmsStatusReportQualifier()");
 
 	return (TSmsFirstOctet::TSmsStatusReportQualifier) (iFirstOctet&TSmsFirstOctet::ESmsStatusReportQualifierMask);
 	} // TSmsFirstOctet::TSmsStatusReportQualifier
@@ -2977,7 +2975,7 @@
  */
 EXPORT_C void CSmsStatusReport::SetStatusReportQualifier(TSmsFirstOctet::TSmsStatusReportQualifier aQualifier)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETSTATUSREPORTQUALIFIER_1, "CSmsStatusReport::SetStatusReportQualifier()");
+	LOGGSMU1("CSmsStatusReport::SetStatusReportQualifier()");
 
 	iFirstOctet=iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportQualifierMask)|aQualifier;
 	} // CSmsStatusReport::SetStatusReportQualifier
@@ -3009,7 +3007,7 @@
  */
 EXPORT_C TInt CSmsStatusReport::MessageReference() const
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_MESSAGEREFERENCE_1, "CSmsStatusReport::MessageReference %d", (TInt)iMessageReference );
+	LOGGSMU2("CSmsStatusReport::MessageReference %d", (TInt)iMessageReference );
 	return iMessageReference;
 	} // CSmsStatusReport::MessageReference
 
@@ -3023,7 +3021,7 @@
 EXPORT_C void CSmsStatusReport::SetMessageReference(TInt aMessageReference)
 	{
 	iMessageReference=aMessageReference;
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETMESSAGEREFERENCE_1, "CSmsStatusReport::SetMessageReference %d", (TInt)iMessageReference );
+	LOGGSMU2("CSmsStatusReport::SetMessageReference %d", (TInt)iMessageReference );
 	} // CSmsStatusReport::SetMessageReference
 
 
@@ -3036,7 +3034,7 @@
  */
 EXPORT_C void CSmsStatusReport::ServiceCenterTimeStamp(TTime& aTime,TInt& aNumQuarterHours)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SERVICECENTERTIMESTAMP_1, "CSmsStatusReport::ServiceCenterTimeStamp()");
+	LOGGSMU1("CSmsStatusReport::ServiceCenterTimeStamp()");
 
 	aTime=iServiceCenterTimeStamp.Time();
 	aNumQuarterHours=iServiceCenterTimeStamp.TimeOffset();
@@ -3052,7 +3050,7 @@
  */
 EXPORT_C void CSmsStatusReport::SetServiceCenterTimeStamp(const TTime& aTime,TInt& aNumQuarterHours)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETSERVICECENTERTIMESTAMP_1, "CSmsStatusReport::SetServiceCenterTimeStamp()");
+	LOGGSMU1("CSmsStatusReport::SetServiceCenterTimeStamp()");
 
 	iServiceCenterTimeStamp.SetTime(aTime);
 	iServiceCenterTimeStamp.SetTimeOffset(aNumQuarterHours);
@@ -3068,7 +3066,7 @@
  */
 EXPORT_C void CSmsStatusReport::DischargeTime(TTime& aTime,TInt& aNumQuarterHours)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_DISCHARGETIME_1, "CSmsStatusReport::DischargeTime()");
+	LOGGSMU1("CSmsStatusReport::DischargeTime()");
 
 	aTime=iDischargeTime.Time();
 	aNumQuarterHours=iDischargeTime.TimeOffset();
@@ -3084,7 +3082,7 @@
  */
 EXPORT_C void CSmsStatusReport::SetDischargeTime(const TTime& aTime,TInt& aNumQuarterHours)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETDISCHARGETIME_1, "CSmsStatusReport::SetDischargeTime()");
+	LOGGSMU1("CSmsStatusReport::SetDischargeTime()");
 
 	iDischargeTime.SetTime(aTime);
 	iDischargeTime.SetTimeOffset(aNumQuarterHours);
@@ -3099,7 +3097,7 @@
  */
 EXPORT_C TSmsStatus::TSmsStatusValue CSmsStatusReport::Status() const
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_STATUS_1, "CSmsStatusReport::Status %d", iStatus.Status());
+	LOGGSMU2("CSmsStatusReport::Status %d", iStatus.Status());
 	return iStatus.Status();
 	} // TSmsStatus::TSmsStatusValue
 
@@ -3112,7 +3110,7 @@
  */
 EXPORT_C void CSmsStatusReport::SetStatus(TSmsStatus::TSmsStatusValue aValue)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETSTATUS_1, "CSmsStatusReport::SetStatus()");
+	LOGGSMU1("CSmsStatusReport::SetStatus()");
 
 	iStatus.SetStatus(aValue);
 	} // CSmsStatusReport::SetStatus
@@ -3120,7 +3118,7 @@
 
 const TSmsDataCodingScheme* CSmsStatusReport::DataCodingScheme() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_DATACODINGSCHEME_1, "CSmsStatusReport::DataCodingScheme()");
+	LOGGSMU1("CSmsStatusReport::DataCodingScheme()");
 
 	__ASSERT_DEBUG(DataCodingSchemePresent(),Panic(KGsmuPanicDataCodingSchemeNotPresent));
 	return &iDataCodingScheme;
@@ -3129,7 +3127,7 @@
 
 const TSmsProtocolIdentifier* CSmsStatusReport::ProtocolIdentifier() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_PROTOCOLIDENTIFIER_1, "CSmsStatusReport::ProtocolIdentifier()");
+	LOGGSMU1("CSmsStatusReport::ProtocolIdentifier()");
 
 	__ASSERT_DEBUG(ProtocolIdentifierPresent(),Panic(KGsmuPanicProtocolIdentifierNotPresent));
 	return &iProtocolIdentifier;
@@ -3138,7 +3136,7 @@
 
 const TSmsParameterIndicator* CSmsStatusReport::ParameterIndicator() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_PARAMETERINDICATOR_1, "CSmsStatusReport::ParameterIndicator()");
+	LOGGSMU1("CSmsStatusReport::ParameterIndicator()");
 
 	__ASSERT_DEBUG(iParameterIndicatorPresent,Panic(KGsmuPanicParameterIndicatorNotPresent));
 	return &iParameterIndicator;
@@ -3147,7 +3145,7 @@
 
 const CSmsUserData* CSmsStatusReport::UserDataPtr() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_USERDATAPTR_1, "CSmsStatusReport::UserDataPtr()");
+	LOGGSMU1("CSmsStatusReport::UserDataPtr()");
 
 	__ASSERT_DEBUG(UserDataPresent(),Panic(KGsmuPanicUserDataNotPresent));
 	return iUserData;
@@ -3156,7 +3154,7 @@
 
 const CSmsAddress* CSmsStatusReport::ToFromAddressPtr() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_TOFROMADDRESSPTR_1, "CSmsStatusReport::ToFromAddressPtr()");
+	LOGGSMU1("CSmsStatusReport::ToFromAddressPtr()");
 
 	return iRecipientAddress;
 	} // CSmsStatusReport::ToFromAddressPtr
@@ -3164,7 +3162,7 @@
 
 void CSmsStatusReport::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_CONSTRUCTL_1, "CSmsStatusReport::ConstructL()");
+	LOGGSMU1("CSmsStatusReport::ConstructL()");
 
 	iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
 	iRecipientAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
@@ -3179,7 +3177,7 @@
  */
 EXPORT_C CSmsStatusReport* CSmsStatusReport::DuplicateL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_DUPLICATEL_1, "CSmsStatusReport::DuplicateL()");
+	LOGGSMU1("CSmsStatusReport::DuplicateL()");
 
 	CSmsStatusReport*  smsStatusReport = new (ELeave) CSmsStatusReport();
 	CleanupStack::PushL(smsStatusReport);
@@ -3206,7 +3204,7 @@
 
 TUint8* CSmsStatusReport::EncodeL(TUint8* aPtr) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_ENCODEL_1, "CSmsStatusReport::EncodeL()");
+	LOGGSMU1("CSmsStatusReport::EncodeL()");
 
 	aPtr=iFirstOctet.EncodeL(aPtr);
 	aPtr=iMessageReference.EncodeL(aPtr);
@@ -3234,7 +3232,7 @@
 
 void CSmsStatusReport::DecodeL(TGsmuLex8& aPdu)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_DECODEL_1, "CSmsStatusReport::DecodeL()");
+	LOGGSMU1("CSmsStatusReport::DecodeL()");
 
 	iFirstOctet.DecodeL(aPdu);
 	iMessageReference.DecodeL(aPdu);
@@ -3381,7 +3379,7 @@
  */
 EXPORT_C TBool CSmsCommand::StatusReportRequest() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_STATUSREPORTREQUEST_1, "CSmsCommand::StatusReportRequest()");
+	LOGGSMU1("CSmsCommand::StatusReportRequest()");
 
 	return (iFirstOctet&TSmsFirstOctet::ESmsStatusReportRequestMask)==TSmsFirstOctet::ESmsStatusReportRequested;
 	} // CSmsCommand::StatusReportRequest
@@ -3395,7 +3393,7 @@
  */
 EXPORT_C void CSmsCommand::SetStatusReportRequest(TBool aRequest)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_SETSTATUSREPORTREQUEST_1, "CSmsCommand::SetStatusReportRequest()");
+	LOGGSMU1("CSmsCommand::SetStatusReportRequest()");
 
 	__ASSERT_DEBUG(CommandType()==TSmsCommandType::ESmsCommandTypeEnableStatusReportRequest,Panic(KGsmuPanicSetStatusReportRequestNotSupportedForCommandType));
 	DoSetStatusReportRequest(aRequest);
@@ -3410,7 +3408,7 @@
  */
 EXPORT_C TInt CSmsCommand::MessageReference() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_MESSAGEREFERENCE_1, "CSmsCommand::MessageReference()");
+	LOGGSMU1("CSmsCommand::MessageReference()");
 
 	return iMessageReference;
 	} // CSmsCommand::MessageReference
@@ -3424,7 +3422,7 @@
  */
 EXPORT_C void CSmsCommand::SetMessageReference(TInt aMessageReference)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_SETMESSAGEREFERENCE_1, "CSmsCommand::SetMessageReference()");
+	LOGGSMU1("CSmsCommand::SetMessageReference()");
 
 	iMessageReference=aMessageReference;
 	} // CSmsCommand::SetMessageReference
@@ -3438,7 +3436,7 @@
  */
 EXPORT_C TInt CSmsCommand::CommandType() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_COMMANDTYPE_1, "CSmsCommand::CommandType()");
+	LOGGSMU1("CSmsCommand::CommandType()");
 
 	return iCommandType.CommandType();
 	} // CSmsCommand::CommandType
@@ -3452,7 +3450,7 @@
  */
 EXPORT_C void CSmsCommand::SetCommandType(TSmsCommandType::TSmsCommandTypeValue aCommandType)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_SETCOMMANDTYPE_1, "CSmsCommand::SetCommandType()");
+	LOGGSMU1("CSmsCommand::SetCommandType()");
 
 	//  Some command types have default status report request
 	switch (aCommandType)
@@ -3485,7 +3483,7 @@
  */
 EXPORT_C TInt CSmsCommand::MessageNumber() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_MESSAGENUMBER_1, "CSmsCommand::MessageNumber()");
+	LOGGSMU1("CSmsCommand::MessageNumber()");
 
 	return iMessageNumber;
 	} // CSmsCommand::MessageNumber
@@ -3499,7 +3497,7 @@
  */
 EXPORT_C void CSmsCommand::SetMessageNumber(TInt aMessageNumber)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_SETMESSAGENUMBER_1, "CSmsCommand::SetMessageNumber()");
+	LOGGSMU1("CSmsCommand::SetMessageNumber()");
 
 	iMessageNumber=aMessageNumber;
 	} // CSmsCommand::SetMessageNumber
@@ -3513,7 +3511,7 @@
  */
 EXPORT_C TInt CSmsCommand::NumInformationElements() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_NUMINFORMATIONELEMENTS_1, "CSmsCommand::NumInformationElements()");
+	LOGGSMU1("CSmsCommand::NumInformationElements()");
 
 	return iCommandData->NumInformationElements();
 	} // CSmsCommand::NumInformationElements
@@ -3528,7 +3526,7 @@
  */
 EXPORT_C CSmsInformationElement& CSmsCommand::InformationElement(TInt aIndex) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_INFORMATIONELEMENT_1, "CSmsCommand::InformationElement()");
+	LOGGSMU1("CSmsCommand::InformationElement()");
 
 	return iCommandData->InformationElement(aIndex);
 	} // CSmsCommand::InformationElement
@@ -3546,7 +3544,7 @@
     // Ignore in code coverage - not used in SMS stack and not exported
     // but cannot be removed as impacts public header.
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_INFORMATIONELEMENTPTR_1, "CSmsCommand::InformationElementPtr()");
+    LOGGSMU1("CSmsCommand::InformationElementPtr()");
     return iCommandData->InformationElementPtr(aIndex);
     BULLSEYE_RESTORE
     }
@@ -3562,7 +3560,7 @@
 EXPORT_C TBool CSmsCommand::InformationElementIndex(CSmsInformationElement::TSmsInformationElementIdentifier aIdentifier,
 		TInt& aIndex) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_INFORMATIONELEMENTINDEX_1, "CSmsCommand::InformationElementIndex()");
+	LOGGSMU1("CSmsCommand::InformationElementIndex()");
 
 	return iCommandData->InformationElementIndex(aIdentifier,aIndex);
 	} // CSmsCommand::InformationElementIndex
@@ -3577,7 +3575,7 @@
  */
 EXPORT_C void CSmsCommand::AddInformationElementL(CSmsInformationElement::TSmsInformationElementIdentifier aIdentifier, TDesC8& aData)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_ADDINFORMATIONELEMENTL_1, "CSmsCommand::AddInformationElementL()");
+	LOGGSMU1("CSmsCommand::AddInformationElementL()");
 
 	iCommandData->AddInformationElementL(aIdentifier,aData);
 	} // CSmsCommand::AddInformationElementL
@@ -3591,7 +3589,7 @@
  */
 EXPORT_C void CSmsCommand::RemoveInformationElement(TInt aIndex)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_REMOVEINFORMATIONELEMENT_1, "CSmsCommand::RemoveInformationElement()");
+	LOGGSMU1("CSmsCommand::RemoveInformationElement()");
 
 	iCommandData->RemoveInformationElement(aIndex);
 	} // CSmsCommand::RemoveInformationElement
@@ -3605,7 +3603,7 @@
  */
 EXPORT_C TInt CSmsCommand::MaxCommandDataLength() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_MAXCOMMANDDATALENGTH_1, "CSmsCommand::MaxCommandDataLength()");
+	LOGGSMU1("CSmsCommand::MaxCommandDataLength()");
 
 	return iCommandData->MaxDataLength();
 	} // CSmsCommand::MaxCommandDataLength
@@ -3619,7 +3617,7 @@
  */
 EXPORT_C TPtrC8 CSmsCommand::CommandData() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_COMMANDDATA_1, "CSmsCommand::CommandData()");
+	LOGGSMU1("CSmsCommand::CommandData()");
 
 	return iCommandData->Data();
 	} // CSmsCommand::CommandData
@@ -3633,7 +3631,7 @@
  */
 EXPORT_C void CSmsCommand::SetCommandDataL(const TDesC8& aData)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_SETCOMMANDDATAL_1, "CSmsCommand::SetCommandDataL()");
+	LOGGSMU1("CSmsCommand::SetCommandDataL()");
 
 	iCommandData->SetDataL(aData);
 	} // CSmsCommand::SetCommandDataL
@@ -3641,7 +3639,7 @@
 
 const TSmsProtocolIdentifier* CSmsCommand::ProtocolIdentifier() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_PROTOCOLIDENTIFIER_1, "CSmsCommand::ProtocolIdentifier()");
+	LOGGSMU1("CSmsCommand::ProtocolIdentifier()");
 
 	return &iProtocolIdentifier;
 	} // CSmsCommand::ProtocolIdentifier
@@ -3649,7 +3647,7 @@
 
 const CSmsAddress* CSmsCommand::ToFromAddressPtr() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_TOFROMADDRESSPTR_1, "CSmsCommand::ToFromAddressPtr()");
+	LOGGSMU1("CSmsCommand::ToFromAddressPtr()");
 
 	return iDestinationAddress;
 	} // CSmsCommand::ToFromAddressPtr
@@ -3657,7 +3655,7 @@
 
 void CSmsCommand::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_CONSTRUCTL_1, "CSmsCommand::ConstructL()");
+	LOGGSMU1("CSmsCommand::ConstructL()");
 
 	iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
 	iDestinationAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
@@ -3672,7 +3670,7 @@
  */
 EXPORT_C CSmsCommand* CSmsCommand::DuplicateL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_DUPLICATEL_1, "CSmsCommand::DuplicateL()");
+	LOGGSMU1("CSmsCommand::DuplicateL()");
 
 	CSmsCommand*  smsCommand = new (ELeave) CSmsCommand();
 	CleanupStack::PushL(smsCommand);
@@ -3694,7 +3692,7 @@
 
 TUint8* CSmsCommand::EncodeL(TUint8* aPtr) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_ENCODEL_1, "CSmsCommand::EncodeL()");
+	LOGGSMU1("CSmsCommand::EncodeL()");
 
 	aPtr=iFirstOctet.EncodeL(aPtr);
 	aPtr=iMessageReference.EncodeL(aPtr);
@@ -3716,7 +3714,7 @@
 
 void CSmsCommand::DecodeL(TGsmuLex8& aPdu)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_DECODEL_1, "CSmsCommand::DecodeL()");
+	LOGGSMU1("CSmsCommand::DecodeL()");
 
 	iFirstOctet.DecodeL(aPdu);
 	iMessageReference.DecodeL(aPdu);
@@ -3758,7 +3756,7 @@
 
 void CSmsCommand::DoSetStatusReportRequest(TBool aRequest)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_DOSETSTATUSREPORTREQUEST_1, "CSmsCommand::DoSetStatusReportRequest()");
+	LOGGSMU1("CSmsCommand::DoSetStatusReportRequest()");
 
 	iFirstOctet=aRequest? (iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportRequestMask)|TSmsFirstOctet::ESmsStatusReportRequested):
 	                      (iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportRequestMask)|TSmsFirstOctet::ESmsAcceptDuplicates);

--- a/smsprotocols/smsstack/gsmu/src/gsmupriv.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmupriv.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "gsmuprivTraces.h"
-#endif
-
 #include "gsmupriv.h"
 #include "Gsmumain.h"
 #include <exterror.h>
@@ -48,7 +42,7 @@
  */
 TInt TSmsAlphabetPacker::PackL(TDes8& aOut,const TDesC8& aIn)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_PACKL_1, "TSmsAlphabetPacker::PackL()");
+	LOGGSMU1("TSmsAlphabetPacker::PackL()");
 
 	// Ensure we've got the right length
 	TInt packedOctetsRequired=PackedOctetsRequiredL(aIn.Length());
@@ -96,7 +90,7 @@
  */
 TInt TSmsAlphabetPacker::UnpackL(const TDesC8& aIn,TDes8& aOut,TInt aNumUDUnits)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_UNPACKL_1, "TSmsAlphabetPacker::UnpackL()");
+	LOGGSMU1("TSmsAlphabetPacker::UnpackL()");
 
 	TInt length=aNumUDUnits;
 	// Ensure we've got enough input and output buffer
@@ -148,7 +142,7 @@
  */
 TInt TSmsAlphabetPacker::ConvertAndPackL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs,TDes8& aOut,const TDesC& aIn,TInt& aConvertedNumUDUnits)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_CONVERTANDPACKL_1, "TSmsAlphabetPacker::ConvertAndPackL()");
+	LOGGSMU1("TSmsAlphabetPacker::ConvertAndPackL()");
 
 	// Do the conversion
 	// VEP Fix for defect EXT-568BMW, when length of alphanumeric destination address
@@ -170,7 +164,7 @@
  */
 TInt TSmsAlphabetPacker::UnpackAndConvertL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs,const TDesC8& aIn,TDes& aOut,TInt aNumUDUnits)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_UNPACKANDCONVERTL_1, "TSmsAlphabetPacker::UnpackAndConvertL()");
+	LOGGSMU1("TSmsAlphabetPacker::UnpackAndConvertL()");
 
 	// Unpack first
 	HBufC8* unpackedBuffer=HBufC8::NewLC(aNumUDUnits);
@@ -193,7 +187,7 @@
  */
 TInt TSmsAlphabetPacker::PackedOctetsRequiredL(TInt aNumUDUnits) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_PACKEDOCTETSREQUIREDL_1, "TSmsAlphabetPacker::PackedOctetsRequiredL()");
+	LOGGSMU1("TSmsAlphabetPacker::PackedOctetsRequiredL()");
 
 	TInt octetsRequired=0;
 	TInt elementSizeInBits=ElementSizeInBitsL();
@@ -224,7 +218,7 @@
  */
 TInt TSmsAlphabetPacker::ElementSizeInBitsL() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_ELEMENTSIZEINBITSL_1, "TSmsAlphabetPacker::ElementSizeInBitsL()");
+	LOGGSMU1("TSmsAlphabetPacker::ElementSizeInBitsL()");
 
     TInt ret = 8;

--- a/smsprotocols/smsstack/gsmu/src/gsmusar.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmusar.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "gsmusarTraces.h"
-#endif
-
 #include "gsmusar.h"
 #include "Gsmumain.h"
 
@@ -44,7 +38,7 @@
  */
 EXPORT_C CSmsBufferSegmenter* CSmsBufferSegmenter::NewLC(CSmsAlphabetConverter& aAlphabetConverter,const CSmsBufferBase& aBuffer,TInt aSegmentSize)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSBUFFERSEGMENTER_NEWLC_1, "CSmsBufferSegmenter::NewLC()");
+	LOGGSMU1("CSmsBufferSegmenter::NewLC()");
 	
 	CSmsBufferSegmenter* segmenter=new(ELeave) CSmsBufferSegmenter(aAlphabetConverter,aBuffer,aSegmentSize);
 	CleanupStack::PushL(segmenter);
@@ -65,7 +59,7 @@
  */
 void CSmsBufferSegmenter::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSBUFFERSEGMENTER_CONSTRUCTL_1, "CSmsBufferSegmenter::ConstructL()");
+	LOGGSMU1("CSmsBufferSegmenter::ConstructL()");
 
 	iConvertedBuffer=HBufC8::NewMaxL(iSegmentSize);
 	iConvertedBufferPtr.Set((TUint8*)iConvertedBuffer->Des().Ptr(),0,iConvertedBuffer->Length());
@@ -88,7 +82,7 @@
  */
 void CSmsBufferSegmenter::Reset()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSBUFFERSEGMENTER_RESET_1, "CSmsBufferSegmenter::Reset()");
+	LOGGSMU1("CSmsBufferSegmenter::Reset()");
 
 	iConvertedBufferPtr.Zero();
 	iElementsExtracted=0;
@@ -110,12 +104,12 @@
 		                                         TInt& aUnconvertedChars, TInt& aDowngradedChars,
 		                                         TSmsEncoding aEncoding)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSBUFFERSEGMENTER_SEGMENTNEXTL_1, "CSmsBufferSegmenter::SegmentNextL(): iSegmentSize=%d", iSegmentSize);
+	LOGGSMU2("CSmsBufferSegmenter::SegmentNextL(): iSegmentSize=%d", iSegmentSize);
 
 	TBool  ret = DoSegmentNextL(aSegmentBuffer, iSegmentSize,
 			                    aUnconvertedChars, aDowngradedChars,
 			                    aEncoding);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSBUFFERSEGMENTER_SEGMENTNEXTL_2, "CSmsBufferSegmenter::SegmentNextL() returns %d ", ret);
+	LOGGSMU2("CSmsBufferSegmenter::SegmentNextL() returns %d ", ret);
 
 	return ret;
 	} // CSmsBufferSegmenter::SegmentNextL
@@ -130,7 +124,7 @@
 // Returns true if this was the last segment
 //
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSBUFFERSEGMENTER_DOSEGMENTNEXTL_1, "CSmsBufferSegmenter::DoSegmentNextL(): aSegmentSize=%d", aSegmentSize);
+	LOGGSMU2("CSmsBufferSegmenter::DoSegmentNextL(): aSegmentSize=%d", aSegmentSize);
 
 	__ASSERT_ALWAYS(aSegmentSize>0,Panic(KGsmuPanicIllegalSegmentSize));
 	__ASSERT_ALWAYS(aSegmentBuffer.MaxLength()>=aSegmentSize,Panic(KGsmuPanicSegmentBufferTooSmall));
@@ -169,7 +163,7 @@
 
 TBool CSmsBufferSegmenter::MoreL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSBUFFERSEGMENTER_MOREL_1, "CSmsBufferSegmenter::MoreL()");
+	LOGGSMU1("CSmsBufferSegmenter::MoreL()");
 
 	if ((iElementsExtracted>=iSmsBuffer.Length())&&(iConvertedBufferPtr.Length()==0))
 		{
@@ -196,7 +190,7 @@
  */
 EXPORT_C TInt CSmsBufferSegmenter::TotalConvertedLengthL(TSmsEncoding aEncoding)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSBUFFERSEGMENTER_TOTALCONVERTEDLENGTHL_1, "CSmsBufferSegmenter::TotalConvertedLengthL(): aEncoding=%d", aEncoding);
+	LOGGSMU2("CSmsBufferSegmenter::TotalConvertedLengthL(): aEncoding=%d", aEncoding);
 	
 	// Check for shortcut
 	CSmsAlphabetConverter::TSmsAlphabetConversionProperties conversionProperties;
@@ -235,7 +229,8 @@
 TSmsEncoding CSmsBufferSegmenter::FindBestAlternativeEncodingL(TSmsEncoding aSuggestedEncoding,
 									  			       		   TInt aMaxBodyLength) const
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSBUFFERSEGMENTER_FINDBESTALTERNATIVEENCODINGL_1, "CSmsBufferSegmenter::FindBestAlternativeEncodingL(): aSuggestedEncoding=%d, aMaxBodyLength=%d",aSuggestedEncoding, aMaxBodyLength);
+	LOGGSMU3("CSmsBufferSegmenter::FindBestAlternativeEncodingL(): aSuggestedEncoding=%d, aMaxBodyLength=%d",
+			 aSuggestedEncoding, aMaxBodyLength);
 
 	TSmsEncoding  encodingToUse = ESmsEncodingNone;
 	
@@ -271,7 +266,8 @@
  */
 void CSmsBufferSegmenter::CheckConvertedBufferAllocL(TInt aMaxLength)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSBUFFERSEGMENTER_CHECKCONVERTEDBUFFERALLOCL_1, "CSmsBufferSegmenter::CheckConvertedBufferAllocL(): aMaxLength=%d",aMaxLength);
+	LOGGSMU2("CSmsBufferSegmenter::CheckConvertedBufferAllocL(): aMaxLength=%d",
+			 aMaxLength);
 
 	if (iConvertedBuffer->Length()<aMaxLength)
 		{
@@ -288,7 +284,8 @@
  */
 TInt CSmsBufferSegmenter::ElementsToReturnFromConvertedBufferL(TInt aSegmentSize)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSBUFFERSEGMENTER_ELEMENTSTORETURNFROMCONVERTEDBUFFERL_1, "CSmsBufferSegmenter::CheckConvertedBufferAllocL(): aSegmentSize=%d",aSegmentSize);
+	LOGGSMU2("CSmsBufferSegmenter::CheckConvertedBufferAllocL(): aSegmentSize=%d",
+			 aSegmentSize);
 
 	TInt elementCount=Min(aSegmentSize,iConvertedBufferPtr.Length());
 	if (iAlphabetConverter.Alphabet()==TSmsDataCodingScheme::ESmsAlphabet7Bit)
@@ -311,7 +308,7 @@
  */
 EXPORT_C CSmsEMSBufferSegmenter* CSmsEMSBufferSegmenter::NewLC(CSmsAlphabetConverter& aAlphabetConverter,const CSmsBufferBase& aBuffer, TInt aSegmentSize)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEMSBUFFERSEGMENTER_NEWLC_1, "CSmsBufferSegmenter::NewLC(): aSegmentSize=%d", aSegmentSize);
+	LOGGSMU2("CSmsBufferSegmenter::NewLC(): aSegmentSize=%d", aSegmentSize);
 
 	CSmsEMSBufferSegmenter* self = new (ELeave) CSmsEMSBufferSegmenter(aAlphabetConverter, aBuffer,  aSegmentSize);
 	CleanupStack::PushL(self);
@@ -340,12 +337,12 @@
 		                                            TInt& aUnconvertedChars, TInt& aDowngradedChars,
 		                                            TSmsEncoding aEncoding)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_1, "CSmsEMSBufferSegmenter::SegmentNext(): aSegmentSize=%d", aSegmentSize);
+	LOGGSMU2("CSmsEMSBufferSegmenter::SegmentNext(): aSegmentSize=%d", aSegmentSize);
 
 	TBool ret=DoSegmentNextL(aSegmentBuffer, aSegmentSize, aUnconvertedChars, aDowngradedChars,
 							 aEncoding);
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_2, "CSmsEMSBufferSegmenter::SegmentNext() returns %d ", ret);
+	LOGGSMU2("CSmsEMSBufferSegmenter::SegmentNext() returns %d ", ret);
 
 	return ret;
 	} // CSmsEMSBufferSegmenter::SegmentNextL
@@ -364,7 +361,8 @@
 		                              TInt& aUnconvertedChars, TInt& aDowngradedChars,
 		                              TSmsEncoding aEncoding)
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEMSBUFFERSEGMENTER_SEGMENTL_1, "CSmsEMSBufferSegmenter::SegmentL(): aNativeChars=%d, aSegmentMax=%d",aNativeChars, aSegmentMax);
+	LOGGSMU3("CSmsEMSBufferSegmenter::SegmentL(): aNativeChars=%d, aSegmentMax=%d",
+			 aNativeChars, aSegmentMax);
 
 	__ASSERT_ALWAYS(iConvertedBufferPtr.Length()==0, User::Leave(KGsmuPanicBufferNotReset));
 	__ASSERT_ALWAYS(aNativeChars>0,User::Leave(KGsmuPanicIllegalSegmentSize));
@@ -432,7 +430,8 @@
 EXPORT_C void TSmsBufferReassembler::ReassembleNextL(const TDesC8& aSegmentBuffer,
 													 TSmsEncoding aEncoding,TBool aIsLast)
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSBUFFERREASSEMBLER_REASSEMBLENEXTL_1, "TSmsBufferReassembler::ReassembleNextL(): aEncoding=%d aIsLast=%d",aEncoding, aIsLast);
+	LOGGSMU3("TSmsBufferReassembler::ReassembleNextL(): aEncoding=%d aIsLast=%d",
+			 aEncoding, aIsLast);
 
 	TPtrC nativeChars=iAlphabetConverter.ConvertToNativeL(aSegmentBuffer, aEncoding);
 	iSmsBuffer.InsertL(iSmsBuffer.Length(),nativeChars);

--- a/smsprotocols/smsstack/gsmu/src/gsmuset.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmuset.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "gsmusetTraces.h"
-#endif
-
 #include "gsmuset.h"
 #include "smsstacklog.h"
 
@@ -45,7 +39,7 @@
  */
 EXPORT_C TBool TSmsUserDataSettings::TextConcatenated(TBool* aIs16Bit) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSUSERDATASETTINGS_TEXTCONCATENATED_1, "TSmsUserDataSettings::TextConcatenated()");
+	LOGGSMU1("TSmsUserDataSettings::TextConcatenated()");
 
 	if (aIs16Bit!=NULL)
 		*aIs16Bit=iFlags&ESmsFlagConcatenatedUsing16BitReference;
@@ -63,7 +57,7 @@
  */
 EXPORT_C void TSmsUserDataSettings::SetTextConcatenated(TBool aConcatenated,TBool aIs16Bit)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSUSERDATASETTINGS_SETTEXTCONCATENATED_1, "TSmsUserDataSettings::SetTextConcatenated()");
+	LOGGSMU1("TSmsUserDataSettings::SetTextConcatenated()");
 
 	iFlags=aIs16Bit? iFlags|ESmsFlagConcatenatedUsing16BitReference: iFlags&(~ESmsFlagConcatenatedUsing16BitReference);
 	iFlags=aConcatenated? iFlags|ESmsFlagConcatenated: iFlags&(~ESmsFlagConcatenated);

--- a/smsprotocols/smsstack/gsmu/src/gsmustor.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmustor.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "gsmustorTraces.h"
-#endif
-
 #include <e32svr.h>
 
 #include "gsmustor.h"
@@ -39,7 +33,7 @@
  */
 void CSARStoreCloseObject(TAny* aObj)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORECLOSEOBJECT_1, "WARNING! Hey, CSARStoreCloseObject called by Untrapper! [0x%08x]", aObj);
+    LOGGSMU2("WARNING! Hey, CSARStoreCloseObject called by Untrapper! [0x%08x]", aObj);
     ((CSARStore*)aObj)->Revert();
     }
 
@@ -131,7 +125,11 @@
  */
 EXPORT_C void CSARStore::OpenL(const TDesC& aFullName, const TUid& aThirdUid)
 	{
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_OPENL_1, "CSARStore::OpenL(): '%S'", aFullName);
+#ifdef _SMS_LOGGING_ENABLED
+	TBuf8<80> buf8;
+	buf8.Copy(aFullName);
+	LOGGSMU2("CSARStore::OpenL(): '%S'", &buf8);
+#endif
 
 	// sanity check
 	__ASSERT_DEBUG(iFileStore==NULL,Panic(KGsmuPanicSARStoreAlreadyOpen));
@@ -147,7 +145,7 @@
  	TRAPD(ret, InternalizeEntryArrayL());
 	if (ret != KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_OPENL_2, "WARNING: InteralizeEntryArrayL left with %d", ret);
+		LOGGSMU2("WARNING: InteralizeEntryArrayL left with %d", ret);
 		}
 
  	if(ret == KErrCorrupt || ret == KErrEof || ret == KErrNotFound)
@@ -168,16 +166,17 @@
 EXPORT_C void CSARStore::CommitTransactionL()
 // This function does the real work of updating the filestore
 	{
-    OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_COMMITTRANSACTIONL_1, "CSARStore::CommitTransactionL(): this=0x%08X iInTransaction=%d iFileStore=0x%08X",(TUint)this, iInTransaction, (TUint)iFileStore);
+    LOGGSMU4("CSARStore::CommitTransactionL(): this=0x%08X iInTransaction=%d iFileStore=0x%08X",
+    		 this, iInTransaction, iFileStore);
 
 	__ASSERT_DEBUG(iFileStore!=NULL, Panic(KGsmuPanicSARStoreNotOpen));
 	__ASSERT_DEBUG(iInTransaction, Panic(KGsmuPanicSARStoreTransaction));
 
-#ifdef OST_TRACE_COMPILER_IN_USE
+#ifdef _SMS_LOGGING_ENABLED
 	TRAPD(err, DoCommitAndCompactL());
 	if (err != KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_COMMITTRANSACTIONL_2, "WARNING! could not CommitL/CompactL due to %d", err);
+		LOGGSMU2("WARNING! could not CommitL/CompactL due to %d", err);
 		User::Leave(err);
 		}
 #else
@@ -200,7 +199,11 @@
  */
 EXPORT_C void CSARStore::Close()
 	{
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_CLOSE_1, "CSARStore::Close(): '%S'", iFullName);
+#ifdef _SMS_LOGGING_ENABLED
+	TBuf8<80> buf8;
+	buf8.Copy(iFullName);
+	LOGGSMU2("CSARStore::Close(): '%S'", &buf8);
+#endif
 
 	__ASSERT_DEBUG(!iInTransaction, Panic(KGsmuPanicSARStoreTransaction));
 
@@ -260,7 +263,8 @@
 // storing it in the reassembly store.
 //
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_PURGEL_1, "CSARStore::PurgeL(): aTimeIntervalMinutes=%d, aPurgeIncompleteOnly=%d",aTimeIntervalMinutes.Int(), aPurgeIncompleteOnly);
+	LOGGSMU3("CSARStore::PurgeL(): aTimeIntervalMinutes=%d, aPurgeIncompleteOnly=%d",
+			 aTimeIntervalMinutes.Int(), aPurgeIncompleteOnly);
 
 	// TODO - flag
 	// we could also save the call of the method from the consruction of the smsprot
@@ -268,7 +272,7 @@
 		return;
 
 	TInt count=iEntryArray.Count();
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_PURGEL_2, "CSARStore::PurgeL(): count=%d", count);
+	LOGGSMU2("CSARStore::PurgeL(): count=%d", count);
 
 	TTime time;
 	time.UniversalTime();
@@ -309,10 +313,11 @@
  */
 EXPORT_C void CSARStore::PurgeL(TInt aKSegmentationLifetimeMultiplier,TBool aPurgeIncompleteOnly)
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_PURGEL1_1, "CSARStore::PurgeL(): aKSegmentationLifetimeMultiplier=%d, aPurgeIncompleteOnly=%d",aKSegmentationLifetimeMultiplier, aPurgeIncompleteOnly);
+	LOGGSMU3("CSARStore::PurgeL(): aKSegmentationLifetimeMultiplier=%d, aPurgeIncompleteOnly=%d",
+			 aKSegmentationLifetimeMultiplier, aPurgeIncompleteOnly);
 
 	TInt count=Entries().Count();
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_PURGEL1_2, "CSARStore::PurgeL(): count=%d", count);
+	LOGGSMU2("CSARStore::PurgeL(): count=%d", count);
 	TTime time;
 	time.UniversalTime();
 
@@ -370,7 +375,7 @@
 	    
 	ExternalizeEntryArrayL();
 	CommitTransactionL();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_PURGEL1_3, "CSmsSegmentationStore::PurgeL End");
+	LOGGSMU1("CSmsSegmentationStore::PurgeL End");
 	} // CSARStore::PurgeL
 
 
@@ -384,7 +389,7 @@
  */
 EXPORT_C void CSARStore::DeleteEntryL(TInt aIndex)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_DELETEENTRYL_1, "CSARStore::DeleteEntryL(): aIndex=%d", aIndex);
+	LOGGSMU2("CSARStore::DeleteEntryL(): aIndex=%d", aIndex);
 
 	DoDeleteEntryL(aIndex);
 	ExternalizeEntryArrayL();
@@ -422,7 +427,7 @@
  */
 EXPORT_C CFileStore& CSARStore::FileStore()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_FILESTORE_1, "CSARStore::FileStore()");
+	LOGGSMU1("CSARStore::FileStore()");
 
 	__ASSERT_DEBUG(iFileStore!=NULL,Panic(KGsmuPanicSARStoreNotOpen));
 	return *iFileStore;
@@ -439,7 +444,7 @@
     {
     // Ignore in code coverage - not used in SMS stack.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_FILESTORE1_1, "CSARStore::FileStore()");
+    LOGGSMU1("CSARStore::FileStore()");
     __ASSERT_DEBUG(iFileStore!=NULL,Panic(KGsmuPanicSARStoreNotOpen));
     return *iFileStore;
     BULLSEYE_RESTORE
@@ -458,7 +463,7 @@
  */
 EXPORT_C void CSARStore::AddEntryL(const TSAREntry& aEntry)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_ADDENTRYL_1, "CSARStore::AddEntryL()");
+	LOGGSMU1("CSARStore::AddEntryL()");
 
 	__ASSERT_DEBUG(iFileStore!=NULL,Panic(KGsmuPanicSARStoreNotOpen));
 	__ASSERT_DEBUG(aEntry.DataStreamId()!=KNullStreamId,Panic(KGsmuPanicSAREntryDataStreamIdNotSet));
@@ -480,7 +485,7 @@
  */
 EXPORT_C void CSARStore::ChangeEntryL(TInt aIndex,const TSAREntry& aNewEntry)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_CHANGEENTRYL_1, "CSARStore::ChangeEntryL(): aIndex=%d", aIndex);
+	LOGGSMU2("CSARStore::ChangeEntryL(): aIndex=%d", aIndex);
 
 	__ASSERT_DEBUG(iFileStore!=NULL,Panic(KGsmuPanicSARStoreNotOpen));
 	__ASSERT_DEBUG(iEntryArray[aIndex].DataStreamId()==aNewEntry.DataStreamId(),Panic(KGsmuPanicSAREntryDataStreamIdChanged));
@@ -501,7 +506,7 @@
  */
 EXPORT_C TStreamId CSARStore::ExtraStreamId() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_EXTRASTREAMID_1, "CSARStore::ExtraStreamId");
+	LOGGSMU1("CSARStore::ExtraStreamId");
 	return iExtraStreamId;
 	} // CSARStore::ExtraStreamId
 
@@ -517,7 +522,7 @@
  */
 EXPORT_C void CSARStore::SetExtraStreamIdL(const TStreamId& aExtraStreamId)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_SETEXTRASTREAMIDL_1, "CSARStore::SetExtraStreamIdL(): id=%d", aExtraStreamId.Value());
+	LOGGSMU2("CSARStore::SetExtraStreamIdL(): id=%d", aExtraStreamId.Value());
 
 	__ASSERT_DEBUG(iFileStore!=NULL,Panic(KGsmuPanicSARStoreNotOpen));
 	TStreamId streamid=iExtraStreamId;
@@ -525,7 +530,7 @@
 	TRAPD(ret, ExternalizeEntryArrayL());
 	if (ret!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_SETEXTRASTREAMIDL_2, "WARNING! CSARStore::DoExternalizeEntryArrayL left with %d", ret);
+		LOGGSMU2("WARNING! CSARStore::DoExternalizeEntryArrayL left with %d", ret);
 		iExtraStreamId=streamid;	//  Roll back
 		User::Leave(ret);			//  re-leave to allow caller to also roll back
 		}
@@ -543,14 +548,14 @@
  */
 EXPORT_C void CSARStore::CompactL()
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_COMPACTL_1, "CSARStore::CompactL Start");
+    LOGGSMU1("CSARStore::CompactL Start");
 	__ASSERT_DEBUG(iFileStore!=NULL, Panic(KGsmuPanicSARStoreNotOpen));
 	__ASSERT_DEBUG(iInTransaction, Panic(KGsmuPanicSARStoreTransaction));
 
 	TInt space = iFileStore->CompactL();
 	iFileStore->CommitL();
 
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_COMPACTL_2, "CSARStore::CompactL End [space=%d]", space);
+    LOGGSMU2("CSARStore::CompactL End [space=%d]", space);
 	(void)space;
 	} // CSARStore::CompactL
 
@@ -564,11 +569,11 @@
  */
 EXPORT_C void CSARStore::BeginTransactionLC()
 	{
-    OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_BEGINTRANSACTIONLC_1, "CSARStore::BeginTransactionLC [this=0x%08X iInTransaction=%d iFileStore=0x%08X]", (TUint)this, iInTransaction, (TUint)iFileStore);
+    LOGGSMU4("CSARStore::BeginTransactionLC [this=0x%08X iInTransaction=%d iFileStore=0x%08X]", this, iInTransaction, iFileStore);
 
 	if (iFileStore == NULL || iInTransaction)
 		{
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_BEGINTRANSACTIONLC_2, "WARNING CSARStore::BeginTransactionLC leaving with KErrAccessDenied");
+	    LOGGSMU1("WARNING CSARStore::BeginTransactionLC leaving with KErrAccessDenied");
 		User::Leave(KErrAccessDenied);
 		}
 
@@ -579,7 +584,8 @@
 
 void CSARStore::Revert()
 	{
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_REVERT_1, "CSARStore::Revert(): this=0x%08X, iInTransaction=%d", (TUint)this, iInTransaction);
+    LOGGSMU3("CSARStore::Revert(): this=0x%08X, iInTransaction=%d",
+    		 this, iInTransaction);
 
 	__ASSERT_DEBUG(iInTransaction, Panic(KGsmuPanicSARStoreTransaction));
 
@@ -598,8 +604,11 @@
  */
 EXPORT_C void CSARStore::DoOpenL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_DOOPENL_1, "CSARStore::DoOpenL(): '%S' this=0x%08X", iFullName, (TUint)this);
-
+#ifdef _SMS_LOGGING_ENABLED
+	TBuf8<80> buf8;
+	buf8.Copy(iFullName);
+	LOGGSMU3("CSARStore::DoOpenL(): '%S' this=0x%08X", &buf8, this);
+#endif
 
 	TUidType uidtype(KPermanentFileStoreLayoutUid,KSARStoreUid,iThirdUid);
 	TEntry entry;
@@ -617,7 +626,7 @@
 		TRAP(ret,(iFileStore=CPermanentFileStore::OpenL(iFs,iFullName,EFileShareExclusive|EFileStream|EFileRead|EFileWrite)));
 		if(ret != KErrNone)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_DOOPENL_2, "WARNING! CPermanentFileStore::OpenLC left with %d", ret);
+			LOGGSMU2("WARNING! CPermanentFileStore::OpenLC left with %d", ret);
 			}
 		}
 
@@ -629,8 +638,11 @@
 		{
 		// create a new file and push the close function on the cleanup stack,
 		// so that the trap handler will close the file automatically
-
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_DOOPENL_3, "CSARStore::DoOpenL(): New file created '%S'", iFullName);
+#ifdef _SMS_LOGGING_ENABLED
+		TBuf8<80> buf8;
+		buf8.Copy(iFullName);
+		LOGGSMU2("CSARStore::DoOpenL(): New file created '%S'", &buf8);
+#endif
 		TInt kerr(iFs.MkDirAll(iFullName)); //the directory may not exist, So create one.
 		if(kerr != KErrAlreadyExists)
 			{
@@ -654,14 +666,18 @@
  */
 void CSARStore::DoDeleteEntryL(TInt aIndex)
 	{
-#ifdef OST_TRACE_COMPLIER_IN_USE
+#ifdef _SMS_LOGGING_ENABLED
 	const TSmsSegmentationEntry& entry = (const TSmsSegmentationEntry&)iEntryArray[aIndex];
 
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_DODELETEENTRYL_1, "CSARStore::DoDeleteEntryL [aIndex=%d Count=%d]",aIndex, iEntryArray.Count());
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_DODELETEENTRYL_2, "CSARStore::DoDeleteEntryL [aIndex=%d Delivered=%d Failed=%d]",aIndex, entry.Delivered(), entry.Failed());
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_DODELETEENTRYL_3, "CSARStore::DoDeleteEntryL [aIndex=%d Count=%d Total=%d]",aIndex, entry.Count(), entry.Total());
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_DODELETEENTRYL_4, "CSARStore::DoDeleteEntryL [aIndex=%d logId=%d StreamId=%u]",aIndex, entry.LogServerId(), (TUint) entry.DataStreamId().Value());
-#endif // OST_TRACE_COMPLIER_IN_USE
+	LOGGSMU3("CSARStore::DoDeleteEntryL [aIndex=%d Count=%d]",
+			 aIndex, iEntryArray.Count());
+	LOGGSMU4("CSARStore::DoDeleteEntryL [aIndex=%d Delivered=%d Failed=%d]",
+			 aIndex, entry.Delivered(), entry.Failed());
+	LOGGSMU4("CSARStore::DoDeleteEntryL [aIndex=%d Count=%d Total=%d]",
+			 aIndex, entry.Count(), entry.Total());
+	LOGGSMU4("CSARStore::DoDeleteEntryL [aIndex=%d logId=%d StreamId=%d]",
+			 aIndex, entry.LogServerId(), entry.DataStreamId().Value());
+#endif // _SMS_LOGGING_ENABLED
 
 	__ASSERT_DEBUG(iFileStore!=NULL,Panic(KGsmuPanicSARStoreNotOpen));
 	TRAPD(err, iFileStore->DeleteL(iEntryArray[aIndex].DataStreamId()));
@@ -677,7 +693,7 @@
  */
 void CSARStore::InternalizeEntryArrayL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_INTERNALIZEENTRYARRAYL_1, "CSARStore::InternalizeEntryArrayL()");
+	LOGGSMU1("CSARStore::InternalizeEntryArrayL()");
 
 	__ASSERT_DEBUG(iFileStore!=NULL, Panic(KGsmuPanicSARStoreNotOpen));
 
@@ -698,7 +714,7 @@
 
 void CSARStore::RemoveDeletedEntries()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_REMOVEDELETEDENTRIES_1, "CSARStore::RemoveDeletedEntries()");
+	LOGGSMU1("CSARStore::RemoveDeletedEntries()");
 
 	TInt count=iEntryArray.Count();
 	while (count--)
@@ -715,7 +731,7 @@
 
 void CSARStore::ReinstateDeletedEntries()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_REINSTATEDELETEDENTRIES_1, "CSARStore::ReinstateDeletedEntries()");
+	LOGGSMU1("CSARStore::ReinstateDeletedEntries()");
 
 	TInt count=iEntryArray.Count();
 	while (count--)
@@ -738,7 +754,8 @@
 	__ASSERT_DEBUG(iFileStore!=NULL, Panic(KGsmuPanicSARStoreNotOpen));
 	__ASSERT_DEBUG(iInTransaction, Panic(KGsmuPanicSARStoreTransaction));
 
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_EXTERNALIZEENTRYARRAYL_1, "CSARStore::ExternalizeEntryArrayL(): this=0x%08X count=%d headerid=%u]",(TUint)this, iEntryArray.Count(), (TUint)iFileStore->Root().Value());
+	LOGGSMU4("CSARStore::ExternalizeEntryArrayL(): this=0x%08X count=%d headerid=%d]",
+			 this, iEntryArray.Count(), iFileStore->Root().Value());
 
 	TStreamId headerid=iFileStore->Root();
 	RStoreWriteStream stream;
@@ -785,18 +802,11 @@
  */
 void CSARStore::DoCommitAndCompactL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_DOCOMMITANDCOMPACTL_1, "CSARStore::DoCommitAndCompactL()");
+	LOGGSMU1("CSARStore::DoCommitAndCompactL()");
 
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) 
-    TBuf<40> timestamp;
-    SmsTimeStampL(timestamp);
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSARSTORE_DOCOMMITANDCOMPACTL_2, "%S",timestamp);
-#endif
+	LOGGSMUTIMESTAMP();
 	iFileStore->CommitL();
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) 
-    SmsTimeStampL(timestamp);
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSARSTORE_DOCOMMITANDCOMPACTL_3, "%S",timestamp);
-#endif
+	LOGGSMUTIMESTAMP();
 
 	iCommitCount--;
 	if (iCommitCount < 0)
@@ -816,7 +826,7 @@
  */
 EXPORT_C void CSARStore::PrivatePath(TDes& aPath)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_PRIVATEPATH_1, "CSARStore::PrivatePath()");
+	LOGGSMU1("CSARStore::PrivatePath()");
 
 	TDriveUnit driveUnit(KStoreDrive);
 	TDriveName drive=driveUnit.Name();

--- a/smsprotocols/smsstack/gsmu/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/smsprotocols/smsstack/gsmu/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,703 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_ACCESSADDRESS_1=0x22
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_ALMOSTMAXIMUMCAPACITY_1=0x1d
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_EXTENSIONINDICATOR_1=0x20
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_MAXIMUMCAPACITY_1=0x1f
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_NUMBEROFVOICEMESSAGES_1=0x26
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_PARSEDACCESSADDRESS_1=0x24
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_PROFILE_1=0x19
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETACCESSADDRESSL_1=0x21
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETALMOSTMAXIMUMCAPACITY_1=0x1c
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETMAXIMUMCAPACITY_1=0x1e
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETNUMBEROFVOICEMESSAGES_1=0x25
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETPARSEDACCESSADDRESSL_1=0x23
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETPROFILE_1=0x18
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETSTORAGE_1=0x1a
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_STORE_1=0x1b
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_TYPE_1=0x17
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_DTOR_1=0x3f
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_GETVOICEMAILDELETIONS_1=0x42
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_NEWL_1=0x40
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_NUMBEROFDELETES_1=0x41
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_DTOR_1=0x39
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_GETVOICEMAILNOTIFICATIONS_1=0x37
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_NEWL_1=0x38
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_NUMBEROFVOICEMAILS_1=0x36
-[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_GETINCOMPLETEMESSAGEINFOL_1=0x95
-[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_SETINCOMPLETEMESSAGEINFOL_1=0x96
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_ADDENTRYL_1=0x123
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_1=0x12a
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_2=0x12b
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CHANGEENTRYL_1=0x124
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CLOSE_1=0x11a
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_1=0x118
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_2=0x119
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_1=0x128
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_2=0x129
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DELETEENTRYL_1=0x120
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_1=0x12c
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_2=0x12d
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_3=0x12e
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_EXTRASTREAMID_1=0x125
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE1_1=0x122
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE_1=0x121
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_1=0x116
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_2=0x117
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PRIVATEPATH_1=0x12f
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_1=0x11d
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_2=0x11e
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_3=0x11f
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_1=0x11b
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_2=0x11c
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_1=0x126
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_2=0x127
-[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL1_1=0x3
-[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL_1=0x2
-[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTTONATIVEL1_1=0x5
-[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTTONATIVEL_1=0x4
-[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_NEWLC_1=0x1
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_NEWLC_1=0x10c
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x10d
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x10e
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_TOTALCONVERTEDLENGTHL_1=0x10f
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_ADDINFORMATIONELEMENTL_1=0x106
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDDATA_1=0x109
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDTYPE_1=0xff
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_DUPLICATEL_1=0x10b
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENTINDEX_1=0x105
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENT_1=0x104
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MAXCOMMANDDATALENGTH_1=0x108
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGENUMBER_1=0x101
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGEREFERENCE_1=0xfd
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_NUMINFORMATIONELEMENTS_1=0x103
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_REMOVEINFORMATIONELEMENT_1=0x107
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDDATAL_1=0x10a
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDTYPE_1=0x100
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGENUMBER_1=0x102
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGEREFERENCE_1=0xfe
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETSTATUSREPORTREQUEST_1=0xfc
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_STATUSREPORTREQUEST_1=0xfb
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_DUPLICATEL_1=0xea
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_FAILURECAUSE_1=0xe8
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_SETFAILURECAUSE_1=0xe9
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_DUPLICATEL_1=0xd9
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_MOREMESSAGESTOSEND_1=0xd1
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_PROTOCOLIDENTIFIER_1=0xda
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_REPLYPATH_1=0xd3
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SERVICECENTERTIMESTAMP_1=0xd7
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETMOREMESSAGESTOSEND_1=0xd2
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETREPLYPATH_1=0xd4
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSERVICECENTERTIMESTAMP_1=0xd8
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSTATUSREPORTINDICATION_1=0xd6
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_STATUSREPORTINDICATION_1=0xd5
-[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_NEWLC_1=0x110
-[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x111
-[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x112
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_1=0x90
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_2=0x91
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_CONTAINSENHANCEDVOICEMAILIEL_1=0x94
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_COPYENHANCEDVOICEMAILIEL_1=0x93
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_REMOVEENHANCEDVOICEMAILIEL_1=0x92
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_ADDHYPERLINKL_1=0x7e
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_COPYHYPERLINKATINDEXL_1=0x80
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_NUMBEROFHYPERLINKSL_1=0x7f
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEALLHYPERLINKSL_1=0x81
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEHYPERLINKL_1=0x82
-[TRACE]TRACE_BORDER[0x84]_CSMSIEOPERATION_ID_1=0x7d
-[TRACE]TRACE_BORDER[0x84]_CSMSINFORMATIONELEMENT_DATA1_1=0x8
-[TRACE]TRACE_BORDER[0x84]_CSMSINFORMATIONELEMENT_DATA_1=0x7
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMAILHEADERL_1=0x6b
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTL_1=0x60
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_1=0x67
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_2=0x68
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_3=0x69
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ALTERNATIVE7BITENCODING_1=0x58
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_COPYEMSELEMENTSL_1=0x66
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEDONSIM_1=0x7a
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEMESSAGEPDUSL_1=0x5d
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEPARTIALCOMPLETEMESSAGEPDUSL_1=0x5e
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DTOR_1=0x46
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL1_1=0x5f
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEMESSAGEPDUSL_1=0x5c
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEL_1=0x4a
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x74
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERL_1=0x48
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_FORWARDTOCLIENT_1=0x7c
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMAILHEADERL_1=0x6d
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMSINFORMATIONELEMENTSL_1=0x64
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_1=0x50
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_2=0x51
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_3=0x52
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_4=0x53
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_5=0x54
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_1=0x75
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_2=0x76
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_1=0x77
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_2=0x78
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEL_1=0x49
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x73
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERL_1=0x47
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISEMAILHEADER_1=0x6c
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL1_1=0x5b
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL_1=0x5a
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MATCHSLOTS_1=0x6a
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MAXMESSAGELENGTH_1=0x4e
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MESSAGELENGTHL_1=0x4f
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL1_1=0x45
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL_1=0x44
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_1=0x4c
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_2=0x4d
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_OPTIMIZESETTINGSL_1=0x57
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTL_1=0x61
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTSL_1=0x62
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_RESETEMSL_1=0x63
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETALTERNATIVE7BITENCODING_1=0x59
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETDECODEDONSIM_1=0x79
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETFORWARDTOCLIENT_1=0x7b
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUSERDATASETTINGSL_1=0x56
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_1=0x6f
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_2=0x70
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETVERSION_1=0x72
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_TEXTPRESENT_1=0x4b
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UPDATESLOTSL_1=0x65
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_USERDATASETTINGS_1=0x55
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UTCOFFSET_1=0x6e
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_VERSION_1=0x71
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ALPHABET_1=0xad
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_APPLICATIONPORTADDRESSING_1=0xbf
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_BITS7TO4_1=0xab
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CLASS_1=0xaf
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEPDUINDEX_1=0xbd
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEREFERENCE_1=0xb9
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DATACODINGSCHEMEPRESENT_1=0xcb
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DUPLICATEL_1=0x9a
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ENCODEMESSAGEPDUL_1=0x9b
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONSTATE_1=0xb3
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONTYPE_1=0xb5
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_1=0xa4
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_2=0xa5
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_3=0xa6
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_4=0xa7
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL1_1=0x98
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL2_1=0x99
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL_1=0x97
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NUMCONCATENATEDMESSAGEPDUS_1=0xbb
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDSERVICECENTERADDRESS_1=0x9e
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDTOFROMADDRESS_1=0xa2
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PIDTYPE_1=0xc1
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PROTOCOLIDENTIFIERPRESENT_1=0xcd
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SERVICECENTERADDRESS_1=0x9c
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETALPHABET_1=0xae
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETAPPLICATIONPORTADDRESSINGL_1=0xc0
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETBITS7TO4_1=0xac
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCLASS_1=0xb0
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEPDUINDEX_1=0xbe
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEREFERENCE_1=0xba
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETDATACODINGSCHEMEPRESENT_1=0xcc
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONSTATE_1=0xb4
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONTYPE_1=0xb6
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_1=0xa8
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_2=0xa9
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_3=0xaa
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNUMCONCATENATEDMESSAGEPDUS_1=0xbc
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDSERVICECENTERADDRESSL_1=0x9f
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDTOFROMADDRESSL_1=0xa3
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPIDTYPE_1=0xc2
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPROTOCOLIDENTIFIERPRESENT_1=0xce
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSERVICECENTERADDRESSL_1=0x9d
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSHORTMESSAGETYPE_1=0xc6
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICEINDICATOR_1=0xc4
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICETYPE_1=0xc8
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCOMPRESSED_1=0xb2
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCONCATENATEDL_1=0xb8
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTOFROMADDRESSL_1=0xa1
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETUSERDATAPRESENT_1=0xca
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SHORTMESSAGETYPE_1=0xc5
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICEINDICATOR_1=0xc3
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICETYPE_1=0xc7
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCOMPRESSED_1=0xb1
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCONCATENATED_1=0xb7
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TOFROMADDRESS_1=0xa0
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA1_1=0xd0
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATAPRESENT_1=0xc9
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA_1=0xcf
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_1=0x85
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_2=0x86
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_1=0x83
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_2=0x84
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_CONTAINSREPLYADDRESSIEL_1=0x87
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETPARSEDREPLYADDRESSL_1=0x89
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETREPLYADDRESSL_1=0x88
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_REMOVEREPLYADDRESSL_1=0x8a
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_ADDSPECIALMESSAGEINDICATIONL_1=0x8b
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETCOUNTOFSPECIALMESSAGEINDICATIONSL_1=0x8c
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETMESSAGEINDICATIONIEL_1=0x8d
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVEALLSPECIALMESSAGEINDICATIONSL_1=0x8f
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVESPECIALMESSAGEINDICATIONL_1=0x8e
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DISCHARGETIME_1=0xf6
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DUPLICATEL_1=0xfa
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MESSAGEREFERENCE_1=0xf2
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MOREMESSAGESTOSEND_1=0xee
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SERVICECENTERTIMESTAMP_1=0xf4
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETDISCHARGETIME_1=0xf7
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMESSAGEREFERENCE_1=0xf3
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMOREMESSAGESTOSEND_1=0xef
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSERVICECENTERTIMESTAMP_1=0xf5
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUSREPORTQUALIFIER_1=0xf1
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUS_1=0xf9
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUSREPORTQUALIFIER_1=0xf0
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUS_1=0xf8
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_DUPLICATEL_1=0xed
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_FAILURECAUSE_1=0xeb
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_SETFAILURECAUSE_1=0xec
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_DUPLICATEL_1=0xe7
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_MESSAGEREFERENCE_1=0xe3
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REJECTDUPLICATES_1=0xdb
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REPLYPATH_1=0xdf
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETMESSAGEREFERENCE_1=0xe4
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREJECTDUPLICATES_1=0xdc
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREPLYPATH_1=0xe0
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETSTATUSREPORTREQUEST_1=0xe2
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIODFORMAT_1=0xde
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIOD_1=0xe6
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_STATUSREPORTREQUEST_1=0xe1
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIODFORMAT_1=0xdd
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIOD_1=0xe5
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ADDINFORMATIONELEMENTL_1=0xc
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_BODY_1=0x10
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_INFORMATIONELEMENTINDEX_1=0xa
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_INFORMATIONELEMENTLASTINDEX_1=0xb
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_INFORMATIONELEMENT_1=0x9
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ISSUPPORTEDL1_1=0x13
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ISSUPPORTEDL2_1=0x14
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ISSUPPORTEDL_1=0x12
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_MAXBODYLENGTHINCHARS_1=0xe
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_MAXBODYLENGTHINCHARS_2=0xf
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_REMOVEINFORMATIONELEMENT_1=0xd
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_SETBODYL_1=0x11
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_DTOR_1=0x3d
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_MESSAGEEXTENSIONINDICATION_1=0x3c
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_MESSAGEID_1=0x3b
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_NEWL_1=0x3e
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_SETMESSAGEID_1=0x3a
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_CALLINGLINEIDENTITY_1=0x31
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_DTOR_1=0x34
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_MESSAGEEXTENSIONINDICATION_1=0x2f
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_MESSAGEID_1=0x28
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_MESSAGELENGTH_1=0x2a
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_NEWL_1=0x35
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_PARSEDCALLINGLINEIDENTITY_1=0x33
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_PRIORITYINDICATION_1=0x2e
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_RETENTIONDAYS_1=0x2c
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETCALLINGLINEIDENTITYL_1=0x30
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETMESSAGEID_1=0x27
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETMESSAGELENGTH_1=0x29
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETPARSEDCALLINGLINEIDENTITYL_1=0x32
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETPRIORITYINDICATION_1=0x2d
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETRETENTIONDAYS_1=0x2b
-[TRACE]TRACE_BORDER[0x84]_GSMUMAIN_PANIC_1=0x43
-[TRACE]TRACE_BORDER[0x84]_TGSMSMSTELNUMBER_ISINSTANCEOF_1=0x6
-[TRACE]TRACE_BORDER[0x84]_TGSMSMSTYPEOFADDRESS_CONVERTTOETELMM_1=0x15
-[TRACE]TRACE_BORDER[0x84]_TGSMSMSTYPEOFADDRESS_SETFROMETELMM_1=0x16
-[TRACE]TRACE_BORDER[0x84]_TSMSBUFFERREASSEMBLER_REASSEMBLENEXTL_1=0x113
-[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_SETTEXTCONCATENATED_1=0x115
-[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_TEXTCONCATENATED_1=0x114
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CONSTRUCTL_1=0x87
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR1_1=0x83
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR2_1=0x84
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR_1=0x82
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DECODEL_1=0x80
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DECODEL_2=0x81
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DOSETPARSEDADDRESSL_1=0x7e
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DTOR_1=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_ENCODEL_1=0x7f
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_NEWBUFFERL_1=0x7d
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_NEWL_1=0x89
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_OPERATOR1_1=0x86
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_OPERATOR_1=0x85
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_CONSTRUCTL_1=0xa8
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_CTOR1_1=0xa5
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_DECODEL_1=0xaa
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_ENCODEL_1=0xa9
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_NEWEXTENSIONL_1=0xa4
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_OPERATOR1_1=0xa7
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_OPERATOR_1=0xa6
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_CONSTRUCTL_1=0x99
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_CTOR1_1=0x96
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_DECODEL_1=0x9b
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_ENCODEL_1=0x9a
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_NEWEXTENSIONL_1=0x95
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_OPERATOR1_1=0x98
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_OPERATOR_1=0x97
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_CTOR_1=0x130
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_EXTERNALIZEL_1=0x13a
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_INTERNALIZEL_1=0x139
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_MESSAGETYPESUPPORTED_1=0x133
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR1_1=0x132
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR_1=0x131
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_SETVERSION_1=0x138
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_1=0x134
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_2=0x135
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_3=0x136
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VERSION_1=0x137
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORECLOSEOBJECT_1=0x17e
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_1=0x188
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_2=0x189
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_3=0x18a
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_1=0x180
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_2=0x181
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_3=0x182
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_4=0x183
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_EXTERNALIZEENTRYARRAYL_1=0x187
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_INTERNALIZEENTRYARRAYL_1=0x184
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REINSTATEDELETEDENTRIES_1=0x186
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REMOVEDELETEDENTRIES_1=0x185
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REVERT_1=0x17f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_ADDRESS_1=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_DOSETPARSEDADDRESSL_1=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_DUPLICATEL_1=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_NEWBUFFERL_1=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_NEWL_1=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SETADDRESSL_1=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SETPARSEDADDRESSL_1=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SETRAWADDRESSL_1=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SIZEL_1=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_TYPEOFADDRESS_1=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL1_1=0x44
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL_1=0x43
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONSTRUCTL_1=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERSIONPROPERTIESL_1=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_1=0x1a5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_2=0x1a6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_3=0x1a7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_4=0x1a8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_1=0x1a9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_2=0x1aa
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_3=0x1ab
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_4=0x1ac
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_5=0x1ad
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_1=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_2=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_GETALTERNATIVEENCODERIDL_1=0x42
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_1=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_2=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_3=0x30
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_4=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_5=0x18d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_6=0x18e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_1=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_2=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_3=0x18b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_4=0x18c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_1=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_2=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_1=0x40
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_2=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CHECKCONVERTEDBUFFERALLOCL_1=0x17b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CONSTRUCTL_1=0x176
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_DOSEGMENTNEXTL_1=0x178
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_ELEMENTSTORETURNFROMCONVERTEDBUFFERL_1=0x17c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_FINDBESTALTERNATIVEENCODINGL_1=0x17a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_MOREL_1=0x179
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_RESET_1=0x177
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_ADDINFORMATIONELEMENTL_1=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DATA_1=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DECODEL_1=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DUPLICATEL_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_ENCODEL_1=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_HEADERLENGTH_1=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_HEADERPRESENT_1=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_INFORMATIONELEMENTINDEX_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_INFORMATIONELEMENTPTR_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_INFORMATIONELEMENT_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_NEWL_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_REMOVEINFORMATIONELEMENT_1=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_SETDATAL_1=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_SETHEADERPRESENT_1=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_TOTALHEADERLENGTHINUDLUNITS_1=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_CONSTRUCTL_1=0x16c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DECODEL_1=0x16e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DOSETSTATUSREPORTREQUEST_1=0x16f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_ENCODEL_1=0x16d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_INFORMATIONELEMENTPTR_1=0x169
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_PROTOCOLIDENTIFIER_1=0x16a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_TOFROMADDRESSPTR_1=0x16b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR1_1=0x12b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR_1=0x12a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR1_1=0xef
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR_1=0xee
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_CONSTRUCTL_1=0x157
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DATACODINGSCHEME_1=0x153
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DECODEL_1=0x159
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_ENCODEL_1=0x158
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PARAMETERINDICATOR_1=0x155
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PROTOCOLIDENTIFIER_1=0x154
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_USERDATAPTR_1=0x156
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_CONSTRUCTL_1=0x142
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DATACODINGSCHEME_1=0x147
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DECODEL_1=0x144
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_ENCODEL_1=0x143
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_EXTERNALIZEMESSAGEPDUL_1=0x146
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_INTERNALIZEMESSAGEPDUL_1=0x145
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_TOFROMADDRESSPTR_1=0x149
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_USERDATAPTR_1=0x148
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEMSBUFFERSEGMENTER_SEGMENTL_1=0x17d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_GETENHANCEDVOICEMAILIEL_1=0x105
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR1_1=0x101
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR_1=0x100
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_1=0x102
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_2=0x103
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_3=0x104
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR1_1=0xf2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR_1=0xf1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_1=0xf3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_2=0xf4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_3=0xf5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_CONSTRUCTL_1=0xf0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_MESSAGETYPESUPPORTED_1=0xeb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_NEWL_1=0xea
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR1_1=0xed
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR_1=0xec
-[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_CONSTRUCTL_1=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_DECODEL_1=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_ENCODEL_1=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_LENGTH_1=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWDATAL_1=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWL1_1=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWL_1=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL1_1=0x119
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_1=0x10d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_2=0x10e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_3=0x10f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_CONSTRUCTL_1=0x10c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DELETECONTROLINFORMATIONELEMENT_1=0x11e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DTOR_1=0x10b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_EXTERNALIZEL_1=0x120
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FIND1STINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x110
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FINDNEXTINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x111
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_1=0x11b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_2=0x11c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_3=0x11d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_1=0x112
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_2=0x113
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_3=0x114
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_4=0x115
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_5=0x116
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_6=0x117
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETIEOPERATIONL_1=0x123
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETNONIEOPERATIONL_1=0x124
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_INTERNALIZEL_1=0x121
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NEWL_1=0x10a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NUMBEROFCONTROLINFORMATIONELEMENTS_1=0x11f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVECONTROLINFORMATIONELEMENT_1=0x118
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVENEXTCONTROLINFORMATIONELEMENT_1=0x11a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_RESETATTRIBUTESL_1=0x122
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_1=0x125
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_2=0x126
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETNONIEOPERATIONL_1=0x127
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL1_1=0xbe
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0xbc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0xbd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCURRENTPDUTOPDUARRAYL_1=0xb9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0xbf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0xc0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_3=0xc1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_4=0xc2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_5=0xc3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOSINGLESEGMENTMESSAGEL_1=0xc4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSOBJECTDISTRIBUTIONL_1=0xe4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSUSERPROMPTL_1=0xe3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDIETOUSERDATAL_1=0xba
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDINCOMPLETEMESSAGEINFOL_1=0xd5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDRECEIVEDEMSINFORMATIONELEMENT_1=0xe6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_1=0xe1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_2=0xe2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL1_1=0xb2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL_1=0xb1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_1=0xab
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_2=0xac
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGINSINGLEPDUL_1=0xb8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_1=0xb6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_2=0xb7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CREATECONTROLIEOPERATIONSCLASSESL_1=0xe9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEBUFFERL_1=0xd3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEONLYTEXTL_1=0xd4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_1=0xc5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_10=0xce
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_11=0xcf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_2=0xc6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_3=0xc7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_4=0xc8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_5=0xc9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_6=0xca
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_7=0xcb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_8=0xcc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_9=0xcd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_1=0xd0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_2=0xd1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_3=0xd2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_FILLPDUL_1=0xbb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_1=0xd6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_2=0xd7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_3=0xd8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_4=0xd9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_5=0xda
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_6=0xdb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_7=0xdc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_8=0xdd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_9=0xde
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL1_1=0xe8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL_1=0xe7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL1_1=0xe0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL_1=0xdf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_1=0xad
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_2=0xae
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_1=0xb3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_2=0xb4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_1=0xaf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_2=0xb0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_RESETWORKINGPDUL_1=0xb5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_UPDATEUSERPROMPTANDODIELEMENTSSTARTPOSITION_1=0xe5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR1_1=0x129
-[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR_1=0x128
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOAPPLICATIONPORTADDRESSING_1=0x140
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETAPPLICATIONPORTADDRESSINGL_1=0x141
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETTEXTCONCATENATEDL_1=0x13f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOTEXTCONCATENATED_1=0x13e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_ENCODEMESSAGEPDUL1_1=0x13b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATECONCATENATIONDATAL_1=0x13c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATEEMAILHEADERDATAL_1=0x13d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR1_1=0xf7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR_1=0xf6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_1=0xf8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_2=0xf9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_3=0xfa
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR1_1=0x107
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR_1=0x106
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_1=0x108
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_2=0x109
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR1_1=0xff
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR_1=0xfe
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_1=0xfb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_2=0xfc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_3=0xfd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_CONSTRUCTL_1=0x166
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DATACODINGSCHEME_1=0x161
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DECODEL_1=0x168
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_ENCODEL_1=0x167
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PARAMETERINDICATOR_1=0x163
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PROTOCOLIDENTIFIER_1=0x162
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_TOFROMADDRESSPTR_1=0x165
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_USERDATAPTR_1=0x164
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_CONSTRUCTL_1=0x15e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DATACODINGSCHEME_1=0x15a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DECODEL_1=0x160
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_ENCODEL_1=0x15f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PARAMETERINDICATOR_1=0x15c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PROTOCOLIDENTIFIER_1=0x15b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_USERDATAPTR_1=0x15d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_CONSTRUCTL_1=0x14e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DATACODINGSCHEME_1=0x14a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DECODEL_1=0x151
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL1_1=0x150
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL_1=0x14f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_INTERNALIZEMESSAGEPDUL_1=0x152
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_PROTOCOLIDENTIFIER_1=0x14b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_TOFROMADDRESSPTR_1=0x14d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_USERDATAPTR_1=0x14c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR1_1=0x12d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR_1=0x12c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_1=0x12e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_2=0x12f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_ADDEMSINFORMATIONELEMENTL_1=0x6c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_APPENDBODYL_1=0x6f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_BODYLENGTHINUDLUNITS_1=0x78
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_CONSTRUCTL_1=0x72
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_CONTROLINFORMATIONELEMENTWILLFITL_1=0x64
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_DECODEL1_1=0x71
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_DUPLICATEL_1=0x73
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_EMSINFORMATIONELEMENTWILLFITL_1=0x63
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_ENCODEL_1=0x70
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_HEADERLENGTH_1=0x74
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_HEADERPRESENT_1=0x7a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_INFORMATIONELEMENTINDICESL_1=0x62
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_INFORMATIONELEMENTPTR_1=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_ISBINARYDATA_1=0x7c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_MAXPACKEDUDUNITSINBODYREMAINING1_1=0x6e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_MAXPACKEDUDUNITSINBODYREMAINING_1=0x6d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_NEWBODYL_1=0x79
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_NEWL_1=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_SETHEADERPRESENT_1=0x7b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS1_1=0x77
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS_1=0x75
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS_2=0x76
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_1=0x65
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_2=0x66
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_3=0x67
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_4=0x68
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_5=0x69
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_6=0x6a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_7=0x6b
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_CONSTRUCTL_1=0xa2
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_CTOR1_1=0x9f
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_DECODEL_1=0x9e
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_ENCODEL_1=0x9d
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_NEWBUFFERL_1=0xa3
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_OPERATOR1_1=0xa1
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_OPERATOR_1=0xa0
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_SIZEL_1=0x9c
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_CONSTRUCTL_1=0x93
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_CTOR1_1=0x92
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_CTOR_1=0x8f
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_DECODEL_1=0x8e
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_DOSETPARSEDADDRESSL_1=0x94
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_ENCODEL_1=0x8d
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_NEWBUFFERL_1=0x8a
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_NEWEXTENSIONL_1=0x8b
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_OPERATOR1_1=0x91
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_OPERATOR_1=0x90
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_SIZEL_1=0x8c
-[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_CONVERTANDPACKL_1=0x172
-[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_ELEMENTSIZEINBITSL_1=0x175
-[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_PACKEDOCTETSREQUIREDL_1=0x174
-[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_PACKL_1=0x170
-[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_UNPACKANDCONVERTL_1=0x173
-[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_UNPACKL_1=0x171
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_ALPHABET_1=0x18
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_ALPHABET_2=0x19
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_CLASS_1=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONSTATE_1=0x22
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONSTATE_2=0x23
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONTYPE_1=0x26
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONTYPE_2=0x27
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_1=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_2=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_3=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_4=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_5=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETCLASS_1=0x20
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETCLASS_2=0x21
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONSTATE_1=0x24
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONSTATE_2=0x25
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONTYPE_1=0x28
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONTYPE_2=0x29
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETTEXTCOMPRESSED_1=0x17
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_TEXTCOMPRESSED_1=0x16
-[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_GETCATEGORYDEFINITION_1=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_GETCATEGORYDEFINITION_2=0x5f
-[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_TRANSLATECATEGORYTOINDEX_1=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_TRANSLATECATEGORYTOINDEX_2=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETSHORTMESSAGEALPROTOCOL_1=0x13
-[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETSHORTMESSAGETYPE_1=0x15
-[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETTELEMATICDEVICEINDICATOR_1=0x10
-[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETTELEMATICDEVICETYPE_1=0x11
-[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SHORTMESSAGEALPROTOCOL_1=0x12
-[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SHORTMESSAGETYPE_1=0x14
-[TRACE]TRACE_INTERNALS[0x88]_TSMSSERVICECENTERTIMESTAMP_DECODEL_1=0x50
-[TRACE]TRACE_INTERNALS[0x88]_TSMSSERVICECENTERTIMESTAMP_ENCODEL_1=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_DECODEL_1=0x54
-[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_ENCODEL1_1=0x53
-[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_ENCODEL_1=0x52
-[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_TIME_1=0x51

--- a/smsprotocols/smsstack/smsprot/Group/SMSPROT.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Group/SMSPROT.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -55,14 +55,13 @@
 USERINCLUDE   ../../smsu/inc
 USERINCLUDE   ../../gsmu/inc
 USERINCLUDE   ../../common/inc
-USERINCLUDE   ../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY       euser.lib estor.lib efsrv.lib esocksvr.lib esock.lib
 LIBRARY       etelmm.lib etel.lib gsmu.lib smsu.lib mbufmgr.lib
 LIBRARY       logwrap.lib bafl.lib
-
+DEBUGLIBRARY  comsdbgutil.lib
 
 LIBRARY commsdat.lib

--- a/smsprotocols/smsstack/smsprot/Group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -37,4 +37,115 @@
 
 ../Group/SMSPROT.mmp
 
-#include "../Test/group/bld.inf"
+PRJ_TESTEXPORTS
+
+../Test/TE_SMSEMSPRT/TE_SMSEMSPRT.script                      z:/testdata/scripts/te_smsemsprt.script
+../Test/TE_SMSEMSPRT/TE_smsemsprt_setup.script                z:/testdata/scripts/te_smsemsprt_setup.script
+../Test/TE_SMSEMSPRT/te_smsemsprt_commdb.cfg                  z:/testdata/configs/te_smsemsprt_commdb.cfg
+								
+../Test/TE_SMSPRTSTRESS/te_smsprtstress.script                z:/testdata/scripts/te_smsprtstress.script
+../Test/TE_SMSPRTSTRESS/TE_smsprtstress_setup.script          z:/testdata/scripts/te_smsprtstress_setup.script
+../Test/TE_SMSPRTSTRESS/te_smsprtstress_commdb.cfg            z:/testdata/configs/te_smsprtstress_commdb.cfg
+
+../Test/TE_SMSCAPS/te_smscapsRead.script                      z:/testdata/scripts/te_smscapsread.script
+../Test/TE_SMSCAPS/te_smscapsWrite.script                     z:/testdata/scripts/te_smscapswrite.script
+../Test/TE_SMSCAPS/te_smscapsReadDevice.script                z:/testdata/scripts/te_smscapsreaddevice.script
+../Test/TE_SMSCAPS/te_smscapsWriteDevice.script               z:/testdata/scripts/te_smscapswritedevice.script
+../Test/TE_SMSCAPS/te_smscapsReadWrite.script                 z:/testdata/scripts/te_smscapsreadwrite.script
+../Test/TE_SMSCAPS/te_smscapsWriteNetwork.script              z:/testdata/scripts/te_smscapswritenetwork.script
+../Test/TE_SMSCAPS/te_smscapsReadWriteNetwork.script          z:/testdata/scripts/te_smscapsreadwritenetwork.script
+../Test/TE_SMSCAPS/te_smscapsNoReadWriteNetwork.script        z:/testdata/scripts/te_smscapsnoreadwritenetwork.script
+../Test/TE_SMSCAPS/te_smscaps.script                          z:/testdata/scripts/te_smscaps.script
+
+../Test/configfiles/t_sms_inter_auto.txt                      c:/sms/t_sms_inter_auto.txt
+../Test/configfiles/t_sms_inter_ems.txt                       c:/sms/t_sms_inter_ems.txt
+../Test/configfiles/t_sms_inter_auto_9210.txt                 c:/sms/t_sms_inter_auto_9210.txt
+../Test/configfiles/t_sms_inter_auto_R520.txt                 c:/sms/t_sms_inter_auto_r520.txt
+../Test/configfiles/t_sms_inter_auto_T65.txt                  c:/sms/t_sms_inter_auto_t65.txt
+../Test/configfiles/t_sms_inter_auto_6210.txt                 c:/sms/t_sms_inter_auto_6210.txt
+../Test/configfiles/TWAPSMS_9210.txt                          c:/sms/twapsms_9210.txt
+../Test/configfiles/TWAPSMS_R520.txt                          c:/sms/twapsms_r520.txt
+../Test/configfiles/TWAPSMS_T65.txt                           c:/sms/twapsms_t65.txt
+../Test/configfiles/t_sms_inter_ems_9210.txt                  c:/sms/t_sms_inter_ems_9210.txt
+../Test/configfiles/t_sms_inter_ems_R520.txt                  c:/sms/t_sms_inter_ems_r520.txt
+../Test/configfiles/t_sms_inter_ems_T68.txt                   c:/sms/t_sms_inter_ems_t68.txt
+../Test/configfiles/t_sms_inter_ems_6210.txt                  c:/sms/t_sms_inter_ems_6210.txt
+
+../../test/configfiles/setupgsmsms.txt                        z:/sms/setupgsmsms.txt
+../../test/configfiles/te_intersetupgsmsms.txt                z:/sms/te_intersetupgsmsms.txt
+
+../Test/configfiles/tsmsprtstress_config.txt                  z:/sms/tsmsprtstress_config.txt
+../Test/configfiles/tsmsemsprt_config.txt                     z:/sms/tsmsemsprt_config.txt
+
+../Test/configfiles/tsmscaps_config.txt                       z:/testdata/configs/tsmscaps_config.txt
+../Test/TE_SMSCAPS/te_smscaps.cfg                             z:/testdata/configs/te_smscaps.cfg
+../Test/TE_SMSCAPS/te_smscaps_setup.script                    z:/testdata/scripts/te_smscaps_setup.script
+
+//
+// TE_SMSINTER test files...
+//
+../Test/TE_SMSINTER/TE_smsinter.script                          z:/testdata/scripts/te_smsinter.script
+
+//
+// TE_SMSSTOR test files...
+//
+../Test/TE_SMSSTOR/te_smsstor.script                          z:/testdata/scripts/te_smsstor.script
+../Test/TE_SMSSTOR/smsreastnopdu.dat                          z:/sms/smsreastnopdu.dat
+../Test/TE_SMSSTOR/smsreastnostream.dat                       z:/sms/smsreastnostream.dat
+../Test/TE_SMSSTOR/smsreastarraynoroot.dat                    z:/sms/smsreastarraynoroot.dat
+../Test/TE_SMSSTOR/smsreastcountwrong.dat                     z:/sms/smsreastcountwrong.dat
+../Test/TE_SMSSTOR/smsreastarraynoentries.dat                 z:/sms/smsreastarraynoentries.dat
+../Test/TE_SMSSTOR/smswap.sms.esk                             z:/sms/smswap.sms-class0test.esk
+../Test/TE_SMSSTOR/smswap.sms-maxnummessagetest.esk           z:/sms/smswap.sms-maxnummessagetest.esk
+../Test/TE_SMSSTOR/smswap.sms-0nummessagetest.esk             z:/sms/smswap.sms-0nummessagetest.esk
+
+//
+// TE_SMSPRT test files...
+//
+../Test/TE_Smsprt/TE_smsprt_setup.script                      z:/testdata/scripts/te_smsprt_setup.script
+../Test/TE_Smsprt/tsmsprt_config.txt                          z:/sms/tsmsprt_config.txt
+../Test/TE_Smsprt/tsmsprt_config_extra.txt                    z:/sms/tsmsprt_config_extra.txt
+../Test/TE_Smsprt/tsmsprt_config_tx_rx_maxmsg.txt             z:/sms/tsmsprt_config_tx_rx_maxmsg.txt
+../Test/TE_Smsprt/TE_smsprt.cfg                               z:/testdata/configs/te_smsprt.cfg
+../Test/TE_Smsprt/Te_smsprt_data.ini                          z:/testdata/configs/te_smsprt_data.ini
+../Test/TE_Smsprt/Te_statusReportScheme.ini                   z:/testdata/configs/te_statusreportscheme.ini
+../Test/TE_Smsprt/TE_DiskSpaceMonitor.ini                     z:/testdata/configs/te_diskspacemonitor.ini
+../Test/TE_Smsprt/smswap.sms-sendTryTimeout.esk               z:/sms/smswap.sms-sendtrytimeout.esk
+../Test/TE_Smsprt/smswap.sms-bootTimerTimeout.esk             z:/sms/smswap.sms-boottimertimeout.esk
+../Test/TE_Smsprt/smswap.sms-AutomaticDeletionOfType0.esk     z:/sms/smswap.sms-automaticdeletionoftype0.esk
+../Test/TE_Smsprt/smswap.sms-AutoDeletionClass2.esk           z:/sms/smswap.sms-autodeletionclass2.esk
+../Test/TE_Smsprt/testsmswap.Sms.esk                          z:/sms/testsmswap.sms.esk
+../Test/TE_Smsprt/TE_smsprt_gsmu.script                       z:/testdata/scripts/te_smsprt_gsmu.script
+../Test/TE_Smsprt/TE_smsprt_prot.script                       z:/testdata/scripts/te_smsprt_prot.script
+../Test/TE_Smsprt/TE_smsprt_smsstack.script                   z:/testdata/scripts/te_smsprt_smsstack.script
+
+//SMSOutOfDiskSpace
+../Test/TE_Smsprt/Te_SMSStackOutOfDiskSpace.script            z:/testdata/scripts/te_smsstackoutofdiskspace.script
+../Test/TE_Smsprt/Te_SMSStackOutOfDiskSpace_ARM_UREL.script   z:/testdata/scripts/te_smsstackoutofdiskspace_arm_urel.script
+../Test/TE_Smsprt/TE_SetupSMSStackOutOfDiskSpace.script       z:/testdata/scripts/te_setupsmsstackoutofdiskspace.script
+../Test/TE_Smsprt/SMSOutOfDiskSpace.ini                   	  z:/testdata/configs/smsoutofdiskspace.ini
+../Test/TE_Smsprt/SMSStackOutOfDiskSpace.txt                  z:/sms/smsstackoutofdiskspace.txt
+../Test/TE_Smsprt/smsclass0preallocated.dat                   z:/testdata/configs/smsclass0preallocated.dat
+../Test/TE_Smsprt/smsclass0reast.dat		                  z:/testdata/configs/smsclass0reast.dat
+../Test/TE_Smsprt/smswap_class0.sms.esk                   	  z:/testdata/configs/smswap_class0.sms.esk
+../Test/TE_Smsprt/smswap_DontDiscardType0s.esk			      z:/testdata/configs/smswap_dontdiscardtype0s.esk
+../Test/TE_Smsprt/smswap_discardType0s.esk			      	  z:/testdata/configs/smswap_discardtype0s.esk
+../Test/TE_Smsprt/smswap_MaxFivePDUsInOOD.esk			      z:/testdata/configs/smswap_maxfivepdusinood.esk
+../Test/TE_Smsprt/smswap_Class0DisabledMaxFivePDUsInOOD.esk	  z:/testdata/configs/smswap_class0disabledmaxfivepdusinood.esk
+
+//Class0RegressionTestSuite
+../Test/TE_Smsprt/smswap.sms-sendTryTimeoutClass0.esk               	z:/sms/smswap.sms-sendtrytimeoutclass0.esk
+../Test/TE_Smsprt/smswap.sms-bootTimerTimeoutClass0.esk             	z:/sms/smswap.sms-boottimertimeoutclass0.esk
+../Test/TE_Smsprt/smswap.sms-AutoDeletionClass2EnableClass0Store.esk	z:/sms/smswap.sms-autodeletionclass2enableclass0store.esk
+../Test/TE_Smsprt/testsmswapClass0.Sms.esk                          	z:/sms/testsmswapclass0.sms.esk
+../Test/TE_Smsprt/smswap.sms-class0test_onepduseg.esk                   z:/sms/smswap.sms-class0test_onepduseg.esk
+../Test/TE_Smsprt/TE_smsprtRegressionClass0StoreEnabled.script			z:/testdata/scripts/te_smsprtregressionclass0storeenabled.script
+
+PRJ_TESTMMPFILES
+
+../Test/TE_SMSINTER/TE_smsinter.mmp
+../Test/TE_SMSSTOR/TE_smsstor.mmp
+../Test/TE_SMSEMSPRT/TE_SMSEMSPRT.mmp
+../Test/TE_SMSPRTSTRESS/TE_smsprtstress.mmp
+../Test/TE_Smsprt/TE_smsprt.mmp
+../Test/TE_SMSCAPS/te_smscaps.mmp

--- a/smsprotocols/smsstack/smsprot/Group/smsport_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSEMSPRT\TE_SMSEMSPRT.script"-"c:\testdata\scripts\TE_SMSEMSPRT.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSEMSPRT\te_smsemsprt_commdb.cfg"-"c:\testdata\scripts\te_smsemsprt_commdb.cfg"
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSPRTSTRESS\te_smsprtstress.script"-"c:\testdata\scripts\te_smsprtstress.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSPRTSTRESS\te_smsprtstress_commdb.cfg"-"c:\testdata\scripts\te_smsprtstress_commdb.cfg"
-
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_SMSSTOR\te_smsstor.script"-"c:\testdata\scripts\te_smsstor.script"
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_gsmu.script"-"c:\testdata\scripts\TE_smsprt_gsmu.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_prot.script"-"c:\testdata\scripts\TE_smsprt_prot.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_smsprt_smsstack.script"-"c:\testdata\scripts\TE_smsprt_smsstack.script"
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\Te_SMSStackOutOfDiskSpace.script"-"c:\testdata\scripts\Te_SMSStackOutOfDiskSpace.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\smsprot\Test\TE_Smsprt\TE_SetupSMSStackOutOfDiskSpace.script"-"c:\testdata\scripts\TE_SetupSMSStackOutOfDiskSpace.script"

--- a/smsprotocols/smsstack/smsprot/Src/smspbear.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspbear.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -17,12 +17,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspbearTraces.h"
-#endif
-
 #include <commsdattypesv1_1.h>
 #include <cdbcols.h>
 #include "smspmain.h"
@@ -44,7 +38,7 @@
  */
 CSmspSetBearer* CSmspSetBearer::NewL(const TSmsSettings& aSmsSettings,RMobileSmsMessaging& aSmsMessaging, TInt aPriority)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_NEWL_1, "CSmspSetBearer::NewL aPriority = %d", aPriority);
+	LOGSMSPROT2("CSmspSetBearer::NewL aPriority = %d", aPriority);
 
 	CSmspSetBearer* smsSetBearer=new(ELeave) CSmspSetBearer(aSmsSettings,aSmsMessaging, aPriority);
 	CleanupStack::PushL(smsSetBearer);
@@ -60,7 +54,7 @@
  */
 void CSmspSetBearer::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_CONSTRUCTL_1, "CSmspSetBearer::ConstructL()");
+	LOGSMSPROT1("CSmspSetBearer::ConstructL()");
 
 	CSmspCommDbEvent::ConstructL();
 
@@ -98,7 +92,7 @@
  */
 void CSmspSetBearer::NotifyBearerSet(TRequestStatus& aStatus)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_NOTIFYBEARERSET_1, "CSmspSetBearer::NotifyBearerSet, aStatus = %d", aStatus.Int());
+	LOGSMSPROT2("CSmspSetBearer::NotifyBearerSet, aStatus = %d", aStatus.Int());
 	if (!iBearerSet && IsActive())
 		{
 		Cancel();
@@ -108,12 +102,12 @@
 
 	if (iBearerSet)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_NOTIFYBEARERSET_2, "CSmspSetBearer::NotifyBearerSet RequestComplete called");
+		LOGSMSPROT1("CSmspSetBearer::NotifyBearerSet RequestComplete called");
 		CSmsuActiveBase::Complete(KErrNone);
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_NOTIFYBEARERSET_3, "CSmspSetBearer::NotifyBearerSet started");
+		LOGSMSPROT1("CSmspSetBearer::NotifyBearerSet started");
 		Start();
 		}
 	} // CSmspSetBearer::NotifyBearerSet
@@ -124,7 +118,7 @@
  */
 void CSmspSetBearer::Start()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_START_1, "CSmspSetBearer::Start");
+	LOGSMSPROT1("CSmspSetBearer::Start");
 	// Cancel any outstanding request
 	TRAPD(err, GetSmsBearerL(iBearer));
 
@@ -132,7 +126,7 @@
 
 	if (err == KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_START_2, "CSmspSetBearer::GetSmsBearerL() left with %d", err);
+		LOGSMSPROT2("CSmspSetBearer::GetSmsBearerL() left with %d", err);
 
 		// Set the previous bearer to the one that has been read
 		// from CommDB so that iPreviousBearer has an initial value
@@ -142,7 +136,7 @@
 		}
 	else
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_START_3, "CSmspSetBearer::Start failed to get SMS bearer, error = %d", err);
+		LOGSMSPROT2("CSmspSetBearer::Start failed to get SMS bearer, error = %d", err);
 		Complete(err);
 		}
 	} // CSmspSetBearer::Start
@@ -157,7 +151,7 @@
  */
 void CSmspSetBearer::DoRunL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_1, "CSmspSetBearer::DoRunL(): iState=%d iStatus=%d", iState, iStatus.Int());
+	LOGSMSPROT3("CSmspSetBearer::DoRunL(): iState=%d iStatus=%d", iState, iStatus.Int());
 
 	switch (iState)
 		{
@@ -176,13 +170,13 @@
 				TRAPD(err, globalSettingsRecord.LoadL(*dbSession));
 				if (err != KErrNone)
 					{
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_2, "CSmspSetBearer::DoRunL, could not load global settings, leave error code = %d", err);
+					LOGSMSPROT2("CSmspSetBearer::DoRunL, could not load global settings, leave error code = %d", err);
 					User::Leave(err);
 					}
 
 				iPreviousBearer = iBearer;
 
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_3, "CSmspSetBearer::DoRunL Storing previous bearer setting. Previous bearer now = %d", iBearer);
+				LOGSMSPROT2("CSmspSetBearer::DoRunL Storing previous bearer setting. Previous bearer now = %d", iBearer);
 
 				tempBearer = ((CCDGlobalSettingsRecord*)globalSettingsRecord.iRecords[0])->iSMSBearer;
 				iBearer = static_cast<RMobileSmsMessaging::TMobileSmsBearer>(tempBearer);
@@ -210,10 +204,10 @@
 				// (e.g. KErrNotSupported)
 				// Set global setting to previous value,
 				// then complete.
-				OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_4, "CSmspSetBearer::DoRunL TSY failed to set MO SMS bearer. status = %d. Bearer = %d", iStatus.Int(), iBearer);
+				LOGSMSPROT3("CSmspSetBearer::DoRunL TSY failed to set MO SMS bearer. status = %d. Bearer = %d", iStatus.Int(), iBearer);
 
 				iBearer = iPreviousBearer;
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_5, "CSmspSetBearer::DoRunL Setting bearer back to previous setting. Bearer = %d", iBearer);
+				LOGSMSPROT2("CSmspSetBearer::DoRunL Setting bearer back to previous setting. Bearer = %d", iBearer);
 
 #ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
 				CMDBSession *dbSession = CMDBSession::NewL(KCDVersion1_2);
@@ -225,7 +219,7 @@
 				TRAPD(err, globalSettingsRecord.LoadL(*dbSession));
 				if (err != KErrNone)
 					{
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_6, "CSmspSetBearer::DoRunL could not load global settings, error = %d", err);
+					LOGSMSPROT2("CSmspSetBearer::DoRunL could not load global settings, error = %d", err);
 					User::Leave(err);
 					}
 
@@ -233,7 +227,7 @@
 				TRAP(err, globalSettingsRecord.ModifyL(*dbSession));
 				if (err != KErrNone)
 					{
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_7, "CSmspSetBearer::DoRunL could not modify global settings, error = %d", err);
+					LOGSMSPROT2("CSmspSetBearer::DoRunL could not modify global settings, error = %d", err);
 					User::Leave(err);
 					}
 
@@ -262,7 +256,7 @@
  */
 void CSmspSetBearer::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DOCANCEL_1, "CSmspSetBearer::DoCancel");
+	LOGSMSPROT1("CSmspSetBearer::DoCancel");
 
 	TimedSetActiveCancel();
 
@@ -319,7 +313,7 @@
  */
 void CSmspSetBearer::GetSmsBearerL(RMobileSmsMessaging::TMobileSmsBearer& aBearer)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_GETSMSBEARERL_1, "CSmspSetBearer::GetSmsBearerL()");
+	LOGSMSPROT1("CSmspSetBearer::GetSmsBearerL()");
 	
 #ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
 	CMDBSession* sess = CMDBSession::NewL(KCDVersion1_2);
@@ -337,7 +331,7 @@
 	smsBearerField->LoadL(*sess);
 
 	aBearer = static_cast<RMobileSmsMessaging::TMobileSmsBearer>(static_cast<TUint32>(*smsBearerField));
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_GETSMSBEARERL_2, "CSmspSetBearer::GetSmsBearerL(): aBearer=%d", aBearer);
+	LOGSMSPROT2("CSmspSetBearer::GetSmsBearerL(): aBearer=%d", aBearer);
 
 	CleanupStack::PopAndDestroy(smsBearerField);
 	CleanupStack::PopAndDestroy(sess);
@@ -350,7 +344,7 @@
  */
 void CSmspSetBearer::SetSmsBearer()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_SETSMSBEARER_1, "CSmspSetBearer::SetSmsBearer, iBearer = %d", iBearer);
+	LOGSMSPROT2("CSmspSetBearer::SetSmsBearer, iBearer = %d", iBearer);
 
 	iBearerSet = EFalse;
 	iState = ESmsSetBearerStateSettingBearer;
@@ -365,7 +359,7 @@
  */
 void CSmspSetBearer::NotifyOnEvent()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_NOTIFYONEVENT_1, "CSmspSetBearer::NotifyOnEvent");
+	LOGSMSPROT1("CSmspSetBearer::NotifyOnEvent");
 
 	iState = ESmsSetBearerNotifyOnEvent;
 	CSmspCommDbEvent::NotifyOnEvent();

--- a/smsprotocols/smsstack/smsprot/Src/smspcdb.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspcdb.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspcdbTraces.h"
-#endif
-
 #include "smspcdb.h"
 #include "smspmain.h"
 #include "smsuset.h"
@@ -54,7 +48,7 @@
 
 void CSmspCommDbEvent::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPCOMMDBEVENT_CONSTRUCTL_1, "CSmspCommDbEvent::ConstructL()");
+	LOGSMSPROT1("CSmspCommDbEvent::ConstructL()");
 
 	ConstructTimeoutL();
 	} // CSmspCommDbEvent::ConstructL
@@ -66,7 +60,7 @@
  */
 void CSmspCommDbEvent::NotifyOnEvent()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPCOMMDBEVENT_NOTIFYONEVENT_1, "CSmspCommDbEvent::NotifyOnEvent()");
+	LOGSMSPROT1("CSmspCommDbEvent::NotifyOnEvent()");
 
 	iProperty.Subscribe(iStatus);
 	SetActive();
@@ -80,7 +74,7 @@
  */
 void CSmspCommDbEvent::Complete(TInt aError)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPCOMMDBEVENT_COMPLETE_1, "CSmspCommDbEvent::Complete()");
+	LOGSMSPROT1("CSmspCommDbEvent::Complete()");
 
 	//
 	// Call the base function to perform the actual complete...

--- a/smsprotocols/smsstack/smsprot/Src/smspclass0stor.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspclass0stor.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -18,12 +18,6 @@
 /**
  @file
 */
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspclass0storTraces.h"
-#endif
-
 #include "smspclass0stor.h"
 #include "gsmubuf.h"
 #include "gsmunonieoperations.h"
@@ -57,7 +51,7 @@
 */
 CSmsPermanentFileStore* CSmsPermanentFileStore::NewL(RFs& aFs, const TDesC& aFileName, const TUid& aThirdUid)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_NEWL_1, "CSmsPermanentFileStore::NewL()");
+	LOGSMSPROT1("CSmsPermanentFileStore::NewL()");
 	CSmsPermanentFileStore*  self = new (ELeave) CSmsPermanentFileStore(aFs, aThirdUid);
 	CleanupStack::PushL(self);
 	self->ConstructL(aFileName);
@@ -68,7 +62,7 @@
 
 void CSmsPermanentFileStore::ConstructL(const TDesC& aFileName)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_CONSTRUCTL_1, "CSmsPermanentFileStore::ConstructL()");
+	LOGSMSPROT1("CSmsPermanentFileStore::ConstructL()");
 	iFileName = aFileName.AllocL();
 	}
 
@@ -115,7 +109,7 @@
 */
 void CSmsPermanentFileStore::CreateL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_CREATEL_1, "CSmsPermanentFileStore::CreateL()");
+	LOGSMSPROT1("CSmsPermanentFileStore::CreateL()");
 	TUidType uidtype(KPermanentFileStoreLayoutUid,KSARStoreUid,iThirdUid);
 	iFileStore=CPermanentFileStore::ReplaceL(iFs, iFileName->Des(), EFileShareExclusive|EFileStream|EFileRead|EFileWrite);
 	iFileStore->SetTypeL(uidtype);
@@ -135,7 +129,7 @@
 */
 void CSmsPermanentFileStore::OpenL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_OPENL_1, "CSmsPermanentFileStore::OpenL()");
+	LOGSMSPROT1("CSmsPermanentFileStore::OpenL()");
 	iFileStore=CPermanentFileStore::OpenL(iFs,iFileName->Des(),EFileShareExclusive|EFileStream|EFileRead|EFileWrite);
 	InternalizeEntryArrayL();
 	}
@@ -147,7 +141,7 @@
 */
 void CSmsPermanentFileStore::Close()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_CLOSE_1, "CSmsPermanentFileStore::Close()");
+	LOGSMSPROT1("CSmsPermanentFileStore::Close()");
 	delete iFileStore;
 	iFileStore = NULL;
 	iEntryArray.Reset();
@@ -171,7 +165,7 @@
 	{
     // Ignore in code coverage - a previous CleanupEntries would need to have failed with KErrDiskFull
 	BULLSEYE_OFF
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_CLEANUPENTRIESWITHCOMPACTL_1, "CSmsPermanentFileStore::CleanupEntriesWithCompactL()");
+	LOGSMSPROT1("CSmsPermanentFileStore::CleanupEntriesWithCompactL()");
 
 	iCompact = ETrue;
 	CleanupEntriesL(aEntryArray);
@@ -193,7 +187,7 @@
 */
 void CSmsPermanentFileStore::CleanupEntriesL(const CArrayFix<TSmsPreAllocatedFileStoreReassemblyEntry>& aEntryArray)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_CLEANUPENTRIESL_1, "CSmsPermanentFileStore::CleanupEntriesL()");
+	LOGSMSPROT1("CSmsPermanentFileStore::CleanupEntriesL()");
 
 	TInt reassemblyCount = iEntryArray.Count();
 	TInt index, index2;
@@ -263,7 +257,7 @@
 */
 void CSmsPermanentFileStore::InternalizeEntryArrayL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_INTERNALIZEENTRYARRAYL_1, "CSmsPermanentFileStore::InternalizeEntryArrayL()");
+	LOGSMSPROT1("CSmsPermanentFileStore::InternalizeEntryArrayL()");
 
 	iEntryArray.Reset();
 	TStreamId headerid=iFileStore->Root();
@@ -286,7 +280,8 @@
 */
 void CSmsPermanentFileStore::ExternalizeEntryArrayL()
 	{
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYARRAYL_1, "CSmsPermanentFileStore::ExternalizeEntryArrayL(): this=0x%08X count=%d headerid=%u]",(TUint) this, iEntryArray.Count(), (TUint)iFileStore->Root().Value());
+	LOGSMSPROT4("CSmsPermanentFileStore::ExternalizeEntryArrayL(): this=0x%08X count=%d headerid=%d]",
+			 this, iEntryArray.Count(), iFileStore->Root().Value());
 
 	TStreamId headerid=iFileStore->Root();
 	RStoreWriteStream stream;
@@ -335,7 +330,7 @@
 */
 void CSmsPermanentFileStore::AddNewMessageL(TInt& aIndex, CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_ADDNEWMESSAGEL_1, "CSmsPermanentFileStore::AddNewMessageL");
+	LOGSMSPROT1("CSmsPermanentFileStore::AddNewMessageL");
 
 	CArrayFix<TInt>* indexArray=new(ELeave) CArrayFixFlat<TInt>(KFlatArrayGranularity);
 	CleanupStack::PushL(indexArray);
@@ -376,7 +371,7 @@
 */
 void CSmsPermanentFileStore::UpdateExistingMessageL(TInt aIndex, const CSmsMessage& aSmsMessage,const CArrayFix<TInt>& aIndexArray,const CArrayFix<TGsmSms>& aSmsArray)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_UPDATEEXISTINGMESSAGEL_1, "CSmsPermanentFileStore::UpdateExistingMessageL()");
+	LOGSMSPROT1("CSmsPermanentFileStore::UpdateExistingMessageL()");
 	TStreamId  streamid = iEntryArray[aIndex].DataStreamId();
 	ExternalizeEntryL(streamid, aSmsMessage, aIndexArray, aSmsArray);
 	TSmsReassemblyEntry entry;
@@ -397,7 +392,7 @@
 void CSmsPermanentFileStore::MatchEntryToExistingMessage(const TReassemblyEntry& aEntry,
 													TInt& aIndex)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_MATCHENTRYTOEXISTINGMESSAGE_1, "CSmsPermanentFileStore::MatchEntryToExistingMessage()");
+	LOGSMSPROT1("CSmsPermanentFileStore::MatchEntryToExistingMessage()");
 
 	aIndex = KErrNotFound;
 
@@ -423,7 +418,7 @@
 			}
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_MATCHENTRYTOEXISTINGMESSAGE_2, "CSmsPermanentFileStore::MatchEntryToExistingMessage(): aIndex=%d", aIndex);
+	LOGSMSPROT2("CSmsPermanentFileStore::MatchEntryToExistingMessage(): aIndex=%d", aIndex);
 	}
 
 /*
@@ -436,7 +431,7 @@
 */
 void CSmsPermanentFileStore::UpdateLogServerIdL(TInt& aIndex, TLogId aLogServerId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_UPDATELOGSERVERIDL_1, "CSmsPermanentFileStore::UpdateLogServerIdL");
+	LOGSMSPROT1("CSmsPermanentFileStore::UpdateLogServerIdL");
 
 	TSmsReassemblyEntry entry;
 	entry = iEntryArray[aIndex];
@@ -458,7 +453,7 @@
 */
 void CSmsPermanentFileStore::SetPassedToClientL(TInt aIndex, TBool aBool)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_SETPASSEDTOCLIENTL_1, "CSmsPermanentFileStore::SetPassedToClientL(): aIndex=%d", aIndex);
+	LOGSMSPROT2("CSmsPermanentFileStore::SetPassedToClientL(): aIndex=%d", aIndex);
 
 	TSmsReassemblyEntry entry;
 	entry = iEntryArray[aIndex];
@@ -493,7 +488,7 @@
 */
 void CSmsPermanentFileStore::ChangeEntryL(TInt aIndex,const TSmsReassemblyEntry& aNewEntry)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_CHANGEENTRYL_1, "CSmsPermanentFileStore::ChangeEntryL(): aIndex=%d", aIndex);
+	LOGSMSPROT2("CSmsPermanentFileStore::ChangeEntryL(): aIndex=%d", aIndex);
 
 	iEntryArray[aIndex].SetIsDeleted(ETrue);
 	iEntryArray.InsertL(aIndex,aNewEntry);
@@ -525,7 +520,7 @@
 */
 void CSmsPermanentFileStore::ExternalizeEntryL(TStreamId& aStreamId,const CSmsMessage& aSmsMessage,const CArrayFix<TInt>& aIndexArray,const CArrayFix<TGsmSms>& aSmsArray)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYL_1, "CSmsPermanentFileStore::ExternalizeEntryL Start [sid=%d]", aStreamId.Value());
+	LOGSMSPROT2("CSmsPermanentFileStore::ExternalizeEntryL Start [sid=%d]", aStreamId.Value());
 
 	RStoreWriteStream writestream;
 	if (aStreamId==KNullStreamId)
@@ -549,7 +544,7 @@
 	writestream.CommitL();
 	CleanupStack::PopAndDestroy();
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYL_2, "CClass0PermanentFileStore::ExternalizeEntryL End [count=%d]", count);
+	LOGSMSPROT2("CClass0PermanentFileStore::ExternalizeEntryL End [count=%d]", count);
 	}
 
 /*
@@ -565,7 +560,7 @@
 void CSmsPermanentFileStore::InternalizeEntryL(const TInt aIndex, CSmsMessage& aSmsMessage, CArrayFix<TInt>& aIndexArray, CArrayFix<TGsmSms>& aSmsArray)
 	{
 	TSmsReassemblyEntry&  entry = iEntryArray[aIndex];
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_INTERNALIZEENTRYL_1, "CSmsPermanentFileStore::InternalizeEntryL Start [sid=%d]", entry.DataStreamId().Value());
+	LOGSMSPROT2("CSmsPermanentFileStore::InternalizeEntryL Start [sid=%d]", entry.DataStreamId().Value());
 	RStoreReadStream readstream;
 	readstream.OpenLC(*iFileStore, entry.DataStreamId());
 	readstream >> aSmsMessage;
@@ -594,7 +589,7 @@
 	aSmsMessage.SetStorage(entry.Storage());
 	aSmsMessage.SetLogServerId(entry.LogServerId());
 	aSmsMessage.SetTime(entry.Time());
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_INTERNALIZEENTRYL_2, "CSmsPermanentFileStore::InternalizeEntryL End [count=%d]", count);
+	LOGSMSPROT2("CSmsPermanentFileStore::InternalizeEntryL End [count=%d]", count);
 	}
 
 /*
@@ -612,7 +607,7 @@
 */
 void CSmsPermanentFileStore::RemovePDUsL(TInt aIndex, TInt aStartPos, TInt aEndPos)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_REMOVEPDUSL_1, "CSmsPermanentFileStore::RemovePDUsL");
+	LOGSMSPROT1("CSmsPermanentFileStore::RemovePDUsL");
 
 	CSmsBuffer*  buffer = CSmsBuffer::NewL();
 	CSmsMessage*  smsMessage = CSmsMessage::NewL(iFs, CSmsPDU::ESmsDeliver, buffer);
@@ -669,11 +664,11 @@
  */
 void CSmsPermanentFileStore::BeginTransactionL()
 	{
-    OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_BEGINTRANSACTIONL_1, "CSmsPermanentFileStore::BeginTransactionL [this=0x%08X iInTransaction=%d iFileStore=0x%08X]", (TUint)this, iInTransaction, (TUint)iFileStore);
+    LOGSMSPROT4("CSmsPermanentFileStore::BeginTransactionL [this=0x%08X iInTransaction=%d iFileStore=0x%08X]", this, iInTransaction, iFileStore);
 
 	if (iFileStore == NULL || iInTransaction)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_BEGINTRANSACTIONL_2, "WARNING CSmsPermanentFileStore::BeginTransactionL leaving with KErrAccessDenied");
+		LOGSMSPROT1("WARNING CSmsPermanentFileStore::BeginTransactionL leaving with KErrAccessDenied");
 		User::Leave(KErrAccessDenied);
 		}
 
@@ -685,7 +680,8 @@
  */
 void CSmsPermanentFileStore::Revert()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_REVERT_1, "CSmsPermanentFileStore::Revert(): this=0x%08X, iInTransaction=%d",(TUint)this, iInTransaction);
+	LOGSMSPROT3("CSmsPermanentFileStore::Revert(): this=0x%08X, iInTransaction=%d",
+    		 this, iInTransaction);
 
 	iFileStore->Revert();
 	iInTransaction = EFalse;
@@ -697,18 +693,11 @@
  */
 void CSmsPermanentFileStore::DoCommitAndCompactL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_1, "CSmsPermanentFileStore::DoCommitAndCompactL()");
-
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) 
-    TBuf<40> timestamp;
-    SmsTimeStampL(timestamp);
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_2, "%S",timestamp);
-#endif
+	LOGSMSPROT1("CSmsPermanentFileStore::DoCommitAndCompactL()");
+
+	LOGSMSPROTTIMESTAMP();
 	iFileStore->CommitL();
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) 
-    SmsTimeStampL(timestamp);
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_3, "%S",timestamp);
-#endif
+	LOGSMSPROTTIMESTAMP();
 
 	iCommitCount--;
 	if ((iCommitCount < 0) || (iCompact))
@@ -725,15 +714,16 @@
  */
 void CSmsPermanentFileStore::CommitTransactionL()
 	{
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_COMMITTRANSACTIONL_1, "CSmsPermanentFileStore::CommitTransactionL(): this=0x%08X iInTransaction=%d iFileStore=0x%08X",(TUint)this, iInTransaction, (TUint)iFileStore);
+	LOGSMSPROT4("CSmsPermanentFileStore::CommitTransactionL(): this=0x%08X iInTransaction=%d iFileStore=0x%08X",
+    		 this, iInTransaction, iFileStore);
 
 	ExternalizeEntryArrayL();
 
-#ifdef OST_TRACE_COMPLIER_IN_USE
+#ifdef _SMS_LOGGING_ENABLED
 	TRAPD(err, DoCommitAndCompactL());
 	if (err != KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_COMMITTRANSACTIONL_2, "WARNING! could not CommitL/CompactL due to %d", err);
+		LOGGSMU2("WARNING! could not CommitL/CompactL due to %d", err);
 		User::Leave(err);
 		}
 #else
@@ -750,7 +740,7 @@
  */
 void CSmsPermanentFileStore::RemoveDeletedEntries()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_REMOVEDELETEDENTRIES_1, "CSmsPermanentFileStore::RemoveDeletedEntries()");
+	LOGSMSPROT1("CSmsPermanentFileStore::RemoveDeletedEntries()");
 
 	TInt count=iEntryArray.Count();
 	while (count--)
@@ -774,7 +764,7 @@
  */
 void CSmsPermanentFileStore::ReinstateDeletedEntries()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_REINSTATEDELETEDENTRIES_1, "CSmsPermanentFileStore::ReinstateDeletedEntries()");
+	LOGSMSPROT1("CSmsPermanentFileStore::ReinstateDeletedEntries()");
 
 	TInt count=iEntryArray.Count();
 	while (count--)
@@ -859,7 +849,7 @@
 */
 CPreallocatedFile* CPreallocatedFile::NewL(RFs& aFs, const TDesC& aFileName, TInt aMaxClass0Msg, TInt aMaxPDUSeg, TPreAllocatedFileVersion aVersion)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_NEWL_1, "CPreallocatedFile::NewL()");
+	LOGSMSPROT1("CPreallocatedFile::NewL()");
 	CPreallocatedFile*  self = new (ELeave) CPreallocatedFile(aFs, aMaxClass0Msg, aMaxPDUSeg, aVersion);
 	CleanupStack::PushL(self);
 	self->ConstructL(aFileName);
@@ -870,7 +860,7 @@
 
 void CPreallocatedFile::ConstructL(const TDesC& aFileName)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_CONSTRUCTL_1, "CPreallocatedFile::ConstructL()");
+	LOGSMSPROT1("CPreallocatedFile::ConstructL()");
 	iFileName = aFileName.AllocL();
 	}
 
@@ -924,7 +914,7 @@
 */
 TBool CPreallocatedFile::IsFileOK()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_ISFILEOK_1, "CPreallocatedFile::IsFileOK()");
+	LOGSMSPROT1("CPreallocatedFile::IsFileOK()");
 
 	TEntry entry;
 	//  Check file exists
@@ -953,7 +943,7 @@
 */
 void CPreallocatedFile::CreateL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_CREATEL_1, "CPreallocatedFile::CreateL");
+	LOGSMSPROT1("CPreallocatedFile::CreateL");
 
 	User::LeaveIfError(iFile.Replace(iFs, iFileName->Des(), EFileWrite));
 	User::LeaveIfError(iFile.SetSize(iSizeOfFile));
@@ -1108,7 +1098,7 @@
 */
 void CPreallocatedFile::AddNewMessageL(TInt& aIndex, CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_ADDNEWMESSAGEL_1, "CPreallocatedFile::AddNewMessageL");
+	LOGSMSPROT1("CPreallocatedFile::AddNewMessageL");
 	//Gets the next free slot where the message will be stored.
 	TInt nextFreeSlot = GetFreeContainer();
 	TInt pduIndex=aSmsMessage.IsDecoded()? 0: aSmsMessage.SmsPDU().ConcatenatedMessagePDUIndex();
@@ -1157,7 +1147,7 @@
 */
 void CPreallocatedFile::UpdateExistingMessageL(TInt aIndex, const CSmsMessage& aSmsMessage, TInt aPduIndex, const TGsmSms& aSms)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_UPDATEEXISTINGMESSAGEL_1, "CPreallocatedFile::UpdateExistingMessageL()");
+	LOGSMSPROT1("CPreallocatedFile::UpdateExistingMessageL()");
 	TInt preAllocatedStorageId = iEntryArray[aIndex].PreAllocatedStorageId();
 	if (preAllocatedStorageId == KErrNotFound)
 		{
@@ -1205,7 +1195,7 @@
 void CPreallocatedFile::MatchEntryToExistingMessage(const TReassemblyEntry& aEntry,
 													TInt& aIndex)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_MATCHENTRYTOEXISTINGMESSAGE_1, "CPreallocatedFile::MatchEntryToExistingMessage()");
+	LOGSMSPROT1("CPreallocatedFile::MatchEntryToExistingMessage()");
 
 	aIndex = KErrNotFound;
 
@@ -1232,7 +1222,7 @@
 			}
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_MATCHENTRYTOEXISTINGMESSAGE_2, "CPreallocatedFile::MatchEntryToExistingMessage(): aIndex=%d", aIndex);
+	LOGSMSPROT2("CPreallocatedFile::MatchEntryToExistingMessage(): aIndex=%d", aIndex);
 	}
 
 /*
@@ -1245,7 +1235,7 @@
 */
 void CPreallocatedFile::UpdateLogServerIdL(TInt& aIndex, TLogId aLogServerId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_UPDATELOGSERVERIDL_1, "CPreallocatedFile::UpdateLogServerId");
+	LOGSMSPROT1("CPreallocatedFile::UpdateLogServerId");
 
 	TSmsPreAllocatedFileStoreReassemblyEntry entry;
 	entry = iEntryArray[aIndex];
@@ -1267,7 +1257,7 @@
 */
 void CPreallocatedFile::SetPassedToClientL(TInt aIndex, TBool aBool)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_SETPASSEDTOCLIENTL_1, "CPreallocatedFile::SetPassedToClientL(): aIndex=%d", aIndex);
+	LOGSMSPROT2("CPreallocatedFile::SetPassedToClientL(): aIndex=%d", aIndex);
 
 	TSmsPreAllocatedFileStoreReassemblyEntry entry;
 	entry = iEntryArray[aIndex];
@@ -1288,7 +1278,7 @@
 */
 void CPreallocatedFile::AddEntryL(TSmsPreAllocatedFileStoreReassemblyEntry& aEntry)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_ADDENTRYL_1, "CPreallocatedFile::AddEntryL");
+	LOGSMSPROT1("CPreallocatedFile::AddEntryL");
 	iEntryArray.AppendL(aEntry);
 	iEntryArray[iEntryArray.Count()-1].SetIsAdded(ETrue);
 	}
@@ -1303,7 +1293,7 @@
 */
 void CPreallocatedFile::ChangeEntryL(TInt aIndex, const TSmsPreAllocatedFileStoreReassemblyEntry& aNewEntry)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_CHANGEENTRYL_1, "CPreallocatedFile::ChangeEntryL(): aIndex=%d", aIndex);
+	LOGSMSPROT2("CPreallocatedFile::ChangeEntryL(): aIndex=%d", aIndex);
 	iEntryArray[aIndex].SetIsDeleted(ETrue);
 	iEntryArray.InsertL(aIndex,aNewEntry);
 	iEntryArray[aIndex].SetIsAdded(ETrue);
@@ -1318,7 +1308,7 @@
 */
 void CPreallocatedFile::DeleteEntryL(TInt aIndex)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_DELETEENTRYL_1, "CPreallocatedFile::DeleteEntryL(): aIndex=%d", aIndex);
+	LOGSMSPROT2("CPreallocatedFile::DeleteEntryL(): aIndex=%d", aIndex);
 	if (iEntryArray[aIndex].PreAllocatedStorageId() != KErrNotFound)
 		{
 		ClearEntryL(iEntryArray[aIndex].PreAllocatedStorageId(), iEntryArray[aIndex].Count());
@@ -1348,7 +1338,7 @@
 */
 void CPreallocatedFile::ClearEntryL(TInt aStorageId, TInt aNumberOfPDUs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_CLEARENTRYL_1, "CPreallocatedFile::ClearEntryL");
+	LOGSMSPROT1("CPreallocatedFile::ClearEntryL");
 
 	//Read storage id.
 	TInt storageId;
@@ -1496,7 +1486,7 @@
 */
 void CPreallocatedFile::ExternalizeEntry(TInt aContainerId, const TGsmSmsSlotEntry& aSmsSlot, TInt aIndex, const TGsmSms& aGsmSms)
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_EXTERNALIZEENTRY_1, "CPreallocatedFile::ExternalizeEntry() 1: aContainerId=%d, aIndex=%d", aContainerId, aIndex);
+	LOGSMSPROT3("CPreallocatedFile::ExternalizeEntry() 1: aContainerId=%d, aIndex=%d", aContainerId, aIndex);
 
 	// Container id must not be greater than max pdu segment.
 	TInt pos = iBeginOfDataSection + ((aContainerId - 1) * (KSizeOfGsmSmsSlotEntry + sizeof(TInt) + KSizeOfSmsGsmPDU));
@@ -1527,7 +1517,7 @@
 */
 void CPreallocatedFile::ExternalizeEntry(TInt aContainerId, TInt aIndex, const TGsmSms& aGsmSms)
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_EXTERNALIZEENTRY1_1, "CPreallocatedFile::ExternalizeEntry() 2: aContainerId=%d, aIndex=%d", aContainerId, aIndex);
+	LOGSMSPROT3("CPreallocatedFile::ExternalizeEntry() 2: aContainerId=%d, aIndex=%d", aContainerId, aIndex);
 
 	// Container id must not be greater than max pdu segment.
 	TInt pos = iBeginOfDataSection + ((aContainerId - 1) * (KSizeOfGsmSmsSlotEntry + sizeof(TInt) + KSizeOfSmsGsmPDU));
@@ -1556,7 +1546,7 @@
 */
 void CPreallocatedFile::InternalizeEntryL(const TInt aIndex, CSmsMessage& aSmsMessage, CArrayFix<TInt>& aIndexArray, CArrayFix<TGsmSms>& aSmsArray)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_INTERNALIZEENTRYL_1, "CPreallocatedFile::InternalizeEntryL");
+	LOGSMSPROT1("CPreallocatedFile::InternalizeEntryL");
 	TSmsPreAllocatedFileStoreReassemblyEntry&  entry = iEntryArray[aIndex];
 	//Set other properties of CSmsMessage
 	aSmsMessage.SetStorage(entry.Storage());
@@ -1568,7 +1558,7 @@
 	aSmsMessage.SetForwardToClient(entry.ForwardToClient());
 	aSmsMessage.SetToFromAddressL(entry.Description2());
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_INTERNALIZEENTRYL_2, "CPreallocatedFile::InternalizeEntryL Start [sid=%d]", entry.PreAllocatedStorageId());
+	LOGSMSPROT2("CPreallocatedFile::InternalizeEntryL Start [sid=%d]", entry.PreAllocatedStorageId());
 	if (entry.PreAllocatedStorageId()==KErrNotFound)
 		{
 		return;
@@ -1628,7 +1618,7 @@
 			}
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_INTERNALIZEENTRYL_3, "CPreallocatedFile::InternalizeEntryL End [noOfPDUsRead=%d]", noOfPDUsRead);
+	LOGSMSPROT2("CPreallocatedFile::InternalizeEntryL End [noOfPDUsRead=%d]", noOfPDUsRead);
 	}
 
 /*
@@ -1646,14 +1636,14 @@
 */
 void CPreallocatedFile::RemovePDUsL(TInt aIndex, TInt aStartPos, TInt aEndPos)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_REMOVEPDUSL_1, "CPreallocatedFile::RemovePDUsL");
+	LOGSMSPROT1("CPreallocatedFile::RemovePDUsL");
 
 	if ((aStartPos < 1) || (aEndPos > 256) || (aStartPos > aEndPos))
 		{
 		User::Leave(KErrArgument);
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_REMOVEPDUSL_2, "CPreallocatedFile::RemovePDUsL Start [sid=%d]", iEntryArray[aIndex].PreAllocatedStorageId());
+	LOGSMSPROT2("CPreallocatedFile::RemovePDUsL Start [sid=%d]", iEntryArray[aIndex].PreAllocatedStorageId());
 	if (iEntryArray[aIndex].PreAllocatedStorageId()==KErrNotFound)
 		{
 		return;
@@ -1891,11 +1881,11 @@
  */
 void CPreallocatedFile::BeginTransactionL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_BEGINTRANSACTIONL_1, "CPreallocatedFile::BeginTransactionL [this=0x%08X iInTransaction=%d]", (TUint)this, iInTransaction);
+	LOGSMSPROT3("CPreallocatedFile::BeginTransactionL [this=0x%08X iInTransaction=%d]", this, iInTransaction);
 
 	if (iInTransaction)
 		{
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_BEGINTRANSACTIONL_2, "WARNING CPreallocatedFile::BeginTransactionL leaving with KErrAccessDenied");
+	    LOGGSMU1("WARNING CPreallocatedFile::BeginTransactionL leaving with KErrAccessDenied");
 		User::Leave(KErrAccessDenied);
 		}
 
@@ -1907,7 +1897,8 @@
  */
 void CPreallocatedFile::CommitTransactionL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_COMMITTRANSACTIONL_1, "CPreallocatedFile::CommitTransactionL(): this=0x%08X iInTransaction=%d",(TUint)this, iInTransaction);
+	LOGSMSPROT3("CPreallocatedFile::CommitTransactionL(): this=0x%08X iInTransaction=%d",
+				this, iInTransaction);
 
 	ExternalizeEntryArray();
 	//Commit
@@ -1922,7 +1913,8 @@
 */
 void CPreallocatedFile::Revert()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_REVERT_1, "CPreallocatedFile::Revert(): this=0x%08X, iInTransaction=%d",(TUint)this, iInTransaction);
+	LOGSMSPROT3("CPreallocatedFile::Revert(): this=0x%08X, iInTransaction=%d",
+    		 this, iInTransaction);
 
 	ReinstateEntries();
 	ExternalizeEntryArray();
@@ -1936,7 +1928,7 @@
  */
 void CPreallocatedFile::RemoveDeletedEntries()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_REMOVEDELETEDENTRIES_1, "CPreallocatedFile::RemoveDeletedEntries()");
+	LOGSMSPROT1("CPreallocatedFile::RemoveDeletedEntries()");
 
 	TInt count=iEntryArray.Count();
 	while (count--)
@@ -1960,7 +1952,7 @@
  */
 void CPreallocatedFile::ReinstateDeletedEntries()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_REINSTATEDELETEDENTRIES_1, "CPreallocatedFile::ReinstateDeletedEntries()");
+	LOGSMSPROT1("CPreallocatedFile::ReinstateDeletedEntries()");
 
 	TInt count=iEntryArray.Count();
 	while (count--)
@@ -1986,7 +1978,7 @@
  */
 void CPreallocatedFile::ReinstateEntries()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_REINSTATEENTRIES_1, "CPreallocatedFile::ReinstateEntries()");
+	LOGSMSPROT1("CPreallocatedFile::ReinstateEntries()");
 
 	TInt containerId;
 	TInt storageId;
@@ -2022,7 +2014,7 @@
 */
 TInt CPreallocatedFile::GetOldestMessageEntryIndex()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_GETOLDESTMESSAGEENTRYINDEX_1, "CPreallocatedFile::GetOldestMessageEntryIndex()");
+	LOGSMSPROT1("CPreallocatedFile::GetOldestMessageEntryIndex()");
 
 	TInt index = KErrNotFound;
 	TTime time;
@@ -2052,7 +2044,7 @@
 */
 CGuardTimer* CGuardTimer::NewL(CClass0SmsReassemblyStore& aClass0ReassemblyStore, TInt aGuardTimeout)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGUARDTIMER_NEWL_1, "CGuardTimer::NewL()");
+	LOGSMSPROT1("CGuardTimer::NewL()");
 
 	CGuardTimer* timer = new(ELeave) CGuardTimer(aClass0ReassemblyStore, aGuardTimeout);
 	CleanupStack::PushL(timer);
@@ -2085,7 +2077,7 @@
  */
 void CGuardTimer::EnableGuardTimer()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGUARDTIMER_ENABLEGUARDTIMER_1, "CGuardTimer::EnableGuardTimer()");
+	LOGSMSPROT1("CGuardTimer::EnableGuardTimer()");
 	if (!IsActive())
 		{
 		TTime nextTimeOut;
@@ -2107,7 +2099,7 @@
  */
 void CGuardTimer::RunL()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGUARDTIMER_RUNL_1, "CGuardTimer::RunL [iStatus=%d]", iStatus.Int());
+	LOGSMSPROT2("CGuardTimer::RunL [iStatus=%d]", iStatus.Int());
 	iClass0ReassemblyStore.ProcessTimeoutMessageL();
 	EnableGuardTimer();
 	} // CGuardTimer::RunL
@@ -2128,7 +2120,7 @@
 */
 CClass0SmsReassemblyStore* CClass0SmsReassemblyStore::NewL(RFs& aFs, MSmsComm& aSmsComm)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_NEWL_1, "CClass0SmsReassemblyStore::NewL()");
+	LOGSMSPROT1("CClass0SmsReassemblyStore::NewL()");
 
 	CClass0SmsReassemblyStore*  self = new (ELeave) CClass0SmsReassemblyStore(aFs, aSmsComm);
 	CleanupStack::PushL(self);
@@ -2196,7 +2188,7 @@
 */
 void CClass0SmsReassemblyStore::ReadConfigurableClass0SmsSettingsL(TInt& aMaxClass0Msg, TInt& aMaxPDUSeg, TInt& aGuardTimeOut)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_1, "CClass0SmsReassemblyStore::ReadConfigurableClass0SmsSettingsL()");
+	LOGSMSPROT1("CClass0SmsReassemblyStore::ReadConfigurableClass0SmsSettingsL()");
 
 	aMaxClass0Msg = KMaxNumberOfClass0MessagesInReassemblyStore;
 	aMaxPDUSeg    = KNumberOfPDUSegmentsStoredInOODCondition;
@@ -2206,7 +2198,7 @@
 	TRAPD(ret, ini=CESockIniData::NewL(_L("smswap.sms.esk")));
 	if(ret!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_2, "CESockIniData::NewL() returned=%d", ret);
+		LOGSMSPROT2("CESockIniData::NewL() returned=%d", ret);
 		}
 	else
 		{
@@ -2217,7 +2209,7 @@
 			{
 			if (var > 0)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_3, "MaxClass0Messages [%d]", var);
+				LOGSMSPROT2("MaxClass0Messages [%d]", var);
 				aMaxClass0Msg = var;
 				}
 			}
@@ -2226,7 +2218,7 @@
 			{
 			if (var > 0)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_4, "MaxClass0Messages [%d]", var);
+				LOGSMSPROT2("MaxClass0Messages [%d]", var);
 				aMaxPDUSeg = var;
 				}
 			}
@@ -2235,7 +2227,7 @@
 			{
 			if (var > 0)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_5, "MaxClass0Messages [%d]", var);
+				LOGSMSPROT2("MaxClass0Messages [%d]", var);
 				aGuardTimeOut = var;
 				}
 			}
@@ -2243,7 +2235,8 @@
 		CleanupStack::PopAndDestroy(ini);
 		}
 
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_6, "CClass0SmsReassemblyStore::ReadConfigurableClass0SmsSettingsL(): aMaxClass0Msg=%d, aMaxPDUSeg=%d, aGuardTimeOut=%d",aMaxClass0Msg, aMaxPDUSeg, aGuardTimeOut);
+	LOGSMSPROT4("CClass0SmsReassemblyStore::ReadConfigurableClass0SmsSettingsL(): aMaxClass0Msg=%d, aMaxPDUSeg=%d, aGuardTimeOut=%d",
+			    aMaxClass0Msg, aMaxPDUSeg, aGuardTimeOut);
 	}
 
 /**
@@ -2254,7 +2247,7 @@
 */
 void CClass0SmsReassemblyStore::OpenStoreL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_OPENSTOREL_1, "CClass0SmsReassemblyStore::OpenStoreL()");
+	LOGSMSPROT1("CClass0SmsReassemblyStore::OpenStoreL()");
 	TFileName pathName;
 	CReassemblyStoreUtility::PrivatePath(iFs, pathName);
 	//Create the directory if it is not created.
@@ -2281,7 +2274,7 @@
 */
 void CClass0SmsReassemblyStore::Close()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_CLOSE_1, "CClass0SmsReassemblyStore::CloseStore()");
+	LOGSMSPROT1("CClass0SmsReassemblyStore::CloseStore()");
 	iGuardTimer->DisableGuardTimer();
 	iEntryArray.Reset();
 	iPreallocatedFile->Close();
@@ -2297,7 +2290,7 @@
 */
 void CClass0SmsReassemblyStore::PopulateEntryArrayL(CArrayFix<TReassemblyEntry>& aEntryArray)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_POPULATEENTRYARRAYL_1, "CClass0SmsReassemblyStore::PopulateEntryArrayL()");
+	LOGSMSPROT1("CClass0SmsReassemblyStore::PopulateEntryArrayL()");
 	aEntryArray.Reset();
 	//Populate Entries from Pre-allocated file.
 	for (TInt count = 0; count < iPreallocatedFile->Entries().Count(); count++)
@@ -2362,7 +2355,7 @@
 		}
 	else if (ret == KErrDiskFull)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_POPULATEENTRYARRAYL_2, "CleanReassemblyEntries() returns KErrDiskFull");
+		LOGSMSPROT1("CleanReassemblyEntries() returns KErrDiskFull");
 		/*
 		In this case permanent store file contains incorrect information.
 		For example forwarded message might be still stored in this store.
@@ -2430,7 +2423,7 @@
 */
 void CClass0SmsReassemblyStore::SetDiskSpaceState(TSmsDiskSpaceMonitorStatus aDiskSpaceStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_SETDISKSPACESTATE_1, "CClass0SmsReassemblyStore::SetDiskSpaceState()");
+	LOGSMSPROT1("CClass0SmsReassemblyStore::SetDiskSpaceState()");
 	iDiskSpaceStatus = aDiskSpaceStatus;
 	}
 
@@ -2448,7 +2441,7 @@
 */
 void CClass0SmsReassemblyStore::AddNewMessageL(CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_ADDNEWMESSAGEL_1, "CClass0SmsReassemblyStore::AddNewMessageL");
+	LOGSMSPROT1("CClass0SmsReassemblyStore::AddNewMessageL");
 
 	// Add entry in permanent store file
 	TInt index;
@@ -2506,7 +2499,7 @@
 */
 void CClass0SmsReassemblyStore::UpdateExistingMessageL(CSmsMessage& aSmsMessage, const TGsmSms& aGsmSms, TBool& aDuplicateMsgRef, TBool& aDuplicateSlot)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1, "CClass0SmsReassemblyStore::UpdateExistingMessageL()");
+	LOGSMSPROT1("CClass0SmsReassemblyStore::UpdateExistingMessageL()");
 
 	aDuplicateMsgRef = EFalse;
 	aDuplicateSlot   = EFalse;
@@ -2566,7 +2559,7 @@
 
 			if (slot.iIndex == newSlot.iIndex  && slot.iStore == newSlot.iStore)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_2, "CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate enumerated PDU.");
+				LOGSMSPROT1("CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate enumerated PDU.");
 
 				// It is a duplicate that was already stored on the SIM...
 				aDuplicateSlot = ETrue;
@@ -2581,7 +2574,7 @@
 		{
 		if (indexArray->At(index) == concatPDUIndex)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_3, "CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate concatenated PDU.");
+			LOGSMSPROT1("CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate concatenated PDU.");
 
 			// The PDU is already stored in the reassembly store.
 			aDuplicateMsgRef = ETrue;
@@ -3068,7 +3061,7 @@
 */
 void CClass0SmsReassemblyStore::ProcessTimeoutMessageL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_PROCESSTIMEOUTMESSAGEL_1, "CClass0SmsReassemblyStore::ProcessTimeoutMessageL()");
+	LOGSMSPROT1("CClass0SmsReassemblyStore::ProcessTimeoutMessageL()");
 	TBool passedToClient=ETrue;
 	TInt count=iEntryArray.Count();
 
@@ -3192,12 +3185,12 @@
 */
 void CClass0SmsReassemblyStore::SetIncompleteMessageForwardedToClientL(const CSmsMessage& aSmsMessage)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_1, "CClass0SmsReassemblyStore::SetIncompleteMessageForwardedToClientL()");
+	LOGSMSPROT1("CClass0SmsReassemblyStore::SetIncompleteMessageForwardedToClientL()");
 	TInt index = KErrNotFound;
 
 	if (aSmsMessage.IsComplete())
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_2, "This function must be called when message is incomplete");
+		LOGSMSPROT1("This function must be called when message is incomplete");
 		User::Leave(KErrArgument);
 		}
 
@@ -3253,7 +3246,7 @@
 */
 TInt CClass0SmsReassemblyStore::CleanReassemblyEntries()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_1, "CleanReassemblyEntries");
+	LOGSMSPROT1("CleanReassemblyEntries");
 	const CArrayFix<TSmsPreAllocatedFileStoreReassemblyEntry>& preAllocatedFileEntryArray = iPreallocatedFile->Entries();
 	TInt ret=KErrNone;
 	TRAP(ret,	BeginTransactionLC();
@@ -3262,7 +3255,7 @@
 
 	if (ret == KErrDiskFull)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_2, "CleanupEntriesL returns KErrDiskFull");
+		LOGSMSPROT1("CleanupEntriesL returns KErrDiskFull");
 		/*
 		Get access to reserve memory, call again to clean the entries with compact.
 		Compact needs to be called at this instance because permanent store
@@ -3274,7 +3267,7 @@
 		TRAP(ret,	BeginTransactionLC();
 					iPermanentFileStore->CleanupEntriesWithCompactL(preAllocatedFileEntryArray);
 					CommitTransactionL(););
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_3, "CleanupEntriesWithCompactL returns %d", ret);
+		LOGSMSPROT2("CleanupEntriesWithCompactL returns %d", ret);
 		iFs.ReleaseReserveAccess(KStoreDrive);
 		}
 	return ret;
@@ -3294,7 +3287,7 @@
 */
 void CClass0SmsReassemblyStore::GetSmsEntriesL(const TReassemblyEntry& aEntry, CSmsMessage& aSmsMessage, CArrayFix<TInt>& aIndexArray, CArrayFix<TGsmSms>& aSmsArray)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_1, "CClass0SmsReassemblyStore::GetSmsEntriesL()");
+	LOGSMSPROT1("CClass0SmsReassemblyStore::GetSmsEntriesL()");
 	TInt permanentStoreIndex=KErrNotFound;
 	iPermanentFileStore->MatchEntryToExistingMessage(aEntry, permanentStoreIndex);
 	if (permanentStoreIndex!=KErrNotFound)
@@ -3303,7 +3296,7 @@
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_2, "No PDUs in Permanent store file");
+		LOGSMSPROT1("No PDUs in Permanent store file");
 		}
 
 	TInt preAllocatedFileIndex=KErrNotFound;
@@ -3337,7 +3330,7 @@
 			{
 			//In this scenario a CSmsMessage object has to be created from the existing PDU in
 			//pre-allocated file & then serialized into aSmsMessage.
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_3, "Number of PDUs in Pre-allocated file %d", aIndexArray.Count());
+			LOGSMSPROT2("Number of PDUs in Pre-allocated file %d", aIndexArray.Count());
 			if (aIndexArray.Count() > 0)
 				{
 				CSmsBuffer* smsBuffer = CSmsBuffer::NewL();
@@ -3510,7 +3503,7 @@
  */
 void CClass0StoreCloseObject(TAny* aObj)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0STORECLOSEOBJECT_1, "WARNING! Hey, CClass0StoreCloseObject called by Untrapper! [0x%08x]", (TUint)aObj);
+	LOGGSMU2("WARNING! Hey, CClass0StoreCloseObject called by Untrapper! [0x%08x]", aObj);
 	((CClass0SmsReassemblyStore*)aObj)->Revert();
 	}
 
@@ -3523,11 +3516,11 @@
  */
 void CClass0SmsReassemblyStore::BeginTransactionLC()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_BEGINTRANSACTIONLC_1, "CClass0SmsReassemblyStore::BeginTransactionLC [this=0x%08X iInTransaction=%d]", (TUint)this, iInTransaction);
+	LOGSMSPROT3("CClass0SmsReassemblyStore::BeginTransactionLC [this=0x%08X iInTransaction=%d]", this, iInTransaction);
 
 	if (iInTransaction)
 		{
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_BEGINTRANSACTIONLC_2, "WARNING CClass0SmsReassemblyStore::BeginTransactionLC leaving with KErrAccessDenied");
+	    LOGGSMU1("WARNING CClass0SmsReassemblyStore::BeginTransactionLC leaving with KErrAccessDenied");
 		User::Leave(KErrAccessDenied);
 		}
 
@@ -3543,7 +3536,8 @@
  */
 void CClass0SmsReassemblyStore::CommitTransactionL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_COMMITTRANSACTIONL_1, "CClass0SmsReassemblyStore::CommitTransactionL(): this=0x%08X iInTransaction=%d",(TUint)this, iInTransaction);
+	LOGSMSPROT3("CClass0SmsReassemblyStore::CommitTransactionL(): this=0x%08X iInTransaction=%d",
+				this, iInTransaction);
 
 	//Commit permanent store file
 	iPermanentFileStore->CommitTransactionL();
@@ -3558,7 +3552,8 @@
  */
 void CClass0SmsReassemblyStore::Revert()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_REVERT_1, "CClass0SmsReassemblyStore::Revert(): this=0x%08X, iInTransaction=%d",(TUint)this, iInTransaction);
+	LOGSMSPROT3("CClass0SmsReassemblyStore::Revert(): this=0x%08X, iInTransaction=%d",
+    		 this, iInTransaction);
 
 	iPreallocatedFile->Revert();
 	iPermanentFileStore->Revert();

--- a/smsprotocols/smsstack/smsprot/Src/smspdel.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspdel.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspdelTraces.h"
-#endif
-
 #include "smspdel.h"
 #include "smspmain.h"
 
@@ -40,7 +34,7 @@
 								   RMobileSmsMessaging& aSmsMessaging
 								   )
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_NEWL_1, "CSmsPDUDelete::NewL()");
+	LOGSMSPROT1("CSmsPDUDelete::NewL()");
 
 	CSmsPDUDelete* smsPduDelete =
 		new(ELeave) CSmsPDUDelete(aSmsSettings,aSmsMessaging);
@@ -74,7 +68,7 @@
  */
 void CSmsPDUDelete::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_CONSTRUCTL_1, "CSmsPDUDelete::ConstructL()");
+	LOGSMSPROT1("CSmsPDUDelete::ConstructL()");
 
 	ConstructTimeoutL();
 	} // CSmsPDUDelete::ConstructL
@@ -89,7 +83,7 @@
  */
 void CSmsPDUDelete::Start(CArrayFix<TGsmSmsSlotEntry>& aLocationArray, TRequestStatus& aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_START_1, "CSmsPDUDelete::Start()");
+	LOGSMSPROT1("CSmsPDUDelete::Start()");
 
 	__ASSERT_DEBUG(iState==ESmsPDUDeleteIdle,SmspPanic(KSmspPanicUnexpectedState));
 
@@ -108,7 +102,7 @@
  */
 void CSmsPDUDelete::DoRunL()
 	{
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_DORUNL_1, "CSmsPDUDelete::RunL [iStatus=%d]", iStatus.Int());
+    LOGSMSPROT2("CSmsPDUDelete::RunL [iStatus=%d]", iStatus.Int());
 
 	switch (iState)
 		{
@@ -179,7 +173,7 @@
  */
 void CSmsPDUDelete::OpenStore()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_OPENSTORE_1, "CSmsPDUDelete::OpenStore()");
+	LOGSMSPROT1("CSmsPDUDelete::OpenStore()");
 
 	//
 	// Open the SMS Store for the first PDU...
@@ -218,7 +212,7 @@
  */
 void CSmsPDUDelete::DeletePDU()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_DELETEPDU_1, "CSmsPDUDelete::DeletePDU()");
+	LOGSMSPROT1("CSmsPDUDelete::DeletePDU()");
 
 	//
 	// Delete the first entry in the list...
@@ -239,7 +233,7 @@
  */
 void CSmsPDUDelete::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_DOCANCEL_1, "CSmsPDUDelete::DoCancel()");
+	LOGSMSPROT1("CSmsPDUDelete::DoCancel()");
 
 	TimedSetActiveCancel();
 
@@ -285,7 +279,7 @@
  */
 void CSmsPDUDelete::Complete(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_COMPLETE_1, "CSmsPDUDelete::Complete()");
+	LOGSMSPROT1("CSmsPDUDelete::Complete()");
 
 	//
 	// Only close the SMS Storage if the object is not active (and it may be

--- a/smsprotocols/smsstack/smsprot/Src/smspenum.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspenum.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -17,12 +17,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspenumTraces.h"
-#endif
-
 #include "smspenum.h"
 #include "smspproc.h"
 #include "smsuset.h"
@@ -58,7 +52,7 @@
 								   TInt aPriority,
 								   CSmsMonitorDiskSpace& aSmsMonitorDiskSpace)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_NEWL_1, "CSmsStoreRead::NewL()");
+	LOGSMSPROT1("CSmsStoreRead::NewL()");
 
 	CSmsStoreRead* smsStoreRead = new ( ELeave ) CSmsStoreRead(aSmsComm,
 															   aSmsSettings,
@@ -111,7 +105,7 @@
  */
 void CSmsStoreRead::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_CONSTRUCTL_1, "CSmsStoreRead::ConstructL()");
+	LOGSMSPROT1("CSmsStoreRead::ConstructL()");
 
 	ConstructTimeoutL();
 	ReadConfigurableSmsSettingsL();
@@ -160,13 +154,13 @@
  */
 void CSmsStoreRead::ReadConfigurableSmsSettingsL()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_1, "CSmsStoreRead::ReadConfigurableSmsSettingsL()");
+    LOGSMSPROT1("CSmsStoreRead::ReadConfigurableSmsSettingsL()");
 
     CESockIniData*  ini = NULL;
     TRAPD(ret, ini=CESockIniData::NewL(_L("smswap.sms.esk")));
     if(ret!=KErrNone)
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_2, "CSmsStoreRead::ReadConfigurableSmsSettingsL(): ret=%d", ret);
+        LOGSMSPROT2("CSmsStoreRead::ReadConfigurableSmsSettingsL(): ret=%d", ret);
         User::Leave(ret);
         }
 
@@ -183,7 +177,8 @@
         iConfigAutomaticDeletionForClass2 = status;
         }
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_3, "CSmsStoreRead::ReadConfigurableSmsSettingsL(): iConfigAutomaticDeletionForClass2=%d",iConfigAutomaticDeletionForClass2);
+	LOGSMSPROT2("CSmsStoreRead::ReadConfigurableSmsSettingsL(): iConfigAutomaticDeletionForClass2=%d",
+				iConfigAutomaticDeletionForClass2);
 
     if (ini->FindVar(_L("Release6Configurability"),
     				 _L("DiscardType0_Class2Message"), status))
@@ -191,7 +186,8 @@
         iConfigDiscardingType0Class2 = status;
         }
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_4, "CSmsStoreRead::ReadConfigurableSmsSettingsL(): iConfigDiscardingType0Class2=%d",iConfigDiscardingType0Class2);
+	LOGSMSPROT2("CSmsStoreRead::ReadConfigurableSmsSettingsL(): iConfigDiscardingType0Class2=%d",
+				iConfigDiscardingType0Class2);
 
     if (ini->FindVar(_L("Release6Configurability"),
     				 _L("DiscardType0_Class0Message"), status))
@@ -199,7 +195,8 @@
         iConfigDiscardingType0Class0 = status;
         }
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_5, "CSmsStoreRead::ReadConfigurableSmsSettingsL(): iConfigDiscardingType0Class0=%d",iConfigDiscardingType0Class0);
+	LOGSMSPROT2("CSmsStoreRead::ReadConfigurableSmsSettingsL(): iConfigDiscardingType0Class0=%d",
+				iConfigDiscardingType0Class0);
 
     CleanupStack::PopAndDestroy(ini);
     } // CSmsStoreRead::ReadConfigurableSmsSettingsL
@@ -214,7 +211,7 @@
  */
 void CSmsStoreRead::Start( TRequestStatus& aStatus, TInt aStoreIndex )
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_START_1, "CSmsStoreRead::Start()");
+	LOGSMSPROT1("CSmsStoreRead::Start()");
 
 	iState = ESmsStoreReadGettingStoreInfo;
 	// Initialises current slot index
@@ -253,7 +250,7 @@
  */
 void CSmsStoreRead::DoRunL()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_DORUNL_1, "CSmsStoreRead::DoRunL [iStatus=%d]", iStatus.Int() );
+	LOGSMSPROT2("CSmsStoreRead::DoRunL [iStatus=%d]", iStatus.Int() );
 
 	TInt status = iStatus.Int();
 
@@ -318,9 +315,7 @@
 				{
 				// Add current message to the list
 				iMobilePhoneGsmSmsList->AddEntryL( iSmsEntry );
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
-                LogSmsIfSmsEntry(_L8("SMSENTRY: "), iSmsEntry);
-#endif
+				LOGSMSIFSMSENTRY(_L8("SMSENTRY: "), iSmsEntry);
 				iStoreInfo.iUsedEntries--;
 				}
 			// Reads next single message from the store
@@ -366,7 +361,7 @@
  */
 void CSmsStoreRead::ReadNextSlotL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_READNEXTSLOTL_1, "CSmsStoreRead::ReadNextSlotL()");
+	LOGSMSPROT1("CSmsStoreRead::ReadNextSlotL()");
 
 	//Increments current slot index
 	iCurrentSlotIndex++;
@@ -392,7 +387,7 @@
  */
 void CSmsStoreRead::ProcessPduL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_PROCESSPDUL_1, "CSmsStoreRead::ProcessPduL()");
+	LOGSMSPROT1("CSmsStoreRead::ProcessPduL()");
 
 	// Increments slot index
 	for ( iCurrentSlotIndex = 0; iCurrentSlotIndex < iMobilePhoneGsmSmsList->Enumerate(); iCurrentSlotIndex++ )
@@ -421,7 +416,7 @@
         // but in this case none of the messages have been passed
         // to the client, this has been fixed here
 		TRAPD(ret, pduProcessor->DecodeAndProcessPDUL(iSlot, ETrue));
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_PROCESSPDUL_2, "CSmsStoreRead::ProcessPduL(): DecodeAndProcessPDUL() returned %d", ret);
+		LOGSMSPROT2("CSmsStoreRead::ProcessPduL(): DecodeAndProcessPDUL() returned %d", ret);
 
 		if (ret == KErrNone)
 			{
@@ -467,7 +462,7 @@
  */
 void CSmsStoreRead::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_DOCANCEL_1, "CSmsStoreRead::DoCancel()");
+	LOGSMSPROT1("CSmsStoreRead::DoCancel()");
 
 	TimedSetActiveCancel();
 
@@ -527,7 +522,7 @@
  */
 void CSmsStoreRead::Complete(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_COMPLETE_1, "CSmsStoreRead::Complete()");
+	LOGSMSPROT1("CSmsStoreRead::Complete()");
 
 	__ASSERT_DEBUG(iState != ESmsStoreReadIdle, SmspPanic(KSmspPanicUnexpectedState));
 
@@ -588,7 +583,7 @@
 												  TInt aPriority,
 												  CSmsMonitorDiskSpace& aSmsMonitorDiskSpace )
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEENUMERATION_NEWL_1, "CSmsPhoneEnumeration::NewL()");
+	LOGSMSPROT1("CSmsPhoneEnumeration::NewL()");
 
 	CSmsPhoneEnumeration* smsPhoneEnumeration =
 		new ( ELeave ) CSmsPhoneEnumeration( aSmsComm,
@@ -643,7 +638,7 @@
  */
 void CSmsPhoneEnumeration::Start()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEENUMERATION_START_1, "CSmsPhoneEnumeration::Start()");
+	LOGSMSPROT1("CSmsPhoneEnumeration::Start()");
 
 	iState = ESmsPhoneEnumerationInitializing;
 	iCurrentStore = 0;
@@ -673,7 +668,7 @@
  */
 void CSmsPhoneEnumeration::DoRunL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEENUMERATION_DORUNL_1, "CSmsPhoneEnumeration::RunL [iStatus=%d], [iState=%d]", iStatus.Int(), iState );
+	LOGSMSPROT3("CSmsPhoneEnumeration::RunL [iStatus=%d], [iState=%d]", iStatus.Int(), iState );
 
     switch (iState)
 		{
@@ -721,7 +716,7 @@
 
 void CSmsPhoneEnumeration::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEENUMERATION_DOCANCEL_1, "CSmsPhoneEnumeration::DoCancel()");
+	LOGSMSPROT1("CSmsPhoneEnumeration::DoCancel()");
 
 	TimedSetActiveCancel();
 
@@ -767,7 +762,7 @@
  */
 void CSmsPhoneEnumeration::ConstructL(CFacadeSmsReassemblyStore& aReassemblyStore,CSmsSegmentationStore& aSegmentationStore,CSmsMonitorDiskSpace& aSmsMonitorDiskSpace)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEENUMERATION_CONSTRUCTL_1, "CSmsPhoneEnumeration::ConstructL()");
+	LOGSMSPROT1("CSmsPhoneEnumeration::ConstructL()");
 
 	iSmsStoreRead = CSmsStoreRead::NewL(iSmsComm, iSmsSettings, iSmsMessaging, aReassemblyStore, aSegmentationStore, Priority(), aSmsMonitorDiskSpace);
 	ConstructTimeoutL();
@@ -776,7 +771,7 @@
 
 void CSmsPhoneEnumeration::Complete(TInt aStatus)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEENUMERATION_COMPLETE_1, "CSmsPhoneEnumeration::Complete [aStatus=%d]", aStatus);
+	LOGSMSPROT2("CSmsPhoneEnumeration::Complete [aStatus=%d]", aStatus);
 
 	//
 	// Call the base function to perform the actual complete...
@@ -808,7 +803,7 @@
 										  CSmsSegmentationStore& aSegmentationStore
 										  )
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_NEWL_1, "CSmsMessageWrite::NewL()");
+	LOGSMSPROT1("CSmsMessageWrite::NewL()");
 
 	CSmsMessageWrite* smsMessageWrite = new (ELeave) CSmsMessageWrite(aSmsComm, aSmsSettings,
 																	  aGsmPhone,
@@ -825,7 +820,7 @@
  */
 CSmsMessageWrite::~CSmsMessageWrite()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_DTOR_1, "CSmsMessageWrite::~CSmsMessageWrite()");
+	LOGSMSPROT1("CSmsMessageWrite::~CSmsMessageWrite()");
 
 	Cancel();
 	iSmsStorage.Close();
@@ -844,7 +839,7 @@
 
 
 	iSmsMessage = aSmsMessage;
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_START_1, "CSmsMessageWrite::Start  Storage=[%d]   Type=[%d]", iSmsMessage->Storage(), iSmsMessage->Type());
+    LOGSMSPROT3("CSmsMessageWrite::Start  Storage=[%d]   Type=[%d]", iSmsMessage->Storage(), iSmsMessage->Type());
 	iCurrentStore = 0;
 	iStoreInfo.iName = KNullDesC;
 
@@ -915,7 +910,7 @@
 
 void CSmsMessageWrite::DoRunL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_DORUNL_1, "CSmsMessageWrite::DoRunL [iStatus=%d iState=%d]", iStatus.Int() , iState);
+	LOGSMSPROT3("CSmsMessageWrite::DoRunL [iStatus=%d iState=%d]", iStatus.Int() , iState);
 
 	switch (iState)
 		{
@@ -942,7 +937,7 @@
 					{
 					if ((iStoreInfo.iCaps & RMobilePhoneStore::KCapsWriteAccess) == 0)
 						{
-                        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_DORUNL_2, "CSmsMessageWrite::DoRunL left with KErrNotSuported [iState=%d]", iState);
+                        LOGSMSPROT2("CSmsMessageWrite::DoRunL left with KErrNotSuported [iState=%d]", iState);
 						User::Leave(KErrNotSupported);
 						}
 
@@ -960,7 +955,7 @@
 						}
 					else
 						{
-                        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_DORUNL_3, "CSmsMessageWrite::DoRunL left with KErrNotFound [iState=%d]", iState);
+                        LOGSMSPROT2("CSmsMessageWrite::DoRunL left with KErrNotFound [iState=%d]", iState);            
 						User::Leave(KErrNotFound);
 						}
 					}
@@ -1004,7 +999,7 @@
 
 void CSmsMessageWrite::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_DOCANCEL_1, "CSmsMessageWrite::DoCancel()");
+	LOGSMSPROT1("CSmsMessageWrite::DoCancel()");
 
 	TimedSetActiveCancel();
 
@@ -1063,14 +1058,14 @@
 	iSegmentationStore(aSegmentationStore),
 	iSmsArray(8)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_CTOR_1, "CSmsMessageWrite::CSmsMessageWrite()");
+	LOGSMSPROT1("CSmsMessageWrite::CSmsMessageWrite()");
 
 	} // CSmsMessageWrite::CSmsMessageWrite
 
 
 void CSmsMessageWrite::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_CONSTRUCTL_1, "CSmsMessageWrite::ConstructL()");
+	LOGSMSPROT1("CSmsMessageWrite::ConstructL()");
 
 	ConstructTimeoutL();
 	} // CSmsMessageWrite::ConstructL
@@ -1078,7 +1073,7 @@
 
 void CSmsMessageWrite::SegmentMessageL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_SEGMENTMESSAGEL_1, "CSmsMessageWrite::SegmentMessageL()");
+	LOGSMSPROT1("CSmsMessageWrite::SegmentMessageL()");
 
 	if (iStoreInfo.iTotalEntries == iStoreInfo.iUsedEntries)
 		{
@@ -1122,7 +1117,7 @@
 
 void CSmsMessageWrite::WriteNextSlot()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_WRITENEXTSLOT_1, "CSmsMessageWrite::WriteNextSlot()");
+	LOGSMSPROT1("CSmsMessageWrite::WriteNextSlot()");
 
 	if (iSmsArray.Count()>0)
 		{
@@ -1146,7 +1141,7 @@
 
 void CSmsMessageWrite::Complete(TInt aStatus)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_COMPLETE_1, "CSmsMessageWrite::Complete [aStatus=%d]", aStatus);
+	LOGSMSPROT2("CSmsMessageWrite::Complete [aStatus=%d]", aStatus);
 
 	__ASSERT_DEBUG(iState != ESmsMessageWriteIdle, SmspPanic(KSmspPanicUnexpectedState));

--- a/smsprotocols/smsstack/smsprot/Src/smspfacadestor.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspfacadestor.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspfacadestorTraces.h"
-#endif
-
 #include "gsmubuf.h"
 #include "smspfacadestor.h"
 
@@ -38,7 +32,7 @@
 */
 CFacadeSmsReassemblyStore* CFacadeSmsReassemblyStore::NewL(RFs& aFs, MSmsComm& aSmsComm)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_NEWL_1, "CFacadeSmsReassemblyStore::NewL()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::NewL()");
 
 	CFacadeSmsReassemblyStore*  self = new (ELeave) CFacadeSmsReassemblyStore(aFs, aSmsComm);
 	CleanupStack::PushL(self);
@@ -62,7 +56,7 @@
 */
 CFacadeSmsReassemblyStore::~CFacadeSmsReassemblyStore()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_DTOR_1, "~CFacadeSmsReassemblyStore()");
+	LOGSMSPROT1("~CFacadeSmsReassemblyStore()");
 	iReassemblyStore->Close();
 	delete iReassemblyStore;
 
@@ -88,7 +82,7 @@
 */
 void CFacadeSmsReassemblyStore::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_CONSTRUCTL_1, "CFacadeSmsReassemblyStore::ConstructL()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::ConstructL()");
 
 	iReassemblyStore = CSmsReassemblyStore::NewL(iFs);
 	/*
@@ -139,7 +133,7 @@
 */
 void CFacadeSmsReassemblyStore::OpenStoreL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_OPENSTOREL_1, "CFacadeSmsReassemblyStore::OpenStoreL()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::OpenStoreL()");
 	iReassemblyStore->OpenStoreL();
 	if (iClass0ReassemblyStore)
 		{
@@ -154,7 +148,7 @@
 */
 void CFacadeSmsReassemblyStore::Close()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_CLOSE_1, "CFacadeSmsReassemblyStore::Close()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::Close()");
 	// Close general Re-assembly store.
 	iReassemblyStore->Close();
 	// Close Class0 re-assembly store.
@@ -188,7 +182,7 @@
 */
 void CFacadeSmsReassemblyStore::InitL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_INITL_1, "CFacadeSmsReassemblyStore::InitL()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::InitL()");
 	// Initialize Non-class 0 Re-assembly store.
 	InitializeNonClass0StoreL();
 	// Initialize Class0 re-assembly store.
@@ -208,7 +202,7 @@
 */
 void CFacadeSmsReassemblyStore::PurgeL(const TTimeIntervalMinutes& aTimeIntervalMinutes,TBool aPurgeIncompleteOnly)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_PURGEL_1, "CFacadeSmsReassemblyStore::PurgeL()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::PurgeL()");
 	iReassemblyStore->PurgeL(aTimeIntervalMinutes, aPurgeIncompleteOnly);
 	if (iClass0ReassemblyStore)
 		{
@@ -225,7 +219,7 @@
 */
 TBool CFacadeSmsReassemblyStore::IsFull()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ISFULL_1, "CFacadeSmsReassemblyStore::IsFull()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::IsFull()");
 
 	//local variable for complete entries
 	TInt count( 0 );
@@ -252,7 +246,7 @@
 */
 void CFacadeSmsReassemblyStore::DeleteEnumeratedSIMEntries()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_DELETEENUMERATEDSIMENTRIES_1, "CFacadeSmsReassemblyStore::DeleteEnumeratedSIMEntries()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::DeleteEnumeratedSIMEntries()");
 	DeleteNonClass0EnumeratedSIMEntries();
 	if (iClass0ReassemblyStore)
 		{
@@ -273,7 +267,7 @@
 */
 TInt CFacadeSmsReassemblyStore::ExternalizeEnumeratedMessagesL(CSmsProvider& aProvider,TInt& aCount)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDMESSAGESL_1, "CFacadeSmsReassemblyStore::ExternalizeEnumeratedMessagesL()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::ExternalizeEnumeratedMessagesL()");
 	TInt numNewSegments(0);
 	numNewSegments = ExternalizeEnumeratedNonClass0SmsMessagesL(aProvider, aCount);
 	if (iClass0ReassemblyStore)
@@ -295,7 +289,7 @@
 */
 void CFacadeSmsReassemblyStore::ProcessCompleteSmsMessagesL(MSmsComm& aSmsComm, const CSmsMessage* aCurrentSmsMessage)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_PROCESSCOMPLETESMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ProcessCompleteSmsMessagesL");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::ProcessCompleteSmsMessagesL");
 
 	ProcessCompleteNonClass0SmsMessagesL(aSmsComm, aCurrentSmsMessage);
 	if (iClass0ReassemblyStore)
@@ -346,7 +340,8 @@
 */
 void CFacadeSmsReassemblyStore::AddSegmentToReassemblyStoreL(CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms, TInt& aIndex, TBool& aIsComplete, TBool aIsEnumeration, TInt& aCount, TInt& aTotal)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_1, "CFacadeSmsReassemblyStore::AddSegmentToReassemblyStoreL(): isComplete Message=%d",aSmsMessage.IsComplete());
+	LOGSMSPROT2("CFacadeSmsReassemblyStore::AddSegmentToReassemblyStoreL(): isComplete Message=%d",
+				aSmsMessage.IsComplete());
 
 	TBool toBeStoredInClass0ReassemblyStore = IsForClass0ReassemblyStore(aSmsMessage);
 
@@ -381,7 +376,7 @@
 */
 void CFacadeSmsReassemblyStore::ForwardCompleteClass0SmsMessagesL(MSmsComm& aSmsComm, const CSmsMessage& aSmsMessage,const TSmsAddr* aOriginalSmsAddr,const CSmsMessage* aOriginalSmsMessage,TDes& aDes)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_FORWARDCOMPLETECLASS0SMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ForwardCompleteClass0SmsMessagesL");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::ForwardCompleteClass0SmsMessagesL");
 	if (iClass0ReassemblyStore)
 		{
 		iClass0ReassemblyStore->ForwardCompleteClass0SmsMessagesL(aSmsComm, aSmsMessage, aOriginalSmsAddr, aOriginalSmsMessage, aDes);
@@ -400,7 +395,7 @@
 */
 void CFacadeSmsReassemblyStore::ProcessMessageIfExceedLimitationL(MSmsComm& aSmsComm)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_PROCESSMESSAGEIFEXCEEDLIMITATIONL_1, "CFacadeSmsReassemblyStore::ProcessMessageIfExceedLimitationL");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::ProcessMessageIfExceedLimitationL");
 	if (iClass0ReassemblyStore)
 		{
 		iClass0ReassemblyStore->ProcessMessageIfExceedLimitationL(aSmsComm);
@@ -420,7 +415,7 @@
 */
 void CFacadeSmsReassemblyStore::SetIncompleteMessageForwardedToClientL(const CSmsMessage& aSmsMessage)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_1, "CFacadeSmsReassemblyStore::SetIncompleteMessageForwardedToClientL()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::SetIncompleteMessageForwardedToClientL()");
 	if (iClass0ReassemblyStore)
 		{
 		iClass0ReassemblyStore->SetIncompleteMessageForwardedToClientL(aSmsMessage);
@@ -434,7 +429,7 @@
 */
 void CFacadeSmsReassemblyStore::SetDiskSpaceState(TSmsDiskSpaceMonitorStatus aDiskSpaceStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_SETDISKSPACESTATE_1, "CFacadeSmsReassemblyStore::SetDiskSpaceState()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::SetDiskSpaceState()");
 	if (iClass0ReassemblyStore)
 		{
 		iClass0ReassemblyStore->SetDiskSpaceState(aDiskSpaceStatus);
@@ -452,7 +447,7 @@
 */
 void CFacadeSmsReassemblyStore::DeleteMessageL(const CSmsMessage& aSmsMessage, TBool aPassed)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_DELETEMESSAGEL_1, "CFacadeSmsReassemblyStore::DeleteEntryL()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::DeleteEntryL()");
 
 	TBool toBeStoredInClass0ReassemblyStore = IsForClass0ReassemblyStore(aSmsMessage);
 
@@ -476,7 +471,7 @@
 */
 void CFacadeSmsReassemblyStore::UpdateLogServerIdL(const CSmsMessage& aSmsMessage, TInt aIndex)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_UPDATELOGSERVERIDL_1, "CFacadeSmsReassemblyStore::UpdateLogServerIdL()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::UpdateLogServerIdL()");
 
 	TBool toBeStoredInClass0ReassemblyStore = IsForClass0ReassemblyStore(aSmsMessage);
 
@@ -499,7 +494,7 @@
 */
 void CFacadeSmsReassemblyStore::SetMessagePassedToClientL(const CSmsMessage& aSmsMessage, TBool aPassed)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_SETMESSAGEPASSEDTOCLIENTL_1, "CFacadeSmsReassemblyStore::SetMessagePassedToClientL()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::SetMessagePassedToClientL()");
 
 	TBool toBeStoredInClass0ReassemblyStore = IsForClass0ReassemblyStore(aSmsMessage);
 
@@ -574,7 +569,7 @@
 */
 void CFacadeSmsReassemblyStore::InitializeNonClass0StoreL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_INITIALIZENONCLASS0STOREL_1, "CFacadeSmsReassemblyStore::InitializeNonClass0StoreL()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::InitializeNonClass0StoreL()");
 	// Initialize Re-assembly store.
 	iReassemblyStore->OpenStoreL();
 	iReassemblyStore->BeginTransactionLC();
@@ -611,7 +606,7 @@
 	{
 	const TInt count = iReassemblyStore->Entries().Count();
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_DELETENONCLASS0ENUMERATEDSIMENTRIES_1, "CFacadeSmsReassemblyStore::DeleteNonClass0EnumeratedSIMEntries(): %d messages in RAS", count);
+	LOGSMSPROT2("CFacadeSmsReassemblyStore::DeleteNonClass0EnumeratedSIMEntries(): %d messages in RAS", count);
 
 	TInt index;
 
@@ -639,7 +634,7 @@
 */
 void CFacadeSmsReassemblyStore::DeleteNonClass0MessageL(const CSmsMessage& aSmsMessage, TBool aPassed)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_DELETENONCLASS0MESSAGEL_1, "CFacadeSmsReassemblyStore::DeleteNonClass0MessageL()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::DeleteNonClass0MessageL()");
 	TInt index(0);
 
 	if(!iReassemblyStore->InTransaction())
@@ -666,7 +661,7 @@
 */
 void CFacadeSmsReassemblyStore::SetNonClass0MessagePassedToClientL(const CSmsMessage& aSmsMessage, TBool aPassed)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_SETNONCLASS0MESSAGEPASSEDTOCLIENTL_1, "CFacadeSmsReassemblyStore::SetNonClass0MessagePassedToClientL()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::SetNonClass0MessagePassedToClientL()");
 	TInt index(0);
 
 	iReassemblyStore->BeginTransactionLC();
@@ -682,7 +677,8 @@
 */
 TInt CFacadeSmsReassemblyStore::NumberOfCompleteNonClass0Messages()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_NUMBEROFCOMPLETENONCLASS0MESSAGES_1, "CFacadeSmsReassemblyStore::NumberOfCompleteMessages(): Entries().Count()=%d",iReassemblyStore->Entries().Count());
+	LOGSMSPROT2("CFacadeSmsReassemblyStore::NumberOfCompleteMessages(): Entries().Count()=%d",
+				iReassemblyStore->Entries().Count());
 
 	//local variable for complete entries
 	TInt count( 0 );
@@ -710,7 +706,7 @@
 */
 void CFacadeSmsReassemblyStore::ProcessCompleteNonClass0SmsMessagesL(MSmsComm& aSmsComm, const CSmsMessage* aCurrentSmsMessage)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_PROCESSCOMPLETENONCLASS0SMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ProcessCompleteNonClass0SmsMessagesL [from %d to 0]", iReassemblyStore->Entries().Count()-1);
+	LOGSMSPROT2("CFacadeSmsReassemblyStore::ProcessCompleteNonClass0SmsMessagesL [from %d to 0]", iReassemblyStore->Entries().Count()-1);
 
 	iReassemblyStore->BeginTransactionLC();
 	TInt count = iReassemblyStore->Entries().Count();
@@ -756,7 +752,7 @@
 */
 void CFacadeSmsReassemblyStore::ProcessCompleteClass0SmsMessagesL(MSmsComm& aSmsComm, const CSmsMessage* aCurrentSmsMessage)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_PROCESSCOMPLETECLASS0SMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ProcessCompleteClass0SmsMessagesL [from %d to 0]", iClass0ReassemblyStore->Entries().Count()-1);
+	LOGSMSPROT2("CFacadeSmsReassemblyStore::ProcessCompleteClass0SmsMessagesL [from %d to 0]", iClass0ReassemblyStore->Entries().Count()-1);
 
 	iClass0ReassemblyStore->BeginTransactionLC();
 	TInt count = iClass0ReassemblyStore->Entries().Count();
@@ -806,7 +802,7 @@
 */
 TInt CFacadeSmsReassemblyStore::ExternalizeEnumeratedNonClass0SmsMessagesL(CSmsProvider& aProvider,TInt& aCount)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDNONCLASS0SMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ExternalizeEnumeratedNonClass0SmsMessagesL()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::ExternalizeEnumeratedNonClass0SmsMessagesL()");
 	TInt count = iReassemblyStore->Entries().Count();
 	TInt index,numNewSegments(0);
 	for(index = count-1; index >=0; --index)
@@ -825,7 +821,7 @@
 				numNewSegments+=aProvider.ExternalizeMessageL(*smsMessage,EFalse);
 				for(TInt i=0; i< smsMessage->iSlotArray.Count() ;i++)
 					{
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDNONCLASS0SMSMESSAGESL_2, "CFacadeSmsReassemblyStore::ExternalizeEnumeratedNonClass0SmsMessagesL %d", smsMessage->iSlotArray[i].iIndex);
+					LOGSMSPROT2("CFacadeSmsReassemblyStore::ExternalizeEnumeratedNonClass0SmsMessagesL %d", smsMessage->iSlotArray[i].iIndex);
 					}
 				++aCount;
 				iReassemblyStore->BeginTransactionLC();
@@ -851,7 +847,7 @@
 */
 TInt CFacadeSmsReassemblyStore::ExternalizeEnumeratedClass0SmsMessagesL(CSmsProvider& aProvider,TInt& aCount)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDCLASS0SMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ExternalizeEnumeratedClass0SmsMessagesL()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::ExternalizeEnumeratedClass0SmsMessagesL()");
 	TInt count = iClass0ReassemblyStore->Entries().Count();
 	TInt index,numNewSegments(0);
 	for(index = count-1; index >=0; --index)
@@ -870,7 +866,7 @@
 				numNewSegments+=aProvider.ExternalizeMessageL(*smsMessage,EFalse);
 				for(TInt i=0; i< smsMessage->iSlotArray.Count() ;i++)
 					{
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDCLASS0SMSMESSAGESL_2, "CFacadeSmsReassemblyStore::ExternalizeEnumeratedClass0SmsMessagesL() %d", smsMessage->iSlotArray[i].iIndex);
+					LOGSMSPROT2("CFacadeSmsReassemblyStore::ExternalizeEnumeratedClass0SmsMessagesL() %d", smsMessage->iSlotArray[i].iIndex);
 					}
 				++aCount;
 				iClass0ReassemblyStore->BeginTransactionLC();
@@ -917,7 +913,8 @@
 */
 void CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms, TInt& aIndex, TBool& aIsComplete, TBool aIsEnumeration, TInt& aCount, TInt& aTotal)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTONONCLASS0REASSEMBLYSTOREL_1, "CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): isComplete Message=%d",aSmsMessage.IsComplete());
+	LOGSMSPROT2("CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): isComplete Message=%d",
+				aSmsMessage.IsComplete());
 
 	if (aIsComplete ||  aSmsMessage.Type() == CSmsPDU::ESmsStatusReport)
 		{
@@ -941,7 +938,8 @@
 		TInt  segStoreIndex(KErrNotFound);
 
 		iReassemblyStore->MatchPDUToExistingMessage(aSmsMessage, segStoreIndex);
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTONONCLASS0REASSEMBLYSTOREL_2, "CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): ""segStoreIndex=%d", segStoreIndex);
+		LOGSMSPROT2("CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): "
+					"segStoreIndex=%d", segStoreIndex);
 
 		//
 		// If not yet complete, then we must be part of a multiple PDU message.
@@ -960,7 +958,9 @@
 			iReassemblyStore->UpdateExistingMessageL(aSmsMessage, aGsmSms, aIndex,
 													aIsComplete, isDuplicateMsgRef,
 													isDuplicateSlot);
-			OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTONONCLASS0REASSEMBLYSTOREL_3, "CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): ""aIndex=%d, isComplete=%d, isDuplicateMsgRef=%d, isDuplicateSlot=%d",aIndex, aIsComplete, isDuplicateMsgRef, isDuplicateSlot);
+			LOGSMSPROT5("CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): "
+						"aIndex=%d, isComplete=%d, isDuplicateMsgRef=%d, isDuplicateSlot=%d",
+						aIndex, aIsComplete, isDuplicateMsgRef, isDuplicateSlot);
 
 			if (isDuplicateMsgRef)
 				{
@@ -1050,7 +1050,8 @@
 		iReassemblyStore->CommitTransactionL();
 		}
 
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_UPDATELOGSERVERIDOFNONCLASS0MESSAGEL_1, "CFacadeSmsReassemblyStore::UpdateLogServerIdOfNonClass0MessageL(): found=%d, foundIndex=%d",found, foundIndex);
+	LOGSMSPROT3("CFacadeSmsReassemblyStore::UpdateLogServerIdOfNonClass0MessageL(): found=%d, foundIndex=%d",
+				found, foundIndex);
 
 	//
 	// If found and the index is valid, then update the Log Server ID...
@@ -1068,7 +1069,7 @@
  */
 TBool CFacadeSmsReassemblyStore::IsWapSMS(const CSmsMessage& aSmsMessage)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ISWAPSMS_1, "CFacadeSmsReassemblyStore::IsWapSMS()");
+	LOGSMSPROT1("CFacadeSmsReassemblyStore::IsWapSMS()");
 
 	return CSmsProtocol::IsAppPortSMS(aSmsMessage);
 	}

--- a/smsprotocols/smsstack/smsprot/Src/smspmain.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspmain.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspmainTraces.h"
-#endif
-
 #include <e32std.h>
 #include "Gsmuelem.h"
 #include <exterror.h>
@@ -68,7 +62,7 @@
 			rpError = KErrGsmSMSUnspecifiedProtocolError;
 			break;
 		}
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, ERRORTORPERROR_1, "ErrorToRPError (%d->%d)", aError, rpError);
+	LOGSMSPROT3("ErrorToRPError (%d->%d)", aError, rpError);
 
 	return rpError;
 	} // ErrorToRPError
@@ -104,7 +98,7 @@
                 } break;
             }
         }
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, ERRORTOTPERROR_1, "ErrorToTPError (%d->%d)", aError, tpError);
+    LOGSMSPROT3("ErrorToTPError (%d->%d)", aError, tpError);
     return tpError;
 	}
 
@@ -121,7 +115,7 @@
     {
     // Ignore in code coverage  - panic method
     BULLSEYE_OFF
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, SMSPPANIC_1, "SMSPPANIC %d", aPanic);
+    LOGSMSPROT2("SMSPPANIC %d", aPanic);
     _LIT(KSmsprotPanic, "SMSP");
     User::Panic(KSmsprotPanic,aPanic);
     BULLSEYE_RESTORE

--- a/smsprotocols/smsstack/smsprot/Src/smspmodm.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspmodm.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspmodmTraces.h"
-#endif
-
 #include "smspmodm.h"
 #include "smsuset.h"
 #include "smspmain.h"
@@ -51,7 +45,7 @@
  */
 void CSmsPhoneInitialization::Start()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_START_1, "CSmsPhoneInitialization::Start  Start initializing the phone");
+	LOGSMSPROT1("CSmsPhoneInitialization::Start  Start initializing the phone");
 
 	Cancel();
 
@@ -66,7 +60,7 @@
 
 void CSmsPhoneInitialization::DoRunL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_1, "CSmsPhoneInitialization::DoRunL [iStatus=%d, iState=%d]", iStatus.Int(), iState);
+	LOGSMSPROT3("CSmsPhoneInitialization::DoRunL [iStatus=%d, iState=%d]", iStatus.Int(), iState);
 
 	switch (iState)
 		{
@@ -80,7 +74,7 @@
 			{
 			if (iStatus.Int() != KErrNone)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_2, "ERROR - TSY failed to set bearer but initialisation will continue; bearer setting may be successful during send");
+				LOGSMSPROT1("ERROR - TSY failed to set bearer but initialisation will continue; bearer setting may be successful during send");
 				}
 
 			iState=ESmsPhoneInitializationGettingRegistrationStatus;
@@ -93,7 +87,7 @@
 			{
 			if(iStatus == KErrNone)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_3, "CSmsPhoneInitialization::DoRunL registration status  : >%d<",iRegistrationStatus);
+				LOGSMSPROT2("CSmsPhoneInitialization::DoRunL registration status  : >%d<",iRegistrationStatus);
 				if (iRegistrationStatus==RMobilePhone::ERegisteredOnHomeNetwork  ||
 					iRegistrationStatus == RMobilePhone::ERegisteredRoaming)
 					{
@@ -112,7 +106,7 @@
 				{
 				iState=ESmsPhoneInitializationCompleted;
 				iNetworkInfoAvailable =EFalse;
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_4, "CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
+				LOGSMSPROT2("CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
 				iSmsPDURead.Start();
 				}
 			}
@@ -130,7 +124,7 @@
 				{
 				iState=ESmsPhoneInitializationCompleted;
 				iNetworkInfoAvailable =EFalse;
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_5, "CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
+				LOGSMSPROT2("CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
 				iSmsPDURead.Start();
 				}
 			}
@@ -142,14 +136,14 @@
 			if(iStatus == KErrNone)
 				{
 				iNetworkInfoAvailable =ETrue;
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_6, "CSmsPhoneInitialization::DoRunL network longname : >%S<",iNetworkInfo.iLongName);
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_7, "CSmsPhoneInitialization::DoRunL network shortname : >%S<",iNetworkInfo.iShortName);
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_8, "CSmsPhoneInitialization::DoRunL network shortname : >%S<",iNetworkInfo.iDisplayTag);
+				LOGSMSPROT2("CSmsPhoneInitialization::DoRunL network longname : >%S<",&iNetworkInfo.iLongName);
+				LOGSMSPROT2("CSmsPhoneInitialization::DoRunL network shortname : >%S<",&iNetworkInfo.iShortName);
+				LOGSMSPROT2("CSmsPhoneInitialization::DoRunL network shortname : >%S<",&iNetworkInfo.iDisplayTag);
 				}
 			else
 				{
 				iNetworkInfoAvailable =EFalse;
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_9, "CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
+				LOGSMSPROT2("CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
 				}
 			iSmsPDURead.Start();
 			}
@@ -174,7 +168,7 @@
  */
 void CSmsPhoneInitialization::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DOCANCEL_1, "CSmsPhoneInitialization::DoCancel()");
+	LOGSMSPROT1("CSmsPhoneInitialization::DoCancel()");
 
 	switch (iState)
 		{
@@ -233,7 +227,7 @@
  */
 void CSmsPhoneInitialization::Complete(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_COMPLETE_1, "CSmsPhoneInitialization::Complete()");
+	LOGSMSPROT1("CSmsPhoneInitialization::Complete()");
 
 	//
 	// Call the base function to perform the actual complete...
@@ -251,7 +245,7 @@
  */
 void CSmsPhoneInitialization::AfterPhoneInitialize(TInt aStatus)
 	{
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_1, "CSmsPhoneInitialization::AfterPhoneIntialize [status=%d]", aStatus);
+    LOGSMSPROT2("CSmsPhoneInitialization::AfterPhoneIntialize [status=%d]", aStatus);
 
 	if (aStatus == KErrNone)
 		{
@@ -263,7 +257,7 @@
 		{
 		if (iMobileSmsCaps.iSmsMode != RMobileSmsMessaging::KCapsGsmSms)
 			{
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_2, "TSY does not support GsmSms");
+		    LOGSMSPROT1("TSY does not support GsmSms");
 			aStatus = KErrNotSupported;
 			}
 		else
@@ -279,13 +273,13 @@
 		{
 	    if (++iNumberOfAttempts < iMaxNumberOfAttempts)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_3, "CSmsPhoneInitialization Restarting [aStatus=%d]", aStatus);
+			LOGSMSPROT2("CSmsPhoneInitialization Restarting [aStatus=%d]", aStatus);
 			iGsmPhone.Initialise(iStatus);
 			SetActive();
 			}
 		else
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_4, "CSmsPhoneInitialization Failed after %d attempts [aStatus=%d]", iNumberOfAttempts, aStatus);
+			LOGSMSPROT3("CSmsPhoneInitialization Failed after %d attempts [aStatus=%d]", iNumberOfAttempts, aStatus);
 			}
 		}
 
@@ -320,7 +314,7 @@
  */
 CSmsModemNotification* CSmsModemNotification::NewL(MSmsComm& aSmsComm)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_NEWL_1, "CSmsModemNotification::NewL");
+	LOGSMSPROT1("CSmsModemNotification::NewL");
 
 	CSmsModemNotification*	self=new(ELeave) CSmsModemNotification(aSmsComm);
 	CleanupStack::PushL(self);
@@ -333,7 +327,7 @@
 
 void CSmsModemNotification::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_CONSTRUCTL_1, "CSmsModemNotification::ConstructL()");
+	LOGSMSPROT1("CSmsModemNotification::ConstructL()");
 
 	User::LeaveIfError(iPhonePowerProperty.Attach(KUidSystemCategory, KUidPhonePwr.iUid));
 	
@@ -353,7 +347,7 @@
 
 RPhone::TModemDetection CSmsModemNotification::ModemState()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_MODEMSTATE_1, "CSmsModemNotification::ModemState()");
+	LOGSMSPROT1("CSmsModemNotification::ModemState()");
 
 	//
 	// Get the phone power state.
@@ -381,7 +375,7 @@
  */
 void CSmsModemNotification::Start()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_START_1, "CSmsModemNotification::Start");
+	LOGSMSPROT1("CSmsModemNotification::Start");
 
 	__ASSERT_DEBUG(iState==ESmsModemNotificationIdle,SmspPanic(KSmspPanicUnexpectedState));
 
@@ -400,7 +394,7 @@
  */
 void CSmsModemNotification::DoRunL()
 	{
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_DORUNL_1, "CSmsModemNotification::RunL [iStatus=%d]", iStatus.Int() );
+    LOGSMSPROT2("CSmsModemNotification::RunL [iStatus=%d]", iStatus.Int() );
 
 	__ASSERT_DEBUG(iState==ESmsModemNotificationWaitingForNotification,SmspPanic(KSmspPanicUnexpectedState));
 
@@ -416,7 +410,7 @@
  */
 void CSmsModemNotification::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_DOCANCEL_1, "CSmsModemNotification::DoCancel()");
+	LOGSMSPROT1("CSmsModemNotification::DoCancel()");
 
 	__ASSERT_DEBUG(iState==ESmsModemNotificationWaitingForNotification,SmspPanic(KSmspPanicUnexpectedState));
 	
@@ -456,7 +450,7 @@
  */
 void CSmsModemNotification::Complete(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_COMPLETE_1, "CSmsModemNotification::Complete()");
+	LOGSMSPROT1("CSmsModemNotification::Complete()");
 
 	//
 	// Call the base function to perform the actual complete...

--- a/smsprotocols/smsstack/smsprot/Src/smspmondsk.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspmondsk.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -45,12 +45,6 @@
  @internalComponent 
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspmondskTraces.h"
-#endif
-
 #include <barsc.h>
 #include <bautils.h>
 
@@ -74,7 +68,7 @@
  */
 CSmsMonitorDiskSpace* CSmsMonitorDiskSpace::NewL(MSmsComm& aSmsComm, RMobileSmsMessaging& aSmsMessaging,RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_NEWL_1, "CSmsMonitorDiskSpace::NewL()");
+	LOGSMSPROT1("CSmsMonitorDiskSpace::NewL()");
 
 	CSmsMonitorDiskSpace*  self = new(ELeave) CSmsMonitorDiskSpace(aSmsComm, aSmsMessaging, aFs);
 	CleanupStack::PushL(self);
@@ -163,12 +157,15 @@
 	//
 	// Log the filename in use and whether it is ROM based...
 	//
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_1, "CSmsMonitorDiskSpace::ConstructL(): fileName=\"%S\"", fileName);
-
+#ifdef _SMS_LOGGING_ENABLED
+	TBuf8<KMaxFileName>  buf8;
+	buf8.Copy(fileName);
+	LOGSMSPROT2("CSmsMonitorDiskSpace::ConstructL(): fileName=\"%S\"", &buf8);
+#endif
 
     if (iFs.IsFileInRom(fileName) == NULL)
     	{
-     	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_2, "CSmsMonitorDiskSpace::ConstructL(): Smsu.rsc not in ROM");
+     	LOGSMSPROT1("CSmsMonitorDiskSpace::ConstructL(): Smsu.rsc not in ROM");
      	}
 
 	//
@@ -202,13 +199,14 @@
         TInt ret = iFreeDiskSpaceProperty.Attach(KUidPSSMSStackCategory, KUidPSSMSStackFreeDiskSpaceKey);
         if (ret != KErrNone)
             {
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_3, "iFreeDiskSpaceProperty.Attach(): error=%d", ret);
+            LOGSMSPROT2("iFreeDiskSpaceProperty.Attach(): error=%d", ret);
             User::Leave(ret);
             }                        
         }   
 #endif        
     
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_4, "CSmsMonitorDiskSpace::ConstructL(): iLowLimit=%u, iHighLimit=%u",iLowLimit, iHighLimit);
+	LOGSMSPROT3("CSmsMonitorDiskSpace::ConstructL(): iLowLimit=%d, iHighLimit=%d",
+			    iLowLimit, iHighLimit);
 	} // CSmsMonitorDiskSpace::ConstructL
 
 
@@ -217,7 +215,8 @@
  */
 void CSmsMonitorDiskSpace::RunL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_RUNL_1, "CSmsMonitorDiskSpace:RunL(): iStatus=%d, iState=%d",iStatus.Int(), iState );
+	LOGSMSPROT3("CSmsMonitorDiskSpace:RunL(): iStatus=%d, iState=%d",
+	            iStatus.Int(), iState );
 
 	switch (iState)
 		{
@@ -301,7 +300,7 @@
  */
 void CSmsMonitorDiskSpace::DoCancel()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_DOCANCEL_1, "CSmsMonitorDiskSpace::DoCancel(): iState=%d", iState);
+	LOGSMSPROT2("CSmsMonitorDiskSpace::DoCancel(): iState=%d", iState);
 
     switch (iState)
 		{
@@ -349,7 +348,8 @@
  */
 void CSmsMonitorDiskSpace::CheckDiskSpaceForPDUL(TBool aPDUIsClass0)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CHECKDISKSPACEFORPDUL_1, "CSmsMonitorDiskSpace::CheckDiskSpaceForPDUL(): aPDUIsClass0=%d",aPDUIsClass0);
+	LOGSMSPROT2("CSmsMonitorDiskSpace::CheckDiskSpaceForPDUL(): aPDUIsClass0=%d",
+				aPDUIsClass0);
 
 	//
 	// First check the actual disk space before working out what to do.
@@ -438,7 +438,8 @@
 void CSmsMonitorDiskSpace::NotifyDiskSpace(TInt aLimit,
 										   TSmsMonitorDiskSpaceState aState)
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_NOTIFYDISKSPACE_1, "CSmsMonitorDiskSpace::NotifyDiskSpace(): aLimit=%d, aState=%d",aLimit, aState);
+	LOGSMSPROT3("CSmsMonitorDiskSpace::NotifyDiskSpace(): aLimit=%d, aState=%d",
+				aLimit, aState);
 
 	//
 	// Cancel any previously outstanding requests...
@@ -512,7 +513,7 @@
  */
 void CSmsMonitorDiskSpace::ResumeSmsReception()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_RESUMESMSRECEPTION_1, "CSmsMonitorDiskSpace::ResumeSmsReception");
+	LOGSMSPROT1("CSmsMonitorDiskSpace::ResumeSmsReception");
 
 	//
 	// Cancel any previously outstanding requests...
@@ -568,7 +569,7 @@
     
 	if (ret != KErrNone) 
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_GETFREEDISKSPACE_1, "CSmsMonitorDiskSpace::GetFreeDiskSpace(): error=%d", ret);
+		LOGSMSPROT2("CSmsMonitorDiskSpace::GetFreeDiskSpace(): error=%d", ret);
 		return KErrGeneral;
 		}
 
@@ -586,7 +587,7 @@
 		freeSpace = (TInt) volumeInfo.iFree;
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_GETFREEDISKSPACE_2, "CSmsMonitorDiskSpace::GetFreeDiskSpace(): freeSpace=%d", freeSpace);
+	LOGSMSPROT2("CSmsMonitorDiskSpace::GetFreeDiskSpace(): freeSpace=%d", freeSpace);
 
 	return freeSpace;
 	} // CSmsMonitorDiskSpace::GetFreeDiskSpace

--- a/smsprotocols/smsstack/smsprot/Src/smsppara.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smsppara.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -14,12 +14,6 @@
 //
 
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspparaTraces.h"
-#endif
-
 #include "smsppara.h"
 #include "smsuset.h"
 #include "smsulog.h"
@@ -56,7 +50,7 @@
  */
 void CSmsParamsBase::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPARAMSBASE_CONSTRUCTL_1, "CSmsParamsBase::ConstructL()");
+	LOGSMSPROT1("CSmsParamsBase::ConstructL()");
 
 	ConstructTimeoutL();
 	} // CSmsParamsBase::ConstructL
@@ -74,7 +68,7 @@
  */
 CSmsReadParams* CSmsReadParams::NewL(MSmsComm& aSmsComm,const TSmsSettings& aSmsSettings,RMobileSmsMessaging& aSmsMessaging)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_NEWL_1, "CSmsReadParams::NewL()");
+	LOGSMSPROT1("CSmsReadParams::NewL()");
 
 	CSmsReadParams* smsReadParams=new(ELeave) CSmsReadParams(aSmsComm,aSmsSettings,aSmsMessaging);
 	CleanupStack::PushL(smsReadParams);
@@ -121,7 +115,7 @@
  */
 void CSmsReadParams::Start(MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_START_1, "CSmsReadParams::Start()");
+	LOGSMSPROT1("CSmsReadParams::Start()");
 
 	__ASSERT_DEBUG(iSmsMessageObserver == NULL  &&  iReport == NULL,
 				   SmspPanic(KSmspPanicUnexpectedState));
@@ -161,7 +155,7 @@
  */
 void CSmsReadParams::Start(TRequestStatus& aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_START1_1, "CSmsReadParams::Start()");
+	LOGSMSPROT1("CSmsReadParams::Start()");
 
 	__ASSERT_DEBUG(iSmsMessageObserver == NULL  &&  iReport == NULL,
 				   SmspPanic(KSmspPanicUnexpectedState));
@@ -187,7 +181,7 @@
  */
 void CSmsReadParams::DoRunL()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_DORUNL_1, "CSmsReadParams::RunL [iStatus=%d]", iStatus.Int() );
+	LOGSMSPROT2("CSmsReadParams::RunL [iStatus=%d]", iStatus.Int() );
 
 	//
 	// If the start retrieve was successful, then continue retrieving the list.
@@ -218,7 +212,7 @@
  */
 void CSmsReadParams::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_DOCANCEL_1, "CSmsReadParams::DoCancel()");
+	LOGSMSPROT1("CSmsReadParams::DoCancel()");
 
 	TimedSetActiveCancel();
 
@@ -264,7 +258,7 @@
  */
 void CSmsReadParams::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_CONSTRUCTL_1, "CSmsReadParams::ConstructL()");
+	LOGSMSPROT1("CSmsReadParams::ConstructL()");
 
 	CSmsParamsBase::ConstructL();
 
@@ -283,7 +277,7 @@
  */
 void CSmsReadParams::CheckListValidityL(CMobilePhoneSmspList& aMobilePhoneSmspList)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_CHECKLISTVALIDITYL_1, "CSmsReadParams::CheckListValidityL()");
+	LOGSMSPROT1("CSmsReadParams::CheckListValidityL()");
 
 	//
 	// MaxNumberEntries method returns the maximum number of entries that can
@@ -314,7 +308,7 @@
  */
 void CSmsReadParams::StoreParameters(CMobilePhoneSmspList* aMobilePhoneSmspList)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_STOREPARAMETERS_1, "CSmsReadParams::StoreParameters()");
+	LOGSMSPROT1("CSmsReadParams::StoreParameters()");
 
 	__ASSERT_DEBUG(iMobilePhoneSmspList != NULL && aMobilePhoneSmspList != NULL && iMobilePhoneSmspList->MaxNumberEntries() == aMobilePhoneSmspList->MaxNumberEntries(),SmspPanic(KSmspPanicCorruptedSmspList));
 
@@ -334,7 +328,7 @@
  */
 void CSmsReadParams::Complete(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_COMPLETE_1, "CSmsReadParams::Complete()");
+	LOGSMSPROT1("CSmsReadParams::Complete()");
 
 	//
 	// Call the base function to perform the actual complete...
@@ -363,7 +357,7 @@
  */
 CSmsWriteParams* CSmsWriteParams::NewL(MSmsComm& aSmsComm,const TSmsSettings& aSmsSettings,RMobileSmsMessaging& aSmsMessaging,CSmsReadParams& aSmsReadParams)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSWRITEPARAMS_NEWL_1, "CSmsWriteParams::NewL()");
+	LOGSMSPROT1("CSmsWriteParams::NewL()");
 
 	CSmsWriteParams* smsWriteParams=new(ELeave) CSmsWriteParams(aSmsComm,aSmsSettings,aSmsMessaging,aSmsReadParams);
 	CleanupStack::PushL(smsWriteParams);
@@ -402,7 +396,7 @@
  */
 void CSmsWriteParams::Start(MSmsMessageObserver& aObserver,CMobilePhoneSmspList* aMobilePhoneSmspList)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSWRITEPARAMS_START_1, "CSmsWriteParams::Start()");
+	LOGSMSPROT1("CSmsWriteParams::Start()");
 
 	__ASSERT_DEBUG(iState==ESmsParamsIdle,SmspPanic(KSmspPanicUnexpectedState));
 	
@@ -441,7 +435,7 @@
  */
 void CSmsWriteParams::DoRunL()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSWRITEPARAMS_DORUNL_1, "CSmsWriteParams::DoRunL [iStatus=%d]", iStatus.Int() );
+	LOGSMSPROT2("CSmsWriteParams::DoRunL [iStatus=%d]", iStatus.Int() );
 
 	switch (iState)
 		{
@@ -503,7 +497,7 @@
  */
 void CSmsWriteParams::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSWRITEPARAMS_DOCANCEL_1, "CSmsWriteParams::DoCancel()");
+	LOGSMSPROT1("CSmsWriteParams::DoCancel()");
 
 	TimedSetActiveCancel();
 
@@ -568,7 +562,7 @@
  */
 void CSmsWriteParams::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSWRITEPARAMS_CONSTRUCTL_1, "CSmsWriteParams::ConstructL()");
+	LOGSMSPROT1("CSmsWriteParams::ConstructL()");
 
 	CSmsParamsBase::ConstructL();
 	} // CSmsWriteParams::ConstructL
@@ -586,7 +580,7 @@
  */
 void CSmsWriteParams::Complete(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSWRITEPARAMS_COMPLETE_1, "CSmsWriteParams::Complete()");
+	LOGSMSPROT1("CSmsWriteParams::Complete()");
 
 	//
 	// Call the base function to perform the actual complete...

--- a/smsprotocols/smsstack/smsprot/Src/smspproc.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspproc.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -18,12 +18,6 @@
 */
 
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspprocTraces.h"
-#endif
-
 #include "smspproc.h"
 #include "smspmondsk.h"
 #include "smspfacadestor.h"
@@ -49,7 +43,7 @@
 										 CSmsSegmentationStore& aSegmentationStore,
 										 CSmsMonitorDiskSpace& aSmsMonitorDiskSpace)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_NEWL_1, "CSmsPDUProcessor::NewL()");
+	LOGSMSPROT1("CSmsPDUProcessor::NewL()");
 
 	CSmsPDUProcessor*  smsPDUProcessor = new (ELeave) CSmsPDUProcessor(aSmsComm,
 																	   aSmsSettings,
@@ -93,13 +87,14 @@
  */
 void CSmsPDUProcessor::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_CONSTRUCTL_1, "CSmsPDUProcessor::ConstructL()");
+	LOGSMSPROT1("CSmsPDUProcessor::ConstructL()");
 	} // CSmsPDUProcessor::ConstructL
 
 
 void CSmsPDUProcessor::DecodeAndProcessPDUL(TGsmSmsSlot& aSlot, TBool aIsEnumeration)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_DECODEANDPROCESSPDUL_1, "CSmsPDUProcessor::DecodeAndProcessPDUL(): aIsEnumeration=%d",aIsEnumeration);
+	LOGSMSPROT2("CSmsPDUProcessor::DecodeAndProcessPDUL(): aIsEnumeration=%d",
+				aIsEnumeration);
 
 	//
 	// Store the slot...
@@ -115,7 +110,8 @@
 		iIsMobileTerminated = ETrue;
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_DECODEANDPROCESSPDUL_2, "CSmsStoreRead::DecodeAndProcessPDUL(): iIsMobileTerminated=%d",iIsMobileTerminated);
+	LOGSMSPROT2("CSmsStoreRead::DecodeAndProcessPDUL(): iIsMobileTerminated=%d",
+				iIsMobileTerminated);
 
 	//
 	// Put the PDU and Service Center Address in the TGsmSms structure...
@@ -196,7 +192,7 @@
 	//
 	if (iSmsMessage->ToFromAddress().CompareF(KNETWORK) == 0)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_DECODEANDPROCESSPDUL_3, "CSmsPDUProcessor::DecodeAndProcessPDUL(): MOSES OTE message!");
+		LOGSMSPROT1("CSmsPDUProcessor::DecodeAndProcessPDUL(): MOSES OTE message!");
 		if (iSmsComm.NetworkInfoAvailable())
 			{
 			iSmsMessage->SetToFromAddressL(iSmsComm.NetworkInfo().iDisplayTag);
@@ -317,7 +313,7 @@
 
 void CSmsPDUProcessor::AnalysePDUCharacteristics()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_1, "CSmsPDUProcessor::AnalysePDUCharacteristics()");
+	LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics()");
 
 	CSmsPDU&  pdu = iSmsMessage->SmsPDU();
 
@@ -330,32 +326,32 @@
         {
         if (msgClass == TSmsDataCodingScheme::ESmsClass0)
         	{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_2, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 0");
+			LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 0");
 	    	iIsClass0Message = ETrue;
         	}
         else if (msgClass == TSmsDataCodingScheme::ESmsClass1)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_3, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 1");
+			LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 1");
 			iIsClass1Message = ETrue;
 			}
         else if (msgClass == TSmsDataCodingScheme::ESmsClass2)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_4, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 2");
+			LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 2");
 			iIsClass2Message = ETrue;
 			}
         else if (msgClass == TSmsDataCodingScheme::ESmsClass3)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_5, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 3");
+			LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 3");
 			iIsClass3Message = ETrue;
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_6, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class Unknown!");
+			LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class Unknown!");
 			}
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_7, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class-less");
+		LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class-less");
 		}
 
 	//
@@ -368,7 +364,8 @@
 	   iIsPIDType0 = ETrue;
 	   }
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_8, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsPIDType0=%d",iIsPIDType0);
+	LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsPIDType0=%d",
+				iIsPIDType0);
 
 	//
 	// Should this message be forwarded to the client?
@@ -381,7 +378,8 @@
 		iIsForwardMessageToClient = ETrue;
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_9, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsForwardMessageToClient=%d",iIsForwardMessageToClient);
+	LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsForwardMessageToClient=%d",
+				iIsForwardMessageToClient);
 
 	//
 	// Is it flaged for auto-delete?
@@ -396,7 +394,8 @@
             }
         }
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_10, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsMarkedForAutoDelete=%d",iIsMarkedForAutoDelete);
+	LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsMarkedForAutoDelete=%d",
+				iIsMarkedForAutoDelete);
 
 	//
 	// Should this PDU be deleted after processing?
@@ -412,7 +411,8 @@
  		iIsPDUToBeDeleted = ETrue;
  		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_11, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsPDUToBeDeleted=%d",iIsPDUToBeDeleted);
+	LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsPDUToBeDeleted=%d",
+				iIsPDUToBeDeleted);
 
 	//
 	// Does the message need to be stored???
@@ -430,7 +430,8 @@
 		iIsMessageGoingToBeStored = ETrue;
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_12, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsMessageGoingToBeStored=%d",iIsMessageGoingToBeStored);
+	LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsMessageGoingToBeStored=%d",
+				iIsMessageGoingToBeStored);
 
 	//
 	// Is the message complete? This value may change later, when the segmentation and
@@ -438,7 +439,8 @@
 	//
 	iIsComplete = iSmsMessage->IsComplete();
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_13, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsComplete=%d",iIsComplete);
+	LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsComplete=%d",
+				iIsComplete);
 	
 	//
 	// Store PDU Data. These values may be updated later.
@@ -460,7 +462,7 @@
 	//
 	TBool  found = iSegmentationStore.AddStatusReportL(iIndex, iIsComplete, *iSmsMessage);
 	
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_FINDORIGINALMESSAGEANDPROCESSSTATUSREPORTL_1, "CSmsPDUReadProcess::FindOriginalMessageAndProcessStatusReportL(): found=%d",found);
+    LOGSMSPROT2("CSmsPDUReadProcess::FindOriginalMessageAndProcessStatusReportL(): found=%d",found);
 
 	if (found)
 		{
@@ -496,7 +498,7 @@
 
 void CSmsPDUProcessor::UpdateStatusReportL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_UPDATESTATUSREPORTL_1, "CSmsPDUProcessor::UpdateStatusReportL()");
+	LOGSMSPROT1("CSmsPDUProcessor::UpdateStatusReportL()");
 
 	//
 	// Update the receive time of the status report...
@@ -529,7 +531,7 @@
 
 void CSmsPDUProcessor::AddSlotToSmsMessageIfRequiredL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ADDSLOTTOSMSMESSAGEIFREQUIREDL_1, "CSmsPDUProcessor::AddSlotToSmsMessageIfRequiredL()");
+	LOGSMSPROT1("CSmsPDUProcessor::AddSlotToSmsMessageIfRequiredL()");
 
 	//
 	// Add the slot to the message (if it is not going to be deleted and
@@ -565,7 +567,8 @@
  */
 void CSmsPDUProcessor::AddSegmentOfMessageToReassemblyStoreIfRequiredL()
 	{
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ADDSEGMENTOFMESSAGETOREASSEMBLYSTOREIFREQUIREDL_1, "CSmsPDUReadProcess::AddSegmentOfMessageToReassemblyStoreIfRequiredL(): iIsComplete=%d",iIsComplete);
+    LOGSMSPROT2("CSmsPDUReadProcess::AddSegmentOfMessageToReassemblyStoreIfRequiredL(): iIsComplete=%d",
+    			iIsComplete);
 
 	iReassemblyStore.AddSegmentToReassemblyStoreL(*iSmsMessage, iGsmSms, iIndex, iIsComplete, iIsEnumeration, iSmsPDUData.iReceived, iSmsPDUData.iTotal);
 	} // CSmsPDUProcessor::AddSegmentOfMessageToReassemblyStoreIfRequiredL
@@ -573,7 +576,7 @@
 
 void CSmsPDUProcessor::UpdateLogServerIdL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_UPDATELOGSERVERIDL_1, "CSmsPDUProcessor::UpdateLogServerIdL()");
+	LOGSMSPROT1("CSmsPDUProcessor::UpdateLogServerIdL()");
 
 	//
 	// If this is a SUBMIT or DELIVER PDU,
@@ -589,7 +592,7 @@
 
 void CSmsPDUProcessor::ProcessMessageIfCompleteL()
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_PROCESSMESSAGEIFCOMPLETEL_1, "CSmsPDUProcessor::ProcessMessageIfCompleteL()");
+    LOGSMSPROT1("CSmsPDUProcessor::ProcessMessageIfCompleteL()");
 
 	if ((iIsClass0Message && !iIsWapSms) && iReassemblyStore.IsSeparateClass0StoreSupported())
 		{
@@ -647,7 +650,7 @@
 
 void CSmsPDUProcessor::DeletePDUL()
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_DELETEPDUL_1, "CSmsPDUProcessor::DeletePDUL()");
+    LOGSMSPROT1("CSmsPDUProcessor::DeletePDUL()");
 
 	//
 	// If the slot number has an index and store assigned, then we can delete

--- a/smsprotocols/smsstack/smsprot/Src/smspqueue.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspqueue.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspqueueTraces.h"
-#endif
-
 #include "smspqueue.h"
 #include "smspcomm.h"
 #include "Gsmumsg.h"
@@ -85,7 +79,7 @@
 
 void CSmspMessageQueue::DoRunL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_DORUNL_1, "CSmspMessageQueue::DoRunL()");
+	LOGSMSPROT1("CSmspMessageQueue::DoRunL()");
 
 	CompleteFirst(iStatus.Int());
 	Start();
@@ -96,7 +90,7 @@
 	{
 	TRAPD(err, DoQueueL(aMessage, aObserver, aOptions));
 
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_QUEUE_1, "*** CSmspMessageQueue::Queue [err=%d aObserver=0x%08x IsActive=%d]", err, (TUint) &aObserver, IsActive());
+	LOGSMSPROT4("*** CSmspMessageQueue::Queue [err=%d aObserver=0x%08x IsActive=%d]", err, &aObserver, IsActive());
 
 	if (err != KErrNone)
 		{
@@ -111,7 +105,7 @@
 
 void CSmspMessageQueue::DoQueueL(CSmsMessage* aMessage, MSmsMessageObserver& aObserver, TUint aOptions)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_DOQUEUEL_1, "CSmspMessageQueue::DoQueueL()");
+	LOGSMSPROT1("CSmspMessageQueue::DoQueueL()");
 
 	CleanupStack::PushL(aMessage);
 
@@ -138,7 +132,7 @@
  */
 void CSmspMessageQueue::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_DOCANCEL_1, "*** CSmspMessageQueue::DoCancel");
+	LOGSMSPROT1("*** CSmspMessageQueue::DoCancel");
 
 	TSglQueIter<CQueuedSmsMessage> iter(iMessageQueue);
 	CQueuedSmsMessage* queuedsmsmessage = iter;
@@ -152,7 +146,7 @@
 
 void CSmspMessageQueue::CompleteFirst(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_COMPLETEFIRST_1, "CSmspMessageQueue::CompleteFirst()");
+	LOGSMSPROT1("CSmspMessageQueue::CompleteFirst()");
 
 	CompleteRequest(iMessageQueue.First(), aStatus);
 	} // CSmspMessageQueue::CompleteFirst
@@ -160,7 +154,7 @@
 
 void CSmspMessageQueue::CompleteRequest(CQueuedSmsMessage* aQueuedMessage, TInt aStatus)
 	{
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_COMPLETEREQUEST_1, "*** CSmspMessageQueue::CompleteRequest [aStatus=%d aObserver=0x%X IsFirst=%d]", aStatus,(TUint) &aQueuedMessage->iObserver, iMessageQueue.IsFirst(aQueuedMessage));
+	LOGSMSPROT4("*** CSmspMessageQueue::CompleteRequest [aStatus=%d aObserver=0x%X IsFirst=%d]", aStatus, &aQueuedMessage->iObserver, iMessageQueue.IsFirst(aQueuedMessage));
 
 	// From defect HOE-563KLY, need to cancel request if active and remove from queue
 	// before observer has chance to manipulate queue
@@ -173,7 +167,7 @@
 
 void CSmspMessageQueue::CancelObserver(MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_CANCELOBSERVER_1, "*** CSmspMessageQueue::CancelObserver [aObserver=0x%X]", &aObserver);
+	LOGSMSPROT2("*** CSmspMessageQueue::CancelObserver [aObserver=0x%X]", &aObserver);
 
 	TSglQueIter<CQueuedSmsMessage> iter(iMessageQueue);
 	CQueuedSmsMessage* queuedsmsmessage = iter;
@@ -226,7 +220,7 @@
  */
 CQueuedPDUDelete* CQueuedPDUDelete::NewL(const CArrayFix<TGsmSmsSlotEntry>& aSlotArray,MSmsMessageObserver* aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQUEUEDPDUDELETE_NEWL_1, "CQueuedPDUDelete::NewL()");
+	LOGSMSPROT1("CQueuedPDUDelete::NewL()");
 
 	CQueuedPDUDelete* queuedpdudelete=new(ELeave) CQueuedPDUDelete(aObserver);
 	CleanupStack::PushL(queuedpdudelete);
@@ -255,7 +249,7 @@
  */
 void CQueuedPDUDelete::ConstructL(const CArrayFix<TGsmSmsSlotEntry>& aSlotArray)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQUEUEDPDUDELETE_CONSTRUCTL_1, "CQueuedPDUDelete::ConstructL()");
+	LOGSMSPROT1("CQueuedPDUDelete::ConstructL()");
 
 	TInt count=aSlotArray.Count();
 	for (TInt i=0; i<count; i++)
@@ -284,7 +278,7 @@
  */
 void CSmspDeleteQueue::RunL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_RUNL_1, "CSmspDeleteQueue::RunL()");
+	LOGSMSPROT1("CSmspDeleteQueue::RunL()");
 
 	CompleteFirst(iStatus.Int());
 
@@ -305,7 +299,7 @@
     {
     // Ignore in code coverage - the delete queue implements its own RunL.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_DORUNL_1, "CSmspDeleteQueue::DoRunL()");
+    LOGSMSPROT1("CSmspDeleteQueue::DoRunL()");
 
 // This CSmspDeleteQueue::DoRunL() function would be called by
 // CSmsuActiveBase::RunL().  However, CSmspDeleteQueue::RunL() now
@@ -319,7 +313,7 @@
 	{
 	TRAPD(err, DoQueueL(aSlotArray, aObserver));
 
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_QUEUE_1, "*** CSmspDeleteQueue::Queue [err=%d aObserver=0x%X IsActive=%d]", err, (TUint)aObserver, IsActive());
+	LOGSMSPROT4("*** CSmspDeleteQueue::Queue [err=%d aObserver=0x%X IsActive=%d]", err, aObserver, IsActive());
 
 	if (err != KErrNone)
 		{
@@ -335,7 +329,7 @@
 
 void CSmspDeleteQueue::DoQueueL(const CArrayFix<TGsmSmsSlotEntry>& aSlotArray, MSmsMessageObserver* aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_DOQUEUEL_1, "CSmspDeleteQueue::DoQueueL()");
+	LOGSMSPROT1("CSmspDeleteQueue::DoQueueL()");
 
 	CQueuedPDUDelete* queuedDelete= CQueuedPDUDelete::NewL(aSlotArray, aObserver);
 	iDeleteQueue.AddLast(*queuedDelete);
@@ -345,7 +339,7 @@
 CSmspDeleteQueue::CSmspDeleteQueue(MSmsComm& aSmsComm, TInt aPriority)
 : CSmspProtocolQueue(aSmsComm, aPriority)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_CTOR_1, "CSmspDeleteQueue::CSmspDeleteQueue()");
+	LOGSMSPROT1("CSmspDeleteQueue::CSmspDeleteQueue()");
 
 	iDeleteQueue.SetOffset(_FOFF(CQueuedPDUDelete,iLink));
 	} // CSmspDeleteQueue::CSmspDeleteQueue
@@ -356,7 +350,7 @@
  */
 void CSmspDeleteQueue::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_DOCANCEL_1, "*** CSmspDeleteQueue::DoCancel");
+	LOGSMSPROT1("*** CSmspDeleteQueue::DoCancel");
 
 	iSmsPDUDelete->Cancel();
 
@@ -370,7 +364,7 @@
 
 void CSmspDeleteQueue::CompleteFirst(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_COMPLETEFIRST_1, "CSmspDeleteQueue::CompleteFirst()");
+	LOGSMSPROT1("CSmspDeleteQueue::CompleteFirst()");
 
 	CompleteRequest(iDeleteQueue.First(), aStatus);
 	} // CSmspDeleteQueue::CompleteFirst
@@ -378,7 +372,7 @@
 
 void CSmspDeleteQueue::CompleteRequest(CQueuedPDUDelete* aQueuedDelete, TInt aStatus)
 	{
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_COMPLETEREQUEST_1, "*** CSmspDeleteQueue::CompleteRequest [aStatus=%d aObserver=0x%X IsFirst=%d]", aStatus, (TUint)aQueuedDelete->iObserver, iDeleteQueue.IsFirst(aQueuedDelete));
+	LOGSMSPROT4("*** CSmspDeleteQueue::CompleteRequest [aStatus=%d aObserver=0x%X IsFirst=%d]", aStatus, aQueuedDelete->iObserver, iDeleteQueue.IsFirst(aQueuedDelete));
 
 	if (aQueuedDelete->iObserver != NULL)
 		CompleteObserver(*aQueuedDelete->iObserver, aStatus);
@@ -390,7 +384,7 @@
 
 void CSmspDeleteQueue::CancelObserver(MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_CANCELOBSERVER_1, "*** CSmspDeleteQueue::CancelObserver [aObserver=0x%X]", &aObserver);
+	LOGSMSPROT2("*** CSmspDeleteQueue::CancelObserver [aObserver=0x%X]", &aObserver);
 
 	TSglQueIter<CQueuedPDUDelete> iter(iDeleteQueue);
 	CQueuedPDUDelete* queuedDelete = iter;
@@ -415,7 +409,7 @@
 
 CSmspDeleteQueue* CSmspDeleteQueue::NewL(MSmsComm& aSmsComm, const TSmsSettings& aSmsSettings, RMobileSmsMessaging& aSmsMessaging, TInt aPriority)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_NEWL_1, "CSmspDeleteQueue::NewL()");
+	LOGSMSPROT1("CSmspDeleteQueue::NewL()");
 
 	CSmspDeleteQueue* self = new (ELeave) CSmspDeleteQueue(aSmsComm, aPriority);
 	CleanupStack::PushL(self);
@@ -427,7 +421,7 @@
 
 void CSmspDeleteQueue::Start()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_START_1, "*** CSmspDeleteQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iDeleteQueue.IsEmpty());
+	LOGSMSPROT3("*** CSmspDeleteQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iDeleteQueue.IsEmpty());
 
 	if (!IsActive() && !iDeleteQueue.IsEmpty())
 		{
@@ -455,7 +449,7 @@
 
 void CSmspDeleteQueue::ConstructL(const TSmsSettings& aSmsSettings, RMobileSmsMessaging& aSmsMessaging)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_CONSTRUCTL_1, "CSmspDeleteQueue::ConstructL()");
+	LOGSMSPROT1("CSmspDeleteQueue::ConstructL()");
 
 	iSmsPDUDelete = CSmsPDUDelete::NewL(aSmsSettings, aSmsMessaging);
 	} // CSmspDeleteQueue::ConstructL
@@ -463,7 +457,7 @@
 
 void CSmspDeleteQueue::CompleteObserver(MSmsMessageObserver& aObserver, TInt aError, const CSmsMessage*)
 	{
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_COMPLETEOBSERVER_1, "*** CSmspDeleteQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", (TUint)&aObserver, aError, IsActive());
+	LOGSMSPROT4("*** CSmspDeleteQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", &aObserver, aError, IsActive());
 
 	if (iSmsComm.ObserverIsPresent(aObserver))
 		{
@@ -479,7 +473,7 @@
 
 CSmspSendQueue* CSmspSendQueue::NewL(MSmsComm& aSmsComm, CSmsSegmentationStore& aSegmentationStore, const TSmsSettings& aSmsSettings, const RMobileSmsMessaging::TMobileSmsCapsV1& aMobileSmsCaps, RMobileSmsMessaging& aSmsMessaging, TInt aPriority, CSmspSetBearer& aSmspSetBearer)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_NEWL_1, "CSmspSendQueue::NewL()");
+	LOGSMSPROT1("CSmspSendQueue::NewL()");
 
 	CSmspSendQueue* self = new (ELeave) CSmspSendQueue(aSmsComm, aPriority);
 	CleanupStack::PushL(self);
@@ -491,7 +485,7 @@
 
 void CSmspSendQueue::Start()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_START_1, "*** CSmspSendQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iMessageQueue.IsEmpty());
+	LOGSMSPROT3("*** CSmspSendQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iMessageQueue.IsEmpty());
 
 	if (!IsActive() && !iMessageQueue.IsEmpty())
 		{
@@ -517,7 +511,7 @@
 
 void CSmspSendQueue::ConstructL(CSmsSegmentationStore& aSegmentationStore, const TSmsSettings& aSmsSettings, const RMobileSmsMessaging::TMobileSmsCapsV1& aMobileSmsCaps, RMobileSmsMessaging& aSmsMessaging, CSmspSetBearer& aSmspSetBearer)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_CONSTRUCTL_1, "CSmspSendQueue::ConstructL()");
+	LOGSMSPROT1("CSmspSendQueue::ConstructL()");
 
 	iSmsMessageSend = CSmsMessageSend::NewL(aSegmentationStore, aSmsSettings, aMobileSmsCaps, aSmsMessaging, Priority(), aSmspSetBearer);
 	} // CSmspSendQueue::ConstructL
@@ -525,7 +519,7 @@
 
 void CSmspSendQueue::CancelRequestIfObserved(MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_CANCELREQUESTIFOBSERVED_1, "CSmspSendQueue::CancelRequestIfObserved()");
+	LOGSMSPROT1("CSmspSendQueue::CancelRequestIfObserved()");
 
 	if (IsActive() && &iMessageQueue.First()->iObserver == &aObserver)
 		{
@@ -536,7 +530,7 @@
 
 void CSmspSendQueue::CompleteObserver(MSmsMessageObserver& aObserver, TInt aError, const CSmsMessage*)
 	{
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_COMPLETEOBSERVER_1, "*** CSmspSendQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", (TUint)&aObserver, aError, IsActive());
+	LOGSMSPROT4("*** CSmspSendQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", &aObserver, aError, IsActive());
 
 	if (iSmsComm.ObserverIsPresent(aObserver))
 		{
@@ -547,7 +541,7 @@
 
 void CSmspSendQueue::Complete(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_COMPLETE_1, "CSmspSendQueue::Complete()");
+	LOGSMSPROT1("CSmspSendQueue::Complete()");
 
 	iSmsComm.MessageSendCompleted(aStatus);
 	} // CSmspSendQueue::Complete
@@ -561,7 +555,7 @@
 
 CSmspWriteQueue* CSmspWriteQueue::NewL(MSmsComm& aSmsComm, const TSmsSettings& aSmsSettings, RMobilePhone& aGsmPhone, CSmsSegmentationStore& aSegmentationStore, TInt aPriority)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_NEWL_1, "CSmspWriteQueue::NewL()");
+	LOGSMSPROT1("CSmspWriteQueue::NewL()");
 
 	CSmspWriteQueue* self = new (ELeave) CSmspWriteQueue(aSmsComm, aPriority);
 	CleanupStack::PushL(self);
@@ -573,7 +567,7 @@
 
 void CSmspWriteQueue::Start()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_START_1, "*** CSmspWriteQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iMessageQueue.IsEmpty());
+	LOGSMSPROT3("*** CSmspWriteQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iMessageQueue.IsEmpty());
 
 	if (!IsActive() && !iMessageQueue.IsEmpty())
 		{
@@ -599,7 +593,7 @@
 
 void CSmspWriteQueue::ConstructL(const TSmsSettings& aSmsSettings, RMobilePhone& aGsmPhone, CSmsSegmentationStore& aSegmentationStore)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_CONSTRUCTL_1, "CSmspWriteQueue::ConstructL()");
+	LOGSMSPROT1("CSmspWriteQueue::ConstructL()");
 
 	iSmsMessageWrite = CSmsMessageWrite::NewL(iSmsComm, aSmsSettings, aGsmPhone, aSegmentationStore);
 	} // CSmspWriteQueue::ConstructL
@@ -607,7 +601,7 @@
 
 void CSmspWriteQueue::CancelRequestIfObserved(MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_CANCELREQUESTIFOBSERVED_1, "CSmspWriteQueue::CancelRequestIfObserved()");
+	LOGSMSPROT1("CSmspWriteQueue::CancelRequestIfObserved()");
 
 	if (IsActive() && &iMessageQueue.First()->iObserver == &aObserver)
 		{
@@ -618,7 +612,7 @@
 
 void CSmspWriteQueue::CompleteObserver(MSmsMessageObserver& aObserver, TInt aError, const CSmsMessage* aSmsMessage)
 	{
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_COMPLETEOBSERVER_1, "*** CSmspWriteQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", (TUint)&aObserver, aError, IsActive());
+	LOGSMSPROT4("*** CSmspWriteQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", &aObserver, aError, IsActive());
 	if (iSmsComm.ObserverIsPresent(aObserver))
 		{
 		aObserver.MessageWriteCompleted(aError, aSmsMessage);
@@ -628,7 +622,7 @@
 
 void CSmspWriteQueue::Complete(TInt)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_COMPLETE_1, "CSmspWriteQueue::Complete()");
+	LOGSMSPROT1("CSmspWriteQueue::Complete()");
 
 	//Do Nothing :o)
 	} // CSmspWriteQueue::Complete

--- a/smsprotocols/smsstack/smsprot/Src/smspread.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspread.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -16,12 +16,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspreadTraces.h"
-#endif
-
 #include "smspread.h"
 #include "smspmain.h"
 
@@ -59,7 +53,7 @@
 								CSmspReceiveMode& aSmspReceiveMode,
 								CSmsMonitorDiskSpace& aSmsMonitorDiskSpace)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_NEWL_1, "CSmsPDURead::NewL()");
+    LOGSMSPROT1("CSmsPDURead::NewL()");
 
 	CSmsPDURead* smsPduRead = new (ELeave) CSmsPDURead(aSmsComm,
 													   aSmsSettings,
@@ -81,7 +75,7 @@
 
 void CSmsPDURead::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_CONSTRUCTL_1, "CSmsPDURead::ConstructL()");
+	LOGSMSPROT1("CSmsPDURead::ConstructL()");
 
 	ConstructTimeoutL();
 	User::LeaveIfError(iOOMTimer.CreateLocal());
@@ -134,7 +128,7 @@
  */
 void CSmsPDURead::Start()
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_START_1, "CSmsPDURead::Start(): iStatus=%d, iState=%d", iStatus.Int(), iState );
+    LOGSMSPROT3("CSmsPDURead::Start(): iStatus=%d, iState=%d", iStatus.Int(), iState );
 
 	if (IsSupported()  &&  IsActive() == EFalse  &&  iReassemblyStore.IsFull() == EFalse)
 		{
@@ -148,7 +142,7 @@
 
 void CSmsPDURead::ProcessPDUL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_PROCESSPDUL_1, "CSmsPDURead::ProcessPDUL()");
+	LOGSMSPROT1("CSmsPDURead::ProcessPDUL()");
 
 	//
 	// Initilse the Slot location data...
@@ -175,7 +169,7 @@
 
 	TRAPD(decodeError, iPduProcessor->DecodeAndProcessPDUL(iSlot, EFalse));
 	iStatus = decodeError;
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_PROCESSPDUL_2, "CSmsPDURead::ProcessPDUL(): DecodeAndProcessPDUL() returned %d", iStatus.Int());
+	LOGSMSPROT2("CSmsPDURead::ProcessPDUL(): DecodeAndProcessPDUL() returned %d", iStatus.Int());
 
 	//
 	// If the PDU cannot be decoded, and this was not due to memory or disk
@@ -206,7 +200,7 @@
  */
 void CSmsPDURead::DoRunL()
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DORUNL_1, "CSmsPDURead::DoRunL [iStatus=%d, iState=%d]", iStatus.Int(), iState);
+    LOGSMSPROT3("CSmsPDURead::DoRunL [iStatus=%d, iState=%d]", iStatus.Int(), iState);
 
 	//
 	// Handle state changes only for successful operations. Any errors will be
@@ -237,12 +231,8 @@
             {
 			if (iStatus.Int() == KErrNone)
 				{
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
-                LogSmsIfPDUL(_L8("ETEL RX PDU: "), iMsgData, EFalse); 
-                TBuf<40> timestamp;
-                SmsTimeStampL(timestamp);
-                OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSPDUREAD_DORUNL_2, "%S",timestamp);
-#endif
+	            LOGSMSIFPDU(_L8("ETEL RX PDU: "), iMsgData, EFalse);
+	            LOGSMSIFTIMESTAMP();
 	            ProcessPDUL();
 	            }
             }
@@ -276,8 +266,8 @@
             {
 			if (iStatus.Int() == KErrNone)
 				{
-	            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DORUNL_3, "CSmsPDURead::DoRunL in ESmsPDUReadSystemOutOfMemorySendNack2");
-    	        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DORUNL_4, "CSmsPDURead::DoRunL activate post OOM timer");
+	            LOGSMSPROT1("CSmsPDURead::DoRunL in ESmsPDUReadSystemOutOfMemorySendNack2");
+    	        LOGSMSPROT1("CSmsPDURead::DoRunL activate post OOM timer");
         	    iState = ESmsPDUWaitTimerAfterOOM;
             	iOOMTimer.After(iStatus,KWaitReadPduTime);
             	SetActive();
@@ -321,7 +311,7 @@
  */
 void CSmsPDURead::ResumeSmsReception()
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_RESUMESMSRECEPTION_1, "CSmsPDURead::ResumeSmsReception [iStatus=%d, iState=%d]", iStatus.Int(), iState );
+    LOGSMSPROT3("CSmsPDURead::ResumeSmsReception [iStatus=%d, iState=%d]", iStatus.Int(), iState );
 
     if (!IsActive())
         {
@@ -346,7 +336,7 @@
  */
 void CSmsPDURead::Receive()
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_RECEIVE_1, "CSmsPDURead::Receive [iStatus=%d, iState=%d]", iStatus.Int(), iState );
+    LOGSMSPROT3("CSmsPDURead::Receive [iStatus=%d, iState=%d]", iStatus.Int(), iState );
 
 	//
 	// Check if we need to resume reception first. This may be required if a
@@ -384,7 +374,7 @@
  */
 void CSmsPDURead::DoCancel()
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DOCANCEL_1, "CSmsPDURead::DoCancel [iStatus=%d iState=%d]", iStatus.Int(), iState );
+    LOGSMSPROT3("CSmsPDURead::DoCancel [iStatus=%d iState=%d]", iStatus.Int(), iState );
 
 	TimedSetActiveCancel();
 
@@ -465,7 +455,7 @@
 
 void CSmsPDURead::AddLogEvent()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_ADDLOGEVENT_1, "CSmsPDURead::AddLogEvent()");
+	LOGSMSPROT1("CSmsPDURead::AddLogEvent()");
 
 	iState = ESmsPDUReadLogging;
 	
@@ -496,7 +486,7 @@
 
 void CSmsPDURead::DoEncodeDeliverReportL()
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DOENCODEDELIVERREPORTL_1, "CSmsPDUReadProcess::DoEncodeDeliverReport [iStatus=%d]", iStatus.Int());
+    LOGSMSPROT2("CSmsPDUReadProcess::DoEncodeDeliverReport [iStatus=%d]", iStatus.Int());
 
     iDeliverReport.SetPdu(KNullDesC8);
 
@@ -512,7 +502,8 @@
         case ESmsPDUReadInvalidPDUSendNegativeAck:
         case ESmsPDUReadSystemOutOfMemorySendNegativeAck:
             {
-            OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DOENCODEDELIVERREPORTL_2, "CSmsPDURead::DoEncodeDeliverReport SendNegativeAck [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",iStatus.Int(),    iState,    iRpErrorCodesSupported);
+            LOGSMSPROT4("CSmsPDURead::DoEncodeDeliverReport SendNegativeAck [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",
+                                                                             iStatus.Int(),    iState,    iRpErrorCodesSupported);
 
             deliverReport.SetIsRPError(ETrue);
             const TInt failureCause = ErrorToTPError(iStatus.Int());
@@ -523,13 +514,15 @@
         case ESmsPDUReadAbsorbInvalidPduSendPositiveAck:
        	case ESmsPDUReadAbsorbValidPduSendPositiveAck:
             {
-            OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DOENCODEDELIVERREPORTL_3, "CSmsPDURead::DoEncodeDeliverReport SendPositiveAck [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",iStatus.Int(),    iState,    iRpErrorCodesSupported);
+            LOGSMSPROT4("CSmsPDURead::DoEncodeDeliverReport SendPositiveAck [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",
+                                                                             iStatus.Int(),    iState,    iRpErrorCodesSupported);
             deliverReport.SetIsRPError(EFalse);
             break;
             }
         default:
             {
-            OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DOENCODEDELIVERREPORTL_4, "CSmsPDURead::DoEncodeDeliverReport [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",iStatus.Int(), iState, iRpErrorCodesSupported);
+            LOGSMSPROT4("CSmsPDURead::DoEncodeDeliverReport [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",
+                                                             iStatus.Int(), iState, iRpErrorCodesSupported);
             SmspPanic( KSmspPanicUnexpectedStateEncountered );
             break;
             }
@@ -575,7 +568,7 @@
 void CSmsPDURead::SendDeliverReport()
 	{
 	// Method behaviour based on DEF047323
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_SENDDELIVERREPORT_1, "CSmsPDUReadProcess::SendDeliverReport(): iStatus=%d ",iStatus.Int());
+    LOGSMSPROT2("CSmsPDUReadProcess::SendDeliverReport(): iStatus=%d ",iStatus.Int());
 
     MakeStateTransitionBasedOnErrorCode();
 
@@ -587,7 +580,7 @@
         TRAPD(err, DoEncodeDeliverReportL());
         if(err != KErrNone)
             {
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_SENDDELIVERREPORT_2, "CSmsPDURead::DoEncodeDeliverReport [err=%d]", err);
+            LOGSMSPROT2("CSmsPDURead::DoEncodeDeliverReport [err=%d]", err);
             }
         }
     else
@@ -618,7 +611,8 @@
 
         default:
              {
-             OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_SENDDELIVERREPORT_3, "CSmsPDURead::DoEncodeDeliverReport [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",iStatus.Int(), iState, iRpErrorCodesSupported);
+             LOGSMSPROT4("CSmsPDURead::DoEncodeDeliverReport [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",
+                                                              iStatus.Int(), iState, iRpErrorCodesSupported);
              SmspPanic( KSmspPanicUnexpectedStateEncountered );
              }
              break;
@@ -634,7 +628,7 @@
  */
 void CSmsPDURead::Complete(TInt aError)
 	{
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_COMPLETE_1, "CSmsPDURead::Complete [aError=%d, iState=%d]", aError, iState );
+    LOGSMSPROT3("CSmsPDURead::Complete [aError=%d, iState=%d]", aError, iState );
 
 	switch (iState)
 		{
@@ -734,7 +728,7 @@
  */
 void CSmsPDURead::SetErrorCodeStatus(enum TRpErrorCodeIndex aIndex, TBool aValue)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_SETERRORCODESTATUS_1, "CSmsPDURead::SetErrorCodeStatus()");
+    LOGSMSPROT1("CSmsPDURead::SetErrorCodeStatus()");
 
     if (aValue)
     	{
@@ -758,7 +752,7 @@
  */
 TBool CSmsPDURead::GetErrorCodeStatus(enum TRpErrorCodeIndex aIndex)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_GETERRORCODESTATUS_1, "CSmsPDURead::GetErrorCodeStatus()");
+    LOGSMSPROT1("CSmsPDURead::GetErrorCodeStatus()");
 
     TBool rc;
     iRpErrorCodesSupported & (((TUint8) 0x01) << aIndex) ? rc = ETrue : rc = EFalse;
@@ -776,7 +770,7 @@
  */
 TBool CSmsPDURead::MapRpErrorToIndex(TInt aRpErrorCode, TRpErrorCodeIndex& aIndex)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_MAPRPERRORTOINDEX_1, "CSmsPDURead::MapRpErrorToIndex()");
+    LOGSMSPROT1("CSmsPDURead::MapRpErrorToIndex()");
 
     switch( aRpErrorCode )
         {
@@ -909,7 +903,7 @@
     TRAPD(ret, ini=CESockIniData::NewL(_L("smswap.sms.esk")));
     if(ret!=KErrNone)
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_READCONFIGURABLESMSSETTINGSL_1, "esk read failed, error code = [%d]", ret);
+        LOGSMSPROT2("esk read failed, error code = [%d]", ret);
         User::Leave(ret);
         }
 
@@ -986,7 +980,7 @@
  */
 TBool CSmsPDURead::IsSupported() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_ISSUPPORTED_1, "CSmsPDURead::IsSupported()");
+	LOGSMSPROT1("CSmsPDURead::IsSupported()");
 
 	if (( iMobileSmsCaps.iSmsControl & RMobileSmsMessaging::KCapsReceiveUnstoredClientAck ) ||
 		( iMobileSmsCaps.iSmsControl & RMobileSmsMessaging::KCapsReceiveUnstoredPhoneAck ) ||
@@ -1013,7 +1007,7 @@
  */
 void CSmsPDURead::MakeStateTransitionBasedOnErrorCode()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_MAKESTATETRANSITIONBASEDONERRORCODE_1, "CSmsPDURead::MakeStateTransitionBasedOnErrorCode()");
+    LOGSMSPROT1("CSmsPDURead::MakeStateTransitionBasedOnErrorCode()");
 
     if (iState != ESmsPDUReadWaitingForPDU)
         SmspPanic( KSmspPanicUnexpectedStateEncountered );
@@ -1046,7 +1040,7 @@
 		  (iPduProcessor->IsClass2Message()  &&  iPduProcessor->IsDiscardType0Class2() ) ||
 		  (iPduProcessor->IsClass0Message() == EFalse  &&  iPduProcessor->IsClass2Message() == EFalse)) )
 		    {
-		    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_MAKESTATETRANSITIONBASEDONERRORCODE_2, "CSmsPDURead::MakeStateTransitionBasedOnErrorCode Absorb Valid PDU");
+		    	LOGSMSPROT1("CSmsPDURead::MakeStateTransitionBasedOnErrorCode Absorb Valid PDU");
 	            iState = ESmsPDUReadAbsorbValidPduSendPositiveAck;
 		    }
 	        else
@@ -1067,7 +1061,7 @@
  */
 CSmsPDUReadLogger* CSmsPDUReadLogger::NewL(RFs& aFs, TInt aPriority)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_NEWL_1, "CSmsPDUReadLogger::NewL()");
+	LOGSMSPROT1("CSmsPDUReadLogger::NewL()");
 
 	CSmsPDUReadLogger* self = new (ELeave) CSmsPDUReadLogger(aPriority);
 	CleanupStack::PushL(self);
@@ -1097,7 +1091,7 @@
  */
 void CSmsPDUReadLogger::ConstructL(RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_CONSTRUCTL_1, "CSmsPDUReadLogger::ConstructL()");
+	LOGSMSPROT1("CSmsPDUReadLogger::ConstructL()");
 
 	iLogger = CSmsEventLogger::NewL(aFs, Priority());
 	} // CSmsPDUReadLogger::ConstructL
@@ -1123,7 +1117,7 @@
  */
 void CSmsPDUReadLogger::ChangeOrAddLogEvent(CSmsMessage& aSmsMessage, const TLogSmsPduData& aSmsPDUData, const TTime* aTime, TRequestStatus& aStatus)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_CHANGEORADDLOGEVENT_1, "CSmsPDUReadLogger::ChangeOrAddLogEvent()");
+    LOGSMSPROT1("CSmsPDUReadLogger::ChangeOrAddLogEvent()");
         
     __ASSERT_DEBUG(iState == ESmsPDUReadLoggerIdle, SmspPanic(KSmspPanicUnexpectedState));
 
@@ -1159,7 +1153,7 @@
  */
 void CSmsPDUReadLogger::AddLogEvent()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_ADDLOGEVENT_1, "CSmsPDUReadLogger::AddLogEvent()");
+	LOGSMSPROT1("CSmsPDUReadLogger::AddLogEvent()");
 
 	iState = ESmsPDUReadLoggerAdd;
 
@@ -1173,7 +1167,7 @@
  */
 void CSmsPDUReadLogger::GetLogEvent()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_GETLOGEVENT_1, "CSmsPDUReadLogger::GetLogEvent()");
+	LOGSMSPROT1("CSmsPDUReadLogger::GetLogEvent()");
 
 	__ASSERT_DEBUG(iSmsMessage->LogServerId() != KLogNullId, SmspPanic(KSmspPanicLogIdNull));
 
@@ -1189,7 +1183,7 @@
  */
 void CSmsPDUReadLogger::ChangeLogEvent()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_CHANGELOGEVENT_1, "CSmsPDUReadLogger::ChangeLogEvent()");
+	LOGSMSPROT1("CSmsPDUReadLogger::ChangeLogEvent()");
 	
 	iState = ESmsPDUReadLoggerChange;	
 	iLogger->ChangeEvent(iStatus, *iSmsMessage, iTimePtr, *iSmsPDUData);
@@ -1199,7 +1193,7 @@
 
 void CSmsPDUReadLogger::DoRunL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_DORUNL_1, "CSmsPDUReadLogger::DoRunL()");
+	LOGSMSPROT1("CSmsPDUReadLogger::DoRunL()");
 
 	switch (iState)
 		{
@@ -1249,7 +1243,7 @@
 	// conditions are very difficult to create in a deterministic way.
 	BULLSEYE_OFF
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_DOCANCEL_1, "CSmsPDUReadLogger::DoCancel()");
+	LOGSMSPROT1("CSmsPDUReadLogger::DoCancel()");
 
 	iLogger->Cancel();
 
@@ -1270,7 +1264,7 @@
 
 void CSmsPDUReadLogger::Complete(TInt aStatus)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_COMPLETE_1, "CSmsPDUReadLogger::Complete()");
+    LOGSMSPROT1("CSmsPDUReadLogger::Complete()");
     
     // Call the base function to perform the actual complete...
     CSmsuActiveBase::Complete(aStatus);

--- a/smsprotocols/smsstack/smsprot/Src/smspreassemblystore.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspreassemblystore.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspreassemblystoreTraces.h"
-#endif
-
 #include "smsstacklog.h"
 #include "gsmubuf.h"
 #include "smspreassemblystore.h"
@@ -31,7 +25,7 @@
  */
 void CReassemblyStoreUtility::PopulateEntry(TSmsReassemblyEntry& aEntry,const CSmsMessage& aSmsMessage,TInt aNumSmss)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTOREUTILITY_POPULATEENTRY_1, "CReassemblyStoreUtility::PopulateEntry");
+	LOGSMSPROT1("CReassemblyStoreUtility::PopulateEntry");
 	aEntry.SetReference(0);
 	aEntry.SetTotal(1);
 	aEntry.SetCount(1);
@@ -93,7 +87,7 @@
  */
 void CReassemblyStoreUtility::PrivatePath(RFs& aFs, TDes& aPath)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTOREUTILITY_PRIVATEPATH_1, "CReassemblyStoreUtility::PrivatePath()");
+	LOGSMSPROT1("CReassemblyStoreUtility::PrivatePath()");
 
 	TDriveUnit driveUnit(KStoreDrive);
 	TDriveName drive=driveUnit.Name();
@@ -130,7 +124,7 @@
 */
 void CReassemblyStore::InitializeL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_INITIALIZEL_1, "CClass0SmsReassemblyStore::InitializeL()");
+	LOGSMSPROT1("CClass0SmsReassemblyStore::InitializeL()");
 	// Initialize Re-assembly store.
 	OpenStoreL();
 	BeginTransactionLC();
@@ -171,7 +165,8 @@
 void CReassemblyStore::PurgeL(const TTimeIntervalMinutes& aTimeIntervalMinutes,TBool aPurgeIncompleteOnly)
 	{
 	//Call purging function
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_PURGEL_1, "CReassemblyStore::PurgeL(): aTimeIntervalMinutes=%d, aPurgeIncompleteOnly=%d",aTimeIntervalMinutes.Int(), aPurgeIncompleteOnly);
+	LOGSMSPROT3("CReassemblyStore::PurgeL(): aTimeIntervalMinutes=%d, aPurgeIncompleteOnly=%d",
+			 aTimeIntervalMinutes.Int(), aPurgeIncompleteOnly);
 
 	// TODO - flag
 	// we could also save the call of the method from the consruction of the smsprot
@@ -179,7 +174,7 @@
 		return;
 
 	TInt count=iEntryArray.Count();
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_PURGEL_2, "CClass0SmsReassemblyStore::PurgeL(): count=%d", count);
+	LOGSMSPROT2("CClass0SmsReassemblyStore::PurgeL(): count=%d", count);
 
 	TTime time;
 	time.UniversalTime();
@@ -214,7 +209,7 @@
 	{
 	const TInt count = iEntryArray.Count();
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_DELETEENUMERATEDSIMENTRIES_1, "CReassemblyStore::DeleteEnumeratedSIMEntries(): %d messages in RAS", count);
+	LOGSMSPROT2("CReassemblyStore::DeleteEnumeratedSIMEntries(): %d messages in RAS", count);
 
 	TInt index;
 
@@ -239,7 +234,8 @@
 */
 TInt CReassemblyStore::NumberOfCompleteMessages()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_NUMBEROFCOMPLETEMESSAGES_1, "CReassemblyStore::NumberOfCompleteMessages(): iEntryArray.Count()=%d",iEntryArray.Count());
+	LOGSMSPROT2("CReassemblyStore::NumberOfCompleteMessages(): iEntryArray.Count()=%d",
+				iEntryArray.Count());
 
 	//local variable for complete entries
 	TInt count( 0 );
@@ -294,7 +290,8 @@
 */
 void CReassemblyStore::AddSegmentToReassemblyStoreL(CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms, TInt& aIndex, TBool& aIsComplete, TBool aIsEnumeration, TInt& aCount, TInt& aTotal)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_1, "CReassemblyStore::AddSegmentToReassemblyStoreL(): isComplete Message=%d",aSmsMessage.IsComplete());
+	LOGSMSPROT2("CReassemblyStore::AddSegmentToReassemblyStoreL(): isComplete Message=%d",
+				aSmsMessage.IsComplete());
 
 	/*
 	(1) If it is a single segment message create a new message
@@ -327,7 +324,8 @@
 		TInt  segStoreIndex(KErrNotFound);
 
 		MatchPDUToExistingMessage(aSmsMessage, segStoreIndex);
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_2, "CSmsReassemblyStore::AddSegmentToReassemblyStoreL(): ""segStoreIndex=%d", segStoreIndex);
+		LOGSMSPROT2("CSmsReassemblyStore::AddSegmentToReassemblyStoreL(): "
+					"segStoreIndex=%d", segStoreIndex);
 
 		//
 		// If not yet complete, then we must be part of a multiple PDU message.
@@ -346,7 +344,9 @@
 			UpdateExistingMessageL(aSmsMessage, aGsmSms, aIndex,
 									aIsComplete, isDuplicateMsgRef,
 									isDuplicateSlot);
-			OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_3, "CSmsReassemblyStore::AddSegmentToReassemblyStoreL(): ""aIndex=%d, isComplete=%d, isDuplicateMsgRef=%d, isDuplicateSlot=%d",aIndex, aIsComplete, isDuplicateMsgRef, isDuplicateSlot);
+			LOGSMSPROT5("CSmsReassemblyStore::AddSegmentToReassemblyStoreL(): "
+						"aIndex=%d, isComplete=%d, isDuplicateMsgRef=%d, isDuplicateSlot=%d",
+						aIndex, aIsComplete, isDuplicateMsgRef, isDuplicateSlot);
 
 			if (isDuplicateMsgRef)
 				{
@@ -413,7 +413,7 @@
 */
 void CReassemblyStore::DeleteMessageL(const CSmsMessage& aSmsMessage, TBool aPassed)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_DELETEMESSAGEL_1, "CReassemblyStore::DeleteMessageL()");
+	LOGSMSPROT1("CReassemblyStore::DeleteMessageL()");
 	TInt index(0);
 	BeginTransactionLC();
 	if (FindMessageL(aSmsMessage, aPassed, index))
@@ -435,7 +435,7 @@
 */
 void CReassemblyStore::UpdateLogServerIdOfMessageL(const CSmsMessage& aSmsMessage, TInt aIndex)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_UPDATELOGSERVERIDOFMESSAGEL_1, "CReassemblyStore::UpdateLogServerIdOfMessageL()");
+	LOGSMSPROT1("CReassemblyStore::UpdateLogServerIdOfMessageL()");
     TInt  foundIndex(KErrNotFound);
 	TBool  found(EFalse);
 
@@ -460,7 +460,7 @@
 */
 void CReassemblyStore::SetMessagePassedToClientL(const CSmsMessage& aSmsMessage, TBool aPassed)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_SETMESSAGEPASSEDTOCLIENTL_1, "CReassemblyStore::SetMessagePassedToClientL()");
+	LOGSMSPROT1("CReassemblyStore::SetMessagePassedToClientL()");
 	TInt index(0);
 
 	BeginTransactionLC();
@@ -490,7 +490,7 @@
 */
 void CReassemblyStore::NewMessagePDUL(TInt& aIndex,CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_NEWMESSAGEPDUL_1, "CReassemblyStore::NewMessagePDUL");
+	LOGSMSPROT1("CReassemblyStore::NewMessagePDUL");
 
 	if (aSmsMessage.Time() >= iLastRealTime)
 		{
@@ -545,7 +545,7 @@
 												TInt aIndex, TBool& aIsComplete,
 												TBool& aDuplicateMsgRef, TBool& aDuplicateSlot)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1, "CReassemblyStore::UpdateExistingMessageL");
+	LOGSMSPROT1("CReassemblyStore::UpdateExistingMessageL");
 	aIsComplete = EFalse;
 	BeginTransactionLC();
 	UpdateExistingMessageL(aSmsMessage, aGsmSms, aDuplicateMsgRef, aDuplicateSlot);
@@ -574,7 +574,7 @@
 void CReassemblyStore::MatchPDUToExistingMessage(const CSmsMessage& aSmsMessage,
 													TInt& aIndex)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_1, "CReassemblyStore::MatchPDUToExistingMessage()");
+	LOGSMSPROT1("CReassemblyStore::MatchPDUToExistingMessage()");
 
 	aIndex = KErrNotFound;
 
@@ -611,7 +611,7 @@
 			}
 		}
 
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_2, "CReassemblyStore::MatchPDUToExistingMessage(): reassemblyCount=%d, aIndex=%d", reassemblyCount, aIndex);
+	LOGSMSPROT3("CReassemblyStore::MatchPDUToExistingMessage(): reassemblyCount=%d, aIndex=%d", reassemblyCount, aIndex);
 	} // CReassemblyStore::MatchPDUToExistingMessage
 
 /**
@@ -627,7 +627,7 @@
 */
 void CReassemblyStore::GetMessageL(TInt aIndex, CSmsMessage& aSmsMessage)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_GETMESSAGEL_1, "CReassemblyStore::GetMessageL()");
+	LOGSMSPROT1("CReassemblyStore::GetMessageL()");
 	const TReassemblyEntry&  entry = iEntryArray[aIndex];
 	RetrieveMessageL(entry, aSmsMessage);
 	}
@@ -647,7 +647,7 @@
 										TBool aPassed,
 										TInt& aIndex)
  	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_FINDMESSAGEL_1, "CReassemblyStore::FindMessageL()");
+	LOGSMSPROT1("CReassemblyStore::FindMessageL()");
 
 	//
 	// Parse the GSM data from the SMS message...
@@ -673,7 +673,7 @@
 			//
 			// Found!
 			//
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_FINDMESSAGEL_2, "CReassemblyStore::FindMessage(): Found! index=%d", index);
+			LOGSMSPROT2("CReassemblyStore::FindMessage(): Found! index=%d", index);
 
 			aIndex = index;
 			
@@ -684,7 +684,7 @@
 	//
 	// Not found...
 	//
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_FINDMESSAGEL_3, "CReassemblyStore::FindMessage(): Not found!");
+	LOGSMSPROT1("CReassemblyStore::FindMessage(): Not found!");
 
 	return EFalse;
 	} // CReassemblyStore::FindMessageL

--- a/smsprotocols/smsstack/smsprot/Src/smsprecvmode.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smsprecvmode.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smsprecvmodeTraces.h"
-#endif
-
 #include <commsdattypesv1_1.h>
 #include <cdbcols.h>
 
@@ -67,7 +61,7 @@
  */
 CSmspReceiveMode* CSmspReceiveMode::NewL(const TSmsSettings& aSmsSettings, RMobileSmsMessaging& aSmsMessaging, const RMobileSmsMessaging::TMobileSmsCapsV1& aSmsCaps, TInt aPriority)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_NEWL_1, "CSmspReceiveMode::NewL()");
+	LOGSMSPROT1("CSmspReceiveMode::NewL()");
 
 	CSmspReceiveMode* self = new (ELeave) CSmspReceiveMode(aSmsSettings, aSmsMessaging, aSmsCaps, aPriority);
 	CleanupStack::PushL(self);
@@ -79,7 +73,7 @@
 
 void CSmspReceiveMode::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_CONSTRUCTL_1, "CSmspReceiveMode::ConstructL()");
+	LOGSMSPROT1("CSmspReceiveMode::ConstructL()");
 
 	CSmspCommDbEvent::ConstructL();
 	User::LeaveIfError(iCommDbRetryTimer.CreateLocal());
@@ -92,7 +86,7 @@
  */
 void CSmspReceiveMode::Start(TRequestStatus& aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_START_1, "CSmspReceiveMode::Start()");
+	LOGSMSPROT1("CSmspReceiveMode::Start()");
 
 	Cancel();
 	Queue(aStatus);
@@ -127,7 +121,7 @@
  */
 void CSmspReceiveMode::NotifyOnEvent()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_NOTIFYONEVENT_1, "CSmspReceiveMode::NotifyOnEvent()");
+	LOGSMSPROT1("CSmspReceiveMode::NotifyOnEvent()");
 
 	iState = ESmspReceiveModeNotifyOnEvent;
 	CSmspCommDbEvent::NotifyOnEvent();
@@ -141,7 +135,7 @@
  */
 void CSmspReceiveMode::SetReceiveMode(RMobileSmsMessaging::TMobileSmsReceiveMode aReceiveMode)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_SETRECEIVEMODE_1, "CSmspReceiveMode::SetReceiveMode()");
+	LOGSMSPROT1("CSmspReceiveMode::SetReceiveMode()");
 
 	aReceiveMode = SelectReceiveMode(aReceiveMode);
 	iSmsReceiveModeLastSet = aReceiveMode;
@@ -154,7 +148,7 @@
 
 void CSmspReceiveMode::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_DOCANCEL_1, "CSmspReceiveMode::DoCancel()");
+	LOGSMSPROT1("CSmspReceiveMode::DoCancel()");
 
 	TimedSetActiveCancel();
 	switch (iState)
@@ -213,7 +207,7 @@
  */
 void CSmspReceiveMode::GetCommDbReceiveModeL(RMobileSmsMessaging::TMobileSmsReceiveMode& aReceiveMode)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_GETCOMMDBRECEIVEMODEL_1, "CSmspReceiveMode::GetCommDbReceiveModeL()");
+	LOGSMSPROT1("CSmspReceiveMode::GetCommDbReceiveModeL()");
 
 #ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
 	CMDBSession* sess = CMDBSession::NewL(KCDVersion1_2);
@@ -236,7 +230,7 @@
 
 void CSmspReceiveMode::DoRunL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_DORUNL_1, "CSmspReceiveMode::DoRunL()");
+	LOGSMSPROT1("CSmspReceiveMode::DoRunL()");
 
 	switch (iState)
 		{
@@ -269,7 +263,7 @@
 				else
 					{
 					// Failed to read CommDB even after retries. Set the receive mode to the last known setting
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_DORUNL_2, "CSmspReceiveMode::DoRunL in ESmspReceiveModeRetryCommDb state, failed to read CommDb, using mode #%d", iSmsReceiveModeLastSet );
+					LOGSMSPROT2("CSmspReceiveMode::DoRunL in ESmspReceiveModeRetryCommDb state, failed to read CommDb, using mode #%d", iSmsReceiveModeLastSet );
 					SetReceiveMode(iSmsReceiveModeLastSet);
 					}
 				}
@@ -314,7 +308,7 @@
  */
 RMobileSmsMessaging::TMobileSmsReceiveMode CSmspReceiveMode::SelectReceiveMode() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_SELECTRECEIVEMODE_1, "CSmspReceiveMode::SelectReceiveMode()");
+	LOGSMSPROT1("CSmspReceiveMode::SelectReceiveMode()");
 
 	const TUint32 smsControl = iSmsCaps.iSmsControl;
 	RMobileSmsMessaging::TMobileSmsReceiveMode recvMode = RMobileSmsMessaging::EReceiveModeUnspecified;
@@ -348,7 +342,7 @@
  */
 RMobileSmsMessaging::TMobileSmsReceiveMode CSmspReceiveMode::SelectReceiveMode(RMobileSmsMessaging::TMobileSmsReceiveMode aPreferredMode) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_SELECTRECEIVEMODE1_1, "CSmspReceiveMode::SelectReceiveMode()");
+	LOGSMSPROT1("CSmspReceiveMode::SelectReceiveMode()");
 
 	const TUint32 smsControl = iSmsCaps.iSmsControl;
 	TBool usePreferred = EFalse;

--- a/smsprotocols/smsstack/smsprot/Src/smsprot.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smsprot.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smsprotTraces.h"
-#endif
-
 #include <commsdattypesv1_1.h>
 #include <logwrap.h>
 #include "Gsmumsg.h"
@@ -68,7 +62,11 @@
  */
 CSmsProtocolFamily * CSmsProtocolFamily::NewL()
 	{
-    OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLFAMILY_NEWL_1, "CSmsProtocolFamily::NewL [version %u.%u.%u]",KSmsPrtMajorVersionNumber,KSmsPrtMinorVersionNumber,KSmsPrtBuildVersionNumber );
+	LOGSMSPROT4("CSmsProtocolFamily::NewL [version %d.%d.%d]",
+			 KSmsPrtMajorVersionNumber,
+			 KSmsPrtMinorVersionNumber,
+			 KSmsPrtBuildVersionNumber
+			 );
 	return new (ELeave)CSmsProtocolFamily;
 	} // CSmsProtocolFamily::NewL
 
@@ -81,7 +79,7 @@
  */
 TInt CSmsProtocolFamily::Install()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLFAMILY_INSTALL_1, "CSmsProtocolFamily::Install");
+	LOGSMSPROT1("CSmsProtocolFamily::Install");
 	return KErrNone;
 	} // CProtocolFamilyBase::Install
 
@@ -95,7 +93,7 @@
  */
 TInt CSmsProtocolFamily::Remove()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLFAMILY_REMOVE_1, "CSmsProtocolFamily::Remove");
+	LOGSMSPROT1("CSmsProtocolFamily::Remove");
 	return KErrNone;
 	} // CProtocolFamilyBase::Remove
 
@@ -111,7 +109,7 @@
  */
 CProtocolBase * CSmsProtocolFamily::NewProtocolL(TUint /*aSockType*/,TUint /*aProtocol*/)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLFAMILY_NEWPROTOCOLL_1	        , "CSmsProtocolFamily::NewProtocolL");
+	LOGSMSPROT1("CSmsProtocolFamily::NewProtocolL");
 	return CSmsProtocol::NewL();
 	} // CProtocolFamilyBase::NewProtocolL
 
@@ -129,12 +127,12 @@
  */
 TUint CSmsProtocolFamily::ProtocolList(TServerProtocolDesc *& aProtocolList)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLFAMILY_PROTOCOLLIST_1, "CSmsProtocolFamily::ProtocolList");
+	LOGSMSPROT1("CSmsProtocolFamily::ProtocolList");
 
 	TRAPD(ret, (aProtocolList=new(ELeave) TServerProtocolDesc[1]));
 	if(ret!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLFAMILY_PROTOCOLLIST_2, "WARNING! new TServerProtocolDesc left with %d", ret);
+		LOGSMSPROT2("WARNING! new TServerProtocolDesc left with %d", ret);
 		return 0;
 		}
 
@@ -171,7 +169,7 @@
  */
 EXPORT_C CProtocolFamilyBase* InstallSMS()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, INSTALLSMS_1, "CSmsProtocolFamily::CSmsProtocolFamily()");
+	LOGSMSPROT1("CSmsProtocolFamily::CSmsProtocolFamily()");
 
 	CSmsProtocolFamily*  smsProtocolFamily(NULL);
 	
@@ -192,7 +190,7 @@
  */
 CSmsProtocol* CSmsProtocol::NewL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NEWL_1, "CSmsProtocol::NewL()");
+	LOGSMSPROT1("CSmsProtocol::NewL()");
 
 	return new (ELeave) CSmsProtocol();
 	} // CSmsProtocol::NewL
@@ -254,7 +252,7 @@
  */
 CServProviderBase *CSmsProtocol::NewSAPL(TUint aSocketType)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NEWSAPL_1, "*CSmsProtocol::NewSAPL [sockettype=%d]", aSocketType);
+	LOGSMSPROT2("*CSmsProtocol::NewSAPL [sockettype=%d]", aSocketType);
 	if (aSocketType!=KSockDatagram)
 		User::Leave(KErrNotSupported);
 	return CSmsProvider::NewL(*this);
@@ -276,14 +274,14 @@
  */
 void CSmsProtocol::InitL(TDesC& /*aTag*/)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_INITL_1, "CSmsProtocol::InitL");
+	LOGSMSPROT1("CSmsProtocol::InitL");
 
 	User::LeaveIfError(iFs.Connect());
 
 	iReassemblyStore=CFacadeSmsReassemblyStore::NewL(iFs, *this);
 	iReassemblyStore->InitL();
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_INITL_2, "CSmsProtocol::InitL Constructing members");
+	LOGSMSPROT1("CSmsProtocol::InitL Constructing members");
 
 	ReadConfigurableSettingsL();
 
@@ -317,7 +315,7 @@
 		User::LeaveIfError(ret);
 #endif
 */
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_INITL_3, "CSmsProtocol::InitL Querying CommDb");
+	LOGSMSPROT1("CSmsProtocol::InitL Querying CommDb");
 
 	// Read the global modem ID setting from  Cooms Database
 	TUint32 modemId = 0;
@@ -346,7 +344,12 @@
 
 	CleanupStack::PopAndDestroy(sess);
 
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_INITL_4, "CSmsProtocol::InitL [modemId=%d tsy=%S]",(TInt)modemId, iGsmTsyName );
+#ifdef _SMS_LOGGING_ENABLED
+	TBuf8<KCommsDbSvrMaxFieldLength> buf8;
+	buf8.Copy(iGsmTsyName);
+	LOGSMSPROT3("CSmsProtocol::InitL [modemId=%d tsy=%S]",
+				modemId, &buf8);
+#endif
 
 	// Start event notification state machines
 	iSmsModemNotification->Start();
@@ -393,7 +396,7 @@
  */
 void CSmsProtocol::StartL(void)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_STARTL_1, "CSmsProtocol::StartL");
+	LOGSMSPROT1("CSmsProtocol::StartL");
 	} // CSmsProtocol::StartL
 
 
@@ -404,7 +407,7 @@
  */
 void CSmsProtocol::Identify(TServerProtocolDesc *aDesc)const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_IDENTIFY_1, "CSmsProtocol::Identify");
+	LOGSMSPROT1("CSmsProtocol::Identify");
 
 	aDesc->iName=KSmsDatagram;
 	aDesc->iAddrFamily=KSMSAddrFamily;
@@ -433,7 +436,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NEWHOSTRESOLVERL_1, "CSmsProtocol::NewHostResolverL");
+    LOGSMSPROT1("CSmsProtocol::NewHostResolverL");
     SmspPanic(ESmspCantCreateHostResolver);
     return NULL;
     BULLSEYE_RESTORE
@@ -451,7 +454,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NEWSERVICERESOLVERL_1, "*CSmsProtocol::NewServiceResolverL");
+    LOGSMSPROT1("*CSmsProtocol::NewServiceResolverL");
     SmspPanic(ESmspCantCreateServiceResolver);
     return NULL;
     BULLSEYE_RESTORE
@@ -469,7 +472,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NEWNETDATABASEL_1, "CSmsProtocol::NewNetDatabaseL");
+    LOGSMSPROT1("CSmsProtocol::NewNetDatabaseL");
     SmspPanic(ESmspCantCreateNetDatabase);
     return NULL;
     BULLSEYE_RESTORE
@@ -487,7 +490,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_BINDL_1, "CSmsProtocol::BindL");
+    LOGSMSPROT1("CSmsProtocol::BindL");
     SmspPanic(ESmspCantBind);
     BULLSEYE_RESTORE
     }
@@ -505,7 +508,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_BINDTOL_1, "CSmsProtocol::BindToL");
+    LOGSMSPROT1("CSmsProtocol::BindToL");
     SmspPanic(ESmspCantBindTo);
     BULLSEYE_RESTORE
     }
@@ -522,7 +525,7 @@
 	TRAPD(ret, ini=CESockIniData::NewL(_L("smswap.sms.esk")));
 	if(ret!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_READCONFIGURABLESETTINGSL_1, "esk read failed, error code = [%d]", ret);
+		LOGSMSPROT2("esk read failed, error code = [%d]", ret);
 		User::Leave(ret);
 		}
 
@@ -533,7 +536,7 @@
 		{
 		if (var > 0)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_READCONFIGURABLESETTINGSL_2, "sendTryTimeout [%d]", var);
+			LOGSMSPROT2("sendTryTimeout [%d]", var);
 			iSmsSettings.SetSendTryTimeout(var);
 			}
 		else
@@ -546,7 +549,7 @@
 		{
 		if (var > 0)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_READCONFIGURABLESETTINGSL_3, "bootTimerTimeout [%d]", var);
+			LOGSMSPROT2("bootTimerTimeout [%d]", var);
 			iSmsSettings.SetBootTimerTimeout(var);
 			}
 		else
@@ -571,7 +574,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_SEND_1, "CSmsProtocol::Send");
+    LOGSMSPROT1("CSmsProtocol::Send");
     SmspPanic(ESmspCantSend);
     return KErrNotSupported;
     BULLSEYE_RESTORE
@@ -589,7 +592,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_PROCESS_1, "CSmsProtocol::Process");
+    LOGSMSPROT1("CSmsProtocol::Process");
     SmspPanic(ESmspCantProcess);
     BULLSEYE_RESTORE
     }
@@ -606,7 +609,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_GETOPTION_1, "CSmsProtocol::GetOption");
+    LOGSMSPROT1("CSmsProtocol::GetOption");
     // SmspPanic(ESmspCantGetOption);
     return KErrNotSupported;
     BULLSEYE_RESTORE
@@ -624,7 +627,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_SETOPTION_1, "CSmsProtocol::SetOption");
+    LOGSMSPROT1("CSmsProtocol::SetOption");
     //SmspPanic(ESmspCantSetOption);
     return KErrNotSupported;
     BULLSEYE_RESTORE
@@ -642,7 +645,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ERROR_1, "CSmsProtocol::Error");
+    LOGSMSPROT1("CSmsProtocol::Error");
     SmspPanic(ESmspCantError);
     BULLSEYE_RESTORE
     }
@@ -656,7 +659,7 @@
  */
 void CSmsProtocol::AddSmsMessageObserverL(MSmsMessageObserver& aObserver)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ADDSMSMESSAGEOBSERVERL_1, "CSmsProtocol::AddSmsMessageObserverL [aObserver=0x%08x]", &aObserver);
+    LOGSMSPROT2("CSmsProtocol::AddSmsMessageObserverL [aObserver=0x%08x]", &aObserver);
     iSmsMessageObserverList.AppendL(&aObserver);
     SetClosingDown(EFalse);
     }
@@ -673,7 +676,7 @@
  */
 TInt CSmsProtocol::BindSmsMessageObserver(MSmsMessageObserver& aObserver,const TSmsAddr& aSmsAddr)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_BINDSMSMESSAGEOBSERVER_1, "CSmsProtocol::BindSmsMessageObserver 0x%08x", &aObserver);
+	LOGSMSPROT2("CSmsProtocol::BindSmsMessageObserver 0x%08x", &aObserver);
 	__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
 	TInt ret=KErrNone;
 
@@ -693,7 +696,7 @@
 			TRAP(ret, ProcessCompleteSmsMessagesL());
 			if(ret != KErrNone)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_BINDSMSMESSAGEOBSERVER_2, "WARNING! CSmsProtocol::ProcessCompleteSmsMessagesL left with %d", ret);
+				LOGSMSPROT2("WARNING! CSmsProtocol::ProcessCompleteSmsMessagesL left with %d", ret);
 				}
 			}
 		}
@@ -712,7 +715,7 @@
  */
 void CSmsProtocol::RemoveSmsMessageObserver(const MSmsMessageObserver& aObserver)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_REMOVESMSMESSAGEOBSERVER_1, "CSmsProtocol::RemoveSmsMessageObserver 0x%08x", &aObserver);
+    LOGSMSPROT2("CSmsProtocol::RemoveSmsMessageObserver 0x%08x", &aObserver);
     __ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
     TInt index=ObserverIndex(aObserver);
     iSmsMessageObserverList.Delete(index);
@@ -725,7 +728,7 @@
  */
 void CSmsProtocol::SendSmsMessage(CSmsMessage* aSmsMessage,MSmsMessageObserver& aObserver,TUint aOptions)
 	{
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_SENDSMSMESSAGE_1, "CSmsProtocol::SendSmsMessage [aObserver=0x%08X]", (TUint) &aObserver);
+	LOGSMSPROT2("CSmsProtocol::SendSmsMessage [aObserver=0x%X]", &aObserver);
 	__ASSERT_DEBUG(ObserverIsPresent(aObserver), SmspPanic(ESmspMessageObserverNotFound));
 
 	// Ensure the modem is connected and initialized
@@ -761,7 +764,7 @@
         }
     if( err != KErrNone )
         {
-        OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CHECKPOWEREDUP_1, "CSmsProtocol::CheckPoweredUp [err=%d, iModemDetection=%d, IsBackupOrRestoreInProgress=%d]", err, iModemDetection, iBackupRestoreSession->IsBackupOrRestoreInProgress());
+        LOGSMSPROT4("CSmsProtocol::CheckPoweredUp [err=%d, iModemDetection=%d, IsBackupOrRestoreInProgress=%d]", err, iModemDetection, iBackupRestoreSession->IsBackupOrRestoreInProgress());
         }    
     return err;
     }
@@ -779,7 +782,7 @@
  */
 void CSmsProtocol::CancelSendSmsMessage(MSmsMessageObserver& aObserver,TBool)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CANCELSENDSMSMESSAGE_1, "CSmsProtocol::CancelSendSmsMessage 0x%08x", &aObserver);
+	LOGSMSPROT2("CSmsProtocol::CancelSendSmsMessage 0x%08x", &aObserver);
 
 	__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
 
@@ -792,7 +795,7 @@
  */
 void CSmsProtocol::EnumeratePhone(MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ENUMERATEPHONE_1, "CSmsProtocol::EnumeratePhone");
+	LOGSMSPROT1("CSmsProtocol::EnumeratePhone");
 	__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
 
 	// Ensure the modem is connected and initialized
@@ -823,7 +826,7 @@
  */
 void CSmsProtocol::CancelEnumeratePhone(MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CANCELENUMERATEPHONE_1, "CSmsProtocol::CancelEnumeratePhone");
+	LOGSMSPROT1("CSmsProtocol::CancelEnumeratePhone");
 
 	__ASSERT_DEBUG(ObserverIsPresent(aObserver), SmspPanic(ESmspMessageObserverNotFound));
 	__ASSERT_DEBUG(iPhoneEnumerationObserver==NULL || &aObserver==iPhoneEnumerationObserver, SmspPanic(ESmspMessageWrongObserver));
@@ -852,7 +855,7 @@
  */
 void CSmsProtocol::WriteSmsMessage(CSmsMessage* aSmsMessage,MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_WRITESMSMESSAGE_1, "CSmsProtocol::WriteSmsMessage");
+	LOGSMSPROT1("CSmsProtocol::WriteSmsMessage");
 	__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
 
 	const TInt err = CheckPoweredUp();
@@ -871,7 +874,7 @@
 
 void CSmsProtocol::CancelWriteSmsMessage(MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CANCELWRITESMSMESSAGE_1, "CSmsProtocol::CancelWriteSmsMessage()");
+	LOGSMSPROT1("CSmsProtocol::CancelWriteSmsMessage()");
 
 	if (iWriteQueue != NULL)
 		iWriteQueue->CancelObserver(aObserver);
@@ -890,7 +893,7 @@
  */
 void CSmsProtocol::DeleteSmsMessage(CSmsMessage* aSmsMessage,MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DELETESMSMESSAGE_1, "CSmsProtocol::DeleteSmsMessage");
+	LOGSMSPROT1("CSmsProtocol::DeleteSmsMessage");
 	__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
 
 	// Ensure the modem is connected and initialized
@@ -918,7 +921,7 @@
  */
 void CSmsProtocol::CancelDeleteSmsMessage(MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CANCELDELETESMSMESSAGE_1, "CSmsProtocol::CancelDeleteSmsMessage");
+	LOGSMSPROT1("CSmsProtocol::CancelDeleteSmsMessage");
 
 	__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
 
@@ -939,7 +942,7 @@
  */
 void CSmsProtocol::ReadSmsParameters(MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_READSMSPARAMETERS_1, "CSmsProtocol::ReadSmsParameters");
+	LOGSMSPROT1("CSmsProtocol::ReadSmsParameters");
 	__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
 	TInt ret = CheckPoweredUp();
 
@@ -973,7 +976,7 @@
  */
 void CSmsProtocol::CancelReadSmsParams()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CANCELREADSMSPARAMS_1, "CSmsProtocol::CancelReadSmsParams");
+	LOGSMSPROT1("CSmsProtocol::CancelReadSmsParams");
 
 	if(iSmsReadParams != NULL)
 		iSmsReadParams->Cancel();
@@ -993,7 +996,7 @@
  */
 void CSmsProtocol::WriteSmsParameters(CMobilePhoneSmspList* aMobilePhoneSmspList,MSmsMessageObserver& aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_WRITESMSPARAMETERS_1, "CSmsProtocol::WriteSmsParameters");
+	LOGSMSPROT1("CSmsProtocol::WriteSmsParameters");
 	__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
 
 	TInt ret = CheckPoweredUp();
@@ -1039,7 +1042,7 @@
  */
 void CSmsProtocol::CancelWriteSmsParams()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CANCELWRITESMSPARAMS_1, "CSmsProtocol::CancelWriteSmsParams");
+	LOGSMSPROT1("CSmsProtocol::CancelWriteSmsParams");
 
 	if(iSmsWriteParams != NULL)
 		iSmsWriteParams->Cancel();
@@ -1070,7 +1073,7 @@
 TInt CSmsProtocol::ProcessMessageL(const CSmsMessage& aSmsMessage,const TSmsAddr* aOriginalSmsAddr,
 		const CSmsMessage* /*aOriginalSmsMessage*/,TDes& aDes)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_PROCESSMESSAGEL_1, "CSmsProtocol::ProcessMessage");
+	LOGSMSPROT1("CSmsProtocol::ProcessMessage");
 
 	MSmsMessageObserver* observer=NULL;
 	if (aOriginalSmsAddr!=NULL)
@@ -1089,7 +1092,7 @@
 		observer = MatchSmsMessageToObserver(aSmsMessage);
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_PROCESSMESSAGEL_2, "CSmsProtocol::ProcessMessage [observer=0x%08x]",observer);
+	LOGSMSPROT2("CSmsProtocol::ProcessMessage [observer=0x%08x]",observer);
 	TInt ret=KErrNone;
 
 	if (observer!=NULL)
@@ -1139,13 +1142,13 @@
  */
 void CSmsProtocol::DeletePDUs(const CArrayFix<TGsmSmsSlotEntry>& aSlotArray, MSmsMessageObserver* aObserver)
 	{
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DELETEPDUS_1, "CSmsProtocol::DeletePDUs [count=%d aObserver=0x%08X", aSlotArray.Count(), (TUint)aObserver);
-    __ASSERT_DEBUG(aSlotArray.Count() != 0, SmspPanic(KSmspSlotArrayEmpty));
+	LOGSMSPROT3("CSmsProtocol::DeletePDUs [count=%d aObserver=0x%08X", aSlotArray.Count(), aObserver);
+	__ASSERT_DEBUG(aSlotArray.Count() != 0, SmspPanic(KSmspSlotArrayEmpty));
 
-    for(TInt i=0; i< aSlotArray.Count() ;i++)
-        {
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DELETEPDUS_2, "CSmsProtocol::DeletePDUs index: %d store %S", aSlotArray[i].iIndex, aSlotArray[i].iStore);
-        }
+	for(TInt i=0; i< aSlotArray.Count() ;i++)
+		{
+		LOGSMSPROT3("CSmsProtocol::DeletePDUs index: %d store %S", aSlotArray[i].iIndex, &aSlotArray[i].iStore);
+		}
 
 	if (iDeleteQueue != NULL && aSlotArray.Count() != 0)
 		{
@@ -1163,7 +1166,8 @@
 void CSmsProtocol::ModemNotificationCompleted(TInt aStatus,
 											  RPhone::TModemDetection aNewState)
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MODEMNOTIFICATIONCOMPLETED_1, "CSmsProtocol::ModemNotificationCompleted(): aStatus=%d, aNewState=%d",aStatus, aNewState);
+	LOGSMSPROT3("CSmsProtocol::ModemNotificationCompleted(): aStatus=%d, aNewState=%d",
+				aStatus, aNewState);
 
 	TBool stateChanged = EFalse;
 
@@ -1177,7 +1181,7 @@
 			case RPhone::EDetectedNotPresent:
 			case RPhone::EDetectedUnknown:
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MODEMNOTIFICATIONCOMPLETED_2, "RPhone::EDetectedNotPresent: [OFF -> ON]");
+				LOGSMSPROT1("RPhone::EDetectedNotPresent: [OFF -> ON]");
 				if (aNewState==RPhone::EDetectedPresent)
 					{
 					// There is a new modem connection
@@ -1191,7 +1195,7 @@
 			//
 			case RPhone::EDetectedPresent:
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MODEMNOTIFICATIONCOMPLETED_3, "RPhone::EDetectedPresent: [ON -> OFF]");
+				LOGSMSPROT1("RPhone::EDetectedPresent: [ON -> OFF]");
 				if (aNewState!=RPhone::EDetectedPresent)
 					{
 					// Ah, lost our modem - cancel outstanding operations
@@ -1226,7 +1230,7 @@
  * Called when the Disk Space Monitor state has changed.
  */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DISKSPACEMONITORSTATECHANGE_1, "CSmsProtocol::DiskSpaceMonitorStateChange(): aStatus=%d", aStatus);
+	LOGSMSPROT2("CSmsProtocol::DiskSpaceMonitorStateChange(): aStatus=%d", aStatus);
 
 	RProperty::Set(KUidPSSMSStackCategory, KUidPSSMSStackDiskSpaceMonitorKey, aStatus);
 	} // CSmsProtocol::DiskSpaceMonitorStateChange
@@ -1239,22 +1243,22 @@
  */
 void CSmsProtocol::MessageSendCompleted(TInt aStatus)
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MESSAGESENDCOMPLETED_1, "*** CSmsProtocol::MessageSendCompleted [aStatus=%d iNumSegmentationStoreAccesses=%d]", aStatus, iNumSegmentationStoreAccesses);
+	LOGSMSPROT3("*** CSmsProtocol::MessageSendCompleted [aStatus=%d iNumSegmentationStoreAccesses=%d]", aStatus, iNumSegmentationStoreAccesses);
     (void) aStatus;
 	iNumSegmentationStoreAccesses++;
 	if (iNumSegmentationStoreAccesses>=KNumSARStoreAccessesBeforePurging)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MESSAGESENDCOMPLETED_2, "iSegmentationStore->PurgeL Start");
+		LOGSMSPROT1("iSegmentationStore->PurgeL Start");
 		TRAPD(ret, iSegmentationStore->PurgeL(iSmsSettings.KSegmentationLifetimeMultiplier(),EFalse));
 		if(ret!=KErrNone)
 			{
 			// we need to close the file because the function
 			// left with the file opened
 			// iSegmentationStore->CloseFile();
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MESSAGESENDCOMPLETED_3, "WARNING! iSegmentationStore->PurgeL left with %d", ret);
+			LOGSMSPROT2("WARNING! iSegmentationStore->PurgeL left with %d", ret);
 			}
 		iNumSegmentationStoreAccesses=0;
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MESSAGESENDCOMPLETED_4, "iSegmentationStore->PurgeL End [ret=%d]", ret);
+		LOGSMSPROT2("iSegmentationStore->PurgeL End [ret=%d]", ret);
 		}
 	} // CSmsProtocol::KNumSARStoreAccessesBeforePurging
 
@@ -1266,7 +1270,7 @@
  */
 void CSmsProtocol::PhoneEnumerationCompleted(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_PHONEENUMERATIONCOMPLETED_1, "CSmsProtocol::PhoneEnumerationCompleted");
+	LOGSMSPROT1("CSmsProtocol::PhoneEnumerationCompleted");
 	iPhoneEnumerationObserver->EnumeratePhoneCompleted(aStatus);
 	} // CSmsProtocol::PhoneEnumerationCompleted
 
@@ -1279,7 +1283,7 @@
  */
 void CSmsProtocol::CloseNow()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CLOSENOW_1, "CSmsProtocol::CloseNow");
+	LOGSMSPROT1("CSmsProtocol::CloseNow");
 	if (iDeleteQueue != NULL && iDeleteQueue->IsActive())
 		SetClosingDown(ETrue);
 	else
@@ -1309,7 +1313,7 @@
  */
 TInt CSmsProtocol::ObserverIndex(const MSmsMessageObserver& aObserver) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_OBSERVERINDEX_1, "CSmsProtocol::ObserverIndex()");
+	LOGSMSPROT1("CSmsProtocol::ObserverIndex()");
 
 	TInt count=iSmsMessageObserverList.Count();
 	TInt index=0;
@@ -1326,7 +1330,7 @@
  */
 TBool CSmsProtocol::SmsAddrIsAlreadyUsed(const MSmsMessageObserver* aObserver,const TSmsAddr& aSmsAddr)const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_SMSADDRISALREADYUSED_1, "CSmsProtocol::SmsAddrIsAlreadyUsed()");
+	LOGSMSPROT1("CSmsProtocol::SmsAddrIsAlreadyUsed()");
 
 	TBool isduplicate=EFalse;
 	TInt count=iSmsMessageObserverList.Count();
@@ -1411,7 +1415,7 @@
  */
 TInt TKeySmsObserver::Compare(TInt aLeft, TInt aRight) const
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TKEYSMSOBSERVER_COMPARE_1, "TKeySmsObserver::Compare [left=%d, right=%d]", aLeft, aRight);
+	LOGSMSPROT3("TKeySmsObserver::Compare [left=%d, right=%d]", aLeft, aRight);
 
 	const TInt lhptr = -1; // Left higher priority than right
 	const TInt rhptl = 1; // Right higher priority than left
@@ -1454,7 +1458,7 @@
  */
 void CSmsProtocol::OrderSmsMessageObserver(const MSmsMessageObserver& /*aObserver*/)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ORDERSMSMESSAGEOBSERVER_1, "CSmsProtocol::OrderSmsMessageObserver()");
+	LOGSMSPROT1("CSmsProtocol::OrderSmsMessageObserver()");
 
 	TKeySmsObserver smsObsKey;
 #ifdef _DEBUG
@@ -1473,7 +1477,7 @@
  */
 MSmsMessageObserver* CSmsProtocol::MatchSmsMessageToObserver(const CSmsMessage& aSmsMessage)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MATCHSMSMESSAGETOOBSERVER_1, "CSmsProtocol::MatchSmsMessageToObserver()");
+	LOGSMSPROT1("CSmsProtocol::MatchSmsMessageToObserver()");
 
 	TInt count=iSmsMessageObserverList.Count();
 	for (TInt i=0;i<count;i++)
@@ -1493,7 +1497,7 @@
  */
 MSmsMessageObserver* CSmsProtocol::MatchSmsAddressToObserver(const TSmsAddr& aAddr)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MATCHSMSADDRESSTOOBSERVER_1, "CSmsProtocol::MatchSmsAddressToObserver()");
+	LOGSMSPROT1("CSmsProtocol::MatchSmsAddressToObserver()");
 
 	TInt count=iSmsMessageObserverList.Count();
 	for (TInt i=0;i<count;i++)
@@ -1513,7 +1517,7 @@
  */
 TBool CSmsProtocol::IsMatch(const TSmsAddr& aSmsAddr, const CSmsMessage& aSmsMessage)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ISMATCH_1, "CSmsProtocol::IsMatch()");
+	LOGSMSPROT1("CSmsProtocol::IsMatch()");
 
 	TSmsAddrFamily family = aSmsAddr.SmsAddrFamily();
 
@@ -1569,7 +1573,7 @@
 
 		case (ESmsAddrStatusReport):
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ISMATCH_2, "TSmsDataCodingScheme::ESmsDCSMessageWaitingIndicationDiscardMessage:");
+			LOGSMSPROT1("TSmsDataCodingScheme::ESmsDCSMessageWaitingIndicationDiscardMessage:");
 			if (aSmsMessage.Type() == CSmsPDU::ESmsStatusReport)
 				return ETrue;
 			}
@@ -1612,7 +1616,7 @@
  */
 TBool CSmsProtocol::MatchApplicationPort(const CSmsMessage& aSmsMessage,TUint aPort,TBool a16Bit)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MATCHAPPLICATIONPORT_1, "CSmsProtocol::MatchApplicationPort");
+	LOGSMSPROT1("CSmsProtocol::MatchApplicationPort");
 
 	if (!aSmsMessage.SmsPDU().UserDataPresent())
 		return EFalse;
@@ -1636,7 +1640,7 @@
  */
 TBool CSmsProtocol::MatchInformationElement(const CSmsMessage& aSmsMessage, CSmsInformationElement::TSmsInformationElementIdentifier aIeVal)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MATCHINFORMATIONELEMENT_1, "CSmsProtocol::MatchInformationElement");
+	LOGSMSPROT1("CSmsProtocol::MatchInformationElement");
 
 	if (!aSmsMessage.SmsPDU().UserDataPresent())
 		return EFalse;
@@ -1662,7 +1666,7 @@
  */
 void CSmsProtocol::ProcessCompleteSmsMessagesL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_PROCESSCOMPLETESMSMESSAGESL_1, "CSmsProtocol::ProcessCompleteSmsMessagesL");
+	LOGSMSPROT1("CSmsProtocol::ProcessCompleteSmsMessagesL");
 
 	if(iPhoneEnumerationObserver) return;
 
@@ -1680,11 +1684,11 @@
  */
 void CSmsProtocol::MessageReadedSuccessfully()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MESSAGEREADEDSUCCESSFULLY_1, "CSmsProtocol::MessageReadedSuccessfully");
+	LOGSMSPROT1("CSmsProtocol::MessageReadedSuccessfully");
 	TRAPD(ret,ProcessCompleteSmsMessagesL());
 	if(ret!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MESSAGEREADEDSUCCESSFULLY_2, "WARNING! CSmsProtocol::ProcessCompleteSmsMessagesL left with %d", ret);
+		LOGSMSPROT2("WARNING! CSmsProtocol::ProcessCompleteSmsMessagesL left with %d", ret);
 		}
 
 	iNumReassemblyStoreAccesses++;
@@ -1694,7 +1698,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MESSAGEREADEDSUCCESSFULLY_3, "WARNING! iReassemblyStore->PurgeL left with %d", ret);
+			LOGSMSPROT2("WARNING! iReassemblyStore->PurgeL left with %d", ret);
 			}
 
 		iNumReassemblyStoreAccesses=0;
@@ -1709,10 +1713,10 @@
  */
 void CSmsProtocol::DeleteSMSFromReaStoreL(const CSmsMessage& aSmsMessage)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DELETESMSFROMREASTOREL_1, "CSmsProtocol::DeleteSMSFromReaStoreL entry");
+	LOGSMSPROT1("CSmsProtocol::DeleteSMSFromReaStoreL entry");
 	if (aSmsMessage.Type() == CSmsPDU::ESmsStatusReport)
 	{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DELETESMSFROMREASTOREL_2, "CSmsProtocol::DeleteSMSFromReaStoreL it's SR");
+		LOGSMSPROT1("CSmsProtocol::DeleteSMSFromReaStoreL it's SR");
 		return;
 	}
 
@@ -1735,7 +1739,7 @@
 					Only in this condition set incomplete message as forwarded
 					which internally will remove the PDUs from pre-allocated file.
 					*/
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DELETESMSFROMREASTOREL_3, "CSmsProtocol::DeleteSMSFromReaStoreL Incomplete Message Not last segment");
+					LOGSMSPROT1("CSmsProtocol::DeleteSMSFromReaStoreL Incomplete Message Not last segment");
 					iReassemblyStore->SetIncompleteMessageForwardedToClientL(aSmsMessage);
 					return;
 					}
@@ -1744,7 +1748,7 @@
 		}
 	iReassemblyStore->DeleteMessageL(aSmsMessage, ETrue);
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DELETESMSFROMREASTOREL_4, "CSmsProtocol::DeleteSMSFromReaStoreL exit");
+	LOGSMSPROT1("CSmsProtocol::DeleteSMSFromReaStoreL exit");
 	} // CSmsProtocol::DeleteSMSFromReaStoreL
 
 
@@ -1754,15 +1758,15 @@
  */
 void CSmsProtocol::NotifyMessageObservers(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NOTIFYMESSAGEOBSERVERS_1, "CSmsProtocol::NotifyMessageObservers");
+	LOGSMSPROT1("CSmsProtocol::NotifyMessageObservers");
 
 	TInt count=iSmsMessageObserverList.Count();
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NOTIFYMESSAGEOBSERVERS_2, "CSmsProtocol::NotifyMessageObservers [count=%d, aStatus=%d]",count, aStatus);
+	LOGSMSPROT3("CSmsProtocol::NotifyMessageObservers [count=%d, aStatus=%d]",count, aStatus);
 	for (TInt index=0; index<count; index++)
 		{
 		MSmsMessageObserver* observer=iSmsMessageObserverList[index];
 		TSmsAddrFamily fam = observer->GetLocalAddress().SmsAddrFamily();
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NOTIFYMESSAGEOBSERVERS_3, "CSmsProtocol::NotifyMessageObservers [family=%d]", fam);
+	    LOGSMSPROT2("CSmsProtocol::NotifyMessageObservers [family=%d]", fam);
 		switch (fam)
 			{
 			case ESmsAddrMessageIndication:
@@ -1790,7 +1794,7 @@
 
 void CSmsProtocol::PowerUp()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_POWERUP_1, "CSmsProtocol::PowerUp [iState=%d]", iState);
+	LOGSMSPROT2("CSmsProtocol::PowerUp [iState=%d]", iState);
 	__ASSERT_DEBUG(iState == EPoweredDown, SmspPanic(KSmspPanicUnexpectedState));
 
 	if (iState == EPoweredDown)
@@ -1799,7 +1803,7 @@
 
 		if (err != KErrNone)
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_POWERUP_2, "WARNING: CSmsProtocol::DoPowerUpL left [err=%d iState=%d]", err, iState);
+			LOGSMSPROT3("WARNING: CSmsProtocol::DoPowerUpL left [err=%d iState=%d]", err, iState);
 			__ASSERT_DEBUG(iState == EPoweredDown, SmspPanic(KSmspPanicUnexpectedState));
 			PowerDown();
 			}
@@ -1818,24 +1822,24 @@
  */
 void CSmsProtocol::DoPowerUpL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_1, "CSmsProtocol::DoPowerUpL");
+	LOGSMSPROT1("CSmsProtocol::DoPowerUpL");
 	__ASSERT_DEBUG(iModemDetection==RPhone::EDetectedPresent,SmspPanic(KSmspPhoneHasNotTurnedOn));
 
 	//Open the segmentation and reassembly stores
 
 	iReassemblyStore->OpenStoreL();
 	iSegmentationStore->OpenStoreL();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_2, "CSmsProtocol::DoPowerUpL->PurgeL Start");
+	LOGSMSPROT1("CSmsProtocol::DoPowerUpL->PurgeL Start");
 	iReassemblyStore->PurgeL(iSmsSettings.ReassemblyLifetime(), ETrue);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_3, "CSmsProtocol::DoPowerUpL->PurgeL End");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_4, "CSmsProtocol::DoPowerUpL->PurgeL Start");
+	LOGSMSPROT1("CSmsProtocol::DoPowerUpL->PurgeL End");
+	LOGSMSPROT1("CSmsProtocol::DoPowerUpL->PurgeL Start");
 	iSegmentationStore->PurgeL(iSmsSettings.KSegmentationLifetimeMultiplier(),EFalse);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_5, "CSmsProtocol::DoPowerUpL->PurgeL End");
+	LOGSMSPROT1("CSmsProtocol::DoPowerUpL->PurgeL End");
 
 	// Connect to ETEL and load the TSY
 	User::LeaveIfError(iTelServer.Connect());
 	User::LeaveIfError(iTelServer.LoadPhoneModule(iGsmTsyName));
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_6, "CSmsProtocol::DoPowerUpL  Connected to Etel");
+	LOGSMSPROT1("CSmsProtocol::DoPowerUpL  Connected to Etel");
 
 	// Find the phone corresponding to this TSY and open a number of handles on it
 	TInt numPhones;
@@ -1860,7 +1864,7 @@
 		User::LeaveIfError(iTelServer.SetExtendedErrorGranularity(RTelServer::EErrorBasic));
 	User::LeaveIfError(iSmsMessaging.Open(iGsmPhone));
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_7, "CSmsProtocol::DoPowerUpL  Opened TSY handles");
+	LOGSMSPROT1("CSmsProtocol::DoPowerUpL  Opened TSY handles");
 
 	if (iSmsPhoneEnumeration == NULL)
 		iSmsPhoneEnumeration=CSmsPhoneEnumeration::NewL(*this, iSmsSettings, *iReassemblyStore, *iSegmentationStore, iEnumerationPhone, KSmsSessionPriority, *iSmsMonitorDiskSpace);
@@ -1874,10 +1878,10 @@
 	// Start state machines
 	iSmsPhoneInitialization->Start();
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_8, "CSmsProtocol::DoPowerUpL  Started state machines");
+	LOGSMSPROT1("CSmsProtocol::DoPowerUpL  Started state machines");
 
 	NotifyMessageObservers(KIoctlSelectModemPresent);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_9, "CSmsProtocol::DoPowerUpL  Notified message observers");
+	LOGSMSPROT1("CSmsProtocol::DoPowerUpL  Notified message observers");
 
 
 	// Process any waiting messages
@@ -1898,7 +1902,7 @@
  */
 void CSmsProtocol::PowerDown()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_POWERDOWN_1, "CSmsProtocol::PowerDown");
+    LOGSMSPROT1("CSmsProtocol::PowerDown");
     
     iSetBearer->Cancel();
     iReceiveMode->Cancel();
@@ -1929,21 +1933,21 @@
     delete iDeleteQueue; //must be deleted because uses iSmsMessaging which is soon closed
     iDeleteQueue = NULL;
     
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_POWERDOWN_2, "CSmsProtocol::PowerDown  Cancelled state machines");
+    LOGSMSPROT1("CSmsProtocol::PowerDown  Cancelled state machines");
     
     NotifyMessageObservers(KIoctlSelectModemNotPresent);
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_POWERDOWN_3, "CSmsProtocol::PowerDown  Notified message observers");
+    LOGSMSPROT1("CSmsProtocol::PowerDown  Notified message observers");
     
     // Close TSY handles
     iSmsMessaging.Close();
     iGsmPhone.Close();
     iEnumerationPhone.Close();
     iWritePhone.Close();
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_POWERDOWN_4, "CSmsProtocol::PowerDown  Closed TSY handles");
+    LOGSMSPROT1("CSmsProtocol::PowerDown  Closed TSY handles");
     
     // Disconnect from Etel
     iTelServer.Close();
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_POWERDOWN_5, "CSmsProtocol::PowerDown  Disconnected from Etel");
+    LOGSMSPROT1("CSmsProtocol::PowerDown  Disconnected from Etel");
     
     iReassemblyStore->Close();
     iSegmentationStore->Close();
@@ -1959,7 +1963,7 @@
     // (rather than the client) and the PDUs are still being deleted 
     // when last client disconnects.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CLOSENOWWRAP_1, "CSmsProtocol::CloseNowWrap()");
+    LOGSMSPROT1("CSmsProtocol::CloseNowWrap()");
     
     if( iDeleteQueue == NULL || !iDeleteQueue->IsActive() )
         {
@@ -1970,13 +1974,13 @@
 
 void CSmsProtocol::HandleBackupOrRestoreStartingL()
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_HANDLEBACKUPORRESTORESTARTINGL_1, "CSmsProtocol::HandleBackupOrRestoreStartingL [ModemState=%d]",  iSmsModemNotification->ModemState());
+    LOGSMSPROT2("CSmsProtocol::HandleBackupOrRestoreStartingL [ModemState=%d]",  iSmsModemNotification->ModemState());
     PowerDown();
     }
 
 void CSmsProtocol::HandleBackupOrRestoreCompleteL()
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_HANDLEBACKUPORRESTORECOMPLETEL_1, "CSmsProtocol::HandleBackupOrRestoreCompleteL [ModemState=%d]", iSmsModemNotification->ModemState());
+    LOGSMSPROT2("CSmsProtocol::HandleBackupOrRestoreCompleteL [ModemState=%d]", iSmsModemNotification->ModemState());
     
     if (iModemDetection == RPhone::EDetectedPresent)
         {
@@ -1989,7 +1993,7 @@
  */
 TBool CSmsProtocol::AllocateLocalAddress(TSmsAddr& aAddr)
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ALLOCATELOCALADDRESS_1, "CSmsProtocol::AllocateLocalAddressL");
+    LOGSMSPROT1("CSmsProtocol::AllocateLocalAddressL");
 
 	TBool found=EFalse;
 	TUint count=0,attempts=0;
@@ -2037,7 +2041,7 @@
  */
 TBool CSmsProtocol::IsAppPortSMS(const CSmsMessage& aSmsMessage)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ISAPPPORTSMS_1, "CSmsProtocol::IsAppPortSMS()");
+	LOGSMSPROT1("CSmsProtocol::IsAppPortSMS()");
 
 	TSmsAddr addr;
 	addr.SetSmsAddrFamily(ESmsAddrMatchIEI);
@@ -2067,7 +2071,7 @@
 
 const RMobilePhone::TMobilePhoneNetworkInfoV1& CSmsProtocol::NetworkInfo() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NETWORKINFO_1, "CSmsProtocol::NetworkInfo()");
+	LOGSMSPROT1("CSmsProtocol::NetworkInfo()");
 
 	return iSmsPhoneInitialization->NetworkInfo();
 	} // CSmsProtocol::NetworkInfo
@@ -2075,7 +2079,7 @@
 
 TBool CSmsProtocol::NetworkInfoAvailable() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NETWORKINFOAVAILABLE_1, "CSmsProtocol::NetworkInfoAvailable()");
+	LOGSMSPROT1("CSmsProtocol::NetworkInfoAvailable()");
 
 	return iSmsPhoneInitialization->NetworkInfoAvailable();
 	} // CSmsProtocol::NetworkInfoAvailable
@@ -2091,7 +2095,7 @@
  */
 CSmsProtocolBootTimer* CSmsProtocolBootTimer::NewL(CSmsProtocol& aSmsProtocol)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLBOOTTIMER_NEWL_1, "CSmsProtocolBootTimer::NewL");
+    LOGSMSPROT1("CSmsProtocolBootTimer::NewL");
     
     CSmsProtocolBootTimer* self = new(ELeave) CSmsProtocolBootTimer(aSmsProtocol);
     CleanupStack::PushL(self);
@@ -2113,7 +2117,7 @@
  */
 void CSmsProtocolBootTimer::Start(const TTimeIntervalMicroSeconds32& aTimeIntervalMicroSeconds32)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLBOOTTIMER_START_1, "CSmsProtocolBootTimer::Start");
+	LOGSMSPROT1("CSmsProtocolBootTimer::Start");
 	After(aTimeIntervalMicroSeconds32);
 	}
 
@@ -2131,6 +2135,6 @@
  */
 void CSmsProtocolBootTimer::RunL()
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLBOOTTIMER_RUNL_1, "CSmsProtocolBootTimer::RunL [iStatus=%d]", iStatus.Int() );
+    LOGSMSPROT2("CSmsProtocolBootTimer::RunL [iStatus=%d]", iStatus.Int() );
     iSmsProtocol.MessageReadedSuccessfully();
     }

--- a/smsprotocols/smsstack/smsprot/Src/smsprov.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smsprov.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -20,12 +20,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smsprovTraces.h"
-#endif
-
 #include "smsprot.h"
 
 #include <es_ver.h>
@@ -39,8 +33,6 @@
 #include "smspmain.h"
 #include "smspfacadestor.h"
 
-#include "smsstacklog.h"
-
 // CSmsProvider policies
 //
 static _LIT_SECURITY_POLICY_C1(smsProviderIoctlDeleteSmsMessagePolicy,ECapabilityWriteUserData);
@@ -69,14 +61,14 @@
  */
 CSmsProvider* CSmsProvider::NewL(CSmsProtocol& aProtocol)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_NEWL_1, "CSmsProvider::NewL");
+    LOGSMSPROT1("CSmsProvider::NewL");
     
     CSmsProvider* self =new(ELeave) CSmsProvider(aProtocol);
     CleanupStack::PushL(self);
     self->ConstructL();
     CleanupStack::Pop(self);
 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_NEWL_2, "-> CSmsProvider::NewL - done");
+    LOGSMSPROT1("-> CSmsProvider::NewL - done");
     
     return self;
     }
@@ -99,14 +91,14 @@
  */
 void CSmsProvider::ConstructL()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_CONSTRUCTL_1, "CSmsProvider::ConstructL");
+    LOGSMSPROT1("CSmsProvider::ConstructL");
     
     iProtocol.AddSmsMessageObserverL(*this);
     SetObserverAddedToProtocol(ETrue);
     iRecvBufSegArray=new(ELeave) CArrayPtrFlat<CBufSeg>(8);
     iSendBufSeg = CBufSeg::NewL(KSmsMaxSegmentLength);
     
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_CONSTRUCTL_2, "-> CSmsProvider::ConstructL - done");
+    LOGSMSPROT1("-> CSmsProvider::ConstructL - done");
     }
 
 /**
@@ -136,7 +128,7 @@
  */
 void CSmsProvider::Start()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_START_1, "CSmsProvider::Start");
+    LOGSMSPROT1("CSmsProvider::Start");
     }
 
 /**
@@ -146,7 +138,7 @@
  */
 void CSmsProvider::LocalName(TSockAddr& aAddr) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_LOCALNAME_1, "CSmsProvider::LocalName");
+    LOGSMSPROT1("CSmsProvider::LocalName");
     aAddr = iLocalAddress;
     }
 
@@ -162,7 +154,7 @@
  */
 TInt CSmsProvider::SetLocalName(TSockAddr& aAddr)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SETLOCALNAME_1, "CSmsProvider::SetLocalName");
+    LOGSMSPROT1("CSmsProvider::SetLocalName");
     
     if( !iSecurityChecker || (iSecurityChecker->CheckPolicy(smsProviderSetLocalNamePolicy,"CSmsProvider SetLocal Name policy check") != KErrNone) )
         {
@@ -190,7 +182,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_REMNAME_1, "CSmsProvider::RemName");
+    LOGSMSPROT1("CSmsProvider::RemName");
     BULLSEYE_RESTORE
     }
 
@@ -205,7 +197,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SETREMNAME_1, "CSmsProvider::SetRemName");
+    LOGSMSPROT1("CSmsProvider::SetRemName");
     return KErrNotSupported;
     BULLSEYE_RESTORE
     }
@@ -220,7 +212,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_GETOPTION_1, "CSmsProvider::GetOption");
+    LOGSMSPROT1("CSmsProvider::GetOption");
     return 0;
     BULLSEYE_RESTORE
     }
@@ -244,7 +236,8 @@
  */
 void CSmsProvider::Ioctl(TUint aLevel,TUint aName,TDes8* aOption)
     {
-    OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_IOCTL_1, "CSmsProvider::Ioctl [aLevel=%u, aName=%u provider=0x%08x]",  aLevel, aName, (TUint)this);
+    LOGSMSPROT3("CSmsProvider::Ioctl [aLevel=%d, aName=%d]", aLevel, aName);
+    LOGSMSPROT2("CSmsProvider::Ioctl [provider=0x%08x]",this);
     
     // Panic in debug mode if this call is invalid in this SAPs current state
     __ASSERT_DEBUG(iLocalAddress.SmsAddrFamily()!=ESmsAddrUnbound,SmspPanic(KSmspPanicWrongSmsAddressFamily));
@@ -382,7 +375,7 @@
                     TRAPD(ret,(smsmessage=InternalizeMessageL()));
                     if( ret!=KErrNone )
                         {
-                        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_IOCTL_3, "-> CSmsProvider::Ioctl - CSmsProvider::InternalizeMessageL [ret=%d]", ret);
+                        LOGSMSPROT2("-> CSmsProvider::Ioctl - CSmsProvider::InternalizeMessageL [ret=%d]", ret);
                         iSendBufSeg->Reset();
                         iSocket->Error(ret, MSocketNotify::EErrorIoctl);
                         }
@@ -408,11 +401,11 @@
                     if( ret==KErrNone )
                         {
                         TRAP(ret,(iProtocol.DeleteSMSFromReaStoreL( *smsmessage )));
-                        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_IOCTL_4, "-> CSmsProvider::Ioctl - CSmsProvider::DeleteSMSFromReaStoreL [ret=%d]", ret);
+                        LOGSMSPROT2("-> CSmsProvider::Ioctl - CSmsProvider::DeleteSMSFromReaStoreL [ret=%d]", ret);
                         }
                     else
                         {
-                        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_IOCTL_5, "-> CSmsProvider::Ioctl - CSmsProvider::InternalizeMessageL [ret=%d]", ret);
+                        LOGSMSPROT2("-> CSmsProvider::Ioctl - CSmsProvider::InternalizeMessageL [ret=%d]", ret);
                         }
                     delete smsmessage;
                     // Looking for more sms left in the store
@@ -421,13 +414,13 @@
                     if( iEnumSocket )
                         {
                         --iNumOfEnumeratedMessages;
-                        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_IOCTL_6, "-> CSmsProvider::Ioctl - [iNumOfEnumeratedMessages=%d]", iNumOfEnumeratedMessages);
+                        LOGSMSPROT2("-> CSmsProvider::Ioctl - [iNumOfEnumeratedMessages=%d]", iNumOfEnumeratedMessages);
                         if( iNumOfEnumeratedMessages <= 0 )
                             {
                             iProtocol.iPhoneEnumerationObserver=NULL;
                             iEnumSocket=EFalse;
                             iProtocol.MessageReadedSuccessfully();
-                            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_IOCTL_7, "-> CSmsProvider::Ioctl - [iNumOfEnumeratedMessages=NULL]");
+                            LOGSMSPROT1("-> CSmsProvider::Ioctl - [iNumOfEnumeratedMessages=NULL]");
                             }
                         }
                     // Remove the message from the receive buffer & complete
@@ -456,7 +449,7 @@
                             if( iNumOfEnumeratedMessages <= 0 )
                                 {
                                 iProtocol.iPhoneEnumerationObserver=NULL;
-                                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_IOCTL_8, "-> CSmsProvider::Ioctl - fail [iNumOfEnumeratedMessages=NULL]");
+                                LOGSMSPROT1("-> CSmsProvider::Ioctl - fail [iNumOfEnumeratedMessages=NULL]");
                                 iEnumSocket=EFalse;
                                 iProtocol.MessageReadedSuccessfully();
                                 }
@@ -564,7 +557,7 @@
  */
 void CSmsProvider::CancelIoctl(TUint aLevel, TUint aName)
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_CANCELIOCTL_1, "CSmsProvider::CancelIoctl [aLevel=%u, aName=%u]", aLevel, aName);
+    LOGSMSPROT3("CSmsProvider::CancelIoctl [aLevel=%d, aName=%d]", aLevel, aName);
     
     // Panic in debug mode if this call is invalid in this SAPs current state
     __ASSERT_DEBUG(iLocalAddress.SmsAddrFamily()!=ESmsAddrUnbound,SmspPanic(KSmspPanicWrongSmsAddressFamily));
@@ -590,7 +583,7 @@
                     iProtocol.CancelEnumeratePhone(*this);
                     iEnumSocket=EFalse;
                     iProtocol.iPhoneEnumerationObserver=NULL;
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_CANCELIOCTL_2, "-> CSmsProvider::CancelIoctl - [iNumOfEnumeratedMessages=NULL]");
+                    LOGSMSPROT1("-> CSmsProvider::CancelIoctl - [iNumOfEnumeratedMessages=NULL]");
                     } break;
                 case KIoctlWriteSmsMessage:
                     {
@@ -637,7 +630,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SETOPTION_1, "CSmsProvider::SetOption()");
+    LOGSMSPROT1("CSmsProvider::SetOption()");
     return 0;
     BULLSEYE_RESTORE
     }
@@ -661,7 +654,7 @@
  */
 TInt CSmsProvider::Write(RMBufChain& aBufChain, TUint /*aOptions*/, TSockAddr* /*aAddr*/)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_WRITE_1, "CSmsProvider::Write");
+    LOGSMSPROT1("CSmsProvider::Write");
     
     if( !iSecurityChecker || (iSecurityChecker->CheckPolicy(smsProviderWritePolicy,"CSmsProvider Write policy check") != KErrNone) )
         {
@@ -670,7 +663,7 @@
     __ASSERT_DEBUG(iLocalAddress.SmsAddrFamily()!=ESmsAddrUnbound,SmspPanic(KSmspPanicWrongSmsAddressFamily));
     
     /// @note: LOGIFH2A2 macro for logging esock write
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_WRITE_2, "-> CSmsProvider::Write [%d bytes]", aBufChain.Length());
+    LOGSMSPROT2("-> CSmsProvider::Write [%d bytes]", aBufChain.Length());
 #ifdef SMSLOGGERIF
 	HBufC8* debugBuf = HBufC8::New(aBufChain.Length());
 	if(debugBuf)
@@ -730,7 +723,7 @@
     {
     __ASSERT_DEBUG((iLocalAddress.SmsAddrFamily()!=ESmsAddrUnbound) && (iLocalAddress.SmsAddrFamily()!=ESmsAddrSendOnly),SmspPanic(KSmspPanicWrongSmsAddressFamily));
 
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_GETDATA_1, "CSmsProvider::GetData [provider=0x%08x]", (TUint)this);
+    LOGSMSPROT2("CSmsProvider::GetData [provider=0x%08x]", this);
     
     // Get the segmented buffer of first message
     CBufSeg* recvbufseg=iRecvBufSegArray->At(0);
@@ -781,7 +774,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_ACTIVEOPEN_1, "CSmsProvider::ActiveOpen [does nothing]");
+    LOGSMSPROT1("CSmsProvider::ActiveOpen [does nothing]");
     BULLSEYE_RESTORE
     }
 
@@ -796,7 +789,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_ACTIVEOPEN1_1, "CSmsProvider::ActiveOpen [does nothing]");
+    LOGSMSPROT1("CSmsProvider::ActiveOpen [does nothing]");
     BULLSEYE_RESTORE
     }
 
@@ -812,7 +805,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_PASSIVEOPEN_1, "CSmsProvider::PassiveOpen [not supported]");
+    LOGSMSPROT1("CSmsProvider::PassiveOpen [not supported]");
     return KErrNotSupported;
     BULLSEYE_RESTORE
     }
@@ -829,7 +822,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_PASSIVEOPEN1_1, "CSmsProvider::PassiveOpen [not supported]");
+    LOGSMSPROT1("CSmsProvider::PassiveOpen [not supported]");
     return KErrNotSupported;
     BULLSEYE_RESTORE
     }
@@ -842,7 +835,7 @@
  */
 void CSmsProvider::Shutdown(TCloseType aOption)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SHUTDOWN_1, "CSmsProvider::Shutdown [aOption=%d]", aOption);
+    LOGSMSPROT2("CSmsProvider::Shutdown [aOption=%d]", aOption);
     
     TInt messagesInBuffer = iRecvBufSegArray->Count();
     for( TInt index = 0; index < messagesInBuffer; ++index )
@@ -853,11 +846,11 @@
         if( ret == KErrNone )
             {
             TRAP(ret, (iProtocol.iReassemblyStore->SetMessagePassedToClientL(*smsmessage, EFalse)));
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SHUTDOWN_2, "-> CSmsProvider::Shutdown - SetMessagePassedToClientL [ret=%d]", ret);
+            LOGSMSPROT2("-> CSmsProvider::Shutdown - SetMessagePassedToClientL [ret=%d]", ret);
             }
         else
             {
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SHUTDOWN_3, "-> CSmsProvider::Shutdown - CSmsProvider::InternalizeMessageL leave [ret=%d]", ret);
+            LOGSMSPROT2("-> CSmsProvider::Shutdown - CSmsProvider::InternalizeMessageL leave [ret=%d]", ret);
             }
         delete smsmessage;
         }
@@ -886,7 +879,7 @@
  */
 void CSmsProvider::Shutdown(TCloseType aOption, const TDesC8& /*aDisconnectionData*/)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SHUTDOWN1_1, "CSmsProvider::Shutdown");
+	LOGSMSPROT1("CSmsProvider::Shutdown");
 	Shutdown(aOption);
 	}
 
@@ -901,7 +894,7 @@
 	{
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF    
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_AUTOBIND_1, "CSmsProvider::AutoBind [does nothing]");
+	LOGSMSPROT1("CSmsProvider::AutoBind [does nothing]");
     BULLSEYE_RESTORE
 	}
 
@@ -913,7 +906,7 @@
  */
 const TSmsAddr& CSmsProvider::GetLocalAddress() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_GETLOCALADDRESS_1, "CSmsProvider::GetLocalAddress");
+	LOGSMSPROT1("CSmsProvider::GetLocalAddress");
 	return iLocalAddress;
 	}
 
@@ -923,7 +916,7 @@
  */
 void CSmsProvider::SetLocalAddress(const TSmsAddr& aSmsAddr)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SETLOCALADDRESS_1, "CSmsProvider::SetLocalAddress");
+	LOGSMSPROT1("CSmsProvider::SetLocalAddress");
 	iLocalAddress = aSmsAddr;
 	}
 
@@ -936,7 +929,7 @@
  */
 void CSmsProvider::ModemNotificationCompleted(TInt aStatus)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_MODEMNOTIFICATIONCOMPLETED_1, "CSmsProvider::ModemNotificationCompleted [aStatus=%d]", aStatus);
+	LOGSMSPROT2("CSmsProvider::ModemNotificationCompleted [aStatus=%d]", aStatus);
 
 	if( !IoctlOutstanding() )
 	    {
@@ -953,7 +946,7 @@
  */
 void CSmsProvider::MessageSendCompleted(TInt aStatus)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_MESSAGESENDCOMPLETED_1, "CSmsProvider::MessageSendCompleted [aStatus=%d]", aStatus);
+    LOGSMSPROT2("CSmsProvider::MessageSendCompleted [aStatus=%d]", aStatus);
     
     iSocket->Error(aStatus,MSocketNotify::EErrorIoctl);
     SetIoctlOutstanding(EFalse);
@@ -968,7 +961,7 @@
  */
 TInt CSmsProvider::MessageReceived(const CSmsMessage& aSmsMessage,TDes& /*aDes*/)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_MESSAGERECEIVED_1, "CSmsProvider::MessageReceived");
+    LOGSMSPROT1("CSmsProvider::MessageReceived");
     
     // Attempt to serial the message to the receive buffer & notify
     // the socket of the new data
@@ -986,7 +979,7 @@
  */
 TBool CSmsProvider::ClientConfirmsMessage() const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_CLIENTCONFIRMSMESSAGE_1, "CSmsProvider::ClientConfirmsMessage");
+    LOGSMSPROT1("CSmsProvider::ClientConfirmsMessage");
     
     return ETrue;
     }
@@ -996,7 +989,7 @@
  */
 TInt CSmsProvider::SmsAddrIsDuplicate(const MSmsMessageObserver* aObserver, const TSmsAddr& aAddr) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SMSADDRISDUPLICATE_1, "CSmsProvider::SmsAddrIsDuplicate");
+    LOGSMSPROT1("CSmsProvider::SmsAddrIsDuplicate");
     
     if( this == aObserver )
         {
@@ -1014,7 +1007,7 @@
  */
 void CSmsProvider::EnumeratePhoneCompleted(TInt aStatus)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_ENUMERATEPHONECOMPLETED_1, "CSmsProvider::EnumeratePhoneCompleted [aStatus=%d]", aStatus);
+    LOGSMSPROT2("CSmsProvider::EnumeratePhoneCompleted [aStatus=%d]", aStatus);
     
     // Attempt to serialize all enumerated messages to the receive buffer
     TInt numnewsegments=0;
@@ -1081,7 +1074,7 @@
  */
 void CSmsProvider::MessageWriteCompleted(TInt aStatus, const CSmsMessage* aSmsMessage)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_MESSAGEWRITECOMPLETED_1, "CSmsProvider::MessageWriteCompleted [aStatus=%d]", aStatus);
+	LOGSMSPROT2("CSmsProvider::MessageWriteCompleted [aStatus=%d]", aStatus);
 
 	// If no errors at present populate the buffer
 	if( aStatus == KErrNone )
@@ -1104,7 +1097,7 @@
  */
 void CSmsProvider::PopulateBufferWithPDUSlotsL(const CSmsMessage& aSmsMessage)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_POPULATEBUFFERWITHPDUSLOTSL_1, "CSmsProvider::PopulateBufferWithPDUSlotsL");
+    LOGSMSPROT1("CSmsProvider::PopulateBufferWithPDUSlotsL");
     
     // Create buffer for store id and PDU slot indexes based on size of slot array
     
@@ -1122,7 +1115,7 @@
     iSocket->IoctlComplete(&textBufPtr);
     delete buf;
 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_POPULATEBUFFERWITHPDUSLOTSL_2, "-> CSmsProvider::PopulateBufferWithPDUSlotsL - done");
+    LOGSMSPROT1("-> CSmsProvider::PopulateBufferWithPDUSlotsL - done");
     }
 
 /**
@@ -1135,7 +1128,7 @@
  */
 void CSmsProvider::MessageDeleteCompleted(TInt aStatus)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_MESSAGEDELETECOMPLETED_1, "CSmsProvider::MessageDeleteCompleted [aStatus=%d]", aStatus);
+    LOGSMSPROT2("CSmsProvider::MessageDeleteCompleted [aStatus=%d]", aStatus);
     iSocket->Error(aStatus,MSocketNotify::EErrorIoctl);
     SetIoctlOutstanding(EFalse);
     }
@@ -1150,7 +1143,7 @@
  */
 void CSmsProvider::ReadSmsParamsCompleted(TInt aStatus, CMobilePhoneSmspList* aSmspList)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_READSMSPARAMSCOMPLETED_1, "CSmsProvider::ReadSmsParamsCompleted [aStatus=%d]", aStatus);
+    LOGSMSPROT2("CSmsProvider::ReadSmsParamsCompleted [aStatus=%d]", aStatus);
     
     TInt numNewSegments=0;
     
@@ -1184,7 +1177,7 @@
  */
 void CSmsProvider::WriteSmsParamsCompleted(TInt aStatus)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_WRITESMSPARAMSCOMPLETED_1, "CSmsProvider::WriteSmsParamsCompleted [aStatus=%d]", aStatus);
+    LOGSMSPROT2("CSmsProvider::WriteSmsParamsCompleted [aStatus=%d]", aStatus);
     iSocket->Error(aStatus,MSocketNotify::EErrorIoctl);
     SetIoctlOutstanding(EFalse);
     }
@@ -1199,12 +1192,12 @@
  */
 TInt CSmsProvider::ExternalizeEnumeratedMessagesL(TInt& aCount)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_EXTERNALIZEENUMERATEDMESSAGESL_1, "CSmsProvider::ExternalizeEnumeratedMessagesL");
+    LOGSMSPROT1("CSmsProvider::ExternalizeEnumeratedMessagesL");
     
     TInt numnewsegments(0);
     numnewsegments=iProtocol.ExternalizeEnumeratedMessagesL(*this,aCount);
     
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_EXTERNALIZEENUMERATEDMESSAGESL_2, "-> CSmsProvider::ExternalizeEnumeratedMessagesL - done");
+    LOGSMSPROT1("-> CSmsProvider::ExternalizeEnumeratedMessagesL - done");
     
     return numnewsegments;
     }
@@ -1222,7 +1215,7 @@
  */
 TInt CSmsProvider::ExternalizeMessageL(const CSmsMessage& aSmsMessage,TBool aAppend)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_EXTERNALIZEMESSAGEL_1, "CSmsProvider::ExternalizeMessageL()");
+    LOGSMSPROT1("CSmsProvider::ExternalizeMessageL()");
     
     // Create a new segmented buffer for the serialization of this message
     CBufSeg* recvbufseg = CBufSeg::NewL(KSmsMaxSegmentLength);
@@ -1246,7 +1239,7 @@
     CleanupStack::PopAndDestroy();  //  writestream
     CleanupStack::Pop();            //  recvbufseg
     
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_EXTERNALIZEMESSAGEL_2, "-> CSmsProvider::ExternalizeMessageL - done");
+    LOGSMSPROT1("-> CSmsProvider::ExternalizeMessageL - done");
     
     return NumSegments(recvbufseg->Size());
     }
@@ -1262,7 +1255,7 @@
  */
 CSmsMessage* CSmsProvider::InternalizeMessageL()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_INTERNALIZEMESSAGEL_1, "CSmsProvider::InternalizeMessageL()");
+    LOGSMSPROT1("CSmsProvider::InternalizeMessageL()");
     
     // Initialize the read stream with the buffer
     RBufReadStream readstream(*iSendBufSeg);
@@ -1281,7 +1274,7 @@
     CleanupStack::PopAndDestroy();  //  readstream
     iSendBufSeg->Reset();
 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_INTERNALIZEMESSAGEL_2, "-> CSmsProvider::InternalizeMessageL - done");
+    LOGSMSPROT1("-> CSmsProvider::InternalizeMessageL - done");
     
     return smsmessage;
     }
@@ -1298,7 +1291,7 @@
  */
 TInt CSmsProvider::ExternalizeParametersL(const CMobilePhoneSmspList& aMobilePhoneSmspList)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_EXTERNALIZEPARAMETERSL_1, "CSmsProvider::ExternalizeParametersL");
+    LOGSMSPROT1("CSmsProvider::ExternalizeParametersL");
     
     // Create a new segmented buffer for the serialization of this message
     CBufSeg* recvBufSeg = CBufSeg::NewL(KSmsMaxSegmentLength);
@@ -1316,7 +1309,7 @@
     iRecvBufSegArray->InsertL(0,recvBufSeg);
     CleanupStack::Pop(recvBufSeg);
 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_EXTERNALIZEPARAMETERSL_2, "-> CSmsProvider::ExternalizeParametersL - done");
+    LOGSMSPROT1("-> CSmsProvider::ExternalizeParametersL - done");
     
     return NumSegments(recvBufSeg->Size());
     }
@@ -1332,7 +1325,7 @@
  */
 CMobilePhoneSmspList* CSmsProvider::InternalizeParametersL()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_INTERNALIZEPARAMETERSL_1, "CSmsProvider::InternalizeParametersL");
+    LOGSMSPROT1("CSmsProvider::InternalizeParametersL");
     
     // Initialize the read stream with the buffer
     RBufReadStream readStream(*iSendBufSeg);
@@ -1350,14 +1343,14 @@
     CleanupStack::PopAndDestroy();	//readStream
     iSendBufSeg->Reset();
 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_INTERNALIZEPARAMETERSL_2, "-> CSmsProvider::InternalizeParametersL - done");
+    LOGSMSPROT1("-> CSmsProvider::InternalizeParametersL - done");
     
     return mobilePhoneSmspList;
     }
 
 CSmsMessage* CSmsProvider::InternalizeMessageL(	CBufSeg* aBufSeg)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_INTERNALIZEMESSAGEL1_1, "CSmsProvider::InternalizeMessageL");
+    LOGSMSPROT1("CSmsProvider::InternalizeMessageL");
     
     RBufReadStream readstream(*aBufSeg);
     readstream.Open(*aBufSeg,0);
@@ -1371,14 +1364,14 @@
     CleanupStack::Pop();  //  smsmessage
     CleanupStack::PopAndDestroy();  //  readsream
     
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_INTERNALIZEMESSAGEL1_2, "-> CSmsProvider::InternalizeMessageL - done");
+    LOGSMSPROT1("-> CSmsProvider::InternalizeMessageL - done");
     
     return smsmessage;
     }
 
 TInt CSmsProvider::SecurityCheck(MProvdSecurityChecker* aSecurityChecker)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SECURITYCHECK_1, "CSmsProvider::SecurityCheck");
+    LOGSMSPROT1("CSmsProvider::SecurityCheck");
     iSecurityChecker = aSecurityChecker;
     return KErrNone;
     }

--- a/smsprotocols/smsstack/smsprot/Src/smspsend.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspsend.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -20,12 +20,6 @@
  @internalAll
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspsendTraces.h"
-#endif
-
 #include "smspsend.h"
 #include "smspstor.h"
 #include "smspmain.h"
@@ -54,7 +48,7 @@
 									   TInt aPriority,
 									   CSmspSetBearer& aSmspSetBearer)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_NEWL_1, "CSmsMessageSend::NewL()");
+	LOGSMSPROT1("CSmsMessageSend::NewL()");
 
 	CSmsMessageSend*  self = new (ELeave) CSmsMessageSend(aSegmentationStore,
 														  aSmsSettings,
@@ -77,7 +71,7 @@
  */
 void CSmsMessageSend::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_CONSTRUCTL_1, "CSmsMessageSend::ConstructL()");
+	LOGSMSPROT1("CSmsMessageSend::ConstructL()");
 
 	iSmsEventLogger = CSmsEventLogger::NewL(iSegmentationStore.FileSession(),
 											Priority());
@@ -130,7 +124,7 @@
 void CSmsMessageSend::Start(CSmsMessage& aSmsMessage, TInt aOptions,
 							const TSmsAddr& aSmsAddr, TRequestStatus& aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_START_1, "CSmsMessageSend::Start()");
+	LOGSMSPROT1("CSmsMessageSend::Start()");
 
 	__ASSERT_DEBUG(iState == ESmsMessageSendIdle,SmspPanic(KSmspPanicUnexpectedState));
 
@@ -166,7 +160,7 @@
 
 void CSmsMessageSend::DoRunL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DORUNL_1, "CSmsMessageSend::RunL(): iStatus=%d, iState=%d", iStatus.Int(), iState);
+	LOGSMSPROT3("CSmsMessageSend::RunL(): iStatus=%d, iState=%d", iStatus.Int(), iState);
 
 	switch (iState)
 		{
@@ -254,15 +248,18 @@
 
 			if (iStatus.Int() == KErrNone  &&  !IsRPError())
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DORUNL_2, "CSmsMessageSend::RunL(): Submit ACK'd MsgRef=%d",iMobileSmsSendAttributesV1.iMsgRef);
+				LOGSMSIF2("CSmsMessageSend::RunL(): Submit ACK'd MsgRef=%d",
+				          iMobileSmsSendAttributesV1.iMsgRef);
 				}
 			else if (IsRPError())
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DORUNL_3, "CSmsMessageSend::RunL(): Submit N'ACK'D MsgRef=%d",iMobileSmsSendAttributesV1.iMsgRef);
+				LOGSMSIF2("CSmsMessageSend::RunL(): Submit N'ACK'D MsgRef=%d",
+				          iMobileSmsSendAttributesV1.iMsgRef);
 				}
 			else
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DORUNL_4, "CSmsMessageSend::RunL(): MsgRef=%d",iMobileSmsSendAttributesV1.iMsgRef);
+				LOGSMSIF2("CSmsMessageSend::RunL(): MsgRef=%d",
+				          iMobileSmsSendAttributesV1.iMsgRef);
 				}
 
 			//
@@ -355,7 +352,7 @@
 
 void CSmsMessageSend::DoCancel()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DOCANCEL_1, "CSmsMessageSend::DoCancel(): iState=%d", iState);
+	LOGSMSPROT2("CSmsMessageSend::DoCancel(): iState=%d", iState);
 
 	TimedSetActiveCancel();
 
@@ -425,7 +422,7 @@
  */
 void CSmsMessageSend::DecodeSubmitReportL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DECODESUBMITREPORTL_1, "CSmsMessageSend::DecodeSubmitReportL()");
+	LOGSMSPROT1("CSmsMessageSend::DecodeSubmitReportL()");
 
 	//
 	// Only try to decode the submit report if error is a RP-error, in which case there should be a valid PDU
@@ -453,7 +450,7 @@
 			}
 		else
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DECODESUBMITREPORTL_2, "Invalid PDU Type = %d with iStatus = %d",  smsMessage->SmsPDU().Type(),  iStatus.Int()  );
+			LOGSMSPROT3("Invalid PDU Type = %d with iStatus = %d",  smsMessage->SmsPDU().Type(),  iStatus.Int()  );
 			}
 
 		CleanupStack::PopAndDestroy(smsMessage);
@@ -468,7 +465,7 @@
  */
 TBool CSmsMessageSend::IsRPError() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_ISRPERROR_1, "CSmsMessageSend::IsRPError()");
+	LOGSMSPROT1("CSmsMessageSend::IsRPError()");
 	
 	TBool  isRPError = EFalse;
 
@@ -517,7 +514,7 @@
 
 void CSmsMessageSend::SegmentMessage()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_SEGMENTMESSAGE_1, "CSmsMessageSend::SegmentMessage()");
+	LOGSMSPROT1("CSmsMessageSend::SegmentMessage()");
 
 	iState = ESmsMessageSendSegmentingMessage;
 
@@ -529,7 +526,7 @@
 
 void CSmsMessageSend::DoSegmentMessageL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DOSEGMENTMESSAGEL_1, "CSmsMessageSend::DoSegmentMessageL()");
+	LOGSMSPROT1("CSmsMessageSend::DoSegmentMessageL()");
 
 	TInt reference=0;
 	if (iSmsMessage->Type()==CSmsPDU::ESmsCommand)
@@ -601,8 +598,8 @@
 			 	}
 			}
 
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DOSEGMENTMESSAGEL_2, "CSmsMesageSend::DoSegmentMessageL [LogServerId=%d][iSentBefore=%d]",iSmsMessage->LogServerId(),iSentBefore);
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DOSEGMENTMESSAGEL_3, "CSmsMesageSend::DoSegmentMessageL [referenceNo=%d] [iCountOfSentBefore=%d ]",reference,iSmsPDUData.iSent);
+		LOGSMSPROT3("CSmsMesageSend::DoSegmentMessageL [LogServerId=%d][iSentBefore=%d]",iSmsMessage->LogServerId(),iSentBefore);
+		LOGSMSPROT3("CSmsMesageSend::DoSegmentMessageL [referenceNo=%d] [iCountOfSentBefore=%d ]",reference,iSmsPDUData.iSent);
 		if(!iSentBefore)
 			{
 			iSegmentationStore.AddSubmitL(iSmsAddr,*iSmsMessage);
@@ -613,7 +610,7 @@
 
 void CSmsMessageSend::CreateLogServerEvent()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_CREATELOGSERVEREVENT_1, "CSmsMessageSend::CreateLogServerEvent()");
+	LOGSMSPROT1("CSmsMessageSend::CreateLogServerEvent()");
 
 	iState=ESmsMessageSendCreatingLogServerEvent;
 	TLogId logid=(TLogId) iSmsMessage->LogServerId();
@@ -633,7 +630,7 @@
 
 void CSmsMessageSend::SendNextPDU()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_SENDNEXTPDU_1, "CSmsMessageSend::SendNextPDU [sending pdu %d of count=%d]",iSmsPDUData.iSent, iSmsArray.Count() );
+	LOGSMSPROT3("CSmsMessageSend::SendNextPDU [sending pdu %d of count=%d]",iSmsPDUData.iSent, iSmsArray.Count() );
 
 	if (iSmsPDUData.iSent<iSmsArray.Count())
 		{
@@ -677,13 +674,10 @@
 		//
 		// Debug logging of the PDU we are sending...
 		//
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
-        LogSmsIfPDUL(_L8("ETEL TX PDU: "), iSmsArray[iSmsPDUData.iSent].Pdu(), ETrue);
-        LogSmsIfSendAttributes(_L8("SENDATTRIBS: "), iMobileSmsSendAttributesV1);
-        TBuf<40> timestamp;
-        SmsTimeStampL(timestamp);
-        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSMESSAGESEND_SENDNEXTPDU_2, "%S",timestamp);
-#endif
+		LOGSMSIFPDU(_L8("ETEL TX PDU: "), iSmsArray[iSmsPDUData.iSent].Pdu(), ETrue);
+		LOGSMSIFSENDATTRIBUTES(_L8("SENDATTRIBS: "), iMobileSmsSendAttributesV1);
+		LOGSMSIFTIMESTAMP();
+
 		//
 		// Send the message and enter the correct state...
 		//
@@ -707,7 +701,7 @@
 
 void CSmsMessageSend::DoUpdateSegmentationStoreL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DOUPDATESEGMENTATIONSTOREL_1, "CSmsMessageSend::DoUpdateSegmentationStoreL()");
+	LOGSMSPROT1("CSmsMessageSend::DoUpdateSegmentationStoreL()");
 
 	iSmsPDUData.iSent++;  //  This is the end of the sequence for sending an SMS PDU
 	
@@ -729,7 +723,7 @@
 
 void CSmsMessageSend::UpdateLogServerEvent()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_UPDATELOGSERVEREVENT_1, "CSmsMessageSend::UpdateLogServerEvent()");
+	LOGSMSPROT1("CSmsMessageSend::UpdateLogServerEvent()");
 
 	//
 	//	Fill in log event...
@@ -743,7 +737,7 @@
 
 void CSmsMessageSend::Complete(TInt aStatus)
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_COMPLETE_1, "CSmsMessageSend::Complete [iStatus=%d, iState=%d]", iStatus.Int(), iState );
+	LOGSMSPROT3("CSmsMessageSend::Complete [iStatus=%d, iState=%d]", iStatus.Int(), iState );
 
 	//
 	// For completion during log events, use the saved error code instead...

--- a/smsprotocols/smsstack/smsprot/Src/smspstor.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspstor.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspstorTraces.h"
-#endif
-
 #include <e32svr.h>
 #include <es_ini.h>
 #include "smspstor.h"
@@ -32,6 +26,7 @@
 #include "smsuaddr.H"
 #include "Gsmumsg.h"
 #include "gsmubuf.h"
+#include <logwrap.h>
 #include <logwraplimits.h>
 #include "Gsmuelem.h"
 #include "gsmuieoperations.h"
@@ -39,7 +34,7 @@
 
 LOCAL_C TPtrC TrimLeadingZeros(const TDesC& aString)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TRIMLEADINGZEROS_1, "CSARStore::ExternalizeEntryArrayL()");
+	LOGSMSPROT1("CSARStore::ExternalizeEntryArrayL()");
 
 	const TInt len = aString.Length();
 
@@ -64,7 +59,7 @@
  */
 CSmsReassemblyStore* CSmsReassemblyStore::NewL(RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_NEWL_1, "CSmsReassemblyStore::NewL()");
+	LOGSMSPROT1("CSmsReassemblyStore::NewL()");
 
 	CSmsReassemblyStore*  self = new (ELeave) CSmsReassemblyStore(aFs);
 	CleanupStack::PushL(self);
@@ -80,7 +75,7 @@
  */
 void CSmsReassemblyStore::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_CONSTRUCTL_1, "CSmsReassemblyStore::ConstructL()");
+	LOGSMSPROT1("CSmsReassemblyStore::ConstructL()");
 
 	//
 	// Generate the full path to the reassembly store.
@@ -104,7 +99,7 @@
 
 void CSmsReassemblyStore::UpdateLogServerIdL(TInt aIndex, TLogId aLogServerId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_UPDATELOGSERVERIDL_1, "CSmsReassemblyStore::UpdateLogServerIdL()");
+	LOGSMSPROT1("CSmsReassemblyStore::UpdateLogServerIdL()");
 
 	TSmsReassemblyEntry entry(reinterpret_cast<const TSmsReassemblyEntry&>(Entries()[aIndex]));
 
@@ -132,7 +127,7 @@
 										TBool aPassed,
 										TInt& aIndex)
  	{
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_FINDMESSAGEL_1, "CSmsReassemblyStore::FindMessageL()");
+ 	LOGSMSPROT1("CSmsReassemblyStore::FindMessageL()");
 
 	//
 	// Parse the GSM data from the SMS message...
@@ -158,7 +153,7 @@
 			//
 			// Found!
 			//
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_FINDMESSAGEL_2, "CSmsReassemblyStore::FindMessage(): Found! index=%d", index);
+			LOGSMSPROT2("CSmsReassemblyStore::FindMessage(): Found! index=%d", index);
 
 			aIndex = index;
 
@@ -169,7 +164,7 @@
 	//
 	// Not found...
 	//
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_FINDMESSAGEL_3, "CSmsReassemblyStore::FindMessage(): Not found!");
+	LOGSMSPROT1("CSmsReassemblyStore::FindMessage(): Not found!");
 
  	return EFalse;
  	} // CSmsReassemblyStore::FindMessageL
@@ -187,7 +182,7 @@
 void CSmsReassemblyStore::MatchPDUToExistingMessage(const CSmsMessage& aSmsMessage,
 													TInt& aIndex)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_1, "CSmsReassemblyStore::MatchPDUToExistingMessage()");
+	LOGSMSPROT1("CSmsReassemblyStore::MatchPDUToExistingMessage()");
 
 	__ASSERT_ALWAYS(!aSmsMessage.IsDecoded(), SmspPanic(KSmspPanicMessageConcatenated));
 
@@ -227,7 +222,7 @@
 			}
 		}
 
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_2, "CSmsReassemblyStore::MatchPDUToExistingMessage(): reassemblyCount=%d, aIndex=%d", reassemblyCount, aIndex);
+	LOGSMSPROT3("CSmsReassemblyStore::MatchPDUToExistingMessage(): reassemblyCount=%d, aIndex=%d", reassemblyCount, aIndex);
 	} // CSmsReassemblyStore::MatchPDUToExistingMessage
 
 
@@ -237,7 +232,7 @@
 												 TBool& aDuplicateMsgRef,
 												 TBool& aDuplicateSlot)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1, "CSmsReassemblyStore::UpdateExistingMessageL()");
+	LOGSMSPROT1("CSmsReassemblyStore::UpdateExistingMessageL()");
 
 	aComplete        = EFalse;
 	aDuplicateMsgRef = EFalse;
@@ -281,7 +276,7 @@
 
 			if (slot.iIndex == newSlot.iIndex  && slot.iStore == newSlot.iStore)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_2, "CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate enumerated PDU.");
+				LOGSMSPROT1("CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate enumerated PDU.");
 
 				// It is a duplicate that was already stored on the SIM...
 				aDuplicateSlot = ETrue;
@@ -296,7 +291,7 @@
 		{
 		if (indexArray->At(index) == concatPDUIndex)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_3, "CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate concatenated PDU.");
+			LOGSMSPROT1("CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate concatenated PDU.");
 
 			// The PDU is already stored in the reassembly store.
 			aDuplicateMsgRef = ETrue;
@@ -365,7 +360,7 @@
 
 void CSmsReassemblyStore::NewMessagePDUL(TInt& aIndex,CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_NEWMESSAGEPDUL_1, "CSmsReassemblyStore::NewMessagePDUL");
+	LOGSMSPROT1("CSmsReassemblyStore::NewMessagePDUL");
 
 	CArrayFix<TInt>* indexarray=new(ELeave) CArrayFixFlat<TInt>(8);
 	CleanupStack::PushL(indexarray);
@@ -382,7 +377,7 @@
 
 void CSmsReassemblyStore::GetMessageL(TInt aIndex,CSmsMessage& aSmsMessage)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_GETMESSAGEL_1, "CSmsReassemblyStore::GetMessageL [aIndex=%d]", aIndex);
+	LOGSMSPROT2("CSmsReassemblyStore::GetMessageL [aIndex=%d]", aIndex);
 
 	CArrayFix<TInt>* indexarray=new(ELeave) CArrayFixFlat<TInt>(8);
 	CleanupStack::PushL(indexarray);
@@ -403,7 +398,7 @@
  */
 void CSmsReassemblyStore::InternalizeEntryL(const TStreamId& aStreamId,CSmsMessage& aSmsMessage,CArrayFix<TInt>& aIndexArray,CArrayFix<TGsmSms>& aSmsArray)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_INTERNALIZEENTRYL_1, "CSmsReassemblyStore::InternalizeEntryL Start [sid=%d]", aStreamId.Value());
+	LOGSMSPROT2("CSmsReassemblyStore::InternalizeEntryL Start [sid=%d]", aStreamId.Value());
 	RStoreReadStream readstream;
 	readstream.OpenLC(FileStore(),aStreamId);
 	readstream >> aSmsMessage;
@@ -428,7 +423,7 @@
 		aSmsArray.AppendL(sms);
 		}
 	CleanupStack::PopAndDestroy();
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_INTERNALIZEENTRYL_2, "CSmsReassemblyStore::InternalizeEntryL End [count=%d]", count);
+	LOGSMSPROT2("CSmsReassemblyStore::InternalizeEntryL End [count=%d]", count);
 	} // CSARStore::OpenFileLC
 
 
@@ -439,7 +434,7 @@
  */
 void CSmsReassemblyStore::ExternalizeEntryL(TStreamId& aStreamId,const CSmsMessage& aSmsMessage,const CArrayFix<TInt>& aIndexArray,const CArrayFix<TGsmSms>& aSmsArray)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_EXTERNALIZEENTRYL_1, "CSmsReassemblyStore::ExternalizeEntryL Start [sid=%d]", aStreamId.Value());
+	LOGSMSPROT2("CSmsReassemblyStore::ExternalizeEntryL Start [sid=%d]", aStreamId.Value());
 
 	RStoreWriteStream writestream;
 	if (aStreamId==KNullStreamId)
@@ -464,13 +459,13 @@
 	writestream.CommitL();
 	CleanupStack::PopAndDestroy();
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_EXTERNALIZEENTRYL_2, "CSmsReassemblyStore::ExternalizeEntryL End [count=%d]", count);
+	LOGSMSPROT2("CSmsReassemblyStore::ExternalizeEntryL End [count=%d]", count);
 	} // CSARStore::OpenFileLC
 
 
 void CSmsReassemblyStore::PopulateEntry(TSmsReassemblyEntry& aEntry,const CSmsMessage& aSmsMessage,TInt aNumSmss)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_POPULATEENTRY_1, "CSmsReassemblyStore::PopulateEntry");
+	LOGSMSPROT1("CSmsReassemblyStore::PopulateEntry");
 	aEntry.SetReference(0);
 	aEntry.SetTotal(1);
 	aEntry.SetCount(1);
@@ -528,7 +523,7 @@
 
 void CSmsReassemblyStore::CreateEntryL(CSmsMessage& aSmsMessage,const CArrayFix<TInt>& aIndexArray,const CArrayFix<TGsmSms>& aSmsArray)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_CREATEENTRYL_1, "CSmsReassemblyStore::CreateEntryL");
+	LOGSMSPROT1("CSmsReassemblyStore::CreateEntryL");
  	TStreamId streamid=KNullStreamId;
  	if (aSmsMessage.Time() >= iLastRealTime)
  		{
@@ -556,7 +551,7 @@
 
 TBool CSmsReassemblyStore::PassedToClient( TInt aIndex ) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_PASSEDTOCLIENT_1, "CSmsReassemblyStore::PassedToClient()");
+	LOGSMSPROT1("CSmsReassemblyStore::PassedToClient()");
 
 	const TSmsReassemblyEntry& entry = reinterpret_cast<const TSmsReassemblyEntry&>(Entries()[ aIndex ]);
 	return entry.PassedToClient();
@@ -565,7 +560,7 @@
 
 void CSmsReassemblyStore::SetPassedToClientL(TInt aIndex, TBool aPassed)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_SETPASSEDTOCLIENTL_1, "CSmsReassemblyStore::SetPassedToClientL()");
+	LOGSMSPROT1("CSmsReassemblyStore::SetPassedToClientL()");
 
 	TSmsReassemblyEntry entry(reinterpret_cast<const TSmsReassemblyEntry&>(Entries()[aIndex]));
 
@@ -584,7 +579,7 @@
  */
 void CSmsReassemblyStore::OpenStoreL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_OPENSTOREL_1, "CSmsReassemblyStore::OpenStoreL()");
+	LOGSMSPROT1("CSmsReassemblyStore::OpenStoreL()");
 
 	this->OpenL(iFullPathBuf,KReassemblyStoreUid);
 	} // CSmsReassemblyStore::OpenStoreL
@@ -604,7 +599,7 @@
 
 CSmsSegmentationStore* CSmsSegmentationStore::NewL(RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_NEWL_1, "CSmsSegmentationStore::NewL()");
+	LOGSMSPROT1("CSmsSegmentationStore::NewL()");
 
 	CSmsSegmentationStore* segmentationStore = new(ELeave) CSmsSegmentationStore(aFs);
 	CleanupStack::PushL( segmentationStore );
@@ -616,7 +611,7 @@
 
 void CSmsSegmentationStore::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_CONSTRUCTL_1, "CSmsSegmentationStore::ConstructL()");
+	LOGSMSPROT1("CSmsSegmentationStore::ConstructL()");
 
 	//generate fullpath of segmentation store.
 	PrivatePath(iFullPathBuf);
@@ -657,7 +652,7 @@
 
 TInt CSmsSegmentationStore::Next8BitReferenceL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_1, "CSmsSegmentationStore::Next8BitReferenceL");
+	LOGSMSPROT1("CSmsSegmentationStore::Next8BitReferenceL");
 
 	TInt reference8bit=0;
 	TInt reference16bit=0;
@@ -674,7 +669,7 @@
 			{
 			// We have to leave on any error; otherwise a duplicate reference number will be generated
 			// The transaction will revert
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_2, "WARNING! CSmsSegmentationStore::InternalizeConcatenationReferencesL left with %d", ret);
+			LOGSMSPROT2("WARNING! CSmsSegmentationStore::InternalizeConcatenationReferencesL left with %d", ret);
 			User::Leave(ret);  //  stream not corrupted
 			}
 		reference8bit=(reference8bit+1)%0x100;
@@ -684,7 +679,7 @@
 		{
 		// We have to leave on any error; otherwise a duplicate reference number will be generated
 		// The transaction will revert
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_3, "WARNING! CSmsSegmentationStore::ExternalizeConcatenationReferencesL left with %d", ret);
+		LOGSMSPROT2("WARNING! CSmsSegmentationStore::ExternalizeConcatenationReferencesL left with %d", ret);
 		User::Leave(ret);  //  stream not corrupted
 		}
 	SetExtraStreamIdL(streamid);
@@ -695,7 +690,7 @@
 
 TInt CSmsSegmentationStore::Next16BitReferenceL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_1, "CSmsSegmentationStore::Next16BitReferenceL");
+	LOGSMSPROT1("CSmsSegmentationStore::Next16BitReferenceL");
 	TInt reference8bit=0;
 	TInt reference16bit=0x100;
 	TStreamId streamid=ExtraStreamId();
@@ -710,7 +705,7 @@
 			{
 			// We have to leave on any error; otherwise a duplicate reference number will be generated
 			// The transaction will revert
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_2, "WARNING! CSmsSegmentationStore::InternalizeConcatenationReferencesL left with %d", ret);
+			LOGSMSPROT2("WARNING! CSmsSegmentationStore::InternalizeConcatenationReferencesL left with %d", ret);
 			User::Leave(ret);  //  stream not corrupted
 			}
 		reference16bit=((reference16bit+1)%0xFF00)+0x100;
@@ -720,7 +715,7 @@
 		{
 		// We have to leave on any error; otherwise a duplicate reference number will be generated
 		// The transaction will revert
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_3, "WARNING! CSmsSegmentationStore::ExternalizeConcatenationReferencesL left with %d", ret);
+		LOGSMSPROT2("WARNING! CSmsSegmentationStore::ExternalizeConcatenationReferencesL left with %d", ret);
 		User::Leave(ret);  //  stream not corrupted
 		}
 	SetExtraStreamIdL(streamid);
@@ -740,7 +735,7 @@
  */
 void CSmsSegmentationStore::AddSubmitL(const TSmsAddr& aSmsAddr,CSmsMessage& aSubmit)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSUBMITL_1, "CSmsSegmentationStore::AddSubmitL");
+	LOGSMSPROT1("CSmsSegmentationStore::AddSubmitL");
 
 	__ASSERT_ALWAYS(aSubmit.Type()==CSmsPDU::ESmsSubmit,SmspPanic(KSmspPanicNotSubmit));
 
@@ -771,7 +766,7 @@
 
 TBool CSmsSegmentationStore::AddCommandL(const TSmsAddr& aSmsAddr,const CSmsMessage& aCommand, CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray& aRefStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDCOMMANDL_1, "CSmsSegmentationStore::AddCommandL");
+	LOGSMSPROT1("CSmsSegmentationStore::AddCommandL");
 	__ASSERT_ALWAYS(aCommand.Type()==CSmsPDU::ESmsCommand,SmspPanic(KSmspPanicNotCommand));
 	const TInt count=Entries().Count();
 	const TLogId logid=(TLogId) aCommand.LogServerId();
@@ -847,7 +842,7 @@
 TBool CSmsSegmentationStore::AddReferenceL(const CSmsMessage& aSmsMessage,TInt aReference)
 	{
 	const TInt count=Entries().Count();
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDREFERENCEL_1, "CSmsSegmentationStore::AddReferenceL [count=%d, ref=%d]", count, aReference);
+	LOGSMSPROT3("CSmsSegmentationStore::AddReferenceL [count=%d, ref=%d]", count, aReference);
 	TInt i=0;
 	TInt logserverid=aSmsMessage.LogServerId();
 	if (logserverid!=KLogNullId)
@@ -875,7 +870,7 @@
             }
 	if(i>=count)
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDREFERENCEL_2, "WARNING! KSmspPanicEntryWithLogServerIdNotFound [i=%d, count=%d]", i, count);
+		LOGSMSPROT3("WARNING! KSmspPanicEntryWithLogServerIdNotFound [i=%d, count=%d]", i, count);
 		return EFalse;
 		}
 
@@ -927,7 +922,7 @@
 TBool CSmsSegmentationStore::AddReferenceStatusPairL(const CSmsMessage& aSmsMessage,TInt aReference, TUint aSegmentSequenceNumber)
  	{
 	const TInt count=Entries().Count();
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDREFERENCESTATUSPAIRL_1, "CSmsSegmentationStore::AddReferenceStatusPairL [count=%d, ref=%d]", count, aReference);
+	LOGSMSPROT3("CSmsSegmentationStore::AddReferenceStatusPairL [count=%d, ref=%d]", count, aReference);
 	TInt i=0;
 	TInt logserverid=aSmsMessage.LogServerId();
 	if (logserverid!=KLogNullId)
@@ -955,7 +950,7 @@
 		}
 	if(i>=count)
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDREFERENCESTATUSPAIRL_2, "WARNING! KSmspPanicEntryWithLogServerIdNotFound [i=%d, count=%d]", i, count);
+		LOGSMSPROT3("WARNING! KSmspPanicEntryWithLogServerIdNotFound [i=%d, count=%d]", i, count);
 		return EFalse;
 		}
 
@@ -1033,7 +1028,7 @@
 
 TBool CSmsSegmentationStore::AddStatusReportL(TInt& aIndex,TBool& aComplete,const CSmsMessage& aStatusReport)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_1, "CSmsSegmentationStore::AddStatusReportL");
+	LOGSMSPROT1("CSmsSegmentationStore::AddStatusReportL");
 
 	__ASSERT_DEBUG(aStatusReport.Type()==CSmsPDU::ESmsStatusReport,SmspPanic(KSmspPanicNotStatusReport));
 
@@ -1045,7 +1040,7 @@
 	TBool found=EFalse;
 	aComplete=EFalse;
 
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_2, "CSmsSegmentationStore::AddStatusReportL [ref=%d status=%d IsPerm=%d]", reference, status, isPerm);
+	LOGSMSPROT4("CSmsSegmentationStore::AddStatusReportL [ref=%d status=%d IsPerm=%d]", reference, status, isPerm);
 
 	if(!isPerm)
 		{
@@ -1088,11 +1083,11 @@
 		
 		if (sameTelNumbers)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_3, "CSmsSegmentationStore::AddStatusReportL telNumber from submit report matches that from SMS message");
+			LOGSMSPROT1("CSmsSegmentationStore::AddStatusReportL telNumber from submit report matches that from SMS message");
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_4, "CSmsSegmentationStore::AddStatusReportL telNumber from submit report does NOT match that from SMS message");
+			LOGSMSPROT1("CSmsSegmentationStore::AddStatusReportL telNumber from submit report does NOT match that from SMS message");
 			}
 
 		if (sameTelNumbers &&
@@ -1119,21 +1114,21 @@
 						}
 					else
 						{
-						OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_5, "CSmsSegmentationStore::AddStatusReportL WARNING: Status already perm [status=%d refStatusPos=%d count=%d]", refStatusArray[refStatusPos].Status(), refStatusPos, refStatusArrayCount);
+						LOGSMSPROT4("CSmsSegmentationStore::AddStatusReportL WARNING: Status already perm [status=%d refStatusPos=%d count=%d]", refStatusArray[refStatusPos].Status(), refStatusPos, refStatusArrayCount);
 						refStatusPos++;
 						}
 					}
 
 				if (found)
 					{
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_6, "CSmsSegmentationStore::AddStatusReportL Found [refStatusPos=%d]", refStatusPos);
+					LOGSMSPROT2("CSmsSegmentationStore::AddStatusReportL Found [refStatusPos=%d]", refStatusPos);
 					refStatusArray[refStatusPos].SetStatus(status);
 					TStreamId streamid=entry.DataStreamId();
 					ExternalizeEntryL(streamid,smsaddr,*smsmessage, refStatusArray);
 					PopulateEntry(entry,*smsmessage, refStatusArray);
 					ChangeEntryL(aIndex,entry);
 					aComplete=StatusArrayComplete(refStatusArray, entry);
-				    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_7, "CSmsSegmentationStore::AddStatusReportL StatusArrayComplete %d", aComplete);
+				    LOGSMSPROT2("CSmsSegmentationStore::AddStatusReportL StatusArrayComplete %d", aComplete);
 					}
 				}
 			}
@@ -1193,7 +1188,7 @@
 				PopulateEntry(entry,/*smsaddr,*/*smsmessage, refStatusArray2);
 				ChangeEntryL(aIndex,entry);
 				aComplete=StatusArrayComplete(refStatusArray2, entry);
-			    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_8, "CSmsSegmentationStore::StatusArrayComplete [aStatus=%d, ret=%d]", status, aComplete);
+			    LOGSMSPROT3("CSmsSegmentationStore::StatusArrayComplete [aStatus=%d, ret=%d]", status, aComplete);
 				break;
 				}
 			}
@@ -1204,14 +1199,14 @@
 	CommitTransactionL();
 	CleanupStack::PopAndDestroy(2); // smsmessage, refStatusArray
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_9, "CSmsSegmentationStore::AddStatusReportL Exit [found=%d]", found);
+	LOGSMSPROT2("CSmsSegmentationStore::AddStatusReportL Exit [found=%d]", found);
 	return found;
 	} // CSmsSegmentationStore::AddStatusReportL
 
 
 void CSmsSegmentationStore::GetMessageL(TInt aIndex,TSmsAddr& aSmsAddr,CSmsMessage& aSmsMessage, RSmsSegmentationStoreRefStatusArray& aRefStatusArray)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_GETMESSAGEL_1, "CSmsSegmentationStore::GetMessageL [aIndex=%d]", aIndex);
+	LOGSMSPROT2("CSmsSegmentationStore::GetMessageL [aIndex=%d]", aIndex);
 
 	InternalizeEntryL(Entries()[aIndex].DataStreamId(),aSmsAddr,aSmsMessage, aRefStatusArray);
 	} // CSmsSegmentationStore::GetMessageL
@@ -1225,13 +1220,13 @@
  */
 void CSmsSegmentationStore::InternalizeConcatenationReferencesL(const TStreamId& aStreamId,TInt& aReference8bit,TInt& aReference16bit)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_INTERNALIZECONCATENATIONREFERENCESL_1, "CSmsSegmentationStore::InternalizeConcatenationReferencesL Start");
+	LOGSMSPROT1("CSmsSegmentationStore::InternalizeConcatenationReferencesL Start");
 	RStoreReadStream readstream;
 	readstream.OpenLC(FileStore(),aStreamId);
 	aReference8bit=readstream.ReadInt32L();
 	aReference16bit=readstream.ReadInt32L();
 	CleanupStack::PopAndDestroy();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_INTERNALIZECONCATENATIONREFERENCESL_2, "CSmsSegmentationStore::InternalizeConcatenationReferencesL End");
+	LOGSMSPROT1("CSmsSegmentationStore::InternalizeConcatenationReferencesL End");
 	} // CSmsSegmentationStore::InternalizeConcatenationReferencesL
 
 
@@ -1243,7 +1238,7 @@
  */
 void CSmsSegmentationStore::ExternalizeConcatenationReferencesL(TStreamId& aStreamId,TInt aReference8bit,TInt aReference16bit)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_EXTERNALIZECONCATENATIONREFERENCESL_1, "CSmsSegmentationStore::ExternalizeConcatenationReferencesL Start");
+	LOGSMSPROT1("CSmsSegmentationStore::ExternalizeConcatenationReferencesL Start");
 	RStoreWriteStream writestream;
 	if (aStreamId==KNullStreamId)
 		aStreamId=writestream.CreateLC(FileStore());
@@ -1253,7 +1248,7 @@
 	writestream.WriteInt32L(aReference16bit);
 	writestream.CommitL();
 	CleanupStack::PopAndDestroy();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_EXTERNALIZECONCATENATIONREFERENCESL_2, "CSmsSegmentationStore::ExternalizeConcatenationReferencesL End");
+	LOGSMSPROT1("CSmsSegmentationStore::ExternalizeConcatenationReferencesL End");
 	} // CSmsSegmentationStore::ExternalizeConcatenationReferencesL
 
 
@@ -1265,7 +1260,7 @@
  */
 void CSmsSegmentationStore::InternalizeEntryL(const TStreamId& aStreamId,TSmsAddr& aSmsAddr,CSmsMessage& aSmsMessage, RSmsSegmentationStoreRefStatusArray& aRefStatusArray)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_INTERNALIZEENTRYL_1, "CSmsSegmentationStore::InternalizeEntryL Start");
+	LOGSMSPROT1("CSmsSegmentationStore::InternalizeEntryL Start");
 
 	aRefStatusArray.Reset();
 
@@ -1276,7 +1271,7 @@
 	readstream >> aRefStatusArray;
 	CleanupStack::PopAndDestroy(&readstream);
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_INTERNALIZEENTRYL_2, "CSmsSegmentationStore::InternalizeEntryL End [count=%d]", aRefStatusArray.Count());
+	LOGSMSPROT2("CSmsSegmentationStore::InternalizeEntryL End [count=%d]", aRefStatusArray.Count());
 	} // CSmsSegmentationStore::InternalizeEntryL
 
 
@@ -1285,7 +1280,7 @@
  */
 void CSmsSegmentationStore::ExternalizeEntryL(TStreamId& aStreamId,const TSmsAddr& aSmsAddr,const CSmsMessage& aSmsMessage, const RSmsSegmentationStoreRefStatusArray& aRefStatusArray)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_EXTERNALIZEENTRYL_1, "CSmsSegmentationStore::ExternalizeEntryL Start");
+	LOGSMSPROT1("CSmsSegmentationStore::ExternalizeEntryL Start");
 
 	RStoreWriteStream writestream;
 
@@ -1300,7 +1295,7 @@
 	writestream.CommitL();
 	CleanupStack::PopAndDestroy(&writestream);
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_EXTERNALIZEENTRYL_2, "CSmsSegmentationStore::ExternalizeEntryL End [count=%d]", aRefStatusArray.Count());
+	LOGSMSPROT2("CSmsSegmentationStore::ExternalizeEntryL End [count=%d]", aRefStatusArray.Count());
 	} // CSmsSegmentationStore::ExternalizeEntryL
 
 
@@ -1318,7 +1313,7 @@
 					  const CSmsMessage& aSmsMessage,
 					  const RSmsSegmentationStoreRefStatusArray& aRefStatusArray)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_POPULATEENTRY_1, "CSmsSegmentationStore::PopulateEntry");
+	LOGSMSPROT1("CSmsSegmentationStore::PopulateEntry");
 	TBool statusreportrequest=EFalse;
 	if (aSmsMessage.Type()==CSmsPDU::ESmsSubmit)
 		{
@@ -1426,7 +1421,7 @@
 	for (TInt i=0; i<count; i++)
 		{
 		const TBool ret = IsPermanentStatus(aRefStatusArray[i].Status());
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_STATUSARRAYCOMPLETE_1, "CSmsSegmentationStore::IsPermanentStatus [Status: %d, RetVal: %d, count=%d]", aRefStatusArray[i].Status(), ret, count);
+		LOGSMSPROT4("CSmsSegmentationStore::IsPermanentStatus [Status: %d, RetVal: %d, count=%d]", aRefStatusArray[i].Status(), ret, count);
 		if (ret)
 			permanent++;
 		}
@@ -1440,14 +1435,14 @@
 CSmsSegmentationStore::CSmsSegmentationStore(RFs& aFs)
     :CSARStore(aFs)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_CTOR_1, "CSmsSegmentationStore::CSmsSegmentationStore()");
+    LOGSMSPROT1("CSmsSegmentationStore::CSmsSegmentationStore()");
 
     } // CSmsSegmentationStore::CSmsSegmentationStore
 
 
 TInt CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::Compare(const TSmsSegmentationStoreRefStatus& aLeft, const TSmsSegmentationStoreRefStatus& aRight)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_COMPARE_1, "CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::Compare()");
+	LOGSMSPROT1("CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::Compare()");
 
 	return aLeft.iReference - aRight.iReference;
 	} // CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::Compare
@@ -1455,7 +1450,7 @@
 
 void CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::InternalizeL(RReadStream& aStream)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_INTERNALIZEL_1, "CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::InternalizeL()");
+	LOGSMSPROT1("CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::InternalizeL()");
 
 	iReference = aStream.ReadInt32L();
 	iStatus = aStream.ReadInt32L();
@@ -1464,7 +1459,7 @@
 
 void CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::ExternalizeL(RWriteStream& aStream) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_EXTERNALIZEL_1, "CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::ExternalizeL()");
+	LOGSMSPROT1("CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::ExternalizeL()");
 
 	aStream.WriteInt32L(iReference);
 	aStream.WriteInt32L(iStatus);
@@ -1473,7 +1468,7 @@
 
 void CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::InsertL(const TSmsSegmentationStoreRefStatus& aRefStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_INSERTL_1, "CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::InsertL()");
+	LOGSMSPROT1("CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::InsertL()");
 
 	TLinearOrder<TSmsSegmentationStoreRefStatus> order(TSmsSegmentationStoreRefStatus::Compare);
 	User::LeaveIfError(InsertInOrderAllowRepeats(aRefStatus, order));
@@ -1482,7 +1477,7 @@
 
 TInt CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::Find(const TSmsSegmentationStoreRefStatus& aRefStatus) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_FIND_1, "CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::Find()");
+	LOGSMSPROT1("CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::Find()");
 
 	TLinearOrder<TSmsSegmentationStoreRefStatus> order(TSmsSegmentationStoreRefStatus::Compare);
 	TInt index = FindInOrder(aRefStatus, order);
@@ -1502,7 +1497,7 @@
 
 void CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::CopyL(const RSmsSegmentationStoreRefStatusArray& aOther)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_COPYL_1, "CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::CopyL()");
+	LOGSMSPROT1("CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::CopyL()");
 
 	Reset();
 
@@ -1516,7 +1511,7 @@
 
 void CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::ResetAllStatus(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_RESETALLSTATUS_1, "CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::ResetAllStatus()");
+	LOGSMSPROT1("CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::ResetAllStatus()");
 
 	TInt count = Count();
 	while (count--)
@@ -1528,7 +1523,7 @@
 
 void CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::InternalizeL(RReadStream& aStream)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_INTERNALIZEL_1, "CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::InternalizeL()");
+	LOGSMSPROT1("CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::InternalizeL()");
 
 	TInt count = aStream.ReadInt32L();
 	while (count--)
@@ -1542,7 +1537,7 @@
 
 void CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::ExternalizeL(RWriteStream& aStream) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAYEXTERNALIZEL_1, "CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::ExternalizeL()");
+	LOGSMSPROT1("CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::ExternalizeL()");
 
 	const TInt count = Count();
 	aStream.WriteInt32L(count);
@@ -1556,7 +1551,7 @@
 
 TBool CSmsSegmentationStore::HasEntryWithLogIdL(TLogId aLogID,TInt& aRefNo,TInt& aSent)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_HASENTRYWITHLOGIDL_1, "CSmsSegmentationStore::HasEntryWithLogIdL()");
+	LOGSMSPROT1("CSmsSegmentationStore::HasEntryWithLogIdL()");
 
 	TInt count=Entries().Count();
 	TBool found=EFalse;
@@ -1581,7 +1576,7 @@
 				else
 					{
 					DeleteEntryL(i);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_HASENTRYWITHLOGIDL_2, "CSmsSegmentationStore::HasEntryWithLogIdL [Entry: %d LogId %d - deleted]", i, (TInt)aLogID );
+					LOGSMSPROT3("CSmsSegmentationStore::HasEntryWithLogIdL [Entry: %d LogId %d - deleted]", i, aLogID );
 					}
 				break;
 				}
@@ -1597,7 +1592,7 @@
  */
 void CSmsSegmentationStore::OpenStoreL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_OPENSTOREL_1, "CSmsSegmentationStore::OpenStoreL()");
+	LOGSMSPROT1("CSmsSegmentationStore::OpenStoreL()");
 
 	this->OpenL(iFullPathBuf,KSegmentationStoreUid);
 	} // CSmsSegmentationStore::OpenStoreL

--- a/smsprotocols/smsstack/smsprot/Test/TE_SMSSTOR/TE_smsstor.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Test/TE_SMSSTOR/TE_smsstor.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -31,12 +31,10 @@
 SOURCE           smspreassemblystore.cpp
 SOURCE           smspclass0stor.cpp
 
-userinclude		 .
 USERINCLUDE      ../../Inc
 USERINCLUDE   	 ../../../gsmu/inc
 USERINCLUDE      ../../../common/inc
 USERINCLUDE   	 ../../../smsu/inc
-USERINCLUDE      ../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
@@ -45,6 +43,6 @@
 LIBRARY       euser.lib efsrv.lib estor.lib bafl.lib esock.lib
 LIBRARY       testexecutelogclient.lib
 LIBRARY	      testexecuteutils.lib
-
+DEBUGLIBRARY  comsdbgutil.lib
 
 SMPSAFE

--- a/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/te_smsprt_R6.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/te_smsprt_R6.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -902,7 +902,7 @@
 	//Get the operations
 	CSmsReplyAddressOperations& corruptReplyOperations = static_cast<CSmsReplyAddressOperations&>(smsMessage->GetOperationsForIEL(CSmsInformationElement::ESmsReplyAddressFormat));
 	//Check has reply address
-	result=corruptReplyOperations.ContainsReplyAddressIEL();
+	result=deliverMultipleReplyOperations.ContainsReplyAddressIEL();
 	TEST(result==1);
 	//Get address
 	TRAP(err,replyAddressHBuf=corruptReplyOperations.GetReplyAddressL());

--- a/smsprotocols/smsstack/smsprot/Test/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-// Copyright (c) 1999-2010 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:
-// Toplevel build information for SMS prot - part of SmsStack
-// SMS protocol module for GSM
-// 
-//
-
-/**
- @file
-*/
-
-PRJ_TESTEXPORTS
-
-../TE_SMSEMSPRT/TE_SMSEMSPRT.script                      z:/testdata/scripts/te_smsemsprt.script
-../TE_SMSEMSPRT/TE_smsemsprt_setup.script                z:/testdata/scripts/te_smsemsprt_setup.script
-../TE_SMSEMSPRT/te_smsemsprt_commdb.cfg                  z:/testdata/configs/te_smsemsprt_commdb.cfg
-								
-../TE_SMSPRTSTRESS/te_smsprtstress.script                z:/testdata/scripts/te_smsprtstress.script
-../TE_SMSPRTSTRESS/TE_smsprtstress_setup.script          z:/testdata/scripts/te_smsprtstress_setup.script
-../TE_SMSPRTSTRESS/te_smsprtstress_commdb.cfg            z:/testdata/configs/te_smsprtstress_commdb.cfg
-
-../TE_SMSCAPS/te_smscapsRead.script                      z:/testdata/scripts/te_smscapsread.script
-../TE_SMSCAPS/te_smscapsWrite.script                     z:/testdata/scripts/te_smscapswrite.script
-../TE_SMSCAPS/te_smscapsReadDevice.script                z:/testdata/scripts/te_smscapsreaddevice.script
-../TE_SMSCAPS/te_smscapsWriteDevice.script               z:/testdata/scripts/te_smscapswritedevice.script
-../TE_SMSCAPS/te_smscapsReadWrite.script                 z:/testdata/scripts/te_smscapsreadwrite.script
-../TE_SMSCAPS/te_smscapsWriteNetwork.script              z:/testdata/scripts/te_smscapswritenetwork.script
-../TE_SMSCAPS/te_smscapsReadWriteNetwork.script          z:/testdata/scripts/te_smscapsreadwritenetwork.script
-../TE_SMSCAPS/te_smscapsNoReadWriteNetwork.script        z:/testdata/scripts/te_smscapsnoreadwritenetwork.script
-../TE_SMSCAPS/te_smscaps.script                          z:/testdata/scripts/te_smscaps.script
-
-../configfiles/t_sms_inter_auto.txt                      c:/sms/t_sms_inter_auto.txt
-../configfiles/t_sms_inter_ems.txt                       c:/sms/t_sms_inter_ems.txt
-../configfiles/t_sms_inter_auto_9210.txt                 c:/sms/t_sms_inter_auto_9210.txt
-../configfiles/t_sms_inter_auto_R520.txt                 c:/sms/t_sms_inter_auto_r520.txt
-../configfiles/t_sms_inter_auto_T65.txt                  c:/sms/t_sms_inter_auto_t65.txt
-../configfiles/t_sms_inter_auto_6210.txt                 c:/sms/t_sms_inter_auto_6210.txt
-../configfiles/TWAPSMS_9210.txt                          c:/sms/twapsms_9210.txt
-../configfiles/TWAPSMS_R520.txt                          c:/sms/twapsms_r520.txt
-../configfiles/TWAPSMS_T65.txt                           c:/sms/twapsms_t65.txt
-../configfiles/t_sms_inter_ems_9210.txt                  c:/sms/t_sms_inter_ems_9210.txt
-../configfiles/t_sms_inter_ems_R520.txt                  c:/sms/t_sms_inter_ems_r520.txt
-../configfiles/t_sms_inter_ems_T68.txt                   c:/sms/t_sms_inter_ems_t68.txt
-../configfiles/t_sms_inter_ems_6210.txt                  c:/sms/t_sms_inter_ems_6210.txt
-
-../../../test/configfiles/setupgsmsms.txt                        z:/sms/setupgsmsms.txt
-../../../test/configfiles/te_intersetupgsmsms.txt                z:/sms/te_intersetupgsmsms.txt
-
-../configfiles/tsmsprtstress_config.txt                  z:/sms/tsmsprtstress_config.txt
-../configfiles/tsmsemsprt_config.txt                     z:/sms/tsmsemsprt_config.txt
-
-../configfiles/tsmscaps_config.txt                       z:/testdata/configs/tsmscaps_config.txt
-../TE_SMSCAPS/te_smscaps.cfg                             z:/testdata/configs/te_smscaps.cfg
-../TE_SMSCAPS/te_smscaps_setup.script                    z:/testdata/scripts/te_smscaps_setup.script
-
-//
-// TE_SMSINTER test files...
-//
-../TE_SMSINTER/TE_smsinter.script                          z:/testdata/scripts/te_smsinter.script
-
-//
-// TE_SMSSTOR test files...
-//
-../TE_SMSSTOR/te_smsstor.script                          z:/testdata/scripts/te_smsstor.script
-../TE_SMSSTOR/smsreastnopdu.dat                          z:/sms/smsreastnopdu.dat
-../TE_SMSSTOR/smsreastnostream.dat                       z:/sms/smsreastnostream.dat
-../TE_SMSSTOR/smsreastarraynoroot.dat                    z:/sms/smsreastarraynoroot.dat
-../TE_SMSSTOR/smsreastcountwrong.dat                     z:/sms/smsreastcountwrong.dat
-../TE_SMSSTOR/smsreastarraynoentries.dat                 z:/sms/smsreastarraynoentries.dat
-../TE_SMSSTOR/smswap.sms.esk                             z:/sms/smswap.sms-class0test.esk
-../TE_SMSSTOR/smswap.sms-maxnummessagetest.esk           z:/sms/smswap.sms-maxnummessagetest.esk
-../TE_SMSSTOR/smswap.sms-0nummessagetest.esk             z:/sms/smswap.sms-0nummessagetest.esk
-
-//
-// TE_SMSPRT test files...
-//
-../TE_Smsprt/TE_smsprt_setup.script                      z:/testdata/scripts/te_smsprt_setup.script
-../TE_Smsprt/tsmsprt_config.txt                          z:/sms/tsmsprt_config.txt
-../TE_Smsprt/tsmsprt_config_extra.txt                    z:/sms/tsmsprt_config_extra.txt
-../TE_Smsprt/tsmsprt_config_tx_rx_maxmsg.txt             z:/sms/tsmsprt_config_tx_rx_maxmsg.txt
-../TE_Smsprt/TE_smsprt.cfg                               z:/testdata/configs/te_smsprt.cfg
-../TE_Smsprt/Te_smsprt_data.ini                          z:/testdata/configs/te_smsprt_data.ini
-../TE_Smsprt/Te_statusReportScheme.ini                   z:/testdata/configs/te_statusreportscheme.ini
-../TE_Smsprt/TE_DiskSpaceMonitor.ini                     z:/testdata/configs/te_diskspacemonitor.ini
-../TE_Smsprt/smswap.sms-sendTryTimeout.esk               z:/sms/smswap.sms-sendtrytimeout.esk
-../TE_Smsprt/smswap.sms-bootTimerTimeout.esk             z:/sms/smswap.sms-boottimertimeout.esk
-../TE_Smsprt/smswap.sms-AutomaticDeletionOfType0.esk     z:/sms/smswap.sms-automaticdeletionoftype0.esk
-../TE_Smsprt/smswap.sms-AutoDeletionClass2.esk           z:/sms/smswap.sms-autodeletionclass2.esk
-../TE_Smsprt/testsmswap.Sms.esk                          z:/sms/testsmswap.sms.esk
-../TE_Smsprt/te_smsprt_gsmu.script                       z:/testdata/scripts/te_smsprt_gsmu.script
-../TE_Smsprt/te_smsprt_smsstack.script                   z:/testdata/scripts/te_smsprt_smsstack.script
-../TE_Smsprt/te_smsprt_prot.script                       z:/testdata/scripts/te_smsprt_prot.script
-
-
-//SMSOutOfDiskSpace
-../TE_Smsprt/Te_SMSStackOutOfDiskSpace.script            z:/testdata/scripts/te_smsstackoutofdiskspace.script
-../TE_Smsprt/Te_SMSStackOutOfDiskSpace_ARM_UREL.script   z:/testdata/scripts/te_smsstackoutofdiskspace_arm_urel.script
-../TE_Smsprt/TE_SetupSMSStackOutOfDiskSpace.script       z:/testdata/scripts/te_setupsmsstackoutofdiskspace.script
-../TE_Smsprt/SMSOutOfDiskSpace.ini                   	  z:/testdata/configs/smsoutofdiskspace.ini
-../TE_Smsprt/SMSStackOutOfDiskSpace.txt                  z:/sms/smsstackoutofdiskspace.txt
-../TE_Smsprt/smsclass0preallocated.dat                   z:/testdata/configs/smsclass0preallocated.dat
-../TE_Smsprt/smsclass0reast.dat		                  z:/testdata/configs/smsclass0reast.dat
-../TE_Smsprt/smswap_class0.sms.esk                   	  z:/testdata/configs/smswap_class0.sms.esk
-../TE_Smsprt/smswap_DontDiscardType0s.esk			      z:/testdata/configs/smswap_dontdiscardtype0s.esk
-../TE_Smsprt/smswap_discardType0s.esk			      	  z:/testdata/configs/smswap_discardtype0s.esk
-../TE_Smsprt/smswap_MaxFivePDUsInOOD.esk			      z:/testdata/configs/smswap_maxfivepdusinood.esk
-../TE_Smsprt/smswap_Class0DisabledMaxFivePDUsInOOD.esk	  z:/testdata/configs/smswap_class0disabledmaxfivepdusinood.esk
-
-//Class0RegressionTestSuite
-../TE_Smsprt/smswap.sms-sendTryTimeoutClass0.esk               	z:/sms/smswap.sms-sendtrytimeoutclass0.esk
-../TE_Smsprt/smswap.sms-bootTimerTimeoutClass0.esk             	z:/sms/smswap.sms-boottimertimeoutclass0.esk
-../TE_Smsprt/smswap.sms-AutoDeletionClass2EnableClass0Store.esk	z:/sms/smswap.sms-autodeletionclass2enableclass0store.esk
-../TE_Smsprt/testsmswapClass0.Sms.esk                          	z:/sms/testsmswapclass0.sms.esk
-../TE_Smsprt/smswap.sms-class0test_onepduseg.esk                   z:/sms/smswap.sms-class0test_onepduseg.esk
-../TE_Smsprt/TE_smsprtRegressionClass0StoreEnabled.script			z:/testdata/scripts/te_smsprtregressionclass0storeenabled.script
-
-PRJ_TESTMMPFILES
-
-../TE_SMSINTER/TE_smsinter.mmp
-../TE_SMSSTOR/TE_smsstor.mmp
-../TE_SMSEMSPRT/TE_SMSEMSPRT.mmp
-../TE_SMSPRTSTRESS/TE_smsprtstress.mmp
-../TE_Smsprt/TE_smsprt.mmp
-../TE_SMSCAPS/te_smscaps.mmp

--- a/smsprotocols/smsstack/smsprot/Test/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/smsprotocols/smsstack/smsprot/Test/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_ERRORTORPERROR_1=0x1
-[TRACE]TRACE_BORDER[0x84]_ERRORTOTPERROR_1=0x2
-[TRACE]TRACE_BORDER[0x84]_SMSPPANIC_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_ADDNEWMESSAGEL_1=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_BEGINTRANSACTIONLC_1=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_BEGINTRANSACTIONLC_2=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_1=0x53
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_2=0x54
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_3=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLOSE_1=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_COMMITTRANSACTIONL_1=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_1=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_2=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_3=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_NEWL_1=0x40
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_OPENSTOREL_1=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_POPULATEENTRYARRAYL_1=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_POPULATEENTRYARRAYL_2=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_PROCESSTIMEOUTMESSAGEL_1=0x50
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_1=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_2=0x42
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_3=0x43
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_4=0x44
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_5=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_6=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_REVERT_1=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_SETDISKSPACESTATE_1=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_1=0x51
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_2=0x52
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_2=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_3=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0STORECLOSEOBJECT_1=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CGUARDTIMER_ENABLEGUARDTIMER_1=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_CGUARDTIMER_NEWL_1=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_CGUARDTIMER_RUNL_1=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_ADDENTRYL_1=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_ADDNEWMESSAGEL_1=0x24
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_BEGINTRANSACTIONL_1=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_BEGINTRANSACTIONL_2=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CHANGEENTRYL_1=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CLEARENTRYL_1=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_COMMITTRANSACTIONL_1=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CONSTRUCTL_1=0x21
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CREATEL_1=0x23
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_DELETEENTRYL_1=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_EXTERNALIZEENTRY1_1=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_EXTERNALIZEENTRY_1=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_GETOLDESTMESSAGEENTRYINDEX_1=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_INTERNALIZEENTRYL_1=0x30
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_INTERNALIZEENTRYL_2=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_INTERNALIZEENTRYL_3=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_ISFILEOK_1=0x22
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_MATCHENTRYTOEXISTINGMESSAGE_1=0x26
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_MATCHENTRYTOEXISTINGMESSAGE_2=0x27
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_NEWL_1=0x20
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REINSTATEDELETEDENTRIES_1=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REINSTATEENTRIES_1=0x3b
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REMOVEDELETEDENTRIES_1=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REMOVEPDUSL_1=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REMOVEPDUSL_2=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REVERT_1=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_SETPASSEDTOCLIENTL_1=0x29
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_UPDATEEXISTINGMESSAGEL_1=0x25
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_UPDATELOGSERVERIDL_1=0x28
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTOREUTILITY_POPULATEENTRY_1=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTOREUTILITY_PRIVATEPATH_1=0x5f
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_1=0x65
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_2=0x66
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_3=0x67
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_DELETEENUMERATEDSIMENTRIES_1=0x63
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_DELETEMESSAGEL_1=0x68
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_FINDMESSAGEL_1=0x70
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_FINDMESSAGEL_2=0x71
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_FINDMESSAGEL_3=0x72
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_GETMESSAGEL_1=0x6f
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_INITIALIZEL_1=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_1=0x6d
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_2=0x6e
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_NEWMESSAGEPDUL_1=0x6b
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_NUMBEROFCOMPLETEMESSAGES_1=0x64
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_PURGEL_1=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_PURGEL_2=0x62
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_SETMESSAGEPASSEDTOCLIENTL_1=0x6a
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1=0x6c
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_UPDATELOGSERVERIDOFMESSAGEL_1=0x69
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_ADDNEWMESSAGEL_1=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_BEGINTRANSACTIONL_1=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_BEGINTRANSACTIONL_2=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CHANGEENTRYL_1=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CLEANUPENTRIESL_1=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CLEANUPENTRIESWITHCOMPACTL_1=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CLOSE_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_COMMITTRANSACTIONL_1=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_COMMITTRANSACTIONL_2=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CONSTRUCTL_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CREATEL_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_1=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_2=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_3=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYARRAYL_1=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYL_1=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYL_2=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_INTERNALIZEENTRYARRAYL_1=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_INTERNALIZEENTRYL_1=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_INTERNALIZEENTRYL_2=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_MATCHENTRYTOEXISTINGMESSAGE_1=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_MATCHENTRYTOEXISTINGMESSAGE_2=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_NEWL_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_OPENL_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REINSTATEDELETEDENTRIES_1=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REMOVEDELETEDENTRIES_1=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REMOVEPDUSL_1=0x15
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REVERT_1=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_SETPASSEDTOCLIENTL_1=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_UPDATEEXISTINGMESSAGEL_1=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_UPDATELOGSERVERIDL_1=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_CONSTRUCTL_1=0x75
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_CREATEENTRYL_1=0x86
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x83
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_EXTERNALIZEENTRYL_2=0x84
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_FINDMESSAGEL_1=0x77
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_FINDMESSAGEL_2=0x78
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_FINDMESSAGEL_3=0x79
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_GETMESSAGEL_1=0x80
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x81
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x82
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_1=0x7a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_2=0x7b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_NEWL_1=0x74
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_NEWMESSAGEPDUL_1=0x7f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_OPENSTOREL_1=0x89
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_PASSEDTOCLIENT_1=0x87
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_POPULATEENTRY_1=0x85
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_SETPASSEDTOCLIENTL_1=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1=0x7c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_2=0x7d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_3=0x7e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATELOGSERVERIDL_1=0x76
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDCOMMANDL_1=0x93
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCEL_1=0x94
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCEL_2=0x95
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCESTATUSPAIRL_1=0x96
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCESTATUSPAIRL_2=0x97
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_1=0x98
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_2=0x99
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_3=0x9a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_4=0x9b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_5=0x9c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_6=0x9d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_7=0x9e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_8=0x9f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_9=0xa0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSUBMITL_1=0x92
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_CONSTRUCTL_1=0x8b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_CTOR_1=0xac
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZECONCATENATIONREFERENCESL_1=0xa4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZECONCATENATIONREFERENCESL_2=0xa5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZEENTRYL_1=0xa8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZEENTRYL_2=0xa9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_GETMESSAGEL_1=0xa1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_HASENTRYWITHLOGIDL_1=0xb6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_HASENTRYWITHLOGIDL_2=0xb7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZECONCATENATIONREFERENCESL_1=0xa2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZECONCATENATIONREFERENCESL_2=0xa3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZEENTRYL_1=0xa6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZEENTRYL_2=0xa7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEWL_1=0x8a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_1=0x8f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_2=0x90
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_3=0x91
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_1=0x8c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_2=0x8d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_3=0x8e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_OPENSTOREL_1=0xb8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_POPULATEENTRY_1=0xaa
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAYEXTERNALIZEL_1=0xb5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_COPYL_1=0xb2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_FIND_1=0xb1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_INSERTL_1=0xb0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_INTERNALIZEL_1=0xb4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_RESETALLSTATUS_1=0xb3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_STATUSARRAYCOMPLETE_1=0xab
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_COMPARE_1=0xad
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_EXTERNALIZEL_1=0xaf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_INTERNALIZEL_1=0xae
-[TRACE]TRACE_INTERNALS[0x88]_TRIMLEADINGZEROS_1=0x73

--- a/smsprotocols/smsstack/smsprot/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/smsprotocols/smsstack/smsprot/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,700 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_ERRORTORPERROR_1=0x1
-[TRACE]TRACE_BORDER[0x84]_ERRORTOTPERROR_1=0x2
-[TRACE]TRACE_BORDER[0x84]_INSTALLSMS_1=0x4
-[TRACE]TRACE_BORDER[0x84]_SMSPPANIC_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_ADDNEWMESSAGEL_1=0xa7
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_BEGINTRANSACTIONLC_1=0xb5
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_BEGINTRANSACTIONLC_2=0xb6
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_1=0xae
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_2=0xaf
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_3=0xb0
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLOSE_1=0xa3
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_COMMITTRANSACTIONL_1=0xb7
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_1=0xb1
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_2=0xb2
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_3=0xb3
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_NEWL_1=0x9b
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_OPENSTOREL_1=0xa2
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_POPULATEENTRYARRAYL_1=0xa4
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_POPULATEENTRYARRAYL_2=0xa5
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_PROCESSTIMEOUTMESSAGEL_1=0xab
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_1=0x9c
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_2=0x9d
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_3=0x9e
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_4=0x9f
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_5=0xa0
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_6=0xa1
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_REVERT_1=0xb8
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_SETDISKSPACESTATE_1=0xa6
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_1=0xac
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_2=0xad
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1=0xa8
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_2=0xa9
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_3=0xaa
-[TRACE]TRACE_INTERNALS[0x88]_CCLASS0STORECLOSEOBJECT_1=0xb4
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTONONCLASS0REASSEMBLYSTOREL_1=0xff
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTONONCLASS0REASSEMBLYSTOREL_2=0x100
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTONONCLASS0REASSEMBLYSTOREL_3=0x101
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_1=0xec
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_CLOSE_1=0xe5
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_CONSTRUCTL_1=0xe3
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_DELETEENUMERATEDSIMENTRIES_1=0xe9
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_DELETEMESSAGEL_1=0xf1
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_DELETENONCLASS0ENUMERATEDSIMENTRIES_1=0xf5
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_DELETENONCLASS0MESSAGEL_1=0xf6
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_DTOR_1=0xe2
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDCLASS0SMSMESSAGESL_1=0xfd
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDCLASS0SMSMESSAGESL_2=0xfe
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDMESSAGESL_1=0xea
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDNONCLASS0SMSMESSAGESL_1=0xfb
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDNONCLASS0SMSMESSAGESL_2=0xfc
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_FORWARDCOMPLETECLASS0SMSMESSAGESL_1=0xed
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_INITIALIZENONCLASS0STOREL_1=0xf4
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_INITL_1=0xe6
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_ISFULL_1=0xe8
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_ISWAPSMS_1=0x103
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_NEWL_1=0xe1
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_NUMBEROFCOMPLETENONCLASS0MESSAGES_1=0xf8
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_OPENSTOREL_1=0xe4
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_PROCESSCOMPLETECLASS0SMSMESSAGESL_1=0xfa
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_PROCESSCOMPLETENONCLASS0SMSMESSAGESL_1=0xf9
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_PROCESSCOMPLETESMSMESSAGESL_1=0xeb
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_PROCESSMESSAGEIFEXCEEDLIMITATIONL_1=0xee
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_PURGEL_1=0xe7
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_SETDISKSPACESTATE_1=0xf0
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_1=0xef
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_SETMESSAGEPASSEDTOCLIENTL_1=0xf3
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_SETNONCLASS0MESSAGEPASSEDTOCLIENTL_1=0xf7
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_UPDATELOGSERVERIDL_1=0xf2
-[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_UPDATELOGSERVERIDOFNONCLASS0MESSAGEL_1=0x102
-[TRACE]TRACE_INTERNALS[0x88]_CGUARDTIMER_ENABLEGUARDTIMER_1=0x99
-[TRACE]TRACE_INTERNALS[0x88]_CGUARDTIMER_NEWL_1=0x98
-[TRACE]TRACE_INTERNALS[0x88]_CGUARDTIMER_RUNL_1=0x9a
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_ADDENTRYL_1=0x85
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_ADDNEWMESSAGEL_1=0x7f
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_BEGINTRANSACTIONL_1=0x90
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_BEGINTRANSACTIONL_2=0x91
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CHANGEENTRYL_1=0x86
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CLEARENTRYL_1=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_COMMITTRANSACTIONL_1=0x92
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CONSTRUCTL_1=0x7c
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CREATEL_1=0x7e
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_DELETEENTRYL_1=0x87
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_EXTERNALIZEENTRY1_1=0x8a
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_EXTERNALIZEENTRY_1=0x89
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_GETOLDESTMESSAGEENTRYINDEX_1=0x97
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_INTERNALIZEENTRYL_1=0x8b
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_INTERNALIZEENTRYL_2=0x8c
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_INTERNALIZEENTRYL_3=0x8d
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_ISFILEOK_1=0x7d
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_MATCHENTRYTOEXISTINGMESSAGE_1=0x81
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_MATCHENTRYTOEXISTINGMESSAGE_2=0x82
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_NEWL_1=0x7b
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REINSTATEDELETEDENTRIES_1=0x95
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REINSTATEENTRIES_1=0x96
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REMOVEDELETEDENTRIES_1=0x94
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REMOVEPDUSL_1=0x8e
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REMOVEPDUSL_2=0x8f
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REVERT_1=0x93
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_SETPASSEDTOCLIENTL_1=0x84
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_UPDATEEXISTINGMESSAGEL_1=0x80
-[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_UPDATELOGSERVERIDL_1=0x83
-[TRACE]TRACE_INTERNALS[0x88]_CQUEUEDPDUDELETE_CONSTRUCTL_1=0x158
-[TRACE]TRACE_INTERNALS[0x88]_CQUEUEDPDUDELETE_NEWL_1=0x157
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTOREUTILITY_POPULATEENTRY_1=0x197
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTOREUTILITY_PRIVATEPATH_1=0x198
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_1=0x19e
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_2=0x19f
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_3=0x1a0
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_DELETEENUMERATEDSIMENTRIES_1=0x19c
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_DELETEMESSAGEL_1=0x1a1
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_FINDMESSAGEL_1=0x1a9
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_FINDMESSAGEL_2=0x1aa
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_FINDMESSAGEL_3=0x1ab
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_GETMESSAGEL_1=0x1a8
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_INITIALIZEL_1=0x199
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_1=0x1a6
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_2=0x1a7
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_NEWMESSAGEPDUL_1=0x1a4
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_NUMBEROFCOMPLETEMESSAGES_1=0x19d
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_PURGEL_1=0x19a
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_PURGEL_2=0x19b
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_SETMESSAGEPASSEDTOCLIENTL_1=0x1a3
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1=0x1a5
-[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_UPDATELOGSERVERIDOFMESSAGEL_1=0x1a2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_COMPLETE_1=0x26f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_CONSTRUCTL_1=0x25c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_CREATELOGSERVEREVENT_1=0x26a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DECODESUBMITREPORTL_1=0x263
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DECODESUBMITREPORTL_2=0x264
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DOCANCEL_1=0x262
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DORUNL_1=0x25e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DORUNL_2=0x25f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DORUNL_3=0x260
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DORUNL_4=0x261
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DOSEGMENTMESSAGEL_1=0x267
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DOSEGMENTMESSAGEL_2=0x268
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DOSEGMENTMESSAGEL_3=0x269
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DOUPDATESEGMENTATIONSTOREL_1=0x26d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_ISRPERROR_1=0x265
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_NEWL_1=0x25b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_SEGMENTMESSAGE_1=0x266
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_SENDNEXTPDU_1=0x26b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_SENDNEXTPDU_2=0x26c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_START_1=0x25d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_UPDATELOGSERVEREVENT_1=0x26e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_COMPLETE_1=0xe0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_CONSTRUCTL_1=0xdd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_CTOR_1=0xdc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_DOCANCEL_1=0xdb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_DORUNL_1=0xd8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_DORUNL_2=0xd9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_DORUNL_3=0xda
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_DTOR_1=0xd6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_NEWL_1=0xd5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_SEGMENTMESSAGEL_1=0xde
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_START_1=0xd7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_WRITENEXTSLOT_1=0xdf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMODEMNOTIFICATION_COMPLETE_1=0x11a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMODEMNOTIFICATION_CONSTRUCTL_1=0x115
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMODEMNOTIFICATION_DOCANCEL_1=0x119
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMODEMNOTIFICATION_DORUNL_1=0x118
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMODEMNOTIFICATION_MODEMSTATE_1=0x116
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMODEMNOTIFICATION_NEWL_1=0x114
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMODEMNOTIFICATION_START_1=0x117
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_CHECKDISKSPACEFORPDUL_1=0x122
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_CONSTRUCTL_1=0x11c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_CONSTRUCTL_2=0x11d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_CONSTRUCTL_3=0x11e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_CONSTRUCTL_4=0x11f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_DOCANCEL_1=0x121
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_GETFREEDISKSPACE_1=0x125
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_GETFREEDISKSPACE_2=0x126
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_NEWL_1=0x11b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_NOTIFYDISKSPACE_1=0x123
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_RESUMESMSRECEPTION_1=0x124
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_RUNL_1=0x120
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPARAMSBASE_CONSTRUCTL_1=0x127
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPCOMMDBEVENT_COMPLETE_1=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPCOMMDBEVENT_CONSTRUCTL_1=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPCOMMDBEVENT_NOTIFYONEVENT_1=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_CANCELOBSERVER_1=0x161
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_COMPLETEFIRST_1=0x15f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_COMPLETEOBSERVER_1=0x165
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_COMPLETEREQUEST_1=0x160
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_CONSTRUCTL_1=0x164
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_CTOR_1=0x15d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_DOCANCEL_1=0x15e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_DOQUEUEL_1=0x15c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_DORUNL_1=0x15a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_NEWL_1=0x162
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_QUEUE_1=0x15b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_RUNL_1=0x159
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_START_1=0x163
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_COMPLETE_1=0xc0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_CONSTRUCTL_1=0xba
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_DELETEPDU_1=0xbe
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_DOCANCEL_1=0xbf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_DORUNL_1=0xbc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_NEWL_1=0xb9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_OPENSTORE_1=0xbd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_START_1=0xbb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ADDSEGMENTOFMESSAGETOREASSEMBLYSTOREIFREQUIREDL_1=0x14c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ADDSLOTTOSMSMESSAGEIFREQUIREDL_1=0x14b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_1=0x13c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_10=0x145
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_11=0x146
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_12=0x147
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_13=0x148
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_2=0x13d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_3=0x13e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_4=0x13f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_5=0x140
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_6=0x141
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_7=0x142
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_8=0x143
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_9=0x144
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_CONSTRUCTL_1=0x138
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_DECODEANDPROCESSPDUL_1=0x139
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_DECODEANDPROCESSPDUL_2=0x13a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_DECODEANDPROCESSPDUL_3=0x13b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_DELETEPDUL_1=0x14f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_FINDORIGINALMESSAGEANDPROCESSSTATUSREPORTL_1=0x149
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_NEWL_1=0x137
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_PROCESSMESSAGEIFCOMPLETEL_1=0x14e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_UPDATELOGSERVERIDL_1=0x14d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_UPDATESTATUSREPORTL_1=0x14a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_ADDLOGEVENT_1=0x191
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_CHANGELOGEVENT_1=0x193
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_CHANGEORADDLOGEVENT_1=0x190
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_COMPLETE_1=0x196
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_CONSTRUCTL_1=0x18f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_DOCANCEL_1=0x195
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_DORUNL_1=0x194
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_GETLOGEVENT_1=0x192
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_NEWL_1=0x18e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_ADDLOGEVENT_1=0x17e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_COMPLETE_1=0x186
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_CONSTRUCTL_1=0x173
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DOCANCEL_1=0x17d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DOENCODEDELIVERREPORTL_1=0x17f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DOENCODEDELIVERREPORTL_2=0x180
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DOENCODEDELIVERREPORTL_3=0x181
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DOENCODEDELIVERREPORTL_4=0x182
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DORUNL_1=0x177
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DORUNL_2=0x178
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DORUNL_3=0x179
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DORUNL_4=0x17a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_GETERRORCODESTATUS_1=0x188
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_ISSUPPORTED_1=0x18b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_MAKESTATETRANSITIONBASEDONERRORCODE_1=0x18c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_MAKESTATETRANSITIONBASEDONERRORCODE_2=0x18d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_MAPRPERRORTOINDEX_1=0x189
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_NEWL_1=0x172
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_PROCESSPDUL_1=0x175
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_PROCESSPDUL_2=0x176
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_READCONFIGURABLESMSSETTINGSL_1=0x18a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_RECEIVE_1=0x17c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_RESUMESMSRECEPTION_1=0x17b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_SENDDELIVERREPORT_1=0x183
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_SENDDELIVERREPORT_2=0x184
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_SENDDELIVERREPORT_3=0x185
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_SETERRORCODESTATUS_1=0x187
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_START_1=0x174
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_ADDNEWMESSAGEL_1=0x65
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_BEGINTRANSACTIONL_1=0x71
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_BEGINTRANSACTIONL_2=0x72
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CHANGEENTRYL_1=0x6b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CLEANUPENTRIESL_1=0x62
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CLEANUPENTRIESWITHCOMPACTL_1=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CLOSE_1=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_COMMITTRANSACTIONL_1=0x77
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_COMMITTRANSACTIONL_2=0x78
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CONSTRUCTL_1=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CREATEL_1=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_1=0x74
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_2=0x75
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_3=0x76
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYARRAYL_1=0x64
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYL_1=0x6c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYL_2=0x6d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_INTERNALIZEENTRYARRAYL_1=0x63
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_INTERNALIZEENTRYL_1=0x6e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_INTERNALIZEENTRYL_2=0x6f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_MATCHENTRYTOEXISTINGMESSAGE_1=0x67
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_MATCHENTRYTOEXISTINGMESSAGE_2=0x68
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_NEWL_1=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_OPENL_1=0x5f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REINSTATEDELETEDENTRIES_1=0x7a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REMOVEDELETEDENTRIES_1=0x79
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REMOVEPDUSL_1=0x70
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REVERT_1=0x73
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_SETPASSEDTOCLIENTL_1=0x6a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_UPDATEEXISTINGMESSAGEL_1=0x66
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_UPDATELOGSERVERIDL_1=0x69
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEENUMERATION_COMPLETE_1=0xd4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEENUMERATION_CONSTRUCTL_1=0xd3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEENUMERATION_DOCANCEL_1=0xd2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEENUMERATION_DORUNL_1=0xd1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEENUMERATION_NEWL_1=0xcf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEENUMERATION_START_1=0xd0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_1=0x110
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_2=0x111
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_3=0x112
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_4=0x113
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_COMPLETE_1=0x10f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DOCANCEL_1=0x10e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_1=0x105
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_2=0x106
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_3=0x107
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_4=0x108
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_5=0x109
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_6=0x10a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_7=0x10b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_8=0x10c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_9=0x10d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_START_1=0x104
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPMESSAGEQUEUE_CANCELOBSERVER_1=0x156
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPMESSAGEQUEUE_COMPLETEFIRST_1=0x154
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPMESSAGEQUEUE_COMPLETEREQUEST_1=0x155
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPMESSAGEQUEUE_DOCANCEL_1=0x153
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPMESSAGEQUEUE_DOQUEUEL_1=0x152
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPMESSAGEQUEUE_DORUNL_1=0x150
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPMESSAGEQUEUE_QUEUE_1=0x151
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_CONSTRUCTL_1=0x1ad
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_DOCANCEL_1=0x1b1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_DORUNL_1=0x1b3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_DORUNL_2=0x1b4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_GETCOMMDBRECEIVEMODEL_1=0x1b2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_NEWL_1=0x1ac
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_NOTIFYONEVENT_1=0x1af
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_SELECTRECEIVEMODE1_1=0x1b6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_SELECTRECEIVEMODE_1=0x1b5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_SETRECEIVEMODE_1=0x1b0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_START_1=0x1ae
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLBOOTTIMER_NEWL_1=0x21d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLBOOTTIMER_RUNL_1=0x21f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLBOOTTIMER_START_1=0x21e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLFAMILY_INSTALL_1=0x1b8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLFAMILY_NEWL_1=0x1b7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLFAMILY_NEWPROTOCOLL_1=0x1ba
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLFAMILY_PROTOCOLLIST_1=0x1bb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLFAMILY_PROTOCOLLIST_2=0x1bc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLFAMILY_REMOVE_1=0x1b9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ADDSMSMESSAGEOBSERVERL_1=0x1d2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ALLOCATELOCALADDRESS_1=0x219
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_BINDL_1=0x1c8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_BINDSMSMESSAGEOBSERVER_1=0x1d3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_BINDSMSMESSAGEOBSERVER_2=0x1d4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_BINDTOL_1=0x1c9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CANCELDELETESMSMESSAGE_1=0x1de
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CANCELENUMERATEPHONE_1=0x1da
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CANCELREADSMSPARAMS_1=0x1e0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CANCELSENDSMSMESSAGE_1=0x1d8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CANCELWRITESMSMESSAGE_1=0x1dc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CANCELWRITESMSPARAMS_1=0x1e2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CHECKPOWEREDUP_1=0x1d7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CLOSENOWWRAP_1=0x216
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CLOSENOW_1=0x1f0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DELETEPDUS_1=0x1e5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DELETEPDUS_2=0x1e6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DELETESMSFROMREASTOREL_1=0x1ff
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DELETESMSFROMREASTOREL_2=0x200
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DELETESMSFROMREASTOREL_3=0x201
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DELETESMSFROMREASTOREL_4=0x202
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DELETESMSMESSAGE_1=0x1dd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DISKSPACEMONITORSTATECHANGE_1=0x1ea
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_1=0x208
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_2=0x209
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_3=0x20a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_4=0x20b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_5=0x20c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_6=0x20d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_7=0x20e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_8=0x20f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_9=0x210
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ENUMERATEPHONE_1=0x1d9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ERROR_1=0x1d1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_GETOPTION_1=0x1cf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_HANDLEBACKUPORRESTORECOMPLETEL_1=0x218
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_HANDLEBACKUPORRESTORESTARTINGL_1=0x217
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_IDENTIFY_1=0x1c4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_INITL_1=0x1bf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_INITL_2=0x1c0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_INITL_3=0x1c1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_INITL_4=0x1c2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ISAPPPORTSMS_1=0x21a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ISMATCH_1=0x1f7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ISMATCH_2=0x1f8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MATCHAPPLICATIONPORT_1=0x1f9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MATCHINFORMATIONELEMENT_1=0x1fa
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MATCHSMSADDRESSTOOBSERVER_1=0x1f6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MATCHSMSMESSAGETOOBSERVER_1=0x1f5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MESSAGEREADEDSUCCESSFULLY_1=0x1fc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MESSAGEREADEDSUCCESSFULLY_2=0x1fd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MESSAGEREADEDSUCCESSFULLY_3=0x1fe
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MESSAGESENDCOMPLETED_1=0x1eb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MESSAGESENDCOMPLETED_2=0x1ec
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MESSAGESENDCOMPLETED_3=0x1ed
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MESSAGESENDCOMPLETED_4=0x1ee
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MODEMNOTIFICATIONCOMPLETED_1=0x1e7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MODEMNOTIFICATIONCOMPLETED_2=0x1e8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MODEMNOTIFICATIONCOMPLETED_3=0x1e9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NETWORKINFOAVAILABLE_1=0x21c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NETWORKINFO_1=0x21b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NEWHOSTRESOLVERL_1=0x1c5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NEWL_1=0x1bd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NEWNETDATABASEL_1=0x1c7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NEWSAPL_1=0x1be
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NEWSERVICERESOLVERL_1=0x1c6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NOTIFYMESSAGEOBSERVERS_1=0x203
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NOTIFYMESSAGEOBSERVERS_2=0x204
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NOTIFYMESSAGEOBSERVERS_3=0x205
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_OBSERVERINDEX_1=0x1f1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ORDERSMSMESSAGEOBSERVER_1=0x1f4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_PHONEENUMERATIONCOMPLETED_1=0x1ef
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_POWERDOWN_1=0x211
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_POWERDOWN_2=0x212
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_POWERDOWN_3=0x213
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_POWERDOWN_4=0x214
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_POWERDOWN_5=0x215
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_POWERUP_1=0x206
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_POWERUP_2=0x207
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_PROCESSCOMPLETESMSMESSAGESL_1=0x1fb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_PROCESSMESSAGEL_1=0x1e3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_PROCESSMESSAGEL_2=0x1e4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_PROCESS_1=0x1ce
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_READCONFIGURABLESETTINGSL_1=0x1ca
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_READCONFIGURABLESETTINGSL_2=0x1cb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_READCONFIGURABLESETTINGSL_3=0x1cc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_READSMSPARAMETERS_1=0x1df
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_REMOVESMSMESSAGEOBSERVER_1=0x1d5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_SENDSMSMESSAGE_1=0x1d6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_SEND_1=0x1cd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_SETOPTION_1=0x1d0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_SMSADDRISALREADYUSED_1=0x1f2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_STARTL_1=0x1c3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_WRITESMSMESSAGE_1=0x1db
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_WRITESMSPARAMETERS_1=0x1e1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_ACTIVEOPEN1_1=0x238
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_ACTIVEOPEN_1=0x237
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_AUTOBIND_1=0x23f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_CANCELIOCTL_1=0x231
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_CANCELIOCTL_2=0x232
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_CLIENTCONFIRMSMESSAGE_1=0x245
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_CONSTRUCTL_1=0x222
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_CONSTRUCTL_2=0x223
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_ENUMERATEPHONECOMPLETED_1=0x247
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_EXTERNALIZEENUMERATEDMESSAGESL_1=0x24e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_EXTERNALIZEENUMERATEDMESSAGESL_2=0x24f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_EXTERNALIZEMESSAGEL_1=0x250
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_EXTERNALIZEMESSAGEL_2=0x251
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_EXTERNALIZEPARAMETERSL_1=0x254
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_EXTERNALIZEPARAMETERSL_2=0x255
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_GETDATA_1=0x236
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_GETLOCALADDRESS_1=0x240
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_GETOPTION_1=0x229
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_INTERNALIZEMESSAGEL1_1=0x258
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_INTERNALIZEMESSAGEL1_2=0x259
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_INTERNALIZEMESSAGEL_1=0x252
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_INTERNALIZEMESSAGEL_2=0x253
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_INTERNALIZEPARAMETERSL_1=0x256
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_INTERNALIZEPARAMETERSL_2=0x257
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_IOCTL_1=0x22a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_IOCTL_3=0x22b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_IOCTL_4=0x22c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_IOCTL_5=0x22d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_IOCTL_6=0x22e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_IOCTL_7=0x22f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_IOCTL_8=0x230
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_LOCALNAME_1=0x225
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_MESSAGEDELETECOMPLETED_1=0x24b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_MESSAGERECEIVED_1=0x244
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_MESSAGESENDCOMPLETED_1=0x243
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_MESSAGEWRITECOMPLETED_1=0x248
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_MODEMNOTIFICATIONCOMPLETED_1=0x242
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_NEWL_1=0x220
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_NEWL_2=0x221
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_PASSIVEOPEN1_1=0x23a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_PASSIVEOPEN_1=0x239
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_POPULATEBUFFERWITHPDUSLOTSL_1=0x249
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_POPULATEBUFFERWITHPDUSLOTSL_2=0x24a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_READSMSPARAMSCOMPLETED_1=0x24c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_REMNAME_1=0x227
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SECURITYCHECK_1=0x25a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SETLOCALADDRESS_1=0x241
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SETLOCALNAME_1=0x226
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SETOPTION_1=0x233
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SETREMNAME_1=0x228
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SHUTDOWN1_1=0x23e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SHUTDOWN_1=0x23b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SHUTDOWN_2=0x23c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SHUTDOWN_3=0x23d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SMSADDRISDUPLICATE_1=0x246
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_START_1=0x224
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_WRITESMSPARAMSCOMPLETED_1=0x24d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_WRITE_1=0x234
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_WRITE_2=0x235
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSENDQUEUE_CANCELREQUESTIFOBSERVED_1=0x169
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSENDQUEUE_COMPLETEOBSERVER_1=0x16a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSENDQUEUE_COMPLETE_1=0x16b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSENDQUEUE_CONSTRUCTL_1=0x168
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSENDQUEUE_NEWL_1=0x166
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSENDQUEUE_START_1=0x167
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_CONSTRUCTL_1=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DOCANCEL_1=0x54
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DORUNL_1=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DORUNL_2=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DORUNL_3=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DORUNL_4=0x50
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DORUNL_5=0x51
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DORUNL_6=0x52
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DORUNL_7=0x53
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_GETSMSBEARERL_1=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_GETSMSBEARERL_2=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_NEWL_1=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_NOTIFYBEARERSET_1=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_NOTIFYBEARERSET_2=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_NOTIFYBEARERSET_3=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_NOTIFYONEVENT_1=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_SETSMSBEARER_1=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_START_1=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_START_2=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_START_3=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPWRITEQUEUE_CANCELREQUESTIFOBSERVED_1=0x16f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPWRITEQUEUE_COMPLETEOBSERVER_1=0x170
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPWRITEQUEUE_COMPLETE_1=0x171
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPWRITEQUEUE_CONSTRUCTL_1=0x16e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPWRITEQUEUE_NEWL_1=0x16c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPWRITEQUEUE_START_1=0x16d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_CHECKLISTVALIDITYL_1=0x12e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_COMPLETE_1=0x130
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_CONSTRUCTL_1=0x12d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_DOCANCEL_1=0x12c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_DORUNL_1=0x12b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_NEWL_1=0x128
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_START1_1=0x12a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_START_1=0x129
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_STOREPARAMETERS_1=0x12f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_CONSTRUCTL_1=0x272
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_CREATEENTRYL_1=0x283
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x280
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_EXTERNALIZEENTRYL_2=0x281
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_FINDMESSAGEL_1=0x274
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_FINDMESSAGEL_2=0x275
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_FINDMESSAGEL_3=0x276
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_GETMESSAGEL_1=0x27d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x27e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x27f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_1=0x277
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_2=0x278
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_NEWL_1=0x271
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_NEWMESSAGEPDUL_1=0x27c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_OPENSTOREL_1=0x286
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_PASSEDTOCLIENT_1=0x284
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_POPULATEENTRY_1=0x282
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_SETPASSEDTOCLIENTL_1=0x285
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1=0x279
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_2=0x27a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_3=0x27b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATELOGSERVERIDL_1=0x273
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDCOMMANDL_1=0x290
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCEL_1=0x291
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCEL_2=0x292
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCESTATUSPAIRL_1=0x293
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCESTATUSPAIRL_2=0x294
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_1=0x295
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_2=0x296
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_3=0x297
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_4=0x298
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_5=0x299
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_6=0x29a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_7=0x29b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_8=0x29c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_9=0x29d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSUBMITL_1=0x28f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_CONSTRUCTL_1=0x288
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_CTOR_1=0x2a9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZECONCATENATIONREFERENCESL_1=0x2a1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZECONCATENATIONREFERENCESL_2=0x2a2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZEENTRYL_1=0x2a5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZEENTRYL_2=0x2a6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_GETMESSAGEL_1=0x29e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_HASENTRYWITHLOGIDL_1=0x2b3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_HASENTRYWITHLOGIDL_2=0x2b4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZECONCATENATIONREFERENCESL_1=0x29f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZECONCATENATIONREFERENCESL_2=0x2a0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZEENTRYL_1=0x2a3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZEENTRYL_2=0x2a4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEWL_1=0x287
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_1=0x28c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_2=0x28d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_3=0x28e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_1=0x289
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_2=0x28a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_3=0x28b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_OPENSTOREL_1=0x2b5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_POPULATEENTRY_1=0x2a7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAYEXTERNALIZEL_1=0x2b2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_COPYL_1=0x2af
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_FIND_1=0x2ae
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_INSERTL_1=0x2ad
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_INTERNALIZEL_1=0x2b1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_RESETALLSTATUS_1=0x2b0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_STATUSARRAYCOMPLETE_1=0x2a8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_COMPARE_1=0x2aa
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_EXTERNALIZEL_1=0x2ac
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_INTERNALIZEL_1=0x2ab
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_COMPLETE_1=0xce
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_CONSTRUCTL_1=0xc2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_DOCANCEL_1=0xcd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_DORUNL_1=0xc9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_NEWL_1=0xc1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_PROCESSPDUL_1=0xcb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_PROCESSPDUL_2=0xcc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_1=0xc3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_2=0xc4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_3=0xc5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_4=0xc6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_5=0xc7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_READNEXTSLOTL_1=0xca
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_START_1=0xc8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSWRITEPARAMS_COMPLETE_1=0x136
-[TRACE]TRACE_INTERNALS[0x88]_CSMSWRITEPARAMS_CONSTRUCTL_1=0x135
-[TRACE]TRACE_INTERNALS[0x88]_CSMSWRITEPARAMS_DOCANCEL_1=0x134
-[TRACE]TRACE_INTERNALS[0x88]_CSMSWRITEPARAMS_DORUNL_1=0x133
-[TRACE]TRACE_INTERNALS[0x88]_CSMSWRITEPARAMS_NEWL_1=0x131
-[TRACE]TRACE_INTERNALS[0x88]_CSMSWRITEPARAMS_START_1=0x132
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFHEXBUF_1=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_1=0x24
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_10=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_2=0x25
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_3=0x26
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_4=0x27
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_5=0x28
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_6=0x29
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_7=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_8=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_9=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_1=0x2b6
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_10=0x2bf
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_11=0x2c0
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_12=0x2c1
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_13=0x2c2
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_14=0x2c3
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_15=0x2c4
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_16=0x2c5
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_17=0x2c6
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_18=0x2c7
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_19=0x2c8
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_2=0x2b7
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_20=0x2c9
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_21=0x2ca
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_22=0x2cb
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_23=0x2cc
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_24=0x2cd
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_25=0x2ce
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_26=0x2cf
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_3=0x2b8
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_4=0x2b9
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_5=0x2ba
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_6=0x2bb
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_7=0x2bc
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_8=0x2bd
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_9=0x2be
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_1=0x38
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_10=0x41
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_11=0x42
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_12=0x43
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_13=0x44
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_2=0x39
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_3=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_4=0x3b
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_5=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_6=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_7=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_8=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_9=0x40
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_1=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_10=0x37
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_2=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_3=0x30
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_4=0x31
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_5=0x32
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_6=0x33
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_7=0x34
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_8=0x35
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_9=0x36
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_1=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_2=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_3=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_4=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_5=0x20
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_6=0x21
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_7=0x22
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_8=0x23
-[TRACE]TRACE_INTERNALS[0x88]_TKEYSMSOBSERVER_COMPARE_1=0x1f3
-[TRACE]TRACE_INTERNALS[0x88]_TRIMLEADINGZEROS_1=0x270

--- a/smsprotocols/smsstack/smsu/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsu/group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"

--- a/smsprotocols/smsstack/smsu/group/smsu.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsu/group/smsu.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -46,10 +46,10 @@
 USERINCLUDE   ../inc
 USERINCLUDE   ../../common/inc
 USERINCLUDE   ../../gsmu/inc
-USERINCLUDE   ../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 LIBRARY       euser.lib estor.lib esock.lib gsmu.lib logwrap.lib bafl.lib
+DEBUGLIBRARY  comsdbgutil.lib
 
 //#if defined(WINS)
 // libraries needed by CCover

--- a/smsprotocols/smsstack/smsu/group/smsu.rss	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsu/group/smsu.rss	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -15,7 +15,5 @@
 
 STRUCT MinDiskSpaceHolder { LONG value; }
 
-// Nokia : normal sms level linked to critical level in SystemWarningLevels.hrh,
-// class 0 sms level agreed to be 20K.
-RESOURCE  MinDiskSpaceHolder r_lowlimit_diskspace_holder  {  value = 20480; }
-RESOURCE  MinDiskSpaceHolder r_highlimit_diskspace_holder {  value = 131072; }
+RESOURCE  MinDiskSpaceHolder r_lowlimit_diskspace_holder  {  value = 8192; }
+RESOURCE  MinDiskSpaceHolder r_highlimit_diskspace_holder {  value = 16384; }

--- a/smsprotocols/smsstack/smsu/src/SmsuAddr.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/SmsuAddr.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -19,14 +19,9 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "SmsuAddrTraces.h"
-#endif
-
 #include "smsumain.h"
 #include "smsuaddr.H"
+#include "smsstacklog.h"
 
 
 /**
@@ -47,7 +42,7 @@
  */
 EXPORT_C TSmsAddrFamily TSmsAddr::SmsAddrFamily() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_SMSADDRFAMILY_1, "TSmsAddr::SmsAddrFamily()");
+	LOGSMSU1("TSmsAddr::SmsAddrFamily()");
 
 	return static_cast<TSmsAddrFamily>(Family());
 	} // TSmsAddr::SmsAddrFamily
@@ -61,7 +56,7 @@
  */
 EXPORT_C void TSmsAddr::SetSmsAddrFamily(TSmsAddrFamily aFamily)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_SETSMSADDRFAMILY_1, "TSmsAddr::SetSmsAddrFamily()");
+	LOGSMSU1("TSmsAddr::SetSmsAddrFamily()");
 
 	SetFamily(static_cast<TUint>(aFamily));
 	} // TSmsAddr::SetSmsAddrFamily
@@ -75,7 +70,7 @@
  */
 EXPORT_C TInt TSmsAddr::IdentifierMatch() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_IDENTIFIERMATCH_1, "TSmsAddr::IdentifierMatch()");
+	LOGSMSU1("TSmsAddr::IdentifierMatch()");
 
 	__ASSERT_DEBUG(SmsAddrFamily()==ESmsAddrMatchIEI,SmsuPanic(ESmsuPanicWrongSmsAddressFamily));
 	return (TInt) Port();
@@ -90,7 +85,7 @@
  */
 EXPORT_C void TSmsAddr::SetIdentifierMatch(TInt aIdentifier)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_SETIDENTIFIERMATCH_1, "TSmsAddr::SetIdentifierMatch()");
+	LOGSMSU1("TSmsAddr::SetIdentifierMatch()");
 
 	__ASSERT_DEBUG(SmsAddrFamily()==ESmsAddrMatchIEI,SmsuPanic(ESmsuPanicWrongSmsAddressFamily));
 	SetPort((TUint) aIdentifier);
@@ -105,7 +100,7 @@
  */
 EXPORT_C TPtrC8 TSmsAddr::TextMatch() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_TEXTMATCH_1, "TSmsAddr::TextMatch()");
+	LOGSMSU1("TSmsAddr::TextMatch()");
 
 	__ASSERT_DEBUG(SmsAddrFamily()==ESmsAddrMatchText,SmsuPanic(ESmsuPanicWrongSmsAddressFamily));
 	return TPtrC8(UserPtr(),const_cast<TSmsAddr*>(this)->GetUserLen());
@@ -120,7 +115,7 @@
  */
 EXPORT_C void TSmsAddr::SetTextMatch(const TDesC8& aText)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_SETTEXTMATCH_1, "TSmsAddr::SetTextMatch()");
+	LOGSMSU1("TSmsAddr::SetTextMatch()");
 
 	__ASSERT_DEBUG(SmsAddrFamily()==ESmsAddrMatchText,SmsuPanic(ESmsuPanicWrongSmsAddressFamily));
 	TUint8* target = UserPtr();
@@ -139,7 +134,7 @@
  */
 EXPORT_C TBool TSmsAddr::operator==(const TSmsAddr& aAddr) const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_OPERATOR_1, "TSmsAddr::operator=()");
+	LOGSMSU1("TSmsAddr::operator=()");
 
 	TSmsAddrFamily family=aAddr.SmsAddrFamily();
 	TBool same=(SmsAddrFamily()==family);

--- a/smsprotocols/smsstack/smsu/src/smsuact.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsuact.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smsuactTraces.h"
-#endif
-
 #include "smsuact.h"
 #include "SmsuTimer.h"
 #include "smsstacklog.h"
@@ -62,7 +56,7 @@
  */
 EXPORT_C void CSmsuActiveBase::ConstructTimeoutL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_CONSTRUCTTIMEOUTL_1, "CSmsuActiveBase::ConstructTimeoutL()");
+	LOGSMSU1("CSmsuActiveBase::ConstructTimeoutL()");
 
 	iSmsuTimeout = CSmsuTimeout::NewL(*this);
 	} // CSmsuActiveBase::ConstructTimeoutL
@@ -76,7 +70,8 @@
  */
 EXPORT_C void CSmsuActiveBase::TimedSetActive(const TTimeIntervalMicroSeconds32& aTimeIntervalMicroSeconds32)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_TIMEDSETACTIVE_1, "CSmsuActiveBase::TimedSetActive(): aTimeIntervalMicroSeconds32=%d",aTimeIntervalMicroSeconds32.Int());
+	LOGSMSU2("CSmsuActiveBase::TimedSetActive(): aTimeIntervalMicroSeconds32=%d",
+			 aTimeIntervalMicroSeconds32.Int());
 
 	__ASSERT_DEBUG(iSmsuTimeout != NULL, SmsuPanic(ESmsuTimeoutNull));
 	
@@ -96,7 +91,7 @@
  */
 EXPORT_C void CSmsuActiveBase::TimedSetActiveCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_TIMEDSETACTIVECANCEL_1, "CSmsuActiveBase::TimedSetActiveCancel()");
+	LOGSMSU1("CSmsuActiveBase::TimedSetActiveCancel()");
 
 	if (iSmsuTimeout != NULL)
 		{
@@ -112,7 +107,7 @@
  */
 EXPORT_C TBool CSmsuActiveBase::TimedOut() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_TIMEDOUT_1, "CSmsuActiveBase::TimedOut()");
+	LOGSMSU1("CSmsuActiveBase::TimedOut()");
 
 	if (iSmsuTimeout != NULL)
 		{
@@ -131,7 +126,7 @@
  */
 EXPORT_C void CSmsuActiveBase::Queue(TRequestStatus& aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_QUEUE_1, "CSmsuActiveBase::Queue()");
+	LOGSMSU1("CSmsuActiveBase::Queue()");
 
 	__ASSERT_DEBUG(iReport==NULL, SmsuPanic(ESmsuAlreadyActive));
 
@@ -149,7 +144,7 @@
  */
 EXPORT_C void CSmsuActiveBase::RunL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_RUNL_1, "CSmsuActiveBase::RunL()");
+	LOGSMSU1("CSmsuActiveBase::RunL()");
 
 	if (iSmsuTimeout != NULL)
 		{
@@ -179,7 +174,7 @@
  */
 EXPORT_C void CSmsuActiveBase::Complete(TInt aStatus)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_COMPLETE_1, "CSmsuActiveBase::Complete(): aStatus=%d", aStatus);
+	LOGSMSU2("CSmsuActiveBase::Complete(): aStatus=%d", aStatus);
 
 	if (iReport)
 		{
@@ -201,7 +196,7 @@
  */
 EXPORT_C TInt CSmsuActiveBase::RunError(TInt aError)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_RUNERROR_1, "CSmsuActiveBase::RunError(): aError=%d", aError);
+	LOGSMSU2("CSmsuActiveBase::RunError(): aError=%d", aError);
 
 	__ASSERT_DEBUG(!IsActive(), User::Invariant());
 
@@ -222,7 +217,8 @@
     {
     // Ignore in code coverage - not used within the SMS stack.
     BULLSEYE_OFF
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_COMPLETEMYSELF_1, "CSmsuActiveBase::CompleteMyself(): aStatus=%d, aSetActive=%d",aStatus, aSetActive);
+    LOGSMSU3("CSmsuActiveBase::CompleteMyself(): aStatus=%d, aSetActive=%d",
+             aStatus, aSetActive);
     
     // Initialise iStatus with a pending request...
     iStatus = KRequestPending;
@@ -258,7 +254,7 @@
  */
 EXPORT_C void CSmsuActiveBase::CompleteMyselfAfterTimeout(TInt aStatus)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_COMPLETEMYSELFAFTERTIMEOUT_1, "CSmsuActiveBase::CompleteMyselfAfterTimeout(): aStatus=%d", aStatus);
+	LOGSMSU2("CSmsuActiveBase::CompleteMyselfAfterTimeout(): aStatus=%d", aStatus);
 
 	__ASSERT_DEBUG(iSmsuTimeout != NULL, SmsuPanic(ESmsuTimeoutNull));

--- a/smsprotocols/smsstack/smsu/src/smsubackup.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsubackup.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-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"
@@ -19,15 +19,10 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smsubackupTraces.h"
-#endif
-
 #include <e32std.h>
 #include "SmsuBackup.h"
 #include <babackup.h>
+#include "smsstacklog.h"
 
 
 const TInt KBURPartMask = 0x000000FF;
@@ -39,7 +34,7 @@
 
 EXPORT_C CBackupAndRestore* CBackupAndRestore::NewL(MNBBackupAndRestoreObserver& aBackupAndRestoreObserver)
  	{
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CBACKUPANDRESTORE_NEWL_1, "CBackupAndRestore::NewL()");
+ 	LOGSMSU1("CBackupAndRestore::NewL()");
 
  	CBackupAndRestore* me = new(ELeave) CBackupAndRestore(aBackupAndRestoreObserver);
  	CleanupStack::PushL(me);
@@ -58,7 +53,7 @@
 
 void CBackupAndRestore::ConstructL()
  	{
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBACKUPANDRESTORE_CONSTRUCTL_1, "CBackupAndRestore::ConstructL()");
+ 	LOGSMSU1("CBackupAndRestore::ConstructL()");
 
  	iBackupOrRestoreInProgress = EFalse;
 	User::LeaveIfError(iBackupProperty.Attach(KUidSystemCategory,KUidBackupRestoreKey));
@@ -77,7 +72,7 @@
 
 void CBackupAndRestore::DoCancel()
  	{
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBACKUPANDRESTORE_DOCANCEL_1, "CBackupAndRestore::DoCancel()");
+ 	LOGSMSU1("CBackupAndRestore::DoCancel()");
 
  	iBackupProperty.Cancel();
  	} // CBackupAndRestore::DoCancel
@@ -85,7 +80,7 @@
 
 EXPORT_C TBool CBackupAndRestore::IsBackupOrRestoreInProgress()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CBACKUPANDRESTORE_ISBACKUPORRESTOREINPROGRESS_1, "CBackupAndRestore::IsBackupOrRestoreInProgress()");
+	LOGSMSU1("CBackupAndRestore::IsBackupOrRestoreInProgress()");
 
 	return iBackupOrRestoreInProgress;
 	} // CBackupAndRestore::IsBackupOrRestoreInProgress
@@ -96,7 +91,7 @@
  */
 void CBackupAndRestore::RunL()
  	{
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBACKUPANDRESTORE_RUNL_1, "CBackupAndRestore::RunL()");
+ 	LOGSMSU1("CBackupAndRestore::RunL()");
 
  	iBackupProperty.Subscribe(iStatus);
  	SetActive();

--- a/smsprotocols/smsstack/smsu/src/smsulog.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsulog.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -19,18 +19,13 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smsulogTraces.h"
-#endif
-
 #include "smsulog.h"
 #include "smsumain.h"
 #include "smsstacklog.h"
 #include "gsmubuf.h"
 #include "Gsmumsg.h"
 #include "Gsmuelem.h"
+#include <logwrap.h>
 #include <logwraplimits.h>
 
 
@@ -44,7 +39,7 @@
  */
 EXPORT_C CSmsEventLogger* CSmsEventLogger::NewL(RFs& aFs,TInt aPriority)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEVENTLOGGER_NEWL_1, "CSmsEventLogger::NewL()");
+	LOGSMSU1("CSmsEventLogger::NewL()");
 
 	CSmsEventLogger* smseventlogger = new(ELeave) CSmsEventLogger(aPriority);
 	CleanupStack::PushL(smseventlogger);
@@ -78,7 +73,7 @@
  */
 EXPORT_C void CSmsEventLogger::AddEvent(TRequestStatus& aStatus,const CSmsMessage& aSmsMessage,const TLogSmsPduData& aData,TInt* aStatusId)
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEVENTLOGGER_ADDEVENT_1, "CSmsEventLogger::AddEvent");
+    LOGSMSU1("CSmsEventLogger::AddEvent");
 
 	__ASSERT_DEBUG(iState==ESmsEventLoggerIdle,SmsuPanic(KSmsuPanicUnexpectedState));
 	
@@ -113,7 +108,7 @@
  */
 EXPORT_C void CSmsEventLogger::GetEvent(TRequestStatus& aStatus,TLogId aId)
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEVENTLOGGER_GETEVENT_1, "CSmsEventLogger::GetEvent");
+    LOGSMSU1("CSmsEventLogger::GetEvent");
 
 	__ASSERT_DEBUG(iState==ESmsEventLoggerIdle,SmsuPanic(KSmsuPanicUnexpectedState));
 	iState=ESmsEventLoggerGettingEvent;
@@ -137,7 +132,7 @@
 */
 EXPORT_C void CSmsEventLogger::ChangeEvent(TRequestStatus& aStatus,const CSmsMessage& aSmsMessage, const TTime* aTime, const TLogSmsPduData& aData, TInt* aStatusId)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEVENTLOGGER_CHANGEEVENT_1, "CSmsEventLogger::ChangeEvent");
+    LOGSMSU1("CSmsEventLogger::ChangeEvent");
     
     __ASSERT_DEBUG(iState==ESmsEventLoggerIdle,SmsuPanic(KSmsuPanicUnexpectedState));
     __ASSERT_DEBUG(aSmsMessage.LogServerId()==iLogEvent->Id(),SmsuPanic(KSmsuPanicWrongLogServerId));
@@ -188,7 +183,7 @@
     {
     // Ignore in code coverage - not used within the SMS stack.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEVENTLOGGER_DELETEEVENT_1, "CSmsEventLogger::DeleteEvent");
+    LOGSMSU1("CSmsEventLogger::DeleteEvent");
     
     __ASSERT_DEBUG(iState==ESmsEventLoggerIdle,SmsuPanic(KSmsuPanicUnexpectedState));
     
@@ -208,7 +203,7 @@
     // message would need to cancel these activities during event the 
     // logger request - too difficult to test. Need to add unit test.
     BULLSEYE_OFF
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOCANCEL_1, "CSmsEventLogger::DoCancel [iStatus=%d, iState=%d]", iStatus.Int(), iState);
+    LOGSMSU3("CSmsEventLogger::DoCancel [iStatus=%d, iState=%d]", iStatus.Int(), iState);
     
     switch( iState )
         {
@@ -247,7 +242,7 @@
 
 void CSmsEventLogger::ConstructL(RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_CONSTRUCTL_1, "CSmsEventLogger::ConstructL()");
+	LOGSMSU1("CSmsEventLogger::ConstructL()");
 
 	iLogWrapper=CLogWrapper::NewL(aFs);
 	iLogEvent=CLogEvent::NewL();
@@ -256,7 +251,7 @@
 
 void CSmsEventLogger::DoRunL()
 	{
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DORUNL_1, "CSmsEventLogger::DoRunL [iStatus=%d]", iStatus.Int() );
+    LOGSMSU2("CSmsEventLogger::DoRunL [iStatus=%d]", iStatus.Int() );
 
 	switch (iState)
 		{
@@ -295,7 +290,7 @@
 
 void CSmsEventLogger::DoAddEventL(const CSmsMessage& aSmsMessage,TInt* aStatusId)
 	{
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOADDEVENTL_1, "CSmsEventLogger::DoAddEventL [statusID*=%d]", aStatusId);
+    LOGSMSU2("CSmsEventLogger::DoAddEventL [statusID*=%d]", aStatusId);
 
 	 //  Reset event
 	CLogEvent* logevent=CLogEvent::NewL();
@@ -307,32 +302,32 @@
 		//  Incoming SMS
 		case CSmsPDU::ESmsDeliver:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOADDEVENTL_2, "DoAddEventL ESmsDeliver");
+			LOGSMSU1("DoAddEventL ESmsDeliver");
 			GetStringL(direction,R_LOG_DIR_IN);
 			break;
 			}
 		case CSmsPDU::ESmsStatusReport:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOADDEVENTL_3, "DoAddEventL ESmsStatusReport");
+			LOGSMSU1("DoAddEventL ESmsStatusReport");
 			GetStringL(direction,R_LOG_DIR_IN);
 			break;
 			}
 		//  Outgoing SMS
 		case CSmsPDU::ESmsSubmit:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOADDEVENTL_4, "DoAddEventL ESmsSubmit");
+			LOGSMSU1("DoAddEventL ESmsSubmit");
 			GetStringL(direction,R_LOG_DIR_OUT);
 			break;
 			}
 		case CSmsPDU::ESmsCommand:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOADDEVENTL_5, "DoAddEventL ESmsCommand");
+			LOGSMSU1("DoAddEventL ESmsCommand");
 			GetStringL(direction,R_LOG_DIR_OUT);
 			break;
 			}
 		default:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOADDEVENTL_6, "DoAddEventL ESmsuUnexpectedSmsPDUType");
+			LOGSMSU1("DoAddEventL ESmsuUnexpectedSmsPDUType");
 			SmsuPanic(ESmsuUnexpectedSmsPDUType);
 			}
 		}
@@ -363,7 +358,7 @@
 	TBuf<KLogMaxStatusLength> status;
 #ifdef _DEBUG
 	if (aStatusId!=NULL)
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_1, "CSmsEventLogger::SetDataL StatusID = %d", *aStatusId);
+		LOGSMSU2("CSmsEventLogger::SetDataL StatusID = %d", *aStatusId);
 #endif
 	if (aStatusId==NULL)
 		{
@@ -375,12 +370,12 @@
 				{
 				if (iSmsPDUData.iTotal==iSmsPDUData.iReceived)
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_2, "SetDataL ESmsDeliver R_LOG_DEL_DONE");
+					LOGSMSU1("SetDataL ESmsDeliver R_LOG_DEL_DONE");
 					GetStringL(status,R_LOG_DEL_DONE);
 					}
 				else if (iSmsPDUData.iTotal>iSmsPDUData.iReceived)
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_3, "SetDataL ESmsDeliver R_LOG_DEL_PENDING");
+					LOGSMSU1("SetDataL ESmsDeliver R_LOG_DEL_PENDING");
 					GetStringL(status,R_LOG_DEL_PENDING);
 					}
 				break;
@@ -389,12 +384,12 @@
 				{
 				if (iSmsPDUData.iTotal==iSmsPDUData.iReceived)
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_4, "SetDataL ESmsStatusReport R_LOG_DEL_DONE");
+					LOGSMSU1("SetDataL ESmsStatusReport R_LOG_DEL_DONE");
 					GetStringL(status,R_LOG_DEL_DONE);
 					}
 				else if (iSmsPDUData.iTotal>iSmsPDUData.iReceived)
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_5, "SetDataL ESmsStatusReport R_LOG_DEL_PENDING");
+					LOGSMSU1("SetDataL ESmsStatusReport R_LOG_DEL_PENDING");
 					GetStringL(status,R_LOG_DEL_PENDING);
 					}
 				break;
@@ -420,63 +415,63 @@
 						{
 						// None sent yet
 						GetStringL(status,R_LOG_DEL_NOT_SENT);
-						OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_6, "SetDataL ESmsSubmit R_LOG_DEL_NOT_SENT SR");
+						LOGSMSU1("SetDataL ESmsSubmit R_LOG_DEL_NOT_SENT SR");
 						}
 					else if (iSmsPDUData.iTotal==iSmsPDUData.iDelivered)
 						{
 						// All have been delivered
-						OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_7, "SetDataL ESmsSubmit R_LOG_DEL_DONE SR iSmsPDUData.iDelivered=%d", iSmsPDUData.iDelivered);
+						LOGSMSU2("SetDataL ESmsSubmit R_LOG_DEL_DONE SR iSmsPDUData.iDelivered=%d", iSmsPDUData.iDelivered);
 						GetStringL(status,R_LOG_DEL_DONE);
 						}
 					else if (iSmsPDUData.iSent<=iSmsPDUData.iTotal && iSmsPDUData.iFailed==0)
 						{
 						// One or more sent but not all, no failures
-						OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_8, "SetDataL ESmsSubmit R_LOG_DEL_PENDING SR iSmsPDUData.iSent==%d, iSmsPDUData.iTotal==%d, iFailed==0", iSmsPDUData.iSent, iSmsPDUData.iTotal);
+						LOGSMSU3("SetDataL ESmsSubmit R_LOG_DEL_PENDING SR iSmsPDUData.iSent==%d, iSmsPDUData.iTotal==%d, iFailed==0", iSmsPDUData.iSent, iSmsPDUData.iTotal);
 						GetStringL(status,R_LOG_DEL_PENDING);
 						}
 					else
 						{
 						// One or more failures or corruption of iSmsPDUData values
-						OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_9, "SetDataL ESmsSubmit R_LOG_DEL_FAILED SR");
-                        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_10, "   Total:  %d, Sent: %d",iSmsPDUData.iTotal, iSmsPDUData.iSent );
-                        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_11, "   Failed: %d, Delivered: %d",iSmsPDUData.iFailed, iSmsPDUData.iDelivered );
-                        GetStringL(status,R_LOG_DEL_FAILED);
-                        }
+						LOGSMSU1("SetDataL ESmsSubmit R_LOG_DEL_FAILED SR");
+						LOGSMSU3("	Total:  %d, Sent: %d",iSmsPDUData.iTotal, iSmsPDUData.iSent );
+						LOGSMSU3("	Failed: %d, Delivered: %d",iSmsPDUData.iFailed, iSmsPDUData.iDelivered );
+						GetStringL(status,R_LOG_DEL_FAILED);
+						}
                     if (aDischargeTime != NULL)
                         {
                         iLogEvent->SetTime(*aDischargeTime);
-                        }                   
-                    }
-                else
-                    {
-                    if (iSmsPDUData.iSent<iSmsPDUData.iTotal)
-                        {
-                        // IF not all PDUs sent, state is "NOT SENT".
-                        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_12, "SetDataL ESmsSubmit R_LOG_DEL_NOT_SENT NOSR");
-                        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_13, "   Total:  %d, Sent: %d", iSmsPDUData.iTotal, iSmsPDUData.iSent );
-                        GetStringL(status,R_LOG_DEL_NOT_SENT);
-                        }
+                        }					
+					}
+				else
+					{
+					if (iSmsPDUData.iSent<iSmsPDUData.iTotal)
+						{
+						// IF not all PDUs sent, state is "NOT SENT".
+						LOGSMSU1("SetDataL ESmsSubmit R_LOG_DEL_NOT_SENT NOSR");
+						LOGSMSU3("	Total:  %d, Sent: %d", iSmsPDUData.iTotal, iSmsPDUData.iSent );
+						GetStringL(status,R_LOG_DEL_NOT_SENT);
+						}
 					else if (iSmsPDUData.iTotal==iSmsPDUData.iSent)
 						{
 						// All sent
-						OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_14, "SetDataL ESmsSubmit R_LOG_DEL_SENT NOSR");
+						LOGSMSU1("SetDataL ESmsSubmit R_LOG_DEL_SENT NOSR");
 						GetStringL(status,R_LOG_DEL_SENT);
 						}
 					else
 						{
 						// The iSmsPDUData values have become corrupt
-						OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_15, "SetDataL ESmsSubmit R_LOG_DEL_FAILED NOSR");
-                        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_16, "   Total:  %d, Sent: %d",iSmsPDUData.iTotal, iSmsPDUData.iSent );
-                        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_17, "   Failed: %d, Delivered: %d",iSmsPDUData.iFailed, iSmsPDUData.iDelivered );
-                        GetStringL(status,R_LOG_DEL_FAILED);
-                        }
-                    }
-                OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_18, "SetDataL [status string=%S]",status);
-                break;
-                }
+						LOGSMSU1("SetDataL ESmsSubmit R_LOG_DEL_FAILED NOSR");
+						LOGSMSU3("	Total:  %d, Sent: %d",iSmsPDUData.iTotal, iSmsPDUData.iSent );
+						LOGSMSU3("	Failed: %d, Delivered: %d",iSmsPDUData.iFailed, iSmsPDUData.iDelivered );
+						GetStringL(status,R_LOG_DEL_FAILED);
+						}
+				    }
+				LOGSMSU2("SetDataL [status string=%S]",&status);
+				break;
+				}
 			default:
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_19, "SetDataL ESmsuUnexpectedSmsPDUType");
+				LOGSMSU1("SetDataL ESmsuUnexpectedSmsPDUType");
 				SmsuPanic(ESmsuUnexpectedSmsPDUType);
 				}
 			}
@@ -513,7 +508,7 @@
 
 void CSmsEventLogger::DoComplete(TInt& aStatus)
 	{
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOCOMPLETE_1, "CSmsEventLogger::DoComplete(): aStatus=%d, iState=%d", aStatus, iState);
+    LOGSMSU3("CSmsEventLogger::DoComplete(): aStatus=%d, iState=%d", aStatus, iState);
 
 	//
 	// Check the state is valid and finish up...

--- a/smsprotocols/smsstack/smsu/src/smsumain.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsumain.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smsumainTraces.h"
-#endif
-
 #include "smsumain.h"
 
 #include "smsstacklog.h"
@@ -36,7 +30,7 @@
     {
     // Ignore in code coverage  - panic method
     BULLSEYE_OFF
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, SMSUPANIC_1, "SMSUPANIC %d", aPanic);
+    LOGSMSU2("SMSUPANIC %d", aPanic);
     _LIT(KSmsuPanic, "SMSU");
     User::Panic(KSmsuPanic,aPanic);
     BULLSEYE_RESTORE

--- a/smsprotocols/smsstack/smsu/src/smsuset.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsuset.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -23,11 +23,8 @@
 
 #include <s32strm.h>
 
-
 #include "smsstacklog.h"
 
-
-
 /**
  *  Constructor.
  *

--- a/smsprotocols/smsstack/smsu/src/smsustrm.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsustrm.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smsustrmTraces.h"
-#endif
-
 #include "smsustrm.h"
 #include "smsumain.h"
 #include <es_sock.h>
@@ -54,7 +48,7 @@
 //Panics if ERead==0
 //
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RSMSSOCKETBUF_UNDERFLOWL_1, "RSmsSocketBuf::UnderflowL()");
+	LOGSMSU1("RSmsSocketBuf::UnderflowL()");
 
 	__ASSERT_ALWAYS(Avail(ERead)==0,SmsuPanic(KSsmuPanicStreamReadUnavailable));
 	SocketWriteL();
@@ -81,7 +75,7 @@
 void RSmsSocketBuf::OverflowL()
 //Panics if EWrite == 0
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RSMSSOCKETBUF_OVERFLOWL_1, "RSmsSocketBuf::OverflowL()");
+	LOGSMSU1("RSmsSocketBuf::OverflowL()");
 
 	__ASSERT_ALWAYS(Avail(EWrite)==0,SmsuPanic(KSsmuPanicStreamWriteUnavailable));
 	SetBuf(ERead,iBuffer,iBuffer);
@@ -96,7 +90,7 @@
  */
 void RSmsSocketBuf::DoSynchL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RSMSSOCKETBUF_DOSYNCHL_1, "RSmsSocketBuf::DoSynchL()");
+	LOGSMSU1("RSmsSocketBuf::DoSynchL()");
 
 	SocketWriteL();
 	SetBuf(ERead|EWrite,iBuffer,iBuffer);
@@ -108,7 +102,7 @@
  */
 void RSmsSocketBuf::SocketWriteL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RSMSSOCKETBUF_SOCKETWRITEL_1, "RSmsSocketBuf::SocketWriteL()");
+	LOGSMSU1("RSmsSocketBuf::SocketWriteL()");
 
 	TInt length=Lag(EWrite);
 	if (length==0)
@@ -131,7 +125,7 @@
 	:RReadStream(&iBuf),
 	iBuf(aSocket)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, RSMSSOCKETREADSTREAM_CTOR_1, "RSmsSocketReadStream::RSmsSocketReadStream()");
+	LOGSMSU1("RSmsSocketReadStream::RSmsSocketReadStream()");
 
 	} // RSmsSocketReadStream::RSmsSocketReadStream
 
@@ -146,7 +140,7 @@
 	:RWriteStream(&iBuf),
 	iBuf(aSocket)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, RSMSSOCKETWRITESTREAM_CTOR_1, "RSmsSocketWriteStream::RSmsSocketWriteStream()");
+	LOGSMSU1("RSmsSocketWriteStream::RSmsSocketWriteStream()");
 
 	} // RSmsSocketWriteStream::RSmsSocketWriteStream

--- a/smsprotocols/smsstack/smsu/src/smsutimer.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsutimer.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smsutimerTraces.h"
-#endif
-
 #include "SmsuTimer.h"
 
 #include <e32std.h>
@@ -39,7 +33,7 @@
  */
 CSmsuTimeout* CSmsuTimeout::NewL(CSmsuActiveBase& aActive)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUTIMEOUT_NEWL_1, "CSmsuTimeout::NewL()");
+    LOGSMSU1("CSmsuTimeout::NewL()");
     
     CSmsuTimeout* self = new(ELeave) CSmsuTimeout(aActive);
     CleanupStack::PushL(self);
@@ -62,7 +56,7 @@
  */
 void CSmsuTimeout::Start(const TTimeIntervalMicroSeconds32& aTimeIntervalMicroSeconds32)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUTIMEOUT_START_1, "CSmsuTimeout::Start()");
+	LOGSMSU1("CSmsuTimeout::Start()");
 
 	iTimedOut = EFalse;
 	After(aTimeIntervalMicroSeconds32);
@@ -78,7 +72,7 @@
 	iTimedOut(EFalse),
 	iCompleteMyselfRequested(EFalse)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUTIMEOUT_CTOR_1, "CSmsuTimeout::CSmsuTimeout()");
+	LOGSMSU1("CSmsuTimeout::CSmsuTimeout()");
 
 	CActiveScheduler::Add(this);
 	} // CSmsuTimeout::CSmsuTimeout
@@ -89,7 +83,7 @@
  */
 void CSmsuTimeout::RunL()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUTIMEOUT_RUNL_1, "CSmsuTimeout::RunL [iStatus=%d]", iStatus.Int() );
+	LOGSMSU2("CSmsuTimeout::RunL [iStatus=%d]", iStatus.Int() );
 	iTimedOut = ETrue;
 	iActive.Cancel();

--- a/smsprotocols/smsstack/smsu/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/smsprotocols/smsstack/smsu/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_CBACKUPANDRESTORE_ISBACKUPORRESTOREINPROGRESS_1=0x13
-[TRACE]TRACE_BORDER[0x84]_CBACKUPANDRESTORE_NEWL_1=0x12
-[TRACE]TRACE_BORDER[0x84]_CSMSEVENTLOGGER_ADDEVENT_1=0x15
-[TRACE]TRACE_BORDER[0x84]_CSMSEVENTLOGGER_CHANGEEVENT_1=0x17
-[TRACE]TRACE_BORDER[0x84]_CSMSEVENTLOGGER_DELETEEVENT_1=0x18
-[TRACE]TRACE_BORDER[0x84]_CSMSEVENTLOGGER_GETEVENT_1=0x16
-[TRACE]TRACE_BORDER[0x84]_CSMSEVENTLOGGER_NEWL_1=0x14
-[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_COMPLETEMYSELFAFTERTIMEOUT_1=0x11
-[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_COMPLETEMYSELF_1=0x10
-[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_COMPLETE_1=0xe
-[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_CONSTRUCTTIMEOUTL_1=0x8
-[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_QUEUE_1=0xc
-[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_RUNERROR_1=0xf
-[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_RUNL_1=0xd
-[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_TIMEDOUT_1=0xb
-[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_TIMEDSETACTIVECANCEL_1=0xa
-[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_TIMEDSETACTIVE_1=0x9
-[TRACE]TRACE_BORDER[0x84]_RSMSSOCKETREADSTREAM_CTOR_1=0x1a
-[TRACE]TRACE_BORDER[0x84]_RSMSSOCKETWRITESTREAM_CTOR_1=0x1b
-[TRACE]TRACE_BORDER[0x84]_SMSUPANIC_1=0x19
-[TRACE]TRACE_BORDER[0x84]_TSMSADDR_IDENTIFIERMATCH_1=0x3
-[TRACE]TRACE_BORDER[0x84]_TSMSADDR_OPERATOR_1=0x7
-[TRACE]TRACE_BORDER[0x84]_TSMSADDR_SETIDENTIFIERMATCH_1=0x4
-[TRACE]TRACE_BORDER[0x84]_TSMSADDR_SETSMSADDRFAMILY_1=0x2
-[TRACE]TRACE_BORDER[0x84]_TSMSADDR_SETTEXTMATCH_1=0x6
-[TRACE]TRACE_BORDER[0x84]_TSMSADDR_SMSADDRFAMILY_1=0x1
-[TRACE]TRACE_BORDER[0x84]_TSMSADDR_TEXTMATCH_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CBACKUPANDRESTORE_CONSTRUCTL_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CBACKUPANDRESTORE_DOCANCEL_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CBACKUPANDRESTORE_RUNL_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_CONSTRUCTL_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOADDEVENTL_1=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOADDEVENTL_2=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOADDEVENTL_3=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOADDEVENTL_4=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOADDEVENTL_5=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOADDEVENTL_6=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOCANCEL_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOCOMPLETE_1=0x20
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DORUNL_1=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_1=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_10=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_11=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_12=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_13=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_14=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_15=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_16=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_17=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_18=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_19=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_2=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_3=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_4=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_5=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_6=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_7=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_8=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_9=0x15
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUTIMEOUT_CTOR_1=0x27
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUTIMEOUT_NEWL_1=0x25
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUTIMEOUT_RUNL_1=0x28
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUTIMEOUT_START_1=0x26
-[TRACE]TRACE_INTERNALS[0x88]_RSMSSOCKETBUF_DOSYNCHL_1=0x23
-[TRACE]TRACE_INTERNALS[0x88]_RSMSSOCKETBUF_OVERFLOWL_1=0x22
-[TRACE]TRACE_INTERNALS[0x88]_RSMSSOCKETBUF_SOCKETWRITEL_1=0x24
-[TRACE]TRACE_INTERNALS[0x88]_RSMSSOCKETBUF_UNDERFLOWL_1=0x21

--- a/smsprotocols/smsstack/test/TE_R6SMS/TE_R6SMS.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/test/TE_R6SMS/TE_R6SMS.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -51,7 +51,6 @@
 USERINCLUDE   	  ../../ems/inc
 
 USERINCLUDE   	  ../../common/inc
-USERINCLUDE	  	  ../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
@@ -60,5 +59,6 @@
 LIBRARY		testexecutelogclient.lib
 LIBRARY		testexecuteutils.lib
 LIBRARY       	fbscli.lib bitgdi.lib
+DEBUGLIBRARY    comsdbgutil.lib
 
 SMPSAFE

--- a/smsprotocols/smsstack/test/TE_SMSPDUDB/TE_smspdudb.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/test/TE_SMSPDUDB/TE_smspdudb.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -52,7 +52,6 @@
 USERINCLUDE   	  ../../gsmu/inc
 USERINCLUDE   	  ../../ems/inc
 USERINCLUDE   	  ../../common/inc
-USERINCLUDE	 	  ../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
@@ -61,5 +60,6 @@
 LIBRARY		testexecutelogclient.lib
 LIBRARY		testexecuteutils.lib
 LIBRARY       	fbscli.lib bitgdi.lib
+DEBUGLIBRARY    comsdbgutil.lib
 
 SMPSAFE

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/test/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,64 @@
+// Copyright (c) 1999-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
+*/
+
+
+PRJ_PLATFORMS
+
+DEFAULT
+
+PRJ_TESTEXPORTS
+
+te_smsstack.iby                         /epoc32/rom/include/te_smsstack.iby
+
+configfiles/setupgsmsms.txt             c:/sms/setupgsmsms.txt
+configfiles/te_intersetupgsmsms.txt     c:/sms/te_intersetupgsmsms.txt
+
+configfiles/t_smspdudb.txt              c:/sms/t_smspdudb.txt
+configfiles/smspdudb.txt                c:/sms/smspdudb.txt
+
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+./EmsTestUtils.h                        /epoc32/include/emstestutils.h
+#endif
+
+TE_SMSPDUDB/TE_smspdudb.script          z:/testdata/scripts/te_smspdudb.script
+TE_SMSPDUDB/TE_smspdudb_setup.script    z:/testdata/scripts/te_smspdudb_setup.script
+
+configfiles/te_smspdudb.txt             z:/testdata/configs/te_smspdudb.txt
+configfiles/smspdudb.txt                z:/testdata/configs/smspdudb.txt
+configfiles/t_smspdudb.txt              z:/testdata/configs/t_smspdudb.txt
+
+TE_R6SMS/TE_R6SMS.script                z:/testdata/scripts/te_r6sms.script
+TE_R6SMS/TE_R6SMS_setup.script          z:/testdata/scripts/te_r6sms_setup.script
+
+//Class0 Store Regresssion Test Suite
+./Te_Class0StoreRegressionSuite.script	z:/testdata/scripts/te_class0storeregressionsuite.script
+
+./smsstackcleanprivatedata.script           z:/testdata/scripts/smsstackcleanprivatedata.script
+./smsstackbackupeskfile.script                z:/testdata/scripts/smsstackbackupeskfile.script
+./smsstackrestoreeskfile.script                z:/testdata/scripts/smsstackrestoreeskfile.script
+
+./smsstacksimtsytestnumbers.ini             z:/testdata/configs/smsstacksimtsytestnumbers.ini
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+
+smsstacktestutilities.mmp
+TE_SMSPDUDB/TE_smspdudb.mmp
+TE_R6SMS/TE_R6SMS.mmp

Binary file smsprotocols/smsstack/test/configfiles/PDU Book.xls has changed

--- a/smsprotocols/smsstack/test/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-// Copyright (c) 1999-2010 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
-*/
-
-
-PRJ_PLATFORMS
-
-DEFAULT
-
-PRJ_TESTEXPORTS
-
-te_smsstack.iby                         /epoc32/rom/include/te_smsstack.iby
-
-../configfiles/setupgsmsms.txt             c:/sms/setupgsmsms.txt
-../configfiles/te_intersetupgsmsms.txt     c:/sms/te_intersetupgsmsms.txt
-
-../configfiles/t_smspdudb.txt              c:/sms/t_smspdudb.txt
-../configfiles/smspdudb.txt                c:/sms/smspdudb.txt
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../../EmsTestUtils.h                        /epoc32/include/emstestutils.h
-#endif
-
-../TE_SMSPDUDB/TE_smspdudb.script          z:/testdata/scripts/te_smspdudb.script
-../TE_SMSPDUDB/TE_smspdudb_setup.script    z:/testdata/scripts/te_smspdudb_setup.script
-
-../configfiles/te_smspdudb.txt             z:/testdata/configs/te_smspdudb.txt
-../configfiles/smspdudb.txt                z:/testdata/configs/smspdudb.txt
-../configfiles/t_smspdudb.txt              z:/testdata/configs/t_smspdudb.txt
-
-../TE_R6SMS/TE_R6SMS.script                z:/testdata/scripts/te_r6sms.script
-../TE_R6SMS/TE_R6SMS_setup.script          z:/testdata/scripts/te_r6sms_setup.script
-
-//Class0 Store Regresssion Test Suite
-../Te_Class0StoreRegressionSuite.script	z:/testdata/scripts/te_class0storeregressionsuite.script
-
-../smsstackcleanprivatedata.script           z:/testdata/scripts/smsstackcleanprivatedata.script
-../smsstackbackupeskfile.script                z:/testdata/scripts/smsstackbackupeskfile.script
-../smsstackrestoreeskfile.script                z:/testdata/scripts/smsstackrestoreeskfile.script
-
-../smsstacksimtsytestnumbers.ini             z:/testdata/configs/smsstacksimtsytestnumbers.ini
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-
-smsstacktestutilities.mmp
-../TE_SMSPDUDB/TE_smspdudb.mmp
-../TE_R6SMS/TE_R6SMS.mmp

--- a/smsprotocols/smsstack/test/group/smsstacktestutilities.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-// Copyright (c) 2003-2010 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:
-// Top-level project file for interactive SMSPROT test code
-// 
-//
-
-/**
- @file
-*/
-
-TARGET           smsstacktestutilities.dll
-CAPABILITY       All -TCB
-UID           	 0x1000008D 0x101FBB4F
-EPOCSTACKSIZE    0x10000
-TARGETTYPE       dll
-
-SOURCEPATH	../
-SOURCE		smsstacktestutilities.cpp EmsTestUtils.cpp
-SOURCE		smspdudb.cpp
-SOURCE		smspdudbitems.cpp
-SOURCE 		smsstackbaseteststeps.cpp smsstacktestcase.cpp
-SOURCE          smsstackbasetestserver.cpp
-SOURCEPATH	../../gsmu/src
-SOURCE		gsmupriv.cpp
-SOURCE		Gsmumain.cpp
-SOURCE		Gsmuelem.cpp
-SOURCEPATH	../../ems/src
-SOURCE 		EMSInformationElement.cpp EMSFormatIE.cpp EMSAnimationIE.cpp
-SOURCE		EMSObjectDistributionIE.cpp EMSPictureIE.cpp EMSSoundIE.cpp
-SOURCE 		EMSUserPromptIE.cpp
-
-SOURCEPATH	../../common/src
-SOURCE		smsstacklog.cpp
-   
-USERINCLUDE      ../../gsmu/inc
-USERINCLUDE      ../../ems/inc
-USERINCLUDE      ../../smsu/inc
-USERINCLUDE      ../../test
-USERINCLUDE      ../../common/inc
-USERINCLUDE   	 ../../smsprot/inc
-USERINCLUDE      ../traces
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY      smsu.lib gsmu.lib // components under test
-LIBRARY      esock.lib         // loading SMSPROT.PRT
-LIBRARY      euser.lib estor.lib
-LIBRARY          logwrap.lib testconfigfileparser.lib etel.lib efsrv.lib charconv.lib etelmm.lib fbscli.lib bitgdi.lib
-LIBRARY		 testexecuteutils.lib
-LIBRARY		 testexecutelogclient.lib
-
-LIBRARY		 commsdat.lib logcli.lib c32root.lib
-
-#if defined(WINS)
-DEFFILE			../../test/bwins/SMSSTACKTESTUTILITIES.DEF
-#elif defined(GCC32)
-DEFFILE			../../test/bmarm/smsstacktestutilities.def
-#else
-DEFFILE			../../test/eabi/smsstacktestutilities.def
-#endif
-
-VENDORID 0x70000001
-
-SMPSAFE

--- a/smsprotocols/smsstack/test/group/te_smsstack.iby	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +0,0 @@
-// Copyright (c) 2002-2010 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
-*/
-
-
-#ifndef __TE_SMSSTACK_IBY__
-#define __TE_SMSSTACK_IBY__
-
-#include <smsstack.iby>
-#include <autotest.iby>
-#include <simtsy.iby>
-#include <testexecute.iby>
-
-//
-// SMS Stack Test Utility DLLs...
-//
-file=ABI_DIR\DEBUG_DIR\smsstacktestutilities.dll                                         SYSTEM_BINDIR\smsstacktestutilities.dll
-
-//
-// Gsmu Test Code...
-//
-file=ABI_DIR\DEBUG_DIR\te_gsmu.exe                                                       SYSTEM_BINDIR\te_gsmu.exe
-file=ABI_DIR\DEBUG_DIR\te_gsmustor.exe                                                   SYSTEM_BINDIR\te_gsmustor.exe
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_gsmu.script                             testdata\scripts\te_gsmu.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_gsmustor.script                         testdata\scripts\te_gsmustor.script
-
-//
-// Smsprot Test Code...
-//
-file=ABI_DIR\DEBUG_DIR\te_smsinter.exe                                                   SYSTEM_BINDIR\te_smsinter.exe stack=0x5000
-file=ABI_DIR\DEBUG_DIR\te_smsemsprt.exe                                                  SYSTEM_BINDIR\te_smsemsprt.exe
-file=ABI_DIR\DEBUG_DIR\te_smsstor.exe                                                    SYSTEM_BINDIR\te_smsstor.exe
-file=ABI_DIR\DEBUG_DIR\te_smsprtstress.exe                                               SYSTEM_BINDIR\te_smsprtstress.exe
-file=ABI_DIR\DEBUG_DIR\te_smsprt.exe                                                     SYSTEM_BINDIR\te_smsprt.exe stack=0x5000
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsstor.script                          TestData\scripts\te_smsstor.script 
-data=EPOCROOT##epoc32\data\z\sms\smswap.sms-class0test.esk                               SMS\smswap.sms-class0test.esk
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprtstress.script                     TestData\scripts\te_smsprtstress.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprtstress_setup.script               TestData\scripts\te_smsprtstress_setup.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_smsprtstress_commdb.cfg                 TestData\configs\te_smsprtstress_commdb.cfg
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsemsprt.script                        TestData\scripts\te_smsemsprt.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsemsprt_setup.script                  TestData\scripts\te_smsemsprt_setup.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_smsemsprt_commdb.cfg                    TestData\configs\te_smsemsprt_commdb.cfg
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsinter.script                         testdata\scripts\te_smsinter.script
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SMSPRT_setup.script                     testdata\scripts\TE_SMSPRT_setup.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SMSPRT.cfg                              testdata\configs\te_smsprt.cfg
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprt_gsmu.script                      testdata\scripts\te_smsprt_gsmu.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprt_smsstack.script                  testdata\scripts\te_smsprt_smsstack.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprt_prot.script                      testdata\scripts\te_smsprt_prot.script
-
-data=EPOCROOT##epoc32\data\z\sms\smswap.sms-sendTryTimeout.esk                           SMS\smswap.sms-sendTryTimeout.esk
-data=EPOCROOT##epoc32\data\z\sms\smswap.sms-bootTimerTimeout.esk                         SMS\smswap.sms-bootTimerTimeout.esk
-
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\smsstackcleanprivatedata.script            TestData\scripts\smsstackcleanprivatedata.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\smsstackbackupeskfile.script               TestData\scripts\smsstackbackupeskfile.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\smsstackrestoreeskfile.script              TestData\scripts\smsstackrestoreeskfile.script
-
-data=EPOCROOT##epoc32\data\z\testdata\configs\smsstacksimtsytestnumbers.ini              TestData\configs\smsstacksimtsytestnumbers.ini
-
-data=EPOCROOT##epoc32\data\z\testdata\configs\t_smspdudb.txt                             testdata\configs\t_smspdudb.txt
-
-// te_smspdudb
-file=ABI_DIR\DEBUG_DIR\te_smspdudb.exe                                                   SYSTEM_BINDIR\te_smspdudb.exe
-
-//te_smspdudb script and configs
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smspdudb.script                         testdata\scripts\te_smspdudb.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smspdudb_setup.script                   testdata\scripts\te_smspdudb_setup.script
-
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_smspdudb.txt                            testdata\configs\te_smspdudb.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\smspdudb.txt                               testdata\configs\smspdudb.txt
-
-// te_R6SMS
-file=ABI_DIR\DEBUG_DIR\te_R6SMS.exe                                                      SYSTEM_BINDIR\te_R6SMS.exe
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_R6SMS.script                            testdata\scripts\te_R6SMS.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_R6SMS_setup.script                      testdata\scripts\te_R6SMS_setup.script
-
-// Gsmu Ems Data
-data=EPOCROOT##epoc32\data\c\ems\anims.mbm                                               Ems\anims.mbm
-data=EPOCROOT##epoc32\data\c\ems\pics.mbm                                                Ems\pics.mbm
-
-// Smsprot Data
-data=EPOCROOT##epoc32\data\c\sms\setupgsmsms.txt                                         Sms\setupgsmsms.txt
-data=EPOCROOT##epoc32\data\c\sms\te_intersetupgsmsms.txt                                 Sms\te_intersetupgsmsms.txt
-data=EPOCROOT##epoc32\data\z\sms\testsmswap.sms.esk                                      Sms\testsmswap.sms.esk
-data=EPOCROOT##epoc32\data\z\sms\smswap.sms-maxnummessagetest.esk                        Sms\smswap.sms-maxnummessagetest.esk
-data=EPOCROOT##epoc32\data\z\sms\smswap.sms-0nummessagetest.esk                        	 Sms\smswap.sms-0nummessagetest.esk
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto.txt                                    Sms\t_sms_inter_auto.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems.txt                                     Sms\t_sms_inter_ems.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_9210.txt                               Sms\t_sms_inter_auto_9210.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_R520.txt                               Sms\t_sms_inter_auto_R520.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_T65.txt                                Sms\t_sms_inter_auto_T65.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_6210.txt                               Sms\t_sms_inter_auto_6210.txt
-data=EPOCROOT##epoc32\data\c\sms\TWAPSMS_9210.txt                                        Sms\TWAPSMS_9210.txt
-data=EPOCROOT##epoc32\data\c\sms\TWAPSMS_R520.txt                                        Sms\TWAPSMS_R520.txt
-data=EPOCROOT##epoc32\data\c\sms\TWAPSMS_T65.txt                                         Sms\TWAPSMS_T65.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_9210.txt                                Sms\t_sms_inter_ems_9210.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_R520.txt                                Sms\t_sms_inter_ems_R520.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_T68.txt                                 Sms\t_sms_inter_ems_T68.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_6210.txt                                Sms\t_sms_inter_ems_6210.txt
-data=EPOCROOT##epoc32\data\z\sms\tsmsprt_config.txt                                      Sms\tsmsprt_config.txt
-data=EPOCROOT##epoc32\data\z\sms\tsmsprt_config_extra.txt                                Sms\tsmsprt_config_extra.txt
-data=EPOCROOT##epoc32\data\z\sms\tsmsprt_config_tx_rx_maxmsg.txt                         Sms\tsmsprt_config_tx_rx_maxmsg.txt
-data=EPOCROOT##epoc32\data\z\sms\tsmsprtstress_config.txt                                Sms\tsmsprtstress_config.txt
-data=EPOCROOT##epoc32\data\z\sms\tsmsemsprt_config.txt                                   Sms\tsmsemsprt_config.txt
-data=EPOCROOT##epoc32\data\c\sms\smspdudb.txt                                            Sms\smspdudb.txt
-data=EPOCROOT##epoc32\data\c\sms\t_smspdudb.txt                                          Sms\t_smspdudb.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_statusReportScheme.ini                  testdata\configs\te_statusReportScheme.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_DiskSpaceMonitor.ini                  	 testdata\configs\TE_DiskSpaceMonitor.ini
-
-//SMSOutOfDiskSpace
-#ifndef _DEBUG
-data=EPOCROOT##epoc32\data\z\testdata\scripts\Te_SMSStackOutOfDiskSpace_ARM_UREL.script		testdata\scripts\Te_SMSStackOutOfDiskSpace.script
-#else
-data=EPOCROOT##epoc32\data\z\testdata\scripts\Te_SMSStackOutOfDiskSpace.script			testdata\scripts\Te_SMSStackOutOfDiskSpace.script
-#endif
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SetupSMSStackOutOfDiskSpace.script 	testdata\scripts\TE_SetupSMSStackOutOfDiskSpace.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\SMSOutOfDiskSpace.ini                 	testdata\configs\SMSOutOfDiskSpace.ini
-data=EPOCROOT##epoc32\data\z\sms\SMSStackOutOfDiskSpace.txt                  		sms\SMSStackOutOfDiskSpace.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\smsclass0preallocated.dat             	testdata\configs\smsclass0preallocated.dat
-data=EPOCROOT##epoc32\data\z\testdata\configs\smsclass0reast.dat		        testdata\configs\smsclass0reast.dat
-data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_class0.sms.esk                	testdata\configs\smswap_class0.sms.esk
-
-data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_discardType0s.esk                	testdata\configs\smswap_discardType0s.esk
-data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_DontDiscardType0s.esk            	testdata\configs\smswap_DontDiscardType0s.esk
-data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_MaxFivePDUsInOOD.esk            	testdata\configs\smswap_MaxFivePDUsInOOD.esk
-data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_Class0DisabledMaxFivePDUsInOOD.esk            	testdata\configs\smswap_Class0DisabledMaxFivePDUsInOOD.esk
-
-// Wapprot Data
-data=EPOCROOT##epoc32\data\z\testdata\configs\tone1.rtp                                  testdata\configs\tone1.rtp
-data=EPOCROOT##epoc32\data\z\testdata\configs\tone2.rtp                                  testdata\configs\tone2.rtp
-data=EPOCROOT##epoc32\data\z\testdata\configs\tone3.rtp                                  testdata\configs\tone3.rtp
-data=EPOCROOT##epoc32\data\z\testdata\configs\vcard1.vcf                                 testdata\configs\vcard1.vcf
-data=EPOCROOT##epoc32\data\z\testdata\configs\vcard2.vcf                                 testdata\configs\vcard2.vcf
-data=EPOCROOT##epoc32\data\z\testdata\configs\vcard3.vcf                                 testdata\configss\vcard3.vcf
-
-
-data=EPOCROOT##epoc32\data\z\sms\smsreastnopdu.dat                                       Sms\smsreastnopdu.dat
-data=EPOCROOT##epoc32\data\z\sms\smsreastnostream.dat                                    Sms\smsreastnostream.dat
-data=EPOCROOT##epoc32\data\z\sms\smsreastarraynoroot.dat                                 Sms\smsreastarraynoroot.dat
-data=EPOCROOT##epoc32\data\z\sms\smsreastcountwrong.dat                                  Sms\smsreastcountwrong.dat
-data=EPOCROOT##epoc32\data\z\sms\smsreastarraynoentries.dat                              Sms\smsreastarraynoentries.dat
-
-// Release 6 test data 
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_smsprt_data.ini                         testdata\configs\te_smsprt_data.ini
-
-// Release 6 automatic deletion configuration files
-data=EPOCROOT##Epoc32\data\z\sms\smswap.sms-AutoDeletionClass2.esk                       sms\smswap.sms-AutoDeletionClass2.esk
-data=EPOCROOT##Epoc32\data\z\sms\smswap.sms-AutomaticDeletionOfType0.esk                 sms\smswap.sms-AutomaticDeletionOfType0.esk
-
-file=ABI_DIR\DEBUG_DIR\te_gsmu_ems.exe                                                   System\bin\te_gsmu_ems.exe
-
-data=EPOCROOT##Epoc32\data\z\TestData\scripts\te_gsmu_ems.script                         TestData\Scripts\te_gsmu_ems.Script
-
-
-// Test Suite
-
-file=ABI_DIR\DEBUG_DIR\TE_WapDgrm.exe                                                    SYSTEM_BINDIR\TE_WapDgrm.exe
-
-// Scripts and Ini files
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_wapdgrm.script                                   testdata\scripts\TE_wapdgrm.script
-
-// Test Suite
-
-file=ABI_DIR\DEBUG_DIR\TE_WapThdr.exe                                                    SYSTEM_BINDIR\TE_WapThdr.exe
-
-// Scripts and Ini files
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_wapthdr.script                          testdata\scripts\TE_wapthdr.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_wapthdr_setup.script                    testdata\scripts\TE_wapthdr_setup.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_waphdr.txt                              testdata\configs\TE_waphdr.txt
-
-// This binary file is marked as "data=" because in the ROM it is must be a RAM executable image to be used with SETCAP.exe.
-data=ABI_DIR\DEBUG_DIR\TE_WapProt.exe                                                    SYSTEM_BINDIR\TE_WapProt.exe
-
-data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapProtSuite.ini              testdata\configs\WapProtSuite\WapProtSuite.ini
-data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapStatusReports.ini          testdata\configs\WapProtSuite\WapStatusReports.ini
-data=EPOCROOT##Epoc32\data\z\testdata\scripts\Te_WapProt.script                          testdata\scripts\Te_WapProt.Script
-data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapProtSuite.cfg              testdata\configs\WapProtSuite\WapProtSuite.cfg
-data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\StatusReportsRequested.cfg    testdata\configs\WapProtSuite\StatusReportsRequested.cfg
-data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\Config.txt                    testdata\configs\WapProtSuite\Config.txt
-data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapStackOutOfDiskSpace.ini    testdata\configs\WapProtSuite\WapStackOutOfDiskSpace.ini
-
-#ifndef _DEBUG
-data=EPOCROOT##Epoc32\data\z\testdata\scripts\Te_WapStackOutOfDiskSpace_ARM_UREL.script  testdata\scripts\Te_WapStackOutOfDiskSpace.script
-#else
-data=EPOCROOT##Epoc32\data\z\testdata\scripts\Te_WapStackOutOfDiskSpace.script           testdata\scripts\Te_WapStackOutOfDiskSpace.script
-#endif
-
-
-
-//
-// TE_WAPSMS files...
-//
-file=ABI_DIR\DEBUG_DIR\TE_WAPSMS.exe                                                     SYSTEM_BINDIR\TE_WAPSMS.exe
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_setupgsmsms.txt                         testdata\configs\te_setupgsmsms.txt
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_WAPSMS.script                           testdata\scripts\TE_WAPSMS.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_WAPSMS_setup.script                     testdata\scripts\TE_WAPSMS_setup.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_WAPSMS_commdb.cfg                       testdata\configs\TE_WAPSMS_commdb.cfg
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_WAPSMS.txt                              testdata\configs\TE_WAPSMS.txt
-
-#endif // __TE_SMSSTACK_IBY__

--- a/smsprotocols/smsstack/test/smsstack_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\test\TE_SMSPDUDB\TE_smspdudb.script"-"c:\testdata\scripts\TE_smspdudb.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\test\TE_R6SMS\TE_R6SMS.script"-"c:\testdata\scripts\TE_R6SMS.script"
-
-
-
-

--- a/smsprotocols/smsstack/test/smsstackbaseteststeps.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/test/smsstackbaseteststeps.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -307,13 +307,12 @@
     RSmsSocketReadStream readstream(aSocket);
     TRAPD(ret, readstream >> *smsMessage);
  
+    TPckgBuf<TUint> sbuf;
     TRequestStatus status;
-    
-    // aDesc arguments passed to Ioctl() method have been changed to NULL to keep it compliant with
-    // usage rules and to prevent OOM tests from failing
+
     if(ret==KErrNone)
         {
-        aSocket.Ioctl(aIoctl, status, NULL, KSolSmsProv);
+        aSocket.Ioctl(aIoctl, status, &sbuf, KSolSmsProv);
         User::WaitForRequest(status);
         CleanupStack::Pop(smsMessage);
         TESTCHECK(status.Int(), KErrNone, "Notifying the SMS stack that message was received successfully");
@@ -322,7 +321,7 @@
     //An error has occured, no message has been received
     else
         {
-        aSocket.Ioctl(KIoctlReadMessageFailed, status, NULL, KSolSmsProv);
+        aSocket.Ioctl(KIoctlReadMessageFailed, status, &sbuf, KSolSmsProv);
         User::WaitForRequest(status);
         TESTCHECK(status.Int(), KErrNone, "Notifying the SMS stack that message was not received");
         ERR_PRINTF2(_L("Receiving message failed %d"), ret);

--- a/smsprotocols/smsstack/test/smsstacktestutilities.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/test/smsstacktestutilities.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smsstacktestutilitiesTraces.h"
-#endif
-
 #include "smsstacktestutilities.h"
 
 #include <commsdattypesv1_1.h>
@@ -1503,12 +1497,8 @@
  *  TODO
  */
 	{
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) 
-    LogSmsIfPDUL(_L8("TestPduDbToolsL PDU: "), aPdu.Pdu(), EFalse);
-    TBuf<40> timestamp;
-    SmsTimeStampL(timestamp);
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSSTACKTESTUTILS_PRINTANDTESTDECODEL_1, "%S",timestamp);
-#endif
+	LOGSMSIFPDU(_L8("TestPduDbToolsL PDU: "), aPdu.Pdu(), EFalse);
+	LOGSMSIFTIMESTAMP();
 
 	CSmsPDU* pdu = NULL;
 	TRAPD(err, pdu = CSmsPDU::NewL(aPdu, *iCharConv, iFs, aIsMobileTerminated));

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/test/smsstacktestutilities.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,76 @@
+// Copyright (c) 2003-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:
+// Top-level project file for interactive SMSPROT test code
+// 
+//
+
+/**
+ @file
+*/
+
+TARGET           smsstacktestutilities.dll
+CAPABILITY       All -TCB
+UID           	 0x1000008D 0x101FBB4F
+EPOCSTACKSIZE    0x10000
+TARGETTYPE       dll
+
+SOURCEPATH	.
+SOURCE		smsstacktestutilities.cpp EmsTestUtils.cpp
+SOURCE		smspdudb.cpp
+SOURCE		smspdudbitems.cpp
+SOURCE 		smsstackbaseteststeps.cpp smsstacktestcase.cpp
+SOURCE          smsstackbasetestserver.cpp
+SOURCEPATH	../gsmu/src
+SOURCE		gsmupriv.cpp
+SOURCE		Gsmumain.cpp
+SOURCE		Gsmuelem.cpp
+SOURCEPATH	../ems/src
+SOURCE 		EMSInformationElement.cpp EMSFormatIE.cpp EMSAnimationIE.cpp
+SOURCE		EMSObjectDistributionIE.cpp EMSPictureIE.cpp EMSSoundIE.cpp
+SOURCE 		EMSUserPromptIE.cpp
+
+SOURCEPATH	../common/src
+SOURCE		smsstacklog.cpp
+   
+USERINCLUDE      ../gsmu/inc
+USERINCLUDE      ../ems/inc
+USERINCLUDE      ../smsu/inc
+USERINCLUDE      ../test
+USERINCLUDE      ../common/inc
+USERINCLUDE   	 ../smsprot/inc
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY      smsu.lib gsmu.lib // components under test
+LIBRARY      esock.lib         // loading SMSPROT.PRT
+LIBRARY      euser.lib estor.lib
+LIBRARY          logwrap.lib testconfigfileparser.lib etel.lib efsrv.lib charconv.lib etelmm.lib fbscli.lib bitgdi.lib
+LIBRARY		 testexecuteutils.lib
+LIBRARY		 testexecutelogclient.lib
+
+LIBRARY		 commsdat.lib logcli.lib c32root.lib
+
+DEBUGLIBRARY		 comsdbgutil.lib
+
+#if defined(WINS)
+DEFFILE			../test/bwins/SMSSTACKTESTUTILITIES.DEF
+#elif defined(GCC32)
+DEFFILE			../test/bmarm/smsstacktestutilities.def
+#else
+DEFFILE			../test/eabi/smsstacktestutilities.def
+#endif
+
+VENDORID 0x70000001
+
+SMPSAFE

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/test/te_smsstack.iby	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,224 @@
+// Copyright (c) 2002-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
+*/
+
+
+#ifndef __TE_SMSSTACK_IBY__
+#define __TE_SMSSTACK_IBY__
+
+#include <smsstack.iby>
+#include <autotest.iby>
+#include <simtsy.iby>
+#include <testexecute.iby>
+
+//
+// SMS Stack Test Utility DLLs...
+//
+file=ABI_DIR\DEBUG_DIR\smsstacktestutilities.dll                                         SYSTEM_BINDIR\smsstacktestutilities.dll
+
+//
+// Gsmu Test Code...
+//
+file=ABI_DIR\DEBUG_DIR\te_gsmu.exe                                                       SYSTEM_BINDIR\te_gsmu.exe
+file=ABI_DIR\DEBUG_DIR\te_gsmustor.exe                                                   SYSTEM_BINDIR\te_gsmustor.exe
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_gsmu.script                             testdata\scripts\te_gsmu.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_gsmustor.script                         testdata\scripts\te_gsmustor.script
+
+//
+// Smsprot Test Code...
+//
+file=ABI_DIR\DEBUG_DIR\te_smsinter.exe                                                   SYSTEM_BINDIR\te_smsinter.exe stack=0x5000
+file=ABI_DIR\DEBUG_DIR\te_smsemsprt.exe                                                  SYSTEM_BINDIR\te_smsemsprt.exe
+file=ABI_DIR\DEBUG_DIR\te_smsstor.exe                                                    SYSTEM_BINDIR\te_smsstor.exe
+file=ABI_DIR\DEBUG_DIR\te_smsprtstress.exe                                               SYSTEM_BINDIR\te_smsprtstress.exe
+file=ABI_DIR\DEBUG_DIR\te_smsprt.exe                                                     SYSTEM_BINDIR\te_smsprt.exe stack=0x5000
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsstor.script                          TestData\scripts\te_smsstor.script 
+data=EPOCROOT##epoc32\data\z\sms\smswap.sms-class0test.esk                               SMS\smswap.sms-class0test.esk
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprtstress.script                     TestData\scripts\te_smsprtstress.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprtstress_setup.script               TestData\scripts\te_smsprtstress_setup.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_smsprtstress_commdb.cfg                 TestData\configs\te_smsprtstress_commdb.cfg
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsemsprt.script                        TestData\scripts\te_smsemsprt.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsemsprt_setup.script                  TestData\scripts\te_smsemsprt_setup.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_smsemsprt_commdb.cfg                    TestData\configs\te_smsemsprt_commdb.cfg
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsinter.script                         testdata\scripts\te_smsinter.script
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SMSPRT_setup.script                     testdata\scripts\TE_SMSPRT_setup.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SMSPRT.cfg                              testdata\configs\te_smsprt.cfg
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprt_gsmu.script                      testdata\scripts\te_smsprt_gsmu.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprt_smsstack.script                  testdata\scripts\te_smsprt_smsstack.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprt_prot.script                      testdata\scripts\te_smsprt_prot.script
+
+data=EPOCROOT##epoc32\data\z\sms\smswap.sms-sendTryTimeout.esk                           SMS\smswap.sms-sendTryTimeout.esk
+data=EPOCROOT##epoc32\data\z\sms\smswap.sms-bootTimerTimeout.esk                         SMS\smswap.sms-bootTimerTimeout.esk
+
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\smsstackcleanprivatedata.script            TestData\scripts\smsstackcleanprivatedata.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\smsstackbackupeskfile.script               TestData\scripts\smsstackbackupeskfile.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\smsstackrestoreeskfile.script              TestData\scripts\smsstackrestoreeskfile.script
+
+data=EPOCROOT##epoc32\data\z\testdata\configs\smsstacksimtsytestnumbers.ini              TestData\configs\smsstacksimtsytestnumbers.ini
+
+data=EPOCROOT##epoc32\data\z\testdata\configs\t_smspdudb.txt                             testdata\configs\t_smspdudb.txt
+
+// te_smspdudb
+file=ABI_DIR\DEBUG_DIR\te_smspdudb.exe                                                   SYSTEM_BINDIR\te_smspdudb.exe
+
+//te_smspdudb script and configs
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smspdudb.script                         testdata\scripts\te_smspdudb.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smspdudb_setup.script                   testdata\scripts\te_smspdudb_setup.script
+
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_smspdudb.txt                            testdata\configs\te_smspdudb.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\smspdudb.txt                               testdata\configs\smspdudb.txt
+
+// te_R6SMS
+file=ABI_DIR\DEBUG_DIR\te_R6SMS.exe                                                      SYSTEM_BINDIR\te_R6SMS.exe
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_R6SMS.script                            testdata\scripts\te_R6SMS.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_R6SMS_setup.script                      testdata\scripts\te_R6SMS_setup.script
+
+// Gsmu Ems Data
+data=EPOCROOT##epoc32\data\c\ems\anims.mbm                                               Ems\anims.mbm
+data=EPOCROOT##epoc32\data\c\ems\pics.mbm                                                Ems\pics.mbm
+
+// Smsprot Data
+data=EPOCROOT##epoc32\data\c\sms\setupgsmsms.txt                                         Sms\setupgsmsms.txt
+data=EPOCROOT##epoc32\data\c\sms\te_intersetupgsmsms.txt                                 Sms\te_intersetupgsmsms.txt
+data=EPOCROOT##epoc32\data\z\sms\testsmswap.sms.esk                                      Sms\testsmswap.sms.esk
+data=EPOCROOT##epoc32\data\z\sms\smswap.sms-maxnummessagetest.esk                        Sms\smswap.sms-maxnummessagetest.esk
+data=EPOCROOT##epoc32\data\z\sms\smswap.sms-0nummessagetest.esk                        	 Sms\smswap.sms-0nummessagetest.esk
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto.txt                                    Sms\t_sms_inter_auto.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems.txt                                     Sms\t_sms_inter_ems.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_9210.txt                               Sms\t_sms_inter_auto_9210.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_R520.txt                               Sms\t_sms_inter_auto_R520.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_T65.txt                                Sms\t_sms_inter_auto_T65.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_6210.txt                               Sms\t_sms_inter_auto_6210.txt
+data=EPOCROOT##epoc32\data\c\sms\TWAPSMS_9210.txt                                        Sms\TWAPSMS_9210.txt
+data=EPOCROOT##epoc32\data\c\sms\TWAPSMS_R520.txt                                        Sms\TWAPSMS_R520.txt
+data=EPOCROOT##epoc32\data\c\sms\TWAPSMS_T65.txt                                         Sms\TWAPSMS_T65.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_9210.txt                                Sms\t_sms_inter_ems_9210.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_R520.txt                                Sms\t_sms_inter_ems_R520.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_T68.txt                                 Sms\t_sms_inter_ems_T68.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_6210.txt                                Sms\t_sms_inter_ems_6210.txt
+data=EPOCROOT##epoc32\data\z\sms\tsmsprt_config.txt                                      Sms\tsmsprt_config.txt
+data=EPOCROOT##epoc32\data\z\sms\tsmsprt_config_extra.txt                                Sms\tsmsprt_config_extra.txt
+data=EPOCROOT##epoc32\data\z\sms\tsmsprt_config_tx_rx_maxmsg.txt                         Sms\tsmsprt_config_tx_rx_maxmsg.txt
+data=EPOCROOT##epoc32\data\z\sms\tsmsprtstress_config.txt                                Sms\tsmsprtstress_config.txt
+data=EPOCROOT##epoc32\data\z\sms\tsmsemsprt_config.txt                                   Sms\tsmsemsprt_config.txt
+data=EPOCROOT##epoc32\data\c\sms\smspdudb.txt                                            Sms\smspdudb.txt
+data=EPOCROOT##epoc32\data\c\sms\t_smspdudb.txt                                          Sms\t_smspdudb.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_statusReportScheme.ini                  testdata\configs\te_statusReportScheme.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\TE_DiskSpaceMonitor.ini                  	 testdata\configs\TE_DiskSpaceMonitor.ini
+
+//SMSOutOfDiskSpace
+#ifndef _DEBUG
+data=EPOCROOT##epoc32\data\z\testdata\scripts\Te_SMSStackOutOfDiskSpace_ARM_UREL.script		testdata\scripts\Te_SMSStackOutOfDiskSpace.script
+#else
+data=EPOCROOT##epoc32\data\z\testdata\scripts\Te_SMSStackOutOfDiskSpace.script			testdata\scripts\Te_SMSStackOutOfDiskSpace.script
+#endif
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SetupSMSStackOutOfDiskSpace.script 	testdata\scripts\TE_SetupSMSStackOutOfDiskSpace.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\SMSOutOfDiskSpace.ini                 	testdata\configs\SMSOutOfDiskSpace.ini
+data=EPOCROOT##epoc32\data\z\sms\SMSStackOutOfDiskSpace.txt                  		sms\SMSStackOutOfDiskSpace.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\smsclass0preallocated.dat             	testdata\configs\smsclass0preallocated.dat
+data=EPOCROOT##epoc32\data\z\testdata\configs\smsclass0reast.dat		        testdata\configs\smsclass0reast.dat
+data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_class0.sms.esk                	testdata\configs\smswap_class0.sms.esk
+
+data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_discardType0s.esk                	testdata\configs\smswap_discardType0s.esk
+data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_DontDiscardType0s.esk            	testdata\configs\smswap_DontDiscardType0s.esk
+data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_MaxFivePDUsInOOD.esk            	testdata\configs\smswap_MaxFivePDUsInOOD.esk
+data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_Class0DisabledMaxFivePDUsInOOD.esk            	testdata\configs\smswap_Class0DisabledMaxFivePDUsInOOD.esk
+
+// Wapprot Data
+data=EPOCROOT##epoc32\data\z\testdata\configs\tone1.rtp                                  testdata\configs\tone1.rtp
+data=EPOCROOT##epoc32\data\z\testdata\configs\tone2.rtp                                  testdata\configs\tone2.rtp
+data=EPOCROOT##epoc32\data\z\testdata\configs\tone3.rtp                                  testdata\configs\tone3.rtp
+data=EPOCROOT##epoc32\data\z\testdata\configs\vcard1.vcf                                 testdata\configs\vcard1.vcf
+data=EPOCROOT##epoc32\data\z\testdata\configs\vcard2.vcf                                 testdata\configs\vcard2.vcf
+data=EPOCROOT##epoc32\data\z\testdata\configs\vcard3.vcf                                 testdata\configss\vcard3.vcf
+
+
+data=EPOCROOT##epoc32\data\z\sms\smsreastnopdu.dat                                       Sms\smsreastnopdu.dat
+data=EPOCROOT##epoc32\data\z\sms\smsreastnostream.dat                                    Sms\smsreastnostream.dat
+data=EPOCROOT##epoc32\data\z\sms\smsreastarraynoroot.dat                                 Sms\smsreastarraynoroot.dat
+data=EPOCROOT##epoc32\data\z\sms\smsreastcountwrong.dat                                  Sms\smsreastcountwrong.dat
+data=EPOCROOT##epoc32\data\z\sms\smsreastarraynoentries.dat                              Sms\smsreastarraynoentries.dat
+
+// Release 6 test data 
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_smsprt_data.ini                         testdata\configs\te_smsprt_data.ini
+
+// Release 6 automatic deletion configuration files
+data=EPOCROOT##Epoc32\data\z\sms\smswap.sms-AutoDeletionClass2.esk                       sms\smswap.sms-AutoDeletionClass2.esk
+data=EPOCROOT##Epoc32\data\z\sms\smswap.sms-AutomaticDeletionOfType0.esk                 sms\smswap.sms-AutomaticDeletionOfType0.esk
+
+file=ABI_DIR\DEBUG_DIR\te_gsmu_ems.exe                                                   System\bin\te_gsmu_ems.exe
+
+data=EPOCROOT##Epoc32\data\z\TestData\scripts\te_gsmu_ems.script                         TestData\Scripts\te_gsmu_ems.Script
+
+
+// Test Suite
+
+file=ABI_DIR\DEBUG_DIR\TE_WapDgrm.exe                                                    SYSTEM_BINDIR\TE_WapDgrm.exe
+
+// Scripts and Ini files
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_wapdgrm.script                                   testdata\scripts\TE_wapdgrm.script
+
+// Test Suite
+
+file=ABI_DIR\DEBUG_DIR\TE_WapThdr.exe                                                    SYSTEM_BINDIR\TE_WapThdr.exe
+
+// Scripts and Ini files
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_wapthdr.script                          testdata\scripts\TE_wapthdr.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_wapthdr_setup.script                    testdata\scripts\TE_wapthdr_setup.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\TE_waphdr.txt                              testdata\configs\TE_waphdr.txt
+
+// This binary file is marked as "data=" because in the ROM it is must be a RAM executable image to be used with SETCAP.exe.
+data=ABI_DIR\DEBUG_DIR\TE_WapProt.exe                                                    SYSTEM_BINDIR\TE_WapProt.exe
+
+data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapProtSuite.ini              testdata\configs\WapProtSuite\WapProtSuite.ini
+data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapStatusReports.ini          testdata\configs\WapProtSuite\WapStatusReports.ini
+data=EPOCROOT##Epoc32\data\z\testdata\scripts\Te_WapProt.script                          testdata\scripts\Te_WapProt.Script
+data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapProtSuite.cfg              testdata\configs\WapProtSuite\WapProtSuite.cfg
+data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\StatusReportsRequested.cfg    testdata\configs\WapProtSuite\StatusReportsRequested.cfg
+data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\Config.txt                    testdata\configs\WapProtSuite\Config.txt
+data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapStackOutOfDiskSpace.ini    testdata\configs\WapProtSuite\WapStackOutOfDiskSpace.ini
+
+#ifndef _DEBUG
+data=EPOCROOT##Epoc32\data\z\testdata\scripts\Te_WapStackOutOfDiskSpace_ARM_UREL.script  testdata\scripts\Te_WapStackOutOfDiskSpace.script
+#else
+data=EPOCROOT##Epoc32\data\z\testdata\scripts\Te_WapStackOutOfDiskSpace.script           testdata\scripts\Te_WapStackOutOfDiskSpace.script
+#endif
+
+
+
+//
+// TE_WAPSMS files...
+//
+file=ABI_DIR\DEBUG_DIR\TE_WAPSMS.exe                                                     SYSTEM_BINDIR\TE_WAPSMS.exe
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_setupgsmsms.txt                         testdata\configs\te_setupgsmsms.txt
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_WAPSMS.script                           testdata\scripts\TE_WAPSMS.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_WAPSMS_setup.script                     testdata\scripts\TE_WAPSMS_setup.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\TE_WAPSMS_commdb.cfg                       testdata\configs\TE_WAPSMS_commdb.cfg
+data=EPOCROOT##epoc32\data\z\testdata\configs\TE_WAPSMS.txt                              testdata\configs\TE_WAPSMS.txt
+
+#endif // __TE_SMSSTACK_IBY__

--- a/smsprotocols/smsstack/test/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/smsprotocols/smsstack/test/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,703 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_ACCESSADDRESS_1=0x22
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_ALMOSTMAXIMUMCAPACITY_1=0x1d
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_EXTENSIONINDICATOR_1=0x20
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_MAXIMUMCAPACITY_1=0x1f
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_NUMBEROFVOICEMESSAGES_1=0x26
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_PARSEDACCESSADDRESS_1=0x24
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_PROFILE_1=0x19
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETACCESSADDRESSL_1=0x21
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETALMOSTMAXIMUMCAPACITY_1=0x1c
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETMAXIMUMCAPACITY_1=0x1e
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETNUMBEROFVOICEMESSAGES_1=0x25
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETPARSEDACCESSADDRESSL_1=0x23
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETPROFILE_1=0x18
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETSTORAGE_1=0x1a
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_STORE_1=0x1b
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_TYPE_1=0x17
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_DTOR_1=0x3f
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_GETVOICEMAILDELETIONS_1=0x42
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_NEWL_1=0x40
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_NUMBEROFDELETES_1=0x41
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_DTOR_1=0x39
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_GETVOICEMAILNOTIFICATIONS_1=0x37
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_NEWL_1=0x38
-[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_NUMBEROFVOICEMAILS_1=0x36
-[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_GETINCOMPLETEMESSAGEINFOL_1=0x531
-[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_SETINCOMPLETEMESSAGEINFOL_1=0x532
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_ADDENTRYL_1=0x5bf
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_1=0x5c6
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_2=0x5c7
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CHANGEENTRYL_1=0x5c0
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CLOSE_1=0x5b6
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_1=0x5b4
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_2=0x5b5
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_1=0x5c4
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_2=0x5c5
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DELETEENTRYL_1=0x5bc
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_1=0x5c8
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_2=0x5c9
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_3=0x5ca
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_EXTRASTREAMID_1=0x5c1
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE1_1=0x5be
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE_1=0x5bd
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_1=0x5b2
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_2=0x5b3
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PRIVATEPATH_1=0x5cb
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_1=0x5b9
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_2=0x5ba
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_3=0x5bb
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_1=0x5b7
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_2=0x5b8
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_1=0x5c2
-[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_2=0x5c3
-[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL1_1=0x3
-[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL_1=0x2
-[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTTONATIVEL1_1=0x5
-[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTTONATIVEL_1=0x4
-[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_NEWLC_1=0x1
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_NEWLC_1=0x5a8
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x5a9
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x5aa
-[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_TOTALCONVERTEDLENGTHL_1=0x5ab
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_ADDINFORMATIONELEMENTL_1=0x5a2
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDDATA_1=0x5a5
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDTYPE_1=0x59b
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_DUPLICATEL_1=0x5a7
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENTINDEX_1=0x5a1
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENT_1=0x5a0
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MAXCOMMANDDATALENGTH_1=0x5a4
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGENUMBER_1=0x59d
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGEREFERENCE_1=0x599
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_NUMINFORMATIONELEMENTS_1=0x59f
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_REMOVEINFORMATIONELEMENT_1=0x5a3
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDDATAL_1=0x5a6
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDTYPE_1=0x59c
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGENUMBER_1=0x59e
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGEREFERENCE_1=0x59a
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETSTATUSREPORTREQUEST_1=0x598
-[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_STATUSREPORTREQUEST_1=0x597
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_DUPLICATEL_1=0x586
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_FAILURECAUSE_1=0x584
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_SETFAILURECAUSE_1=0x585
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_DUPLICATEL_1=0x575
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_MOREMESSAGESTOSEND_1=0x56d
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_PROTOCOLIDENTIFIER_1=0x576
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_REPLYPATH_1=0x56f
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SERVICECENTERTIMESTAMP_1=0x573
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETMOREMESSAGESTOSEND_1=0x56e
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETREPLYPATH_1=0x570
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSERVICECENTERTIMESTAMP_1=0x574
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSTATUSREPORTINDICATION_1=0x572
-[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_STATUSREPORTINDICATION_1=0x571
-[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_NEWLC_1=0x5ac
-[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x5ad
-[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x5ae
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_1=0x52c
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_2=0x52d
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_CONTAINSENHANCEDVOICEMAILIEL_1=0x530
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_COPYENHANCEDVOICEMAILIEL_1=0x52f
-[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_REMOVEENHANCEDVOICEMAILIEL_1=0x52e
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_ADDHYPERLINKL_1=0x51a
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_COPYHYPERLINKATINDEXL_1=0x51c
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_NUMBEROFHYPERLINKSL_1=0x51b
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEALLHYPERLINKSL_1=0x51d
-[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEHYPERLINKL_1=0x51e
-[TRACE]TRACE_BORDER[0x84]_CSMSIEOPERATION_ID_1=0x519
-[TRACE]TRACE_BORDER[0x84]_CSMSINFORMATIONELEMENT_DATA1_1=0x8
-[TRACE]TRACE_BORDER[0x84]_CSMSINFORMATIONELEMENT_DATA_1=0x7
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMAILHEADERL_1=0x507
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTL_1=0x4fc
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_1=0x503
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_2=0x504
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_3=0x505
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ALTERNATIVE7BITENCODING_1=0x4f4
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_COPYEMSELEMENTSL_1=0x502
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEDONSIM_1=0x516
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEMESSAGEPDUSL_1=0x4f9
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEPARTIALCOMPLETEMESSAGEPDUSL_1=0x4fa
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DTOR_1=0x4e2
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL1_1=0x4fb
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEMESSAGEPDUSL_1=0x4f8
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEL_1=0x4e6
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x510
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERL_1=0x4e4
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_FORWARDTOCLIENT_1=0x518
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMAILHEADERL_1=0x509
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMSINFORMATIONELEMENTSL_1=0x500
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_1=0x4ec
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_2=0x4ed
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_3=0x4ee
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_4=0x4ef
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_5=0x4f0
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_1=0x511
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_2=0x512
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_1=0x513
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_2=0x514
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEL_1=0x4e5
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x50f
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERL_1=0x4e3
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISEMAILHEADER_1=0x508
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL1_1=0x4f7
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL_1=0x4f6
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MATCHSLOTS_1=0x506
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MAXMESSAGELENGTH_1=0x4ea
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MESSAGELENGTHL_1=0x4eb
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL1_1=0x4e1
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL_1=0x4e0
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_1=0x4e8
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_2=0x4e9
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_OPTIMIZESETTINGSL_1=0x4f3
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTL_1=0x4fd
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTSL_1=0x4fe
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_RESETEMSL_1=0x4ff
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETALTERNATIVE7BITENCODING_1=0x4f5
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETDECODEDONSIM_1=0x515
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETFORWARDTOCLIENT_1=0x517
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUSERDATASETTINGSL_1=0x4f2
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_1=0x50b
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_2=0x50c
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETVERSION_1=0x50e
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_TEXTPRESENT_1=0x4e7
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UPDATESLOTSL_1=0x501
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_USERDATASETTINGS_1=0x4f1
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UTCOFFSET_1=0x50a
-[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_VERSION_1=0x50d
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ALPHABET_1=0x549
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_APPLICATIONPORTADDRESSING_1=0x55b
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_BITS7TO4_1=0x547
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CLASS_1=0x54b
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEPDUINDEX_1=0x559
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEREFERENCE_1=0x555
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DATACODINGSCHEMEPRESENT_1=0x567
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DUPLICATEL_1=0x536
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ENCODEMESSAGEPDUL_1=0x537
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONSTATE_1=0x54f
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONTYPE_1=0x551
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_1=0x540
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_2=0x541
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_3=0x542
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_4=0x543
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL1_1=0x534
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL2_1=0x535
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL_1=0x533
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NUMCONCATENATEDMESSAGEPDUS_1=0x557
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDSERVICECENTERADDRESS_1=0x53a
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDTOFROMADDRESS_1=0x53e
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PIDTYPE_1=0x55d
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PROTOCOLIDENTIFIERPRESENT_1=0x569
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SERVICECENTERADDRESS_1=0x538
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETALPHABET_1=0x54a
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETAPPLICATIONPORTADDRESSINGL_1=0x55c
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETBITS7TO4_1=0x548
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCLASS_1=0x54c
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEPDUINDEX_1=0x55a
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEREFERENCE_1=0x556
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETDATACODINGSCHEMEPRESENT_1=0x568
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONSTATE_1=0x550
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONTYPE_1=0x552
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_1=0x544
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_2=0x545
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_3=0x546
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNUMCONCATENATEDMESSAGEPDUS_1=0x558
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDSERVICECENTERADDRESSL_1=0x53b
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDTOFROMADDRESSL_1=0x53f
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPIDTYPE_1=0x55e
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPROTOCOLIDENTIFIERPRESENT_1=0x56a
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSERVICECENTERADDRESSL_1=0x539
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSHORTMESSAGETYPE_1=0x562
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICEINDICATOR_1=0x560
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICETYPE_1=0x564
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCOMPRESSED_1=0x54e
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCONCATENATEDL_1=0x554
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTOFROMADDRESSL_1=0x53d
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETUSERDATAPRESENT_1=0x566
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SHORTMESSAGETYPE_1=0x561
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICEINDICATOR_1=0x55f
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICETYPE_1=0x563
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCOMPRESSED_1=0x54d
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCONCATENATED_1=0x553
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TOFROMADDRESS_1=0x53c
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA1_1=0x56c
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATAPRESENT_1=0x565
-[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA_1=0x56b
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_1=0x521
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_2=0x522
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_1=0x51f
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_2=0x520
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_CONTAINSREPLYADDRESSIEL_1=0x523
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETPARSEDREPLYADDRESSL_1=0x525
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETREPLYADDRESSL_1=0x524
-[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_REMOVEREPLYADDRESSL_1=0x526
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_ADDSPECIALMESSAGEINDICATIONL_1=0x527
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETCOUNTOFSPECIALMESSAGEINDICATIONSL_1=0x528
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETMESSAGEINDICATIONIEL_1=0x529
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVEALLSPECIALMESSAGEINDICATIONSL_1=0x52b
-[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVESPECIALMESSAGEINDICATIONL_1=0x52a
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DISCHARGETIME_1=0x592
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DUPLICATEL_1=0x596
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MESSAGEREFERENCE_1=0x58e
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MOREMESSAGESTOSEND_1=0x58a
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SERVICECENTERTIMESTAMP_1=0x590
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETDISCHARGETIME_1=0x593
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMESSAGEREFERENCE_1=0x58f
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMOREMESSAGESTOSEND_1=0x58b
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSERVICECENTERTIMESTAMP_1=0x591
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUSREPORTQUALIFIER_1=0x58d
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUS_1=0x595
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUSREPORTQUALIFIER_1=0x58c
-[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUS_1=0x594
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_DUPLICATEL_1=0x589
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_FAILURECAUSE_1=0x587
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_SETFAILURECAUSE_1=0x588
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_DUPLICATEL_1=0x583
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_MESSAGEREFERENCE_1=0x57f
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REJECTDUPLICATES_1=0x577
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REPLYPATH_1=0x57b
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETMESSAGEREFERENCE_1=0x580
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREJECTDUPLICATES_1=0x578
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREPLYPATH_1=0x57c
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETSTATUSREPORTREQUEST_1=0x57e
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIODFORMAT_1=0x57a
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIOD_1=0x582
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_STATUSREPORTREQUEST_1=0x57d
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIODFORMAT_1=0x579
-[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIOD_1=0x581
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ADDINFORMATIONELEMENTL_1=0xc
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_BODY_1=0x10
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_INFORMATIONELEMENTINDEX_1=0xa
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_INFORMATIONELEMENTLASTINDEX_1=0xb
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_INFORMATIONELEMENT_1=0x9
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ISSUPPORTEDL1_1=0x13
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ISSUPPORTEDL2_1=0x14
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ISSUPPORTEDL_1=0x12
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_MAXBODYLENGTHINCHARS_1=0xe
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_MAXBODYLENGTHINCHARS_2=0xf
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_REMOVEINFORMATIONELEMENT_1=0xd
-[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_SETBODYL_1=0x11
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_DTOR_1=0x3d
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_MESSAGEEXTENSIONINDICATION_1=0x3c
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_MESSAGEID_1=0x3b
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_NEWL_1=0x3e
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_SETMESSAGEID_1=0x3a
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_CALLINGLINEIDENTITY_1=0x31
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_DTOR_1=0x34
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_MESSAGEEXTENSIONINDICATION_1=0x2f
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_MESSAGEID_1=0x28
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_MESSAGELENGTH_1=0x2a
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_NEWL_1=0x35
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_PARSEDCALLINGLINEIDENTITY_1=0x33
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_PRIORITYINDICATION_1=0x2e
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_RETENTIONDAYS_1=0x2c
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETCALLINGLINEIDENTITYL_1=0x30
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETMESSAGEID_1=0x27
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETMESSAGELENGTH_1=0x29
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETPARSEDCALLINGLINEIDENTITYL_1=0x32
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETPRIORITYINDICATION_1=0x2d
-[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETRETENTIONDAYS_1=0x2b
-[TRACE]TRACE_BORDER[0x84]_GSMUMAIN_PANIC_1=0x43
-[TRACE]TRACE_BORDER[0x84]_TGSMSMSTELNUMBER_ISINSTANCEOF_1=0x6
-[TRACE]TRACE_BORDER[0x84]_TGSMSMSTYPEOFADDRESS_CONVERTTOETELMM_1=0x15
-[TRACE]TRACE_BORDER[0x84]_TGSMSMSTYPEOFADDRESS_SETFROMETELMM_1=0x16
-[TRACE]TRACE_BORDER[0x84]_TSMSBUFFERREASSEMBLER_REASSEMBLENEXTL_1=0x5af
-[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_SETTEXTCONCATENATED_1=0x5b1
-[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_TEXTCONCATENATED_1=0x5b0
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CONSTRUCTL_1=0x87
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR1_1=0x83
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR2_1=0x84
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR_1=0x82
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DECODEL_1=0x80
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DECODEL_2=0x81
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DOSETPARSEDADDRESSL_1=0x7e
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DTOR_1=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_ENCODEL_1=0x7f
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_NEWBUFFERL_1=0x7d
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_NEWL_1=0x89
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_OPERATOR1_1=0x86
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_OPERATOR_1=0x85
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_CONSTRUCTL_1=0xa8
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_CTOR1_1=0xa5
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_DECODEL_1=0xaa
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_ENCODEL_1=0xa9
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_NEWEXTENSIONL_1=0xa4
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_OPERATOR1_1=0xa7
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_OPERATOR_1=0xa6
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_CONSTRUCTL_1=0x99
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_CTOR1_1=0x96
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_DECODEL_1=0x9b
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_ENCODEL_1=0x9a
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_NEWEXTENSIONL_1=0x95
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_OPERATOR1_1=0x98
-[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_OPERATOR_1=0x97
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_CTOR_1=0x6f4
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_EXTERNALIZEL_1=0x6fe
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_INTERNALIZEL_1=0x6fd
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_MESSAGETYPESUPPORTED_1=0x6f7
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR1_1=0x6f6
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR_1=0x6f5
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_SETVERSION_1=0x6fc
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_1=0x6f8
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_2=0x6f9
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_3=0x6fa
-[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VERSION_1=0x6fb
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORECLOSEOBJECT_1=0x73c
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_1=0x746
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_2=0x747
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_3=0x748
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_1=0x73e
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_2=0x73f
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_3=0x740
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_4=0x741
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_EXTERNALIZEENTRYARRAYL_1=0x745
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_INTERNALIZEENTRYARRAYL_1=0x742
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REINSTATEDELETEDENTRIES_1=0x744
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REMOVEDELETEDENTRIES_1=0x743
-[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REVERT_1=0x73d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_ADDRESS_1=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_DOSETPARSEDADDRESSL_1=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_DUPLICATEL_1=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_NEWBUFFERL_1=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_NEWL_1=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SETADDRESSL_1=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SETPARSEDADDRESSL_1=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SETRAWADDRESSL_1=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SIZEL_1=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_TYPEOFADDRESS_1=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL1_1=0x44
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL_1=0x43
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONSTRUCTL_1=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERSIONPROPERTIESL_1=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_1=0x665
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_2=0x666
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_3=0x667
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_4=0x668
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_1=0x669
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_2=0x66a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_3=0x66b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_4=0x66c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_5=0x66d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_1=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_2=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_GETALTERNATIVEENCODERIDL_1=0x42
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_1=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_2=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_3=0x30
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_4=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_5=0x2f0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_6=0x2f1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_1=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_2=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_3=0x2ee
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_4=0x2ef
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_1=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_2=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_1=0x40
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_2=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CHECKCONVERTEDBUFFERALLOCL_1=0x739
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CONSTRUCTL_1=0x734
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_DOSEGMENTNEXTL_1=0x736
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_ELEMENTSTORETURNFROMCONVERTEDBUFFERL_1=0x73a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_FINDBESTALTERNATIVEENCODINGL_1=0x738
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_MOREL_1=0x737
-[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_RESET_1=0x735
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_ADDINFORMATIONELEMENTL_1=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DATA_1=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DECODEL_1=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DUPLICATEL_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_ENCODEL_1=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_HEADERLENGTH_1=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_HEADERPRESENT_1=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_INFORMATIONELEMENTINDEX_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_INFORMATIONELEMENTPTR_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_INFORMATIONELEMENT_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_NEWL_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_REMOVEINFORMATIONELEMENT_1=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_SETDATAL_1=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_SETHEADERPRESENT_1=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_TOTALHEADERLENGTHINUDLUNITS_1=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_CONSTRUCTL_1=0x730
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DECODEL_1=0x732
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DOSETSTATUSREPORTREQUEST_1=0x733
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_ENCODEL_1=0x731
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_INFORMATIONELEMENTPTR_1=0x72d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_PROTOCOLIDENTIFIER_1=0x72e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_TOFROMADDRESSPTR_1=0x72f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR1_1=0x6ef
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR_1=0x6ee
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR1_1=0x6b3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR_1=0x6b2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_CONSTRUCTL_1=0x71b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DATACODINGSCHEME_1=0x717
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DECODEL_1=0x71d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_ENCODEL_1=0x71c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PARAMETERINDICATOR_1=0x719
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PROTOCOLIDENTIFIER_1=0x718
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_USERDATAPTR_1=0x71a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_CONSTRUCTL_1=0x706
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DATACODINGSCHEME_1=0x70b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DECODEL_1=0x708
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_ENCODEL_1=0x707
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_EXTERNALIZEMESSAGEPDUL_1=0x70a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_INTERNALIZEMESSAGEPDUL_1=0x709
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_TOFROMADDRESSPTR_1=0x70d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_USERDATAPTR_1=0x70c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSEMSBUFFERSEGMENTER_SEGMENTL_1=0x73b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_GETENHANCEDVOICEMAILIEL_1=0x6c9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR1_1=0x6c5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR_1=0x6c4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_1=0x6c6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_2=0x6c7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_3=0x6c8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR1_1=0x6b6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR_1=0x6b5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_1=0x6b7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_2=0x6b8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_3=0x6b9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_CONSTRUCTL_1=0x6b4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_MESSAGETYPESUPPORTED_1=0x6af
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_NEWL_1=0x6ae
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR1_1=0x6b1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR_1=0x6b0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_CONSTRUCTL_1=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_DECODEL_1=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_ENCODEL_1=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_LENGTH_1=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWDATAL_1=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWL1_1=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWL_1=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL1_1=0x6dd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_1=0x6d1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_2=0x6d2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_3=0x6d3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_CONSTRUCTL_1=0x6d0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DELETECONTROLINFORMATIONELEMENT_1=0x6e2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DTOR_1=0x6cf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_EXTERNALIZEL_1=0x6e4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FIND1STINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x6d4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FINDNEXTINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x6d5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_1=0x6df
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_2=0x6e0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_3=0x6e1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_1=0x6d6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_2=0x6d7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_3=0x6d8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_4=0x6d9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_5=0x6da
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_6=0x6db
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETIEOPERATIONL_1=0x6e7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETNONIEOPERATIONL_1=0x6e8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_INTERNALIZEL_1=0x6e5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NEWL_1=0x6ce
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NUMBEROFCONTROLINFORMATIONELEMENTS_1=0x6e3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVECONTROLINFORMATIONELEMENT_1=0x6dc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVENEXTCONTROLINFORMATIONELEMENT_1=0x6de
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_RESETATTRIBUTESL_1=0x6e6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_1=0x6e9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_2=0x6ea
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETNONIEOPERATIONL_1=0x6eb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL1_1=0x682
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0x680
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0x681
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCURRENTPDUTOPDUARRAYL_1=0x67d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0x683
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0x684
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_3=0x685
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_4=0x686
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_5=0x687
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOSINGLESEGMENTMESSAGEL_1=0x688
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSOBJECTDISTRIBUTIONL_1=0x6a8
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSUSERPROMPTL_1=0x6a7
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDIETOUSERDATAL_1=0x67e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDINCOMPLETEMESSAGEINFOL_1=0x699
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDRECEIVEDEMSINFORMATIONELEMENT_1=0x6aa
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_1=0x6a5
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_2=0x6a6
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL1_1=0x676
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL_1=0x675
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_1=0x66f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_2=0x670
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGINSINGLEPDUL_1=0x67c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_1=0x67a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_2=0x67b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CREATECONTROLIEOPERATIONSCLASSESL_1=0x6ad
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEBUFFERL_1=0x697
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEONLYTEXTL_1=0x698
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_1=0x689
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_10=0x692
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_11=0x693
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_2=0x68a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_3=0x68b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_4=0x68c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_5=0x68d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_6=0x68e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_7=0x68f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_8=0x690
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_9=0x691
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_1=0x694
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_2=0x695
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_3=0x696
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_FILLPDUL_1=0x67f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_1=0x69a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_2=0x69b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_3=0x69c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_4=0x69d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_5=0x69e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_6=0x69f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_7=0x6a0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_8=0x6a1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_9=0x6a2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL1_1=0x6ac
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL_1=0x6ab
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL1_1=0x6a4
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL_1=0x6a3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_1=0x671
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_2=0x672
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_1=0x677
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_2=0x678
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_1=0x673
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_2=0x674
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_RESETWORKINGPDUL_1=0x679
-[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_UPDATEUSERPROMPTANDODIELEMENTSSTARTPOSITION_1=0x6a9
-[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR1_1=0x6ed
-[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR_1=0x6ec
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOAPPLICATIONPORTADDRESSING_1=0x704
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETAPPLICATIONPORTADDRESSINGL_1=0x705
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETTEXTCONCATENATEDL_1=0x703
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOTEXTCONCATENATED_1=0x702
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_ENCODEMESSAGEPDUL1_1=0x6ff
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATECONCATENATIONDATAL_1=0x700
-[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATEEMAILHEADERDATAL_1=0x701
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR1_1=0x6bb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR_1=0x6ba
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_1=0x6bc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_2=0x6bd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_3=0x6be
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR1_1=0x6cb
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR_1=0x6ca
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_1=0x6cc
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_2=0x6cd
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR1_1=0x6c3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR_1=0x6c2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_1=0x6bf
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_2=0x6c0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_3=0x6c1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_CONSTRUCTL_1=0x72a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DATACODINGSCHEME_1=0x725
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DECODEL_1=0x72c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_ENCODEL_1=0x72b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PARAMETERINDICATOR_1=0x727
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PROTOCOLIDENTIFIER_1=0x726
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_TOFROMADDRESSPTR_1=0x729
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_USERDATAPTR_1=0x728
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_CONSTRUCTL_1=0x722
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DATACODINGSCHEME_1=0x71e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DECODEL_1=0x724
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_ENCODEL_1=0x723
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PARAMETERINDICATOR_1=0x720
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PROTOCOLIDENTIFIER_1=0x71f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_USERDATAPTR_1=0x721
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_CONSTRUCTL_1=0x712
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DATACODINGSCHEME_1=0x70e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DECODEL_1=0x715
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL1_1=0x714
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL_1=0x713
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_INTERNALIZEMESSAGEPDUL_1=0x716
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_PROTOCOLIDENTIFIER_1=0x70f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_TOFROMADDRESSPTR_1=0x711
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_USERDATAPTR_1=0x710
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR1_1=0x6f1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR_1=0x6f0
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_1=0x6f2
-[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_2=0x6f3
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_ADDEMSINFORMATIONELEMENTL_1=0x6c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_APPENDBODYL_1=0x6f
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_BODYLENGTHINUDLUNITS_1=0x78
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_CONSTRUCTL_1=0x72
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_CONTROLINFORMATIONELEMENTWILLFITL_1=0x64
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_DECODEL1_1=0x71
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_DUPLICATEL_1=0x73
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_EMSINFORMATIONELEMENTWILLFITL_1=0x63
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_ENCODEL_1=0x70
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_HEADERLENGTH_1=0x74
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_HEADERPRESENT_1=0x7a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_INFORMATIONELEMENTINDICESL_1=0x62
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_INFORMATIONELEMENTPTR_1=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_ISBINARYDATA_1=0x7c
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_MAXPACKEDUDUNITSINBODYREMAINING1_1=0x6e
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_MAXPACKEDUDUNITSINBODYREMAINING_1=0x6d
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_NEWBODYL_1=0x79
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_NEWL_1=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_SETHEADERPRESENT_1=0x7b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS1_1=0x77
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS_1=0x75
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS_2=0x76
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_1=0x65
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_2=0x66
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_3=0x67
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_4=0x68
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_5=0x69
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_6=0x6a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_7=0x6b
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_CONSTRUCTL_1=0xa2
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_CTOR1_1=0x9f
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_DECODEL_1=0x9e
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_ENCODEL_1=0x9d
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_NEWBUFFERL_1=0xa3
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_OPERATOR1_1=0xa1
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_OPERATOR_1=0xa0
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_SIZEL_1=0x9c
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_CONSTRUCTL_1=0x93
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_CTOR1_1=0x92
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_CTOR_1=0x8f
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_DECODEL_1=0x8e
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_DOSETPARSEDADDRESSL_1=0x94
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_ENCODEL_1=0x8d
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_NEWBUFFERL_1=0x8a
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_NEWEXTENSIONL_1=0x8b
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_OPERATOR1_1=0x91
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_OPERATOR_1=0x90
-[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_SIZEL_1=0x8c
-[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_CONVERTANDPACKL_1=0x172
-[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_ELEMENTSIZEINBITSL_1=0x175
-[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_PACKEDOCTETSREQUIREDL_1=0x174
-[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_PACKL_1=0x170
-[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_UNPACKANDCONVERTL_1=0x173
-[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_UNPACKL_1=0x171
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_ALPHABET_1=0x18
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_ALPHABET_2=0x19
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_CLASS_1=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONSTATE_1=0x22
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONSTATE_2=0x23
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONTYPE_1=0x26
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONTYPE_2=0x27
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_1=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_2=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_3=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_4=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_5=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETCLASS_1=0x20
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETCLASS_2=0x21
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONSTATE_1=0x24
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONSTATE_2=0x25
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONTYPE_1=0x28
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONTYPE_2=0x29
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETTEXTCOMPRESSED_1=0x17
-[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_TEXTCOMPRESSED_1=0x16
-[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_GETCATEGORYDEFINITION_1=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_GETCATEGORYDEFINITION_2=0x5f
-[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_TRANSLATECATEGORYTOINDEX_1=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_TRANSLATECATEGORYTOINDEX_2=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETSHORTMESSAGEALPROTOCOL_1=0x13
-[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETSHORTMESSAGETYPE_1=0x15
-[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETTELEMATICDEVICEINDICATOR_1=0x10
-[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETTELEMATICDEVICETYPE_1=0x11
-[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SHORTMESSAGEALPROTOCOL_1=0x12
-[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SHORTMESSAGETYPE_1=0x14
-[TRACE]TRACE_INTERNALS[0x88]_TSMSSERVICECENTERTIMESTAMP_DECODEL_1=0x50
-[TRACE]TRACE_INTERNALS[0x88]_TSMSSERVICECENTERTIMESTAMP_ENCODEL_1=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_DECODEL_1=0x54
-[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_ENCODEL1_1=0x53
-[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_ENCODEL_1=0x52
-[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_TIME_1=0x51

--- a/smsprotocols/smsstack/wapprot/Group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -44,4 +44,58 @@
 
 ../Group/wapprot.mmp
 
-#include "../test/group/bld.inf"
\ No newline at end of file
+PRJ_TESTEXPORTS
+
+//
+// Test files used by all WAP tests...
+//
+../test/configfiles/tone1.rtp                           z:/testdata/configs/tone1.rtp
+../test/configfiles/tone2.rtp                           z:/testdata/configs/tone2.rtp
+../test/configfiles/tone3.rtp                           z:/testdata/configs/tone3.rtp
+../test/configfiles/vcard1.vcf                          z:/testdata/configs/vcard1.vcf
+../test/configfiles/vcard2.vcf                          z:/testdata/configs/vcard2.vcf
+../test/configfiles/vcard3.vcf                          z:/testdata/configs/vcard3.vcf
+
+//
+// TE_WAPDGRM test files...
+//
+../test/TE_WAPDGRM/TE_wapdgrm.script                    z:/testdata/scripts/te_wapdgrm.script
+
+//
+// TE_WAPHDR test files...
+//
+../test/configfiles/te_waphdr.txt                       z:/testdata/configs/te_waphdr.txt
+../test/TE_WAPTHDR/TE_wapthdr.script                    z:/testdata/scripts/te_wapthdr.script
+../test/TE_WAPTHDR/TE_wapthdr_setup.script              z:/testdata/scripts/te_wapthdr_setup.script
+
+//
+// TE_WAPSMS test files...
+//
+../test/TE_WAPSMS/TE_wapsms.script                      z:/testdata/scripts/te_wapsms.script
+../test/TE_WAPSMS/TE_wapsms_setup.script                z:/testdata/scripts/te_wapsms_setup.script
+../test/TE_WAPSMS/TE_wapsms.txt                         z:/testdata/configs/te_wapsms.txt
+../test/TE_WAPSMS/te_setupgsmsms.txt                    z:/testdata/configs/te_setupgsmsms.txt
+../test/TE_WAPSMS/te_wapsms_commdb.cfg                  z:/testdata/configs/te_wapsms_commdb.cfg
+
+//
+// TE_WAPPROT test files...
+//
+../test/Te_wapprot/Te_WapProt.script                    z:/testdata/scripts/te_wapprot.script
+../test/Te_wapprot/Config.txt                           z:/testdata/configs/wapprotsuite/config.txt
+../test/Te_wapprot/WapProtSuite.cfg                     z:/testdata/configs/wapprotsuite/wapprotsuite.cfg
+../test/Te_wapprot/WapProtSuiteMM.cfg                   z:/testdata/configs/wapprotsuite/wapprotsuitemm.cfg
+../test/Te_wapprot/StatusReportsRequested.cfg           z:/testdata/configs/wapprotsuite/statusreportsrequested.cfg
+../test/Te_wapprot/WapProtSuite.ini                     z:/testdata/configs/wapprotsuite/wapprotsuite.ini
+../test/Te_wapprot/WapStatusReports.ini                 z:/testdata/configs/wapprotsuite/wapstatusreports.ini
+../test/Te_wapprot/WAPStackOutOfDiskSpace.ini           z:/testdata/configs/wapprotsuite/wapstackoutofdiskspace.ini
+../test/Te_wapprot/Te_WapStackOutOfDiskSpace.script     z:/testdata/scripts/te_wapstackoutofdiskspace.script
+../test/Te_wapprot/Te_WapStackOutOfDiskSpace_ARM_UREL.script     z:/testdata/scripts/te_wapstackoutofdiskspace_arm_urel.script
+
+
+
+PRJ_TESTMMPFILES
+
+../test/TE_WAPDGRM/TE_wapdgrm.mmp
+../test/TE_WAPTHDR/TE_wapthdr.mmp
+../test/TE_WAPSMS/TE_wapsms.mmp
+../test/Te_wapprot/TE_WapProt.mmp

--- a/smsprotocols/smsstack/wapprot/Group/wapport_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\TE_WAPDGRM\TE_wapdgrm.script"-"c:\testdata\scripts\TE_wapdgrm.script"
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\TE_WAPTHDR\TE_wapthdr.script"-"c:\testdata\scripts\TE_wapthdr.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\TE_WAPTHDR\TE_wapthdr_setup.script"-"c:\testdata\scripts\TE_wapthdr_setup.script"
-
-"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\Te_wapprot\Te_WapProt.script"-"c:\testdata\scripts\Te_WapProt.script"
-"\sf\os\cellularsrv\smsprotocols\smsstack\wapprot\Test\Te_wapprot\Te_WapStackOutOfDiskSpace_ARM_UREL.script"-"c:\testdata\scripts\Te_WapStackOutOfDiskSpace_ARM_UREL.script"
-
-

--- a/smsprotocols/smsstack/wapprot/Group/wapprot.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Group/wapprot.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -44,7 +44,6 @@
 USERINCLUDE   ../../gsmu/inc
 USERINCLUDE   ../../smsprot/Inc
 USERINCLUDE   ../../smsu/inc
-USERINCLUDE   ../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
@@ -54,6 +53,8 @@
 LIBRARY		commsdat.lib
 
 
+DEBUGLIBRARY    comsdbgutil.lib
+
 //#if defined(WINS)
 // libraries needed by CCover
 //LIBRARY       covrt.obj covrt-nt-entryuser.obj covrt-nt-link.obj

--- a/smsprotocols/smsstack/wapprot/Src/wapdgrm.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/wapdgrm.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "wapdgrmTraces.h"
-#endif
-
 #include "gsmubuf.h"
 #include "gsmuset.h"
 #include "Gsmuelem.h"
@@ -34,7 +28,7 @@
 //
 CWapDatagram* CWapDatagram::NewL(const CSmsMessage& aSms)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_1, "CWapDatagram::NewL(): aSms=0x%08x", (TInt) &aSms);
+    LOGWAPPROT2("CWapDatagram::NewL(): aSms=0x%08x", (TInt) &aSms);
 
     CWapDatagram* datagram = new (ELeave)CWapDatagram();
 
@@ -42,38 +36,38 @@
     datagram->ConstructL(aSms);
     CleanupStack::Pop();
 
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_2, "CWapDatagram::NewL(): iFromPort: %d", datagram->iFromPort);
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_3, "CWapDatagram::NewL(): iToPort: %d", datagram->iToPort);
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_4, "CWapDatagram::NewL(): iReference: %d", datagram->iReference);
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_5, "CWapDatagram::NewL(): iTotalSegments: %d", datagram->iTotalSegments);
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_6, "CWapDatagram::NewL(): iSegmentNumber: %d", datagram->iSegmentNumber);
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_7, "CWapDatagram::NewL(): iIsComplete: %d", datagram->iIsComplete);
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_8, "CWapDatagram::NewL(): iReference: %d", datagram->iReference);
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_9, "CWapDatagram::NewL(): iIsTextHeader: %d", datagram->iIsTextHeader);
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_10, "CWapDatagram::NewL(): iLogServerId: %d", datagram->iLogServerId);
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_11, "CWapDatagram::NewL(): i16BitPorts: %d", datagram->i16BitPorts);
+    LOGWAPPROT2("CWapDatagram::NewL(): iFromPort: %d", datagram->iFromPort);
+    LOGWAPPROT2("CWapDatagram::NewL(): iToPort: %d", datagram->iToPort);
+    LOGWAPPROT2("CWapDatagram::NewL(): iReference: %d", datagram->iReference);
+    LOGWAPPROT2("CWapDatagram::NewL(): iTotalSegments: %d", datagram->iTotalSegments);
+    LOGWAPPROT2("CWapDatagram::NewL(): iSegmentNumber: %d", datagram->iSegmentNumber);
+    LOGWAPPROT2("CWapDatagram::NewL(): iIsComplete: %d", datagram->iIsComplete);
+    LOGWAPPROT2("CWapDatagram::NewL(): iReference: %d", datagram->iReference);
+    LOGWAPPROT2("CWapDatagram::NewL(): iIsTextHeader: %d", datagram->iIsTextHeader);
+    LOGWAPPROT2("CWapDatagram::NewL(): iLogServerId: %d", datagram->iLogServerId);
+    LOGWAPPROT2("CWapDatagram::NewL(): i16BitPorts: %d", datagram->i16BitPorts);
 
     // assert destination port
 	if (datagram->i16BitPorts)
 		{
 		if (datagram->iToPort>=0  &&  datagram->iToPort<=65535)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_12, "iToPort OK");
+			LOGWAPPROT1("iToPort OK");
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_13, "iToPort FAILED");
+			LOGWAPPROT1("iToPort FAILED");
 			}
 		}
     else
 		{
         if (datagram->iToPort>=0  &&  datagram->iToPort<=255)
 			{
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_14, "iToPort OK");
+		    LOGWAPPROT1("iToPort OK");
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_15, "iToPort FAILED");
+			LOGWAPPROT1("iToPort FAILED");
 			}
 		}
 
@@ -81,22 +75,22 @@
 		{
 		if (datagram->iFromPort>=0  &&  datagram->iFromPort<=65535)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_16, "iFromPort OK");
+			LOGWAPPROT1("iFromPort OK");
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_17, "iFromPort FAILED");
+			LOGWAPPROT1("iFromPort FAILED");
 			}
 		}
     else
 		{
         if (datagram->iFromPort>=0  &&  datagram->iFromPort<=255)
 			{
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_18, "iFromPort OK");
+		    LOGWAPPROT1("iFromPort OK");
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_19, "iFromPort FAILED");
+			LOGWAPPROT1("iFromPort FAILED");
 			}
 		}
 
@@ -109,7 +103,7 @@
 //
 CWapDatagram* CWapDatagram::NewL(const TDesC8& aSendBuffer)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL1_1, "CWapDatagram::NewL(): aSendBuffer=0x%08x", (TInt) &aSendBuffer);
+    LOGWAPPROT2("CWapDatagram::NewL(): aSendBuffer=0x%08x", (TInt) &aSendBuffer);
 
     CWapDatagram* datagram = new (ELeave)CWapDatagram();
 
@@ -123,7 +117,7 @@
 
 CWapDatagram::~CWapDatagram()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_DTOR_1, "CWapDatagram::~CWapDatagram()");
+    LOGWAPPROT1("CWapDatagram::~CWapDatagram()");
 
 	delete iRecvbuf;
     delete iBuffer;
@@ -137,7 +131,7 @@
 //
 void CWapDatagram::EncodeConcatenatedMessagesL(RFs& aFs, CArrayPtr<CSmsMessage>& aSmsMessageArray)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1, "CWapDatagram::EncodeConcatenatedMessagesL(): %d messages", aSmsMessageArray.Count());
+    LOGWAPPROT2("CWapDatagram::EncodeConcatenatedMessagesL(): %d messages", aSmsMessageArray.Count());
 
     // Couple of checkings makes sense
     __ASSERT_DEBUG(iToPort >=0 && iToAddress.Length()>=0
@@ -201,7 +195,7 @@
 
 void CWapDatagram::DecodeConcatenatedMessagesL(CArrayPtr<TSegmentData>& aSmsMessageArray)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1, "CWapDatagram::DecodeConcatenatedMessagesL()");
+    LOGWAPPROT1("CWapDatagram::DecodeConcatenatedMessagesL()");
 
     // The TSegmentData elements are in the random order in the array
     TInt Count = aSmsMessageArray.Count();
@@ -367,7 +361,7 @@
 //
 void CWapDatagram::Construct(const TDesC8& aSendBuffer)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_CONSTRUCT_1, "CWapDatagram::Construct()");
+    LOGWAPPROT1("CWapDatagram::Construct()");
 	
 	// Set version number to 1, as we have had to make 
 	// changes to CWapDatagram for CR0929
@@ -385,7 +379,7 @@
 //
 void CWapDatagram::ConstructL(const CSmsMessage& aSms)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_CONSTRUCTL_1, "CWapDatagram::ConstructL()");
+    LOGWAPPROT1("CWapDatagram::ConstructL()");
 
 	// Set version number to 1, as we have had to make 
 	// changes to CWapDatagram for CR0929
@@ -452,7 +446,7 @@
 //
 void CWapDatagram::GetDatagramSettingsL()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1, "CWapDatagram::GetDatagramSettingsL()");
+    LOGWAPPROT1("CWapDatagram::GetDatagramSettingsL()");
 
 	/* The WAP stack always receives 8 bit WAP datagrams from the SMS Stack as a single CSmsMessage.
 	This is because 8 bit WAP messages which cannot be encoded into a single PDU are sent in a segmented SMS
@@ -497,7 +491,7 @@
 //
 void CWapDatagram::GetDatagramSettings(const CSmsMessage& aSms)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_GETDATAGRAMSETTINGS_1, "CWapDatagram::GetDatagramSettings()");
+    LOGWAPPROT1("CWapDatagram::GetDatagramSettings()");
 
     const CSmsPDU& Pdu = aSms.SmsPDU();
 
@@ -530,7 +524,7 @@
 //
 void CWapDatagram::ConvertL(const TDesC8& aNarrowChars,CSmsBufferBase& aSmsBuffer) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_CONVERTL_1, "CWapDatagram::ConvertL()");
+    LOGWAPPROT1("CWapDatagram::ConvertL()");
 
 	// Convert the data in segments of specified max size
 	const TInt KMaxSegmentSize=CSmsBufferBase::EMaxBufLength;
@@ -561,7 +555,7 @@
 //
 void CWapDatagram::ConvertL(const CSmsBufferBase& aSmsBuffer,HBufC8** aNarrowChars) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_CONVERTL1_1, "CWapDatagram::ConvertL()");
+    LOGWAPPROT1("CWapDatagram::ConvertL()");
 
 	// Convert the data in segments of specified max size
 	const TInt KMaxSegmentSize=CSmsBufferBase::EMaxBufLength;
@@ -606,7 +600,7 @@
 
 void CWapDatagram::SetSmsMessageSettingsL(CSmsMessage& aSmsMessage, TBool aSetPorts)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1, "CWapDatagram::SetSmsMessageSettingsL()");
+    LOGWAPPROT1("CWapDatagram::SetSmsMessageSettingsL()");
 
     CSmsPDU& Pdu = aSmsMessage.SmsPDU();
 
@@ -677,7 +671,7 @@
 //
 TInt CWapDatagram::LinkOffset()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_LINKOFFSET_1, "CWapDatagram::LinkOffset()");
+	LOGWAPPROT1("CWapDatagram::LinkOffset()");
 
 
 	return _FOFF(CWapDatagram,iLink);
@@ -686,7 +680,7 @@
 
 TBool CWapDatagram::SetUTCOffset(const TTimeIntervalSeconds& aUTCOffset)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_SETUTCOFFSET_1, "CWapDatagram::SetUTCOffset()");
+    LOGWAPPROT1("CWapDatagram::SetUTCOffset()");
 
     TBool rc = ETrue;
     TInt utcOffset = aUTCOffset.Int();
@@ -698,7 +692,7 @@
        }
     else
        {
-       OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_SETUTCOFFSET_2, "CWapDatagram:SetUTCOffset offset [out of range] = %d",utcOffset);
+       LOGWAPPROT2("CWapDatagram:SetUTCOffset offset [out of range] = %d",utcOffset);
        rc = EFalse;
        }

--- a/smsprotocols/smsstack/wapprot/Src/wapmain.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/wapmain.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -12,12 +12,6 @@
 //
 // Description:
 //
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "wapmainTraces.h"
-#endif
-
 #include "wapmain.h"
 #include <e32std.h>
 #include "smsstacklog.h"
@@ -26,7 +20,7 @@
      {
      // Ignore in code coverag - panic method
      BULLSEYE_OFF
-     OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, WAPMAIN_PANIC_1, "WAPUPANIC %d", aPanic);
+     LOGWAPPROT2("WAPUPANIC %d", aPanic);
      _LIT(KWapProtPanic, "WAPPROT");
      User::Panic(KWapProtPanic, aPanic);
      BULLSEYE_RESTORE

--- a/smsprotocols/smsstack/wapprot/Src/wappstor.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/wappstor.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "wappstorTraces.h"
-#endif
-
 #include "wappstor.h"
 #include "ws_main.h"
 #include "smsstackutils.h"
@@ -32,7 +26,7 @@
 
 CWapReassemblyStore* CWapReassemblyStore::NewL(RFs& aFs)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_NEWL_1, "CWapReassemblyStore::NewL()");
+    LOGWAPPROT1("CWapReassemblyStore::NewL()");
 
     CWapReassemblyStore* reassembly=new (ELeave)CWapReassemblyStore(aFs);
    	CleanupStack::PushL(reassembly);
@@ -50,7 +44,7 @@
 
 TBool CWapReassemblyStore::AddMessageL( TInt& aIndex, const CWapDatagram& aDatagram)                                                
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_ADDMESSAGEL_1, "CWapReassemblyStore::AddMessageL()");
+    LOGWAPPROT1("CWapReassemblyStore::AddMessageL()");
 
     CArrayPtrFlat<CWapDatagram::TSegmentData>* segmentArray = new
         (ELeave) CArrayPtrFlat<CWapDatagram::TSegmentData> (8);
@@ -204,7 +198,7 @@
 void CWapReassemblyStore::GetDatagramL( TInt            aIndex,
                                                 CWapDatagram&   aDatagram)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_GETDATAGRAML_1, "CWapReassemblyStore::GetDatagramL()");
+    LOGWAPPROT1("CWapReassemblyStore::GetDatagramL()");
 
     CArrayPtrFlat<CWapDatagram::TSegmentData>* segmentArray = new
         (ELeave) CArrayPtrFlat<CWapDatagram::TSegmentData> (8);
@@ -237,7 +231,7 @@
 
 TBool CWapReassemblyStore::FindAndDeleteDatagramL( CWapDatagram& aDatagram)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1, "CWapReassemblyStore::FindAndDeleteDatagramL()");
+	LOGWAPPROT1("CWapReassemblyStore::FindAndDeleteDatagramL()");
 
 	TInt index;
 	TBool isFound = EFalse;
@@ -269,7 +263,7 @@
 
 void CWapReassemblyStore::ConstructL()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_CONSTRUCTL_1, "CWapReassemblyStore::ConstructL()");
+    LOGWAPPROT1("CWapReassemblyStore::ConstructL()");
 
     //get full path of reassembly store
     PrivatePath(iFullPathBuf);
@@ -292,7 +286,7 @@
                             CWapDatagram&               aDatagram,
                             CArrayPtr<CWapDatagram::TSegmentData>&  aSegmentArray)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1, "CWapReassemblyStore::InternalizeEntryL Start");
+    LOGWAPPROT1("CWapReassemblyStore::InternalizeEntryL Start");
 
 	BeginTransactionLC();
     RStoreReadStream ReadStream;
@@ -324,7 +318,7 @@
     // Closes the ReadStream
     CleanupStack::PopAndDestroy();
 	CommitTransactionL();
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2, "CWapReassemblyStore::InternalizeEntryL End");
+    LOGWAPPROT1("CWapReassemblyStore::InternalizeEntryL End");
     } // CWapReassemblyStore::InternalizeEntryL
 
 
@@ -341,7 +335,7 @@
                             const CWapDatagram& aDatagram,
                             const CArrayPtr<CWapDatagram::TSegmentData>& aSegmentArray)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1, "CWapReassemblyStore::ExternalizeEntryL Start");
+    LOGWAPPROT1("CWapReassemblyStore::ExternalizeEntryL Start");
     
     TInt32 Count = aSegmentArray.Count();
     RStoreWriteStream WriteStream;
@@ -376,7 +370,7 @@
                                         const CWapDatagram& aDatagram,
                                         TInt                aNumDatagrams)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_POPULATEENTRY_1, "CWapReassemblyStore::PopulateEntry()");
+    LOGWAPPROT1("CWapReassemblyStore::PopulateEntry()");
 
     TInt ToPort = 0;
     TInt FromPort = 0;
@@ -408,7 +402,7 @@
 void CWapReassemblyStore::CreateEntryL(const CWapDatagram&                 aDatagram,
                                        const CArrayPtr<CWapDatagram::TSegmentData>& aSegmentArray)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_CREATEENTRYL_1, "CWapReassemblyStore::CreateEntryL");
+	LOGWAPPROT1("CWapReassemblyStore::CreateEntryL");
 
     TWapReassemblyEntry Entry;
     TStreamId WriteStream = KNullStreamId;
@@ -433,7 +427,7 @@
  */
 void CWapReassemblyStore::OpenStoreL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_OPENSTOREL_1, "CWapReassemblyStore::OpenStoreL()");
+	LOGWAPPROT1("CWapReassemblyStore::OpenStoreL()");
 
 	OpenL(iFullPathBuf,KWapReassemblyStoreUid);
 	} // CWapReassemblyStore::OpenStoreL

--- a/smsprotocols/smsstack/wapprot/Src/wapthdr.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/wapthdr.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -20,12 +20,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "wapthdrTraces.h"
-#endif
-
 #include <e32std.h>
 #include "wapthdr.h"
 #include "ws_main.h"
@@ -44,21 +38,21 @@
 {
 // Long header ("//SCKL") indices
 // destination port (, other header)
-    { 1,{ 6, 10, 0, 0, 0, 0} },
+	{ 1,{ 6, 10, 0, 0, 0, 0} },
 // destination port, source port (, other header)
-    { 2,{ 6, 10, 14, 0, 0, 0} },
+	{ 2,{ 6, 10, 14, 0, 0, 0} },
 // destination port, source port,
 // reference, total segments, current segment(, other header)
-    { 5,{ 6, 10, 14, 16, 18, 20}},
+	{ 5,{ 6, 10, 14, 16, 18, 20}},
 
 // Short header ("//SCK") indices
 // destination port (, other header)
-    { 1, { 5, 7, 0, 0, 0, 0}},
+	{ 1, { 5, 7, 0, 0, 0, 0}},
 // destination port, source port (, other header)
-    { 2, { 5, 7, 9, 0, 0, 0}},
+	{ 2, { 5, 7, 9, 0, 0, 0}},
 // destination port, source port,
 // reference, total segments, current segment(, other header)
-    { 5,{ 5, 7, 9, 11, 13, 15}},
+	{ 5,{ 5, 7, 9, 11, 13, 15}},
 };
 
 
@@ -69,22 +63,22 @@
  *  @note simply use KNullDesC8, if you are going to encode.
  */
 TWapTextMessage::TWapTextMessage(const TDesC8& aWapMessage)
-    :iIsWapTextMessage(EFalse)
-    ,iWAPMessage(aWapMessage)
-    ,iIs16Bit(EFalse)
-    ,iDestinationPort(-1)
-    ,iSourcePort(-1)
-    ,iReference(0)
-    ,iTotalSegments(0)
-    ,iSegmentNumber(0)
-    ,iOtherHeader(0)
-    ,iOtherHeaderLength(0)
-    ,iData(0)
-    ,iDataLength(0)
-    ,iRefOtherHeader(KNullDesC8)
-    ,iRefData(KNullDesC8)
-    {
-    } // TWapTextMessage::TWapTextMessage
+	:iIsWapTextMessage(EFalse)
+	,iWAPMessage(aWapMessage)
+	,iIs16Bit(EFalse)
+	,iDestinationPort(-1)
+	,iSourcePort(-1)
+	,iReference(0)
+	,iTotalSegments(0)
+	,iSegmentNumber(0)
+	,iOtherHeader(0)
+	,iOtherHeaderLength(0)
+	,iData(0)
+	,iDataLength(0)
+	,iRefOtherHeader(KNullDesC8)
+	,iRefData(KNullDesC8)
+	{
+	} // TWapTextMessage::TWapTextMessage
 
 
 /**
@@ -93,111 +87,111 @@
  *  what will be the array element type ?
  */
 void TWapTextMessage::EncodeSegmentsL(CArrayPtr<HBufC8>& aSegmentArray)
-    {
-    TBuf8<KMaxSmsChars>  header;        // buffer for a modifiable header
-    TInt        headerLength = 0;
-    TInt        segmentNumberIndex = 0; // index of segment number field in the header
-    TBuf8<2>    hexSegmentNumber;
-    TInt        dataSegmented = 0;
+	{
+	TBuf8<KMaxSmsChars>  header;        // buffer for a modifiable header
+	TInt        headerLength = 0;
+	TInt        segmentNumberIndex = 0; // index of segment number field in the header
+	TBuf8<2>    hexSegmentNumber;
+	TInt        dataSegmented = 0;
 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_ENCODESEGMENTSL_1, "TWapTextMessage::EncodeSegmentsL()");
+	LOGWAPPROT1("TWapTextMessage::EncodeSegmentsL()");
 
-    iSegmentNumber = 0;
-    do
-        {
-        //
-        // Create the segment and add it to the array...
-        //
-        HBufC8*  segment = HBufC8::NewL(KMaxSmsChars); // 160 characters
-        CleanupStack::PushL(segment);
-        TPtr8  ptr(segment->Des());
-        aSegmentArray.AppendL(segment);
-        CleanupStack::Pop(); // segment
+	iSegmentNumber = 0;
+	do
+		{
+		//
+		// Create the segment and add it to the array...
+		//
+		HBufC8*  segment = HBufC8::NewL(KMaxSmsChars); // 160 characters
+		CleanupStack::PushL(segment);
+		TPtr8  ptr(segment->Des());
+		aSegmentArray.AppendL(segment);
+		CleanupStack::Pop(); // segment
 
-        //
-        // Calculate length of header and copy it...
-        //
-        if (iSegmentNumber==0)
-            {
-            headerLength = CreateHeader(header, segmentNumberIndex);
-            }
+		//
+		// Calculate length of header and copy it...
+		//
+		if (iSegmentNumber==0)
+			{
+			headerLength = CreateHeader(header, segmentNumberIndex);
+			}
 
-        ptr.Copy(header);
-        if (iTotalSegments>255)
-            {
-            User::Leave(KErrOverflow);
-            }
+		ptr.Copy(header);
+		if (iTotalSegments>255)
+			{
+			User::Leave(KErrOverflow);
+			}
 
-        //
-        // Set segment number...
-        //
-        if (segmentNumberIndex != 0)
-            {
-            hexSegmentNumber.NumFixedWidthUC(iSegmentNumber+1, EHex, 2); // two bytes wide
-            ptr.Insert(segmentNumberIndex, hexSegmentNumber);
-            }
+		//
+		// Set segment number...
+		//
+		if (segmentNumberIndex != 0)
+			{
+			hexSegmentNumber.NumFixedWidthUC(iSegmentNumber+1, EHex, 2); // two bytes wide
+			ptr.Insert(segmentNumberIndex, hexSegmentNumber);
+			}
 
-        //
-        // Count any escaped characters we can be sure that the converted data
-        // size fits inside the remaining length (e.g. so that non-7bit characters
-        // when converted by the SMS Stack will still fit).
-        //
-        TInt  segmentSize = iRefData.Length() - dataSegmented;
+		//
+		// Count any escaped characters we can be sure that the converted data
+		// size fits inside the remaining length (e.g. so that non-7bit characters
+		// when converted by the SMS Stack will still fit).
+		//
+		TInt  segmentSize = iRefData.Length() - dataSegmented;
 
-        if (segmentSize > KMaxSmsChars - headerLength)
-            {
-            segmentSize = KMaxSmsChars - headerLength;
-            }
+		if (segmentSize > KMaxSmsChars - headerLength)
+			{
+			segmentSize = KMaxSmsChars - headerLength;
+			}
 
-        while (segmentSize > 1)
-            {
-            TPtrC8  segmentData(iRefData.Mid(dataSegmented, segmentSize));
-            TInt  non7bitCharEscapes = 0;
-            
-            //
-            // Count all non-7bit characters that will be escaped (many non-7bit
-            // characters are not escaped, but converted to "?"). The ones
-            // that are known to be escaped are list below:
-            //
-            //    12  [Form Feed].
-            //    91  "["
-            //    92  "\"
-            //    93  "]"
-            //    94  "^"
-            //   123  "{"
-            //   124  "|"
-            //   125  "}"
-            //   126  "~"
-            //
-            for (TInt  ch = 0;  ch < segmentSize;  ch++)
-                {
-                if (segmentData[ch] == 12  ||
-                    (segmentData[ch] >= 91  &&  segmentData[ch] <= 94)  ||
-                    (segmentData[ch] >= 123  &&  segmentData[ch] <= 126))
-                    {
-                    non7bitCharEscapes++;
-                    }
-                }
-            
-            //
-            // Can it fit? If so store it, otherwise reduce the size...
-            //
-            if (segmentData.Length() + non7bitCharEscapes <= KMaxSmsChars - headerLength)
-                {
-                ptr.Append(segmentData);
-                break;
-                }
-            
-            segmentSize--;
-            }
-        
-            dataSegmented += segmentSize;
-            iSegmentNumber++;
-        }
-    while (dataSegmented < iRefData.Length());
+		while (segmentSize > 1)
+			{
+			TPtrC8  segmentData(iRefData.Mid(dataSegmented, segmentSize));
+			TInt  non7bitCharEscapes = 0;
+			
+			//
+			// Count all non-7bit characters that will be escaped (many non-7bit
+			// characters are not escaped, but converted to "?"). The ones
+			// that are known to be escaped are list below:
+			//
+			//	  12  [Form Feed].
+			//	  91  "["
+			//	  92  "\"
+			//	  93  "]"
+			//	  94  "^"
+			//	 123  "{"
+			//	 124  "|"
+			//	 125  "}"
+			//	 126  "~"
+			//
+			for (TInt  ch = 0;  ch < segmentSize;  ch++)
+				{
+				if (segmentData[ch] == 12  ||
+					(segmentData[ch] >= 91  &&  segmentData[ch] <= 94)  ||
+					(segmentData[ch] >= 123  &&  segmentData[ch] <= 126))
+					{
+					non7bitCharEscapes++;
+					}
+				}
+			
+			//
+			// Can it fit? If so store it, otherwise reduce the size...
+			//
+			if (segmentData.Length() + non7bitCharEscapes <= KMaxSmsChars - headerLength)
+				{
+				ptr.Append(segmentData);
+				break;
+				}
+			
+			segmentSize--;
+			}
+		
+			dataSegmented += segmentSize;
+			iSegmentNumber++;
+		}
+	while (dataSegmented < iRefData.Length());
 
-    __ASSERT_DEBUG(iTotalSegments == aSegmentArray.Count(), Panic(KPanicEncodingError));
-    } // TWapTextMessage::EncodeSegmentsL
+	__ASSERT_DEBUG(iTotalSegments == aSegmentArray.Count(), Panic(KPanicEncodingError));
+	} // TWapTextMessage::EncodeSegmentsL
 
 
 /**
@@ -205,66 +199,66 @@
  *  WAP text message header set by SetWapTextMessage.
  */
 TBool TWapTextMessage::Parse()
-    {
-    TInt waplength = iWAPMessage.Length();
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_PARSE_1, "TWapTextMessage::Parse [%d bytes]", waplength);
-    if(waplength != 0)
-        {
-        // check whether long or short header
-        TInt iBaseIndex = -1;
+	{
+	TInt waplength = iWAPMessage.Length();
+	LOGWAPPROT2("TWapTextMessage::Parse [%d bytes]", waplength);
+	if(waplength != 0)
+		{
+		// check whether long or short header
+		TInt iBaseIndex = -1;
 
-        // minimum length is 8 "//SCKxx "
-        if(waplength >= 8)
-            {
-            TPtrC8 HeaderIdPart(iWAPMessage.Left(6));
-            if(!HeaderIdPart.Compare(KSCKHeaderLong))
-                {
-                iBaseIndex = 0;
-                iIs16Bit = ETrue; // Yes, the ports are 16 bit wide
-                }
-            else
-                HeaderIdPart.Set(iWAPMessage.Left(5));
+		// minimum length is 8 "//SCKxx "
+		if(waplength >= 8)
+			{
+			TPtrC8 HeaderIdPart(iWAPMessage.Left(6));
+			if(!HeaderIdPart.Compare(KSCKHeaderLong))
+				{
+				iBaseIndex = 0;
+				iIs16Bit = ETrue; // Yes, the ports are 16 bit wide
+				}
+			else
+				HeaderIdPart.Set(iWAPMessage.Left(5));
 
-            if(iBaseIndex == (-1) && !HeaderIdPart.Compare(KSCKHeaderShort) )
-                iBaseIndex = 3;
-            // else  no match
-            }
+			if(iBaseIndex == (-1) && !HeaderIdPart.Compare(KSCKHeaderShort) )
+				iBaseIndex = 3;
+			// else  no match
+			}
 
-        if(iBaseIndex >= 0)
-            {
-            // check which of the TIndexInfos match
-            for(TInt i=iBaseIndex; i<iBaseIndex+3; i++)
-                {
-                // Get length (index) of text header variant
-                TInt lastIndex = KElemIndexes[i].iIndexes[KElemIndexes[i].iLastIndex];
-                if (iWAPMessage.Length() <= lastIndex)
-                    {
-                    // no hope about match, because other variants are longer
-                    iIsWapTextMessage = EFalse;
-                    break;
-                    }
+		if(iBaseIndex >= 0)
+			{
+			// check which of the TIndexInfos match
+			for(TInt i=iBaseIndex; i<iBaseIndex+3; i++)
+				{
+				// Get length (index) of text header variant
+				TInt lastIndex = KElemIndexes[i].iIndexes[KElemIndexes[i].iLastIndex];
+				if (iWAPMessage.Length() <= lastIndex)
+					{
+					// no hope about match, because other variants are longer
+					iIsWapTextMessage = EFalse;
+					break;
+					}
 
-                TInt LastChar = iWAPMessage[lastIndex];
-                if (LastChar == '/' || LastChar == ' ' || LastChar == '\n')
-                    {
-                    // reinitialize, because following maybe absent
-                    iTotalSegments = 1;
-                    iSegmentNumber = 1;
-                    iIsWapTextMessage = ParseWapTextHeader(KElemIndexes[i]);
-                    break;
-                    }
+				TInt LastChar = iWAPMessage[lastIndex];
+				if (LastChar == '/' || LastChar == ' ' || LastChar == '\n')
+					{
+					// reinitialize, because following maybe absent
+					iTotalSegments = 1;
+					iSegmentNumber = 1;
+					iIsWapTextMessage = ParseWapTextHeader(KElemIndexes[i]);
+					break;
+					}
 
-                }
+				}
 
-            if (!iIsWapTextMessage)
-                {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_PARSE_2, "WARNING! illegal incoming WAP message");
-                }
-            }
-        }
+			if (!iIsWapTextMessage)
+				{
+				LOGWAPPROT1("WARNING! illegal incoming WAP message");
+				}
+			}
+		}
 
-    return iIsWapTextMessage;
-    } // TWapTextMessage::Parse
+	return iIsWapTextMessage;
+	} // TWapTextMessage::Parse
 
 
 /**
@@ -280,48 +274,48 @@
  *  TODO use TLex instead
  */
 TInt TWapTextMessage::ParseNumber(const TDesC8& aInValue,
-                                  TBool   aBigEndian,
-                                  TInt    aRadix)
-    {
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_PARSENUMBER_1, "TWapTextMessage::ParseNumber [%s]", aInValue);
-    // least significant byte first
-    TInt Values[4] = {0,0,0,0};
-    TInt Temp = 0;
-    TInt length = aInValue.Length();
-    TInt i = 0;
-    TInt Value = 0;
+								  TBool   aBigEndian,
+								  TInt    aRadix)
+	{
+	LOGWAPPROT2("TWapTextMessage::ParseNumber [%S]", &aInValue);
+	// least significant byte first
+	TInt Values[4] = {0,0,0,0};
+	TInt Temp = 0;
+	TInt length = aInValue.Length();
+	TInt i = 0;
+	TInt Value = 0;
 
-    __ASSERT_DEBUG(length<5,Panic(KPanicInvalidParseNumber));
+	__ASSERT_DEBUG(length<5,Panic(KPanicInvalidParseNumber));
     if( length >= 5 )
         return KErrNotFound;
-    for(i=0; i<length; i++)
-        {
-        Temp = aInValue[i];
-        if (Temp>='0' && Temp<='9')
-            Temp-='0';
-        else if (Temp>='A' && Temp<='Z')
-            Temp = Temp - 'A'+10;
-        else if (Temp>='a' && Temp<='z')
-            Temp = Temp - 'a'+10;
-        else
+	for(i=0; i<length; i++)
+		{
+		Temp = aInValue[i];
+		if (Temp>='0' && Temp<='9')
+			Temp-='0';
+		else if (Temp>='A' && Temp<='Z')
+			Temp = Temp - 'A'+10;
+		else if (Temp>='a' && Temp<='z')
+			Temp = Temp - 'a'+10;
+		else
             return KErrNotFound;
-        if (aBigEndian)
-            Values[(length-1)-i]=Temp;
-        else
-            Values[i]=Temp;
-        }
+		if (aBigEndian)
+			Values[(length-1)-i]=Temp;
+		else
+			Values[i]=Temp;
+		}
 
-    // build the value
-    Value=Values[0];
-    TInt Base=1;
-    for(i=1; i<length; i++)
-        {
-        Base*=aRadix;
-        Value+=(Base)*Values[i];
-        }
+	// build the value
+	Value=Values[0];
+	TInt Base=1;
+	for(i=1; i<length; i++)
+		{
+		Base*=aRadix;
+		Value+=(Base)*Values[i];
+		}
 
-    return Value;
-    } // TWapTextMessage::ParseNumber
+	return Value;
+	} // TWapTextMessage::ParseNumber
 
 
 /**
@@ -334,95 +328,95 @@
  *  except for KOtherHeader and user data, of course
  */
 TBool TWapTextMessage::ParseWapTextHeader(const TIndexInfo& aIndexArray)
-    {
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_PARSEWAPTEXTHEADER_1, "TWapTextMessage::ParseWapTextHeader: %s", iWAPMessage );
+	{
+	LOGWAPPROT2("TWapTextMessage::ParseWapTextHeader: %S", &iWAPMessage );
 
-    TInt ParsedNumber = 0;
+	TInt ParsedNumber = 0;
 
-    // parse the header
-    TInt ElemIndexCount=aIndexArray.iLastIndex+1;
-    for(TInt i=0; i<ElemIndexCount; i++)
-        {
-        if (i<ElemIndexCount-1)
-            {
-            // all the elems have a length defined in advance
-            if (iWAPMessage.Length() >= aIndexArray.iIndexes[i+1])
-                {
-                // the header fits into the wap datagram
-                TPtrC8 Elem(iWAPMessage.Mid(aIndexArray.iIndexes[i],
-                                            aIndexArray.iIndexes[i+1]-
-                                            aIndexArray.iIndexes[i]));
+	// parse the header
+	TInt ElemIndexCount=aIndexArray.iLastIndex+1;
+	for(TInt i=0; i<ElemIndexCount; i++)
+		{
+		if (i<ElemIndexCount-1)
+			{
+			// all the elems have a length defined in advance
+			if (iWAPMessage.Length() >= aIndexArray.iIndexes[i+1])
+				{
+				// the header fits into the wap datagram
+				TPtrC8 Elem(iWAPMessage.Mid(aIndexArray.iIndexes[i],
+											aIndexArray.iIndexes[i+1]-
+											aIndexArray.iIndexes[i]));
 
-                ParsedNumber = ParseNumber(Elem,ETrue,16);
+				ParsedNumber = ParseNumber(Elem,ETrue,16);
                 if( ParsedNumber == KErrNotFound )
                     return EFalse;
-                switch(i)
-                    {
-                  case KIndexDestinationPort:
-                      iDestinationPort = ParsedNumber;
+				switch(i)
+					{
+				  case KIndexDestinationPort:
+					  iDestinationPort = ParsedNumber;
 
-                      break;
-                  case KIndexSourcePort:
-                      iSourcePort = ParsedNumber;
-                      break;
-                  case KIndexReferenceNumber:
-                      iReference = ParsedNumber;
-                      break;
-                  case KIndexTotalSegments:
-                      iTotalSegments = ParsedNumber;
-                      break;
-                  case KIndexSegmentNumber:
-                      iSegmentNumber = ParsedNumber;
-                      break;
-                  default:
-                      OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_PARSEWAPTEXTHEADER_2, "Hm. unhandled WAP index [%d]", i );
-                      break;
-                    }
-                }
-            }
-        else
-            {
-            // elems have not a length defined in advance
-            iOtherHeader = 0;
-            iOtherHeaderLength = 0;
+					  break;
+				  case KIndexSourcePort:
+					  iSourcePort = ParsedNumber;
+					  break;
+				  case KIndexReferenceNumber:
+					  iReference = ParsedNumber;
+					  break;
+				  case KIndexTotalSegments:
+					  iTotalSegments = ParsedNumber;
+					  break;
+				  case KIndexSegmentNumber:
+					  iSegmentNumber = ParsedNumber;
+					  break;
+				  default:
+					  LOGWAPPROT2("Hm. unhandled WAP index [%d]", i );
+					  break;
+					}
+				}
+			}
+		else
+			{
+			// elems have not a length defined in advance
+			iOtherHeader = 0;
+			iOtherHeaderLength = 0;
 
-            // Search the terminating character ' '
-            iData = iWAPMessage.Locate(' ');
-            TInt dataTmp = iWAPMessage.Locate('\n');
+			// Search the terminating character ' '
+			iData = iWAPMessage.Locate(' ');
+			TInt dataTmp = iWAPMessage.Locate('\n');
 
-            if (iData == KErrNotFound)
-                {
-                if (dataTmp == KErrNotFound)
-                    return EFalse;
-                else
-                    iData = dataTmp;
-                }
-            else if (dataTmp != KErrNotFound)
-                iData = Min(iData, dataTmp);
+			if (iData == KErrNotFound)
+				{
+				if (dataTmp == KErrNotFound)
+					return EFalse;
+				else
+					iData = dataTmp;
+				}
+			else if (dataTmp != KErrNotFound)
+				iData = Min(iData, dataTmp);
 
-            // check the existence of other header
-            // at least "// " should be there
-            if (   iWAPMessage.Length() > aIndexArray.iIndexes[i]+2
-                   && iWAPMessage[aIndexArray.iIndexes[i]] == '/'
-                   && iWAPMessage[aIndexArray.iIndexes[i]+1] == '/')
-                {
-                iOtherHeader = aIndexArray.iIndexes[i];
-                iOtherHeaderLength=iData-iOtherHeader;
-                }
+			// check the existence of other header
+			// at least "// " should be there
+			if (   iWAPMessage.Length() > aIndexArray.iIndexes[i]+2
+				   && iWAPMessage[aIndexArray.iIndexes[i]] == '/'
+				   && iWAPMessage[aIndexArray.iIndexes[i]+1] == '/')
+				{
+				iOtherHeader = aIndexArray.iIndexes[i];
+				iOtherHeaderLength=iData-iOtherHeader;
+				}
 
-            // data: check if any characters after ' '
-            iDataLength = 0;
-            iData++;
-            if (iWAPMessage.Length() > iData)
-                {
-                iDataLength = iWAPMessage.Length() - iData;
-                }
+			// data: check if any characters after ' '
+			iDataLength = 0;
+			iData++;
+			if (iWAPMessage.Length() > iData)
+				{
+				iDataLength = iWAPMessage.Length() - iData;
+				}
 
-            // That's it
-            } // end of other header and data
-        }// end of for loop
-    return ETrue;
-    } // TWapTextMessage::ParseWapTextHeader
+			// That's it
+			} // end of other header and data
+		}// end of for loop
+	return ETrue;
+	} // TWapTextMessage::ParseWapTextHeader
 
 
 /**
@@ -438,80 +432,80 @@
  *  aFixedHeader.Length() == (return value of this function) is true
  */
 TInt TWapTextMessage::CreateHeader(TDes8& aFixedHeader, TInt& aSegmentNumberIndex)
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_CREATEHEADER_1, "TWapTextMessage::CreateHeader");
+	{
+	LOGWAPPROT1("TWapTextMessage::CreateHeader");
 
-    // Index into KElemIndexes indicating which header elements are present
-    TInt elemIndex;
-    // Index into Indexes, for current header element
-    TInt minorIndex=KIndexDestinationPort;
-    TBuf8<4> hexNumber;
+	// Index into KElemIndexes indicating which header elements are present
+	TInt elemIndex;
+	// Index into Indexes, for current header element
+	TInt minorIndex=KIndexDestinationPort;
+	TBuf8<4> hexNumber;
 
-    // Segment number length is set, if SAR is needed
-    TInt segmentNumberLength = 0;
-    aSegmentNumberIndex = 0;
+	// Segment number length is set, if SAR is needed
+	TInt segmentNumberLength = 0;
+	aSegmentNumberIndex = 0;
 
-    // Determine whether long or short form is used
-    if (iIs16Bit || iSourcePort > 255 || iDestinationPort>255)
-        {
-        elemIndex = 0;
-        aFixedHeader.Copy(KSCKHeaderLong);
-        }
-    else
-        {
-        elemIndex = 3;
-        aFixedHeader.Copy(KSCKHeaderShort);
-        }
+	// Determine whether long or short form is used
+	if (iIs16Bit || iSourcePort > 255 || iDestinationPort>255)
+		{
+		elemIndex = 0;
+		aFixedHeader.Copy(KSCKHeaderLong);
+		}
+	else
+		{
+		elemIndex = 3;
+		aFixedHeader.Copy(KSCKHeaderShort);
+		}
 
-    // Set destination port
-    hexNumber.NumFixedWidthUC(iDestinationPort,EHex,
-                              KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
-    aFixedHeader.Append(hexNumber);
+	// Set destination port
+	hexNumber.NumFixedWidthUC(iDestinationPort,EHex,
+							  KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
+	aFixedHeader.Append(hexNumber);
 
-    // Don't set the source port,
-    // 1) if it is not set or it same as destination port and
-    // 2) data (and other header) fits in one segment
-    if (!((iSourcePort==-1 || iDestinationPort==iSourcePort)
-          && CalculateTotalSegments(KElemIndexes[elemIndex].iIndexes[minorIndex+1])==1))
-        {
-        // Source port is present
-        elemIndex++;
-        minorIndex++;
-        if (iSourcePort==-1)
-            iSourcePort = iDestinationPort;
+	// Don't set the source port,
+	// 1) if it is not set or it same as destination port and
+	// 2) data (and other header) fits in one segment
+	if (!((iSourcePort==-1 || iDestinationPort==iSourcePort)
+		  && CalculateTotalSegments(KElemIndexes[elemIndex].iIndexes[minorIndex+1])==1))
+		{
+		// Source port is present
+		elemIndex++;
+		minorIndex++;
+		if (iSourcePort==-1)
+			iSourcePort = iDestinationPort;
 
-        // Set source port
-        hexNumber.NumFixedWidthUC(iSourcePort,EHex,
-                                  KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
-        aFixedHeader.Append(hexNumber);
+		// Set source port
+		hexNumber.NumFixedWidthUC(iSourcePort,EHex,
+								  KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
+		aFixedHeader.Append(hexNumber);
 
-        // Add the SAR info when source port is set
-        elemIndex++;
+		// Add the SAR info when source port is set
+		elemIndex++;
 
-        // Set reference
-        minorIndex++;
-        hexNumber.NumFixedWidthUC(iReference,EHex,
-                                  KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
-        aFixedHeader.Append(hexNumber);
+		// Set reference
+		minorIndex++;
+		hexNumber.NumFixedWidthUC(iReference,EHex,
+								  KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
+		aFixedHeader.Append(hexNumber);
 
-        // Set fragment count
-        minorIndex++;
-        CalculateTotalSegments(KElemIndexes[elemIndex].iIndexes[KElemIndexes[elemIndex].iLastIndex]);
-        hexNumber.NumFixedWidthUC(iTotalSegments,EHex,
-                                  KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
-        aFixedHeader.Append(hexNumber);
+		// Set fragment count
+		minorIndex++;
+		CalculateTotalSegments(KElemIndexes[elemIndex].iIndexes[KElemIndexes[elemIndex].iLastIndex]);
+		hexNumber.NumFixedWidthUC(iTotalSegments,EHex,
+								  KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
+		aFixedHeader.Append(hexNumber);
 
-        // Return the index for segment number in the header
-        minorIndex++;
-        aSegmentNumberIndex = KElemIndexes[elemIndex].iIndexes[minorIndex];
-        segmentNumberLength = 2;
-        }
+		// Return the index for segment number in the header
+		minorIndex++;
+		aSegmentNumberIndex = KElemIndexes[elemIndex].iIndexes[minorIndex];
+		segmentNumberLength = 2;
+		}
 
-    aFixedHeader.Append(iRefOtherHeader);
-    aFixedHeader.Append(_L(" "));
+	aFixedHeader.Append(iRefOtherHeader);
+	aFixedHeader.Append(_L(" "));
 
-    return aFixedHeader.Length()+segmentNumberLength;
-    } // TWapTextMessage::CreateHeader
+	return aFixedHeader.Length()+segmentNumberLength;
+	} // TWapTextMessage::CreateHeader
 
 
 /**
@@ -520,87 +514,87 @@
  *  The affect of terminating ' ' is taken into inside the method
  */
 TInt TWapTextMessage::CalculateTotalSegments(TInt aFixedLength)
-    {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_CALCULATETOTALSEGMENTS_1, "TWapTextMessage::CalculateTotalSegments [aFixedLength=%d]", aFixedLength);
+	{
+	LOGWAPPROT2("TWapTextMessage::CalculateTotalSegments [aFixedLength=%d]", aFixedLength);
 
-    // '+1': length of terminating ' '
-    TInt  length        = aFixedLength + iRefOtherHeader.Length() + 1;
-    TInt  remain        = KMaxSmsChars - length;
-    TInt  dataSegmented = 0;
+	// '+1': length of terminating ' '
+	TInt  length        = aFixedLength + iRefOtherHeader.Length() + 1;
+	TInt  remain        = KMaxSmsChars - length;
+	TInt  dataSegmented = 0;
 
-    __ASSERT_DEBUG(remain > 0, Panic(KPanicTextHeaderTooLong));
+	__ASSERT_DEBUG(remain > 0, Panic(KPanicTextHeaderTooLong));
 
-    iTotalSegments = 0;
-    do
-        {
-        iTotalSegments++;
+	iTotalSegments = 0;
+	do
+		{
+		iTotalSegments++;
 
-        //
-        // Count any escaped characters we can be sure that the converted data
-        // size fits inside the remaining length (e.g. so that non-7bit characters
-        // when converted by the SMS Stack will still fit).
-        //
-        TInt  segmentSize = iRefData.Length() - dataSegmented;
+		//
+		// Count any escaped characters we can be sure that the converted data
+		// size fits inside the remaining length (e.g. so that non-7bit characters
+		// when converted by the SMS Stack will still fit).
+		//
+		TInt  segmentSize = iRefData.Length() - dataSegmented;
 
-        if (segmentSize > remain)
-            {
-            segmentSize = remain;
-            }
+		if (segmentSize > remain)
+			{
+			segmentSize = remain;
+			}
 
-        while (segmentSize > 1)
-            {
-            TPtrC8  segmentData(iRefData.Mid(dataSegmented, segmentSize));
-            TInt  non7bitCharEscapes = 0;
-            
-            //
-            // Count all non-7bit characters that will be escaped (many non-7bit
-            // characters are not escaped, but converted to "?"). The ones
-            // that are known to be escaped are list below:
-            //
-            //    12  [Form Feed].
-            //    91  "["
-            //    92  "\"
-            //    93  "]"
-            //    94  "^"
-            //   123  "{"
-            //   124  "|"
-            //   125  "}"
-            //   126  "~"
-            //
-            for (TInt  ch = 0;  ch < segmentSize;  ch++)
-                {
-                if (segmentData[ch] == 12  ||
-                    (segmentData[ch] >= 91  &&  segmentData[ch] <= 94)  ||
-                    (segmentData[ch] >= 123  &&  segmentData[ch] <= 126))
-                    {
-                    non7bitCharEscapes++;
-                    }
-                }
-            
-            //
-            // Can it fit? If so store it, otherwise reduce the size...
-            //
-            if (segmentData.Length() + non7bitCharEscapes <= remain)
-                {
-                break;
-                }
-            
-            segmentSize--;
-            }
-        
-            dataSegmented += segmentSize;
-        }
-    while (dataSegmented < iRefData.Length());
-    
-    //
-    // At least one fragment is needed...
-    //
-    if (iTotalSegments == 0)
-        {
-        iTotalSegments = 1;
-        }
+		while (segmentSize > 1)
+			{
+			TPtrC8  segmentData(iRefData.Mid(dataSegmented, segmentSize));
+			TInt  non7bitCharEscapes = 0;
+			
+			//
+			// Count all non-7bit characters that will be escaped (many non-7bit
+			// characters are not escaped, but converted to "?"). The ones
+			// that are known to be escaped are list below:
+			//
+			//	  12  [Form Feed].
+			//	  91  "["
+			//	  92  "\"
+			//	  93  "]"
+			//	  94  "^"
+			//	 123  "{"
+			//	 124  "|"
+			//	 125  "}"
+			//	 126  "~"
+			//
+			for (TInt  ch = 0;  ch < segmentSize;  ch++)
+				{
+				if (segmentData[ch] == 12  ||
+					(segmentData[ch] >= 91  &&  segmentData[ch] <= 94)  ||
+					(segmentData[ch] >= 123  &&  segmentData[ch] <= 126))
+					{
+					non7bitCharEscapes++;
+					}
+				}
+			
+			//
+			// Can it fit? If so store it, otherwise reduce the size...
+			//
+			if (segmentData.Length() + non7bitCharEscapes <= remain)
+				{
+				break;
+				}
+			
+			segmentSize--;
+			}
+		
+			dataSegmented += segmentSize;
+		}
+	while (dataSegmented < iRefData.Length());
+	
+	//
+	// At least one fragment is needed...
+	//
+	if (iTotalSegments == 0)
+		{
+		iTotalSegments = 1;
+		}
 
-    return iTotalSegments;
-    } // TWapTextMessage::CalculateTotalSegments
+	return iTotalSegments;
+	} // TWapTextMessage::CalculateTotalSegments
 
 // EOF - WAPTHDR.CPP

--- a/smsprotocols/smsstack/wapprot/Src/ws_main.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/ws_main.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ws_mainTraces.h"
-#endif
-
 #include "es_ver.h"
 #include "es_prot.h"
 #include "es_wsms.h"
@@ -43,7 +37,7 @@
 //
 CWapSmsProtocolFamily * CWapSmsProtocolFamily::NewL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOLFAMILY_NEWL_1, "CWapSmsProtocolFamily::NewL()");
+	LOGWAPPROT1("CWapSmsProtocolFamily::NewL()");
 
 	return new (ELeave)CWapSmsProtocolFamily;
 	} // CWapSmsProtocolFamily::NewL
@@ -54,7 +48,7 @@
 //
 TInt CWapSmsProtocolFamily::Install()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOLFAMILY_INSTALL_1, "CWapSmsProtocolFamily::Install()");
+	LOGWAPPROT1("CWapSmsProtocolFamily::Install()");
 
 	return KErrNone;
 	} // CWapSmsProtocolFamily::Install
@@ -65,7 +59,7 @@
 //
 TInt CWapSmsProtocolFamily::Remove()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOLFAMILY_REMOVE_1, "CWapSmsProtocolFamily::Remove()");
+	LOGWAPPROT1("CWapSmsProtocolFamily::Remove()");
 
 	return KErrNone;
 	} // CWapSmsProtocolFamily::Remove
@@ -76,7 +70,7 @@
 //
 CProtocolBase * CWapSmsProtocolFamily::NewProtocolL(TUint aSockType,TUint /*aProtocol*/)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOLFAMILY_NEWPROTOCOLL_1, "CWapSmsProtocolFamily::NewProtocolL()");
+	LOGWAPPROT1("CWapSmsProtocolFamily::NewProtocolL()");
 
 	if (aSockType!=KSockDatagram)
 		return NULL;
@@ -90,7 +84,7 @@
 //
 TUint CWapSmsProtocolFamily::ProtocolList(TServerProtocolDesc *& aProtocolList)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOLFAMILY_PROTOCOLLIST_1, "CWapSmsProtocolFamily::ProtocolList()");
+	LOGWAPPROT1("CWapSmsProtocolFamily::ProtocolList()");
 
 	TRAPD(ret, (aProtocolList=new(ELeave) TServerProtocolDesc[1]) );
 	if(ret!=KErrNone)
@@ -119,7 +113,11 @@
 //
 EXPORT_C CProtocolFamilyBase * InstallWAPSMS(void)
 	{
-    OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, INSTALLWAPSMS_1, "InstallWAPSMS [version %u.%u.%u]",KWapSmsMajorVersionNumber, KWapSmsMinorVersionNumber, KWapSmsBuildVersionNumber);
+	LOGWAPPROT4("InstallWAPSMS [version %d.%d.%d]",
+			 KWapSmsMajorVersionNumber,
+			 KWapSmsMinorVersionNumber,
+			 KWapSmsBuildVersionNumber
+			 );
 
 	CWapSmsProtocolFamily* wapProt=NULL;
 	TRAPD(ret, (wapProt=CWapSmsProtocolFamily::NewL()) );

--- a/smsprotocols/smsstack/wapprot/Src/ws_obsvr.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/ws_obsvr.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ws_obsvrTraces.h"
-#endif
-
 #include "ws_obsvr.h"
 
 #include <commsdattypesv1_1.h>
@@ -89,7 +83,7 @@
  */
 CWapSapMessageSender* CWapSapMessageSender::NewL(CSmsProtocol* aSmsProtocol, CWapSmsProvider* aWapSap)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_NEWL_1, "CWapSapMessageSender::NewL");
+	LOGWAPPROT1("CWapSapMessageSender::NewL");
 
 	CWapSapMessageSender* msgSender = new(ELeave) CWapSapMessageSender(aSmsProtocol,aWapSap);
 	CleanupStack::PushL(msgSender);
@@ -108,7 +102,7 @@
  */
 void CWapSapMessageSender::SendDatagramL(CWapDatagram* aMsg)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_SENDDATAGRAML_1, "CWapSapMessageSender::SendDatagramL");
+	LOGWAPPROT1("CWapSapMessageSender::SendDatagramL");
 
 	__ASSERT_DEBUG(iSmsMsgArray->Count()==0,Panic(EWapSmsSapMessageSenderBusy));
 
@@ -124,7 +118,7 @@
  */
 void CWapSapMessageSender::SendNextSms()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_SENDNEXTSMS_1, "CWapSapMessageSender::SendNextSms");
+	LOGWAPPROT1("CWapSapMessageSender::SendNextSms");
 
 	__ASSERT_DEBUG(iSmsMsgArray->Count()>0,Panic(EWapSmsSapMessageSenderNothingToSend));
 	CSmsMessage* smsMsg = iSmsMsgArray->At(0);
@@ -145,7 +139,7 @@
  */
 void CWapSapMessageSender::SetSmsMessageSettingsL(CSmsMessage* aSmsMessage)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_SETSMSMESSAGESETTINGSL_1, "CWapSapMessageSender::SetSmsMessageSettingsL");
+	LOGWAPPROT1("CWapSapMessageSender::SetSmsMessageSettingsL");
 
 	TBuf<KCommsDbSvrMaxFieldLength> msgCenterNumberValue;
 	TUint32 msgValidityPeriodValue = KWapSmsMessageValidityPeriod;
@@ -283,7 +277,7 @@
  */
 void CWapSapMessageSender::MessageSendCompleted(TInt aStatus)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_MESSAGESENDCOMPLETED_1, "CWapSapMessageSender::MessageSendCompleted [aStatus=%d]", aStatus);
+	LOGWAPPROT2("CWapSapMessageSender::MessageSendCompleted [aStatus=%d]", aStatus);
 
 	if (aStatus!=KErrNone)
 		iSmsMsgArray->ResetAndDestroy();
@@ -302,7 +296,7 @@
  */
 const TSmsAddr& CWapSapMessageSender::GetLocalAddress() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_GETLOCALADDRESS_1, "CWapSapMessageSender::GetLocalAddress()");
+	LOGWAPPROT1("CWapSapMessageSender::GetLocalAddress()");
 
 	return iSmsAddr;
 	} // CWapSapMessageSender::GetLocalAddress
@@ -313,7 +307,7 @@
  */
 void CWapSapMessageSender::SetLocalAddress(const TSmsAddr& aSmsAddr)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_SETLOCALADDRESS_1, "CWapSapMessageSender::SetLocalAddress()");
+	LOGWAPPROT1("CWapSapMessageSender::SetLocalAddress()");
 
 	iSmsAddr = aSmsAddr;
 	} // CWapSapMessageSender::SetLocalAddress
@@ -328,7 +322,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_MODEMNOTIFICATIONCOMPLETED_1, "CWapSapMessageSender::ModemNotificationCompleted()");
+    LOGWAPPROT1("CWapSapMessageSender::ModemNotificationCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -341,7 +335,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_ENUMERATEPHONECOMPLETED_1, "CWapSapMessageSender::EnumeratePhoneCompleted()");
+    LOGWAPPROT1("CWapSapMessageSender::EnumeratePhoneCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -354,7 +348,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_MESSAGERECEIVED_1, "CWapSapMessageSender::MessageReceived");
+    LOGWAPPROT1("CWapSapMessageSender::MessageReceived");
     __ASSERT_DEBUG(EFalse,Panic(EWapSmsReceiveOnMessageSender));
     return KErrNone;
     BULLSEYE_RESTORE
@@ -368,7 +362,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_CLIENTCONFIRMSMESSAGE_1, "CWapSapMessageSender::ClientConfirmsMessage");
+    LOGWAPPROT1("CWapSapMessageSender::ClientConfirmsMessage");
     __ASSERT_DEBUG(EFalse,Panic(EWapSmsReceiveOnMessageSender));
     return ETrue;
     BULLSEYE_RESTORE
@@ -379,7 +373,7 @@
  */
 TInt CWapSapMessageSender::SmsAddrIsDuplicate(const MSmsMessageObserver* /*aObserver*/,const TSmsAddr& /*aAddr*/)const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_SMSADDRISDUPLICATE_1, "CWapSapMessageSender::SmsAddrIsDuplicate()");
+	LOGWAPPROT1("CWapSapMessageSender::SmsAddrIsDuplicate()");
 
 	return EFalse;
 	} // CWapSapMessageSender::SmsAddrIsDuplicate
@@ -394,7 +388,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_MESSAGEWRITECOMPLETED_1, "CWapSapMessageSender::MessageWriteCompleted()");
+    LOGWAPPROT1("CWapSapMessageSender::MessageWriteCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -407,7 +401,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_MESSAGEDELETECOMPLETED_1, "CWapSapMessageSender::MessageDeleteCompleted()");
+    LOGWAPPROT1("CWapSapMessageSender::MessageDeleteCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -420,7 +414,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_READSMSPARAMSCOMPLETED_1, "CWapSapMessageSender::ReadSmsParamsCompleted()");
+    LOGWAPPROT1("CWapSapMessageSender::ReadSmsParamsCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -433,7 +427,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_WRITESMSPARAMSCOMPLETED_1, "CWapSapMessageSender::WriteSmsParamsCompleted()");
+    LOGWAPPROT1("CWapSapMessageSender::WriteSmsParamsCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -450,7 +444,7 @@
  */
 CWapProtocolObserver* CWapProtocolObserver::NewL(CWapSmsProtocol* aProtocol)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_NEWL_1, "CWapProtocolObserver::NewL()");
+	LOGWAPPROT1("CWapProtocolObserver::NewL()");
 
 	CWapProtocolObserver* prot = new(ELeave) CWapProtocolObserver;
 	prot->iWapSmsProtocol=aProtocol;
@@ -463,7 +457,7 @@
  */
 const TSmsAddr& CWapProtocolObserver::GetLocalAddress() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_GETLOCALADDRESS_1, "CWapProtocolObserver::GetLocalAddress()");
+	LOGWAPPROT1("CWapProtocolObserver::GetLocalAddress()");
 
 	return iSmsAddr;
 	} // CWapProtocolObserver::GetLocalAddress
@@ -474,7 +468,7 @@
  */
 void CWapProtocolObserver::SetLocalAddress(const TSmsAddr& aSmsAddr)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_SETLOCALADDRESS_1, "CWapProtocolObserver::SetLocalAddress()");
+	LOGWAPPROT1("CWapProtocolObserver::SetLocalAddress()");
 
 	iSmsAddr = aSmsAddr;
 	} // CWapProtocolObserver::SetLocalAddress
@@ -486,7 +480,7 @@
  */
 void CWapProtocolObserver::ModemNotificationCompleted(TInt /*aStatus*/)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_MODEMNOTIFICATIONCOMPLETED_1, "CWapProtocolObserver::ModemNotificationCompleted()");
+	LOGWAPPROT1("CWapProtocolObserver::ModemNotificationCompleted()");
 
 	} // CWapProtocolObserver::ModemNotificationCompleted
 
@@ -500,7 +494,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_MESSAGESENDCOMPLETED_1, "CWapProtocolObserver::MessageSendCompleted()");
+    LOGWAPPROT1("CWapProtocolObserver::MessageSendCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -509,7 +503,7 @@
  */
 TBool CWapProtocolObserver::ClientConfirmsMessage()const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_CLIENTCONFIRMSMESSAGE_1, "CWapProtocolObserver::ClientConfirmsMessage()");
+	LOGWAPPROT1("CWapProtocolObserver::ClientConfirmsMessage()");
 
 	return EFalse;
 	} // CWapProtocolObserver::ClientConfirmsMessage
@@ -520,7 +514,7 @@
  */
 TInt CWapProtocolObserver::SmsAddrIsDuplicate(const MSmsMessageObserver* aObserver,const TSmsAddr& aAddr)const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_SMSADDRISDUPLICATE_1, "CWapProtocolObserver::SmsAddrIsDuplicate()");
+	LOGWAPPROT1("CWapProtocolObserver::SmsAddrIsDuplicate()");
 
 	if(this == aObserver)return EFalse;
 	if(aAddr.SmsAddrFamily() == ESmsAddrApplication8BitPort || ( aAddr.SmsAddrFamily() == ESmsAddrApplication16BitPort && aAddr.Port() > 255))
@@ -539,7 +533,7 @@
  */
 TInt CWapProtocolObserver::MessageReceived(const CSmsMessage& aSmsMessage,TDes& /*aDes*/)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_MESSAGERECEIVED_1, "CWapProtocolObserver::MessageReceived");
+	LOGWAPPROT1("CWapProtocolObserver::MessageReceived");
 
 	TRAPD(ret, iWapSmsProtocol->ProcessSmsL(aSmsMessage) );
 	return ret;
@@ -555,7 +549,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_ENUMERATEPHONECOMPLETED_1, "CWapProtocolObserver::EnumeratePhoneCompleted()");
+    LOGWAPPROT1("CWapProtocolObserver::EnumeratePhoneCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -568,7 +562,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_MESSAGEWRITECOMPLETED_1, "CWapProtocolObserver::MessageWriteCompleted()");
+    LOGWAPPROT1("CWapProtocolObserver::MessageWriteCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -581,7 +575,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_MESSAGEDELETECOMPLETED_1, "CWapProtocolObserver::MessageDeleteCompleted()");
+    LOGWAPPROT1("CWapProtocolObserver::MessageDeleteCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -594,7 +588,7 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_READSMSPARAMSCOMPLETED_1, "CWapProtocolObserver::ReadSmsParamsCompleted()");
+    LOGWAPPROT1("CWapProtocolObserver::ReadSmsParamsCompleted()");
     BULLSEYE_RESTORE
     }
 
@@ -607,6 +601,6 @@
     // Ignore in code coverage - implementation required by base class
     // but not relavent for WAP PROT.
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_WRITESMSPARAMSCOMPLETED_1, "CWapProtocolObserver::WriteSmsParamsCompleted()");
+    LOGWAPPROT1("CWapProtocolObserver::WriteSmsParamsCompleted()");
     BULLSEYE_RESTORE
     }

--- a/smsprotocols/smsstack/wapprot/Src/ws_prtcl.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/ws_prtcl.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ws_prtclTraces.h"
-#endif
-
 #include <e32base.h>
 #include <f32file.h>
 #include "smsprot.h"
@@ -54,7 +48,7 @@
 //
 CWapSmsProtocol* CWapSmsProtocol::NewL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_NEWL_1, "CWapSmsProtocol::NewL()");
+	LOGWAPPROT1("CWapSmsProtocol::NewL()");
 
 	CWapSmsProtocol* p=new(ELeave) CWapSmsProtocol;
 	CleanupStack::PushL(p);
@@ -72,14 +66,14 @@
 
 void CWapSmsProtocol::HandleBackupOrRestoreStartingL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_HANDLEBACKUPORRESTORESTARTINGL_1, "CWapSmsProtocol::HandleBackupOrRestoreStartingL");
+	LOGWAPPROT1("CWapSmsProtocol::HandleBackupOrRestoreStartingL");
 	iWapStore->Close();
 	} // CWapSmsProtocol::HandleBackupOrRestoreStartingL
 
 
 void CWapSmsProtocol::HandleBackupOrRestoreCompleteL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_HANDLEBACKUPORRESTORECOMPLETEL_1, "CWapSmsProtocol::HandleBackupOrRestoreCompleteL ");
+	LOGWAPPROT1("CWapSmsProtocol::HandleBackupOrRestoreCompleteL ");
 	iWapStore->DoOpenL();
 	} // CWapSmsProtocol::HandleBackupOrRestoreCompleteL
 
@@ -111,7 +105,7 @@
 //
 CServProviderBase *CWapSmsProtocol::NewSAPL(TUint aSocketType)
 	{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_NEWSAPL_1, "*CWapSmsProtocol::NewSAPL");
+        LOGWAPPROT1("*CWapSmsProtocol::NewSAPL");
 
 	if (aSocketType!=KSockDatagram)
 		User::Leave(KErrNotSupported);
@@ -136,7 +130,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_BINDL_1, "CWapSmsProtocol::BindL");
+    LOGWAPPROT1("CWapSmsProtocol::BindL");
     Panic(EWapSmsCantBind);
     BULLSEYE_RESTORE
     }
@@ -155,7 +149,7 @@
 //
 void CWapSmsProtocol::Identify(TServerProtocolDesc *aDes) const
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_IDENTIFY_1, "CWapSmsProtocol::Identify");
+    LOGWAPPROT1("CWapSmsProtocol::Identify");
 
 	aDes->iName=KWAPSMSProtocolId;
 	aDes->iAddrFamily=KWAPSMSAddrFamily;
@@ -178,7 +172,7 @@
 //
 void CWapSmsProtocol::BindToL(CProtocolBase* aProtocol)
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_BINDTOL_1, "CWapSmsProtocol::BindToL");
+    LOGWAPPROT1("CWapSmsProtocol::BindToL");
 
 	TServerProtocolDesc info;
 	aProtocol->Identify(&info);
@@ -204,7 +198,7 @@
 //
 void CWapSmsProtocol::BindObserversToSmsL()
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_BINDOBSERVERSTOSMSL_1, "CWapSmsProtocol::BindObserversToSmsL");
+    LOGWAPPROT1("CWapSmsProtocol::BindObserversToSmsL");
 
 	iNextSapPort=KMinWapPortNumber;
 	TSmsAddr addr0;
@@ -237,7 +231,7 @@
 //
 void CWapSmsProtocol::RemoveObserversFromSmsProtocol()
 	{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_REMOVEOBSERVERSFROMSMSPROTOCOL_1, "CWapSmsProtocol::RemoveObserversFromSmsProtocol");
+        LOGWAPPROT1("CWapSmsProtocol::RemoveObserversFromSmsProtocol");
 
 	if (iSmsProtocol==NULL)
 		return;
@@ -256,7 +250,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_SEND_1, "CWapSmsProtocol::Send");
+    LOGWAPPROT1("CWapSmsProtocol::Send");
     Panic(EWapSmsSendCallCantBind);
     return KErrNone;
     BULLSEYE_RESTORE
@@ -267,7 +261,7 @@
 //
 void CWapSmsProtocol::ProcessSmsL(const CSmsMessage& aSmsMessage)
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_PROCESSSMSL_1, "CWapSmsProtocol::ProcessSmsL");
+    LOGWAPPROT1("CWapSmsProtocol::ProcessSmsL");
 	TInt index=0;
 	TBool storeDatagramComplete = EFalse;
 	TBool isNewStyleClient = EFalse;
@@ -332,7 +326,7 @@
 //
 TInt CWapSmsProtocol::GetOption(TUint aLevel, TUint aName, TDes8& aOption, CProtocolBase* /*aSourceProtocol*/)
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_GETOPTION_1, "CWapSmsProtocol::GetOption");
+    LOGWAPPROT1("CWapSmsProtocol::GetOption");
 
 	TInt ret = iSmsProtocol->GetOption(aLevel, aName, aOption,this);
 	return ret;
@@ -345,7 +339,7 @@
 //
 TInt CWapSmsProtocol::SetOption(TUint aLevel, TUint aName, const TDesC8& aOption, CProtocolBase* /*aSourceProtocol*/)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_SETOPTION_1, "CWapSmsProtocol::SetOption");
+    LOGWAPPROT1("CWapSmsProtocol::SetOption");
     
     TInt ret= iSmsProtocol->SetOption(aLevel,aName,aOption,this);
     return ret;
@@ -357,7 +351,7 @@
 //
 void CWapSmsProtocol::Error(TInt aError, CProtocolBase* /*aSourceProtocol*/)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_ERROR_1, "CWapSmsProtocol::Error");
+    LOGWAPPROT1("CWapSmsProtocol::Error");
     
     TDblQueIter<CWapSmsProvider> iter(iSAPList);
     CWapSmsProvider* sap;
@@ -372,7 +366,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_NEWHOSTRESOLVERL_1, "*CWapSmsProtocol::NewHostResolverL");
+    LOGWAPPROT1("*CWapSmsProtocol::NewHostResolverL");
     Panic(EWapSmsCantCreateHostResolver);
     return NULL;
     BULLSEYE_RESTORE
@@ -385,7 +379,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_NEWSERVICERESOLVERL_1, "*CWapSmsProtocol::NewServiceResolverL");
+    LOGWAPPROT1("*CWapSmsProtocol::NewServiceResolverL");
     Panic(EWapSmsCantCreateServiceResolver);
     return NULL;
     BULLSEYE_RESTORE
@@ -398,7 +392,7 @@
     {
     // Ignore in code coverage - not intended to be used
     BULLSEYE_OFF
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_NEWNETDATABASEL_1, "CWapSmsProtocol::NewNetDatabaseL");
+    LOGWAPPROT1("CWapSmsProtocol::NewNetDatabaseL");
     Panic(EWapSmsCantCreateNetDatabase);
     return NULL;
     BULLSEYE_RESTORE
@@ -409,7 +403,7 @@
 //
 void CWapSmsProtocol::AddSAP(CWapSmsProvider* aSAP, TUint /*aSockType*/)
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_ADDSAP_1, "CWapSmsProtocol::AddSAP");
+    LOGWAPPROT1("CWapSmsProtocol::AddSAP");
 
 	iSAPList.AddLast(*aSAP);
 	} // CWapSmsProtocol::AddSAP
@@ -420,7 +414,7 @@
 //
 TBool CWapSmsProtocol::AllocateLocalAddress(TWapAddr& aAddr)
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_ALLOCATELOCALADDRESS_1, "CWapSmsProtocol::AllocateLocalAddressL");
+    LOGWAPPROT1("CWapSmsProtocol::AllocateLocalAddressL");
 	//
 	TBool found=EFalse;
 	TUint count=0,attempts=0;
@@ -447,7 +441,7 @@
 //
 CWapSmsProvider* CWapSmsProtocol::LookupSAP(CWapDatagram* aMsg)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_LOOKUPSAP_1, "CWapSmsProtocol::LookupSAP");
+	LOGWAPPROT1("CWapSmsProtocol::LookupSAP");
 
 	TBuf8<KMaxSockAddrSize> addrBuf;
 	addrBuf.Copy(aMsg->FromAddress());
@@ -483,7 +477,7 @@
 //
 TInt CWapSmsProtocol::AddrAlreadyUsedByWAP(const TWapAddr &aAddr, const CWapSmsProvider* aSap)
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_ADDRALREADYUSEDBYWAP_1, "CWapSmsProtocol::AddrAlreadyUsedByWAP");
+    LOGWAPPROT1("CWapSmsProtocol::AddrAlreadyUsedByWAP");
 
 	TDblQueIter<CWapSmsProvider> iter(iSAPList);
 	CWapSmsProvider* sap;
@@ -498,7 +492,7 @@
 				return KErrInUse;
 			}
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_ADDRALREADYUSEDBYWAP_2, "CWapSmsProtocol::AddrAlreadyUsedByWAP not used by WAP");
+	LOGWAPPROT1("CWapSmsProtocol::AddrAlreadyUsedByWAP not used by WAP");
 	return KErrNone;
 	} // CWapSmsProtocol::AddrAlreadyUsedByWAP
 
@@ -508,7 +502,7 @@
 //
 CSmsProtocol* CWapSmsProtocol::SmsProtocol()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_SMSPROTOCOL_1, "CWapSmsProtocol::SmsProtocol()");
+    LOGWAPPROT1("CWapSmsProtocol::SmsProtocol()");
 
     return iSmsProtocol;
     } // CWapSmsProtocol::SmsProtocol
@@ -519,7 +513,7 @@
 //
 TBool CWapSmsProtocol::FindAndDeleteMsg(CWapDatagram& aDatagram)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_FINDANDDELETEMSG_1, "CWapSmsProtocol::FindAndDeleteMsg()");
+	LOGWAPPROT1("CWapSmsProtocol::FindAndDeleteMsg()");
 
 	TInt err;
 	TInt ret = EFalse;
@@ -539,7 +533,7 @@
 //
 TInt CWapSmsProtocol::CheckSarL(const TWapAddr& aAddr,CWapSmsProvider* aSap)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_CHECKSARL_1, "CWapSmsProtocol::CheckSarL()");
+	LOGWAPPROT1("CWapSmsProtocol::CheckSarL()");
 
 	TInt count=0;
 	TInt err = KErrNone;

--- a/smsprotocols/smsstack/wapprot/Src/ws_prvdr.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/ws_prvdr.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ws_prvdrTraces.h"
-#endif
-
 #include <e32std.h>
 #include <wap_sock.h>
 #include "ws_main.h"
@@ -33,34 +27,33 @@
 #include "ws_obsvr.h"
 #include "smsprot.h"
 #include <es_mbuf.h>
-#include "smsstacklog.h"
 
 //
 // implementation of CWapSmsProvider
 //
 
-    // CWapSmsProvider policies
-    static _LIT_SECURITY_POLICY_C1(wapSmsProviderSetLocalNamePolicy, ECapabilityNetworkServices );
-    static _LIT_SECURITY_POLICY_C1(wapSmsProviderSetOptionPolicy, ECapability_None);
-    static _LIT_SECURITY_POLICY_C1(wapSmsProviderGetLengthIoctlPolicy,ECapability_None);
-    static _LIT_SECURITY_POLICY_C1(wapSmsProviderGetMessageParamLengthIoctlPolicy,ECapability_None);
-    static _LIT_SECURITY_POLICY_C1(wapSmsProviderGetMessageParametersIoctlPolicy,ECapabilityReadDeviceData);
-    static _LIT_SECURITY_POLICY_C1(wapSmsProviderWritePolicy,ECapabilityNetworkServices);
+	// CWapSmsProvider policies
+	static _LIT_SECURITY_POLICY_C1(wapSmsProviderSetLocalNamePolicy, ECapabilityNetworkServices );
+	static _LIT_SECURITY_POLICY_C1(wapSmsProviderSetOptionPolicy, ECapability_None);
+	static _LIT_SECURITY_POLICY_C1(wapSmsProviderGetLengthIoctlPolicy,ECapability_None);
+	static _LIT_SECURITY_POLICY_C1(wapSmsProviderGetMessageParamLengthIoctlPolicy,ECapability_None);
+	static _LIT_SECURITY_POLICY_C1(wapSmsProviderGetMessageParametersIoctlPolicy,ECapabilityReadDeviceData);
+	static _LIT_SECURITY_POLICY_C1(wapSmsProviderWritePolicy,ECapabilityNetworkServices);
 
 
 /**
  *  Factory
  */
 CWapSmsProvider* CWapSmsProvider::NewL(CWapSmsProtocol* aProtocol)
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_NEWL_1, "CWapSmsProvider::NewL()");
+	{
+	LOGWAPPROT1("CWapSmsProvider::NewL()");
 
-    CWapSmsProvider* provider=new(ELeave) CWapSmsProvider(aProtocol);
-    CleanupStack::PushL(provider);
-    provider->iWapSmsProviderWrite = CWapSmsProviderWrite::NewL(*provider);
-    CleanupStack::Pop();
-    return provider;
-    } // CWapSmsProvider::NewL
+	CWapSmsProvider* provider=new(ELeave) CWapSmsProvider(aProtocol);
+	CleanupStack::PushL(provider);
+	provider->iWapSmsProviderWrite = CWapSmsProviderWrite::NewL(*provider);
+	CleanupStack::Pop();
+	return provider;
+	} // CWapSmsProvider::NewL
 
 
 /**
@@ -70,9 +63,9 @@
     :iMessageType(ESmartMessage)
     ,iProtocol(aProtocol)
     ,iSendPending(EFalse)
-    ,iIoctlOutstanding(EFalse)
-    ,iIsNewStyleClient(EFalse)
-    ,iStatusReportScheme(EWapSmsDefault)
+	,iIoctlOutstanding(EFalse)
+	,iIsNewStyleClient(EFalse)
+	,iStatusReportScheme(EWapSmsDefault)
     {
     iRecvdMsgQueue.SetOffset(CWapDatagram::LinkOffset());
     } // CWapSmsProvider::CWapSmsProvider
@@ -100,16 +93,16 @@
  *  Return WAPSMS options
  */
 TInt CWapSmsProvider::GetOption(TUint aLevel,TUint aName, TDes8& aOption)const
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_GETOPTION_1, "CWapSmsProvider::GetOption");
+	{
+	LOGWAPPROT1("CWapSmsProvider::GetOption");
 
-    TInt ret=KErrNone;
-    if (TInt(aLevel)==KWapSmsOptionLevel && TInt(aName)==KWapSmsOptionNameDCS)
-        aOption = TPtrC8((TText8*)&iDataCodingScheme,sizeof(TWapSmsDataCodingScheme));
-    else
-        ret=iProtocol->GetOption(aLevel,aName,aOption,NULL);
-    return ret;
-    } // CWapSmsProvider::GetOption
+	TInt ret=KErrNone;
+	if (TInt(aLevel)==KWapSmsOptionLevel && TInt(aName)==KWapSmsOptionNameDCS)
+		aOption = TPtrC8((TText8*)&iDataCodingScheme,sizeof(TWapSmsDataCodingScheme));
+	else
+		ret=iProtocol->GetOption(aLevel,aName,aOption,NULL);
+	return ret;
+	} // CWapSmsProvider::GetOption
 
 
 /**
@@ -119,76 +112,76 @@
  *  
  */
 TInt CWapSmsProvider::SetOption(TUint aLevel, TUint aName, const TDesC8& aOption)
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_SETOPTION_1, "CWapSmsProvider::SetOption");
-    if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderSetOptionPolicy,"CWapSmsProvider SetOption policy check") != KErrNone))
-        {
-        return KErrPermissionDenied;
-        }
+	{
+	LOGWAPPROT1("CWapSmsProvider::SetOption");
+	if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderSetOptionPolicy,"CWapSmsProvider SetOption policy check") != KErrNone))
+		{
+		return KErrPermissionDenied;
+		}
 
-    TInt ret=KErrNone;
-    if (TInt(aLevel)==KWapSmsOptionLevel)
-    {
-        switch(TInt(aName))
-        {
-        case KWapSmsOptionNameDCS:
-            {
-            iDataCodingScheme = static_cast<TWapSmsDataCodingScheme>(*aOption.Ptr());
-            break;
-            }
-        case KWapSmsOptionWapDatagram:
-            {
-            iMessageType=EWapDatagram;
-            break;
-            }
-        case KWapSmsStatusReportScheme:
-            {
-            iStatusReportScheme = static_cast<TWapSmsStatusReportScheme>(*aOption.Ptr());
-            break;              
-            }
-        case KWapSmsOptionNewStyleClient:
-            {
-            iIsNewStyleClient = ETrue;
-            break;
-            }
-        case KWapSmsOptionOKToDeleteMessage:
-            {
-            //Get the first message from the queue
-            CWapDatagram* msg = iRecvdMsgQueue.First();
-            //Find and delete from SAR
-            TBool found=iProtocol->FindAndDeleteMsg(*msg);
-            if(!found)
-                {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_SETOPTION_2, "CWapSmsProvider::SetOption: Error. Couldn't find the message in the SAR for deletion");
-                break;
-                }
-            //Remove from the queue
-            iRecvdMsgQueue.Remove(*msg);
-            delete msg;
-            break;
-            }
-        default:
-            ret=KErrNotSupported;
-        }
+	TInt ret=KErrNone;
+	if (TInt(aLevel)==KWapSmsOptionLevel)
+	{
+		switch(TInt(aName))
+		{
+		case KWapSmsOptionNameDCS:
+			{
+			iDataCodingScheme = static_cast<TWapSmsDataCodingScheme>(*aOption.Ptr());
+			break;
+			}
+		case KWapSmsOptionWapDatagram:
+			{
+			iMessageType=EWapDatagram;
+			break;
+			}
+		case KWapSmsStatusReportScheme:
+			{
+			iStatusReportScheme = static_cast<TWapSmsStatusReportScheme>(*aOption.Ptr());
+			break;				
+			}
+		case KWapSmsOptionNewStyleClient:
+			{
+			iIsNewStyleClient = ETrue;
+			break;
+			}
+		case KWapSmsOptionOKToDeleteMessage:
+			{
+			//Get the first message from the queue
+			CWapDatagram* msg = iRecvdMsgQueue.First();
+			//Find and delete from SAR
+			TBool found=iProtocol->FindAndDeleteMsg(*msg);
+			if(!found)
+				{
+				LOGWAPPROT1("CWapSmsProvider::SetOption: Error. Couldn't find the message in the SAR for deletion");
+				break;
+				}
+			//Remove from the queue
+			iRecvdMsgQueue.Remove(*msg);
+			delete msg;
+			break;
+			}
+		default:
+			ret=KErrNotSupported;
+		}
 
-    }
-    else
-    {
-        ret=iProtocol->SetOption(aLevel,aName,aOption,NULL);
-    }
-    return ret;
-    } // CWapSmsProvider::SetOption
+	}
+	else
+	{
+		ret=iProtocol->SetOption(aLevel,aName,aOption,NULL);
+	}
+	return ret;
+	} // CWapSmsProvider::SetOption
 
 
 /**
  *  Shutdown the SAP
  */
 void CWapSmsProvider::Shutdown(TCloseType aType)
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_SHUTDOWN_1, "CWapSmsProvider::Shutdown");
-    if (aType!=CServProviderBase::EImmediate)
-        iSocket->CanClose();
-    } // CWapSmsProvider::Shutdown
+	{
+	LOGWAPPROT1("CWapSmsProvider::Shutdown");
+	if (aType!=CServProviderBase::EImmediate)
+		iSocket->CanClose();
+	} // CWapSmsProvider::Shutdown
 
 
 /**
@@ -198,160 +191,160 @@
  *  @capability NetworkServices
  */
 TInt CWapSmsProvider::Write(RMBufChain& aBufChain, TUint /*options*/, TSockAddr* aAddr)
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_WRITE_1, "CWapSmsProvider::Write()");
+	{
+	LOGWAPPROT1("CWapSmsProvider::Write()");
 
-        if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderWritePolicy,"CWapSmsProvider Write policy check") != KErrNone))
-        {
-        return KErrPermissionDenied;
-        }
-    // @note: LOGIFH2A2 macro for logging esock write
+		if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderWritePolicy,"CWapSmsProvider Write policy check") != KErrNone))
+		{
+		return KErrPermissionDenied;
+		}
+	// @note: LOGIFH2A2 macro for logging esock write
 #ifdef SMSLOGGERIF
-    TInt length = aBufChain.Length();
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_WRITE_2, "CWapSmsProvider::Write [%d bytes]", length);
-    TBuf8<0x100> dumpBuf;
-    if(length > 0x100)
-        {
+	TInt length = aBufChain.Length();
+	LOGWAPPROT2("CWapSmsProvider::Write [%d bytes]", length);
+	TBuf8<0x100> dumpBuf;
+	if(length > 0x100)
+		{
 
-        TInt parts=0;
-        TInt offset = 0;
-        while (offset < length)
-            {
-            aBufChain.CopyOut(dumpBuf, offset);
-            offset += length;
-            LOGIF2(_L8("ESock WAP concantonated part: %d"),parts++);
-            LOGIF2(_L8("ESOCK WRITE: %S"),&dumpBuf);
-            LOGIFH2A2(_L8("ESOCK WRITE: "),dumpBuf);
-            }
+		TInt parts=0;
+		TInt offset = 0;
+ 		while (offset < length)
+ 			{
+			aBufChain.CopyOut(dumpBuf, offset);
+			offset += length;
+ 			LOGIF2(_L8("ESock WAP concantonated part: %d"),parts++);
+ 			LOGIF2(_L8("ESOCK WRITE: %S"),&dumpBuf);
+ 			LOGIFH2A2(_L8("ESOCK WRITE: "),dumpBuf);
+ 			}
 
-    }
-    else
-    {
-        aBufChain.CopyOut(dumpBuf, 0);
-        LOGIF2(_L8("ESOCK WRITE: %S"),&dumpBuf);
-        LOGIFH2A2(_L8("ESOCK WRITE: "),dumpBuf);
-    }
+ 	}
+ 	else
+ 	{
+		aBufChain.CopyOut(dumpBuf, 0);
+ 		LOGIF2(_L8("ESOCK WRITE: %S"),&dumpBuf);
+ 		LOGIFH2A2(_L8("ESOCK WRITE: "),dumpBuf);
+	}
 #endif
 
-    // Note that if this fails somehow it still frees the buf chain and sets itself active - it's
-    // not clear to me whether this is good behaviour but it's the pre-mbuf behaviour too
-    iWapSmsProviderWrite->Start(aBufChain, *aAddr);
-    return KErrNone;
-    } // CWapSmsProvider::Write
+	// Note that if this fails somehow it still frees the buf chain and sets itself active - it's
+	// not clear to me whether this is good behaviour but it's the pre-mbuf behaviour too
+	iWapSmsProviderWrite->Start(aBufChain, *aAddr);
+	return KErrNone;
+	} // CWapSmsProvider::Write
 
 
 /**
  *  Read a datagram off the queue
  */
 TInt CWapSmsProvider::GetData(RMBufChain& aBufChain, TUint aLength, TUint /*options*/,TSockAddr* aAddr)
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_GETDATA_1, "CWapSmsProvider::GetData()");
+	{
+	LOGWAPPROT1("CWapSmsProvider::GetData()");
 
-    CWapDatagram* msg = iRecvdMsgQueue.First();
-    if(!iIsNewStyleClient)
-        {
-        iRecvdMsgQueue.Remove(*msg);
-        }
-    TInt err = msg->WapDatagram(aBufChain, aLength);
+	CWapDatagram* msg = iRecvdMsgQueue.First();
+	if(!iIsNewStyleClient)
+		{
+		iRecvdMsgQueue.Remove(*msg);
+		}
+	TInt err = msg->WapDatagram(aBufChain, aLength);
 
-    //@note: LOGIFH2A2 macro for logging esock getdata
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_GETDATA_2, "CWapSmsProvider::GetData");
-    // Logging migrated to WapDatagram() for ease of descriptor ref
+	//@note: LOGIFH2A2 macro for logging esock getdata
+	LOGWAPPROT1("CWapSmsProvider::GetData");
+	// Logging migrated to WapDatagram() for ease of descriptor ref
 
-    if (err > 0 && aAddr)
-        {
-        TWapAddr* wapAddr = reinterpret_cast<TWapAddr*>(aAddr);
-        TInt toPort,fromPort;
-        msg->Ports(fromPort,toPort);
-        wapAddr->SetWapPort(static_cast<TWapPortNumber>(fromPort));
-        TBuf8<KMaxSockAddrSize> addrBuf;
-        addrBuf.Copy(msg->FromAddress());
-        wapAddr->SetWapAddress(addrBuf);
-        }
-    if(!iIsNewStyleClient)
-        {
-        delete msg;
-        }
-    return err > 0? 1: err;     // datagrams are atoms not byte counts
-    } // CWapSmsProvider::GetData
+	if (err > 0 && aAddr)
+		{
+		TWapAddr* wapAddr = reinterpret_cast<TWapAddr*>(aAddr);
+		TInt toPort,fromPort;
+		msg->Ports(fromPort,toPort);
+		wapAddr->SetWapPort(static_cast<TWapPortNumber>(fromPort));
+		TBuf8<KMaxSockAddrSize> addrBuf;
+		addrBuf.Copy(msg->FromAddress());
+		wapAddr->SetWapAddress(addrBuf);
+		}
+	if(!iIsNewStyleClient)
+		{
+		delete msg;
+		}
+	return err > 0? 1: err;		// datagrams are atoms not byte counts
+	} // CWapSmsProvider::GetData
 
 
 /**
  *  New data has arrived notify ESOCK.
  */
 void CWapSmsProvider::NewData(CWapDatagram* aMsg)
-    {
-    TBool notifyEsock = EFalse;
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_NEWDATA_1, "CWapSmsProvider::NewData");
+	{
+	TBool notifyEsock = EFalse;
+	LOGWAPPROT1("CWapSmsProvider::NewData");
 
-    if(iIoctlOutstanding && iName==KSOGetLength && iIsNewStyleClient)
-        {
-        TPckgBuf<TInt> buf= aMsg->WapDatagramLength();
-        iSocket->IoctlComplete(&buf);
-        iIoctlOutstanding= EFalse;
-        iName= NULL;
-        notifyEsock = ETrue;
-        }
-    else if(iIoctlOutstanding && iName==KSOGetMessageParametersLength && iIsNewStyleClient)
-        {
-        CBufFlat* buffer = aMsg->SmsExternalisedStream();
-        TPckgBuf<TInt> buf = buffer->Size();
-        iSocket->IoctlComplete(&buf);
-        iIoctlOutstanding= EFalse;
-        iName= NULL;
-        notifyEsock = ETrue;
-        }
-    else if(iIoctlOutstanding && iName==KSOGetMessageParameters && iIsNewStyleClient)
-        {
-        CBufFlat* buffer = aMsg->SmsExternalisedStream();
-        TPtr8 buf = buffer->Ptr(0);
-        iSocket->IoctlComplete(&buf);
-        iIoctlOutstanding= EFalse;
-        iName= NULL;
-        notifyEsock = ETrue;
-        }
-    else if(iName!=KSOGetLength && iName!=KSOGetMessageParametersLength && iName!=KSOGetMessageParameters && iIsNewStyleClient)
-        {
-        notifyEsock= EFalse;
-        }
+	if(iIoctlOutstanding && iName==KSOGetLength && iIsNewStyleClient)
+		{
+		TPckgBuf<TInt> buf= aMsg->WapDatagramLength();
+		iSocket->IoctlComplete(&buf);
+		iIoctlOutstanding= EFalse;
+		iName= NULL;
+		notifyEsock = ETrue;
+		}
+	else if(iIoctlOutstanding && iName==KSOGetMessageParametersLength && iIsNewStyleClient)
+		{
+		CBufFlat* buffer = aMsg->SmsExternalisedStream();
+		TPckgBuf<TInt> buf = buffer->Size();
+		iSocket->IoctlComplete(&buf);
+		iIoctlOutstanding= EFalse;
+		iName= NULL;
+		notifyEsock = ETrue;
+		}
+	else if(iIoctlOutstanding && iName==KSOGetMessageParameters && iIsNewStyleClient)
+		{
+		CBufFlat* buffer = aMsg->SmsExternalisedStream();
+		TPtr8 buf = buffer->Ptr(0);
+		iSocket->IoctlComplete(&buf);
+		iIoctlOutstanding= EFalse;
+		iName= NULL;
+		notifyEsock = ETrue;
+		}
+	else if(iName!=KSOGetLength && iName!=KSOGetMessageParametersLength && iName!=KSOGetMessageParameters && iIsNewStyleClient)
+		{
+		notifyEsock= EFalse;
+		}
 
-    if(!iIsNewStyleClient || notifyEsock)
-        iSocket->NewData(1);
-    //else we notify ESock in IOCTL for new client
-    } // CWapSmsProvider::NewData
+	if(!iIsNewStyleClient || notifyEsock)
+		iSocket->NewData(1);
+	//else we notify ESock in IOCTL for new client
+	} // CWapSmsProvider::NewData
 
 
 /**
  *  Error happened, notify ESOCK
  */
 void CWapSmsProvider::Error(TInt aError, TUint aOperationMask)
-    {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_ERROR_1, "CWapSmsProvider::Error [aError=%d, mask=%u] ", aError, aOperationMask);
+	{
+	LOGWAPPROT3("CWapSmsProvider::Error [aError=%d, mask=%d] ", aError, aOperationMask);
 
-    iSocket->Error(aError, aOperationMask);
-    } // CWapSmsProvider::Error
+	iSocket->Error(aError, aOperationMask);
+	} // CWapSmsProvider::Error
 
 
 /**
  *  Return the offset to the dblquelink
  */
 TInt CWapSmsProvider::LinkOffset()
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_LINKOFFSET_1, "CWapSmsProvider::LinkOffset");
+	{
+	LOGWAPPROT1("CWapSmsProvider::LinkOffset");
 
-    return _FOFF(CWapSmsProvider,iSAPLink);
-    } // CWapSmsProvider::LinkOffset
+	return _FOFF(CWapSmsProvider,iSAPLink);
+	} // CWapSmsProvider::LinkOffset
 
 
 /**
  *  Return the address associated with the sap
  */
 void CWapSmsProvider::LocalName(TSockAddr& aAddr) const
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_LOCALNAME_1, "CWapSmsProvider::LocalName");
+	{
+	LOGWAPPROT1("CWapSmsProvider::LocalName");
 
-    Mem::Copy(&aAddr,&iLocalAddress,sizeof(TSockAddr));
-    } // CWapSmsProvider::LocalName
+	Mem::Copy(&aAddr,&iLocalAddress,sizeof(TSockAddr));
+	} // CWapSmsProvider::LocalName
 
 
 /**
@@ -360,61 +353,61 @@
  *  @capability NetworkServices
  */
 TInt CWapSmsProvider::SetLocalName(TSockAddr& aAddr)
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_SETLOCALNAME_1, "CWapSmsProvider::SetLocalName()");
+	{
+	LOGWAPPROT1("CWapSmsProvider::SetLocalName()");
 
-        if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderSetLocalNamePolicy,"CWapSmsProvider SetLocalName policy check") != KErrNone))
-        {
-        return KErrPermissionDenied;
-        }
-    TWapAddr* wapAddr = reinterpret_cast<TWapAddr*>(&aAddr);
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_SETLOCALNAME_2, "CWapSmsProvider::SetLocalName %d",wapAddr->WapPort());
-    // Due ESOCK interface port EWapPortUnspecified value (-1)  can be transferred as a maximum unsigned 16 int
-    if (wapAddr->WapPort()==EWapPortUnspecified || wapAddr->WapPort()==static_cast<TUint16>(EWapPortUnspecified))
-        {
-        if(!iProtocol->AllocateLocalAddress(iLocalAddress))
-            return KErrInUse;
-        else return KErrNone;
-        }
+		if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderSetLocalNamePolicy,"CWapSmsProvider SetLocalName policy check") != KErrNone))
+		{
+		return KErrPermissionDenied;
+		}
+	TWapAddr* wapAddr = reinterpret_cast<TWapAddr*>(&aAddr);
+	LOGWAPPROT2("CWapSmsProvider::SetLocalName %d",wapAddr->WapPort());
+	// Due ESOCK interface port EWapPortUnspecified value (-1)  can be transferred as a maximum unsigned 16 int
+	if (wapAddr->WapPort()==EWapPortUnspecified || wapAddr->WapPort()==static_cast<TUint16>(EWapPortUnspecified))
+		{
+		if(!iProtocol->AllocateLocalAddress(iLocalAddress))
+			return KErrInUse;
+		else return KErrNone;
+		}
 
 
-    TInt ret=iProtocol->AddrAlreadyUsedByWAP(*wapAddr,this);
-    if(ret == KErrInUse) return ret;
-    else if(ret == KErrAlreadyExists) return KErrNone;
+	TInt ret=iProtocol->AddrAlreadyUsedByWAP(*wapAddr,this);
+	if(ret == KErrInUse) return ret;
+	else if(ret == KErrAlreadyExists) return KErrNone;
 
-    TSmsAddr addr;
-    if(wapAddr->Port() <=255)
-        addr.SetSmsAddrFamily(ESmsAddrApplication8BitPort);
-    else
-        addr.SetSmsAddrFamily(ESmsAddrApplication16BitPort);
+	TSmsAddr addr;
+	if(wapAddr->Port() <=255)
+		addr.SetSmsAddrFamily(ESmsAddrApplication8BitPort);
+	else
+		addr.SetSmsAddrFamily(ESmsAddrApplication16BitPort);
 
-    addr.SetPort(wapAddr->Port());
+	addr.SetPort(wapAddr->Port());
 
-    if((iProtocol->SmsProtocol()->SmsAddrIsAlreadyUsed(NULL,addr)))
-        return KErrInUse;
+	if((iProtocol->SmsProtocol()->SmsAddrIsAlreadyUsed(NULL,addr)))
+		return KErrInUse;
 
-    Mem::Copy(&iLocalAddress,&aAddr,sizeof(TSockAddr));
-    TInt err;
-    TRAP(err,ret = iProtocol->CheckSarL(*wapAddr,this));
-    if(err!=KErrNone)
-            return err;
-    if(ret!=KErrNone)
-        {
-        Error(ret,MSocketNotify::EErrorAllOperations);
-        }
-    return KErrNone;
-    } // RSocket::Bind
+	Mem::Copy(&iLocalAddress,&aAddr,sizeof(TSockAddr));
+	TInt err;
+	TRAP(err,ret = iProtocol->CheckSarL(*wapAddr,this));
+	if(err!=KErrNone)
+			return err;
+	if(ret!=KErrNone)
+		{
+		Error(ret,MSocketNotify::EErrorAllOperations);
+		}
+	return KErrNone;
+	} // RSocket::Bind
 
 
 /**
  *  Returns true if aAddr matches the local address of the sap
  */
 TBool CWapSmsProvider::MatchesLocalAddress(const TWapAddr& aAddr)
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_MATCHESLOCALADDRESS_1, "CWapSmsProvider::MatchesLocalAddress");
+	{
+	LOGWAPPROT1("CWapSmsProvider::MatchesLocalAddress");
 
-    return (iLocalAddress == aAddr);
-    } // CWapSmsProvider::MatchesLocalAddress
+	return (iLocalAddress == aAddr);
+	} // CWapSmsProvider::MatchesLocalAddress
 
 //
 
@@ -434,195 +427,195 @@
  *  
  */
 void CWapSmsProvider::Ioctl(TUint aLevel,TUint aName,TDes8 * /*aOption*/)
-    {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_IOCTL_1, "CWapSmsProvider::Ioctl [aLevel=%u, aName=%u]", aLevel, aName);
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_IOCTL_2, "CWapSmsProtocol::Ioctl [provider=0x%08x]",this);
+	{
+	LOGWAPPROT3("CWapSmsProvider::Ioctl [aLevel=%d, aName=%d]", aLevel, aName);
+	LOGWAPPROT2("CWapSmsProtocol::Ioctl [provider=0x%08x]",this);
 
-    iName=aName;
-    switch (aLevel)
-        {
-        case KSolWapProv:
-            {
-            if(iIoctlOutstanding || !iIsNewStyleClient)
-                {
-                Error(KErrInUse,MSocketNotify::EErrorIoctl);
-                break;
-                }
-            switch (iName)
-                {
-                case KSOGetLength:
-                //
-                // Get the length
-                //
-                    {
-                    if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderGetLengthIoctlPolicy,"CWapSmsProvider GetLength Ioctl policy check") != KErrNone))
-                        {
-                        Error(KErrPermissionDenied,MSocketNotify::EErrorIoctl);
-                        return;
-                        }
-                    iIoctlOutstanding = ETrue;
-                    //check the queue for any other message for this client and call new data if any exist
-                    if(!iRecvdMsgQueue.IsEmpty())
-                        {
-                        CWapDatagram* msg = iRecvdMsgQueue.First();
-                        //check the datagram.
-                        if(msg->IsComplete())
-                            {
-                            NewData(msg);
-                            }
-                        else
-                            {
-                            //  else notify the client with error.
-                            //  Note:this can happen if client uses 8-Bit port number for 7-Bit datagram
-                            Error(KErrGeneral,MSocketNotify::EErrorIoctl);
-                            iIoctlOutstanding = EFalse;
-                            }
+	iName=aName;
+	switch (aLevel)
+		{
+		case KSolWapProv:
+			{
+		    if(iIoctlOutstanding || !iIsNewStyleClient)
+				{
+				Error(KErrInUse,MSocketNotify::EErrorIoctl);
+				break;
+				}
+			switch (iName)
+				{
+				case KSOGetLength:
+				//
+				// Get the length
+				//
+					{
+					if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderGetLengthIoctlPolicy,"CWapSmsProvider GetLength Ioctl policy check") != KErrNone))
+        				{
+        				Error(KErrPermissionDenied,MSocketNotify::EErrorIoctl);
+        				return;
+        				}
+					iIoctlOutstanding = ETrue;
+					//check the queue for any other message for this client and call new data if any exist
+					if(!iRecvdMsgQueue.IsEmpty())
+						{
+						CWapDatagram* msg = iRecvdMsgQueue.First();
+						//check the datagram.
+						if(msg->IsComplete())
+							{
+							NewData(msg);
+							}
+						else
+							{
+							//	else notify the client with error.
+							//	Note:this can happen if client uses 8-Bit port number for 7-Bit datagram
+							Error(KErrGeneral,MSocketNotify::EErrorIoctl);
+							iIoctlOutstanding = EFalse;
+							}
 
-                        }
-                    break;
-                    }
-                
-                case KSOGetMessageParametersLength:
-                //
-                // Get the Message Parameters Length
-                //
-                    {
-                    if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderGetMessageParamLengthIoctlPolicy,"CWapSmsProvider KSOGetMessageParametersLength Ioctl policy check") != KErrNone))
-                        {
-                        Error(KErrPermissionDenied,MSocketNotify::EErrorIoctl);
-                        return;
-                        }
-                    iIoctlOutstanding = ETrue;
-                    //check the queue for any other message for this client and call new data if any exist
-                    if(!iRecvdMsgQueue.IsEmpty())
-                        {
-                        CWapDatagram* msg = iRecvdMsgQueue.First();
-                        //check the datagram.
-                        if(msg->IsComplete())
-                            {
-                            NewData(msg);
-                            }
-                        else
-                            {
-                            //  else notify the client with error.
-                            //  Note:this can happen if client uses 8-Bit port number for 7-Bit datagram
-                            Error(KErrGeneral,MSocketNotify::EErrorIoctl);
-                            iIoctlOutstanding = EFalse;
-                            }
+						}
+					break;
+					}
+				
+				case KSOGetMessageParametersLength:
+				//
+				// Get the Message Parameters Length
+				//
+					{
+					if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderGetMessageParamLengthIoctlPolicy,"CWapSmsProvider KSOGetMessageParametersLength Ioctl policy check") != KErrNone))
+        				{
+        				Error(KErrPermissionDenied,MSocketNotify::EErrorIoctl);
+        				return;
+        				}
+					iIoctlOutstanding = ETrue;
+					//check the queue for any other message for this client and call new data if any exist
+					if(!iRecvdMsgQueue.IsEmpty())
+						{
+						CWapDatagram* msg = iRecvdMsgQueue.First();
+						//check the datagram.
+						if(msg->IsComplete())
+							{
+							NewData(msg);
+							}
+						else
+							{
+							//	else notify the client with error.
+							//	Note:this can happen if client uses 8-Bit port number for 7-Bit datagram
+							Error(KErrGeneral,MSocketNotify::EErrorIoctl);
+							iIoctlOutstanding = EFalse;
+							}
 
-                        }
-                    break;
-                    }
-                    
-                case KSOGetMessageParameters:
-                //
-                // Get the Message Parameters
-                //
-                    {
-                    if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderGetMessageParametersIoctlPolicy,"CWapSmsProvider GetMessageParameters Ioctl policy check") != KErrNone))
-                        {
-                        Error(KErrPermissionDenied,MSocketNotify::EErrorIoctl);
-                        return;
-                        }
-                    iIoctlOutstanding = ETrue;
-                    //check the queue for any other message for this client and call new data if any exist
-                    if(!iRecvdMsgQueue.IsEmpty())
-                        {
-                        CWapDatagram* msg = iRecvdMsgQueue.First();
-                        //check the datagram.
-                        if(msg->IsComplete())
-                            {
-                            NewData(msg);
-                            }
-                        else
-                            {
-                            //  else notify the client with error.
-                            //  Note:this can happen if client uses 8-Bit port number for 7-Bit datagram
-                            Error(KErrGeneral,MSocketNotify::EErrorIoctl);
-                            iIoctlOutstanding = EFalse;
-                            }
+						}
+					break;
+					}
+					
+				case KSOGetMessageParameters:
+				//
+				// Get the Message Parameters
+				//
+					{
+					if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderGetMessageParametersIoctlPolicy,"CWapSmsProvider GetMessageParameters Ioctl policy check") != KErrNone))
+        				{
+        				Error(KErrPermissionDenied,MSocketNotify::EErrorIoctl);
+        				return;
+        				}
+					iIoctlOutstanding = ETrue;
+					//check the queue for any other message for this client and call new data if any exist
+					if(!iRecvdMsgQueue.IsEmpty())
+						{
+						CWapDatagram* msg = iRecvdMsgQueue.First();
+						//check the datagram.
+						if(msg->IsComplete())
+							{
+							NewData(msg);
+							}
+						else
+							{
+							//	else notify the client with error.
+							//	Note:this can happen if client uses 8-Bit port number for 7-Bit datagram
+							Error(KErrGeneral,MSocketNotify::EErrorIoctl);
+							iIoctlOutstanding = EFalse;
+							}
 
-                        }
-                    break;
-                    }
+						}
+					break;
+					}
 
 
-                default:
-                //
-                // Unsupported ioctl name
-                //
-                    {
-                    // Error gracefully
-                    Error(KErrNotSupported,MSocketNotify::EErrorIoctl);
-                    }
-                }
-            break;
-            }
-        default:
-            // Gracefully error in release build
-            Error(KErrNotSupported,MSocketNotify::EErrorIoctl);
-        }
-    } // CServProviderBase::Ioctl
+				default:
+				//
+				// Unsupported ioctl name
+				//
+					{
+					// Error gracefully
+					Error(KErrNotSupported,MSocketNotify::EErrorIoctl);
+					}
+				}
+			break;
+			}
+		default:
+			// Gracefully error in release build
+			Error(KErrNotSupported,MSocketNotify::EErrorIoctl);
+		}
+	} // CServProviderBase::Ioctl
 
 
 /**
  *  Cancel IOCTL- can only have one outstanding IOCTL at a time
  */
 void CWapSmsProvider::CancelIoctl(TUint aLevel,TUint aName)
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_CANCELIOCTL_1, "CWapSmsProvider::CancelIoctl()");
+	{
+	LOGWAPPROT1("CWapSmsProvider::CancelIoctl()");
 
-    if(!iIoctlOutstanding || (aName!=iName) || (aLevel!=KSolWapProv))
-        {
-        Error(KErrNotFound,MSocketNotify::EErrorIoctl);
-        }
-    else
-        {
-        iIoctlOutstanding=EFalse;
-        }
-    } // CWapSmsProvider::CancelIoctl
+	if(!iIoctlOutstanding || (aName!=iName) || (aLevel!=KSolWapProv))
+		{
+		Error(KErrNotFound,MSocketNotify::EErrorIoctl);
+		}
+	else
+		{
+		iIoctlOutstanding=EFalse;
+		}
+	} // CWapSmsProvider::CancelIoctl
 
 
 /**
  *  Start the provider- does nothing
  */
 void CWapSmsProvider::Start()
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_START_1, "CWapSmsProvider::Start()");
+	{
+	LOGWAPPROT1("CWapSmsProvider::Start()");
 
-    } // CWapSmsProvider::Start
+	} // CWapSmsProvider::Start
 
 void CWapSmsProvider::AddToQueue(CWapDatagram* aMsg)
 /**
  *  Adding the datagram to received messages queue
  */
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_ADDTOQUEUE_1, "CWapSmsProvider::AddToQueue...");
+	{
+	LOGWAPPROT1("CWapSmsProvider::AddToQueue...");
 
-    iRecvdMsgQueue.AddLast(*aMsg);
-    NewData(aMsg);
-    } // CWapSmsProvider::AddToQueue
+	iRecvdMsgQueue.AddLast(*aMsg);
+	NewData(aMsg);
+	} // CWapSmsProvider::AddToQueue
 
 
 TInt CWapSmsProvider::SecurityCheck(MProvdSecurityChecker* aSecurityChecker)
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_SECURITYCHECK_1, "CWapSmsProvider::SecurityCheck()");
+ 	{
+ 	LOGWAPPROT1("CWapSmsProvider::SecurityCheck()");
 
-    iSecurityChecker=aSecurityChecker;
-    return KErrNone;
-    } // CWapSmsProvider::SecurityCheck
+ 	iSecurityChecker=aSecurityChecker;
+	return KErrNone;
+ 	} // CWapSmsProvider::SecurityCheck
 
 
 TWapSmsStatusReportScheme CWapSmsProvider::GetStatusReportScheme()
-    {
-    return iStatusReportScheme;
-    }
+	{
+	return iStatusReportScheme;
+	}
 
-    
+	
 TWapSmsDataCodingScheme CWapSmsProvider::GetDataCodingScheme()
-    {
-    return iDataCodingScheme;
-    }
+	{
+	return iDataCodingScheme;
+	}
 
 
 //
@@ -634,14 +627,14 @@
  *  2 phase constructor
  */
 CWapSmsProviderWrite* CWapSmsProviderWrite::NewL(CWapSmsProvider& aWapSmsProvider)
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDERWRITE_NEWL_1, "CWapSmsProviderWrite::NewL");
-    CWapSmsProviderWrite* self = new (ELeave) CWapSmsProviderWrite(aWapSmsProvider);
-    CleanupStack::PushL(self);
-    self->iMsgSender = CWapSapMessageSender::NewL(aWapSmsProvider.iProtocol->SmsProtocol(), &aWapSmsProvider);
-    CleanupStack::Pop(self);
-    return self;
-    } // CWapSmsProviderWrite::NewL
+	{
+	LOGWAPPROT1("CWapSmsProviderWrite::NewL");
+	CWapSmsProviderWrite* self = new (ELeave) CWapSmsProviderWrite(aWapSmsProvider);
+	CleanupStack::PushL(self);
+	self->iMsgSender = CWapSapMessageSender::NewL(aWapSmsProvider.iProtocol->SmsProtocol(), &aWapSmsProvider);
+	CleanupStack::Pop(self);
+	return self;
+	} // CWapSmsProviderWrite::NewL
 
 
 /**
@@ -651,7 +644,7 @@
     :CActive(EPriorityStandard)
     ,iWapSmsProvider(aWapSmsProvider)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDERWRITE_CTOR_1, "CWapSmsProviderWrite::CWapSmsProviderWrite()");
+    LOGWAPPROT1("CWapSmsProviderWrite::CWapSmsProviderWrite()");
 
     CActiveScheduler::Add(this);
     } // CWapSmsProviderWrite::CWapSmsProviderWrite
@@ -669,80 +662,76 @@
 
 
 void CWapSmsProviderWrite::Start(RMBufChain& aBufChain, TSockAddr& aAddr)
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDERWRITE_START_1, "CWapSmsProviderWrite::Start");
-    iWapAddr = reinterpret_cast<TWapAddr&>(aAddr);
-    delete iDes;
-    iDes = NULL;
-    TRAPD(err, (iDes = HBufC8::NewL(aBufChain.Length())) );
-    if(err == KErrNone)
-        {
-        TPtr8 desBuf(iDes->Des());
-        desBuf.SetLength(aBufChain.Length());
-        aBufChain.CopyOut(desBuf, 0);
-        // Logging migrated from CWapSmsProvider::GetData
-        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDERWRITE_START_2, "ESOCK READ: \"%s\"", *iDes);
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
-        LogSmsIfHexBuf(_L8("ESOCK READ"), *iDes);
-        TBuf<40> timestamp;
-        SmsTimeStampL(timestamp);
-        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSSTACKTESTUTILS_PRINTANDTESTDECODEL_1, "%S",timestamp);
-#endif
-        }
-    aBufChain.Free();
+   	{
+   	LOGWAPPROT1("CWapSmsProviderWrite::Start");
+   	iWapAddr = reinterpret_cast<TWapAddr&>(aAddr);
+   	delete iDes;
+   	iDes = NULL;
+ 	TRAPD(err, (iDes = HBufC8::NewL(aBufChain.Length())) );
+ 	if(err == KErrNone)
+ 		{
+ 		TPtr8 desBuf(iDes->Des());
+ 		desBuf.SetLength(aBufChain.Length());
+ 		aBufChain.CopyOut(desBuf, 0);
+ 		// Logging migrated from CWapSmsProvider::GetData
+ 		LOGSMSIF2("ESOCK READ: \"%S\"", iDes);
+ 		LOGSMSIFHEXBUF(_L8("ESOCK READ"), *iDes);
+ 		LOGSMSIFTIMESTAMP();
+ 		}
+ 	aBufChain.Free();
 
-    TRequestStatus* status = &iStatus;
-    User::RequestComplete(status, err);
-    SetActive();
-    } // CWapSmsProviderWrite::Start
+   	TRequestStatus* status = &iStatus;
+   	User::RequestComplete(status, err);
+   	SetActive();
+   	} // CWapSmsProviderWrite::Start
 
 
 void CWapSmsProviderWrite::RunL()
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDERWRITE_RUNL_1, "CWapSmsProviderWrite::RunL");
-    User::LeaveIfError(iStatus.Int());
+	{
+	LOGWAPPROT1("CWapSmsProviderWrite::RunL");
+	User::LeaveIfError(iStatus.Int());
 
-    //no need to use cleanup stack
-    CWapDatagram* datagram = CWapDatagram::NewL(*iDes);
+	//no need to use cleanup stack
+	CWapDatagram* datagram = CWapDatagram::NewL(*iDes);
 
-    if (iWapSmsProvider.iDataCodingScheme == EWapSms7BitDCS)
-        datagram->SetAlphabet(TSmsDataCodingScheme::ESmsAlphabet7Bit);
-    else
-        datagram->SetAlphabet(TSmsDataCodingScheme::ESmsAlphabet8Bit);
-    
-    if (iWapSmsProvider.iStatusReportScheme == EWapSmsTPSRR)
-        {
-        datagram->SetStatusReportScheme(ETPSRRScheme);
-        }
-    else
-        {
-        datagram->SetStatusReportScheme(EDefaultScheme);
-        } 
-        
-    TBuf<KMaxSockAddrSize> addrBuf;
-    addrBuf.Copy(iWapAddr.WapAddress());
-    datagram->SetToAddress(addrBuf);
-    TInt fromPort = iWapSmsProvider.iLocalAddress.WapPort();
-    datagram->SetPorts(fromPort, iWapAddr.WapPort());
+	if (iWapSmsProvider.iDataCodingScheme == EWapSms7BitDCS)
+		datagram->SetAlphabet(TSmsDataCodingScheme::ESmsAlphabet7Bit);
+	else
+		datagram->SetAlphabet(TSmsDataCodingScheme::ESmsAlphabet8Bit);
+	
+	if (iWapSmsProvider.iStatusReportScheme == EWapSmsTPSRR)
+		{
+		datagram->SetStatusReportScheme(ETPSRRScheme);
+		}
+	else
+		{
+		datagram->SetStatusReportScheme(EDefaultScheme);
+		} 
+		
+	TBuf<KMaxSockAddrSize> addrBuf;
+	addrBuf.Copy(iWapAddr.WapAddress());
+	datagram->SetToAddress(addrBuf);
+	TInt fromPort = iWapSmsProvider.iLocalAddress.WapPort();
+	datagram->SetPorts(fromPort, iWapAddr.WapPort());
 
-    iMsgSender->SendDatagramL(datagram); // takes ownership of datagram
-    } // CWapSmsProviderWrite::RunL
+	iMsgSender->SendDatagramL(datagram); // takes ownership of datagram
+	} // CWapSmsProviderWrite::RunL
 
 
 TInt CWapSmsProviderWrite::RunError(TInt aError)
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDERWRITE_RUNERROR_1, "CWapSmsProviderWrite::RunError");
-    iWapSmsProvider.Error(aError, MSocketNotify::EErrorSend);
-    return KErrNone;
-    } // CWapSmsProviderWrite::RunError
+	{
+	LOGWAPPROT1("CWapSmsProviderWrite::RunError");
+	iWapSmsProvider.Error(aError, MSocketNotify::EErrorSend);
+	return KErrNone;
+	} // CWapSmsProviderWrite::RunError
 
 
 void CWapSmsProviderWrite::DoCancel()
-    {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDERWRITE_DOCANCEL_1, "CWapSmsProviderWrite::DoCancel");
-    TRequestStatus* status = &iStatus;
-    User::RequestComplete(status, KErrCancel);
-    } // CWapSmsProviderWrite::DoCancel
+	{
+	LOGWAPPROT1("CWapSmsProviderWrite::DoCancel");
+	TRequestStatus* status = &iStatus;
+	User::RequestComplete(status, KErrCancel);
+	} // CWapSmsProviderWrite::DoCancel
 
 
 // EOF - WS_PRVDR.CPP

--- a/smsprotocols/smsstack/wapprot/test/TE_WAPDGRM/TE_wapdgrm.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/test/TE_WAPDGRM/TE_wapdgrm.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -13,6 +13,9 @@
 // Description:
 //
 
+#include <comms-infras/commsdebugutility.mmh>
+#include <cflog.mmh>
+
 TARGET      te_wapdgrm.exe
 CAPABILITY ReadDeviceData WriteDeviceData NetworkControl NetworkServices ReadUserData WriteUserData PowerMgmt
 TARGETTYPE  exe
@@ -34,7 +37,6 @@
 USERINCLUDE   ../../../common/inc
 USERINCLUDE   ../../../test
 USERINCLUDE   ../../../smsu/inc
-USERINCLUDE	  ../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN

--- a/smsprotocols/smsstack/wapprot/test/TE_WAPDGRM/TE_wapdgrmbase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/test/TE_WAPDGRM/TE_wapdgrmbase.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -18,15 +18,10 @@
 #include "TE_wapdgrmbase.h"
 #include "smsstackutils.h"
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "TE_wapdgrmbaseTraces.h"
-#endif
-
 // WapProt code needs it
 GLDEF_C void Panic(TWAPSMSPanic aPanic)
 {
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TE_WAPDGRMBASE_PANIC_1, "WAPUPANIC %d", aPanic);
+	LOGWAPPROT2("WAPUPANIC %d", aPanic);
 	_LIT(KWapProtPanic, "WAPPROT");
 	User::Panic(KWapProtPanic, aPanic);
 }

--- a/smsprotocols/smsstack/wapprot/test/TE_WAPTHDR/TE_testwapthdr.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/test/TE_WAPTHDR/TE_testwapthdr.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -20,11 +20,6 @@
 #include "TE_wapthdrbase.h"
 #include "smsstackutils.h"
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "TE_testwapthdrTraces.h"
-#endif
-
 const TInt KSmsLogBufferSize = 1280;
 
 TVerdict CTestParseWapTextMessage::doTestStepL()
@@ -208,7 +203,7 @@
 	// Send a buffer too long for the logger to handle, therefore causing an overflow.
 	// Function will panic if overflow handler is not implemented correctly.
 	INFO_PRINTF1(_L("Testing LOGSMSIF2..."));
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTESTLOGGEROVERFLOW_DOTESTSTEPL_1, "%s",buf);
+	LOGSMSIF2("%S",&buf);
 
 	return TestStepResult();
 	}

--- a/smsprotocols/smsstack/wapprot/test/TE_WAPTHDR/TE_wapthdr.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/test/TE_WAPTHDR/TE_wapthdr.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -32,12 +32,11 @@
 USERINCLUDE   ../../../test
 USERINCLUDE   ../../../smsu/inc
 
-USERINCLUDE   ../traces
-
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY       euser.lib efsrv.lib testconfigfileparser.lib
 LIBRARY		  testexecutelogclient.lib
 LIBRARY		  testexecuteutils.lib
+DEBUGLIBRARY  comsdbgutil.lib
 
 SMPSAFE

--- a/smsprotocols/smsstack/wapprot/test/TE_WAPTHDR/TE_wapthdrbase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/test/TE_WAPTHDR/TE_wapthdrbase.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -17,15 +17,10 @@
 
 #include "TE_wapthdrbase.h"
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "TE_wapthdrbaseTraces.h"
-#endif
-
 // WapProt code needs it
 GLDEF_C void Panic(TWAPSMSPanic aPanic)
 {
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TE_WAPTHDRBASE_PANIC_1, "WAPUPANIC %d", aPanic);
+	LOGWAPPROT2("WAPUPANIC %d", aPanic);
 	_LIT(KWapProtPanic, "WAPPROT");
 	User::Panic(KWapProtPanic, aPanic);
 }

--- a/smsprotocols/smsstack/wapprot/test/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-// Copyright (c) 1999-2010 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:
-// WAP ESOCK protocol module
-// 
-//
-
-/**
- @file
-*/
-
-PRJ_TESTEXPORTS
-
-//
-// Test files used by all WAP tests...
-//
-../configfiles/tone1.rtp                           z:/testdata/configs/tone1.rtp
-../configfiles/tone2.rtp                           z:/testdata/configs/tone2.rtp
-../configfiles/tone3.rtp                           z:/testdata/configs/tone3.rtp
-../configfiles/vcard1.vcf                          z:/testdata/configs/vcard1.vcf
-../configfiles/vcard2.vcf                          z:/testdata/configs/vcard2.vcf
-../configfiles/vcard3.vcf                          z:/testdata/configs/vcard3.vcf
-
-//
-// TE_WAPDGRM test files...
-//
-../TE_WAPDGRM/TE_wapdgrm.script                    z:/testdata/scripts/te_wapdgrm.script
-
-//
-// TE_WAPHDR test files...
-//
-../configfiles/te_waphdr.txt                       z:/testdata/configs/te_waphdr.txt
-../TE_WAPTHDR/TE_wapthdr.script                    z:/testdata/scripts/te_wapthdr.script
-../TE_WAPTHDR/TE_wapthdr_setup.script              z:/testdata/scripts/te_wapthdr_setup.script
-
-//
-// TE_WAPSMS test files...
-//
-../TE_WAPSMS/TE_wapsms.script                      z:/testdata/scripts/te_wapsms.script
-../TE_WAPSMS/TE_wapsms_setup.script                z:/testdata/scripts/te_wapsms_setup.script
-../TE_WAPSMS/TE_wapsms.txt                         z:/testdata/configs/te_wapsms.txt
-../TE_WAPSMS/te_setupgsmsms.txt                    z:/testdata/configs/te_setupgsmsms.txt
-../TE_WAPSMS/te_wapsms_commdb.cfg                  z:/testdata/configs/te_wapsms_commdb.cfg
-
-//
-// TE_WAPPROT test files...
-//
-../Te_wapprot/Te_WapProt.script                    z:/testdata/scripts/te_wapprot.script
-../Te_wapprot/Config.txt                           z:/testdata/configs/wapprotsuite/config.txt
-../Te_wapprot/WapProtSuite.cfg                     z:/testdata/configs/wapprotsuite/wapprotsuite.cfg
-../Te_wapprot/WapProtSuiteMM.cfg                   z:/testdata/configs/wapprotsuite/wapprotsuitemm.cfg
-../Te_wapprot/StatusReportsRequested.cfg           z:/testdata/configs/wapprotsuite/statusreportsrequested.cfg
-../Te_wapprot/WapProtSuite.ini                     z:/testdata/configs/wapprotsuite/wapprotsuite.ini
-../Te_wapprot/WapStatusReports.ini                 z:/testdata/configs/wapprotsuite/wapstatusreports.ini
-../Te_wapprot/WAPStackOutOfDiskSpace.ini           z:/testdata/configs/wapprotsuite/wapstackoutofdiskspace.ini
-../Te_wapprot/Te_WapStackOutOfDiskSpace.script     z:/testdata/scripts/te_wapstackoutofdiskspace.script
-../Te_wapprot/Te_WapStackOutOfDiskSpace_ARM_UREL.script     z:/testdata/scripts/te_wapstackoutofdiskspace_arm_urel.script
-
-
-
-PRJ_TESTMMPFILES
-
-../TE_WAPSMS/TE_wapsms.mmp
-../Te_wapprot/TE_WapProt.mmp
-../TE_WAPTHDR/TE_wapthdr.mmp
-../TE_WAPDGRM/TE_wapdgrm.mmp
\ No newline at end of file

--- a/smsprotocols/smsstack/wapprot/test/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/smsprotocols/smsstack/wapprot/test/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_TE_WAPDGRMBASE_PANIC_1=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCTL_1=0x12f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCT_1=0x12e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL1_1=0x133
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL_1=0x132
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1=0x12d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DTOR_1=0x12b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1=0x12c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1=0x130
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGS_1=0x131
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_LINKOFFSET_1=0x135
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL1_1=0x12a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_1=0x117
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_10=0x120
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_11=0x121
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_12=0x122
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_13=0x123
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_14=0x124
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_15=0x125
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_16=0x126
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_17=0x127
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_18=0x128
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_19=0x129
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_2=0x118
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_3=0x119
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_4=0x11a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_5=0x11b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_6=0x11c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_7=0x11d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_8=0x11e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_9=0x11f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1=0x134
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_1=0x136
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_2=0x137
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_ADDMESSAGEL_1=0x139
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CONSTRUCTL_1=0x13c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CREATEENTRYL_1=0x141
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x13f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1=0x13b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_GETDATAGRAML_1=0x13a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x13d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x13e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_NEWL_1=0x138
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_OPENSTOREL_1=0x142
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_POPULATEENTRY_1=0x140
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_CALCULATETOTALSEGMENTS_1=0x34
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_CREATEHEADER_1=0x33
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_ENCODESEGMENTSL_1=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSENUMBER_1=0x30
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSEWAPTEXTHEADER_1=0x31
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSEWAPTEXTHEADER_2=0x32
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSE_1=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSE_2=0x2f

--- a/smsprotocols/smsstack/wapprot/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/smsprotocols/smsstack/wapprot/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,214 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_INSTALLWAPSMS_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CSMSSTACKTESTUTILS_PRINTANDTESTDECODEL_1=0xcf
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCTL_1=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCT_1=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL1_1=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL_1=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DTOR_1=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGS_1=0x5f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_LINKOFFSET_1=0x63
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL1_1=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_1=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_10=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_11=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_12=0x50
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_13=0x51
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_14=0x52
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_15=0x53
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_16=0x54
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_17=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_18=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_19=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_2=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_3=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_4=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_5=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_6=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_7=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_8=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_9=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1=0x62
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_1=0x64
-[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_2=0x65
-[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_CLIENTCONFIRMSMESSAGE_1=0x94
-[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_ENUMERATEPHONECOMPLETED_1=0x97
-[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_GETLOCALADDRESS_1=0x90
-[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_MESSAGEDELETECOMPLETED_1=0x99
-[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_MESSAGERECEIVED_1=0x96
-[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_MESSAGESENDCOMPLETED_1=0x93
-[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_MESSAGEWRITECOMPLETED_1=0x98
-[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_MODEMNOTIFICATIONCOMPLETED_1=0x92
-[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_NEWL_1=0x8f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_READSMSPARAMSCOMPLETED_1=0x9a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_SETLOCALADDRESS_1=0x91
-[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_SMSADDRISDUPLICATE_1=0x95
-[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_WRITESMSPARAMSCOMPLETED_1=0x9b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_ADDMESSAGEL_1=0x68
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CONSTRUCTL_1=0x6b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CREATEENTRYL_1=0x70
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x6e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1=0x6a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_GETDATAGRAML_1=0x69
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x6c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x6d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_NEWL_1=0x67
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_OPENSTOREL_1=0x71
-[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_POPULATEENTRY_1=0x6f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_CLIENTCONFIRMSMESSAGE_1=0x89
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_ENUMERATEPHONECOMPLETED_1=0x87
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_GETLOCALADDRESS_1=0x84
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_MESSAGEDELETECOMPLETED_1=0x8c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_MESSAGERECEIVED_1=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_MESSAGESENDCOMPLETED_1=0x83
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_MESSAGEWRITECOMPLETED_1=0x8b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_MODEMNOTIFICATIONCOMPLETED_1=0x86
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_NEWL_1=0x7f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_READSMSPARAMSCOMPLETED_1=0x8d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_SENDDATAGRAML_1=0x80
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_SENDNEXTSMS_1=0x81
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_SETLOCALADDRESS_1=0x85
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_SETSMSMESSAGESETTINGSL_1=0x82
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_SMSADDRISDUPLICATE_1=0x8a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_WRITESMSPARAMSCOMPLETED_1=0x8e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOLFAMILY_INSTALL_1=0x7b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOLFAMILY_NEWL_1=0x7a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOLFAMILY_NEWPROTOCOLL_1=0x7d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOLFAMILY_PROTOCOLLIST_1=0x7e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOLFAMILY_REMOVE_1=0x7c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_ADDRALREADYUSEDBYWAP_1=0xb0
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_ADDRALREADYUSEDBYWAP_2=0xb1
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_ADDSAP_1=0xad
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_ALLOCATELOCALADDRESS_1=0xae
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_BINDL_1=0xa0
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_BINDOBSERVERSTOSMSL_1=0xa3
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_BINDTOL_1=0xa2
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_CHECKSARL_1=0xb4
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_ERROR_1=0xa9
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_FINDANDDELETEMSG_1=0xb3
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_GETOPTION_1=0xa7
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_HANDLEBACKUPORRESTORECOMPLETEL_1=0x9e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_HANDLEBACKUPORRESTORESTARTINGL_1=0x9d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_IDENTIFY_1=0xa1
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_LOOKUPSAP_1=0xaf
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_NEWHOSTRESOLVERL_1=0xaa
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_NEWL_1=0x9c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_NEWNETDATABASEL_1=0xac
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_NEWSAPL_1=0x9f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_NEWSERVICERESOLVERL_1=0xab
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_PROCESSSMSL_1=0xa6
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_REMOVEOBSERVERSFROMSMSPROTOCOL_1=0xa4
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_SEND_1=0xa5
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_SETOPTION_1=0xa8
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_SMSPROTOCOL_1=0xb2
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDERWRITE_CTOR_1=0xcc
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDERWRITE_DOCANCEL_1=0xd2
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDERWRITE_NEWL_1=0xcb
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDERWRITE_RUNERROR_1=0xd1
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDERWRITE_RUNL_1=0xd0
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDERWRITE_START_1=0xcd
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDERWRITE_START_2=0xce
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_ADDTOQUEUE_1=0xc9
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_CANCELIOCTL_1=0xc7
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_ERROR_1=0xbf
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_GETDATA_1=0xbc
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_GETDATA_2=0xbd
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_GETOPTION_1=0xb6
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_IOCTL_1=0xc5
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_IOCTL_2=0xc6
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_LINKOFFSET_1=0xc0
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_LOCALNAME_1=0xc1
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_MATCHESLOCALADDRESS_1=0xc4
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_NEWDATA_1=0xbe
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_NEWL_1=0xb5
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_SECURITYCHECK_1=0xca
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_SETLOCALNAME_1=0xc2
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_SETLOCALNAME_2=0xc3
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_SETOPTION_1=0xb7
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_SETOPTION_2=0xb8
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_SHUTDOWN_1=0xb9
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_START_1=0xc8
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_WRITE_1=0xba
-[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_WRITE_2=0xbb
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFHEXBUF_1=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_1=0x24
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_10=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_2=0x25
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_3=0x26
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_4=0x27
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_5=0x28
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_6=0x29
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_7=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_8=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_9=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_1=0xd3
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_10=0xdc
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_11=0xdd
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_12=0xde
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_13=0xdf
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_14=0xe0
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_15=0xe1
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_16=0xe2
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_17=0xe3
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_18=0xe4
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_19=0xe5
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_2=0xd4
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_20=0xe6
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_21=0xe7
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_22=0xe8
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_23=0xe9
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_24=0xea
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_25=0xeb
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_26=0xec
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_3=0xd5
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_4=0xd6
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_5=0xd7
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_6=0xd8
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_7=0xd9
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_8=0xda
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDUL_9=0xdb
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_1=0x38
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_10=0x41
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_11=0x42
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_12=0x43
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_13=0x44
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_2=0x39
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_3=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_4=0x3b
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_5=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_6=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_7=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_8=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_9=0x40
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_1=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_10=0x37
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_2=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_3=0x30
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_4=0x31
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_5=0x32
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_6=0x33
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_7=0x34
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_8=0x35
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_9=0x36
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_1=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_2=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_3=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_4=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_5=0x20
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_6=0x21
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_7=0x22
-[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_8=0x23
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_CALCULATETOTALSEGMENTS_1=0x79
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_CREATEHEADER_1=0x78
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_ENCODESEGMENTSL_1=0x72
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSENUMBER_1=0x75
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSEWAPTEXTHEADER_1=0x76
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSEWAPTEXTHEADER_2=0x77
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSE_1=0x73
-[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSE_2=0x74
-[TRACE]TRACE_INTERNALS[0x88]_WAPMAIN_PANIC_1=0x66

--- a/telephonyprotocols/csdagt/group/CSD.IBY	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/group/CSD.IBY	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -24,6 +24,7 @@
 #include <commdb.iby>
 #include <charconv.iby>
 #ifdef _DEBUG
+#include <commsdebugutility.iby>
 #endif
 #include <etelmm.iby>
 #include <nifman.iby>

--- a/telephonyprotocols/csdagt/group/CSD.MMP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/group/CSD.MMP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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"
@@ -42,7 +42,6 @@
 USERINCLUDE		../src
 USERINCLUDE		../script 
 USERINCLUDE		../inc
-USERINCLUDE		../traces
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 // The resource file containing csd error messages, generated
@@ -59,18 +58,19 @@
 
 LIBRARY			commsdat.lib
 
-#if defined(EABI)
+#if defined(WINS)
+deffile    /epoc32/release/wins/agent.def
+#elif defined(GCC32)
+deffile    /epoc32/release/marm/agent.def
+#else
 deffile    /epoc32/include/def/eabi/agent.def
-#elif defined(WINS)
-deffile    /epoc32/release/wins/agent.def
-#else
-deffile    /epoc32/release/marm/agent.def
 #endif
 
 START WINS
 BASEADDRESS		0x47900000
 END
 
+#include	<comms-infras/commsdebugutility.mmh>
 CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
 
 UNPAGED

--- a/telephonyprotocols/csdagt/group/dummycsd.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/group/dummycsd.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -42,6 +42,8 @@
 LIBRARY		commdb.lib dummyetel.lib nifman.lib 
 LIBRARY		commsdat.lib
 
+#include	<comms-infras/commsdebugutility.mmh>
+
 #if defined(WINS)
 deffile    /epoc32/release/wins/agent.def
 #elif defined(GCC32)

--- a/telephonyprotocols/csdagt/group/tcsdagt.iby	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/group/tcsdagt.iby	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -19,6 +19,9 @@
 
 #ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
 
+REM Comms Framework FLogger extension
+#include <commsdebugutility.iby>
+
 #include <csd.iby>
 
 #include <integrationtest.iby>

--- a/telephonyprotocols/csdagt/script/SCHAT.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/script/SCHAT.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -114,6 +114,7 @@
 			: (cs->LastChar()==aChar && Match(cs)) )
 			{
 			iNotify->ChatStringMatch(index);
+			cs=iter;	// In case user removed cs;
 			}
 		index++;
 		}

--- a/telephonyprotocols/csdagt/script/SCOMMAND.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/script/SCOMMAND.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,15 +19,10 @@
  @file Scommand.cpp 
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "SCOMMANDTraces.h"
-#endif
-
 #include "SSCRREAD.H"
 #include "SSCREXEC.H"
 #include "SIO.H"
+#include "SLOGGER.H"
 
 // Command names
 
@@ -477,7 +472,8 @@
 		{
 		if (!iStatus.iSkip)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSETCOMMAND_PARSEL_1, "Script:\tExecuting Set");
+			__FLOG_STMT(_LIT8(KLogStringExecutingSet,"Script:\tExecuting Set");)
+			__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KLogStringExecutingSet());
 			}
 		iStatus.iOffset=end;
 		EatSpaces(iStatus.iOffset);
@@ -491,7 +487,8 @@
 		if (!iStatus.iSkip)
 			{
 			iVarMan->AddVariableL(varName,value);
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSETCOMMAND_PARSEL_2, "Script:\tSet Var: %S  To %S",varName,value);
+			__FLOG_STMT(_LIT(KLogStringSetVar,"Script:\tSet Var: %S  To %S"));
+			__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KLogStringSetVar()),&varName,&value);
 			}
 		iStatus.iOffset=end;
 		return ETrue;		// Consumed
@@ -553,7 +550,8 @@
 		{
 		if(!iStatus.iSkip)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDCOMMAND_PARSEL_1,"Script:\tExecuting Send");
+			__FLOG_STMT(_LIT8(KLogStringExecutingSend,"Script:\tExecuting Send");)
+			__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KLogStringExecutingSend());
 			}
 		iStatus.iOffset=end;
 		EatSpaces(iStatus.iOffset);
@@ -564,7 +562,12 @@
 		if(!iStatus.iSkip)
 			{
 			iScriptIO->Write(iSendString);
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDCOMMAND_PARSEL_2, "Script:\tSending %s",iSendString);
+#ifdef __FLOG_ACTIVE
+			_LIT(KLogStringSending,"Script:\tSending %S");
+			TBuf16<KLogBufferSize> temp;
+			temp.Copy(iSendString.Left(Min(iSendString.Length(),KLogBufferSize)));
+			__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KLogStringSending()),&temp);
+#endif
 			}
 		CleanupStack::PopAndDestroy();
 		return ETrue;		// Consumed
@@ -711,7 +714,8 @@
 queue a read.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAITCOMMAND_PARSEACTIONL_1, "Script:\tExecuting Wait");
+	__FLOG_STMT(_LIT8(KLogStringExecutingWait,"Script:\tExecuting Wait");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KLogStringExecutingWait());
 	EatSpaces(iStatus.iOffset);
 	TReal waitPeriod=ParseRealL(iStatus.iOffset);
 	EatSpacesAndLinesAndCommentsL();
@@ -736,7 +740,16 @@
 			TPtrC8 waitString(buf->Des());	
 			label->CreateCommChatStringL(waitString,EFalse);
 			iLabelArray->AppendL(label);
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAITCOMMAND_PARSEACTIONL_2, "Script:\tIf %s is found, Goto %S",waitString,label->LabelName());
+			// for logging
+			TBuf<KLogBufferSize> labelName;
+			labelName.Copy(label->LabelName().Left(Min(KLogBufferSize,label->LabelName().Length())));
+			//
+#ifdef __FLOG_ACTIVE
+			_LIT(KLogStringGog,"Script:\tIf %S is found, Goto %S");
+			TBuf16<KLogBufferSize> string;
+			string.Copy(waitString.Left(Min(waitString.Length(),KLogBufferSize)));
+			__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KLogStringGog()),&string,&labelName);
+#endif
 			CleanupStack::Pop();			// label - will be deleted from array
 			CleanupStack::PopAndDestroy();	// buf - will have been copied into label array
 			}			
@@ -880,7 +893,8 @@
 			User::Leave(KErrNestedLoop);
 		if (!iStatus.iSkip)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CLOOPCOMMAND_PARSEL_1,"Script:\tExecuting Loop");
+			__FLOG_STMT(_LIT8(KLogStringExecutingLoop,"Script:\tExecuting Loop");)
+			__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KLogStringExecutingLoop());
 			}
 		iStatus.iOffset=end;
 		EatSpaces(iStatus.iOffset);
@@ -894,7 +908,8 @@
 		iScriptReader->CurrentPos(iLoopPosition,iStatus.iOffset);
 		if (!iStatus.iSkip)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CLOOPCOMMAND_PARSEL_2, "Script:\tLoop Counter %d",iLoopCounter);
+			__FLOG_STMT(_LIT(KLogStringLoopCounter,"Script:\tLoop Counter %d");)
+			__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),KLogStringLoopCounter(),iLoopCounter);
 			}
 		return ETrue;		// Consumed
 		}
@@ -919,8 +934,10 @@
 			else
 				{
 				iScriptReader->SetCurrentPos(iLoopPosition);
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CLOOPCOMMAND_CHECKLOOPL_1,"Script:\tRepeat Loop");
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CLOOPCOMMAND_CHECKLOOPL_2,"Script:\tLoop Counter %d",iLoopCounter);
+				__FLOG_STMT(_LIT8(logString1,"Script:\tRepeat Loop");)
+				__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
+				__FLOG_STMT(_LIT8(logString2,"Script:\tLoop Counter %d");)
+				__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),logString2(),iLoopCounter);
 				}
 			return ETrue;				// Consumed Something
 			}
@@ -982,7 +999,8 @@
 		{
 		if(!iStatus.iSkip)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGOTOCOMMAND_PARSEL_1,"Script:\tExecuting Goto");
+			__FLOG_STMT(_LIT8(logString,"Script:\tExecuting Goto");)
+			__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 			}
 		iStatus.iOffset=end;
 		EatSpaces(iStatus.iOffset);
@@ -1011,8 +1029,10 @@
 			{
 			iSearchName.Copy(aLabelName);
 			iStatus.iSkipModeToggleReq=ETrue;
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGOTOCOMMAND_GOTO_1,"Script:\tSearching for Label %S",aLabelName);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGOTOCOMMAND_GOTO_2, "Script:\tEntering Skip Mode");
+			__FLOG_STMT(_LIT(logString1,"Script:\tSearching for Label %S");)
+			__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString1()),&aLabelName);
+			__FLOG_STMT(_LIT8(logString2,"Script:\tEntering Skip Mode");)
+			__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2());
 			}
 		else
 			iScriptReader->SetCurrentPos(pos);
@@ -1037,7 +1057,8 @@
 		if (iStatus.iSkip && (iLabelMan->FindLabel(iSearchName,dummyPos)==KErrNone))
 			{
 			iStatus.iSkipModeToggleReq=ETrue;
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGOTOCOMMAND_PARSELABELL_1,"Script:\tExiting Skip Mode");
+			__FLOG_STMT(_LIT8(logString,"Script:\tExiting Skip Mode");)
+			__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 			}
 		return ETrue;
 		}
@@ -1110,7 +1131,8 @@
 		{
 		if(!iStatus.iSkip)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDTRCOMMAND_PARSEL_1,"Script:\tExecuting DTR");
+			__FLOG_STMT(_LIT8(logString1,"Script:\tExecuting DTR");)
+			__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
 			}
 		iStatus.iOffset=end;
 		EatSpaces(iStatus.iOffset);
@@ -1119,7 +1141,8 @@
 			{
 			if(!iStatus.iSkip)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDTRCOMMAND_PARSEL_2,"Script:\tRaising DTR");
+				__FLOG_STMT(_LIT8(logString2,"Script:\tRaising DTR");)
+				__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2());
 				iScriptIO->RaiseDTR(NULL);
 				}	
 			}
@@ -1127,7 +1150,8 @@
 			{
 			if(!iStatus.iSkip)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDTRCOMMAND_PARSEL_3,"Script:\tDropping DTR");
+				__FLOG_STMT(_LIT8(logString3,"Script:\tDropping DTR");)
+				__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString3());
 				iScriptIO->DropDTR(NULL);
 				}	
 			}
@@ -1193,7 +1217,8 @@
 		{
 		if (!iStatus.iSkip)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREADPCTCOMMAND_PARSEL_1, "Script:\tExecuting Read");
+			__FLOG_STMT(_LIT8(logString,"Script:\tExecuting Read");)
+			__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 			iCharSet=ParseCharacterTypeL(iStatus.iOffset);
 			iScriptExec->ReadPct();
 			}
@@ -1336,7 +1361,8 @@
 		{
 		if (!iStatus.iSkip)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CEXITCOMMAND_PARSEL_1,"Script:\tExecuting Exit");
+			__FLOG_STMT(_LIT8(logString1,"Script:\tExecuting Exit");)
+			__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
 			}
 		iStatus.iOffset=end;
 		EatSpaces(iStatus.iOffset);
@@ -1360,7 +1386,8 @@
 				User::Leave(KErrScriptCompleted);
 			else
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CEXITCOMMAND_PARSEL_2,"Script:\tExit With Error %d",ret);
+				__FLOG_STMT(_LIT8(logString2,"Script:\tExit With Error %d");)
+				__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString2()),ret);
 				User::Leave(ret);
 				}
 			}

--- a/telephonyprotocols/csdagt/script/SIO.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/script/SIO.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,14 +19,9 @@
  @file Sio.cpp 
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "SIOTraces.h"
-#endif
-
 #include "SSCREXEC.H"
 #include "SIO.H"
+#include "SLOGGER.H"
 #include <networking/bca.h>
 
 const TInt KChatterPriority=0;
@@ -85,13 +80,13 @@
 void CScriptIO::CreateChannel(TRequestStatus& aStatus)
 	{
 	ASSERT(iCreateAndShutdownStatus == NULL);
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CREATECHANNEL_1,"Script:\tOpening Comm Port '%S'", iCommsChannel);
+	__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),_L("Script:\tOpening Comm Port '%S'"), &iCommsChannel);
 
 	iCommClosed = EFalse;
 	TInt err = CommOpen(iCommsChannel);
 	if (err != KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CREATECHANNEL_2, "Script: Error %d opening Comm Port", err);
+		__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),_L("Script: Error %d opening Comm Port"), err);
 		TRequestStatus* stat = &aStatus;
 		User::RequestComplete(stat, err);	
 		}
@@ -100,13 +95,15 @@
 
 void CScriptIO::CancelCreateChannel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CANCELCREATECHANNEL_1, "Script:\tCancelCreateChannel()");
+	__FLOG_STMT(_LIT8(logString,"Script:\tCancelCreateChannel()");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	CommCancel();
 	}
 
 void CScriptIO::InitializeComplete()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_INITIALIZECOMPLETE_1,"Script:\tInitializeComplete()");
+	__FLOG_STMT(_LIT8(logString,"Script:\tInitializeComplete()");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	ASSERT(iCreateAndShutdownStatus);
 	User::RequestComplete(iCreateAndShutdownStatus, KErrNone);
 	iCreateAndShutdownStatus = NULL;
@@ -114,7 +111,8 @@
 
 void CScriptIO::ShutdownComplete(TInt aError)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_SHUTDOWNCOMPLETE_1, _"Script:\tShutdownComplete(aError %d)", aError);
+	__FLOG_STMT(_LIT8(logString,"Script:\tShutdownComplete(aError %d)");)
+	__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),logString(), aError);
 
 	ASSERT(iCreateAndShutdownStatus);
 	if (iCreateError != KErrNone) //The creation error is probably more interesting than a bad shutdown error
@@ -161,7 +159,8 @@
 @param aError System wide error code. 
 */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_STOP_1,"Script:\tStop(aError %d)", aError);
+	__FLOG_STMT(_LIT8(logString,"Script:\tStop(aError %d)");)
+	__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),logString(), aError);
 
 	iCreateError = aError;
 	delete iChat;
@@ -201,16 +200,19 @@
 Reads completely - stops timer and if no error checks string against the desired string
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_1,"Script:\tRead Complete");
+	__FLOG_STMT(_LIT8(logString1,"Script:\tRead Complete");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
 	if(aStatus==KErrCommsLineFail)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_2,"Script:\tComms Error %d",aStatus);
+		__FLOG_STMT(_LIT8(logString2,"Script:\tComms Error %d");)
+		__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString2()),aStatus);
 		iChat->StopTimer();
 		iReadPending=EFalse;
 		TRAPD(ret,iScriptExecutor->CompletedReadL(KErrCommsLineFail));
 		if (KErrNone != ret)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_3,"Script:\tCompleteReadL Failure");
+			__FLOG_STMT(_LIT8(logString6,"Script:\tCompleteReadL Failure");)
+			__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString6());
 			}
 		return;
 		}
@@ -221,7 +223,8 @@
 	
 	if (aStatus==KErrCommsFrame)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_4, "Script:\tComms Error %d",aStatus);
+		__FLOG_STMT(_LIT(logString3,"Script:\tComms Error %d");)
+		__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString3()),aStatus);
 		User::After(KClockTick);		// wait for a clock tick and continue
 		aStatus=KErrNone;
 		}
@@ -231,13 +234,18 @@
 		TRAPD(ret,iScriptExecutor->CompletedReadL(aStatus));
 		if (KErrNone != ret)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_5,"Script:\tCompleteReadL Failure");
+			__FLOG_STMT(_LIT8(logString7,"Script:\tCompleteReadL Failure");)
+			__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString7());
 			}
 		return;
 		}
 
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_7, "Rx:\t%s",iRxBuffer);
-
+#ifdef __FLOG_ACTIVE
+	_LIT(logString4,"Rx:\t%S");
+	TBuf16<KLogBufferSize> temp;
+	temp.Copy(iRxBuffer.Left(Min(iRxBuffer.Length(),KLogBufferSize)));
+	__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString4()),&temp);
+#endif
 
 	if (iScriptExecutor->RequestUsePct())
 		{
@@ -247,7 +255,8 @@
 			TRAPD(ret,iScriptExecutor->CompletedReadL(err));
 			if (KErrNone != ret)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_8,"Script:\tCompleteReadL Failure");
+				__FLOG_STMT(_LIT8(logString8,"Script:\tCompleteReadL Failure");)
+				__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString8());
 				}
 			return;
 			}
@@ -261,7 +270,12 @@
 			if(iStringFound!=-1)
 				{
 				iExcessData.Set(iRxBuffer.Right(iRxBuffer.Length()-iRxBufOffset-1));
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_9, "Script:\tExcess data buffer set to: %s",iExcessData);
+#ifdef __FLOG_ACTIVE
+				_LIT(logString5,"Script:\tExcess data buffer set to: %S");
+				TBuf16<KLogBufferSize> temp;
+				temp.Copy(iExcessData.Left(Min(iExcessData.Length(),KLogBufferSize)));
+				__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString5()),&temp);
+#endif
 				break;
 				}
 			}
@@ -275,7 +289,8 @@
 		TRAPD(ret,iScriptExecutor->CompletedReadL(aStatus,iStringFound));
 		if (KErrNone != ret)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_10, "Script:\tCompleteReadL Failure");
+			__FLOG_STMT(_LIT8(logString9,"Script:\tCompleteReadL Failure");)
+			__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString9());
 			}
 		}
 	else
@@ -290,11 +305,13 @@
 Writes completely - stops timer
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMWRITECOMPLETE_1,"Script:\tWrite Complete");
+	__FLOG_STMT(_LIT8(logString,"Script:\tWrite Complete");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	iChat->StopTimer();
 	if(aStatus==KErrCommsLineFail)
  		{
- 		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMWRITECOMPLETE_2, "Script:\tComms Error %d",aStatus);
+ 		__FLOG_STMT(_LIT8(logString2,"Script:\tComms Error %d");)
+ 		__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),logString2(),aStatus);
  		iWritePending=EFalse;
  		iScriptExecutor->CompletedWrite(KErrCommsLineFail);
  		return;
@@ -311,7 +328,8 @@
 Logs matching string found and sets iStringFound to aIndex.
 */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CHATSTRINGMATCH_1, "Script:\tMatching String Found %d",aIndex);
+	__FLOG_STMT(_LIT8(logString,"Script:\tMatching String Found %d");)
+	__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()),aIndex);
 	iStringFound=aIndex;
 	}
 
@@ -323,18 +341,21 @@
 	CommCancel();
 	if(iWritePending)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CHATTIMEOUT_1, "Script:\tWrite Chat Time Out");
+		__FLOG_STMT(_LIT8(logString1,"Script:\tWrite Chat Time Out");)
+		__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
 		iWritePending=EFalse;
 		iScriptExecutor->CompletedWrite(KErrTimedOut);
 		}
 	else if(iReadPending)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CHATTIMEOUT_2,"Script:\tRead Chat Time Out");
+		__FLOG_STMT(_LIT8(logString2,"Script:\tRead Chat Time Out");)
+		__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2());
 		iReadPending=EFalse;
 		TRAPD(ret,iScriptExecutor->CompletedReadL(KErrTimedOut));
 		if (KErrNone != ret)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CHATTIMEOUT_3,"Script:\tCompleteReadL Failure");
+			__FLOG_STMT(_LIT8(logString3,"Script:\tCompleteReadL Failure");)
+			__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString3());
 			}
 		}
 	else
@@ -361,8 +382,8 @@
 	TInt timeInterval=TInt(realTimeInterval);
 	if (realTimeInterval>TReal(timeInterval))
 		timeInterval++;
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_READ_1,"Script:\tRead Pending In %d Microseconds",timeInterval);
-	
+	__FLOG_STMT(_LIT8(logString,"Script:\tRead Pending In %d Microseconds");)
+	__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),logString(),timeInterval);
 //
 	iChat->StartTimer(timeInterval);
 	CommReadOneOrMore(iRxBuffer);
@@ -374,7 +395,8 @@
 Reads echo.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_READECHO_1,"Script:\tRead Echo");
+	__FLOG_STMT(_LIT8(logString,"Script:\tRead Echo");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	iExcessData.Set(NULL,0);	// clear excess data buffer
 
 	iReadPending=ETrue;
@@ -402,7 +424,12 @@
 PreSend pause is finished, can now do write.
 */
 	{
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_PRESENDPAUSECOMPLETED_1, "Tx:\t%s",iTxBuffer);
+#ifdef __FLOG_ACTIVE
+	_LIT(logString,"Tx:\t%S");
+	TBuf16<KLogBufferSize> temp;
+	temp.Copy(iTxBuffer.Left(Min(iTxBuffer.Length(),KLogBufferSize)));
+	__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString()),&temp);
+#endif
 	CommWrite(iTxBuffer);
 	iChat->StartTimer(KWriteTimeOutSec*KOneSecInMicroSecs);
 	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/csdagt/script/SLOGGER.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,48 @@
+/**
+* Copyright (c) 2003-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:
+* Netdial Data and Event Logger header.
+* 
+*
+*/
+
+
+
+/**
+ @file Slogger.h
+ @internalComponent
+*/
+
+#ifndef __SLOGGER_H__
+#define __SLOGGER_H__
+
+#include <comms-infras/commsdebugutility.h>
+#include <e32base.h>
+
+/**
+@internalComponent
+*/
+_LIT8(KNetDialLogFile,"NETDIAL.TXT");
+_LIT8(KNetDialLogFolder,"NETDIAL");
+
+_LIT(KIllegalTranstionPanicString,"NetDial (%d %d)");
+_LIT(KCompletedPhaseLogString,"NetDial:\tCompleted Phase '%S' with Error %d");
+_LIT(KPhaseTransitionLogString,"NetDial:\tPhase Transition from Phase %d to Phase %d");
+_LIT(KIllegalPhaseTransitionLogString,"NetDial:\tIllegal Phase Transition from Phase %d to Phase %d");
+_LIT(KStopLogString,"NetDial:\tStopped, Phase %d");
+_LIT(KServiceStartedLogString,"NetDial:\tService Started");
+_LIT(KServiceStartedReconnLogString,"NetDial:\tService Started On Reconnection");
+
+
+#endif	// __SLOGGER_H__

--- a/telephonyprotocols/csdagt/script/SSCREXEC.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/script/SSCREXEC.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,14 +19,9 @@
  @file Sscrexec.cpp 
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "SSCREXECTraces.h"
-#endif
-
 #include "SSCREXEC.H"
 #include "SIO.H"
+#include "SLOGGER.H"
 #include "ND_SCR.H"
 
 _LIT(KPPPProtocolName,"PPP.");
@@ -178,7 +173,8 @@
 	__ASSERT_DEBUG(iLastCommand==NULL, NetDialPanic(ELastCommandNotNull));
 	__ASSERT_DEBUG(iScriptReader!=NULL, NetDialPanic(ENullScriptReader));
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTEXECUTOR_SETSCRIPT_1,"Script:\tBeginning");
+	__FLOG_STMT(_LIT8(logString,"Script:\tBeginning");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	iScriptReader->SetScript(aScript);
 	iLoopCommand->Loop(EFalse);
 	}
@@ -188,7 +184,8 @@
 Scans script for READ command.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTEXECUTOR_SCANSCRIPTL_1,"Script:\tScanning");
+	__FLOG_STMT(_LIT8(logString1,"Script:\tScanning");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
 
 	__ASSERT_DEBUG(iScriptReader!=NULL, NetDialPanic(ENullScriptReader));
 
@@ -205,11 +202,13 @@
 
 	if (iReadFound)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTEXECUTOR_SCANSCRIPTL_2,"Script:\tFound Read");
+		__FLOG_STMT(_LIT8(logString2,"Script:\tFound Read");)
+		__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2());
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTEXECUTOR_SCANSCRIPTL_3,"Script:\tDid Not Find Read");
+		__FLOG_STMT(_LIT8(logString3,"Script:\tDid Not Find Read");)
+		__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString3());
 		}
 
 	User::LeaveIfError(iScriptReader->Reset());
@@ -398,7 +397,8 @@
 	
 		TInt error=aStatus;
 
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTEXECUTOR_COMPLETEDSCRIPT_1,"Script:\tScript Completed With Error %d",error);
+		__FLOG_STMT(_LIT8(logString,"Script:\tScript Completed With Error %d");)
+		__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()),error);
 
 		ConvertScriptError(error);
 		PctCancelAndClose();
@@ -456,7 +456,8 @@
 Close script.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTEXECUTOR_CLOSESCRIPT_1, "Script:\tClosing");
+	__FLOG_STMT(_LIT8(logString,"Script:\tClosing");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	if (iScriptReader!=NULL)
 		iScriptReader->Reset();		// ignore error
 	}
@@ -595,7 +596,12 @@
 		return;
 		}
 	TPtr8 eightBitBuf(buf->Des());
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTEXECUTOR_READPCTCOMPLETE_1, "Script:\tRead %s from PCT",eightBitBuf);
+#ifdef __FLOG_ACTIVE
+	_LIT(logString,"Script:\tRead %S from PCT");
+	TBuf16<KLogBufferSize> temp;
+	temp.Copy(eightBitBuf.Left(Min(eightBitBuf.Length(),KLogBufferSize)));
+	__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString()),&temp);
+#endif
 	TInt end=iReadBuffer.Locate(KCarriageReturn);
 	TInt spaceInBuffer=iDataToWrite.MaxLength()-iDataToWrite.Length();

--- a/telephonyprotocols/csdagt/script/SSCRREAD.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/script/SSCRREAD.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,14 +19,9 @@
  @file Scrread.cpp 
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "SSCRREADTraces.h"
-#endif
-
 #include "SSCRREAD.H"
 #include "ND_STD.H"
+#include "SLOGGER.H"
 
 // TLinePosition definitions 
 
@@ -122,7 +117,8 @@
 @param aBufferSize is buffer size for script reader.
 */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTREADER_CONSTRUCTL_1,"Script:\tCreating Buffer Of Size %d", aBufferSize);
+	__FLOG_STMT(_LIT8(logString,"Script:\tCreating Buffer Of Size %d");)
+	__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()),aBufferSize);
 	iScriptBuffer=HBufC::NewL(aBufferSize);
 	TPtr temp=iScriptBuffer->Des();
 	iScript.Set(temp);
@@ -218,13 +214,17 @@
 	iCurrentPosition.iLineCount++;
 	if (iLoggingOn)
 		{
+		TBuf<KLogBufferSize> line;
+		line.Copy(activeDes.Left(Min(KLogBufferSize,iCurrentPosition.iLineLength)));
 		if (iSkip)
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTREADER_GETCURRENTLINE_1, "Script Line #%d:\t[Skip] : %S", iCurrentPosition.iLineCount,activeDes);
+			__FLOG_STMT(_LIT(logString1,"Script Line #%d:\t[Skip] : %S");)
+			__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString1()),iCurrentPosition.iLineCount,&line);
 			}
 		else
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTREADER_GETCURRENTLINE_2, "Script Line #%d:\t%S", iCurrentPosition.iLineCount,activeDes);
+			__FLOG_STMT(_LIT(logString2,"Script Line #%d:\t%S");)
+			__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString2()),iCurrentPosition.iLineCount,&line);
 			}
 		}
 	return KErrNone;

--- a/telephonyprotocols/csdagt/src/ND_DBACC.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_DBACC.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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"
@@ -24,6 +24,7 @@
 	#include <commsdatutils.h>
 	using namespace CommsDat;
 #include "ND_DBACC.H"
+#include "SLOGGER.H"
 #include "ND_STD.H"
 
 /**

--- a/telephonyprotocols/csdagt/src/ND_DIRCT.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_DIRCT.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -23,6 +23,7 @@
 #include "ND_SCR.H"
 #include "ND_DBACC.H"
 #include "ND_STD.H"
+#include "SLOGGER.H"
 #include "ND_DIRECTSTATES.H"
 
 CDirCtAgXSM* CDirCtAgXSM::NewL(MAgentNotify& aControllerObserver, CDialogProcessor* aDlgPrc, CCommsDbAccess& aDbAccess)

--- a/telephonyprotocols/csdagt/src/ND_DIRECTSTATES.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_DIRECTSTATES.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,17 +19,11 @@
  @file Nd_directstates.cpp 
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ND_DIRECTSTATESTraces.h"
-#endif
-
 #include "ND_DIRCT.H"
 #include "ND_SCR.H"
 #include "ND_DBACC.H"
 #include "ND_STD.H"
+#include "SLOGGER.H"
 #include "ND_DIRECTSTATES.H"
 
 CDirCtInit* CDirCtInit::NewL(MAgentStateMachineEnv& aSMObserver, MNetdialEnv& aNdEnv)
@@ -242,7 +236,8 @@
 	{
 	if(iStatus!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTSCANSCRIPT_RUNL_1,"NetDial:\tCompleted Phase Scan Script with Error %d", iStatus.Int());
+		__FLOG_STMT(_LIT(logString3,"Scan Script");)
+		__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),KCompletedPhaseLogString(), &logString3(), iStatus.Int());
 		if (iNdEnv->Script()!=NULL)
 			iNdEnv->Script()->CloseScript();
 		iSMObserver->ConnectionComplete(ECsdScannedScript,iStatus.Int());
@@ -252,11 +247,11 @@
 	iSMObserver->UpdateProgress(ECsdScannedScript,iStatus.Int());
 	if (!(iNdEnv->BaseEnv())->IsReconnect())
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTSCANSCRIPT_RUNL_2, "NetDial:\tService Started");
+		__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KServiceStartedLogString());
 		}
 	else
 		{			
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTSCANSCRIPT_RUNL_3,"NetDial:\tService Started On Reconnection");
+		__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KServiceStartedReconnLogString());
 		}
 	//iSMObserver->ServiceStarted();
 	(iNdEnv->BaseEnv())->CompleteState(KErrNone);
@@ -436,7 +431,8 @@
 	{
 	if(iStatus!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONNECT_RUNL_1, "NetDial:\tCompleted Phase Execute Script with Error %d", iStatus.Int());
+		__FLOG_STMT(_LIT(logString3,"Execute Script");)
+		__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),KCompletedPhaseLogString(), &logString3(), iStatus.Int());
 		if (iNdEnv->Script()!=NULL)
 			iNdEnv->Script()->CloseScript();
 		iSMObserver->ConnectionComplete(ECsdFinishedConnect,iStatus.Int());
@@ -468,7 +464,8 @@
 	{
 	if (iNdEnv->UseScript())
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONNECT_DOSTARTSTATEL_1, "NetDial:\tExecuting Script");
+		__FLOG_STMT(_LIT8(logString,"NetDial:\tExecuting Script");)
+		__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 
 		(iNdEnv->Script())->ExecuteL(*this);
 		iStatus=KRequestPending;
@@ -570,7 +567,8 @@
 	{
 	__ASSERT_DEBUG(iStatus==KErrNone,User::Invariant());
 	iSMObserver->UpdateProgress(ECsdConnectionOpen,KErrNone);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTOPEN_RUNL_1, "NetDial:\tConnection Open");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tConnection Open");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	if (iNdEnv->Script()!=NULL)
 		iNdEnv->Script()->CloseScript();
 	iSMObserver->ConnectionComplete(ECsdConnectionOpen,KErrNone);
@@ -660,12 +658,14 @@
 Complete hangup state.
 */
 	{
+	__FLOG_STMT(_LIT(logString3,"Hang Up");)
 	if(iStatus!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTHANGUP_RUNL_1,"NetDial:\tCompleted Phase Hang Up with Error %d", iStatus.Int());
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTHANGUP_RUNL_2, "NetDial:\tDisconnection Error %d", iStatus.Int());
+		__FLOG_STMT(_LIT8(logString2,"NetDial:\tDisconnection Error %d");)
+		__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
+		__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString2()), iStatus.Int());
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTHANGUP_RUNL_3,"Hang Up");
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString3());
 	iSMObserver->UpdateProgress(ECsdFinishedHangUp,iStatus.Int());
 	(iNdEnv->BaseEnv())->CompleteState(iStatus.Int());
 	}
@@ -751,7 +751,8 @@
 Call DisconnectComplete().
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTDISCONNECT_RUNL_1, "NetDial:\tDisconnect Complete");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tDisconnect Complete");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 
 	iSMObserver->DisconnectComplete();
 	}
@@ -922,7 +923,8 @@
 	TRAPD(ret,DoStartStateL());
 	if (ret!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONFIGURECOMMPORT_STARTSTATE_1, "NetDial:\tError %d Configuring Comm Port", ret);
+		__FLOG_STMT(_LIT8(logString, "NetDial:\tError %d Configuring Comm Port");)
+		__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()), ret);
 		JumpToRunl(ret);
 		}
 	}
@@ -953,8 +955,8 @@
 Cancels active requests
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONFIGURECOMMPORT_DOCANCEL_1,"NetDial:\tCancel Configure Comm Port");
-
+	__FLOG_STMT(_LIT8(logString, "NetDial:\tCancel Configure Comm Port");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()));
 
 	(iNdEnv->Script())->CancelConfigureCommPort();
 	}
@@ -968,7 +970,8 @@
 	{
 	if(iStatus!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONFIGURECOMMPORT_RUNL_1, "NetDial:\tCompleted Phase Configuring Comm Port with Error %d", iStatus.Int());
+		__FLOG_STMT(_LIT(logString3,"Configuring Comm Port");)
+		__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),KCompletedPhaseLogString(), &logString3(), iStatus.Int());
 		if (iNdEnv->Script()!=NULL)
 			iNdEnv->Script()->CloseScript();
 		iSMObserver->ConnectionComplete(ECsdFinishedConnect,iStatus.Int());
@@ -985,8 +988,8 @@
 @exception Leaves if GetCommConfigForDirectConnectL() leaves.
 */
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONFIGURECOMMPORT_DOSTARTSTATEL_1,"NetDial:\tConfiguring Comm Port");
-
+	__FLOG_STMT(_LIT8(logString1,"NetDial:\tConfiguring Comm Port");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
 	(iNdEnv->NetDialDb())->GetCommConfigForDirectConnectL(iConfigPckg);
 
 	iStatus = KRequestPending;
@@ -1047,7 +1050,8 @@
 Reconfigure port to allow signals to be dropped.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTRECONFIGURECOMMPORT_STARTSTATE_1, "NetDial:\tReconfiguring Comm Port");
+	__FLOG_STMT(_LIT8(logString, "NetDial:\tReconfiguring Comm Port");)
+	__FLOG_STATIC(KNetDialLogFolder(), KNetDialLogFile(), logString());
 	iStatus = KRequestPending;
 	SetActive();
 	// Reconfigure the Comm Port to allow the signals to be set.
@@ -1110,7 +1114,8 @@
 	if (!iDropping)
 		{
 		// ReConfigureAndCancelCommPort() has completed to allow us to drop the Comm Port signals.
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTRECONFIGURECOMMPORT_RUNL_1, "NetDial:\tDropping Signals");
+		__FLOG_STMT(_LIT8(logString, "NetDial:\tDropping Signals");)
+		__FLOG_STATIC(KNetDialLogFolder(), KNetDialLogFile(), logString());
 
 		iDropping = ETrue;
 		iStatus = KRequestPending;
@@ -1218,11 +1223,15 @@
 	// in response to its earlier Connect()).  Consequently, we can't call either method with an error argument
 	// for a second time (otherwise NIFMAN will panic due to too many ConnectComplete() responses).
 	if (iStatus!=KErrNone)
-	    {
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCLOSEDATAPORT_RUNL_1,  "NetDial:\tCompleted Phase Close Data Port with Error %d", iStatus.Int());
+		{
+#ifdef __FLOG_ACTIVE
+		_LIT(logString3,"Close Data Port");
+		_LIT8(logstring2,"Saved error = %d");
+#endif
+		__FLOG_STATIC2(KNetDialLogFolder(), KNetDialLogFile(), TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
 		if (iError != KErrNone)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCLOSEDATAPORT_RUNL_2,"Saved error = %d", iError);
+			__FLOG_STATIC1(KNetDialLogFolder(), KNetDialLogFile(), TRefByValue<const TDesC8>(logstring2()), iError);
 			}
 		else
 			{

--- a/telephonyprotocols/csdagt/src/ND_DLIN.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_DLIN.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -22,7 +22,9 @@
 #include "ND_DLIN.H"
 #include "ND_ETEL.H"
 #include "ND_STD.H"
+#include "SLOGGER.H"
 #include "Nd_dlinStates.h"
+#include <comms-infras/eventlogger.h>
 #include "ND_DBACC.H"
 
 // Dial In state machine

--- a/telephonyprotocols/csdagt/src/ND_DLL.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_DLL.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -20,15 +20,10 @@
  @internalComponent
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ND_DLLTraces.h"
-#endif
-
 #include <e32std.h>
 #include <cdbcols.h>
 #include "ND_STD.H"
+#include "SLOGGER.H"
 #include "ND_DIRCT.H"
 #include "ND_DLIN.H"
 #include "ND_DLUP.H"
@@ -44,7 +39,8 @@
 */
 GLDEF_C void NetDialPanic(TNetDialPanic aPanic)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, NETDIALPANIC_1, _"NetDial Panic %d",aPanic);
+	__FLOG_STMT(_LIT8(logString,"NetDial Panic %d");)
+	__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()),aPanic);
 	_LIT(KNetDialPanic,"NetDial");
 	User::Panic(KNetDialPanic,aPanic);
 	}

--- a/telephonyprotocols/csdagt/src/ND_DLUP.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_DLUP.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,12 +19,6 @@
  @file Nd_dlup.cpp 
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ND_DLUPTraces.h"
-#endif
-
 #include "ND_DLUP.H"
 #include "ND_ETEL.H"
 #include "ND_SCR.H"
@@ -32,6 +26,7 @@
 #include <comms-infras/eventlogger.h>
 #include "ND_DBACC.H"
 #include "ND_STD.H"
+#include "SLOGGER.H"
 #include "Nd_dlupStates.h"
 #include <comms-infras/nifprvar.h>
 
@@ -121,7 +116,8 @@
 		{
 	case ENifToAgentEventTypePPPCallbackGranted:
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPAGXSM_NOTIFICATION_1, "NetDial:\tCallback Request Granted");
+		__FLOG_STMT(_LIT8(logString,"NetDial:\tCallback Request Granted");)
+		__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 		return KErrNone;
 		}
 	case ENifToAgentEventTypeQueryIsDialIn:

--- a/telephonyprotocols/csdagt/src/ND_ETEL.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_ETEL.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,16 +19,10 @@
  @file Nd_etel.cpp
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ND_ETELTraces.h"
-#endif
-
 #include "ND_DBACC.H"
 #include "ND_STD.H"
 #include "ND_ETEL.H"
-
+#include "SLOGGER.H"
 
 /**
 @internalComponent
@@ -83,7 +77,8 @@
 	{
 	CActiveScheduler::Add(this);
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_CONSTRUCTL_1, "NetDial:\tConnecting Etel Server");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tConnecting Etel Server");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	User::LeaveIfError(iTelServer.Connect());
 	iState=EIdle;
 	iCallType=EUnknown;
@@ -97,9 +92,11 @@
 Close ETel server connection.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_DTOR_1,"NetDial:\tClosing Call");
+	__FLOG_STMT(_LIT8(logString1,"NetDial:\tClosing Call");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
 	CloseCall();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_DTOR_2, "NetDial:\tClosing Etel Server");
+	__FLOG_STMT(_LIT8(logString2,"NetDial:\tClosing Etel Server");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2());
 	if(iTsyLoaded)
 		{
 		iTelServer.UnloadPhoneModule(iTsyName);
@@ -136,7 +133,8 @@
 @exception Leaves if GetCallParamsL() leaves.
 */
 	{
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_DIALL_1, "NetDial:\tDialling %S", iTelNum);
+	__FLOG_STMT(_LIT(logString,"NetDial:\tDialling %S");)
+	__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString()),&iTelNum);
 
 	TInt ret=iDb->GetRedialAttempts(iMaxDialAttempts);
 	if (ret!=KErrNone)
@@ -199,7 +197,8 @@
 @param aObserver a reference to observer.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_LISTENFORSTATUSCHANGE_1, "NetDial:\tListening For Call Status Change");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tListening For Call Status Change");)
+	__FLOG_STATIC(KNetDialLogFolder(), KNetDialLogFile(), logString());
 	
 	__ASSERT_ALWAYS(EIdle == iState, NetDialPanic(EEtelServerNotIdle));
 	__ASSERT_ALWAYS(iCallOpen, NetDialPanic(EEtelCallNotOpen));
@@ -212,7 +211,8 @@
 	
 void CTelServerProcessor::CancelListenForStatusChange()
 	{
-	OstTraceDefEx2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_CANCELLISTENFORSTATUSCHANGE_1, "NetDial:\tCancelListenForStatusChange. iState: [%d]. iStatus: [%d]",iState, iStatus.Int());
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tCancelListenForStatusChange. iState: [%d]. iStatus: [%d]");)
+	__FLOG_STATIC2(KNetDialLogFolder(), KNetDialLogFile(), logString(), iState, iStatus.Int());
 	
 	__ASSERT_ALWAYS(iCallOpen, NetDialPanic(EEtelCallNotOpen));	
 	
@@ -226,7 +226,8 @@
 change notification
 */
 	{	
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_HANDLESTATUSCHANGE_1, "NetDial:\tCall Status Changed. CallStatus %d Error: %d",iCallStatus, iStatus.Int());
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tCall Status Changed. CallStatus %d Error: %d");)
+	__FLOG_STATIC2(KNetDialLogFolder(), KNetDialLogFile(), logString(), iCallStatus, iStatus.Int());
 	
 	// Ignore if subscribing to status change notification failed.
 	// It can be that the TSY doesn't support the feature etc.
@@ -280,7 +281,8 @@
 	if (!iCallOpen)
 		OpenNewCallL();
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_WAITFORINCOMINGCALLL_1, "NetDial:\tWaiting For Incoming Call");
+	__FLOG_STMT(_LIT8(logString2,"NetDial:\tWaiting For Incoming Call");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2());
 
 	if (iCallType==ECoreCallOnly)
 		{
@@ -344,7 +346,8 @@
 #endif	
 	Assertions();
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_STARTHANGUP_1, "NetDial:\tHanging Up Call");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tHanging Up Call");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	ActiveCall().HangUp(iStatus);
 	SetActive();
 	}
@@ -358,7 +361,8 @@
 @exception Leaves if LoanDataPort() returns error or SetCommPortL leaves.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_GETCOMMPORTL_1, "NetDial:\tLoaning Port From Etel");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tLoaning Port From Etel");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	User::LeaveIfError(ActiveCall().LoanDataPort(aCommPort));
 	iDb->SetCommPortL(aCommPort);
 	iLoaned=ETrue;
@@ -374,7 +378,8 @@
 @exception Leaves if RecoverDataPort() returns error.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_RETURNCOMMPORTL_1, "NetDial:\tRecovering Port To Etel");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tRecovering Port To Etel");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	User::LeaveIfError(ActiveCall().RecoverDataPort());
 	iLoaned=EFalse;
 #ifndef SYMBIAN_NETWORKING_CSDAGENT_BCA_SUPPORT
@@ -388,13 +393,15 @@
 If call is open, call Close() from active call object.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_CLOSECALL_1, "NetDial:\tClosing Call");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tClosing Call");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	if (iLoaned)
 		{
 		TRAPD(ret,ReturnCommPortL());		// can't do anything with the error, so just trap
 		if (KErrNone != ret)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_CLOSECALL_2, "ReturnCommPort:\tError Occured");
+			__FLOG_STMT(_LIT8(logString2,"ReturnCommPort:\tError Occured");)
+			__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2());
 			}
 		}
 
@@ -562,7 +569,8 @@
 	callName.Append(lineInfo.iName);
 	
 	callName.Append(KDoubleColon);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_OPENNEWCALLL_1, "NetDial:\tOpening Call");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tOpening Call");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 
 	iDb->CopyIspInitStringToModemL();	// will not leave if the field is blank
 	// Only MultimodeV1 and greater supported!
@@ -587,7 +595,8 @@
 	User::LeaveIfError(iTelServer.EnumeratePhones(count));
 	if (count<=0)
 		{
-    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_GETPHONEINFOL_1,"NetDial:\tGetPhoneInfoL(): no phones found - leaving with -1");
+    	__FLOG_STMT(_LIT(logString,"NetDial:\tGetPhoneInfoL(): no phones found - leaving with -1");)
+    	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 		User::Leave(KErrNotFound);
 		}
 	TInt i;
@@ -610,7 +619,8 @@
 
 	if (!found)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_GETPHONEINFOL_2, "NetDial:\tGetPhoneInfoL(): required phone not found - leaving with -1");
+		__FLOG_STMT(_LIT(logString,"NetDial:\tGetPhoneInfoL(): required phone not found - leaving with -1");)
+    	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 		User::Leave(KErrNotFound);
 		}
 	}
@@ -625,7 +635,8 @@
         User::LeaveIfError(phone.EnumerateLines(count));
 	if (count <= 0)
 		{
-    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_GETLINEINFOL_1,"NetDial:\tGetLineInfoL(): no line info available - leaving with -1");
+    	__FLOG_STMT(_LIT(logString,"NetDial:\tGetLineInfoL(): no line info available - leaving with -1");)
+    	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	        User::Leave(KErrNotFound);
 		}
         
@@ -655,7 +666,8 @@
         CleanupStack::PopAndDestroy(&phone);
         if (!found)
         	{
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_GETLINEINFOL_2, "NetDial:\tGetLineInfoL(): required line not found - leaving with -1");
+        	__FLOG_STMT(_LIT(logString,"NetDial:\tGetLineInfoL(): required line not found - leaving with -1");)
+        	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	        User::Leave(KErrNotFound);
         	}
         }

--- a/telephonyprotocols/csdagt/src/ND_SCR.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_SCR.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,14 +19,9 @@
  @file Nd_scr.cpp 
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ND_SCRTraces.h"
-#endif
-
 #include "ND_SCR.H"
 #include "ND_STD.H"
+#include "SLOGGER.H"
 #include "SSCREXEC.H"
 #include "ND_DBACC.H"
 
@@ -324,7 +319,8 @@
 @return error code for OpenPct() request.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_OPENPCT_1, "NetDial:\tOpening PCT");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tOpening PCT");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 
 	const TInt ret = iDlgPrc->OpenPct();
 	if (ret == KErrNone)
@@ -338,7 +334,8 @@
 Call DestroyPctNotification() from dialog processor.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_DESTROYPCTNOTIFICATION_1, "NetDial:\tRequesting Destroy PCT Notification");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tRequesting Destroy PCT Notification");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	
 	iDlgPrc->DestroyPctNotification(*this);
 	}	
@@ -351,7 +348,8 @@
 @return error code for WritePct() request.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_WRITEPCT_1, "NetDial:\tWriting To PCT");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tWriting To PCT");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	
 	return iDlgPrc->WritePct(aBuffer);
 	}	
@@ -363,7 +361,8 @@
 @param aBuffer a reference for read data.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_READPCT_1, "NetDial:\tReading From PCT");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tReading From PCT");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	
 	iDlgPrc->ReadPct(*this,aBuffer);
 	}
@@ -376,7 +375,8 @@
 	{
 	if (iPctOpen)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_CLOSEPCT_1, "NetDial:\tClosing PCT");
+		__FLOG_STMT(_LIT8(logString,"NetDial:\tClosing PCT");)
+		__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	
 		iDlgPrc->ClosePct();
 		iPctOpen = EFalse;
@@ -413,7 +413,8 @@
 @param aError a error code for completition.
 */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CNETDIALSCRIPT_MDPOREADPCTCOMPLETE_1,"NetDial:\tRead PCT Complete with Error %d",aError);
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tRead PCT Complete with Error %d");)
+	__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()),aError);
 	iScriptExecutor->ReadPctComplete(aError);
 	}
 void CNetDialScript::MDPODestroyPctComplete(TInt aError)
@@ -424,7 +425,8 @@
 @param aError a error code for completition.
 */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_MDPODESTROYPCTCOMPLETE_1, "NetDial:\tDestroy PCT Notification Complete with Error %d",aError);
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tDestroy PCT Notification Complete with Error %d");)
+	__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()),aError);
 
 	iScriptExecutor->DestroyPctNotificationReceived(aError);
 	}

--- a/telephonyprotocols/csdagt/src/Nd_Bases.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/src/Nd_Bases.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,14 +19,8 @@
  @file Nd_bases.cpp 
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "Nd_BasesTraces.h"
-#endif
-
 #include "Nd_Bases.h"
+#include "SLOGGER.H"
 #include <comms-infras/eventlogger.h>
 #include "ND_ETEL.H"
 #include "ND_DBACC.H"
@@ -93,9 +87,11 @@
 */
 	{
 	TInt len = 0;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSM_GETUSESCRIPTL_1, "Netdial:\tGetUseScriptL");
+	__FLOG_STMT(_LIT8(logString0,"Netdial:\tGetUseScriptL");)
+	__FLOG_STATIC(KNetDialLogFolder(), KNetDialLogFile(), logString0);
 	iDbAccess->GetScriptDetailsL(iUseScript, len);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSM_GETUSESCRIPTL_2, "Netdial:\tGetUseScriptL. iUseScript [%d]",iUseScript);
+	__FLOG_STMT(_LIT8(logString1,"Netdial:\tGetUseScriptL. iUseScript [%d]");)
+	__FLOG_STATIC1(KNetDialLogFolder(), KNetDialLogFile(), logString1, iUseScript);
 	}
 #endif // SYMBIAN_NETWORKING_CSDAGENT_BCA_SUPPORT
 TInt CNetdialSM::GetExcessData(TDes8& aBuffer)
@@ -106,7 +102,8 @@
 @return KErrNotFound if script is not found.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSM_GETEXCESSDATA_1,"NetDial:\tGetting Excess Data");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tGetting Excess Data");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	if (iNdScript!=NULL)
 		return iNdScript->GetExcessData(aBuffer);
 	else
@@ -204,7 +201,8 @@
 	{
 	if(iStatus!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGETLOGININFO_RUNL_1,"NetDial:\tCompleted Phase 'Get Login Info' with Error %d",  iStatus.Int());
+		__FLOG_STMT(_LIT(logString3,"Get Login Info");)
+		__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
 		if (iNdEnv->Script()!=NULL)
 			iNdEnv->Script()->CloseScript();
 		iSMObserver->ConnectionComplete(ECsdGotLoginInfo,iStatus.Int());
@@ -214,11 +212,11 @@
 	
 	if (!(iNdEnv->BaseEnv())->IsReconnect())
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGETLOGININFO_RUNL_2,"NetDial:\tService Started");
+		__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KServiceStartedLogString());
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGETLOGININFO_RUNL_3, "NetDial:\tService Started On Reconnection");
+		__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KServiceStartedReconnLogString());
 		}
 	iSMObserver->ServiceStarted();
 	(iNdEnv->BaseEnv())->CompleteState(KErrNone);

--- a/telephonyprotocols/csdagt/src/Nd_dlinStates.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/src/Nd_dlinStates.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,14 +19,9 @@
  @file Nd_dlinstates.cpp 
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "Nd_dlinStatesTraces.h"
-#endif
-
 #include "ND_DLIN.H"
 #include "Nd_dlinStates.h"
+#include "SLOGGER.H"
 #include <comms-infras/eventlogger.h>
 #include <csdprog.h>
 #include "ND_DBACC.H"
@@ -262,7 +257,8 @@
 	
 	if(iStatus!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLINANSWERING_RUNL_1, "NetDial:\tCompleted Phase Answering with Error %d", iStatus.Int());
+		__FLOG_STMT(_LIT(logString3,"Answering");)
+		__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
 		}
 	else
 		{
@@ -392,7 +388,8 @@
 Call ConnectionComplete() with EConnectionOpen and iStatus.Int().
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLINOPEN_RUNL_1, "NetDial:\tConnection Open");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tConnection Open");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	iSMObserver->ConnectionComplete(ECsdConnectionOpen,iStatus.Int());
 	}
 
@@ -481,7 +478,8 @@
 Call DisconnectComplete().
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLINDISCONNECT_RUNL_1, "NetDial:\tDisconnect Complete");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tDisconnect Complete");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	
 	iSMObserver->DisconnectComplete();
 	}
@@ -612,7 +610,8 @@
 	iNdEnv->Logger()->LogDataUpdateEvent(R_LOG_CON_DISCONNECTED, KLogDataEventTypeUid);
 	if(iStatus!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLINHANGUP_RUNL_1, "NetDial:\tCompleted Phase Hanging Up with Error %d",iStatus.Int());
+		__FLOG_STMT(_LIT(logString3,"Hanging Up");)
+		__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
 		}
 	iSMObserver->UpdateProgress(ECsdFinishedHangUp,KErrNone);
 	(iNdEnv->BaseEnv())->CompleteState(iStatus.Int());

--- a/telephonyprotocols/csdagt/src/Nd_dlupStates.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/src/Nd_dlupStates.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -20,13 +20,8 @@
 */
 
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "Nd_dlupStatesTraces.h"
-#endif
-
 #include "Nd_dlupStates.h"
+#include "SLOGGER.H"
 #include <comms-infras/eventlogger.h>
 #include <csdprog.h>
 #include "ND_DBACC.H"
@@ -278,7 +273,8 @@
 	{
 	if(iStatus!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPDIALLING_RUNL_1, "NetDial:\tCompleted Phase 'Dialling' with Error %d" ,iStatus.Int());
+		__FLOG_STMT(_LIT(logString3,"Dialling");)
+		__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3() ,iStatus.Int());
 		if (iNdEnv->Script()!=NULL)
 			iNdEnv->Script()->CloseScript();
 		iSMObserver->ConnectionComplete(ECsdFinishedDialling,iStatus.Int());
@@ -433,7 +429,8 @@
 	{
 	if(iStatus!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPSCANSCRIPT_RUNL_1, "NetDial:\tCompleted Phase 'Scan Script' with Error %d", iStatus.Int());
+		__FLOG_STMT(_LIT(logString3,"Scan Script");)
+		__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
 		if (iNdEnv->Script()!=NULL)
 			iNdEnv->Script()->CloseScript();
 		iSMObserver->ConnectionComplete(ECsdScannedScript,iStatus.Int());
@@ -506,7 +503,8 @@
 	{ 
 	if((!aContinue)||(iStatus!=KErrNone))
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPGETLOGININFO_NEXTSTATEL_1, "NetDial:\tGetLoginInfo state cancelling (aContinue %d, iStatus %d)",aContinue, iStatus.Int());
+		__FLOG_STMT(_LIT(logString,"NetDial:\tGetLoginInfo state cancelling (aContinue %d, iStatus %d)");)
+		__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString()), aContinue, iStatus.Int());
 
 		TInt err = iStatus.Int();
 		if (!aContinue && err == KErrNone)
@@ -647,7 +645,8 @@
 	{
 	if(iStatus!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPLOGIN_RUNL_1, _ "NetDial:\tCompleted Phase 'Login' with Error %d", iStatus.Int());
+		__FLOG_STMT(_LIT(logString3,"Login");)
+		__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
 		if (iNdEnv->Script()!=NULL)
 			iNdEnv->Script()->CloseScript();
 		iSMObserver->ConnectionComplete(ECsdFinishedLogIn,iStatus.Int());
@@ -781,7 +780,8 @@
 #endif					
 	__ASSERT_DEBUG(iStatus==KErrNone,User::Invariant());
 	iSMObserver->UpdateProgress(ECsdConnectionOpen,KErrNone);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPOPEN_RUNL_1, "NetDial:\tConnection Open");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tConnection Open");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 	if (iNdEnv->Script()!=NULL)
 		iNdEnv->Script()->CloseScript();
 	iSMObserver->ConnectionComplete(ECsdConnectionOpen,KErrNone);
@@ -920,8 +920,12 @@
 	iNdEnv->Logger()->LogDataUpdateEvent(R_LOG_CON_DISCONNECTED, KLogDataEventTypeUid);
 	if(iStatus!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPHANGUP_RUNL_1,"NetDial:\tCompleted Phase 'Hang Up' with Error %d", iStatus.Int());
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPHANGUP_RUNL_2, "NetDial:\tDisconnection Error %d", iStatus.Int());
+#ifdef __FLOG_ACTIVE
+		_LIT(logString3,"Hang Up");
+		_LIT8(logString2,"NetDial:\tDisconnection Error %d");
+#endif
+		__FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
+		__FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString2()), iStatus.Int());
 		}
 	else
 		{
@@ -1020,7 +1024,8 @@
 Call DisconnectComplete().
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPDISCONNECT_RUNL_1, _"NetDial:\tDisconnect Complete");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tDisconnect Complete");)
+	__FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
 
 	iSMObserver->DisconnectComplete();
 	}
@@ -1074,7 +1079,8 @@
 */
 	{
 	ASSERT(iNdEnv);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPOPENDATAPORT_STARTSTATE_1,"NetDial:\tOpening Data Port");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tOpening Data Port"));
+	__FLOG_STATIC(KNetDialLogFolder(), KNetDialLogFile(), logString());
 
 	iSMObserver->UpdateProgress(ECsdScanningScript,KErrNone);
 	TRAPD(ret,iNdEnv->SetUpScriptL());
@@ -1124,7 +1130,10 @@
 	{
 	if (iStatus!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPOPENDATAPORT_RUNL_1, "NetDial:\tCompleted Phase 'Open Data Port' with Error %d", iStatus.Int());
+#ifdef __FLOG_ACTIVE
+		_LIT(logString3,"Open Data Port");
+#endif
+		__FLOG_STATIC2(KNetDialLogFolder(), KNetDialLogFile(), TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
 		if (iNdEnv->Script()!=NULL)
 			iNdEnv->Script()->CloseScript();
 		iSMObserver->ConnectionComplete(ECsdScannedScript,iStatus.Int());
@@ -1184,7 +1193,8 @@
 	ASSERT(iNdEnv);
 	ASSERT (iNdEnv->Script());
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPCLOSEDATAPORT_STARTSTATE_1, "NetDial:\tClosing Data Port");
+	__FLOG_STMT(_LIT8(logString,"NetDial:\tClosing Data Port"));
+	__FLOG_STATIC(KNetDialLogFolder(), KNetDialLogFile(), logString());
 
 	iNdEnv->Script()->ShutdownChannel(iStatus);
 	iStatus = KRequestPending;
@@ -1201,7 +1211,9 @@
 	{
 	if((!aContinue) || (iError != KErrNone) || (iStatus.Int() != KErrNone))
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPCLOSEDATAPORT_NEXTSTATEL_1, "NetDial:\tCloseDataPort state cancelling (iError %d, aContinue %d, iStatus %d)", iError, aContinue, iStatus.Int());
+		__FLOG_STMT(_LIT(logString,"NetDial:\tCloseDataPort state cancelling (iError %d, aContinue %d, iStatus %d)");)
+		__FLOG_STATIC3(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString()), iError, aContinue, iStatus.Int());
+
 		return CDlUpHangUp::NewL(*iSMObserver,*iNdEnv);
 		}
 	else
@@ -1228,11 +1240,14 @@
 	// to its earlier Connect()).
 	if (iStatus!=KErrNone)
 		{
-
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPCLOSEDATAPORT_RUNL_1, "NetDial:\tCompleted Phase 'Close Data Port' with Error %d", iStatus.Int());
+#ifdef __FLOG_ACTIVE
+		_LIT(logString3,"Close Data Port");
+		_LIT8(logstring2,"Saved error = %d");
+#endif
+		__FLOG_STATIC2(KNetDialLogFolder(), KNetDialLogFile(), TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
 		if (iError != KErrNone)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPCLOSEDATAPORT_RUNL_2, "Saved error = %d", iError);
+			__FLOG_STATIC1(KNetDialLogFolder(), KNetDialLogFile(), TRefByValue<const TDesC8>(logstring2()), iError);
 			}
 		else
 			{

--- a/telephonyprotocols/csdagt/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyprotocols/csdagt/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_NETDIALPANIC_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCLOSEDATAPORT_RUNL_1=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCLOSEDATAPORT_RUNL_2=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCONFIGURECOMMPORT_DOCANCEL_1=0x42
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCONFIGURECOMMPORT_DOSTARTSTATEL_1=0x44
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCONFIGURECOMMPORT_RUNL_1=0x43
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCONFIGURECOMMPORT_STARTSTATE_1=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCONNECT_DOSTARTSTATEL_1=0x3b
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCONNECT_RUNL_1=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTDISCONNECT_RUNL_1=0x40
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTHANGUP_RUNL_1=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTHANGUP_RUNL_2=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTHANGUP_RUNL_3=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTOPEN_RUNL_1=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTRECONFIGURECOMMPORT_RUNL_1=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTRECONFIGURECOMMPORT_STARTSTATE_1=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTSCANSCRIPT_RUNL_1=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTSCANSCRIPT_RUNL_2=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CDIRCTSCANSCRIPT_RUNL_3=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CDLINANSWERING_RUNL_1=0x68
-[TRACE]TRACE_INTERNALS[0x88]_CDLINDISCONNECT_RUNL_1=0x6a
-[TRACE]TRACE_INTERNALS[0x88]_CDLINHANGUP_RUNL_1=0x6b
-[TRACE]TRACE_INTERNALS[0x88]_CDLINOPEN_RUNL_1=0x69
-[TRACE]TRACE_INTERNALS[0x88]_CDLUPAGXSM_NOTIFICATION_1=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CDLUPCLOSEDATAPORT_NEXTSTATEL_1=0x77
-[TRACE]TRACE_INTERNALS[0x88]_CDLUPCLOSEDATAPORT_RUNL_1=0x78
-[TRACE]TRACE_INTERNALS[0x88]_CDLUPCLOSEDATAPORT_RUNL_2=0x79
-[TRACE]TRACE_INTERNALS[0x88]_CDLUPCLOSEDATAPORT_STARTSTATE_1=0x76
-[TRACE]TRACE_INTERNALS[0x88]_CDLUPDIALLING_RUNL_1=0x6c
-[TRACE]TRACE_INTERNALS[0x88]_CDLUPDISCONNECT_RUNL_1=0x73
-[TRACE]TRACE_INTERNALS[0x88]_CDLUPGETLOGININFO_NEXTSTATEL_1=0x6e
-[TRACE]TRACE_INTERNALS[0x88]_CDLUPHANGUP_RUNL_1=0x71
-[TRACE]TRACE_INTERNALS[0x88]_CDLUPHANGUP_RUNL_2=0x72
-[TRACE]TRACE_INTERNALS[0x88]_CDLUPLOGIN_RUNL_1=0x6f
-[TRACE]TRACE_INTERNALS[0x88]_CDLUPOPENDATAPORT_RUNL_1=0x75
-[TRACE]TRACE_INTERNALS[0x88]_CDLUPOPENDATAPORT_STARTSTATE_1=0x74
-[TRACE]TRACE_INTERNALS[0x88]_CDLUPOPEN_RUNL_1=0x70
-[TRACE]TRACE_INTERNALS[0x88]_CDLUPSCANSCRIPT_RUNL_1=0x6d
-[TRACE]TRACE_INTERNALS[0x88]_CDTRCOMMAND_PARSEL_1=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CDTRCOMMAND_PARSEL_2=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CDTRCOMMAND_PARSEL_3=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CEXITCOMMAND_PARSEL_1=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CEXITCOMMAND_PARSEL_2=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CGETLOGININFO_RUNL_1=0x65
-[TRACE]TRACE_INTERNALS[0x88]_CGETLOGININFO_RUNL_2=0x66
-[TRACE]TRACE_INTERNALS[0x88]_CGETLOGININFO_RUNL_3=0x67
-[TRACE]TRACE_INTERNALS[0x88]_CGOTOCOMMAND_GOTO_1=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CGOTOCOMMAND_GOTO_2=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CGOTOCOMMAND_PARSELABELL_1=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CGOTOCOMMAND_PARSEL_1=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CLOOPCOMMAND_CHECKLOOPL_1=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CLOOPCOMMAND_CHECKLOOPL_2=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CLOOPCOMMAND_PARSEL_1=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CLOOPCOMMAND_PARSEL_2=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSCRIPT_CLOSEPCT_1=0x5f
-[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSCRIPT_DESTROYPCTNOTIFICATION_1=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSCRIPT_MDPODESTROYPCTCOMPLETE_1=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSCRIPT_MDPOREADPCTCOMPLETE_1=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSCRIPT_OPENPCT_1=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSCRIPT_READPCT_1=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSCRIPT_WRITEPCT_1=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSM_GETEXCESSDATA_1=0x64
-[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSM_GETUSESCRIPTL_1=0x62
-[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSM_GETUSESCRIPTL_2=0x63
-[TRACE]TRACE_INTERNALS[0x88]_CREADPCTCOMMAND_PARSEL_1=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTEXECUTOR_CLOSESCRIPT_1=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTEXECUTOR_COMPLETEDSCRIPT_1=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTEXECUTOR_READPCTCOMPLETE_1=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTEXECUTOR_SCANSCRIPTL_1=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTEXECUTOR_SCANSCRIPTL_2=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTEXECUTOR_SCANSCRIPTL_3=0x30
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTEXECUTOR_SETSCRIPT_1=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_CANCELCREATECHANNEL_1=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_CHATSTRINGMATCH_1=0x26
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_CHATTIMEOUT_1=0x27
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_CHATTIMEOUT_2=0x28
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_CHATTIMEOUT_3=0x29
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_1=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_10=0x23
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_2=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_3=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_4=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_5=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_7=0x20
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_8=0x21
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_9=0x22
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMWRITECOMPLETE_1=0x24
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMWRITECOMPLETE_2=0x25
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_CREATECHANNEL_1=0x15
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_CREATECHANNEL_2=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_INITIALIZECOMPLETE_1=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_PRESENDPAUSECOMPLETED_1=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_READECHO_1=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_READ_1=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_SHUTDOWNCOMPLETE_1=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_STOP_1=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTREADER_CONSTRUCTL_1=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTREADER_GETCURRENTLINE_1=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTREADER_GETCURRENTLINE_2=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CSENDCOMMAND_PARSEL_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CSENDCOMMAND_PARSEL_2=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CSETCOMMAND_PARSEL_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CSETCOMMAND_PARSEL_2=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_CLOSECALL_1=0x54
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_CLOSECALL_2=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_CONSTRUCTL_1=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_DIALL_1=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_DTOR_1=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_DTOR_2=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_GETCOMMPORTL_1=0x52
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_GETLINEINFOL_1=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_GETLINEINFOL_2=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_GETPHONEINFOL_1=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_GETPHONEINFOL_2=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_HANDLESTATUSCHANGE_1=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_LISTENFORSTATUSCHANGE_1=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_OPENNEWCALLL_1=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_RETURNCOMMPORTL_1=0x53
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_STARTHANGUP_1=0x51
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_WAITFORINCOMINGCALLL_1=0x50
-[TRACE]TRACE_INTERNALS[0x88]_CWAITCOMMAND_PARSEACTIONL_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CWAITCOMMAND_PARSEACTIONL_2=0x6

--- a/telephonyprotocols/pdplayer/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -30,7 +30,7 @@
 PRJ_TESTMMPFILES
 
 
-#include "../test/controlplane/group/bld.inf"
+#include "../test/controlplane/group/BLD.INF"
 
 #endif

--- a/telephonyprotocols/pdplayer/group/pdp.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/group/pdp.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -46,9 +46,9 @@
 SOURCE		pdpservices.cpp
 SOURCE		mbmsengine.cpp
 SOURCE		pdptiermanagerselector.cpp
+#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 SOURCE		PDPCPR.cpp
 SOURCE		PDPCPRFactory.cpp
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 SOURCE		PDPCPRAvailabilityListener.cpp
 #endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 SOURCE		AuthenticationDialog.cpp
@@ -101,7 +101,6 @@
 USERINCLUDE    	../inc
 USERINCLUDE		../umts/spudtel/inc
 USERINCLUDE		../umts/spudfsm/inc
-USERINCLUDE    	../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN

--- a/telephonyprotocols/pdplayer/inc/PDPCPR.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/inc/PDPCPR.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -37,7 +37,7 @@
     }
 
 
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
+
 namespace PDPCprStates
 {
 typedef MeshMachine::TNodeContext<CPDPConnectionProvider, CprStates::TContext> TContext;
@@ -51,8 +51,8 @@
    TUpdateBundle,
    PRStates::TRespondWithRetrievedParams
    )
+
 }
-#endif
 
 
 class CPDPConnectionProvider : public CCoreConnectionProvider, MPDPCPRBearerObserver
@@ -62,29 +62,21 @@
 */
     {
 	friend class CPDPConnectionProviderFactory;
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 	friend class PDPCprStates::TUpdateBundle;
-#endif
 
 public:
     typedef CPDPConnectionProviderFactory FactoryType;
 	
 	static CPDPConnectionProvider* NewL(ESock::CConnectionProviderFactoryBase& aFactory);
-
-	// from MPDPCPRBearerObserver
+	
 	virtual void BearerChangeDetectedL();
-
-private:	
+	
+protected:	
     CPDPConnectionProvider(ESock::CConnectionProviderFactoryBase& aFactory);
-   
-protected:
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
     void StartListener();
     void StopListener();
+    TUint32 Bearer(TUint aDynamicCaps, RMobilePhone::TMobilePhoneNetworkMode& aNetworkMode);
     void UpdateBearer();
-    TUint32 Bearer(TUint aDynamicCaps, RMobilePhone::TMobilePhoneNetworkMode& aNetworkMode);
-#endif
-    
     virtual ~CPDPConnectionProvider();
     virtual void ReceivedL(const Messages::TRuntimeCtxId& aSender, const Messages::TNodeId& aRecipient, Messages::TSignatureBase& aMessage);
 	void ConstructL();

--- a/telephonyprotocols/pdplayer/src/102822EF.rss	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/102822EF.rss	Wed Sep 01 12:40:21 2010 +0100
@@ -59,7 +59,7 @@
                 }
             };
         },
-
+#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
     INTERFACE_INFO
         {
         interface_uid = CprInterfaceUid;
@@ -75,7 +75,7 @@
                 }
             };
         },
-
+#endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
     INTERFACE_INFO
         {
         interface_uid = ScprInterfaceUid;

--- a/telephonyprotocols/pdplayer/src/PDPCPR.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/PDPCPR.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -33,19 +33,14 @@
 #include <comms-infras/ss_metaconnprov.h>
 #include "PDPProvision.h"
 #include <etel.h>
+#include <networking/cfbearers.h>
 #include "pdpcpravailabilitylistener.h"
 #include <comms-infras/ss_nodemessages.h>
+#include <networking/ipcpr_states.h>
 #include <comms-infras/linkmessages.h>
 #include <elements/nm_interfaces.h>
-
-
-
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
-#include <networking/cfbearers.h>
-#include <networking/ipcpr_states.h>
 #include <cs_genevent.h>
 #include <networking/etelbearers.h>
-#endif
 
 using namespace ESock;
 
@@ -55,7 +50,6 @@
 //
 //-=========================================================	
 
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 namespace PDPCprLinkCharacteristicActivity
 {
 DECLARE_DEFINE_NODEACTIVITY(ECFActivityParamRequest, PDPCprLinkCharacteristic, TCFScpr::TGetParamsRequest)
@@ -73,18 +67,16 @@
     LAST_NODEACTIVITY_ENTRY(CoreNetStates::KNonDefault, MeshMachine::TDoNothing)    
 NODEACTIVITY_END()
 }
-#endif
 
 namespace PDPCprActivities
 {
 DEFINE_ACTIVITY_MAP(activityMap)
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
     ACTIVITY_MAP_ENTRY(PDPDataClientGoneDownActivity, PDPScprGoneDown)
 	ACTIVITY_MAP_ENTRY(PDPCprLinkCharacteristicActivity, PDPCprLinkCharacteristic)
-#endif
 ACTIVITY_MAP_END_BASE(CprActivities, coreCprActivities)
 }
 
+
 CPDPConnectionProvider* CPDPConnectionProvider::NewL(ESock::CConnectionProviderFactoryBase& aFactory)
     {
     CPDPConnectionProvider* provider = new (ELeave) CPDPConnectionProvider(aFactory);
@@ -94,6 +86,18 @@
 	return provider;
     }        
 
+
+void CPDPConnectionProvider::StartListener()
+/**
+ * Start listening for dynamic caps or network mode changes.
+ * @param None
+ * @return void
+ */
+	{
+	iDynamicCapsEventListener->NotifyDynamicCapsChange(this);
+	iNetworkModeEventListener->NotifyNetworkModeChange(this);
+	}
+
 void CPDPConnectionProvider::ConstructL()
 /**
  * PDP Connection Provider Second Phase Constructor
@@ -104,13 +108,23 @@
 	CCoreConnectionProvider::ConstructL();
 	}
 
+void CPDPConnectionProvider::StopListener()
+/**
+ * Start listening for dynamic caps or network mode changes.
+ */
+	{
+	if(iDynamicCapsEventListener)
+		{
+		iDynamicCapsEventListener->Cancel();
+		}
+	if(iNetworkModeEventListener)
+		{
+		iNetworkModeEventListener->Cancel();
+		}
+	}
+
 CPDPConnectionProvider::CPDPConnectionProvider(ESock::CConnectionProviderFactoryBase& aFactory)
-	: CCoreConnectionProvider(aFactory, PDPCprActivities::activityMap::Self()),
-	  iDynamicCapsEventListener(NULL),
-	  iNetworkModeEventListener(NULL),
-	  iBearerType(0),
-	  iBearerSet(EFalse)
-	  
+	: CCoreConnectionProvider(aFactory, PDPCprActivities::activityMap::Self())
 /**
  * Construct PDP connection provider.
  */	
@@ -124,9 +138,7 @@
  */
     {    
     LOG_NODE_DESTROY(KESockConnectionTag, CPDPConnectionProvider);
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
     StopListener();
-#endif
 	delete iDynamicCapsEventListener;
 	delete iNetworkModeEventListener;
     }
@@ -146,7 +158,6 @@
  * all the control client.
  */
 	{
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 	//Update bearers.
 	UpdateBearer();
 	
@@ -177,35 +188,10 @@
 		msg.iRefCountOwnedNotification->Open();
 		ctl->PostMessage(this->NodeId(), msg);
 		}
-#endif
+
 	}
 
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
-void CPDPConnectionProvider::StartListener()
-/**
- * Start listening for dynamic caps or network mode changes.
- * @param None
- * @return void
- */
-    {
-    iDynamicCapsEventListener->NotifyDynamicCapsChange(this);
-    iNetworkModeEventListener->NotifyNetworkModeChange(this);
-    }
 
-void CPDPConnectionProvider::StopListener()
-/**
- * Start listening for dynamic caps or network mode changes.
- */
-    {
-    if(iDynamicCapsEventListener)
-        {
-        iDynamicCapsEventListener->Cancel();
-        }
-    if(iNetworkModeEventListener)
-        {
-        iNetworkModeEventListener->Cancel();
-        }
-    }
 void CPDPConnectionProvider::UpdateBearer()
 /**
  * Update bearer type based on the change of the dynamic caps or network mode.
@@ -221,6 +207,7 @@
 	iBearerSet = ETrue;
 	}
 
+
 TUint32 CPDPConnectionProvider::Bearer(TUint aDynamicCaps, RMobilePhone::TMobilePhoneNetworkMode& aNetworkMode)
 /**
  * Determine bearer based on dynamic caps and network mode.
@@ -230,6 +217,7 @@
  *
  */
 	{
+	
 	if ((aDynamicCaps & RPacketService::KCapsHSUPA) || (aDynamicCaps & RPacketService::KCapsHSDPA))
 		{
 		return KHsdpaBearer;
@@ -255,6 +243,7 @@
 		}
 	}
 
+
 DEFINE_SMELEMENT(PDPCprStates::TUpdateBundle, NetStateMachine::MStateTransition, PDPCprStates::TContext)
 void PDPCprStates::TUpdateBundle::DoL()
 /**
@@ -303,6 +292,5 @@
 		iContext.Node().StartListener();
 		}
 	}
-#endif

--- a/telephonyprotocols/pdplayer/src/PDPConfig.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/PDPConfig.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -20,14 +20,6 @@
  @internalComponent
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "PDPConfigTraces.h"
-#endif
-
-#include <hash.h>
-#include <e32math.h>
 #include <comms-infras/ss_log.h>
 #include <in_sock.h>
 #include <comms-infras/metadata.h>
@@ -39,6 +31,11 @@
 
 using namespace ESock;
 
+#if defined(__CFLOG_ACTIVE)
+#define KPDPMCprTag KESockMetaConnectionTag
+_LIT8(KPDPMCprSubTag, "pdpmcpr");
+#endif
+
 //
 // Attribute table for provisioning structure passed to CFProtocol
 //
@@ -161,7 +158,7 @@
 		{
 		aCompression |= RPacketContext::KPdpHeaderCompression;
 		}
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGPRSPROVISION_RETRIEVEGPRSCOMPRESSION_1, "CGPRSProvision [this=0x%08x]::InitialiseConfigL() KCDTIdWCDMADataCompression|KCDTIdWCDMAHeaderCompression [%u]", (TUint)this, aCompression);
+	__CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CGPRSProvision [this=%08x]::InitialiseConfigL() KCDTIdWCDMADataCompression|KCDTIdWCDMAHeaderCompression [%d]"), this, aCompression));
 	}
 
 void CGPRSProvision::RetrieveGprsAnonymousAccess(RPacketContext::TAnonymousAccess& aAnonymous, ESock::CCommsDatIapView* aIapView) const
@@ -173,7 +170,7 @@
 	else
 		aAnonymous = RPacketContext::ENotRequired;
 	
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGPRSPROVISION_RETRIEVEGPRSANONYMOUSACCESS_1, "CGPRSProvision [this=%08x]::InitialiseConfigL() KCDTIdWCDMAAnonymousAccess [%d]", (TUint)this, aAnonymous);
+	__CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CGPRSProvision [this=%08x]::InitialiseConfigL() KCDTIdWCDMAAnonymousAccess [%d]"), this, aAnonymous));
 	}
 
 void CGPRSProvision::RetrieveApnNameL(TDes8& aApnName, ESock::CCommsDatIapView* aIapView) const
@@ -190,7 +187,7 @@
     		{
     		User::Leave(getErr);
     		}
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGPRSPROVISION_RETRIEVEAPNNAMEL_1, "CGPRSProvision [this=%08x]::InitialiseConfigL() KCDTIdAPN [%s]", (TUint)this, aApnName);
+	__CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CGPRSProvision [this=%08x]::InitialiseConfigL() KCDTIdAPN [%S]"), this, &aApnName));
 	}
 
 void CGPRSProvision::RetrievePdpTypeL(RPacketContext::TProtocolType& aPdpType, ESock::CCommsDatIapView* aIapView) const	
@@ -199,7 +196,7 @@
 
 	aIapView->GetIntL(KCDTIdWCDMPDPType | KCDTIdOutgoingGprsRecord, pdpType);
 	aPdpType = static_cast<RPacketContext::TProtocolType>(pdpType);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGPRSPROVISION_RETRIEVEPDPTYPEL_1, "CGPRSProvision [this=%08x]::InitialiseConfigL() KCDTIdWCDMPDPType=%d", (TUint)this, aPdpType);
+	__CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CGPRSProvision [this=%08x]::InitialiseConfigL() KCDTIdWCDMPDPType=%d"), this, aPdpType)); 	
 	}
 
 void CGPRSProvision::RetrieveAuthenticationInfoL(RPacketContext::TProtocolConfigOptionV2& aProtocolConfigOption, ESock::CCommsDatIapView* aIapView)
@@ -207,7 +204,7 @@
     HBufC* buf = NULL;
     TInt getErr;
 
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGPRSPROVISION_RETRIEVEAUTHENTICATIONINFOL_1, "CGPRSProvision [this=%08x]::RetrieveAuthenticationInfoL()", (TUint)this);
+    __CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CGPRSProvision [this=%08x]::RetrieveAuthenticationInfoL()"), this));
 
     getErr = aIapView->GetText(KCDTIdWCDMAIfAuthName | KCDTIdOutgoingGprsRecord, buf);
     if ( getErr == KErrNone )
@@ -217,10 +214,9 @@
         delete buf;
         buf = NULL;
         
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGPRSPROVISION_RETRIEVEAUTHENTICATIONINFOL_2, "CGPRSProvision [this=%08x]::RetrieveAuthenticationInfoL() KCDTIdWCDMAIfAuthName [%s] ", (TUint)this, aProtocolConfigOption.iAuthInfo.iUsername);
+        __CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CGPRSProvision [this=%08x]::RetrieveAuthenticationInfoL() KCDTIdWCDMAIfAuthName [%S] "), this, &aProtocolConfigOption.iAuthInfo.iUsername));
         
 		aProtocolConfigOption.iId = 1;
-		
         getErr = aIapView->GetText(KCDTIdWCDMAIfAuthPass | KCDTIdOutgoingGprsRecord, buf);
         if ( getErr == KErrNone )
             {
@@ -229,7 +225,7 @@
             delete buf;
             buf = NULL;
             
-            OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGPRSPROVISION_RETRIEVEAUTHENTICATIONINFOL_3, "CGPRSProvision [this=%08x]::RetrieveAuthenticationInfoL() KCDTIdWCDMAIfAuthPass [%S]", (TUint)this, aProtocolConfigOption.iAuthInfo.iPassword);
+            __CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CGPRSProvision [this=%08x]::RetrieveAuthenticationInfoL() KCDTIdWCDMAIfAuthPass [%S]"), this, &aProtocolConfigOption.iAuthInfo.iPassword));
             }
         else if (getErr != KErrNotFound)
             {
@@ -411,7 +407,7 @@
 	
 	aIapView->GetTextL(KCDTIdTsyName, buf);
 	iTsyName.Copy(*buf);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYPROVISION_INITIALISECONFIGL_1, "CTSYProvision [this=%08x]::InitialiseConfigL() KCDTIdTsyName=%S", (TUint)this, iTsyName);
+	__CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CTSYProvision [this=%08x]::InitialiseConfigL() KCDTIdTsyName=%s"), this, &iTsyName)); 	
 	delete buf;
     }

--- a/telephonyprotocols/pdplayer/src/PDPDeftSCPR.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/PDPDeftSCPR.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -20,11 +20,6 @@
  @internalComponent
 */
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "PDPDeftSCPRTraces.h"
-#endif
-
 #include <comms-infras/corescpractivities.h>
 #include "PDPDeftSCPR.h"
 #include "PDPSCPRStates.h"
@@ -33,7 +28,7 @@
 #include <comms-infras/commsdebugutility.h>
 #include <elements/nm_signatures.h>
 
-#if defined(SYMBIAN_TRACE_ENABLE)
+#if defined(__CFLOG_ACTIVE) || defined(SYMBIAN_TRACE_ENABLE)
 #define KPDPSCprTag KESockSubConnectionTag
 _LIT8(KPDPSCprSubTag, "pdpscpr");
 #endif
@@ -282,8 +277,8 @@
     iUsername.Copy(configOption->iAuthInfo.iUsername);
     iPassword.Copy(configOption->iAuthInfo.iPassword);
 
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATE_1, "CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%S] ", (TUint)this, iUsername);
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATE_2, "CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%S] ", (TUint)this, iPassword);
+    __CFLOG_VAR((KPDPSCprTag, KPDPSCprSubTag, _L8("CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%S] "), this, &iUsername));
+    __CFLOG_VAR((KPDPSCprTag, KPDPSCprSubTag, _L8("CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%S] "), this, &iPassword));
     
     iAuthDialog = CAuthenticationDialog::NewL();
     iAuthDialog->Authenticate(*this, iUsername, iPassword);
@@ -298,9 +293,9 @@
 
         configOption->iAuthInfo.iUsername.Copy(iUsername);
         configOption->iAuthInfo.iPassword.Copy(iPassword);
-       
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATIONCOMPLETE_1, "CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%s] ", (TUint)this, configOption->iAuthInfo.iUsername);
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATIONCOMPLETE_2, "CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%s] ", (TUint)this, configOption->iAuthInfo.iPassword);
+
+        __CFLOG_VAR((KPDPSCprTag, KPDPSCprSubTag, _L8("CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%S] "), this, &configOption->iAuthInfo.iUsername));
+        __CFLOG_VAR((KPDPSCprTag, KPDPSCprSubTag, _L8("CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%S] "), this, &configOption->iAuthInfo.iPassword));
         }
 
     //Send AuthenticateComplete message

--- a/telephonyprotocols/pdplayer/src/PDPSCPR.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/PDPSCPR.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -31,7 +31,7 @@
 #include <comms-infras/agentscpractivities.h>
 #include <comms-infras/ss_nodemessages_factory.h>
 
-#if  defined SYMBIAN_TRACE_ENABLE
+#if defined __FLOG_ACTIVE || defined SYMBIAN_TRACE_ENABLE
 #define KPDPSCprTag KESockSubConnectionTag
 _LIT8(KPDPSCprSubTag, "pdpscpr");
 #endif

--- a/telephonyprotocols/pdplayer/src/ecom_impl.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/ecom_impl.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -25,7 +25,9 @@
 #include <ecom/ecom.h>
 
 #include "pdpmcprfactory.h"
+#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 #include "PDPCPRFactory.h"
+#endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 #include "PDPSCPRFactory.h"
 #include "pdptiermanagerfactory.h"
 
@@ -36,7 +38,9 @@
 const TImplementationProxy ImplementationTable[] =
 	{   
 	IMPLEMENTATION_PROXY_ENTRY(CPdpMetaConnectionProviderFactory::iUid, CPdpMetaConnectionProviderFactory::NewL),
+#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 	IMPLEMENTATION_PROXY_ENTRY(CPDPConnectionProviderFactory::iUid, CPDPConnectionProviderFactory::NewL),
+#endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 	IMPLEMENTATION_PROXY_ENTRY(CPDPSubConnectionProviderFactory::iUid, CPDPSubConnectionProviderFactory::NewL),
 	IMPLEMENTATION_PROXY_ENTRY(CPDPTierManagerFactory::EUid, CPDPTierManagerFactory::NewL)
    	};

--- a/telephonyprotocols/pdplayer/src/pdpmcpr.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/pdpmcpr.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -20,13 +20,6 @@
  @internalComponent
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "pdpmcprTraces.h"
-#endif
-
-
 #include <etelqos.h>
 #include <comms-infras/agentmcpractivities.h>
 #include <comms-infras/coremcpractivities.h>
@@ -167,7 +160,8 @@
 
 void CPdpMetaConnectionProvider::ReceivedL(const TRuntimeCtxId& aSender, const TNodeId& aRecipient, TSignatureBase& aMessage)
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPMETACONNECTIONPROVIDER_RECEIVEDL_1, "CPdpMetaConnectionProvider [this=%08x]::ReceivedL() aMessage=%d",(TUint)this, aMessage.MessageId().MessageId());
+	__CFLOG_VAR((KPdpMCprTag, KPdpMCprSubTag, _L8("CPdpMetaConnectionProvider [this=%08x]::ReceivedL() aMessage=%d"),
+	   this, aMessage.MessageId().MessageId()));
 
 	ESOCK_DEBUG_MESSAGE_INTERCEPT(aSender, aMessage, aRecipient);

--- a/telephonyprotocols/pdplayer/src/pdpmcprfactory.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/pdpmcprfactory.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -20,12 +20,6 @@
  @internalComponent
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "pdpmcprfactoryTraces.h"
-#endif
-
 #include <etelqos.h>
 #include <ecom/implementationproxy.h>
 #include <comms-infras/ss_log.h>
@@ -37,6 +31,13 @@
 #include "pdpmcprfactory.h"
 #include "pdpmcpr.h"
 
+
+
+#ifdef _DEBUG
+#define KPdpMCprFactoryTag KESockMetaConnectionTag
+_LIT8(KPdpMCprFactorySubTag, "pdpmcprfactory");
+#endif
+
 using namespace ESock;
 
 //-=========================================================
@@ -46,14 +47,14 @@
 //-=========================================================	
 CPdpMetaConnectionProviderFactory* CPdpMetaConnectionProviderFactory::NewL(TAny* aParentContainer)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPMETACONNECTIONPROVIDERFACTORY_NEWL_1, "CPdpMetaConnectionProviderFactory ::\tNewL(%08x)", aParentContainer);
+	__CFLOG_VAR((KPdpMCprFactoryTag, KPdpMCprFactorySubTag, _L8("CPdpMetaConnectionProviderFactory ::\tNewL(%08x)"), aParentContainer));
  	return new (ELeave) CPdpMetaConnectionProviderFactory(TUid::Uid(CPdpMetaConnectionProviderFactory::iUid), *(reinterpret_cast<CMetaConnectionFactoryContainer*>(aParentContainer)));
 	}
 
 CPdpMetaConnectionProviderFactory::CPdpMetaConnectionProviderFactory(TUid aFactoryId, CMetaConnectionFactoryContainer& aParentContainer)
 	: CMetaConnectionProviderFactoryBase(aFactoryId,aParentContainer)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPMETACONNECTIONPROVIDERFACTORY_CTOR_1, "CPdpMetaConnectionProviderFactory %08x:\tCPdpMetaConnectionProviderFactory Constructor", this);
+	__CFLOG_VAR((KPdpMCprFactoryTag, KPdpMCprFactorySubTag, _L8("CPdpMetaConnectionProviderFactory %08x:\tCPdpMetaConnectionProviderFactory Constructor"), this));
 	}
 
 ESock::ACommsFactoryNodeId* CPdpMetaConnectionProviderFactory::DoCreateObjectL(ESock::TFactoryQueryBase& aQuery)

--- a/telephonyprotocols/pdplayer/src/pdpservices.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/pdpservices.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -18,12 +18,6 @@
  @internalComponent
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "pdpservicesTraces.h"
-#endif
-
 #include <comms-infras/ss_log.h>
 #include <comms-infras/ss_corepractivities.h> // TODO is this needed?
 #include <comms-infras/coretiermanagerstates.h> // TODO is this needed?
@@ -33,6 +27,11 @@
 #include <pcktcs.h>
 #include <comms-infras/es_connectionserv.h>
 
+#ifdef __CFLOG_ACTIVE
+#define KPDPTierMgrTag KESockMetaConnectionTag
+_LIT8(KMBMSObjectTag, "MBMSObject");
+#endif
+
 using namespace Messages;
 using namespace MeshMachine; // TODO is this needed?
 using namespace ESock;
@@ -120,7 +119,7 @@
 */
 void CMBMSServiceRequest::CancelMessage(const TInt aError)
 	{
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_CANCELMESSAGE_1, "CMBMSServiceRequest[%08x]::CancelMessage(%d)", (TUint)this, aError);
+	__CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::CancelMessage(%d)"), this, aError));
 	if (iRequestType == TCFTierStatusProvider::TTierNotificationRegistration::Id())
 		{
 		iRequestOriginator.PostMessage(
@@ -198,7 +197,7 @@
 */
 TInt CMBMSServiceRequest::RunError(TInt aError)
 	{
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNERROR_1, "CMBMSServiceRequest[%08x]::RunError(%d)", (TUint)this, aError);
+	__CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::RunError(%d)"), this, aError));
 
 	// Stop the ScanEngine components
 	Cancel();
@@ -226,7 +225,7 @@
 		switch(iScanEngineState)
 			{
 			case EChecking:
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_1, "CMBMSServiceRequest[%08x]::In EChecking State", (TUint)this);
+				__CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In EChecking State"), this));
 				User::LeaveIfError(iMBMSEngine.GetRPacketService().GetStatus(iPsdStatus)); // get initial status
 
 				//check the query type
@@ -249,14 +248,14 @@
 
 			case EBearerAvailable:
 				//get MBMS bearer availability.
-				 OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_2, "CMBMSServiceRequest[%08x]::In EBearerAvailable State", (TUint)this);
+				 __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In EBearerAvailable State"), this));
 				 iMBMSEngine.GetRPacketService().GetMbmsNetworkServiceStatus(iStatus,ETrue,iNetworkServiceStatus);
 			 	 iScanEngineState = ERetrieveBearerAvailability;
 				 SetActive();
 			break;
 
 		   	case ERetrieveBearerAvailability:
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_3, "CMBMSServiceRequest[%08x]::In ERetrieveBearerAvailability State", (TUint)this);
+				__CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In ERetrieveBearerAvailability State"), this));
 			    //create a parameter bundle and send the results to the client.
 			    SendResultBundleL();
 
@@ -304,7 +303,7 @@
 
 			case EGetCountMonitorList:
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_4, "CMBMSServiceRequest[%08x]::In ECountActiveServiceList State", (TUint)this);
+				__CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In ECountActiveServiceList State"), this));
 				iMBMSEngine.GetRPacketService().EnumerateMbmsMonitorServiceList(iStatus,iCount,iMaxCount);
 
 				SetActive();
@@ -314,7 +313,7 @@
 
 			case EGetCountServiceList:
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_5, "CMBMSServiceRequest[%08x]::In ECountActiveServiceList State", (TUint)this);
+				__CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In ECountActiveServiceList State"), this));
 				iMBMSEngine.GetRPacketService().EnumerateMbmsActiveServiceList(iStatus,iCount,iMaxCount);
 
 				SetActive();
@@ -328,14 +327,14 @@
 
 			case ENotifyService:
 				//notify for MBMS Services.
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_6, "CMBMSServiceRequest[%08x]::In ENotifyService State", (TUint)this);
+				__CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In ENotifyService State"), this));
 				iMBMSEngine.GetRPacketService().NotifyMbmsServiceAvailabilityChange(iStatus);
 			    SetActive();
 				iScanEngineState = EStartMonitor;
 			break;
 
 			case EStartMonitor:
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_7, "CMBMSServiceRequest[%08x]::In EStartMonitor State", (TUint)this);
+				__CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In EStartMonitor State"), this));
 				iRetrievePcktMbms = CRetrievePcktMbmsMonitoredServices::NewL(iMBMSEngine.GetRPacketService());
 			    iRetrievePcktMbms->Start(iStatus);
 
@@ -355,13 +354,13 @@
 		}
 	else if(((iStatus.Int() == KErrMbmsImpreciseServiceEntries))||((iStatus.Int() == KErrNotFound)))
 		 {
-		  OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_8, "CMBMSServiceRequest[%08x]::RunL() KErrMbmsImpreciseServiceEntries || KErrNotFound", (TUint)this);
+		  __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::RunL() KErrMbmsImpreciseServiceEntries || KErrNotFound"), this));
 		  CancelMessage(iStatus.Int());
 		  iMBMSEngine.RemoveFromRequestListL(GetClientId());
 		 }
 	else
 		{
-		 OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_9, "CMBMSServiceRequest[%08x]::RunL() ERROR: Incorrect status, Aborting", (TUint)this);
+		 __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::RunL() ERROR: Incorrect status, Aborting"), this));
 		 User::Leave(iStatus.Int());
 		}
 
@@ -374,7 +373,7 @@
 */
 CPcktMbmsMonitoredServiceList* CMBMSServiceRequest::UpdateMonitorServiceListL()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_UPDATEMONITORSERVICELISTL_1, "CMBMSServiceRequest[%08x]::In UpdateMonitorServiceListL()", (TUint)this);
+	__CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In UpdateMonitorServiceListL()"), this));
 
 	//Read the entries in the parameter bundle and pass them to Etel.
 	CPcktMbmsMonitoredServiceList* serviceList= CPcktMbmsMonitoredServiceList::NewL();
@@ -448,7 +447,7 @@
 	CConnectionServParameterBundle* returnBundle = CConnectionServParameterBundle::NewL();
 	CleanupStack::PushL(returnBundle);
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_PREPAREMONITORRESULTBUNDLEL_1, "CMBMSServiceRequest[%08x]::In PrepareMonitorResultBundleL function", (TUint)this);
+	__CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In PrepareMonitorResultBundleL function"), this));
 	//read the MBMS Service list from Etel after receiving the MBMS Service Availability Notification.
 
 	CPcktMbmsMonitoredServiceList* serviceList = iRetrievePcktMbms->RetrieveListL();
@@ -493,7 +492,7 @@
 */
 CConnectionServParameterBundle* CMBMSServiceRequest::PrepareBearerResultBundleL() const
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_PREPAREBEARERRESULTBUNDLEL_1, "CMBMSServiceRequest[%08x]::In PrepareBearerResultBundleL function", (TUint)this);
+	__CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In PrepareBearerResultBundleL function"), this));
 
 	CConnectionServParameterBundle* returnBundle = CConnectionServParameterBundle::NewL();
 	CleanupStack::PushL(returnBundle);
@@ -518,7 +517,7 @@
 */
 CConnectionServParameterBundle* CMBMSServiceRequest::PrepareCountBundleL() const
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_PREPARECOUNTBUNDLEL_1, "CMBMSServiceRequest[%08x]::In PrepareCountBundleL function", (TUint)this);
+	__CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In PrepareCountBundleL function"), this));
 
 	CConnectionServParameterBundle* returnBundle = CConnectionServParameterBundle::NewL();
 	CleanupStack::PushL(returnBundle);
@@ -544,7 +543,7 @@
 CConnectionServParameterBundle* CMBMSServiceRequest::PrepareRemoveAllBundleL() const
 	{
 	//pass empty bundle
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_PREPAREREMOVEALLBUNDLEL_1, "CMBMSServiceRequest[%08x]::In PrepareRemoveAllBundleL function", (TUint)this);
+	__CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In PrepareRemoveAllBundleL function"), this));
 
 	CConnectionServParameterBundle* returnBundle = CConnectionServParameterBundle::NewL();
 	return returnBundle;

--- a/telephonyprotocols/pdplayer/src/pdptiermanager.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/pdptiermanager.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -18,12 +18,6 @@
  @internalComponent
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "pdptiermanagerTraces.h"
-#endif
-
 #include "pdptiermanager.h"
 #include "mbmsengine.h"
 #include "pdptiermanagerselector.h"
@@ -32,12 +26,13 @@
 #include <comms-infras/coretiermanageractivities.h>
 #include <pcktcs.h>
 
+#include "pdpmcpr.h"
+
 #ifdef SYMBIAN_TRACE_ENABLE
 #define KPDPTierMgrTag KESockMetaConnectionTag
+_LIT8(KPDPTierMgrSubTag, "pdptiermgr");
 #endif
 
-#include "pdpmcpr.h"
-
 using namespace Messages;
 using namespace MeshMachine;
 using namespace ESock;
@@ -175,11 +170,16 @@
 	iContextMonitors.Remove(monitorIndex);
 	}
 
-void CPrimaryContextsMonitor::ProcessError(TInt aError)
+void CPrimaryContextsMonitor::ProcessError(
+	#ifdef _DEBUG
+		TInt aError
+	#else	//remove compilation warning in release builds
+		TInt /*aError*/
+	#endif
+	)
 	{
 	__ASSERT_DEBUG(aError != KErrNone, User::Invariant());
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPRIMARYCONTEXTSMONITOR_PROCESSERROR_1, ("PDP context monitoring error: %d"), aError);
-	(void)aError;  //needed for debug builds 
+	__FLOG_STATIC1(KPDPTierMgrTag, KPDPTierMgrSubTag, _L("PDP context monitoring error: %d"), aError);
 	}
 
 void CPrimaryContextsMonitor::RunL()
@@ -437,7 +437,7 @@
 */
 MProviderSelector* CPDPTierManager::DoCreateProviderSelectorL(const Meta::SMetaData& aSelectionPreferences)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPTIERMANAGER_DOCREATEPROVIDERSELECTORL_1, "CPdpTierManager[%08x]::DoSelectProvider()", (TUint)this);
+	__CFLOG_VAR((KPDPTierMgrTag, KPDPTierMgrSubTag, _L8("CPdpTierManager[%08x]::DoSelectProvider()"), this));
 	return TPdpSelectorFactory::NewSelectorL(aSelectionPreferences);
 	}
 
@@ -448,7 +448,7 @@
 */
 void CPDPTierManager::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPTIERMANAGER_CONSTRUCTL_1, "ConstructL::In CPDPTierManager");
+	__CFLOG_VAR((KPDPTierMgrTag, KPDPTierMgrSubTag, _L8("ConstructL::In CPDPTierManager")));
 	iMBMSEngine = CMBMSEngine::NewL(NodeId(), *this);
 	}

--- a/telephonyprotocols/pdplayer/src/pdptiermanagerfactory.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/pdptiermanagerfactory.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -18,17 +18,16 @@
  @internalComponent
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "pdptiermanagerfactoryTraces.h"
-#endif
-
 #include <comms-infras/ss_log.h>
 #include <ecom/ecom.h>
 #include "pdptiermanagerfactory.h"
 #include "pdptiermanager.h"
 
+#ifdef __CFLOG_ACTIVE
+#define KPDPTierMgrTag KESockMetaConnectionTag
+_LIT8(KPDPTierMgrSubTag, "pdptiermgr");
+#endif
+
 // ---------------- Factory Methods ----------------
 /**
 Creates a PDP Tier Manager Factory
@@ -38,7 +37,7 @@
 */
 CPDPTierManagerFactory* CPDPTierManagerFactory::NewL(TAny* aParentContainer)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPTIERMANAGERFACTORY_NEWL_1, "CPDPTierManagerFactory::\tNewL(%08x)", aParentContainer);
+	__CFLOG_VAR((KPDPTierMgrTag, KPDPTierMgrSubTag, _L8("CPDPTierManagerFactory::\tNewL(%08x)"), aParentContainer));
  	return new (ELeave) CPDPTierManagerFactory(TUid::Uid(CPDPTierManagerFactory::EUid), TUid::Uid(CPDPTierManagerFactory::EUid),*(reinterpret_cast<ESock::CTierManagerFactoryContainer*>(aParentContainer)));
 	}
 /**

--- a/telephonyprotocols/pdplayer/src/pdptiermanagerselector.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/pdptiermanagerselector.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -18,12 +18,6 @@
  @internalComponent
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "pdptiermanagerselectorTraces.h"
-#endif
-
 #include "pdptiermanagerselector.h"
 #include "pdptiermanagerfactory.h"
 
@@ -32,7 +26,12 @@
 #include <commsdattypesv1_1_partner.h>
 #include <comms-infras/ss_tiermanagerutils.h>
 #include <es_connpref.h>	//TConnIdList
-#include <es_enum_internal.h>
+#include <es_enum_internal.h>	
+
+#ifdef __CFLOG_ACTIVE
+#define KPdpTierMgrTag KESockTierTag
+_LIT8(KPdpTierMgrSubTag, "pdptiermgr");
+#endif // __CFLOG_ACTIVE
 
 using namespace ESock;
 using namespace CommsDat;
@@ -78,7 +77,7 @@
 	if (iSelectionPrefs.IsEmpty())
 		{
     	//Implicit case on the new setup
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPPROVIDERSELECTOR_SELECTL_1, "CPdpProviderSelector %08x::\tSelectL() Using Default AP:%d",(TUint)this,defaultAccessPoint);
+		__CFLOG_VAR((KPdpTierMgrTag, KPdpTierMgrSubTag, _L8("CPdpProviderSelector %08x::\tSelectL() Using Default AP:%d"),this,defaultAccessPoint));
 		aSelectionNotify.SelectComplete(this,FindOrCreateProviderL(defaultAccessPoint));
 		aSelectionNotify.SelectComplete(this,NULL);
 		return;
@@ -89,7 +88,7 @@
 		{
     	ASSERT(iSelectionPrefs.Scope() & TSelectionPrefs::ESelectFromExisting); //This is always attach
 		const TConnProviderInfo& connProvInfo = static_cast<const TConnProviderInfoPref&>(prefs).Info();
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPPROVIDERSELECTOR_SELECTL_2, "CPdpProviderSelector %08x::\tSelectL() Using TConnProviderInfoPref, AP:%d",(TUint)this,connProvInfo.iInfo[1]);
+		__CFLOG_VAR((KPdpTierMgrTag, KPdpTierMgrSubTag, _L8("CPdpProviderSelector %08x::\tSelectL() Using TConnProviderInfoPref, AP:%d"),this,connProvInfo.iInfo[1]));
 		aSelectionNotify.SelectComplete(this,FindProviderL(connProvInfo.iInfo[1],(TAny*)connProvInfo.iInfo[2]));
 		aSelectionNotify.SelectComplete(this,NULL);
 		return;
@@ -98,7 +97,7 @@
 	if (prefs.ExtensionId() == TConnPref::EConnPrefSnap)
 		{
 		TUint accessPoint = static_cast<const TConnSnapPref&>(prefs).Snap();
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPPROVIDERSELECTOR_SELECTL_3, "CPdpProviderSelector %08x::\tSelectL() Using TConnPrefSnap, AP:%d",(TUint)this,accessPoint);
+		__CFLOG_VAR((KPdpTierMgrTag, KPdpTierMgrSubTag, _L8("CPdpProviderSelector %08x::\tSelectL() Using TConnPrefSnap, AP:%d"),this,accessPoint));
 		aSelectionNotify.SelectComplete(this,FindOrCreateProviderL(accessPoint));
 		aSelectionNotify.SelectComplete(this,NULL);
 		return;
@@ -106,7 +105,7 @@
 
 	if (prefs.ExtensionId() == TConnPref::EConnPrefIdList)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPPROVIDERSELECTOR_SELECTL_4, "CPdpProviderSelector %08x::\tSelectL() Using TConnIdList",(TUint)this);
+		__CFLOG_VAR((KPdpTierMgrTag, KPdpTierMgrSubTag, _L8("CPdpProviderSelector %08x::\tSelectL() Using TConnIdList"),this));
 		const TConnIdList& list = static_cast<const TConnIdList&>(prefs);
 		TInt count = list.Count();
 		for (TInt i = 0; i < count; i++)
@@ -119,7 +118,7 @@
 
 	//In this selector we _must_ have the new preferences, otherwise it means that
 	//a critical, non-recoverable mitsake has occured before when this selector has been picked.
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPPROVIDERSELECTOR_SELECTL_5, "ERROR: CPdpProviderSelector %08x::\tSelectL() Unexpected selection preferences",(TUint)this);
+	__CFLOG_VAR((KPdpTierMgrTag, KPdpTierMgrSubTag, _L8("ERROR: CPdpProviderSelector %08x::\tSelectL() Unexpected selection preferences"),this));
 	User::Panic(KPdpSelectorPanic,EUnExpectedSelectionPreferences);
 	}
 
@@ -127,7 +126,7 @@
 // TPdpSelectorFactory::NewSelectorL - This fn matches a selector
 MProviderSelector* TPdpSelectorFactory::NewSelectorL(const Meta::SMetaData& aSelectionPreferences)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSELECTORFACTORY_NEWSELECTORL_1, "CPdpMetaCprSelectorBase::\tNewL()");
+	__CFLOG_VAR((KPdpTierMgrTag, KPdpTierMgrSubTag, _L8("CPdpMetaCprSelectorBase::\tNewL()")));
 	ASSERT(aSelectionPreferences.IsTypeOf(TSelectionPrefs::TypeId()));
 	CMDBSession* dbs = CMDBSession::NewLC(KCDVersion1_2);
 	CPdpProviderSelector* self = new (ELeave) CPdpProviderSelector(aSelectionPreferences);

--- a/telephonyprotocols/pdplayer/test/controlplane/group/te_PDP_ControlPlane.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\test\controlplane\scripts\te_PDP_ControlPlane.script"-"c:\testdata\scripts\te_PDP_ControlPlane.script"

--- a/telephonyprotocols/pdplayer/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyprotocols/pdplayer/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,666 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_CTOR_1=0x1a9
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DOCANCEL_1=0x1b2
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DOCANCEL_2=0x1b3
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DTOR_1=0x1aa
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_1=0x1d4
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_10=0x1dd
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_11=0x1de
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_12=0x1df
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_13=0x1e0
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_14=0x1e1
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_15=0x1e2
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_16=0x1e3
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_17=0x1e4
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_18=0x1e5
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_2=0x1d5
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_3=0x1d6
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_4=0x1d7
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_5=0x1d8
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_6=0x1d9
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_7=0x1da
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_8=0x1db
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_9=0x1dc
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_1=0x1b6
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_10=0x1bf
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_11=0x1c0
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_12=0x1c1
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_13=0x1c2
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_14=0x1c3
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_15=0x1c4
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_16=0x1c5
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_17=0x1c6
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_18=0x1c7
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_19=0x1c8
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_2=0x1b7
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_20=0x1c9
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_21=0x1ca
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_22=0x1cb
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_23=0x1cc
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_24=0x1cd
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_25=0x1ce
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_26=0x1cf
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_27=0x1d0
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_28=0x1d1
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_29=0x1d2
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_3=0x1b8
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_30=0x1d3
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_4=0x1b9
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_5=0x1ba
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_6=0x1bb
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_7=0x1bc
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_8=0x1bd
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_9=0x1be
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_EXISTINGCONTEXTNAME_1=0x1b4
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_EXISTINGCONTEXTNAME_2=0x1b5
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_INPUT_1=0x1ab
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_INPUT_2=0x1ac
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_INPUT_3=0x1ad
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_1=0x1ae
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_2=0x1af
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_3=0x1b0
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_4=0x1b1
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CANCELALLPDPNOTIFICATIONS_1=0x1f2
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CANCELPDPNOTIFICATIONS_1=0x1f1
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CREATEPDPL_1=0x1ed
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CREATEPDPL_2=0x1ee
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CTOR_1=0x1e6
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_DTOR_1=0x1e8
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_DTOR_2=0x1e9
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_FREEPDP_1=0x1ef
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_INITL_1=0x1eb
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_INITL_2=0x1ec
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_NEWL_1=0x1e7
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_STARTPDPNOTIFICATIONS_1=0x1f0
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERNOTIFIER_RUNL_1=0x1f3
-[TRACE]TRACE_INTERNALS[0x88]_CGPRSPROVISION_RETRIEVEAPNNAMEL_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CGPRSPROVISION_RETRIEVEAUTHENTICATIONINFOL_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CGPRSPROVISION_RETRIEVEAUTHENTICATIONINFOL_2=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CGPRSPROVISION_RETRIEVEAUTHENTICATIONINFOL_3=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CGPRSPROVISION_RETRIEVEGPRSANONYMOUSACCESS_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CGPRSPROVISION_RETRIEVEGPRSCOMPRESSION_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CGPRSPROVISION_RETRIEVEPDPTYPEL_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x1f8
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x1f9
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x1fa
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x1fb
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_DOCANCEL_1=0x200
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_1=0x201
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x202
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_3=0x203
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_CANCELMESSAGE_1=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_PREPAREBEARERRESULTBUNDLEL_1=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_PREPARECOUNTBUNDLEL_1=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_PREPAREMONITORRESULTBUNDLEL_1=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_PREPAREREMOVEALLBUNDLEL_1=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNERROR_1=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_1=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_2=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_3=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_4=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_5=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_6=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_7=0x15
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_8=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_9=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_UPDATEMONITORSERVICELISTL_1=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x1f4
-[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x1f5
-[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x1f6
-[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x1f7
-[TRACE]TRACE_INTERNALS[0x88]_CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATE_1=0x292
-[TRACE]TRACE_INTERNALS[0x88]_CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATE_2=0x293
-[TRACE]TRACE_INTERNALS[0x88]_CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATIONCOMPLETE_1=0x294
-[TRACE]TRACE_INTERNALS[0x88]_CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATIONCOMPLETE_2=0x295
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CLOSE_1=0x118
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CLOSE_2=0x119
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CTOR_1=0x112
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CTOR_2=0x113
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DELETEFSMCONTEXT_1=0x11f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DELETEFSMCONTEXT_2=0x120
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DTOR_1=0x114
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DTOR_2=0x115
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_GETFSMCONTEXT_1=0x11a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_GETFSMCONTEXT_2=0x11b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_INITL_1=0x116
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_INITL_2=0x117
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWFSMCONTEXTL_1=0x11c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWFSMCONTEXTL_2=0x11d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWFSMCONTEXTL_3=0x11e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWL_1=0x110
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWL_2=0x111
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CLOSE_1=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CLOSE_2=0x30
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CTOR_1=0x27
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CTOR_2=0x28
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_DTOR_1=0x29
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_DTOR_2=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET10_1=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET10_2=0x62
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET11_1=0x65
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET11_2=0x66
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET1_1=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET1_2=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET2_1=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET2_2=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET3_1=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET3_2=0x50
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET4_1=0x51
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET4_2=0x52
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET5_1=0x53
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET5_2=0x54
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET6_1=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET6_2=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET7_1=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET7_2=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET8_1=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET8_2=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET9_1=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET9_2=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_1=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_2=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_INPUT_1=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_INPUT_2=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_NEWL_1=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_NEWL_2=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_OPEN_1=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_OPEN_2=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET10_1=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET10_2=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET11_1=0x5f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET11_2=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET12_1=0x63
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET12_2=0x64
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET1_1=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET1_2=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET2_1=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET2_2=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET3_1=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET3_2=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET4_1=0x3b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET4_2=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET5_1=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET5_2=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET6_1=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET6_2=0x40
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET7_1=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET7_2=0x42
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET8_1=0x43
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET8_2=0x44
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET9_1=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET9_2=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_1=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_2=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_TSYNAME_1=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_TSYNAME_2=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_1=0xfc
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_2=0xfd
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_3=0xfe
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_4=0xff
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_1=0xc0
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_2=0xc1
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_3=0xc2
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_4=0xc3
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_1=0xd4
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_2=0xd5
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_3=0xd6
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_4=0xd7
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_1=0xdc
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_2=0xdd
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_3=0xde
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_4=0xdf
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_1=0xe0
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_2=0xe1
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_3=0xe2
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_4=0xe3
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_1=0xf0
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_2=0xf1
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_3=0xf2
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_4=0xf3
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_1=0x100
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_2=0x101
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_3=0x102
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_4=0x103
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_1=0xc8
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_2=0xc9
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_3=0xca
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_4=0xcb
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_1=0xf8
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_2=0xf9
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_3=0xfa
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_4=0xfb
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_1=0xbc
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_2=0xbd
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_3=0xbe
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_4=0xbf
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_1=0xc4
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_2=0xc5
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_3=0xc6
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_4=0xc7
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_1=0xe4
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_2=0xe5
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_3=0xe6
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_4=0xe7
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_1=0xb4
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_2=0xb5
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_3=0xb6
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_4=0xb7
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_1=0xe8
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_2=0xe9
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_3=0xea
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_4=0xeb
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_1=0xb8
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_2=0xb9
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_3=0xba
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_4=0xbb
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_1=0xd8
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_2=0xd9
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_3=0xda
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_4=0xdb
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_1=0xd0
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_2=0xd1
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_3=0xd2
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_4=0xd3
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_1=0xcc
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_2=0xcd
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_3=0xce
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_4=0xcf
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_1=0xf4
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_2=0xf5
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_3=0xf6
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_4=0xf7
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_1=0xec
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_2=0xed
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_3=0xee
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_4=0xef
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CTOR_1=0x67
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CTOR_2=0x68
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CTOR_3=0x69
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_DTOR_1=0x6a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_DTOR_2=0x6b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_DTOR_3=0x6c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELCANCEL_1=0xae
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELCANCEL_2=0xaf
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELCANCEL_3=0xb0
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELINPUT_1=0xab
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELINPUT_2=0xac
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELINPUT_3=0xad
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET10_1=0x10a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET10_2=0x10b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET10_3=0x10c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET1_1=0x75
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET1_2=0x76
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET1_3=0x77
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET2_1=0x78
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET2_2=0x79
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET2_3=0x7a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET3_1=0x7b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET3_2=0x7c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET3_3=0x7d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET4_1=0x7e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET4_2=0x7f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET4_3=0x80
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET5_1=0x81
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET5_2=0x82
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET5_3=0x83
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET6_1=0x84
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET6_2=0x85
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET6_3=0x86
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET7_1=0x87
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET7_2=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET7_3=0x89
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET8_1=0x8a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET8_2=0x8b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET8_3=0x8c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET9_1=0x104
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET9_2=0x105
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET9_3=0x106
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET_1=0x72
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET_2=0x73
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET_3=0x74
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_1=0x6d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_2=0x6e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_3=0x6f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_4=0x70
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_5=0x71
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET10_1=0x107
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET10_2=0x108
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET10_3=0x109
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET11_1=0x10d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET11_2=0x10e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET11_3=0x10f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET1_1=0x90
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET1_2=0x91
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET1_3=0x92
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET2_1=0x93
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET2_2=0x94
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET2_3=0x95
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET3_1=0x96
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET3_2=0x97
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET3_3=0x98
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET4_1=0x99
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET4_2=0x9a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET4_3=0x9b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET5_1=0x9c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET5_2=0x9d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET5_3=0x9e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET6_1=0x9f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET6_2=0xa0
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET6_3=0xa1
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET7_1=0xa2
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET7_2=0xa3
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET7_3=0xa4
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET8_1=0xa5
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET8_2=0xa6
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET8_3=0xa7
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET9_1=0xa8
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET9_2=0xa9
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET9_3=0xaa
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET_1=0x8d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET_2=0x8e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET_3=0x8f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SPUDINPUT_1=0xb1
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SPUDINPUT_2=0xb2
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SPUDINPUT_3=0xb3
-[TRACE]TRACE_INTERNALS[0x88]_CPDPMETACONNECTIONPROVIDERFACTORY_CTOR_1=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CPDPMETACONNECTIONPROVIDERFACTORY_NEWL_1=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CPDPMETACONNECTIONPROVIDER_RECEIVEDL_1=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CPDPPROVIDERSELECTOR_SELECTL_1=0x21
-[TRACE]TRACE_INTERNALS[0x88]_CPDPPROVIDERSELECTOR_SELECTL_2=0x22
-[TRACE]TRACE_INTERNALS[0x88]_CPDPPROVIDERSELECTOR_SELECTL_3=0x23
-[TRACE]TRACE_INTERNALS[0x88]_CPDPPROVIDERSELECTOR_SELECTL_4=0x24
-[TRACE]TRACE_INTERNALS[0x88]_CPDPPROVIDERSELECTOR_SELECTL_5=0x25
-[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_DOCANCEL_1=0x1fc
-[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_1=0x1fd
-[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x1fe
-[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_3=0x1ff
-[TRACE]TRACE_INTERNALS[0x88]_CPDPTIERMANAGERFACTORY_NEWL_1=0x20
-[TRACE]TRACE_INTERNALS[0x88]_CPDPTIERMANAGER_CONSTRUCTL_1=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPTIERMANAGER_DOCREATEPROVIDERSELECTORL_1=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_CPRIMARYCONTEXTSMONITOR_PROCESSERROR_1=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_CTOR_1=0x204
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_DOCANCEL_1=0x208
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_DTOR_1=0x205
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_1=0x209
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_2=0x20a
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_3=0x20b
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_1=0x206
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_2=0x207
-[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_DOCANCEL_1=0x20f
-[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_NOTIFY_1=0x20c
-[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_NOTIFY_2=0x20d
-[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_NOTIFY_3=0x20e
-[TRACE]TRACE_INTERNALS[0x88]_CTSYPROVISION_INITIALISECONFIGL_1=0x9
-[TRACE]TRACE_INTERNALS[0x88]_GETPHONEINFOL_1=0x1ea
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELALLPDPNOTIFICATIONS_1=0x291
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELALLPDPS_1=0x290
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDPNOTIFICATIONS_1=0x28e
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDPNOTIFICATIONS_2=0x28f
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDP_1=0x28b
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDP_2=0x28c
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CLOSE_1=0x284
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CREATEPDPL_1=0x285
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CREATEPDPL_2=0x286
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_DELETEPDP_1=0x287
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_DELETEPDP_2=0x288
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_DTOR_1=0x282
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_INPUT_1=0x289
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_INPUT_2=0x28a
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_OPENL_1=0x283
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_STARTPDPNOTIFICATIONS_1=0x28d
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_1=0x278
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_2=0x279
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_3=0x27a
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_4=0x27b
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_1=0x273
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_2=0x274
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_1=0x275
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_2=0x276
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_3=0x277
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_1=0x255
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_2=0x256
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_3=0x257
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_4=0x258
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_5=0x259
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_1=0x24e
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_2=0x24f
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_3=0x296
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_4=0x297
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_5=0x298
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_6=0x299
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_1=0x250
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_2=0x251
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_3=0x252
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_4=0x253
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_5=0x254
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_1=0x24a
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_2=0x24b
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_3=0x24c
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_4=0x24d
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_1=0x242
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_2=0x243
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_3=0x244
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_4=0x245
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_5=0x246
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_6=0x247
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NOTIFYFSM_1=0x248
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NOTIFYFSM_2=0x249
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_1=0x21a
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_2=0x21b
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_3=0x21c
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_4=0x21d
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_1=0x216
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_2=0x217
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NOTIFYFSM_1=0x218
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NOTIFYFSM_2=0x219
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x224
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2=0x225
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_3=0x226
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_4=0x227
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_5=0x228
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_1=0x21e
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_2=0x21f
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_3=0x220
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_4=0x221
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x222
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x223
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x22e
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2=0x22f
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_1=0x229
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_2=0x22a
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_3=0x22b
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x22c
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x22d
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x270
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2=0x271
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_3=0x272
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_1=0x26b
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_2=0x26c
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_3=0x26d
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x26e
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x26f
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_1=0x260
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_2=0x261
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NEXT_1=0x25a
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NEXT_2=0x25b
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_1=0x25c
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_2=0x25d
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_3=0x25e
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_4=0x25f
-[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_1=0x27f
-[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_2=0x280
-[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_3=0x281
-[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_1=0x27c
-[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_1=0x27d
-[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_2=0x27e
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_1=0x268
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_2=0x269
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_3=0x26a
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_1=0x262
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_2=0x263
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_1=0x264
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_2=0x265
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_3=0x266
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_4=0x267
-[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_CANCELASYNCREQUEST_1=0x214
-[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_CANCELASYNCREQUEST_2=0x215
-[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NEXT_1=0x210
-[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NEXT_2=0x211
-[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NOTIFYFSM_1=0x212
-[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NOTIFYFSM_2=0x213
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSELECTORFACTORY_NEWSELECTORL_1=0x26
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_1=0x12a
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_2=0x12b
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_3=0x12c
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_4=0x12d
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_5=0x12e
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_6=0x12f
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_1=0x130
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_2=0x131
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_3=0x132
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_4=0x133
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_5=0x134
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_6=0x135
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_7=0x136
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_1=0x137
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_2=0x138
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_3=0x139
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_4=0x13a
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_5=0x13b
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_6=0x13c
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_1=0x13d
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_2=0x13e
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_3=0x13f
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_4=0x140
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_5=0x141
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_1=0x142
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_2=0x143
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_3=0x144
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_4=0x145
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_5=0x146
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_1=0x147
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_2=0x148
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_3=0x149
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_4=0x14a
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_5=0x14b
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_6=0x14c
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_7=0x14d
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDMBMS_INPUT_1=0x154
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDMBMS_INPUT_2=0x155
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_1=0x14e
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_2=0x14f
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_3=0x150
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_4=0x151
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_5=0x152
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_6=0x153
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_1=0x15d
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_2=0x15e
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_3=0x15f
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_4=0x160
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_5=0x161
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_6=0x162
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_7=0x163
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_8=0x164
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_1=0x165
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_2=0x166
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_3=0x167
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_5=0x168
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_6=0x169
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_7=0x16a
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_1=0x156
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_2=0x157
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_3=0x158
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_4=0x159
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_5=0x15a
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_6=0x15b
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_7=0x15c
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_1=0x16b
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_2=0x16c
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_3=0x16d
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_4=0x16e
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_5=0x16f
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_6=0x170
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_7=0x171
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_8=0x172
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_1=0x173
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_2=0x174
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_3=0x175
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_4=0x176
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_5=0x177
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_6=0x178
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_7=0x179
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_1=0x17a
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_2=0x17b
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_3=0x17c
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_4=0x17d
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_5=0x17e
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_1=0x18c
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_2=0x18d
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_3=0x18e
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_4=0x18f
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_5=0x190
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_6=0x191
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_1=0x17f
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_10=0x188
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_11=0x189
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_12=0x18a
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_13=0x18b
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_2=0x180
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_3=0x181
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_4=0x182
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_5=0x183
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_6=0x184
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_7=0x185
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_8=0x186
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_9=0x187
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_1=0x192
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_2=0x193
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_3=0x194
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_4=0x195
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_5=0x196
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_1=0x197
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_2=0x198
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_3=0x199
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_4=0x19a
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_5=0x19b
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_1=0x19c
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_2=0x19d
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_3=0x19e
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_4=0x19f
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_5=0x1a0
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_6=0x1a1
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_7=0x1a2
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_8=0x1a3
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_1=0x1a4
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_2=0x1a5
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_3=0x1a6
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_4=0x1a7
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_5=0x1a8
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_CTOR_1=0x121
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_CTOR_2=0x122
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_ETELDRIVERCANCEL_1=0x128
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_ETELDRIVERINPUT_1=0x127
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_1=0x123
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_2=0x124
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_3=0x125
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_4=0x126
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_SPUDMANNOTIFY_1=0x129
-[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_CANCELASYNCREQUEST_1=0x234
-[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_CANCELASYNCREQUEST_2=0x235
-[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_1=0x230
-[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_2=0x231
-[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NOTIFYFSM_1=0x232
-[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NOTIFYFSM_2=0x233
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_1=0x23f
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_2=0x240
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_3=0x241
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_1=0x236
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_2=0x237
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_3=0x238
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_4=0x239
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_5=0x23a
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_6=0x23b
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_7=0x23c
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_1=0x23d
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_2=0x23e

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/PDPSCPRFSM.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/PDPSCPRFSM.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,13 +20,9 @@
 */
 
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "PDPSCPRFSMTraces.h"
-#endif
-
 #include "PDPFSM.h"
 #include "cpdpfsmfactory.h"
+#include "spudfsmdebuglogger.h"
 #include "PDPDeftSCPR.h"
 
 
@@ -40,15 +36,13 @@
  iRefCount(1),
  iUmtsRelease(TPacketDataConfigBase::KConfigGPRS)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CTOR_1, ">>CPdpFsmInterface::()");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CTOR_2, "<<CPdpFsmInterface::()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
     }
 
 CPdpFsmInterface::~CPdpFsmInterface()
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_DTOR_1, ">>CPdpFsmInterface::()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
 	delete iPdpFsmFactory;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_DTOR_2, "<<CPdpFsmInterface::()");
     }
 
 TContextId CPdpFsmInterface::NewFsmContextL(MPdpFsmEventHandler& aPdpFsmEventHandler,SpudMan::TPdpContextType aContextType)
@@ -74,12 +68,11 @@
 */
 void CPdpFsmInterface::NewL(const TName& aTsyName, TInt aUmtsRelease)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_NEWL_1, ">>CPdpFsmInterface::NewL()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::NewL()");
 	
 	iUmtsRelease = aUmtsRelease;
 	iPdpFsmFactory = CPdpFsmFactory::NewL();
 	iPdpFsmFactory->InitL(aTsyName, this);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_NEWL_2, "<<CPdpFsmInterface::NewL()");
     }
 
 /** request to open the FSM
@@ -88,16 +81,15 @@
 */
 void CPdpFsmInterface::Open()
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_OPEN_1, ">>CPdpFsmInterface::Open()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Open()");
 	iRefCount++;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_OPEN_2, "<<CPdpFsmInterface::Open()");
     }
     
 /** closes the FSM and frees underlying resources
 */
 void CPdpFsmInterface::Close()
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CLOSE_1, ">>CPdpFsmInterface::Close()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Close()");
     ASSERT( iRefCount > 0 );
 	if (--iRefCount == 0 )
 	    {
@@ -107,9 +99,7 @@
     	    }
     	delete this;
 	    }
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CLOSE_2, "<<CPdpFsmInterface::Close()");
     }
-    
 
 
 /** 
@@ -125,7 +115,7 @@
     {
 	TInt ret = KErrNone;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_1, ">>CPdpFsmInterface::Input(aParam)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Input(aParam)");
 
 	ASSERT(iPdpFsmFactory);
 
@@ -181,7 +171,7 @@
 	    {
 		ret = KErrBadHandle;
 	    }
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_2, "<<CPdpFsmInterface::Input(aParam)");
+	
 	return ret;
     }
 
@@ -197,13 +187,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketQoS::TQoSR5Requested& aParam)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
 	return KErrNone;
 	}
 
@@ -216,13 +205,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketQoS::TQoSR5Negotiated& aParam)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET1_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET1_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
 	return KErrNone;
 }
 
@@ -238,13 +226,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketQoS::TQoSR99_R4Requested& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET2_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
 
 	ASSERT(iPdpFsmFactory);
     ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
     iPdpFsmFactory->GetFsmContext(aPdpId,aContextType)->Set(aParam);
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET2_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
 	return KErrNone;
     }
 
@@ -257,13 +244,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketQoS::TQoSR99_R4Negotiated& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET3_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId,aContextType)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET3_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
 	return KErrNone;
     }
 
@@ -273,13 +259,12 @@
 
 void CPdpFsmInterface::Set(const TContextId aPdpId,MPdpFsmEventHandler& aPdpFsmEventHandler)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET4_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aPdpFsmEventHandler);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET4_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
     }
 
 /** Set context parameters
@@ -290,13 +275,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const TTFTInfo& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET5_1, ">>CPdpFsmInterface::Set(TFTInfo)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TFTInfo)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET5_2, "<<CPdpFsmInterface::Set(TFTInfo)");
 	return KErrNone;
     }
 
@@ -308,13 +292,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const TTFTOperationCode& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET6_1, ">>CPdpFsmInterface::Set(TTFTOperationCode)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TTFTOperationCode)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET6_2, "<<CPdpFsmInterface::Set(TTFTOperationCode)");
 	return KErrNone;
     }
 
@@ -326,13 +309,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketContext::TDataChannelV2& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET7_1, ">>CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET7_2, "<<CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
 	return KErrNone;
     }
 
@@ -344,13 +326,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketContext::TContextStatus& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET8_1, ">>CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET8_2, "<<CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
 	return KErrNone;
     }
 
@@ -362,13 +343,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const TPacketDataConfigBase& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET9_1, ">>CPdpFsmInterface::Set(TPacketDataConfigBase)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TPacketDataConfigBase)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET9_2, "<<CPdpFsmInterface::Set(TPacketDataConfigBase)");
 	return KErrNone;
     }
 
@@ -378,12 +358,11 @@
 */
 void CPdpFsmInterface::Set(const RPacketService::TStatus aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET10_1, ">>CPdpFsmInterface::Set(RPacketService::TStatus)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketService::TStatus)");
 
 	ASSERT(iPdpFsmFactory);
 
 	iNetworkStatus = aParam;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET10_2, "<<CPdpFsmInterface::Set(RPacketService::TStatus)");
     }
 
 
@@ -397,13 +376,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketQoS::TQoSR5Requested& aParam) const
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_1, ">>CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_2, "<<CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
 	return KErrNone;
 }
 
@@ -417,13 +395,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketQoS::TQoSR5Negotiated& aParam) const
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET1_1, ">>CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET1_2, "<<CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
 	return KErrNone;
 }
 
@@ -439,13 +416,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketQoS::TQoSR99_R4Requested& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET2_1, ">>CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET2_2, "<<CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
 	return KErrNone;
     }
 
@@ -459,13 +435,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketQoS::TQoSR99_R4Negotiated& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET3_1, ">>CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET3_2, "<<CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
 	return KErrNone;
     }
 
@@ -482,13 +457,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,TTFTInfo& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET4_1, ">>CPdpFsmInterface::Get(TFTInfo)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET4_2, "<<CPdpFsmInterface::Get(TFTInfo)");
 	return KErrNone;
     }
 
@@ -500,13 +474,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,TTFTOperationCode& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET5_1, ">>CPdpFsmInterface::Get(TFTInfo)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET5_2, "<<CPdpFsmInterface::Get(TFTInfo)");
 	return KErrNone;
     }
 
@@ -520,13 +493,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketContext::TDataChannelV2& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET6_1, ">>CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET6_2, "<<CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
 	return KErrNone;
     }
 
@@ -538,13 +510,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, TPacketDataConfigBase& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET7_1, ">>CPdpFsmInterface::Get(TPacketDataConfigBase)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TPacketDataConfigBase)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET7_2, "<<CPdpFsmInterface::Get(TPacketDataConfigBase)");
 	return KErrNone;
     }
 
@@ -556,13 +527,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketContext::TContextStatus& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET8_1, ">>CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET8_2, "<<CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
 	return KErrNone;
     }
 
@@ -574,12 +544,11 @@
 */
 void CPdpFsmInterface::Get(RPacketService::TStatus& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET9_1, ">>CPdpFsmInterface::Get(RPacketService::TStatus)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketService::TStatus)");
 
 	ASSERT(iPdpFsmFactory);
 
 	aParam = iNetworkStatus;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET9_2, "<<CPdpFsmInterface::Get(RPacketService::TStatus)");
     }
 
 
@@ -589,10 +558,10 @@
 */
 const TName& CPdpFsmInterface::TsyName(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_TSYNAME_1, ">>CPdpFsmInterface::TsyName");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::TsyName");
 
 	ASSERT(iPdpFsmFactory);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_TSYNAME_2, "<<CPdpFsmInterface::TsyName");
+	
 	return iPdpFsmFactory->TsyName();
 }
 
@@ -608,11 +577,10 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketMbmsContext::TContextConfigMbmsV1& aParam)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET11_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 
 	ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET11_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 	return KErrNone;
 	}
 
@@ -624,11 +592,10 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketMbmsContext::TContextConfigMbmsV1& aParam) const 
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET10_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 
 	ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET10_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 	return KErrNone;
 	}
 	
@@ -640,11 +607,10 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const TSessionOperatioInfo& aParam)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET12_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 
 	ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET12_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 	return KErrNone;
 	}
 
@@ -657,11 +623,10 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, TSessionOperatioInfo& aParam) const 
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET11_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 
 	ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET11_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 	return KErrNone;
 	}

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsm.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsm.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -17,16 +17,10 @@
 //
 
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cpdpfsmTraces.h"
-#endif
-
 #include "tpdpstates.h"
 #include "cpdpfsm.h"
 #include "cpdpfsmfactory.h"
+#include "spudfsmdebuglogger.h"
 #include "eteldrivernmspace.h"
 
 
@@ -65,8 +59,8 @@
 // NOTE: Both pointers are valid when called - see CPdpFsmFactory and CPdpFsmInterface. 
 // No other caller is expected.
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CTOR_1, ">>CPdpFsm::CPdpFsm()");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CTOR_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::CPdpFsm()");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 	
 	// save for later
 	iPdpId = aPdpId;
@@ -78,33 +72,30 @@
 	
 	// we need a state
 	iState = &iPdpFsmFactory->iStateInitialised;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CTOR_3, "<<CPdpFsm::CPdpFsm()");
     }
     
 
 CPdpFsm::~CPdpFsm()
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_DTOR_1, ">>CPdpFsm::~CPdpFsm()");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_DTOR_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::~CPdpFsm()");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 	iContextConfig.Close();
 	iEtelDriverInput->DeletePdp(iPdpId);
 	iSessionInfo.iSessionIds.Close();	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_DTOR_3, "<<CPdpFsm::~CPdpFsm()");
     }
 
 	
 TInt CPdpFsm::Input (const TInt aOperation, const TInt aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_INPUT_1, ">>CPdpFsm::Input()");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_INPUT_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Input()");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 	
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_INPUT_3, "State : %S", iState->iName);
-
+#ifdef _DEBUG // NOT DEBUGRELEASE
+	SPUDFSMVERBOSE_LOG1(_L("State : %S"), &iState->iName);
+#endif	
 
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_INPUT_4, "Pdp ID %d, State '%S', Operation '%S'",iPdpId, iState->iName, *iState->LogOperation(*this, aOperation));
-#endif  
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_INPUT_5, "<<CPdpFsm::Input()");
+	SPUDFSM_LOG3(_L("Pdp ID %d, State '%S', Operation '%S'"),iPdpId, &iState->iName, iState->LogOperation(*this, aOperation));
+
 	return iState->Input (*this, aOperation, aParam);
     }
 	
@@ -112,22 +103,20 @@
 #ifdef SYMBIAN_NETWORKING_UMTSR5
 void CPdpFsm::Get(RPacketQoS::TQoSR5Requested& aParam)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET_1, ">>CPdpFsm::Get(QoSR5Req)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QoSR5Req)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	ASSERT(iQosRequested.ExtensionId() == TPacketDataConfigBase::KConfigRel5);
 	aParam = iQosRequested.RequestedQoSR5();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET_3, "<<CPdpFsm::Get(QoSR5Req)");
 }
 
 void CPdpFsm::Get(RPacketQoS::TQoSR5Negotiated& aParam)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET1_1, ">>CPdpFsm::Get(QoSR5Neg)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET1_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QoSR5Neg)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	ASSERT(iQosNegotiated.ExtensionId() == TPacketDataConfigBase::KConfigRel5);
 	aParam = iQosNegotiated.NegotiatedQoSR5();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET1_3, "<<CPdpFsm::Get(QoSR5Neg)");
 }
 
 #else
@@ -135,20 +124,18 @@
 
 void CPdpFsm::Get(RPacketQoS::TQoSR99_R4Requested& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET2_1, ">>CPdpFsm::Get(QosReq)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET2_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QosReq)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	aParam = iQosRequested.RequestedQoSR99_R4();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET2_3, "<<CPdpFsm::Get(QosReq)");
     }
 
 void CPdpFsm::Get(RPacketQoS::TQoSR99_R4Negotiated& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET3_1, ">>CPdpFsm::Get(QoSNeg)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET3_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QoSNeg)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	aParam = iQosNegotiated.NegotiatedQoSR99_R4();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET3_3, "<<CPdpFsm::Get(QoSNeg)");
     }
     
 #endif
@@ -157,35 +144,32 @@
 
 void CPdpFsm::Get(TTFTInfo& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET4_1, ">>CPdpFsm::Get(TFTInfo)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET4_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(TFTInfo)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	aParam = iTFT;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET4_3, "<<CPdpFsm::Get(TFTInfo)");
     }
 
 void CPdpFsm::Get(TTFTOperationCode& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET5_1, ">>CPdpFsm::Get(TFTOperationCode)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET5_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(TFTOperationCode)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	aParam = iTFTOperationCode;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET5_3, "<<CPdpFsm::Get(TFTOperationCode)");
     }
 
 void CPdpFsm::Get(RPacketContext::TDataChannelV2& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET6_1, ">>CPdpFsm::Get(RPacketContext::TDataChannelV2)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET6_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(RPacketContext::TDataChannelV2)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	aParam = iDataChannelV2;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET6_3, "<<CPdpFsm::Get(RPacketContext::TDataChannelV2)");
     }
 
 void CPdpFsm::Get(TPacketDataConfigBase& aParam)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET7_1, ">>CPdpFsm::Get(TPacketDataConfigBase)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET7_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(TPacketDataConfigBase)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	TInt rel = GetContextConfigAs<TPacketDataConfigBase>().ExtensionId();
 	if (rel == 0)
@@ -208,36 +192,32 @@
 			Mem::Copy(&aParam, const_cast<TUint8*>(iContextConfig.Ptr()), sizeof(RPacketContext::TContextConfig_R5));
 			break;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET7_3, "<<CPdpFsm::Get(TPacketDataConfigBase)");
-	}
+    	}
 
 void CPdpFsm::Get(RPacketContext::TContextStatus& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET8_1, ">>CPdpFsm::Get(RPacketContext::TContextStatus)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET8_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(RPacketContext::TContextStatus)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	aParam = iContextStatus;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET8_3, "<<CPdpFsm::Get(RPacketContext::TContextStatus)");
     }
 
 
 #ifdef SYMBIAN_NETWORKING_UMTSR5
 void CPdpFsm::Set(const RPacketQoS::TQoSR5Requested& aParam)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET_1, ">>CPdpFsm::Set(QoSR5Req)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSR5Req)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	iQosRequested = aParam;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET_3, "<<CPdpFsm::Set(QoSR5Req)");
 }
 
 void CPdpFsm::Set(const RPacketQoS::TQoSR5Negotiated& aParam)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET1_1, ">>CPdpFsm::Set(QoSR5Neg)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET1_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSR5Neg)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	iQosNegotiated = aParam;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET1_3, "<<CPdpFsm::Set(QoSR5Neg)");
 }
 
 #else
@@ -246,22 +226,20 @@
 
 void CPdpFsm::Set(const RPacketQoS::TQoSR99_R4Requested& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET2_1, ">>CPdpFsm::Set(QoSReq)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET2_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSReq)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	iQosRequested = aParam;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET2_3, "<<CPdpFsm::Set(QoSReq)");
 
     }
 
 
 void CPdpFsm::Set(const RPacketQoS::TQoSR99_R4Negotiated& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET3_1, ">>CPdpFsm::Set(QoSNeg)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET3_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSNeg)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	iQosNegotiated = aParam;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET3_3, "<<CPdpFsm::Set(QoSNeg)");
     }
 
 
@@ -271,44 +249,40 @@
 
 void CPdpFsm::Set(const TTFTInfo& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET4_1, ">>CPdpFsm::Set(TFT)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET4_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(TFT)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	iTFT = aParam;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET4_3, "<<CPdpFsm::Set(TFT)");
     }
 
 void CPdpFsm::Set(const TTFTOperationCode& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET5_1, ">>CPdpFsm::Set(TFTOperationCode)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET5_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(TFTOperationCode)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	iTFTOperationCode = aParam;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET5_3, "<<CPdpFsm::Set(TFTOperationCode)");
     }
 
 void CPdpFsm::Set(const RPacketContext::TDataChannelV2& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET6_1, ">>CPdpFsm::Set(RPacketContext::TDataChannelV2)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET6_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(RPacketContext::TDataChannelV2)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	iDataChannelV2 = aParam;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET6_3, "<<CPdpFsm::Set(RPacketContext::TDataChannelV2)");
     }
 
 void CPdpFsm::Set(const RPacketContext::TContextStatus& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET7_1, ">>CPdpFsm::Set(RPacketContext::TContextStatus)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET7_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(RPacketContext::TContextStatus)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	iContextStatus = aParam;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET7_3, "<<CPdpFsm::Set(RPacketContext::TContextStatus)");
     }
 
 void CPdpFsm::Set(const TPacketDataConfigBase& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET8_1, ">>CPdpFsm::Set(RPacketContext::TContextConfigGPRS)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET8_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(RPacketContext::TContextConfigGPRS)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 	
 	switch ((const_cast<TPacketDataConfigBase&>(aParam)).ExtensionId())
 	    {
@@ -324,52 +298,47 @@
 	        Mem::Copy(const_cast<TUint8*>(iContextConfig.Ptr()), &aParam, sizeof(RPacketContext::TContextConfig_R5));
 	        break;
 	    }
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET8_3, "<<CPdpFsm::Set(RPacketContext::TContextConfigGPRS)");
     }
 
 #ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY	
 void CPdpFsm::Set(MPdpFsmEventHandler& aPdpFsmEventHandler)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET9_1, ">>CPdpFsm::Set(MPdpFsmEventHandler&)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET9_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(MPdpFsmEventHandler&)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 	
 	if (iPdpFsmEventHandler)
     	{
     	iPdpFsmEventHandler->Event(KContextDeleteEvent, KErrAbort);
     	}
 	iPdpFsmEventHandler = &aPdpFsmEventHandler;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET9_3, "<<CPdpFsm::Set(MPdpFsmEventHandler&)");
     }
 #endif  
 
 void CPdpFsm::EtelInput (EtelDriver::TEtelInput aOperation)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_ETELINPUT_1, ">>CPdpFsm::EtelInput");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_ETELINPUT_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::EtelInput");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 	
 	iEtelDriverInput->Input (iPdpId, aOperation);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_ETELINPUT_3, "<<CPdpFsm::EtelInput");
     }
 
 void CPdpFsm::EtelCancel (void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_ETELCANCEL_1, ">>CPdpFsm::EtelCancel");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_ETELCANCEL_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::EtelCancel");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 	
 	iEtelDriverInput->CancelPdp (iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_ETELCANCEL_3, "<<CPdpFsm::EtelCancel");
     }
 
 void CPdpFsm::SpudInput (TInt aNotification, TInt aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SPUDINPUT_1, ">>CPdpFsm::SpudInput");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SPUDINPUT_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::SpudInput");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 #ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY	
 	iPdpFsmFactory->SpudInput (iPdpId, aNotification, aParam);
 #else
     ASSERT(iPdpFsmEventHandler);
     iPdpFsmEventHandler->Event(aNotification, aParam);
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SPUDINPUT_3, "<<CPdpFsm::SpudInput");
 #endif
     }
 
@@ -377,245 +346,221 @@
 
 void CPdpFsm::ChangeStateToInitialised(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOINITIALISED_1, ">>CPdpFsm::ChangeStateToInitialised");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOINITIALISED_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOINITIALISED_3, "New State : Initialised");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToInitialised");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : Initialised"));
 	
 	iState = &iPdpFsmFactory->iStateInitialised;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOINITIALISED_4, "<<CPdpFsm::ChangeStateToInitialised");
     }
 
 void CPdpFsm::ChangeStateToOpeningPhone(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPENINGPHONE_1, ">>CPdpFsm::ChangeStateToOpeningPhone");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPENINGPHONE_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPENINGPHONE_3, "New State : OpeningPhone");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToOpeningPhone");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : OpeningPhone"));
 	
 	iState = &iPdpFsmFactory->iStateOpeningPhone;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPENINGPHONE_4, "<<CPdpFsm::ChangeStateToOpeningPhone");
     }
 
 void CPdpFsm::ChangeStateToCreatingPrimary(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGPRIMARY_1, ">>CPdpFsm::ChangeStateToCreatingPrimary");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGPRIMARY_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGPRIMARY_3, "New State : CreatingPrimary");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatingPrimary");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : CreatingPrimary"));
 	
 	iState = &iPdpFsmFactory->iStateCreatingPrimary;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGPRIMARY_4, "<<CPdpFsm::ChangeStateToCreatingPrimary");
     }
 
 void CPdpFsm::ChangeStateToActivatingPrimary(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_1, ">>CPdpFsm::ChangeStateToActivatingPrimary");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_3, "New State : ActivatingPrimary");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToActivatingPrimary");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : ActivatingPrimary"));
 	
 	iState = &iPdpFsmFactory->iStateActivatingPrimary;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_4, "<<CPdpFsm::ChangeStateToActivatingPrimary");
     }
 
 void CPdpFsm::ChangeStateToCreatingSecondary(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGSECONDARY_1, ">>CPdpFsm::ChangeStateToCreatingSecondary");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGSECONDARY_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGSECONDARY_3, "New State : CreatingSecondary");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatingSecondary");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : CreatingSecondary"));
 	
 	iState = &iPdpFsmFactory->iStateCreatingSecondary;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGSECONDARY_4, "<<CPdpFsm::ChangeStateToCreatingSecondary");
     }
 
 void CPdpFsm::ChangeStateToCreatedSecondary(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDSECONDARY_1, ">>CPdpFsm::ChangeStateToCreatedSecondary");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDSECONDARY_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDSECONDARY_3, "New State : CreatedSecondary");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatedSecondary");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : CreatedSecondary"));
 	
 	iState = &iPdpFsmFactory->iStateCreatedSecondary;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDSECONDARY_4, "<<CPdpFsm::ChangeStateToCreatedSecondary");
     }
 
 void CPdpFsm::ChangeStateToSettingTFT(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGTFT_1, ">>CPdpFsm::ChangeStateToSettingTFT");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGTFT_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGTFT_3, "New State : SettingTFT");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToSettingTFT");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : SettingTFT"));
 	
 	iState = &iPdpFsmFactory->iStateSettingTFT;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGTFT_4, "<<CPdpFsm::ChangeStateToSettingTFT");
     }
 
 void CPdpFsm::ChangeStateToSettingQoS(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGQOS_1, ">>CPdpFsm::ChangeStateToSettingQoS");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGQOS_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGQOS_3, "New State : SettingQoS");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToSettingQoS");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : SettingQoS"));
 	
 	iState = &iPdpFsmFactory->iStateSettingQoS;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGQOS_4, "<<CPdpFsm::ChangeStateToSettingQoS");
     }
 
 void CPdpFsm::ChangeStateToActivatingSecondary(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_1, ">>CPdpFsm::ChangeStateToActivatingSecondary");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_3, "New State : ActivatingSecondary");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToActivatingSecondary");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : ActivatingSecondary"));
 	
 	iState = &iPdpFsmFactory->iStateActivatingSecondary;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_4, "<<CPdpFsm::ChangeStateToActivatingSecondary");
     }
 
 void CPdpFsm::ChangeStateToOpen(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPEN_1, ">>CPdpFsm::ChangeStateToOpen");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPEN_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPEN_3, "New State : Open");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToOpen");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : Open"));
 	
 	iState = &iPdpFsmFactory->iStateOpen;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPEN_4, "<<CPdpFsm::ChangeStateToOpen");
     }
 
 void CPdpFsm::ChangeStateToChangingQoS(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGQOS_1, ">>CPdpFsm::ChangeStateToChangingQoS");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGQOS_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGQOS_3, "New State : ChangingQoS");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToChangingQoS");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : ChangingQoS"));
 	
 	iState = &iPdpFsmFactory->iStateChangingQoS;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGQOS_4, "<<CPdpFsm::ChangeStateToChangingQoS");
     }
 
 void CPdpFsm::ChangeStateToChangingTFT(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGTFT_1, ">>CPdpFsm::ChangeStateToChangingTFT");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGTFT_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGTFT_3, "New State : ChangingTFT");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToChangingTFT");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : ChangingTFT"));
 	
 	iState = &iPdpFsmFactory->iStateChangingTFT;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGTFT_4, "<<CPdpFsm::ChangeStateToChangingTFT");
     }
 
 void CPdpFsm::ChangeStateToGettingNegQoS(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOGETTINGNEGQOS_1, ">>CPdpFsm::ChangeStateToGettingNegQoS");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOGETTINGNEGQOS_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOGETTINGNEGQOS_3, "New State : GettingNegQoS");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToGettingNegQoS");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : GettingNegQoS"));
 	
 	iState = &iPdpFsmFactory->iStateGettingNegQoS;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOGETTINGNEGQOS_4, "<<CPdpFsm::ChangeStateToGettingNegQoS");
     }
 
 
 
 void CPdpFsm::ChangeStateToModifingActive(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOMODIFINGACTIVE_1, ">>CPdpFsm::ChangeStateToModifingActive");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOMODIFINGACTIVE_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOMODIFINGACTIVE_3, "New State : ModifingActive");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToModifingActive");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : ModifingActive"));
 	
 	iState = &iPdpFsmFactory->iStateModifyingActive;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOMODIFINGACTIVE_4, "<<CPdpFsm::ChangeStateToModifingActive");
     }
 
 void CPdpFsm::ChangeStateToSuspended(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSUSPENDED_1, ">>CPdpFsm::ChangeStateToSuspended");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSUSPENDED_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSUSPENDED_3, "New State : Suspended");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToSuspended");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : Suspended"));
 	
 	iState = &iPdpFsmFactory->iStateSuspended;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSUSPENDED_4, "<<CPdpFsm::ChangeStateToSuspended");
     }
 
 void CPdpFsm::ChangeStateToClosing(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCLOSING_1, ">>CPdpFsm::ChangeStateToClosing");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCLOSING_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCLOSING_3, "New State : Closing");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToClosing");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : Closing"));
 	
 	iState = &iPdpFsmFactory->iStateClosing;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCLOSING_4, "<<CPdpFsm::ChangeStateToClosing");
     }
 
 void CPdpFsm::ChangeStateToStopping(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSTOPPING_1, ">>CPdpFsm::ChangeStateToStopping");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSTOPPING_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSTOPPING_3, "New State : Stopping");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToStopping");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : Stopping"));
 	
 	iState = &iPdpFsmFactory->iStateStopping;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSTOPPING_4, "<<CPdpFsm::ChangeStateToStopping");
     }
     
 void CPdpFsm::ChangeStateToCreatingMbms(void)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGMBMS_1, ">>CPdpFsm::ChangeStateToCreatingMbms");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGMBMS_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGMBMS_3, "New State : Creating");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatingMbms");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : Creating"));
 	
 	iState = &iPdpFsmFactory->iStateCreatingMbms;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGMBMS_4, "<<CPdpFsm::ChangeStateToCreatingMbms");
 	}
 	
 void CPdpFsm::ChangeStateToActivatingMbms(void)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGMBMS_1, ">>CPdpFsm::ChangeStateToActivatingMbms");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGMBMS_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGMBMS_3, "New State : Activating");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToActivatingMbms");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : Activating"));
 	
-	iState = &iPdpFsmFactory->iStateActivatingMbms;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGMBMS_4, "<<CPdpFsm::ChangeStateToActivatingMbms");
+	iState = &iPdpFsmFactory->iStateActivatingMbms;	
 	}
 
 void CPdpFsm::ChangeStateToCreatedMbms(void)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDMBMS_1, ">>CPdpFsm::ChangeStateToCreatingMbms");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDMBMS_2, "Pdp ID %d",iPdpId);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDMBMS_3, "New State : Created");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatingMbms");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+	SPUDFSM_LOG(_L("New State : Created"));
 	
-	iState = &iPdpFsmFactory->iStateCreatedMbms;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDMBMS_4, "<<CPdpFsm::ChangeStateToCreatingMbms");
+	iState = &iPdpFsmFactory->iStateCreatedMbms;	
 	}
 
 
 	
 void CPdpFsm::Get(RPacketMbmsContext::TContextConfigMbmsV1& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET9_1, ">>CPdpFsm::Get(RPacketMbmsContext::TContextConfigMbmsV1)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET9_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(RPacketMbmsContext::TContextConfigMbmsV1)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	aParam = iMbms;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET9_3, "<<CPdpFsm::Get(RPacketMbmsContext::TContextConfigMbmsV1)");
     }
     
     
 void CPdpFsm::Set(const RPacketMbmsContext::TContextConfigMbmsV1& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET10_1, ">>CPdpFsm::Get(RPacketMbmsContext::TContextConfigMbmsV1)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET10_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(RPacketMbmsContext::TContextConfigMbmsV1)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	iMbms = aParam ;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET10_3, "<<CPdpFsm::Get(RPacketMbmsContext::TContextConfigMbmsV1)");
     }
     
     
 void CPdpFsm::Get(TSessionOperatioInfo& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET10_1, ">>CPdpFsm::Get(Session)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET10_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(Session)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	aParam = iSessionInfo;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET10_3, "<<CPdpFsm::Get(Session)");
     }
     
     
 void CPdpFsm::Set(const TSessionOperatioInfo& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET11_1, ">>CPdpFsm::Get(Session)");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET11_2, "Pdp ID %d",iPdpId);
+	SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(Session)");
+	SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
 
 	iSessionInfo = aParam ;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET11_3, "<<CPdpFsm::Get(Session)");
     }    
 
 void CPdpFsm::InitialiseContextConfig(TUint32 aConfigRel)

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsmfactory.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsmfactory.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,20 +20,14 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cpdpfsmfactoryTraces.h"
-#endif
-
 #include "cpdpfsmfactory.h"
+#include "spudfsmdebuglogger.h"
 
 // NewL 
 CPdpFsmFactory* CPdpFsmFactory::NewL ()
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWL_1, ">>CPdpFsmFactory::NewL()");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWL_2, "<<CPdpFsmFactory::NewL()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::NewL()");
+	
 	return new (ELeave) CPdpFsmFactory ();	
     }
 
@@ -70,26 +64,24 @@
   iStateActivatingMbms(this),
   iStateCreatedMbms(this)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_CTOR_1, ">>CPdpFsmFactory::CPdpFsmFactory()");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_CTOR_2, "<<CPdpFsmFactory::CPdpFsmFactory()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::CPdpFsmFactory()");
     }
 
 
 CPdpFsmFactory::~CPdpFsmFactory()
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DTOR_1, ">>CPdpFsmFactory::~CPdpFsmFactory()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::~CPdpFsmFactory()");
 
 	iContexts.DeleteAll();
     iContexts.Reset();
 	
     delete iEtelDriverInput;   
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DTOR_2, "<<CPdpFsmFactory::~CPdpFsmFactory()");
     }
 
 
 void CPdpFsmFactory::InitL(const TName& aTsyName, CPdpFsmInterface * aPdpFsmInterface)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_INITL_1, ">>CPdpFsmFactory::InitL()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::InitL()");
 
 	iPdpFsmInterface = aPdpFsmInterface;
 	
@@ -100,21 +92,20 @@
 	iEtelDriverInput = new (ELeave) REtelDriverInput;
 
 	iEtelDriverInput->OpenL (*iPdpFsmInterface);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_INITL_2, "<<CPdpFsmFactory::InitL()");
+
 	// Only create PDP contexts if specifically requested.
     }
 
 
 void CPdpFsmFactory::Close (void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_CLOSE_1, ">>CPdpFsmFactory::Close()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::Close()");
 	// in OOM conditions iEtelDriveInput may not have successfully
 	// been created, check here for safety.
 	if (iEtelDriverInput != NULL)
 	    {
         iEtelDriverInput->Close();
 	    }
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_CLOSE_2, "<<CPdpFsmFactory::Close()");
     }
 
 
@@ -123,8 +114,8 @@
 */
 CPdpFsm* CPdpFsmFactory::GetFsmContext (TContextId aPdpId)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_GETFSMCONTEXT_1, ">>CPdpFsmFactory::GetContext()");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_GETFSMCONTEXT_2, "<<CPdpFsmFactory::GetContext()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::GetContext()");
+
 	return iContexts[aPdpId];
     }
 
@@ -140,7 +131,7 @@
 TContextId CPdpFsmFactory::NewFsmContextL(MPdpFsmEventHandler& aPdpFsmEventHandler,SpudMan::TPdpContextType aContextType)
 #endif
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWFSMCONTEXTL_1, ">>CPdpFsmFactory::NewFsmContext()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::NewFsmContext()");
 
 #ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
 	TInt ret = KErrNone;
@@ -154,7 +145,6 @@
 	         iContexts[aPdpId] = p;       
 	         );
 	    }
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWFSMCONTEXTL_2, "<<CPdpFsmFactory::NewFsmContext()");
    return ret;
 #else
 	TInt i=0;
@@ -168,19 +158,18 @@
         iContexts[i] = p;
         iEtelDriverInput->CreatePdpL(i, aContextType);
         }
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWFSMCONTEXTL_3, "<<CPdpFsmFactory::NewFsmContext()");
-    return i;
+        return i;
 #endif	
     }
    
 TInt CPdpFsmFactory::DeleteFsmContext(TContextId aPdpId)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DELETEFSMCONTEXT_1, ">>CPdpFsmFactory::DeleteFsmContext()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::DeleteFsmContext()");
 	ASSERT(ContextIsValid(aPdpId));
 
     delete iContexts[aPdpId];
     iContexts[aPdpId] = NULL;
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DELETEFSMCONTEXT_2, "<<CPdpFsmFactory::DeleteFsmContext()");
+    
 	return KErrNone;
     }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/spudfsmdebuglogger.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,87 @@
+// Copyright (c) 2004-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:
+// SpudFsm Data and Event Logger header
+// 
+//
+
+/**
+ @file 
+ @internalComponent
+*/
+
+#ifndef SPUDFSMDEBUGLOGGER_H
+#define SPUDFSMDEBUGLOGGER_H
+
+#include "comms-infras/commsdebugutility.h"
+
+#ifdef __FLOG_ACTIVE
+
+#include <e32base.h>
+
+_LIT8(KSpudFsmLogFileVerbose,"SPUDFSMVERB.TXT");
+_LIT8(KSpudFsmLogFile,"SPUDFSM.TXT");
+_LIT8(KSpudFsmLogFolder,"SPUD");
+
+// Static Output Logging Macros
+#define SPUDFSMVERBOSE_LOG(text) 			__FLOG_STATIC0(KSpudFsmLogFolder,KSpudFsmLogFileVerbose,text)
+#define SPUDFSMVERBOSE_LOG1(text,a)		    __FLOG_STATIC1(KSpudFsmLogFolder,KSpudFsmLogFileVerbose,text, a)
+#define SPUDFSMVERBOSE_LOG2(text,a, b)		__FLOG_STATIC2(KSpudFsmLogFolder,KSpudFsmLogFileVerbose,text,a,b)
+#define SPUDFSMVERBOSE_LOG3(text,a, b, c)	__FLOG_STATIC3(KSpudFsmLogFolder,KSpudFsmLogFileVerbose,text,a,b,c)
+#define SPUDFSM_LOG(text) 					__FLOG_STATIC0(KSpudFsmLogFolder,KSpudFsmLogFile,text)
+#define SPUDFSM_LOG1(text,a)		    	__FLOG_STATIC1(KSpudFsmLogFolder,KSpudFsmLogFile,text, a)
+#define SPUDFSM_LOG2(text,a, b)				__FLOG_STATIC2(KSpudFsmLogFolder,KSpudFsmLogFile,text,a,b)
+#define SPUDFSM_LOG3(text,a, b, c)			__FLOG_STATIC3(KSpudFsmLogFolder,KSpudFsmLogFile,text,a,b,c)
+
+
+_LIT(KSpudFsmMsgIn, ">>%S");
+_LIT(KSpudFsmMsgOut,"<<%S");
+
+class TSpudFsmLogVerboseFn
+{
+	protected:
+	TBuf<100> iName;
+
+	public:
+	TSpudFsmLogVerboseFn(const TDesC& aName) 	{ iName = aName; SPUDFSMVERBOSE_LOG1(KSpudFsmMsgIn, &iName);};
+	~TSpudFsmLogVerboseFn()						{ SPUDFSMVERBOSE_LOG1(KSpudFsmMsgOut, &iName);};
+};
+
+#define SPUDFSMVERBOSE_FNLOG(name) TSpudFsmLogVerboseFn spudFsmVerboseFnLog(_L(name))
+
+// error logging
+#if defined(_ERROR_LOG)
+#define SPUDFSM_ERROR_LOG(errtext, err)	{ __FLOG_STATIC0(KSpudFsmLogFolder,KSpudFsmLogFile, _L("ERROR: ")); \
+										__FLOG_STATIC1(KSpudFsmLogFolder,KSpudFsmLogFile, errtext, err); }
+#else // defined(_ERROR_LOG)
+#define SPUDFSM_ERROR_LOG(errtext, err)
+#endif // defined(_ERROR_LOG)
+
+#else // __FLOG_ACTIVE
+
+#define SPUDFSM_LOG(t)
+#define SPUDFSM_LOG1(t,a)
+#define SPUDFSM_LOG2(t,a,b)
+#define SPUDFSM_LOG3(t,a,b,c)
+#define SPUDFSMVERBOSE_LOG(t)
+#define SPUDFSMVERBOSE_LOG1(t,a)
+#define SPUDFSMVERBOSE_LOG2(t,a,b)
+#define SPUDFSMVERBOSE_LOG3(t,a,b,c)
+#define SPUDFSMVERBOSE_FNLOG(name)
+#define SPUDFSM_ERROR_LOG(errtext, err)
+
+#endif // __FLOG_ACTIVE
+
+
+#endif
+// SPUDFSMDEBUGLOGGER_H

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstate.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstate.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -22,16 +22,10 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstateTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "cpdpfsmfactory.h"
 #include "tpdpstate.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "reteldriverinput.h"
 #include "PDPFSM.h"
@@ -94,18 +88,17 @@
 
 
 TPdpState::TPdpState()
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#ifdef _DEBUG
 	: iName()
 #endif		
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_CTOR_1, ">>TPdpState::TPdpState()");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_CTOR_2, "<<TPdpState::TPdpState()");
+	SPUDFSMVERBOSE_FNLOG("TPdpState::TPdpState()");
 }
 
 TInt TPdpState::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt /*aErrorCode*/)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_INPUT_1, ">>TPdpState::Input()");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_INPUT_2, "aOperation : %d", aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpState::Input()");
+	SPUDFSMVERBOSE_LOG1(_L("aOperation : %d"), aOperation);
 
 	if (aOperation == PdpFsm::EContextDeleted || aOperation == SpudMan::EContextDelete ||
 		(aOperation == PdpFsm::EContextStatusChangeNetwork && aFsm.iContextStatus == RPacketContext::EStatusDeleted))
@@ -116,26 +109,25 @@
 		return KErrNone;
 	}
 
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_INPUT_3, "!!! Unhandled Operation (%S)!!!", *(LogOperation (aFsm, aOperation)));
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_INPUT_4, "<<TPdpState::Input()");
+	SPUDFSMVERBOSE_LOG1(_L("!!! Unhandled Operation (%S)!!!"), LogOperation (aFsm, aOperation));
 	return KErrGeneral;
 }
 
 void TPdpState::EtelDriverInput (CPdpFsm& aFsm, EtelDriver::TEtelInput aOperation)
 {
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_ETELDRIVERINPUT_1, "EtelDriverInput : %d", aOperation);
+	SPUDFSMVERBOSE_LOG1(_L("EtelDriverInput : %d"), aOperation);
 	aFsm.EtelInput (aOperation);
 }
 
 void TPdpState::EtelDriverCancel (CPdpFsm& aFsm)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_ETELDRIVERCANCEL_1, "EtelDriverCancel");
+	SPUDFSMVERBOSE_LOG(_L("EtelDriverCancel"));
 	aFsm.EtelCancel();
 }
 
 void TPdpState::SpudManNotify (CPdpFsm& aFsm, TInt aNotification, TInt aParam)
 {
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_SPUDMANNOTIFY_1, "SpudManNotify : %d", aNotification);
+	SPUDFSMVERBOSE_LOG1(_L("SpudManNotify : %d"), aNotification);
 	aFsm.SpudInput (aNotification, aParam);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstate.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstate.h	Wed Sep 01 12:40:21 2010 +0100
@@ -31,7 +31,6 @@
 #include "pdpfsmnmspace.h"
 
 
-
 class CPdpFsm;
 //class REtelDriverInput;
 class CPdpFsmFactory;
@@ -54,10 +53,8 @@
 	void SpudManNotify (CPdpFsm& aFsm, TInt aNotification, TInt aParam);
 	
 public:
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#ifdef _DEBUG
 	TBuf<100> iName;
-#else
-	TBuf<1> iName;
 #endif		
 
 protected:

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingmbms.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingmbms.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -20,22 +20,16 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstateactivatingmbmsTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsm.h"
 
 TInt TPdpStateActivatingMbms::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGMBMS_INPUT_1, ">>TPdpStateActivatingMbms::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGMBMS_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateActivatingMbms::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
@@ -45,18 +39,15 @@
 		aFsm.Set(RPacketContext::EStatusActive);
 		aFsm.ChangeStateToCreatedMbms();//there is no Qos to be set
 		SpudManNotify (aFsm, KContextActivateEvent, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGMBMS_INPUT_3, "<<TPdpStateActivatingMbms::Input()");
 		return KErrNone;
 	case PdpFsm::EPdpActivatedFailed:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGMBMS_INPUT_4, "*** FAILURE ***");
+		SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***"));
 		aFsm.ChangeStateToCreatedMbms();
 		SpudManNotify (aFsm, KContextActivateEvent, aErrorCode);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGMBMS_INPUT_5, "<<TPdpStateActivatingMbms::Input()");
 		return KErrNone;
 	// no default
 	}
 
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGMBMS_INPUT_6, "<<TPdpStateActivatingMbms::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingprimary.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingprimary.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,23 +20,17 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstateactivatingprimaryTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsm.h"
 #include "PDPFSM.h"
 	
 TInt TPdpStateActivatingPrimary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_1, ">>TPdpStateActivatingPrimary::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_2, "aOperation : %S(%d)", *LogOperation(aFsm, aOperation), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateActivatingPrimary::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
@@ -46,27 +40,23 @@
 		aFsm.Set(RPacketContext::EStatusActive);
 		aFsm.ChangeStateToOpen();
 		SpudManNotify (aFsm, KPrimaryContextCreated, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_3, "<<TPdpStateActivatingPrimary::Input()");
 		return KErrNone;
 	case PdpFsm::EPdpActivatedFailed:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_4, "*** FAILURE ***");
+		SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***"));
 		aFsm.ChangeStateToClosing();
 		
 		SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode);
 		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_5, "<<TPdpStateActivatingPrimary::Input()");
 		return KErrNone;
   case SpudMan::ECancelContextCreate:
 		aFsm.ChangeStateToStopping();
 		EtelDriverCancel(aFsm);
 		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_6, "<<TPdpStateActivatingPrimary::Input()");
 		return KErrNone;
 	// no default	
 	}
 
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_7, "<<TPdpStateActivatingPrimary::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingsecondary.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingsecondary.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,22 +20,16 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstateactivatingsecondaryTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsm.h"
 
 TInt TPdpStateActivatingSecondary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_1, ">>TPdpStateActivatingSecondary::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateActivatingSecondary::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
@@ -46,19 +40,16 @@
 		aFsm.ChangeStateToGettingNegQoS();  // Context was activated, but we don't necessarily have negotiated QoS yet; 
                        					    // a TSY might wait for a successfull activation to report it to Etel. 
 		SpudManNotify (aFsm, KContextActivateEvent, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_3, "<<TPdpStateActivatingSecondary::Input()");
 		return KErrNone;
 	case PdpFsm::EPdpActivatedFailed:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_4, "*** FAILURE ***");
+		SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***"));
 		aFsm.ChangeStateToCreatedSecondary();
 		SpudManNotify (aFsm, KContextActivateEvent, aErrorCode);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_5, "<<TPdpStateActivatingSecondary::Input()");
 		return KErrNone;
 	// no default
 	}
 
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_6, "<<TPdpStateActivatingSecondary::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatechangingqos.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatechangingqos.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,41 +20,32 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstatechangingqosTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsm.h"
 
 TInt TPdpStateChangingQoS::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGQOS_INPUT_1, ">>TPdpStateChangingQoS::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGQOS_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateChangingQoS::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
 	case PdpFsm::EQoSSet:
 		aFsm.ChangeStateToOpen();
 		SpudManNotify (aFsm, KContextQoSSetEvent, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGQOS_INPUT_3, "<<TPdpStateChangingQoS::Input()");
 		return KErrNone;
 	case PdpFsm::EQoSSetFailed:
 		aFsm.ChangeStateToOpen();
 		SpudManNotify (aFsm, KContextQoSSetEvent, aErrorCode);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGQOS_INPUT_4, "<<TPdpStateChangingQoS::Input()");
 		return KErrNone;
 	
 	// no default	
 	}
 	
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGQOS_INPUT_5, "<<TPdpStateChangingQoS::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatechangingtft.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatechangingtft.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,41 +20,32 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstatechangingtftTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsm.h"
 
 TInt TPdpStateChangingTFT::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGTFT_INPUT_1, ">>TPdpStateChangingTFT::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGTFT_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateChangingTFT::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
 	case PdpFsm::ETftChanged:
 		aFsm.ChangeStateToOpen();
 		SpudManNotify (aFsm, KContextTFTModifiedEvent, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGTFT_INPUT_3, "<<TPdpStateChangingTFT::Input()");
 		return KErrNone;
 	case PdpFsm::ETftChangedFailed:
 		aFsm.ChangeStateToOpen();
 		SpudManNotify (aFsm, KContextTFTModifiedEvent, aErrorCode);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGTFT_INPUT_4, "<<TPdpStateChangingTFT::Input()");
 		return KErrNone;
 		
 	// no default
 	}
 
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGTFT_INPUT_5, "<<TPdpStateChangingTFT::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateclosing.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateclosing.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,49 +20,39 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstateclosingTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "PDPFSM.h"
 #include "cpdpfsm.h"
 
 TInt TPdpStateClosing::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECLOSING_INPUT_1, "<<TPdpStateClosing::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECLOSING_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateClosing::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
 	case PdpFsm::EContextDeleted:
 		aFsm.ChangeStateToInitialised();
 		SpudManNotify (aFsm, KContextDeleteEvent, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECLOSING_INPUT_3, ">>TPdpStateClosing::Input()");
 		return KErrNone;			
 	case PdpFsm::EContextDeletedFailed:
 		// There isn't any corrective action that can be taken here. 
 		// It is assumed when this context is used again, there will be a failure 
 		// or a failure elsewhere down the line that will correct the situation, ultimately
 		// involving the user. FSM and ETelDriver are not in a position to take any corrective action.
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECLOSING_INPUT_4, "**** DELETE FAILURE ****");
+		SPUDFSMVERBOSE_LOG(_L("**** DELETE FAILURE ****"));
 		aFsm.ChangeStateToInitialised();
 		SpudManNotify (aFsm, KContextDeleteEvent, aErrorCode);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECLOSING_INPUT_5, ">>TPdpStateClosing::Input()");
 		return KErrNone;			
 	case SpudMan::EContextDelete:
 		// already doing this and don't want default action
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECLOSING_INPUT_6, ">>TPdpStateClosing::Input()");
 		return KErrInUse;
 	}
 
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECLOSING_INPUT_7, ">>TPdpStateClosing::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatedSecondary.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatedSecondary.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,15 +20,9 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstatecreatedSecondaryTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "pdpfsmnmspace.h"
 #include "PDPFSM.h"
@@ -36,30 +30,26 @@
 
 TInt TPdpStateCreatedSecondary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDSECONDARY_INPUT_1, ">>TPdpStateCreatedSecondary::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDSECONDARY_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateCreatedSecondary::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
 	case SpudMan::EContextActivate: 
 		aFsm.ChangeStateToActivatingSecondary();
 		EtelDriverInput(aFsm, EtelDriver::EActivatePdp);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDSECONDARY_INPUT_3, "<<TPdpStateCreatedSecondary::Input()");
 		return KErrNone;		
 	case SpudMan::EContextQoSSet:
 		aFsm.ChangeStateToSettingQoS();
 		EtelDriverInput(aFsm, EtelDriver::ESetQoS);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDSECONDARY_INPUT_4, "<<TPdpStateCreatedSecondary::Input()");
 		return KErrNone;
 	case SpudMan::EContextTFTModify:
 		aFsm.ChangeStateToSettingTFT();
 		EtelDriverInput(aFsm, EtelDriver::ESetTft);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDSECONDARY_INPUT_5, "<<TPdpStateCreatedSecondary::Input()");
 		return KErrNone;
 	}
 	
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDSECONDARY_INPUT_6, "<<TPdpStateCreatedSecondary::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatedmbms.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatedmbms.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -20,15 +20,9 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstatecreatedmbmsTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "pdpfsmnmspace.h"
 #include "PDPFSM.h"
@@ -39,8 +33,8 @@
 
 TInt TPdpStateCreatedMbms::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDMBMS_INPUT_1, "TPdpStateCreatedMbms::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDMBMS_INPUT_2, "aOperation : %S(%d)", *LogOperation(aFsm, aOperation), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateCreatedMbms::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingSecondary.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingSecondary.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,50 +20,40 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstatecreatingSecondaryTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "PDPFSM.h"
 #include "cpdpfsm.h"
 
 TInt TPdpStateCreatingSecondary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_1, ">>TPdpStateCreatingSecondary::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateCreatingSecondary::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
 	case PdpFsm::E2ryPdpContextCreated:
 		aFsm.ChangeStateToCreatedSecondary();
 		SpudManNotify(aFsm, KSecondaryContextCreated, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_3, "<<TPdpStateCreatingSecondary::Input()");
 		return KErrNone;
 	case PdpFsm::E2ryPdpContextCreatedFailed:
 		iErrorCode = aErrorCode;
 		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_4, "<<TPdpStateCreatingSecondary::Input()");
 		return KErrNone;
 
 	case PdpFsm::EContextDeletedFailed:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_5, "**** DELETE FAILURE ****");
+		SPUDFSMVERBOSE_LOG(_L("**** DELETE FAILURE ****"));
 		// fall through
 	case PdpFsm::EContextDeleted:
 		aFsm.ChangeStateToInitialised();
 		SpudManNotify(aFsm, KSecondaryContextCreated, iErrorCode);
 		iErrorCode = KErrNone;
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_6, "<<TPdpStateCreatingSecondary::Input()");
 		return KErrNone;
 	}
 	
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_7, "<<TPdpStateCreatingSecondary::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingmbms.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingmbms.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -20,16 +20,10 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstatecreatingmbmsTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include <networking/pdpdef.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "PDPFSM.h"
 #include "cpdpfsm.h"
@@ -37,41 +31,36 @@
 
 TInt TPdpStateCreatingMbms::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_1, ">>TPdpStateCreatingMbms::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateCreatingMbms::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 	
 	
 	switch (aOperation)
 	{
 	case PdpFsm::EMbmsPdpContextCreated:
 		EtelDriverInput(aFsm, EtelDriver::ESessionUpdate);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_3, "<<TPdpStateCreatingMbms::Input()");
 		return KErrNone;
 
 	case  SpudMan::EMbmsParameterUpdate:
 		aFsm.ChangeStateToCreatedMbms();
 		SpudManNotify(aFsm,KMbmsContextCreated, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_4, "<<TPdpStateCreatingMbms::Input()");
 		return KErrNone;
 
 	case PdpFsm::EMbmsPdpContextCreatedFailed:
 		iErrorCode = aErrorCode;
 		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_5, "<<TPdpStateCreatingMbms::Input()");
 		return KErrNone;
 
 	case PdpFsm::EContextDeletedFailed:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_6, "**** DELETE FAILURE ****");
+		SPUDFSMVERBOSE_LOG(_L("**** DELETE FAILURE ****"));
 		// fall through
 	case PdpFsm::EContextDeleted:
 		aFsm.ChangeStateToInitialised();
 		SpudManNotify(aFsm, KMbmsContextCreated, iErrorCode);
 		iErrorCode = KErrNone;
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_7, "<<TPdpStateCreatingMbms::Input()");
 		return KErrNone;
 	}
 	
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_8, "<<TPdpStateCreatingMbms::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingprimary.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingprimary.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,47 +20,37 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstatecreatingprimaryTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsm.h"
 #include "PDPFSM.h"
 
 TInt TPdpStateCreatingPrimary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_1, ">>TPdpStateCreatingPrimary::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateCreatingPrimary::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
 	case PdpFsm::E1ryPdpContextCreated:
 		aFsm.ChangeStateToActivatingPrimary();
 		EtelDriverInput(aFsm, EtelDriver::EActivatePdp);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_3, "<<TPdpStateCreatingPrimary::Input()");
 		return KErrNone;
 	case PdpFsm::E1ryPdpContextCreatedFailed: 
 		aFsm.ChangeStateToInitialised();
 		SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode); // or is it KContextActivateEvent?
 		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_5, "<<TPdpStateCreatingPrimary::Input()");
 		return KErrNone;
    case SpudMan::ECancelContextCreate:
 		aFsm.ChangeStateToStopping();
 		EtelDriverCancel(aFsm);
 		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_6, "<<TPdpStateCreatingPrimary::Input()");
 		return KErrNone;
 	}
 
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_7, "<<TPdpStateCreatingPrimary::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstategettingnegqos.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstategettingnegqos.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,51 +20,41 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstategettingnegqosTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsm.h"
 
 TInt TPdpStateGettingNegQoS::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_1, ">>TPdpStateGettingNegQoS::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateGettingNegQoS::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	    {
     	case SpudMan::EGetNegQoS:
     		EtelDriverInput(aFsm, EtelDriver::ENegQoSGet);
-    		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_3, "<<TPdpStateGettingNegQoS::Input()");
     		return KErrNone;
     		
     	case PdpFsm::EPdpNegQoSRetrieved:
-    		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_4, "*** SUCCESS ***");
+    		SPUDFSMVERBOSE_LOG(_L("*** SUCCESS ***"));
     		aFsm.ChangeStateToOpen();
     		SpudManNotify(aFsm, KGetNegQoSEvent, KErrNone);
-    		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_5, "<<TPdpStateGettingNegQoS::Input()");
     		return KErrNone;
     		
     	case PdpFsm::EPdpNegQoSRetrievedFailed:
-    		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_6, "*** FAILURE ***");
+    		SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***"));
     		// As far as everybody is concerned, the context was activated:
     		// This makes it eligible for certain events. 
     		// We have to move to Open state, so that that we can handle any operations
     		// on the activated PDP context correctly.
     		aFsm.ChangeStateToOpen(); 
     		SpudManNotify(aFsm, KGetNegQoSEvent, aErrorCode);
-    		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_7, "<<TPdpStateGettingNegQoS::Input()");
     		return KErrNone;
     	}
 	
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_8, "<<TPdpStateGettingNegQoS::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
     }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateinitialised.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateinitialised.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,15 +20,9 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstateinitialisedTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsm.h"
 #include "cpdpfsmfactory.h"
@@ -37,8 +31,8 @@
 
 TInt TPdpStateInitialised::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_1, ">>TPdpStateInitialised::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateInitialised::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
@@ -56,7 +50,7 @@
 			aFsm.ChangeStateToCreatingPrimary();
 			EtelDriverInput (aFsm, EtelDriver::ECreate1ryPdpContext);
 			}
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_3, "<<TPdpStateInitialised::Input()");
+	
 		return KErrNone;
 	case SpudMan::ECreateSecondaryPDPContext:
 		aFsm.ChangeStateToCreatingSecondary();
@@ -64,7 +58,7 @@
 		aFsm.iContextType = SpudMan::ESecondary;
 
 		EtelDriverInput (aFsm, EtelDriver::ECreate2ryPdpContext);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_4, "<<TPdpStateInitialised::Input()");
+	
 		return KErrNone;
 		
 		
@@ -72,7 +66,6 @@
 		aFsm.ChangeStateToCreatingMbms();
 		aFsm.iContextType = SpudMan::EMbms;
 		EtelDriverInput (aFsm, EtelDriver::ECreateMbmsPdpContext);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_5, "<<TPdpStateInitialised::Input()");
 		return KErrNone;
 		
 	// these stop the default actions which aren't of value in the Initialised state, although we 
@@ -82,14 +75,12 @@
 	case PdpFsm::EContextStatusChangeNetwork:
 		if (aFsm.iContextStatus == RPacketContext::EStatusDeleted)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_6, "<<TPdpStateInitialised::Input()");
-		return KErrNone;
+			return KErrNone;
 		}
 		break;
 	}
 
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_7, "<<TPdpStateInitialised::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatemodifingactive.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatemodifingactive.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -21,39 +21,30 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstatemodifingactiveTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsm.h"
 
 TInt TPdpStateModifyingActive::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEMODIFYINGACTIVE_INPUT_1, ">>TPdpStateModifyingActive::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEMODIFYINGACTIVE_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateModifyingActive::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
 	case PdpFsm::EPdpContextModified:
 		aFsm.ChangeStateToOpen();
 		SpudManNotify(aFsm, KContextModifyActiveEvent, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEMODIFYINGACTIVE_INPUT_3, "<<TPdpStateModifyingActive::Input()");
 		return KErrNone;
 	case PdpFsm::EPdpContextModifiedFailed:
 		aFsm.ChangeStateToOpen();
 		SpudManNotify(aFsm, KContextModifyActiveEvent, aErrorCode);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEMODIFYINGACTIVE_INPUT_4, "<<TPdpStateModifyingActive::Input()");
 		return KErrNone;
 	}
 	
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEMODIFYINGACTIVE_INPUT_5, "<<TPdpStateModifyingActive::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateopen.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateopen.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,36 +20,28 @@
  @internalComponent
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstateopenTraces.h"
-#endif
-
 #include <etelpckt.h>
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "PDPFSM.h"
 #include "cpdpfsm.h"
 
 TInt TPdpStateOpen::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_1, ">>TPdpStateOpen::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateOpen::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
 	case PdpFsm::EQoSProfileChangeNetwork:
 //		RPacketQoS::TQoSR99_R4Negotiated
 		SpudManNotify (aFsm, KContextParametersChangeEvent, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_3, "<<TPdpStateOpen::Input()");
 		return KErrNone;
 	case PdpFsm::EConfigGPRSChangeNetwork:
 //		//RPacketContext::TContextConfigGPRS
 		SpudManNotify (aFsm, KContextParametersChangeEvent, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_4, "<<TPdpStateOpen::Input()");
 		return KErrNone;
 	case PdpFsm::EContextStatusChangeNetwork:
 		if (aFsm.iContextStatus == RPacketContext::EStatusSuspended)
@@ -67,46 +59,37 @@
 			// no change in state - the upper layer must change the state if it needs to
 			SpudManNotify (aFsm, KContextParametersChangeEvent, aErrorCode);
     		}
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_5, "<<TPdpStateOpen::Input()");
 		return KErrNone;
 	case SpudMan::EContextDelete:
 		aFsm.ChangeStateToClosing();
 		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_6, "<<TPdpStateOpen::Input()");
 		return KErrNone;
 	case SpudMan::EContextQoSSet:
 		aFsm.ChangeStateToChangingQoS();
 		EtelDriverInput(aFsm, EtelDriver::ESetQoS);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_7, "<<TPdpStateOpen::Input()");
 		return KErrNone;
 	case SpudMan::EContextModifyActive:
 		aFsm.ChangeStateToModifingActive();
 		EtelDriverInput(aFsm, EtelDriver::EModifyActive);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_8, "<<TPdpStateOpen::Input()");
 		return KErrNone;
 	case SpudMan::EContextTFTModify:
 		aFsm.ChangeStateToChangingTFT();
 		EtelDriverInput(aFsm, EtelDriver::EChangeTft);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_9, "<<TPdpStateOpen::Input()");
 		return KErrNone;
 	case SpudMan::ESuspend: // think this is superfluous - DAN will see at review :)
 		aFsm.ChangeStateToSuspended();
 		SpudManNotify(aFsm, KContextBlockedEvent, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_10, "<<TPdpStateOpen::Input()");
 		return KErrNone;
 	case SpudMan::EMbmsSessionUpdate:
 		EtelDriverInput(aFsm, EtelDriver::ESessionUpdate);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_11, "<<TPdpStateOpen::Input()");
 		return KErrNone;
 		
 	case SpudMan::EMbmsParameterUpdate:
 		SpudManNotify (aFsm, KContextParametersChangeEvent, aErrorCode);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_12, "<<TPdpStateOpen::Input()");
 		return KErrNone;
 	}
 	
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_13, "<<TPdpStateOpen::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateopeningphone.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateopeningphone.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,15 +20,9 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstateopeningphoneTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsmfactory.h"
 #include "cpdpfsm.h"
@@ -36,8 +30,8 @@
 
 TInt TPdpStateOpeningPhone::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_1, ">>TPdpStateOpeningPhone::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateOpeningPhone::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
@@ -46,24 +40,20 @@
 		aFsm.ChangeStateToCreatingPrimary();
 		iPdpFsmFactory->iEtelOpened = ETrue;		
 		EtelDriverInput(aFsm, EtelDriver::ECreate1ryPdpContext);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_3, "<<TPdpStateOpeningPhone::Input()");
 		return KErrNone;
 	case PdpFsm::EPhoneOpenedFailed:
 		aFsm.ChangeStateToInitialised();
 		iPdpFsmFactory->iEtelOpened = EFalse;		
 		SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_4, "<<TPdpStateOpeningPhone::Input()");
 		return KErrNone;
   case SpudMan::ECancelContextCreate:
 		aFsm.ChangeStateToStopping();
 		EtelDriverCancel(aFsm);
 		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_5, "<<TPdpStateOpeningPhone::Input()");
 		return KErrNone;
 	}
 	
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_6, "<<TPdpStateOpeningPhone::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstates.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstates.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -24,16 +24,18 @@
 #define TPDPSTATES_H
 
 #include "tpdpstate.h"
+#include "spudfsmdebuglogger.h"
 
 class CPdpFsm;
 
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#if _DEBUG 
 #define DEFINE_TPDPSTATE_CLASS(state) _LIT(KName##state, #state); \
 NONSHARABLE_CLASS(TPdpState##state) : public TPdpState \
 { \
 public: \
 	TPdpState##state (CPdpFsmFactory * aPdpFsmFactory) \
 	{ \
+		SPUDFSMVERBOSE_FNLOG("TPdpState" L ## #state L"::TPdpState" L ## #state L"()"); \
 		iName = KName##state; \
 		iPdpFsmFactory = aPdpFsmFactory; \
 	} \
@@ -47,6 +49,7 @@
 public: \
 	TPdpState##state (CPdpFsmFactory * aPdpFsmFactory) \
 	{ \
+		SPUDFSMVERBOSE_FNLOG("TPdpState" L ## #state L"::TPdpState" L ## #state L"()"); \
 		iPdpFsmFactory = aPdpFsmFactory; \
 	} \
 	TInt Input (CPdpFsm& aFsm, TInt aOperation, TInt aErrorCode); \

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesettingqos.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesettingqos.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,39 +20,30 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstatesettingqosTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsm.h"
 
 TInt TPdpStateSettingQoS::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOS_INPUT_1, ">>TPdpStateSettingQoS::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOS_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateSettingQoS::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
 	case PdpFsm::EQoSSet:
 		aFsm.ChangeStateToCreatedSecondary();
 		SpudManNotify(aFsm, KContextQoSSetEvent, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOS_INPUT_3, "<<TPdpStateSettingQoS::Input()");
 		return KErrNone;
 	case PdpFsm::EQoSSetFailed:
 		aFsm.ChangeStateToCreatedSecondary();
 		SpudManNotify(aFsm, KContextQoSSetEvent, aErrorCode);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOS_INPUT_4, "<<TPdpStateSettingQoS::Input()");
 		return KErrNone;
 	}
 	
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOS_INPUT_5, "<<TPdpStateSettingQoS::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesettingqosprimary.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesettingqosprimary.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -22,31 +22,29 @@
  
 #include <networking\UmtsNifControlIf.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsm.h"
 
 TInt TPdpStateSettingQoSPrimary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOSPRIMARY_INPUT_1, ">>TPdpStateSettingQoSPrimary::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOSPRIMARY_INPUT_2, "aOperation : %S(%d)", LogOperation(aFsm, aOperation), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateSettingQoSPrimary::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
 	case PdpFsm::EQoSSet:
 		aFsm.ChangeStateToActivatingPrimary();
 		EtelDriverInput(aFsm, EtelDriver::EActivatePdp);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOSPRIMARY_INPUT_3, "<<TPdpStateSettingQoSPrimary::Input()");
 		return KErrNone;
 	case PdpFsm::EQoSSetFailed:
 		aFsm.ChangeStateToClosing();
 		SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode); // or is it KContextActivateEvent?
 		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOSPRIMARY_INPUT_4, "<<TPdpStateSettingQoSPrimary::Input()");
 		return KErrNone;
 	}
 	
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOSPRIMARY_INPUT_5, "<<TPdpStateSettingQoSPrimary::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesettingtft.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesettingtft.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,22 +20,16 @@
  @internalComponent
 */
  						   
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstatesettingtftTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsm.h"
 
 TInt TPdpStateSettingTFT::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGTFT_INPUT_1, ">>TPdpStateSettingTFT::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGTFT_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateSettingTFT::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
@@ -58,7 +52,6 @@
 				}
 			}
 		SpudManNotify(aFsm, KContextTFTModifiedEvent, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGTFT_INPUT_3, "<<TPdpStateSettingTFT::Input()");
 		return KErrNone;
 	case PdpFsm::ETftSetFailed:
 		if (aFsm.iContextType != SpudMan::EMbms)
@@ -70,12 +63,10 @@
 			aFsm.ChangeStateToCreatedMbms();
 			}
 		SpudManNotify(aFsm, KContextTFTModifiedEvent, aErrorCode);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGTFT_INPUT_4, "<<TPdpStateSettingTFT::Input()");
 		return KErrNone;
 	}
 	
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGTFT_INPUT_5, "<<TPdpStateSettingTFT::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatestopping.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatestopping.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,48 +20,38 @@
  @internalComponent
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstatestoppingTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "PDPFSM.h"
 #include "cpdpfsm.h"
 
 TInt TPdpStateStopping::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_1, ">>TPdpStateStopping::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateStopping::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
 	case PdpFsm::EContextDeleted:
 		aFsm.ChangeStateToInitialised();
 		SpudManNotify (aFsm, KPrimaryContextCreated, KErrGeneral);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_3, "<<TPdpStateStopping::Input()");
 		return KErrNone;			
 	case PdpFsm::EContextDeletedFailed:
 		// There isn't any corrective action that can be taken here. 
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_4, "**** DELETE FAILURE ****");
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_5, "*** DELETE FAILURE ***");
+		SPUDFSMVERBOSE_LOG(_L("**** DELETE FAILURE ****"));
+		SPUDFSM_LOG(_L("*** DELETE FAILURE ***"));
 		aFsm.ChangeStateToInitialised();
 		EtelDriverCancel (aFsm);
 		SpudManNotify (aFsm, KPrimaryContextCreated, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_6, "<<TPdpStateStopping::Input()");
 		return KErrNone;
 	case SpudMan::EContextDelete:
 		// already doing this and don't want default action
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_7, "<<TPdpStateStopping::Input()");
 		return KErrInUse;
 	}
 
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_8, "<<TPdpStateStopping::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesuspended.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesuspended.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,30 +20,23 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstatesuspendedTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "PDPFSM.h"
 #include "cpdpfsm.h"
 
 TInt TPdpStateSuspended::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESUSPENDED_INPUT_1, ">>TPdpStateSuspended::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESUSPENDED_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateSuspended::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
 	case SpudMan::EResume:
 		aFsm.ChangeStateToOpen();
 		SpudManNotify(aFsm, KContextUnblockedEvent, KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESUSPENDED_INPUT_3, "<<TPdpStateSuspended::Input()");
 		return KErrNone;
 	case PdpFsm::EContextStatusChangeNetwork:
 		if (aFsm.iContextStatus == RPacketContext::EStatusActive)
@@ -51,14 +44,12 @@
 			aFsm.ChangeStateToOpen();
 			SpudManNotify(aFsm, KContextUnblockedEvent, KErrNone); 
 			//SpudManNotify (aFsm, KNetworkStatusEvent, KErrNone);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESUSPENDED_INPUT_4, "<<TPdpStateSuspended::Input()");
 			return KErrNone;
 		}
 		break;		
 	}
 	
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESUSPENDED_INPUT_5, "<<TPdpStateSuspended::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }

--- a/telephonyprotocols/pdplayer/umts/spudtel/inc/ceteldrivercontext.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/inc/ceteldrivercontext.h	Wed Sep 01 12:40:21 2010 +0100
@@ -110,7 +110,7 @@
 
     inline RPacketContext::TContextStatus& ContextStatus();	
 	
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#ifdef _DEBUG
     void DumpReqProfileParameters ();
     void DumpNegProfileParameters ();
 #endif

--- a/telephonyprotocols/pdplayer/umts/spudtel/inc/meteldriverstrategy.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/inc/meteldriverstrategy.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/umts/spudtel/inc/spudteldebuglogger.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,114 @@
+// Copyright (c) 2004-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:
+// Event Logger header
+// 
+//
+
+/**
+ @file
+ @internalComponent
+*/
+
+#ifndef SPUDTELDEBUGLOGGER_H
+#define SPUDTELDEBUGLOGGER_H
+
+
+#include "comms-infras/commsdebugutility.h"
+
+#ifdef __FLOG_ACTIVE
+
+#include <e32base.h>
+#include <e32def.h>
+
+
+_LIT8(KSpudTelLogFile,"SPUDTEL.TXT");
+_LIT8(KSpudTelLogFileVerbose,"SPUDTELVERB.TXT");
+_LIT8(KSpudTelLogFolder,"SPUD");
+
+// pure informational logging
+#if defined(_INFO_LOG)
+// Static info Output Logging Macros
+#define SPUDTEL_INFO_LOG(text) 					__FLOG_STATIC0(KSpudTelLogFolder,KSpudTelLogFile,text)
+#define SPUDTEL_INFO_LOG1(text,a)				__FLOG_STATIC1(KSpudTelLogFolder,KSpudTelLogFile,text, a)
+#define SPUDTEL_INFO_LOG2(text,a, b)			__FLOG_STATIC2(KSpudTelLogFolder,KSpudTelLogFile,text,a,b)
+#define SPUDTEL_INFO_LOG3(text,a, b, c)			__FLOG_STATIC3(KSpudTelLogFolder,KSpudTelLogFile,text,a,b,c)
+#define SPUDTELVERBOSE_INFO_LOG(text) 			__FLOG_STATIC0(KSpudTelLogFolder,KSpudTelLogFileVerbose,text)
+#define SPUDTELVERBOSE_INFO_LOG1(text,a)		__FLOG_STATIC1(KSpudTelLogFolder,KSpudTelLogFileVerbose,text, a)
+#define SPUDTELVERBOSE_INFO_LOG2(text,a, b)		__FLOG_STATIC2(KSpudTelLogFolder,KSpudTelLogFileVerbose,text,a,b)
+#define SPUDTELVERBOSE_INFO_LOG3(text,a, b, c)	__FLOG_STATIC3(KSpudTelLogFolder,KSpudTelLogFileVerbose,text,a,b,c)
+
+
+_LIT(KSpudTelMsgIn, ">>%S");
+_LIT(KSpudTelMsgOut,"<<%S");
+
+class TSpudTelLogFn
+{
+protected:
+	TName iName;
+
+public:
+	TSpudTelLogFn(const TDesC& aName) 	{ iName = aName; SPUDTELVERBOSE_INFO_LOG1(KSpudTelMsgIn, &iName);};
+	~TSpudTelLogFn()					{ SPUDTELVERBOSE_INFO_LOG1(KSpudTelMsgOut, &iName);};
+};
+
+#define SPUDTEL_FNLOG(name) TSpudTelLogFn spudTelLogFn(_L(name))
+
+#else // defined(_INFO_LOG)
+
+#define SPUDTEL_INFO_LOG(text)
+#define SPUDTEL_INFO_LOG1(text,a)
+#define SPUDTEL_INFO_LOG2(text,a, b)
+#define SPUDTEL_INFO_LOG3(text,a, b, c)
+#define SPUDTEL_FNLOG(name) 
+#define SPUDTELVERBOSE_INFO_LOG(text)
+#define SPUDTELVERBOSE_INFO_LOG1(text,a)
+#define SPUDTELVERBOSE_INFO_LOG2(text,a, b)
+#define SPUDTELVERBOSE_INFO_LOG3(text,a, b, c)
+
+#endif // defined(_INFO_LOG)
+
+
+// error logging
+#if defined(_ERROR_LOG)
+
+#define SPUDTEL_ERROR_LOG(errtext, err)	__FLOG_STATIC1(KSpudTelLogFolder,KSpudTelLogFile, errtext, err)
+#define SPUDTEL_ERROR_LOG0(errtext)		__FLOG_STATIC0(KSpudTelLogFolder,KSpudTelLogFile, errtext)
+
+#else // defined(_ERROR_LOG)
+
+#define SPUDTEL_ERROR_LOG(errtext, err)
+#define SPUDTEL_ERROR_LOG0(errtext)
+
+#endif // defined(_ERROR_LOG)
+
+
+#else	// __FLOG_ACTIVE
+
+#define SPUDTEL_INFO_LOG(t)
+#define SPUDTEL_INFO_LOG1(t,a)
+#define SPUDTEL_INFO_LOG2(t,a,b)
+#define SPUDTEL_INFO_LOG3(t,a,b,c)
+#define SPUDTEL_FNLOG(name)
+#define SPUDTELVERBOSE_INFO_LOG(t)
+#define SPUDTELVERBOSE_INFO_LOG1(t,a)
+#define SPUDTELVERBOSE_INFO_LOG2(t,a,b)
+#define SPUDTELVERBOSE_INFO_LOG3(t,a,b,c)
+#define SPUDTEL_ERROR_LOG(errtext, err)
+#define SPUDTEL_ERROR_LOG0(errtext)
+
+
+#endif //__FLOG_ACTIVE
+#endif
+// SPUDTELDEBUGLOGGER_H
+

--- a/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldrivercontext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldrivercontext.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -21,15 +21,9 @@
 */
 
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ceteldrivercontextTraces.h"
-#endif
-
 #include "ceteldrivercontext.h"
 #include "ceteldriverfactory.h"
+#include "spudteldebuglogger.h"
 
 
 using namespace EtelDriver;
@@ -98,12 +92,12 @@
   iFilterV2(),
   iFilterV2Pckg(iFilterV2)
  	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_CTOR_1, "CEtelDriverContext::CEtelDriverContext");
+	SPUDTEL_FNLOG("CEtelDriverContext::CEtelDriverContext");
 	CActiveScheduler::Add(this);
   	}
 CEtelDriverContext::~CEtelDriverContext()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DTOR_1, "CEtelDriverContext::~CEtelDriverContext()");
+	SPUDTEL_FNLOG("CEtelDriverContext::~CEtelDriverContext()");
 	Cancel(); // N.B. This cancels all outstanding operations on the context, including deletion!
 	iContextConfig.Close();
 
@@ -137,12 +131,12 @@
 */
 TInt CEtelDriverContext::Input (TEtelInput aOperation)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_INPUT_1, "CEtelDriverContext::Input()");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_INPUT_2,  "Operation %d", aOperation );
+	SPUDTEL_FNLOG("CEtelDriverContext::Input()");
+	SPUDTELVERBOSE_INFO_LOG1( _L("Operation %d"), aOperation );
 	
 	if (MEtelDriverStrategy::EFinishStep != iStrategyStep)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_INPUT_3, "ERROR: Pdp context is in use, return %d", KErrInUse);
+		SPUDTEL_ERROR_LOG(_L("ERROR: Pdp context is in use, return %d"), KErrInUse);
 		// I'm still doing something
 		ASSERT(EFalse); // shouldn't happen
 		return KErrInUse;
@@ -161,7 +155,7 @@
 
 void CEtelDriverContext::RunL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_RUNL_1, "CEtelDriverContext::RunL()");
+	SPUDTEL_FNLOG("CEtelDriverContext::RunL()");
 	ASSERT(iStrategyId < ESentinelStrategy);
 	
 	if(iStatus != KErrNone)
@@ -169,7 +163,7 @@
 		if(iCompletionStatus == KErrNone)
 			{ 
 			iCompletionStatus = iStatus; 
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_RUNL_2, "Last async request completed with error %d", iStatus.Int());
+			SPUDTEL_ERROR_LOG(_L("Last async request completed with error %d"), iStatus.Int());
 			}
 		// Don't continue with the strategy for all cases except Delete
 		// N.B.: deletion of a context has to be done till the very last step
@@ -178,13 +172,13 @@
 			{
 			iStrategyStep = MEtelDriverStrategy::EFinishStep;
 			}
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_RUNL_3, "Strategy is completed");
+		SPUDTELVERBOSE_INFO_LOG(_L("Strategy is completed"));
 		}
 	
 	if(MEtelDriverStrategy::EFinishStep == iStrategyStep)
 		{
 		// we are done
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_RUNL_4, "Strategy is completed");
+		SPUDTELVERBOSE_INFO_LOG(_L("Strategy is completed"));
 		Strategy(iStrategyId).NotifyFsm (*this, iCompletionStatus);
 		}
 	else
@@ -198,7 +192,7 @@
 /** cancels last async request */  	
 void CEtelDriverContext::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DOCANCEL_1, "CEtelDriverContext::DoCancel()");
+	SPUDTEL_FNLOG("CEtelDriverContext::DoCancel()");
 
 	if(IsActive())
 		{
@@ -206,13 +200,13 @@
 		Strategy(iStrategyId).CancelAsyncRequest(*this);
 		}
 	iStrategyStep = MEtelDriverStrategy::EFinishStep;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DOCANCEL_2, "Strategy is cancelled");
+	SPUDTELVERBOSE_INFO_LOG(_L("Strategy is cancelled"));
 	}
 
 /** accessor */
 const TName& CEtelDriverContext::ExistingContextName() const 
 	{ 
-   	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_EXISTINGCONTEXTNAME_1, "CEtelDriverContext::ExistingContextName()");
+   	SPUDTEL_FNLOG("CEtelDriverContext::ExistingContextName()");
 	for (TContextId i = 0; i < static_cast<TContextId>(iFactory.ContextCount()); i++)
 		{
         
@@ -223,7 +217,7 @@
 		}
 		
 	// Unacceptable situation: we didn't create a single context yet
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_EXISTINGCONTEXTNAME_2, "CEtelDriverContext::ExistingContextName - can't find existing context. return %S", iFactory.Context(0).Name());
+	SPUDTEL_ERROR_LOG(_L("CEtelDriverContext::ExistingContextName - can't find existing context. return %S"), &iFactory.Context(0).Name());
 	ASSERT(EFalse);
 	return iFactory.Context(0).Name(); 
 	}
@@ -277,54 +271,54 @@
 	}
 
 
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#ifdef _DEBUG
 void CEtelDriverContext::DumpReqProfileParameters ()
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_1,  "Requested Profile Parameters Dump - Context Id = %d", Id());
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_2,  "===========================================================");
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_3,  "ExtensionId = %d", iQosRequested.ExtensionId());
+    SPUDTEL_INFO_LOG1( _L("Requested Profile Parameters Dump - Context Id = %d"), Id());
+    SPUDTEL_INFO_LOG( _L("==========================================================="));
+    SPUDTEL_INFO_LOG1( _L("ExtensionId = %d"), iQosRequested.ExtensionId());
     
     if (iQosRequested.ExtensionId() != TPacketDataConfigBase::KConfigRel99Rel4
         && iQosRequested.ExtensionId() != TPacketDataConfigBase::KConfigRel5)
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_4,  "Invalid/Unsupported ExtensionId");
+        SPUDTEL_INFO_LOG( _L("Invalid/Unsupported ExtensionId"));
         return;
         }
 
     if (iQosRequested.ExtensionId() == TPacketDataConfigBase::KConfigRel99Rel4
         || iQosRequested.ExtensionId() == TPacketDataConfigBase::KConfigRel5)
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_5,  "[1]iReqTrafficClass = %d", iQosRequested.RequestedQoSR99_R4().iReqTrafficClass);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_6,  "[2]iMinTrafficClass = %d", iQosRequested.RequestedQoSR99_R4().iMinTrafficClass);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_7,  "[3]iReqDeliveryOrderReqd = %d", iQosRequested.RequestedQoSR99_R4().iReqDeliveryOrderReqd);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_8,  "[4]iMinDeliveryOrderReqd = %d", iQosRequested.RequestedQoSR99_R4().iMinDeliveryOrderReqd);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_9,  "[5]iReqDeliverErroneousSDU = %d", iQosRequested.RequestedQoSR99_R4().iReqDeliverErroneousSDU);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_10,  "[6]iMinDeliverErroneousSDU = %d", iQosRequested.RequestedQoSR99_R4().iMinDeliverErroneousSDU);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_11,  "[7]iReqMaxSDUSize = %d", iQosRequested.RequestedQoSR99_R4().iReqMaxSDUSize);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_12,  "[8]iMinAcceptableMaxSDUSize = %d", iQosRequested.RequestedQoSR99_R4().iMinAcceptableMaxSDUSize);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_13,  "[9]iReqMaxRate.iUplinkRate = %d", iQosRequested.RequestedQoSR99_R4().iReqMaxRate.iUplinkRate);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_14,  "[10]iReqMaxRate.iDownlinkRate = %d", iQosRequested.RequestedQoSR99_R4().iReqMaxRate.iDownlinkRate);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_15,  "[11]iMinAcceptableMaxRate.iUplinkRate = %d", iQosRequested.RequestedQoSR99_R4().iMinAcceptableMaxRate.iUplinkRate);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_16,  "[12]iMinAcceptableMaxRate.iDownlinkRate = %d", iQosRequested.RequestedQoSR99_R4().iMinAcceptableMaxRate.iDownlinkRate);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_17,  "[13]iReqBER = %d", iQosRequested.RequestedQoSR99_R4().iReqBER);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_18,  "[14]iMaxBER = %d", iQosRequested.RequestedQoSR99_R4().iMaxBER);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_19,  "[15]iReqSDUErrorRatio = %d", iQosRequested.RequestedQoSR99_R4().iReqSDUErrorRatio);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_20,  "[16]iMaxSDUErrorRatio = %d", iQosRequested.RequestedQoSR99_R4().iMaxSDUErrorRatio);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_21,  "[17]iReqTrafficHandlingPriority = %d", iQosRequested.RequestedQoSR99_R4().iReqTrafficHandlingPriority);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_22,  "[18]iReqTrafficHandlingPriority = %d", iQosRequested.RequestedQoSR99_R4().iMinTrafficHandlingPriority);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_23,  "[19]iReqTransferDelay = %d", iQosRequested.RequestedQoSR99_R4().iReqTransferDelay);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_24,  "[20]iMaxTransferDelay = %d", iQosRequested.RequestedQoSR99_R4().iMaxTransferDelay);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_25,  "[21]iReqGuaranteedRate.iUplinkRate = %d", iQosRequested.RequestedQoSR99_R4().iReqGuaranteedRate.iUplinkRate);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_26,  "[22]iReqGuaranteedRate.iDownlinkRate = %d", iQosRequested.RequestedQoSR99_R4().iReqGuaranteedRate.iDownlinkRate);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_27,  "[23]iMinGuaranteedRate.iUplinkRate = %d", iQosRequested.RequestedQoSR99_R4().iMinGuaranteedRate.iUplinkRate);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_28,  "[24]iMinGuaranteedRate.iDownlinkRate = %d", iQosRequested.RequestedQoSR99_R4().iMinGuaranteedRate.iDownlinkRate);
+        SPUDTEL_INFO_LOG1( _L("[1]iReqTrafficClass = %d"), iQosRequested.RequestedQoSR99_R4().iReqTrafficClass);
+        SPUDTEL_INFO_LOG1( _L("[2]iMinTrafficClass = %d"), iQosRequested.RequestedQoSR99_R4().iMinTrafficClass);
+        SPUDTEL_INFO_LOG1( _L("[3]iReqDeliveryOrderReqd = %d"), iQosRequested.RequestedQoSR99_R4().iReqDeliveryOrderReqd);
+        SPUDTEL_INFO_LOG1( _L("[4]iMinDeliveryOrderReqd = %d"), iQosRequested.RequestedQoSR99_R4().iMinDeliveryOrderReqd);
+        SPUDTEL_INFO_LOG1( _L("[5]iReqDeliverErroneousSDU = %d"), iQosRequested.RequestedQoSR99_R4().iReqDeliverErroneousSDU);
+        SPUDTEL_INFO_LOG1( _L("[6]iMinDeliverErroneousSDU = %d"), iQosRequested.RequestedQoSR99_R4().iMinDeliverErroneousSDU);
+        SPUDTEL_INFO_LOG1( _L("[7]iReqMaxSDUSize = %d"), iQosRequested.RequestedQoSR99_R4().iReqMaxSDUSize);
+        SPUDTEL_INFO_LOG1( _L("[8]iMinAcceptableMaxSDUSize = %d"), iQosRequested.RequestedQoSR99_R4().iMinAcceptableMaxSDUSize);
+        SPUDTEL_INFO_LOG1( _L("[9]iReqMaxRate.iUplinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iReqMaxRate.iUplinkRate);
+        SPUDTEL_INFO_LOG1( _L("[10]iReqMaxRate.iDownlinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iReqMaxRate.iDownlinkRate);
+        SPUDTEL_INFO_LOG1( _L("[11]iMinAcceptableMaxRate.iUplinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iMinAcceptableMaxRate.iUplinkRate);
+        SPUDTEL_INFO_LOG1( _L("[12]iMinAcceptableMaxRate.iDownlinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iMinAcceptableMaxRate.iDownlinkRate);
+        SPUDTEL_INFO_LOG1( _L("[13]iReqBER = %d"), iQosRequested.RequestedQoSR99_R4().iReqBER);
+        SPUDTEL_INFO_LOG1( _L("[14]iMaxBER = %d"), iQosRequested.RequestedQoSR99_R4().iMaxBER);
+        SPUDTEL_INFO_LOG1( _L("[15]iReqSDUErrorRatio = %d"), iQosRequested.RequestedQoSR99_R4().iReqSDUErrorRatio);
+        SPUDTEL_INFO_LOG1( _L("[16]iMaxSDUErrorRatio = %d"), iQosRequested.RequestedQoSR99_R4().iMaxSDUErrorRatio);
+        SPUDTEL_INFO_LOG1( _L("[17]iReqTrafficHandlingPriority = %d"), iQosRequested.RequestedQoSR99_R4().iReqTrafficHandlingPriority);
+        SPUDTEL_INFO_LOG1( _L("[18]iReqTrafficHandlingPriority = %d"), iQosRequested.RequestedQoSR99_R4().iMinTrafficHandlingPriority);
+        SPUDTEL_INFO_LOG1( _L("[19]iReqTransferDelay = %d"), iQosRequested.RequestedQoSR99_R4().iReqTransferDelay);
+        SPUDTEL_INFO_LOG1( _L("[20]iMaxTransferDelay = %d"), iQosRequested.RequestedQoSR99_R4().iMaxTransferDelay);
+        SPUDTEL_INFO_LOG1( _L("[21]iReqGuaranteedRate.iUplinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iReqGuaranteedRate.iUplinkRate);
+        SPUDTEL_INFO_LOG1( _L("[22]iReqGuaranteedRate.iDownlinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iReqGuaranteedRate.iDownlinkRate);
+        SPUDTEL_INFO_LOG1( _L("[23]iMinGuaranteedRate.iUplinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iMinGuaranteedRate.iUplinkRate);
+        SPUDTEL_INFO_LOG1( _L("[24]iMinGuaranteedRate.iDownlinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iMinGuaranteedRate.iDownlinkRate);
         }
     
 #ifdef SYMBIAN_NETWORKING_UMTSR5
     if (iQosRequested.ExtensionId() == TPacketDataConfigBase::KConfigRel5)
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_29,  "[25]iSignallingIndication = %d", iQosRequested.RequestedQoSR5().iSignallingIndication);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_30,  "[26]iSourceStatisticsDescriptor = %d", iQosRequested.RequestedQoSR5().iSourceStatisticsDescriptor);
+        SPUDTEL_INFO_LOG1( _L("[25]iSignallingIndication = %d"), iQosRequested.RequestedQoSR5().iSignallingIndication);
+        SPUDTEL_INFO_LOG1( _L("[26]iSourceStatisticsDescriptor = %d"), iQosRequested.RequestedQoSR5().iSourceStatisticsDescriptor);
         }
 #endif        
     }
@@ -333,40 +327,40 @@
 
 void CEtelDriverContext::DumpNegProfileParameters ()
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_1,  "Negotiated Profile Parameters Dump - Context Id = %d", Id());
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_2,  "===========================================================");
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_3,  "ExtensionId = %d", iQosNegotiated.ExtensionId());
+    SPUDTEL_INFO_LOG1( _L("Negotiated Profile Parameters Dump - Context Id = %d"), Id());
+    SPUDTEL_INFO_LOG( _L("==========================================================="));
+    SPUDTEL_INFO_LOG1( _L("ExtensionId = %d"), iQosNegotiated.ExtensionId());
     
     if (iQosNegotiated.ExtensionId() != TPacketDataConfigBase::KConfigRel99Rel4
         && iQosNegotiated.ExtensionId() != TPacketDataConfigBase::KConfigRel5)
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_4,  "Invalid/Unsupported ExtensionId");
+        SPUDTEL_INFO_LOG( _L("Invalid/Unsupported ExtensionId"));
         return;
         }
 
     if (iQosNegotiated.ExtensionId() == TPacketDataConfigBase::KConfigRel99Rel4
         || iQosNegotiated.ExtensionId() == TPacketDataConfigBase::KConfigRel5)
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_5,  "[2]iTrafficClass = %d", iQosNegotiated.NegotiatedQoSR99_R4().iTrafficClass);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_6,  "[3]iDeliveryOrderReqd = %d", iQosNegotiated.NegotiatedQoSR99_R4().iDeliveryOrderReqd);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_7,  "[4]iDeliverErroneousSDU = %d", iQosNegotiated.NegotiatedQoSR99_R4().iDeliverErroneousSDU);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_8,  "[5]iMaxSDUSize = %d", iQosNegotiated.NegotiatedQoSR99_R4().iMaxSDUSize);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_9,  "[6]iBER = %d", iQosNegotiated.NegotiatedQoSR99_R4().iBER);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_10,  "[7]iSDUErrorRatio = %d", iQosNegotiated.NegotiatedQoSR99_R4().iSDUErrorRatio);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_11,  "[8]iTrafficHandlingPriority = %d", iQosNegotiated.NegotiatedQoSR99_R4().iTrafficHandlingPriority);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_12,  "[9]iTransferDelay = %d", iQosNegotiated.NegotiatedQoSR99_R4().iTransferDelay);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_13,  "[10]iGuaranteedRate.iUplinkRate = %d", iQosNegotiated.NegotiatedQoSR99_R4().iGuaranteedRate.iUplinkRate);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_14,  "[11]iGuaranteedRate.iDownlinkRate = %d", iQosNegotiated.NegotiatedQoSR99_R4().iGuaranteedRate.iDownlinkRate);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_15,  "[12]iMaxRate.iUplinkRate = %d", iQosNegotiated.NegotiatedQoSR99_R4().iMaxRate.iUplinkRate);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_16,  "[13]iMaxRate.iDownlinkRate = %d", iQosNegotiated.NegotiatedQoSR99_R4().iMaxRate.iDownlinkRate);
+        SPUDTEL_INFO_LOG1( _L("[2]iTrafficClass = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iTrafficClass);
+        SPUDTEL_INFO_LOG1( _L("[3]iDeliveryOrderReqd = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iDeliveryOrderReqd);
+        SPUDTEL_INFO_LOG1( _L("[4]iDeliverErroneousSDU = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iDeliverErroneousSDU);
+        SPUDTEL_INFO_LOG1( _L("[5]iMaxSDUSize = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iMaxSDUSize);
+        SPUDTEL_INFO_LOG1( _L("[6]iBER = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iBER);
+        SPUDTEL_INFO_LOG1( _L("[7]iSDUErrorRatio = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iSDUErrorRatio);
+        SPUDTEL_INFO_LOG1( _L("[8]iTrafficHandlingPriority = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iTrafficHandlingPriority);
+        SPUDTEL_INFO_LOG1( _L("[9]iTransferDelay = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iTransferDelay);
+        SPUDTEL_INFO_LOG1( _L("[10]iGuaranteedRate.iUplinkRate = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iGuaranteedRate.iUplinkRate);
+        SPUDTEL_INFO_LOG1( _L("[11]iGuaranteedRate.iDownlinkRate = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iGuaranteedRate.iDownlinkRate);
+        SPUDTEL_INFO_LOG1( _L("[12]iMaxRate.iUplinkRate = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iMaxRate.iUplinkRate);
+        SPUDTEL_INFO_LOG1( _L("[13]iMaxRate.iDownlinkRate = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iMaxRate.iDownlinkRate);
         }
 
     
 #ifdef SYMBIAN_NETWORKING_UMTSR5
     if (iQosNegotiated.ExtensionId() == TPacketDataConfigBase::KConfigRel5)
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_17,  "[14]iSignallingIndication = %d", iQosNegotiated.NegotiatedQoSR5().iSignallingIndication);
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_18,  "[15]iSourceStatisticsDescriptor = %d", iQosNegotiated.NegotiatedQoSR5().iSourceStatisticsDescriptor);
+        SPUDTEL_INFO_LOG1( _L("[14]iSignallingIndication = %d"), iQosNegotiated.NegotiatedQoSR5().iSignallingIndication);
+        SPUDTEL_INFO_LOG1( _L("[15]iSourceStatisticsDescriptor = %d"), iQosNegotiated.NegotiatedQoSR5().iSourceStatisticsDescriptor);
         }
 #endif
     }

--- a/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldriverfactory.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldriverfactory.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,18 +20,12 @@
  @internalComponent
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ceteldriverfactoryTraces.h"
-#endif
-
 #include <e32base.h>
 #include <etelmm.h>
 
 #include "cspudcontextelem.h"
 #include "ceteldriverfactory.h"
+#include "spudteldebuglogger.h"
 #include "PDPFSM.h"
 using namespace EtelDriver;
 
@@ -42,7 +36,7 @@
 : iPdpFsmInterface(aPdpFsmInterface),
   iServiceChangeNotifier(iPacketService, iPdpFsmInterface)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG,TRACE_INTERNALS, CETELDRIVERFACTORY_CTOR_1, "CEtelDriverFactory::CEtelDriverFactory()");
+	SPUDTELVERBOSE_INFO_LOG(_L("CEtelDriverFactory::CEtelDriverFactory()"));
 	}
 
 /**
@@ -50,15 +44,15 @@
 */
 CEtelDriverFactory* CEtelDriverFactory::NewL (CPdpFsmInterface& aPdpFsmInterface)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_NEWL_1, "CEtelDriverFactory::NewL()");
+	SPUDTEL_INFO_LOG(_L("CEtelDriverFactory::NewL()"));
 	
 	return new (ELeave) CEtelDriverFactory (aPdpFsmInterface);
 	}
 
 CEtelDriverFactory::~CEtelDriverFactory()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_DTOR_1, "CEtelDriverFactory::~CEtelDriverFactory()");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_DTOR_2, "CEtelDriverFactory::~CEtelDriverFactory()");
+	SPUDTEL_FNLOG("CEtelDriverFactory::~CEtelDriverFactory()");
+	SPUDTEL_INFO_LOG(_L("CEtelDriverFactory::~CEtelDriverFactory()"));
 
 	// cancel all notificators
 	iServiceChangeNotifier.Cancel();
@@ -97,7 +91,7 @@
 	{
 	// dev. note: leavescan reports an error in this method.
 	// But there is no visible ground for it.
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, GETPHONEINFOL_1, "GetPhoneInfoL()");
+	SPUDTEL_FNLOG("GetPhoneInfoL()");
 	TInt count;
 	User::LeaveIfError(aTelServer.EnumeratePhones(count));
 	if (count<=0)
@@ -134,8 +128,8 @@
 /** initializes factory objects */
 void CEtelDriverFactory::InitL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_INITL_1, "CEtelDriverFactory::InitL()");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_INITL_2, "Initializing Etel driver");
+	SPUDTEL_FNLOG("CEtelDriverFactory::InitL()");
+	SPUDTEL_INFO_LOG(_L("Initializing Etel driver"));
 	
 	iStrategies[EOpenPhoneStrategy] 			= &iOpenStrategy;
 	iStrategies[ESetQoSStrategy] 				= &iSetQoSStrategy;
@@ -188,8 +182,8 @@
 */
 void CEtelDriverFactory::CreatePdpL (TContextId aPdpId,SpudMan::TPdpContextType aContextType)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_CREATEPDPL_1, "CEtelDriverFactory::CreatePdpL()");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_CREATEPDPL_2, "pdp id : %d", aPdpId);
+	SPUDTEL_FNLOG("CEtelDriverFactory::CreatePdpL()");
+	SPUDTELVERBOSE_INFO_LOG1(_L("pdp id : %d"), aPdpId);
 	__ASSERT_ALWAYS((NULL == iContexts[aPdpId]), User::Panic(KTxtSpudTel, KErrArgument));
 
 	if (aContextType == SpudMan::EMbms)
@@ -210,7 +204,7 @@
 void CEtelDriverFactory::FreePdp(TContextId aPdpId)
 	{
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_FREEPDP_1, "Free pdp id : %d", aPdpId);
+	SPUDTELVERBOSE_INFO_LOG1(_L("Free pdp id : %d"), aPdpId);
     // In an OOM situation, this object may be cleaned up prior to establishment. 
     if (iContexts[aPdpId] != NULL) 
         { 
@@ -228,7 +222,7 @@
 */
 void CEtelDriverFactory::StartPdpNotifications (TContextId aPdpId)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_STARTPDPNOTIFICATIONS_1, "StartPdpNotifications for pdp id : %d", aPdpId);
+	SPUDTELVERBOSE_INFO_LOG1(_L("StartPdpNotifications for pdp id : %d"), aPdpId);
 	// sanity check
 	ASSERT(iContexts[aPdpId]);
 	
@@ -241,7 +235,7 @@
 */
 void CEtelDriverFactory::CancelPdpNotifications (TContextId aPdpId)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_CANCELPDPNOTIFICATIONS_1, "CancelPdpNotifications for pdp id : %d", aPdpId);
+	SPUDTELVERBOSE_INFO_LOG1(_L("CancelPdpNotifications for pdp id : %d"), aPdpId);
 	// sanity check
 	ASSERT(iContexts[aPdpId]);
 	
@@ -251,7 +245,7 @@
 /** cancels notifications for all pdp contexts */
 void CEtelDriverFactory::CancelAllPdpNotifications()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_CANCELALLPDPNOTIFICATIONS_1, "CancelAllPdpNotifications");
+	SPUDTEL_INFO_LOG(_L("CancelAllPdpNotifications"));
 	for(TContextId i = 0; i < static_cast<TContextId>(ContextCount()); i++)
 		{ 
 		CancelPdpNotifications (i);

--- a/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldrivernotifier.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldrivernotifier.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,17 +20,11 @@
  @internalComponent
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ceteldrivernotifierTraces.h"
-#endif
-
 #include <e32def.h>
 
 #include "ceteldrivernotifier.h"
 #include "PDPFSM.h"
+#include "spudteldebuglogger.h"
 
 
 /**
@@ -58,7 +52,8 @@
 		{
 		if(KErrCancel != iStatus.Int())
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERNOTIFIER_RUNL_1, "CEtelDriverNotifier::RunL() reported an error: %d", iStatus.Int());
+			SPUDTEL_ERROR_LOG(_L("CEtelDriverNotifier::RunL() reported an error: %d"), 
+							iStatus.Int());
 			}
 		}
 	}

--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpconfigchangenotifier.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpconfigchangenotifier.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,18 +20,12 @@
  @internalComponent
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cpdpconfigchangenotifierTraces.h"
-#endif
-
 #include <e32base.h>
 #include <pcktcs.h>
 
 #include "cpdpconfigchangenotifier.h"
 #include "PDPFSM.h"
+#include "spudteldebuglogger.h"
 #include "pdpfsmnmspace.h"
 
 /**
@@ -125,7 +119,8 @@
 	{
 	if(IsActive())
 		{ 
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_DOCANCEL_1, "CPdpConfigChangeNotifier::DoCancel EPacketContextNotifyConfigChanged");
+		SPUDTELVERBOSE_INFO_LOG(
+			_L("CPdpConfigChangeNotifier::DoCancel EPacketContextNotifyConfigChanged"));
 		iPacketContext.CancelAsyncRequest(EPacketContextNotifyConfigChanged); 
 		}
 	}
@@ -138,14 +133,15 @@
 	{
 	if(aStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_1, "FSM set ConfigGPRS");
+		SPUDTELVERBOSE_INFO_LOG(_L("FSM set ConfigGPRS"));
 		iPdpFsmInterface.Set(iId, GetScratchContextAs<TPacketDataConfigBase>());
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_2, "FSM input EConfigGPRSChangeNetwork");
+		SPUDTELVERBOSE_INFO_LOG(_L("FSM input EConfigGPRSChangeNetwork"));
 		iPdpFsmInterface.Input(iId, PdpFsm::EConfigGPRSChangeNetwork);
 		}
 	else
 		{ 
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_3, "CPdpConfigChangeNotifier::Notify(), error: %d", aStatus.Int());
+		SPUDTEL_ERROR_LOG(_L("CPdpConfigChangeNotifier::Notify(), error: %d"), 
+						aStatus.Int());
 		// Not all TSYs support RPacketContext::NotifyConfigChanged so we handle
 		// KErrNotSupported silently (PDEF118981).
 		ASSERT((aStatus == KErrCancel) || (aStatus == KErrNotSupported));
@@ -190,7 +186,8 @@
 	{
 	if(IsActive())
 		{ 
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_DOCANCEL_1, "CMbmsPdpConfigChangeNotifier::DoCancel EPacketContextNotifyConfigChanged");
+		SPUDTELVERBOSE_INFO_LOG(
+			_L("CMbmsPdpConfigChangeNotifier::DoCancel EPacketContextNotifyConfigChanged"));
 		iMbmsPacketContext.CancelAsyncRequest(EPacketContextNotifyConfigChanged); 
 		}
 	}
@@ -203,16 +200,17 @@
 	{
 	if(aStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_1, "FSM set ConfigMbms");
+		SPUDTELVERBOSE_INFO_LOG(_L("FSM set ConfigMbms"));
 		iPdpFsmInterface.Set(iId, iConfigMbms);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_2, "FSM input EConfigMbmsChangeNetwork");
+		SPUDTELVERBOSE_INFO_LOG(_L("FSM input EConfigMbmsChangeNetwork"));
 		iPdpFsmInterface.Input(iId, PdpFsm::EConfigGPRSChangeNetwork,SpudMan::EMbms);
 		//to be discussed...
 		
 		}
 	else
 		{ 
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3, "CMbmsPdpConfigChangeNotifier::Notify(), error: %d", aStatus.Int());
+		SPUDTEL_ERROR_LOG(_L("CMbmsPdpConfigChangeNotifier::Notify(), error: %d"), 
+						aStatus.Int());
 		// Not all TSYs support RPacketContext::NotifyConfigChanged so we handle
 		// KErrNotSupported silently (PDEF118981).
 		ASSERT((aStatus == KErrCancel) || (aStatus == KErrNotSupported));

--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpstatuschangenotifier.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpstatuschangenotifier.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,17 +20,11 @@
  @internalComponent
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cpdpstatuschangenotifierTraces.h"
-#endif
-
 #include <e32base.h>
 
 #include "cpdpstatuschangenotifier.h"
 #include "PDPFSM.h"
+#include "spudteldebuglogger.h"
 #include "pdpfsmnmspace.h"
 
 #include <pcktcs.h>
@@ -71,7 +65,8 @@
 	{
 	if(IsActive())
 		{ 
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_DOCANCEL_1, "CPdpStatusChangeNotifier::DoCancel EPacketContextNotifyStatusChange");
+		SPUDTELVERBOSE_INFO_LOG(
+			_L("CPdpStatusChangeNotifier::DoCancel EPacketContextNotifyStatusChange"));
 		iPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange); 
 		}
 	}
@@ -84,13 +79,13 @@
 	{
 	if(aStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_1, "Notified of context status change");
+		SPUDTELVERBOSE_INFO_LOG(_L("Notified of context status change"));
 		RPacketContext::TContextStatus aOldContextStatus;
 		iPdpFsmInterface.Get(iId,aOldContextStatus);
 		// only notify of change if it has actually changed
 		if (iContextStatus != aOldContextStatus)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_2, "FSM input EContextStatusChangeNetwork");
+			SPUDTELVERBOSE_INFO_LOG(_L("FSM input EContextStatusChangeNetwork"));
 			iPdpFsmInterface.Set(iId, iContextStatus);
             TInt err = KErrNone;
             iPacketContext.GetLastErrorCause(err); // Ignore error return code.
@@ -99,7 +94,8 @@
 		}
 	else
 		{ 
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_3, "CPdpStatusChangeNotifier::Notify(), error: %d", aStatus.Int());
+		SPUDTEL_ERROR_LOG(_L("CPdpStatusChangeNotifier::Notify(), error: %d"), 
+						aStatus.Int());
 		ASSERT(aStatus == KErrCancel); 
 		}
 	}
@@ -143,7 +139,8 @@
 	{
 	if(IsActive())
 		{ 
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_DOCANCEL_1, "CMbmsPdpStatusChangeNotifier::DoCancel EPacketContextNotifyStatusChange");
+		SPUDTELVERBOSE_INFO_LOG(
+			_L("CMbmsPdpStatusChangeNotifier::DoCancel EPacketContextNotifyStatusChange"));
 		iMbmsPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange); 
 		}
 	}
@@ -156,13 +153,13 @@
 	{
 	if(aStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_1, "Notified of context status change");
+		SPUDTELVERBOSE_INFO_LOG(_L("Notified of context status change"));
 		RPacketContext::TContextStatus aOldContextStatus;
 		iPdpFsmInterface.Get(iId,aOldContextStatus);
 		// only notify of change if it has actually changed
 		if (iContextStatus != aOldContextStatus)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2, "FSM input EContextStatusChangeNetwork");
+			SPUDTELVERBOSE_INFO_LOG(_L("FSM input EContextStatusChangeNetwork"));
 			iPdpFsmInterface.Set(iId, iContextStatus);
             TInt err = KErrNone;
             iMbmsPacketContext.GetLastErrorCause(err); // Ignore error return code.
@@ -171,7 +168,8 @@
 		}
 	else
 		{ 
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_3, "CMbmsPdpStatusChangeNotifier::Notify(), error: %d", aStatus.Int());
+		SPUDTEL_ERROR_LOG(_L("CMbmsPdpStatusChangeNotifier::Notify(), error: %d"), 
+						aStatus.Int());
 		ASSERT(aStatus == KErrCancel); 
 		}
 	}

--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cqoschangenotifier.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cqoschangenotifier.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,14 +20,8 @@
  @internalComponent
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cqoschangenotifierTraces.h"
-#endif
-
 #include "cqoschangenotifier.h"
+#include "spudteldebuglogger.h"
 #include <pcktcs.h>
 
 
@@ -46,24 +40,24 @@
   iProfilePckg(iProfileBuffer)
   
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_CTOR_1, "CQoSChangeNotifier::CQoSChangeNotifier()");
+	SPUDTEL_FNLOG("CQoSChangeNotifier::CQoSChangeNotifier()");
 	}
 	
 CQoSChangeNotifier::~CQoSChangeNotifier()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_DTOR_1, "CQoSChangeNotifier::~CQoSChangeNotifier()");
+	SPUDTEL_FNLOG("CQoSChangeNotifier::~CQoSChangeNotifier()");
 	Cancel();
 	}
 	
 /** starts notification */
 void CQoSChangeNotifier::Start()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_START_1, "CQoSChangeNotifier::Start()");
+	SPUDTEL_FNLOG("CQoSChangeNotifier::Start()");
 	if (!IsActive())
 		{ 
 		iPacketQoS.NotifyProfileChanged(iStatus, iProfilePckg); 
 		SetActive();
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_START_2, "CQoSChangeNotifier::Start(), iPacketQoS.NotifyProfileChanged()");
+		SPUDTEL_FNLOG("CQoSChangeNotifier::Start(), iPacketQoS.NotifyProfileChanged()");
 		}
 	}
 	
@@ -72,7 +66,8 @@
 	{
 	if (IsActive())
 		{ 
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_DOCANCEL_1, "CQoSChangeNotifier::DoCancel EPacketQoSNotifyProfileChanged");
+		SPUDTELVERBOSE_INFO_LOG(
+			_L("CQoSChangeNotifier::DoCancel EPacketQoSNotifyProfileChanged"));
 		iPacketQoS.CancelAsyncRequest(EPacketQoSNotifyProfileChanged);
 		}
 	}
@@ -85,7 +80,7 @@
 	{
 	if(aStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_1, "FSM set QoSProfile");
+		SPUDTELVERBOSE_INFO_LOG(_L("FSM set QoSProfile"));
 
 #ifdef SYMBIAN_NETWORKING_UMTSR5
         iPdpFsmInterface.Set(iId, iProfileBuffer.NegotiatedQoSR5());
@@ -97,12 +92,12 @@
 #endif
 // SYMBIAN_NETWORKING_UMTSR5
 
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_2, "FSM input EQoSProfileChangeNetwork");
+		SPUDTELVERBOSE_INFO_LOG(_L("FSM input EQoSProfileChangeNetwork"));
 		iPdpFsmInterface.Input(iId, PdpFsm::EQoSProfileChangeNetwork);
 		}
 	else
 		{ 
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_3, "CQoSChangeNotifier::Notify(), error: %d", aStatus.Int());
+		SPUDTEL_ERROR_LOG(_L("CQoSChangeNotifier::Notify(), error: %d"), aStatus.Int());
 		ASSERT(aStatus == KErrCancel); 
 		}
 	}

--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cservicechangenotifier.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cservicechangenotifier.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,17 +20,11 @@
  @internalComponent
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cservicechangenotifierTraces.h"
-#endif
-
 #include <e32def.h>
 
 #include "cservicechangenotifier.h"
 #include "PDPFSM.h"
+#include "spudteldebuglogger.h"
 #include "pdpfsmnmspace.h"
 
 #include <pcktcs.h>
@@ -71,15 +65,16 @@
 	{
 	if(aStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSERVICECHANGENOTIFIER_NOTIFY_1, "FSM set ServiceStatus");
+		SPUDTELVERBOSE_INFO_LOG(_L("FSM set ServiceStatus"));
 		iPdpFsmInterface.Set(iServiceStatus);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSERVICECHANGENOTIFIER_NOTIFY_2, "FSM input EServiceStatusChangeNetwork");
+		SPUDTELVERBOSE_INFO_LOG(_L("FSM input EServiceStatusChangeNetwork"));
 		iPdpFsmInterface.Input(KAllContexts, 
 								PdpFsm::EServiceStatusChangeNetwork);
 		}
 	else
 		{ 
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSERVICECHANGENOTIFIER_NOTIFY_3, "CServiceChangeNotifier::Notify(), error: %d", aStatus.Int());
+		SPUDTEL_ERROR_LOG(_L("CServiceChangeNotifier::Notify(), error: %d"), 
+							aStatus.Int());
 		ASSERT(aStatus == KErrCancel); 
 		}
 	}
@@ -89,7 +84,8 @@
 	{
 	if(IsActive())
 		{ 
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSERVICECHANGENOTIFIER_DOCANCEL_1, "CServiceChangeNotifier::DoCancel EPacketNotifyStatusChange");
+		SPUDTELVERBOSE_INFO_LOG(
+			_L("CServiceChangeNotifier::DoCancel EPacketNotifyStatusChange"));
 		iPacketService.CancelAsyncRequest(EPacketNotifyStatusChange); 
 		}
 	}

--- a/telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -20,17 +20,11 @@
  @internalComponent
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "eteldriverstrategiesTraces.h"
-#endif
-
 #include <e32def.h>
 
 #include "ceteldrivercontext.h"
 #include "eteldriverstrategies.h"
+#include "spudteldebuglogger.h"
 #include "pdpfsmnmspace.h"
 
 #include <pcktcs.h>
@@ -46,7 +40,7 @@
 */
 void TOpenStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NEXT_1, "TOpenStrategy::Next()");
+	SPUDTEL_FNLOG("TOpenStrategy::Next()");
 	
 	TInt err = KErrNone;
 	
@@ -67,7 +61,7 @@
 			
 		default:
 			// incorrect step
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NEXT_2, "Incorrect step");
+			SPUDTEL_ERROR_LOG0(_L("Incorrect step"));
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -91,12 +85,12 @@
 	{
 	if(aCompletionStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NOTIFYFSM_1, "Notifying FSM: EPhoneOpened");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPhoneOpened"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPhoneOpened);
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NOTIFYFSM_2, "Notifying FSM: EPhoneOpenedFailed");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPhoneOpenedFailed"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPhoneOpenedFailed, aCompletionStatus.Int());
 		}
 	}
@@ -111,14 +105,14 @@
 		{
 		case EInitPhoneStep:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_CANCELASYNCREQUEST_1, "Cancel Phone::InitialiseCancel");
+			SPUDTEL_INFO_LOG(_L("Cancel Phone::InitialiseCancel"));
 			aContext.Phone().InitialiseCancel();
 			break;
 			}
 			
 		default:
 			// there're NO outstanding async requests
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_CANCELASYNCREQUEST_2, "ERROR: Incorrect case in TOpenStrategy::CancelAsyncRequest");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TOpenStrategy::CancelAsyncRequest"));
 			ASSERT(EFalse);
 			break;
 		}
@@ -135,7 +129,7 @@
 */
 void TContextDeleteStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_1, "TContextDeleteStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)");
+	SPUDTEL_FNLOG("TContextDeleteStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)");
 	
 	TInt err = KErrNone;
 	
@@ -241,7 +235,7 @@
 			
 		default:
 			// incorrect step
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_2, "ERROR: Incorrect case");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -268,12 +262,12 @@
 	
 	if(aCompletionStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NOTIFYFSM_1, "Notifying FSM: EContextDeleted");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: EContextDeleted"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EContextDeleted);
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NOTIFYFSM_2, "Notifying FSM: EContextDeletedFailed");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: EContextDeletedFailed"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EContextDeletedFailed, aCompletionStatus.Int());
 		}
 	}
@@ -284,7 +278,7 @@
 */
 void TContextDeleteStrategy::CancelAsyncRequest(CEtelDriverContext& aContext)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_1, "TContextDeleteStrategy::CancelAsyncRequest()");
+	SPUDTEL_FNLOG("TContextDeleteStrategy::CancelAsyncRequest()");
 	
 	// When there is no sub-session, the strategy will not call DeactivateContext, but will be in the EDeactivateStep state
 	// In this case we don't want to cancel the deactivate request
@@ -297,21 +291,21 @@
 		{
 		case EDeactivateStep:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketContext::EPacketContextDeactivate");
+			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextDeactivate"));
 			aContext.PacketContext().CancelAsyncRequest(EPacketContextDeactivate);
 			break;
 			}
 			
 		case EDeleteContextStep:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_3, "Cancel PacketContext::EPacketContextDelete");
+			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextDelete"));
 			aContext.PacketContext().CancelAsyncRequest(EPacketContextDelete);
 			break;
 			}
 			
 		default:
 			// there're NO outstanding async requests
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_4, "ERROR: Incorrect case");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 			ASSERT(EFalse);
 			break;
 		}
@@ -328,7 +322,7 @@
 */
 void TCreate1ryPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_1, "TCreate1ryPdpContextStrategy::Next()");
+	SPUDTEL_FNLOG("TCreate1ryPdpContextStrategy::Next()");
 	
 	TInt err = KErrNone;
 	
@@ -343,7 +337,7 @@
 			err = aContext.PacketContext().OpenNewContext (aContext.PacketService(), aContext.Name());
 			if (err)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_2, "PacketContextOpenNewContext returned %d", err);
+				SPUDTEL_ERROR_LOG(_L("PacketContextOpenNewContext returned %d"), err);
 				break;
 				}
 				
@@ -370,7 +364,7 @@
 			err = aContext.PacketQoS().OpenNewQoS (aContext.PacketContext(), newName);
 			if (err)
 				{ 
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_3, "PacketQoS OpenNewQoS returned %d", err);
+				SPUDTEL_ERROR_LOG(_L("PacketQoS OpenNewQoS returned %d"), err);
 				break; 
 				}
 				
@@ -386,7 +380,7 @@
 // SYMBIAN_NETWORKING_UMTSR5
 
 
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#ifdef _DEBUG
             aContext.DumpReqProfileParameters ();
 #endif			
 			aContext.PacketQoS().SetProfileParameters (*aStatus, aContext.QosRequestedPckg());
@@ -401,7 +395,7 @@
 			}
 			
 		default:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_4, "ERROR: Incorrect case");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -425,12 +419,12 @@
 {
 	if(aCompletionStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1, "Notifying FSM: E1ryPdpContextCreated");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: E1ryPdpContextCreated"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E1ryPdpContextCreated);
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2, "Notifying FSM: E1ryPdpContextCreatedFailed");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: E1ryPdpContextCreatedFailed"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E1ryPdpContextCreatedFailed, aCompletionStatus.Int());
 		}
 }
@@ -441,32 +435,32 @@
 */
 void TCreate1ryPdpContextStrategy::CancelAsyncRequest(CEtelDriverContext& aContext)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1, "TCreate1ryPdpContextStrategy::CancelAsyncRequest()");
+	SPUDTEL_FNLOG("TCreate1ryPdpContextStrategy::CancelAsyncRequest()");
 	
 	switch(aContext.StrategyStep())
 		{
 		case ESetConfigStep:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketContext::EPacketContextSetConfig");
+			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextSetConfig"));
 			aContext.PacketContext().CancelAsyncRequest(EPacketContextSetConfig);
 			break;
 			}
 			
 		case ESetProfileParamsStep:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_3, "Cancel PacketContext::EPacketQoSSetProfileParams");
+			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSSetProfileParams"));
 			aContext.PacketQoS().CancelAsyncRequest(EPacketQoSSetProfileParams);
 			break;
 			}
 			
 		case EInitialiseContextStep:
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_4, "Cancel PacketContext::EPacketContextInitialiseContext");
+		    SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextInitialiseContext"));
 		    aContext.PacketContext().CancelAsyncRequest(EPacketContextInitialiseContext);
 		    break;
 			
 		default:
 			// there're NO outstanding async requests
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_5, "ERROR: Incorrect case");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 			ASSERT(EFalse);
 			break;
 		}
@@ -483,7 +477,7 @@
 */
 void TCreate2ryPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_1, "TCreate2ryPdpContextStrategy::Next()");
+	SPUDTEL_FNLOG("TCreate2ryPdpContextStrategy::Next()");
 	
 	TInt err = KErrNone;
 	
@@ -508,7 +502,7 @@
 			err = aContext.PacketQoS().OpenNewQoS (aContext.PacketContext(), newName);
 			if (err)
 				{ 
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_2, "PacketQoS OpenNewQoS returned %d", err);
+				SPUDTEL_ERROR_LOG(_L("PacketQoS OpenNewQoS returned %d"), err);
 				break; 
 				}
 			aContext.SetStrategyStep (EFinishStep);
@@ -516,7 +510,7 @@
 			}
 			
 		default:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_3, "ERROR: Incorrect case");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -540,12 +534,12 @@
 {
 	if(aCompletionStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1, "Notifying FSM: E2ryPdpContextCreated");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: E2ryPdpContextCreated"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E2ryPdpContextCreated);
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2, "Notifying FSM: E2ryPdpContextCreatedFailed");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: E2ryPdpContextCreatedFailed"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E2ryPdpContextCreatedFailed, aCompletionStatus.Int());
 		}
 }
@@ -556,8 +550,8 @@
 */
 void TCreate2ryPdpContextStrategy::CancelAsyncRequest(CEtelDriverContext& /*aContext*/)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1, "TCreate2ryPdpContextStrategy::CancelAsyncRequest()");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2, "ERROR: No outstanding requests");
+	SPUDTEL_FNLOG("TCreate2ryPdpContextStrategy::CancelAsyncRequest()");
+	SPUDTEL_ERROR_LOG0(_L("ERROR: No outstanding requests"));
 	}
 
 
@@ -571,7 +565,7 @@
 */
 void TSetQoSStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_1, "TSetQoSStrategy::Next()");
+	SPUDTEL_FNLOG("TSetQoSStrategy::Next()");
 	
 	TInt err = KErrNone;
 	
@@ -592,7 +586,7 @@
 			aContext.QosRequested() = req;	
 
 
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#ifdef _DEBUG
             aContext.DumpReqProfileParameters ();
 #endif			
             aContext.PacketQoS().SetProfileParameters (*aStatus, aContext.QosRequestedPckg());
@@ -609,7 +603,7 @@
 		default:
 			{
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_2, "ERROR: Incorrect case");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -632,12 +626,12 @@
 	{
 	if(aCompletionStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NOTIFYFSM_1, "Notifying FSM: EQoSSet");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: EQoSSet"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EQoSSet);
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NOTIFYFSM_2, "Notifying FSM: EQoSSetFailed");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: EQoSSetFailed"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EQoSSetFailed, aCompletionStatus.Int());
 		}
 	}
@@ -653,13 +647,13 @@
 		case ESetProfileParamsStep:
 			{
 			aContext.PacketQoS().CancelAsyncRequest(EPacketQoSSetProfileParams);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_CANCELASYNCREQUEST_1, "Cancel PacketQoS::EPacketQoSSetProfileParams");
+			SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketQoSSetProfileParams"));
 			break;
 			}
 			
 		default:
 			// there're NO outstanding async requests
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_CANCELASYNCREQUEST_2, "ERROR: Incorrect case in TSetQoSStrategy::CancelAsyncRequest");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TSetQoSStrategy::CancelAsyncRequest"));
 			ASSERT(EFalse);
 			break;
 		}
@@ -676,7 +670,7 @@
 */
 void TSetTftStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_1, "TSetTftStrategy::Next()");
+	SPUDTEL_FNLOG("TSetTftStrategy::Next()");
 	
 	TInt err = KErrNone;
 
@@ -691,9 +685,9 @@
 				{
 				case KAddFilters:
 					aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo());
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_2, "TftOperationCode - Add Filters %d", aContext.TftInfo().FilterCount());
+					SPUDTELVERBOSE_INFO_LOG1(_L("TftOperationCode - Add Filters"), aContext.TftInfo().FilterCount());
 					// Set strategy assumes that TFT has to be created on a first place
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_3, "Creating TFT...");
+					SPUDTELVERBOSE_INFO_LOG(_L("Creating TFT..."));
 					if (aContext.ContextType() != SpudMan::EMbms)
 						{	
 						aContext.PacketContext().CreateNewTFT(*aStatus, aContext.TftInfo().FilterCount());
@@ -707,17 +701,17 @@
 
 				case KRemoveFilters:
 					err = KErrNotSupported;
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_4, "TftOperationCode - Remove is not supported in a Set strategy, return %d", err);
+					SPUDTEL_ERROR_LOG(_L("TftOperationCode - Remove is not supported in a Set strategy, return %d"), err);
 					break;
 
 				case KDeleteTFT:
 					err = KErrNotSupported;
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_5, "TftOperationCode - Delete is not supported in a Set strategy, return %d", err);
+					SPUDTEL_ERROR_LOG(_L("TftOperationCode - Delete is not supported in a Set strategy, return %d"), err);
 					break;
 
 				default:
 					// wrong case
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_6, "ERROR: Incorrect case");
+					SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 					ASSERT(EFalse);
 					err = KErrNotSupported;
 					break;
@@ -777,7 +771,7 @@
 
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_7, "ERROR: Incorrect case");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -800,12 +794,12 @@
 	{
 	if(aCompletionStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NOTIFYFSM_1, "Notifying FSM: ETftSet");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftSet"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftSet);
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NOTIFYFSM_2, "Notifying FSM: ETftSetFailed");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftSetFailed"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftSetFailed, aCompletionStatus.Int());
 		}
 	}
@@ -821,20 +815,20 @@
 		case ECreateNewTFTStep:
 			{
 			aContext.PacketQoS().CancelAsyncRequest(EPacketContextCreateNewTFT);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_CANCELASYNCREQUEST_1, "Cancel PacketQoS::EPacketContextCreateNewTFT");
+			SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextCreateNewTFT"));
 			break;
 			}
 			
 		case EAddTftStep:
 			{
 			aContext.PacketQoS().CancelAsyncRequest(EPacketContextAddPacketFilter);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketQoS::EPacketContextAddPacketFilter");
+			SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextAddPacketFilter"));
 			break;
 			}
 
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_CANCELASYNCREQUEST_3, "ERROR: Incorrect case in TSetTftStrategy::CancelAsyncRequest");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TSetTftStrategy::CancelAsyncRequest"));
 			ASSERT(EFalse);
 			break;
 		}
@@ -851,7 +845,7 @@
 */
 void TChangeTftStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_1, "TChangeTftStrategy::Next()");
+	SPUDTEL_FNLOG("TChangeTftStrategy::Next()");
 	
 	TInt err = KErrNone;
 
@@ -863,18 +857,18 @@
 			{
 			case KAddFilters:
 				aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo());
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_2, "TftOperationCode - Add Filters %d", aContext.TftInfo().FilterCount());
+				SPUDTELVERBOSE_INFO_LOG1(_L("TftOperationCode - Add Filters"), aContext.TftInfo().FilterCount());
 				aContext.SetStrategyStep (EAddFirstTftStep);
 				break;
 
 			case KRemoveFilters:
 				aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo());
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_3, "TftOperationCode - Remove %d Filters", aContext.TftInfo().FilterCount());
+				SPUDTELVERBOSE_INFO_LOG1(_L("TftOperationCode - Remove %d Filters"), aContext.TftInfo().FilterCount());
 				aContext.SetStrategyStep (ERemoveFirstTftStep);
 				break;
 
 			case KDeleteTFT:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_4, "TftOperationCode - Delete TFT");
+				SPUDTELVERBOSE_INFO_LOG(_L("TftOperationCode - Delete TFT"));
 				// delete old TFT
 				aContext.PacketContext().DeleteTFT(*aStatus);
 				aContext.SetStrategyStep (EDeleteTftStep);
@@ -883,7 +877,7 @@
 
 			default:
 				// wrong case
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_5, "ERROR: Incorrect case");
+				SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 				ASSERT(EFalse);
 				err = KErrNotSupported;
 				break;
@@ -1010,7 +1004,7 @@
 				
 			default:
 				// unexpected
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_6, "ERROR: Incorrect case");
+				SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 				ASSERT(EFalse);
 				err = KErrNotSupported;
 				break;
@@ -1035,12 +1029,12 @@
 	{
 	if(aCompletionStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NOTIFYFSM_1, "Notifying FSM: ETftChanged");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftChanged"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftChanged);
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NOTIFYFSM_2, "Notifying FSM: ETftChangedFailed");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftChangedFailed"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftChangedFailed, aCompletionStatus.Int());
 		}
 	}
@@ -1055,28 +1049,28 @@
 		{
 		case EDeleteTftStep:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_1, "Cancel PacketQoS::EPacketContextDeleteTFTCancel");
+			SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextDeleteTFTCancel"));
 			aContext.PacketQoS().CancelAsyncRequest(EPacketContextDeleteTFTCancel);
 			break;
 			}
 		
 		case ERemoveTftStep:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketQoS::EPacketContextRemovePacketFilterCancel");
+			SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextRemovePacketFilterCancel"));
 			aContext.PacketQoS().CancelAsyncRequest(EPacketContextRemovePacketFilterCancel);
 			break;
 			}
 			
 		case EAddTftStep:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_3, "Cancel PacketQoS::EPacketContextAddPacketFilter");
+			SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextAddPacketFilter"));
 			aContext.PacketQoS().CancelAsyncRequest(EPacketContextAddPacketFilterCancel);
 			break;
 			}
 
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_4, "ERROR: Incorrect case in TChangeTftStrategy::CancelAsyncRequest");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TChangeTftStrategy::CancelAsyncRequest"));
 			ASSERT(EFalse);
 			break;
 		}
@@ -1093,7 +1087,7 @@
 */
 void TActivatePdpStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_1, "TActivatePdpStrategy::Next()");
+	SPUDTEL_FNLOG("TActivatePdpStrategy::Next()");
 	
 	TInt err = KErrNone;
 	
@@ -1101,7 +1095,7 @@
 		{
 		case EStartStep:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_3, "RPacketContext::Activate()");
+			SPUDTEL_INFO_LOG(_L("RPacketContext::Activate()"));
 			aContext.PacketContext().Activate(*aStatus);
 			aContext.SetStrategyStep (EActivateStep);
 			break;
@@ -1110,8 +1104,7 @@
 		case EActivateStep:
 		case ENotifyStatusChange:
 			{
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_4, "RPacketContext::GetStatus()");
-
+            SPUDTEL_INFO_LOG(_L("RPacketContext::GetStatus()"));
             if (aContext.PacketContext().GetStatus(aContext.ContextStatus()) != KErrNone)
                 {
                 aContext.ContextStatus() = RPacketContext::EStatusInactive;
@@ -1122,7 +1115,7 @@
             	case RPacketContext::EStatusActive:
                 	// Context is now active
     	            aContext.PdpFsmInterface().Get (aContext.Id(), aContext.ContextPacketDataConfigBase());
-    	            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_5, "RPacketContext::GetConfig()");
+    	            SPUDTEL_INFO_LOG(_L("RPacketContext::GetConfig()"));
     				aContext.PacketContext().GetConfig (*aStatus, aContext.ContextConfig());
     				aContext.SetStrategyStep (EGetConfigStep);
     				break;
@@ -1163,7 +1156,7 @@
             	
             	default:
             		// Not active, not inactive. Re-request the status and try again
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_6, "RPacketContext::NotifyStatusChange()");
+            	    SPUDTEL_INFO_LOG(_L("RPacketContext::NotifyStatusChange()"));
                     aContext.PacketContext().NotifyStatusChange(*aStatus, aContext.ContextStatus());
                     aContext.SetStrategyStep (ENotifyStatusChange);
                     break;
@@ -1177,7 +1170,7 @@
 			if (KPrimaryContextId == aContext.Id())
 				{
                 aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg());	
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#ifdef _DEBUG
                 aContext.DumpNegProfileParameters ();
 #endif
                 aContext.SetStrategyStep (EGetProfileParamsStep);
@@ -1207,7 +1200,7 @@
 			
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_2, "ERROR: Incorrect case");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -1231,26 +1224,26 @@
 	{
 	if(aCompletionStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NOTIFYFSM_1, "FSM set: DataChannelV2");
+		SPUDTELVERBOSE_INFO_LOG(_L("FSM set: DataChannelV2"));
 		aContext.PdpFsmInterface().Set(aContext.Id(), aContext.DataChannelV2());
 
 #ifdef SYMBIAN_NETWORKING_UMTSR5
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NOTIFYFSM_2, "FSM set: QoSR5Negotiated");
+		SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR5Negotiated"));
 		aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR5());
 
 #else
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NOTIFYFSM_3, "FSM set: QoSR99_R4Negotiated");
+		SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR99_R4Negotiated"));
 		aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR99_R4());
 #endif 
 // SYMBIAN_NETWORKING_UMTSR5
 
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NOTIFYFSM_4, "Notifying FSM: EPdpActivated");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpActivated"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpActivated);
 
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NOTIFYFSM_5, "Notifying FSM: EPdpActivatedFailed");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpActivatedFailed"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpActivatedFailed, aCompletionStatus.Int());
 		}
 	}
@@ -1265,30 +1258,30 @@
 		{
 		case EActivateStep:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_1, "Cancel PacketContext::EPacketContextActivate");
+            SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextActivate"));
 			aContext.PacketContext().CancelAsyncRequest(EPacketContextActivate);
 			break;
 			}
 			
 		case EGetConfigStep:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketContext::EPacketContextGetConfig");
+	        SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextGetConfig"));
 			aContext.PacketContext().CancelAsyncRequest(EPacketContextGetConfig);
 			break;
 			}
-		
+					
 		case ENotifyStatusChange:
 		    {
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_3, "Cancel PacketContext::EPacketContextNotifyStatusChange");
-			aContext.PacketContext().CancelAsyncRequest(EPacketContextNotifyStatusChange);	
-			break;
-			}
-			
+            SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextNotifyStatusChange"));
+            aContext.PacketContext().CancelAsyncRequest(EPacketContextNotifyStatusChange);
+            break;
+		    }
+		    
 		case EGetProfileParamsStep:
 			{
 			if(KPrimaryContextId == aContext.Id())
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_4, "Cancel PacketContext::EPacketQoSGetProfileParams");
+                SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSGetProfileParams"));
 				aContext.PacketContext().CancelAsyncRequest(EPacketQoSGetProfileParams);	
 				break;
 				}
@@ -1296,7 +1289,7 @@
 			
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_5, "ERROR: Incorrect case in TActivatePdpStrategy::CancelAsyncRequest");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TActivatePdpStrategy::CancelAsyncRequest"));
 			ASSERT(EFalse);
 			break;
 		}
@@ -1312,7 +1305,7 @@
 */
 void TGetNegQoSStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NEXT_1, "TGetNegQoSStrategy::Next()");
+	SPUDTEL_FNLOG("TGetNegQoSStrategy::Next()");
 	
 	TInt err = KErrNone;
 	
@@ -1321,7 +1314,7 @@
 		case EStartStep:
 			{
 			aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg());
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#ifdef _DEBUG
             aContext.DumpNegProfileParameters ();
 #endif
 			aContext.SetStrategyStep (EGetProfileParamsStep);
@@ -1336,7 +1329,7 @@
 			
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NEXT_2, "ERROR: Incorrect case");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -1361,23 +1354,23 @@
 	if(aCompletionStatus == KErrNone)
 		{
 #ifdef SYMBIAN_NETWORKING_UMTSR5
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NOTIFYFSM_1, "FSM set: QoSR5Negotiated");
+		SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR5Negotiated"));
 		aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR5());
 
 #else
 // !SYMBIAN_NETWORKING_UMTSR5
 
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NOTIFYFSM_2, "FSM set: QoSR99_R4Negotiated");
+		SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR99_R4Negotiated"));
 		aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR99_R4());
 #endif
 // SYMBIAN_NETWORKING_UMTSR5
 		
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NOTIFYFSM_3, "Notifying FSM: EPdpNegQoSRetrieved");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpNegQoSRetrieved"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpNegQoSRetrieved);
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NOTIFYFSM_4, "Notifying FSM: EPdpNegQoSRetrievedFailed");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpNegQoSRetrievedFailed"));
 	 	aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpNegQoSRetrievedFailed, aCompletionStatus.Int());
 		}
 	}
@@ -1393,13 +1386,13 @@
 		case EGetProfileParamsStep:
 			{
 			aContext.PacketContext().CancelAsyncRequest(EPacketQoSGetProfileParams);	
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_1, "Cancel PacketContext::EPacketQoSGetProfileParams");
+			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSGetProfileParams"));
 			break;
 			}
 			
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_2, "ERROR: Incorrect case in TGetNegQoSStrategy::CancelAsyncRequest");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TGetNegQoSStrategy::CancelAsyncRequest"));
 			ASSERT(EFalse);
 			break;
 		}
@@ -1416,7 +1409,7 @@
 */
 void TModifyActiveStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_1, "TModifyActiveStrategy::Next()");
+	SPUDTEL_FNLOG("TModifyActiveStrategy::Next()");
 	
 	TInt err = KErrNone;
 	
@@ -1441,7 +1434,7 @@
 		case EModifyActiveStep:
 			{
 			aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg());
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#ifdef _DEBUG
             aContext.DumpNegProfileParameters ();
 #endif
 			aContext.SetStrategyStep (EGetProfileParamsStep);
@@ -1456,7 +1449,7 @@
 			
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_2, "ERROR: Incorrect case");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -1483,22 +1476,22 @@
 		if(aContext.ContextType() != SpudMan::EMbms)
 			{
 #ifdef SYMBIAN_NETWORKING_UMTSR5
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NOTIFYFSM_1, "FSM set: QoSR5Negotiated");
+			SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR5Negotiated"));
 			aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR5());
 
 #else
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NOTIFYFSM_2, "FSM set: QoSR99_R4Negotiated");
+			SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR99_R4Negotiated"));
  			aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR99_R4());
 #endif 
 // SYMBIAN_NETWORKING_UMTSR5
 			}
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NOTIFYFSM_3, "Notifying FSM: EPdpContextModified");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpContextModified"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpContextModified);
 
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NOTIFYFSM_4, "Notifying FSM: EPdpContextModifiedFailed");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpContextModifiedFailed"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpContextModifiedFailed, aCompletionStatus.Int());
 		}
 	}
@@ -1514,20 +1507,20 @@
 		case EModifyActiveStep:
 			{
 			aContext.PacketContext().CancelAsyncRequest(EPacketContextModifyActiveContext);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_1, "Cancel PacketContext::EPacketContextModifyActiveContext");
+			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextModifyActiveContext"));
 			break;
 			}
 			
 		case EGetProfileParamsStep:
 			{
 			aContext.PacketContext().CancelAsyncRequest(EPacketQoSGetProfileParams);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketContext::EPacketQoSGetProfileParams");
+			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSGetProfileParams"));
 			break;
 			}
 			
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_3, "ERROR: Incorrect case in TModifyActiveStrategy::CancelAsyncRequest");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TModifyActiveStrategy::CancelAsyncRequest"));
 			ASSERT(EFalse);
 			break;
 		}
@@ -1550,7 +1543,7 @@
 */
 void TCreateMbmsPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_1, "TCreateMbmsPdpContextStrategy::Next()");
+	SPUDTEL_FNLOG("TCreateMbmsPdpContextStrategy::Next()");
 	
 	TInt err = KErrNone;
 	
@@ -1565,7 +1558,7 @@
 			err = aContext.MbmsPacketContext().OpenNewContext (aContext.PacketService(), aContext.Name());
 			if (err)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_2, "PacketContextOpenNewContext returned for MBMS %d", err);
+				SPUDTEL_ERROR_LOG(_L("PacketContextOpenNewContext returned for MBMS %d"), err);
 				break;
 				}
 				
@@ -1589,7 +1582,7 @@
 			break;	
 	
 		default:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_3, "ERROR: Incorrect case");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -1613,12 +1606,12 @@
 {
 	if(aCompletionStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_1, "Notifying FSM: EMbmsPdpContextCreated");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: EMbmsPdpContextCreated"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EMbmsPdpContextCreated);
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_2, "Notifying FSM: E1ryPdpContextCreatedFailed");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: E1ryPdpContextCreatedFailed"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EMbmsPdpContextCreatedFailed, aCompletionStatus.Int());
 		}
 }
@@ -1629,20 +1622,20 @@
 */
 void TCreateMbmsPdpContextStrategy::CancelAsyncRequest(CEtelDriverContext& aContext)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1, "TCreate1ryPdpContextStrategy::CancelAsyncRequest()");
+	SPUDTEL_FNLOG("TCreate1ryPdpContextStrategy::CancelAsyncRequest()");
 	
 	switch(aContext.StrategyStep())
 		{
 		case ESetConfigStep:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketContext::EPacketContextSetConfig");
+			SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextSetConfig"));
 			aContext.PacketContext().CancelAsyncRequest(EPacketContextSetConfig);
 			break;
 			}
 			
 		default:
 			// there're NO outstanding async requests
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_3, "ERROR: Incorrect case");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 			ASSERT(EFalse);
 			break;
 		}
@@ -1659,7 +1652,7 @@
 */
 void TActivateMbmsPdpStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_1, "TActivatePdpStrategy::Next()");
+	SPUDTEL_FNLOG("TActivatePdpStrategy::Next()");
 	
 	TInt err = KErrNone;
 	
@@ -1702,7 +1695,7 @@
 			
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_2, "ERROR: Incorrect case");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
 			ASSERT(EFalse);
 			err = KErrNotSupported;
 			break;
@@ -1726,16 +1719,16 @@
 	{
 	if(aCompletionStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_1, "FSM set: DataChannelV2");
+		SPUDTELVERBOSE_INFO_LOG(_L("FSM set: DataChannelV2"));
 		aContext.PdpFsmInterface().Set(aContext.Id(), aContext.DataChannelV2());
 
 
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_2, "Notifying FSM: EPdpActivated");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpActivated"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpActivated);
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_3, "Notifying FSM: EPdpActivatedFailed");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpActivatedFailed"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpActivatedFailed, aCompletionStatus.Int());
 		}
 	}
@@ -1751,28 +1744,28 @@
 		case EActivateStep:
 			{
 			aContext.MbmsPacketContext().CancelAsyncRequest(EPacketContextActivate);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_1, "Cancel MbmsPacketContext::EPacketContextActivate");
+			SPUDTEL_INFO_LOG(_L("Cancel MbmsPacketContext::EPacketContextActivate"));
 			break;
 			}
 		
 		case EGetConfigStep:
 			{
 			aContext.MbmsPacketContext().CancelAsyncRequest(EPacketContextGetConfig);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_2, "Cancel MbmsPacketContext::EGetConfigStep");
+			SPUDTEL_INFO_LOG(_L("Cancel MbmsPacketContext::EPacketContextGetConfig"));
 			break;
 			}
 		
 		case EInitialiseContextStep:
 			{
 			aContext.MbmsPacketContext().CancelAsyncRequest(EPacketContextInitialiseContext);	
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_3, "Cancel MbmsPacketContext::EPacketContextInitialiseContext");
+			SPUDTEL_INFO_LOG(_L("Cancel MbmsPacketContext::EPacketContextInitialiseContext"));
 			break;
 			}
 			
 					
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_4, "ERROR: Incorrect case in TActivatePdpStrategy::CancelAsyncRequest");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TActivatePdpStrategy::CancelAsyncRequest"));
 			ASSERT(EFalse);
 			break;
 		}
@@ -1788,7 +1781,7 @@
 */	
 void TMbmsSessionUpdateStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_1, "TMbmsSessionUpdateStrategy::Next()");
+	SPUDTEL_FNLOG("TMbmsSessionUpdateStrategy::Next()");
 	
 	TInt err = KErrNone;
 	switch(aContext.StrategyStep())
@@ -1896,12 +1889,12 @@
 	{
 		if(aCompletionStatus == KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_1, "Notifying FSM: TMbmsSessionUpdateStrategy");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: TMbmsSessionUpdateStrategy"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), SpudMan::EMbmsParameterUpdate);
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_2, "Notifying FSM: TMbmsSessionUpdateStrategy");
+		SPUDTEL_INFO_LOG(_L("Notifying FSM: TMbmsSessionUpdateStrategy"));
 		aContext.PdpFsmInterface().Input(aContext.Id(), SpudMan::EMbmsParameterUpdate, aCompletionStatus.Int());
 		}
 	}
@@ -1917,20 +1910,20 @@
 		case EUpdateMbmsSessionList:
 			{
 			aContext.MbmsPacketContext().CancelAsyncRequest(EPacketContextSetConfig);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_1, "Cancel MbmsPacketContext::EUpdateMbmsSessionList");
+			SPUDTEL_INFO_LOG(_L("Cancel MbmsPacketContext::EUpdateMbmsSessionList"));
 			break;
 			}
 		
 		case EPrepareSessionList:
 			{
 			aContext.MbmsPacketContext().CancelAsyncRequest(EPacketContextSetConfig);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_2, "Cancel MbmsPacketContext::EPrepareSessionList");
+			SPUDTEL_INFO_LOG(_L("Cancel MbmsPacketContext::EPrepareSessionList"));
 			break;
 			}
 								
 		default:
 			// unexpected
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_3, "ERROR: Incorrect case in TMbmsSessionUpdateStrategy::CancelAsyncRequest");
+			SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TMbmsSessionUpdateStrategy::CancelAsyncRequest"));
 			ASSERT(EFalse);
 			break;
 		}

--- a/telephonyprotocols/pdplayer/umts/spudtel/src/reteldriverinput.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/reteldriverinput.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,19 +20,13 @@
  @internalComponent
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "reteldriverinputTraces.h"
-#endif
-
 #include <e32def.h>
 #include <e32std.h>
 
 #include "ceteldriverfactory.h"
 #include "ceteldrivercontext.h"
 #include "reteldriverinput.h"
+#include "spudteldebuglogger.h"
 
 using namespace EtelDriver;
 
@@ -44,7 +38,7 @@
 
 REtelDriverInput::~REtelDriverInput()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_DTOR_1, "REtelDriverInput::~REtelDriverInput()");
+	SPUDTEL_FNLOG("REtelDriverInput::~REtelDriverInput()");
 	
 	if (iDriverFactory)
 	   {
@@ -59,7 +53,7 @@
 */
 void REtelDriverInput::OpenL (CPdpFsmInterface& aPdpFsmInterface)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_OPENL_1, "REtelDriverInput::OpenL()");
+	SPUDTEL_FNLOG("REtelDriverInput::OpenL()");
 
 	// internal check
 	iDriverFactory = CEtelDriverFactory::NewL(aPdpFsmInterface);
@@ -74,7 +68,7 @@
 */
 void REtelDriverInput::Close()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CLOSE_1, "REtelDriverInput::Close()");
+	SPUDTEL_FNLOG("REtelDriverInput::Close()");
 	
 	// cancel all outstanding requests
 	if (iDriverFactory)
@@ -95,8 +89,8 @@
 */
 void REtelDriverInput::CreatePdpL (TContextId aPdpId,SpudMan::TPdpContextType aContextType)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CREATEPDPL_1, "REtelDriverInput::CreatePdpL()");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CREATEPDPL_2, "pdp id : %d", aPdpId);
+	SPUDTEL_FNLOG("REtelDriverInput::CreatePdpL()");
+	SPUDTELVERBOSE_INFO_LOG1(_L("pdp id : %d"), aPdpId);
 	
 	ASSERT(iDriverFactory);
 	iDriverFactory->CreatePdpL (aPdpId,aContextType );
@@ -108,8 +102,8 @@
 */
 void REtelDriverInput::DeletePdp (TContextId aPdpId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_DELETEPDP_1, "REtelDriverInput::DeletePdp()");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_DELETEPDP_2, "pdp id : %d", aPdpId);
+	SPUDTEL_FNLOG("REtelDriverInput::DeletePdp()");
+	SPUDTELVERBOSE_INFO_LOG1(_L("pdp id : %d"), aPdpId);
 	
 	if(iDriverFactory)
     	{
@@ -124,8 +118,8 @@
 */
 void REtelDriverInput::Input(TContextId aPdpId, TEtelInput aOperation)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_INPUT_1, "REtelDriverInput::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_INPUT_2, "REtelDriverInput::Input: pdp id : %d, operation %d", aPdpId, aOperation);
+	SPUDTEL_FNLOG("REtelDriverInput::Input()");
+	SPUDTEL_INFO_LOG2(_L("REtelDriverInput::Input: pdp id : %d, operation %d"), aPdpId, aOperation);
 	ASSERT(iDriverFactory);
 	
 	iDriverFactory->Context(aPdpId).Input(aOperation);
@@ -137,8 +131,8 @@
 */
 void REtelDriverInput::CancelPdp (TContextId aPdpId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELPDP_1, "REtelDriverInput::CancelPdp()");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELPDP_2, "REtelDriverInput::CancelPdp: pdp id : %d", aPdpId);
+	SPUDTEL_FNLOG("REtelDriverInput::CancelPdp()");
+	SPUDTEL_INFO_LOG1(_L("REtelDriverInput::CancelPdp: pdp id : %d"), aPdpId);
 	ASSERT(iDriverFactory);
 	
 	iDriverFactory->Context(aPdpId).Cancel();
@@ -150,7 +144,7 @@
 */
 void REtelDriverInput::StartPdpNotifications(TContextId aPdpId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_STARTPDPNOTIFICATIONS_1, "REtelDriverInput::StartPdpNotifications()");
+	SPUDTEL_FNLOG("REtelDriverInput::StartPdpNotifications()");
 	ASSERT(iDriverFactory);
 
 	iDriverFactory->StartPdpNotifications(aPdpId);
@@ -162,8 +156,8 @@
 */
 void REtelDriverInput::CancelPdpNotifications (TContextId aPdpId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELPDPNOTIFICATIONS_1, "REtelDriverInput::CancelPdpNotifications()");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELPDPNOTIFICATIONS_2, "REtelDriverInput::CancelPdpNotifications: pdp id : %d", aPdpId);
+	SPUDTEL_FNLOG("REtelDriverInput::CancelPdpNotifications()");
+	SPUDTEL_INFO_LOG1(_L("REtelDriverInput::CancelPdpNotifications: pdp id : %d"), aPdpId);
 	ASSERT(iDriverFactory);
 
 	iDriverFactory->CancelPdpNotifications (aPdpId);
@@ -172,7 +166,7 @@
 /** cancels last operations for all created pdp contexts */
 void REtelDriverInput::CancelAllPdps ()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELALLPDPS_1, "REtelDriverInput::CancelAllPdps()");
+	SPUDTEL_FNLOG("REtelDriverInput::CancelAllPdps()");
 	ASSERT(iDriverFactory);
 	
 	for(TContextId i = 0; i < static_cast<TContextId>(iDriverFactory->ContextCount()); i++)
@@ -187,7 +181,7 @@
 /** cancels all notifications for all pdp contexts */
 void REtelDriverInput::CancelAllPdpNotifications ()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELALLPDPNOTIFICATIONS_1, "REtelDriverInput::CancelAllPdpNotifications()");
+	SPUDTEL_FNLOG("REtelDriverInput::CancelAllPdpNotifications()");
 	ASSERT(iDriverFactory);
 
 	iDriverFactory->CancelAllPdpNotifications();

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/configs/te_umtsgprsscpr_captest.cfg	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,1315 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## Network
+## 
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Intranet
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Intranet2
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Intranet3
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Intranet4
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=Intranet5
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=Intranet6
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Loopback Modem
+	TSYName=SIM
+	CSYName=PKTLOOPBACK
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=6
+	LastSocketClosedTimeout=4
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOff=Q0
+	QuietOn=Q1
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageValidityPeriod=0
+	MessageDeliveryReport=FALSE
+	CommRole=0
+	Agent=NULLAGT
+	BCAStack=C32Bca
+	FIELD_COUNT=66
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Loopback_RawIP_1
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::501
+	CSYName=PKTLOOPBACK
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Loopback_SPUD_2
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Loopback_RawIP_3
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::503
+	CSYName=PKTLOOPBACK
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=Loopback_SPUD_4
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=WinTunnel_SPUD_5
+	IfName=SPUD
+	Agent=NULLAGT
+	FIELD_COUNT=4
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=Loopback_SPUD_5
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=Loopback_SPUD_6
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=Loopback_SPUD_7
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10
+	Name=Loopback_SPUD_8
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Office
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	DialOutCode=9,
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_TEMPLATE
+	DefaultTier=Link.TierTable.2048
+	FIELD_COUNT=1
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	ConnectionAttempts=2
+	RedialAttempts=3
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ModemForDataAndFax=2
+	ModemForPhoneServicesAndSMS=2
+	LocationForDataAndFax=3
+	LocationForPhoneServicesAndSMS=3
+	MaxMBufHeap=3
+	DefaultNetwork=1
+	BearerAvailabilityCheckTSY=mm
+	FIELD_COUNT=15
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Outgoing GPRS
+	APN=Test
+	PDPType=IPV4
+	ReqPrecedence=2
+	ReqDelay=4
+	ReqReliability=3
+	ReqPeakThroughput=3
+	ReqMeanThroughput=31
+	MinPrecedence=2
+	MinDelay=4
+	MinReliability=3
+	MinPeakThroughput=3
+	MinMeanThroughput=31
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	AuthRetries=1
+	IpNetMask=255.255.255.0
+	IpAddrFromServer=FALSE
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.51
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=30
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=RawIP_Bounce_1
+	PDPType=IPV4
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.1.1
+	IpDNSAddrFromServer=FALSE
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=SPUD_Echo_2
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.2
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=RawIP_Bounce_3
+	PDPType=IPV4
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.2.3
+	IpDNSAddrFromServer=FALSE
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=SPUD_Echo_4
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.2.4
+	IpDNSAddrFromServer=FALSE
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=SPUD_Multi_1
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.10
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=SPUD_Multi_2
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.11
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=SPUD_Multi_3
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.12
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=SPUD_Multi_4
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.13
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	APN=Access point name
+	PDPType=IPV6
+	PDPAddress=www.wid.com
+	Precedence=1
+	Delay=1
+	Reliability=1
+	PeakThroughput=1
+	MeanThroughput=1
+	MinPrecedence=1
+	MinDelay=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=TRUE
+	HeaderCompression=TRUE
+	GprsUseEdge=FALSE
+	AnonymousAccess=TRUE
+	FIELD_COUNT=20
+END_ADD
+
+############################################################
+## APPrioritySelectionPolicyTable
+## 
+[APPrioritySelectionPolicyTable]
+ADD_SECTION
+# COMMDB_ID = 1
+  	Id=1
+	Name=SelectionPolicy1
+	AP1=Link.AccessPointTable.10001
+	APCOUNT=1
+	FIELD_COUNT=4
+END_ADD
+
+############################################################
+## AccessPointTable
+## 
+[AccessPointTable]
+ADD_SECTION
+# COMMDB_ID = 235
+	Id=9
+	Name=spud-rawipMappedFromIAP9
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.4
+	CprConfig=9
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 237
+	Id=8
+	Name=spud-rawipMappedFromIAP8
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.4
+	CprConfig=8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 239
+	Id=7
+	Name=spud-rawipMappedFromIAP7
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.4
+	CprConfig=7
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 241
+	Id=6
+	Name=spud-rawipMappedFromIAP6
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.4
+	CprConfig=6
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 243
+	Id=5
+	Name=rawipMappedFromIAP5
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=5
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 245
+	Id=4
+	Name=spud-rawipMappedFromIAP4
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.4
+	CprConfig=4
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 247
+	Id=3
+	Name=rawipMappedFromIAP3
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 249
+	Id=2
+	Name=spud-rawipMappedFromIAP2
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.4
+	CprConfig=2
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 251
+	Id=1
+	Name=rawipMappedFromIAP1
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=1
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 253
+	Id=10001
+	Name=IPProtoDefault
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	CustomSelectionPolicy=2
+	Cpr=CprTable.2
+	CprConfig=2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 254
+	Id=10000
+	Name=NetworkDefault
+	Tier=Link.TierTable.2048
+	MCpr=MCprTable.1
+	AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.1
+	Cpr=CprTable.1
+	SCpr=SCprTable.7
+	Protocol=ProtocolTable.1
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## BearerTypeTable
+## 
+[BearerTypeTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ethint
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.4
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.4
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=tunnelnif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.6
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.6
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=qosppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.7
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.7
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=dummynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.8
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.8
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=hungrynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.9
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.9
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=spud-ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.4
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=spud-rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.4
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+##This record here is the template record for the IPProto level APs generated by CommsDat.
+ADD_SECTION
+# COMMDB_ID = 10
+	##This name is a predefined name for the template for the IPProto APs.
+	##Please don't change it!
+	Name=IPProtoDefaultTemplate
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=6
+END_ADD
+
+############################################################
+## IAP
+## 
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Loopback_GRPS_1
+	IAPServiceType=OutgoingGPRS
+	IAPService=2
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Loopback_GRPS_2
+	IAPServiceType=OutgoingGPRS
+	IAPService=3
+	IAPBearerType=ModemBearer
+	IAPBearer=3
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Loopback_GRPS_3
+	IAPServiceType=OutgoingGPRS
+	IAPService=4
+	IAPBearerType=ModemBearer
+	IAPBearer=4
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Loopback_GRPS_4
+	IAPServiceType=OutgoingGPRS
+	IAPService=5
+	IAPBearerType=ModemBearer
+	IAPBearer=5
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=Loopback_GRPS_5
+	IAPServiceType=OutgoingGPRS
+	IAPService=2
+	IAPBearerType=ModemBearer
+	IAPBearer=4
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=Loopback_GRPS_6
+	IAPServiceType=OutgoingGPRS
+	IAPService=6
+	IAPBearerType=ModemBearer
+	IAPBearer=7
+	IAPNetwork=3
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=Loopback_GRPS_7
+	IAPServiceType=OutgoingGPRS
+	IAPService=7
+	IAPBearerType=ModemBearer
+	IAPBearer=8
+	IAPNetwork=4
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=Loopback_GRPS_8
+	IAPServiceType=OutgoingGPRS
+	IAPService=8
+	IAPBearerType=ModemBearer
+	IAPBearer=9
+	IAPNetwork=5
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=Loopback_GRPS_9
+	IAPServiceType=OutgoingGPRS
+	IAPService=9
+	IAPBearerType=ModemBearer
+	IAPBearer=10
+	IAPNetwork=6
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	Ranking=1
+	Direction=OUTGOING
+	BearerSet=PSD
+	DialogPref=DONOTPROMPT
+	IAP=2
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## TierTable
+## 
+[TierTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=2048
+	TierImplUid=271064536
+	Name=Tier1
+	TierThreadName=ESock_IP
+	TierManagerName=NetworkTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10000
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=271064560
+	TierImplUid=271064560
+	Name=Tier2
+	TierThreadName=ESock_IP
+	TierManagerName=ProtoTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10001
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=271064565
+	TierImplUid=271064565
+	Name=Tier3
+	TierThreadName=ESock_IP
+	TierManagerName=LinkTierManager
+##NB defaultAccessPoint not present in this layer. This is only needed here to satisfy the check
+##on the link layer. However important that once this field has a value it has to be linked to a
+##correct accesspoint record in the accesspoint table because this will be checked either.
+	DefaultAccessPoint=Link.AccessPointTable.1
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## MCprTable
+## 
+[MCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=netmcpr
+	MCprUid=271009095
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotomcpr
+	MCprUid=271064558
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=pppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethmcpr
+	MCprUid=271064572
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawipmcpr
+	MCprUid=271064576
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnelmcpr
+	MCprUid=271064578
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qospppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10
+	Name=pdpmcpr
+	MCprUid=271065840
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## CprTable
+## 
+[CprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ipcpr
+	CprUid=270561519
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotocpr
+	CprUid=271064531
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentcpr
+	CprUid=271064552
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=vanillacpr
+	CprUid=271065843
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## SCprTable
+## 
+[SCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=qosipscpr
+	SCprUid=0xFFFFFFFF
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotoscpr
+	SCprUid=271064529
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentscpr
+	SCprUid=271064554
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=pdpscpr
+	SCprUid=271065824
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=pppscpr
+	SCprUid=271065852
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=vanillascpr
+	SCprUid=271065844
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=ipscpr
+	SCprUid=271065811
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=ipqosprotoscpr
+	SCprUid=271065816
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## ProtocolTable
+## 
+[ProtocolTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=sapshim
+	ProtocolUid=270496898
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipshim4
+	ProtocolUid=271064118
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=ppp
+	ProtocolUid=271064143
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethernet
+	ProtocolUid=271064539
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawip
+	ProtocolUid=271064562
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnel
+	ProtocolUid=271064567
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qosppp
+	ProtocolUid=271064148
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynif
+	ProtocolUid=271064123
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynif
+	ProtocolUid=271064125
+	FIELD_COUNT=3
+END_ADD
+
+[UmtsR99QoSAndOn]
+ADD_SECTION
+# COMMDB_ID = 1
+  	Name=PRIMARY1
+        ReqTrafficClass=1
+        MinTrafficClass=1
+        ReqDeliveryOrder=1
+        MinDeliveryOrder=1
+        ReqDeliverErroneousSDU=1
+        MinDeliverErroneousSDU=1
+        ReqMaxSDUSize=0
+        MinAcceptableMaxSDUSize=0
+        ReqMaxUplinkRate=0
+        ReqMinUplinkRate=0
+        ReqMaxDownlinkRate=0
+        ReqMinDownlinkRate=0
+        ReqBER=1
+        MaxBER=1
+        ReqSDUErrorRatio=1
+        MaxSDUErrorRatio=1
+        ReqTrafficHandlingPriority=1
+        MinTrafficHandlingPriority=1
+        ReqTransferDelay=0
+        MaxTransferDelay=0
+        ReqGuaranteedUplinkRate=0
+        MinGuaranteedUplinkRat=0
+        ReqGuaranteedDownlinkRate=0
+        MinGuaranteedDownlinkRate=0
+        SignallingIndication=FALSE
+        IMCNSignallingIndication=FALSE
+        SourceStatisticsDescriptor=0
+	FIELD_COUNT=28
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+  	Name=SECONDARY1
+        ReqTrafficClass=4
+        MinTrafficClass=4
+        ReqDeliveryOrder=1
+        MinDeliveryOrder=1
+        ReqDeliverErroneousSDU=8
+        MinDeliverErroneousSDU=8
+        ReqMaxSDUSize=768
+        MinAcceptableMaxSDUSize=512
+        ReqMaxUplinkRate=1024
+        ReqMinUplinkRate=1024
+        ReqMaxDownlinkRate=1024
+        ReqMinDownlinkRate=1024
+        ReqBER=0
+        MaxBER=0
+        ReqSDUErrorRatio=1
+        MaxSDUErrorRatio=1
+        ReqTrafficHandlingPriority=1
+        MinTrafficHandlingPriority=1
+        ReqTransferDelay=250
+        MaxTransferDelay=250
+        ReqGuaranteedUplinkRate=1024
+        MinGuaranteedUplinkRat=1024
+        ReqGuaranteedDownlinkRate=1024
+        MinGuaranteedDownlinkRate=1024
+        SignallingIndication=FALSE
+        IMCNSignallingIndication=FALSE
+        SourceStatisticsDescriptor=0
+	FIELD_COUNT=28
+END_ADD
+
+[PolicySelectorTable]
+ADD_SECTION
+# COMMDB_ID = 1
+  PolicyId=1
+  AppUid=0
+  SrcAddress=0.0.0.0
+  SrcMask=255.255.255.255
+  DstAddress=192.168.1.1
+  DstMask=255.255.255.255
+  SrcPort=0
+  SrcPortMax=1031
+  DstPort=3461
+  DstPortMax=3461
+  ProtocolId=17
+  IapId=2
+  Priority=1
+  FIELD_COUNT=13
+END_ADD  
+
+ADD_SECTION
+# COMMDB_ID = 2
+  PolicyId=2
+  AppUid=0
+  SrcPort=0
+  SrcPortMax=0
+  ProtocolId=1
+  IapId=2
+  Priority=1
+  FIELD_COUNT=7
+END_ADD

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/configs/te_umtsgprsscpr_captest2.cfg	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,1316 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## Network
+## 
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Intranet
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Intranet2
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Intranet3
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Intranet4
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=Intranet5
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=Intranet6
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Loopback Modem
+	TSYName=SIM
+	CSYName=PKTLOOPBACK
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=6
+	LastSocketClosedTimeout=4
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOff=Q0
+	QuietOn=Q1
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageValidityPeriod=0
+	MessageDeliveryReport=FALSE
+	CommRole=0
+	Agent=NULLAGT
+	BCAStack=C32Bca
+	FIELD_COUNT=66
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Loopback_RawIP_1
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::501
+	CSYName=PKTLOOPBACK
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Loopback_SPUD_2
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Loopback_RawIP_3
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::503
+	CSYName=PKTLOOPBACK
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=Loopback_SPUD_4
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=WinTunnel_SPUD_5
+	IfName=SPUD
+	Agent=NULLAGT
+	FIELD_COUNT=4
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=Loopback_SPUD_5
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=Loopback_SPUD_6
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=Loopback_SPUD_7
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10
+	Name=Loopback_SPUD_8
+	IfName=SPUD
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Office
+	IntlPrefixCode=00
+	NatPrefixCode=0
+	NatCode=44
+	AreaCode=171
+	DialOutCode=9,
+	Mobile=FALSE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Mobile
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_TEMPLATE
+	DefaultTier=Link.TierTable.2048
+	FIELD_COUNT=1
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	ConnectionAttempts=2
+	RedialAttempts=3
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ModemForDataAndFax=2
+	ModemForPhoneServicesAndSMS=2
+	LocationForDataAndFax=3
+	LocationForPhoneServicesAndSMS=3
+	MaxMBufHeap=3
+	DefaultNetwork=1
+	BearerAvailabilityCheckTSY=mm
+	FIELD_COUNT=15
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_TEMPLATE
+	Id=0
+	Name=Default Outgoing GPRS
+	APN=Test
+	PDPType=IPV4
+	ReqPrecedence=2
+	ReqDelay=4
+	ReqReliability=3
+	ReqPeakThroughput=3
+	ReqMeanThroughput=31
+	MinPrecedence=2
+	MinDelay=4
+	MinReliability=3
+	MinPeakThroughput=3
+	MinMeanThroughput=31
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	AuthRetries=1
+	IpNetMask=255.255.255.0
+	IpAddrFromServer=FALSE
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.51
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=30
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=RawIP_Bounce_1
+	PDPType=IPV4
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.1.1
+	IpDNSAddrFromServer=FALSE
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=SPUD_Echo_2
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.2
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=RawIP_Bounce_3
+	PDPType=IPV4
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.2.3
+	IpDNSAddrFromServer=FALSE
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=SPUD_Echo_4
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=FALSE
+	IpAddr=192.168.2.4
+	IpDNSAddrFromServer=FALSE
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=SPUD_Multi_1
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.10
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=SPUD_Multi_2
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.11
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=SPUD_Multi_3
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.12
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=SPUD_Multi_4
+	PDPType=IPV4
+	IfParams=lowernif=RAWIP
+	IfPromptForAuth=FALSE
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.13
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	APN=Access point name
+	PDPType=IPV6
+	PDPAddress=www.wid.com
+	Precedence=1
+	Delay=1
+	Reliability=1
+	PeakThroughput=1
+	MeanThroughput=1
+	MinPrecedence=1
+	MinDelay=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=TRUE
+	HeaderCompression=TRUE
+	GprsUseEdge=FALSE
+	AnonymousAccess=TRUE
+	FIELD_COUNT=20
+END_ADD
+
+
+############################################################
+## APPrioritySelectionPolicyTable
+## 
+[APPrioritySelectionPolicyTable]
+ADD_SECTION
+# COMMDB_ID = 1
+  	Id=1
+	Name=SelectionPolicy1
+	AP1=Link.AccessPointTable.10001
+	APCOUNT=1
+	FIELD_COUNT=4
+END_ADD
+
+############################################################
+## AccessPointTable
+## 
+[AccessPointTable]
+ADD_SECTION
+# COMMDB_ID = 235
+	Id=9
+	Name=spud-rawipMappedFromIAP9
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.4
+	CprConfig=9
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 237
+	Id=8
+	Name=spud-rawipMappedFromIAP8
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.4
+	CprConfig=8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 239
+	Id=7
+	Name=spud-rawipMappedFromIAP7
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.4
+	CprConfig=7
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 241
+	Id=6
+	Name=spud-rawipMappedFromIAP6
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.4
+	CprConfig=6
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 243
+	Id=5
+	Name=rawipMappedFromIAP5
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=5
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 245
+	Id=4
+	Name=spud-rawipMappedFromIAP4
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.4
+	CprConfig=4
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 247
+	Id=3
+	Name=rawipMappedFromIAP3
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 249
+	Id=2
+	Name=spud-rawipMappedFromIAP2
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.4
+	CprConfig=2
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 251
+	Id=1
+	Name=rawipMappedFromIAP1
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	AccessPointSelectionPolicy=0
+	Cpr=CprTable.3
+	CprConfig=1
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	AppSID=0
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 253
+	Id=10001
+	Name=IPProtoDefault
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	CustomSelectionPolicy=1
+	CprConfig=1
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 254
+	Id=10000
+	Name=NetworkDefault
+	Tier=Link.TierTable.2048
+	MCpr=MCprTable.1
+	AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.1
+	Cpr=CprTable.1
+	SCpr=SCprTable.7
+	Protocol=ProtocolTable.1
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## BearerTypeTable
+## 
+[BearerTypeTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ethint
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.4
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.4
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=tunnelnif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.6
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.6
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=qosppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.7
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.7
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=dummynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.8
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.8
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=hungrynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.9
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.9
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=spud-ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.4
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=spud-rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.4
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=7
+END_ADD
+
+##This record here is the template record for the IPProto level APs generated by CommsDat.
+ADD_SECTION
+# COMMDB_ID = 10
+	##This name is a predefined name for the template for the IPProto APs.
+	##Please don't change it!
+	Name=IPProtoDefaultTemplate
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=6
+END_ADD
+
+############################################################
+## IAP
+## 
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=Loopback_GRPS_1
+	IAPServiceType=OutgoingGPRS
+	IAPService=2
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=Loopback_GRPS_2
+	IAPServiceType=OutgoingGPRS
+	IAPService=3
+	IAPBearerType=ModemBearer
+	IAPBearer=3
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=Loopback_GRPS_3
+	IAPServiceType=OutgoingGPRS
+	IAPService=4
+	IAPBearerType=ModemBearer
+	IAPBearer=4
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=Loopback_GRPS_4
+	IAPServiceType=OutgoingGPRS
+	IAPService=5
+	IAPBearerType=ModemBearer
+	IAPBearer=5
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=Loopback_GRPS_5
+	IAPServiceType=OutgoingGPRS
+	IAPService=2
+	IAPBearerType=ModemBearer
+	IAPBearer=4
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=Loopback_GRPS_6
+	IAPServiceType=OutgoingGPRS
+	IAPService=6
+	IAPBearerType=ModemBearer
+	IAPBearer=7
+	IAPNetwork=3
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=Loopback_GRPS_7
+	IAPServiceType=OutgoingGPRS
+	IAPService=7
+	IAPBearerType=ModemBearer
+	IAPBearer=8
+	IAPNetwork=4
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=Loopback_GRPS_8
+	IAPServiceType=OutgoingGPRS
+	IAPService=8
+	IAPBearerType=ModemBearer
+	IAPBearer=9
+	IAPNetwork=5
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=Loopback_GRPS_9
+	IAPServiceType=OutgoingGPRS
+	IAPService=9
+	IAPBearerType=ModemBearer
+	IAPBearer=10
+	IAPNetwork=6
+	IAPNetworkWeighting=0
+	Location=3
+	FIELD_COUNT=9
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=DefaultRecordName-1
+	Ranking=1
+	Direction=OUTGOING
+	BearerSet=PSD
+	DialogPref=DONOTPROMPT
+	IAP=2
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## TierTable
+## 
+[TierTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=2048
+	TierImplUid=271064536
+	Name=Tier1
+	TierThreadName=ESock_IP
+	TierManagerName=NetworkTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10000
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=271064560
+	TierImplUid=271064560
+	Name=Tier2
+	TierThreadName=ESock_IP
+	TierManagerName=ProtoTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10001
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=271064565
+	TierImplUid=271064565
+	Name=Tier3
+	TierThreadName=ESock_IP
+	TierManagerName=LinkTierManager
+##NB defaultAccessPoint not present in this layer. This is only needed here to satisfy the check
+##on the link layer. However important that once this field has a value it has to be linked to a
+##correct accesspoint record in the accesspoint table because this will be checked either.
+	DefaultAccessPoint=Link.AccessPointTable.1
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## MCprTable
+## 
+[MCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=netmcpr
+	MCprUid=271009095
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotomcpr
+	MCprUid=271064558
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=pppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethmcpr
+	MCprUid=271064572
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawipmcpr
+	MCprUid=271064576
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnelmcpr
+	MCprUid=271064578
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qospppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10
+	Name=pdpmcpr
+	MCprUid=271065840
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## CprTable
+## 
+[CprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=ipcpr
+	CprUid=270561519
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotocpr
+	CprUid=271064531
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentcpr
+	CprUid=271064552
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=vanillacpr
+	CprUid=271065843
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## SCprTable
+## 
+[SCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=qosipscpr
+	SCprUid=0xFFFFFFFF
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipprotoscpr
+	SCprUid=271064529
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=agentscpr
+	SCprUid=271064554
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=pdpscpr
+	SCprUid=271065824
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=pppscpr
+	SCprUid=271065852
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=vanillascpr
+	SCprUid=271065844
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=ipscpr
+	SCprUid=271065811
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=ipqosprotoscpr
+	SCprUid=271065816
+	FIELD_COUNT=3
+END_ADD
+
+
+############################################################
+## ProtocolTable
+## 
+[ProtocolTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=sapshim
+	ProtocolUid=270496898
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=2
+	Name=ipshim4
+	ProtocolUid=271064118
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=3
+	Name=ppp
+	ProtocolUid=271064143
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=4
+	Name=ethernet
+	ProtocolUid=271064539
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=5
+	Name=rawip
+	ProtocolUid=271064562
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=6
+	Name=tunnel
+	ProtocolUid=271064567
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=7
+	Name=qosppp
+	ProtocolUid=271064148
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=8
+	Name=dummynif
+	ProtocolUid=271064123
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=9
+	Name=hungrynif
+	ProtocolUid=271064125
+	FIELD_COUNT=3
+END_ADD
+
+[UmtsR99QoSAndOn]
+ADD_SECTION
+# COMMDB_ID = 1
+  	Name=PRIMARY1
+        ReqTrafficClass=4
+        MinTrafficClass=4
+        ReqDeliveryOrder=4
+        MinDeliveryOrder=4
+        ReqDeliverErroneousSDU=8
+        MinDeliverErroneousSDU=8
+        ReqMaxSDUSize=0
+        MinAcceptableMaxSDUSize=0
+        ReqMaxUplinkRate=128
+        ReqMinUplinkRate=128
+        ReqMaxDownlinkRate=128
+        ReqMinDownlinkRate=128
+        ReqBER=32
+        MaxBER=32
+        ReqSDUErrorRatio=16
+        MaxSDUErrorRatio=16
+        ReqTrafficHandlingPriority=4
+        MinTrafficHandlingPriority=4
+        ReqTransferDelay=128
+        MaxTransferDelay=128
+        ReqGuaranteedUplinkRate=128
+        MinGuaranteedUplinkRat=128
+        ReqGuaranteedDownlinkRate=128
+        MinGuaranteedDownlinkRate=128
+        SignallingIndication=FALSE
+        IMCNSignallingIndication=FALSE
+        SourceStatisticsDescriptor=0
+	FIELD_COUNT=28
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+  	Name=SECONDARY1
+        ReqTrafficClass=4
+        MinTrafficClass=4
+        ReqDeliveryOrder=1
+        MinDeliveryOrder=1
+        ReqDeliverErroneousSDU=8
+        MinDeliverErroneousSDU=8
+        ReqMaxSDUSize=768
+        MinAcceptableMaxSDUSize=512
+        ReqMaxUplinkRate=1024
+        ReqMinUplinkRate=1024
+        ReqMaxDownlinkRate=1024
+        ReqMinDownlinkRate=1024
+        ReqBER=0
+        MaxBER=0
+        ReqSDUErrorRatio=1
+        MaxSDUErrorRatio=1
+        ReqTrafficHandlingPriority=1
+        MinTrafficHandlingPriority=1
+        ReqTransferDelay=250
+        MaxTransferDelay=250
+        ReqGuaranteedUplinkRate=1024
+        MinGuaranteedUplinkRat=1024
+        ReqGuaranteedDownlinkRate=1024
+        MinGuaranteedDownlinkRate=1024
+        SignallingIndication=FALSE
+        IMCNSignallingIndication=FALSE
+        SourceStatisticsDescriptor=0
+	FIELD_COUNT=28
+END_ADD
+
+[PolicySelectorTable]
+ADD_SECTION
+# COMMDB_ID = 1
+  PolicyId=1
+  AppUid=0
+  SrcAddress=0.0.0.0
+  SrcMask=255.255.255.255
+  DstAddress=192.168.1.1
+  DstMask=255.255.255.255
+  SrcPort=0
+  SrcPortMax=1031
+  DstPort=3461
+  DstPortMax=3461
+  ProtocolId=17
+  IapId=2
+  Priority=1
+  FIELD_COUNT=13
+END_ADD  
+
+ADD_SECTION
+# COMMDB_ID = 2
+  PolicyId=2
+  AppUid=0
+  SrcPort=0
+  SrcPortMax=0
+  ProtocolId=1
+  IapId=2
+  Priority=1
+  FIELD_COUNT=7
+END_ADD

--- a/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/group/Te_UmtsGprsSCPR.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\Te_UmtsGprsSCPR\scripts\te_Cap_UmtsGprsScpr.script"-"c:\testdata\scripts\te_Cap_UmtsGprsScpr.script"
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\Te_UmtsGprsSCPR\scripts\te_UmtsGprsScprConfig1.script"-"c:\testdata\scripts\te_UmtsGprsScprConfig1.script"
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\Te_UmtsGprsSCPR\scripts\te_UmtsGprsScprConfig2.script"-"c:\testdata\scripts\te_UmtsGprsScprConfig2.script"
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\Te_UmtsGprsSCPR\scripts\te_UmtsGprsScprConfig3.script"-"c:\testdata\scripts\te_UmtsGprsScprConfig3.script"
-
-//running some of the networkingsrv test scripts. becuase there regression can be caused by us.
-
-"\sf\os\networkingsrv\networkcontrol\qosfwconfig\qostest\te_qos\scripts\TE_QoSSuite.script"-"c:\testdata\scripts\TE_QoSSuite.script"
-"\sf\os\networkingsrv\networkcontrol\qosfwconfig\qostest\te_qos\scripts\CIT_P192_Qos_SimTsy2.script"-"c:\testdata\scripts\CIT_P192_Qos_SimTsy2.script"
-"\sf\os\networkingsrv\networkingtestandutils\networkingintegrationtest\te_DedicatedSignalling1ryCtx\scripts\Te_DedicatedSignalling1ryCtx.script"-"c:\testdata\scripts\Te_DedicatedSignalling1ryCtx.script"
-

--- a/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -17,11 +17,16 @@
 
 prj_testexports
 
-../configs/te_UmtsGprsScpr_CapTest.xml          z:/testdata/configs/te_umtsgprsscpr_captest.xml
-../configs/te_umtsgprsscpr_captest_pdpcpr.cfg   z:/testdata/configs/te_umtsgprsscpr_captest.cfg
-../configs/te_umtsgprsscpr_captest2_pdpcpr.cfg  z:/testdata/configs/te_umtsgprsscpr_captest2.cfg
-../configs/te_UmtsGprsScpr_NoDefaults.xml       z:/testdata/configs/te_umtsgprsscpr_nodefaults.xml
-../configs/TE_UmtsGprsScprLoopbackCSY.ini       z:/testdata/configs/te_umtsgprsscprloopbackcsy.ini
+../configs/te_UmtsGprsScpr_CapTest.xml			z:/testdata/configs/te_umtsgprsscpr_captest.xml
+#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
+../configs/te_umtsgprsscpr_captest_pdpcpr.cfg		z:/testdata/configs/te_umtsgprsscpr_captest.cfg
+../configs/te_umtsgprsscpr_captest2_pdpcpr.cfg		z:/testdata/configs/te_umtsgprsscpr_captest2.cfg
+#else
+../configs/te_umtsgprsscpr_captest.cfg			z:/testdata/configs/te_umtsgprsscpr_captest.cfg
+../configs/te_umtsgprsscpr_captest2.cfg			z:/testdata/configs/te_umtsgprsscpr_captest2.cfg
+#endif
+../configs/te_UmtsGprsScpr_NoDefaults.xml		z:/testdata/configs/te_umtsgprsscpr_nodefaults.xml
+../configs/TE_UmtsGprsScprLoopbackCSY.ini		z:/testdata/configs/te_umtsgprsscprloopbackcsy.ini
 
 
 // configuration 1 commdb settings //

--- a/telephonyprotocols/pdplayer/umts/test/te_mbms/group/te_mbms.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_mbms\scripts\MBMSBroadcast.script"-"c:\testdata\scripts\MBMSBroadcast.script"

--- a/telephonyprotocols/pdplayer/umts/test/te_spud/group/TE_Spud.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-
-// Copyright (c) 2007-2010 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:
-//
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spud\scripts\TE_SpudUnitTest.script"-"c:\testdata\scripts\TE_SpudUnitTest.script"

--- a/telephonyprotocols/pdplayer/umts/test/te_spud/group/TE_SpudUnit.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/group/TE_SpudUnit.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -91,8 +91,6 @@
 USERINCLUDE   	../../../spudtel/inc
 USERINCLUDE   	../../../spudfsm/inc
 USERINCLUDE   	../../../spudfsm/src
-USERINCLUDE   	../traces
-
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN

--- a/telephonyprotocols/pdplayer/umts/test/te_spud/src/CPdpFsmInterface.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/src/CPdpFsmInterface.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -19,14 +19,12 @@
  @file
 */
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cpdpfsminterfaceTraces.h"
-#endif
+
 
 
 #include "CPdpFsmInterface.h"
 #include "cpdpfsmfactory.h"
+#include "spudfsmdebuglogger.h"
 
 //-=========================================================
 // Custom methods
@@ -37,17 +35,15 @@
  iUmtsRelease(TPacketDataConfigBase::KConfigGPRS)
 
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CTOR_1, ">>CPdpFsmInterface::()");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CTOR_2, "<<CPdpFsmInterface::()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
     }
 
 CPdpFsmInterface::~CPdpFsmInterface()
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_DTOR_1, ">>CPdpFsmInterface::()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
 	
 	CPdpFsmInterface::Close();
 	delete iPdpFsmFactory;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_DTOR_2, "<<CPdpFsmInterface::()");
     }
 
 //-=========================================================
@@ -59,34 +55,32 @@
 */
 void CPdpFsmInterface::OpenL(TName& aTsyName, TInt aUmtsRelease)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_OPEN_1, ">>CPdpFsmInterface::OpenL()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::OpenL()");
     
 	iUmtsRelease = aUmtsRelease;
 	iPdpFsmFactory = CPdpFsmFactory::NewL();
 	iPdpFsmFactory->InitL(aTsyName, this);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_OPEN_2, "<<CPdpFsmInterface::OpenL()");
     }
 
 /** closes the FSM and frees underlying resources
 */
 void CPdpFsmInterface::Close()
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CLOSE_1, ">>CPdpFsmInterface::Close()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Close()");
 	
 	if (iPdpFsmFactory)
 	    {
 		iPdpFsmFactory->Close();
 	    }
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CLOSE_2, "<<CPdpFsmInterface::Close()");
     }
 
 
 TContextId CPdpFsmInterface::NewFsmContextL(MPdpFsmEventHandler& aPdpFsmEventHandler,SpudMan::TPdpContextType aContextType)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_NEWFSMCONTESTL_1, ">>CPdpFsmInterface::NewFsmContext()");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::NewFsmContext()");
 
 	ASSERT(iPdpFsmFactory);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_NEWFSMCONTESTL_2, "<<CPdpFsmInterface::NewFsmContext()");
+	
 	return iPdpFsmFactory->NewFsmContextL(aPdpFsmEventHandler,aContextType);
     }
 
@@ -104,7 +98,7 @@
     {
 	TInt ret = KErrNone;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_1, ">>CPdpFsmInterface::Input(aParam)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Input(aParam)");
 
 	ASSERT(iPdpFsmFactory);
 
@@ -164,7 +158,7 @@
 	    {
 		ret = KErrBadHandle;
 	    }
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_2, "<<CPdpFsmInterface::Input(aParam)");
+	
 	return ret;
     }
 
@@ -177,7 +171,7 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -191,7 +185,6 @@
 //             }
 //         }
  	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
 	return KErrNone;
 }
 
@@ -203,7 +196,7 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_1_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -217,7 +210,6 @@
 //         }
 
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_1_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
 	return KErrNone;
 }
 
@@ -233,7 +225,7 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_2_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
 
 	ASSERT(iPdpFsmFactory);
     ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -248,7 +240,6 @@
 //         }
 
     iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_2_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
 	return KErrNone;
     }
 
@@ -260,7 +251,7 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_3_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -275,7 +266,7 @@
 //         }
 
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_3_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
+
 	return KErrNone;
     }
 
@@ -296,7 +287,7 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTInfo& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_4_1, ">>CPdpFsmInterface::Set(TFTInfo)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TFTInfo)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -310,7 +301,6 @@
 //             }
 //         }
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_4_2, "<<CPdpFsmInterface::Set(TFTInfo)");
 	return KErrNone;
     }
 
@@ -322,7 +312,7 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTOperationCode& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_5_1, ">>CPdpFsmInterface::Set(TTFTOperationCode)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TTFTOperationCode)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -336,7 +326,6 @@
 //             }
 //         }
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_5_2, "<<CPdpFsmInterface::Set(TTFTOperationCode)");
 	return KErrNone;
     }
 
@@ -348,7 +337,7 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_6_1, ">>CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -362,7 +351,6 @@
 //             }
 //         }
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_6_2, "<<CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
 	return KErrNone;
     }
 
@@ -375,7 +363,7 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_7_1, ">>CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -389,7 +377,6 @@
 //             }
 //         }
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_7_2, "<<CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
 	return KErrNone;
     }
 
@@ -401,7 +388,7 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const TPacketDataConfigBase& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACESET_8_1, ">>CPdpFsmInterface::Set(RPacketContext::TContextConfigGPRS)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextConfigGPRS)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -415,7 +402,6 @@
 //            }
 //        }
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACESET_8_2, "<<CPdpFsmInterface::Set(RPacketContext::TContextConfigGPRS)");
 	return KErrNone;
     }
 
@@ -425,12 +411,11 @@
 */
 void CPdpFsmInterface::Set(const RPacketService::TStatus aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_9_1, ">>CPdpFsmInterface::Set(RPacketService::TStatus)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketService::TStatus)");
 
 	ASSERT(iPdpFsmFactory);
 
 	iNetworkStatus = aParam;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_9_2, "<<CPdpFsmInterface::Set(RPacketService::TStatus)");
     }
 
 
@@ -446,7 +431,7 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_1, ">>CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -460,7 +445,6 @@
 //             }
 //         }
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_2, "<<CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
 	return KErrNone;
 }
 
@@ -472,7 +456,7 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_1_1, ">>CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -486,7 +470,6 @@
 //             }
 //         }
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_1_2, "<<CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
 	return KErrNone;
 }
 
@@ -501,7 +484,7 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_2_1, ">>CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -515,7 +498,6 @@
 //             }
 //         }
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_2_2, "<<CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
 	return KErrNone;
     }
 
@@ -527,7 +509,7 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_3_1, ">>CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -541,7 +523,6 @@
 //             }
 //         }
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_3_2, "<<CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
 	return KErrNone;
     }
 
@@ -560,7 +541,7 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTInfo& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_4_1, ">>CPdpFsmInterface::Get(TFTInfo)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -574,7 +555,6 @@
 //             }
 //         }
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_4_2, "<<CPdpFsmInterface::Get(TFTInfo)");
 	return KErrNone;
     }
 
@@ -586,7 +566,7 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTOperationCode& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_5_1, ">>CPdpFsmInterface::Get(TFTInfo)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -600,7 +580,6 @@
 //             }
 //         }
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_5_2, "<<CPdpFsmInterface::Get(TFTInfo)");
 	return KErrNone;
     }
 
@@ -613,7 +592,7 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_6_1, ">>CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -627,7 +606,6 @@
 //             }
 //         }
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_6_2, "<<CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
 	return KErrNone;
     }
 
@@ -639,7 +617,7 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, TPacketDataConfigBase& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_7_1, ">>CPdpFsmInterface::Get(RPacketContext::TContextConfigGPRS)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextConfigGPRS)");
 
 	ASSERT(	aParam.ExtensionId() == TPacketDataConfigBase::KConfigGPRS ||
 			aParam.ExtensionId() == TPacketDataConfigBase::KConfigRel99Rel4 ||
@@ -657,7 +635,6 @@
 //            }
 //        }
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_7_2, "<<CPdpFsmInterface::Get(RPacketContext::TContextConfigGPRS)");
 	return KErrNone;
     }
 
@@ -669,7 +646,7 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_8_1, ">>CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -683,7 +660,6 @@
 //             }
 //         }
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_8_2, "<CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
 	return KErrNone;
     }
 
@@ -695,12 +671,11 @@
 */
 void CPdpFsmInterface::Get(RPacketService::TStatus& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_9_1, ">>CPdpFsmInterface::Get(RPacketService::TStatus)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketService::TStatus)");
 
 	ASSERT(iPdpFsmFactory);
 
 	aParam = iNetworkStatus;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_9_2, "<<CPdpFsmInterface::Get(RPacketService::TStatus)");
     }
 
 
@@ -710,10 +685,10 @@
 */
 const TName& CPdpFsmInterface::TsyName(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_TSYNAME_1, ">>CPdpFsmInterface::TsyName");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::TsyName");
 
 	ASSERT(iPdpFsmFactory);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_TSYNAME_2, "<<CPdpFsmInterface::TsyName");
+	
 	return iPdpFsmFactory->TsyName();
 	}
 
@@ -726,11 +701,10 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketMbmsContext::TContextConfigMbmsV1& aParam) const 
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_10_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 
 	ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_10_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 	return KErrNone;
 	}
 	
@@ -743,7 +717,7 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketMbmsContext::TContextConfigMbmsV1& aParam)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_10_1, "CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 
 	ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
@@ -761,11 +735,10 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const TSessionOperatioInfo& aParam)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_11_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 
 	ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_11_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 	return KErrNone;
 	}
 
@@ -778,11 +751,10 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, TSessionOperatioInfo& aParam) const 
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_11_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 
 	ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_11_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 	return KErrNone;
 	}

--- a/telephonyprotocols/pdplayer/umts/test/te_spud/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyprotocols/pdplayer/umts/test/te_spud/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,618 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_CTOR_1=0x143
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DOCANCEL_1=0x14c
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DOCANCEL_2=0x14d
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DTOR_1=0x144
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_1=0x16e
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_10=0x177
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_11=0x178
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_12=0x179
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_13=0x17a
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_14=0x17b
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_15=0x17c
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_16=0x17d
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_17=0x17e
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_18=0x17f
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_2=0x16f
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_3=0x170
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_4=0x171
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_5=0x172
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_6=0x173
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_7=0x174
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_8=0x175
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_9=0x176
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_1=0x150
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_10=0x159
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_11=0x15a
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_12=0x15b
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_13=0x15c
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_14=0x15d
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_15=0x15e
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_16=0x15f
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_17=0x160
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_18=0x161
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_19=0x162
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_2=0x151
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_20=0x163
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_21=0x164
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_22=0x165
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_23=0x166
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_24=0x167
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_25=0x168
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_26=0x169
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_27=0x16a
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_28=0x16b
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_29=0x16c
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_3=0x152
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_30=0x16d
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_4=0x153
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_5=0x154
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_6=0x155
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_7=0x156
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_8=0x157
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_9=0x158
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_EXISTINGCONTEXTNAME_1=0x14e
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_EXISTINGCONTEXTNAME_2=0x14f
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_INPUT_1=0x145
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_INPUT_2=0x146
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_INPUT_3=0x147
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_1=0x148
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_2=0x149
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_3=0x14a
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_4=0x14b
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CANCELALLPDPNOTIFICATIONS_1=0x18c
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CANCELPDPNOTIFICATIONS_1=0x18b
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CREATEPDPL_1=0x187
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CREATEPDPL_2=0x188
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CTOR_1=0x180
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_DTOR_1=0x182
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_DTOR_2=0x183
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_FREEPDP_1=0x189
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_INITL_1=0x185
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_INITL_2=0x186
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_NEWL_1=0x181
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_STARTPDPNOTIFICATIONS_1=0x18a
-[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERNOTIFIER_RUNL_1=0x18d
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x192
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x193
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x194
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x195
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_DOCANCEL_1=0x19a
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_1=0x19b
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x19c
-[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_3=0x19d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x18e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x18f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x190
-[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x191
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CLOSE_1=0xb2
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CLOSE_2=0xb3
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CTOR_1=0xac
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CTOR_2=0xad
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DELETEFSMCONTEXT_1=0xb9
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DELETEFSMCONTEXT_2=0xba
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DTOR_1=0xae
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DTOR_2=0xaf
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_GETFSMCONTEXT_1=0xb4
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_GETFSMCONTEXT_2=0xb5
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_INITL_1=0xb0
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_INITL_2=0xb1
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWFSMCONTEXTL_1=0xb6
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWFSMCONTEXTL_2=0xb7
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWFSMCONTEXTL_3=0xb8
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWL_1=0xaa
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWL_2=0xab
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACESET_8_1=0x248
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACESET_8_2=0x249
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CLOSE_1=0x232
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CLOSE_2=0x233
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CTOR_1=0x22c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CTOR_2=0x22d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_DTOR_1=0x22e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_DTOR_2=0x22f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_1=0x24c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_10_1=0x262
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_10_2=0x263
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_11_1=0x267
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_11_2=0x268
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_1_1=0x24e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_1_2=0x24f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_2=0x24d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_2_1=0x250
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_2_2=0x251
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_3_1=0x252
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_3_2=0x253
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_4_1=0x254
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_4_2=0x255
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_5_1=0x256
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_5_2=0x257
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_6_1=0x258
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_6_2=0x259
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_7_1=0x25a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_7_2=0x25b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_8_1=0x25c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_8_2=0x25d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_9_1=0x25e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_9_2=0x25f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_INPUT_1=0x236
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_INPUT_2=0x237
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_NEWFSMCONTESTL_1=0x234
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_NEWFSMCONTESTL_2=0x235
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_OPEN_1=0x230
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_OPEN_2=0x231
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_1=0x238
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_10_1=0x264
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_11_1=0x265
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_11_2=0x266
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_1_1=0x23a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_1_2=0x23b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_2=0x239
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_2_1=0x23c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_2_2=0x23d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_3_1=0x23e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_3_2=0x23f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_4_1=0x240
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_4_2=0x241
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_5_1=0x242
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_5_2=0x243
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_6_1=0x244
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_6_2=0x245
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_7_1=0x246
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_7_2=0x247
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_9_1=0x24a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_9_2=0x24b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_TSYNAME_1=0x260
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_TSYNAME_2=0x261
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_1=0x96
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_2=0x97
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_3=0x98
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_4=0x99
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_1=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_2=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_3=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_4=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_1=0x6e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_2=0x6f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_3=0x70
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_4=0x71
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_1=0x76
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_2=0x77
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_3=0x78
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_4=0x79
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_1=0x7a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_2=0x7b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_3=0x7c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_4=0x7d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_1=0x8a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_2=0x8b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_3=0x8c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_4=0x8d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_1=0x9a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_2=0x9b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_3=0x9c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_4=0x9d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_1=0x62
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_2=0x63
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_3=0x64
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_4=0x65
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_1=0x92
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_2=0x93
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_3=0x94
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_4=0x95
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_1=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_2=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_3=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_4=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_1=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_2=0x5f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_3=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_4=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_1=0x7e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_2=0x7f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_3=0x80
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_4=0x81
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_1=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_2=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_3=0x50
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_4=0x51
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_1=0x82
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_2=0x83
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_3=0x84
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_4=0x85
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_1=0x52
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_2=0x53
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_3=0x54
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_4=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_1=0x72
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_2=0x73
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_3=0x74
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_4=0x75
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_1=0x6a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_2=0x6b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_3=0x6c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_4=0x6d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_1=0x66
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_2=0x67
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_3=0x68
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_4=0x69
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_1=0x8e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_2=0x8f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_3=0x90
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_4=0x91
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_1=0x86
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_2=0x87
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_3=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_4=0x89
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CTOR_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CTOR_2=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CTOR_3=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_DTOR_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_DTOR_2=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_DTOR_3=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELCANCEL_1=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELCANCEL_2=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELCANCEL_3=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELINPUT_1=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELINPUT_2=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELINPUT_3=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET10_1=0xa4
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET10_2=0xa5
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET10_3=0xa6
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET1_1=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET1_2=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET1_3=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET2_1=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET2_2=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET2_3=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET3_1=0x15
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET3_2=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET3_3=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET4_1=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET4_2=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET4_3=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET5_1=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET5_2=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET5_3=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET6_1=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET6_2=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET6_3=0x20
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET7_1=0x21
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET7_2=0x22
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET7_3=0x23
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET8_1=0x24
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET8_2=0x25
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET8_3=0x26
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET9_1=0x9e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET9_2=0x9f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET9_3=0xa0
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET_1=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET_2=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET_3=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_1=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_2=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_3=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_4=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_5=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET10_1=0xa1
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET10_2=0xa2
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET10_3=0xa3
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET11_1=0xa7
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET11_2=0xa8
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET11_3=0xa9
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET1_1=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET1_2=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET1_3=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET2_1=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET2_2=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET2_3=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET3_1=0x30
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET3_2=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET3_3=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET4_1=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET4_2=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET4_3=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET5_1=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET5_2=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET5_3=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET6_1=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET6_2=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET6_3=0x3b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET7_1=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET7_2=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET7_3=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET8_1=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET8_2=0x40
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET8_3=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET9_1=0x42
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET9_2=0x43
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET9_3=0x44
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET_1=0x27
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET_2=0x28
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET_3=0x29
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SPUDINPUT_1=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SPUDINPUT_2=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SPUDINPUT_3=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_DOCANCEL_1=0x196
-[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_1=0x197
-[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x198
-[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_3=0x199
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_CTOR_1=0x19e
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_DOCANCEL_1=0x1a2
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_DTOR_1=0x19f
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_1=0x1a3
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_2=0x1a4
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_3=0x1a5
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_1=0x1a0
-[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_2=0x1a1
-[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_DOCANCEL_1=0x1a9
-[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_NOTIFY_1=0x1a6
-[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_NOTIFY_2=0x1a7
-[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_NOTIFY_3=0x1a8
-[TRACE]TRACE_INTERNALS[0x88]_GETPHONEINFOL_1=0x184
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELALLPDPNOTIFICATIONS_1=0x22b
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELALLPDPS_1=0x22a
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDPNOTIFICATIONS_1=0x228
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDPNOTIFICATIONS_2=0x229
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDP_1=0x225
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDP_2=0x226
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CLOSE_1=0x21e
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CREATEPDPL_1=0x21f
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CREATEPDPL_2=0x220
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_DELETEPDP_1=0x221
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_DELETEPDP_2=0x222
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_DTOR_1=0x21c
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_INPUT_1=0x223
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_INPUT_2=0x224
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_OPENL_1=0x21d
-[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_STARTPDPNOTIFICATIONS_1=0x227
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_1=0x212
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_2=0x213
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_3=0x214
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_4=0x215
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_1=0x20d
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_2=0x20e
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_1=0x20f
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_2=0x210
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_3=0x211
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_1=0x1ef
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_2=0x1f0
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_3=0x1f1
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_4=0x1f2
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_5=0x1f3
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_1=0x1e8
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_2=0x1e9
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_1=0x1ea
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_2=0x1eb
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_3=0x1ec
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_4=0x1ed
-[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_5=0x1ee
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_1=0x1e4
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_2=0x1e5
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_3=0x1e6
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_4=0x1e7
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_1=0x1dc
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_2=0x1dd
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_3=0x1de
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_4=0x1df
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_5=0x1e0
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_6=0x1e1
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NOTIFYFSM_1=0x1e2
-[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NOTIFYFSM_2=0x1e3
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_1=0x1b4
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_2=0x1b5
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_3=0x1b6
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_4=0x1b7
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_1=0x1b0
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_2=0x1b1
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NOTIFYFSM_1=0x1b2
-[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NOTIFYFSM_2=0x1b3
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x1be
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2=0x1bf
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_3=0x1c0
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_4=0x1c1
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_5=0x1c2
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_1=0x1b8
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_2=0x1b9
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_3=0x1ba
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_4=0x1bb
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x1bc
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x1bd
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x1c8
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2=0x1c9
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_1=0x1c3
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_2=0x1c4
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_3=0x1c5
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x1c6
-[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x1c7
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x20a
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2=0x20b
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_3=0x20c
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_1=0x205
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_2=0x206
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_3=0x207
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x208
-[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x209
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_1=0x1fa
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_2=0x1fb
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NEXT_1=0x1f4
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NEXT_2=0x1f5
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_1=0x1f6
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_2=0x1f7
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_3=0x1f8
-[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_4=0x1f9
-[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_1=0x219
-[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_2=0x21a
-[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_3=0x21b
-[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_1=0x216
-[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_1=0x217
-[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_2=0x218
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_1=0x202
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_2=0x203
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_3=0x204
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_1=0x1fc
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_2=0x1fd
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_1=0x1fe
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_2=0x1ff
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_3=0x200
-[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_4=0x201
-[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_CANCELASYNCREQUEST_1=0x1ae
-[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_CANCELASYNCREQUEST_2=0x1af
-[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NEXT_1=0x1aa
-[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NEXT_2=0x1ab
-[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NOTIFYFSM_1=0x1ac
-[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NOTIFYFSM_2=0x1ad
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_1=0xc4
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_2=0xc5
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_3=0xc6
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_4=0xc7
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_5=0xc8
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_6=0xc9
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_1=0xca
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_2=0xcb
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_3=0xcc
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_4=0xcd
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_5=0xce
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_6=0xcf
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_7=0xd0
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_1=0xd1
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_2=0xd2
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_3=0xd3
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_4=0xd4
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_5=0xd5
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_6=0xd6
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_1=0xd7
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_2=0xd8
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_3=0xd9
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_4=0xda
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_5=0xdb
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_1=0xdc
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_2=0xdd
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_3=0xde
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_4=0xdf
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_5=0xe0
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_1=0xe1
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_2=0xe2
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_3=0xe3
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_4=0xe4
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_5=0xe5
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_6=0xe6
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_7=0xe7
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDMBMS_INPUT_1=0xee
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDMBMS_INPUT_2=0xef
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_1=0xe8
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_2=0xe9
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_3=0xea
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_4=0xeb
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_5=0xec
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_6=0xed
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_1=0xf7
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_2=0xf8
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_3=0xf9
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_4=0xfa
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_5=0xfb
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_6=0xfc
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_7=0xfd
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_8=0xfe
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_1=0xff
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_2=0x100
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_3=0x101
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_5=0x102
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_6=0x103
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_7=0x104
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_1=0xf0
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_2=0xf1
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_3=0xf2
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_4=0xf3
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_5=0xf4
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_6=0xf5
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_7=0xf6
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_1=0x105
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_2=0x106
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_3=0x107
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_4=0x108
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_5=0x109
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_6=0x10a
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_7=0x10b
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_8=0x10c
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_1=0x10d
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_2=0x10e
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_3=0x10f
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_4=0x110
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_5=0x111
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_6=0x112
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_7=0x113
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_1=0x114
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_2=0x115
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_3=0x116
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_4=0x117
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_5=0x118
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_1=0x126
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_2=0x127
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_3=0x128
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_4=0x129
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_5=0x12a
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_6=0x12b
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_1=0x119
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_10=0x122
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_11=0x123
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_12=0x124
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_13=0x125
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_2=0x11a
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_3=0x11b
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_4=0x11c
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_5=0x11d
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_6=0x11e
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_7=0x11f
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_8=0x120
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_9=0x121
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_1=0x12c
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_2=0x12d
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_3=0x12e
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_4=0x12f
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_5=0x130
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_1=0x131
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_2=0x132
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_3=0x133
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_4=0x134
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_5=0x135
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_1=0x136
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_2=0x137
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_3=0x138
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_4=0x139
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_5=0x13a
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_6=0x13b
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_7=0x13c
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_8=0x13d
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_1=0x13e
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_2=0x13f
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_3=0x140
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_4=0x141
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_5=0x142
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_CTOR_1=0xbb
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_CTOR_2=0xbc
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_ETELDRIVERCANCEL_1=0xc2
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_ETELDRIVERINPUT_1=0xc1
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_1=0xbd
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_2=0xbe
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_3=0xbf
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_4=0xc0
-[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_SPUDMANNOTIFY_1=0xc3
-[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_CANCELASYNCREQUEST_1=0x1ce
-[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_CANCELASYNCREQUEST_2=0x1cf
-[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_1=0x1ca
-[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_2=0x1cb
-[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NOTIFYFSM_1=0x1cc
-[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NOTIFYFSM_2=0x1cd
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_1=0x1d9
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_2=0x1da
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_3=0x1db
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_1=0x1d0
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_2=0x1d1
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_3=0x1d2
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_4=0x1d3
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_5=0x1d4
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_6=0x1d5
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_7=0x1d6
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_1=0x1d7
-[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_2=0x1d8

--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/TE_RawIpSize.cfg	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/TE_RawIpSize.cfg	Wed Sep 01 12:40:21 2010 +0100
@@ -911,7 +911,7 @@
 	AccessPointSelectionPolicy=0
 	Tier=Link.TierTable.271064565
 	MCpr=MCprTable.10
-	Cpr=CprTable.8
+	Cpr=CprTable.3
 	SCpr=SCprTable.4
 	Protocol=ProtocolTable.5
 	CprConfig=0
@@ -1035,7 +1035,7 @@
 	AccessPointSelectionPolicy=0
 	Tier=Link.TierTable.271064565
 	MCpr=MCprTable.10
-	Cpr=CprTable.8
+	Cpr=CprTable.3
 	SCpr=SCprTable.4
 	Protocol=ProtocolTable.5
 	CprConfig=0

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/TE_RawIpSize_pdpcpr.cfg	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,1594 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## Network
+## 
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Intranet
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Intranet2
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Intranet3
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Intranet4
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=Intranet5
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=Intranet6
+	FIELD_COUNT=1
+END_ADD
+
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Name=Default Loopback Modem
+	TSYName=SIM
+	CSYName=PKTLOOPBACK
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=4
+	LastSocketClosedTimeout=6
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOff=Q0
+	QuietOn=Q1
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageValidityPeriod=0
+	MessageDeliveryReport=FALSE
+	CommRole=0
+	BCAStack=C32Bca
+	Agent=NULLAGT
+	FIELD_COUNT=65
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Loopback_RawIP_1
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::501
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Loopback_SPUD_2
+	IfName=SPUD
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Loopback_RawIP_3
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::502
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Loopback_SPUD_4
+	IfName=SPUD
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=WinTunnel_SPUD_5
+	IfName=SPUD
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=Loopback_SPUD_5
+	IfName=SPUD
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=Loopback_SPUD_6
+	IfName=SPUD
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=Loopback_SPUD_7
+	IfName=SPUD
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=Loopback_SPUD_8
+	IfName=SPUD
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=8
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Office
+	IntlPrefixCode=00
+	AreaCode=171
+	DialOutCode=9,
+	Mobile=FALSE
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Mobile
+	FIELD_COUNT=1
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_TEMPLATE
+	Name=Default Outgoing GPRS
+	APN=Test
+	PDPType=IPV4
+	ReqPrecedence=2
+	ReqDelay=4
+	ReqReliability=3
+	ReqPeakThroughput=3
+	ReqMeanThroughput=31
+	MinPrecedence=2
+	MinDelay=4
+	MinReliability=3
+	MinPeakThroughput=3
+	MinMeanThroughput=31
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	AuthRetries=1
+	IpNetMask=255.255.255.0
+	IpGateway=0.0.0.1
+	IpAddrFromServer=FALSE
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.51
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=30
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=RawIP_Bounce_1
+	IpAddr=192.168.1.1
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=SPUD_Echo_2
+	IfParams=lowernif=RAWIP
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.2
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=RawIP_Bounce_3
+	IpAddr=192.168.2.3
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=SPUD_Echo_4
+	IfParams=lowernif=RAWIP
+	IpAddr=192.168.2.4
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=SPUD_Multi_1
+	IfParams=lowernif=RAWIP
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.10
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=SPUD_Multi_2
+	IfParams=lowernif=RAWIP
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.11
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=SPUD_Multi_3
+	IfParams=lowernif=RAWIP
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.12
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=SPUD_Multi_4
+	IfParams=lowernif=RAWIP
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.13
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=GPRS_BAD_QOS
+	IfParams=lowernif=RAWIP
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.2
+	IpDNSAddrFromServer=TRUE
+	UmtsR99QoSAndOn=5
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	APN=Access point name
+	PDPType=IPV6
+	PDPAddress=www.wid.com
+	Precedence=1
+	Delay=1
+	Reliability=1
+	PeakThroughput=1
+	MeanThroughput=1
+	MinPrecedence=1
+	MinDelay=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=TRUE
+	HeaderCompression=TRUE
+	GprsUseEdge=FALSE
+	AnonymousAccess=TRUE
+	FIELD_COUNT=19
+END_ADD
+
+
+############################################################
+## APPrioritySelectionPolicyTable
+## 
+[APPrioritySelectionPolicyTable]
+ADD_SECTION
+# COMMDB_ID = 254
+	Id=20000
+	Name=APSelPolNetworkDefault
+	AP1=Link.AccessPointTable.10004
+	APCOUNT=1
+	FIELD_COUNT=4
+END_ADD
+
+
+############################################################
+## TierTable
+## 
+[TierTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=2048
+	Name=Tier1
+	TierImplUid=271064536
+	TierThreadName=ESock_IP
+	TierManagerName=NetworkTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10000
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=271064560
+	Name=Tier2
+	TierImplUid=271064560
+	TierThreadName=ESock_IP
+	TierManagerName=ProtoTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10004
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=271064565
+	Name=Tier3
+	TierImplUid=271064565
+	TierThreadName=ESock_IP
+	TierManagerName=LinkTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10000
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=536887799
+	Name=Tier4
+	TierImplUid=536887799
+	TierThreadName=ESock_SIP
+	TierManagerName=SIPTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10002
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## MCprTable
+## 
+[MCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=netmcpr
+	MCprUid=271009095
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=ipprotomcpr
+	MCprUid=271064558
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=pppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=ethmcpr
+	MCprUid=271064572
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=rawipmcpr
+	MCprUid=271064576
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=tunnelmcpr
+	MCprUid=271064578
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=qospppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=dummynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=hungrynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=pdpmcpr
+	MCprUid=271065840
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=sipmcpr
+	MCprUid=536887801
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Name=panethermcpr
+	MCprUid=271070626
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## CprTable
+## 
+[CprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=ipcpr
+	CprUid=270561519
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=ipprotocpr
+	CprUid=271064531
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=agentcpr
+	CprUid=271064552
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=vanillacpr
+	CprUid=271065843
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=sipcpr
+	CprUid=271010872
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=tunnelagentcpr
+	CprUid=271080968
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=pdpcpr
+	CprUid=271065826
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## SCprTable
+## 
+[SCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=qosipscpr
+	SCprUid=270549768
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=ipprotoscpr
+	SCprUid=271064529
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=agentscpr
+	SCprUid=271064554
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=pdpscpr
+	SCprUid=271065824
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=pppscpr
+	SCprUid=271065852
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=vanillascpr
+	SCprUid=271065844
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=qosscpr
+	SCprUid=271065811
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=sipscpr
+	SCprUid=271010839
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## ProtocolTable
+## 
+[ProtocolTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=sapshim
+	ProtocolUid=270496898
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=ipshim4
+	ProtocolUid=271064118
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=ppp
+	ProtocolUid=271064143
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=ethernet
+	ProtocolUid=271064539
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=rawip
+	ProtocolUid=271064562
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=tunnel
+	ProtocolUid=271064567
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=qosppp
+	ProtocolUid=271064148
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=dummynif
+	ProtocolUid=271064123
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=hungrynif
+	ProtocolUid=271064125
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=panether
+	ProtocolUid=271070627
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=rawip2
+	ProtocolUid=271084280
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## BearerTypeTable
+## 
+[BearerTypeTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=ethint
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.4
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.4
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=tunnelnif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.6
+	Cpr=CprTable.7
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.6
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=qosppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.7
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.7
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=dummynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.8
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.8
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=hungrynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.9
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.9
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=spud-ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.3
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=spud-rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.3
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=IPProtoDefaultTemplate
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=NetworkDefaultTemplate
+	Tier=Link.TierTable.2048
+	MCpr=MCprTable.1
+	Cpr=CprTable.1
+	SCpr=SCprTable.7
+	Protocol=ProtocolTable.1
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=rawip2
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.11
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Name=spud-rawip2
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.11
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## AccessPointTable
+## 
+[AccessPointTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=rawipMappedFromIAP1
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=10003
+	Name=IPProto_generated_10003
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=1
+	CustomSelectionPolicy=1
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=2
+	Name=spud-rawipMappedFromIAP2
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=10004
+	Name=IPProto_generated_10004
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=2
+	CustomSelectionPolicy=2
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=3
+	Name=rawipMappedFromIAP3
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=10005
+	Name=IPProto_generated_10005
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=3
+	CustomSelectionPolicy=3
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=4
+	Name=spud-rawipMappedFromIAP4
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=10006
+	Name=IPProto_generated_10006
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=4
+	CustomSelectionPolicy=4
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=5
+	Name=rawipMappedFromIAP5
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10007
+	Name=IPProto_generated_10007
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=5
+	CustomSelectionPolicy=5
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Id=6
+	Name=spud-rawipMappedFromIAP6
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Id=10008
+	Name=IPProto_generated_10008
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=6
+	CustomSelectionPolicy=6
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Id=7
+	Name=spud-rawipMappedFromIAP7
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+	Id=10009
+	Name=IPProto_generated_10009
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=7
+	CustomSelectionPolicy=7
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 15
+	Id=8
+	Name=spud-rawipMappedFromIAP8
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 16
+	Id=10010
+	Name=IPProto_generated_10010
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=8
+	CustomSelectionPolicy=8
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 17
+	Id=9
+	Name=spud-rawipMappedFromIAP9
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 18
+	Id=10011
+	Name=IPProto_generated_10011
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=9
+	CustomSelectionPolicy=9
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 19
+	Id=10
+	Name=spud-rawipMappedFromIAP10
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 20
+	Id=10012
+	Name=IPProto_generated_10012
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=10
+	CustomSelectionPolicy=10
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 252
+	Id=10002
+	Name=SIPDefault
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.536887799
+	MCpr=MCprTable.11
+	Cpr=CprTable.5
+	SCpr=SCprTable.8
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 254
+	Id=10000
+	Name=NetworkDefault
+	AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.20000
+	Tier=Link.TierTable.2048
+	MCpr=MCprTable.1
+	Cpr=CprTable.1
+	SCpr=SCprTable.7
+	Protocol=ProtocolTable.1
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_TEMPLATE
+	DefaultTier=1
+	FIELD_COUNT=1
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=DefaultRecordName-1
+	ConnectionAttempts=2
+	RedialAttempts=3
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ModemForDataAndFax=2
+	ModemForPhoneServicesAndSMS=2
+	LocationForDataAndFax=2
+	LocationForPhoneServicesAndSMS=2
+	DefaultNetwork=1
+	BearerAvailabilityCheckTSY=mm
+	FIELD_COUNT=13
+END_ADD
+
+
+############################################################
+## IAP
+## 
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Loopback_GRPS_1
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=1
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Loopback_GRPS_2
+	IAPServiceType=OutgoingGPRS
+	IAPService=2
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Loopback_GRPS_3
+	IAPServiceType=OutgoingGPRS
+	IAPService=3
+	IAPBearerType=ModemBearer
+	IAPBearer=3
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Loopback_GRPS_4
+	IAPServiceType=OutgoingGPRS
+	IAPService=4
+	IAPBearerType=ModemBearer
+	IAPBearer=4
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=Loopback_GRPS_5
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=3
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=Loopback_GRPS_6
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=1
+	IAPNetwork=3
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=Loopback_GRPS_7
+	IAPServiceType=OutgoingGPRS
+	IAPService=6
+	IAPBearerType=ModemBearer
+	IAPBearer=7
+	IAPNetwork=4
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=Loopback_GRPS_8
+	IAPServiceType=OutgoingGPRS
+	IAPService=7
+	IAPBearerType=ModemBearer
+	IAPBearer=8
+	IAPNetwork=5
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=Loopback_GRPS_9
+	IAPServiceType=OutgoingGPRS
+	IAPService=8
+	IAPBearerType=ModemBearer
+	IAPBearer=9
+	IAPNetwork=6
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=IAP_GRPS_BAD_QOS
+	IAPServiceType=OutgoingGPRS
+	IAPService=9
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=DefaultRecordName-1
+	Ranking=1
+	Direction=OUTGOING
+	BearerSet=PSD
+	DialogPref=DONOTPROMPT
+	IAP=2
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## UmtsR99QoSAndOn
+## 
+[UmtsR99QoSAndOn]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=PRIMARY1
+	ReqTrafficClass=1
+	MinTrafficClass=1
+	ReqDeliveryOrder=1
+	MinDeliveryOrder=1
+	ReqDeliverErroneousSDU=1
+	MinDeliverErroneousSDU=1
+	ReqMaxSDUSize=0
+	MinAcceptableMaxSDUSize=0
+	ReqMaxUplinkRate=0
+	ReqMinUplinkRate=0
+	ReqMaxDownlinkRate=0
+	ReqMinDownlinkRate=0
+	ReqBER=1
+	MaxBER=1
+	ReqSDUErrorRatio=1
+	MaxSDUErrorRatio=1
+	ReqTrafficHandlingPriority=1
+	MinTrafficHandlingPriority=1
+	ReqTransferDelay=0
+	MaxTransferDelay=0
+	ReqGuaranteedUplinkRate=0
+	MinGuaranteedUplinkRat=0
+	ReqGuaranteedDownlinkRate=0
+	MinGuaranteedDownlinkRate=0
+	SignallingIndication=FALSE
+	ImCnSignallingIndication=FALSE
+	SourceStatisticsDescriptor=0
+	FIELD_COUNT=28
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=SECONDARY1
+	ReqTrafficClass=4
+	MinTrafficClass=4
+	ReqDeliveryOrder=1
+	MinDeliveryOrder=1
+	ReqDeliverErroneousSDU=8
+	MinDeliverErroneousSDU=8
+	ReqMaxSDUSize=768
+	MinAcceptableMaxSDUSize=512
+	ReqMaxUplinkRate=1024
+	ReqMinUplinkRate=1024
+	ReqMaxDownlinkRate=1024
+	ReqMinDownlinkRate=1024
+	ReqBER=0
+	MaxBER=0
+	ReqSDUErrorRatio=1
+	MaxSDUErrorRatio=1
+	ReqTrafficHandlingPriority=1
+	MinTrafficHandlingPriority=1
+	ReqTransferDelay=250
+	MaxTransferDelay=250
+	ReqGuaranteedUplinkRate=1024
+	MinGuaranteedUplinkRat=1024
+	ReqGuaranteedDownlinkRate=1024
+	MinGuaranteedDownlinkRate=1024
+	SignallingIndication=FALSE
+	ImCnSignallingIndication=FALSE
+	SourceStatisticsDescriptor=0
+	FIELD_COUNT=28
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=PRIMARY2
+	ReqTrafficClass=1
+	MinTrafficClass=1
+	ReqDeliveryOrder=1
+	MinDeliveryOrder=1
+	ReqDeliverErroneousSDU=1
+	MinDeliverErroneousSDU=1
+	ReqMaxSDUSize=0
+	MinAcceptableMaxSDUSize=0
+	ReqMaxUplinkRate=0
+	ReqMinUplinkRate=0
+	ReqMaxDownlinkRate=0
+	ReqMinDownlinkRate=0
+	ReqBER=1
+	MaxBER=1
+	ReqSDUErrorRatio=1
+	MaxSDUErrorRatio=1
+	ReqTrafficHandlingPriority=1
+	MinTrafficHandlingPriority=1
+	ReqTransferDelay=0
+	MaxTransferDelay=0
+	ReqGuaranteedUplinkRate=0
+	MinGuaranteedUplinkRat=0
+	ReqGuaranteedDownlinkRate=0
+	MinGuaranteedDownlinkRate=0
+	SignallingIndication=FALSE
+	ImCnSignallingIndication=FALSE
+	SourceStatisticsDescriptor=0
+	FIELD_COUNT=28
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=SECONDARY2
+	ReqTrafficClass=4
+	MinTrafficClass=4
+	ReqDeliveryOrder=1
+	MinDeliveryOrder=1
+	ReqDeliverErroneousSDU=8
+	MinDeliverErroneousSDU=8
+	ReqMaxSDUSize=768
+	MinAcceptableMaxSDUSize=512
+	ReqMaxUplinkRate=1024
+	ReqMinUplinkRate=1024
+	ReqMaxDownlinkRate=1024
+	ReqMinDownlinkRate=1024
+	ReqBER=0
+	MaxBER=0
+	ReqSDUErrorRatio=1
+	MaxSDUErrorRatio=1
+	ReqTrafficHandlingPriority=1
+	MinTrafficHandlingPriority=1
+	ReqTransferDelay=250
+	MaxTransferDelay=250
+	ReqGuaranteedUplinkRate=1024
+	MinGuaranteedUplinkRat=1024
+	ReqGuaranteedDownlinkRate=1024
+	MinGuaranteedDownlinkRate=1024
+	SignallingIndication=FALSE
+	ImCnSignallingIndication=FALSE
+	SourceStatisticsDescriptor=0
+	FIELD_COUNT=28
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=BAD_QOS
+	MinTrafficClass=1
+	ReqDeliveryOrder=1
+	MinDeliveryOrder=1
+	ReqDeliverErroneousSDU=1
+	MinDeliverErroneousSDU=1
+	ReqMaxSDUSize=0
+	MinAcceptableMaxSDUSize=0
+	ReqMaxUplinkRate=0
+	ReqMinUplinkRate=0
+	ReqMaxDownlinkRate=0
+	ReqMinDownlinkRate=0
+	ReqBER=1
+	MaxBER=1
+	ReqSDUErrorRatio=1
+	MaxSDUErrorRatio=1
+	ReqTrafficHandlingPriority=1
+	MinTrafficHandlingPriority=1
+	ReqTransferDelay=0
+	MaxTransferDelay=0
+	ReqGuaranteedUplinkRate=0
+	MinGuaranteedUplinkRat=0
+	ReqGuaranteedDownlinkRate=0
+	MinGuaranteedDownlinkRate=0
+	SignallingIndication=FALSE
+	ImCnSignallingIndication=FALSE
+	SourceStatisticsDescriptor=0
+	FIELD_COUNT=27
+END_ADD
+
+
+############################################################
+## PolicySelectorTable
+## 
+[PolicySelectorTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=DefaultRecordName-1
+	PolicyId=1
+	SrcAddress=0.0.0.0
+	SrcMask=255.255.255.255
+	DstAddress=192.168.1.1
+	DstMask=255.255.255.255
+	SrcPort=0
+	DstPort=3461
+	SrcPortMax=1031
+	DstPortMax=3461
+	ProtocolId=17
+	IAPid=2
+	Priority=1
+	FIELD_COUNT=13
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=DefaultRecordName-2
+	PolicyId=2
+	SrcPort=0
+	SrcPortMax=0
+	ProtocolId=1
+	IAPid=2
+	Priority=1
+	FIELD_COUNT=7
+END_ADD
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_pdplayer_ip6.cfg	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,1552 @@
+############################################################
+## AUTO-GENERATED CONFIGURATION FILE
+## CommsDat Database Dump Utility
+## 1.1
+############################################################
+
+############################################################
+## Network
+## 
+[Network]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Intranet
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Intranet2
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Intranet3
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Intranet4
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=Intranet5
+	FIELD_COUNT=1
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=Intranet6
+	FIELD_COUNT=1
+END_ADD
+
+
+############################################################
+## ModemBearer
+## 
+[ModemBearer]
+ADD_TEMPLATE
+	Name=Default Loopback Modem
+	TSYName=SIM
+	CSYName=PKTLOOPBACK
+	LastSocketActivityTimeout=180
+	LastSessionClosedTimeout=4
+	LastSocketClosedTimeout=30
+	DataBits=8
+	StopBits=1
+	Parity=NONE
+	Rate=115200
+	Handshaking=0
+	SpecialRate=0
+	XonChar=0
+	XoffChar=0
+	FaxClassPref=AUTO
+	SpeakerPref=NEVER
+	SpeakerVolPref=QUIET
+	ModemInitString=AT
+	DataInitString=AT
+	FaxInitString=AT
+	DialPauseLength=S8=
+	SpeakerVolContorlLow=L0
+	SpeakerVolControlMedium=L1
+	SpeakerVolControlHigh=L2
+	SpeakerAlwaysOff=M0
+	SpeakerOnUntilCarrier=M1
+	SpeakerAlwaysOn=M2
+	SpeakerOnAfterUntilCarrier=M3
+	DialToneWaitModifier=W
+	CallProgress1=X1
+	CallProgress2=X2
+	CallProgress3=X3
+	CallProgress4=X4
+	EchoOff=E0
+	VerboseText=V1
+	QuietOff=Q0
+	QuietOn=Q1
+	DialCommandStateModifier=;
+	OnLine=O
+	ResetConfiguration=Z
+	ReturnToFactoryDefs=&F
+	DCDOnDuringLink=&C1
+	DTRHangUp=&D2
+	DSRAlwaysOn=&S0
+	RTSCTSHandshake=&K3
+	XonXoffHandshake=&K4
+	EscapeCharacter=+
+	EscapeGuardPeriod=S12
+	NoDialTone=NO DIAL TONE
+	Busy=BUSY
+	NoAnswer=NO ANSWER
+	Carrier=CARRIER
+	Connect=CONNECT
+	CompressionClass5=COMPRESSION:CLASS 5
+	CompressionV42bis=COMPRESSION:V.42 bis
+	CompressionNone=COMPRESSION:NONE
+	ProtocolLAPD=PROTOCOL:LAPD
+	ProtocolALT=PROTOCOL:ALT
+	ProtocolALTCELLULAR=PROTOCOL:ALT-CELLULAR
+	ProtocolNone=PROTOCOL:NONE
+	MessageValidityPeriod=0
+	MessageDeliveryReport=FALSE
+	CommRole=0
+	BCAStack=C32Bca
+	Agent=NULLAGT
+	FIELD_COUNT=65
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Loopback_RawIP_1
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::501
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Loopback_SPUD_2
+	IfName=SPUD
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Loopback_RawIP_3
+	IfName=RAWIP
+	PortName=PKTLOOPBACK::503
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Loopback_SPUD_4
+	IfName=SPUD
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=WinTunnel_SPUD_5
+	IfName=SPUD
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=Loopback_SPUD_5
+	IfName=SPUD
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=Loopback_SPUD_6
+	IfName=SPUD
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=Loopback_SPUD_7
+	IfName=SPUD
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=Loopback_SPUD_8
+	IfName=SPUD
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## Location
+## 
+[Location]
+ADD_TEMPLATE
+	Name=Default Location
+	IntlPrefixCode=+
+	NatPrefixCode=0
+	NatCode=44
+	Mobile=TRUE
+	UsePulseDial=FALSE
+	WaitForDialTone=FALSE
+	PauseAfterDialout=0
+	FIELD_COUNT=8
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Office
+	IntlPrefixCode=00
+	AreaCode=171
+	DialOutCode=9,
+	Mobile=FALSE
+	FIELD_COUNT=5
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Mobile
+	FIELD_COUNT=1
+END_ADD
+
+
+############################################################
+## OutgoingGPRS
+## 
+[OutgoingGPRS]
+ADD_TEMPLATE
+	Name=Default Outgoing GPRS
+	APN=Test
+	PDPType=IPV4
+	ReqPrecedence=2
+	ReqDelay=4
+	ReqReliability=3
+	ReqPeakThroughput=3
+	ReqMeanThroughput=31
+	MinPrecedence=2
+	MinDelay=4
+	MinReliability=3
+	MinPeakThroughput=3
+	MinMeanThroughput=31
+	DataCompression=FALSE
+	HeaderCompression=FALSE
+	GprsUseEdge=FALSE
+	AnonymousAccess=FALSE
+	IfNetworks=ip
+	IfPromptForAuth=FALSE
+	IfAuthName=RasUser
+	AuthRetries=1
+	IpNetMask=255.255.255.0
+	IpGateway=0.0.0.1
+	IpAddrFromServer=FALSE
+	IpDNSAddrFromServer=FALSE
+	IpNameServer1=194.72.6.51
+	IpNameServer2=194.72.6.51
+	EnableLCPExtension=FALSE
+	DisablePlainTextAuth=FALSE
+	UmtsR99QoSAndOn=1
+	FIELD_COUNT=30
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=RawIP_Bounce_1
+	IpAddrFromServer=TRUE
+	IpAddr=192.168.1.1
+	IpDNSAddrFromServer=TRUE
+	FIELD_COUNT=4
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=SPUD_Echo_2
+	APN=orangeinternet
+	PDPType=IPV6
+	IfParams=lowernif=RAWIP
+	IfNetworks=ip6
+	IpAddrFromServer=TRUE
+	IpAddr=fe80::19:5bff:fe8a:c0eb
+	Ip6DNSAddrFromServer=FALSE
+	IP6NameServer1=fe80::19:5bff:fe8a:dead
+	IP6NameServer2=fe80::19:5bff:fe8a:beef
+	IpNetMask=ffff:ffff:ffff:ffff:ffff:0000
+	IpGateway=0:0:0:0:0:1
+	IfAuthName=web
+	IfAuthPass=web
+	FIELD_COUNT=14
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=RawIP_Bounce_3
+	IpAddr=192.168.2.3
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=SPUD_Echo_4
+	IfParams=lowernif=RAWIP
+	IpAddr=192.168.2.4
+	FIELD_COUNT=3
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=SPUD_Multi_1
+	APN=orangeinternet
+	PDPType=IPV6
+	IfParams=lowernif=RAWIP
+	IfNetworks=ip6
+	IpAddrFromServer=TRUE
+	IpAddr=fe80::19:5bff:fe8a:c0ec
+	Ip6DNSAddrFromServer=FALSE
+	IP6NameServer1=fe80::19:5bff:fe8a:dead
+	IP6NameServer2=fe80::19:5bff:fe8a:beef
+	IpNetMask=ffff:ffff:ffff:ffff:ffff:0000
+	IpGateway=0:0:0:0:0:1
+	IfAuthName=web
+	IfAuthPass=web
+	FIELD_COUNT=14
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=SPUD_Multi_2
+	APN=orangeinternet
+	PDPType=IPV6
+	IfParams=lowernif=RAWIP
+	IfNetworks=ip6
+	IpAddrFromServer=TRUE
+	IpAddr=fe80::19:5bff:fe8a:c0ed
+	Ip6DNSAddrFromServer=FALSE
+	IP6NameServer1=fe80::19:5bff:fe8a:dead
+	IP6NameServer2=fe80::19:5bff:fe8a:beef
+	IpNetMask=ffff:ffff:ffff:ffff:ffff:0000
+	IpGateway=0:0:0:0:0:1
+	IfAuthName=web
+	IfAuthPass=web
+	FIELD_COUNT=14
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=SPUD_Multi_3
+	APN=orangeinternet
+	PDPType=IPV6
+	IfParams=lowernif=RAWIP
+	IfNetworks=ip6
+	IpAddrFromServer=TRUE
+	IpAddr=fe80::19:5bff:fe8a:c0ee
+	Ip6DNSAddrFromServer=FALSE
+	IP6NameServer1=fe80::19:5bff:fe8a:dead
+	IP6NameServer2=fe80::19:5bff:fe8a:beef
+	IpNetMask=ffff:ffff:ffff:ffff:ffff:0000
+	IpGateway=0:0:0:0:0:1
+	IfAuthName=web
+	IfAuthPass=web
+	FIELD_COUNT=14
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=SPUD_Multi_4
+	APN=orangeinternet
+	PDPType=IPV6
+	IfParams=lowernif=RAWIP
+	IfNetworks=ip6
+	IpAddrFromServer=TRUE
+	IpAddr=fe80::19:5bff:fe8a:c0ef
+	Ip6DNSAddrFromServer=FALSE
+	IP6NameServer1=fe80::19:5bff:fe8a:dead
+	IP6NameServer2=fe80::19:5bff:fe8a:beef
+	IpNetMask=ffff:ffff:ffff:ffff:ffff:0000
+	IpGateway=0:0:0:0:0:1
+	IfAuthName=web
+	IfAuthPass=web
+	FIELD_COUNT=14
+END_ADD
+
+############################################################
+## DefaultGPRS
+## 
+[DefaultGPRS]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Dummy Default GPRS Settings
+	Usage=1
+	APN=Access point name
+	PDPType=IPV6
+	PDPAddress=www.wid.com
+	Precedence=1
+	Delay=1
+	Reliability=1
+	PeakThroughput=1
+	MeanThroughput=1
+	MinPrecedence=1
+	MinDelay=1
+	MinReliability=1
+	MinPeakThroughput=1
+	MinMeanThroughput=1
+	DataCompression=TRUE
+	HeaderCompression=TRUE
+	GprsUseEdge=FALSE
+	AnonymousAccess=TRUE
+	FIELD_COUNT=19
+END_ADD
+
+
+############################################################
+## APPrioritySelectionPolicyTable
+## 
+[APPrioritySelectionPolicyTable]
+ADD_SECTION
+# COMMDB_ID = 254
+	Id=20000
+	Name=APSelPolNetworkDefault
+	AP1=Link.AccessPointTable.10004
+	APCOUNT=1
+	FIELD_COUNT=4
+END_ADD
+
+
+############################################################
+## TierTable
+## 
+[TierTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=2048
+	Name=Tier1
+	TierImplUid=271064536
+	TierThreadName=ESock_IP
+	TierManagerName=NetworkTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10000
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=271064560
+	Name=Tier2
+	TierImplUid=271064560
+	TierThreadName=ESock_IP
+	TierManagerName=ProtoTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10004
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=271064565
+	Name=Tier3
+	TierImplUid=271064565
+	TierThreadName=ESock_IP
+	TierManagerName=LinkTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10000
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=536887799
+	Name=Tier4
+	TierImplUid=536887799
+	TierThreadName=ESock_SIP
+	TierManagerName=SIPTierManager
+	DefaultAccessPoint=Link.AccessPointTable.10002
+	PromptUser=0
+	FIELD_COUNT=7
+END_ADD
+
+
+############################################################
+## MCprTable
+## 
+[MCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=netmcpr
+	MCprUid=271009095
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=ipprotomcpr
+	MCprUid=271064558
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=pppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=ethmcpr
+	MCprUid=271064572
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=rawipmcpr
+	MCprUid=271064576
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=tunnelmcpr
+	MCprUid=271064578
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=qospppmcpr
+	MCprUid=271064556
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=dummynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=hungrynifmcpr
+	MCprUid=271064580
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=pdpmcpr
+	MCprUid=271065840
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=sipmcpr
+	MCprUid=536887801
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Name=panethermcpr
+	MCprUid=271070626
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## CprTable
+## 
+[CprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=ipcpr
+	CprUid=270561519
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=ipprotocpr
+	CprUid=271064531
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=agentcpr
+	CprUid=271064552
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=vanillacpr
+	CprUid=271065843
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=sipcpr
+	CprUid=271010872
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=tunnelagentcpr
+	CprUid=271080968
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=pdpcpr
+	CprUid=271065826
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## SCprTable
+## 
+[SCprTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=qosipscpr
+	SCprUid=270549768
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=ipprotoscpr
+	SCprUid=271064529
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=agentscpr
+	SCprUid=271064554
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=pdpscpr
+	SCprUid=271065824
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=pppscpr
+	SCprUid=271065852
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=vanillascpr
+	SCprUid=271065844
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=qosscpr
+	SCprUid=271065811
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=sipscpr
+	SCprUid=271010839
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## ProtocolTable
+## 
+[ProtocolTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=sapshim
+	ProtocolUid=270496898
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=ipshim4
+	ProtocolUid=271064118
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=ppp
+	ProtocolUid=271064143
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=ethernet
+	ProtocolUid=271064539
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=rawip
+	ProtocolUid=271064562
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=tunnel
+	ProtocolUid=271064567
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=qosppp
+	ProtocolUid=271064148
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=dummynif
+	ProtocolUid=271064123
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=hungrynif
+	ProtocolUid=271064125
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=panether
+	ProtocolUid=271070627
+	FIELD_COUNT=2
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=rawip2
+	ProtocolUid=271084280
+	FIELD_COUNT=2
+END_ADD
+
+
+############################################################
+## BearerTypeTable
+## 
+[BearerTypeTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.3
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=ethint
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.4
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.4
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=tunnelnif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.6
+	Cpr=CprTable.7
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.6
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=qosppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.7
+	Cpr=CprTable.3
+	SCpr=SCprTable.5
+	Protocol=ProtocolTable.7
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=dummynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.8
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.8
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=hungrynif
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.9
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.9
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=spud-ppp
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.3
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.3
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=spud-rawip
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.3
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Name=IPProtoDefaultTemplate
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Name=NetworkDefaultTemplate
+	Tier=Link.TierTable.2048
+	MCpr=MCprTable.1
+	Cpr=CprTable.1
+	SCpr=SCprTable.7
+	Protocol=ProtocolTable.1
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Name=rawip2
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.11
+	FIELD_COUNT=6
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Name=spud-rawip2
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.8
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.11
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## AccessPointTable
+## 
+[AccessPointTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Id=1
+	Name=rawipMappedFromIAP1
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Id=10003
+	Name=IPProto_generated_10003
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=1
+	CustomSelectionPolicy=1
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Id=2
+	Name=spud-rawipMappedFromIAP2
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.3
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Id=10004
+	Name=IPProto_generated_10004
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=2
+	CustomSelectionPolicy=2
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Id=3
+	Name=rawipMappedFromIAP3
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Id=10005
+	Name=IPProto_generated_10005
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=3
+	CustomSelectionPolicy=3
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Id=4
+	Name=spud-rawipMappedFromIAP4
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.3
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Id=10006
+	Name=IPProto_generated_10006
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=4
+	CustomSelectionPolicy=4
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Id=5
+	Name=rawipMappedFromIAP5
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.5
+	Cpr=CprTable.3
+	SCpr=SCprTable.3
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 10
+	Id=10007
+	Name=IPProto_generated_10007
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=5
+	CustomSelectionPolicy=5
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 11
+	Id=6
+	Name=spud-rawipMappedFromIAP6
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.3
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 12
+	Id=10008
+	Name=IPProto_generated_10008
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=6
+	CustomSelectionPolicy=6
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 13
+	Id=7
+	Name=spud-rawipMappedFromIAP7
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.3
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 14
+	Id=10009
+	Name=IPProto_generated_10009
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=7
+	CustomSelectionPolicy=7
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 15
+	Id=8
+	Name=spud-rawipMappedFromIAP8
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.3
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 16
+	Id=10010
+	Name=IPProto_generated_10010
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=8
+	CustomSelectionPolicy=8
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 17
+	Id=9
+	Name=spud-rawipMappedFromIAP9
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064565
+	MCpr=MCprTable.10
+	Cpr=CprTable.3
+	SCpr=SCprTable.4
+	Protocol=ProtocolTable.5
+	CprConfig=0
+	AppSID=0
+	Priority=4294967295
+	FIELD_COUNT=11
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 18
+	Id=10011
+	Name=IPProto_generated_10011
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.271064560
+	MCpr=MCprTable.2
+	Cpr=CprTable.2
+	SCpr=SCprTable.2
+	Protocol=ProtocolTable.2
+	CprConfig=9
+	CustomSelectionPolicy=9
+	FIELD_COUNT=10
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 252
+	Id=10002
+	Name=SIPDefault
+	AccessPointSelectionPolicy=0
+	Tier=Link.TierTable.536887799
+	MCpr=MCprTable.11
+	Cpr=CprTable.5
+	SCpr=SCprTable.8
+	Protocol=ProtocolTable.2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 254
+	Id=10000
+	Name=NetworkDefault
+	AccessPointSelectionPolicy=Link.APPrioritySelectionPolicyTable.20000
+	Tier=Link.TierTable.2048
+	MCpr=MCprTable.1
+	Cpr=CprTable.1
+	SCpr=SCprTable.7
+	Protocol=ProtocolTable.1
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## GlobalSettings
+## 
+[GlobalSettings]
+ADD_TEMPLATE
+	DefaultTier=1
+	FIELD_COUNT=1
+END_TEMPLATE
+
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=DefaultRecordName-1
+	ConnectionAttempts=2
+	RedialAttempts=3
+	SmsReceiveMode=2
+	GPRSAttachMode=1
+	AcceptIncomingGprs=1
+	GPRSClassCBearer=GSM
+	ModemForDataAndFax=2
+	ModemForPhoneServicesAndSMS=2
+	LocationForDataAndFax=2
+	LocationForPhoneServicesAndSMS=2
+	DefaultNetwork=1
+	BearerAvailabilityCheckTSY=mm
+	FIELD_COUNT=13
+END_ADD
+
+
+############################################################
+## IAP
+## 
+[IAP]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=Loopback_GRPS_1
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=1
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=Loopback_GRPS_2
+	IAPServiceType=OutgoingGPRS
+	IAPService=2
+	IAPBearerType=ModemBearer
+	IAPBearer=2
+	IAPNetwork=1
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=Loopback_GRPS_3
+	IAPServiceType=OutgoingGPRS
+	IAPService=3
+	IAPBearerType=ModemBearer
+	IAPBearer=3
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=Loopback_GRPS_4
+	IAPServiceType=OutgoingGPRS
+	IAPService=4
+	IAPBearerType=ModemBearer
+	IAPBearer=4
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 5
+	Name=Loopback_GRPS_5
+	IAPServiceType=OutgoingGPRS
+	IAPService=1
+	IAPBearerType=ModemBearer
+	IAPBearer=3
+	IAPNetwork=2
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 6
+	Name=Loopback_GRPS_6
+	IAPServiceType=OutgoingGPRS
+	IAPService=5
+	IAPBearerType=ModemBearer
+	IAPBearer=6
+	IAPNetwork=3
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 7
+	Name=Loopback_GRPS_7
+	IAPServiceType=OutgoingGPRS
+	IAPService=6
+	IAPBearerType=ModemBearer
+	IAPBearer=7
+	IAPNetwork=4
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 8
+	Name=Loopback_GRPS_8
+	IAPServiceType=OutgoingGPRS
+	IAPService=7
+	IAPBearerType=ModemBearer
+	IAPBearer=8
+	IAPNetwork=5
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 9
+	Name=Loopback_GRPS_9
+	IAPServiceType=OutgoingGPRS
+	IAPService=8
+	IAPBearerType=ModemBearer
+	IAPBearer=9
+	IAPNetwork=6
+	IAPNetworkWeighting=0
+	Location=2
+	FIELD_COUNT=8
+END_ADD
+
+
+############################################################
+## ConnectionPreferences
+## 
+[ConnectionPreferences]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=DefaultRecordName-1
+	Ranking=1
+	Direction=OUTGOING
+	BearerSet=PSD
+	DialogPref=DONOTPROMPT
+	IAP=2
+	FIELD_COUNT=6
+END_ADD
+
+
+############################################################
+## UmtsR99QoSAndOn
+## 
+[UmtsR99QoSAndOn]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=PRIMARY1
+	ReqTrafficClass=1
+	MinTrafficClass=1
+	ReqDeliveryOrder=1
+	MinDeliveryOrder=1
+	ReqDeliverErroneousSDU=1
+	MinDeliverErroneousSDU=1
+	ReqMaxSDUSize=0
+	MinAcceptableMaxSDUSize=0
+	ReqMaxUplinkRate=0
+	ReqMinUplinkRate=0
+	ReqMaxDownlinkRate=0
+	ReqMinDownlinkRate=0
+	ReqBER=1
+	MaxBER=1
+	ReqSDUErrorRatio=1
+	MaxSDUErrorRatio=1
+	ReqTrafficHandlingPriority=1
+	MinTrafficHandlingPriority=1
+	ReqTransferDelay=0
+	MaxTransferDelay=0
+	ReqGuaranteedUplinkRate=0
+	MinGuaranteedUplinkRat=0
+	ReqGuaranteedDownlinkRate=0
+	MinGuaranteedDownlinkRate=0
+	SignallingIndication=FALSE
+	ImCnSignallingIndication=FALSE
+	SourceStatisticsDescriptor=0
+	FIELD_COUNT=28
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=SECONDARY1
+	ReqTrafficClass=4
+	MinTrafficClass=4
+	ReqDeliveryOrder=1
+	MinDeliveryOrder=1
+	ReqDeliverErroneousSDU=8
+	MinDeliverErroneousSDU=8
+	ReqMaxSDUSize=768
+	MinAcceptableMaxSDUSize=512
+	ReqMaxUplinkRate=1024
+	ReqMinUplinkRate=1024
+	ReqMaxDownlinkRate=1024
+	ReqMinDownlinkRate=1024
+	ReqBER=0
+	MaxBER=0
+	ReqSDUErrorRatio=1
+	MaxSDUErrorRatio=1
+	ReqTrafficHandlingPriority=1
+	MinTrafficHandlingPriority=1
+	ReqTransferDelay=250
+	MaxTransferDelay=250
+	ReqGuaranteedUplinkRate=1024
+	MinGuaranteedUplinkRat=1024
+	ReqGuaranteedDownlinkRate=1024
+	MinGuaranteedDownlinkRate=1024
+	SignallingIndication=FALSE
+	ImCnSignallingIndication=FALSE
+	SourceStatisticsDescriptor=0
+	FIELD_COUNT=28
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 3
+	Name=PRIMARY2
+	ReqTrafficClass=1
+	MinTrafficClass=1
+	ReqDeliveryOrder=1
+	MinDeliveryOrder=1
+	ReqDeliverErroneousSDU=1
+	MinDeliverErroneousSDU=1
+	ReqMaxSDUSize=0
+	MinAcceptableMaxSDUSize=0
+	ReqMaxUplinkRate=0
+	ReqMinUplinkRate=0
+	ReqMaxDownlinkRate=0
+	ReqMinDownlinkRate=0
+	ReqBER=1
+	MaxBER=1
+	ReqSDUErrorRatio=1
+	MaxSDUErrorRatio=1
+	ReqTrafficHandlingPriority=1
+	MinTrafficHandlingPriority=1
+	ReqTransferDelay=0
+	MaxTransferDelay=0
+	ReqGuaranteedUplinkRate=0
+	MinGuaranteedUplinkRat=0
+	ReqGuaranteedDownlinkRate=0
+	MinGuaranteedDownlinkRate=0
+	SignallingIndication=FALSE
+	ImCnSignallingIndication=FALSE
+	SourceStatisticsDescriptor=0
+	FIELD_COUNT=28
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 4
+	Name=SECONDARY2
+	ReqTrafficClass=4
+	MinTrafficClass=4
+	ReqDeliveryOrder=1
+	MinDeliveryOrder=1
+	ReqDeliverErroneousSDU=8
+	MinDeliverErroneousSDU=8
+	ReqMaxSDUSize=768
+	MinAcceptableMaxSDUSize=512
+	ReqMaxUplinkRate=1024
+	ReqMinUplinkRate=1024
+	ReqMaxDownlinkRate=1024
+	ReqMinDownlinkRate=1024
+	ReqBER=0
+	MaxBER=0
+	ReqSDUErrorRatio=1
+	MaxSDUErrorRatio=1
+	ReqTrafficHandlingPriority=1
+	MinTrafficHandlingPriority=1
+	ReqTransferDelay=250
+	MaxTransferDelay=250
+	ReqGuaranteedUplinkRate=1024
+	MinGuaranteedUplinkRat=1024
+	ReqGuaranteedDownlinkRate=1024
+	MinGuaranteedDownlinkRate=1024
+	SignallingIndication=FALSE
+	ImCnSignallingIndication=FALSE
+	SourceStatisticsDescriptor=0
+	FIELD_COUNT=28
+END_ADD
+
+
+############################################################
+## PolicySelectorTable
+## 
+[PolicySelectorTable]
+ADD_SECTION
+# COMMDB_ID = 1
+	Name=DefaultRecordName-1
+	PolicyId=1
+	SrcAddress=0:0:0:0:0:0
+	SrcMask=ffff:ffff:ffff:ffff:ffff:ffff
+	DstAddress=fe80::19:5bff:fe8a:abcd
+	DstMask=ffff:ffff:ffff:ffff:ffff:ffff
+	SrcPort=0
+	DstPort=3461
+	SrcPortMax=1031
+	DstPortMax=3461
+	ProtocolId=17
+	IAPid=2
+	Priority=1
+	FIELD_COUNT=13
+END_ADD
+
+ADD_SECTION
+# COMMDB_ID = 2
+	Name=DefaultRecordName-2
+	PolicyId=2
+	SrcPort=0
+	SrcPortMax=0
+	ProtocolId=1
+	IAPid=2
+	Priority=1
+	FIELD_COUNT=7
+END_ADD

--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/BLD.INF	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/BLD.INF	Wed Sep 01 12:40:21 2010 +0100
@@ -81,44 +81,52 @@
 ../configs/te_SpudNetworkSide.xml					z:/testdata/configs/te_spudnetworkside.xml
 ../configs/te_spudnetworkside_promptforauth.xml		z:/testdata/configs/te_spudnetworkside_promptforauth.xml
 ../configs/te_SpudNetworkSide_ppp.xml				z:/testdata/configs/te_spudnetworkside_ppp.xml
-../configs/TE_SpudNetworkSide_PppLoopback.xml       z:/testdata/configs/te_spudnetworkside_ppploopback.xml
-../configs/te_SpudNetworkSide_nifman.xml            z:/testdata/configs/te_spudnetworkside_nifman.xml
-../configs/te_spudNetworkSide_r4_and_r5.xml         z:/testdata/configs/te_spudnetworkside_r4_and_r5.xml
-../configs/te_spudNetworkSide.ini                   z:/testdata/configs/te_spudnetworkside.ini
-../configs/TE_SpudNetworkSideLoopbackCSY.ini        z:/testdata/configs/te_spudnetworksideloopbackcsy.ini
-../configs/TE_SpudNetworkSideLoopbackCSY_serial.ini z:/testdata/configs/te_spudnetworksideloopbackcsy_serial.ini
-../configs/te_spudNetworkSide_nifman.ini            z:/testdata/configs/te_spudnetworkside_nifman.ini
-../configs/te_spudNetworkSide_r4_and_r5.ini         z:/testdata/configs/te_spudnetworkside_r4_and_r5.ini
+../configs/TE_SpudNetworkSide_PppLoopback.xml			z:/testdata/configs/te_spudnetworkside_ppploopback.xml
+../configs/te_SpudNetworkSide_nifman.xml				z:/testdata/configs/te_spudnetworkside_nifman.xml
+../configs/te_spudNetworkSide_r4_and_r5.xml			z:/testdata/configs/te_spudnetworkside_r4_and_r5.xml
+../configs/te_spudNetworkSide.ini					z:/testdata/configs/te_spudnetworkside.ini
+../configs/TE_SpudNetworkSideLoopbackCSY.ini		z:/testdata/configs/te_spudnetworksideloopbackcsy.ini
+../configs/TE_SpudNetworkSideLoopbackCSY_serial.ini	z:/testdata/configs/te_spudnetworksideloopbackcsy_serial.ini
+../configs/te_spudNetworkSide_nifman.ini			z:/testdata/configs/te_spudnetworkside_nifman.ini
+../configs/te_spudNetworkSide_r4_and_r5.ini			z:/testdata/configs/te_spudnetworkside_r4_and_r5.ini
 
 ../configs/TE_PppSize_spud.ini						z:/testdata/configs/te_pppsize_spud.ini
 ../configs/TE_PppSize_spud.xml						z:/testdata/configs/te_pppsize_spud.xml
-../configs/TE_PppSize_config.txt                    z:/testdata/configs/te_pppsize_config.txt
+../configs/TE_PppSize_config.txt					z:/testdata/configs/te_pppsize_config.txt
 
-../configs/TE_SpudNetworkSide_Channel_config.txt    z:/testdata/configs/TE_SpudNetworkSide_Channel_config.txt
+../configs/TE_SpudNetworkSide_Channel_config.txt		z:/testdata/configs/TE_SpudNetworkSide_Channel_config.txt
 
 // Some error codes are platsec dependent
-../configs/TE_SpudNetworkSide_9x.ini                z:/testdata/configs/te_spudnetworkside_platsec.ini
+../configs/TE_SpudNetworkSide_9x.ini 	z:/testdata/configs/te_spudnetworkside_platsec.ini
 
 //Used to trigger GuQos to use Qospolicies.ini file for SetDefaultQoS
-../configs/qospolicies.ini                          z:/testdata/configs/qospolicies.ini
+../configs/qospolicies.ini							z:/testdata/configs/qospolicies.ini
 
-// IPv6 testing
-../configs/te_pdplayer_ip6.ini                      z:/testdata/configs/te_pdplayer_ip6.ini
-../configs/te_pdplayer_ip6_pdpcpr.cfg               z:/testdata/configs/te_pdplayer_ip6.cfg
-../configs/te_pdplayer_ip6_loopbackcsy.ini          z:/testdata/configs/te_pdplayer_ip6_loopbackcsy.ini
-../configs/te_pdplayer_ip6_simtsy_config.txt        z:/testdata/configs/te_pdplayer_ip6_simtsy_config.txt
+../configs/te_pdplayer_ip6.ini							z:/testdata/configs/te_pdplayer_ip6.ini
+#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
+../configs/te_pdplayer_ip6_pdpcpr.cfg						z:/testdata/configs/te_pdplayer_ip6.cfg
+#else
+../configs/te_pdplayer_ip6.cfg							z:/testdata/configs/te_pdplayer_ip6.cfg
+#endif
+
+../configs/te_pdplayer_ip6_loopbackcsy.ini							z:/testdata/configs/te_pdplayer_ip6_loopbackcsy.ini
+../configs/te_pdplayer_ip6_simtsy_config.txt							z:/testdata/configs/te_pdplayer_ip6_simtsy_config.txt
 
 //stress tests
 ../configs/te_pdpstresstestsparam.ini				z:/testdata/configs/te_pdpstresstestsparam.ini
 
 //sip tests
-../configs/te_spudnetworkside_sipaddress.ini        z:/testdata/configs/te_spudnetworkside_sipaddress.ini
-../configs/te_spudnetworkside_sipaddress_config.txt z:/testdata/configs/te_spudnetworkside_sipaddress_config.txt
+../configs/te_spudnetworkside_sipaddress.ini				z:/testdata/configs/te_spudnetworkside_sipaddress.ini
+../configs/te_spudnetworkside_sipaddress_config.txt			z:/testdata/configs/te_spudnetworkside_sipaddress_config.txt
 
 //Min Max MMU tests
 ../configs/TE_RawIpSize.ini				z:/testdata/configs/te_rawipsize.ini
 ../configs/TE_RawIpSize_config.txt			z:/testdata/configs/te_rawipsize_config.txt
+#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
+../configs/TE_RawIpSize_pdpcpr.cfg			z:/testdata/configs/te_rawipsize.cfg
+#else
 ../configs/TE_RawIpSize.cfg			z:/testdata/configs/te_rawipsize.cfg
+#endif
 
 #endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY

--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/TE_spudNetworkSide.iby	Wed Sep 01 12:40:21 2010 +0100
@@ -39,7 +39,6 @@
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_PppLoopback.xml		testdata\configs\te_spudnetworkside_PppLoopback.xml
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_nifman.xml		testdata\configs\te_spudnetworkside_nifman.xml
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_r4_and_r5.xml 			testdata\configs\te_spudnetworkside_r4_and_r5.xml
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_promptforauth.xml	testdata\configs\te_spudnetworkside_promptforauth.xml
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside.ini 			testdata\configs\te_spudnetworkside.ini
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_nifman.ini		testdata\configs\te_spudnetworkside_nifman.ini
 data=EPOCROOT##epoc32\data\z\testdata\configs\te_spudnetworkside_platsec.ini 	testdata\configs\te_spudnetworkside_platsec.ini

--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/group/te_spudNetworkSide.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\te_pdplayer_ip6.script"-"c:\testdata\scripts\te_pdplayer_ip6.script"
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\te_pdpstresstests.script"-"c:\testdata\scripts\te_pdpstresstests.script"
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_PppSize_spud.script"-"c:\testdata\scripts\TE_PppSize_spud.script"
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_spudNetworkSide.script"-"c:\testdata\scripts\TE_spudNetworkSide.script"
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_SpudNetworkside_Channel.script"-"c:\testdata\scripts\TE_SpudNetworkside_Channel.script"
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_spudNetworkSide_nifman.script"-"c:\testdata\scripts\TE_spudNetworkSide_nifman.script"
-""\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_spudNetworkSide_ppp_9x.script"-"c:\testdata\scripts\TE_spudNetworkSide_ppp.script"
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\TE_spudNetworkSide_R4_and_R5.script"-"c:\testdata\scripts\TE_spudNetworkSide_R4_and_R5.script"
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudNetworkSide\scripts\te_spudnetworkside_sipaddress.script"-"c:\testdata\scripts\te_spudnetworkside_sipaddress.script"

--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_RawIpSize.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_RawIpSize.script	Wed Sep 01 12:40:21 2010 +0100
@@ -34,6 +34,12 @@
 
 START_TESTCASE          CBS-RAWIP-0001
 //! @SYMTestCaseID      CBS-RAWIP-0001
+//! @SYMTestCaseDesc Sanity check: Sends & receives the packets of different size.
+//! @SYMTestActions Open two sockets. Sends & receives data frame of configured size.
+//! @SYMTestExpectedResults  Successfully sends & receives the packet.
+//! @SYMTestPriority Critical
+//! @SYMTestStatus Implemented
+//! @SYMTestType CIT
 RUN_TEST_STEP 2000 TE_SpudNetworkSide CRawIpMinMaxMMU z:\testdata\configs\te_rawipsize.ini MMUInfo
 END_TESTCASE            CBS-RAWIP-0001

--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideServer.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideServer.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -251,14 +251,3 @@
           }
 	return step;	
 	}
-
-
-
-
-
-
-
-
-
-
-

--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideSteps.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideSteps.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -80,7 +80,7 @@
 
 #ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
 TVerdict CSpudNetSideTestBase::doTestStepPostambleL()
-	{
+	{	
 	ClearPolicySelector2QosParametersTableL();
 	return TestStepResult();
 	}
@@ -1646,7 +1646,7 @@
 	StopInterfaceL();
 	
 	StopSecondaryL();
-	
+
 	ClearNextPktLoopbackCsyWriteL(loopbackPort);
 	return EPass;
 	}
@@ -1720,7 +1720,7 @@
 		User::Leave(KErrNotFound);
 		}
 	FailNextPktLoopbackCsyWriteL(loopbackPort, KErrCompletion);
-		
+
 	TRequestStatus sendStatus;
 	iSocket.Send(KCommWriteData, 0, sendStatus);
 	User::WaitForRequest(sendStatus);
@@ -1731,6 +1731,7 @@
 	// In the meanwhile, we sneak in and stop the interface.
 	
 	StopInterfaceL();
+
 	ClearNextPktLoopbackCsyWriteL(loopbackPort);
 	return EPass;	
 	};
@@ -2140,9 +2141,8 @@
 #ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
 	VerifySubconnectionCountL(_L("SubConnectionCount1"), PDPIAP);
 #endif
-
-   // start a secondary context
-    InitiateSecondaryStartL();
+	// start a secondary context
+	InitiateSecondaryStartL();
 
 	TInt primaryIapId, secondaryIapId;
 	TestBooleanTrueL(GetIntFromConfig(ConfigSection(), _L("PppIapId1"), primaryIapId), _L("Get Iap ID for first Ppp instance"));
@@ -2152,14 +2152,13 @@
 	CConnectionStart *primaryIfStart = CConnectionStart::NewLC(iEsock, *this, primaryIapId);
 	CConnectionStart *secondaryIfStart = CConnectionStart::NewLC(iEsock, *this, secondaryIapId);
 
-	TRequestStatus progressReqSt;   
-	primaryIfStart->iInterface.ProgressNotification(iProgressBuf, progressReqSt, KConnectionUp );
+    TRequestStatus progressReqSt;   
+    primaryIfStart->iInterface.ProgressNotification(iProgressBuf, progressReqSt, KConnectionUp);
 
-	WaitForProgressNotificationL(progressReqSt, KConnectionUp, 0);
+    WaitForProgressNotificationL(progressReqSt, KConnectionUp, 0); // We can wait here forever. Set timeout on test step.
 
-	secondaryIfStart->iInterface.ProgressNotification(iProgressBuf, progressReqSt, KConnectionUp);
-	WaitForProgressNotificationL(progressReqSt, KConnectionUp, 0);
-
+    secondaryIfStart->iInterface.ProgressNotification(iProgressBuf, progressReqSt, KConnectionUp);
+    WaitForProgressNotificationL(progressReqSt, KConnectionUp, 0); // We can wait here forever. Set timeout on test step.
 
 #ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
 	WaitForQoSEventL(_L("SecondaryActivationEvent2"), _L("SecondaryActivationEvent2Reason"));

--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideSteps.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideSteps.h	Wed Sep 01 12:40:21 2010 +0100
@@ -244,6 +244,6 @@
 	//SIP server address retrieve
 	SYMBIAN_SPUD_TEST_CLASS(CIoctlAddressRetrieve)
 	SYMBIAN_SPUD_TEST_CLASS(CRawIpMinMaxMMU)
-	} 
-	
+	}
+
 #endif

--- a/telephonyprotocols/pdplayer/umts/test/te_spudRSubConn/group/te_spudRSubConn.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudRSubConn\scripts\TE_spudRSubConn.script"-"c:\testdata\scripts\TE_spudRSubConn.script"
-"\sf\os\cellularsrv\telephonyprotocols\pdplayer\umts\test\te_spudRSubConn\scripts\te_spud_staticip.script"-"c:\testdata\scripts\te_spud_staticip.script"

--- a/telephonyprotocols/psdagt/group/dummypsdagt.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/psdagt/group/dummypsdagt.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-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"
@@ -34,6 +34,8 @@
 
 LIBRARY			euser.lib  dummyetel.lib nifman.lib 
 
+#include	<comms-infras/commsdebugutility.mmh>
+
 #if defined(WINS)
 deffile    /epoc32/release/wins/agent.def
 #elif defined(GCC32)

--- a/telephonyprotocols/psdagt/group/psdagt.iby	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/psdagt/group/psdagt.iby	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -23,6 +23,7 @@
 #include <etel.iby>
 #include <etelpckt.iby>
 #include <commdb.iby>
+#include <flogger.iby>
 #include <nifman.iby>
 
 file=ABI_DIR\DEBUG_DIR\psd.agt		System\Libs\psd.agt

--- a/telephonyprotocols/psdagt/group/psdagt.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/psdagt/group/psdagt.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -34,12 +34,11 @@
 
 USERINCLUDE		../src
 USERINCLUDE		../inc
-USERINCLUDE		../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY			euser.lib  etel.lib etelpckt.lib nifman.lib 				etelmm.lib
-
+#include	<comms-infras/commsdebugutility.mmh>
 
 #if defined(WINS)
 deffile    /epoc32/release/wins/agent.def

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/psdagt/inc/debuglogger.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,40 @@
+/**
+* Copyright (c) 2003-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:
+* PSD AGX Data and Event Logger header
+* 
+*
+*/
+
+
+
+/**
+ @file DebugLogger.h
+ @internalComponent
+*/
+
+#ifndef __DEBUGLOGGER_H__
+#define __DEBUGLOGGER_H__
+
+#include "comms-infras/commsdebugutility.h"
+#include <e32base.h>
+
+/**
+@internalComponent
+*/
+_LIT8(KPsdAgxLogFile,"PSDAGX.TXT");
+_LIT8(KPsdAgxLogFolder,"PSD");
+
+
+#endif	// __DEBUGLOGGER_H__

--- a/telephonyprotocols/psdagt/src/PSDAGTBase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/psdagt/src/PSDAGTBase.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,13 +19,8 @@
  @file PSDAGTBase.cpp
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "PSDAGTBaseTraces.h"
-#endif
-
 #include "PSDAGTBase.h"
+#include "debuglogger.h"
 #include "psdagt.h"
 
 /**
@@ -125,16 +120,20 @@
 @exception Panics if connection direction is unknown.
 */
 	{
+	__FLOG_STMT(_LIT8(logString1,"GPRS:\tCreating a new PSD state machine - %s");)
+	
 	if (aDirection==ECommDbConnectionDirectionOutgoing)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDAGENT_CREATEAGENTSML_1,"GPRS:\tCreating a new PSD state machine - Outbound");
+		__FLOG_STMT(const TText8 direction[] = "Outbound";)
+		__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&direction);
 		return CPsdOutSM::NewL(aObserver,aDlgPrc,aDb);
 		}
 	else 
 		{
 #ifndef INCOMING_NOT_SUPORTED
 		__ASSERT_ALWAYS(aDirection==ECommDbConnectionDirectionIncoming, PanicAgx(EPsdBadDirection));
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDAGENT_CREATEAGENTSML_2,"GPRS:\tCreating a new PSD state machine - Inbound");
+		__FLOG_STMT(const TText8 direction[] = "Inbound";)
+		__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&direction);
 		return CPsdInSM::NewL(aObserver,aDlgPrc,aDb);
 #else
 		User::Leave(KErrNotSupported);

--- a/telephonyprotocols/psdagt/src/psdentry.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/psdagt/src/psdentry.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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"
@@ -19,6 +19,7 @@
 */
 
 #include "psdagt.h"
+#include "debuglogger.h"
 
 
 /**

--- a/telephonyprotocols/psdagt/src/psdstates.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/psdagt/src/psdstates.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -17,12 +17,6 @@
  @file PsdStates.cpp
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "psdstatesTraces.h"
-#endif
-
 #include <comms-infras/cagentsmbase.h>
 #include <etelpckt.h>
 #include <connectprog.h>  // for circuit-switched progress enums
@@ -33,6 +27,7 @@
 #include "psdagt.h"
 #include "psdprog.h"
 
+#include "debuglogger.h"
 #include <logengevents.h>
 
 CPsdOutInit::CPsdOutInit(MAgentStateMachineEnv* aObserver,MPsdEnv* aPsdSM, MPsdCommDbAccess* aDb)
@@ -191,8 +186,9 @@
 */
 	{
 	__ASSERT_DEBUG(iSM,User::Invariant());
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDINITBASE_DOSTARTSTATEL_1, "Packet Data:\tInitialising");
-	
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tInitialising");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1());
+
 	iSMObserver->PreventConnectionRetries();
 	//
 	//	PSD AGX does not allow any more connection retries. It assumes that GenConn has
@@ -278,7 +274,8 @@
 Complete state for the initialisation state for both incomming and outgoing connections.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDINITBASE_RUNL_1, "Packet Data:\tInitialised");
+	__FLOG_STMT(_LIT8(logString2,"Packet Data:\tInitialised");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString2());
 	if (iStatus!=KErrNone)
 		iSMObserver->ConnectionComplete(EPsdStartingConfiguration,iStatus.Int()); // correct progress?
 	else
@@ -327,7 +324,8 @@
 		{
 		User::Leave(KErrNotSupported);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCHECKCONFIG_DOINITL_1,"Packet Data:\tChecked Config");
+	__FLOG_STMT(_LIT8(logString2,"Packet Data:\tChecked Config");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString2());
 	}
 
 void CPsdCheckConfig::RunL()
@@ -374,7 +372,8 @@
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	__ASSERT_DEBUG(iSMObserver,User::Invariant());
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDNETWORKCHECK_STARTSTATE_1,"Packet Data:\tChecking network availability");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tChecking network availability");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1());
 
 	iSubState = EGettingInitialStatus;
 	iSM->PacketNetwork().GetNtwkRegStatus(iStatus,iRegStatus);
@@ -393,7 +392,8 @@
 		iRegStatus==RPacketService::ENotRegisteredNotSearching || 
 		iRegStatus==RPacketService::ENotRegisteredAndNotAvailable)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDNETWORKCHECK_DONETWORKCHECK_1, "Packet Data:\tNo network");
+		__FLOG_STMT(_LIT8(logString1,"Packet Data:\tNo network");)
+		__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1());
 		JumpToRunl(KErrNetConNoGPRSNetwork);
 		return;
 		}
@@ -402,7 +402,8 @@
 		iRegStatus==RPacketService::ENotRegisteredButAvailable ||
 		iRegStatus==RPacketService::EUnknown)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDNETWORKCHECK_DONETWORKCHECK_2,"Packet Data:\tReg status %d. Proceeding",iRegStatus);
+		__FLOG_STMT(_LIT8(logString1,"Packet Data:\tReg status %d. Proceeding");)
+		__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),iRegStatus);
 
 		iSM->BaseEnv().CompleteState(KErrNone);
 		return;
@@ -487,7 +488,8 @@
 	{
 	__ASSERT_DEBUG(iSM,User::Invariant());
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDWAITFORINCOMING_STARTSTATE_1,"Packet Data:\tWaiting for incoming Packet request");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tWaiting for incoming Packet request");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 
 	iSM->PacketNetwork().NotifyContextActivationRequested(iStatus,iPdpTypeRequested,iAddressRequested);
 	SetActive();
@@ -505,7 +507,8 @@
 
 	if (iStatus==KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDWAITFORINCOMING_RUNL_1, "Packet Data:\tReceived network context activation request");
+		__FLOG_STMT(_LIT8(logString1,"Packet Data:\tReceived network context activation request");)
+		__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 		
 		if(iSM->Config().QueryIfIncommingConnectionAcceptable(iPdpTypeRequested,iAddressRequested) )
 			{
@@ -586,7 +589,8 @@
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	__ASSERT_DEBUG(iSMObserver,User::Invariant());
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCREATECONTEXT_STARTSTATE_1, "Packet Data:\tCreating context");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tCreating context");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 
 	RPacketService& packetNetwork = iSM->PacketNetwork();
 	RPacketContext& context = iSM->Context();
@@ -613,7 +617,8 @@
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	__ASSERT_DEBUG(iSMObserver,User::Invariant());
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCREATECONTEXT_RUNL_1, "Packet Data:\tCompleted with error %d",iStatus.Int());
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tCompleted with error %d");)
+	__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),iStatus.Int());
 
 	if (iStatus==KErrNone)
 		{
@@ -682,7 +687,8 @@
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	__ASSERT_DEBUG(iSMObserver,User::Invariant());
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCREATEQOS_STARTSTATE_1, "Packet Data:\tCreating QoS");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tCreating QoS");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 
 	RPacketContext& context = iSM->Context();
 	RPacketQoS& qoS = iSM->QoS();
@@ -713,7 +719,8 @@
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	__ASSERT_DEBUG(iSMObserver,User::Invariant());
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCREATEQOS_RUNL_1,"Packet Data:\tCompleted with error %d",iStatus.Int());
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tCompleted with error %d");)
+	__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),iStatus.Int());
 
 	if (iStatus==KErrNone)
 		{
@@ -778,8 +785,8 @@
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	__ASSERT_DEBUG(iSMObserver,User::Invariant());
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDACTIVATECONTEXT_STARTSTATE_1, "Packet Data:\tActivating context");
-	
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tActivating context");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 
 	iSMObserver->UpdateProgress(EPsdStartingActivation,KErrNone);
 	// Check if the context is already active since in the reconnect case it may be
@@ -810,7 +817,8 @@
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	__ASSERT_DEBUG(iSMObserver,User::Invariant());
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDACTIVATECONTEXT_RUNL_1, "Packet Data:\tCompleted with error %d",iStatus.Int());
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tCompleted with error %d");)
+	__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),iStatus.Int());
 
 	if( (iSubState==EActivatingContext&&(iStatus==KErrNone || iStatus==KErrNotSupported) )
 		||(iSubState==ELoaningCommPort&&iStatus==KErrNone) ) 
@@ -834,7 +842,8 @@
 				{
 				iSMObserver->UpdateProgress(EPsdFinishedActivation,KErrNone);// may want to do this when it really
 																// activates
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDACTIVATECONTEXT_RUNL_2,"Packet Data:\tHanding control to PPP");
+				__FLOG_STMT(_LIT8(logString1,"Packet Data:\tHanding control to PPP");)
+				__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 
 				iSMObserver->ServiceStarted();	
 				iSM->BaseEnv().CompleteState(KErrNone);
@@ -933,8 +942,8 @@
 	//stuff.
 	RequestStatusChange();
  
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_STARTSTATE_1, "Packet Data:\tCalling ConnectionComplete");
-
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tCalling ConnectionComplete");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1());
 
 	iSMObserver->Notification(EAgentToNifEventTypeModifyInitialTimer,NULL);
 	iSMObserver->UpdateProgress(KConnectionOpen,KErrNone); // I think NIFMAN just swallows this after
@@ -960,7 +969,8 @@
 		if(err != KErrNone)
 			{
 #ifdef __FLOG_ACTIVE
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_LOGACTIVE_1, "CPsdOpen:\t Error in getting remote party %d.",err);
+			_LIT8(logString1,"CPsdOpen:\t Error in getting remote party %d.");
+			__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),err);	
 #endif
 			}
 		iEventLoggerStarted = ETrue;
@@ -1016,14 +1026,16 @@
 	{
 	__ASSERT_DEBUG(iSM && iSMObserver,User::Invariant());
 
+	__FLOG_STMT(_LIT8(logString1,"PacketData:\tStatus change to %s\0");)
+
 	if (iStatus==KErrNone)
 		{
 		switch (iContextStatus)
 			{
 		case RPacketContext::EStatusSuspended:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_1, "PacketData:\tStatus change to suspended");
-			
+			__FLOG_STMT(const TText8 value[] = "suspended";)
+			__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
 			iSMObserver->Notification(EAgentToNifEventTypeDisableTimers,NULL);	
 			iSMObserver->UpdateProgress(EPsdSuspended,KErrNone);
 			iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_SUSPENDED, KLogPacketDataEventTypeUid);
@@ -1035,15 +1047,16 @@
 			// if reconnect happened then the logger is allready started and we just do an update
 			if (!iEventLoggerStarted)
 				{
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_2, "PacketData:\tStatus change to log active");
+				__FLOG_STMT(const TText8 value[] = "log active";)
+				__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
 				WatchForConfigChangesL();	//those 2 functions should have been called in start state but
 				LogActive();				//RPacketContext was not EStatusActive at that time
 				}
 			else	// the LogCallStart() has completed 
 				{
 				iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_CONNECTED, KLogPacketDataEventTypeUid);
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_3, "PacketData:\tStatus change to active");
-				
+				__FLOG_STMT(const TText8 value[] = "active";)
+				__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
 				}
 			iSMObserver->Notification(EAgentToNifEventTypeEnableTimers,NULL);	
 			iSMObserver->UpdateProgress(KConnectionOpen,KErrNone);
@@ -1052,7 +1065,8 @@
 			break;
 		case RPacketContext::EStatusDeactivating:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_4, "PacketData:\tStatus change to deactivating");
+			__FLOG_STMT(const TText8 value[] = "deactivating";)
+			__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
 			iSMObserver->UpdateProgress(EPsdStartingDeactivation,KErrNone);
 			iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_DISCONNECTING, KLogPacketDataEventTypeUid);
 			RequestStatusChange();			
@@ -1060,20 +1074,23 @@
 			break;
 		case RPacketContext::EStatusInactive:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_5, "PacketData:\tStatus change to inactive");
+			__FLOG_STMT(const TText8 value[] = "inactive";)
+			__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
 			iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_DISCONNECTED, KLogPacketDataEventTypeUid);
 			}
 			break;
 		case RPacketContext::EStatusDeleted:
 			{ 
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_6, "PacketData:\tStatus change to deleted");
+			__FLOG_STMT(const TText8 value[] = "deleted";)
+			__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
 			iSMObserver->UpdateProgress(EPsdFinishedDeactivation,KErrNone);
 			iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_DISCONNECTED, KLogPacketDataEventTypeUid);
 			}
 			break;
 		case RPacketContext::EStatusActivating:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_7, "PacketData:\tStatus change to activating");
+			__FLOG_STMT(const TText8 value[] = "activating";)
+			__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
 			iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_CONNECTING, KLogPacketDataEventTypeUid);
 			RequestStatusChange();
 			}
@@ -1178,7 +1195,8 @@
 	{
 	__ASSERT_DEBUG(iSM && iSMObserver,User::Invariant());
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDRECOVERCOMMPORT_STARTSTATE_1, "Packet Data:\tRecovering Comm Port to ETel");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tRecovering Comm Port to ETel");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 
 	iSMObserver->UpdateProgress(EPsdStartingDeactivation,KErrNone);
 	iSM->Context().RecoverCommPort(iStatus);
@@ -1192,7 +1210,8 @@
 	{
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	// what can we do with errors at this stage in the game?
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDRECOVERCOMMPORT_RUNL_1, "Packet Data:\tRecovered Comm Port");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tRecovered Comm Port");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 
 	iSM->BaseEnv().CompleteState(KErrNone);
 	}
@@ -1260,7 +1279,8 @@
 Function called by the genconn state machine framework to start the state
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCLOSELOG_STARTSTATE_1, "Packet Data:\tClosing Log");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tClosing Log");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1());
 	// We need to make sure that logging is finished before closing everything.
 	// forward iStatus to the logger, which will be responsible to complete iStatus when it is finished.
 			iStatus = KRequestPending;
@@ -1329,7 +1349,8 @@
 	{
 	__ASSERT_DEBUG(iSM,User::Invariant());
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDDEACTIVATION_STARTSTATE_1, "Packet Data:\tDeactivating Context");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tDeactivating Context");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 
 	iSM->Context().Deactivate(iStatus);
 	SetActive();
@@ -1342,8 +1363,9 @@
 	{
 	__ASSERT_DEBUG(iSM && iSMObserver,User::Invariant());
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDDEACTIVATION_RUNL_1,"Packet Data:\tDeactivated Context");
-		
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tDeactivated Context");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
+	
 	iSMObserver->UpdateProgress(EPsdFinishedDeactivation,KErrNone);
 	iSM->BaseEnv().CompleteState(KErrNone);
 
@@ -1407,7 +1429,8 @@
 	{
 	__ASSERT_DEBUG(iSM && iSMObserver,User::Invariant());
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCLOSURE_RUNL_1,"Packet Data:\tClosing down");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tClosing down");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 
 	RTelServer& etel = iSM->TelServer();
 	RPhone& phone = iSM->Phone();

--- a/telephonyprotocols/psdagt/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyprotocols/psdagt/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CPSDACTIVATECONTEXT_RUNL_1=0x20
-[TRACE]TRACE_INTERNALS[0x88]_CPSDACTIVATECONTEXT_RUNL_2=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CPSDACTIVATECONTEXT_STARTSTATE_1=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_CPSDAGENT_CREATEAGENTSML_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CPSDAGENT_CREATEAGENTSML_2=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CPSDCHECKCONFIG_DOINITL_1=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CPSDCLOSELOG_STARTSTATE_1=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CPSDCLOSURE_RUNL_1=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CPSDCREATECONTEXT_RUNL_1=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CPSDCREATECONTEXT_STARTSTATE_1=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CPSDCREATEQOS_RUNL_1=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CPSDCREATEQOS_STARTSTATE_1=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CPSDDEACTIVATION_RUNL_1=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CPSDDEACTIVATION_STARTSTATE_1=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CPSDINITBASE_DOSTARTSTATEL_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CPSDINITBASE_RUNL_1=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CPSDNETWORKCHECK_DONETWORKCHECK_1=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CPSDNETWORKCHECK_DONETWORKCHECK_2=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_CPSDNETWORKCHECK_STARTSTATE_1=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_LOGACTIVE_1=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_RUNL_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_RUNL_2=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_RUNL_3=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_RUNL_4=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_RUNL_5=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_RUNL_6=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_RUNL_7=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_STARTSTATE_1=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_CPSDRECOVERCOMMPORT_RUNL_1=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CPSDRECOVERCOMMPORT_STARTSTATE_1=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CPSDWAITFORINCOMING_RUNL_1=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CPSDWAITFORINCOMING_STARTSTATE_1=0x15

--- a/telephonyprotocols/qos3gppcpr/inc/Qos3GPP_subconparams.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/qos3gppcpr/inc/Qos3GPP_subconparams.h	Wed Sep 01 12:40:21 2010 +0100
@@ -26,6 +26,8 @@
 #define QOS3GPP_SUBCONPARAMS_H
 
 #include <es_sock.h>
+#include <comms-infras/metadata.h>
+#include <comms-infras/metatype.h>
 
 #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <etelqos.h>

--- a/telephonyprotocols/qos3gppcpr/src/Qos3GPP_subconnExtFactory.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/qos3gppcpr/src/Qos3GPP_subconnExtFactory.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 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"

--- a/telephonyprotocols/qos3gppcpr/src/Qos3GPP_subconparams.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/qos3gppcpr/src/Qos3GPP_subconparams.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2010 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"

--- a/telephonyprotocols/qosextnapi/group/qosextnapi.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/qosextnapi/group/qosextnapi.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -37,7 +37,6 @@
 SOURCEPATH  ../src
 SOURCE      umtsextn.cpp sblpextn.cpp imsextn.cpp
 USERINCLUDE ../inc
-USERINCLUDE ../traces
 
 #if defined(QOS_TESTING)
 USERINCLUDE     ..\..\..\..\unref\orphan\comgen\networking\qostesting\umtssim\inc
@@ -46,6 +45,7 @@
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY         euser.lib qoslib.lib
+DEBUGLIBRARY	flogger.lib
 
 DEFFILE     qosextnapi.def

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/qosextnapi/inc/qosextn_log.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,74 @@
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// @file qosextn_log.h
+// Header file for qos extn API log
+//
+
+
+
+/**
+ @internalComponent
+*/
+#if !defined(__LOG_H__)
+#define __LOG_H__
+
+#if !defined(_DEBUG)
+#  define LOG(a)
+#else
+#  define LOG(a) a 
+#  define _LOG
+
+#include <flogger.h>
+
+_LIT(KQoSExtnLogFolder,"qosextnapi");
+_LIT(KQoSExtnLogFile,"qosextnapi.txt");  
+
+class Log
+	{
+public:
+	static inline void Write(const TDesC& aDes);
+	static inline void Printf(TRefByValue<const TDesC> aFmt, ...);
+	static inline void Printf(TRefByValue<const TDesC8> aFmt, ...);
+	static inline void HexDump(const TText* aHeader, const TText* aMargin, const TUint8* aPtr, TInt aLen);
+	};
+
+inline void Log::Write(const TDesC& aDes)
+{
+	RFileLogger::Write(KQoSExtnLogFolder(), KQoSExtnLogFile(), EFileLoggingModeAppend, aDes);
+}
+	
+
+inline void Log::Printf(TRefByValue<const TDesC> aFmt, ...)
+{
+	VA_LIST list;
+	VA_START(list,aFmt);
+	RFileLogger::WriteFormat(KQoSExtnLogFolder(), KQoSExtnLogFile(), EFileLoggingModeAppend, aFmt, list);
+}
+
+inline void Log::Printf(TRefByValue<const TDesC8> aFmt, ...)
+{
+	VA_LIST list;
+	VA_START(list,aFmt);
+	RFileLogger::WriteFormat(KQoSExtnLogFolder(), KQoSExtnLogFile(), EFileLoggingModeAppend, aFmt, list);
+}
+
+inline void Log::HexDump(const TText* aHeader, const TText* aMargin, const TUint8* aPtr, TInt aLen)
+{
+	RFileLogger::HexDump(KQoSExtnLogFolder(), KQoSExtnLogFile(), EFileLoggingModeAppend, aHeader, aMargin, aPtr, aLen);
+}
+
+#endif // !defined(_DEBUG)
+
+#endif //__LOG_H__
+

--- a/telephonyprotocols/qosextnapi/src/imsextn.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/qosextnapi/src/imsextn.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -15,10 +15,7 @@
 //
 
 #include "imsextn.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "imsextnTraces.h"
-#endif
+#include "qosextn_log.h"
 
 //#ifdef SYMBIAN_NETWORKING_UMTS5
 
@@ -135,13 +132,13 @@
 	{
 	iIms = aIms;
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CIMSPOLICY_SETIMSPARAMETER_1, "<------------------------------------------------\n");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CIMSPOLICY_SETIMSPARAMETER_2, "CImsPolicy::SetImsParameter");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CIMSPOLICY_SETIMSPARAMETER_3, "\n");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CIMSPOLICY_SETIMSPARAMETER_4, "IMS VALUE SUPPLIED BY CLIENT IS \n");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CIMSPOLICY_SETIMSPARAMETER_5, "\n");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CIMSPOLICY_SETIMSPARAMETER_6, "[IMS Signalling Indicator value is  :   = %d]\n",aIms.GetIMSSigallingIndicator());
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CIMSPOLICY_SETIMSPARAMETER_7, "------------------------------------------------>\n");
+	LOG(Log::Printf(_L("<------------------------------------------------\n")));
+	LOG(Log::Printf(_L("CImsPolicy::SetImsParameter")));
+	LOG(Log::Printf(_L("\n")));
+	LOG(Log::Printf(_L("IMS VALUE SUPPLIED BY CLIENT IS \n")));
+	LOG(Log::Printf(_L("\n")));
+	LOG(Log::Printf(_L("[IMS Signalling Indicator value is  :	 = %d]\n"),aIms.GetIMSSigallingIndicator()));
+	LOG(Log::Printf(_L("------------------------------------------------>\n")));
 	
 	}

--- a/telephonyprotocols/qosextnapi/src/sblpextn.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/qosextnapi/src/sblpextn.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -14,14 +14,9 @@
 // sblpapi.cpp - SBLP QoS API
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "sblpextnTraces.h"
-#endif
-
 #include "sblpextn.h"
 #include "qosextn_constants.h"
+#include "qosextn_log.h"
 #include <networking/qosparameters.h>
 
 // Buffer size
@@ -69,7 +64,7 @@
 
 EXPORT_C CSblpParameters::TFlowIdentifier& CSblpParameters::GetFlowId(TInt aIndex)
 	{
-	__ASSERT_DEBUG(aIndex<iFlowIds.Count(),User::Panic(_L("CSblpParameters::GetFlowId"),KErrArgument));
+	__ASSERT_DEBUG(aIndex<iFlowIds.Count(),User::Panic(_L("Sblp"),KErrArgument));
 	return iFlowIds[aIndex];
 	}
 
@@ -83,7 +78,7 @@
 		TInt errorCode = this->iFlowIds.Append(aFlowIds[i]);
 		if (errorCode != KErrNone) 
 		    {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPARAMETERS_SETFLOWID, "Not Enough Memory");
+            LOG(Log::Printf(_L("CSblpParameters::SetFlowIds - Not Enough Memory!!!\n"));)
 		    }
 		}
 	}
@@ -99,7 +94,7 @@
         errorCode = aFlowIds.Append(this->iFlowIds[i]);
         if (errorCode != KErrNone) 
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPARAMETERS_GETFLOWID, "Not Enough Memory");
+            LOG(Log::Printf(_L("CSblpParameters::GetFlowIds - Not Enough Memory!!!\n"));)
             return errorCode;
             }
 		}
@@ -180,7 +175,7 @@
 	header.reserved = 0;
 	header.protocol_id = 0;
 	bufPtr.Append((TUint8*)&header, sizeof(pfqos_configure));
-	
+
 	pfqos_extension extensionType;
 	extensionType.pfqos_ext_len = 0;
 	extensionType.pfqos_ext_type = EPfqosExtExtension;
@@ -199,11 +194,11 @@
 	iSblp->GetMAT(authToken);
 	SetStringBlockHeader(stringBlock,authToken,KDescSblpMediaAuthorizationToken);
 	bufPtr.Append((TUint8*)&stringBlock, sizeof(pfqos_configblock));
-
 	// put the string now
 	authToken.ZeroTerminate();
 	bufPtr.Append((TUint8*)authToken.Ptr(),KAuthorizationTokenAdjustedStringLength);
 
+
 	// Flowids
 	pfqos_configblock_int ext;
 	TInt i;
@@ -212,13 +207,11 @@
 		CSblpParameters::TFlowIdentifier& flowId = iSblp->GetFlowId(i);
 		SetIntValue(ext,flowId.iMediaComponentNumber,KDescSblpMediaComponentNumber);
 		bufPtr.Append((TUint8*)&ext, sizeof(pfqos_configblock_int));
-
 		SetIntValue(ext,flowId.iIPFlowNumber,KDescSblpIPFlowNumber);
 		bufPtr.Append((TUint8*)&ext, sizeof(pfqos_configblock_int));
 		}
 
 	bufPtr.AppendFill(0, header.pfqos_configure_len * 8 - byte_len);
-
 	return *iData;
 	}
 
@@ -247,32 +240,32 @@
 	
 	*iSblp = aSblp;
 
-
+	LOG(
 	// following code is to create logs
 	TAuthorizationToken authToken;
 	iSblp->GetMAT (authToken);
-    RArray<CSblpParameters::TFlowIdentifier> flowIds;
+	RArray<CSblpParameters::TFlowIdentifier> flowIds;
 	iSblp->GetFlowIds(flowIds);
 	// in case of low memory GetFlowIds might return an error and flowIds might not have all the ids, but we still try to log as much as we can
 	TBuf<KAuthorizationTokenSize> label;
 	label.Copy(authToken);
 		
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_1, "<------------------------------------------------\n");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_2, "CSblpPolicy::SetSblpParameters");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_3, "\n");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_4, "SBLP VALUES SUPPLIED BY CLIENT IS \n");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_5, "\n");
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_6, "[MAT string           :   = %S]\n",label);
+	Log::Printf(_L("<------------------------------------------------\n"));
+	Log::Printf(_L("CSblpPolicy::SetSblpParameters"));
+	Log::Printf(_L("\n"));
+	Log::Printf(_L("SBLP VALUES SUPPLIED BY CLIENT IS \n"));
+	Log::Printf(_L("\n"));
+	Log::Printf(_L("[MAT string			 :	 = %S]\n"),&label);
 	
 	TInt i;
 	for(i=0; i<flowIds.Count();i++)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_7, "Media component number  :   = %d]\n",flowIds[i].iMediaComponentNumber);
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_8, "IP flow number       :  = %d]\n",flowIds[i].iIPFlowNumber);
+		Log::Printf(_L("Media component number  :	 = %d]\n"),flowIds[i].iMediaComponentNumber);
+		Log::Printf(_L("IP flow number		  :	 = %d]\n"),flowIds[i].iIPFlowNumber);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_9, "------------------------------------------------>\n");
+	Log::Printf(_L("------------------------------------------------>\n"));
 	flowIds.Close();
-	
+	)
 	
 	}

--- a/telephonyprotocols/qosextnapi/src/umtsextn.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/qosextnapi/src/umtsextn.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -16,12 +16,8 @@
 
 #include "umtsextn.h"
 #include "qosextn_constants.h"
+#include "qosextn_log.h"
 #include <networking/pfqos.h>
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "umtsextnTraces.h"
-#endif
 //
 // TUmtsQoSParameters
 //
@@ -611,48 +607,48 @@
 EXPORT_C void CUmtsQoSPolicy::SetQoSRequested(const TUmtsQoSParameters& aRequested)
 	{
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_1, "<------------------------------------------------\n");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_2, "CUmtsQoSPolicy::SetQoSRequested");
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_3, "\n");
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_4, "REQUESTED R99 VALUES SUPPLIED BY CLIENT IS \n");
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_5, "\n");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_6, " [aRequested.iTrafficClass         = %d]\n",aRequested.iTrafficClass);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_7, " [aRequested.iDeliveryOrder            = %d]\n",aRequested.iDeliveryOrder);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_8, " [aRequested.iDeliveryOfErroneusSdu = %d]\n",aRequested.iDeliveryOfErroneusSdu);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_9, " [aRequested.iMaxSduSize           = %d]\n",aRequested.iMaxSduSize);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_10, " [aRequested.iMaxBitrateUplink    = %d]\n",aRequested.iMaxBitrateUplink);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_11, " [aRequested.iMaxBitrateDownlink  = %d]\n",aRequested.iMaxBitrateDownlink);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_12, " [aRequested.iResidualBer         = %d]\n",aRequested.iResidualBer);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_13, " [aRequested.iErrorRatio          = %d]\n",aRequested.iErrorRatio);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_14, " [aRequested.iPriority            = %d]\n",aRequested.iPriority);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_15, " [aRequested.iTransferDelay       = %d]\n",aRequested.iTransferDelay);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_16, " [aRequested.iGuaBitrateUplink    = %d]\n",aRequested.iGuaBitrateUplink);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_17, " [aRequested.iGuaBitrateDownlink  = %d]\n",aRequested.iGuaBitrateDownlink);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_18, "------------------------------------------------>\n");
+	LOG(Log::Printf(_L("<------------------------------------------------\n")));
+	LOG(Log::Printf(_L("CUmtsQoSPolicy::SetQoSRequested")));
+    LOG(Log::Printf(_L("\n")));
+    LOG(Log::Printf(_L("REQUESTED R99 VALUES SUPPLIED BY CLIENT IS \n")));
+    LOG(Log::Printf(_L("\n")));
+	LOG(Log::Printf(_L(" [aRequested.iTrafficClass 			= %d]\n"),aRequested.iTrafficClass));
+	LOG(Log::Printf(_L(" [aRequested.iDeliveryOrder 		= %d]\n"),aRequested.iDeliveryOrder));
+	LOG(Log::Printf(_L(" [aRequested.iDeliveryOfErroneusSdu = %d]\n"),aRequested.iDeliveryOfErroneusSdu));
+	LOG(Log::Printf(_L(" [aRequested.iMaxSduSize			= %d]\n"),aRequested.iMaxSduSize));
+	LOG(Log::Printf(_L(" [aRequested.iMaxBitrateUplink		= %d]\n"),aRequested.iMaxBitrateUplink));
+	LOG(Log::Printf(_L(" [aRequested.iMaxBitrateDownlink	= %d]\n"),aRequested.iMaxBitrateDownlink));
+	LOG(Log::Printf(_L(" [aRequested.iResidualBer			= %d]\n"),aRequested.iResidualBer));
+	LOG(Log::Printf(_L(" [aRequested.iErrorRatio			= %d]\n"),aRequested.iErrorRatio));
+	LOG(Log::Printf(_L(" [aRequested.iPriority				= %d]\n"),aRequested.iPriority));
+	LOG(Log::Printf(_L(" [aRequested.iTransferDelay			= %d]\n"),aRequested.iTransferDelay));
+	LOG(Log::Printf(_L(" [aRequested.iGuaBitrateUplink		= %d]\n"),aRequested.iGuaBitrateUplink));
+	LOG(Log::Printf(_L(" [aRequested.iGuaBitrateDownlink	= %d]\n"),aRequested.iGuaBitrateDownlink));
+	LOG(Log::Printf(_L("------------------------------------------------>\n")));
 	
 	iRequested = aRequested;
 	}
 
 EXPORT_C void CUmtsQoSPolicy::SetQoSMinimum(const TUmtsQoSParameters& aMinimum)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_1, "<------------------------------------------------\n");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_2, "CUmtsQoSPolicy::SetQoSMinimum");
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_3, "\n");
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_4, "MINIMUM R99 VALUES SUPPLIED BY CLIENT IS \n");
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_5, "\n");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_6, " [aMinimum.iTrafficClass             = %d]\n",aMinimum.iTrafficClass);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_7, " [aMinimum.iDeliveryOrder            = %d]\n",aMinimum.iDeliveryOrder);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_8, " [aMinimum.iDeliveryOfErroneusSdu    = %d]\n",aMinimum.iDeliveryOfErroneusSdu);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_9, " [aMinimum.iMaxSduSize               = %d]\n",aMinimum.iMaxSduSize);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_10, " [aMinimum.iMaxBitrateUplink        = %d]\n",aMinimum.iMaxBitrateUplink);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_11, " [aMinimum.iMaxBitrateDownlink      = %d]\n",aMinimum.iMaxBitrateDownlink);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_12, " [aMinimum.iResidualBer             = %d]\n",aMinimum.iResidualBer);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_13, " [aMinimum.iErrorRatio              = %d]\n",aMinimum.iErrorRatio);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_14, " [aMinimum.iPriority                = %d]\n",aMinimum.iPriority);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_15, " [aMinimum.iTransferDelay           = %d]\n",aMinimum.iTransferDelay);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_16, " [aMinimum.iGuaBitrateUplink        = %d]\n",aMinimum.iGuaBitrateUplink);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_17, " [aMinimum.iGuaBitrateDownlink      = %d]\n",aMinimum.iGuaBitrateDownlink);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_18, "------------------------------------------------>\n");
+	LOG(Log::Printf(_L("<------------------------------------------------\n")));
+	LOG(Log::Printf(_L("CUmtsQoSPolicy::SetQoSMinimum")));
+    LOG(Log::Printf(_L("\n")));
+    LOG(Log::Printf(_L("MINIMUM R99 VALUES SUPPLIED BY CLIENT IS \n")));
+    LOG(Log::Printf(_L("\n")));
+	LOG(Log::Printf(_L(" [aMinimum.iTrafficClass 			= %d]\n"),aMinimum.iTrafficClass));
+	LOG(Log::Printf(_L(" [aMinimum.iDeliveryOrder 			= %d]\n"),aMinimum.iDeliveryOrder));
+	LOG(Log::Printf(_L(" [aMinimum.iDeliveryOfErroneusSdu 	= %d]\n"),aMinimum.iDeliveryOfErroneusSdu));
+	LOG(Log::Printf(_L(" [aMinimum.iMaxSduSize				= %d]\n"),aMinimum.iMaxSduSize));
+	LOG(Log::Printf(_L(" [aMinimum.iMaxBitrateUplink		= %d]\n"),aMinimum.iMaxBitrateUplink));
+	LOG(Log::Printf(_L(" [aMinimum.iMaxBitrateDownlink		= %d]\n"),aMinimum.iMaxBitrateDownlink));
+	LOG(Log::Printf(_L(" [aMinimum.iResidualBer				= %d]\n"),aMinimum.iResidualBer));
+	LOG(Log::Printf(_L(" [aMinimum.iErrorRatio				= %d]\n"),aMinimum.iErrorRatio));
+	LOG(Log::Printf(_L(" [aMinimum.iPriority				= %d]\n"),aMinimum.iPriority));
+	LOG(Log::Printf(_L(" [aMinimum.iTransferDelay			= %d]\n"),aMinimum.iTransferDelay));
+	LOG(Log::Printf(_L(" [aMinimum.iGuaBitrateUplink		= %d]\n"),aMinimum.iGuaBitrateUplink));
+	LOG(Log::Printf(_L(" [aMinimum.iGuaBitrateDownlink		= %d]\n"),aMinimum.iGuaBitrateDownlink));
+	LOG(Log::Printf(_L("------------------------------------------------>\n")));
 	
 	iMinimum = aMinimum;
 	}
@@ -1173,52 +1169,52 @@
 EXPORT_C void CUmtsR5QoSPolicy::SetQoSRequested(const TUmtsR5QoSParameters& aRequested)
 	{
     
-   	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_1, "<------------------------------------------------\n");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_2, "CUmtsR5QoSPolicy::SetQoSRequested");
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_3, "\n");
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_4, "REQUESTED R5 VALUES SUPPLIED BY CLIENT IS \n");
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_5, "\n");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_6, " [aRequested.iTrafficClass           = %d]\n",aRequested.iTrafficClass);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_7, " [aRequested.iDeliveryOrder          = %d]\n",aRequested.iDeliveryOrder);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_8, " [aRequested.iDeliveryOfErroneusSdu = %d]\n",aRequested.iDeliveryOfErroneusSdu);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_9, " [aRequested.iMaxSduSize             = %d]\n",aRequested.iMaxSduSize);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_10, " [aRequested.iMaxBitrateUplink      = %d]\n",aRequested.iMaxBitrateUplink);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_11, " [aRequested.iMaxBitrateDownlink    = %d]\n",aRequested.iMaxBitrateDownlink);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_12, " [aRequested.iResidualBer           = %d]\n",aRequested.iResidualBer);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_13, " [aRequested.iErrorRatio            = %d]\n",aRequested.iErrorRatio);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_14, " [aRequested.iPriority              = %d]\n",aRequested.iPriority);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_15, " [aRequested.iTransferDelay         = %d]\n",aRequested.iTransferDelay);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_16, " [aRequested.iGuaBitrateUplink      = %d]\n",aRequested.iGuaBitrateUplink);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_17, " [aRequested.iGuaBitrateDownlink    = %d]\n",aRequested.iGuaBitrateDownlink);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_18, " [aRequested.iSignallingIndicator   = %d]\n",aRequested.iSignallingIndicator);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_19, " [aRequested.iSrcStatisticsDesc     = %d]\n",aRequested.iSrcStatisticsDesc);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_20, "------------------------------------------------>\n");
+   	LOG(Log::Printf(_L("<------------------------------------------------\n")));
+	LOG(Log::Printf(_L("CUmtsR5QoSPolicy::SetQoSRequested")));
+    LOG(Log::Printf(_L("\n")));
+    LOG(Log::Printf(_L("REQUESTED R5 VALUES SUPPLIED BY CLIENT IS \n")));
+    LOG(Log::Printf(_L("\n")));
+	LOG(Log::Printf(_L(" [aRequested.iTrafficClass 			= %d]\n"),aRequested.iTrafficClass));
+	LOG(Log::Printf(_L(" [aRequested.iDeliveryOrder 		= %d]\n"),aRequested.iDeliveryOrder));
+	LOG(Log::Printf(_L(" [aRequested.iDeliveryOfErroneusSdu = %d]\n"),aRequested.iDeliveryOfErroneusSdu));
+	LOG(Log::Printf(_L(" [aRequested.iMaxSduSize			= %d]\n"),aRequested.iMaxSduSize));
+	LOG(Log::Printf(_L(" [aRequested.iMaxBitrateUplink		= %d]\n"),aRequested.iMaxBitrateUplink));
+	LOG(Log::Printf(_L(" [aRequested.iMaxBitrateDownlink	= %d]\n"),aRequested.iMaxBitrateDownlink));
+	LOG(Log::Printf(_L(" [aRequested.iResidualBer			= %d]\n"),aRequested.iResidualBer));
+	LOG(Log::Printf(_L(" [aRequested.iErrorRatio			= %d]\n"),aRequested.iErrorRatio));
+	LOG(Log::Printf(_L(" [aRequested.iPriority				= %d]\n"),aRequested.iPriority));
+	LOG(Log::Printf(_L(" [aRequested.iTransferDelay			= %d]\n"),aRequested.iTransferDelay));
+	LOG(Log::Printf(_L(" [aRequested.iGuaBitrateUplink		= %d]\n"),aRequested.iGuaBitrateUplink));
+	LOG(Log::Printf(_L(" [aRequested.iGuaBitrateDownlink	= %d]\n"),aRequested.iGuaBitrateDownlink));
+	LOG(Log::Printf(_L(" [aRequested.iSignallingIndicator	= %d]\n"),aRequested.iSignallingIndicator));
+	LOG(Log::Printf(_L(" [aRequested.iSrcStatisticsDesc	    = %d]\n"),aRequested.iSrcStatisticsDesc));	
+	LOG(Log::Printf(_L("------------------------------------------------>\n")));
 	
 	iRequested = aRequested;
 	}
 
 EXPORT_C void CUmtsR5QoSPolicy::SetQoSMinimum(const TUmtsR5QoSParameters& aMinimum)
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_1, "<------------------------------------------------\n");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_2, "CUmtsR5QoSPolicy::SetQoSMinimum");
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_3, "\n");
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_4, "MINIMUM R5 VALUES SUPPLIED BY CLIENT IS \n");
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_5, "\n");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_6, " [aMinimum.iTrafficClass           = %d]\n",aMinimum.iTrafficClass);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_7, " [aMinimum.iDeliveryOrder          = %d]\n",aMinimum.iDeliveryOrder);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_8, " [aMinimum.iDeliveryOfErroneusSdu  = %d]\n",aMinimum.iDeliveryOfErroneusSdu);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_9, " [aMinimum.iMaxSduSize             = %d]\n",aMinimum.iMaxSduSize);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_10, " [aMinimum.iMaxBitrateUplink      = %d]\n",aMinimum.iMaxBitrateUplink);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_11, " [aMinimum.iMaxBitrateDownlink    = %d]\n",aMinimum.iMaxBitrateDownlink);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_12, " [aMinimum.iResidualBer           = %d]\n",aMinimum.iResidualBer);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_13, " [aMinimum.iErrorRatio            = %d]\n",aMinimum.iErrorRatio);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_14, " [aMinimum.iPriority              = %d]\n",aMinimum.iPriority);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_15, " [aMinimum.iTransferDelay         = %d]\n",aMinimum.iTransferDelay);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_16, " [aMinimum.iGuaBitrateUplink      = %d]\n",aMinimum.iGuaBitrateUplink);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_17, " [aMinimum.iGuaBitrateDownlink    = %d]\n",aMinimum.iGuaBitrateDownlink);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_18, " [aMinimum.iSignallingIndicator   = %d]\n",aMinimum.iSignallingIndicator);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_19, " [aMinimum.iSrcStatisticsDesc     = %d]\n",aMinimum.iSrcStatisticsDesc);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_20, "------------------------------------------------>\n");
+    LOG(Log::Printf(_L("<------------------------------------------------\n")));
+	LOG(Log::Printf(_L("CUmtsR5QoSPolicy::SetQoSMinimum")));
+    LOG(Log::Printf(_L("\n")));
+    LOG(Log::Printf(_L("MINIMUM R5 VALUES SUPPLIED BY CLIENT IS \n")));
+    LOG(Log::Printf(_L("\n")));
+	LOG(Log::Printf(_L(" [aMinimum.iTrafficClass 			= %d]\n"),aMinimum.iTrafficClass));
+	LOG(Log::Printf(_L(" [aMinimum.iDeliveryOrder 			= %d]\n"),aMinimum.iDeliveryOrder));
+	LOG(Log::Printf(_L(" [aMinimum.iDeliveryOfErroneusSdu 	= %d]\n"),aMinimum.iDeliveryOfErroneusSdu));
+	LOG(Log::Printf(_L(" [aMinimum.iMaxSduSize				= %d]\n"),aMinimum.iMaxSduSize));
+	LOG(Log::Printf(_L(" [aMinimum.iMaxBitrateUplink		= %d]\n"),aMinimum.iMaxBitrateUplink));
+	LOG(Log::Printf(_L(" [aMinimum.iMaxBitrateDownlink		= %d]\n"),aMinimum.iMaxBitrateDownlink));
+	LOG(Log::Printf(_L(" [aMinimum.iResidualBer				= %d]\n"),aMinimum.iResidualBer));
+	LOG(Log::Printf(_L(" [aMinimum.iErrorRatio				= %d]\n"),aMinimum.iErrorRatio));
+	LOG(Log::Printf(_L(" [aMinimum.iPriority				= %d]\n"),aMinimum.iPriority));
+	LOG(Log::Printf(_L(" [aMinimum.iTransferDelay			= %d]\n"),aMinimum.iTransferDelay));
+	LOG(Log::Printf(_L(" [aMinimum.iGuaBitrateUplink		= %d]\n"),aMinimum.iGuaBitrateUplink));
+	LOG(Log::Printf(_L(" [aMinimum.iGuaBitrateDownlink		= %d]\n"),aMinimum.iGuaBitrateDownlink));
+	LOG(Log::Printf(_L(" [aMinimum.iSignallingIndicator	    = %d]\n"),aMinimum.iSignallingIndicator));
+	LOG(Log::Printf(_L(" [aMinimum.iSrcStatisticsDesc	    = %d]\n"),aMinimum.iSrcStatisticsDesc));
+	LOG(Log::Printf(_L("------------------------------------------------>\n")));
 	
 	iMinimum = aMinimum;
 	}

--- a/telephonyprotocols/qosextnapi/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyprotocols/qosextnapi/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[TRACE]TRACE_BORDER[0x84]_CIMSPOLICY_SETIMSPARAMETER_1=0x56
-[TRACE]TRACE_BORDER[0x84]_CIMSPOLICY_SETIMSPARAMETER_2=0x57
-[TRACE]TRACE_BORDER[0x84]_CIMSPOLICY_SETIMSPARAMETER_3=0x58
-[TRACE]TRACE_BORDER[0x84]_CIMSPOLICY_SETIMSPARAMETER_4=0x59
-[TRACE]TRACE_BORDER[0x84]_CIMSPOLICY_SETIMSPARAMETER_5=0x5a
-[TRACE]TRACE_BORDER[0x84]_CIMSPOLICY_SETIMSPARAMETER_6=0x5b
-[TRACE]TRACE_BORDER[0x84]_CIMSPOLICY_SETIMSPARAMETER_7=0x5c
-[TRACE]TRACE_BORDER[0x84]_CSBLPPARAMETERS_GETFLOWID=0x5e
-[TRACE]TRACE_BORDER[0x84]_CSBLPPARAMETERS_SETFLOWID=0x5d
-[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_1=0x1
-[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_2=0x2
-[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_3=0x3
-[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_4=0x4
-[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_5=0x5
-[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_6=0x7
-[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_7=0x8
-[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_8=0x9
-[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_9=0x6
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_1=0x11
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_10=0x4f
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_11=0x30
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_12=0x31
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_13=0x32
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_14=0x50
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_15=0x33
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_16=0x34
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_17=0x35
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_18=0x16
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_2=0x12
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_3=0x13
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_4=0x14
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_5=0x15
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_6=0x2c
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_7=0x2d
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_8=0x2e
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_9=0x2f
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_1=0xa
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_10=0x4d
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_11=0x27
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_12=0x28
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_13=0x29
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_14=0x4e
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_15=0x2a
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_16=0x55
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_17=0x2b
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_18=0x10
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_2=0xb
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_3=0xc
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_4=0xd
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_5=0xe
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_6=0x24
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_7=0x25
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_8=0xf
-[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_9=0x26
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_1=0x1e
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_10=0x44
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_11=0x45
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_12=0x46
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_13=0x54
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_14=0x47
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_15=0x48
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_16=0x49
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_17=0x4a
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_18=0x4b
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_19=0x4c
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_2=0x1f
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_20=0x23
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_3=0x20
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_4=0x21
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_5=0x22
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_6=0x41
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_7=0x42
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_8=0x43
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_9=0x53
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_1=0x17
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_10=0x39
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_11=0x51
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_12=0x3a
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_13=0x3b
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_14=0x3c
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_15=0x3d
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_16=0x3e
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_17=0x52
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_18=0x3f
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_19=0x40
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_2=0x18
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_20=0x1d
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_3=0x19
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_4=0x1a
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_5=0x1b
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_6=0x36
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_7=0x37
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_8=0x1c
-[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_9=0x38

Binary file telephonyprotocols/rawipnif/doc_pub/Raw_IP_NIF_Detailed_Design.doc has changed

--- a/telephonyprotocols/rawipnif/group/BLD.INF	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/group/BLD.INF	Wed Sep 01 12:40:21 2010 +0100
@@ -19,6 +19,12 @@
  @file
 */
 
+#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
+
+#include "../version1/group/bld.inf"
+
+#else
+
 PRJ_PLATFORMS
 
 DEFAULT
@@ -39,5 +45,7 @@
 RawIPNif.mmp
 
 #ifdef SYMBIAN_ZERO_COPY_NETWORKING
-#include "../rawipnif2/group/bld.inf"
+RawIPNif2.mmp
 #endif
+
+#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY

--- a/telephonyprotocols/rawipnif/group/RawIPNif.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/group/RawIPNif.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -50,6 +50,7 @@
 SOURCE  Sender.cpp 
 SOURCE  Receiver.cpp 
 SOURCE  IPTagHeader.cpp
+SOURCE  bttlog.cpp
 SOURCE	rawipmcpr.cpp
 SOURCE	rawipmcprfactory.cpp
 SOURCE	RawIpAgentHandler.cpp
@@ -57,7 +58,6 @@
 
 
 USERINCLUDE		../inc
-USERINCLUDE		../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/group/RawIPNif2.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,77 @@
+// Copyright (c) 2002-2010 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:
+// RAWIP.MMP
+// 
+//
+
+TARGET      rawip2.dll
+TARGETTYPE  PLUGIN
+UID         0x10009D8D 0x10286AF7
+
+// Used to specify if the rawip.dll should be specifically built to the
+// functionality of TI basebands, where a two-byte header is appended
+// to all incoming and outgoing packets (to specify the protocol being
+// used). This macro is commented out as part of fix INC113695 propagation to v94
+// MACRO RAWIP_HEADER_APPENDED_TO_PACKETS
+
+// Do not add the non-callable exports to the DEF files
+// Remove this line temporarily if we need to add new exports
+NOEXPORTLIBRARY
+
+// DEFFILE RawIp2.def
+
+MACRO __BTT_LOGGING__
+
+SOURCEPATH  ../rawipnif2/src
+SOURCE BcaController.cpp
+SOURCE BinderBase.cpp
+SOURCE bttlog.cpp
+SOURCE ecom_impl.cpp
+SOURCE IPTagHeader.cpp
+SOURCE IPv4Binder.cpp
+SOURCE IPv6Binder.cpp
+SOURCE RawIP2Flow.cpp RawIP2FlowFactory.cpp
+
+USERINCLUDE		../rawipnif2/inc
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+START RESOURCE 10286AF7.rss
+TARGET rawip2.rsc
+END
+
+//MI support
+#include <elements/sd_mintercept.mmh>
+
+#include <networking/packetlogger.mmh>
+
+LIBRARY	euser.lib 
+LIBRARY	esock.lib
+LIBRARY	esocksvr.lib
+LIBRARY	netmeta.lib 
+LIBRARY	mbufmgr.lib
+LIBRARY	commsbufs.lib
+LIBRARY	insock.lib
+LIBRARY nodemessages.lib
+LIBRARY netinterfaces.lib
+
+START WINS
+    BASEADDRESS 0x47E00000
+END
+
+CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
+VENDORID 0x70000001
+
+UNPAGED
+SMPSAFE

--- a/telephonyprotocols/rawipnif/inc/BcaController.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/BcaController.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -26,19 +26,22 @@
 #include <c32comm.h>
 
 #include "MControllerObserver.h"
+#include "bttlog.h"
 #include "Constants.h"
 
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
 #include "IPTagHeader.h"
 #endif // RAWIP_HEADER_APPENDED_TO_PACKETS
 
+class CBttLogger;
+
 /** 
 @internalComponent 
 */	
 class CBcaController : public CBase
 	{
 public:
-	CBcaController(MControllerObserver& aObserver);
+	CBcaController(MControllerObserver& aObserver, CBttLogger* aTheLogger);
 	void BaseConstructL();
 	~CBcaController();
 
@@ -100,6 +103,7 @@
 private: // Unowned data.
     MControllerObserver& iObserver;
 protected:
+	CBttLogger* iTheLogger;
 	TInt iMaxTxPacketSize;
 	TInt iMaxRxPacketSize;

--- a/telephonyprotocols/rawipnif/inc/BcaIoController.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/BcaIoController.h	Wed Sep 01 12:40:21 2010 +0100
@@ -33,6 +33,7 @@
 
 using namespace BasebandChannelAdaptation;
 
+class CBttLogger;
 class CSender;
 class CReceiver;
 class CBcaControl;
@@ -56,7 +57,7 @@
 class CBcaIoController : public CBase
 	{
 public:
-	static CBcaIoController* NewL(MControllerObserver& aObserver);	
+	static CBcaIoController* NewL(MControllerObserver& aObserver, CBttLogger* aTheLogger);	
 	~CBcaIoController();
 
 	void StartL();
@@ -90,12 +91,13 @@
 #endif // RAWIP_HEADER_APPENDED_TO_PACKETS
     
 protected:
+    CBttLogger* iTheLogger;
     TUint iMaxTxPacketSize;
     TUint iMaxRxPacketSize;
     
 private:
     
-    CBcaIoController(MControllerObserver& aObserver);
+    CBcaIoController(MControllerObserver& aObserver, CBttLogger* aTheLogger);
     void ConstructL();
     
     enum TSendState
@@ -254,7 +256,7 @@
 class CBcaControl : public CActive
 	{
 public:
-	CBcaControl(CBcaIoController& aObserver);
+	CBcaControl(CBcaIoController& aObserver, CBttLogger* aTheLogger);
 	~CBcaControl();
 public:
 	void StartLoadL();
@@ -266,6 +268,7 @@
 	virtual void DoCancel();	
 private: // Unowned data.
 	CBcaIoController& iObserver;
+	CBttLogger* iTheLogger;
 private:
 		enum TBcaState
 		{

--- a/telephonyprotocols/rawipnif/inc/BinderBase.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/BinderBase.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -30,6 +30,7 @@
 #include <comms-infras/es_protbinder.h>
 
 class CRawIPFlow;
+class CBttLogger;
 class CRawIpProvision;
 class CRawIPFlow;
 
@@ -37,7 +38,7 @@
 	{
 public:
 	friend class CRawIPFlow;
-	CBinderBase(CRawIPFlow& aFlow);
+	CBinderBase(CRawIPFlow& aFlow, CBttLogger* aTheLogger);
 	virtual ~CBinderBase();
 
 public:
@@ -70,6 +71,7 @@
 	ESock::MUpperControl* iUpperControl;
 	ESock::MUpperDataReceiver* iUpperReceiver;
 
+	CBttLogger* iTheLogger;
 	};

--- a/telephonyprotocols/rawipnif/inc/IPTagHeader.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/IPTagHeader.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -24,20 +24,23 @@
 #ifndef IPTAGHEADER_H__
 #define IPTAGHEADER_H__
 
+#include "bttlog.h"
 #include "Constants.h"
 #include <nifmbuf.h>
 
+class CBttLogger;
 
 class CIPTagHeader : public CBase
 	{
 public:
-	CIPTagHeader();
+	CIPTagHeader(CBttLogger* aTheLogger);
 	~CIPTagHeader();
 	void SetType(TUint16 aType);	
 	void AddHeader(TDes8& aDes);
 	TUint16 RemoveHeader(RMBufChain& aPdu);
 
 private: // Unowned data.
+	CBttLogger* iTheLogger;
 
 	//CLASSNAMEDECL(CIPTagHeader);

--- a/telephonyprotocols/rawipnif/inc/IPv4Binder.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/IPv4Binder.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -28,11 +28,12 @@
 #include <comms-infras/nifprvar_internal.h>
 #endif
 
+class CBttLogger;
 
 class CIPv4Binder : public CBinderBase
 {
 public:
-	CIPv4Binder(CRawIPFlow& aFlow);
+	CIPv4Binder(CRawIPFlow& aFlow, CBttLogger* aTheLogger);
 	~CIPv4Binder();
 
 public:

--- a/telephonyprotocols/rawipnif/inc/IPv6Binder.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/IPv6Binder.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -29,11 +29,12 @@
 #include <comms-infras/nifprvar_internal.h>
 #endif
 
+class CBttLogger;
 
 class CIPv6Binder : public CBinderBase
 {
 public:
-	CIPv6Binder(CRawIPFlow& aFlow);
+	CIPv6Binder(CRawIPFlow& aFlow, CBttLogger* aTheLogger);
 	~CIPv6Binder();
 
 public:
@@ -83,6 +84,8 @@
 	void LogPacket(const RMBufChain& aPacket);
 #endif // __BTT_LOGGING__
 
+private: //unowned
+	CBttLogger* iTheLogger;
 
 private: //owned
 	TIPv6Settings iSettings;

--- a/telephonyprotocols/rawipnif/inc/RawIPFlow.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/RawIPFlow.h	Wed Sep 01 12:40:21 2010 +0100
@@ -32,8 +32,10 @@
 #include "BinderBase.h"
 #include "BcaIoController.h"
 #include "MControllerObserver.h"
+#include "bttlog.h"
 #include <comms-infras/linkmessages.h>		// for TLinkMessageId
 
+class CBttLogger;
 class CPacketLogger;
 class TRawIpAgentProvision;
 class CBCAProvision;
@@ -110,7 +112,7 @@
 	inline RPacketContext::TContextStatus GetContextStatus();
 
 protected:
-	CRawIPFlow(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf);
+	CRawIPFlow(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf, CBttLogger* aTheLogger);
 	void ConstructL();
 	virtual ~CRawIPFlow();
 
@@ -148,6 +150,8 @@
 private:// Unowned
 	/** networking packet logger for debugging packets */
 	__PACKETLOG_DECLARATION_MEMBER;
+	CBttLogger* iTheLogger;
+
 	// Upstack bound protocol reference
 	CProtocolBase* iProtocol;

--- a/telephonyprotocols/rawipnif/inc/RawIPFlowFactory.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/RawIPFlowFactory.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -27,6 +27,7 @@
 #include <comms-infras/ss_subconnflow.h>
 #include <comms-infras/ss_protflow.h>
 
+#include "bttlog.h"
 
 /**
 RawIP Flow Implementation UID
@@ -47,6 +48,8 @@
 	CRawIPFlowFactory(TUid aFactoryId, ESock::CSubConnectionFlowFactoryContainer& aParentContainer);
 	virtual ESock::CSubConnectionFlowBase* DoCreateFlowL(ESock::CProtocolIntfBase* aProtocol, ESock::TFactoryQueryBase& aQuery);
 
-};
+private:
+	CBttLogger* iTheLogger;		// only here to allow use of _LOG_LnCn() macros within factory
+	};
 
 #endif

--- a/telephonyprotocols/rawipnif/inc/RawIPNifMain.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/RawIPNifMain.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-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"
@@ -30,16 +30,18 @@
 #include "ProtocolIfBase.h"
 #include "BcaIoController.h"
 #include "MControllerObserver.h"
+#include "bttlog.h"
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <comms-infras/nifprvar_internal.h>
 #endif
 
+class CBttLogger;
 class CPacketLogger;
 
 class CRawIPNifMain : public CNifIfLink, public MControllerObserver
 	{
 public:
- 	CRawIPNifMain(CNifIfFactory& aFactory, MNifIfNotify* aNotify);
+ 	CRawIPNifMain(CNifIfFactory& aFactory, MNifIfNotify* aNotify, CBttLogger* aTheLogger);
 	~CRawIPNifMain();
 	void ConstructL(const TDesC& aName);
 	// Used to be :Pure virtuals inherited from MContextSmObserver
@@ -93,8 +95,12 @@
 
 public:	// Context status retrieval.
 	inline RPacketContext::TContextStatus GetContextStatus();
+	
+private:// Unowned
+	/** networking packet logger for debugging packets */
+	__PACKETLOG_DECLARATION_MEMBER;
+	CBttLogger* iTheLogger;
 
-private:// Unowned
 	// Upstack bound protocol reference
 	CProtocolBase* iProtocol;

--- a/telephonyprotocols/rawipnif/inc/Receiver.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/Receiver.h	Wed Sep 01 12:40:21 2010 +0100
@@ -23,14 +23,16 @@
 #define RECEIVER_H
 
 #include "BcaIoController.h"
+#include "bttlog.h"
 #include "Constants.h"
 #include <nifmbuf.h>
 
+class CBttLogger;
 
 class CReceiver : public CActive
 	{
 public:	
-	static CReceiver* NewL(CBcaIoController& aObserver, TUint aMaxPacketSize);
+	static CReceiver* NewL(CBcaIoController& aObserver, CBttLogger* aTheLogger, TUint aMaxPacketSize);
 	~CReceiver();
 
 	// Inherited from CActive.
@@ -41,11 +43,12 @@
 	void StartListening();
 	
 private:
-	CReceiver(CBcaIoController& aObserver, TUint aMaxPacketSize);
+	CReceiver(CBcaIoController& aObserver, CBttLogger* aTheLogger, TUint aMaxPacketSize);
 	void ConstructL();
 
 private: // Unowned data.
 	CBcaIoController& iObserver;
+	CBttLogger* iTheLogger;
 	TUint iMaxPacketSize;
 	RBuf8 iData;
 	RMBufPacket iRMBufPacket;

--- a/telephonyprotocols/rawipnif/inc/Sender.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/Sender.h	Wed Sep 01 12:40:21 2010 +0100
@@ -23,19 +23,18 @@
 #define SENDER_H
 
 #include "BcaIoController.h"
+#include "bttlog.h"
 #include "Constants.h"
 
+class CBttLogger;
 
 class CSender : public CActive
 	{
 public:
-	CSender(CBcaIoController& aObserver,  TInt aMaxPacketSise);
-	static CSender* NewL(CBcaIoController& aObserver,  TInt aMaxPacketSise);
-	void ConstructL();
-	~CSender();	
-
-	
-	
+    CSender(CBcaIoController& aObserver, CBttLogger* aTheLogger, TInt aMaxPacketSise);
+    static CSender* NewL(CBcaIoController& aObserver, CBttLogger* aTheLogger, TInt aMaxPacketSise);
+    void ConstructL();
+    ~CSender();	
 
     // Inherited from CActive.
     virtual void RunL();
@@ -46,6 +45,7 @@
 
 private: // Unowned data.
     CBcaIoController& iObserver;
+    CBttLogger* iTheLogger;	
     TInt iMaxPacketSize;
     RBuf8 iSendBuffer;
 	};

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/inc/bttlog.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,142 @@
+// Copyright (c) 2002-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:
+// Defines logger for RawIP NIF.
+// 
+//
+
+/**
+ @file
+*/
+
+#ifndef BTTLOG_H__
+#define BTTLOG_H__
+
+#include <comms-infras/commsdebugutility.h>
+
+#if defined(__FLOG_ACTIVE) || defined(__DEBUGRAWIPSERIALPORT__)
+// Uncomment any of these macros if you want logging.
+// -> BTT_LOG_1 : For general logging
+// -> BTT_LOG_2 : For error and warning logging
+// -> BTT_LOG_3 : For IP packet information
+#define	__BTT_LOG_1__ 1
+//#define __BTT_LOG_2__ 1
+//#define __BTT_LOG_3__ 1
+#endif
+
+#ifdef __BTT_LOG_1__
+#define _LOG_L1C1(AAA)						iTheLogger->Write(AAA)
+#define _LOG_L1C2(AAA, BBB)					iTheLogger->WriteFormat(AAA, BBB)
+#define _LOG_L1C3(AAA, BBB, CCC)			iTheLogger->WriteFormat(AAA, BBB, CCC)
+#define _LOG_L1C4(AAA, BBB, CCC, DDD)		iTheLogger->WriteFormat(AAA, BBB, CCC, DDD)
+#define _LOG_L1C5(AAA, BBB, CCC, DDD, EEE)	iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE)
+#else
+#define _LOG_L1C1(AAA)
+#define _LOG_L1C2(AAA, BBB)
+#define _LOG_L1C3(AAA, BBB, CCC)
+#define _LOG_L1C4(AAA, BBB, CCC, DDD)
+#define _LOG_L1C5(AAA, BBB, CCC, DDD, EEE)  
+#endif // __BTT_LOG_1__
+
+#ifdef __BTT_LOG_2__
+#define _LOG_L2C1(AAA)						iTheLogger->Write(AAA)
+#define _LOG_L2C2(AAA, BBB)					iTheLogger->WriteFormat(AAA, BBB)
+#define _LOG_L2C3(AAA, BBB, CCC)			iTheLogger->WriteFormat(AAA, BBB, CCC)
+#define _LOG_L2C4(AAA, BBB, CCC, DDD)		iTheLogger->WriteFormat(AAA, BBB, CCC, DDD)
+#define _LOG_L2C5(AAA, BBB, CCC, DDD, EEE)	iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE)
+#else
+#define _LOG_L2C1(AAA)
+#define _LOG_L2C2(AAA, BBB)
+#define _LOG_L2C3(AAA, BBB, CCC)
+#define _LOG_L2C4(AAA, BBB, CCC, DDD)
+#define _LOG_L2C5(AAA, BBB, CCC, DDD, EEE)  
+#endif // __BTT_LOG_2__
+
+#ifdef __BTT_LOG_3__
+#define _LOG_L3C1(AAA)						iTheLogger->Write(AAA)
+#define _LOG_L3C2(AAA, BBB)					iTheLogger->WriteFormat(AAA, BBB)
+#define _LOG_L3C3(AAA, BBB, CCC)			iTheLogger->WriteFormat(AAA, BBB, CCC)
+#define _LOG_L3C4(AAA, BBB, CCC, DDD)		iTheLogger->WriteFormat(AAA, BBB, CCC, DDD)
+#define _LOG_L3C5(AAA, BBB, CCC, DDD, EEE)	iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE)
+#else
+#define _LOG_L3C1(AAA)
+#define _LOG_L3C2(AAA, BBB)
+#define _LOG_L3C3(AAA, BBB, CCC)
+#define _LOG_L3C4(AAA, BBB, CCC, DDD)
+#define _LOG_L3C5(AAA, BBB, CCC, DDD, EEE)  
+#endif // __BTT_LOG_3__
+
+#ifdef __BTT_LOG_1__
+#ifndef __BTT_LOGGING__
+#define __BTT_LOGGING__
+#endif
+#endif
+
+#ifdef __BTT_LOG_2__ 
+#ifndef __BTT_LOGGING__
+#define __BTT_LOGGING__
+#endif
+#endif
+
+#ifdef __BTT_LOG_3__ 
+#ifndef __BTT_LOGGING__
+#define __BTT_LOGGING__
+#endif
+#endif
+
+#ifdef __BTT_LOGGING__
+#define _BTT_LEAVEIFERROR(a)	iTheLogger->VerboseLeaveL(__FILE__, __LINE__, a)
+#define _BTT_PANIC(CAT,	CODE)	iTheLogger->VerbosePanic(__FILE__, __LINE__, CODE, (TText8*)#CODE, CAT)
+#else
+#define _BTT_LEAVEIFERROR(a)	User::LeaveIfError(a)
+#define _BTT_PANIC(CAT, CODE)	User::Panic(CAT, CODE)
+#endif // __BTT_LOGGING__
+
+/**
+ * static class containing methods for logging
+ * text to a logfile.
+ */
+class CBttLogger : public CBase
+	{
+public:
+	static CBttLogger* NewL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId);
+	~CBttLogger();
+
+public:
+	void Write(const TDesC8& aText);
+	void WriteFormat(TRefByValue<const TDesC8> aFmt, ...);
+	void VerboseLeaveL(char* aFile, TInt aLine, TInt aReason);
+	void VerbosePanic(char* aFile, 
+		TInt aLine, 
+		TInt aPanicCode, 
+		TText8* aPanicName,
+		const TDesC& aPanicCategory);
+
+protected:
+	CBttLogger();
+	void ConstructL(const TDesC8& aSubDir, const TDesC8& aFileName, const TUint32 aInstanceId);
+
+private:
+    class TLogIgnoreOverflow8 : public TDes8Overflow
+        {
+        public:
+            void Overflow(TDes8& /*aDes*/) { }
+        };
+
+private: // owned
+
+	TUint32 iInstanceId;
+	__FLOG_DECLARATION_MEMBER;
+	};
+
+#endif // BTTLOG_H__

--- a/telephonyprotocols/rawipnif/rawipnif2/group/RawIPNif2.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-// Copyright (c) 2002-2010 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:
-// RAWIP.MMP
-// 
-//
-
-TARGET      rawip2.dll
-TARGETTYPE  PLUGIN
-UID         0x10009D8D 0x10286AF7
-
-// Used to specify if the rawip.dll should be specifically built to the
-// functionality of TI basebands, where a two-byte header is appended
-// to all incoming and outgoing packets (to specify the protocol being
-// used). This macro is commented out as part of fix INC113695 propagation to v94
-// MACRO RAWIP_HEADER_APPENDED_TO_PACKETS
-
-// Do not add the non-callable exports to the DEF files
-// Remove this line temporarily if we need to add new exports
-NOEXPORTLIBRARY
-
-// DEFFILE RawIp2.def
-
-SOURCEPATH  ../src
-SOURCE BcaController.cpp
-SOURCE BinderBase.cpp
-SOURCE ecom_impl.cpp
-SOURCE IPTagHeader.cpp
-SOURCE IPv4Binder.cpp
-SOURCE IPv6Binder.cpp
-SOURCE RawIP2Flow.cpp RawIP2FlowFactory.cpp
-
-USERINCLUDE		../inc
-USERINCLUDE 	../traces
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-START RESOURCE 10286AF7.rss
-TARGET rawip2.rsc
-END
-
-//MI support
-#include <elements/sd_mintercept.mmh>
-
-#include <networking/packetlogger.mmh>
-
-LIBRARY	euser.lib 
-LIBRARY	esock.lib
-LIBRARY	esocksvr.lib
-LIBRARY	netmeta.lib 
-LIBRARY	mbufmgr.lib
-LIBRARY	commsbufs.lib
-LIBRARY	insock.lib
-LIBRARY nodemessages.lib
-LIBRARY netinterfaces.lib
-
-START WINS
-    BASEADDRESS 0x47E00000
-END
-
-CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
-VENDORID 0x70000001
-
-UNPAGED
-SMPSAFE

--- a/telephonyprotocols/rawipnif/rawipnif2/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-// Copyright (c) 2005-2010 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:
-// Network interface for supporting multiple primary PDP contexts on the telephony reference platform 
-// 
-//
-
-/**
- @file
-*/
-
-
-PRJ_MMPFILES
-
-RawIPNif2.mmp
\ No newline at end of file

--- a/telephonyprotocols/rawipnif/rawipnif2/inc/BcaController.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/BcaController.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -30,6 +30,7 @@
 
 using namespace BasebandChannelAdaptation2;
 
+class CBttLogger;
 
 void Panic(TRawIP2NifPanic aPanic);
 typedef MBca2Factory* (*TNewBca2FactoryL)();
@@ -40,10 +41,10 @@
 class CBcaController : public CActive
 	{
 public:
-	CBcaController(CRawIP2Flow& aRawIPFlow);	
+	CBcaController(CRawIP2Flow& aRawIPFlow, CBttLogger* aTheLogger);	
 	~CBcaController();
 
-	static CBcaController* NewL(CRawIP2Flow& aRawIPFlow);
+	static CBcaController* NewL(CRawIP2Flow& aRawIPFlow,CBttLogger* aTheLogger);
 	void ConstructL();
 public:
 	void StartLoadL(const CBCAProvision* aBCAProvisionConfig,MUpperControl* aControl, 
@@ -59,7 +60,8 @@
 	// Inherited from CActive.
 	virtual void RunL();
 	virtual void DoCancel();	
-
+private: 
+	CBttLogger* iTheLogger; // Unowned data.
 private:
 		enum TBcaState
 		{

--- a/telephonyprotocols/rawipnif/rawipnif2/inc/BinderBase.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/BinderBase.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -32,13 +32,14 @@
 #include <networking/bca2.h>
 
 class CRawIP2Flow;
+class CBttLogger;
 
 class CBinderBase : public CBase, public ESock::MLowerDataSender, public ESock::MLowerControl,
 						BasebandChannelAdaptation2::MUpperControl, BasebandChannelAdaptation2::MUpperDataReceiver
 	{
 public:
 	friend class CRawIP2Flow;
-	CBinderBase(CRawIP2Flow& aFlow);
+	CBinderBase(CRawIP2Flow& aFlow, CBttLogger* aTheLogger);
 	virtual ~CBinderBase();
 
 public:
@@ -84,6 +85,7 @@
 	ESock::MUpperControl* iUpperControl;  // not owned
 	ESock::MUpperDataReceiver* iUpperReceiver;  // not owned
 	BasebandChannelAdaptation2::MLowerDataSender* iLowerDataSender; // not owned
+	CBttLogger* iTheLogger;
 	
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
 	CIPTagHeader* iIPTagHeader; // owned

--- a/telephonyprotocols/rawipnif/rawipnif2/inc/IPTagHeader.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/IPTagHeader.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -24,20 +24,24 @@
 #ifndef IPTAGHEADER_H__
 #define IPTAGHEADER_H__
 
+#include "bttlog.h"
 #include "Constants.h"
 #include <comms-infras/commsbufchain.h>
 
+class CBttLogger;
 
 class CIPTagHeader : public CBase
 	{
 public:
-	CIPTagHeader();
+	CIPTagHeader(CBttLogger* aTheLogger);
 	~CIPTagHeader();
 	void SetType(TUint16 aType);	
 	void AddHeader(RCommsBufChain& aPdu);
 	TUint16 RemoveHeader(RCommsBufChain& aPdu);
 
-private: //Unowned data
+private: // Unowned data.
+	CBttLogger* iTheLogger;
+
 
 	TBuf8<KIPTagHeaderLength> iHeaderByte; // Owned
 	};

--- a/telephonyprotocols/rawipnif/rawipnif2/inc/IPv4Binder.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/IPv4Binder.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -25,11 +25,12 @@
 
 #include "BinderBase.h"
 
+class CBttLogger;
 
 class CIPv4Binder : public CBinderBase
 {
 public:
-	CIPv4Binder(CRawIP2Flow& aFlow);
+	CIPv4Binder(CRawIP2Flow& aFlow, CBttLogger* aTheLogger);
 	~CIPv4Binder();
 
 public:

--- a/telephonyprotocols/rawipnif/rawipnif2/inc/IPv6Binder.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/IPv6Binder.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -26,11 +26,12 @@
 #include "BinderBase.h"
 #include <eui_addr.h>
 
+class CBttLogger;
 
 class CIPv6Binder : public CBinderBase
 {
 public:
-	CIPv6Binder(CRawIP2Flow& aFlow);
+	CIPv6Binder(CRawIP2Flow& aFlow, CBttLogger* aTheLogger);
 	~CIPv6Binder();
 
 public:
@@ -86,6 +87,9 @@
 	void LogPacket(const RMBufChain& aPacket);
 #endif // __BTT_LOGGING__
 
+private: //unowned
+	CBttLogger* iTheLogger;
+
 private: //owned
 	TIPv6Settings iSettings;
 	TUint iSpeedMetric;

--- a/telephonyprotocols/rawipnif/rawipnif2/inc/RawIP2Flow.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/RawIP2Flow.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -30,9 +30,11 @@
 #include <comms-infras/ss_flowbinders.h>
 #include <comms-infras/ss_subconnflow.h>
 #include "BinderBase.h"
+#include "bttlog.h"
 #include <comms-infras/linkmessages.h>		// for TLinkMessageId
 
 class CBcaController;
+class CBttLogger;
 class CPacketLogger;
 class CBCAProvision;
 
@@ -98,7 +100,7 @@
 	inline RPacketContext::TContextStatus GetContextStatus();
 	
 protected:
-	CRawIP2Flow(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf);
+	CRawIP2Flow(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf, CBttLogger* aTheLogger);
 	void ConstructL();
 	virtual ~CRawIP2Flow();
 	
@@ -136,7 +138,7 @@
 private:// Unowned
 	/** networking packet logger for debugging packets */
 	__PACKETLOG_DECLARATION_MEMBER;
-	// Upstack bound protocol reference
+	CBttLogger* iTheLogger;
 
 	// The protocol to use (IPv4).Note: This is not owned by this class.
 	CBinderBase* iBinder;

--- a/telephonyprotocols/rawipnif/rawipnif2/inc/RawIP2FlowFactory.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/RawIP2FlowFactory.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -27,6 +27,7 @@
 #include <comms-infras/ss_subconnflow.h>
 #include <comms-infras/ss_protflow.h>
 
+#include "bttlog.h"
 
 /**
 RawIP Flow Implementation UID
@@ -47,6 +48,8 @@
 	CRawIP2FlowFactory(TUid aFactoryId, ESock::CSubConnectionFlowFactoryContainer& aParentContainer);
 	virtual ESock::CSubConnectionFlowBase* DoCreateFlowL(ESock::CProtocolIntfBase* aProtocol, ESock::TFactoryQueryBase& aQuery);
 
+private:
+	CBttLogger* iTheLogger;		// only here to allow use of _LOG_LnCn() macros within factory
 	};
 
 #endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/bttlog.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,141 @@
+// Copyright (c) 2002-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:
+// Defines logger for RawIP NIF.
+// 
+//
+
+/**
+ @file
+*/
+
+#ifndef BTTLOG_H__
+#define BTTLOG_H__
+
+#include <comms-infras/commsdebugutility.h>
+
+#if defined(__FLOG_ACTIVE) || defined(__DEBUGRAWIPSERIALPORT__)
+// Uncomment any of these macros if you want logging.
+// -> BTT_LOG_1 : For general logging
+// -> BTT_LOG_2 : For error and warning logging
+// -> BTT_LOG_3 : For IP packet information
+#define	__BTT_LOG_1__ 1
+//#define __BTT_LOG_2__ 1
+//#define __BTT_LOG_3__ 1
+#endif
+
+#ifdef __BTT_LOG_1__
+#define _LOG_L1C1(AAA)						iTheLogger->Write(AAA)
+#define _LOG_L1C2(AAA, BBB)					iTheLogger->WriteFormat(AAA, BBB)
+#define _LOG_L1C3(AAA, BBB, CCC)			iTheLogger->WriteFormat(AAA, BBB, CCC)
+#define _LOG_L1C4(AAA, BBB, CCC, DDD)		iTheLogger->WriteFormat(AAA, BBB, CCC, DDD)
+#define _LOG_L1C5(AAA, BBB, CCC, DDD, EEE)	iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE)
+#else
+#define _LOG_L1C1(AAA)
+#define _LOG_L1C2(AAA, BBB)
+#define _LOG_L1C3(AAA, BBB, CCC)
+#define _LOG_L1C4(AAA, BBB, CCC, DDD)
+#define _LOG_L1C5(AAA, BBB, CCC, DDD, EEE)  
+#endif // __BTT_LOG_1__
+
+#ifdef __BTT_LOG_2__
+#define _LOG_L2C1(AAA)						iTheLogger->Write(AAA)
+#define _LOG_L2C2(AAA, BBB)					iTheLogger->WriteFormat(AAA, BBB)
+#define _LOG_L2C3(AAA, BBB, CCC)			iTheLogger->WriteFormat(AAA, BBB, CCC)
+#define _LOG_L2C4(AAA, BBB, CCC, DDD)		iTheLogger->WriteFormat(AAA, BBB, CCC, DDD)
+#define _LOG_L2C5(AAA, BBB, CCC, DDD, EEE)	iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE)
+#else
+#define _LOG_L2C1(AAA)
+#define _LOG_L2C2(AAA, BBB)
+#define _LOG_L2C3(AAA, BBB, CCC)
+#define _LOG_L2C4(AAA, BBB, CCC, DDD)
+#define _LOG_L2C5(AAA, BBB, CCC, DDD, EEE)  
+#endif // __BTT_LOG_2__
+
+#ifdef __BTT_LOG_3__
+#define _LOG_L3C1(AAA)						iTheLogger->Write(AAA)
+#define _LOG_L3C2(AAA, BBB)					iTheLogger->WriteFormat(AAA, BBB)
+#define _LOG_L3C3(AAA, BBB, CCC)			iTheLogger->WriteFormat(AAA, BBB, CCC)
+#define _LOG_L3C4(AAA, BBB, CCC, DDD)		iTheLogger->WriteFormat(AAA, BBB, CCC, DDD)
+#define _LOG_L3C5(AAA, BBB, CCC, DDD, EEE)	iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE)
+#else
+#define _LOG_L3C1(AAA)
+#define _LOG_L3C2(AAA, BBB)
+#define _LOG_L3C3(AAA, BBB, CCC)
+#define _LOG_L3C4(AAA, BBB, CCC, DDD)
+#define _LOG_L3C5(AAA, BBB, CCC, DDD, EEE)  
+#endif // __BTT_LOG_3__
+
+#ifdef __BTT_LOG_1__
+#ifndef __BTT_LOGGING__
+#define __BTT_LOGGING__
+#endif
+#endif
+
+#ifdef __BTT_LOG_2__
+#ifndef __BTT_LOGGING__
+#define __BTT_LOGGING__
+#endif
+#endif
+
+#ifdef __BTT_LOG_3__
+#ifndef __BTT_LOGGING__
+#define __BTT_LOGGING__
+#endif
+#endif
+
+#ifdef __BTT_LOGGING__
+#define _BTT_LEAVEIFERROR(a)	iTheLogger->VerboseLeaveL(__FILE__, __LINE__, a)
+#define _BTT_PANIC(CAT,	CODE)	iTheLogger->VerbosePanic(__FILE__, __LINE__, CODE, (TText8*)#CODE, CAT)
+#else
+#define _BTT_LEAVEIFERROR(a)	User::LeaveIfError(a)
+#define _BTT_PANIC(CAT, CODE)	User::Panic(CAT, CODE)
+#endif // __BTT_LOGGING__
+
+/**
+ * static class containing methods for logging
+ * text to a logfile.
+ */
+class CBttLogger : public CBase
+	{
+public:
+	static CBttLogger* NewL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId);
+	~CBttLogger();
+
+public:
+	void Write(const TDesC8& aText);
+	void WriteFormat(TRefByValue<const TDesC8> aFmt, ...);
+	void VerboseLeaveL(char* aFile, TInt aLine, TInt aReason);
+	void VerbosePanic(char* aFile, 
+		TInt aLine, 
+		TInt aPanicCode, 
+		TText8* aPanicName,
+		const TDesC& aPanicCategory);
+
+protected:
+	CBttLogger();
+	void ConstructL(const TDesC8& aSubDir, const TDesC8& aFileName, const TUint32 aInstanceId);
+
+private:
+    class TLogIgnoreOverflow8 : public TDes8Overflow
+        {
+        public:
+            void Overflow(TDes8& /*aDes*/) { }
+        };
+
+private: // owned
+	TUint32 iInstanceId;
+	__FLOG_DECLARATION_MEMBER;
+	};
+
+#endif // BTTLOG_H__

--- a/telephonyprotocols/rawipnif/rawipnif2/src/BcaController.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/BcaController.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -19,26 +19,21 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "BcaControllerTraces.h"
-#endif
-
 #include <e32uid.h>
 #include <nifmbuf.h>
 
 #include "Constants.h"
 #include "BcaController.h"
 
-CBcaController::CBcaController(CRawIP2Flow& aRawIPFlow)
+CBcaController::CBcaController(CRawIP2Flow& aRawIPFlow,CBttLogger* aTheLogger)
 /**
  * Constructor. Performs standard active object initialisation.
  *
  * @param aRawIPFlow Reference to the RawIp2Flow
- *
+ * @param aTheLogger The logging object
  */
 	: CActive(EPriorityStandard), 	  
+	  iTheLogger(aTheLogger),	 
 	  iMBca(NULL),	  
 	  iState(EIdling),
 	  iRawIPFlow(aRawIPFlow),
@@ -50,16 +45,17 @@
 	CActiveScheduler::Add(this);
 	}
 	 
-CBcaController* CBcaController::NewL(CRawIP2Flow& aRawIPFlow)
+CBcaController* CBcaController::NewL(CRawIP2Flow& aRawIPFlow,CBttLogger* aTheLogger)
 /**
  * Two-phase constructor. Creates a new CBcaController object, performs 
  * second-phase construction, then returns it.
  *
  * @param aRawIPFlow Reference to the RawIp2Flow
+ * @param aTheLogger The logging object
  * @return A newly constructed CBcaController object
  */
 	{
-	CBcaController* self = new (ELeave) CBcaController(aRawIPFlow);
+	CBcaController* self = new (ELeave) CBcaController(aRawIPFlow,aTheLogger);
 	CleanupStack::PushL(self);
 	self->ConstructL();
 	CleanupStack::Pop(self);
@@ -71,7 +67,7 @@
  * Second-phase constructor. Creates all the state objects it owns.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_CONSTRUCTL_1, "CBcaController::ConstructL");
+	_LOG_L1C1(_L8("CBcaController::ConstructL"));
 	
 	}
   
@@ -96,7 +92,7 @@
  *  
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_1, "CBcaControl::RunL() called");
+	_LOG_L1C1(_L8("CBcaControl::RunL() called"));
 	switch (iState)
 		{
 		//in this state, Ioctl is called to set IAP ID, check the result of
@@ -108,11 +104,11 @@
 				{
 				if(iStatus == KErrNotSupported)
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_2, "This BCA does not support IAPID set");
+					_LOG_L1C1(_L8("This BCA does not support IAPID set"));
 					}
 				else
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_3, "This BCA supports IAPID set");
+					_LOG_L2C1(_L8("This BCA supports IAPID set"));
 					}
 				
 				TPtrC bcaStack = iBCAProvisionConfig->GetBCAStack();
@@ -132,7 +128,7 @@
 				}
 			else
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_4, "ERROR in BCA IAPID set = %d", iStatus.Int());
+				_LOG_L1C2(_L8("ERROR in BCA IAPID set = %d"), iStatus.Int());
 				Stop(iStatus.Int());
 				}
 			
@@ -146,18 +142,18 @@
 				{
 				if(iStatus == KErrNotSupported)
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_5, "This BCA does not support BCA stacking");
+					_LOG_L1C1(_L8("This BCA does not support BCA stacking"));
 					}
 				else
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_6, "This BCA supports BCA stacking");
+					_LOG_L2C1(_L8("This BCA supports BCA stacking"));
 					}
 				iBcaParams = new(ELeave) MBca2::TBcaParams(const_cast<CBCAProvision*>(iBCAProvisionConfig)->GetCommsPond(), iBCAProvisionConfig->GetPortName());
 			
 				TInt aErr = iMBca->Open(*iUpperControl,*iUpperDataReceiver,*iBcaParams);
 				if ( aErr != KErrNone)
 					{					
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_7, "ERROR in BCA Open = %d", aErr);
+					_LOG_L2C2(_L8("ERROR in BCA Open = %d"), aErr);
 					Stop(iStatus.Int());
 					iState = EIdling;
 					}
@@ -168,7 +164,7 @@
 				}
 			else
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_8, "ERROR in BCA stack set = %d", iStatus.Int());
+				_LOG_L2C2(_L8("ERROR in BCA stack set = %d"), iStatus.Int());
 				Stop(iStatus.Int());
 				}
 			break;
@@ -176,9 +172,8 @@
 		// Wrong state.
 		default:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_9, "ERROR CBcaControl::RunL(): Unknown state");
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_10, "PANIC: %S %d", KNifName, KBcaUnkownState);
-			User::Panic(KNifName, KBcaUnkownState);
+			_LOG_L1C1(_L8("ERROR CBcaControl::RunL(): Unknown state"));
+			_BTT_PANIC(KNifName, KBcaUnkownState);
 			break;
 			}
 		}
@@ -190,8 +185,8 @@
  *	cancel active request. 
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_DOCANCEL_1, "CBcaControl::DoCancel called.");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_DOCANCEL_2, "iState value is %d", iState);
+	_LOG_L1C1(_L8("CBcaControl::DoCancel called."));
+	_LOG_L2C2(_L8("iState value is %d"), iState);
 	switch (iState)
 		{
 		case EIdling:
@@ -203,9 +198,8 @@
 			iState = EIdling;
 			break;
 		default:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_DOCANCEL_3, "ERROR CBcaControl::DoCancel(): Unknown state");
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_DOCANCEL_4, "PANIC: %S %d", KNifName, KBcaUnkownState);
-			User::Panic(KNifName, KBcaUnkownState);
+			_LOG_L2C1(_L8("ERROR CBcaControl::DoCancel(): Unknown state"));
+			_BTT_PANIC(KNifName, KBcaUnkownState);
 			break;
 		}
 	}
@@ -221,7 +215,7 @@
  * @return none 
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_STARTLOADL_1, "CBcaControl::StartLoad");
+	_LOG_L1C1(_L8("CBcaControl::StartLoad"));
 
 	iBCAProvisionConfig = aBCAProvisionConfig;
 	iUpperControl = aControl;
@@ -232,7 +226,7 @@
 	TNewBca2FactoryL newBca2FactoryProcL = (TNewBca2FactoryL)iBcaDll.iObj.Lookup(1);
 	if (NULL == newBca2FactoryProcL)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_STARTLOADL_2, "Library entry point found error %d", KErrBadLibraryEntryPoint);
+		_LOG_L1C2(_L8("Library entry point found error %d"), KErrBadLibraryEntryPoint);
 		User::Leave(KErrBadLibraryEntryPoint);	
 		}
 	
@@ -240,7 +234,7 @@
 
 	if(!bcaFactory)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_STARTLOADL_3, "BcaFactory creation error %d", KErrCompletion);
+		_LOG_L1C2(_L8("BcaFactory creation error %d"), KErrCompletion);
 		User::Leave(KErrCompletion);	
 		}
 	CleanupReleasePushL(*bcaFactory);
@@ -261,7 +255,7 @@
  *  requests on the active objects owned by this module and shutdown.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_STOP_1, "CBcaController::Stop is called.");
+	_LOG_L1C1(_L8("CBcaController::Stop is called."));
 
 	if(iMBca)
 		{
@@ -269,7 +263,7 @@
 		}
 	else 
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_STOP_2, "CBcaController::Stop Bca is not initialized. Bring the link layer down");
+		_LOG_L1C1(_L8("CBcaController::Stop Bca is not initialized. Bring the link layer down"));
 		iRawIPFlow.LinkLayerDown(aError);
 		}
   	}
@@ -280,7 +274,7 @@
 * @param aPanic panic code */
 void Panic(TRawIP2NifPanic aPanic)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_PANIC_1, "Panic code for RawIpNif = %d", aPanic);
+	_LOG_L2C2(_L8("Panic code for RawIpNif = %d"), aPanic);
 	User::Panic(KNifName,aPanic);
 
 	}

--- a/telephonyprotocols/rawipnif/rawipnif2/src/BinderBase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/BinderBase.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -19,28 +19,23 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "BinderBaseTraces.h"
-#endif
-
 #include <nifmbuf.h>
 #include "BinderBase.h"
 #include "RawIP2Flow.h"
 #include "BcaController.h"
 
-CBinderBase::CBinderBase(CRawIP2Flow& aFlow)
+CBinderBase::CBinderBase(CRawIP2Flow& aFlow, CBttLogger* aTheLogger)
 /**
  * Constructor
  *
  * @param aNifMain A pointer to CRawIPFlow
  */
 	:iFlow(&aFlow),
+	iTheLogger(aTheLogger),
 	iStarted(EFalse)
 	{	
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
-	iIPTagHeader = new (ELeave) CIPTagHeader();
+	iIPTagHeader = new (ELeave) CIPTagHeader(iTheLogger);
 #endif // RAWIP_HEADER_APPENDED_TO_PACKETS
 	}
 
@@ -60,7 +55,7 @@
 /**
  *	Used to specify the type of the IP header.
  */
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_SETTYPE_1, "CBinderBase::SetType");
+	_LOG_L1C1(_L8("CBinderBase::SetType"));
 	
 	iIPTagHeader->SetType(aType);	
 }
@@ -108,7 +103,7 @@
  * @param aUpperControl A pointer to Upper layer control class
  */
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_BIND_1, "CBinderBase:\tBind()");
+    _LOG_L1C1(_L8("CBinderBase:\tBind()"));
 
 	iUpperReceiver = aUpperReceiver;
 	iUpperControl = aUpperControl;
@@ -117,7 +112,7 @@
 
 void CBinderBase::Unbind(ESock::MUpperDataReceiver* aUpperReceiver, ESock::MUpperControl* aUpperControl)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_UNBIND_1, "CBinderBase:\tUnbind()");
+	_LOG_L1C1(_L8("CBinderBase:\tUnbind()"));
 	
 #ifndef _DEBUG
 	(void) aUpperReceiver;
@@ -137,7 +132,7 @@
  * @param aProtocol A pointer to a protocol
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_STARTSENDING_1, "CBinderBase:\tStartSending()");
+	_LOG_L1C1(_L8("CBinderBase:\tStartSending()"));
 
 	if (!iStarted)
 		{
@@ -157,7 +152,7 @@
  * @param aProtocol A pointer to a protocol
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_ERROR_1, "CBinderBase:\tError()");
+	_LOG_L1C1(_L8("CBinderBase:\tError()"));
 
 	// Default implementation.
 	// Uses iProtocol instead aProtocol.

--- a/telephonyprotocols/rawipnif/rawipnif2/src/IPTagHeader.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/IPTagHeader.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -21,19 +21,14 @@
 
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "IPTagHeaderTraces.h"
-#endif
-
 #include "IPTagHeader.h"
 #include "Constants.h"
 
 /**
 Default constructor. 
 */
-CIPTagHeader::CIPTagHeader()
+CIPTagHeader::CIPTagHeader(CBttLogger* aTheLogger)
+	: iTheLogger(aTheLogger)
 	{
 	iHeaderByte.SetMax();
 	iHeaderByte.FillZ();
@@ -53,7 +48,7 @@
 */
 void CIPTagHeader::SetType(TUint16 aType)
  	{
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPTAGHEADER_SETTYPE_1, "CIPTagHeader::SetType");
+ 	_LOG_L1C1(_L8("CIPTagHeader::SetType"));
  	
  	iHeaderByte[0] = (TUint8)(aType>>8); 
  	iHeaderByte[1] = (TUint8)(aType&0xff);	
@@ -68,7 +63,7 @@
 */
 void CIPTagHeader::AddHeader(RCommsBufChain& aPdu)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPTAGHEADER_ADDHEADER_1, "CIPTagHeader::AddHeader");
+	_LOG_L1C1(_L8("CIPTagHeader::AddHeader"));
 
 	// Add the protocol code as a header to the buffer
 	aPdu.Write(iHeaderByte,0);	
@@ -84,7 +79,7 @@
 */
 TUint16 CIPTagHeader::RemoveHeader(RCommsBufChain& aPdu)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPTAGHEADER_REMOVEHEADER_1, "CIPTagHeader::RemoveHeader");
+	_LOG_L1C1(_L8("CIPTagHeader::RemoveHeader"));
 
 	if (aPdu.Length() > KIPTagHeaderLength)
 		{

--- a/telephonyprotocols/rawipnif/rawipnif2/src/IPv4Binder.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/IPv4Binder.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -20,12 +20,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "IPv4BinderTraces.h"
-#endif
-
 #include <etelpckt.h>
 #include <in_iface.h>
 #include "RawIP2Flow.h"
@@ -36,12 +30,14 @@
 #include <networking/umtsnifcontrolif.h>
 #endif
 
+#define LOG_IP_ADDRESS(desc,addr) _LOG_L1C5(_L8("    " desc " = %d.%d.%d.%d"), \
+			addr >> 24, (addr >> 16) & 0xFF, (addr >> 8) & 0xFF, addr & 0xFF);
 
-CIPv4Binder::CIPv4Binder(CRawIP2Flow& aFlow)
+CIPv4Binder::CIPv4Binder(CRawIP2Flow& aFlow, CBttLogger* aTheLogger)
 /**
  * Constructor
  */ 
-	: CBinderBase(aFlow),
+	: CBinderBase(aFlow,aTheLogger),
 	  iSpeedMetric(KDefaultSpeedMetric)
 	{	
 	}
@@ -77,7 +73,8 @@
  * @return Standard error codes
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_CONTROL_1, "CIPv4Binder::Control [aLevel=%d, aName=%d]",aLevel, aName);
+	_LOG_L1C3(_L8("CIPv4Binder::Control [aLevel=%d, aName=%d]"),
+		aLevel, aName);
 
 	if (aLevel == KSOLInterface)
 		{
@@ -156,7 +153,7 @@
 
 TInt CIPv4Binder::GetConfig(TBinderConfig& aConfig)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_GETCONFIG_1, "CIPv4Binder::GetConfig");
+	_LOG_L1C1(_L8("CIPv4Binder::GetConfig"));
     TBinderConfig4* config = TBinderConfig::Cast<TBinderConfig4>(aConfig);
     
    	if(config == NULL)
@@ -170,9 +167,8 @@
 	config->iInfo.iMtu = KDefaultMtu;				/* Maximum transmission unit. */
 	config->iInfo.iRMtu = KDefaultMtu;				/* Maximum transmission unit for receiving. */
 	config->iInfo.iSpeedMetric = iSpeedMetric;		/* approximation of the interface speed in Kbps. */
-
-	OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_GETCONFIG_2, "Local IP address from TBinderConfig = %u.%u.%u.%u",iSettings.iLocalAddr >> 24, (iSettings.iLocalAddr >> 16) & 0xFF, (iSettings.iLocalAddr >> 8) & 0xFF, iSettings.iLocalAddr & 0xFF);   
-    
+    LOG_IP_ADDRESS("Local IP address from TBinderConfig", iSettings.iLocalAddr);
+	
 	config->iAddress.SetAddress(iSettings.iLocalAddr);		/* Interface IP address. */
 	config->iNetMask.SetAddress(iSettings.iNetMask);			/* IP netmask. */
 	config->iBrdAddr.SetAddress(iSettings.iBroadcastAddr);	/* IP broadcast address. */
@@ -193,7 +189,7 @@
  * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_DELETECONTEXT_1, "CIPv4Binder::DeleteContext");
+	_LOG_L1C1(_L8("CIPv4Binder::DeleteContext"));
 
 	if (aContextParameters.Length() != sizeof(TContextParameters))
 		{
@@ -227,7 +223,7 @@
  */
 void CIPv4Binder::UpdateContextConfigL(const TPacketDataConfigBase& aConfig)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_1, "CIPv4Binder::UpdateContextConfig");
+	_LOG_L1C1(_L8("CIPv4Binder::UpdateContextConfig"));
 
 	// Get our IP address from the GPRS context config.
 	TInetAddr address;
@@ -253,13 +249,14 @@
 	if (ret == KErrNone)
 		{
 		iSettings.iLocalAddr = address.Address();
-		OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_2, "Got local IP address from context = %u.%u.%u.%u",iSettings.iLocalAddr >> 24, (iSettings.iLocalAddr >> 16) & 0xFF, (iSettings.iLocalAddr >> 8) & 0xFF, iSettings.iLocalAddr & 0xFF);
+		LOG_IP_ADDRESS("Got local IP address from context", iSettings.iLocalAddr);
 		iSettings.iDefGateway = address.Address();
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_3, "Set Default Gateway to local IP address");
+		_LOG_L1C1(_L8("Set Default Gateway to local IP address"));
 		}
 	else
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_4, "Couldn't get IP address from GPRS config (err: %d)",ret);
+		_LOG_L2C2(_L8("Couldn't get IP address from GPRS config (err: %d)"),
+			ret);
 
 		// Don't leave on this error: we may still be OK if we read some
 		// settings from CommDB.
@@ -281,11 +278,12 @@
 		if (ret == KErrNone)
 			{
 			iSettings.iPrimaryDns = address.Address();
-			OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_5, "Got primary DNS from context PCO = %u.%u.%u.%u",iSettings.iPrimaryDns >> 24, (iSettings.iPrimaryDns >> 16) & 0xFF, (iSettings.iPrimaryDns >> 8) & 0xFF, iSettings.iPrimaryDns & 0xFF);
+			LOG_IP_ADDRESS("Got primary DNS from context PCO", iSettings.iPrimaryDns);
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_6, "Couldn't get primary DNS address from GPRS config (err: %d)",ret);
+			_LOG_L2C2(_L8("Couldn't get primary DNS address from GPRS config (err: %d)"),
+				ret);
 
 			// Don't leave on this error: we may still be OK if we read some
 			// settings from CommDB.
@@ -297,11 +295,12 @@
 		if (ret == KErrNone)
 			{
 			iSettings.iSecondaryDns = address.Address();
-	        OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_7, "Got secondary DNS from context PCO = %u.%u.%u.%u",iSettings.iSecondaryDns >> 24, (iSettings.iSecondaryDns >> 16) & 0xFF, (iSettings.iSecondaryDns >> 8) & 0xFF, iSettings.iSecondaryDns);
+			LOG_IP_ADDRESS("Got secondary DNS from context PCO", iSettings.iPrimaryDns);
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_8, "Couldn't get secondary DNS address from GPRS config (err: %d)",ret);
+			_LOG_L2C2(_L8("Couldn't get secondary DNS address from GPRS config (err: %d)"),
+				ret);
 
 			// Don't leave on this error: we may still be OK if we read some
 			// settings from CommDB.
@@ -309,8 +308,8 @@
 		}
 	else
 		{
-        OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_9, "Using CommDB DNS address - Primary = %u.%u.%u.%u",iSettings.iPrimaryDns >> 24, (iSettings.iPrimaryDns >> 16) & 0xFF, (iSettings.iPrimaryDns >> 8) & 0xFF, iSettings.iPrimaryDns & 0xFF);
-		OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_10, "                         - Secondary = %u.%u.%u.%u",iSettings.iSecondaryDns >> 24, (iSettings.iSecondaryDns >> 16) & 0xFF, (iSettings.iSecondaryDns >> 8) & 0xFF, iSettings.iSecondaryDns);
+		LOG_IP_ADDRESS("Using CommDB DNS address - Primary ", iSettings.iPrimaryDns);
+		LOG_IP_ADDRESS("                         - Secondary ", iSettings.iSecondaryDns);
 		}
 
 
@@ -328,11 +327,12 @@
 		if (ret == KErrNone)
 			{
 			iSettings.iDefGateway = address.Address();
-			OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_10, "Got default gateway = %u.%u.%u.%u",iSettings.iDefGateway >> 24, (iSettings.iDefGateway >> 16) & 0xFF, (iSettings.iDefGateway >> 8) & 0xFF, iSettings.iDefGateway);
+			LOG_IP_ADDRESS("Got default gateway", iSettings.iDefGateway);
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_6, "Couldn't get default gateway from GPRS config (err: %d)",ret);
+			_LOG_L2C2(_L8("Couldn't get default gateway from GPRS config (err: %d)"),
+				ret);
 			}
 		}*/
 	}
@@ -344,7 +344,7 @@
  * @param aConnectionSpeed Our connection speed
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONNECTIONSPEED_1, "CIPv4Binder::UpdateConnectionSpeed");
+	_LOG_L1C1(_L8("CIPv4Binder::UpdateConnectionSpeed"));
 
 	iSpeedMetric = aConnectionSpeed;
 	}
@@ -362,7 +362,7 @@
  * @return Standard error codes
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_SEND1_1, "CIPv4Binder::Send");
+	_LOG_L1C1(_L8("CIPv4Binder::Send"));
 
 #ifdef __BTT_LOGGING__
 	LogPacket(static_cast<RMBufChain&>(aPdu));
@@ -387,7 +387,7 @@
  * @param aInfo Not used 
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_NOTIFICATION_1, "CIPv4Binder::Notification");
+	_LOG_L1C1(_L8("CIPv4Binder::Notification"));
 
 	return KErrNone;
 	}
@@ -399,7 +399,7 @@
  * @param aProtocol A pointer to a protocol
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_STARTSENDING_1, "CIPv4Binder::StartSending()");
+	_LOG_L1C1(_L8("CIPv4Binder::StartSending()"));
 
 	CBinderBase::StartSending();
 	}
@@ -411,7 +411,8 @@
  * @param aProtocolCode The protocol type
  */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_WANTSPROTOCOL_1, "CIPv4Binder::WantsProtocol [aProtocolCode=%X]",aProtocolCode);
+	_LOG_L1C2(_L8("CIPv4Binder::WantsProtocol [aProtocolCode=%X]"),
+		aProtocolCode);
 
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
 	return ((aProtocolCode & 0x00FF) == KIp4FrameType);
@@ -434,7 +435,7 @@
  * @param aPdu The incoming packet
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_PROCESS1_1, "CIPv4Binder::Process");
+	_LOG_L1C1(_L8("CIPv4Binder::Process"));
 
 #ifdef __BTT_LOGGING__
 	LogPacket(static_cast<RMBufChain&>(aPdu));
@@ -451,12 +452,12 @@
 	// been bound yet.
 	if (iUpperReceiver && WantsProtocol(protocolCode))
 		{		
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_PROCESS1_2, "CIPv4Binder: Packet Sent to TCP/IP Protocol!!!");
+		_LOG_L1C1(_L8("CIPv4Binder: Packet Sent to TCP/IP Protocol!!!"));
 		iUpperReceiver->Process(static_cast<RMBufChain&>(aPdu));
 		}
 	else 
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_PROCESS1_3, "WARNING: dumping incoming packet, no protocol bound");
+		_LOG_L2C1(_L8("WARNING: dumping incoming packet, no protocol bound"));
 		aPdu.Free();
 		}
 	}
@@ -486,7 +487,7 @@
 @param aProvision Provisioning structure from Control side.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_SETPROVISION_1, "CIPv4Binder::SetProvision");
+	_LOG_L1C1(_L8("CIPv4Binder::SetProvision"));
 	iSettings.iLocalAddr	 = aProvision.GetIpAddress();
 	iSettings.iNetMask		 = aProvision.GetIpNetMask();
 	iSettings.iBroadcastAddr = aProvision.GetBroadCastAddr();
@@ -495,8 +496,7 @@
 	iSettings.iSecondaryDns	 = aProvision.GetIp4NameServer2();
 	iSettings.iGetGatewayFromServer = aProvision.GetIpAddrFromServer();
 	iSettings.iGetDnsFromServer		= aProvision.GetIp4DNSAddrFromServer();
-	
-    OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_SETPROVISION_2, "Local IP address from Provisioning = %u.%u.%u.%u",iSettings.iLocalAddr >> 24, (iSettings.iLocalAddr >> 16) & 0xFF, (iSettings.iLocalAddr >> 8) & 0xFF, iSettings.iLocalAddr & 0xFF);
+    LOG_IP_ADDRESS("Local IP address from Provisioning", iSettings.iLocalAddr);	
 	}
 
 #ifdef __BTT_LOGGING__
@@ -507,18 +507,19 @@
 * @param aPacket The packet 
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_1, "CIPv4Binder::LogPacket");
+	_LOG_L1C1(_L8("CIPv4Binder::LogPacket"));
 
 	TInt mBufLength = aPacket.Length() - aPacket.First()->Length();
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_2, "Analysis of %d byte packet:", mBufLength);
+	_LOG_L3C2(_L8("Analysis of %d byte packet:"), mBufLength);
 
 	//Note: All the constants used on this method are a pragmatic guess of the
 	//IP header fields. The only porpose of this method is logging.
 
 	if (mBufLength < 20)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_3, " -doesn't appear to be a valid IPv4 packet (length=%d)", mBufLength);
+		_LOG_L3C2(_L8(" -doesn't appear to be a valid IPv4 packet (length=%d)")
+			, mBufLength);
 		return;
 		}
 
@@ -527,28 +528,34 @@
 
 	if ((payloadPtr[0] & 0xF0) != 0x40)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_4, " - doesn't appear to be an IPv4 packet (version=0x%X)",(payloadPtr[0] & 0xF0) >> 4);
+		_LOG_L3C2(_L8(" - doesn't appear to be an IPv4 packet (version=0x%X)"),
+			(payloadPtr[0] & 0xF0) >> 4);
 		return;
 		}
 
 	if ((payloadPtr[0] & 0xF) != 0x5)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_5, " - doesn't have a standard IP header (length=0x%X)",payloadPtr[0] & 0xF);
+		_LOG_L3C2(_L8(" - doesn't have a standard IP header (length=0x%X)"),
+			payloadPtr[0] & 0xF);
 		return;
 		}
 
-	OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_6, " - src addr: %u.%u.%u.%u", payloadPtr[12], payloadPtr[13],payloadPtr[14], payloadPtr[15]);
-	OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_7, " - dst addr: %u.%u.%u.%u", payloadPtr[16], payloadPtr[17],payloadPtr[18], payloadPtr[19]);
+	_LOG_L3C5(_L8(" - src addr: %d.%d.%d.%d"), payloadPtr[12], payloadPtr[13],
+		payloadPtr[14], payloadPtr[15]);
+	_LOG_L3C5(_L8(" - dst addr: %d.%d.%d.%d"), payloadPtr[16], payloadPtr[17],
+		payloadPtr[18], payloadPtr[19]);
 
 	if (payloadPtr[9] == 0x06)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_8, " - appears to be a TCP packet");
+		_LOG_L3C1(_L8(" - appears to be a TCP packet"));
 		if (mBufLength < 40)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_9, " - but is too short (length=0x%X)", mBufLength);
+			_LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength);
 			return;
 			}
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_10, " - src port: %d, dst port: %d",(payloadPtr[20] << 8) + payloadPtr[21],(payloadPtr[22] << 8) + payloadPtr[23]);
+		_LOG_L3C3(_L8(" - src port: %d, dst port: %d"),
+			(payloadPtr[20] << 8) + payloadPtr[21],
+			(payloadPtr[22] << 8) + payloadPtr[23]);
 		_LOG_L3C3(_L8(" - seq #: 0x%08X, ack #: 0x%08X"),
 			(payloadPtr[24] << 24) + (payloadPtr[25] << 16) +
 			(payloadPtr[26] << 8) + payloadPtr[27],
@@ -583,7 +590,7 @@
 			{
 			flagsSet.Append(_L8("URG "));
 			}
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_11, flagsSet);
+		_LOG_L3C1(flagsSet);
 
 		TInt dataOffset = payloadPtr[32] >> 2; // in bytes
 		if ((dataOffset > 0) && (mBufLength > dataOffset + 30))
@@ -606,50 +613,55 @@
 					data.Append(TChar('?'));
 					}
 				}
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_12, data);
+			_LOG_L3C1(data);
 			}
 		}
 	else if (payloadPtr[9] == 0x01)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_13, " - appears to be an ICMP packet");
+		_LOG_L3C1(_L8(" - appears to be an ICMP packet"));
 		if (mBufLength < 24)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_14, " - but is too short (length=0x%X)", mBufLength);
+			_LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength);
 			return;
 			}
 
 		if (payloadPtr[20] == 0x8)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_15, " - is an echo request");
+			_LOG_L3C1(_L8(" - is an echo request"));
 			}
 		else if (payloadPtr[20] == 0x0)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_16, " - is an echo reply");
+			_LOG_L3C1(_L8(" - is an echo reply"));
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_17, " - unknown type (0x%02X)", payloadPtr[20]);
+			_LOG_L3C2(_L8(" - unknown type (0x%02X)"), payloadPtr[20]);
 			return;
 			}
 
 		if (mBufLength >= 28)
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_18, " - ID: 0x%04X, seq #: 0x%04X",(payloadPtr[24] << 8) + payloadPtr[25],(payloadPtr[26] << 8) + payloadPtr[27]);
+			_LOG_L3C3(_L8(" - ID: 0x%04X, seq #: 0x%04X"),
+				(payloadPtr[24] << 8) + payloadPtr[25],
+				(payloadPtr[26] << 8) + payloadPtr[27]);
 			}
 		}
 	else if (payloadPtr[9] == 0x11)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_19, " - appears to be a UDP packet");
+		_LOG_L3C1(_L8(" - appears to be a UDP packet"));
 		if (mBufLength < 28)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_20, " - but is too short (length=0x%X)", mBufLength);
+			_LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength);
 			return;
 			}
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_21, " - src port: %d, dst port: %d",(payloadPtr[20] << 8) + payloadPtr[21],(payloadPtr[22] << 8) + payloadPtr[23]);
+		_LOG_L3C3(_L8(" - src port: %d, dst port: %d"),
+			(payloadPtr[20] << 8) + payloadPtr[21],
+			(payloadPtr[22] << 8) + payloadPtr[23]);
 		}
 	else
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_22, " - appears to be for an unknown protocol (0x%X)",payloadPtr[9]);
+		_LOG_L3C2(_L8(" - appears to be for an unknown protocol (0x%X)"),
+			payloadPtr[9]);
 		}
 	}
 #endif // __BTT_LOGGING__

--- a/telephonyprotocols/rawipnif/rawipnif2/src/IPv6Binder.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/IPv6Binder.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -20,12 +20,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "IPv6BinderTraces.h"
-#endif
-
 #include <etelpckt.h>
 #include <in_iface.h>
 #include "RawIP2Flow.h"
@@ -39,12 +33,15 @@
 #include <networking/umtsnifcontrolif.h>
 #endif
 
+#define LOG_IP_ADDRESS(desc,addr) _LOG_L2C5(_L8("    " desc " = %d:%d:%d:%d from context"), \
+			addr.u.iAddr32[3], addr.u.iAddr32[2], addr.u.iAddr32[1], addr.u.iAddr32[0]);
 
-CIPv6Binder::CIPv6Binder(CRawIP2Flow& aFlow)
+CIPv6Binder::CIPv6Binder(CRawIP2Flow& aFlow, CBttLogger* aTheLogger)
 /**
  * Constructor
  */ 
-	: CBinderBase(aFlow),
+	: CBinderBase(aFlow,aTheLogger),
+	  iTheLogger(aTheLogger),
 	  iSpeedMetric(KDefaultSpeedMetric)
 	{
 	}
@@ -80,7 +77,8 @@
  * @return Standard error codes
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_CONTROL_1, "CIPv6Binder::Control [aLevel=%u, aName=%u]",aLevel, aName);
+	_LOG_L1C3(_L8("CIPv6Binder::Control [aLevel=%d, aName=%d]"),
+		aLevel, aName);
 
 	if (aLevel == KSOLInterface)
 		{
@@ -191,7 +189,7 @@
  * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_DELETECONTEXT_1, "CIPv6Binder::DeleteContext");
+	_LOG_L1C1(_L8("CIPv6Binder::DeleteContext"));
 
 	if (aContextParameters.Length() != sizeof(TContextParameters))
 		{
@@ -225,7 +223,7 @@
  */
  void CIPv6Binder::UpdateContextConfigL(const TPacketDataConfigBase& aConfig)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_1, "CIPv6Binder::UpdateContextConfig");
+	_LOG_L1C1(_L8("CIPv6Binder::UpdateContextConfig"));
 
 	// Get our IP address from the GPRS context config.
 	TInetAddr address;
@@ -251,11 +249,12 @@
 	if (ret == KErrNone)
 		{
 		iSettings.iLocalAddr = address.Ip6Address();
-		OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_2, "Got local IP address = %u:%u:%u:%u from context", iSettings.iLocalAddr.u.iAddr32[3], iSettings.iLocalAddr.u.iAddr32[2], iSettings.iLocalAddr.u.iAddr32[1], iSettings.iLocalAddr.u.iAddr32[0]);
+		LOG_IP_ADDRESS("Got local IP address", iSettings.iLocalAddr);
 		}
 	else
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_3, "Couldn't get IP address from GPRS config (err: %d)",ret);
+		_LOG_L2C2(_L8("Couldn't get IP address from GPRS config (err: %d)"),
+			ret);
 
 		// Don't leave on this error: we may still be OK if we read some
 		// settings from CommDB.
@@ -277,11 +276,12 @@
 		if (ret == KErrNone)
 			{
 			iSettings.iPrimaryDns = address.Ip6Address();
-			OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_4, "Got primary DNS = %u:%u:%u:%u from context", iSettings.iPrimaryDns.u.iAddr32[3], iSettings.iPrimaryDns.u.iAddr32[2], iSettings.iPrimaryDns.u.iAddr32[1], iSettings.iPrimaryDns.u.iAddr32[0]);
+			LOG_IP_ADDRESS("Got primary DNS", iSettings.iPrimaryDns);
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_5, "Couldn't get primary DNS address from GPRS config (err: %d)",ret);
+			_LOG_L2C2(_L8("Couldn't get primary DNS address from GPRS config (err: %d)"),
+				ret);
 
 			// Don't leave on this error: we may still be OK if we read some
 			// settings from CommDB.
@@ -293,11 +293,12 @@
 		if (ret == KErrNone)
 			{
 			iSettings.iSecondaryDns = address.Ip6Address();
-			OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_6, "Got secondary DNS = %u:%u:%u:%u from context", iSettings.iSecondaryDns.u.iAddr32[3], iSettings.iSecondaryDns.u.iAddr32[2], iSettings.iSecondaryDns.u.iAddr32[1], iSettings.iSecondaryDns.u.iAddr32[0]);
+			LOG_IP_ADDRESS("Got secondary DNS", iSettings.iPrimaryDns);
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_7, "Couldn't get secondary DNS address from GPRS config (err: %d)",ret);
+			_LOG_L2C2(_L8("Couldn't get secondary DNS address from GPRS config (err: %d)"),
+				ret);
 
 			// Don't leave on this error: we may still be OK if we read some
 			// settings from CommDB.
@@ -305,8 +306,8 @@
 		}
 	else
 		{
-        OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_8, "Using CommDB DNS address - Primary  = %u:%u:%u:%u", iSettings.iPrimaryDns.u.iAddr32[3], iSettings.iPrimaryDns.u.iAddr32[2], iSettings.iPrimaryDns.u.iAddr32[1], iSettings.iPrimaryDns.u.iAddr32[0]);
-        OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_9, "                         - Secondary = %u:%u:%u:%u", iSettings.iSecondaryDns.u.iAddr32[3], iSettings.iSecondaryDns.u.iAddr32[2], iSettings.iSecondaryDns.u.iAddr32[1], iSettings.iSecondaryDns.u.iAddr32[0]);
+		LOG_IP_ADDRESS("Using CommDB DNS address - Primary ", iSettings.iPrimaryDns);
+		LOG_IP_ADDRESS("                         - Secondary ", iSettings.iSecondaryDns);
 		}
 	}
 
@@ -317,7 +318,7 @@
  * @param aConnectionSpeed Our connection speed
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONNECTIONSPEED_1, "CIPv6Binder::UpdateConnectionSpeed");
+	_LOG_L1C1(_L8("CIPv6Binder::UpdateConnectionSpeed"));
 
 	iSpeedMetric = aConnectionSpeed;
 	}
@@ -335,7 +336,7 @@
  * @return Standard error codes
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_SEND1_1, "CIPv6Binder::Send");
+	_LOG_L1C1(_L8("CIPv6Binder::Send"));
 
 #ifdef __BTT_LOGGING__
 		LogPacket(static_cast<RMBufChain&>(aPdu));
@@ -361,7 +362,7 @@
  * @param aInfo Not used 
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_NOTIFICATION_1, "CIPv6Binder::Notification");
+	_LOG_L1C1(_L8("CIPv6Binder::Notification"));
 
 	return KErrNone;
 	}
@@ -373,7 +374,7 @@
  * @param aProtocol A pointer to a protocol
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_STARTSENDING_1, "CIPv6Binder::StartSending()");
+	_LOG_L1C1(_L8("CIPv6Binder::StartSending()"));
 	CBinderBase::StartSending();
 	}
 
@@ -384,7 +385,8 @@
  * @param aProtocolCode The protocol type
  */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_WANTSPROTOCOL_1, "CIPv6Binder::WantsProtocol [aProtocolCode=%X]",aProtocolCode);
+	_LOG_L1C2(_L8("CIPv6Binder::WantsProtocol [aProtocolCode=%X]"),
+		aProtocolCode);
 
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
 	return ((aProtocolCode & 0x00FF) == KIp6FrameType);
@@ -407,7 +409,7 @@
  * @param aPdu The incoming packet
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_PROCESS1_1, "CIPv6Binder::Process");
+	_LOG_L1C1(_L8("CIPv6Binder::Process"));
 
 #ifdef __BTT_LOGGING__
 	LogPacket(static_cast<RMBufChain&>(aPdu));
@@ -425,12 +427,12 @@
 	// been bound yet.
 	if (iUpperReceiver && WantsProtocol(protocolCode))
 		{		
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_PROCESS1_2, "CIPv6Binder: Packet Sent to TCP/IP Protocol!!!");
+		_LOG_L1C1(_L8("CIPv6Binder: Packet Sent to TCP/IP Protocol!!!"));
 		iUpperReceiver->Process(static_cast<RMBufChain&>(aPdu));
 		}
 	else 
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_PROCESS1_3, "WARNING: dumping incoming packet, no protocol bound");
+		_LOG_L2C1(_L8("WARNING: dumping incoming packet, no protocol bound"));
 		aPdu.Free();
 		}
 
@@ -509,18 +511,19 @@
 * @param aPacket The packet 
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_1, "CIPv6Binder::LogPacket");
+	_LOG_L1C1(_L8("CIPv6Binder::LogPacket"));
 
 	TInt mBufLength = aPacket.Length() - aPacket.First()->Length();
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_2, "Analysis of %d byte packet:", mBufLength);
+	_LOG_L3C2(_L8("Analysis of %d byte packet:"), mBufLength);
 
 	//Note: All the constants used on this method are a pragmatic guess of the
 	//IP header fields. The only porpose of this method is logging.
 
 	if (mBufLength < 40)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_3, " -doesn't appear to be a valid IPv6 packet (length=%d)", mBufLength);
+		_LOG_L3C2(_L8(" -doesn't appear to be a valid IPv6 packet (length=%d)")
+			, mBufLength);
 		return;
 		}
 
@@ -529,14 +532,18 @@
 
 	if ((payloadPtr[0] & 0xF0) != 0x60)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_4, " - doesn't appear to be an IPv6 packet (version=0x%X)",(payloadPtr[0] & 0xF0) >> 4);
+		_LOG_L3C2(_L8(" - doesn't appear to be an IPv6 packet (version=0x%X)"),
+			(payloadPtr[0] & 0xF0) >> 4);
 		return;
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_5, " - traffic class: 0x%X", ((payloadPtr[0] & 0xF) << 4) | ((payloadPtr[1] & 0xF0) >> 4));
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_6, " - flow label: 0x%X", ((payloadPtr[1] & 0x0F) << 16) | (payloadPtr[2] << 8) | payloadPtr[3]);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_7, " - payload length: 0x%X", (payloadPtr[4] << 16) | payloadPtr[5]);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_8, " - next header: 0x%08X", payloadPtr[6]);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_9, " - hop limit: 0x%08X", payloadPtr[7]);
+	_LOG_L3C2(_L8(" - traffic class: 0x%X"), 
+					((payloadPtr[0] & 0xF) << 4) | ((payloadPtr[1] & 0xF0) >> 4));
+	_LOG_L3C2(_L8(" - flow label: 0x%X"), 
+					((payloadPtr[1] & 0x0F) << 16) | (payloadPtr[2] << 8) | payloadPtr[3]);
+	_LOG_L3C2(_L8(" - payload length: 0x%X"), 
+					(payloadPtr[4] << 16) | payloadPtr[5]);
+	_LOG_L3C2(_L8(" - next header: 0x%08X"), payloadPtr[6]);
+	_LOG_L3C2(_L8(" - hop limit: 0x%08X"), payloadPtr[7]);
 	}
 #endif // __BTT_LOGGING__

--- a/telephonyprotocols/rawipnif/rawipnif2/src/RawIP2Flow.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/RawIP2Flow.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -21,12 +21,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "RawIP2FlowTraces.h"
-#endif
-
 #include <f32file.h>
 #include <nifman.h>
 #include <nifmbuf.h>
@@ -46,16 +40,23 @@
 using namespace Messages;
 using namespace MeshMachine;
 
+#ifdef __FLOG_ACTIVE
+//These variables are used only if flog is active.
+_LIT8(KTcpDumpFirstTag,"TcpDump");
+static const TUint16 KTcpDumpLinkType = 12;
+#endif
 
-CRawIP2Flow::CRawIP2Flow(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf)
+CRawIP2Flow::CRawIP2Flow(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf, CBttLogger* aTheLogger)
 /**
  * Constructor.
  *
  * @param aFactory Reference to the factory which created this object.
  * @param aSubConnId Reference to the node id for sub connection.
  * @param aProtocolIntf pointer to the CProtocolIntfBase
+ * @param aTheLogger The logging object, ownership is passed to this object
  */
 	: CSubConnectionFlowBase(aFactory, aSubConnId, aProtocolIntf),
+	  iTheLogger(aTheLogger),
 	  iInitError(KErrNone),
 	  iStarted(EFalse),
 	  iStopping(EFalse)
@@ -71,10 +72,10 @@
  * @param aName The name of the NIF (unused)
  */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_CONSTRUCTL_1, "CRawIP2Flow %08x:\tConstructL()", this);
+	_LOG_L1C2(_L8("CRawIP2Flow %08x:\tConstructL()"), this);
 	
     iBinderControl = new (ELeave) TBinderControlProxy(*this);
-	iBcaController = CBcaController::NewL(*this);
+	iBcaController = CBcaController::NewL(*this, iTheLogger);
 	}
 
 CRawIP2Flow::~CRawIP2Flow()
@@ -84,11 +85,15 @@
 	{
 	// Note that we don't delete iBinder because it's not owned by us.
 	delete iBcaController;
+	// This class also deletes the logging object
+	delete iTheLogger;
 
 	ASSERT(iBinder == NULL);
 	
 	delete iBinderControl;	
 	LOG_NODE_DESTROY(KNifSubDir, CRawIP2Flow);
+	// Cleanup when stop was not called - harmless as it null's the pointer
+	__PACKETLOG_DELETE;
 	}
 
 void CRawIP2Flow::StartFlowL()
@@ -102,7 +107,7 @@
 	{
 	ASSERT(iStarting==EFalse);
 	iStarting = ETrue;
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_STARTFLOWL_1, "CRawIP2Flow %08x:\tStartFlowL()", this);
+	_LOG_L1C2(_L8("CRawIP2Flow %08x:\tStartFlowL()"), this);
 
 	// If there were any errors during earlier processing of the ProvisionConfig message
 	// then send an Error message in response to the StartFlow (because ProvisionConfig
@@ -119,7 +124,7 @@
 	// associate the binder object with the lowersender
 	iBinder->SetSender(&(iBcaController->Bca()->GetSender()));
 	//the name calculation should be done only if logging is enabled
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#ifdef __FLOG_ACTIVE
 	const TUint KModemNameLen = KCommsDbSvrMaxColumnNameLength + 10;  // need enough for ppp-XXX.txt - e.g. ppp-comm-1.txt, ppp-btcomm-10.txt etc
 	TBuf8<KModemNameLen> modemName;
 
@@ -140,7 +145,12 @@
 	TUint32 counter = User::FastCounter();
 	logFileName.Format(KTimeFormat, counter);
 
-	
+	TRAPD(err,__PACKETLOG_NEWL(KTcpDumpFirstTag, logFileName, CPacketLogger::ETcpDump, KTcpDumpLinkType));
+	if (err)
+		{
+		_LOG_L1C1(_L8("Trapped leave from __PACKETLOG_NEWL"));
+		}
+
 	const TUint KLogTextLen = KModemNameLen+KTimeStampLen+30;
 	TBuf8<KLogTextLen> logText;
 	_LIT8(KLogTimeText, "TcpDump log file time stamp:");
@@ -149,7 +159,7 @@
 	logText.Append(logFileName);
 	logText.Append(KLogModemText);
 	logText.Append(modemName);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_STARTFLOWL_3, logText);
+	_LOG_L1C1(logText);
 #endif
 	}
 
@@ -161,7 +171,7 @@
  * ready to go.
  */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_LINKLAYERUP_1, "CRawIP2Flow %08x:\tLinkLayerUp()", this);
+	_LOG_L1C2(_L8("CRawIP2Flow %08x:\tLinkLayerUp()"), this);
 
 	iLastRequestOriginator.ReplyTo(Id(), ESock::TCFDataClient::TStarted().CRef());
 	
@@ -178,8 +188,8 @@
  * @param aError An error code to propagate to NifMan
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_LINKLAYERDOWN_1, "CRawIP2Flow %08x:\tLinkLayerDown(aError %d)", (TUint)this, aError);
-
+	_LOG_L1C3(_L8("CRawIP2Flow %08x:\tLinkLayerDown(aError %d)"), this, aError);
+	__PACKETLOG_DELETE;
 
 	if (iStopping)
 		{
@@ -209,7 +219,8 @@
  * @param aAction The action to take: disconnect or reconnect
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_STOPFLOW_1, "CRawIP2Flow %08x:\tStopFlow(aError %d)",(TUint) this, aError);
+	_LOG_L1C3(_L8("CRawIP2Flow %08x:\tStopFlow(aError %d)"), this, aError);
+	__PACKETLOG_DELETE;
 	iStopping = ETrue;
 	ShutDown(aError);
 	}
@@ -226,7 +237,7 @@
  * @param aError A possible error
  */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_INITIALISEL_1, "CRawIPFlow %08x:\tInitialiseL",this);
+	_LOG_L1C2(_L8("CRawIPFlow %08x:\tInitialiseL"),this);		
 
 	// Update local state from TSY information originally from Agent.
 	GetBinder()->UpdateContextConfigL(*iAgentProvision->iGprsConfig);
@@ -247,7 +258,7 @@
  * @param aError A possible error (only during initialisation)
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_SHUTDOWN_1, "CRawIPFlow %08x:\tShutDown(aError %d)",(TUint)this, aError);
+	_LOG_L1C3(_L8("CRawIPFlow %08x:\tShutDown(aError %d)"),this, aError);	
 			
 	if (aError != KErrNone)
 		{
@@ -290,7 +301,7 @@
  * @param aError A possible error
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_UPDATECONTEXTSTATE_1, "CRawIP2Flow %08x:\tUpdateContextState(aState %d)", (TUint)this, aState);
+	_LOG_L1C3(_L8("CRawIP2Flow %08x:\tUpdateContextState(aState %d)"), this, aState);
 
 	// Note that we do not need to close the Flow down if there's been an
 	// error, as the context state machine will do this for us.
@@ -315,22 +326,25 @@
 
 ESock::MLowerControl* CRawIP2Flow::GetControlL(const TDesC8& aProtocol)
 	{
-
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_GETCONTROLL_1, "CRawIP2Flow %08x:\tGetControlL(aProtocol %s)", (TUint) this, aProtocol);
+#ifdef __BTT_LOGGING__
+	//TBuf8<256> debugBuffer;
+	//debugBuffer.Copy(aProtocol);
+	_LOG_L1C3(_L8("CRawIP2Flow %08x:\tGetControlL(aProtocol %S)"), this, &aProtocol);
+#endif
 
 	// IPv4 and ICMP Protocols
 	if (aProtocol.CompareF(KDescIp()) == 0 || aProtocol.CompareF(KDescIcmp()) == 0)
 		{
 		if (!iBinder)
 			{
-			iBinder = new (ELeave) CIPv4Binder(*this);
+			iBinder = new (ELeave) CIPv4Binder(*this, iTheLogger);
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS			
  			iBinder->SetType(KIp4FrameType);
 #endif // RAWIP_HEADER_APPENDED_TO_PACKETS			
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_GETCONTROLL_2, "CRawIP2Flow %08x:\tGetControlL(): IPv4 binder already exists", this);
+			_LOG_L1C2(_L8("CRawIP2Flow %08x:\tGetControlL(): IPv4 binder already exists"), this);
 			}
 		}
 	// IPv6 Protocol
@@ -338,14 +352,14 @@
 		{
 		if (!iBinder)
 			{
-			iBinder = new (ELeave) CIPv6Binder(*this);
+			iBinder = new (ELeave) CIPv6Binder(*this, iTheLogger);
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS			
  			iBinder->SetType(KIp6FrameType);
 #endif // RAWIP_HEADER_APPENDED_TO_PACKETS						
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_GETCONTROLL_3, "CRawIP2Flow %08x:\tGetControlL(): IPv6 binder already exists", this);
+			_LOG_L1C2(_L8("CRawIP2Flow %08x:\tGetControlL(): IPv6 binder already exists"), this);
 			}
 		}		
 	else
@@ -378,7 +392,7 @@
 
 void CRawIP2Flow::Unbind(ESock::MUpperDataReceiver* aUpperReceiver, ESock::MUpperControl* aUpperControl)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_UNBIND_1, "CRawIP2Flow %08x:\tUnbind()", this);
+    _LOG_L1C2(_L8("CRawIP2Flow %08x:\tUnbind()"), this);
 
 	ASSERT(iBinder);
 	iBinder->Unbind(aUpperReceiver, aUpperControl);
@@ -491,6 +505,7 @@
 			//doesn't notice anything. It does that by swapping the
 			//flows below the binders.
 			CBinderBase* localBinder = iBinder;
+			CBttLogger* logger = localBinder->iTheLogger;
 
 			TBinderControlProxy* localBinderControl = iBinderControl;
 			iBinder = otherFlow->iBinder;
@@ -502,6 +517,7 @@
 			otherFlow->iBinderControl->iFlow = otherFlow;
 			iBinderControl->iFlow = this;
 
+			iBinder->iTheLogger = logger;
 
 			iSubConnectionProvider.Close();
 			iSubConnectionProvider.Open(address_cast<TNodeId>(rejoinMsg.iNodeId));
@@ -561,7 +577,7 @@
 @param aData provisioning pointer from message
 */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_PROVISIONCONFIG_1, "CRawIP2Flow %08x:\tProvisionConfig()", this);
+	_LOG_L1C2(_L8("CRawIP2Flow %08x:\tProvisionConfig()"), this);
 	iProvisionError = KErrNone;
 
 	AccessPointConfig().Close();
@@ -572,7 +588,7 @@
 
     if (iBCAProvisionConfig == NULL)
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_PROVISIONCONFIG_2, "CRawIP2Flow:\tProvisionConfigL() - CBCAProvision config incomplete");
+        _LOG_L1C1(_L8("CRawIP2Flow:\tProvisionConfigL() - CBCAProvision config incomplete"));
 		iProvisionError = KErrCorrupt;
 		return;
         }
@@ -594,7 +610,7 @@
     const CIPConfig* wcdmaIpProvision = static_cast<const CIPConfig*>(AccessPointConfig().FindExtension(STypeId::CreateSTypeId(CIPConfig::EUid, CIPConfig::ETypeId)));
     if (wcdmaIpProvision == NULL)
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_DYNAMICPROVISIONCONFIGL_1, "CRawIP2Flow %08x:\tDynamicProvisionConfigL() - WCDMA config incomplete", this);
+        _LOG_L1C2(_L8("CRawIP2Flow %08x:\tDynamicProvisionConfigL() - WCDMA config incomplete"), this);
 		iProvisionError = KErrCorrupt;
 		return;
         }

--- a/telephonyprotocols/rawipnif/rawipnif2/src/RawIP2FlowFactory.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/RawIP2FlowFactory.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -19,14 +19,9 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "RawIP2FlowFactoryTraces.h"
-#endif
-
 #include "RawIP2FlowFactory.h"
 #include "RawIP2Flow.h"
+#include "bttlog.h"
 
 using namespace ESock;
 
@@ -63,11 +58,14 @@
 
 CSubConnectionFlowBase* CRawIP2FlowFactory::DoCreateFlowL(ESock::CProtocolIntfBase* aProtocol, ESock::TFactoryQueryBase& aQuery)
 	{
+#ifdef __BTT_LOGGING__
+	iTheLogger = CBttLogger::NewL(KNifSubDir, KRefFile, User::FastCounter());
+#endif // __BTT_LOGGING__
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOWFACTORY_DOCREATEFLOWL_1, "Raw IP logging started.");
+	_LOG_L1C1(_L8("Raw IP logging started."));
 
 	const TDefaultFlowFactoryQuery& query = static_cast<const TDefaultFlowFactoryQuery&>(aQuery);
- 	CRawIP2Flow* s = new (ELeave) CRawIP2Flow(*this, query.iSCprId, aProtocol);
+ 	CRawIP2Flow* s = new (ELeave) CRawIP2Flow(*this, query.iSCprId, aProtocol, iTheLogger);
 	CleanupStack::PushL(s);
 	s->ConstructL();
 	CleanupStack::Pop(s);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/bttlog.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,221 @@
+// Copyright (c) 2002-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:
+// Implements CBttLogger.
+// 
+//
+
+/**
+ @file
+*/
+
+#include "bttlog.h"
+
+#ifdef __BTT_LOGGING__
+
+#ifdef __DEBUGRAWIPSERIALPORT__
+#include <e32svr.h>
+#endif
+
+//Enable this if you want time stamps for each log statements.
+//This is computation ineffective and not recommended.
+//#define __TIME_STAMP_ENABLED__
+
+CBttLogger* CBttLogger::NewL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId)
+/**
+ * Factory method for CBttLogger.
+ * 
+ * @param aSubDir The subdirectory of c:\logs\gprsbtt to log to.
+ * @param aFileName The filename to log to.
+ * @return Ownership of a new CBttLogger.
+ */
+	{
+	CBttLogger* self = new(ELeave) CBttLogger;
+	CleanupStack::PushL(self);
+	self->ConstructL(aTag, aFileName, aInstanceId);
+	CleanupStack::Pop(self);
+	return self;
+	}
+
+#ifdef __FLOG_ACTIVE
+void CBttLogger::ConstructL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId)
+#else
+void CBttLogger::ConstructL(const TDesC8&, const TDesC8&, const TUint32 aInstanceId)
+#endif
+/**
+ * 2nd-phase construction.
+ * Hurricane/Typhoon - we can log to a particular directory
+ */
+	{
+	iInstanceId = aInstanceId;
+	__FLOG_OPEN(aTag, aFileName);
+	}
+
+//#endif
+
+CBttLogger::CBttLogger()
+/**
+ * Constructor
+ */
+ 	{
+	}
+
+CBttLogger::~CBttLogger()
+/**
+ * Destructor
+ */
+	{
+	__FLOG_CLOSE;
+	}
+
+void CBttLogger::Write(const TDesC8& aText)
+/**
+ * Write an 8-bit descriptor to the log file
+ *
+ * @param aText The test to write
+ */	
+	{
+	TBuf8<KLogBufferSize> buf;
+	TLogIgnoreOverflow8 overflowHandler;
+	// put the instance id to identify which nif we are
+	// logging from
+	_LIT8(KInstanceFormat, "RawIp 0x%08X: ");
+	buf.Format(KInstanceFormat, &overflowHandler, iInstanceId);
+	
+#ifdef __TIME_STAMP_ENABLED__
+	// log to our own file in Hurricane/Typhoon
+	_LIT8(KTimeFormat, "%02d.%02d:%02d:%06d ");
+	
+	TTime now;
+	now.UniversalTime();
+	TDateTime dateTime;
+	dateTime = now.DateTime();
+	buf.AppendFormat(KTimeFormat, 
+		&overflowHandler,
+		dateTime.Hour(), 
+		dateTime.Minute(), 
+		dateTime.Second(), 
+		dateTime.MicroSecond());
+#endif
+
+	buf.Append(aText);
+
+#ifdef __DEBUGRAWIPSERIALPORT__
+	TBuf<KLogBufferSize> buf2;
+	// TEMP: Do not print single % since appear as format char to RDebug::Print
+	for (TInt i = 0; i < buf.Length(); i++)
+		{
+		if (buf[i] == '%')
+			buf2.Append(_L("."));
+		else
+			buf2.Append(buf[i]);
+		}
+	RDebug::Print(buf2);
+#else
+	__FLOG(buf);
+#endif
+	}
+
+void CBttLogger::WriteFormat(TRefByValue<const TDesC8> aFmt, ...)
+/**
+ * Write an 8-bit format list to the log file
+ */	
+	{
+    //coverity[var_decl];
+    VA_LIST list;
+    VA_START(list, aFmt);
+ 
+	// log to our own file in Hurricane/Typhoon
+	TBuf8<KLogBufferSize> buf;
+	TLogIgnoreOverflow8 overflowHandler;
+        //coverity[uninit_use_in_call];
+	buf.AppendFormatList(aFmt, list, &overflowHandler);
+	Write(buf);
+	}
+
+void CBttLogger::VerboseLeaveL(char* aFile, TInt aLine, TInt aReason)
+/**
+ * Make a verbose leave - write name of file and line number to the log just 
+ * before leaving.
+ *
+ * @param aFile The file we're leaving from.
+ * @param aLine The line number we're leaving from.
+ * @param aReason The leave code.
+ */
+	{
+	// only leave if non-zero value
+	if ( aReason == KErrNone )
+		{
+		return;
+		}
+
+	_LIT8(KLeavePrefix, "LEAVE: " );
+
+	TPtrC8 fullFileName((const TUint8*)aFile);
+	TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
+
+	TBuf8<256> buf;
+	TLogIgnoreOverflow8 overflowHandler;
+	buf.AppendFormat(_L8("%S aReason=%d [file %S, line %d]"),
+		&overflowHandler,
+		&KLeavePrefix,
+		aReason,
+		&fileName,
+		aLine);
+	Write(buf);
+
+	__FLOG_CLOSE;
+
+	// finally
+	User::Leave(aReason);
+	}
+
+void CBttLogger::VerbosePanic(char* aFile, 
+							   TInt aLine, 
+							   TInt aPanicCode, 
+							   TText8* aPanicName,
+							   const TDesC& aPanicCategory)
+/**
+ * Make a verbose panic - write name of file and line number to the
+ * log just before panicking.
+ *
+ * @param aFile The file that's panicking.
+ * @param aLine The line number that's panicking.
+ * @param aReason The panic code.
+ * @param aPanicName The text of the panic code.
+ * @param aPanicCategory The panic category.
+ */
+	{
+	_LIT8(KLeavePrefix, "PANIC: " );
+
+	TPtrC8 fullFileName((const TUint8*)aFile);
+	TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
+
+	TBuf8<256> buf;
+	TLogIgnoreOverflow8 overflowHandler;
+	buf.AppendFormat(_L8("%S %d = %s [file %S, line %d]"), 
+		&overflowHandler,
+		&KLeavePrefix,
+		aPanicCode, 
+		aPanicName, 
+		&fileName, 
+		aLine);
+	Write(buf);
+
+	__FLOG_CLOSE;
+
+	// finally
+	User::Panic(aPanicCategory, aPanicCode);
+	}
+
+#endif // __BTT_LOGGING__

--- a/telephonyprotocols/rawipnif/rawipnif2/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyprotocols/rawipnif/rawipnif2/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_CONSTRUCTL_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_DOCANCEL_1=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_DOCANCEL_2=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_DOCANCEL_3=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_DOCANCEL_4=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_PANIC_1=0x15
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_10=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_2=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_3=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_4=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_5=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_6=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_7=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_8=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_9=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_STARTLOADL_1=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_STARTLOADL_2=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_STARTLOADL_3=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_STOP_1=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_STOP_2=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_BIND_1=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_ERROR_1=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_SETTYPE_1=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_STARTSENDING_1=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_UNBIND_1=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CIPTAGHEADER_ADDHEADER_1=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CIPTAGHEADER_REMOVEHEADER_1=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_CIPTAGHEADER_SETTYPE_1=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_CONTROL_1=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_DELETECONTEXT_1=0x21
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_GETCONFIG_1=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_GETCONFIG_2=0x20
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_1=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_10=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_11=0x40
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_12=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_13=0x42
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_14=0x43
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_15=0x44
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_16=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_17=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_18=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_19=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_2=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_20=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_21=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_22=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_3=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_4=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_5=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_6=0x3b
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_7=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_8=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_9=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_NOTIFICATION_1=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_PROCESS1_1=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_PROCESS1_2=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_PROCESS1_3=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_SEND1_1=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_SETPROVISION_1=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_SETPROVISION_2=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_STARTSENDING_1=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONNECTIONSPEED_1=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_1=0x22
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_10=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_2=0x23
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_3=0x24
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_4=0x25
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_5=0x26
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_6=0x27
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_7=0x28
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_8=0x29
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_9=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_WANTSPROTOCOL_1=0x30
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_CONTROL_1=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_DELETECONTEXT_1=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_1=0x5f
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_2=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_3=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_4=0x62
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_5=0x63
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_6=0x64
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_7=0x65
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_8=0x66
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_9=0x67
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_NOTIFICATION_1=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_PROCESS1_1=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_PROCESS1_2=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_PROCESS1_3=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_SEND1_1=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_STARTSENDING_1=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONNECTIONSPEED_1=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_1=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_2=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_3=0x50
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_4=0x51
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_5=0x52
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_6=0x53
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_7=0x54
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_8=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_9=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_WANTSPROTOCOL_1=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOWFACTORY_DOCREATEFLOWL_1=0x78
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_CONSTRUCTL_1=0x68
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_DYNAMICPROVISIONCONFIGL_1=0x77
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_GETCONTROLL_1=0x71
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_GETCONTROLL_2=0x72
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_GETCONTROLL_3=0x73
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_INITIALISEL_1=0x6e
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_LINKLAYERDOWN_1=0x6c
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_LINKLAYERUP_1=0x6b
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_PROVISIONCONFIG_1=0x75
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_PROVISIONCONFIG_2=0x76
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_SHUTDOWN_1=0x6f
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_STARTFLOWL_1=0x69
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_STARTFLOWL_3=0x6a
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_STOPFLOW_1=0x6d
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_UNBIND_1=0x74
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_UPDATECONTEXTSTATE_1=0x70

--- a/telephonyprotocols/rawipnif/src/BcaController.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/BcaController.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "BcaControllerTraces.h"
-#endif
-
 #include <e32uid.h>
 #include <nifmbuf.h>
 #include <es_ini.h>
@@ -48,6 +42,7 @@
  * Constructor. 
  */
 	: iObserver(aObserver),  
+	  iTheLogger(aTheLogger),
 	  iTxFlowControl(EFlowControlOff), 
 	  iTxContextActive(ETrue), 
 	  iSendState(EIdle),
@@ -73,13 +68,11 @@
 
 void CBcaController::BaseConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_BASECONSTRUCTL_1, "CBcaController::BaseConstructL");
+	_LOG_L1C1(_L8("CBcaController::BaseConstructL"));
 	
-    #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS         
-	iIPTagHeader = new (ELeave) CIPTagHeader();        
-    #endif // RAWIP_HEADER_APPENDED_TO_PACKETS
-	
-	iIPTagHeader = new (ELeave) CIPTagHeader(iTheLogger);
+#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
+    iIPTagHeader = new (ELeave) CIPTagHeader(iTheLogger);
+#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
     
 #if defined (__EABI__)
     // Default value for queue length
@@ -98,7 +91,6 @@
 	UserSvr::HalFunction(EHalGroupEmulator,EEmulatorHalIntProperty,(TAny*)"rawip_KMaxTxIPPacketSize",&iMaxTxPacketSize);
 	UserSvr::HalFunction(EHalGroupEmulator,EEmulatorHalIntProperty,(TAny*)"rawip_KMaxRxIPPacketSize",&iMaxRxPacketSize);
 #endif
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_BASECONSTRUCTL_2, "RawIp ini file %S not found. Default values will be used.", KRawIpIniFile);
 	}
 
 void CBcaController::UpdateInternalFlowFlag(TFlowControl aValue)
@@ -109,12 +101,13 @@
  * @param aValue the new state of iInternalFlow
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_UPDATEINTERNALFLOWFLAG_1, "CBcaController::UpdateInternalFlowFlag[NewValue=%d, iSendState=%d]",aValue, iSendState);
+	_LOG_L1C3(_L8("CBcaController::UpdateInternalFlowFlag[NewValue=%d, iSendState=%d]"),
+		aValue, iSendState);
 
 	if(iTxFlowControl == aValue)
 		{
 		// C32 Sent the same indication signal twice. Nif will ignore it.
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_UPDATEINTERNALFLOWFLAG_2, "WARNING CBcaController: Received same indication twice");
+		_LOG_L2C1(_L8("WARNING CBcaController: Received same indication twice"));
 		return;
 		}
 	
@@ -146,7 +139,8 @@
  * @param aValue the new state of iTxContextState
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_UPDATECONTEXTSTATEFLAG_1, "CBcaController::UpdateContextStateFlag[NewValue=%d, OldValue=%d]",aValue, iTxContextActive);
+	_LOG_L1C3(_L8("CBcaController::UpdateContextStateFlag[NewValue=%d, OldValue=%d]"),
+		aValue, iTxContextActive);
 	
 	if(iTxContextActive == aValue)
 		{
@@ -181,12 +175,12 @@
  *	@param aPdu a data packet
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_1, ">>CBcaController::Send");
+	_LOG_L1C1(_L8(">>CBcaController::Send"));
 
 	// Check if NIF is shutting down
 	if (iSendState == EShuttingDown)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_2, "    ERROR: Nif is shutting down");
+		_LOG_L2C1(_L8("    ERROR: Nif is shutting down"));
 		
 		aPdu.Free();
 
@@ -197,8 +191,8 @@
 	// add it to our queue
 	if ((aPdu.Length() - aPdu.First()->Length()) > BcaSendBufferLength())
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_3, "Packet is too large - discarding");
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_4, "<<CSender::Send -> Error");
+		_LOG_L2C1(_L8("Packet is too large - discarding"));
+		_LOG_L1C1(_L8("<<CSender::Send -> Error"));
 
 		aPdu.Free();
 		return KErrArgument;
@@ -212,14 +206,14 @@
 		// queue becomes full the IP layer shouldnt send any more packets until it is told to
 		if (!IsSendQueueFull())
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_5, "    Sender busy, appending packet to queue");
+			_LOG_L1C1(_L8("    Sender busy, appending packet to queue"));
 			//We know that flow control is off and context isnt suspended so can add to queue
 			AppendToSendQueue(aPdu);
 			
 			return IsSendQueueFull() ? KStopSending : KContinueSending;
 			}
 			
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_6, "    Queue is full, upper layer is still sending packets, potential memory problems.");
+		_LOG_L1C1(_L8("    Queue is full, upper layer is still sending packets, potential memory problems."));
 		AppendToSendQueue(aPdu);
 		return KStopSending;
 		}
@@ -233,12 +227,12 @@
 		//make sure that we don't change the order of packets!
 		//first send what has already been lined up
 		RMBufChain tmpPdu;
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_7, "    Packet removed from queue to send");
+		_LOG_L1C1(_L8("    Packet removed from queue to send"));
 		RemoveFromSendQueue(tmpPdu);
 		AppendToSendQueue(aPdu);
 		
 		// Update module state
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_8, "     set State to ESending");
+		_LOG_L2C1(_L8("     set State to ESending"));
 		iSendState = ESending;
 		
 		BcaSend(tmpPdu);
@@ -246,13 +240,13 @@
 	else
 		{
 		// Update module state
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_9, "     set State to ESending");
+		_LOG_L2C1(_L8("     set State to ESending"));
 		iSendState = ESending;
 		 
 		BcaSend(aPdu);
 		}
 		
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_10, "<<CBcaController::Send - return StopSending/ContinueSending");
+	_LOG_L2C1(_L8("<<CBcaController::Send - return StopSending/ContinueSending"));
 	return IsSendQueueFull() ? KStopSending : KContinueSending;
 	}
 
@@ -263,8 +257,8 @@
  *  protocol indicating that is available to send more packets.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SENDCOMPLETE_1, "CBcaController::SendComplete");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SENDCOMPLETE_2, "     set State to EIdle");
+	_LOG_L1C1(_L8("CBcaController::SendComplete"));
+	_LOG_L2C1(_L8("     set State to EIdle"));
 	
 	iSendState = EIdle;
 
@@ -279,7 +273,8 @@
  * @return The Flow control state
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_ISTXPOSSIBLE_1, "CBcaController::IsTxPossible (contextActive %d, flowcontrol %d)", iTxContextActive, iTxFlowControl);
+	_LOG_L1C3(_L8("CBcaController::IsTxPossible (contextActive %d, flowcontrol %d)"), 
+		iTxContextActive, iTxFlowControl);
 
 	if(iTxContextActive && (iTxFlowControl == EFlowControlOff))
 		return ETrue;
@@ -294,7 +289,7 @@
  * @param aPdu a data packet
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_PROCESS_1, ">>CBcaController::Process");
+	_LOG_L1C1(_L8(">>CBcaController::Process"));
 
 	TInt ret;
 
@@ -304,7 +299,7 @@
 	if (ret != KErrNone)
 		{
 		// Couldn't create package. Packet will be ignored...
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_PROCESS_2, "<<CBcaController::Process couldn't create MBuf [ret=%d]", ret);
+		_LOG_L1C2(_L8("<<CBcaController::Process couldn't create MBuf [ret=%d]"), ret);
 		return;
 		}
 	else
@@ -321,7 +316,7 @@
 		GetObserver().Process(packet, protocolCode);
 		}
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_PROCESS_3, "<<CBcaController::Process");
+	_LOG_L1C1(_L8("<<CBcaController::Process"));
 	}
 
 void CBcaController::ResumeSending()
@@ -330,7 +325,7 @@
  *	process more packets.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RESUMESENDING_1, "CBcaIoController::ResumeSending");
+	_LOG_L1C1(_L8("CBcaIoController::ResumeSending"));
 
 	// If there are still some packets in the queue to be sent, then carry
 	// on sending them.
@@ -340,11 +335,11 @@
 		if(!IsSendQueueEmpty())
 			{
 			RMBufChain tmpPdu;
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RESUMESENDING_2, "    Packet removed from queue to send");
+			_LOG_L1C1(_L8("    Packet removed from queue to send"));
 			RemoveFromSendQueue(tmpPdu);
 			
 			// Update module state
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RESUMESENDING_3, "     set State to ESending");
+			_LOG_L2C1(_L8("     set State to ESending"));
 			iSendState = ESending;
 			
 			BcaSend(tmpPdu);
@@ -363,7 +358,7 @@
 /**
  *  Used to specify the type of the IP header.
  */
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SETTYPE_1, "CBcaController::SetType");
+ 	_LOG_L1C1(_L8("CBcaController::SetType"));
  	
  	iIPTagHeader->SetType(aType);	
 	}
@@ -373,7 +368,7 @@
  *  Used to add the IP header to the packet before sending to the BCA.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_ADDHEADER_1, "CBcaController::AddHeader");
+	_LOG_L1C1(_L8("CBcaController::AddHeader"));
 
 	iIPTagHeader->AddHeader(aDes);
 	}
@@ -385,7 +380,7 @@
  * @return The IP header that has been removed from the packet
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_REMOVEHEADER_1, "CBcaController::RemoveHeader");
+	_LOG_L1C1(_L8("CBcaController::RemoveHeader"));
 
 	return (iIPTagHeader->RemoveHeader(aPdu));
 	}

--- a/telephonyprotocols/rawipnif/src/BcaIoController.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/BcaIoController.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -19,12 +19,6 @@
  @file BcaIoController.cpp
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "BcaIoControllerTraces.h"
-#endif
-
 #include <e32uid.h>
 #include <nifmbuf.h>
 #include <e32svr.h>
@@ -44,13 +38,16 @@
 extern const TInt KMaxRxIPPacketSize = KMaxIPPacket + KIPTagHeaderLength;
 #endif
 
-CBcaIoController::CBcaIoController(MControllerObserver& aObserver)
+CBcaIoController::CBcaIoController(MControllerObserver& aObserver,
+	CBttLogger* aTheLogger)
 /**
  * Constructor. 
  *
  * @param aObserver Reference to the observer of this state machine
+ * @param aTheLogger The logging object
  */
-    : iSendState(EIdle),
+    : iTheLogger(aTheLogger),
+      iSendState(EIdle),
       iFlowBlocked(EFalse),
       iNumPacketsInSendQueue(0),
       iObserver(aObserver),
@@ -61,28 +58,29 @@
     {
     }
 
-CBcaIoController* CBcaIoController::NewL(MControllerObserver& aObserver)
+CBcaIoController* CBcaIoController::NewL(MControllerObserver& aObserver, CBttLogger* aTheLogger)
 /**
  * Two-phase constructor. Creates a new CBcaIoController object, performs 
  * second-phase construction, then returns it.
  *
  * @param aObserver The observer, to which events will be reported
+ * @param aTheLogger The logging object
  * @return A newly constructed CBcaIoController object
  */
-	{
-	CBcaIoController* self = new (ELeave) CBcaIoController(aObserver);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop(self);
-	return self;
-	}
+    {
+    CBcaIoController* self = new (ELeave) CBcaIoController(aObserver, aTheLogger);
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    CleanupStack::Pop(self);
+    return self;
+    }
 
 void CBcaIoController::ConstructL()
 /**
  * Second-phase constructor. Creates all the state objects it owns.
  */
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_CONSTRUCTL_1, "CBcaIoController::ConstructL");
+    _LOG_L1C1(_L8("CBcaIoController::ConstructL"));
 
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
     iIPTagHeader = new (ELeave) CIPTagHeader(iTheLogger);
@@ -108,11 +106,10 @@
     
     // end note
     
-    iSender = CSender::NewL(*this, iMaxTxPacketSize);
-    iReceiver = CReceiver::NewL(*this, iMaxRxPacketSize);
-    iLoader = new (ELeave) CBcaControl(*this);
+    iSender = CSender::NewL(*this, iTheLogger, iMaxTxPacketSize);
+    iReceiver = CReceiver::NewL(*this, iTheLogger, iMaxRxPacketSize);
+    iLoader = new (ELeave) CBcaControl(*this, iTheLogger);
     }
-	
 
 
 CBcaIoController::~CBcaIoController()
@@ -148,7 +145,7 @@
  *  Used to kick off the initialisation for this module
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_STARTL_1, "CBcaIoController::StartL is called.");
+	_LOG_L1C1(_L8("CBcaIoController::StartL is called."));
 
     iLoader->StartLoadL();
 	}
@@ -160,7 +157,7 @@
  * @param aError the passed in error code as to why Stop has been called
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_STOP_1, "CBcaIoController::Stop is called.");
+	_LOG_L1C1(_L8("CBcaIoController::Stop is called."));
 
 	//Stop all the active objects
 	iReceiver->Cancel();
@@ -185,12 +182,12 @@
  *  @param aPdu a data packet
  */
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_1, "<<CBcaIoController::Send");
+    _LOG_L1C1(_L8(">>CBcaIoController::Send"));
 
     // Check if flow is shutting down
     if (iSendState == EShuttingDown)
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_2, "    ERROR: Nif is shutting down");
+        _LOG_L2C1(_L8("    ERROR: Nif is shutting down"));
         
         // when the flow is destroyed the memory for this packet will be 
         // cleaned up - just tell the layers above to stop sending.
@@ -203,8 +200,8 @@
     // add it to our queue
     if ((aPdu.Length() - aPdu.First()->Length()) > iMaxTxPacketSize)
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_3, "Packet is too large - discarding");
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_4, "<<CSender::Send -> Error");
+        _LOG_L2C1(_L8("Packet is too large - discarding"));
+        _LOG_L1C1(_L8("<<CSender::Send -> Error"));
 
         // in debug panic - this should not happen, MTU on the uplink should
         // be strictly enforced
@@ -215,7 +212,7 @@
         // may be counter intuitive, however the only options here are either 
         // send accepted or blocked (MLowerDataSender).
         
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_5, "<<CBcaIoController::Send - return ContinueSending");
+        _LOG_L2C1(_L8("<<CBcaIoController::Send - return ContinueSending"));
         return ESock::MLowerDataSender::ESendAccepted;
         }
     
@@ -225,7 +222,7 @@
         // Transmit is off for this flow - we must have received a block
         // message from our control.  append this message to the queue
         // and tell the layer above it to kindly stop sending.
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_6, "    Sender blocked, appending packet to queue");
+        _LOG_L1C1(_L8("    Sender blocked, appending packet to queue"));
         
         AppendToSendQueue(aPdu);
         
@@ -235,12 +232,12 @@
         
         if (IsSendQueueFull())
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_7, "<<CBcaIoController::Send - return StopSending");
+            _LOG_L2C1(_L8("<<CBcaIoController::Send - return StopSending"));
             return ESock::MLowerDataSender::ESendBlocked;
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_8, "<<CBcaIoController::Send - return ContinueSending");
+            _LOG_L2C1(_L8("<<CBcaIoController::Send - return ContinueSending"));
             return ESock::MLowerDataSender::ESendAccepted;       
             }
         }
@@ -252,12 +249,12 @@
         // If this happens, it means that TCP/IP has sent us an IP packet
         // while we're still sending the previous one. 
         {    
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_9, "    Sender busy, appending packet to queue");
+        _LOG_L1C1(_L8("    Sender busy, appending packet to queue"));
         AppendToSendQueue(aPdu);
         
         if (IsSendQueueFull())
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_10, "<<CBcaIoController::Send - return StopSending");
+            _LOG_L2C1(_L8("<<CBcaIoController::Send - return StopSending"));
             return ESock::MLowerDataSender::ESendBlocked;
             }
         }
@@ -268,7 +265,7 @@
         // packets that might have been queued onto the send queue.
     
         // Update module state
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_11, "     set State to ESending");
+        _LOG_L2C1(_L8("     set State to ESending"));
         iSendState = ESending;
          
         iSender->Send(aPdu);
@@ -278,7 +275,7 @@
     // otherwise, block this flow until we have room for the next
     // packet
     
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_12, "<<CBcaIoController::Send - return ContinueSending");
+    _LOG_L2C1(_L8("<<CBcaIoController::Send - return ContinueSending"));
 
     return ESock::MLowerDataSender::ESendAccepted;
     }
@@ -289,12 +286,12 @@
  *  to process more packets.
  */
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SENDCOMPLETE_1, ">>CBcaIoController::SendComplete");
+    _LOG_L1C1(_L8(">>CBcaIoController::SendComplete"));
 
     // if we've been blocked while in the middle of a 
     // send - don't continue sending, this will happen
     // when the flow is resumed.
-	
+
     iSendState = EIdle;
 
     // are we available to transmit?
@@ -324,11 +321,11 @@
             iSendState = ESending;
             
             RMBufChain tmpPdu;
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SENDCOMPLETE_2, "    Packet removed from queue to send");
+            _LOG_L1C1(_L8("    Packet removed from queue to send"));
             RemoveFromSendQueue(tmpPdu);
             
             // Update module state
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SENDCOMPLETE_3, "     set State to ESending");
+            _LOG_L2C1(_L8("     set State to ESending"));
           
             iSender->Send(tmpPdu);
             
@@ -343,7 +340,7 @@
             }
         }
     
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SENDCOMPLETE_4, "<<CBcaIoController::SendComplete");
+    _LOG_L1C1(_L8("<<CBcaIoController::SendComplete"));
     }
 
 
@@ -352,7 +349,7 @@
  *  Flow is being unblocked this will resume sending.
  */
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_RESUMESENDING_1, ">>CBcaIoController::ResumeSending");
+    _LOG_L1C1(_L8(">>CBcaIoController::ResumeSending"));
 
     // allows for normal SendComplete behaviour if there is
     // a packet outstanding with BCA
@@ -381,11 +378,11 @@
         if ((resumeSending) || (!IsSendQueueEmpty()))
             {
             RMBufChain tmpPdu;
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_RESUMESENDING_2, "    Packet removed from queue to send");
+            _LOG_L1C1(_L8("    Packet removed from queue to send"));
             RemoveFromSendQueue(tmpPdu);
             
             // Update module state
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_RESUMESENDING_3, "     set State to ESending");
+            _LOG_L2C1(_L8("     set State to ESending"));
             iSendState = ESending;
           
             iSender->Send(tmpPdu);
@@ -401,7 +398,7 @@
             }
         }
     
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_RESUMESENDING_4, "<<CBcaIoController::ResumeSending");
+    _LOG_L1C1(_L8("<<CBcaIoController::ResumeSending"));
     }
 
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
@@ -410,7 +407,7 @@
 /**
  *  Used to specify the type of the IP header.
  */
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SETTYPE_1, "CBcaController::SetType");
+    _LOG_L1C1(_L8("CBcaController::SetType"));
     
     iIPTagHeader->SetType(aType);   
     }
@@ -420,7 +417,7 @@
  *  Used to add the IP header to the packet before sending to the BCA.
  */
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_ADDHEADER_1, "CBcaController::AddHeader");
+    _LOG_L1C1(_L8("CBcaController::AddHeader"));
 
     iIPTagHeader->AddHeader(aDes);
     }
@@ -432,21 +429,23 @@
  * @return The IP header that has been removed from the packet
  */
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_REMOVEHEADER_1, "CBcaController::RemoveHeader");
+    _LOG_L1C1(_L8("CBcaController::RemoveHeader"));
 
     return (iIPTagHeader->RemoveHeader(aPdu));
     }   
 #endif // RAWIP_HEADER_APPENDED_TO_PACKETS
 
 
-CBcaControl::CBcaControl(CBcaIoController& aObserver)
+CBcaControl::CBcaControl(CBcaIoController& aObserver, CBttLogger* aTheLogger)
 /**
  * Constructor. Performs standard active object initialisation.
  *
  * @param aObserver Reference to the observer of this state machine
+ * @param aTheLogger The logging object
  */
 	: CActive(EPriorityStandard), 
 	  iObserver(aObserver), 
+	  iTheLogger(aTheLogger),
 	  iMBca(NULL),
 	  iState(EIdling),
 	  iError(KErrNone)
@@ -480,7 +479,7 @@
  *  
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_1, "CBcaControl::RunL() called");
+	_LOG_L1C1(_L8("CBcaControl::RunL() called"));
 	switch (iState)
 		{
 		//in this state, Ioctl is called to set IAP ID, check the result of
@@ -492,11 +491,11 @@
 				{
 				if(iStatus == KErrNotSupported)
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_2, "This BCA does not support IAPID set");
+					_LOG_L1C1(_L8("This BCA does not support IAPID set"));
 					}
 				else
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_3, "This BCA supports IAPID set");
+					_LOG_L2C1(_L8("This BCA supports IAPID set"));
 					}
 				
 				TPtrC bcaStack = iObserver.BcaStack();
@@ -516,7 +515,7 @@
 				}
 			else
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_4, "ERROR in BCA IAPID set = %d", iStatus.Int());
+				_LOG_L1C2(_L8("ERROR in BCA IAPID set = %d"), iStatus.Int());
 				iObserver.Stop(iStatus.Int());
 				}
 			
@@ -531,11 +530,11 @@
 				{
 				if(iStatus == KErrNotSupported)
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_5, "This BCA does not support BCA stacking");
+					_LOG_L1C1(_L8("This BCA does not support BCA stacking"));
 					}
 				else
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_6, "This BCA supports BCA stacking");
+					_LOG_L2C1(_L8("This BCA supports BCA stacking"));
 					}
 				iMBca->Open(iStatus, iObserver.Port());
 				iState = EBcaStackSet;
@@ -543,7 +542,7 @@
 				}
 			else
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_7, "ERROR in BCA stack set = %d", iStatus.Int());
+				_LOG_L2C2(_L8("ERROR in BCA stack set = %d"), iStatus.Int());
 				iObserver.Stop(iStatus.Int());
 				}
 			break;
@@ -555,7 +554,7 @@
 			{
 			if(iStatus != KErrNone && iStatus !=  KErrAlreadyExists)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_8, "ERROR in BCA Open = %d", iStatus.Int());
+				_LOG_L2C2(_L8("ERROR in BCA Open = %d"), iStatus.Int());
 				iObserver.Stop(iStatus.Int());
 				}
 			else
@@ -563,11 +562,11 @@
                 iState = EBcaOpened;
                 //Activate the receiver Active Object
 				iObserver.Receiver().StartListening();
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_9, "CBcaIoController Is Initialised");
+				_LOG_L1C1(_L8("CBcaIoController Is Initialised"));
 				TRAPD(err, iObserver.GetObserver().InitialiseL(MRawIPObserverBase::EBcaController,KErrNone));
 				if(err != KErrNone)
 					{
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_10, "ERROR in BCA Open Initialise observer = %d", err);
+					_LOG_L2C2(_L8("ERROR in BCA Open Initialise observer = %d"), err);
 					iObserver.Stop(err);
 					}
 				}
@@ -585,9 +584,8 @@
 		// Wrong state.
 		default:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_11, "ERROR CBcaControl::RunL(): Unknown state");
-	        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_12, "PANIC: %S %d", KNifName, KBcaUnkownState);
-	        User::Panic(KNifName, KBcaUnkownState);
+			_LOG_L1C1(_L8("ERROR CBcaControl::RunL(): Unknown state"));
+			_BTT_PANIC(KNifName, KBcaUnkownState);
 			break;
 			}
 		}
@@ -599,8 +597,8 @@
  *	cancel active request. 
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_DOCANCEL_1, "CBcaControl::DoCancel called.");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_DOCANCEL_2, "iState value is %d", iState);
+	_LOG_L1C1(_L8("CBcaControl::DoCancel called."));
+	_LOG_L2C2(_L8("iState value is %d"), iState);
 	switch (iState)
 		{
 		case EIdling:
@@ -616,9 +614,8 @@
             iState = EIdling;		    
             break;    
 		default:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_DOCANCEL_3, "ERROR CBcaControl::DoCancel(): Unknown state");
-	        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_DOCANCEL_4, "PANIC: %S %d", KNifName, KBcaUnkownState);
-	        User::Panic(KNifName, KBcaUnkownState);
+			_LOG_L2C1(_L8("ERROR CBcaControl::DoCancel(): Unknown state"));
+			_BTT_PANIC(KNifName, KBcaUnkownState);
 			break;
 		}
 	}
@@ -628,7 +625,7 @@
  *  This method loads the C32BCA library and uses Ioctl to set the Bca iIapId. 
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_STARTLOADL_1, "CBcaControl::StartLoad");
+	_LOG_L1C1(_L8("CBcaControl::StartLoad"));
 	
 	//iMBca should not be initialized at this point
 	__ASSERT_DEBUG(!iMBca,Panic(KBcaAlreadyExists));
@@ -650,7 +647,7 @@
 	TNewBcaFactoryL newBcaFactoryProcL = (TNewBcaFactoryL)iBcaDll.iObj.Lookup(1);
 	if (NULL == newBcaFactoryProcL)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_STARTLOADL_2, "Library entry point found error %d", KErrBadLibraryEntryPoint);
+		_LOG_L1C2(_L8("Library entry point found error %d"), KErrBadLibraryEntryPoint);
 		User::Leave(KErrBadLibraryEntryPoint);	
 		}
 	
@@ -658,7 +655,7 @@
 
 	if(!bcaFactory)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_STARTLOADL_3, "BcaFactory creation error %d", KErrCompletion);
+		_LOG_L1C2(_L8("BcaFactory creation error %d"), KErrCompletion);
 		User::Leave(KErrCompletion);	
 		}
 	CleanupReleasePushL(*bcaFactory);
@@ -691,7 +688,7 @@
         {
         if(aError == KErrConnectionTerminated )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_SHUTDOWNBCA_1, "This is an emergency shutdown, it kills the NIF immediately.");
+            _LOG_L1C1(_L8("This is an emergency shutdown, it kills the NIF immediately."));
             // It is a emergency shutdown, it kills the NIF immediately.
             iMBca->Close();
             iState = EIdling;
@@ -699,7 +696,7 @@
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_SHUTDOWNBCA_2, "This is a graceful termination which takes a while.");
+            _LOG_L1C1(_L8("This is a graceful termination which takes a while."));
             //It is a graceful termination which takes a while.
             iError = aError;
             iState = EClosing;
@@ -709,7 +706,7 @@
         }
     else //nothing to shutdown, just notify linklayer down.
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_SHUTDOWNBCA_3, "Bca is not initialized or opened, bring the linklayer down");
+        _LOG_L1C1(_L8("Bca is not initialized or opened, bring the linklayer down"));
         iState = EIdling;
         iObserver.GetObserver().ShutDown(MControllerObserver::EBcaController, aError);
         }

--- a/telephonyprotocols/rawipnif/src/BinderBase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/BinderBase.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -19,25 +19,20 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "BinderBaseTraces.h"
-#endif
-
 #include <nifmbuf.h>
 #include "BinderBase.h"
 #include "RawIPFlow.h"
 
 using namespace ESock;
 
-CBinderBase::CBinderBase(CRawIPFlow& aFlow)
+CBinderBase::CBinderBase(CRawIPFlow& aFlow, CBttLogger* aTheLogger)
 /**
  * Constructor
  *
  * @param aNifMain A pointer to CRawIPFlow
  */
-	:iFlow(&aFlow)
+	:iFlow(&aFlow),
+	 iTheLogger(aTheLogger)
 	{
 	}
 
@@ -68,7 +63,7 @@
  * @param aUpperControl A pointer to Upper layer control class
  */
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_BIND_1, "CBinderBase:\tBind()");
+    _LOG_L1C1(_L8("CBinderBase:\tBind()"));
 
 	iUpperReceiver = aUpperReceiver;
 	iUpperControl = aUpperControl;
@@ -77,7 +72,7 @@
 
 void CBinderBase::Unbind(MUpperDataReceiver* aUpperReceiver, MUpperControl* aUpperControl)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_UNBIND_1, "CBinderBase:\tUnbind()");
+	_LOG_L1C1(_L8("CBinderBase:\tUnbind()"));
 	
 #ifndef _DEBUG
 	(void) aUpperReceiver;
@@ -97,7 +92,7 @@
  * @param aProtocol A pointer to a protocol
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_STARTSENDING_1, "CBinderBase:\tStartSending()");
+	_LOG_L1C1(_L8("CBinderBase:\tStartSending()"));
 
 	// Default implementation.
 	// Uses iProtocol instead aProtocol.

--- a/telephonyprotocols/rawipnif/src/IPTagHeader.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/IPTagHeader.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -21,19 +21,14 @@
 
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "IPTagHeaderTraces.h"
-#endif
-
 #include "IPTagHeader.h"
 #include "Constants.h"
 
 /**
 Default constructor. 
 */
-CIPTagHeader::CIPTagHeader()
+CIPTagHeader::CIPTagHeader(CBttLogger* aTheLogger)
+	: iTheLogger(aTheLogger)
 	{
 	iHeaderByte.SetMax();
 	iHeaderByte.FillZ();
@@ -53,7 +48,7 @@
 */
 void CIPTagHeader::SetType(TUint16 aType)
  	{
- 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPTAGHEADER_SETTYPE_1, "CIPTagHeader::SetType");
+ 	_LOG_L1C1(_L8("CIPTagHeader::SetType"));
  	
  	iHeaderByte[0] = (TUint8)(aType>>8); 
  	iHeaderByte[1] = (TUint8)(aType&0xff);	
@@ -68,7 +63,7 @@
 */
 void CIPTagHeader::AddHeader(TDes8& aDes)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPTAGHEADER_ADDHEADER_1, "CIPTagHeader::AddHeader");
+	_LOG_L1C1(_L8("CIPTagHeader::AddHeader"));
 
 	// Add the protocol code as a header to the buffer
 	aDes.Insert(0,iHeaderByte);
@@ -84,7 +79,7 @@
 */
 TUint16 CIPTagHeader::RemoveHeader(RMBufChain& aPdu)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPTAGHEADER_REMOVEHEADER_1, "CIPTagHeader::RemoveHeader");
+	_LOG_L1C1(_L8("CIPTagHeader::RemoveHeader"));
 
 	if (aPdu.Length() > KIPTagHeaderLength)
 		{

--- a/telephonyprotocols/rawipnif/src/IPv4Binder.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/IPv4Binder.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -20,12 +20,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "IPv4BinderTraces.h"
-#endif
-
 #include <etelpckt.h>
 #include <in_iface.h>
 #include "RawIPFlow.h"
@@ -38,6 +32,8 @@
 #include <networking/umtsnifcontrolif.h>
 #endif
 
+#define LOG_IP_ADDRESS(desc,addr) _LOG_L1C5(_L8("    " desc " = %d.%d.%d.%d"), \
+			addr >> 24, (addr >> 16) & 0xFF, (addr >> 8) & 0xFF, addr & 0xFF);
 
 #ifdef __EABI__
 // Patch data is used and KMtuIPv4 and KRMtuIPv4 can be modified to a different value in RawIpNif.iby file
@@ -45,11 +41,11 @@
 extern const TInt KRMtuIPv4 = KDefaultMtu;
 #endif
 
-CIPv4Binder::CIPv4Binder(CRawIPFlow& aFlow)
+CIPv4Binder::CIPv4Binder(CRawIPFlow& aFlow, CBttLogger* aTheLogger)
 /**
  * Constructor
  */ 
-	: CBinderBase(aFlow),
+	: CBinderBase(aFlow,aTheLogger),
 	  iSpeedMetric(KDefaultSpeedMetric)
 	{
 	}
@@ -85,7 +81,8 @@
  * @return Standard error codes
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_CONTROL_1, "CIPv4Binder::Control [aLevel=%d, aName=%d]",aLevel, aName);
+	_LOG_L1C3(_L8("CIPv4Binder::Control [aLevel=%d, aName=%d]"),
+		aLevel, aName);
 
 	if (aLevel == KSOLInterface)
 		{
@@ -162,7 +159,7 @@
 
 TInt CIPv4Binder::GetConfig(TBinderConfig& aConfig)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_GETCONFIG_1, "CIPv4Binder::GetConfig");
+	_LOG_L1C1(_L8("CIPv4Binder::GetConfig"));
 	
     TBinderConfig4* config = TBinderConfig::Cast<TBinderConfig4>(aConfig);
     
@@ -192,8 +189,8 @@
 	
 	config->iInfo.iSpeedMetric = iSpeedMetric;		/* approximation of the interface speed in Kbps. */
 
-	OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_GETCONFIG_2, "Local IP address from TBinderConfig = %u.%u.%u.%u",iSettings.iLocalAddr >> 24, (iSettings.iLocalAddr >> 16) & 0xFF, (iSettings.iLocalAddr >> 8) & 0xFF, iSettings.iLocalAddr & 0xFF);   
-    
+    LOG_IP_ADDRESS("Local IP address from TBinderConfig", iSettings.iLocalAddr);
+	
 	config->iAddress.SetAddress(iSettings.iLocalAddr);		/* Interface IP address. */
 	config->iNetMask.SetAddress(iSettings.iNetMask);			/* IP netmask. */
 	config->iBrdAddr.SetAddress(iSettings.iBroadcastAddr);	/* IP broadcast address. */
@@ -214,7 +211,7 @@
  * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_DELETECONTEXT_1, "CIPv4Binder::DeleteContext");
+	_LOG_L1C1(_L8("CIPv4Binder::DeleteContext"));
 
 	if (aContextParameters.Length() != sizeof(TContextParameters))
 		{
@@ -247,7 +244,7 @@
  */
 void CIPv4Binder::UpdateContextConfigL(const TPacketDataConfigBase& aConfig)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_1, "CIPv4Binder::UpdateContextConfig");
+	_LOG_L1C1(_L8("CIPv4Binder::UpdateContextConfig"));
 
 	// Get our IP address from the GPRS context config.
 	TInetAddr address;
@@ -273,13 +270,14 @@
 	if (ret == KErrNone)
 		{
 		iSettings.iLocalAddr = address.Address();
-		OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_2, "Got local IP address from context = %u.%u.%u.%u",iSettings.iLocalAddr >> 24, (iSettings.iLocalAddr >> 16) & 0xFF, (iSettings.iLocalAddr >> 8) & 0xFF, iSettings.iLocalAddr & 0xFF);
+		LOG_IP_ADDRESS("Got local IP address from context", iSettings.iLocalAddr);
 		iSettings.iDefGateway = address.Address();
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_3, "Set Default Gateway to local IP address");
+		_LOG_L1C1(_L8("Set Default Gateway to local IP address"));
 		}
 	else
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_4, "Couldn't get IP address from GPRS config (err: %d)",ret);
+		_LOG_L2C2(_L8("Couldn't get IP address from GPRS config (err: %d)"),
+			ret);
 
 		// Don't leave on this error: we may still be OK if we read some
 		// settings from CommDB.
@@ -301,11 +299,12 @@
 		if (ret == KErrNone)
 			{
 			iSettings.iPrimaryDns = address.Address();
-			OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_5, "Got primary DNS from context PCO = %u.%u.%u.%u",iSettings.iPrimaryDns >> 24, (iSettings.iPrimaryDns >> 16) & 0xFF, (iSettings.iPrimaryDns >> 8) & 0xFF, iSettings.iPrimaryDns & 0xFF);
+			LOG_IP_ADDRESS("Got primary DNS from context PCO", iSettings.iPrimaryDns);
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_6, "Couldn't get primary DNS address from GPRS config (err: %d)",ret);
+			_LOG_L2C2(_L8("Couldn't get primary DNS address from GPRS config (err: %d)"),
+				ret);
 
 			// Don't leave on this error: we may still be OK if we read some
 			// settings from CommDB.
@@ -317,11 +316,12 @@
 		if (ret == KErrNone)
 			{
 			iSettings.iSecondaryDns = address.Address();
-	        OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_7, "Got secondary DNS from context PCO = %u.%u.%u.%u",iSettings.iSecondaryDns >> 24, (iSettings.iSecondaryDns >> 16) & 0xFF, (iSettings.iSecondaryDns >> 8) & 0xFF, iSettings.iSecondaryDns);
+			LOG_IP_ADDRESS("Got secondary DNS from context PCO", iSettings.iPrimaryDns);
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_8, "Couldn't get secondary DNS address from GPRS config (err: %d)",ret);
+			_LOG_L2C2(_L8("Couldn't get secondary DNS address from GPRS config (err: %d)"),
+				ret);
 
 			// Don't leave on this error: we may still be OK if we read some
 			// settings from CommDB.
@@ -329,8 +329,8 @@
 		}
 	else
 		{
-        OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_9, "Using CommDB DNS address - Primary = %u.%u.%u.%u",iSettings.iPrimaryDns >> 24, (iSettings.iPrimaryDns >> 16) & 0xFF, (iSettings.iPrimaryDns >> 8) & 0xFF, iSettings.iPrimaryDns & 0xFF);
-		OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_10, "                         - Secondary = %u.%u.%u.%u",iSettings.iSecondaryDns >> 24, (iSettings.iSecondaryDns >> 16) & 0xFF, (iSettings.iSecondaryDns >> 8) & 0xFF, iSettings.iSecondaryDns);
+		LOG_IP_ADDRESS("Using CommDB DNS address - Primary ", iSettings.iPrimaryDns);
+		LOG_IP_ADDRESS("                         - Secondary ", iSettings.iSecondaryDns);
 		}
 
 
@@ -352,7 +352,8 @@
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_4, "Couldn't get default gateway from GPRS config (err: %d)",ret);
+			_LOG_L2C2(_L8("Couldn't get default gateway from GPRS config (err: %d)"),
+				ret);
 			}
 		}*/
 	}
@@ -364,7 +365,7 @@
  * @param aConnectionSpeed Our connection speed
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONNECTIONSPEED_1, "CIPv4Binder::UpdateConnectionSpeed");
+	_LOG_L1C1(_L8("CIPv4Binder::UpdateConnectionSpeed"));
 
 	iSpeedMetric = aConnectionSpeed;
 	}
@@ -378,7 +379,7 @@
  * @return MLowerDataSender::ESendBlocked or ESendAccepted based on state of flow.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_SEND_1, "CIPv4Binder::Send");
+	_LOG_L1C1(_L8("CIPv4Binder::Send"));
 
 #ifdef __BTT_LOGGING__
 	LogPacket(aPdu);
@@ -399,7 +400,7 @@
  * @param aInfo Not used 
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_NOTIFICATION_1, "CIPv4Binder::Notification");
+	_LOG_L1C1(_L8("CIPv4Binder::Notification"));
 
 	return KErrNone;
 	}
@@ -411,7 +412,7 @@
  * @param aProtocol A pointer to a protocol
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_STARTSENDING_1, "CIPv4Binder::StartSending()");
+	_LOG_L1C1(_L8("CIPv4Binder::StartSending()"));
 
 	CBinderBase::StartSending();
 	}
@@ -423,7 +424,8 @@
  * @param aProtocolCode The protocol type
  */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_WANTSPROTOCOL_1, "CIPv4Binder::WantsProtocol [aProtocolCode=%X]",aProtocolCode);
+	_LOG_L1C2(_L8("CIPv4Binder::WantsProtocol [aProtocolCode=%X]"),
+		aProtocolCode);
 
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
 	return ((aProtocolCode & 0x00FF) == KIp4FrameType);
@@ -441,7 +443,7 @@
  * @param aPdu The incoming packet
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_PROCESS_1, "CIPv4Binder::Process");
+	_LOG_L1C1(_L8("CIPv4Binder::Process"));
 
 #ifdef __BTT_LOGGING__
 	LogPacket(aPdu);
@@ -451,12 +453,12 @@
 	// been bound yet.
 	if (iUpperReceiver)						// ASSERT(iUpperReceiver) ?
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_PROCESS_2, "CIPv4Binder: Packet Sent to TCP/IP Protocol!!!");
+		_LOG_L1C1(_L8("CIPv4Binder: Packet Sent to TCP/IP Protocol!!!"));
 		iUpperReceiver->Process(aPdu);
 		}
 	else 
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_PROCESS_3, "WARNING: dumping incoming packet, no protocol bound");
+		_LOG_L2C1(_L8("WARNING: dumping incoming packet, no protocol bound"));
 		aPdu.Free();
 		}
 	}
@@ -486,7 +488,7 @@
 @param aProvision Provisioning structure from Control side.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_SETPROVISION_1, "CIPv4Binder::SetProvision");
+	_LOG_L1C1(_L8("CIPv4Binder::SetProvision"));
 
 	iSettings.iLocalAddr	 = aProvision.GetIpAddress();
 	iSettings.iNetMask		 = aProvision.GetIpNetMask();
@@ -497,7 +499,7 @@
 	iSettings.iGetGatewayFromServer = aProvision.GetIpAddrFromServer();
 	iSettings.iGetDnsFromServer		= aProvision.GetIp4DNSAddrFromServer();
 	
-    OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_SETPROVISION_2, "Local IP address from Provisioning = %u.%u.%u.%u",iSettings.iLocalAddr >> 24, (iSettings.iLocalAddr >> 16) & 0xFF, (iSettings.iLocalAddr >> 8) & 0xFF, iSettings.iLocalAddr & 0xFF);
+    LOG_IP_ADDRESS("Local IP address from Provisioning", iSettings.iLocalAddr);	
 	}
 
 #ifdef __BTT_LOGGING__
@@ -508,18 +510,19 @@
 * @param aPacket The packet 
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_1, "CIPv4Binder::LogPacket");
+	_LOG_L1C1(_L8("CIPv4Binder::LogPacket"));
 
 	TInt mBufLength = aPacket.Length() - aPacket.First()->Length();
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_2, "Analysis of %d byte packet:", mBufLength);
+	_LOG_L3C2(_L8("Analysis of %d byte packet:"), mBufLength);
 
 	//Note: All the constants used on this method are a pragmatic guess of the
 	//IP header fields. The only porpose of this method is logging.
 
 	if (mBufLength < 20)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_3, " -doesn't appear to be a valid IPv4 packet (length=%d)", mBufLength);
+		_LOG_L3C2(_L8(" -doesn't appear to be a valid IPv4 packet (length=%d)")
+			, mBufLength);
 		return;
 		}
 
@@ -528,34 +531,39 @@
 
 	if ((payloadPtr[0] & 0xF0) != 0x40)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_4, " - doesn't appear to be an IPv4 packet (version=0x%X)",(payloadPtr[0] & 0xF0) >> 4);
+		_LOG_L3C2(_L8(" - doesn't appear to be an IPv4 packet (version=0x%X)"),
+			(payloadPtr[0] & 0xF0) >> 4);
 		return;
 		}
 
 	if ((payloadPtr[0] & 0xF) != 0x5)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_5, " - doesn't have a standard IP header (length=0x%X)",payloadPtr[0] & 0xF);
+		_LOG_L3C2(_L8(" - doesn't have a standard IP header (length=0x%X)"),
+			payloadPtr[0] & 0xF);
 		return;
 		}
 
-	OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_6, " - src addr: %d.%d.%d.%d", payloadPtr[12], payloadPtr[13],payloadPtr[14], payloadPtr[15]);
-	OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_7, " - dst addr: %d.%d.%d.%d", payloadPtr[16], payloadPtr[17],payloadPtr[18], payloadPtr[19]);
+	_LOG_L3C5(_L8(" - src addr: %d.%d.%d.%d"), payloadPtr[12], payloadPtr[13],
+		payloadPtr[14], payloadPtr[15]);
+	_LOG_L3C5(_L8(" - dst addr: %d.%d.%d.%d"), payloadPtr[16], payloadPtr[17],
+		payloadPtr[18], payloadPtr[19]);
 
 	if (payloadPtr[9] == 0x06)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_8, " - appears to be a TCP packet");
+		_LOG_L3C1(_L8(" - appears to be a TCP packet"));
 		if (mBufLength < 40)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_9, " - but is too short (length=0x%X)", mBufLength);
+			_LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength);
 			return;
 			}
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_10, " - src port: %d, dst port: %d",(payloadPtr[20] << 8) + payloadPtr[21],(payloadPtr[22] << 8) + payloadPtr[23]);
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_11, " - seq #: 0x%08X, ack #: 0x%08X",           
-		        (payloadPtr[24] << 24) + (payloadPtr[25] << 16) +
-	            (payloadPtr[26] << 8) + payloadPtr[27],
-	            (payloadPtr[28] << 24) + (payloadPtr[29] << 16) +
-	            (payloadPtr[30] << 8) + payloadPtr[31]);
-
+		_LOG_L3C3(_L8(" - src port: %d, dst port: %d"),
+			(payloadPtr[20] << 8) + payloadPtr[21],
+			(payloadPtr[22] << 8) + payloadPtr[23]);
+		_LOG_L3C3(_L8(" - seq #: 0x%08X, ack #: 0x%08X"),
+			(payloadPtr[24] << 24) + (payloadPtr[25] << 16) +
+			(payloadPtr[26] << 8) + payloadPtr[27],
+			(payloadPtr[28] << 24) + (payloadPtr[29] << 16) +
+			(payloadPtr[30] << 8) + payloadPtr[31]);
 
 		TBuf8<100> flagsSet;
 		flagsSet.Copy(_L8(" - flags set: "));
@@ -585,7 +593,7 @@
 			{
 			flagsSet.Append(_L8("URG "));
 			}
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_12, "%s", flagsSet);
+		_LOG_L3C1(flagsSet);
 
 		TInt dataOffset = payloadPtr[32] >> 2; // in bytes
 		if ((dataOffset > 0) && (mBufLength > dataOffset + 30))
@@ -608,50 +616,55 @@
 					data.Append(TChar('?'));
 					}
 				}
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_13, "%s", data);
+			_LOG_L3C1(data);
 			}
 		}
 	else if (payloadPtr[9] == 0x01)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_14, " - appears to be an ICMP packet");
+		_LOG_L3C1(_L8(" - appears to be an ICMP packet"));
 		if (mBufLength < 24)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_15, " - but is too short (length=0x%X)", mBufLength);
+			_LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength);
 			return;
 			}
 
 		if (payloadPtr[20] == 0x8)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_16, " - is an echo request");
+			_LOG_L3C1(_L8(" - is an echo request"));
 			}
 		else if (payloadPtr[20] == 0x0)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_17, " - is an echo reply");
+			_LOG_L3C1(_L8(" - is an echo reply"));
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_18, " - unknown type (0x%02X)", payloadPtr[20]);
+			_LOG_L3C2(_L8(" - unknown type (0x%02X)"), payloadPtr[20]);
 			return;
 			}
 
 		if (mBufLength >= 28)
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_19, " - ID: 0x%04X, seq #: 0x%04X",(payloadPtr[24] << 8) + payloadPtr[25],(payloadPtr[26] << 8) + payloadPtr[27]);
+			_LOG_L3C3(_L8(" - ID: 0x%04X, seq #: 0x%04X"),
+				(payloadPtr[24] << 8) + payloadPtr[25],
+				(payloadPtr[26] << 8) + payloadPtr[27]);
 			}
 		}
 	else if (payloadPtr[9] == 0x11)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_20, " - appears to be a UDP packet");
+		_LOG_L3C1(_L8(" - appears to be a UDP packet"));
 		if (mBufLength < 28)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_21, " - but is too short (length=0x%X)", mBufLength);
+			_LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength);
 			return;
 			}
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_22, " - src port: %d, dst port: %d",(payloadPtr[20] << 8) + payloadPtr[21],(payloadPtr[22] << 8) + payloadPtr[23]);
+		_LOG_L3C3(_L8(" - src port: %d, dst port: %d"),
+			(payloadPtr[20] << 8) + payloadPtr[21],
+			(payloadPtr[22] << 8) + payloadPtr[23]);
 		}
 	else
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_23, " - appears to be for an unknown protocol (0x%X)",payloadPtr[9]);
+		_LOG_L3C2(_L8(" - appears to be for an unknown protocol (0x%X)"),
+			payloadPtr[9]);
 		}
 	}
 #endif // __BTT_LOGGING__

--- a/telephonyprotocols/rawipnif/src/IPv6Binder.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/IPv6Binder.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -20,12 +20,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "IPv6BinderTraces.h"
-#endif
-
 #include <etelpckt.h>
 #include <in_iface.h>
 #include "RawIPFlow.h"
@@ -39,6 +33,8 @@
 #include <networking/umtsnifcontrolif.h>
 #endif
 
+#define LOG_IP_ADDRESS(desc,addr) _LOG_L2C5(_L8("    " desc " = %d:%d:%d:%d from context"), \
+			addr.u.iAddr32[3], addr.u.iAddr32[2], addr.u.iAddr32[1], addr.u.iAddr32[0]);
 
 #ifdef __EABI__
 // Patch data is used and KMtuIPv6 and KRMtuIPv6 can be modified to a different value in RawIpNif.iby file
@@ -46,11 +42,12 @@
 extern const TInt KRMtuIPv6 = KDefaultMtu;
 #endif
 
-CIPv6Binder::CIPv6Binder(CRawIPFlow& aFlow)
+CIPv6Binder::CIPv6Binder(CRawIPFlow& aFlow, CBttLogger* aTheLogger)
 /**
  * Constructor
  */ 
-	: CBinderBase(aFlow),
+	: CBinderBase(aFlow,aTheLogger),
+	  iTheLogger(aTheLogger),
 	  iSpeedMetric(KDefaultSpeedMetric)
 	{
 	}
@@ -86,7 +83,8 @@
  * @return Standard error codes
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_CONTROL_1, "CIPv6Binder::Control [aLevel=%u, aName=%u]",aLevel, aName);
+	_LOG_L1C3(_L8("CIPv6Binder::Control [aLevel=%d, aName=%d]"),
+		aLevel, aName);
 
 	if (aLevel == KSOLInterface)
 		{
@@ -207,7 +205,7 @@
  * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_DELETECONTEXT_1, "CIPv6Binder::DeleteContext");
+	_LOG_L1C1(_L8("CIPv6Binder::DeleteContext"));
 
 	if (aContextParameters.Length() != sizeof(TContextParameters))
 		{
@@ -241,7 +239,7 @@
  */
  void CIPv6Binder::UpdateContextConfigL(const TPacketDataConfigBase& aConfig)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_1, "CIPv6Binder::UpdateContextConfig");
+	_LOG_L1C1(_L8("CIPv6Binder::UpdateContextConfig"));
 
 	// Get our IP address from the GPRS context config.
 	TInetAddr address;
@@ -270,11 +268,12 @@
 		
 		iSettings.iLocalIfId.SetAddr(addrTable, 8);		
 		
-		OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_2, "Got local IP address = %u:%u:%u:%u from context", address.Ip6Address().u.iAddr32[3], address.Ip6Address().u.iAddr32[2], address.Ip6Address().u.iAddr32[1], address.Ip6Address().u.iAddr32[0]);
+		LOG_IP_ADDRESS("Got local IP address", address.Ip6Address());
 		}
 	else
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_3, "Couldn't get IP address from GPRS config (err: %d)",ret);
+		_LOG_L2C2(_L8("Couldn't get IP address from GPRS config (err: %d)"),
+			ret);
 
 		// Don't leave on this error: we may still be OK if we read some
 		// settings from CommDB.
@@ -296,11 +295,12 @@
 		if (ret == KErrNone)
 			{
 			iSettings.iPrimaryDns = address.Ip6Address();
-			OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_4, "Got primary DNS = %u:%u:%u:%u from context", iSettings.iPrimaryDns.u.iAddr32[3], iSettings.iPrimaryDns.u.iAddr32[2], iSettings.iPrimaryDns.u.iAddr32[1], iSettings.iPrimaryDns.u.iAddr32[0]);
+			LOG_IP_ADDRESS("Got primary DNS", iSettings.iPrimaryDns);
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_5, "Couldn't get primary DNS address from GPRS config (err: %d)",ret);
+			_LOG_L2C2(_L8("Couldn't get primary DNS address from GPRS config (err: %d)"),
+				ret);
 
 			// Don't leave on this error: we may still be OK if we read some
 			// settings from CommDB.
@@ -312,11 +312,12 @@
 		if (ret == KErrNone)
 			{
 			iSettings.iSecondaryDns = address.Ip6Address();
-			OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_6, "Got secondary DNS = %u:%u:%u:%u from context", iSettings.iSecondaryDns.u.iAddr32[3], iSettings.iSecondaryDns.u.iAddr32[2], iSettings.iSecondaryDns.u.iAddr32[1], iSettings.iSecondaryDns.u.iAddr32[0]);
+			LOG_IP_ADDRESS("Got secondary DNS", iSettings.iPrimaryDns);
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_7, "Couldn't get secondary DNS address from GPRS config (err: %d)",ret);
+			_LOG_L2C2(_L8("Couldn't get secondary DNS address from GPRS config (err: %d)"),
+				ret);
 
 			// Don't leave on this error: we may still be OK if we read some
 			// settings from CommDB.
@@ -324,8 +325,8 @@
 		}
 	else
 		{
-        OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_8, "Using CommDB DNS address - Primary  = %u:%u:%u:%u", iSettings.iPrimaryDns.u.iAddr32[3], iSettings.iPrimaryDns.u.iAddr32[2], iSettings.iPrimaryDns.u.iAddr32[1], iSettings.iPrimaryDns.u.iAddr32[0]);
-        OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_9, "                         - Secondary = %u:%u:%u:%u", iSettings.iSecondaryDns.u.iAddr32[3], iSettings.iSecondaryDns.u.iAddr32[2], iSettings.iSecondaryDns.u.iAddr32[1], iSettings.iSecondaryDns.u.iAddr32[0]);
+		LOG_IP_ADDRESS("Using CommDB DNS address - Primary ", iSettings.iPrimaryDns);
+		LOG_IP_ADDRESS("                         - Secondary ", iSettings.iSecondaryDns);
 		}
 	}
 
@@ -336,7 +337,7 @@
  * @param aConnectionSpeed Our connection speed
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONNECTIONSPEED_1, "CIPv6Binder::UpdateConnectionSpeed");
+	_LOG_L1C1(_L8("CIPv6Binder::UpdateConnectionSpeed"));
 
 	iSpeedMetric = aConnectionSpeed;
 	}
@@ -350,7 +351,7 @@
  * @return MLowerDataSender::ESendBlocked or ESendAccepted based on state of flow.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_SEND_1, "CIPv6Binder::Send");
+	_LOG_L1C1(_L8("CIPv6Binder::Send"));
 
 #ifdef __BTT_LOGGING__
 	LogPacket(aPdu);
@@ -371,7 +372,7 @@
  * @param aInfo Not used 
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_NOTIFICATION_1, "CIPv6Binder::Notification");
+	_LOG_L1C1(_L8("CIPv6Binder::Notification"));
 
 	return KErrNone;
 	}
@@ -383,7 +384,7 @@
  * @param aProtocol A pointer to a protocol
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_STARTSENDING_1, "CIPv6Binder::StartSending()");
+	_LOG_L1C1(_L8("CIPv6Binder::StartSending()"));
 
 	CBinderBase::StartSending();
 	}
@@ -395,7 +396,8 @@
  * @param aProtocolCode The protocol type
  */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_WANTSPROTOCOL_1, "CIPv6Binder::WantsProtocol [aProtocolCode=%X]",aProtocolCode);
+	_LOG_L1C2(_L8("CIPv6Binder::WantsProtocol [aProtocolCode=%X]"),
+		aProtocolCode);
 
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
 	return ((aProtocolCode & 0x00FF) == KIp6FrameType);
@@ -413,7 +415,7 @@
  * @param aPdu The incoming packet
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_PROCESS_1, "CIPv6Binder::Process");
+	_LOG_L1C1(_L8("CIPv6Binder::Process"));
 
 #ifdef __BTT_LOGGING__
 	LogPacket(aPdu);
@@ -423,12 +425,12 @@
 	// been bound yet.
 	if (iUpperReceiver)						// ASSERT(iUpperReceiver) ?
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_PROCESS_2, "CIPv6Binder: Packet Sent to TCP/IP Protocol!!!");
+		_LOG_L1C1(_L8("CIPv6Binder: Packet Sent to TCP/IP Protocol!!!"));
 		iUpperReceiver->Process(aPdu);
 		}
 	else 
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_PROCESS_3, "WARNING: dumping incoming packet, no protocol bound");
+		_LOG_L2C1(_L8("WARNING: dumping incoming packet, no protocol bound"));
 		aPdu.Free();
 		}
 	}
@@ -506,18 +508,19 @@
 * @param aPacket The packet 
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_1, "CIPv6Binder::LogPacket");
+	_LOG_L1C1(_L8("CIPv6Binder::LogPacket"));
 
 	TInt mBufLength = aPacket.Length() - aPacket.First()->Length();
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_2, "Analysis of %d byte packet:", mBufLength);
+	_LOG_L3C2(_L8("Analysis of %d byte packet:"), mBufLength);
 
 	//Note: All the constants used on this method are a pragmatic guess of the
 	//IP header fields. The only porpose of this method is logging.
 
 	if (mBufLength < 40)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_3, " -doesn't appear to be a valid IPv6 packet (length=%d)", mBufLength);
+		_LOG_L3C2(_L8(" -doesn't appear to be a valid IPv6 packet (length=%d)")
+			, mBufLength);
 		return;
 		}
 
@@ -526,14 +529,18 @@
 
 	if ((payloadPtr[0] & 0xF0) != 0x60)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_4, " - doesn't appear to be an IPv6 packet (version=0x%X)",(payloadPtr[0] & 0xF0) >> 4);
+		_LOG_L3C2(_L8(" - doesn't appear to be an IPv6 packet (version=0x%X)"),
+			(payloadPtr[0] & 0xF0) >> 4);
 		return;
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_5, " - traffic class: 0x%X", ((payloadPtr[0] & 0xF) << 4) | ((payloadPtr[1] & 0xF0) >> 4));
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_6, " - flow label: 0x%X", ((payloadPtr[1] & 0x0F) << 16) | (payloadPtr[2] << 8) | payloadPtr[3]);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_7, " - payload length: 0x%X", (payloadPtr[4] << 16) | payloadPtr[5]);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_8, " - next header: 0x%08X", payloadPtr[6]);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_9, " - hop limit: 0x%08X", payloadPtr[7]);
+	_LOG_L3C2(_L8(" - traffic class: 0x%X"), 
+					((payloadPtr[0] & 0xF) << 4) | ((payloadPtr[1] & 0xF0) >> 4));
+	_LOG_L3C2(_L8(" - flow label: 0x%X"), 
+					((payloadPtr[1] & 0x0F) << 16) | (payloadPtr[2] << 8) | payloadPtr[3]);
+	_LOG_L3C2(_L8(" - payload length: 0x%X"), 
+					(payloadPtr[4] << 16) | payloadPtr[5]);
+	_LOG_L3C2(_L8(" - next header: 0x%08X"), payloadPtr[6]);
+	_LOG_L3C2(_L8(" - hop limit: 0x%08X"), payloadPtr[7]);
 	}
 #endif // __BTT_LOGGING__

--- a/telephonyprotocols/rawipnif/src/RawIPFlow.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/RawIPFlow.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -21,12 +21,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "RawIPFlowTraces.h"
-#endif
-
 #include <f32file.h>
 #include <nifman.h>
 #include <nifmbuf.h>
@@ -52,13 +46,15 @@
 static const TUint16 KTcpDumpLinkType = 12;
 #endif
 
-CRawIPFlow::CRawIPFlow(CSubConnectionFlowFactoryBase& aFactory, const TNodeId& aSubConnId, CProtocolIntfBase* aProtocolIntf)
+CRawIPFlow::CRawIPFlow(CSubConnectionFlowFactoryBase& aFactory, const TNodeId& aSubConnId, CProtocolIntfBase* aProtocolIntf, CBttLogger* aTheLogger)
 /**
  * Constructor.
  *
  * @param aFactory Reference to the factory which created this object.
+ * @param aTheLogger The logging object, ownership is passed to this object
  */
 	: CSubConnectionFlowBase(aFactory, aSubConnId, aProtocolIntf),
+	  iTheLogger(aTheLogger),
 	  iInitError(KErrNone),
 	  iStarted(EFalse),
 	  iStopping(EFalse)
@@ -74,9 +70,9 @@
  * @param aName The name of the NIF (unused)
  */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_CONSTRUCTL_1, "CRawIPFlow %08x:\tConstructL()", this);
+	_LOG_L1C2(_L8("CRawIPFlow %08x:\tConstructL()"), this);
     iBinderControl = new (ELeave) TBinderControlProxy(*this);
-	iBcaController = CBcaIoController::NewL(*this);
+	iBcaController = CBcaIoController::NewL(*this, iTheLogger);
 	}
 
 CRawIPFlow::~CRawIPFlow()
@@ -86,6 +82,8 @@
 	{
 	// Note that we don't delete iBinder because it's not owned by us.
 	delete iBcaController;
+	// This class also deletes the logging object
+	delete iTheLogger;
 
 	ASSERT(iBinder == NULL);
 	
@@ -107,7 +105,7 @@
 	{
 	ASSERT(iStarting==EFalse);
 	iStarting = ETrue;
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_STARTFLOWL_1, "CRawIPFlow %08x:\tStartFlowL()", this);
+	_LOG_L1C2(_L8("CRawIPFlow %08x:\tStartFlowL()"), this);
 
 	// If there were any errors during earlier processing of the ProvisionConfig message
 	// then send an Error message in response to the StartFlow (because ProvisionConfig
@@ -142,13 +140,13 @@
 	_LIT8(KTimeFormat, "%08X");
 	TUint32 counter = User::FastCounter();
 	logFileName.Format(KTimeFormat, counter);
-	
-    TRAPD(err,__PACKETLOG_NEWL(KTcpDumpFirstTag, logFileName, CPacketLogger::ETcpDump, KTcpDumpLinkType));
-        if (err)
-            {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_STARTFLOWL_2, "Trapped leave from __PACKETLOG_NEWL");
-            }
-	
+
+	TRAPD(err,__PACKETLOG_NEWL(KTcpDumpFirstTag, logFileName, CPacketLogger::ETcpDump, KTcpDumpLinkType));
+	if (err)
+		{
+		_LOG_L1C1(_L8("Trapped leave from __PACKETLOG_NEWL"));
+		}
+
 	const TUint KLogTextLen = KModemNameLen+KTimeStampLen+30;
 	TBuf8<KLogTextLen> logText;
 	_LIT8(KLogTimeText, "TcpDump log file time stamp:");
@@ -157,7 +155,7 @@
 	logText.Append(logFileName);
 	logText.Append(KLogModemText);
 	logText.Append(modemName);
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_STARTFLOWL_3, "%s", logText);
+	_LOG_L1C1(logText);
 #endif
 	}
 
@@ -169,7 +167,7 @@
  * ready to go.
  */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_LINKLAYERUP_1, "CRawIPFlow %08x:\tLinkLayerUp()", this);
+	_LOG_L1C2(_L8("CRawIPFlow %08x:\tLinkLayerUp()"), this);
 
 	iLastRequestOriginator.ReplyTo(Id(), TCFDataClient::TStarted().CRef());
 
@@ -188,10 +186,9 @@
  * @param aError An error code to propagate to NifMan
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_LINKLAYERDOWN_1, "CRawIPFlow %08x:\tLinkLayerDown(aError %d)", (TUint)this, aError);
-	
+	_LOG_L1C3(_L8("CRawIPFlow %08x:\tLinkLayerDown(aError %d)"), this, aError);
 	__PACKETLOG_DELETE;
-	
+
 	if (iStopping)
 		{
 		iLastRequestOriginator.ReplyTo(Id(), TCFDataClient::TStopped(aError).CRef());
@@ -220,7 +217,7 @@
  * @param aAction The action to take: disconnect or reconnect
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_STOPFLOW_1, "CRawIPFlow %08x:\tStopFlow(aError %d)", (TUint)this, aError);
+	_LOG_L1C3(_L8("CRawIPFlow %08x:\tStopFlow(aError %d)"), this, aError);
 	__PACKETLOG_DELETE;
 	iStopping = ETrue;
 	ShutDown(MControllerObserver::EInitialised, aError);
@@ -236,7 +233,9 @@
  * @return MLowerDataSender::TSendResult
  */
 	{
-    OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_SENDPACKET_1, "CRawIPFlow %08x:\tSendPacket(): length=%d, blocked=%d", (TUint)this, aPdu.Length() - aPdu.First()->Length(),iBlocked);
+	_LOG_L1C3(_L8("CRawIPFlow %08x:\tSendPacket(): length=%d"),
+		this, aPdu.Length() - aPdu.First()->Length());
+
     __PACKETLOG_WRITE_PACKET(aPdu, 0);
     return iBcaController->Send(aPdu);
 	}
@@ -250,12 +249,13 @@
  * @param aPdu The incoming packet
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_PROCESS_1, "CRawIPFlow %08x:\tProcess() [aPdu length=%d]",(TUint)this, aPdu.Length() - aPdu.First()->Length());
+	_LOG_L1C3(_L8("CRawIPFlow %08x:\tProcess() [aPdu length=%d]"),
+		this, aPdu.Length() - aPdu.First()->Length());
 
 	// If the packet has zero or negative length, bin it.
 	if ((aPdu.Length() - aPdu.First()->Length()) <= 0)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_PROCESS_2, "Dumped packet: illegal length");
+		_LOG_L1C1(_L8("Dumped packet: illegal length"));
 		aPdu.Free();
 		return;
 		}
@@ -269,10 +269,11 @@
 	else
 		{
 		// The protocol didn't want the packet, so bin it.
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_PROCESS_3, "Packet was not processed: freeing (protocol code: %X)",aProtocolCode);
+		_LOG_L1C2(_L8("Packet was not processed: freeing (protocol code: %X)"),
+			aProtocolCode);
 		if (iBinder == NULL)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_PROCESS_4, "CRawIPFlow %08x:\tProcess(): NOTE: Binder not present", this);
+			_LOG_L1C2(_L8("CRawIPFlow %08x:\tProcess(): NOTE: Binder not present"), this);
 			}
 		aPdu.Free();
 		}
@@ -283,7 +284,7 @@
  * Notifies the protocol interface that it can resume sending packets.
  */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_RESUMESENDING_1, "CRawIPFlow %08x:\tResumeSending()", this);
+	_LOG_L1C2(_L8("CRawIPFlow %08x:\tResumeSending()"), this);
 
 	if (iBinder)
 		{
@@ -291,7 +292,7 @@
 		}
 	else
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_RESUMESENDING_2, "CRawIPFlow %08x:\tResumeSending(): NOTE: Binder not present", this);
+		_LOG_L1C2(_L8("CRawIPFlow %08x:\tResumeSending(): NOTE: Binder not present"), this);
 		}
 	}
 
@@ -306,11 +307,12 @@
  * @param aError A possible error
  */
 	{
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_1, "CRawIPFlow %08x:\tInitialiseL(aState %d, aError %d)",(TUint)this, aState, aError);
+	_LOG_L1C4(_L8("CRawIPFlow %08x:\tInitialiseL(aState %d, aError %d)"),
+		this, aState, aError);		
 
 	if (aError != KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_2, "  *** FAILED to initialise NIF *** Error =%d",aError);
+		_LOG_L2C2(_L8("  *** FAILED to initialise NIF *** Error =%d"),aError);
 
 		// Initialise shutdown sequence
 		switch (aState)
@@ -319,7 +321,7 @@
 			ShutDown(MControllerObserver::EInitialised, aError);
 			break;
 		default:
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_3, "ERROR CRawIPFlow: Unknown state:%d in NIF: %S", aState, KNifName);
+			_LOG_L2C3(_L8("ERROR CRawIPFlow: Unknown state:%d in NIF: %S"), aState, &KNifName);
 			User::Leave(KErrUnknown);
 			break;
 			}
@@ -334,13 +336,13 @@
 		GetBinder()->UpdateContextConfigL(*iAgentProvision->iGprsConfig);
 		GetBinder()->UpdateConnectionSpeed(iAgentProvision->iConnectionSpeed);
 
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_4, "Port details %S", iProvision->GetPortName());
+		_LOG_L1C2(_L8("Port details %S"), &iProvision->GetPortName());
 		iBcaController->SetPort(iProvision->GetPortName());
 
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_5, "bcaName details %S,%S",iProvision->GetBCAStack(), iProvision->GetBCAName());
+		_LOG_L1C3(_L8("bcaName details %S,%S"),&iProvision->GetBCAStack(), &iProvision->GetBCAName());
 		iBcaController->SetBcaStackAndName(iProvision->GetBCAStack(), iProvision->GetBCAName());
 
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_6, "IAP ID details %u", iProvision->GetIAPid());
+		_LOG_L1C2(_L8("IAP ID details %u"), iProvision->GetIAPid());
 		iBcaController->SetIapId(iProvision->GetIAPid());
 
 		UpdateContextState(RPacketContext::EStatusActive, KErrNone);
@@ -349,11 +351,11 @@
 		}
 		break;
 	case MControllerObserver::EBcaController:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_7, "  ***** NIF INITIALISED *****");
+		_LOG_L1C1(_L8("  ***** NIF INITIALISED *****"));
 		LinkLayerUp();
 		break;
 	default:
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_8, "ERROR CRawIPFlow: Unknown state:%d in NIF: %S", aState, KNifName);
+		_LOG_L2C3(_L8("ERROR CRawIPFlow: Unknown state:%d in NIF: %S"), aState, &KNifName);
 		User::Leave(KErrUnknown);
 		break;
 		}
@@ -369,7 +371,8 @@
  * @param aError A possible error (only during initialisation)
  */
 	{
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_SHUTDOWN_1, "CRawIPFlow %08x:\tShutDown(aState %d, aError %d)",(TUint)this, aState, aError);
+	_LOG_L1C4(_L8("CRawIPFlow %08x:\tShutDown(aState %d, aError %d)"),
+		this, aState, aError);	
 			
 	if (aError != KErrNone)
 		{
@@ -388,9 +391,8 @@
 		LinkLayerDown(iInitError);
 		break;
 	default:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_SHUTDOWN_2, "ERROR CRawIPFlow: Unknown Shutdown step");
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_SHUTDOWN_3, "PANIC: %S %d", KNifName, KNifUnknownShutDownState);
-          User::Panic(KNifName,KNifUnknownShutDownState);
+		_LOG_L2C1(_L8("ERROR CRawIPFlow: Unknown Shutdown step"));
+		_BTT_PANIC(KNifName,KNifUnknownShutDownState);
 		break;
 		}
 	}
@@ -424,7 +426,7 @@
  * @param aError A possible error
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_UPDATECONTEXTSTATE_1, "CRawIPFlow %08x:\tUpdateContextState(aState %d)",(TUint) this, aState);
+	_LOG_L1C3(_L8("CRawIPFlow %08x:\tUpdateContextState(aState %d)"), this, aState);
 
 	// Note that we do not need to close the Flow down if there's been an
 	// error, as the context state machine will do this for us.
@@ -449,23 +451,25 @@
 
 MLowerControl* CRawIPFlow::GetControlL(const TDesC8& aProtocol)
 	{
-
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_GETCONTROLL_1, "CRawIPFlow %08x:\tGetControlL(aProtocol %s)", (TUint)this, aProtocol);
-
+#ifdef __BTT_LOGGING__
+	//TBuf8<256> debugBuffer;
+	//debugBuffer.Copy(aProtocol);
+	_LOG_L1C3(_L8("CRawIPFlow %08x:\tGetControlL(aProtocol %S)"), this, &aProtocol);
+#endif
 
 	// IPv4 and ICMP Protocols
 	if (aProtocol.CompareF(KDescIp()) == 0 || aProtocol.CompareF(KDescIcmp()) == 0)
 		{
 		if (!iBinder)
 			{
-			iBinder = new (ELeave) CIPv4Binder(*this);
+			iBinder = new (ELeave) CIPv4Binder(*this, iTheLogger);
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
  			iBcaController->SetType(KIp4FrameType);
 #endif // RAWIP_HEADER_APPENDED_TO_PACKETS
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_GETCONTROLL_2, "CRawIPFlow %08x:\tGetControlL(): IPv4 binder already exists", this);
+			_LOG_L1C2(_L8("CRawIPFlow %08x:\tGetControlL(): IPv4 binder already exists"), this);
 			}
 		}
 	// IPv6 Protocol
@@ -473,14 +477,14 @@
 		{
 		if (!iBinder)
 			{
-			iBinder = new (ELeave) CIPv6Binder(*this);
+			iBinder = new (ELeave) CIPv6Binder(*this, iTheLogger);
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
  			iBcaController->SetType(KIp6FrameType);
 #endif // RAWIP_HEADER_APPENDED_TO_PACKETS
 			}
 		else
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_GETCONTROLL_3, "CRawIPFlow %08x:\tGetControlL(): IPv6 binder already exists", this);
+			_LOG_L1C2(_L8("CRawIPFlow %08x:\tGetControlL(): IPv6 binder already exists"), this);
 			}
 		}		
 	else
@@ -513,7 +517,7 @@
 
 void CRawIPFlow::Unbind(MUpperDataReceiver* aUpperReceiver, MUpperControl* aUpperControl)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_UNBIND_1, "CRawIPFlow %08x:\tUnbind()", this);
+    _LOG_L1C2(_L8("CRawIPFlow %08x:\tUnbind()"), this);
 
 	if (iBinder)
 	    {
@@ -636,6 +640,7 @@
 			//doesn't notice anything. It does that by swapping the
 			//flows below the binders.
 			CBinderBase* localBinder = iBinder;
+			CBttLogger* logger = localBinder->iTheLogger;
 
 			TBinderControlProxy* localBinderControl = iBinderControl;
 			iBinder = otherFlow->iBinder;
@@ -647,6 +652,7 @@
 			otherFlow->iBinderControl->iFlow = otherFlow;
 			iBinderControl->iFlow = this;
 
+			iBinder->iTheLogger = logger;
 
 			iSubConnectionProvider.Close();
 			iSubConnectionProvider.Open(address_cast<TNodeId>(rejoinMsg.iNodeId));
@@ -720,7 +726,7 @@
 @param aData provisioning pointer from message
 */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_PROVISIONCONFIG_1, "CRawIPFlow %08x:\tProvisionConfig()", this);
+	_LOG_L1C2(_L8("CRawIPFlow %08x:\tProvisionConfig()"), this);
 
 	AccessPointConfig().Close();
 	AccessPointConfig().Open(aConfigData);
@@ -737,7 +743,7 @@
 	{
     if (iProvision == NULL)
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_DYNAMICPROVISIONCONFIGL_1, "CRawIPFlow:\tProvisionConfigL() - CBCAProvision config incomplete");
+        _LOG_L1C1(_L8("CRawIPFlow:\tProvisionConfigL() - CBCAProvision config incomplete"));
 		iProvisionError = KErrCorrupt;
 		return;
         }
@@ -755,7 +761,7 @@
             STypeId::CreateSTypeId(CIPConfig::EUid, CIPConfig::ETypeId)));
     if (wcdmaIpProvision == NULL)
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_DYNAMICPROVISIONCONFIGL_2, "CRawIPFlow %08x:\tDynamicProvisionConfigL() - WCDMA config incomplete", this);
+        _LOG_L1C2(_L8("CRawIPFlow %08x:\tDynamicProvisionConfigL() - WCDMA config incomplete"), this);
 		iProvisionError = KErrCorrupt;
 		return;
         }
@@ -783,13 +789,13 @@
 some historical understanding.
 */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_NOTIFICATION_1, "CRawIPFlow %08x:\tNotification(aEvent %d)", (TUint)this, aEvent);
+	_LOG_L1C3(_L8("CRawIPFlow %08x:\tNotification(aEvent %d)"), this, aEvent);
 
 	switch (aEvent)
 	{
-	case EAgentToNifEventTypeDisableTimers: //GPRS suspension
-		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_NOTIFICATION_2, "CRawIPFlow::Received Suspend from Agent...");
+    case EAgentToNifEventTypeDisableTimers: //GPRS suspension
+        {
+        _LOG_L1C1(_L8("CRawIPFlow::Received Suspend from Agent..."));
 
         // Let the BCA controller know that data can no longer be sent over
         // the PDP context.
@@ -800,7 +806,7 @@
 
     case EAgentToNifEventTypeEnableTimers: //GPRS resumption
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_NOTIFICATION_3, "CRawIPFlow::Received Resume from Agent...");
+        _LOG_L1C1(_L8("CRawIPFlow::Received Resume from Agent..."));
         iBcaController->ResumeSending();
 
         break;
@@ -808,13 +814,13 @@
 	case (EAgentToNifEventTypeDisableConnection) :
 		{
 		// This is handled by NIFMAN and passed to Flow as a Stop() call
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_NOTIFICATION_4, "CRawIPFlow::Received Disable connection from Agent...");
+		_LOG_L1C1(_L8("CRawIPFlow::Received Disable connection from Agent..."));
 		break;
 		}
 
 	default :
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_NOTIFICATION_5, "CRawIPFlow::Received Notification [%d] from Agent...", aEvent);
+		_LOG_L1C2(_L8("CRawIPFlow::Received Notification [%d] from Agent..."), aEvent);
 		break;
 		}
 	}//endswitch

--- a/telephonyprotocols/rawipnif/src/RawIPFlowFactory.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/RawIPFlowFactory.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -19,14 +19,9 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "RawIPFlowFactoryTraces.h"
-#endif
-
 #include "RawIPFlowFactory.h"
 #include "RawIPFlow.h"
+#include "bttlog.h"
 
 using namespace ESock;
 
@@ -63,11 +58,14 @@
 
 CSubConnectionFlowBase* CRawIPFlowFactory::DoCreateFlowL(ESock::CProtocolIntfBase* aProtocol, ESock::TFactoryQueryBase& aQuery)
 	{
+#ifdef __BTT_LOGGING__
+	iTheLogger = CBttLogger::NewL(KNifSubDir, KRefFile, User::FastCounter());
+#endif // __BTT_LOGGING__
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOWFACTORY_DOCREATEFLOWL_1, "Raw IP logging started.");
+	_LOG_L1C1(_L8("Raw IP logging started."));
 	
 	const TDefaultFlowFactoryQuery& query = static_cast<const TDefaultFlowFactoryQuery&>(aQuery);
- 	CRawIPFlow* s = new (ELeave) CRawIPFlow(*this, query.iSCprId, aProtocol);
+ 	CRawIPFlow* s = new (ELeave) CRawIPFlow(*this, query.iSCprId, aProtocol, iTheLogger);
 	CleanupStack::PushL(s);
 	s->ConstructL();
 	CleanupStack::Pop(s);

--- a/telephonyprotocols/rawipnif/src/Receiver.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/Receiver.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ReceiverTraces.h"
-#endif
-
 #include "Receiver.h"
 #include "Constants.h"
 #include <es_ini.h>
@@ -32,29 +26,32 @@
 const TUint KBufferIncreaseStep=500;
 const TUint K64k=65535;
 
-CReceiver::CReceiver(CBcaIoController& aObserver, TUint aMaxPacketSize)
+CReceiver::CReceiver(CBcaIoController& aObserver, CBttLogger* aTheLogger, TUint aMaxPacketSize)
 /**
  * Constructor. Performs standard active object initialisation.
  *
  * @param aObserver Reference to the observer of this state machine
+ * @param aTheLogger The logging object
  */
 	: CActive(EPriorityHigh), 
 	  iObserver(aObserver), 
+	  iTheLogger(aTheLogger),
 	  iMaxPacketSize(aMaxPacketSize)
 	{	
 	CActiveScheduler::Add(this);
 	}
 
-CReceiver* CReceiver::NewL(CBcaIoController& aObserver, TUint aMaxPacketSize)
+CReceiver* CReceiver::NewL(CBcaIoController& aObserver, CBttLogger* aTheLogger, TUint aMaxPacketSize)
 /**
  * Two-phase constructor. Creates a new CBcaIoController object, performs 
  * second-phase construction, then returns it.
  *
  * @param aObserver The observer, to which events will be reported
+ * @param aTheLogger The logging object
  * @return A newly constructed CBcaIoController object
  */
 	{
-	CReceiver* self = new (ELeave) CReceiver(aObserver, aMaxPacketSize);
+	CReceiver* self = new (ELeave) CReceiver(aObserver, aTheLogger, aMaxPacketSize);
 	CleanupStack::PushL(self);
 	self->ConstructL();
 	CleanupStack::Pop(self);
@@ -66,7 +63,7 @@
  * Second-phase constructor. Creates all the state objects it owns.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_CONSTRUCTL_1, "CReceiver::ConstructL");
+	_LOG_L1C1(_L8("CReceiver::ConstructL"));
 	iData.CreateL(iMaxPacketSize);
 	}
 
@@ -88,14 +85,15 @@
  *  packet in its buffer.
  */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_RUNL_1, "CReceiver::RunL [iStatus=%d]", iStatus.Int());
+	_LOG_L1C2(_L8("CReceiver::RunL [iStatus=%d]"), iStatus.Int());
 
 	if (iStatus != KErrNone)
 		{
 		if (iStatus == KErrNoMemory)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_RUNL_2, "WARNING! CReceiver: Read failed with KErrNoMemory. Increase buffer.");
-				// Read operation failed!! Nif will re-issue the read request. Increase buffer.			
+			_LOG_L2C1(
+				_L8("WARNING! CReceiver: Read failed with KErrNoMemory. Increase buffer."));
+			// Read operation failed!! Nif will re-issue the read request. Increase buffer.			
 			if ((iMaxPacketSize + KBufferIncreaseStep) > K64k)
 			    {
 			    // In theory IP packet can't be bigger than 64k, so if we come here something is wrong so stop observer. 
@@ -118,14 +116,14 @@
 			}
 		else 
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_RUNL_3, "WARNING! CReceiver: Read failed");
+			_LOG_L2C1(_L8("WARNING! CReceiver: Read failed"));
 			iObserver.Stop(iStatus.Int());
 			}
 		return;
 		}
 	else
 	    {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_RUNL_4, "CReceiver: Data Packet Received");
+        _LOG_L1C1(_L8("CReceiver: Data Packet Received"));
     
         iRMBufPacket.CreateL(iData);
         
@@ -135,7 +133,7 @@
         SetActive();
         
         iRMBufPacket.Pack();
-        
+    
 #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
         TUint16 protocolCode = iObserver.RemoveHeader(iRMBufPacket);
 #else
@@ -150,7 +148,7 @@
 
 TInt CReceiver::RunError(TInt aError)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_RUNERROR_1, "WARNING! CReceiver::RunError Read failed");
+    _LOG_L2C1(_L8("WARNING! CReceiver::RunError Read failed"));
     iObserver.Stop(aError); 
     return KErrNone;  
     }
@@ -160,7 +158,7 @@
  *	Cancel active request
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_DOCANCEL_1, "CReceiver::DoCancel");
+	_LOG_L1C1(_L8("CReceiver::DoCancel"));
 
 	(iObserver.Bca())->CancelRead(); 
 	}
@@ -171,7 +169,7 @@
  *  packets from BCA.  
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_STARTLISTENING_1, "CReceiver::StartListening");
+	_LOG_L1C1(_L8("CReceiver::StartListening"));
 
 	// The BCA will complete this read once it has a full IP packet in its buffer.
 	(iObserver.Bca())->Read(iStatus, iData);

--- a/telephonyprotocols/rawipnif/src/Sender.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/Sender.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -19,24 +19,20 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "SenderTraces.h"
-#endif
-
 #include "Sender.h"
 #include "Constants.h"
 #include <es_ini.h>
 
 
-CSender::CSender(CBcaIoController& aObserver, TInt aMaxPacketSise)
+CSender::CSender(CBcaIoController& aObserver, CBttLogger* aTheLogger, TInt aMaxPacketSise)
 /**
  * Constructor. Performs standard active object initialisation.
+ *
  * @param aObserver Reference to the observer of this state machine
  */
 	: CActive(EPriorityUserInput), 
 	  iObserver(aObserver),
+	  iTheLogger(aTheLogger),
 	  iMaxPacketSize(aMaxPacketSise)
 	{
     // EPriorityUserInput is higher than the default priority but lower than
@@ -46,16 +42,17 @@
 	CActiveScheduler::Add(this);
 	}
 
-CSender* CSender::NewL(CBcaIoController& aObserver, TInt aMaxPacketSise)
+CSender* CSender::NewL(CBcaIoController& aObserver, CBttLogger* aTheLogger, TInt aMaxPacketSise)
 /**
  * Two-phase constructor. Creates a new CBcaIoController object, performs 
  * second-phase construction, then returns it.
  *
  * @param aObserver The observer, to which events will be reported
+ * @param aTheLogger The logging object
  * @return A newly constructed CBcaIoController object
  */
 	{
-	CSender* self = new (ELeave) CSender(aObserver, aMaxPacketSise);
+	CSender* self = new (ELeave) CSender(aObserver, aTheLogger, aMaxPacketSise);
 	CleanupStack::PushL(self);
 	self->ConstructL();
 	CleanupStack::Pop(self);
@@ -67,7 +64,7 @@
  * Second-phase constructor. Creates all the state objects it owns.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_CONSTRUCTL_1, "CSender::ConstructL");
+	_LOG_L1C1(_L8("CSender::ConstructL"));
 	iSendBuffer.CreateL(iMaxPacketSize);
 	}
 
@@ -88,27 +85,27 @@
  * This method checks if any error occured in the write operation.  
  */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_1, "CSender::RunL [iStatus=%d]", iStatus.Int());
+	_LOG_L1C2(_L8("CSender::RunL [iStatus=%d]"), iStatus.Int());
 
 	if (iStatus!=KErrNone)
 		{
 		if(iStatus == KErrNoMemory)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_2, "WARNING! CSender: Write failed with KErrNoMemory");
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_3, "WARNING! CSender: Ignoring packet!!!!");
+			_LOG_L2C1(_L8("WARNING! CSender: Write failed with KErrNoMemory"));
+			_LOG_L2C1(_L8("WARNING! CSender: Ignoring packet!!!!"));
 			// Write operation failed!! Nif will ignore this packet.
 			iObserver.SendComplete();
 			}
 		else if (iStatus == KErrNotReady)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_4, "WARNING! CSender: Write failed with KErrNotReady");
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_5, "WARNING! CSender: Ignoring packet!!!!");
+			_LOG_L2C1(_L8("WARNING! CSender: Write failed with KErrNotReady"));
+			_LOG_L2C1(_L8("WARNING! CSender: Ignoring packet!!!!"));
 			// Write operation failed!! Nif will ignore this packet.
 			iObserver.SendComplete();
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_6, "ERROR! CSender: Write failed!!!!");
+			_LOG_L2C1(_L8("ERROR! CSender: Write failed!!!!"));
 			// Nif will shut down
 			iObserver.Stop(iStatus.Int());
 			}
@@ -118,7 +115,7 @@
 	else
 		{
 		// The Ip packet was sent successfuly
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_7, "***** CSender: Packet Sent.");
+		_LOG_L1C1(_L8("***** CSender: Packet Sent."));
 		iObserver.SendComplete();
 		}
 	}
@@ -128,7 +125,7 @@
  *	Cancel active request
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_DOCANCEL_1, "CSender::DoCancel");
+	_LOG_L1C1(_L8("CSender::DoCancel"));
 
 	(iObserver.Bca())->CancelWrite(); 
 	}
@@ -141,7 +138,7 @@
  * @return KStopSending, or KErrArgument if the packet is too large.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_SEND_1, "CSender::Send");
+	_LOG_L1C1(_L8("CSender::Send"));
 
 	// Copy the IP portion of the RMBufChain to the buffer.
 	iSendBuffer.SetMax();
@@ -154,5 +151,7 @@
 	aPdu.Free();
 
 	(iObserver.Bca())->Write(iStatus, iSendBuffer);
+	
 	SetActive();
 	}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/src/bttlog.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,221 @@
+// Copyright (c) 2002-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:
+// Implements CBttLogger.
+// 
+//
+
+/**
+ @file
+*/
+
+#include "bttlog.h"
+
+#ifdef __BTT_LOGGING__
+
+#ifdef __DEBUGRAWIPSERIALPORT__
+#include <e32svr.h>
+#endif
+
+//Enable this if you want time stamps for each log statements.
+//This is computation ineffective and not recommended.
+//#define __TIME_STAMP_ENABLED__
+
+CBttLogger* CBttLogger::NewL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId)
+/**
+ * Factory method for CBttLogger.
+ * 
+ * @param aSubDir The subdirectory of c:\logs\gprsbtt to log to.
+ * @param aFileName The filename to log to.
+ * @return Ownership of a new CBttLogger.
+ */
+	{
+	CBttLogger* self = new(ELeave) CBttLogger;
+	CleanupStack::PushL(self);
+	self->ConstructL(aTag, aFileName, aInstanceId);
+	CleanupStack::Pop(self);
+	return self;
+	}
+
+#ifdef __FLOG_ACTIVE
+void CBttLogger::ConstructL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId)
+#else
+void CBttLogger::ConstructL(const TDesC8&, const TDesC8&, const TUint32 aInstanceId)
+#endif
+/**
+ * 2nd-phase construction.
+ * Hurricane/Typhoon - we can log to a particular directory
+ */
+	{
+	iInstanceId = aInstanceId;
+	__FLOG_OPEN(aTag, aFileName);
+	}
+
+//#endif
+
+CBttLogger::CBttLogger()
+/**
+ * Constructor
+ */
+ 	{
+	}
+
+CBttLogger::~CBttLogger()
+/**
+ * Destructor
+ */
+	{
+	__FLOG_CLOSE;
+	}
+
+void CBttLogger::Write(const TDesC8& aText)
+/**
+ * Write an 8-bit descriptor to the log file
+ *
+ * @param aText The test to write
+ */	
+	{
+	TBuf8<KLogBufferSize> buf;
+	TLogIgnoreOverflow8 overflowHandler;
+	// put the instance id to identify which nif we are
+	// logging from
+	_LIT8(KInstanceFormat, "RawIp 0x%08X: ");
+	buf.Format(KInstanceFormat, &overflowHandler, iInstanceId);
+	
+#ifdef __TIME_STAMP_ENABLED__
+	// log to our own file in Hurricane/Typhoon
+	_LIT8(KTimeFormat, "%02d.%02d:%02d:%06d ");
+	
+	TTime now;
+	now.UniversalTime();
+	TDateTime dateTime;
+	dateTime = now.DateTime();
+	buf.AppendFormat(KTimeFormat, 
+		&overflowHandler,
+		dateTime.Hour(), 
+		dateTime.Minute(), 
+		dateTime.Second(), 
+		dateTime.MicroSecond());
+#endif
+
+	buf.Append(aText);
+
+#ifdef __DEBUGRAWIPSERIALPORT__
+	TBuf<KLogBufferSize> buf2;
+	// TEMP: Do not print single % since appear as format char to RDebug::Print
+	for (TInt i = 0; i < buf.Length(); i++)
+		{
+		if (buf[i] == '%')
+			buf2.Append(_L("."));
+		else
+			buf2.Append(buf[i]);
+		}
+	RDebug::Print(buf2);
+#else
+	__FLOG(buf);
+#endif
+	}
+
+void CBttLogger::WriteFormat(TRefByValue<const TDesC8> aFmt, ...)
+/**
+ * Write an 8-bit format list to the log file
+ */	
+	{
+    //coverity[var_decl];
+    VA_LIST list;
+    VA_START(list, aFmt);
+ 
+	// log to our own file in Hurricane/Typhoon
+	TBuf8<KLogBufferSize> buf;
+	TLogIgnoreOverflow8 overflowHandler;
+        //coverity[uninit_use_in_call];
+	buf.AppendFormatList(aFmt, list, &overflowHandler);
+	Write(buf);
+	}
+
+void CBttLogger::VerboseLeaveL(char* aFile, TInt aLine, TInt aReason)
+/**
+ * Make a verbose leave - write name of file and line number to the log just 
+ * before leaving.
+ *
+ * @param aFile The file we're leaving from.
+ * @param aLine The line number we're leaving from.
+ * @param aReason The leave code.
+ */
+	{
+	// only leave if non-zero value
+	if ( aReason == KErrNone )
+		{
+		return;
+		}
+
+	_LIT8(KLeavePrefix, "LEAVE: " );
+
+	TPtrC8 fullFileName((const TUint8*)aFile);
+	TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
+
+	TBuf8<256> buf;
+	TLogIgnoreOverflow8 overflowHandler;
+	buf.AppendFormat(_L8("%S aReason=%d [file %S, line %d]"),
+		&overflowHandler,
+		&KLeavePrefix,
+		aReason,
+		&fileName,
+		aLine);
+	Write(buf);
+
+	__FLOG_CLOSE;
+
+	// finally
+	User::Leave(aReason);
+	}
+
+void CBttLogger::VerbosePanic(char* aFile, 
+							   TInt aLine, 
+							   TInt aPanicCode, 
+							   TText8* aPanicName,
+							   const TDesC& aPanicCategory)
+/**
+ * Make a verbose panic - write name of file and line number to the
+ * log just before panicking.
+ *
+ * @param aFile The file that's panicking.
+ * @param aLine The line number that's panicking.
+ * @param aReason The panic code.
+ * @param aPanicName The text of the panic code.
+ * @param aPanicCategory The panic category.
+ */
+	{
+	_LIT8(KLeavePrefix, "PANIC: " );
+
+	TPtrC8 fullFileName((const TUint8*)aFile);
+	TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
+
+	TBuf8<256> buf;
+	TLogIgnoreOverflow8 overflowHandler;
+	buf.AppendFormat(_L8("%S %d = %s [file %S, line %d]"), 
+		&overflowHandler,
+		&KLeavePrefix,
+		aPanicCode, 
+		aPanicName, 
+		&fileName, 
+		aLine);
+	Write(buf);
+
+	__FLOG_CLOSE;
+
+	// finally
+	User::Panic(aPanicCategory, aPanicCode);
+	}
+
+#endif // __BTT_LOGGING__

--- a/telephonyprotocols/rawipnif/src/rawipmcpr.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/rawipmcpr.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -20,11 +20,6 @@
  @internalComponent
 */
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "rawipmcprTraces.h"
-#endif
-
 #include <comms-infras/ss_log.h>
 #include "rawipmcpr.h"
 #include <comms-infras/linkprovision.h>
@@ -98,7 +93,8 @@
 
 void CRawIpMetaConnectionProvider::ReceivedL(const TRuntimeCtxId& aSender, const TNodeId& aRecipient, TSignatureBase& aMessage)
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPMETACONNECTIONPROVIDER_RECEIVEDL_1, "CRawIpMetaConnectionProvider [this=%08x]::ReceivedL() aCFMessage=%u",(TUint)this, aMessage.MessageId().MessageId());
+	__CFLOG_VAR((KRawIPMCprTag, KRawIPMCprSubTag, _L8("CRawIpMetaConnectionProvider [this=%08x]::ReceivedL() aCFMessage=%d"),
+	   this, aCFMessage.MessageId()));
 
 	ESOCK_DEBUG_MESSAGE_INTERCEPT(aSender, aMessage, aRecipient);

--- a/telephonyprotocols/rawipnif/src/rawipmcprfactory.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/rawipmcprfactory.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -20,11 +20,6 @@
  @internalComponent
 */
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "rawipmcprfactoryTraces.h"
-#endif
-
 #include "rawipmcprfactory.h"
 #include "rawipmcpr.h"
 #include <comms-infras/ss_log.h>
@@ -32,6 +27,10 @@
 
 #include <comms-infras/ss_msgintercept.h>
 
+#ifdef __CFLOG_ACTIVE
+#define KRawIPMCprFactoryTag KESockMetaConnectionTag
+// _LIT8(KRawIPMCprFactorySubTag, "rawipmcprfactory");
+#endif // __CFLOG_ACTIVE
 
 using namespace ESock;
 
@@ -42,15 +41,14 @@
 //-=========================================================	
 CRawIpMetaConnectionProviderFactory* CRawIpMetaConnectionProviderFactory::NewL(TAny* aParentContainer)
 	{
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPMETACONNECTIONPROVIDERFACTORY_NEWL_1, "CRawIpMetaConnectionProviderFactory ::\tNewL(%08x)",(TUint)aParentContainer);
+	__CFLOG_VAR((KRawIPMCprFactoryTag, KRawIPMCprFactorySubTag, _L8("CRawIpMetaConnectionProviderFactory ::\tNewL(%08x)"), aParentContainer));
  	return new (ELeave) CRawIpMetaConnectionProviderFactory(TUid::Uid(CRawIpMetaConnectionProviderFactory::iUid), *(reinterpret_cast<CMetaConnectionFactoryContainer*>(aParentContainer)));
 	}
 
 CRawIpMetaConnectionProviderFactory::CRawIpMetaConnectionProviderFactory(TUid aFactoryId, CMetaConnectionFactoryContainer& aParentContainer)
 	: CMetaConnectionProviderFactoryBase(aFactoryId,aParentContainer)
 	{
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPMETACONNECTIONPROVIDERFACTORY_NEWL_2, "CRawIpMetaConnectionProviderFactory %08x:\tCRawIpMetaConnectionProviderFactory Constructor",(TUint)this);
-
+	__CFLOG_VAR((KRawIPMCprFactoryTag, KRawIPMCprFactorySubTag, _L8("CRawIpMetaConnectionProviderFactory %08x:\tCRawIpMetaConnectionProviderFactory Constructor"), this));
 	}
 
 ACommsFactoryNodeId* CRawIpMetaConnectionProviderFactory::DoCreateObjectL(ESock::TFactoryQueryBase& aQuery)

--- a/telephonyprotocols/rawipnif/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyprotocols/rawipnif/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_DOCANCEL_1=0x30
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_DOCANCEL_2=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_DOCANCEL_3=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_DOCANCEL_4=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_1=0x24
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_10=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_11=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_12=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_2=0x25
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_3=0x26
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_4=0x27
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_5=0x28
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_6=0x29
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_7=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_8=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_9=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_SHUTDOWNBCA_1=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_SHUTDOWNBCA_2=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_SHUTDOWNBCA_3=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_STARTLOADL_1=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_STARTLOADL_2=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_STARTLOADL_3=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_ADDHEADER_1=0xdd
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_CONSTRUCTL_1=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_REMOVEHEADER_1=0xde
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_RESUMESENDING_1=0xd7
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_RESUMESENDING_2=0xd8
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_RESUMESENDING_3=0xd9
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_RESUMESENDING_4=0xda
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SENDCOMPLETE_1=0xd2
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SENDCOMPLETE_2=0xe0
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SENDCOMPLETE_3=0xd3
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SENDCOMPLETE_4=0xd4
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_1=0xc6
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_10=0xcf
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_11=0xd0
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_12=0xd1
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_2=0xc7
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_3=0xc8
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_4=0xc9
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_5=0xca
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_6=0xcb
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_7=0xcc
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_8=0xcd
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_9=0xce
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SETTYPE_1=0xdc
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_STARTL_1=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_STOP_1=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_BIND_1=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_STARTSENDING_1=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_UNBIND_1=0x3b
-[TRACE]TRACE_INTERNALS[0x88]_CIPTAGHEADER_ADDHEADER_1=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_CIPTAGHEADER_REMOVEHEADER_1=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_CIPTAGHEADER_SETTYPE_1=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_CONTROL_1=0x40
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_DELETECONTEXT_1=0x43
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_GETCONFIG_1=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_GETCONFIG_2=0x42
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_1=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_10=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_11=0x62
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_12=0xe1
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_13=0xe2
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_14=0x65
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_15=0x66
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_16=0x67
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_17=0x68
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_18=0x69
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_19=0x6a
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_2=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_20=0x6b
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_21=0x6c
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_22=0x6d
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_23=0x6e
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_3=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_4=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_5=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_6=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_7=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_8=0x5f
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_9=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_NOTIFICATION_1=0x50
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_PROCESS_1=0x53
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_PROCESS_2=0x54
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_PROCESS_3=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_SEND_1=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_SETPROVISION_1=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_SETPROVISION_2=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_STARTSENDING_1=0x51
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONNECTIONSPEED_1=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_1=0x44
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_10=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_2=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_3=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_4=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_5=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_6=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_7=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_8=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_9=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_WANTSPROTOCOL_1=0x52
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_CONTROL_1=0x6f
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_DELETECONTEXT_1=0x70
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_1=0x82
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_2=0x83
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_3=0x84
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_4=0x85
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_5=0x86
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_6=0x87
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_7=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_8=0x89
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_9=0x8a
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_NOTIFICATION_1=0x7c
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_PROCESS_1=0x7f
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_PROCESS_2=0x80
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_PROCESS_3=0x81
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_SEND_1=0x7b
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_STARTSENDING_1=0x7d
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONNECTIONSPEED_1=0x7a
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_1=0x71
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_2=0x72
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_3=0x73
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_4=0x74
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_5=0x75
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_6=0x76
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_7=0x77
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_8=0x78
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_9=0x79
-[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_WANTSPROTOCOL_1=0x7e
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOWFACTORY_DOCREATEFLOWL_1=0xb0
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_CONSTRUCTL_1=0x8b
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_DYNAMICPROVISIONCONFIGL_1=0xa9
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_DYNAMICPROVISIONCONFIGL_2=0xaa
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_GETCONTROLL_1=0xa4
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_GETCONTROLL_2=0xa5
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_GETCONTROLL_3=0xa6
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_1=0x98
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_2=0x99
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_3=0x9a
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_4=0x9b
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_5=0x9c
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_6=0x9d
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_7=0x9e
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_8=0x9f
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_LINKLAYERDOWN_1=0x8f
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_LINKLAYERUP_1=0x8e
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_NOTIFICATION_1=0xab
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_NOTIFICATION_2=0xac
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_NOTIFICATION_3=0xad
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_NOTIFICATION_4=0xae
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_NOTIFICATION_5=0xaf
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_PROCESS_1=0x92
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_PROCESS_2=0x93
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_PROCESS_3=0x94
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_PROCESS_4=0x95
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_PROVISIONCONFIG_1=0xa8
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_RESUMESENDING_1=0x96
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_RESUMESENDING_2=0x97
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_SENDPACKET_1=0xdf
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_SHUTDOWN_1=0xa0
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_SHUTDOWN_2=0xa1
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_SHUTDOWN_3=0xa2
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_STARTFLOWL_1=0x8c
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_STARTFLOWL_2=0xe3
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_STARTFLOWL_3=0xe4
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_STOPFLOW_1=0x90
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_UNBIND_1=0xa7
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_UPDATECONTEXTSTATE_1=0xa3
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPMETACONNECTIONPROVIDERFACTORY_NEWL_1=0xc4
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPMETACONNECTIONPROVIDERFACTORY_NEWL_2=0xc5
-[TRACE]TRACE_INTERNALS[0x88]_CRAWIPMETACONNECTIONPROVIDER_RECEIVEDL_1=0xc3
-[TRACE]TRACE_INTERNALS[0x88]_CRECEIVER_CONSTRUCTL_1=0xb1
-[TRACE]TRACE_INTERNALS[0x88]_CRECEIVER_DOCANCEL_1=0xb6
-[TRACE]TRACE_INTERNALS[0x88]_CRECEIVER_RUNL_1=0xb2
-[TRACE]TRACE_INTERNALS[0x88]_CRECEIVER_RUNL_2=0xb3
-[TRACE]TRACE_INTERNALS[0x88]_CRECEIVER_RUNL_3=0xb4
-[TRACE]TRACE_INTERNALS[0x88]_CRECEIVER_RUNL_4=0xb5
-[TRACE]TRACE_INTERNALS[0x88]_CRECEIVER_STARTLISTENING_1=0xb7
-[TRACE]TRACE_INTERNALS[0x88]_CSENDER_CONSTRUCTL_1=0xb8
-[TRACE]TRACE_INTERNALS[0x88]_CSENDER_DOCANCEL_1=0xc0
-[TRACE]TRACE_INTERNALS[0x88]_CSENDER_RUNL_1=0xb9
-[TRACE]TRACE_INTERNALS[0x88]_CSENDER_RUNL_2=0xba
-[TRACE]TRACE_INTERNALS[0x88]_CSENDER_RUNL_3=0xbb
-[TRACE]TRACE_INTERNALS[0x88]_CSENDER_RUNL_4=0xbc
-[TRACE]TRACE_INTERNALS[0x88]_CSENDER_RUNL_5=0xbd
-[TRACE]TRACE_INTERNALS[0x88]_CSENDER_RUNL_6=0xbe
-[TRACE]TRACE_INTERNALS[0x88]_CSENDER_RUNL_7=0xbf
-[TRACE]TRACE_INTERNALS[0x88]_CSENDER_SEND_1=0xc1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/bmarm/RawIPNifU.DEF	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,3 @@
+EXPORTS
+	NewInterfaceFactoryL @ 1 NONAME R3UNUSED ; (null)
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/bwins/RawIPNifU.DEF	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,3 @@
+EXPORTS
+	NewInterfaceFactoryL @ 1 NONAME
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/data/rawip.ini	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,2 @@
+[link]
+highmark= 5

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/eabi/RawIPNifU.def	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,2 @@
+EXPORTS
+	NewInterfaceFactoryL @ 1 NONAME ; extracted from ..\..\..\..\..\EPOC32\BUILD\gt139\dev_branch\gprsbtt\Nif\GROUP\BTTNIF\ARMV4\UDEB\Btt.in

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/group/BLD.INF	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,35 @@
+// Copyright (c) 2002-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:
+// Network interface for supporting multiple primary PDP contexts on the telephony reference platform 
+// 
+//
+
+/**
+ @file
+*/
+
+PRJ_PLATFORMS
+
+DEFAULT
+
+PRJ_EXPORTS
+RawIpNif.iby 	/epoc32/rom/include/rawipnif.iby
+
+PRJ_MMPFILES
+
+RawIPNif.mmp
+
+// Note that there is no PRJ_TESTMMPFILES here. This is intentional, because
+// building the NIF unit test stops the other unit tests from working. If you
+// want to run the NIF unit test, build it explicitly.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/group/RawIPNif.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,79 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+TARGET      rawip.nif
+TARGETTYPE  DLL
+UID         0x10003d3a 0x10206860
+
+// Used to specify if the rawip.nif should be specifically built to the
+// functionality of TI basebands, where a two-byte header is appended
+// to all incoming and outgoing packets (to specify the protocol being
+// used). This macro is commented out as part of fix INC113695 propagation to v94
+// MACRO RAWIP_HEADER_APPENDED_TO_PACKETS
+
+// Used by UmtsNifControlIf. Networking defect DEF027856 reversed the meaning
+// of this, so we don't define it any more.
+//MACRO	MM_ETEL_API
+
+// Do not add the non-callable exports to the DEF files
+// Remove this line temporarily if we need to add new exports
+NOEXPORTLIBRARY
+
+#if defined(WINS)
+DEFFILE RawIPNif.DEF
+#elif defined(GCC32)
+DEFFILE RawIPNif.DEF
+#else
+DEFFILE RawIPNif.def
+#endif
+
+SOURCEPATH  ../src
+
+SOURCE  DllMain.cpp 
+SOURCE  RawIPNifMain.cpp 
+SOURCE  RawIPNifMainFactory.cpp
+SOURCE  IPv4ProtocolIf.cpp
+SOURCE  IPv6ProtocolIf.cpp 
+SOURCE  ProtocolIfBase.cpp
+SOURCE  BcaIoController.cpp 
+SOURCE  BcaController.cpp 
+SOURCE  Sender.cpp 
+SOURCE  Receiver.cpp 
+SOURCE  IPTagHeader.cpp
+SOURCE  bttlog.cpp
+
+
+USERINCLUDE		../inc
+
+OS_LAYER_SYSTEMINCLUDE
+
+#include <networking/packetlogger.mmh>
+
+LIBRARY  euser.lib
+LIBRARY  nifman.lib
+LIBRARY  insock.lib
+LIBRARY  etelpckt.lib
+LIBRARY  mbufmgr.lib
+LIBRARY  esock.lib
+
+
+START WINS
+    BASEADDRESS 0x47E00000
+END
+
+CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
+VENDORID 0x70000001
+
+UNPAGED

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/group/RawIpNif.iby	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,28 @@
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __RAWIPNIF_IBY__
+#define __RAWIPNIF_IBY__
+
+// Raw IP NIF
+
+#include <packetlogger.iby>
+
+// The default BCA is C32, but may be replaced by another BCA if desired
+#include <c32bca.iby>
+
+file=ABI_DIR\DEBUG_DIR\rawip.nif    System\libs\rawip.nif
+
+#endif // __RAWIPNIF_IBY__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/group/networking_rawipnif.history.xml	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<relnotes schema="1.0.0" name="Raw IP NIF" purpose="" type="component">
+  <revision major="1" functional="0" minor="0" date="20071109">
+    <ref name="PDEF113864" type="defect"/>
+    <description>The RawIP NIF and TRP PCO implementation is not correct.  TProtocolConfigOptionV2::iMiscBuffer is not the correct way to pass a gateway address - data needs to be passed in TLV format but there are no TLV content tags defined for a gateway address and any UMTS/GPRS hardware which claims to be able to supply this address is erroneous (3gpp standard 24.008, section 10.5.6.3).  We no longer pass any gateway information in the buffer so that other correctly formed parameters can be passed.</description>
+  </revision>
+  <purpose>
+    Required to support multiple primary PDP contexts (multi-homing over GPRS) on the telephony reference platform.
+  </purpose>
+</relnotes>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/group/networking_rawipnif.mrp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,5 @@
+component	networking_rawipnif
+source	\sf\os\cellularsrv\telephonyprotocols\rawipnif
+binary	\sf\os\cellularsrv\telephonyprotocols\rawipnif\group	all
+exports	\sf\os\cellularsrv\telephonyprotocols\rawipnif\group
+notes_source	\component_defs\release.src

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/inc/BcaController.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,142 @@
+// Copyright (c) 2004-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:
+// Defines the interface to the BCA & flow control.
+// 
+//
+
+/**
+ @file 
+*/
+
+#ifndef BCACONTROLLER_H
+#define BCACONTROLLER_H
+
+#include <e32base.h>
+#include <c32comm.h>
+
+#include "MControllerObserver.h"
+#include "bttlog.h"
+#include "Constants.h"
+
+#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
+#include "IPTagHeader.h"
+#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
+
+class CBttLogger;
+
+/** 
+@internalComponent 
+*/	
+class CBcaController : public CBase
+	{
+public:
+	CBcaController(MControllerObserver& aObserver, CBttLogger* aTheLogger);
+	void BaseConstructL();
+	~CBcaController();
+
+public: // Flow Control
+	void UpdateInternalFlowFlag(TFlowControl aValue);
+	void UpdateContextStateFlag(TBool aValue);
+	TBool IsTxPossible();
+
+public:
+	virtual void StartL() = 0;
+	virtual void Stop(TInt aError = KErrNone) = 0;
+
+#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
+public: //tag headers
+	void SetType(TUint16 aType);
+	void AddHeader(TDes8& aDes);
+	TUint16 RemoveHeader(RMBufChain& aPdu);
+#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
+
+public:  // Process Down/Up stack data packets 
+	void Process(TDesC8& aPdu);
+	TInt Send(RMBufChain& aPdu);
+	void SendComplete();
+	// Get the NIF reference.
+	inline MControllerObserver& GetObserver();
+protected:
+	virtual void BcaSend(RMBufChain& aPdu) = 0;
+	virtual void BcaProcess(TDesC8& aPdu) = 0;
+	virtual void BcaSendComplete() = 0;
+	virtual TInt BcaSendBufferLength() = 0;
+	
+protected:
+	enum TSendState
+		{
+		EIdle,
+		ESending,
+		EShuttingDown
+		};
+
+	enum TInitialisationState
+		{
+		EStart,
+		EBcaController,
+		EInitialised
+		};
+
+	inline TInt GetSendState();
+	inline void SendState(TSendState aState);
+	
+private: // Flow Control
+	void ResumeSending();
+	//Buffer control
+	TBool IsSendQueueEmpty();
+	TBool IsSendQueueFull();
+	void AppendToSendQueue(RMBufChain& aPdu);
+	TBool RemoveFromSendQueue(RMBufChain& aPdu);
+	void EmptySendQueue();
+	
+private: // Unowned data.
+    MControllerObserver& iObserver;
+protected:
+	CBttLogger* iTheLogger;
+	
+private:
+	// Flow control flags
+	TFlowControl iTxFlowControl;
+	TBool iTxContextActive;
+	TSendState iSendState;
+
+	/** The internal packet buffer */
+	RMBufPktQ iSendQueue;
+	/** The maximum number of packets that we want in an internal queue */
+	TInt iMaxSendQueueLen;
+	/** Current number of packets in the internal packet buffer */
+	TInt iNumPacketsInSendQueue;
+
+#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
+	CIPTagHeader* iIPTagHeader;
+#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
+	};
+
+void CBcaController::SendState(TSendState aState)
+	{
+	iSendState = aState;
+	}
+
+TInt CBcaController::GetSendState()
+	{
+	return iSendState;
+	}
+
+
+MControllerObserver& CBcaController::GetObserver()
+	{
+	return iObserver;
+	}
+
+#endif // BCACONTROLLER_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/inc/BcaIoController.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,239 @@
+// Copyright (c) 2004-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:
+// Defines the interface to the BCA interface
+// 
+//
+
+/**
+ @file 
+*/
+
+#ifndef BCAIOCONTROLLER_H
+#define BCAIOCONTROLLER_H
+
+#include <e32base.h>
+#include <c32comm.h>
+#include <networking/bca.h>
+#include <networking/bcafactory.h>
+
+#include "BcaController.h"
+using namespace BasebandChannelAdaptation;
+
+class CBttLogger;
+class CSender;
+class CReceiver;
+class CBcaControl;
+
+/** 
+
+@internalComponent 
+*/	
+void Panic(TRawIPNifPanic aPanic);
+
+/**
+
+@internalComponent
+*/
+typedef MBcaFactory* (*TNewBcaFactoryL)();
+
+
+/** 
+@internalComponent 
+*/	
+class CBcaIoController : public CBcaController
+	{
+public:
+	CBcaIoController(MControllerObserver& aObserver, CBttLogger* aTheLogger);
+	static CBcaIoController* NewL(MControllerObserver& aObserver, CBttLogger* aTheLogger);
+	void ConstructL();
+	~CBcaIoController();
+
+public:
+	void StartL();
+	void Stop(TInt aError = KErrNone);
+
+public:  // Process Down/Up stack data packets 
+	void BcaProcess(TDesC8& aPdu);
+	void BcaSend(RMBufChain& aPdu);
+	void BcaSendComplete();
+
+public:
+	inline CSender& Sender();
+	inline CReceiver& Receiver();
+	inline TUint Nsapi();
+	void SetBcaStackAndName(TDesC& aBcaStack);
+	inline const TName& BcaStack()const;
+	inline const TName& BcaName()const;
+	inline MBca* Bca();
+	inline void SetBca(MBca* aBca);
+	inline void SetPort(TDesC& aPortName);
+	inline const TName& Port()const;
+	inline void SetIapId(TUint32 aIapId);
+	inline TUint32 IapId();
+	TInt BcaSendBufferLength();
+	
+private:
+	void InitialiseBcaL();
+
+private: // Flow Control
+	void ResumeSending();
+
+private: // Unowned data.
+	/** Pointer to the BCA */
+   	MBca* iMBca;
+
+	/** used to send data*/
+	CSender* iSender;
+	/** used to receive data*/
+	CReceiver* iReceiver;
+	/** used to load, open and close the BCA*/
+	CBcaControl* iLoader;
+	/** IAP ID used to open CommDB*/
+	TUint32 iIapId;
+	/** Bca name*/
+	TName iBcaName;
+	/** Bca Stack*/
+	TName iBcaStack;
+	/** CommPort Name*/
+	TName iCommPort;
+	};
+
+inline CSender& CBcaIoController::Sender()
+/**
+ * Returns reference to CSender object
+ *
+ * @return iSender The CSender reference
+ */
+	{
+	return *iSender;
+	}
+	
+inline CReceiver& CBcaIoController::Receiver()
+/**
+ * Returns reference to CReceiver object
+ *
+ * @return iReceiver The CReceiver reference
+ */
+	{
+	return *iReceiver;
+	}
+
+/** returns the BCA Stack*/
+inline const TName& CBcaIoController::BcaStack()const
+	{
+	return iBcaStack;
+	}
+	
+/** returns the BCA name*/
+inline const TName& CBcaIoController::BcaName()const
+	{
+	return iBcaName;
+	}
+	
+/** retrurns the BCA pointer.*/	
+inline MBca* CBcaIoController::Bca()
+	{
+	return iMBca;
+	}
+/** sets the BCA pointer.
+
+* @param aBca BCA pointer.
+*/
+inline void CBcaIoController::SetBca(MBca* aBca)
+	{
+	iMBca = aBca;
+	}
+
+/** sets the IAP ID
+
+* @param aIapId IAP ID to be set.
+*/	
+inline void CBcaIoController::SetIapId(TUint32 aIapId)
+	{
+	iIapId = aIapId;
+	}
+
+/** returns the IAP ID*/	
+inline TUint32 CBcaIoController::IapId()
+	{
+	return iIapId;
+	}
+
+/** sets the port name
+
+* @param aPortName port name to be set.
+*/	
+inline void CBcaIoController::SetPort(TDesC& aPortName)
+	{
+	iCommPort = aPortName;
+	}
+
+/** returns the port name*/	
+inline const TName& CBcaIoController::Port()const
+	{
+	return iCommPort;
+	}
+
+/** class used to load, open and shutdown the BCA and also start and shutdown the NIF.
+@internalComponent 
+*/
+class CBcaControl : public CActive
+	{
+public:
+	CBcaControl(CBcaIoController& aObserver, CBttLogger* aTheLogger);
+	~CBcaControl();
+public:
+	void StartLoadL();
+	void ShutdownBca(TInt aError);
+    inline MBca* Bca();
+protected:
+	// Inherited from CActive.
+	virtual void RunL();
+	virtual void DoCancel();	
+private: // Unowned data.
+	CBcaIoController& iObserver;
+	CBttLogger* iTheLogger;
+private:
+		enum TBcaState
+		{
+		/** Bca ready to start */
+		EIdling,
+		/** Bca to be closed*/
+		EClosing,
+		/** Bca IAP is set*/
+		EIAPSet,
+		/** Bca stack is set*/
+		EBcaStackSet
+		};
+	
+private:
+	
+	/** BCA owned by NIF*/	
+	MBca* iMBca;
+	/** used to load library*/
+	TAutoClose<RLibrary> iBcaDll;
+	/** BCA state*/
+	TBcaState iState;
+	/** NIF shut down error*/
+	TInt iError; 
+	};
+	
+/** returns the BCA pointer. */	
+inline MBca* CBcaControl::Bca()
+	{
+	return iMBca;
+	}	
+
+#endif // BCAIOCONTROLLER_H
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/inc/Constants.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,86 @@
+// Copyright (c) 2002-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
+*/
+
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
+
+#include <e32base.h>
+#include <etelqos.h>
+
+const TUint KNifMajorVersionNumber=1;
+const TUint KNifMinorVersionNumber=0;
+const TUint KNifBuildVersionNumber=0;
+
+// For CommDb usage
+const TUint KSlashChar='\\';
+
+// Constants for IPv4 protocol interface
+_LIT(KDescIp, "ip");
+_LIT(KDescIcmp, "icmp");
+_LIT(KIPv4ProtocolIfName, "Bttint4");
+
+// Constants for IPv6 protocol interface
+_LIT(KDescIp6, "ip6");
+_LIT(KIPv6ProtocolIfName, "Bttint6");
+
+_LIT(KNifName, "rawipnif");
+enum TRawIPNifPanic
+    {
+	KNifUnknownInitState,
+	KNifUnknownShutDownState,
+	KNifProtocolInUse,
+	/** Bca in unkonwn State */
+	KBcaUnkownState,
+	/** BCA not exist*/
+	KBcaNotExist 	
+	};
+
+
+const TUint16 KIp4FrameType = 0x21;
+const TUint16 KVanJacCompTCPIPFrameType = 0x2d;
+const TUint16 KVanJacUnCompTCPIPFrameType = 0x2f;
+const TUint16 KIp6FrameType = 0x57;
+
+const TUint KDefaultSpeedMetric = 1;
+const TUint KDefaultMtu = 1500;
+
+const TUint KDataPacketMaxSize = 4096;
+
+// BTT TSY contants
+const TInt KTsyPhone = 0;
+
+// Flow control constants
+const TInt KStopSending		= 0;
+const TInt KContinueSending	= 1;
+
+_LIT(KRawIPNifName, "RawIP");
+
+// constants for diagnostic logging
+_LIT8(KNifSubDir, "RawIp"); 
+_LIT8(KRefFile, "RawIP.txt"); 
+
+// Max size of IP packet 
+const TInt KMaxIPPacket = 1500;
+const TInt KIPTagHeaderLength = 2;
+const TInt KMaxIPPacketAndHeader = KMaxIPPacket + KIPTagHeaderLength;
+
+const TInt KIPTagHeaderByte1 = 0x00;
+const TInt KIPTagHeaderByte2 = 0x21;
+
+#endif	//CONSTANTS_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/inc/IPTagHeader.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,52 @@
+// Copyright (c) 2004-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:
+// Defines the Class that adds and extracts specific header tags.
+// 
+//
+
+/**
+ @file
+*/
+
+#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
+
+#ifndef IPTAGHEADER_H__
+#define IPTAGHEADER_H__
+
+#include "bttlog.h"
+#include "Constants.h"
+#include <nifmbuf.h>
+
+class CBttLogger;
+
+class CIPTagHeader : public CBase
+	{
+public:
+	CIPTagHeader(CBttLogger* aTheLogger);
+	~CIPTagHeader();
+	void SetType(TUint16 aType);
+	void AddHeader(TDes8& aDes);
+	TUint16 RemoveHeader(RMBufChain& aPdu);
+
+private: // Unowned data.
+	CBttLogger* iTheLogger;
+
+	//CLASSNAMEDECL(CIPTagHeader);
+
+	TBuf8<KIPTagHeaderLength> iHeaderByte; // Owned
+	};
+
+#endif // IPTAGHEADER_H__
+
+#endif // RAWIP_HEADER_APPENDED_TO_PACKETS

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/inc/IPv4ProtocolIf.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,103 @@
+// Copyright (c) 2002-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:
+// This file defines the CIPv4ProtocolIf class, which handles the transmission
+// of IPv4 data to and from the TCP/IP stack.
+// 
+//
+
+/**
+ @file
+*/
+
+#ifndef IPV4PROTOCOLIF_H__
+#define IPV4PROTOCOLIF_H__
+
+#include "ProtocolIfBase.h"
+
+class CBttLogger;
+
+class CIPv4ProtocolIf : public CProtocolIfBase
+{
+public:
+	CIPv4ProtocolIf(CRawIPNifMain& aNifMain, CBttLogger* aTheLogger);
+	~CIPv4ProtocolIf();
+
+public:	//NifIfBase support.
+	virtual void BindL(TAny *aId);
+	virtual TInt Control(TUint aLevel,TUint aName,TDes8& aOption, TAny* aSource);
+	virtual TInt Send(RMBufChain& aPdu, TAny* aSource);
+	virtual void Info(TNifIfInfo& aInfo) const;
+	virtual TInt Notification(TAgentToNifEventType aEvent, void * aInfo);
+	virtual void StartSending(CProtocolBase* aProtocol);
+
+	virtual TBool WantsProtocol(TUint16 aProtocolCode);
+	virtual void Process(RMBufChain& aPdu);
+
+	virtual void UpdateContextConfigL(const RPacketContext::TContextConfigGPRS&
+		aConfig);
+	virtual void UpdateConnectionSpeed(TUint aConnectionSpeed);
+
+	// Define the class that will hold the IPv4 setting required by the Nif.
+	class TIPv4Settings
+		{
+	public:
+		// As this is IPv4, all addresses are 32-bit.
+		TUint32	iLocalAddr;
+		TUint32	iNetMask;
+		TUint32	iBroadcastAddr;
+		TUint32	iDefGateway;
+		TUint32	iPrimaryDns;
+		TUint32	iSecondaryDns;
+		TBool iGetGatewayFromServer;
+		TBool iGetDnsFromServer;
+		};
+
+private:
+	void ReadCommDbGprsSettingsL();
+	void ReadIPv4SettingL(const TDesC& aFieldName, TUint32& aIpAddr);
+
+	TInt WriteIfConfig(TDes8& aIfConfig);
+	TInt WriteIfInfo(TDes8& aIfInfo);
+
+	TInt WriteConnectionInfo(TDes8& aConnectionInfo);
+
+#ifdef WCDMA_STUB
+	TInt DeleteContext(TDes8& aContextParameters);
+#endif
+
+	inline void WriteIfName(TDes& aName) const;
+
+#ifdef __BTT_LOGGING__
+	void LogPacket(const RMBufChain& aPacket);
+#endif // __BTT_LOGGING__
+
+private: //unowned
+	CBttLogger* iTheLogger;
+
+private: //owned
+	TIPv4Settings iSettings;
+	TUint iSpeedMetric;
+};
+
+void CIPv4ProtocolIf::WriteIfName(TDes& aName) const
+/**
+ * Used to uniquely identify the current Nif instance
+ *
+ * @param aName Descriptor that will be initialised.
+ */
+	{
+	aName.Format(_L("%S[0x%X]"), &KIPv4ProtocolIfName, this);
+	}
+
+#endif // IPV4PROTOCOLIF_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/inc/IPv6ProtocolIf.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,103 @@
+// Copyright (c) 2002-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:
+// This file defines the CIPv6ProtocolIf class, which handles the transmission
+// of IPv6 data to and from the TCP/IP stack.
+// 
+//
+
+/**
+ @file
+*/
+
+#ifndef IPV6PROTOCOLIF_H__
+#define IPV6PROTOCOLIF_H__
+
+#include "ProtocolIfBase.h"
+#include <eui_addr.h>
+
+class CBttLogger;
+
+class CIPv6ProtocolIf : public CProtocolIfBase
+{
+public:
+	CIPv6ProtocolIf(CRawIPNifMain& aNifMain, CBttLogger* aTheLogger);
+	~CIPv6ProtocolIf();
+
+public:	//NifIfBase support.
+	virtual void BindL(TAny *aId);
+	virtual TInt Control(TUint aLevel,TUint aName,TDes8& aOption, TAny* aSource);
+	virtual TInt Send(RMBufChain& aPdu, TAny* aSource);
+	virtual void Info(TNifIfInfo& aInfo) const;
+	virtual TInt Notification(TAgentToNifEventType aEvent, void * aInfo);
+	virtual void StartSending(CProtocolBase* aProtocol); // It seems not needed for ipv6
+
+	virtual TBool WantsProtocol(TUint16 aProtocolCode);
+	virtual void Process(RMBufChain& aPdu);
+
+
+	virtual void UpdateContextConfigL(const RPacketContext::TContextConfigGPRS&
+		aConfig);
+	virtual void UpdateConnectionSpeed(TUint aConnectionSpeed);
+
+	// Define the class that will hold the IPv6 setting required by the Nif.
+	class TIPv6Settings
+		{
+	public:
+		TIp6Addr iLocalAddr;
+		TIp6Addr iPrimaryDns;
+		TIp6Addr iSecondaryDns;
+		TBool iGetDnsFromServer;
+		TBool iGetIpFromServer;
+		TE64Addr iLocalIfId;
+		//TE64Addr iRemoteIfId;
+		};
+
+private:
+	void ReadCommDbGprsSettingsL();
+	// This method is only used to get GPRS_IP_ADDR.
+	void ReadIPv4SettingL(const TDesC& aFieldName, TUint32& aIpAddr);	
+	void ReadIPv6SettingL(const TDesC& aFieldName, TIp6Addr& aIpAddr);
+
+	TInt WriteIfConfig(TDes8& aIfConfig);
+	TInt WriteIfInfo(TDes8& aIfInfo);
+
+	TInt WriteConnectionInfo(TDes8& aConnectionInfo);
+#ifdef WCDMA_STUB
+	TInt DeleteContext(TDes8& aContextParameters);
+#endif
+	inline void WriteIfName(TDes& aName) const;
+
+#ifdef __BTT_LOGGING__
+	void LogPacket(const RMBufChain& aPacket);
+#endif // __BTT_LOGGING__
+
+private: //unowned
+	CBttLogger* iTheLogger;
+
+private: //owned
+	TIPv6Settings iSettings;
+	TUint iSpeedMetric;
+};
+
+void CIPv6ProtocolIf::WriteIfName(TDes& aName) const
+/**
+ * Used to uniquely identify the current Nif instance
+ *
+ * @param aName Descriptor that will be initialised.
+ */
+	{
+	aName.Format(_L("%S[0x%X]"), &KIPv6ProtocolIfName, this);
+	}
+
+#endif // IPV6PROTOCOLIF_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/inc/MControllerObserver.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,35 @@
+// Copyright (c) 2002-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:
+// Interface class for objects which need to observe the BCA controller.
+// 
+//
+
+/**
+ @file
+*/
+
+#ifndef MCONTROLLEROBSERVER_H__
+#define MCONTROLLEROBSERVER_H__
+
+#include "MRawIPNifObserverBase.h"
+#include <es_mbuf.h>
+
+class MControllerObserver : public MRawIPNifObserverBase
+	{
+public:
+	virtual void Process(RMBufChain& aPdu, TUint16 aProtocolCode)=0;
+	virtual void ResumeSending()=0;
+	};
+
+#endif // MCONTROLLEROBSERVER_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/inc/MRawIPNifObserverBase.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,49 @@
+// Copyright (c) 2002-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:
+// Defines the class MRawIPNifObserverBase. All internal NIF observer mixins
+// derive from this class.
+// 
+//
+
+/**
+ @file
+*/
+
+#ifndef MRAWIPNIFOBSERVERBASE_H__
+#define MRAWIPNIFOBSERVERBASE_H__
+
+class MNifIfNotify;
+class CBcaIoController;
+class CProtocolIfBase;
+
+class MRawIPNifObserverBase
+	{
+public:
+	enum TInitialisationState
+		{
+		EStart,
+		EBcaController,
+		EInitialised
+		};
+
+public:
+	virtual void InitialiseL(TInitialisationState aState, TInt aError)=0;
+	virtual void ShutDown(TInitialisationState aState, TInt aError=KErrNone)=0;
+
+public:
+	virtual MNifIfNotify* GetAgent()=0;
+	virtual CProtocolIfBase* GetProtocolIf()=0;
+	};
+
+#endif // MRAWIPNIFOBSERVERBASE_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/inc/ProtocolIfBase.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,77 @@
+// Copyright (c) 2002-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:
+// This file defines the base class for the protocol interface classes.
+// 
+//
+
+/**
+ @file
+*/
+
+#ifndef PROTOCOLIFBASE_H__
+#define PROTOCOLIFBASE_H__
+
+#include <comms-infras/nifif.h>
+#include <es_mbuf.h>
+
+#include "Constants.h"
+
+class CRawIPNifMain;
+class CBttLogger;
+
+class CProtocolIfBase : public CNifIfBase
+	{
+public:
+	CProtocolIfBase(CRawIPNifMain& aNifMain, CBttLogger* aTheLogger);
+	virtual ~CProtocolIfBase();
+
+public:
+	virtual void BindL(TAny *aId);
+	virtual TInt State();
+	virtual TInt Control(TUint aLevel,TUint aName,TDes8& aOption, TAny* aSource);
+	virtual TInt Send(RMBufChain& aPdu, TAny* aSource);
+	virtual void Info(TNifIfInfo& aInfo) const;
+	virtual TInt Notification(TAgentToNifEventType aEvent, void * aInfo);
+	virtual void StartSending(CProtocolBase* aProtocol);
+
+public:
+	virtual void UpdateContextConfigL(const RPacketContext::TContextConfigGPRS&
+		aConfig);
+	virtual void UpdateConnectionSpeed(TUint aConnectionSpeed);
+
+	virtual TBool WantsProtocol(TUint16 aProtocolCode)=0;
+	virtual void Process(RMBufChain& aPdu) = 0; 
+
+public:
+	inline CRawIPNifMain& GetNifMain();
+
+protected:
+    CProtocolBase* iProtocol;
+	CRawIPNifMain& iNifMain;
+
+private:
+	CBttLogger* iTheLogger;
+	};
+
+CRawIPNifMain& CProtocolIfBase::GetNifMain()
+/**
+ * Returns to reference to RawIPNifMain
+ *
+ * @return reference to CRawIPNifMain class
+ */
+	{
+	return iNifMain;
+	}
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/inc/RawIPNifMain.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,127 @@
+// Copyright (c) 2002-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:
+// Defines the CRawIPNifMain class, which provides a central point for the NIF
+// to communicate with NifMan and the BCA controller. This class creates an
+// interface to the IPv4 protocol when it is required.
+// 
+//
+
+/**
+ @file
+*/
+
+#ifndef RAWIPNIFMAIN_H
+#define RAWIPNIFMAIN_H
+
+#include <comms-infras/nifif.h>
+#include <networking/packetlogger.h>
+#include <in_sock.h>
+#include "ProtocolIfBase.h"
+#include "BcaIoController.h"
+#include "MControllerObserver.h"
+#include "bttlog.h"
+
+class CBttLogger;
+class CPacketLogger;
+
+class CRawIPNifMain : public CNifIfLink, public MControllerObserver
+	{
+public:
+ 	CRawIPNifMain(CNifIfFactory& aFactory, MNifIfNotify* aNotify, CBttLogger* aTheLogger);
+	~CRawIPNifMain();
+	void ConstructL(const TDesC& aName);
+	// Used to be :Pure virtuals inherited from MContextSmObserver
+	CBcaIoController* GetBcaController();
+	void UpdateContextState(RPacketContext::TContextStatus aState,
+		TInt aError);
+	void UpdateContextConfig(
+		RPacketContext::TContextConfigGPRS aConfig);
+
+public: // Pure virtuals inherited from CNifIfBase
+	virtual void Info(TNifIfInfo&) const;
+	virtual TInt Send(RMBufChain& aPdu, TAny* aSource=0);
+	virtual TInt Notification(TAgentToNifEventType aEvent, void * aInfo); 
+
+public: // Virtuals inherited from CNifIfBase
+	virtual void BindL(TAny *aId);
+	virtual TInt Control(TUint aLevel, TUint aName, TDes8& aOption, 
+		TAny* aSource);
+	virtual TInt State();
+
+public: // Pure virtuals inherited from CNifIfLink 
+	virtual TInt Start();
+	virtual void Stop(TInt aReason,MNifIfNotify::TAction aAction);
+    virtual CNifIfBase* GetBinderL(const TDesC& aName);
+	virtual void Restart(CNifIfBase* aIf);
+
+public: // Virtuals inherited from CNifIfLink
+	virtual void AuthenticateComplete(TInt aResult);
+ 
+public: // Pure virtuals inherited from MRawIPNifObserverBase
+	virtual void InitialiseL(TInitialisationState aState, TInt aError);
+	virtual void ShutDown(TInitialisationState aState, TInt aError);
+	virtual MNifIfNotify* GetAgent();
+	
+	virtual CProtocolIfBase* GetProtocolIf();
+
+public: // Pure virtuals inherited from MControllerObserver
+	// Data going upstack
+	virtual void Process(RMBufChain& aPdu, TUint16 aProtocolCode);
+	// Flow Control unblocked
+	virtual void ResumeSending();
+
+public:  // Inherited from MNifIfNotify
+	// Notify that link is Up/Down
+	virtual void LinkLayerUp();
+	virtual void LinkLayerDown(TInt aError);
+
+public:	// Send data to CBcaIoController
+	TInt SendPacket(RMBufChain& aPdu, TAny* /*aSource=0*/, 
+		TUint16 /*aType=KIp4FrameType*/);	
+
+public:	// Context status retrieval.
+	inline RPacketContext::TContextStatus GetContextStatus();
+	
+private:// Unowned
+	/** networking packet logger for debugging packets */
+	__PACKETLOG_DECLARATION_MEMBER;
+	CBttLogger* iTheLogger;
+
+	// Upstack bound protocol reference
+	CProtocolBase* iProtocol;
+
+	// The protocol to use (IPv4).Note: This is not owned by this class.
+	CProtocolIfBase* iProtocolIf;
+
+private:// Owned 
+	TInt iInitError; 
+	TIfStatus iState; // One of EIfPending, EIfUp, EIfBusy or EIfDown.
+
+	RPacketContext::TContextStatus iContextStatus;
+	RPacketContext::TContextConfigGPRS iContextConfig;
+
+	CBcaIoController* iBcaController;
+	};
+
+inline RPacketContext::TContextStatus CRawIPNifMain::GetContextStatus()
+/**
+ * Returns Context status
+ *
+ * @return iContextStatus The context status
+ */
+	{
+	return iContextStatus;
+	}
+
+#endif // RAWIPNIFMAIN_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/inc/RawIPNifMainFactory.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,42 @@
+// Copyright (c) 2002-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:
+// Defines the factory class which is used to instantiate the RAW IP NIF.
+// 
+//
+
+/**
+ @file
+*/
+
+#ifndef RAWIPNIFMAINFACTORY_H__
+#define RAWIPNIFMAINFACTORY_H__
+
+#include <comms-infras/nifif.h>
+#include "bttlog.h"
+
+class CRawIPNifMainFactory : public CNifIfFactory
+	{
+public:
+	virtual CNifIfBase* NewInterfaceL(const TDesC& aName);
+	virtual CNifIfBase* NewInterfaceL(const TDesC& aName,MNifIfNotify* aNotify);
+
+protected:
+	virtual void InstallL();
+	virtual TInt Info(TNifIfInfo& aInfo, TInt aIndex) const;
+
+private:
+	CBttLogger* iTheLogger;
+	};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/inc/Receiver.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,52 @@
+// Copyright (c) 2002-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:
+// Defines the active object that controls the BCA Read() requests. 
+// 
+//
+
+/**
+ @file
+*/
+
+#ifndef RECEIVER_H
+#define RECEIVER_H
+
+#include "BcaIoController.h"
+#include "bttlog.h"
+#include "Constants.h"
+
+class CBttLogger;
+
+class CReceiver : public CActive
+	{
+public:
+	CReceiver(CBcaIoController& aObserver, CBttLogger* aTheLogger);
+	~CReceiver();
+
+public: // Inherited from CActive.
+	virtual void RunL();
+	virtual void DoCancel();
+
+public:
+	void StartListening();
+
+private: // Unowned data.
+	CBcaIoController& iObserver;
+	CBttLogger* iTheLogger;
+	
+private:
+	TBuf8<KMaxIPPacketAndHeader> iData;
+	};
+
+#endif // RECEIVER_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/inc/Sender.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,61 @@
+// Copyright (c) 2002-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:
+// Defines the active object that controls the BCA Write() requests. 
+// 
+//
+
+/**
+ @file
+*/
+
+#ifndef SENDER_H
+#define SENDER_H
+
+#include "BcaIoController.h"
+#include "bttlog.h"
+#include "Constants.h"
+
+class CBttLogger;
+
+class CSender : public CActive
+	{
+public:
+	CSender(CBcaIoController& aObserver, CBttLogger* aTheLogger);
+	~CSender();
+
+public: // Inherited from CActive.
+	virtual void RunL();
+	virtual void DoCancel();
+
+public:
+	void Send(RMBufChain& aPdu);
+	void SendBuffer(const TDesC8& aBuffer);
+	inline TInt SendBufferLength();
+
+private: // Unowned data.
+	CBcaIoController& iObserver;
+	CBttLogger* iTheLogger;	
+	
+private:
+	//CLASSNAMEDECL(CSender);
+
+	TBuf8<KMaxIPPacketAndHeader> iSendBuffer;
+	};
+
+TInt CSender::SendBufferLength()
+	{
+	return iSendBuffer.MaxLength();
+	}
+
+#endif // SENDER_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/inc/bttlog.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,135 @@
+// Copyright (c) 2002-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:
+// Defines logger for RawIP NIF.
+// 
+//
+
+/**
+ @file
+*/
+
+#ifndef BTTLOG_H__
+#define BTTLOG_H__
+
+#include <comms-infras/commsdebugutility.h>
+
+#if defined(__FLOG_ACTIVE) || defined(__DEBUGRAWIPSERIALPORT__)
+// Uncomment any of these macros if you want logging.
+// -> BTT_LOG_1 : For general logging
+// -> BTT_LOG_2 : For error and warning logging
+// -> BTT_LOG_3 : For IP packet information
+#define	__BTT_LOG_1__ 1
+//#define __BTT_LOG_2__ 1
+//#define __BTT_LOG_3__ 1
+#endif
+
+#ifdef __BTT_LOG_1__
+#define _LOG_L1C1(AAA)						iTheLogger->Write(AAA)
+#define _LOG_L1C2(AAA, BBB)					iTheLogger->WriteFormat(AAA, BBB)
+#define _LOG_L1C3(AAA, BBB, CCC)			iTheLogger->WriteFormat(AAA, BBB, CCC)
+#define _LOG_L1C4(AAA, BBB, CCC, DDD)		iTheLogger->WriteFormat(AAA, BBB, CCC, DDD)
+#define _LOG_L1C5(AAA, BBB, CCC, DDD, EEE)	iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE)
+#else
+#define _LOG_L1C1(AAA)
+#define _LOG_L1C2(AAA, BBB)
+#define _LOG_L1C3(AAA, BBB, CCC)
+#define _LOG_L1C4(AAA, BBB, CCC, DDD)
+#define _LOG_L1C5(AAA, BBB, CCC, DDD, EEE)  
+#endif // __BTT_LOG_1__
+
+#ifdef __BTT_LOG_2__
+#define _LOG_L2C1(AAA)						iTheLogger->Write(AAA)
+#define _LOG_L2C2(AAA, BBB)					iTheLogger->WriteFormat(AAA, BBB)
+#define _LOG_L2C3(AAA, BBB, CCC)			iTheLogger->WriteFormat(AAA, BBB, CCC)
+#define _LOG_L2C4(AAA, BBB, CCC, DDD)		iTheLogger->WriteFormat(AAA, BBB, CCC, DDD)
+#define _LOG_L2C5(AAA, BBB, CCC, DDD, EEE)	iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE)
+#else
+#define _LOG_L2C1(AAA)
+#define _LOG_L2C2(AAA, BBB)
+#define _LOG_L2C3(AAA, BBB, CCC)
+#define _LOG_L2C4(AAA, BBB, CCC, DDD)
+#define _LOG_L2C5(AAA, BBB, CCC, DDD, EEE)  
+#endif // __BTT_LOG_2__
+
+#ifdef __BTT_LOG_3__
+#define _LOG_L3C1(AAA)						iTheLogger->Write(AAA)
+#define _LOG_L3C2(AAA, BBB)					iTheLogger->WriteFormat(AAA, BBB)
+#define _LOG_L3C3(AAA, BBB, CCC)			iTheLogger->WriteFormat(AAA, BBB, CCC)
+#define _LOG_L3C4(AAA, BBB, CCC, DDD)		iTheLogger->WriteFormat(AAA, BBB, CCC, DDD)
+#define _LOG_L3C5(AAA, BBB, CCC, DDD, EEE)	iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE)
+#else
+#define _LOG_L3C1(AAA)
+#define _LOG_L3C2(AAA, BBB)
+#define _LOG_L3C3(AAA, BBB, CCC)
+#define _LOG_L3C4(AAA, BBB, CCC, DDD)
+#define _LOG_L3C5(AAA, BBB, CCC, DDD, EEE)  
+#endif // __BTT_LOG_3__
+
+#ifdef __BTT_LOG_1__
+#ifndef __BTT_LOGGING__
+#define __BTT_LOGGING__
+#endif
+#endif
+
+#ifdef __BTT_LOG_2__
+#ifndef __BTT_LOGGING__
+#define __BTT_LOGGING__
+#endif
+#endif
+
+#ifdef __BTT_LOG_3__
+#ifndef __BTT_LOGGING__
+#define __BTT_LOGGING__
+#endif
+#endif
+
+#ifdef __BTT_LOGGING__
+#define _BTT_LEAVEIFERROR(a)	iTheLogger->VerboseLeaveL(__FILE__, __LINE__, a)
+#define _BTT_PANIC(CAT,	CODE)	iTheLogger->VerbosePanic(__FILE__, __LINE__, CODE, (TText8*)#CODE, CAT)
+#else
+#define _BTT_LEAVEIFERROR(a)	User::LeaveIfError(a)
+#define _BTT_PANIC(CAT, CODE)	User::Panic(CAT, CODE)
+#endif // __BTT_LOGGING__
+
+/**
+ * static class containing methods for logging
+ * text to a logfile.
+ */
+class CBttLogger : public CBase
+	{
+public:
+	static CBttLogger* NewL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId);
+	~CBttLogger();
+
+public:
+	void Write(const TDesC8& aText);
+	void WriteFormat(TRefByValue<const TDesC8> aFmt, ...);
+	void VerboseLeaveL(char* aFile, TInt aLine, TInt aReason);
+	void VerbosePanic(char* aFile, 
+		TInt aLine, 
+		TInt aPanicCode, 
+		TText8* aPanicName,
+		const TDesC& aPanicCategory);
+
+protected:
+	CBttLogger();
+	void ConstructL(const TDesC8& aSubDir, const TDesC8& aFileName, const TUint32 aInstanceId);
+
+private: // owned
+
+	TUint32 iInstanceId;
+	__FLOG_DECLARATION_MEMBER;
+	};
+
+#endif // BTTLOG_H__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/src/BcaController.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,437 @@
+// Copyright (c) 2004-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:
+// Implements the interface to Bca & flow control.
+// 
+//
+
+/**
+ @file
+*/
+
+#include <e32uid.h>
+#include <nifmbuf.h>
+#include <es_ini.h>
+#include "BcaController.h"
+
+_LIT(KRawIpIniFile, "rawip.ini");
+_LIT(KLinkLit, "link");
+_LIT(KHighmarkLit, "highmark");
+//In order not to flow off SPUD everytime we set the default to 1
+const TUint KDefaultBufferSize=1;
+
+CBcaController::CBcaController(MControllerObserver& aObserver,
+	CBttLogger* aTheLogger)
+/**
+ * Constructor. 
+ */
+	: iObserver(aObserver),  
+	  iTheLogger(aTheLogger),
+	  iTxFlowControl(EFlowControlOff), 
+	  iTxContextActive(ETrue), 
+	  iSendState(EIdle),
+	  iMaxSendQueueLen(0),
+	  iNumPacketsInSendQueue(0)
+	{
+	iSendQueue.Init();
+	}
+
+
+CBcaController::~CBcaController()
+/**
+ * Destructor.
+ */
+	{
+	iSendQueue.Free();
+	iNumPacketsInSendQueue = 0;
+
+#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
+	delete iIPTagHeader;
+#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
+	}
+
+void CBcaController::BaseConstructL()
+	{
+	_LOG_L1C1(_L8("CBcaController::BaseConstructL"));
+
+#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
+	iIPTagHeader = new (ELeave) CIPTagHeader(iTheLogger);
+#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
+	CESockIniData* iniData = NULL;
+	TRAPD(res, iniData = CESockIniData::NewL(KRawIpIniFile));
+	CleanupStack::PushL(iniData);
+	
+	if(res!=KErrNone)
+		{
+		_LOG_L1C2(_L8("RawIp ini file %S not found. Default values will be used."), &KRawIpIniFile);
+		CleanupStack::PopAndDestroy();
+		return;
+		}
+	
+	//here process the file
+	if(!iniData->FindVar(KLinkLit(), KHighmarkLit(), iMaxSendQueueLen))
+		{
+		iMaxSendQueueLen = KDefaultBufferSize;
+		}
+	
+	CleanupStack::PopAndDestroy();
+	}
+
+void CBcaController::UpdateInternalFlowFlag(TFlowControl aValue)
+/**
+ *  Updates Internal Flow flag and resumes the data flow if
+ *  necessary.
+ *
+ * @param aValue the new state of iInternalFlow
+ */
+	{
+	_LOG_L1C3(_L8("CBcaController::UpdateInternalFlowFlag[NewValue=%d, iSendState=%d]"),
+		aValue, iSendState);
+
+	if(iTxFlowControl == aValue)
+		{
+		// C32 Sent the same indication signal twice. Nif will ignore it.
+		_LOG_L2C1(_L8("WARNING CBcaController: Received same indication twice"));
+		return;
+		}
+	
+	// Update the flag value.
+	iTxFlowControl = aValue;
+
+	if(iTxFlowControl == EFlowControlOff)
+		{
+		// If the indication received turned flow control off...
+		if (IsTxPossible() && (iSendState == EIdle))
+			{
+			// ... if the NIF is in the EWaiting state
+			// then the data flow can be resumed. 
+			ResumeSending();
+			}
+		}		
+	else
+		{
+		// if the Flow Control is on we can remove all queued write requests
+		EmptySendQueue();
+		}
+	}
+
+void CBcaController::UpdateContextStateFlag(TBool aValue)
+/**
+ *  Updates Context State flag and resumes the data flow if
+ *  necessary.
+ *
+ * @param aValue the new state of iTxContextState
+ */
+	{
+	_LOG_L1C3(_L8("CBcaController::UpdateContextStateFlag[NewValue=%d, OldValue=%d]"),
+		aValue, iTxContextActive);
+	
+	if(iTxContextActive == aValue)
+		{
+		return;
+		}
+
+	// Update the flag value.
+	iTxContextActive = aValue;
+
+	if(iTxContextActive)
+		{
+		// If the PDP context is active and...
+		if (IsTxPossible() && (iSendState == EIdle))
+			{
+			// ... if the NIF is in the EWaiting state
+			// then the data flow can be resumed. 
+			ResumeSending();
+			}
+		}
+	else
+		{
+		// if the PDP context is suspended we can remove all queued write requests
+		EmptySendQueue();
+		}
+	}
+
+TInt CBcaController::Send(RMBufChain& aPdu)
+/**
+ *  This method is called by CRawIPNifMain in order to send a packet down
+ * to the BCA. 
+ *
+ *	@param aPdu a data packet
+ */
+	{
+	_LOG_L1C1(_L8(">>CBcaController::Send"));
+
+	// Check if NIF is shutting down
+	if (iSendState == EShuttingDown)
+		{
+		_LOG_L2C1(_L8("    ERROR: Nif is shutting down"));
+		
+		aPdu.Free();
+
+		return KErrDisconnected;
+		}
+	
+	// check that this packet isnt too big - If it is, we dont want to send it or
+	// add it to our queue
+	if ((aPdu.Length() - aPdu.First()->Length()) > BcaSendBufferLength())
+		{
+		_LOG_L2C1(_L8("Packet is too large - discarding"));
+		_LOG_L1C1(_L8("<<CSender::Send -> Error"));
+
+		aPdu.Free();
+		return KErrArgument;
+		}
+	
+	if (iSendState == ESending)
+		// If this happens, it means that TCP/IP has sent us an IP packet
+		// while we're still sending the previous one. 
+		{
+		// check that the queue isnt full NB. this check should not be needed as when the 
+		// queue becomes full the IP layer shouldnt send any more packets until it is told to
+		if (!IsSendQueueFull())
+			{
+			_LOG_L1C1(_L8("    Sender busy, appending packet to queue"));
+			//We know that flow control is off and context isnt suspended so can add to queue
+			AppendToSendQueue(aPdu);
+			
+			return IsSendQueueFull() ? KStopSending : KContinueSending;
+			}
+			
+		_LOG_L1C1(_L8("    Queue is full, upper layer is still sending packets, potential memory problems."));
+		AppendToSendQueue(aPdu);
+		return KStopSending;
+		}
+
+	// If we have got here then a write isnt currently happening
+	// We dont need to check flow control is off and context isnt suspended as the BCA always
+	// has room for one packet, so send the packet
+
+	if(!IsSendQueueEmpty())
+		{
+		//make sure that we don't change the order of packets!
+		//first send what has already been lined up
+		RMBufChain tmpPdu;
+		_LOG_L1C1(_L8("    Packet removed from queue to send"));
+		RemoveFromSendQueue(tmpPdu);
+		AppendToSendQueue(aPdu);
+		
+		// Update module state
+		_LOG_L2C1(_L8("     set State to ESending"));
+		iSendState = ESending;
+		
+		BcaSend(tmpPdu);
+		}
+	else
+		{
+		// Update module state
+		_LOG_L2C1(_L8("     set State to ESending"));
+		iSendState = ESending;
+		 
+		BcaSend(aPdu);
+		}
+		
+	_LOG_L2C1(_L8("<<CBcaController::Send - return StopSending/ContinueSending"));
+	return IsSendQueueFull() ? KStopSending : KContinueSending;
+	}
+
+void CBcaController::SendComplete()	
+/**
+ *  This method is called after a packet was sent to the board. 
+ *  If allowed by flow contol flags the NIF can signal the TCP/IP
+ *  protocol indicating that is available to send more packets.
+ */
+	{
+	_LOG_L1C1(_L8("CBcaController::SendComplete"));
+	_LOG_L2C1(_L8("     set State to EIdle"));
+	
+	iSendState = EIdle;
+
+	if (IsTxPossible())
+		ResumeSending();
+	}
+
+TBool CBcaController::IsTxPossible()
+/**
+ *  This method returns ETrue if both TX flags are set to ETrue
+ *
+ * @return The Flow control state
+ */
+	{
+	_LOG_L1C3(_L8("CBcaController::IsTxPossible (contextActive %d, flowcontrol %d)"), 
+		iTxContextActive, iTxFlowControl);
+
+	if(iTxContextActive && (iTxFlowControl == EFlowControlOff))
+		return ETrue;
+	else
+		return EFalse;
+	}
+
+void CBcaController::Process(TDesC8& aPdu)
+/**
+ *  This method will pass on the received data to CBttNifMain. 
+ *
+ * @param aPdu a data packet
+ */
+	{
+	_LOG_L1C1(_L8(">>CBcaController::Process"));
+
+	TInt ret;
+
+	// Create a packet object.
+	RMBufPacket packet;
+	TRAP(ret, packet.CreateL(aPdu));
+	if (ret != KErrNone)
+		{
+		// Couldn't create package. Packet will be ignored...
+		_LOG_L1C2(_L8("<<CBcaController::Process couldn't create MBuf [ret=%d]"), ret);
+		return;
+		}
+	else
+		// Package created...
+		{
+#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
+		TUint16 protocolCode = iIPTagHeader->RemoveHeader(packet);
+#else
+		TUint16 protocolCode = 0;
+#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
+
+		packet.Pack();
+		// Process the packet
+		GetObserver().Process(packet, protocolCode);
+		}
+
+	_LOG_L1C1(_L8("<<CBcaController::Process"));
+	}
+
+void CBcaController::ResumeSending()
+/**
+ *  Used to indicate to the TCP/IP protocol layer that the NIF is ready to 
+ *	process more packets.
+ */
+	{
+	_LOG_L1C1(_L8("CBcaIoController::ResumeSending"));
+
+	// If there are still some packets in the queue to be sent, then carry
+	// on sending them.
+	// NB. we only want to send more packets from the queue if we are currently EIdle
+	if (iSendState == EIdle) 
+		{
+		if(!IsSendQueueEmpty())
+			{
+			RMBufChain tmpPdu;
+			_LOG_L1C1(_L8("    Packet removed from queue to send"));
+			RemoveFromSendQueue(tmpPdu);
+			
+			// Update module state
+			_LOG_L2C1(_L8("     set State to ESending"));
+			iSendState = ESending;
+			
+			BcaSend(tmpPdu);
+			}
+		if(IsSendQueueEmpty())
+			{
+			iObserver.ResumeSending();
+			}
+		}
+	// if iSendState = ESending - do nothing
+	}
+	
+#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
+void CBcaController::SetType(TUint16 aType)
+{
+/**
+ *  Used to specify the type of the IP header.
+ */
+	_LOG_L1C1(_L8("CBcaController::SetType"));
+	
+	iIPTagHeader->SetType(aType);	
+}
+
+void CBcaController::AddHeader(TDes8& aDes)
+/**
+ *  Used to add the IP header to the packet before sending to the BCA.
+ */
+	{
+	_LOG_L1C1(_L8("CBcaController::AddHeader"));
+
+	iIPTagHeader->AddHeader(aDes);
+	}
+
+TUint16 CBcaController::RemoveHeader(RMBufChain& aPdu)
+/**
+ *  Used to remove the IP header from the received the packet before sending to the 
+ *  TCP/IP layer.  
+ * @return The IP header that has been removed from the packet
+ */
+	{
+	_LOG_L1C1(_L8("CBcaController::RemoveHeader"));
+
+	return (iIPTagHeader->RemoveHeader(aPdu));
+	}	
+#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
+
+TBool CBcaController::IsSendQueueEmpty()
+/**
+ *  Indicator of whether the BufferQueue is empty
+ * @return TBool.  ETrue if bufferQueue is emtpy, EFalse if queue is not empty
+ */
+	{
+	return iSendQueue.IsEmpty();
+	}
+	
+TBool CBcaController::IsSendQueueFull()
+/**
+ *  Indicator of whether the BufferQueue is full
+ * @return TBool.  ETrue if bufferQueue is full, EFalse if queue is not full
+ */
+	{
+	return iNumPacketsInSendQueue >= iMaxSendQueueLen;
+	}	
+
+void CBcaController::AppendToSendQueue(RMBufChain& aPdu)
+/**
+ * Appends the packet aPdu to the queue. 
+ * Increments the packet count. Doesn't do error checking.
+ * @param aChain buffer chain to be added
+ */
+	{
+	iSendQueue.Append(aPdu);
+	iNumPacketsInSendQueue++;
+	}
+	
+TBool CBcaController::RemoveFromSendQueue(RMBufChain& aPdu)
+/**
+ * Removes the packet aPdu from the queue. 
+ * Decrements the packet count.
+ * @param aChain buffer chain to be added
+ * @return False if chain is empty
+ */
+	{
+	TBool ret = iSendQueue.Remove(aPdu);
+	if(ret)
+		{
+		iNumPacketsInSendQueue--;
+		}
+	return ret;
+	}
+	
+void CBcaController::EmptySendQueue()
+/**
+ * Removes all the packets from the send queue. Initializes the
+ * send queue and sets the packet count to 0.
+ */
+	{
+	iSendQueue.Free();
+	iSendQueue.Init();
+	iNumPacketsInSendQueue = 0;
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/src/BcaIoController.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,474 @@
+// Copyright (c) 2004-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:
+// Implements the interface to BCA.
+// 
+//
+
+/**
+ @file BcaIoController.cpp
+*/
+
+#include <e32uid.h>
+#include <nifmbuf.h>
+
+#include "Constants.h"
+#include "BcaIoController.h"
+#include "Sender.h"
+#include "Receiver.h"
+
+CBcaIoController::CBcaIoController(MControllerObserver& aObserver,
+	CBttLogger* aTheLogger)
+/**
+ * Constructor. 
+ *
+ * @param aObserver Reference to the observer of this state machine
+ * @param aTheLogger The logging object
+ */
+	: 
+	  CBcaController(aObserver, aTheLogger),
+	  iMBca(NULL),
+	  iSender(NULL),
+	  iReceiver(NULL),
+	  iLoader(NULL)
+	{
+	}
+
+CBcaIoController* CBcaIoController::NewL(MControllerObserver& aObserver, CBttLogger* aTheLogger)
+/**
+ * Two-phase constructor. Creates a new CBcaIoController object, performs 
+ * second-phase construction, then returns it.
+ *
+ * @param aObserver The observer, to which events will be reported
+ * @param aTheLogger The logging object
+ * @return A newly constructed CBcaIoController object
+ */
+	{
+	CBcaIoController* self = new (ELeave) CBcaIoController(aObserver, aTheLogger);
+	CleanupStack::PushL(self);
+	self->ConstructL();
+	CleanupStack::Pop(self);
+	return self;
+	}
+
+void CBcaIoController::ConstructL()
+/**
+ * Second-phase constructor. Creates all the state objects it owns.
+ */
+	{
+	_LOG_L1C1(_L8("CBcaIoController::ConstructL"));
+	BaseConstructL();
+	iSender = new (ELeave) CSender(*this, iTheLogger);
+	iReceiver = new (ELeave) CReceiver(*this, iTheLogger);
+	iLoader = new (ELeave) CBcaControl(*this, iTheLogger);
+	}
+
+
+CBcaIoController::~CBcaIoController()
+/**
+ * Destructor.
+ */
+	{
+	delete iReceiver;
+	delete iSender;
+	delete iLoader;
+
+	}
+
+/** sets the BCA Stack name
+
+* @param aBcaStack Text composed of bca stack and next bca names
+*/	
+void CBcaIoController::SetBcaStackAndName(TDesC& aBcaStack)
+	{
+	const TChar stackDelimiter(',');
+	
+	TInt length = aBcaStack.Length();
+	TInt delimiterLoc = aBcaStack.Locate(stackDelimiter);
+	
+	if(delimiterLoc > 0)
+		{
+		iBcaName.Copy(aBcaStack.Left(delimiterLoc));
+		
+		if(delimiterLoc < length)
+			{
+			iBcaStack.Copy(aBcaStack.Right(length-delimiterLoc-1));
+			}
+		}
+	else
+		{
+		iBcaName.Copy(aBcaStack);
+		}
+	}
+	
+
+void CBcaIoController::StartL()
+/**
+ *  Used to kick off the initialisation for this module
+ */
+	{
+	_LOG_L1C1(_L8("CBcaIoController::StartL is called."));
+
+	InitialiseBcaL();
+	}
+
+void CBcaIoController::Stop(TInt aError)
+/**
+ *  Used to shutdown this module. This will cancel all the outstanding 
+ *  requests on the active objects owned by this module and shutdown.
+ * @param aError the passed in error code as to why Stop has been called
+ */
+	{
+	_LOG_L1C1(_L8("CBcaIoController::Stop is called."));
+
+	//Stop all the active objects
+	iReceiver->Cancel();
+
+	if(GetSendState() == ESending)
+		{
+		iSender->Cancel();
+		}
+
+	// Update module state
+	SendState(EShuttingDown);
+	
+	//It does nothing here.
+	iLoader->Cancel();
+	MBca* bca = iLoader->Bca();
+	if(bca)
+		{
+		if(aError == KErrConnectionTerminated )
+			{
+			_LOG_L1C1(_L8("This is an emergency shutdown, it kills the NIF immediately."));
+			// It is a emergency shutdown, it kills the NIF immediately.
+			bca->Close();
+			GetObserver().ShutDown(MControllerObserver::EBcaController, aError);
+			}
+	    
+		else
+			{
+			_LOG_L1C1(_L8("This is a graceful termination which takes a while."));
+			//It is a graceful termination which takes a while.
+			iLoader->ShutdownBca(aError); 	
+			}	
+		}
+	else //nothing to shutdown, just notify linklayer down.
+		{
+		_LOG_L1C1(_L8("Bca is not initialized, bring the linklayer down"));
+		GetObserver().ShutDown(MControllerObserver::EBcaController, aError);
+		}
+
+  	}
+
+void CBcaIoController::InitialiseBcaL()
+/**
+ *  Load & Initialise Bca.
+ */
+	{
+	_LOG_L1C1(_L8("<<CBcaIoController::InitialiseBcaL"));
+    iLoader->StartLoadL();
+	}
+
+void CBcaIoController::BcaProcess(TDesC8& aPdu)
+/**
+ *  This method will pass on the received data to CRawIPNifMain. 
+ *
+ * @param aPdu a data packet
+ */
+	{
+	_LOG_L1C1(_L8(">>CBcaIoController::Process"));
+
+	Process(aPdu);
+
+	_LOG_L1C1(_L8("<<CBcaIoController::Process"));
+	}
+
+void CBcaIoController::BcaSend(RMBufChain& aPdu)
+/**
+ *  This method is called by CRawIPNifMain in order to send a packet down
+ * to the BCA. The CSender active object will be activated by calling the send
+ * method.
+ *
+ *	@param aPdu a data packet
+ */
+	{
+	_LOG_L1C1(_L8("CBcaIoController::BcaSend"));
+
+	iSender->Send(aPdu);
+	}
+
+TInt CBcaIoController::BcaSendBufferLength()
+	{
+	return iSender->SendBufferLength();
+	}
+
+void CBcaIoController::BcaSendComplete()	
+/**
+ *  This method is called after a packet was sent to the board. 
+ *  If allowed by flow contol flags the NIF can signal the TCP/IP
+ *  protocol indicating that is available to send more packets.
+ */
+	{
+	_LOG_L1C1(_L8("CBcaController::SendComplete"));
+
+	SendComplete();
+	}
+
+	
+CBcaControl::CBcaControl(CBcaIoController& aObserver, CBttLogger* aTheLogger)
+/**
+ * Constructor. Performs standard active object initialisation.
+ *
+ * @param aObserver Reference to the observer of this state machine
+ * @param aTheLogger The logging object
+ */
+	: CActive(EPriorityNormal), 
+	  iObserver(aObserver), 
+	  iTheLogger(aTheLogger),
+	  iMBca(NULL),
+	  iState(EIdling),
+	  iError(KErrNone)
+	  
+	{
+	CActiveScheduler::Add(this);
+	}
+	
+CBcaControl::~CBcaControl()
+/**
+ * Destructor.
+ */
+	{
+	Cancel();
+	if(iMBca)
+		{
+		iMBca->Release();	
+		}
+		
+	// Library will be Closed when iBcaDll is destroyed.
+	}
+
+void CBcaControl::RunL()
+/**
+ *  Called after request is completed. 
+ *  
+ */
+	{
+	_LOG_L1C1(_L8("CBcaControl::RunL() called"));
+	switch (iState)
+		{
+		//in this state, Ioctl is called to set IAP ID, check the result of
+		// Ioctl, then either set the BCA stack with another Ioctl call, 
+		// open the BCA (if there's no BCA stack to set), or stop the NIF.
+		case EIdling:
+			{
+			if(iStatus == KErrNone || iStatus == KErrNotSupported)
+				{
+				if(iStatus == KErrNotSupported)
+					{
+					_LOG_L1C1(_L8("This BCA does not support IAPID set"));
+					}
+				else
+					{
+					_LOG_L2C1(_L8("This BCA supports IAPID set"));
+					}
+				
+				TPtrC bcaStack = iObserver.BcaStack();
+				if(bcaStack.Length())
+					{
+					TBuf8<KMaxName> remainingBcaStack8;
+					remainingBcaStack8.Copy(bcaStack);
+					iMBca->Ioctl(iStatus, KBcaOptLevelGeneric,KBCASetBcaStack,remainingBcaStack8);
+					}
+				else
+					{
+					TRequestStatus* statusPtr=&iStatus;
+					User::RequestComplete(statusPtr,KErrNone);
+					}
+				iState = EIAPSet;
+				SetActive();	
+				}
+			else
+				{
+				_LOG_L1C2(_L8("ERROR in BCA IAPID set = %d"), iStatus.Int());
+				iObserver.Stop(iStatus.Int());
+				}
+			
+			break;
+			}
+			
+		//in this case, we receive the result of Ioctl call to set Bca Stack.
+		// Check the result of Ioctl, then Open the Bca or stop the NIF
+		case EIAPSet:
+			{
+			if(iStatus == KErrNotSupported || iStatus == KErrNone)
+				{
+				if(iStatus == KErrNotSupported)
+					{
+					_LOG_L1C1(_L8("This BCA does not support BCA stacking"));
+					}
+				else
+					{
+					_LOG_L2C1(_L8("This BCA supports BCA stacking"));
+					}
+				iMBca->Open(iStatus, iObserver.Port());
+				iState = EBcaStackSet;
+				SetActive();	
+				}
+			else
+				{
+				_LOG_L2C2(_L8("ERROR in BCA stack set = %d"), iStatus.Int());
+				iObserver.Stop(iStatus.Int());
+				}
+			break;
+			}
+		
+		//in this state, BCA Open is called. Checks the result of Open.
+		// If it is successful,then start the NIF. Otherwise stops the NIF.
+		case EBcaStackSet:
+			{
+			if(iStatus != KErrNone && iStatus !=  KErrAlreadyExists)
+				{
+				_LOG_L2C2(_L8("ERROR in BCA Open = %d"), iStatus.Int());
+				iObserver.Stop(iStatus.Int());
+				}
+			else
+				{
+				iObserver.Receiver().StartListening();
+				_LOG_L1C1(_L8("CBcaIoController Is Initialised"));
+				TRAPD(err, iObserver.GetObserver().InitialiseL(MRawIPNifObserverBase::EBcaController,KErrNone));
+				if(err != KErrNone)
+					{
+					_LOG_L2C2(_L8("ERROR in BCA Open Initialise observer = %d"), err);
+					iObserver.Stop(err);
+					}
+				}
+			break;
+			}
+
+		//in this state, BCA is Shutdown, shutdown the NIF.
+		case EClosing:
+			{
+			// linklayer shutdown
+			iObserver.GetObserver().ShutDown(MControllerObserver::EBcaController, iError);
+			break;
+			}
+		// Wrong state.
+		default:
+			{
+			_LOG_L1C1(_L8("ERROR CBcaControl::RunL(): Unknown state"));
+			_BTT_PANIC(KNifName, KBcaUnkownState);
+			break;
+			}
+		}
+
+	}
+	
+void CBcaControl::DoCancel()
+/**
+ *	cancel active request. 
+ */
+	{
+	_LOG_L1C1(_L8("CBcaControl::DoCancel called."));
+	_LOG_L2C2(_L8("iState value is %d"), iState);
+	switch (iState)
+		{
+		case EIdling:
+		case EIAPSet:
+			if(iMBca)
+				{
+				iMBca->CancelIoctl();
+				}
+			iState = EIdling;
+			break;
+		case EBcaStackSet:
+		case EClosing:
+		    if(iMBca)
+			    {
+			    iMBca->Close();
+			    }
+			iState = EIdling;
+			break;
+		default:
+			_LOG_L2C1(_L8("ERROR CBcaControl::DoCancel(): Unknown state"));
+			_BTT_PANIC(KNifName, KBcaUnkownState);
+			break;
+		}
+	}
+	
+void CBcaControl::StartLoadL()
+/**
+ *  This method loads the C32BCA library and uses Ioctl to set the Bca iIapId. 
+ */
+	{
+	_LOG_L1C1(_L8("CBcaControl::StartLoad"));
+	
+	// Loads Bca Dll and creates a Bca instance;
+	User::LeaveIfError(iBcaDll.iObj.Load(iObserver.BcaName()));
+	
+	TNewBcaFactoryL newBcaFactoryProcL = (TNewBcaFactoryL)iBcaDll.iObj.Lookup(1);
+	if (NULL == newBcaFactoryProcL)
+		{
+		_LOG_L1C2(_L8("Library entry point found error %d"), KErrBadLibraryEntryPoint);
+		User::Leave(KErrBadLibraryEntryPoint);	
+		}
+	
+	MBcaFactory* bcaFactory = (*newBcaFactoryProcL)();
+
+	if(!bcaFactory)
+		{
+		_LOG_L1C2(_L8("BcaFactory creation error %d"), KErrCompletion);
+		User::Leave(KErrCompletion);	
+		}
+	CleanupReleasePushL(*bcaFactory);
+	
+	iMBca = bcaFactory->NewBcaL();
+	CleanupStack::PopAndDestroy(bcaFactory);
+	
+	iObserver.SetBca(iMBca); //Pass BCA pointer.
+
+	TPckg<TUint32> aOpt(iObserver.IapId());
+	iMBca->Ioctl(iStatus,KBcaOptLevelGeneric,KBCASetIapId,aOpt);
+	
+	iState = EIdling;
+	SetActive();
+	}
+
+	
+void CBcaControl::ShutdownBca(TInt aError)
+/**
+ *  Bca Shutdown.
+ 
+ *  @param aError the error code to shutdown the NIF. 
+ */
+	{
+	__ASSERT_DEBUG(iMBca,Panic(KBcaNotExist));
+	Cancel();
+    iError = aError;
+    iState = EClosing;	
+	if(iMBca)
+		{
+		iMBca->Shutdown(iStatus);
+	    SetActive();	
+		}
+	}
+
+/** Panic function for RawIpNif 
+
+* @param aPanic panic code */
+void Panic(TRawIPNifPanic aPanic)
+	{
+	_LOG_L2C2(_L8("Panic code for RawIpNif = %d"), aPanic);
+	User::Panic(KNifName,aPanic);
+
+	}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/src/DllMain.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,39 @@
+// Copyright (c) 2002-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:
+// Defines the global functions which provide DLL entry points.
+// 
+//
+
+/**
+ @file
+*/
+
+#include "RawIPNifMainFactory.h"
+
+
+extern "C"
+    {
+    IMPORT_C CNifFactory* NewInterfaceFactoryL();	// Force export
+    }
+
+EXPORT_C CNifFactory* NewInterfaceFactoryL()
+/**
+ * Creates a new RAW IP NIF main factory. This must be the first exported function
+ * in the NIF's DLL.
+ *
+ * @return A newly created RAW IP NIF main factory
+ */
+	{
+	return new (ELeave) CRawIPNifMainFactory;
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/src/IPTagHeader.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,101 @@
+// Copyright (c) 2004-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:
+// Implements the adding and removal of tag headers.
+// 
+//
+
+/**
+ @file
+*/
+
+#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
+
+#include "IPTagHeader.h"
+#include "Constants.h"
+
+/**
+Default constructor. 
+*/
+CIPTagHeader::CIPTagHeader(CBttLogger* aTheLogger)
+	: iTheLogger(aTheLogger)
+	{
+	iHeaderByte.SetMax();
+	iHeaderByte.FillZ();
+	}
+
+/**
+Default destructor.
+*/
+CIPTagHeader::~CIPTagHeader()
+	{
+	}
+
+/**
+This method will set the type of the IP header.
+
+@param aType IP header type
+*/
+void CIPTagHeader::SetType(TUint16 aType)
+	{
+	_LOG_L1C1(_L8("CIPTagHeader::SetType"));
+	
+	iHeaderByte[0] = (TUint8)(aType>>8); 
+	iHeaderByte[1] = (TUint8)(aType&0xff);	
+	}
+
+/**
+This method will add a two-byte header to the send buffer detailing the
+protocol the aDes data packet is encoded with; in this case an IPv4
+header tag is appended.
+
+@param aDes the send buffer
+*/
+void CIPTagHeader::AddHeader(TDes8& aDes)
+	{
+	_LOG_L1C1(_L8("CIPTagHeader::AddHeader"));
+
+	// Add the protocol code as a header to the buffer
+	aDes.Insert(0,iHeaderByte);
+	}
+
+/**
+This method will remove the two-byte header from the received data,
+which specifies whether it is an IPv4/IPv6 packet.  This information
+will be stored in protocolCode and returned to the caller.
+
+@param aPdu The received data packet
+@return The protocol header tag stripped from aPdu
+*/
+TUint16 CIPTagHeader::RemoveHeader(RMBufChain& aPdu)
+	{
+	_LOG_L1C1(_L8("CIPTagHeader::RemoveHeader"));
+
+	if (aPdu.Length() > KIPTagHeaderLength)
+		{
+		//Strip off the first part of the header
+		aPdu.TrimStart(1);
+		//Read the remaining part of the header as this contains the protocol code
+		TUint8* payloadPtr = aPdu.First()->Ptr();
+		TUint16 protocolCode = static_cast<TUint16>(*payloadPtr);
+		//Strip off the remaining protocol code part of the header
+
+		aPdu.TrimStart(1);
+
+		return protocolCode;
+		}
+
+	return 0;
+	}
+
+#endif // RAWIP_HEADER_APPENDED_TO_PACKETS

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/src/IPv4ProtocolIf.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,776 @@
+// Copyright (c) 2002-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:
+// This file implements the CIPv4ProtocolIf class, which handles the transmission
+// of IPv4 data to and from the TCP/IP stack.
+// 
+//
+
+/**
+ @file
+*/
+
+#include <etelpckt.h>
+#include <in_iface.h>
+#include "RawIPNifMain.h"
+#include "IPv4ProtocolIf.h"
+#ifdef WCDMA_STUB
+#include <UMTSNifControlIf.h>
+#endif
+#define LOG_IP_ADDRESS(desc,addr) _LOG_L2C5(_L8("    " desc " = %d.%d.%d.%d from context"), \
+			addr >> 24, (addr >> 16) & 0xFF, (addr >> 8) & 0xFF, addr & 0xFF);
+
+CIPv4ProtocolIf::CIPv4ProtocolIf(CRawIPNifMain& aNifMain, CBttLogger* aTheLogger)
+/**
+ * Constructor
+ */ 
+	: CProtocolIfBase(aNifMain,aTheLogger),
+	  iTheLogger(aTheLogger), 
+	  iSpeedMetric(KDefaultSpeedMetric)
+	{
+	}
+
+CIPv4ProtocolIf::~CIPv4ProtocolIf()
+/**
+ *	Destructor
+ */
+	{
+	}
+
+void CIPv4ProtocolIf::BindL(TAny* aId)
+/**
+ *	Binds protocol to the Nif
+ *
+ *	@param aId A point the the protocol(TCP/IP)
+ */
+	{
+	_LOG_L1C2(_L8("CIPv4ProtocolIf::BindL [aId=%X]"), aId);
+
+	CProtocolIfBase::BindL(aId); // Call the superclass's method.
+	iNotify = iNifMain.Notify();
+	}
+
+TInt CIPv4ProtocolIf::Control(TUint aLevel, TUint aName, TDes8& aOption,
+							TAny* /*aSource*/)
+/**
+ * The main function called by the TCP/IP protocol to control the interface.
+ * Can perform a variety of general IP tasks (such as getting IP config)
+ * and "3G" specific tasks (such as deleting the context).
+ *
+ * @param aLevel The level of the interface to control - always KSOLInterface
+ * @param aName The command to perform
+ * @param aOption Data to be input/output as a result of the command
+ * @param aSource The source of the command (unused)
+ * @return Standard error codes
+ */
+	{
+	_LOG_L1C3(_L8("CIPv4ProtocolIf::Control [aLevel=%d, aName=%d]"),
+		aLevel, aName);
+
+	if (aLevel == KSOLInterface)
+		{
+		switch (aName)
+			{
+		// General IP configuration commands are below this point.
+
+		case KSoIfInfo:
+			// Gets information about the interface, such as name and MTU.
+			return WriteIfInfo(aOption);
+
+		case KSoIfConfig:
+			// Gets interface configuration, eg. IP address and DNS servers.
+			return WriteIfConfig(aOption);
+
+		case KSoIfGetConnectionInfo:
+			// Gets IAP and network information.
+			return WriteConnectionInfo(aOption);
+
+		case KSoIfHardwareAddr:
+			// unsupported because we don't have a h/w address
+		case KSoIfCompareAddr:
+			// this never actually appears to be called
+			break;
+
+		// 3G-specific configuration commands are below this point.
+#ifdef WCDMA_STUB
+		case KRegisterEventHandler:
+			// Raw IP NIF Events are not supported
+		case KContextSetEvents:
+			// Raw IP NIF Events are not supported
+			break;
+
+		case KContextCreate:
+			// We don't support creating new secondary contexts.
+			break;
+
+		case KContextDelete:
+			// Deletes the primary PDP context. This will shut down the Nif.
+			return DeleteContext(aOption);
+
+		case KContextActivate:
+			// If the IPv4 interface is up, then the context will already have
+			// been activated. So this command should fail with 
+			// KErrAlreadyExists
+			{
+			TUint8* ptr = CONST_CAST(TUint8*, aOption.Ptr()); 
+			TContextParameters* contextParams =
+				REINTERPRET_CAST(TContextParameters*, ptr);
+
+			if (contextParams->iContextInfo.iContextId != 
+				STATIC_CAST(TInt8, GetNifMain().GetBcaController()->Nsapi()))
+				{
+				contextParams->iReasonCode = KErrNotFound;
+				}
+			else
+				{
+				contextParams->iContextInfo.iStatus =
+					GetNifMain().GetContextStatus();
+				contextParams->iReasonCode = KErrAlreadyExists;
+				}
+			return KErrNone;
+			}
+
+		case KNifSetDefaultQoS:
+		case KContextQoSSet:
+			// Setting the QoS is meaningless over GPRS, so we just return that
+			// we don't support these operations.
+			break;
+
+		case KContextTFTModify:
+			// As we only have one primary context, we don't support anything
+			// to do with traffic flow templates, which are used by secondary
+			// contexts.
+			break;
+
+		case KContextModifyActive:
+			// This command is only valid aftermodifying TFT/QoS parameters. 
+			// As we don't support any of these operations,
+			// this command is never valid.
+			break;
+#endif
+		default:
+			break;
+			}
+		}
+	return KErrNotSupported;
+	}
+
+TInt CIPv4ProtocolIf::WriteIfConfig(TDes8& aIfConfig)
+/**
+ * Writes the configuration of the interface (eg. IP address, DNS servers)
+ * into the supplied descriptor.
+ *
+ * @param aIfConfig Will contain the interface configuration
+ * @return KErrNotSupported if an incorrect structure is passed, 
+ * otherwise KErrNone
+ */
+	{
+	_LOG_L1C1(_L8("CIPv4ProtocolIf::WriteIfConfig"));
+
+	if (aIfConfig.Length() != sizeof(TSoInetIfConfig))
+		{
+		return KErrArgument;
+		}
+
+	TUint8* ptr = CONST_CAST(TUint8*, aIfConfig.Ptr());
+	TSoInetIfConfig* config = REINTERPRET_CAST(TSoInetIfConfig*, ptr);
+
+	if (config->iFamily != KAfInet)
+		{
+		return KErrNotSupported;
+		}
+
+	TInetAddr::Cast(config->iConfig.iAddress).SetAddress(iSettings.iLocalAddr);
+	TInetAddr::Cast(config->iConfig.iNetMask).SetAddress(iSettings.iNetMask);
+	TInetAddr::Cast(config->iConfig.iBrdAddr).
+		SetAddress(iSettings.iBroadcastAddr);
+	TInetAddr::Cast(config->iConfig.iDefGate).SetAddress(iSettings.iDefGateway);
+	TInetAddr::Cast(config->iConfig.iNameSer1).
+		SetAddress(iSettings.iPrimaryDns);
+	TInetAddr::Cast(config->iConfig.iNameSer2).
+		SetAddress(iSettings.iSecondaryDns);
+
+	return KErrNone;
+	}
+
+TInt CIPv4ProtocolIf::WriteIfInfo(TDes8& aIfInfo)
+/**
+ * Writes information about the interface into the supplied descriptor.
+ *
+ * @param aIfInfo Will contain the interface information
+ * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone
+ */
+	{
+	_LOG_L1C1(_L8("CIPv4ProtocolIf::WriteIfInfo"));
+
+	if (aIfInfo.Length() != sizeof(TSoIfInfo))
+		{
+		return KErrArgument;
+		}
+
+	TSoIfInfo* info = (TSoIfInfo*) aIfInfo.Ptr();
+	info->iFeatures = KIfCanBroadcast | KIfCanMulticast;
+	info->iSpeedMetric = iSpeedMetric;
+	info->iMtu = KDefaultMtu;
+	WriteIfName(info->iName);
+
+	return KErrNone;
+	}
+
+TInt CIPv4ProtocolIf::WriteConnectionInfo(TDes8& aConnectionInfo)
+/**
+ * Writes information about the IAP and network we're associated with. This
+ * is used to route data in a multi-homing environment.
+ *
+ * @param aConnectionInfo Will contain the connection information
+ * @return Standard CommDB error codes
+ */
+	{
+	_LOG_L1C1(_L8("CIPv4ProtocolIf::WriteConnectionInfo"));
+
+	TSoIfConnectionInfo* connectionInfo =
+		(TSoIfConnectionInfo*) aConnectionInfo.Ptr();
+
+	TInt err;
+	// Append the 2 commdb filed into this descriptor
+	TBuf<2*KCommsDbSvrMaxColumnNameLength+1> fieldName;
+
+	fieldName.Copy(TPtrC(IAP));
+	fieldName.Append(KSlashChar);
+	fieldName.Append(TPtrC(COMMDB_ID));
+	err = GetNifMain().GetAgent()->ReadInt(fieldName, connectionInfo->iIAPId);
+	if (err != KErrNone)
+		{
+		return err;
+		}
+
+	fieldName.Copy(TPtrC(IAP));
+	fieldName.Append(KSlashChar);
+	fieldName.Append(TPtrC(IAP_NETWORK));
+	err = GetNifMain().GetAgent()->ReadInt(fieldName, connectionInfo->iNetworkId);
+	if (err != KErrNone)
+		{
+		return err;
+		}
+
+	return KErrNone;
+	}
+#ifdef WCDMA_STUB
+
+TInt CIPv4ProtocolIf::DeleteContext(TDes8& aContextParameters)
+/**
+ * Deletes a context. As the NIF is responsible for one primary context,
+ * this is equivalent to closing down the NIF.
+ *
+ * @param aContextParameters Parameters of the context to delete
+ * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone
+ */
+	{
+	_LOG_L1C1(_L8("CIPv4ProtocolIf::DeleteContext"));
+
+	if (aContextParameters.Length() != sizeof(TContextParameters))
+		{
+		return KErrArgument;
+		}
+
+	TUint8* ptr = CONST_CAST(TUint8*, aContextParameters.Ptr());
+	TContextParameters* params = REINTERPRET_CAST(TContextParameters*, ptr);
+
+	if (params->iContextInfo.iContextId != 
+		STATIC_CAST(TInt8, GetNifMain().GetBcaController()->Nsapi()))
+		{
+		params->iReasonCode = KErrBadName;
+		}
+	else
+		{
+		params->iReasonCode = KErrNone; 
+		GetNifMain().Stop(KErrNone, MNifIfNotify::EDisconnect);
+		}
+
+	return KErrNone;
+	}
+
+#endif
+
+void CIPv4ProtocolIf::ReadCommDbGprsSettingsL()
+/**
+ * Reads GPRS IP settings from CommDB via the agent.
+ */
+	{
+	_LOG_L1C1(_L8("CIPv4ProtocolIf::ReadCommDbGprsSettings"));
+
+	// Read the IP address settings from CommDB.
+	ReadIPv4SettingL(TPtrC(GPRS_IP_ADDR), iSettings.iLocalAddr);
+	ReadIPv4SettingL(TPtrC(GPRS_IP_NETMASK), iSettings.iNetMask);
+	ReadIPv4SettingL(TPtrC(GPRS_IP_NAME_SERVER1), iSettings.iPrimaryDns);
+	ReadIPv4SettingL(TPtrC(GPRS_IP_NAME_SERVER2), iSettings.iSecondaryDns);
+	ReadIPv4SettingL(TPtrC(GPRS_IP_GATEWAY), iSettings.iDefGateway);
+
+	// Read whether to get the gateway IP address from the server.
+	_BTT_LEAVEIFERROR(GetNifMain().GetAgent()->ReadBool(
+		TPtrC(GPRS_IP_ADDR_FROM_SERVER),
+		iSettings.iGetGatewayFromServer));
+
+	// Read whether to get the DNS addresses from the server.
+	_BTT_LEAVEIFERROR(GetNifMain().GetAgent()->ReadBool(
+		TPtrC(GPRS_IP_DNS_ADDR_FROM_SERVER),
+		iSettings.iGetDnsFromServer));
+
+	// Because CommDB doesn't define a Broadcast Address field, we must
+	// calculate the broadcast address. This is based on the localAddr
+	// and the netMask.
+	TInetAddr localAddr(iSettings.iLocalAddr, 0);
+	TInetAddr netMask(iSettings.iNetMask, 0);
+	TInetAddr broadcast;
+	broadcast.SubNetBroadcast(localAddr, netMask);
+	iSettings.iBroadcastAddr = broadcast.Address();
+	}
+
+void CIPv4ProtocolIf::UpdateContextConfigL(const
+										  RPacketContext::TContextConfigGPRS&
+										  aConfig)
+/**
+ * Called when the context has been activated to set our IP address and get
+ * any other required settings from CommDB.
+ *
+ * @param aConfig The new context config
+ */
+	{
+	_LOG_L1C1(_L8("CIPv4ProtocolIf::UpdateContextConfig"));
+
+	// Get the settings which are stored in CommDB.
+	ReadCommDbGprsSettingsL();
+
+	// Get our IP address from the GPRS context config.
+	TInetAddr address;
+	
+	TBuf<RPacketContext::KMaxPDPAddressLength> tempAddr;
+	tempAddr.Copy(aConfig.iPdpAddress);
+	TInt ret = address.Input(tempAddr);
+
+	// We've got our IP address! Let's save it.
+	if (ret == KErrNone)
+		{
+		iSettings.iLocalAddr = address.Address();
+		LOG_IP_ADDRESS("Got local IP address", iSettings.iLocalAddr);
+		}
+	else
+		{
+		_LOG_L2C2(_L8("Couldn't get IP address from GPRS config (err: %d)"),
+			ret);
+
+		// Don't leave on this error: we may still be OK if we read some
+		// settings from CommDB.
+		}
+
+	// @todo - is this correct. We can only get the DNS addresses
+	// from the TSY using the iProtocolConfigOption data. Yet a client could
+	// access those DNS config details without knowing about the state of the
+	// iSettings.iGetDnsFromServer flag.
+
+	if ((iSettings.iGetDnsFromServer) ||
+		((iSettings.iPrimaryDns == 0) &&
+		 (iSettings.iSecondaryDns == 0)) ) 
+		{
+		TBuf<RPacketContext::KMaxPDPAddressLength> tempAddr;
+		tempAddr.Copy(aConfig.iProtocolConfigOption.iDnsAddresses.iPrimaryDns);
+		ret = address.Input(tempAddr);
+
+		if (ret == KErrNone)
+			{
+			iSettings.iPrimaryDns = address.Address();
+			LOG_IP_ADDRESS("Got primary DNS", iSettings.iPrimaryDns);
+			}
+		else
+			{
+			_LOG_L2C2(_L8("Couldn't get primary DNS address from GPRS config (err: %d)"),
+				ret);
+
+			// Don't leave on this error: we may still be OK if we read some
+			// settings from CommDB.
+			}
+
+		tempAddr.Copy(aConfig.iProtocolConfigOption.iDnsAddresses.iSecondaryDns);
+		ret = address.Input(tempAddr);
+
+		if (ret == KErrNone)
+			{
+			iSettings.iSecondaryDns = address.Address();
+			LOG_IP_ADDRESS("Got secondary DNS", iSettings.iPrimaryDns);
+			}
+		else
+			{
+			_LOG_L2C2(_L8("Couldn't get secondary DNS address from GPRS config (err: %d)"),
+				ret);
+
+			// Don't leave on this error: we may still be OK if we read some
+			// settings from CommDB.
+			}
+		}
+	else
+		{
+		LOG_IP_ADDRESS("Using CommDB DNS address - Primary ", iSettings.iPrimaryDns);
+		LOG_IP_ADDRESS("                         - Secondary ", iSettings.iSecondaryDns);
+		}
+
+
+	// TProtocolConfigOptionV2::iMiscBuffer is not the correct way to pass a gateway
+	// address - data needs to be passed in TLV format but there are no TLV content tags
+	// defined for a gateway address and any UMTS/GPRS hardware which claims to be able
+	// to supply this address is erroneous (3gpp standard 24.008, section 10.5.6.3).
+	// This misuse of iMiscBuffer was preventing other correctly formed parameters from
+	// being passed (INC113612).
+/*	if (iSettings.iGetGatewayFromServer)
+		{
+		tempAddr.Copy(aConfig.iProtocolConfigOption.iMiscBuffer);
+		ret = address.Input(tempAddr);
+
+		if (ret == KErrNone)
+			{
+			iSettings.iDefGateway = address.Address();
+			LOG_IP_ADDRESS("Got default gateway", iSettings.iDefGateway);
+			}
+		else
+			{
+			_LOG_L2C2(_L8("Couldn't get default gateway from GPRS config (err: %d)"),
+				ret);
+			}
+		}*/
+	}
+
+void CIPv4ProtocolIf::UpdateConnectionSpeed(TUint aConnectionSpeed)
+/**
+ * Sets the speed metric to return to TCP/IP, based on what the TSY tells us.
+ *
+ * @param aConnectionSpeed Our connection speed
+ */
+	{
+	_LOG_L1C1(_L8("CIPv4ProtocolIf::UpdateConnectionSpeed"));
+
+	iSpeedMetric = aConnectionSpeed;
+	}
+
+void CIPv4ProtocolIf::ReadIPv4SettingL(const TDesC& aFieldName,
+									   TUint32& aIpAddr)
+/**
+ * Reads an IPv4 address from CommDB, via the TRP agent. It leaves if an error
+ * other than KErrNotFound occurs.
+ *
+ * @param aFieldName The name of the field to read
+ * @param aIpAddr Will contain the IP address
+ */
+	{
+#ifdef __BTT_LOGGING__
+	TBuf8<256> debugBuffer;
+	debugBuffer.Copy(aFieldName);
+	_LOG_L1C2(_L8("CIPv4ProtocolIf::ReadIp4Setting [aFieldName=%S]"),
+		&debugBuffer);
+#endif
+
+	TBuf<KCommsDbSvrMaxFieldLength> name;
+	TInetAddr ip4Addr;
+
+	TInt ret = GetNifMain().GetAgent()->ReadDes(aFieldName, name);
+
+	if (ret == KErrNone)
+		{
+		// We've successfully read an IP address, so convert it into a number.
+		ip4Addr.Input(name);
+		aIpAddr = ip4Addr.Address();
+		}
+	else
+		{
+		// We couldn't get the IP address, so set it to 0.0.0.0. Note that we
+		// only leave here if we got a more serious error than "not found".
+		aIpAddr = 0;
+		if (ret != KErrNotFound)
+			{
+			_BTT_LEAVEIFERROR(ret);
+			}
+		}
+	}
+
+TInt CIPv4ProtocolIf::Send(RMBufChain& aPdu, TAny* aSource)
+/**
+ * Called by the protocol to send an outgoing IP packet to the network.
+ *
+ * @param aPdu The outgoing packet
+ * @param aSource The source of the packet
+ * @return Standard error codes
+ */
+	{
+	_LOG_L1C1(_L8("CIPv4ProtocolIf::Send"));
+
+#ifdef __BTT_LOGGING__
+	LogPacket(aPdu);
+#endif
+
+	// Return <0: an error occurred
+	// Return  0: no error, but don't send any more packets
+
+	return GetNifMain().SendPacket(aPdu, aSource, KIp4FrameType);
+	}
+
+void CIPv4ProtocolIf::Info(TNifIfInfo& aInfo) const
+/**
+ * Called by the protocol to get information about the NIF.
+ *
+ * @param aInfo Will contain NIF information
+ */
+	{
+	_LOG_L1C1(_L8("CIPv4ProtocolIf::Info"));
+
+	// The parent class sets everything except the name...
+	CProtocolIfBase::Info(aInfo);
+	// ...which we set here.
+	WriteIfName(aInfo.iName);
+	}
+
+TInt CIPv4ProtocolIf::Notification(TAgentToNifEventType /*aEvent*/, 
+	void* /*aInfo*/)
+/**
+ * The Nif will ignore any notification sent
+ *
+ * @param aEvent Not used
+ * @param aInfo Not used 
+ */
+	{
+	_LOG_L1C1(_L8("CIPv4ProtocolIf::Notification"));
+
+	return KErrNone;
+	}
+
+void CIPv4ProtocolIf::StartSending(CProtocolBase* aProtocol)
+/**
+ * Indicates to the protocol layer that the NIF is ready to send packets.
+ *
+ * @param aProtocol A pointer to a protocol
+ */
+	{
+	_LOG_L1C2(_L8("CIPv4ProtocolIf::StartSending [aProtocol=%X]"), aProtocol);
+
+	CProtocolIfBase::StartSending(aProtocol);
+	}
+
+TBool CIPv4ProtocolIf::WantsProtocol(TUint16 aProtocolCode)
+/**
+ * Indicates the type of protocol implemented by this class.
+ *
+ * @param aProtocolCode The protocol type
+ */
+	{
+	_LOG_L1C2(_L8("CIPv4ProtocolIf::WantsProtocol [aProtocolCode=%X]"),
+		aProtocolCode);
+
+#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
+	return ((aProtocolCode & 0x00FF) == KIp4FrameType);
+#else
+	(void) aProtocolCode; // disable compiler warning
+	return ETrue;
+#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
+	}
+
+void CIPv4ProtocolIf::Process(RMBufChain& aPdu)
+/**
+ * Called when an incoming IP packet has arrived. Send packets up to the
+ * TCP/IP stack.
+ *
+ * @param aPdu The incoming packet
+ */
+	{
+	_LOG_L1C1(_L8("CIPv4ProtocolIf::Process"));
+
+#ifdef __BTT_LOGGING__
+	LogPacket(aPdu);
+#endif
+
+	// Pass incoming packets up to the protocol, unless it hasn't
+	// been bound yet.
+	if (iProtocol)
+		{
+		_LOG_L1C1(_L8("CIPv4ProtocolIf: Packet Sent to TCP/IP Protocol!!!"));
+		iProtocol->Process(aPdu, reinterpret_cast<CProtocolBase*>(this));
+		}
+	else 
+		{
+		_LOG_L2C1(_L8("WARNING: dumping incoming packet, no protocol bound"));
+		aPdu.Free();
+		}
+	}
+
+#ifdef __BTT_LOGGING__
+void CIPv4ProtocolIf::LogPacket(const RMBufChain& aPacket)
+/**
+* Logs packet information into log file.
+*
+* @param aPacket The packet 
+*/
+	{
+	_LOG_L1C1(_L8("CIPv4ProtocolIf::LogPacket"));
+
+	TInt mBufLength = aPacket.Length() - aPacket.First()->Length();
+
+	_LOG_L3C2(_L8("Analysis of %d byte packet:"), mBufLength);
+
+	//Note: All the constants used on this method are a pragmatic guess of the
+	//IP header fields. The only porpose of this method is logging.
+
+	if (mBufLength < 20)
+		{
+		_LOG_L3C2(_L8(" -doesn't appear to be a valid IPv4 packet (length=%d)")
+			, mBufLength);
+		return;
+		}
+
+	// Get a pointer to the packet's payload.
+	const TUint8* payloadPtr = aPacket.First()->Next()->Ptr();
+
+	if ((payloadPtr[0] & 0xF0) != 0x40)
+		{
+		_LOG_L3C2(_L8(" - doesn't appear to be an IPv4 packet (version=0x%X)"),
+			(payloadPtr[0] & 0xF0) >> 4);
+		return;
+		}
+
+	if ((payloadPtr[0] & 0xF) != 0x5)
+		{
+		_LOG_L3C2(_L8(" - doesn't have a standard IP header (length=0x%X)"),
+			payloadPtr[0] & 0xF);
+		return;
+		}
+
+	_LOG_L3C5(_L8(" - src addr: %d.%d.%d.%d"), payloadPtr[12], payloadPtr[13],
+		payloadPtr[14], payloadPtr[15]);
+	_LOG_L3C5(_L8(" - dst addr: %d.%d.%d.%d"), payloadPtr[16], payloadPtr[17],
+		payloadPtr[18], payloadPtr[19]);
+
+	if (payloadPtr[9] == 0x06)
+		{
+		_LOG_L3C1(_L8(" - appears to be a TCP packet"));
+		if (mBufLength < 40)
+			{
+			_LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength);
+			return;
+			}
+		_LOG_L3C3(_L8(" - src port: %d, dst port: %d"),
+			(payloadPtr[20] << 8) + payloadPtr[21],
+			(payloadPtr[22] << 8) + payloadPtr[23]);
+		_LOG_L3C3(_L8(" - seq #: 0x%08X, ack #: 0x%08X"),
+			(payloadPtr[24] << 24) + (payloadPtr[25] << 16) +
+			(payloadPtr[26] << 8) + payloadPtr[27],
+			(payloadPtr[28] << 24) + (payloadPtr[29] << 16) +
+			(payloadPtr[30] << 8) + payloadPtr[31]);
+
+		TBuf8<100> flagsSet;
+		flagsSet.Copy(_L8(" - flags set: "));
+
+		// Write description of payload's flags to "flagsSet"
+		if (payloadPtr[33] & 0x01)
+			{
+			flagsSet.Append(_L8("FIN "));
+			}
+		if (payloadPtr[33] & 0x02)
+			{
+			flagsSet.Append(_L8("SYN "));
+			}
+		if (payloadPtr[33] & 0x04)
+			{
+			flagsSet.Append(_L8("RST "));
+			}
+		if (payloadPtr[33] & 0x08)
+			{
+			flagsSet.Append(_L8("PSH "));
+			}
+		if (payloadPtr[33] & 0x10)
+			{
+			flagsSet.Append(_L8("ACK "));
+			}
+		if (payloadPtr[33] & 0x20)
+			{
+			flagsSet.Append(_L8("URG "));
+			}
+		_LOG_L3C1(flagsSet);
+
+		TInt dataOffset = payloadPtr[32] >> 2; // in bytes
+		if ((dataOffset > 0) && (mBufLength > dataOffset + 30))
+			{
+			TBuf8<100> data;
+			data.Copy(_L8(" - data begins: "));
+			for (TInt i = dataOffset + 20; i < dataOffset + 100; i++)
+				{
+				// We skip some bytes at the end of the MBuf, as they're junk.
+				if (i >= (mBufLength - 10))
+					{
+					break;
+					}
+				if (TChar(payloadPtr[i]).IsPrint())
+					{
+					data.Append(TChar(payloadPtr[i]));
+					}
+				else
+					{
+					data.Append(TChar('?'));
+					}
+				}
+			_LOG_L3C1(data);
+			}
+		}
+	else if (payloadPtr[9] == 0x01)
+		{
+		_LOG_L3C1(_L8(" - appears to be an ICMP packet"));
+		if (mBufLength < 24)
+			{
+			_LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength);
+			return;
+			}
+
+		if (payloadPtr[20] == 0x8)
+			{
+			_LOG_L3C1(_L8(" - is an echo request"));
+			}
+		else if (payloadPtr[20] == 0x0)
+			{
+			_LOG_L3C1(_L8(" - is an echo reply"));
+			}
+		else
+			{
+			_LOG_L3C2(_L8(" - unknown type (0x%02X)"), payloadPtr[20]);
+			return;
+			}
+
+		if (mBufLength >= 28)
+			{
+			_LOG_L3C3(_L8(" - ID: 0x%04X, seq #: 0x%04X"),
+				(payloadPtr[24] << 8) + payloadPtr[25],
+				(payloadPtr[26] << 8) + payloadPtr[27]);
+			}
+		}
+	else if (payloadPtr[9] == 0x11)
+		{
+		_LOG_L3C1(_L8(" - appears to be a UDP packet"));
+		if (mBufLength < 28)
+			{
+			_LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength);
+			return;
+			}
+		_LOG_L3C3(_L8(" - src port: %d, dst port: %d"),
+			(payloadPtr[20] << 8) + payloadPtr[21],
+			(payloadPtr[22] << 8) + payloadPtr[23]);
+		}
+	else
+		{
+		_LOG_L3C2(_L8(" - appears to be for an unknown protocol (0x%X)"),
+			payloadPtr[9]);
+		}
+	}
+#endif // __BTT_LOGGING__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/src/IPv6ProtocolIf.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,696 @@
+// Copyright (c) 2002-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:
+// This file implements the CIPv6ProtocolIf class, which handles the transmission
+// of IPv6 data to and from the TCP/IP stack.
+// 
+//
+
+/**
+ @file
+*/
+
+#include <e32hal.h>	// UserHal::MachineInfo()
+#include <etelpckt.h>
+#include <in_iface.h>
+#include <in6_if.h>
+#include "RawIPNifMain.h"
+#include "IPv6ProtocolIf.h"
+#ifdef WCDMA_STUB
+#include <UMTSNifControlIf.h>
+#endif
+#define LOG_IP_ADDRESS(desc,addr) _LOG_L2C5(_L8("    " desc " = %d:%d:%d:%d from context"), \
+			addr[3], addr[2], addr[1], addr[0]);
+
+CIPv6ProtocolIf::CIPv6ProtocolIf(CRawIPNifMain& aNifMain, CBttLogger* aTheLogger)
+/**
+ * Constructor
+ */ 
+	: CProtocolIfBase(aNifMain,aTheLogger),
+	  iTheLogger(aTheLogger), 
+	  iSpeedMetric(KDefaultSpeedMetric)
+	{
+	}
+
+CIPv6ProtocolIf::~CIPv6ProtocolIf()
+/**
+ *	Destructor
+ */
+	{
+	}
+
+void CIPv6ProtocolIf::BindL(TAny* aId)
+/**
+ *	Binds protocol to the Nif
+ *
+ *	@param aId A point the the protocol(TCP/IP)
+ */
+	{
+	_LOG_L1C2(_L8("CIPv6ProtocolIf::BindL [aId=%X]"), aId);
+
+	CProtocolIfBase::BindL(aId); // Call the superclass's method.
+	iNotify = iNifMain.Notify();
+	}
+
+TInt CIPv6ProtocolIf::Control(TUint aLevel, TUint aName, TDes8& aOption,
+							TAny* /*aSource*/)
+/**
+ * The main function called by the TCP/IP protocol to control the interface.
+ * Can perform a variety of general IP tasks (such as getting IP config)
+ * and "3G" specific tasks (such as deleting the context).
+ *
+ * @param aLevel The level of the interface to control - always KSOLInterface
+ * @param aName The command to perform
+ * @param aOption Data to be input/output as a result of the command
+ * @param aSource The source of the command (unused)
+ * @return Standard error codes
+ */
+	{
+	_LOG_L1C3(_L8("CIPv6ProtocolIf::Control [aLevel=%d, aName=%d]"),
+		aLevel, aName);
+
+	if (aLevel == KSOLInterface)
+		{
+		switch (aName)
+			{
+		// General IP configuration commands are below this point.
+
+		case KSoIfInfo6:
+			// Gets information about the interface, such as name and MTU.
+			return WriteIfInfo(aOption);
+
+		case KSoIfConfig:
+			// Gets interface configuration, eg. IP address and DNS servers.
+			return WriteIfConfig(aOption);
+
+		case KSoIfGetConnectionInfo:
+			// Gets IAP and network information.
+			return WriteConnectionInfo(aOption);
+
+		case KSoIfHardwareAddr:
+			// unsupported because we don't have a h/w address
+		case KSoIfCompareAddr:
+			// this never actually appears to be called
+			break;
+
+		// 3G-specific configuration commands are below this point.
+#ifdef WCDMA_STUB
+		case KRegisterEventHandler:
+			// Raw IP NIF Events are not supported
+		case KContextSetEvents:
+			// Raw IP NIF Events are not supported
+			break;
+
+		case KContextCreate:
+			// We don't support creating new secondary contexts.
+			break;
+
+		case KContextDelete:
+			// Deletes the primary PDP context. This will shut down the Nif.
+			return DeleteContext(aOption);
+
+		case KContextActivate:
+			// If the IPv6 interface is up, then the context will already have
+			// been activated. So this command should fail with 
+			// KErrAlreadyExists
+			{
+			TUint8* ptr = CONST_CAST(TUint8*, aOption.Ptr()); 
+			TContextParameters* contextParams =
+				REINTERPRET_CAST(TContextParameters*, ptr);
+
+			if (contextParams->iContextInfo.iContextId != 
+				STATIC_CAST(TInt8, GetNifMain().GetBcaController()->Nsapi()))
+				{
+				contextParams->iReasonCode = KErrNotFound;
+				}
+			else
+				{
+				contextParams->iContextInfo.iStatus =
+					GetNifMain().GetContextStatus();
+				contextParams->iReasonCode = KErrAlreadyExists;
+				}
+			return KErrNone;
+			}
+
+		case KNifSetDefaultQoS:
+		case KContextQoSSet:
+			// Setting the QoS is meaningless over GPRS, so we just return that
+			// we don't support these operations.
+			break;
+
+		case KContextTFTModify:
+			// As we only have one primary context, we don't support anything
+			// to do with traffic flow templates, which are used by secondary
+			// contexts.
+			break;
+
+		case KContextModifyActive:
+			// This command is only valid aftermodifying TFT/QoS parameters. 
+			// As we don't support any of these operations,
+			// this command is never valid.
+			break;
+#endif
+		default:
+			break;
+			}
+		}
+	return KErrNotSupported;
+	}
+
+TInt CIPv6ProtocolIf::WriteIfConfig(TDes8& aIfConfig)
+/**
+ * Writes the configuration of the interface (eg. IP address, DNS servers)
+ * into the supplied descriptor.
+ *
+ * @param aIfConfig Will contain the interface configuration
+ * @return KErrNotSupported if an incorrect structure is passed, 
+ * otherwise KErrNone
+ */
+	{
+	_LOG_L1C1(_L8("CIPv6ProtocolIf::WriteIfConfig"));
+	__ASSERT_DEBUG((TUint)aIfConfig.MaxLength() >= sizeof (TSoInet6IfConfig), User::Panic(KIPv6ProtocolIfName, 0));
+
+	if ((TUint)aIfConfig.MaxLength() < sizeof(TSoInet6IfConfig))
+		{
+		return KErrArgument;
+		}
+
+	TUint8* ptr = CONST_CAST(TUint8*, aIfConfig.Ptr());
+	TSoInet6IfConfig* config = REINTERPRET_CAST(TSoInet6IfConfig*, ptr);
+
+	TEui64Addr& localId = TEui64Addr::Cast(config->iLocalId);
+	localId = iSettings.iLocalIfId;
+
+	// If required, configure static DNS addresses
+	if (!iSettings.iPrimaryDns.IsUnspecified())
+		{
+		config->iNameSer1.SetAddress(iSettings.iPrimaryDns);
+		if (!iSettings.iSecondaryDns.IsUnspecified())
+			config->iNameSer2.SetAddress(iSettings.iSecondaryDns);
+		}
+		
+	config->idPaddingBits = 0;
+
+	return KErrNone;
+	}
+
+TInt CIPv6ProtocolIf::WriteIfInfo(TDes8& aIfInfo)
+/**
+ * Writes information about the interface into the supplied descriptor.
+ *
+ * @param aIfInfo Will contain the interface information
+ * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone
+ */
+	{
+	_LOG_L1C1(_L8("CIPv6ProtocolIf::WriteIfInfo"));
+	__ASSERT_DEBUG((TUint)aIfInfo.MaxLength() >= sizeof (TSoIfInfo6), User::Panic(KIPv6ProtocolIfName, 0));
+
+	if ((TUint)aIfInfo.MaxLength() < sizeof(TSoIfInfo6))
+		{
+		return KErrArgument;
+		}
+
+	TSoIfInfo6* info = (TSoIfInfo6*) aIfInfo.Ptr();
+	info->iFeatures = KIfCanBroadcast | KIfCanMulticast;
+	info->iSpeedMetric = iSpeedMetric;
+	info->iMtu = KDefaultMtu;
+	info->iRMtu = KDefaultMtu;
+	WriteIfName(info->iName);
+
+	return KErrNone;
+	}
+
+TInt CIPv6ProtocolIf::WriteConnectionInfo(TDes8& aConnectionInfo)
+/**
+ * Writes information about the IAP and network we're associated with. This
+ * is used to route data in a multi-homing environment.
+ *
+ * @param aConnectionInfo Will contain the connection information
+ * @return Standard CommDB error codes
+ */
+	{
+	_LOG_L1C1(_L8("CIPv6ProtocolIf::WriteConnectionInfo"));
+
+	TSoIfConnectionInfo* connectionInfo =
+		(TSoIfConnectionInfo*) aConnectionInfo.Ptr();
+
+	TInt err;
+	// Append the 2 commdb filed into this descriptor
+	TBuf<2*KCommsDbSvrMaxColumnNameLength+1> fieldName;
+
+	fieldName.Copy(TPtrC(IAP));
+	fieldName.Append(KSlashChar);
+	fieldName.Append(TPtrC(COMMDB_ID));
+	err = GetNifMain().GetAgent()->ReadInt(fieldName, connectionInfo->iIAPId);
+	if (err != KErrNone)
+		{
+		return err;
+		}
+
+	fieldName.Copy(TPtrC(IAP));
+	fieldName.Append(KSlashChar);
+	fieldName.Append(TPtrC(IAP_NETWORK));
+	err = GetNifMain().GetAgent()->ReadInt(fieldName, connectionInfo->iNetworkId);
+	if (err != KErrNone)
+		{
+		return err;
+		}
+
+	return KErrNone;
+	}
+#ifdef WCDMA_STUB
+
+TInt CIPv6ProtocolIf::DeleteContext(TDes8& aContextParameters)
+/**
+ * Deletes a context. As the NIF is responsible for one primary context,
+ * this is equivalent to closing down the NIF.
+ *
+ * @param aContextParameters Parameters of the context to delete
+ * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone
+ */
+	{
+	_LOG_L1C1(_L8("CIPv6ProtocolIf::DeleteContext"));
+
+	if (aContextParameters.Length() != sizeof(TContextParameters))
+		{
+		return KErrArgument;
+		}
+
+	TUint8* ptr = CONST_CAST(TUint8*, aContextParameters.Ptr());
+	TContextParameters* params = REINTERPRET_CAST(TContextParameters*, ptr);
+
+	if (params->iContextInfo.iContextId != 
+		STATIC_CAST(TInt8, GetNifMain().GetBcaController()->Nsapi()))
+		{
+		params->iReasonCode = KErrBadName;
+		}
+	else
+		{
+		params->iReasonCode = KErrNone; 
+		GetNifMain().Stop(KErrNone, MNifIfNotify::EDisconnect);
+		}
+
+	return KErrNone;
+	}
+
+#endif
+
+void CIPv6ProtocolIf::ReadCommDbGprsSettingsL()
+/**
+ * Reads GPRS IP settings from CommDB via the agent.
+ */
+	{
+	_LOG_L1C1(_L8("CIPv6ProtocolIf::ReadCommDbGprsSettings"));
+	
+	// Read he DNS addresses..
+	ReadIPv6SettingL(TPtrC(GPRS_IP6_NAME_SERVER1), iSettings.iPrimaryDns);
+	ReadIPv6SettingL(TPtrC(GPRS_IP6_NAME_SERVER2), iSettings.iSecondaryDns);	
+	// Read whether to get the DNS addresses from the server.
+	_BTT_LEAVEIFERROR(GetNifMain().GetAgent()->ReadBool(
+		TPtrC(GPRS_IP6_DNS_ADDR_FROM_SERVER),
+		iSettings.iGetDnsFromServer));
+	
+	// Read whether to get IPv4 address from the server
+	// This is only needed for the integration tests. If it's true then 
+	// the IPv4 address will be used to build up the IPv6 address. 
+	_BTT_LEAVEIFERROR(GetNifMain().GetAgent()->ReadBool(
+		TPtrC(GPRS_IP_ADDR_FROM_SERVER),
+		iSettings.iGetIpFromServer));
+		
+
+	if (iSettings.iGetIpFromServer == EFalse)
+		{
+		// Sets the IPv6 Link-local address from IpAddr.
+		// LocalId is derived from IpAddr and it's further used to set the Link-local
+		// address elsewhere by adding a prefix (FE80::) in front.
+		// For IpAddr: 192.168.1.1, link-local address will be FE80::C0A8:101.
+		TUint32 ipAddr;	
+		ReadIPv4SettingL(TPtrC(GPRS_IP_ADDR), ipAddr);
+		const TUint8 constantId[8] = { 0, 0, 0, 0, 
+									ipAddr >> 24, (ipAddr >> 16) & 0xFF, 
+									(ipAddr >> 8) & 0xFF, ipAddr & 0xFF }; 
+		iSettings.iLocalIfId.SetAddr(constantId, sizeof (constantId));
+		}
+	else
+		{
+			
+		//
+		// Use the 64 bit id of MARM machines as our interface id
+		//
+		TMachineInfoV1Buf machineInfo;	
+		UserHal::MachineInfo(machineInfo);
+		iSettings.iLocalIfId.SetAddr(machineInfo().iMachineUniqueId);
+		iSettings.iLocalIfId.SetUniversalBit(0);
+		//
+		// In WINS environment the id is zero which is no-no
+		//
+		if (iSettings.iLocalIfId.IsZero())
+			{
+			iSettings.iLocalIfId.SetAddrRandomNZ();
+			}		
+
+		}
+	}
+
+void CIPv6ProtocolIf::UpdateContextConfigL(const
+										  RPacketContext::TContextConfigGPRS&
+										  aConfig)
+/**
+ * Called when the context has been activated to set our IP address and get
+ * any other required settings from CommDB.
+ *
+ * @param aConfig The new context config
+ */
+	{
+	_LOG_L1C1(_L8("CIPv6ProtocolIf::UpdateContextConfig"));
+
+	// Get the settings which are stored in CommDB.
+	ReadCommDbGprsSettingsL();
+
+	// Get our IP address from the GPRS context config.
+	TInetAddr address;
+	
+	TBuf<RPacketContext::KMaxPDPAddressLength> tempAddr;
+	tempAddr.Copy(aConfig.iPdpAddress);
+	TInt ret = address.Input(tempAddr);
+
+	// We've got our IP address! Let's save it.
+	if (ret == KErrNone)
+		{
+		iSettings.iLocalAddr = address.Ip6Address();
+		LOG_IP_ADDRESS("Got local IP address", iSettings.iLocalAddr);
+		}
+	else
+		{
+		_LOG_L2C2(_L8("Couldn't get IP address from GPRS config (err: %d)"),
+			ret);
+
+		// Don't leave on this error: we may still be OK if we read some
+		// settings from CommDB.
+		}
+
+	// @todo - is this correct. We can only get the DNS addresses
+	// from the TSY using the iProtocolConfigOption data. Yet a client could
+	// access those DNS config details without knowing about the state of the
+	// iSettings.iGetDnsFromServer flag.
+
+	if ((iSettings.iGetDnsFromServer) ||
+		((iSettings.iPrimaryDns.IsUnspecified()) &&
+		 (iSettings.iSecondaryDns.IsUnspecified())) ) 
+		{
+		TBuf<RPacketContext::KMaxPDPAddressLength> tempAddr;
+		tempAddr.Copy(aConfig.iProtocolConfigOption.iDnsAddresses.iPrimaryDns);
+		ret = address.Input(tempAddr);
+
+		if (ret == KErrNone)
+			{
+			iSettings.iPrimaryDns = address.Ip6Address();
+			LOG_IP_ADDRESS("Got primary DNS", iSettings.iPrimaryDns);
+			}
+		else
+			{
+			_LOG_L2C2(_L8("Couldn't get primary DNS address from GPRS config (err: %d)"),
+				ret);
+
+			// Don't leave on this error: we may still be OK if we read some
+			// settings from CommDB.
+			}
+
+		tempAddr.Copy(aConfig.iProtocolConfigOption.iDnsAddresses.iSecondaryDns);
+		ret = address.Input(tempAddr);
+
+		if (ret == KErrNone)
+			{
+			iSettings.iSecondaryDns = address.Ip6Address();
+			LOG_IP_ADDRESS("Got secondary DNS", iSettings.iPrimaryDns);
+			}
+		else
+			{
+			_LOG_L2C2(_L8("Couldn't get secondary DNS address from GPRS config (err: %d)"),
+				ret);
+
+			// Don't leave on this error: we may still be OK if we read some
+			// settings from CommDB.
+			}
+		}
+	else
+		{
+		LOG_IP_ADDRESS("Using CommDB DNS address - Primary ", iSettings.iPrimaryDns);
+		LOG_IP_ADDRESS("                         - Secondary ", iSettings.iSecondaryDns);
+		}
+	}
+
+void CIPv6ProtocolIf::UpdateConnectionSpeed(TUint aConnectionSpeed)
+/**
+ * Sets the speed metric to return to TCP/IP, based on what the TSY tells us.
+ *
+ * @param aConnectionSpeed Our connection speed
+ */
+	{
+	_LOG_L1C1(_L8("CIPv6ProtocolIf::UpdateConnectionSpeed"));
+
+	iSpeedMetric = aConnectionSpeed;
+	}
+
+void CIPv6ProtocolIf::ReadIPv4SettingL(const TDesC& aFieldName,
+									   TUint32& aIpAddr)
+/**
+ * Reads an IPv4 address from CommDB, via the TRP agent. It leaves if an error
+ * other than KErrNotFound occurs.
+ *
+ * @param aFieldName The name of the field to read
+ * @param aIpAddr Will contain the IP address
+ */
+	{
+#ifdef __BTT_LOGGING__
+	TBuf8<256> debugBuffer;
+	debugBuffer.Copy(aFieldName);
+	_LOG_L1C2(_L8("CIPv6ProtocolIf::ReadIp4Setting [aFieldName=%S]"),
+		&debugBuffer);
+#endif
+
+	TBuf<KCommsDbSvrMaxFieldLength> name;
+	TInetAddr ip4Addr;
+
+	TInt ret = GetNifMain().GetAgent()->ReadDes(aFieldName, name);
+
+	if (ret == KErrNone)
+		{
+		// We've successfully read an IP address, so convert it into a number.
+		ip4Addr.Input(name);
+		aIpAddr = ip4Addr.Address();
+		}
+	else
+		{
+		// We couldn't get the IP address, so set it to 0.0.0.0. Note that we
+		// only leave here if we got a more serious error than "not found".
+		aIpAddr = 0;
+		if (ret != KErrNotFound)
+			{
+			_BTT_LEAVEIFERROR(ret);
+			}
+		}
+	}
+
+void CIPv6ProtocolIf::ReadIPv6SettingL(const TDesC& aFieldName,
+									   TIp6Addr& aIpAddr)
+/**
+ * Reads an IPv6 address from CommDB, via the TRP agent. It leaves if an error
+ * other than KErrNotFound occurs.
+ *
+ * @param aFieldName The name of the field to read
+ * @param aIpAddr Will contain the IP address
+ */
+	{
+#ifdef __BTT_LOGGING__
+	TBuf8<256> debugBuffer;
+	debugBuffer.Copy(aFieldName);
+	_LOG_L1C2(_L8("CIPv6ProtocolIf::ReadIp6Setting [aFieldName=%S]"),
+		&debugBuffer);
+#endif
+
+	TBuf<KCommsDbSvrMaxFieldLength> name;
+	TInetAddr ip6Addr;
+
+	TInt ret = GetNifMain().GetAgent()->ReadDes(aFieldName, name);
+
+	if (ret == KErrNone)
+		{
+		// We've successfully read an IP address, so convert it into a number.
+		ip6Addr.Input(name);
+		aIpAddr = ip6Addr.Ip6Address();
+		}
+	else
+		{
+		// We couldn't get the IP address, so set it to 0.0.0.0. Note that we
+		// only leave here if we got a more serious error than "not found".
+		aIpAddr = KInet6AddrNone;
+		if (ret != KErrNotFound)
+			{
+			_BTT_LEAVEIFERROR(ret);
+			}
+		}
+	}
+
+TInt CIPv6ProtocolIf::Send(RMBufChain& aPdu, TAny* aSource)
+/**
+ * Called by the protocol to send an outgoing IP packet to the network.
+ *
+ * @param aPdu The outgoing packet
+ * @param aSource The source of the packet
+ * @return Standard error codes
+ */
+	{
+	_LOG_L1C1(_L8("CIPv6ProtocolIf::Send"));
+
+#ifdef __BTT_LOGGING__
+	LogPacket(aPdu);
+#endif
+
+	// Return <0: an error occurred
+	// Return  0: no error, but don't send any more packets
+
+	return GetNifMain().SendPacket(aPdu, aSource, KIp6FrameType);
+	}
+
+void CIPv6ProtocolIf::Info(TNifIfInfo& aInfo) const
+/**
+ * Called by the protocol to get information about the NIF.
+ *
+ * @param aInfo Will contain NIF information
+ */
+	{
+	_LOG_L1C1(_L8("CIPv6ProtocolIf::Info"));
+
+	// The parent class sets everything except the name...
+	CProtocolIfBase::Info(aInfo);
+	// ...which we set here.
+	WriteIfName(aInfo.iName);
+	}
+
+TInt CIPv6ProtocolIf::Notification(TAgentToNifEventType /*aEvent*/, 
+	void* /*aInfo*/)
+/**
+ * The Nif will ignore any notification sent
+ *
+ * @param aEvent Not used
+ * @param aInfo Not used 
+ */
+	{
+	_LOG_L1C1(_L8("CIPv6ProtocolIf::Notification"));
+
+	return KErrNone;
+	}
+
+void CIPv6ProtocolIf::StartSending(CProtocolBase* aProtocol)
+/**
+ * Indicates to the protocol layer that the NIF is ready to send packets.
+ *
+ * @param aProtocol A pointer to a protocol
+ */
+	{
+	_LOG_L1C2(_L8("CIPv6ProtocolIf::StartSending [aProtocol=%X]"), aProtocol);
+
+	CProtocolIfBase::StartSending(aProtocol);
+	}
+
+TBool CIPv6ProtocolIf::WantsProtocol(TUint16 aProtocolCode)
+/**
+ * Indicates the type of protocol implemented by this class.
+ *
+ * @param aProtocolCode The protocol type
+ */
+	{
+	_LOG_L1C2(_L8("CIPv6ProtocolIf::WantsProtocol [aProtocolCode=%X]"),
+		aProtocolCode);
+
+#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
+	return ((aProtocolCode & 0x00FF) == KIp6FrameType);
+#else
+	(void) aProtocolCode; // disable compiler warning
+	return ETrue;
+#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
+	}
+
+void CIPv6ProtocolIf::Process(RMBufChain& aPdu)
+/**
+ * Called when an incoming IP packet has arrived. Send packets up to the
+ * TCP/IP stack.
+ *
+ * @param aPdu The incoming packet
+ */
+	{
+	_LOG_L1C1(_L8("CIPv6ProtocolIf::Process"));
+
+#ifdef __BTT_LOGGING__
+	LogPacket(aPdu);
+#endif
+
+	// Pass incoming packets up to the protocol, unless it hasn't
+	// been bound yet.
+	if (iProtocol)
+		{
+		_LOG_L1C1(_L8("CIPv6ProtocolIf: Packet Sent to TCP/IP Protocol!!!"));
+		iProtocol->Process(aPdu, reinterpret_cast<CProtocolBase*>(this));
+		}
+	else 
+		{
+		_LOG_L2C1(_L8("WARNING: dumping incoming packet, no protocol bound"));
+		aPdu.Free();
+		}
+	}
+
+#ifdef __BTT_LOGGING__
+void CIPv6ProtocolIf::LogPacket(const RMBufChain& aPacket)
+/**
+* Logs packet information into log file.
+*
+* @param aPacket The packet 
+*/
+	{
+	_LOG_L1C1(_L8("CIPv6ProtocolIf::LogPacket"));
+
+	TInt mBufLength = aPacket.Length() - aPacket.First()->Length();
+
+	_LOG_L3C2(_L8("Analysis of %d byte packet:"), mBufLength);
+
+	//Note: All the constants used on this method are a pragmatic guess of the
+	//IP header fields. The only porpose of this method is logging.
+
+	if (mBufLength < 40)
+		{
+		_LOG_L3C2(_L8(" -doesn't appear to be a valid IPv6 packet (length=%d)")
+			, mBufLength);
+		return;
+		}
+
+	// Get a pointer to the packet's payload.
+	const TUint8* payloadPtr = aPacket.First()->Next()->Ptr();
+
+	if ((payloadPtr[0] & 0xF0) != 0x60)
+		{
+		_LOG_L3C2(_L8(" - doesn't appear to be an IPv6 packet (version=0x%X)"),
+			(payloadPtr[0] & 0xF0) >> 4);
+		return;
+		}
+
+	_LOG_L3C2(_L8(" - traffic class: 0x%X"), 
+					((payloadPtr[0] & 0xF) << 4) | ((payloadPtr[1] & 0xF0) >> 4));
+	_LOG_L3C2(_L8(" - flow label: 0x%X"), 
+					((payloadPtr[1] & 0x0F) << 16) | (payloadPtr[2] << 8) | payloadPtr[3]);
+	_LOG_L3C2(_L8(" - payload length: 0x%X"), 
+					(payloadPtr[4] << 16) | payloadPtr[5]);
+	_LOG_L3C2(_L8(" - next header: 0x%08X"), payloadPtr[6]);
+	_LOG_L3C2(_L8(" - hop limit: 0x%08X"), payloadPtr[7]);
+	}
+#endif // __BTT_LOGGING__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/src/ProtocolIfBase.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,159 @@
+// Copyright (c) 2002-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:
+// This file implements the base class for the protocol interface classes.
+// 
+//
+
+/**
+ @file
+*/
+
+#include <nifmbuf.h>
+#include "ProtocolIfBase.h"
+#include "RawIPNifMain.h"
+
+CProtocolIfBase::CProtocolIfBase(CRawIPNifMain& aNifMain, CBttLogger* aTheLogger)
+/**
+ * Constructor
+ *
+ * @param aNifMain A pointer to CRawIPNifMain
+ */
+	:iNifMain(aNifMain),
+	 iTheLogger(aTheLogger)
+	{
+	}
+
+CProtocolIfBase::~CProtocolIfBase()
+/**
+ * Destructor
+ */
+	{
+	}
+
+void CProtocolIfBase::BindL(TAny *aId)
+/**
+ * Binds TCP/IP protocol to Nif
+ *
+ * @param aId A pointer to protocol object 
+ */
+
+	{
+	_LOG_L1C2(_L8("CProtocolIfBase::BindL [aId=%X]"), aId);
+
+	if (iProtocol)
+		_BTT_PANIC(KNifName, KNifProtocolInUse);
+	iProtocol = reinterpret_cast<CProtocolBase*>(aId);
+	}
+
+TInt CProtocolIfBase::State()
+/**
+ * Used to retrieve the Nif state
+ *
+ * @return The Nif state
+ */
+	{
+	_LOG_L1C1(_L8("CProtocolIfBase::State"));
+
+	return GetNifMain().State();
+	}
+
+TInt CProtocolIfBase::Control(TUint aLevel, TUint aName, TDes8& aOption, TAny* aSource)
+/**
+ * This method will call the control method in IPv4Protocol
+ *
+ */
+	{
+	_LOG_L1C1(_L8("CProtocolIfBase::Control"));
+
+	return GetNifMain().Control(aLevel, aName, aOption, aSource);
+	}
+
+TInt CProtocolIfBase::Send(RMBufChain& aPdu, TAny* aSource)
+/**
+ * Send and IP packet. This method is overriden by the IPv4ProtocolIf class.
+ *
+ * @param aPdu The outgoing packet
+ * @param aSource The source of the packet
+ * @return Standard error codes
+ */
+	{
+	_LOG_L1C1(_L8("CProtocolIfBase::Send"));
+
+	return GetNifMain().Send(aPdu, aSource);
+	}
+
+void CProtocolIfBase::Info(TNifIfInfo& aInfo) const
+/**
+ * Used to retrieved Nif information
+ *
+ * @param aInfo Nif Information structure
+ */
+	{
+	_LOG_L1C1(_L8("CProtocolIfBase::Info"));
+
+	aInfo.iVersion = TVersion(KNifMajorVersionNumber, KNifMinorVersionNumber,
+		KNifBuildVersionNumber);
+	aInfo.iFlags = KNifIfIsBase | KNifIfUsesNotify | KNifIfCreatedByLink;
+	// Doesn't fill in aInfo.iName, as this is done by derived classes.
+	aInfo.iProtocolSupported = KProtocolInetIp;
+	}
+
+TInt CProtocolIfBase::Notification(TAgentToNifEventType /*aEvent*/, void* /*aInfo*/)
+/**
+ * Method overidden by the notification method on IPv4ProtocolIf class.
+ *
+ * @param aEvent Not used
+ * @param aInfo Not used 
+ */
+	{
+	_LOG_L1C1(_L8("CProtocolIfBase::Notification"));
+
+	return KErrNone;
+	}
+
+void CProtocolIfBase::StartSending(CProtocolBase* /*aProtocol*/)
+/**
+ * Indicates to the protocol layer that the NIF is ready to send packets.
+ *
+ * @param aProtocol A pointer to a protocol
+ */
+	{
+	_LOG_L1C1(_L8("CProtocolIfBase::StartSending"));
+
+	// Default implementation.
+	// Uses iProtocol instead aProtocol.
+	iProtocol->StartSending(reinterpret_cast<CProtocolBase*>(this));
+	}
+
+
+void CProtocolIfBase::UpdateContextConfigL(const
+	RPacketContext::TContextConfigGPRS& /*aConfig*/)
+/**
+ * Method overidden by UpdateContextConfig on IPv4ProtocolIf class
+ *
+ * @param aConfig Not used
+ */
+	{
+	// Default implementation does nothing.
+	}
+
+void CProtocolIfBase::UpdateConnectionSpeed(TUint /*aConnectionSpeed*/)
+/**
+ * Method overidden by UpdateConnectionSpeed on IPv4ProtocolIf class
+ *
+ * @param aConnectionSpeed Not used
+ */
+	{
+	// Default implementation does nothing.
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/src/RawIPNifMain.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,670 @@
+// Copyright (c) 2002-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:
+// Implements the CRawIPNifMain class, which provides a central point for the NIF
+// to communicate with NifMan and the BCA controllers. This class creates an interface
+// to the IPv4 protocol when it is required.
+// 
+//
+
+/**
+ @file
+*/
+
+#include <f32file.h>
+#include <nifman.h>
+#include <nifmbuf.h>
+#include <in_iface.h>
+#include <nifvar.h>
+#include "IPv4ProtocolIf.h"
+#include "IPv6ProtocolIf.h"
+#include "RawIPNifMain.h"
+
+#ifdef __FLOG_ACTIVE
+//These variables are used only if flog is active.
+_LIT8(KTcpDumpFirstTag,"TcpDump");
+static const TUint16 KTcpDumpLinkType = 12;
+#endif
+
+CRawIPNifMain::CRawIPNifMain(CNifIfFactory& aFactory, MNifIfNotify* aNotify, CBttLogger* aTheLogger)
+/**
+ * Constructor.
+ *
+ * @param aFactory Reference to the factory which created this object.
+ * @param aTheLogger The logging object, ownership is passed to this object
+ */
+	: CNifIfLink(aFactory), 
+	  iTheLogger(aTheLogger),
+	  iInitError(KErrNone), 
+	  iState(EIfDown)
+	{
+	// To aid debugging.
+	iNotify = aNotify;
+	}
+
+void CRawIPNifMain::Info(TNifIfInfo& aInfo) const
+/**
+ * Provides information about the NIF.
+ *
+ * @param aInfo Information structure to be filled in
+ */
+	{
+	_LOG_L1C1(_L8("CRawIPNifMain::Info"));
+
+	aInfo.iVersion = TVersion(KNifMajorVersionNumber, KNifMinorVersionNumber,
+		KNifBuildVersionNumber);
+	aInfo.iFlags = KNifIfIsBase | 
+				   KNifIfUsesNotify | 
+				   KNifIfIsLink |
+	               KNifIfCreatedByFactory |
+				   KNifIfCreatesBinder;
+	aInfo.iName = KRawIPNifName;
+	aInfo.iProtocolSupported = KProtocolUnknown;
+	}
+
+void CRawIPNifMain::ConstructL(const TDesC& /*aName*/)
+/**
+ * Second-phase constructor. Creates the Etel
+ * control engine
+ *
+ * @param aName The name of the NIF (unused)
+ */
+	{
+	_LOG_L1C1(_L8("CRawIPNifMain::ConstructL"));
+
+	iBcaController = CBcaIoController::NewL(*this, iTheLogger);
+	}
+
+CRawIPNifMain::~CRawIPNifMain()
+/**
+ * Destructor. Cancels and deletes all owned active objects.
+ */
+	{
+	// Note that we don't delete iProtocolIf because it's not owned by us.
+	delete iBcaController;
+	// This class also deletes the logging object
+	delete iTheLogger;
+	// Cleanup when stop was not called - harmless as it null's the pointer
+	__PACKETLOG_DELETE;
+	}
+
+TInt CRawIPNifMain::Control(TUint /*aLevel*/, TUint /*aName*/,
+                             TDes8& /*aOption*/, TAny* /*aSource*/)
+/**
+ * Method to set up NIF parameters. This is unused; instead, the Control()
+ * method on the IPv4 interface will be called to configure the NIF.
+ *
+ * @param aLevel The network level of the parameter to be set (unused)
+ * @param aName The name of the parameter to be set (unused)
+ * @param aOption The parameter to be written to (unused)
+ * @param aSource The source of the method call (unused)
+ * @return Always KErrNotSupported
+ */
+	{
+	_LOG_L1C1(_L8("CRawIPNifMain::Control"));
+
+	return KErrNotSupported;
+	}
+
+TInt CRawIPNifMain::State()
+/**
+ * Returns the current state of the NIF. This will be one of EIfUp or EIfDown.
+ *
+ * @return The state of the NIF
+ */
+	{
+	_LOG_L1C1(_L8("CRawIPNifMain::State"));
+
+	return iState;
+	}
+
+TInt CRawIPNifMain::Start()
+/**
+ * Starts the NIF up. This process involves connecting to the BCA.  When startup is
+ * complete, LinkLayerUp() will be called.
+ *
+ * @return Allways KErrNone
+ */
+	{
+	_LOG_L1C1(_L8("CRawIPNifMain::Start"));
+
+	TRAPD(err1,InitialiseL(MControllerObserver::EStart, KErrNone));
+	if (err1)
+		{
+		return err1;
+		}
+	
+	
+	//the name calculation should be done only if logging is enabled
+#ifdef __FLOG_ACTIVE
+	const TUint KModemNameLen = KCommsDbSvrMaxColumnNameLength + 10;  // need enough for ppp-XXX.txt - e.g. ppp-comm-1.txt, ppp-btcomm-10.txt etc
+	TBuf8<KModemNameLen> modemName;
+	
+	//first add modem name
+	_LIT(KModemPortName, "ModemBearer\\PortName");
+	_LIT8(KStupidCharacters, "::");
+	iNotify->ReadDes(KModemPortName, modemName);
+	const TInt pos = modemName.FindC((const TDesC8&)KStupidCharacters);
+	if(pos != KErrNotFound)
+		{
+		modemName.Delete(pos, 2);
+		}
+		
+	//append time stamp
+	const TUint KTimeStampLen = 8;
+	TBuf8<KTimeStampLen> logFileName;
+	
+	_LIT8(KTimeFormat, "%08X");
+	TUint32 counter = User::FastCounter();
+	logFileName.Format(KTimeFormat, counter);
+		
+	TRAPD(err,__PACKETLOG_NEWL(KTcpDumpFirstTag, logFileName, CPacketLogger::ETcpDump, KTcpDumpLinkType));
+	if (err)
+		{
+		_LOG_L1C1(_L8("Trapped leave from __PACKETLOG_NEWL"));
+		}
+	
+	const TUint KLogTextLen = KModemNameLen+KTimeStampLen+30;
+	TBuf8<KLogTextLen> logText;
+	_LIT8(KLogTimeText, "TcpDump log file time stamp:");
+	_LIT8(KLogModemText, " for modem:");
+	logText.Append(KLogTimeText);
+	logText.Append(logFileName);
+	logText.Append(KLogModemText);
+	logText.Append(modemName);
+	_LOG_L1C1(logText);
+#endif
+
+	return KErrNone;
+	}
+
+
+void CRawIPNifMain::LinkLayerUp()
+/**
+ * This function is called when initialisation is complete and the NIF is
+ * ready to send/receive data. It notifies NifMan and the IP interface that it's
+ * ready to go.
+ */
+	{
+	_LOG_L1C1(_L8("CRawIPNifMain::LinkLayerUp"));
+
+	iState = EIfUp;
+	iNotify->LinkLayerUp();
+
+	iNotify->IfProgress(KLinkLayerOpen, KErrNone);
+
+	iProtocolIf->StartSending(reinterpret_cast<CProtocolBase*>(this));
+	}
+
+void CRawIPNifMain::LinkLayerDown(TInt aError)
+/**
+ * This function is called when the context has been deactivated and the NIF
+ * is ready to be deleted, or if there is an error on startup. Its job is to
+ * notify NifMan that the link has gone down, so it can delete the NIF.
+ *
+ * @param aError An error code to propagate to NifMan
+ */
+	{
+	_LOG_L1C2(_L8("CRawIPNifMain::LinkLayerDown [aError=%d]"), aError);
+
+	iState = EIfDown;
+
+	iNotify->IfProgress(KLinkLayerClosed, aError);
+
+	iNotify->LinkLayerDown(aError, MNifIfNotify::EDisconnect);
+	}
+
+void CRawIPNifMain::Stop(TInt aError, MNifIfNotify::TAction /*aAction*/)
+/**
+ * This function is called by NifMan to bring down the link. It starts
+ * the asynchronous context deactivation process; LinkLayerDown() will be
+ * called when the context has been deactivated.
+ *
+ * @param aError A code specifying why the link is to be brought down
+ * @param aAction The action to take: disconnect or reconnect
+ */
+	{
+	_LOG_L1C2(_L8("CRawIPNifMain::Stop [aError=%d]"), aError);
+	__PACKETLOG_DELETE;
+	ShutDown(MControllerObserver::EInitialised, aError);
+	}
+
+void CRawIPNifMain::Restart(CNifIfBase* /*aIf*/)
+/**
+ * This is just an empty implementation of the CNifIfLink derived method.
+ * It is used as part of functionality to allow a NIF to specify that
+ * one of its binders has gone down but the link layer has not.
+ *
+ * @param Pointer to the protocol interface object
+ */
+	{
+	_LOG_L1C1(_L8("CRawIPNifMain::Restart called"));
+	}
+
+TInt CRawIPNifMain::Send(RMBufChain& /*aPdu*/, TAny* /*aProtocol*/)
+/**
+ * Unused. The Send() method on the IPv4 protocol interface should be used
+ * to send IPv4 packets.
+ *
+ * @return Always KErrNotSupported
+ */
+	{
+	_LOG_L1C1(_L8("CRawIPNifMain::Send"));
+
+	// Only the bearers' Send functions should be called.
+	return KErrNotSupported;
+	}
+
+TInt CRawIPNifMain::SendPacket(RMBufChain& aPdu, TAny* /*aProtocol*/,
+							   TUint16 /*aType*/)
+/**
+ * Sends a packet, via the BCA controller. This method is protocol-agnostic,
+ * and is called by the IPv4 protocol interface to actually send packets.
+ *
+ * @param aPdu The packet to send
+ * @return A standard error code
+ */
+	{
+	_LOG_L1C2(_L8("CRawIPNifMain::SendPacket [length=%d]"),
+		aPdu.Length() - aPdu.First()->Length());
+
+	__PACKETLOG_WRITE_PACKET(aPdu, 0);
+	TInt ret = iBcaController->Send(aPdu);
+	
+	return ret;
+	}
+
+void CRawIPNifMain::Process(RMBufChain& aPdu, TUint16 aProtocolCode)
+/**
+ * Handles incoming packets which have been passed up from the BCA controller.
+ * If the IPv4 interface wants to process the packet, it hands it on; otherwise,
+ * the packet is binned.
+ *
+ * @param aPdu The incoming packet
+ */
+	{
+	_LOG_L1C2(_L8("CRawIPNifMain::Process [aPdu length=%d]"),
+		aPdu.Length() - aPdu.First()->Length());
+
+	// If the packet has zero or negative length, bin it.
+	if ((aPdu.Length() - aPdu.First()->Length()) <= 0)
+		{
+		_LOG_L1C1(_L8("Dumped packet: illegal length"));
+		aPdu.Free();
+		return;
+		}
+
+	// See if the protocol interface wants the packet.
+	if (iProtocolIf->WantsProtocol(aProtocolCode)) 
+		{
+		__PACKETLOG_WRITE_PACKET(aPdu, 0);
+		iProtocolIf->Process(aPdu);
+		}
+	else
+		{
+		// The protocol didn't want the packet, so bin it.
+		_LOG_L1C2(_L8("Packet was not processed: freeing (protocol code: %X)"),
+			aProtocolCode);
+		aPdu.Free();
+		}
+	}
+
+void CRawIPNifMain::ResumeSending()
+/**
+ * Notifies the protocol interface that it can resume sending packets.
+ */
+	{
+	_LOG_L1C1(_L8("CRawIPNifMain::ResumeSending"));
+
+	iProtocolIf->StartSending(reinterpret_cast<CProtocolBase*>(this));
+	}
+
+void CRawIPNifMain::AuthenticateComplete(TInt /*aResult*/)
+/**
+ * Notifies NifMan when authentication is complete. This function is never
+ * actually called.
+ *
+ * @param aResult The result of the authentication (unused)
+ */
+	{
+	_LOG_L1C1(_L8("CRawIPNifMain::AuthenticateComplete"));
+	}
+
+TInt CRawIPNifMain::Notification(TAgentToNifEventType aEvent,
+								  void* aInfo)
+/**
+ * Provides a mechanism for the notification of events. 
+ *
+ * @param aEvent The event type (unused)
+ * @param aInfo Event information (unused)
+ */
+	{
+	_LOG_L1C2(_L8("CRawIPNifMain::Notification [%d]"), aEvent);
+
+	
+	switch (aEvent)
+	{
+	case (EAgentToNifEventTypeDisableTimers) : //GPRS suspension
+		{
+		_LOG_L1C1(_L8("CRawIPNifMain::Received Suspend from Agent..."));
+
+		// Let the BCA controller know that data can no longer be sent over
+		// the PDP context.
+		iBcaController->UpdateContextStateFlag(EFalse);
+
+		break;
+		}
+				
+	case (EAgentToNifEventTypeEnableTimers) : //GPRS resumption
+		{
+		_LOG_L1C1(_L8("CRawIPNifMain::Received Resume from Agent..."));
+		iBcaController->UpdateContextStateFlag(ETrue);
+
+		break;
+		}
+			
+	case (EAgentToNifEventTsyConfig) : 
+		{
+		_LOG_L1C1(_L8("CRawIPNifMain::Received context config from Agent..."));
+		
+		RPacketContext::TContextConfigGPRS* localPtr = (reinterpret_cast<RPacketContext::TContextConfigGPRS*>(aInfo));
+
+		TRAPD(err, GetProtocolIf()->UpdateContextConfigL(*localPtr));
+
+		if (err)
+			{
+			_LOG_L1C1(_L8("Trapped leave from UpdateContextConfigL"));
+			}
+		break;
+		}
+			
+	case (EAgentToNifEventTsyConnectionSpeed) : 
+		{
+		TUint connectionSpeed = reinterpret_cast<TUint>(aInfo);
+		_LOG_L1C2(_L8("CRawIPNifMain::Connection Speed Received [%d]"), connectionSpeed);
+
+		GetProtocolIf()->UpdateConnectionSpeed(connectionSpeed);
+		break;
+		}
+			
+	case (EAgentToNifEventTypeDisableConnection) :
+		{
+		// This is handled by NIFMAN and passed to NifMain as a Stop() call
+		_LOG_L1C1(_L8("CRawIPNifMain::Received Disable connection from Agent..."));
+		break;
+		}
+			
+	case (EAgentToNifEventTypeGetDataTransfer) :
+		{
+		_LOG_L1C1(_L8("CRawIPNifMain::Received Get Data Transfer from Agent..."));
+		break;
+		}
+			
+	default : 
+		{
+		_LOG_L1C2(_L8("CRawIPNifMain::Received Notification [%d] from Agent..."), aEvent);
+		break;
+		}
+	}
+
+	return KErrNone;
+	}
+
+void CRawIPNifMain::BindL(TAny *aId)
+/**
+ * Called by NifMan to bind the NIF to a specific protocol. This is never
+ * actually called; instead, the BindL() function of the IPv4 interface is used.
+ *
+ * @param aId A pointer to the protocol to be bound to
+ * @leave KErrAlreadyExists when already bound
+ */
+	{
+	_LOG_L1C2(_L8("CRawIPNifMain::BindL [aId=%X]"), aId);
+	
+	if (iProtocol)
+		{
+		User::Leave(KErrAlreadyExists);
+		}
+	iProtocol = reinterpret_cast<CProtocolBase*>(aId);
+	}
+
+CNifIfBase* CRawIPNifMain::GetBinderL(const TDesC& aName)
+/**
+ * Creates a new protocol interface, for supported protocols. This is currently
+ * only IPv4 and ICMP, both of which use the IPv4 protocol interface class.
+ *
+ * @param aName The name of the protocol
+ * @return A newly created protocol interface object
+ * @leave KErrNotSupported if protocol is not supported
+ */
+	{
+#ifdef __BTT_LOGGING__
+	TBuf8<256> debugBuffer;
+	debugBuffer.Copy(aName);
+	_LOG_L1C2(_L8("CRawIPNifMain::GetBinderL [aName=%S]"), &debugBuffer);
+#endif
+
+	// IPv4 and ICMP Protocols.
+	if (!aName.CompareF(KDescIp) || !aName.CompareF(KDescIcmp))
+		{
+		if (!iProtocolIf)
+			{
+			iProtocolIf = new (ELeave) CIPv4ProtocolIf(*this, iTheLogger);
+#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS			
+			iBcaController->SetType(KIp4FrameType);
+#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
+			}
+		}
+	// IPv6 Protocol
+	else if (!aName.CompareF(KDescIp6))
+		{
+		if (!iProtocolIf)
+			{
+			iProtocolIf = new (ELeave) CIPv6ProtocolIf(*this, iTheLogger);
+#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS			
+			iBcaController->SetType(KIp6FrameType);
+#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
+			}
+		}		
+	else
+		{
+		User::Leave(KErrNotSupported);
+		}
+
+    return iProtocolIf;
+	}
+
+void CRawIPNifMain::InitialiseL(TInitialisationState aState, TInt aError)
+/**
+ * This method controls the initialisation sequence of the different modules
+ * in the NIF. When a module completes all the initialisation tasks it will 
+ * call again this method with the new state. If an error occurs then the 
+ * ShutDown() method will be called.
+ *  
+ * @param aState The current initialisation step
+ * @param aError A possible error
+ */	
+	{
+	_LOG_L1C3(_L8("CRawIPNifMain::InitialiseL [aState=%d ,aError=%d]"),
+		aState, aError);
+
+	if (aError != KErrNone)
+		{
+		_LOG_L2C2(_L8("  *** FAILED to initialise NIF *** Error =%d"),aError);
+	
+		// Initialise shutdown sequence
+		switch (aState)
+		{
+		case MControllerObserver::EBcaController:
+			ShutDown(MControllerObserver::EInitialised, aError);
+			break;
+		default:
+			_LOG_L2C3(_L8("ERROR CRawIPNifMain: Unknown state:%d in NIF: %S"), aState, &KNifName);
+			User::Leave(KErrUnknown);	
+			break;
+			}
+		return;
+		}
+	
+	switch (aState)
+		{
+	case MControllerObserver::EStart:
+		{
+		_LOG_L1C1(_L8("Calling Agent for TSY Config"));
+
+		GetAgent()->Notification(ENifToAgentEventTsyConfig, NULL);
+
+		_LOG_L1C1(_L8("Calling Agent for TSY Connection Speed"));
+		GetAgent()->Notification(ENifToAgentEventTsyConnectionSpeed, NULL);
+
+		//Read the port name from CommDB.
+		_LOG_L1C1(_L8("Attempting to read Port Name..."));
+		TBuf<2*KCommsDbSvrMaxColumnNameLength> columnName;
+		_LIT(KModemNameFormatText,"%s\\%s");
+		columnName.Format(KModemNameFormatText ,MODEM_BEARER,MODEM_PORT_NAME);
+		TName tempBuf;
+		GetAgent()->ReadDes(columnName,tempBuf);
+
+		_LOG_L1C2(_L8("Port details %S"),&tempBuf);
+		iBcaController->SetPort(tempBuf);
+
+		//Read the BCA name from CommDB.
+		columnName.Format(KModemNameFormatText ,MODEM_BEARER,BCA_STACK);
+        tempBuf.SetLength(0); // Clear the buffer in case the next ReadDes() fails
+		GetAgent()->ReadDes(columnName,tempBuf);
+		
+		_LOG_L1C2(_L8("bcaName details %S"),&tempBuf);
+		iBcaController->SetBcaStackAndName(tempBuf);
+
+		//Read IAPID from CommDB.
+		//IAP ID is used in BCA Ioctl method to set IapId for accessing CommDB.
+		TUint32 iapId(0);
+		columnName.Format(KModemNameFormatText ,IAP,COMMDB_ID);
+		GetAgent()->ReadInt(columnName,iapId);
+		_LOG_L1C2(_L8("IAP ID details %u"),iapId);
+		iBcaController->SetIapId(iapId);
+		
+		UpdateContextState(RPacketContext::EStatusActive, KErrNone);
+
+		iBcaController->StartL();
+		}
+		break;
+	case MControllerObserver::EBcaController:
+		_LOG_L1C1(_L8("  ***** NIF INITIALISED *****"));
+		LinkLayerUp();
+		break;
+	default:
+		_LOG_L2C3(_L8("ERROR CRawIPNifMain: Unknown state:%d in NIF: %S"), aState, &KNifName);
+		User::Leave(KErrUnknown);	
+		break;
+		}
+	}
+
+void CRawIPNifMain::ShutDown(TInitialisationState aState, TInt aError)
+/**
+ * This method controls the shutdown sequence of the different modules
+ * in the NIF. When a module completes all the shutdown tasks it will 
+ * call again this method with the new state. 
+ * 
+ * @param aState The current state
+ * @param aError A possible error (only during initialisation)
+ */	
+	{
+	_LOG_L1C3(_L8("CRawIPNifMain::ShutDown [aState=%d ,aError=%d]"),
+		aState, aError);
+
+	if (aError != KErrNone)
+		{
+		// NIF is shutting down due to an error. 
+		// The error code must be stored in order to call linklayer down 
+		// passing that value
+		iInitError = aError;
+		}
+
+	switch (aState)
+		{
+	case MControllerObserver::EInitialised:
+		iBcaController->Stop(aError);
+		break;
+	case MControllerObserver::EBcaController:
+		LinkLayerDown(iInitError);
+		break;
+	default:
+		_LOG_L2C1(_L8("ERROR CRawIPNifMain: Unknown Shutdown step"));
+		_BTT_PANIC(KNifName,KNifUnknownShutDownState);
+		break;
+		}
+	}
+
+MNifIfNotify* CRawIPNifMain::GetAgent()
+/**
+ * Returns a pointer to the MNifIfNotify class used to comunicate with the Agent 
+ * 
+ * @return a pointer to MNifIfNotify
+ */
+	{
+	return iNotify;
+	}
+	
+CProtocolIfBase* CRawIPNifMain::GetProtocolIf()
+/**
+ * Returns a pointer to the CIPv4ProtocolIf class
+ * 
+ * @return a pointer to a CProtocolIfBase derived class
+ */
+	{
+	return iProtocolIf; 
+	}
+
+CBcaIoController* CRawIPNifMain::GetBcaController()
+/**
+ * Returns a pointer to the CBcaIoController class
+ * 
+ * @return a pointer to CBcaIoController 
+ */
+	{
+	return iBcaController;
+	}
+
+void CRawIPNifMain::UpdateContextState(
+	RPacketContext::TContextStatus aState, TInt /*aError*/)
+/**
+ * Updates the state of the iContextState variable 
+ * 
+ * @param aState The new state
+ * @param aError A possible error
+ */
+	{
+	_LOG_L1C2(_L8("CRawIPNifMain::UpdateContextState [State=%d]"), aState);
+
+	// Note that we do not need to close the NIF down if there's been an
+	// error, as the context state machine will do this for us.
+	
+	iContextStatus = aState;
+	}
+
+void CRawIPNifMain::UpdateContextConfig(
+	RPacketContext::TContextConfigGPRS aConfig)
+/**
+ * Updates the state of the iContextConfig variable 
+ * 
+ * @param aConfig The new config
+ */
+	{
+	_LOG_L1C1(_L8("CRawIPNifMain::UpdateContextConfig"));
+
+	// Note that we do not need to close the NIF down if there's been an
+	// error, as the context state machine will do this for us.
+	
+	iContextConfig = aConfig;
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/src/RawIPNifMainFactory.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,82 @@
+// Copyright (c) 2002-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:
+// Implements the factory class which is used to instantiate the RAW IP NIF.
+// 
+//
+
+/**
+ @file
+*/
+
+#include <f32file.h>
+#include "RawIPNifMainFactory.h"
+#include "RawIPNifMain.h"
+#include "bttlog.h"
+
+void CRawIPNifMainFactory::InstallL()
+/**
+ * This function is pure virtual in CNifFactory, so we have to define it
+ * here. It is called by NifMan before NewInterfaceL().
+ * However, it doesn't do anything.
+ */
+	{
+	}
+
+CNifIfBase* CRawIPNifMainFactory::NewInterfaceL(const TDesC& aName) 
+/**
+ * Factory function which creates an instance of the RAW IP NIF.
+ *
+ * @param aName The name of the NIF
+ * @return A newly instantiated RAW IP NIF
+ */
+	{
+	return NewInterfaceL(aName, NULL);
+	}
+
+CNifIfBase* CRawIPNifMainFactory::NewInterfaceL(const TDesC& aName,MNifIfNotify* aNotify)
+/**
+ * Factory function which creates an instance of the RAW IP NIF.
+ *
+ * @param aName The name of the NIF
+ * @param aNotify supplies details from "IfParams" field in CommDb - not used in btt
+ * @return A newly instantiated RAW IP NIF
+ */
+	{
+#ifdef __BTT_LOGGING__
+	iTheLogger = CBttLogger::NewL(KNifSubDir, KRefFile, User::FastCounter());
+#endif // __BTT_LOGGING__
+
+	_LOG_L1C1(_L8("Raw IP.NIF logging started."));
+	_LOG_L1C2(_L8("         aNotify = %x"), aNotify);
+
+ 	CRawIPNifMain* s = new (ELeave) CRawIPNifMain(*this, aNotify, iTheLogger);
+	CleanupStack::PushL(s);
+	s->ConstructL(aName);
+	CleanupStack::Pop(s);
+
+	return s;
+	}
+
+TInt CRawIPNifMainFactory::Info(TNifIfInfo& /*aInfo*/, TInt /*aIndex*/) const
+/**
+ * This function is pure virtual in CNifFactory, so we have to define it
+ * here. However, it doesn't do anything, and is never called by NifMan.
+ *
+ * @param aInfo Ignored
+ * @param aIndex Ignored
+ * @return Always KErrNone
+ */
+	{
+	return KErrNone;
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/src/Receiver.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,106 @@
+// Copyright (c) 2002-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:
+// Implements the active object that controls the Read() requests.
+// 
+//
+
+/**
+ @file
+*/
+
+#include "Receiver.h"
+#include "Constants.h"
+
+
+CReceiver::CReceiver(CBcaIoController& aObserver, CBttLogger* aTheLogger)
+/**
+ * Constructor. Performs standard active object initialisation.
+ *
+ * @param aObserver Reference to the observer of this state machine
+ * @param aTheLogger The logging object
+ */
+	: CActive(EPriorityNormal), 
+	  iObserver(aObserver), 
+	  iTheLogger(aTheLogger)
+	{
+	CActiveScheduler::Add(this);
+	}
+
+CReceiver::~CReceiver()
+/**
+ * Destructor.
+ */
+	{
+	Cancel();
+	}
+
+void CReceiver::RunL()
+/**
+ *  Method called when read request completes. This will only be once the BCA has a full IP 
+ *  packet in its buffer.
+ */
+	{
+	_LOG_L1C2(_L8("CReceiver::RunL [iStatus=%d]"), iStatus.Int());
+
+	if (iStatus!=KErrNone)
+		{
+		if(iStatus == KErrNoMemory)
+			{
+			_LOG_L2C1(
+				_L8("WARNING! CReceiver: Read failed with KErrNoMemory"));
+			// Read operation failed!! Nif will re-issue the read request.
+			StartListening();
+			}
+		else 
+			{
+			_LOG_L2C1(_L8("WARNING! CReceiver: Read failed"));
+			iObserver.Stop(iStatus.Int());
+			}
+		return;
+		}
+
+	_LOG_L1C1(_L8("CReceiver: Data Packet Received"));
+
+	// Process Ip packet
+	iObserver.Process(iData);
+
+	// The packet received was processed. NIF can start listening
+	// for another one.
+	StartListening();
+
+	}
+
+void CReceiver::DoCancel()
+/**
+ *	Cancel active request
+ */
+	{
+	_LOG_L1C1(_L8("CReceiver::DoCancel"));
+
+	(iObserver.Bca())->CancelRead(); 
+	}
+
+void CReceiver::StartListening()
+/**
+ *  This method issues a Read request. This is the API used to receive 
+ *  packets from BCA.  
+ */
+	{
+	_LOG_L1C1(_L8("CReceiver::StartListening"));
+
+	// The BCA will complete this read once it has a full IP packet in its buffer.
+	(iObserver.Bca())->Read(iStatus, iData);
+
+	SetActive();
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/src/Sender.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,132 @@
+// Copyright (c) 2002-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:
+// Implements the active object that controls the Write() requests. 
+// 
+//
+
+/**
+ @file
+*/
+
+#include "Sender.h"
+#include "Constants.h"
+
+CSender::CSender(CBcaIoController& aObserver, CBttLogger* aTheLogger)
+/**
+ * Constructor. Performs standard active object initialisation.
+ *
+ * @param aObserver Reference to the observer of this state machine
+ */
+	: CActive(EPriorityNormal), 
+	  iObserver(aObserver),
+	  iTheLogger(aTheLogger)
+	{
+	CActiveScheduler::Add(this);
+	}
+
+CSender::~CSender()
+/**
+ * Destructor.
+ */
+	{
+	Cancel();
+	}
+
+void CSender::RunL()
+/**
+ * This method checks if any error occured in the write operation.  
+ */
+	{
+	_LOG_L1C2(_L8("CSender::RunL [iStatus=%d]"), iStatus.Int());
+
+	if (iStatus!=KErrNone)
+		{
+		if(iStatus == KErrNoMemory)
+			{
+			_LOG_L2C1(_L8("WARNING! CSender: Write failed with KErrNoMemory"));
+			_LOG_L2C1(_L8("WARNING! CSender: Ignoring packet!!!!"));
+			// Write operation failed!! Nif will ignore this packet.
+			iObserver.SendComplete();
+			}
+		else if (iStatus == KErrNotReady)
+			{
+			_LOG_L2C1(_L8("WARNING! CSender: Write failed with KErrNotReady"));
+			_LOG_L2C1(_L8("WARNING! CSender: Ignoring packet!!!!"));
+			// Write operation failed!! Nif will ignore this packet.
+			iObserver.SendComplete();
+			}
+		else
+			{
+			_LOG_L2C1(_L8("ERROR! CSender: Write failed!!!!"));
+			// Nif will shut down
+			iObserver.Stop(iStatus.Int());
+			}
+		return;
+		}
+
+	else
+		{
+		// The Ip packet was sent successfuly
+		_LOG_L1C1(_L8("***** CSender: Packet Sent."));
+		iObserver.SendComplete();
+		}
+	}
+
+void CSender::DoCancel()
+/**
+ *	Cancel active request
+ */
+	{
+	_LOG_L1C1(_L8("CSender::DoCancel"));
+
+	(iObserver.Bca())->CancelWrite(); 
+	}
+
+void CSender::Send(RMBufChain& aPdu)
+/**
+ * Copies the specified RMBufChain into a descriptor and sends it.
+ *
+ * @param aPdu The IP packet to be sent.
+ * @return KStopSending, or KErrArgument if the packet is too large.
+ */
+	{
+	_LOG_L1C1(_L8("CSender::Send"));
+
+	// Copy the IP portion of the RMBufChain to the buffer.
+	iSendBuffer.SetMax();
+	aPdu.CopyOut(iSendBuffer, aPdu.First()->Length());
+
+#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
+	iObserver.AddHeader(iSendBuffer);
+#endif // RAWIP_HEADER_APPENDED_TO_PACKETS
+
+	aPdu.Free();
+
+	SendBuffer(iSendBuffer);
+	}
+
+void CSender::SendBuffer(const TDesC8& aBuffer)
+/**
+ * Sends an IP packet, contained in the specified descriptor
+ *
+ * @param aBuffer The IP packet to send.
+ * @return Always KStopSending.
+ */
+	{
+	_LOG_L1C1(_L8("CSender::SendBuffer"));
+
+	// Finally, send the packet to BCA
+	(iObserver.Bca())->Write(iStatus, aBuffer);
+	SetActive();
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/version1/src/bttlog.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,210 @@
+// Copyright (c) 2002-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:
+// Implements CBttLogger.
+// 
+//
+
+/**
+ @file
+*/
+
+#include "bttlog.h"
+
+#ifdef __BTT_LOGGING__
+
+#ifdef __DEBUGRAWIPSERIALPORT__
+#include <e32svr.h>
+#endif
+
+//Enable this if you want time stamps for each log statements.
+//This is computation ineffective and not recommended.
+//#define __TIME_STAMP_ENABLED__
+
+CBttLogger* CBttLogger::NewL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId)
+/**
+ * Factory method for CBttLogger.
+ * 
+ * @param aSubDir The subdirectory of c:\logs\gprsbtt to log to.
+ * @param aFileName The filename to log to.
+ * @return Ownership of a new CBttLogger.
+ */
+	{
+	CBttLogger* self = new(ELeave) CBttLogger;
+	CleanupStack::PushL(self);
+	self->ConstructL(aTag, aFileName, aInstanceId);
+	CleanupStack::Pop(self);
+	return self;
+	}
+
+#ifdef __FLOG_ACTIVE
+void CBttLogger::ConstructL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId)
+#else
+void CBttLogger::ConstructL(const TDesC8&, const TDesC8&, const TUint32 aInstanceId)
+#endif
+/**
+ * 2nd-phase construction.
+ * Hurricane/Typhoon - we can log to a particular directory
+ */
+	{
+	iInstanceId = aInstanceId;
+	__FLOG_OPEN(aTag, aFileName);
+	}
+
+//#endif
+
+CBttLogger::CBttLogger()
+/**
+ * Constructor
+ */
+ 	{
+	}
+
+CBttLogger::~CBttLogger()
+/**
+ * Destructor
+ */
+	{
+	__FLOG_CLOSE;
+	}
+
+void CBttLogger::Write(const TDesC8& aText)
+/**
+ * Write an 8-bit descriptor to the log file
+ *
+ * @param aText The test to write
+ */	
+	{
+	TBuf8<KLogBufferSize> buf;
+	// put the instance id to identify which nif we are
+	// logging from
+	_LIT8(KInstanceFormat, "RawIp 0x%08X: ");
+	buf.Format(KInstanceFormat, iInstanceId);
+	
+#ifdef __TIME_STAMP_ENABLED__
+	// log to our own file in Hurricane/Typhoon
+	_LIT8(KTimeFormat, "%02d.%02d:%02d:%06d ");
+	
+	TTime now;
+	now.UniversalTime();
+	TDateTime dateTime;
+	dateTime = now.DateTime();
+	buf.AppendFormat(KTimeFormat, 
+		dateTime.Hour(), 
+		dateTime.Minute(), 
+		dateTime.Second(), 
+		dateTime.MicroSecond());
+#endif
+
+	buf.Append(aText);
+
+#ifdef __DEBUGRAWIPSERIALPORT__
+	TBuf<KLogBufferSize> buf2;
+	// TEMP: Do not print single % since appear as format char to RDebug::Print
+	for (TInt i = 0; i < buf.Length(); i++)
+		{
+		if (buf[i] == '%')
+			buf2.Append(_L("."));
+		else
+			buf2.Append(buf[i]);
+		}
+	RDebug::Print(buf2);
+#else
+	__FLOG(buf);
+#endif
+	}
+
+void CBttLogger::WriteFormat(TRefByValue<const TDesC8> aFmt, ...)
+/**
+ * Write an 8-bit format list to the log file
+ */	
+	{
+    VA_LIST list;
+    VA_START(list, aFmt);
+
+	// log to our own file in Hurricane/Typhoon
+	TBuf8<KLogBufferSize> buf;
+	buf.AppendFormatList(aFmt, list);
+	Write(buf);
+	}
+
+void CBttLogger::VerboseLeaveL(char* aFile, TInt aLine, TInt aReason)
+/**
+ * Make a verbose leave - write name of file and line number to the log just 
+ * before leaving.
+ *
+ * @param aFile The file we're leaving from.
+ * @param aLine The line number we're leaving from.
+ * @param aReason The leave code.
+ */
+	{
+	// only leave if non-zero value
+	if ( aReason == KErrNone )
+		{
+		return;
+		}
+
+	_LIT8(KLeavePrefix, "LEAVE: " );
+
+	TPtrC8 fullFileName((const TUint8*)aFile);
+	TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
+
+	TBuf8<256> buf;
+	buf.Append(KLeavePrefix);
+	buf.AppendFormat(_L8(" aReason=%d [file %S, line %d]"), aReason, &fileName, 
+		aLine);
+	Write(buf);
+
+	__FLOG_CLOSE;
+
+	// finally
+	User::Leave(aReason);
+	}
+
+void CBttLogger::VerbosePanic(char* aFile, 
+							   TInt aLine, 
+							   TInt aPanicCode, 
+							   TText8* aPanicName,
+							   const TDesC& aPanicCategory)
+/**
+ * Make a verbose panic - write name of file and line number to the
+ * log just before panicking.
+ *
+ * @param aFile The file that's panicking.
+ * @param aLine The line number that's panicking.
+ * @param aReason The panic code.
+ * @param aPanicName The text of the panic code.
+ * @param aPanicCategory The panic category.
+ */
+	{
+	_LIT8(KLeavePrefix, "PANIC: " );
+
+	TPtrC8 fullFileName((const TUint8*)aFile);
+	TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
+
+	TBuf8<256> buf;
+	buf.Append(KLeavePrefix);
+	buf.AppendFormat(_L8(" %d = %s [file %S, line %d]"), 
+		aPanicCode, 
+		aPanicName, 
+		&fileName, 
+		aLine);
+	Write(buf);
+
+	__FLOG_CLOSE;
+
+	// finally
+	User::Panic(aPanicCategory, aPanicCode);
+	}
+
+#endif // __BTT_LOGGING__

--- a/telephonyserver/etelmultimode/CETEL/mm_phone.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelmultimode/CETEL/mm_phone.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -4846,26 +4846,6 @@
 	Blank(EMobilePhoneTerminateAllCalls,aReqStatus);
 	}
 
-/************************************************************************************/
-//
-// Mobile Active Calls Termination
-//
-/************************************************************************************/
-
-EXPORT_C void RMobilePhone::TerminateActiveCalls(TRequestStatus& aReqStatus) const
-/**
-Terminates all active calls on all lines.
-Active calls are defined as those in either active or held state.
-This will not terminate calls in dialling or connecting state.
- 
-@param aReqStatus returns the result code after the asynchronous call completes.
-
-@capability NetworkServices
-*/
-    {
-    Blank(EMobilePhoneTerminateActiveCalls,aReqStatus);
-    }
-
 /***********************************************************************************/
 //
 // Auto Redial Functional Unit

--- a/telephonyserver/etelmultimode/DTsy/mmtsy.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelmultimode/DTsy/mmtsy.h	Wed Sep 01 12:40:21 2010 +0100
@@ -633,8 +633,6 @@
 	TInt NotifyAirTimeDurationChangeCancel(const TTsyReqHandle aTsyReqHandle);
 	TInt TerminateAllCalls(const TTsyReqHandle aTsyReqHandle);
 	TInt TerminateAllCallsCancel(const TTsyReqHandle aTsyReqHandle);
-    TInt TerminateActiveCalls(const TTsyReqHandle aTsyReqHandle);
-    TInt TerminateActiveCallsCancel(const TTsyReqHandle aTsyReqHandle);
 	TInt NotifySendNetworkServiceRequest(const TTsyReqHandle aTsyReqHandle, RMobilePhone::TMobilePhoneNotifySendSSOperation* aOperation, TDes8* aRequestComplete);
 	TInt NotifySendNetworkServiceRequestCancel(const TTsyReqHandle aTsyReqHandle);
 	TInt NotifyAllSendNetworkServiceRequest(const TTsyReqHandle aTsyReqHandle, RMobilePhone::TMobilePhoneNotifySendSSOperation* aOperation, TDes8* aRequestComplete);
@@ -808,7 +806,6 @@
 	TInt iNotifyNetworkInvScanChange;
 	TInt iNotifyAirTimeChangeChange;
 	TInt iTerminateAllCalls;
-	TInt iTerminateActiveCalls;
 	TInt iNotifySendNetworkServiceRequest;
 	TInt iClearBlacklist;
 	TInt iNotifyDTMFEvent;

--- a/telephonyserver/etelmultimode/DTsy/mmtsyphone.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelmultimode/DTsy/mmtsyphone.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -491,7 +491,6 @@
 	case EMobilePhoneSetCallForwardingStatus:
 	case EMobilePhoneProgramFeatureCode:
 	case EMobilePhoneTerminateAllCalls:
-	case EMobilePhoneTerminateActiveCalls:
 		ret=KReqModeFlowControlObeyed;
 		break;
 	default:
@@ -1553,9 +1552,6 @@
 		
 	case EMobilePhoneTerminateAllCalls:
 		return TerminateAllCalls(aTsyReqHandle);
-		
-    case EMobilePhoneTerminateActiveCalls:
-        return TerminateActiveCalls(aTsyReqHandle);
 			
 	case EMobilePhoneGetMailboxNumbers:
 		return GetMailboxNumbers (aTsyReqHandle, aPackage.Des1n());
@@ -2139,8 +2135,6 @@
 		return NotifyAirTimeDurationChangeCancel(aTsyReqHandle);
 	case EMobilePhoneTerminateAllCalls:
 		return TerminateAllCallsCancel(aTsyReqHandle);
-    case EMobilePhoneTerminateActiveCalls:
-        return TerminateActiveCallsCancel(aTsyReqHandle);
 	case EMobilePhoneNotifySendNetworkServiceRequest:
 		return NotifySendNetworkServiceRequestCancel(aTsyReqHandle);
 	case EMobilePhoneNotifyAllSendNetworkServiceRequest:
@@ -6073,25 +6067,6 @@
 	return KErrNone;
 	}
 
-TInt CPhoneDMmTsy::TerminateActiveCalls(const TTsyReqHandle aTsyReqHandle)
-    {
-    LOGTEXT(_L8("CPhoneDMmTsy::TerminateActiveCalls called"));
-    if (!iTerminateActiveCalls++)
-        {
-        //Just return KErrNone
-        ReqCompleted(aTsyReqHandle,KErrNone);
-        }
-    return KErrNone;
-    }
-    
-TInt CPhoneDMmTsy::TerminateActiveCallsCancel(const TTsyReqHandle aTsyReqHandle)
-    {
-    LOGTEXT(_L8("CPhoneDMmTsy::TerminateActiveCallsCancel called"));
-    RemoveDelayedReq(aTsyReqHandle);
-    ReqCompleted(aTsyReqHandle,KErrCancel);
-    return KErrNone;
-    }
-
  TInt CPhoneDMmTsy::NotifySendNetworkServiceRequest(const TTsyReqHandle aTsyReqHandle, RMobilePhone::TMobilePhoneNotifySendSSOperation* aOperation, TDes8* aRequestComplete)
  	{
  	LOGTEXT(_L8("CPhoneDMmTsy::NotifySendNetworkServiceRequest called"));

--- a/telephonyserver/etelmultimode/INC/ETELMM.H	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelmultimode/INC/ETELMM.H	Wed Sep 01 12:40:21 2010 +0100
@@ -15,7 +15,7 @@
 // Describes the MM ETel API - classes, methods and types.
 // 
 //
-   
+
 /**
  @file
  @publishedPartner
@@ -6813,13 +6813,7 @@
 
 	IMPORT_C void StorePreferredWlanSIDListL(TRequestStatus& aReqStatus, CMobilePhoneStoredWlanSIDList* aList) const;
 	IMPORT_C void NotifyPreferredWlanSIDListChange(TRequestStatus& aReqStatus) const;	
-
-	/***********************************************************************************/
-    //
-    // Terminate Active Calls
-    //
-    /***********************************************************************************/
-    IMPORT_C void TerminateActiveCalls(TRequestStatus& aReqStatus) const;
+		
 
 private:
 	CMobilePhonePtrHolder* iMmPtrHolder;

--- a/telephonyserver/etelmultimode/INC/secure/ETELMMCS.H	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelmultimode/INC/secure/ETELMMCS.H	Wed Sep 01 12:40:21 2010 +0100
@@ -19,7 +19,7 @@
 // associated with them.
 // 
 //
-   
+
 /**
  @file
 */
@@ -322,8 +322,7 @@
 	EMobilePhoneSendDTMFTones,                                            // 21026
 	EMobilePhoneStartDTMFTone,                                            // 21027
 	EMobilePhoneStopDTMFTone,                                             // 21028
-	EMobilePhoneTerminateAllCalls,                                        // 21029
-	EMobilePhoneTerminateActiveCalls                                      // 21030
+	EMobilePhoneTerminateAllCalls                                         // 21029
 	};
 
 enum
@@ -350,8 +349,7 @@
 	EMobilePhoneNotifyStopInDTMFStringCancel = EMobilePhoneNotifyStopInDTMFString + EMobileCancelOffset,                                       // 21523
 	EMobilePhoneReadDTMFTonesCancel = EMobilePhoneReadDTMFTones + EMobileCancelOffset,                                                         // 21524
 	EMobilePhoneSendDTMFTonesCancel = EMobilePhoneSendDTMFTones + EMobileCancelOffset,                                                         // 21526
-	EMobilePhoneTerminateAllCallsCancel = EMobilePhoneTerminateAllCalls + EMobileCancelOffset,                                                 // 21529
-	EMobilePhoneTerminateActiveCallsCancel = EMobilePhoneTerminateActiveCalls + EMobileCancelOffset                                            // 21530
+	EMobilePhoneTerminateAllCallsCancel = EMobilePhoneTerminateAllCalls + EMobileCancelOffset                                                  // 21529
 	};
 
 //

--- a/telephonyserver/etelmultimode/TETEL/te_EtelMM/TE_mmphone.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelmultimode/TETEL/te_EtelMM/TE_mmphone.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -86,7 +86,6 @@
 	TestMobileAPNControlListServiceStatus(mmPhone, reqStatus);
 	TestMobileAirTime(mmPhone, reqStatus);
 	TestTerminateAllCalls(mmPhone, reqStatus);
-	TestTerminateActiveCalls(mmPhone, reqStatus);
 	TestMobileAutoRedial(mmPhone, reqStatus);
 	TestMobilePersonalisation(mmPhone, reqStatus);
 	TestSmartCardHandling(mmPhone, reqStatus);
@@ -5660,29 +5659,7 @@
 	User::WaitForRequest(aReqStatus);
 	TEST(aReqStatus.Int() == KErrCancel);
 	}	
-
-void CTestPhone::TestTerminateActiveCalls(RMobilePhone& aPhone, TRequestStatus &aReqStatus)
-    {
-    //Test asynchronous TerminateActiveCalls - just returns KErrNone
-    
-    aPhone.TerminateActiveCalls(aReqStatus);
-    User::WaitForRequest(aReqStatus);
-    TEST(aReqStatus.Int()==KErrNone);
-    if (KErrNone == aReqStatus.Int())
-        INFO_PRINTF2(_L("Test %d - RMobilePhone::TerminateActiveCalls (async) passed"), iTestCount++);
-    else
-        ERR_PRINTF2(_L("Test %d - RMobilePhone::TerminateActiveCalls (async) failed"), iTestCount++);
-    //Test asynchronous TerminateActiveCalls & Cancel
-    
-    aPhone.TerminateActiveCalls(aReqStatus);
-    aPhone.CancelAsyncRequest(EMobilePhoneTerminateActiveCalls);
-    User::WaitForRequest(aReqStatus);
-    TEST(aReqStatus.Int() == KErrCancel);
-    if (KErrCancel == aReqStatus.Int())
-        INFO_PRINTF2(_L("Test %d - Cancelation of  RMobilePhone::TerminateActiveCalls (async) passed"), iTestCount++);
-    else
-        ERR_PRINTF2(_L("Test %d - Cancelation of  RMobilePhone::TerminateActiveCalls (async) failed"), iTestCount++);
-    }   
+	
 
 /**************************************************************/
 //

--- a/telephonyserver/etelmultimode/TETEL/te_EtelMM/TE_mmphone.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelmultimode/TETEL/te_EtelMM/TE_mmphone.h	Wed Sep 01 12:40:21 2010 +0100
@@ -101,7 +101,6 @@
 		   void TestMobileAPNControlListServiceStatus(RMobilePhone& aPhone, TRequestStatus &aReqStatus);
 		   void TestMobileAirTime(RMobilePhone& aPhone, TRequestStatus &aReqStatus);
 		   void TestTerminateAllCalls(RMobilePhone& aPhone, TRequestStatus &aReqStatus);
-		   void TestTerminateActiveCalls(RMobilePhone& aPhone, TRequestStatus &aReqStatus);
 		   void TestMobileAutoRedial(RMobilePhone& aPhone, TRequestStatus &aReqStatus);
 		   void TestMobilePersonalisation(RMobilePhone& aPhone, TRequestStatus &aReqStatus);
 		   void TestSmartCardHandling(RMobilePhone& aPhone, TRequestStatus &aReqStatus);

--- a/telephonyserver/etelmultimode/bwins/ETELMMU.def	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelmultimode/bwins/ETELMMU.def	Wed Sep 01 12:40:21 2010 +0100
@@ -671,5 +671,4 @@
 	??0TMobileCallInfoV8@RMobileCall@@QAE@XZ @ 670 NONAME ; RMobileCall::TMobileCallInfoV8::TMobileCallInfoV8(void)
 	??0TMobileDataCallParamsV8@RMobileCall@@QAE@XZ @ 671 NONAME ; RMobileCall::TMobileDataCallParamsV8::TMobileDataCallParamsV8(void)
 	??0TMobileHscsdCallParamsV8@RMobileCall@@QAE@XZ @ 672 NONAME ; RMobileCall::TMobileHscsdCallParamsV8::TMobileHscsdCallParamsV8(void)
-	?TerminateActiveCalls@RMobilePhone@@QBEXAAVTRequestStatus@@@Z @ 673 NONAME ; void RMobilePhone::TerminateActiveCalls(class TRequestStatus &) const

Binary file telephonyserver/etelmultimode/doc_pub/ETelMM_API_Design_Document.doc has changed

Binary file telephonyserver/etelmultimode/doc_pub/ETelMM_Architecture_Design.doc has changed

Binary file telephonyserver/etelmultimode/doc_pub/ETelMM_UseCase_Analysis.doc has changed

--- a/telephonyserver/etelmultimode/eabi/ETelmmU.DEF	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelmultimode/eabi/ETelmmU.DEF	Wed Sep 01 12:40:21 2010 +0100
@@ -993,5 +993,4 @@
 	_ZN11RMobileCall23TMobileDataCallParamsV8C2Ev @ 992 NONAME
 	_ZN11RMobileCall24TMobileHscsdCallParamsV8C1Ev @ 993 NONAME
 	_ZN11RMobileCall24TMobileHscsdCallParamsV8C2Ev @ 994 NONAME
-	_ZNK12RMobilePhone20TerminateActiveCallsER14TRequestStatus @ 995 NONAME

--- a/telephonyserver/etelmultimode/group/etelmm_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-// Copyright (c) 2007-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:
-//
-
-
-"\sf\os\cellularsrv\telephonyserver\etelmultimode\TETEL\te_EtelMM\TE_mmLocationServices.ini"-"c:\testdata\configs\TE_mmLocationServices.ini"
-
-"\sf\os\cellularsrv\telephonyserver\etelmultimode\TETEL\te_EtelMM\TE_EtelMM.script"-"c:\testdata\scripts\TE_EtelMM.script"
-"\sf\os\cellularsrv\telephonyserver\etelmultimode\TETEL\te_EtelMM\TE_EtelMM_LCS.script"-"c:\testdata\scripts\TE_EtelMM_LCS.script"

Binary file telephonyserver/etelpacketdata/doc_pub/ETel_Packet_API_Design.doc has changed

--- a/telephonyserver/etelpacketdata/group/etelpckt_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-
-"\sf\os\cellularsrv\telephonyserver\etelpacketdata\Te_EtelPacket\te_etelpacket.ini"-"c:\testdata\configs\te_etelpacket.ini"
-"\sf\os\cellularsrv\telephonyserver\etelpacketdata\Te_EtelPacket\Te_EtelPacket.script"-"c:\testdata\scripts\Te_EtelPacket.script"
-"\sf\os\cellularsrv\telephonyserver\etelpacketdata\Te_EtelPacket\Te_EtelPacket_no_adaptive_tcp_receive_window_size.script"-"c:\testdata\scripts\Te_EtelPacket_no_adaptive_tcp_receive_window_size.script"

--- a/telephonyserver/etelserverandcore/EtelRecorder/playback/inc/tipclookup.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelserverandcore/EtelRecorder/playback/inc/tipclookup.h	Wed Sep 01 12:40:21 2010 +0100
@@ -11,7 +11,7 @@
 // Contributors:
 //
 // Description:
-// ipclookup.h   
+// ipclookup.h
 // 
 //
 
@@ -356,7 +356,6 @@
 		{21027, _L8("EMobilePhoneStartDTMFTone")},
 		{21028, _L8("EMobilePhoneStopDTMFTone")},
 		{21029, _L8("EMobilePhoneTerminateAllCalls")},
-		{21030, _L8("EMobilePhoneTerminateActiveCalls")},
 		{21500, _L8("EMobileCallActivateCCBSCancel")},
 		{21501, _L8("EMobileCallAnswerISVCancel")},
 		{21502, _L8("EMobileCallAnswerMultimediaCallAsVoiceCancel")},
@@ -380,7 +379,6 @@
 		{21524, _L8("EMobilePhoneReadDTMFTonesCancel")},
 		{21526, _L8("EMobilePhoneSendDTMFTonesCancel")},
 		{21529, _L8("EMobilePhoneTerminateAllCallsCancel")},
-		{21530, _L8("EMobilePhoneTerminateActiveCallsCancel")},
 		{22000, _L8("EMobileConferenceCallGetMobileCallInfo")},
 		{22001, _L8("EMobilePhoneEnumerateAPNEntries")},
 		{22002, _L8("EMobilePhoneGetAPNname")},

--- a/telephonyserver/etelserverandcore/SETEL/ET_CORE.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelserverandcore/SETEL/ET_CORE.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,18 +13,11 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ET_CORETraces.h"
-#endif
-
 #include "ET_SSTD.H"
 #include "ETBUFFER.H"
 #include <f32file.h>
 #include "etsvr_slots.h"
 #include "et_phone_util.h"
-
 //
 //
 // CFaxBase
@@ -186,7 +179,7 @@
 //	This is for all object inherit fron CSubSessionBase
 //
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CCALLBASE_DTOR_1, "~CCallBase");
+	LOGTEXT("~CCallBase");
 	}
 
 EXPORT_C TInt CCallBase::CancelService(const TInt aIpc,const TTsyReqHandle aTsyReqHandle)
@@ -333,7 +326,7 @@
 // if is owner then set to EUnOwned
 //
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CCALLBASE_CLOSESUBSESSIONPREPROCESSING_1, "CCallBase::CloseSubSessionPreProcessing() - about to create dummy session");
+	LOGTEXT("CCallBase::CloseSubSessionPreProcessing() - about to create dummy session");
 	CreateDummySession(aSession,aSubSessionHandle);
 	RCall::TOwnershipStatus owner=CheckOwnershipBySession(aSession,aSubSessionHandle);
 	if (owner==RCall::EOwnershipOwnedByThisClient)
@@ -681,7 +674,7 @@
 //	D'Tor
 //
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CLINEBASE_DTOR_1, "~CLineBase");
+	LOGTEXT("~CLineBase");
 	}
 
 EXPORT_C TInt CLineBase::CancelService(const TInt aIpc,const TTsyReqHandle aTsyReqHandle)
@@ -793,7 +786,7 @@
 // 
 //
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CLINEBASE_CLOSESUBSESSIONPREPROCESSING_1, "CLineBase::CloseSubSessionPreProcessing() - about to create dummy session");
+	LOGTEXT("CLineBase::CloseSubSessionPreProcessing() - about to create dummy session");
 	CreateDummySession(aSession,aSubSessionHandle);
 	FlushReqs(aSession,aSubSessionHandle);
 	}
@@ -869,7 +862,7 @@
 //	This is for all object inherit fron CSubSesissionBase
 //
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CPHONEBASE_DTOR_1, "~CPhoneBase");
+	LOGTEXT("~CPhoneBase");
 	}
 
 //
@@ -1058,7 +1051,7 @@
 //	Add reqEntry to the 'active list'
 //
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBASE_ADDREQTOACTIVE_1, "CPhoneBase::AddReqToActive with TsyHandle of %d", aReqEntry->iTsyReqHandle);
+	LOGTEXT2("CPhoneBase::AddReqToActive with TsyHandle of %d", aReqEntry->iTsyReqHandle);
 	iReqActiveList.AddLast(*aReqEntry);
 	}
 
@@ -1067,7 +1060,7 @@
 //	Add entry to the 'wait list'
 //
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBASE_ADDREQTOWAITING_1, "CPhoneBase::AddReqToWaiting with TsyHandle of %d", aReqEntry->iTsyReqHandle);
+	LOGTEXT2("CPhoneBase::AddReqToWaiting with TsyHandle of %d", aReqEntry->iTsyReqHandle);
 	iReqWaitList.AddLast(*aReqEntry);
 	}
 
@@ -1117,7 +1110,7 @@
 //  Find if any active request if so create a dummy session
 //
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CPHONEBASE_CLOSESUBSESSIONPREPROCESSING_1, "CPhoneBase::CloseSubSessionPreProcessing");
+	LOGTEXT("CPhoneBase::CloseSubSessionPreProcessing");
 	CreateDummySession(aSession,aSubSessionHandle);
 	FlushReqs(aSession,aSubSessionHandle);
 	}
@@ -1277,7 +1270,7 @@
 // Increase iFlowControlCnt
 //
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBASE_FLOWCONTROLINC_1, "Incrementing Flow Control from %d to %d", iFlowControlCnt, iFlowControlCnt+1);
+	LOGTEXT3("Incrementing Flow Control from %d to %d", iFlowControlCnt, iFlowControlCnt+1);
 	iFlowControlCnt++;
 	}
 
@@ -1287,7 +1280,7 @@
 //
 	{
 	__ASSERT_ALWAYS((iFlowControlCnt>0),Fault(EEtelFaultNegativeFlowcontrolCount));
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBASE_FLOWCONTROLDEC_1, "Decrementing Flow Control from %d to %d", iFlowControlCnt, iFlowControlCnt-1);
+	LOGTEXT3("Decrementing Flow Control from %d to %d", iFlowControlCnt, iFlowControlCnt-1);
 	iFlowControlCnt--;
 	}

--- a/telephonyserver/etelserverandcore/SETEL/ET_MAN.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelserverandcore/SETEL/ET_MAN.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -18,12 +18,6 @@
 */
 
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ET_MANTraces.h"
-#endif
-
 #include <e32svr.h>
 #include <f32file.h>
 #include "ET_SSTD.H"
@@ -256,18 +250,22 @@
 	TInt found=iTsyModulesCon->FindByName(findHandle,name,foundName);	// Is already loaded?
 	if(found==KErrNone)
 		{	// The TSY is already loaded, we'll just open, and bump up the reference count.
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_LOADPHONEMODULEL_1, "LoadPhoneModuleL\tTSY already loaded - inc ref count");
+		LOGTEXT("LoadPhoneModuleL\tTSY already loaded - inc ref count");
 		CPhoneFactoryBase* s=REINTERPRET_CAST(CPhoneFactoryBase*,iTsyModulesCon->At(findHandle));
 		s->Open();
 		return s;
 		}
 
 	RLibrary lib;
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_LOADPHONEMODULEL_2, "Loading %S", aFileName);
+#ifdef _DEBUG
+	TBuf8<128> buf;
+	buf.Copy(aFileName);
+#endif // _DEBUG
+	LOGTEXT2("Loading %S", &buf);
 	TInt r=lib.Load(aFileName);
 	if (r!=KErrNone)
 		User::Leave(r);
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_LOADPHONEMODULEL_3, "Loaded %S", aFileName);
+	LOGTEXT2("Loaded %S", &buf);
 	TCleanupItem libClose(CloseLibrary,&lib);
 	CleanupStack::PushL(libClose);
 
@@ -278,12 +276,12 @@
 	TPhoneFactoryBaseNewL libEntry=(TPhoneFactoryBaseNewL)lib.Lookup(1);
 	if (libEntry==NULL)
 		User::Leave(KErrBadLibraryEntryPoint);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_LOADPHONEMODULEL_4, "About to get CPhoneFactoryBase ptr");
+	LOGTEXT("About to get CPhoneFactoryBase ptr");
 	CPhoneFactoryBase* s=NULL;
 	s=(*libEntry)();	// libEntry may leave.
 	if(s==NULL)
 		User::Leave(KErrNoMemory);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_LOADPHONEMODULEL_5, "Got CPhoneFactoryBase ptr");
+	LOGTEXT("Got CPhoneFactoryBase ptr");
 	TRAPD(error, s->ConstructL(lib));
 	if(error)
 		{
@@ -473,9 +471,9 @@
 				TName newName(tsyName);
 				newName.Append(KDash);
 				newName.Append(infoToMatch.iName);	// Create unique name
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_RENAMEDUPLICATEPHONENAME_1, "new name = %S", newName);
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_RENAMEDUPLICATEPHONENAME_2, "tsy name = %S", tsyName);
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_RENAMEDUPLICATEPHONENAME_3, "old name = %S", infoToMatch.iName);
+				LOGTEXT2("new name = %S", &newName);
+				LOGTEXT2("tsy name = %S", &tsyName);
+				LOGTEXT2("old name = %S", &infoToMatch.iName);	
 				TRAPD(ret,StoreDuplicateNameL(tsyName,infoToMatch.iName,newName));// even if this returns with 
 									//KErrAlreadyExists, carry on searching for another match
 				if (ret!=KErrNone && ret!=KErrAlreadyExists)

--- a/telephonyserver/etelserverandcore/SETEL/ET_PHONE.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelserverandcore/SETEL/ET_PHONE.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -17,12 +17,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ET_PHONETraces.h"
-#endif
-
 #include "ET_SSTD.H"
 #include "et_record.h"
 #include "et_phone_util.h"
@@ -74,7 +68,7 @@
 
 void CReqEntry::CompleteAndDeque(TInt aError)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREQENTRY_COMPLETEANDDEQUE_1, "CReqEntry::CompleteAndDeque");
+	LOGTEXT("CReqEntry::CompleteAndDeque");
 	// if client does not interested in this request do not completed
 	if (iClientInterested) 
 		{		
@@ -201,7 +195,7 @@
 		iRead=0;
 	iOverFlow=EFalse;
 	iBufferFull=EFalse;
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBUFFER_INCREAD_1, "ETel:\tiRead incremented to %d", iRead);
+	LOGTEXT2("ETel:\tiRead incremented to %d", iRead);
 	}
 
 void CBuffer::IncWrite()
@@ -223,7 +217,7 @@
 			iOverFlow=ETrue;
 			}
 		}
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBUFFER_INCWRITE_1, "ETel:\tiWrite incremented to %d", iWrite);
+	LOGTEXT2("ETel:\tiWrite incremented to %d", iWrite);
 	}
 
 TUint8* CBuffer::CurrentSlotData1(TWhichSlot aWhichSlot) const
@@ -355,12 +349,12 @@
 	{
 	if (iDestroyDummySubSession==NULL)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CREATEDUMMYSESSIONOBJECTL_1, "CDestroyDummySubSession object does not already exist and will be created.");
+		LOGTEXT("CDestroyDummySubSession object does not already exist and will be created.");
 		iDestroyDummySubSession = CDestroyDummySubSession::NewL(aTelSession->TelServer(),this);
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CREATEDUMMYSESSIONOBJECTL_2, "CDestroyDummySubSession object already exists and will not be created");
+		LOGTEXT("CDestroyDummySubSession object already exists and will not be created");
 		}
 
 	}
@@ -371,14 +365,14 @@
 // function is called.
 //
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CREATEDUMMYSESSION_1, "CreateDummySession() with iDestroyDummySubSession = %x", iDestroyDummySubSession);
+	LOGTEXT2("CreateDummySession() with iDestroyDummySubSession = %x", iDestroyDummySubSession);
 	iCreateDummy=aCreateDummy;
 	
 	if (iDestroyDummySubSession->iOpen == EFalse)
 		{
 		if ( IsActiveReq(aSession,aSubSessionHandle) || aCreateDummy)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CREATEDUMMYSESSION_2, "About to create dummy session");
+			LOGTEXT("About to create dummy session");
 			__ASSERT_ALWAYS(aSession!=NULL,Fault(EEtelFaultBadTelSessionPointer));
 			CObject* theObj=this;
 			while(theObj->Owner())
@@ -393,7 +387,7 @@
 			// has been previously allocated upon the CTelObject creation (by calling
 			// CreateDummySessionObjectL() )
 			iTelServer->Inc();
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CREATEDUMMYSESSION_3, "Added a Dummy Session, producing server's session count of %d", iTelServer->Count());
+			LOGTEXT2("Added a Dummy Session, producing server's session count of %d", iTelServer->Count());
 				
 			iDestroyDummySubSession->iTelServer = iTelServer;
 			iDestroyDummySubSession->iTelObject = this;
@@ -452,7 +446,7 @@
 			ret=ETrue;
 			}
 		}
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_ISACTIVEREQ_1, "IsActiveReq found %d active reqs", iActiveReqCount);
+	LOGTEXT2("IsActiveReq found %d active reqs", iActiveReqCount);
 	return ret;
 	}
 
@@ -463,7 +457,7 @@
 // Only go through the list once set the count to zero at start to count number of requests 
 //
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CANCELACTIVEREQ_1, "Entered CancelActiveReq");
+	LOGTEXT("Entered CancelActiveReq");
 	CReqEntry* reqEntry=NULL;
 	TDblQueIter<CReqEntry> iter(PhoneOwner()->ReqActiveList());
 	while(reqEntry=iter++,reqEntry!=NULL) // go through the list from begin to end
@@ -476,7 +470,7 @@
 				{
 				if (reqEntry->iPlacedRequest)
 					{
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CANCELACTIVEREQ_2, "Calling Cancel Service ActiveReq TsyReq=%d", reqEntry->iTsyReqHandle);
+					LOGTEXT2("Calling Cancel Service ActiveReq TsyReq=%d", reqEntry->iTsyReqHandle);
 					reqEntry->iCancelFnCalled=ETrue;
 					CancelService(reqEntry->iFunction,reqEntry->iTsyReqHandle);
 					
@@ -502,7 +496,7 @@
 					}
 				else
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CANCELACTIVEREQ_3, "Destroying request");
+					LOGTEXT("Destroying request");
 					DestroyReq(reqEntry);
 					CheckAndDestroyDummySubSession();
 					}
@@ -957,7 +951,7 @@
 //
 	{
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_GENERALREQ_1, "CTelObject::GeneralReq - IPC=%d", aMessage.Function());
+	LOGTEXT2("CTelObject::GeneralReq - IPC=%d", aMessage.Function());
 	RECORD_IPC(aMessage,aSession,this,aFromFlowControlResume);
 	if (aFromFlowControlResume && !aFromFlowControlResume){	; } // avoid compiler warning when ETEL_RECORDER is not defined
 	
@@ -1127,7 +1121,7 @@
 	TInt error = ResolveError(updatedReqEntry->iSession,aError);		// set error as either low or high byte
 
 	ipc=updatedReqEntry->iFunction;
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTELOBJECT_REQCOMPLETED_1, "CTelObject::ReqCompleted, IPC=%d, TsyHandle=%d, Error=%d", ipc, aTsyReqHandle, aError);
+	LOGTEXT4("CTelObject::ReqCompleted, IPC=%d, TsyHandle=%d, Error=%d", ipc, aTsyReqHandle, aError);
 
 	TReqMode reqMode = updatedReqEntry->iReqMode;
 	TBool ret=EFalse;
@@ -1275,7 +1269,7 @@
 	if (iActiveReqCount)
 		{
 		iActiveReqCount--;
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CHECKANDDESTROYDUMMYSUBSESSION_1, "In CheckAndDestroyDummySubSession(), iActiveReqCount down to %d", iActiveReqCount);
+		LOGTEXT2("In CheckAndDestroyDummySubSession(), iActiveReqCount down to %d", iActiveReqCount);
 		if ((iActiveReqCount==0) && (iCreateDummy==FALSE))
 			{
 			__ASSERT_ALWAYS(iDestroyDummySubSession!=NULL,Fault(EEtelFaultBadTelSessionPointer));
@@ -1492,7 +1486,7 @@
 //
 	{
 	__ASSERT_ALWAYS(aReqEntry!=NULL,Fault(EEtelFaultCompleteReqWithoutReqEntry));
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_WRITEBACKANDCOMPLETEREQ_1, "CTelObject::WriteBackAndCompleteReq");
+	LOGTEXT("CTelObject::WriteBackAndCompleteReq");
 	TInt basicMessageType = (aReqEntry->iMessage.Int1() & ~KPriorityClientReq);
 
 	switch (basicMessageType)
@@ -1839,7 +1833,7 @@
 	__ASSERT_ALWAYS(aReqEntry!=NULL,Fault(EEtelFaultCallTsyServiceWithoutReqPackage));
 	TTsyReqHandle tsyReqHandle=aReqEntry->iTsyReqHandle;
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSUBSESSIONEXTBASE_SERVICEEXTFUNC_1, "Entered ServiceExtFunc with TSY handle %d", tsyReqHandle);
+	LOGTEXT2("Entered ServiceExtFunc with TSY handle %d", tsyReqHandle);
 	TInt ret=KErrNone;
 
 	TInt basicMessageType = aMessage.Int1() & ~(KPriorityClientReq);
@@ -2039,7 +2033,7 @@
 	{
 	if (iLibUnloader)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CPHONEFACTORYBASE_DTOR_1, "About to call iLibUnloader");
+		LOGTEXT("About to call iLibUnloader");
 		iLibUnloader->Call();
 		}
 	}

--- a/telephonyserver/etelserverandcore/SETEL/ET_SES.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelserverandcore/SETEL/ET_SES.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -18,16 +18,11 @@
 */
 
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ET_SESTraces.h"
-#endif
-
 #include "ET_SSTD.H"
 #include "e32svr.h"
 #include "et_record.h"
 
+
 #define DOUBLE_COLON		_L("::")
 #define ETEL_NAME			_L("Etel")
 #define TSY_EXTENSION		_L(".TSY")
@@ -103,7 +98,7 @@
 		CObject* theObj=NULL;
 		TInt count=iObjectIx->Count();
 
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSESSION_DTOR_1, "CTelSession::~CTelSession iObjectIx->Count()=%d", count);
+		LOGTEXT2("CTelSession::~CTelSession iObjectIx->Count()=%d", count);
 		
 		for(TInt i=0;i<count;i++)
 			{
@@ -135,14 +130,14 @@
 					}
 				}
 			}
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSESSION_DTOR_2, "Delete iObjectIx");
+		LOGTEXT("Delete iObjectIx");
 		delete iObjectIx;
 		}
 
 
 	if (iTsyModulesIx)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSESSION_DTOR_3, "Delete TsyModulesIx");
+		LOGTEXT("Delete TsyModulesIx");
 		delete iTsyModulesIx;
 		}
 	UnsetPriorityClient();
@@ -167,7 +162,7 @@
 // Handle messages for this session
 //
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSESSION_SERVICEL_1, "CTelSession::Service Called, IPC: %d", aMessage.Function());
+	LOGTEXT2("CTelSession::Service Called, IPC: %d", aMessage.Function());
 
 	iMessage=aMessage;
 
@@ -818,7 +813,7 @@
 	TRAP(res,(newObject=iPhoneManager->OpenPhoneFromFactoryL(phoneFactory,name)));
 	if(res!=KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSESSION_NEWTELOBJECT_1, "Open Phone from Factory returned %d", res);
+		LOGTEXT2("Open Phone from Factory returned %d", res);
 		if(newObject)
 			newObject->TelObjectClose();
 		else

--- a/telephonyserver/etelserverandcore/SETEL/ET_SSTD.H	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelserverandcore/SETEL/ET_SSTD.H	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -34,6 +34,10 @@
 #include "ETELEXT.H"
 #endif
 
+#if !defined(__SLOGGER_H__)
+#include "ET_SLOG.H"
+#endif
+
 #if !defined(__ET_EMERGENCYCLIENT_H__)
 #include "et_emergencyclient.h"
 #endif

--- a/telephonyserver/etelserverandcore/SETEL/ET_SVR.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelserverandcore/SETEL/ET_SVR.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ET_SVRTraces.h"
-#endif
-
 #include <e32svr.h>
 #include "ET_SSTD.H"
 #include <e32cmn.h>
@@ -63,7 +57,7 @@
 // Destroy the tel object and the the server
 //
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDESTROYDUMMYSUBSESSION_RUNL_1, "In RunL and about to Destroy the Tel Objects");
+	LOGTEXT("In RunL and about to Destroy the Tel Objects");
 	iOpen=EFalse;
 	iTelObject->TelObjectClose();
 	}
@@ -103,18 +97,18 @@
 	{
 	if((aMessage.Type()==EOptional) || (aMessage.Type()==EGraceful))
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_CFMESSAGESHUTDOWN_1, "CTelServer received Shutdown. Scheduling shutdown when there's no sessions.");
+		LOGTEXT("CTelServer received Shutdown. Scheduling shutdown when there's no sessions.");
 		iShutGracefully = ETrue;
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_CFMESSAGESHUTDOWN_2, "Session Count is %d", iSessionCount);
+		LOGTEXT2("Session Count is %d", iSessionCount);
 		if(iSessionCount==0)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_CFMESSAGESHUTDOWN_3, "Calling AsynOneShot::Call()");
+			LOGTEXT("Calling AsynOneShot::Call()");
 			iSch->Call();
 			}
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_CFMESSAGESHUTDOWN_4, "CTelServer received Shutdown option EUnGraceful. Not supported, ignoring.");
+		LOGTEXT("CTelServer received Shutdown option EUnGraceful. Not supported, ignoring.");
 		}
 	}
 
@@ -149,7 +143,7 @@
 // Stop the Active Scheduler (after any libraries have been unloaded)
 //
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSCHEDULERSTOP_RUNL_1, "In RunL and about to stop CActiveScheduler");
+	LOGTEXT("In RunL and about to stop CActiveScheduler");
 	CActiveScheduler::Stop();
 	}
 
@@ -196,7 +190,7 @@
 
 CTelServer::~CTelServer()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_DTOR_1, "CTelServer::~CTelServer()");
+	LOGTEXT("CTelServer::~CTelServer()");
 	delete iChannelHandler;
 	delete iPhoneManager;
 	delete iSch;
@@ -242,19 +236,19 @@
 // Decrement a session stop scheduler if no session
 //
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_DEC_1, "Entered CTelServer::Dec");
+	LOGTEXT("Entered CTelServer::Dec");
 	__ASSERT_ALWAYS((iSessionCount>0),Fault(EEtelFaultNegativeSessionCount));
 	iSessionCount--;
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_DEC_2, "Session Count is %d", iSessionCount);
+	LOGTEXT2("Session Count is %d", iSessionCount);
 	// If iShutGracefully==ETrue the Rootserver has informed us that it wants us to shutdown
 	// next time there is no sessions. If it is EFalse no such notification has arrived and 
 	// ETel continues running even though there are no sessions.
 	if((iSessionCount==0) && (iShutGracefully))
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_DEC_3, "Calling AsynOneShot::Call()");
+		LOGTEXT("Calling AsynOneShot::Call()");
 		iSch->Call();
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_DEC_4, "Exited from CTelServer::Dec");
+	LOGTEXT("Exited from CTelServer::Dec");
 	}
 
 TBool CTelServer::IsPriorityClient(const CTelSession* aSession) const
@@ -449,9 +443,9 @@
 	// RThread::SetProtected is superceded by the security model
 	
 	__UHEAP_MARK;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDERS, ETELSERVERTHREAD_1, "----------New Log----------\015\012");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDERS, ETELSERVERTHREAD_2, "Entered ETel Server thread");
-	OstTraceDef0(OST_TRACE_CATEGORY_PRODUCTION, TRACE_BORDERS, ETELSERVERTHREAD_3, "Entered ETel Server thread");
+	LOGTEXT("----------New Log----------\015\012");
+	LOGTEXT("Entered ETel Server thread");
+	LOGTEXTREL("Entered ETel Server thread");
 	
 	CTrapCleanup* pT;
 	if ((pT=CTrapCleanup::New())==NULL)
@@ -477,17 +471,17 @@
 		Fault(EEtelFaultSvrStartServer);
 		}
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDERS, ETELSERVERTHREAD_4, "ETel:\tMeeting rendezvous\n");
+	LOGTEXT("ETel:\tMeeting rendezvous\n");
 	RThread::Rendezvous(KErrNone);
 	CTelScheduler::Start();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDERS, ETELSERVERTHREAD_5, "ETel:\tScheduler has been stopped\n");
+	LOGTEXT("ETel:\tScheduler has been stopped\n");
 
 	delete pT;
 	delete pServer;
 	delete pScheduler;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDERS, ETELSERVERTHREAD_6, "ETel:\tAbout to exit ETel thread function\n");
-	OstTraceDef0(OST_TRACE_CATEGORY_PRODUCTION, TRACE_BORDERS, ETELSERVERTHREAD_7, "ETel:\tAbout to exit ETel thread function\n");
+	LOGTEXT("ETel:\tAbout to exit ETel thread function\n");
+	LOGTEXTREL("ETel:\tAbout to exit ETel thread function\n");
 	__UHEAP_MARKEND;
 
 	return(KErrNone);
@@ -590,8 +584,8 @@
 	20610,		//range is 20610-20610 inclusive
 	20611,		//range is 20611-20618 inclusive
 	20619,		//range is 20619-20999 inclusive
-	21000,		//range is 21000-21030 inclusive
-	21031,		//range is 21031-21499 inclusive
+	21000,		//range is 21000-21029 inclusive
+	21030,		//range is 21030-21499 inclusive
 	21500,		//range is 21500-21508 inclusive
 	21509,		//range is 21509-21509 inclusive
 	21510,		//range is 21510-21511 inclusive
@@ -602,8 +596,8 @@
 	21525,		//range is 21525-21525 inclusive
 	21526,		//range is 21526
 	21527,		//range is 21527-21528 inclusive
-	21529,		//range is 21529-21530 inclusive
-	21531,		//range is 21531-21999 inclusive
+	21529,		//range is 21529
+	21530,		//range is 21530-21999 inclusive
 	22000,		//range is 22000-22003 inclusive
 	22004,		//range is 22004
 	22005,		//range is 22005-22008 inclusive

--- a/telephonyserver/etelserverandcore/TETEL/CapTestFramework/EtelMessage.csv	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelserverandcore/TETEL/CapTestFramework/EtelMessage.csv	Wed Sep 01 12:40:21 2010 +0100
@@ -350,7 +350,6 @@
 ETest349,21027,CTestEtelServer,NetworkServices
 ETest350,21028,CTestEtelServer,NetworkServices
 ETest351,21029,CTestEtelServer,NetworkServices
-ETest1059,21030,CTestEtelServer,NetworkServices
 ETest352,21500,CTestEtelServer,NetworkServices
 ETest353,21501,CTestEtelServer,NetworkServices
 ETest354,21502,CTestEtelServer,NetworkServices
@@ -374,7 +373,6 @@
 ETest372,21524,CTestEtelServer,NetworkServices
 ETest373,21526,CTestEtelServer,NetworkServices
 ETest374,21529,CTestEtelServer,NetworkServices
-ETest1060,21530,CTestEtelServer,NetworkServices
 ETest375,22000,CTestEtelServer,ReadDeviceData
 ETest376,22001,CTestEtelServer,ReadDeviceData 
 ETest377,22002,CTestEtelServer,ReadDeviceData

--- a/telephonyserver/etelserverandcore/TETEL/TE_ETEL/TE_Etel.iby	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelserverandcore/TETEL/TE_ETEL/TE_Etel.iby	Wed Sep 01 12:40:21 2010 +0100
@@ -30,7 +30,7 @@
 file=ABI_DIR\DEBUG_DIR\dstdnc.tsy               SYSTEM_BINDIR\dstdnc.tsy
 file=ABI_DIR\DEBUG_DIR\didenb.tsy               SYSTEM_BINDIR\didenb.tsy
 file=ABI_DIR\DEBUG_DIR\dstaticcall.tsy          SYSTEM_BINDIR\dstaticcall.tsy
-
+file=ABI_DIR\DEBUG_DIR\faxstb.dll               SYSTEM_BINDIR\faxstb.dll
 
 
 // TE_Etel Test harnesses

Binary file telephonyserver/etelserverandcore/doc_pub/ETel_Core_API_Design.doc has changed

Binary file telephonyserver/etelserverandcore/doc_pub/ETel_Telephony_Server_Design.doc has changed

--- a/telephonyserver/etelserverandcore/group/ETEL.MMP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelserverandcore/group/ETEL.MMP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -56,7 +56,6 @@
 USERINCLUDE   	../SETEL
 USERINCLUDE   	../CETEL
 USERINCLUDE   	../EtelRecorder/recorder/inc
-USERINCLUDE   	../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 LIBRARY       	euser.lib c32root.lib commsfw.lib efsrv.lib

--- a/telephonyserver/etelserverandcore/group/etel.iby	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelserverandcore/group/etel.iby	Wed Sep 01 12:40:21 2010 +0100
@@ -19,7 +19,7 @@
 REM Epoc Telephony Layer
 
 #include <commdb.iby>
-
+#include <fax.iby>
 
 file=ABI_DIR\DEBUG_DIR\etel.dll           SYSTEM_BINDIR\ETel.dll
 data=EPOCROOT##epoc32\data\z\private\101F7988\etel.cmi private\101F7988\etel.cmi

--- a/telephonyserver/etelserverandcore/group/etel_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-
-"\sf\os\cellularsrv\telephonyserver\etelserverandcore\TETEL\TE_ETEL\epocetel.ini"-"c:\testdata\configs\epocetel.ini"
-"\sf\os\cellularsrv\telephonyserver\etelserverandcore\TETEL\TE_ETEL\TE_Etel.script"-"c:\testdata\scripts\TE_Etel.script"
-

--- a/telephonyserver/etelserverandcore/group/telephony.iby	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelserverandcore/group/telephony.iby	Wed Sep 01 12:40:21 2010 +0100
@@ -23,6 +23,6 @@
 #include <mmtsy.iby>
 #include <phbksync.iby>
 #include <etelsat.iby>
-
+#include <fax.iby>
 
 #endif

--- a/telephonyserver/etelserverandcore/group/telephony_etel.mrp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserver/etelserverandcore/group/telephony_etel.mrp	Wed Sep 01 12:40:21 2010 +0100
@@ -11,7 +11,6 @@
 source \sf\os\cellularsrv\telephonyserver\etelserverandcore\INC
 source \sf\os\cellularsrv\telephonyserver\etelserverandcore\SETEL
 source \sf\os\cellularsrv\telephonyserver\etelserverandcore\TETEL
-source \sf\os\cellularsrv\telephonyserver\etelserverandcore\traces
 
 binary	\sf\os\cellularsrv\telephonyserver\etelserverandcore\group	all
 exports	\sf\os\cellularsrv\telephonyserver\etelserverandcore\group

--- a/telephonyserver/etelserverandcore/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyserver/etelserverandcore/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[GROUP]TRACE_BORDERS=0xde
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDERS[0xDE]_ETELSERVERTHREAD_1=0x1
-[TRACE]TRACE_BORDERS[0xDE]_ETELSERVERTHREAD_2=0x2
-[TRACE]TRACE_BORDERS[0xDE]_ETELSERVERTHREAD_3=0x3
-[TRACE]TRACE_BORDERS[0xDE]_ETELSERVERTHREAD_4=0x4
-[TRACE]TRACE_BORDERS[0xDE]_ETELSERVERTHREAD_5=0x5
-[TRACE]TRACE_BORDERS[0xDE]_ETELSERVERTHREAD_6=0x6
-[TRACE]TRACE_BORDERS[0xDE]_ETELSERVERTHREAD_7=0x7
-[TRACE]TRACE_BORDER[0x84]_CCALLBASE_CLOSESUBSESSIONPREPROCESSING_1=0x2
-[TRACE]TRACE_BORDER[0x84]_CCALLBASE_DTOR_1=0x1
-[TRACE]TRACE_BORDER[0x84]_CLINEBASE_CLOSESUBSESSIONPREPROCESSING_1=0x4
-[TRACE]TRACE_BORDER[0x84]_CLINEBASE_DTOR_1=0x3
-[TRACE]TRACE_BORDER[0x84]_CPHONEBASE_CLOSESUBSESSIONPREPROCESSING_1=0x6
-[TRACE]TRACE_BORDER[0x84]_CPHONEBASE_DTOR_1=0x5
-[TRACE]TRACE_BORDER[0x84]_CPHONEFACTORYBASE_DTOR_1=0x8
-[TRACE]TRACE_BORDER[0x84]_CTELOBJECT_REQCOMPLETED_1=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CBUFFER_INCREAD_1=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CBUFFER_INCWRITE_1=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CDESTROYDUMMYSUBSESSION_RUNL_1=0x22
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEBASE_ADDREQTOACTIVE_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEBASE_ADDREQTOWAITING_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEBASE_FLOWCONTROLDEC_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEBASE_FLOWCONTROLINC_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_LOADPHONEMODULEL_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_LOADPHONEMODULEL_2=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_LOADPHONEMODULEL_3=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_LOADPHONEMODULEL_4=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_LOADPHONEMODULEL_5=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_RENAMEDUPLICATEPHONENAME_1=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_RENAMEDUPLICATEPHONENAME_2=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_RENAMEDUPLICATEPHONENAME_3=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CREQENTRY_COMPLETEANDDEQUE_1=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CSUBSESSIONEXTBASE_SERVICEEXTFUNC_1=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CANCELACTIVEREQ_1=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CANCELACTIVEREQ_2=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CANCELACTIVEREQ_3=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CHECKANDDESTROYDUMMYSUBSESSION_1=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CREATEDUMMYSESSIONOBJECTL_1=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CREATEDUMMYSESSIONOBJECTL_2=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CREATEDUMMYSESSION_1=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CREATEDUMMYSESSION_2=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CREATEDUMMYSESSION_3=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_GENERALREQ_1=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_ISACTIVEREQ_1=0x15
-[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_WRITEBACKANDCOMPLETEREQ_1=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_CTELSCHEDULERSTOP_RUNL_1=0x27
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_CFMESSAGESHUTDOWN_1=0x23
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_CFMESSAGESHUTDOWN_2=0x24
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_CFMESSAGESHUTDOWN_3=0x25
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_CFMESSAGESHUTDOWN_4=0x26
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_DEC_1=0x29
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_DEC_2=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_DEC_3=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_DEC_4=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_DTOR_1=0x28
-[TRACE]TRACE_INTERNALS[0x88]_CTELSESSION_DTOR_1=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_CTELSESSION_DTOR_2=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_CTELSESSION_DTOR_3=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_CTELSESSION_NEWTELOBJECT_1=0x21
-[TRACE]TRACE_INTERNALS[0x88]_CTELSESSION_SERVICEL_1=0x20

Binary file telephonyserver/etelsimtoolkit/doc_pub/(U)SAT_ETel_API_Specification.doc has changed

--- a/telephonyserver/etelsimtoolkit/group/etelsat_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-"\sf\os\cellularsrv\telephonyserver\etelsimtoolkit\tetel\Te_EtelSat\TE_EtelSat.script"-"c:\testdata\scripts\TE_EtelSat.script"
-

--- a/telephonyserverplugins/common_tsy/buildgroups/g_group_with_dispatcher/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-// 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:
-//
-
-#include "../../group/bld.inf"
-
-
-
-

--- a/telephonyserverplugins/common_tsy/buildgroups/g_group_without_dispatcher/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-// 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:
-//
-
-#define CTSY_G_BUILD_WITHOUT_DISPATCHER
-
-//ROM
-ctsy.iby          /epoc32/rom/include/ctsy.iby
-
-#include "../../group/bld.inf"
-
-
-
-

--- a/telephonyserverplugins/common_tsy/buildgroups/g_group_without_dispatcher/ctsy.iby	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef CTSY_IBY
-#define CTSY_IBY
-
-//*** commontsy ***
-
-file=ABI_DIR\DEBUG_DIR\COMMONTSY.DLL			Sys\Bin\COMMONTSY.DLL
-
-// c32.exe SID is 101F7989
-data=ZPRIVATE\101f7989\operatorVariants.ini		private\101f7989\operatorVariants.ini
-
-//*** customapi ***
-file=ABI_DIR\DEBUG_DIR\CUSTOMAPI.DLL        Sys\Bin\CUSTOMAPI.DLL
-
-//*** phonetsy ***
-
-file=ABI_DIR\DEBUG_DIR\PHONETSY.TSY        Sys\Bin\PHONETSY.TSY
-
-// System State plugin
-#include <ctsysystemstateplugin.iby>
-
-#endif

--- a/telephonyserverplugins/common_tsy/commontsy/exportinc/serviceapi/MmTsy_IPCdefs.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/exportinc/serviceapi/MmTsy_IPCdefs.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 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"
@@ -15,7 +15,7 @@
 *
 */
 
-   
+
 
 
 /**
@@ -156,20 +156,22 @@
 	ECtsyPhoneCellInfoComp,
 	ECtsyPhoneCellInfoIndReq,
 	ECtsyPhoneCellInfoIndComp,
-	ECtsyPhoneCellInfoInd,
+	ECtsyPhoneCellInfoInd,	// 5
 	ECtsyUpdateLifeTimeReq,
 	ECtsyUpdateLifeTimeComp,
 	ECtsyPacketMbmsInitialiseContextReq,
 	ECtsyPacketMbmsInitialiseContextComp,
-	ECtsyPacketMbmsContextNotifyConfigChanged,
+	ECtsyPacketMbmsContextNotifyConfigChanged, // 10
 	ECtsyPhoneTerminateAllCallsReq,
 	ECtsyPhoneTerminateAllCallsComp,
 	// RMobilePhone::NotifySendNetworkServiceRequest
 	ECtsyPhoneSendNetworkServiceRequestReq,
 	ECtsyPhoneSendNetworkServiceRequestIndReq,
-	ECtsyPhoneSendNetworkServiceRequestInd,
-	ECtsyPhoneTerminateActiveCallsReq,
-    ECtsyPhoneTerminateActiveCallsComp
+	ECtsyPhoneSendNetworkServiceRequestInd,	//15
+	ECtsyPhoneGetPreferredNetworksReq,
+	ECtsyPhoneGetPreferredNetworksComp,
+	ECtsyPhoneStorePreferredNetworksListReq,
+	ECtsyPhoneStorePreferredNetworksListComp
 	};
 #else
 enum TCtsyIpc
@@ -179,16 +181,18 @@
 	ECtsyPhoneCellInfoIndReq,
 	ECtsyPhoneCellInfoIndComp,
 	ECtsyUpdateLifeTimeReq,
-	ECtsyUpdateLifeTimeComp,
+	ECtsyUpdateLifeTimeComp,	// 5
 	ECtsyPacketMbmsInitialiseContextReq,
 	ECtsyPacketMbmsInitialiseContextComp,
 	ECtsyPacketMbmsContextNotifyConfigChanged,
 	ECtsyPhoneTerminateAllCallsReq,
-	ECtsyPhoneTerminateAllCallsComp,
+	ECtsyPhoneTerminateAllCallsComp,	//10
 	ECtsyPhoneSendNetworkServiceRequestInd,
 	ECtsyGetPhoneIdV2Comp,
-    ECtsyPhoneTerminateActiveCallsReq,
-    ECtsyPhoneTerminateActiveCallsComp
+	ECtsyPhoneGetPreferredNetworksReq,
+	ECtsyPhoneGetPreferredNetworksComp,
+	ECtsyPhoneStorePreferredNetworksListReq,	 //15
+	ECtsyPhoneStorePreferredNetworksListComp
 	};
 #endif //USING_CTSY_DISPATCHER

--- a/telephonyserverplugins/common_tsy/commontsy/group/commontsy.mmh	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/group/commontsy.mmh	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -181,8 +181,6 @@
 
 USERINCLUDE     ../../licenseetsy_lib/inc
 
-USERINCLUDE ../traces
-
 // Default system include paths for OS extension layer modules.
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 #ifdef USING_DISPATCHER
@@ -190,6 +188,7 @@
 	
 LIBRARY       euser.lib    // EPOC basics
 LIBRARY	      bafl.lib	   // Arrays
+LIBRARY       flogger.lib  // Logging
 LIBRARY       hash.lib     // For sha functions
 LIBRARY       efsrv.lib    // File handling
 LIBRARY	      centralrepository.lib  //Central Repository
@@ -207,3 +206,5 @@
 LIBRARY sysutil.lib // for using sysutil API for phone identity
 #endif
 
+#include <comms-infras/commsdebugutility.mmh>
+

--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmstorage/cmmphonebookstoretsy.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmstorage/cmmphonebookstoretsy.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -25,6 +25,7 @@
 #include <mpbutil.h>
 #include <ctsy/rmmcustomapi.h>
 #include "cmmgsmphonestorageprivateutility.h"
+#include <ctsy/tflogger.h>
 #include "MmTsy_timeoutdefs.h"
 
 //  FORWARD DECLARATIONS

--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmcalltsy.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmcalltsy.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -24,6 +24,7 @@
 #include <et_phone.h>
 #include <etelmm.h>
 #include "MmTsy_timeoutdefs.h"
+#include <ctsy/tflogger.h>
 
 // FORWARD DECLARATIONS
 class CMmPhoneTsy;

--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmconferencecalltsy.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmconferencecalltsy.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -24,6 +24,7 @@
 #include <etelmm.h>
 #include <et_phone.h>
 #include "MmTsy_timeoutdefs.h"
+#include <ctsy/tflogger.h>
 #include "cmmcalltsy.h"
 
 // FORWARD DECLARATIONS

--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmlinetsy.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmlinetsy.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -24,6 +24,7 @@
 #include <et_tsy.h>
 #include <et_phone.h>
 #include <etelmm.h>
+#include <ctsy/tflogger.h>
 
 // FORWARD DECLARATIONS
 class CMmPhoneTsy;

--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmnettsy.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmnettsy.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 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"
@@ -329,6 +329,23 @@
         	CMmDataPackage* aDataPackage,
         	TInt aErrorValue );                        
 
+        /**
+         * Completes an outstanding GetPreferredNetworksListPhase1L,
+         * which retrieves Preferred Networks List from LTSY Layer
+         *          
+         * @param aError: Error value
+         * @param aDataPackage: contains Preferred Networks List from LTSY layer
+         */
+        void CompleteGetPreferredNetworksListPhase1(TInt aError, CMmDataPackage* aDataPackage);
+
+        /**
+         * Completes an outstanding StorePreferredNetworksListL,
+         * which stores Preferred Networks List to LTSY layer
+         *          
+         * @param aError: Error value
+         */
+        void CompleteStorePreferredNetworksList(TInt aError);
+        
     private:
     
         /**
@@ -922,8 +939,68 @@
          *         
          * @return KErrNone
          */
-        TInt GetCurrentActiveUSimApplicationCancel();        
+        TInt GetCurrentActiveUSimApplicationCancel();   
+        
+        /**
+         * Returns minimum size of a buffer to retreive the current Preferred Networks List from SIM
+         * 
+         * @param aTsyReqHandle: Request handle
+         * @param aId: pointer to the client id
+         * @param aBufSize: pointer to the size of buffer
+         * @return : Error value.
+         */
+        TInt GetPreferredNetworksListPhase1L(const TTsyReqHandle aTsyReqHandle, 
+            											 RMobilePhone::TClientId const* aId, TInt* aBufSize);
+        
+        /**
+         * Copies the current Preferred Networks List into the given buffer
+         * 
+         * @param aTsyReqHandle: Request handle
+         * @param aId: pointer to the client id
+         * @param aBuffer: pointer to the buffer for retrieving the Preferred Networks List
+         * @return TInt: Error value.
+         */
+        TInt GetPreferredNetworksListPhase2(const TTsyReqHandle aTsyReqHandle, 
+            											 RMobilePhone::TClientId const* aId, TDes8* aBuffer);
+        
+        /**
+         * Stores the Preferred Networks List into the SIM
+         * 
+         * @param aTsyReqHandle: Request handle
+         * @param aBuffer: pointer to the buffer for the Preferred Networks List to be stored
+         * @return TInt: Error value.
+         */
+        TInt StorePreferredNetworksListL(const TTsyReqHandle aTsyReqHandle, TDes8* aBuffer);
+        
+        /**
+         * Cancels the request for Getting Preferred Networks List
+         * 
+         * @param aTsyReqHandle: Request handle
+         * @return : Error value.
+         */
+        TInt GetPreferredNetworksListCancel(const TTsyReqHandle aTsyReqHandle);
 
+        /**
+         * Subscribes the notification for storing Preferred networks List
+         * 
+         * @return TInt: Error value.
+         */
+        TInt NotifyStorePreferredNetworksListChange();
+        
+        /**
+         * Cancels the notification request for storing Preferred Networks List
+         * 
+         * @param aTsyReqHandle: Request handle
+         * @return: Error value.
+         */
+        TInt NotifyStorePreferredNetworksListChangeCancel(const TTsyReqHandle aTsyReqHandle);
+
+        /**
+         * Completes the notification request for storing Preferred Networks List
+         * 
+         */
+        void CompleteNotifyStorePreferredNetworksListChange();
+        
     protected:  // Data
         //None
 
@@ -1081,7 +1158,27 @@
         /**
          * Pointer to the current active usim application.       
          */         
-        RMobilePhone::TAID* iRetCurrentActiveUSimApplication;            
+        RMobilePhone::TAID* iRetCurrentActiveUSimApplication;
+      
+		/*
+		*  Not owned, buffer size for reading preferred networks list
+		*/
+		TInt* iBufSizeGetPrefPLMN;
+
+		/*
+		* Copy of client ID for reading preferred networks list
+		*/
+		RMobilePhone::TClientId* iClientIdGetPrefPLMN; 
+
+		/*
+		* Streamed contents of the retrieved preferred networks list
+		*/
+		CBufBase* iGetPrefPLMNList;
+
+		/*
+		* Client supplied preferred networks list for storing to the SIM
+		*/
+		CMobilePhoneStoredNetworkList* iStorePrefPLMNList;
     };
 
 #endif // CMMNETSY_H

--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonefactorytsy.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonefactorytsy.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 2008-2010 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:
- *
- */
+* Copyright (c) 2008-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:
+*
+*/
 
 
 
@@ -56,7 +56,7 @@
         void ConstructL();
 
         /**
-         * Returns a new Phone instance
+         * Returns Phone instance
          */
         CPhoneBase* NewPhoneL( const TDesC& aName );
 
@@ -103,21 +103,12 @@
         TBool IsSupported( const TInt aFunctionalUnit );    
 #ifdef USING_CTSY_DISPATCHER     
     protected:
-        
-        TBool UsingCtsyDispatcher();
+    	
+    	TBool UsingCtsyDispatcher();
+    	MLtsyFactoryBase* LoadLibraryL();
 #endif // #endif USING_CTSY_DISPATCHER
-        MLtsyFactoryBase* LoadLibraryL();
-        
-    private:
-        void InitCtsyL(MLtsyFactoryBase* aLtsyFactory);
-        TPtrC ReadDllNameFromConfigL(const TDesC& aConfigData);
-        TUint ReadDllUidFromConfigL(const TDesC& aConfigData);
-        static void ReadConfigFileL(RBuf* aConfigData);
-        static TPtrC GetValueForKeyL(const TDesC& aKeysValues, const TDesC& aKey);
-
     private:    // Data
     
-        MLtsyFactoryBase* iLtsyFactory;
         /**
          * Pointer to PhoneTSY
          * Not owned.
@@ -129,8 +120,17 @@
          * Not owned.
          */
         MMessageRouter* iMessageRouter;
-
+                
+        /**
+         * Pointer to LTSY factory, used to retrieve LTSY and SIM ATK TSY
+         * Not owned.
+         */
+        MLtsyFactoryBase* iLtsyFactory;
+#ifdef USING_CTSY_DISPATCHER        
         RLibrary iLoadedLib; //can either be LicenseeTsy or CtsyDispatcher dlls
+#endif // #ifdef USING_CTSY_DISPATCHER
     };
 
 #endif // CMMPHONEFACTORYTSY_H
+
+// End of File

--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonetsy.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonetsy.h	Wed Sep 01 12:40:21 2010 +0100
@@ -31,6 +31,7 @@
 #include "cmmmessagemanagerbase.h"
 #include "MmTsy_timeoutdefs.h"
 #include <ctsy/serviceapi/mmtsy_defaults.h>
+#include <ctsy/tflogger.h>
 #include "CMmPrivateUtility.h"
 #include <ctsy/serviceapi/ctsydomainpskeys.h>
 #include <ctsy/serviceapi/mctsysatservice.h>
@@ -123,10 +124,13 @@
             EMultimodePhoneNotifyNWSelectionSettingChange, 
             EMultimodePhoneNotifyNWTimeInfoChange, //15
             EMultimodePhoneSelectNetwork, 
-            EMultimodePhoneSetNWSelectionSetting, 
+            EMultimodePhoneSetNWSelectionSetting,
+            EMultimodePhoneGetPreferredNetworksPhase1,
+            EMultimodePhoneStorePreferredNetworksList,
+            EMultimodePhoneNotifyStorePreferredNetworksListChange, // 20
             EMultimodePhoneSetCallForwardingStatus, 
             EMultimodePhoneGetIdentityServiceStatus,
-            EMultimodePhoneSetCallBarringStatus, //20
+            EMultimodePhoneSetCallBarringStatus,
             EMultimodePhoneSetSSPassword,
             EMultimodePhoneSetCallWaitingStatus,
             EMultimodePhoneSetFdnSetting,
@@ -201,7 +205,6 @@
             EMultimodePhoneNotifyAllSendNetworkServiceRequest,
             EMultimodePhoneGetCurrentActiveUSimApplication,             
             EMultimodePhoneTerminateAllCalls,
-            EMultimodePhoneTerminateActiveCalls,
             EMultimodePhoneNotifyDtmfEvent, 
             // ATTENTION:: Declare constant for those requests that need
             // own request handle record in iTsyReqHandleStore above the
@@ -1414,13 +1417,6 @@
         void CompleteTerminateAllCallsReq(TInt aErrorCode);
         
         /**
-         * Complete TerminateActiveCalls request
-         * 
-         * @param aErrorCode The result of the request
-         */
-        void CompleteTerminateActiveCallsReq(TInt aErrorCode);
-        
-        /**
         * Notify change of battery info
         *          
         * @param aErrorCode error code
@@ -2181,14 +2177,6 @@
           */
         TInt TerminateAllCallsL(const TTsyReqHandle aTsyReqHandle);
 
-        /**
-          * Terminate all active calls simultaneously
-          * 
-          * @param aTsyReqHandle TSY req handle
-          * @return Error value
-          */
-        TInt TerminateActiveCallsL(const TTsyReqHandle aTsyReqHandle);
-        
         /*
          * This function return availability of Hareware Resource Manager in the current ROM
          *

--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/MmTsy_numberOfSlots.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/MmTsy_numberOfSlots.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 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"
@@ -63,6 +63,7 @@
 const TUint8 KMmPhoneNotifySendNetworkServiceRequestSlots = 2;
 const TUint8 KMmPhoneNotifyAllSendNetworkServiceRequestSlots = 2;
 const TUint8 KMmPhoneCellInfoChangeSlots = 2;
+const TUint8 KMmPhoneStorePreferredNetworksListChangeSlots = 2;
 
 //CMmLineTsy
 const TUint8 KMmLineStatusChangeSlots = 2;

--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/MmTsy_timeoutdefs.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmutility/MmTsy_timeoutdefs.h	Wed Sep 01 12:40:21 2010 +0100
@@ -15,7 +15,7 @@
 *
 */
 
-  
+
 
 #ifndef MMTSY_TIMEOUTDEFS_H
 #define MMTSY_TIMEOUTDEFS_H
@@ -44,8 +44,6 @@
 
     // All Calls Termination
     const TUint8 KMmPhoneTerminateAllCallsTimeOut = 30;
-    // Active Calls Termination
-    const TUint8 KMmPhoneTerminateActiveCallsTimeOut = 30;
     
     //NET
     const TUint8 KMmPhoneSelectNetworkTimeOut = 165;
@@ -108,7 +106,7 @@
     const TUint8 KMmCallAnswerTimeOut = 50;
     const TUint8 KMmCallAnswerCallBackTimeOut = 180;
     const TUint8 KMmCallHangUpTimeOut = 60;
-    const TUint8 KMmCallHoldTimeOut = 30;
+    const TUint8 KMmCallHoldTimeOut = 5; // Increase timeout to 30 seconds in future.
     const TUint8 KMmCallResumeTimeOut = 3;
     const TUint8 KMmCallSwapTimeOut = 3;
     const TUint8 KMmCallDeflectCallTimeOut = 10;

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomSecurityTsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomSecurityTsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,13 +16,8 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CMmCustomSecurityTsyTraces.h"
-#endif
-
 #include "CMmCustomSecurityTsy.h"
+#include <ctsy/tflogger.h>
 #include "cmmphonegsmwcdmaext.h"
 #include <ctsy/serviceapi/mmtsy_ipcdefs.h>
 #include <ctsy/pluginapi/cmmdatapackage.h>
@@ -37,7 +32,7 @@
     CMmCustomTsy* aMmCustomTsy, 
     CMmPhoneTsy* aMmPhoneTsy )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_CONSTRUCTL_1, "TSY: CMmCustomSecurityTsy::ConstructL");
+TFLOGSTRING("TSY: CMmCustomSecurityTsy::ConstructL");
     iMmCustomTsy = aMmCustomTsy;
     iMmPhoneTsy = aMmPhoneTsy;
 
@@ -63,7 +58,7 @@
     CMmCustomTsy* aMmCustomTsy, 
     CMmPhoneTsy* aPhoneTsy )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_NEWL_1, "TSY: CMmCustomSecurityTsy::NewL");
+TFLOGSTRING("TSY: CMmCustomSecurityTsy::NewL");
     CMmCustomSecurityTsy* self = new (ELeave) CMmCustomSecurityTsy();
 
     CleanupStack::PushL( self );
@@ -337,7 +332,7 @@
     TInt aReqHandleType, 
     TInt aError )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_COMPLETE_1,  "CustomTSY: CMmCustomSecurityTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError );
+TFLOGSTRING3( "CustomTSY: CMmCustomSecurityTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError );
     // All possible TSY req handle types are listed in the
     // switch case below.
     switch ( aReqHandleType )
@@ -375,7 +370,7 @@
         {
         return KErrServerBusy;
         }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_ISBLOCKED_1,  "TSY: CMmPhoneTsy::IsBlocked - Code to check: %d", *aCode );
+TFLOGSTRING2( "TSY: CMmPhoneTsy::IsBlocked - Code to check: %d", *aCode );
 
     switch ( *aCode )
         {
@@ -501,7 +496,7 @@
     CMmDataPackage aPackage;
     aPackage.PackData( &iCodeID, &iSecCode );
 
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_CHECKSECURITYCODEL_1,  "TSY: CMmCustomSecurityTsy::CheckSecurityCodeL iSecCode: %S", iSecCode );
+TFLOGSTRING2( "TSY: CMmCustomSecurityTsy::CheckSecurityCodeL iSecCode: %S", &iSecCode );
     TInt retValue ( iMmPhoneTsy->MessageManager()->HandleRequestL( 
         ECustomCheckSecurityCodeIPC, &aPackage ) );
 
@@ -528,7 +523,7 @@
 void CMmCustomSecurityTsy::CompleteCheckSecurityCode(
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_COMPLETECHECKSECURITYCODE_1, "TSY: CMmCustomSecurityTsy::CompleteCheckSecurityCode - Error code: %d", aErrorCode );
+TFLOGSTRING2("TSY: CMmCustomSecurityTsy::CompleteCheckSecurityCode - Error code: %d", aErrorCode );
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         ESecurityRequestTypeCheckSecurityCode );
@@ -582,7 +577,7 @@
 //
 void CMmCustomSecurityTsy::CompleteCheckSecurityCodeCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_COMPLETECHECKSECURITYCODECANCEL_1, "TSY: CMmCustomSecurityTsy::CompleteCheckSecurityCodeCancel");
+TFLOGSTRING("TSY: CMmCustomSecurityTsy::CompleteCheckSecurityCodeCancel");
     }
 
 // ---------------------------------------------------------------------------
@@ -601,7 +596,7 @@
     iMmPhoneTsy->MessageManager()->HandleRequestL( 
         ECustomSecurityDeliverCodeIPC, &aPackage );
 
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_DELIVERCODEL_1,  "TSY: CMmCustomSecurityTsy::DeliverCodeL iSecCode: %S", iSecCode );
+TFLOGSTRING2( "TSY: CMmCustomSecurityTsy::DeliverCodeL iSecCode: %S", &iSecCode );
 
     return KErrNone;
     }
@@ -652,7 +647,7 @@
 void CMmCustomSecurityTsy::CompleteDisablePhoneLock(
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_COMPLETEDISABLEPHONELOCK_1, "TSY: CMmCustomSecurityTsy::CompleteDisablePhoneLock - Error code: %d", aErrorCode );
+TFLOGSTRING2("TSY: CMmCustomSecurityTsy::CompleteDisablePhoneLock - Error code: %d", aErrorCode );
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         ESecurityRequestTypeDisablePhoneLock );

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CMmCustomTsyTraces.h"
-#endif
-
 #include "CMmCustomTsy.h"
 #include "CMmCustomGsmExt.h"
 #include "cmmcalllist.h"
@@ -31,6 +25,7 @@
 #include "CMmCommonStaticUtility.h"
 #include "CMmSimLockTsy.h"
 #include "MmTsy_conf.h"
+#include <ctsy/tflogger.h>
 #include "cmmpblist.h"
 #include "cmmphonebookstoretsy.h"
 #include "CMmPacketTsy.h"
@@ -60,7 +55,7 @@
 void CMmCustomTsy::ConstructL(
     CMmPhoneTsy* aMmPhoneTsy )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_1, "TSY: CMmCustomTsy::ConstructL");
+TFLOGSTRING("TSY: CMmCustomTsy::ConstructL");
     iMmPhoneTsy = aMmPhoneTsy;
 
     iMmCustomExtInterface = CMmCustomGsmExt::NewL( aMmPhoneTsy, this );
@@ -103,7 +98,7 @@
     // update/receive Icc Call forward information
     if( iMmPhoneTsy->NosBootState()->iSIMReady )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_2, "TSY: CMmCustomTsy::ConstructL -- GET ICC call forward indicators");
+TFLOGSTRING("TSY: CMmCustomTsy::ConstructL -- GET ICC call forward indicators");       
         // Get Icc cfis values from LTSY
         Phone()->MessageManager()->HandleRequestL( 
             ECustomGetIccCallForwardingStatusIPC );
@@ -113,20 +108,20 @@
  	// if not, query again
     if ( !iMmPhoneTsy->GetHomeZoneParamsChecked() )
     	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_3, "TSY: CMmCustomTsy::ConstructL - GetHomeZoneParamsChecked()");
+TFLOGSTRING("TSY: CMmCustomTsy::ConstructL - GetHomeZoneParamsChecked()");    	
         CMmSIMTsy* simCustomTsy = NULL;
         simCustomTsy = ( CMmSIMTsy* )GetSIMTsyPtr();
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_4, "TSY: CMmCustomTsy::ConstructL - pointer created");
+TFLOGSTRING("TSY: CMmCustomTsy::ConstructL - pointer created");
 	
         if ( simCustomTsy )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_5, "TSY: CMmCustomTsy::ConstructL - CheckViagHomeZoneParamsL()");
+TFLOGSTRING("TSY: CMmCustomTsy::ConstructL - CheckViagHomeZoneParamsL()");
             simCustomTsy->CheckViagHomezoneParamsL();
             iMmPhoneTsy->SetHomeZoneParamsChecked( ETrue );
             }
         else
         	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_6, "TSY: CMmCustomTsy::ConstructL - CheckViagHomeZoneParamsL() False");
+TFLOGSTRING("TSY: CMmCustomTsy::ConstructL - CheckViagHomeZoneParamsL() False");        		
 			iMmPhoneTsy->SetHomeZoneParamsChecked( EFalse );
         	}
     	}     
@@ -135,7 +130,7 @@
 CMmCustomTsy* CMmCustomTsy::NewL(
     CMmPhoneTsy* aMmPhoneTsy )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NEWL_1, "TSY: CMmCustomTsy::NewL");
+TFLOGSTRING("TSY: CMmCustomTsy::NewL");
     CMmCustomTsy* mmCustomTsy = new ( ELeave ) CMmCustomTsy();
     CleanupClosePushL( *mmCustomTsy );
     mmCustomTsy->ConstructL( aMmPhoneTsy );
@@ -146,7 +141,7 @@
 
 CMmCustomTsy::~CMmCustomTsy()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_DTOR_1, "TSY: CMmCustomTsy::~CMmCustomTsy");
+TFLOGSTRING("TSY: CMmCustomTsy::~CMmCustomTsy");
 
 	iFeatureControl.Close();
 	
@@ -216,7 +211,7 @@
     if ( ERfsStateInfoInactive == iMmPhoneTsy->GetRfStateInfo() &&
         !IsRequestPossibleInOffline( aIpc ) )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_EXTFUNC_1, "TSY: Offline mode ON, request is not allowed: %d", aIpc );
+TFLOGSTRING2 ("TSY: Offline mode ON, request is not allowed: %d", aIpc );
         ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral,
                 KErrGsmOfflineOpNotAllowed );
 
@@ -549,7 +544,7 @@
                     break;
                 default:
                     // ret is already set as KErrNotSupported
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_DOEXTFUNCL_1, "TSY: CMmCustomTsy::DoExtFuncL unsupported ipc=%d", aIpc);
+TFLOGSTRING2("TSY: CMmCustomTsy::DoExtFuncL unsupported ipc=%d", aIpc);
                     break;
                 }
 
@@ -805,7 +800,7 @@
 TSecurityPolicy CMmCustomTsy::GetRequiredPlatSecCaps(
     const TInt aIpc )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_1,  "TSY: CMmCustomTsy::GetRequiredPlatSecCaps ipc=%d", aIpc );
+TFLOGSTRING2( "TSY: CMmCustomTsy::GetRequiredPlatSecCaps ipc=%d", aIpc );
     // assume fail as default return value
     TSecurityPolicy policy( TSecurityPolicy::EAlwaysFail );
 
@@ -814,7 +809,7 @@
     if (ipc >= KIpcCustomExt + EMobileCancelOffset)
         {
         ipc  -= EMobileCancelOffset;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_2, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps cancel for ipc=%d", ipc);
+TFLOGSTRING2("TSY: CMmCustomTsy::GetRequiredPlatSecCaps cancel for ipc=%d", ipc);
         }
 
     switch ( ipc )
@@ -848,7 +843,7 @@
         case ECustomNotifyCellInfoChangeIPC:
         case ECustomGetBandSelectionIPC:
         case ECustomNotifyRemoteAlertingToneStatusChangeIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_3, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=None");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=None");
             policy = TSecurityPolicy( TSecurityPolicy::EAlwaysPass );
             break;
 
@@ -857,14 +852,14 @@
         case ECustomSetSystemNetworkModeIPC:
         case ECustomSimWarmResetIPC:
         case ECustomSetBandSelectionIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_4, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl");
             policy = TSecurityPolicy( ECapabilityNetworkControl );
             break;
 
         // NetworkControl, PowerMgmt
         case ECustomPowerSimOnIPC:
         case ECustomPowerSimOffIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_5, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl, PowerMgmt");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl, PowerMgmt");
             policy = TSecurityPolicy( ECapabilityNetworkControl,
                 ECapabilityPowerMgmt );
             break;
@@ -872,7 +867,7 @@
         // NetworkControl, ReadDeviceData
         case ECustomReleaseFileIPC:
         case ECustomRestartFileIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_6, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl, ReadDeviceData");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl, ReadDeviceData");
             policy = TSecurityPolicy( ECapabilityNetworkControl,
                 ECapabilityReadDeviceData );
             break;
@@ -880,13 +875,13 @@
         // NetworkServices
         case ECustomTerminateCallIPC:
         case ECustomCancelUssdSessionIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_7, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkServices");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkServices");
             policy = TSecurityPolicy( ECapabilityNetworkServices );
             break;
 
         // NetworkServices, WriteDeviceData
         case ECustomSetDriveModeIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_8, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkServices, WriteDeviceData");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkServices, WriteDeviceData");
             policy = TSecurityPolicy( ECapabilityNetworkServices,
                 ECapabilityWriteDeviceData );
             break;
@@ -907,27 +902,27 @@
         case ECustomReadHSxPAStatusIPC:
         case ECustomGetIccCallForwardingStatusIPC:
         case ECustomGetCellInfoIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_9, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData");
             policy = TSecurityPolicy( ECapabilityReadDeviceData );
             break;
 
         // ReadDeviceData, Location
         case EReadViagHomeZoneCacheIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_10, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, Location");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, Location");
             policy = TSecurityPolicy( ECapabilityReadDeviceData,
                 ECapabilityLocation );
             break;
 
         // ReadDeviceData, ReadUserData
         case ECustomNotifySsNetworkEventIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_11, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy= ReadDeviceData, ReadUserData");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy= ReadDeviceData, ReadUserData");
             policy = TSecurityPolicy( ECapabilityReadDeviceData,
                 ECapabilityReadUserData );
             break;
 
         // ReadDeviceData, ReadUserData, Location
         case ECustomReadSimFileIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_12, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, ReadUserData, Location");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, ReadUserData, Location");
             policy = TSecurityPolicy( ECapabilityReadDeviceData,
                 ECapabilityReadUserData,
                 ECapabilityLocation );
@@ -935,7 +930,7 @@
 
         // ReadDeviceData, ReadUserData, WriteUserData, NetworkControl
         case ECustomGetSimAuthenticationDataIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_13, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, ReadUserData, WriteUserData, NetworkControl");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, ReadUserData, WriteUserData, NetworkControl");
             policy = TSecurityPolicy( ECapabilityReadDeviceData,
                 ECapabilityReadUserData,
                 ECapabilityWriteUserData,
@@ -943,14 +938,14 @@
             break;
 
        	case ECustomGetServiceTableSupportbyApplicationIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_14, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData");
             policy = TSecurityPolicy( ECapabilityReadDeviceData );
             break;
         // ReadDeviceData, WriteDeviceData, ReadUserData, WriteUserData,
         // Location, NetworkServices, NetworkControl
         case ECustomSendAPDUReqIPC:
         case ECustomSendAPDUReqV2IPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_15, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, WriteDeviceData, ReadUserData, WriteUserData, Location, NetworkServices, NetworkControl");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, WriteDeviceData, ReadUserData, WriteUserData, Location, NetworkServices, NetworkControl");
             policy = TSecurityPolicy( ECapabilityReadDeviceData,
                 ECapabilityWriteDeviceData,
                 ECapabilityReadUserData,
@@ -964,7 +959,7 @@
         case ECustomStartSimCbTopicBrowsingIPC:
         case ECustomGetNextSimCbTopicIPC:
         case ECustomGetAirTimeDurationIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_16, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadUserData");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadUserData");
             policy = TSecurityPolicy( ECapabilityReadUserData );
             break;
 
@@ -979,32 +974,32 @@
         case ECustomDisablePhoneLockIPC:
         case ECustomSetSimMessageStatusReadIPC:
         case ECustomWriteHSxPAStatusIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_17, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData");
             policy = TSecurityPolicy( ECapabilityWriteDeviceData );
             break;
 
         // WriteDeviceData, Location
         case EWriteViagHomeZoneCacheIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_18, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData, Location");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData, Location");
             policy = TSecurityPolicy( ECapabilityWriteDeviceData,
                 ECapabilityLocation );
             break;
 
         // WriteUserData
         case ECustomDeleteSimCbTopicIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_19, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteUserData");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteUserData");
             policy = TSecurityPolicy( ECapabilityWriteUserData );
             break;
 
         // WriteDeviceData
         case EWriteViagHomeZoneUHZIUESettingsIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_20, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData");
             policy = TSecurityPolicy( ECapabilityWriteDeviceData );
             break;
         default:
             // if none of the above then we end up here,
             // as a default we already have caps as alwaysfail.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_21, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=AlwaysFail");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=AlwaysFail");
             break;
         }
 
@@ -1310,7 +1305,7 @@
     TInt ret ( KErrNone );
     TInt rfStateInfo ( ERfsStateInfoNormal );
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_1,  "CMmCustomTSY: CMmCustomTsy::SimAuthentication" );
+TFLOGSTRING( "CMmCustomTSY: CMmCustomTsy::SimAuthentication" );
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(ECustomTsyGetSimAuthenticationData);
     if(0 < reqHandle)
@@ -1354,69 +1349,69 @@
     else if ( RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrap ==
         basePtr->ExtensionId() )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_2,  "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrap" );
+TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrap" );
         iGbaBootstrap = REINTERPRET_CAST( 
 	        RMmCustomAPI::TSimAuthenticationGbaBootstrap*, basePtr );
 
         rand.Append( iGbaBootstrap->iRandomParameters );
 
         authenticationDataPackage.PackData( iGbaBootstrap, &rfStateInfo  ); 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_3,  "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrap" );
+TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrap" ); 
         }
     else if ( RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrapUpdate ==
         basePtr->ExtensionId() )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_4,  "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrapUpdate" );
+TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrapUpdate" );
         iGbaBootstrapUpdate = REINTERPRET_CAST( 
         	RMmCustomAPI::TSimAuthenticationGbaBootstrapUpdate*, basePtr );
 
         authenticationDataPackage.PackData( iGbaBootstrapUpdate, &rfStateInfo  ); 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_5,  "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrapUpdate" );
+TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrapUpdate" ); 
         }
     else if ( 
         RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrapNafDerivation ==
         basePtr->ExtensionId() )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_6,  "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrapNafDerivation" );
+TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrapNafDerivation" );
         iGbaNafDerivation = REINTERPRET_CAST( 
         	RMmCustomAPI::TSimAuthenticationGbaNafDerivation*, basePtr );
 
         authenticationDataPackage.PackData( iGbaNafDerivation, &rfStateInfo  ); 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_7,  "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrapNafDerivation" );
+TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrapNafDerivation" );
         }
     else if ( RMmCustomAPI::TSimAuthenticationBase::EMgvMskUpdate ==
         basePtr->ExtensionId() )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_8,  "CMmCustomTSY: SimAuthenticationL::in EMgvMskUpdate" );
+TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EMgvMskUpdate" );  
         iMgvMskUpdate = REINTERPRET_CAST( 
         	RMmCustomAPI::TSimAuthenticationMgvMskUpdate*, basePtr );
 
         authenticationDataPackage.PackData( iMgvMskUpdate, &rfStateInfo  ); 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_9,  "CMmCustomTSY: SimAuthenticationL::out EMgvMskUpdate" );
+TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EMgvMskUpdate" );
         }
     else if ( RMmCustomAPI::TSimAuthenticationBase::EMgvMtkGeneration ==
         basePtr->ExtensionId() )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_10,  "CMmCustomTSY: SimAuthenticationL::in EMgvMtkGeneration" );
+TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EMgvMtkGeneration" );
         iMgvMtkGeneration = REINTERPRET_CAST( 
         	RMmCustomAPI::TSimAuthenticationMgvMtkGeneration*, basePtr );
 
         authenticationDataPackage.PackData( iMgvMtkGeneration, &rfStateInfo  ); 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_11,  "CMmCustomTSY: SimAuthenticationL::out EMgvMtkGeneration" );
+TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EMgvMtkGeneration" );
         }
     else if ( RMmCustomAPI::TSimAuthenticationBase::EMgvMskDeletion ==
         basePtr->ExtensionId() )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_12,  "CMmCustomTSY: SimAuthenticationL::in EMgvMskDeletion" );
+TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EMgvMskDeletion" );
         iMgvMskDeletion = REINTERPRET_CAST( 
         	RMmCustomAPI::TSimAuthenticationMgvMskDeletion*, basePtr );
 
         authenticationDataPackage.PackData( iMgvMskDeletion, &rfStateInfo  ); 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_13,  "CMmCustomTSY: SimAuthenticationL::out EMgvMskDeletion" );
+TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EMgvMskDeletion" ); 
         }
     else
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_14,  "CMmCustomTSY: Invalid authentication type specified: %d", basePtr->ExtensionId() );
+TFLOGSTRING2( "CMmCustomTSY: Invalid authentication type specified: %d", basePtr->ExtensionId() );
         ret = KErrNotSupported;
 
         iEapSim = NULL;
@@ -1493,7 +1488,7 @@
     CMmDataPackage* aDataPackage,
     TInt aResult )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_1,  "TSY: CMmCustomTsy::CompleteSimAuthentication" );
+TFLOGSTRING( "TSY: CMmCustomTsy::CompleteSimAuthentication" );
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyGetSimAuthenticationData );
@@ -1541,7 +1536,7 @@
             else if ( RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrap ==
                 basePtr->ExtensionId() )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_2,  "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrap" );
+TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrap" );
                 RMmCustomAPI::TSimAuthenticationGbaBootstrap* gbaBootstrap;
 
                 aDataPackage->UnPackData( &gbaBootstrap );
@@ -1553,13 +1548,13 @@
                 iGbaBootstrap = NULL;
 
                 ReqCompleted( reqHandle, aResult );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_3,  "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrap" );
+TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrap" );
                 }
             else if ( 
                 RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrapUpdate ==
                 basePtr->ExtensionId() )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_4,  "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrapUpdate" );
+TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrapUpdate" );                
                 RMmCustomAPI::TSimAuthenticationGbaBootstrapUpdate* 
                     gbaBootstrapUpdate;
 
@@ -1572,13 +1567,13 @@
                 iGbaBootstrapUpdate = NULL;
 
                 ReqCompleted( reqHandle, aResult );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_5,  "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrapUpdate" );
+TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrapUpdate" );
                 }
             else if ( 
                 RMmCustomAPI::TSimAuthenticationBase::
                     EGbaBootstrapNafDerivation == basePtr->ExtensionId() )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_6,  "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrapNafDerivation" );
+TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrapNafDerivation" );                
                 RMmCustomAPI::TSimAuthenticationGbaNafDerivation* 
                     gbaNafDerivation;
 
@@ -1591,12 +1586,12 @@
                 iGbaNafDerivation = NULL;
 
                 ReqCompleted( reqHandle, aResult );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_7,  "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrapNafDerivation" );
+TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrapNafDerivation" );                
                 }
             else if ( RMmCustomAPI::TSimAuthenticationBase::EMgvMskUpdate ==
                     basePtr->ExtensionId() )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_8,  "CMmCustomTSY: CompleteSimAuthentication::in EMgvMskUpdate" );
+TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::in EMgvMskUpdate" );                
                 RMmCustomAPI::TSimAuthenticationMgvMskUpdate* mgvMskUpdate;
 
                 aDataPackage->UnPackData( &mgvMskUpdate );
@@ -1611,12 +1606,12 @@
                 iMgvMskUpdate = NULL;
 
                 ReqCompleted( reqHandle, aResult );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_9,  "CMmCustomTSY: CompleteSimAuthentication::out EMgvMskUpdate" );
+TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::out EMgvMskUpdate" );
                 }
             else if ( RMmCustomAPI::TSimAuthenticationBase::
                     EMgvMtkGeneration == basePtr->ExtensionId() )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_10,  "CMmCustomTSY: CompleteSimAuthentication::in EMgvMtkGeneration" );
+TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::in EMgvMtkGeneration" );                
                 RMmCustomAPI::TSimAuthenticationMgvMtkGeneration* 
                     mgvMtkGeneration;
 
@@ -1631,7 +1626,7 @@
                 iMgvMtkGeneration = NULL;
 
                 ReqCompleted( reqHandle, aResult );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_11,  "CMmCustomTSY: CompleteSimAuthentication::out EMgvMtkGeneration" );
+TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::out EMgvMtkGeneration" ); 
                 }
             else if ( RMmCustomAPI::TSimAuthenticationBase::
                     EMgvMskDeletion == basePtr->ExtensionId() )
@@ -1640,7 +1635,7 @@
                 }
             else
                 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_12,  "CMmCustomTSY: Invalid authentication type specified: %d", basePtr->ExtensionId() );
+TFLOGSTRING2( "CMmCustomTSY: Invalid authentication type specified: %d", basePtr->ExtensionId() );
                 aResult = KErrArgument;
                 ReqCompleted( reqHandle, aResult );
                 }
@@ -1682,7 +1677,7 @@
                 else if( RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrap ==
                         basePtr->ExtensionId() )
                     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_13,  "TSYMH: CompleteSimAuthentication RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrap" );
+TFLOGSTRING( "TSYMH: CompleteSimAuthentication RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrap" );
                     RMmCustomAPI::TSimAuthenticationGbaBootstrap* gbabootstrap;
                     aDataPackage->UnPackData( &gbabootstrap );
 
@@ -1767,7 +1762,7 @@
 
     if ( KErrArgument == ret && 0 == iFreshBitCounter )
        {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CHECKRANDVALIDITYL_1,  "CMmCustomTsy: RAND rejected" );
+TFLOGSTRING( "CMmCustomTsy: RAND rejected" );
        }
 
     return ret;
@@ -1806,7 +1801,7 @@
 
         if ( KErrNone != ret )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CREATERANDDB_1,  "TSY: CMmCustomTsy: 'rand_db.cur' creation failed!" );
+TFLOGSTRING( "TSY: CMmCustomTsy: 'rand_db.cur' creation failed!" );
             }
         else if ( KErrNone == ret )
             {
@@ -1846,13 +1841,13 @@
 
                 if ( KErrNone != ret )
                     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CREATERANDDB_2,  "TSY: CMmCustomTsy: 'rand_db.cur' initialization failed!" );
+TFLOGSTRING( "TSY: CMmCustomTsy: 'rand_db.cur' initialization failed!" );
                     file.Close();
                     }
                 }
             else
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CREATERANDDB_3,  "TSY: CMmCustomTsy: 'rand_db.cur' open failed!" );
+TFLOGSTRING( "TSY: CMmCustomTsy: 'rand_db.cur' open failed!" );
                 }
             }
 
@@ -1868,7 +1863,7 @@
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CREATERANDDB_4,  "TSY: CMmCustomTsy: Could not connect to file server!" );
+TFLOGSTRING( "TSY: CMmCustomTsy: Could not connect to file server!" );
         }
 
     // Give some time for file.Close() and fs.Close() to complete
@@ -1925,7 +1920,7 @@
                     EFileWrite );
                 if( KErrNone != ret )
                     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_INSERTBLOBSTORANDDB_1,  "TSY: CMmCustomTsy: rand_db open failed" );
+TFLOGSTRING( "TSY: CMmCustomTsy: rand_db open failed" );
                     }
                 }
             if ( KErrNone != ret )
@@ -1990,7 +1985,7 @@
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_INSERTBLOBSTORANDDB_2,  "TSY: CMmCustomTsy: Could not connect to file server!" );
+TFLOGSTRING( "TSY: CMmCustomTsy: Could not connect to file server!" );
         return ret;
         }
 
@@ -2088,7 +2083,7 @@
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_UPDATEBITCOUNTER_1,  "TSY: CMmCustomTsy: Could not connect to file server!" );
+TFLOGSTRING( "TSY: CMmCustomTsy: Could not connect to file server!" );
         }
 
     return ret;
@@ -2336,7 +2331,7 @@
 void CMmCustomTsy::CompleteTerminateCall(
     TInt aError )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETETERMINATECALL_1,  "TSY: CMmCustomTsy::CompleteTerminateCall - aError: %d", aError );
+TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteTerminateCall - aError: %d", aError );
 
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -2361,7 +2356,7 @@
 TInt CMmCustomTsy::NotifyDtmfEvent(
         RMmCustomAPI::TDtmfInfo* aInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYDTMFEVENT_1, "TSY: CMmCustomTsy::NotifyDtmfEvent");
+TFLOGSTRING("TSY: CMmCustomTsy::NotifyDtmfEvent");
     // save pointer to client data
     iNotifyInfo = aInfo;
 
@@ -2381,7 +2376,7 @@
     RMmCustomAPI::TDtmfInfo aInfo,
     TInt aErrorCode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYDTMFEVENT_1, "TSY: CMmCustomTsy::CompleteNotifyDtmfEvent");
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyDtmfEvent");
     // reset request handle. Returns the deleted req handle.
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyNotifyDtmfEvent );
@@ -2448,7 +2443,7 @@
 
         if ( 0 != diags )
             {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETDIAGNOSTICINFO_1,  "TSY:CMmCustomTsy::GetDiagnosticInfo: Diagnostic info=%d asked for call id=%d", diags, mmCall->CallId() );
+TFLOGSTRING3( "TSY:CMmCustomTsy::GetDiagnosticInfo: Diagnostic info=%d asked for call id=%d", diags, mmCall->CallId() );
             switch ( diags )
                 {                
                 case KDiagnosticInfoBarredWithCUG:
@@ -2480,17 +2475,17 @@
                     break;
                 }
             }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETDIAGNOSTICINFO_2,  "TSY: CMmCustomTsy::GetDiagnosticInfo - ReqCompleted - Error code: %d", errorValue );
+TFLOGSTRING2( "TSY: CMmCustomTsy::GetDiagnosticInfo - ReqCompleted - Error code: %d", errorValue );
         // complete errorvalue to client  - inform change  
         ReqCompleted( aTsyReqHandle, errorValue ); 
         }
     else
         {
          // call is not found
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETDIAGNOSTICINFO_3, "TSY: CMmCustomTsy::GetDiagnosticInfo - Call is not found");
+TFLOGSTRING("TSY: CMmCustomTsy::GetDiagnosticInfo - Call is not found");
         ReqCompleted( aTsyReqHandle, KErrNotFound );
         }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETDIAGNOSTICINFO_4,  "TSY: CMmCustomTsy::GetDiagnosticInfo - Error code: %d", errorValue );
+TFLOGSTRING2( "TSY: CMmCustomTsy::GetDiagnosticInfo - Error code: %d", errorValue );
    
     return KErrNone;
     }
@@ -2526,7 +2521,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::TRemoteAlertingToneStatus* aToneStatus )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREMOTEALERTINGTONESTATUS_1, "TSY: CMmCustomTsy::GetRemoteAlertingToneStatus");
+TFLOGSTRING("TSY: CMmCustomTsy::GetRemoteAlertingToneStatus");
     TInt ret = iMmCustomExtInterface->GetRemoteAlertingToneStatus(
         aToneStatus );
 
@@ -2585,7 +2580,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::TGetAlsBlockStatus* aBlockStatus )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSBLOCKEDL_1,  "TSY: CMmCustomTsy::GetAlsBlockedL - Req handle: %d, Block status: %d", aTsyReqHandle, *aBlockStatus );
+TFLOGSTRING3( "TSY: CMmCustomTsy::GetAlsBlockedL - Req handle: %d, Block status: %d", aTsyReqHandle, *aBlockStatus );
     TTsyReqHandle getAlsBlockedHandle =
         iTsyReqHandleStore->GetTsyReqHandle( ECustomTsyGetAlsBlocked );
 
@@ -2630,7 +2625,7 @@
     RMmCustomAPI::TGetAlsBlockStatus  aBlockStatus,
     TInt aErrorCode )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETALSBLOCKED_1,  "TSY: CMmCustomTsy::CompleteGetAlsBlocked - Block status: %d, Error code: %d", aBlockStatus, aErrorCode );
+TFLOGSTRING3( "TSY: CMmCustomTsy::CompleteGetAlsBlocked - Block status: %d, Error code: %d", aBlockStatus, aErrorCode );
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyGetAlsBlocked );
@@ -2732,7 +2727,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::TSetAlsBlock* aBlockStatus )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SETALSBLOCKEDL_1,  "TSY: CMmCustomTsy::SetAlsBlockedL - Req handle: %d, Block status: %d", aTsyReqHandle, *aBlockStatus );
+TFLOGSTRING3( "TSY: CMmCustomTsy::SetAlsBlockedL - Req handle: %d, Block status: %d", aTsyReqHandle, *aBlockStatus );
     // get the handle
     TTsyReqHandle setAlsBlockedHandle =
         iTsyReqHandleStore->GetTsyReqHandle( ECustomTsySetAlsBlocked );
@@ -2782,7 +2777,7 @@
 void CMmCustomTsy::CompleteSetAlsBlocked(
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESETALSBLOCKED_1,  "TSY: CMmCustomTsy::CompleteSetAlsBlocked - Error code: %d", aErrorCode );
+TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteSetAlsBlocked - Error code: %d", aErrorCode );
     // get reaq handle for NotifyAlsBlockedChanged
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(
         ECustomTsyNotifyAlsBlockedChanged );
@@ -2854,7 +2849,7 @@
             {
             *iRetNotifyAlsBlockStatus = RMmCustomAPI::EBlockStatusInactive;
             }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYALSBLOCKEDCHANGED_1,  "TSY: CMmCustomTsy::CompleteNotifyAlsBlockedChanged - Block status: %d", *iSetBlockStatus );
+TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteNotifyAlsBlockedChanged - Block status: %d", *iSetBlockStatus );
 
         // reset the varible
         iRetNotifyAlsBlockStatus = NULL;
@@ -2896,7 +2891,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::TAlsSupport* aSupport )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSPPSUPPORTL_1,  "TSY: CMmCustomTsy::GetAlsPpSupportL");
+TFLOGSTRING( "TSY: CMmCustomTsy::GetAlsPpSupportL");
     // save pointer to client space
     iAlsSupport = aSupport;
     
@@ -2905,7 +2900,7 @@
 
     if ( 0 < reqHandle )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSPPSUPPORTL_2,  "TSY: CMmCustomTsy::GetAlsPpSupportL - Already processing, save handle");
+TFLOGSTRING( "TSY: CMmCustomTsy::GetAlsPpSupportL - Already processing, save handle");
         //The request is already in processing because of previous request
         //Complete request with status value informing the client about
 		TCheckAlsPpSupportRequest* req = 
@@ -2926,7 +2921,7 @@
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSPPSUPPORTL_3,  "TSY: CMmCustomTsy::GetAlsPpSupportL - Save handle");
+TFLOGSTRING( "TSY: CMmCustomTsy::GetAlsPpSupportL - Save handle");
         // Save the req handle type
         iReqHandleType = ECustomTsyGetAlsPpSupport;
 			// save request in queue for completion
@@ -2949,7 +2944,7 @@
 //
 TInt CMmCustomTsy::GetAlsPpSupportCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSPPSUPPORTCANCEL_1,  "TSY: CMmCustomTsy::GetAlsPpSupportCancel");
+TFLOGSTRING( "TSY: CMmCustomTsy::GetAlsPpSupportCancel");
     // reset the pointer to client data
     iAlsSupport = NULL;
 
@@ -2960,7 +2955,7 @@
     // complete
     TInt checkAlsPpSupportRequestsCount = 
         iCheckAlsPpSupportRequests.Count();
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSPPSUPPORTCANCEL_2,  "TSY: CMmCustomTsy::GetAlsPpSupportCancel - Cancel %d requests", checkAlsPpSupportRequestsCount );
+TFLOGSTRING2( "TSY: CMmCustomTsy::GetAlsPpSupportCancel - Cancel %d requests", checkAlsPpSupportRequestsCount );
 
 	for ( TInt i=0; i < checkAlsPpSupportRequestsCount ; i++ )
 		{
@@ -2986,7 +2981,7 @@
     RMmCustomAPI::TAlsSupport aAlsSupport,
     TInt aErrorCode )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_1,  "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS support: %d, Error: %d", aAlsSupport, aErrorCode );
+TFLOGSTRING3( "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS support: %d, Error: %d", aAlsSupport, aErrorCode );
     TBool status = EFalse;
     
     // Check if the get was called internally during boot
@@ -2994,7 +2989,7 @@
         {
     	if( RMmCustomAPI::EAlsSupportOn == aAlsSupport )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_2,  "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS supported by SIM" );
+TFLOGSTRING( "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS supported by SIM" );
             status = ETrue;
             }
         //Update ALS status from sim
@@ -3017,7 +3012,7 @@
 
             if( RMmCustomAPI::EAlsSupportOn == aAlsSupport )
             	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_3,  "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS supported by SIM" );
+TFLOGSTRING( "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS supported by SIM" );
             	status = ETrue;
             	}
             //Update ALS status from sim
@@ -3029,7 +3024,7 @@
         // complete
         TInt checkAlsPpSupportRequestsCount = 
             iCheckAlsPpSupportRequests.Count();
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_4,  "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - Complete %d requests", checkAlsPpSupportRequestsCount );
+TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - Complete %d requests", checkAlsPpSupportRequestsCount );
 
 		for ( TInt i=0; i < checkAlsPpSupportRequestsCount ; i++ )
 			{
@@ -3211,18 +3206,18 @@
     TBool aCipherStatus,
     TInt aErrorCode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYCIPHERINGINFOCHANGE_1, "TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange entered");
+TFLOGSTRING("TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange entered");
     // this is special case, only called when Ciphering indicator
     // is forced off for some operators
     if ( iMmPhoneTsy->GetNetTsy()->CipheringIndicatorForcedOff() )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYCIPHERINGINFOCHANGE_2, "TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange: Ciphering forced off");
+TFLOGSTRING("TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange: Ciphering forced off");
         TTsyReqHandle handle = iTsyReqHandleStore->ResetTsyReqHandle(
             ECustomTsyNotifyCipheringInfoChange );
 
         if ( ECustomTsyReqHandleUnknown != handle )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYCIPHERINGINFOCHANGE_3, "TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange: Ciphering forced off, request completed");
+TFLOGSTRING("TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange: Ciphering forced off, request completed");
             iRetNotifyCipheringInfoChange->iIndStatus = EFalse;
             iRetNotifyCipheringInfoChange->iCiphStatus = ETrue;
 
@@ -3522,7 +3517,7 @@
     TInt aError,
     TInt aIPC )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETE_1,  "TSY: CMmCustomTsy::Complete - ReqHandleType: %d Error: %d", aReqHandleType, aError );
+TFLOGSTRING3( "TSY: CMmCustomTsy::Complete - ReqHandleType: %d Error: %d", aReqHandleType, aError );
     TBool subTsyReqFound = EFalse;
     TInt max = GetMaxNumberOfSubsystems();
     CMmSubTsyBase** subTsyPtr = GetSubsystemArrayPtr();
@@ -3747,7 +3742,7 @@
     RMmCustomAPI::TEmerNumberCheckMode* aNumberMode,
     TBool* aResult )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CHECKEMERGENCYNUMBERL_1, "TSY: CMmCustomTsy::CheckEmergencyNumberL number=%S", (aNumberMode->iNumber) );
+TFLOGSTRING2("TSY: CMmCustomTsy::CheckEmergencyNumberL number=%S", &(aNumberMode->iNumber) );
 
     TInt ret(KErrGeneral);
 
@@ -3757,7 +3752,7 @@
     // 3rd Dial check number
     if( iISVDialNumberCheck && 0 == requestHandle )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CHECKEMERGENCYNUMBERL_2, "TSY: CMmCustomTsy::CheckEmergencyNumberL - 3rd party client nbr check aResult  = %d" , aResult );
+TFLOGSTRING2("TSY: CMmCustomTsy::CheckEmergencyNumberL - 3rd party client nbr check aResult  = %d" , aResult );
         iEmergencyNumberCheckMode   = aNumberMode;
         iEmergencyNumberCheckResult = aResult;
 
@@ -3771,7 +3766,7 @@
     //Normal case
     else
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CHECKEMERGENCYNUMBERL_3, "TSY: CMmCustomTsy::CheckEmergencyNumberL - aResult  = %d" , aResult );
+TFLOGSTRING2("TSY: CMmCustomTsy::CheckEmergencyNumberL - aResult  = %d" , aResult );
 
         if ( ( 0 < requestHandle || iISVDialNumberCheck ) && 0 != aTsyReqHandle )
             {
@@ -3819,7 +3814,7 @@
     TInt aErrorValue )
     {
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETECHECKEMERGENCYNUMBER_1, "TSY: CMmCustomTsy::CompleteCheckEmergencyNumber" );
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteCheckEmergencyNumber" );
 
     // 3rd party number check completion0
     if( iISVDialNumberCheck )
@@ -3841,7 +3836,7 @@
     // check is the Dial cancel NULL
     if( iISVDialNumberCheckObject )
       {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETECHECKEMERGENCYNUMBER_2, "TSY: CMmCustomTsy::CompleteCheckEmergencyNumber - Complete3rdPartyCallNbrCheck isEmergencyNbr = %d",isEmergencyNbr );
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteCheckEmergencyNumber - Complete3rdPartyCallNbrCheck isEmergencyNbr = %d",isEmergencyNbr );
       iISVDialNumberCheckObject->Complete3rdPartyCallNbrCheck(
         isEmergencyNbr );
       }
@@ -3875,7 +3870,7 @@
             *iEmergencyNumberCheckResult = EFalse;
             }
         }
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETECHECKEMERGENCYNUMBER_3, "TSY: CMmCustomTsy::CompleteCheckEmergencyNumber number=%S", (iEmergencyNumberCheckMode->iNumber) );
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteCheckEmergencyNumber number=%S", &(iEmergencyNumberCheckMode->iNumber) );
 
         // reset the internal variable
         iEmergencyNumberCheckResult = NULL;
@@ -3992,13 +3987,13 @@
     // used phonebook is Adn
     if ( 0 == aPndName->CompareF( KETelIccAdnPhoneBook ) )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETPNDCACHESTATUS_1, "TSY: CMmCustomTsy::GetPndCacheStatus - ADN phonebook status: %d", iAdnCacheStatus);
+TFLOGSTRING2("TSY: CMmCustomTsy::GetPndCacheStatus - ADN phonebook status: %d", iAdnCacheStatus);
         *aPndStatus = iAdnCacheStatus;
         }
     // used phonebook is Fdn
     else if ( 0 == aPndName->CompareF( KETelIccFdnPhoneBook ) )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETPNDCACHESTATUS_2, "TSY: CMmCustomTsy::GetPndCacheStatus - FDN phonebook status: %d", iFdnCacheStatus);
+TFLOGSTRING2("TSY: CMmCustomTsy::GetPndCacheStatus - FDN phonebook status: %d", iFdnCacheStatus);
         *aPndStatus = iFdnCacheStatus;
         }
     // used phonebook doesn't have cache
@@ -4006,12 +4001,12 @@
               ( 0 == aPndName->CompareF( KETelIccSdnPhoneBook ) ) ||
               ( 0 == aPndName->CompareF( KETelIccVoiceMailBox ) ) )
         {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETPNDCACHESTATUS_3, "TSY: CMmCustomTsy::GetPndCacheStatus - No cache for: %S ", *aPndName);
+TFLOGSTRING2("TSY: CMmCustomTsy::GetPndCacheStatus - No cache for: %S ", aPndName);
         *aPndStatus = RMmCustomAPI::ECacheNotUsed;
         }
     else
         {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETPNDCACHESTATUS_4, "TSY: CMmCustomTsy::GetPndCacheStatus - No cache found for: %S ", *aPndName);
+TFLOGSTRING2("TSY: CMmCustomTsy::GetPndCacheStatus - No cache found for: %S ", aPndName);        
         error = KErrArgument;
         }
 
@@ -4030,7 +4025,7 @@
     RMmCustomAPI::TPndCacheStatus aPndStatus,
     TName& aPndName )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_UPDATECACHESTATUS_1, "TSY: CMmCustomTsy::UpdateCacheStatus - Phonebook: %S status: %d", aPndName, aPndStatus);
+TFLOGSTRING3("TSY: CMmCustomTsy::UpdateCacheStatus - Phonebook: %S status: %d", &aPndName, aPndStatus);
     // if used phonebook is Adn
     if ( 0 == aPndName.CompareF( KETelIccAdnPhoneBook ) )
         {
@@ -4138,7 +4133,7 @@
 TInt CMmCustomTsy::SsAdditionalInfoNotification(
     RMmCustomAPI::TSsAdditionalInfo* aSsAdditionalInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SSADDITIONALINFONOTIFICATION_1, "TSY: CMmCustomTsy::SsAdditionalInfoNotification");
+TFLOGSTRING("TSY: CMmCustomTsy::SsAdditionalInfoNotification");
     iRetSsAdditionalInfo = aSsAdditionalInfo;
     iReqHandleType = ECustomTsyNotifySsAdditionalInfo;
 
@@ -4154,7 +4149,7 @@
 TInt CMmCustomTsy::SsAdditionalInfoNotificationCancel(
     const TTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SSADDITIONALINFONOTIFICATIONCANCEL_1, "TSY: CMmCustomTsy::SsAdditionalInfoNotificationCancel");
+TFLOGSTRING("TSY: CMmCustomTsy::SsAdditionalInfoNotificationCancel");
     iRetSsAdditionalInfo = NULL;
 
     // reset reqhandle
@@ -4179,7 +4174,7 @@
     RMmCustomAPI::TSsAdditionalInfo* aSsAdditionalInfo,
     TInt aError )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESSADDITIONALINFONOTIFICATION_1, "TSY: CMmCustomTsy::CompleteSsAdditionalInfoNotification");
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteSsAdditionalInfoNotification");
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyNotifySsAdditionalInfo );
@@ -4210,7 +4205,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::TTwoDigitDialSupport* aSupport )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CHECKTWODIGITDIALSUPPORTL_1, "TSY: CMmCustomTsy::CheckTwoDigitDialSupportL");
+TFLOGSTRING("TSY: CMmCustomTsy::CheckTwoDigitDialSupportL");
     // save pointer to client space
     iTwoDigitDialSupport = aSupport;
 
@@ -4651,7 +4646,7 @@
 TInt CMmCustomTsy::ResetNetServerL(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_RESETNETSERVERL_1, "TSY: CMmCustomTsy::ResetNetServerL");
+TFLOGSTRING("TSY: CMmCustomTsy::ResetNetServerL");
     // call DOS (no packed parameters)
     TInt ret = Phone()->MessageManager()->HandleRequestL(
         ECustomResetNetServerIPC );
@@ -4678,7 +4673,7 @@
 void CMmCustomTsy::CompleteResetNetServer(
     TInt aErrorValue )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETERESETNETSERVER_1, "TSY: CMmCustomTsy::CompleteResetNetServer - Error: %d", aErrorValue );
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteResetNetServer - Error: %d", aErrorValue );
     // reset the reqhandle
     TTsyReqHandle tsyReqHandle =
         iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsyResetNetServer );
@@ -4694,7 +4689,7 @@
             aErrorValue = KErrNotReady; 
             }
             
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETERESETNETSERVER_2, "TSY: CMmCustomTsy::CompleteResetNetServer - complete with error value: %d", aErrorValue );
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteResetNetServer - complete with error value: %d", aErrorValue );
         ReqCompleted( tsyReqHandle, aErrorValue );
         }
     }
@@ -4746,7 +4741,7 @@
     // If SIM is inserted complete network connection failure
     if ( iMmPhoneTsy->NosBootState()->iSIMReady )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYNETWORKCONNECTIONFAILURE_1, "TSY: CMmCustomTsy::CompleteNotifyNetworkConnectionFailure");
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyNetworkConnectionFailure");
         // reset the reqhandle
         TTsyReqHandle tsyReqHandle =
             iTsyReqHandleStore->ResetTsyReqHandle(
@@ -5012,7 +5007,7 @@
     const TTsyReqHandle aTsyReqHandle,
     TUint32* aNetworkMode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETCURRENTSYSTEMNETWORKMODEL_1, "CMmCustomTsy::GetCurrentSystemNetworkModeL");
+TFLOGSTRING("CMmCustomTsy::GetCurrentSystemNetworkModeL");
     TTsyReqHandle reqhandle = iTsyReqHandleStore->GetTsyReqHandle(
         ECustomTsyGetCurrentSystemNetworkMode );
 
@@ -5052,7 +5047,7 @@
 TInt CMmCustomTsy::GetCurrentSystemNetworkModeCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETCURRENTSYSTEMNETWORKMODECANCEL_1, "CMmCustomTsy::GetCurrentSystemNetworkModeCancel");
+TFLOGSTRING("CMmCustomTsy::GetCurrentSystemNetworkModeCancel");
 
     // reset pointer to client data
     iCurrentNetworkMode = NULL;
@@ -5080,7 +5075,7 @@
     TDes8* aSimFileInfoPckg,
     TDes8* aSimResponseBuffer )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSIMFILEINFOL_1,  "TSY: CMmCustomTsy::GetSimFileInfoL" );
+TFLOGSTRING( "TSY: CMmCustomTsy::GetSimFileInfoL" );
     TTsyReqHandle reqHandle =
         iTsyReqHandleStore->GetTsyReqHandle( ECustomTsyGetSimFileInfo );
 
@@ -5101,7 +5096,7 @@
         	&& ( iGetSimFileInfoReq.iOffSet == simFileInfo.iOffSet )
         	&& ( iGetSimFileInfoReq.iSize == simFileInfo.iSize ) )
         	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSIMFILEINFOL_2,  "TSY: CMmCustomTsy::GetSimFileInfoL - Same info already requested" );
+TFLOGSTRING( "TSY: CMmCustomTsy::GetSimFileInfoL - Same info already requested" );
 
 			TGetSimFileInfoRequest* req = new ( ELeave ) TGetSimFileInfoRequest();
 			req->iReqHandle = aTsyReqHandle;
@@ -5131,7 +5126,7 @@
             }
         else
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSIMFILEINFOL_3,  "TSY: CMmCustomTsy::GetSimFileInfoL - Save handle" );
+TFLOGSTRING( "TSY: CMmCustomTsy::GetSimFileInfoL - Save handle" );
 	        // Save the req handle type
 	        iReqHandleType = ECustomTsyGetSimFileInfo;
 			// Save request in queue for completion
@@ -5153,7 +5148,7 @@
 //
 TInt CMmCustomTsy::GetSimFileInfoCancel( TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSIMFILEINFOCANCEL_1,  "TSY: CMmCustomTsy::GetSimFileInfoCancel" );
+TFLOGSTRING( "TSY: CMmCustomTsy::GetSimFileInfoCancel" );
     
 	for ( TInt i = 0; i < iGetSimFileInfoRequests.Count(); i++ )
 		{
@@ -5194,7 +5189,7 @@
     TDesC8* aData,
     TInt aError )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETSIMFILEINFO_1,  "TSY: CMmCustomTsy::CompleteGetSimFileInfo" );
+TFLOGSTRING( "TSY: CMmCustomTsy::CompleteGetSimFileInfo" );
     
     // reset the reqhandle
     TTsyReqHandle tsyReqHandle =
@@ -5205,7 +5200,7 @@
         {
         // complete
         TInt getSimFileInfoRequestsCount = iGetSimFileInfoRequests.Count();
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETSIMFILEINFO_2,  "TSY: CMmCustomTsy::CompleteGetSimFileInfo - Complete %d requests", getSimFileInfoRequestsCount );
+TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteGetSimFileInfo - Complete %d requests", getSimFileInfoRequestsCount );
         
 		for ( TInt i = 0; i < getSimFileInfoRequestsCount; i++ )
 		    {
@@ -5249,10 +5244,10 @@
     {
     
     TInt ret( KErrNone );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_1, "TSY: CMmCustomTsy::GetLifeTimeL");
+    TFLOGSTRING ("TSY: CMmCustomTsy::GetLifeTimeL");
     if ( sizeof(RMmCustomAPI::TLifeTimeData) != aLifeTimerInfoPckg->MaxLength() )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_2, "TSY: CMmCustomTsy::GetLifeTimeL bad size argument");
+        TFLOGSTRING ("TSY: CMmCustomTsy::GetLifeTimeL bad size argument");
         // Complete the request with appropiate error        
         return KErrArgument;
         }
@@ -5260,7 +5255,7 @@
             ECustomTsyGetLifeTimerInfo  );
     if ( ECustomTsyReqHandleUnknown != reqHandle ) 
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_3,  "TSY: CMmCustomTsy::GetLifeTimeL - ECustomTsyReqHandleUnknown" );
+TFLOGSTRING( "TSY: CMmCustomTsy::GetLifeTimeL - ECustomTsyReqHandleUnknown" );
         // The request is already in processing because of previous request.
         // Complete request with status value informing the client about 
         // the situation.
@@ -5270,7 +5265,7 @@
         {
         // save pointer to the packaged life timer info
         iLifeTimerInfoPckg = aLifeTimerInfoPckg;
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_4,  "TSY: CMmCustomTsy::GetLifeTimeL - send request" );
+        TFLOGSTRING( "TSY: CMmCustomTsy::GetLifeTimeL - send request" );
         iTsyReqHandleStore->SetTsyReqHandle( 
                         ECustomTsyGetLifeTimerInfo, aTsyReqHandle );
         ret = Phone()->MessageManager()->HandleRequestL(
@@ -5278,13 +5273,13 @@
         // Check response of the extension
         if ( KErrNone != ret )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_5,  "TSY: CMmCustomTsy::GetLifeTimeL - DOS layer returned error " );
+            TFLOGSTRING( "TSY: CMmCustomTsy::GetLifeTimeL - DOS layer returned error " );
             TTsyReqHandle tsyReqHandle =
                 iTsyReqHandleStore->ResetTsyReqHandle( 
                                     ECustomTsyGetLifeTimerInfo );
             if ( ECustomTsyReqHandleUnknown != tsyReqHandle )
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_6,  "TSY: CMmCustomTsy::GetLifeTimeL - DOS error - unknown handle" );
+                TFLOGSTRING( "TSY: CMmCustomTsy::GetLifeTimeL - DOS error - unknown handle" );
                 }
             ReqCompleted( aTsyReqHandle, ret );
             }
@@ -5370,7 +5365,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::TSetDriveMode* aModeStatus )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SETDRIVEMODEL_1, "TSY: CMmCustomTsy::SetDriveModeL - Req handle: %d, Mode status: %d", aTsyReqHandle, *aModeStatus );
+TFLOGSTRING3("TSY: CMmCustomTsy::SetDriveModeL - Req handle: %d, Mode status: %d", aTsyReqHandle, *aModeStatus );
 	if ( (iUsingFeatureManager) && (iFeatureControl.FeatureSupported(NFeature::KDriveModeCanRestrictMtCalls) == KFeatureSupported) )
         {
         // get the handle
@@ -5425,7 +5420,7 @@
 void CMmCustomTsy::CompleteSetDriveMode(
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESETDRIVEMODE_1,  "TSY: CMmCustomTsy::CompleteSetDriveMode - Error code: %d", aErrorCode );
+TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteSetDriveMode - Error code: %d", aErrorCode );
 	if ( (iUsingFeatureManager) && (iFeatureControl.FeatureSupported(NFeature::KDriveModeCanRestrictMtCalls) == KFeatureSupported) )
         {
         //Reset req handle, returns the deleted req handle
@@ -5598,7 +5593,7 @@
 void CMmCustomTsy::SetObjectForISVDialNumberCheck(
     CMmVoiceCallTsy* aCallObject )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SETOBJECTFORISVDIALNUMBERCHECK_1, "TSY: CMmCustomTsy::SetObjectForISVDialNumberCheck aCallObject=0x%08x", aCallObject );
+TFLOGSTRING2("TSY: CMmCustomTsy::SetObjectForISVDialNumberCheck aCallObject=%x", aCallObject );
     //Save pointer for completion of check emergency number
     iISVDialNumberCheckObject = aCallObject;
     //ISV dial has been requested
@@ -5614,7 +5609,7 @@
 TInt CMmCustomTsy::NotifyRauEvent(
     RMmCustomAPI::TRauEventStatus* aEventStatus )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYRAUEVENT_1, "TSY: CMmCustomTsy::NotifyRauEvent");
+TFLOGSTRING("TSY: CMmCustomTsy::NotifyRauEvent");
 
     // save pointer to client data
     iRauEventStatus = aEventStatus;
@@ -5635,7 +5630,7 @@
     RMmCustomAPI::TRauEventStatus aEventStatus,
     TInt aErrorCode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYRAUEVENT_1, "TSY: CMmCustomTsy::CompleteNotifyRauEvent");
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyRauEvent");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyNotifyRauEvent );
@@ -5691,7 +5686,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::THSxPAStatus* aHSxPAStatus )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_READHSXPASTATUSL_1, "TSY: CMmCustomTsy::ReadHSxPAStatusL");
+TFLOGSTRING("TSY: CMmCustomTsy::ReadHSxPAStatusL");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(
         ECustomTsyReadHSxPAStatus );
@@ -5734,7 +5729,7 @@
     CMmDataPackage* aDataPackage,
     TInt aErrorCode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEREADHSXPASTATUS_1, "TSY: CMmCustomTsy::CompleteReadHSxPAStatus");
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteReadHSxPAStatus");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyReadHSxPAStatus );
@@ -5746,7 +5741,7 @@
             RMmCustomAPI::THSxPAStatus status;
             aDataPackage->UnPackData( status );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEREADHSXPASTATUS_2, "TSY: CMmCustomTsy::CompleteReadHSxPAStatus, status = %d", status);
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteReadHSxPAStatus, status = %d", status);
 
             // Save the status.
             iHSxPAStatus = status;
@@ -5775,7 +5770,7 @@
 //
 TInt CMmCustomTsy::ReadHSxPAStatusCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_READHSXPASTATUSCANCEL_1, "TSY: CMmCustomTsy::ReadHSxPAStatusCancel");
+TFLOGSTRING("TSY: CMmCustomTsy::ReadHSxPAStatusCancel");
 
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -5802,7 +5797,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::THSxPAStatus* aHSxPAStatus )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_WRITEHSXPASTATUSL_1, "TSY: CMmCustomTsy::WriteHSxPAStatusL. New status: %d", *aHSxPAStatus);
+TFLOGSTRING2("TSY: CMmCustomTsy::WriteHSxPAStatusL. New status: %d", *aHSxPAStatus);
 
     iSetHSxPAStatus = aHSxPAStatus;
 
@@ -5845,7 +5840,7 @@
 void CMmCustomTsy::CompleteWriteHSxPAStatus(
     TInt aErrorCode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEWRITEHSXPASTATUS_1, "TSY: CMmCustomTsy::CompleteWriteHSxPAStatus");
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteWriteHSxPAStatus");
 
     //reset req handle.
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -5874,7 +5869,7 @@
 //
 TInt CMmCustomTsy::WriteHSxPAStatusCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_WRITEHSXPASTATUSCANCEL_1, "TSY: CMmCustomTsy::WriteHSxPAStatusCancel");
+TFLOGSTRING("TSY: CMmCustomTsy::WriteHSxPAStatusCancel");
 
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -5900,7 +5895,7 @@
 TInt CMmCustomTsy::NotifyHSxPAStatus(
     RMmCustomAPI::THSxPAStatus* aHSxPAStatus )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYHSXPASTATUS_1, "TSY: CMmCustomTsy::NotifyHSxPAStatus");
+TFLOGSTRING("TSY: CMmCustomTsy::NotifyHSxPAStatus");
 
     // save pointer to client data
     iRetNotifyHSxPAStatus = aHSxPAStatus;
@@ -5921,13 +5916,13 @@
     CMmDataPackage* aDataPackage,
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYHSXPASTATUS_1, "TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, Error: %d", aErrorCode);
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, Error: %d", aErrorCode);
 
     RMmCustomAPI::THSxPAStatus status;
     aDataPackage->UnPackData( status );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYHSXPASTATUS_2, "TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, old status: %d", iHSxPAStatus);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYHSXPASTATUS_3, "TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, new status: %d", status);
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, old status: %d", iHSxPAStatus);
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, new status: %d", status);
 
     // check if status was changed
     if ( iHSxPAStatus != status )
@@ -5970,7 +5965,7 @@
 //
 TInt CMmCustomTsy::NotifyHSxPAStatusCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYHSXPASTATUSCANCEL_1, "TSY: CMmCustomTsy::NotifyHSxPAStatusCancel");
+TFLOGSTRING("TSY: CMmCustomTsy::NotifyHSxPAStatusCancel");
 
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -5997,7 +5992,7 @@
     TTsyReqHandle /*aTsyReqHandle*/,
     TDes8* aCFIndicators )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETICCCALLFORWARDINGSTATUSL_1, "TSY: CMmCustomTsy::GetIccCallForwardingStatusL");
+TFLOGSTRING("TSY: CMmCustomTsy::GetIccCallForwardingStatusL");
 
     TInt ret( KErrGeneral );
 
@@ -6043,7 +6038,7 @@
     CMmDataPackage* aDataPackage,
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_1, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus, aErrorCode=%d", aErrorCode );
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus, aErrorCode=%d", aErrorCode );
 
     //reset req handle.
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -6058,7 +6053,7 @@
             RMmCustomAPI::TCFIndicators& tcfIndicator = ( *tcfIndicatorPckg )();
 
             aDataPackage->UnPackData( iCurrentTCFIndicator );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_2, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus, indicator=%u", iCurrentTCFIndicator.iIndicator );
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus, indicator=%u", iCurrentTCFIndicator.iIndicator );
 
             tcfIndicator.iIndicator = iCurrentTCFIndicator.iIndicator;
                 tcfIndicator.iCFNumber.iTypeOfNumber =
@@ -6071,7 +6066,7 @@
 	        // Update CenRep with latest valid data
 	        if( &iCurrentTCFIndicator )
 	            {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_3, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus : Update Central Repository");
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus : Update Central Repository");
 	            TPckg<TUint32> tempPckg( iCurrentTCFIndicator.iIndicator );
 	            iCFISCentRep->Set( KCtsyCallForwardingIndicator, tempPckg );
 	
@@ -6096,9 +6091,9 @@
             {
             iGetIccCfStatusBootUp = EFalse;
             aDataPackage->UnPackData( iCurrentTCFIndicator );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_4, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus CenRep key UnconditionalCFStatus not RESETED.");
-
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_5, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus : Bootup case, KCtsyCallForwardingIndicator indicator=%u", iCurrentTCFIndicator.iIndicator );
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus CenRep key UnconditionalCFStatus not RESETED.");     
+
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus : Bootup case, KCtsyCallForwardingIndicator indicator=%u", iCurrentTCFIndicator.iIndicator );
 
             TPckg<TUint32> tempPckg( iCurrentTCFIndicator.iIndicator );
             iCFISCentRep->Set( KCtsyCallForwardingIndicator, tempPckg );
@@ -6108,7 +6103,7 @@
             iCurrentTCFIndicator.iCFNumber.iTelNumber );
             iCFISPrivateCentRep->Set( KCtsyCallForwardingMspId,
             iCurrentTCFIndicator.iMultipleSubscriberProfileID );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_6, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus CenRep updated.");
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus CenRep updated."); 			
             }
         }
     }
@@ -6122,7 +6117,7 @@
 TInt CMmCustomTsy::GetIccCallForwardingStatusCancel(
 	const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETICCCALLFORWARDINGSTATUSCANCEL_1, "CMmCustomTsy::GetIccCallForwardingStatusCancel");
+TFLOGSTRING("CMmCustomTsy::GetIccCallForwardingStatusCancel");
 	// reset reqhandle
 	iTsyReqHandleStore->ResetTsyReqHandle(
 			ECustomTsyGetIccCallForwardingStatus );
@@ -6184,7 +6179,7 @@
     CMmDataPackage* aDataPackage,
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYICCCALLFORWARDINGSTATUSCHANGE_1, "TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange, Error: %d", aErrorCode);
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange, Error: %d", aErrorCode);
 
     RMmCustomAPI::TCFIndicators tempNotifyCFIndicator;
     aDataPackage->UnPackData( tempNotifyCFIndicator );
@@ -6204,7 +6199,7 @@
 
             TPckg<TUint32> tempPckg( iCurrentTCFIndicator.iIndicator );
 			iCFISCentRep->Set( KCtsyCallForwardingIndicator, tempPckg );	
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYICCCALLFORWARDINGSTATUSCHANGE_2, "TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange : Update CenRep, KCtsyCallForwardingIndicator indicator=%u", iCurrentTCFIndicator.iIndicator );
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange : Update CenRep, KCtsyCallForwardingIndicator indicator=%u", iCurrentTCFIndicator.iIndicator );
 				
         	iCFISPrivateCentRep->Set( KCtsyCallForwardingNumberPlan, 
         	    iCurrentTCFIndicator.iCFNumber.iNumberPlan );
@@ -6215,7 +6210,7 @@
         	iCFISPrivateCentRep->Set( KCtsyCallForwardingMspId, 
         	    iCurrentTCFIndicator.iMultipleSubscriberProfileID );
             //CenRep updated
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYICCCALLFORWARDINGSTATUSCHANGE_3, "TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange CenRep updated.");
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange CenRep updated."); 	            
             }
 
         // Check if notification was requested
@@ -6314,7 +6309,7 @@
 TInt CMmCustomTsy::GetCellInfoL(
     TDes8* aCellInfoPckg )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETCELLINFOL_1, "TSY: CMmCustomTsy::GetCellInfo");
+TFLOGSTRING("TSY: CMmCustomTsy::GetCellInfo");
 
     TInt ret = KErrServerBusy;
 
@@ -6354,7 +6349,7 @@
 //
 TInt CMmCustomTsy::GetCellInfoCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETCELLINFOCANCEL_1, "TSY: CMmCustomTsy::GetCellInfoCancel");
+TFLOGSTRING("TSY: CMmCustomTsy::GetCellInfoCancel");
 
     // reset the req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -6382,7 +6377,7 @@
     RMmCustomAPI::TMmCellInfo* aCellInfo,
     TInt aErrorValue )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETCELLINFO_1, "TSY: CMmCustomTsy::CompleteGetCellInfo - aErrorValue %d", aErrorValue);
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteGetCellInfo - aErrorValue %d", aErrorValue);
 
     // reset the req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -6413,7 +6408,7 @@
 TInt CMmCustomTsy::NotifyCellInfoChange(
     TDes8* aCellInfoPckg )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYCELLINFOCHANGE_1, "TSY: CMmCustomTsy::NotifyCellInfoChange");
+TFLOGSTRING("TSY: CMmCustomTsy::NotifyCellInfoChange");
    
     RMmCustomAPI::TMmCellInfo temp;
 	RMmCustomAPI::TMmCellInfoPckg tempPckg(temp);
@@ -6443,7 +6438,7 @@
     RMmCustomAPI::TMmCellInfo* aCellInfo,
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYCELLINFOCHANGE_1, "TSY: CMmCustomTsy::CompleteNotifyCellInfoChange Error: %d", aErrorCode);
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyCellInfoChange Error: %d", aErrorCode);
 
     // Check if notification was requested
 	TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -6475,7 +6470,7 @@
 //
 TInt CMmCustomTsy::NotifyCellInfoChangeCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYCELLINFOCHANGECANCEL_1, "TSY: CMmCustomTsy::NotifyCellInfoChangeCancel");
+TFLOGSTRING("TSY: CMmCustomTsy::NotifyCellInfoChangeCancel");
 
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -6501,7 +6496,7 @@
 RMmCustomAPI::TPndCacheStatus CMmCustomTsy::GetPhonebookCacheStatus( 
     TUint8 aPhoneBookType )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETPHONEBOOKCACHESTATUS_1, "TSY: CMmCustomTsy::GetPhonebookCacheStatus");
+TFLOGSTRING("TSY: CMmCustomTsy::GetPhonebookCacheStatus");
     RMmCustomAPI::TPndCacheStatus ret( RMmCustomAPI::ECacheNotUsed );
 
     switch ( aPhoneBookType )
@@ -6531,7 +6526,7 @@
 void CMmCustomTsy::ReqCompleted( const TTsyReqHandle aTsyReqHandle,
     const TInt aError )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_REQCOMPLETED_1, "TSY: CMmCustomTsy::ReqCompleted, aTsyReqHandle=%d, aError=%d", aTsyReqHandle, aError );
+TFLOGSTRING3("TSY: CMmCustomTsy::ReqCompleted, aTsyReqHandle=%d, aError=%d", aTsyReqHandle, aError );
 
 	CTelObject::ReqCompleted ( aTsyReqHandle, aError );
 	}
@@ -6547,7 +6542,7 @@
     RMmCustomAPI::TBandSelection* aSystemNetworkBand,
     RMmCustomAPI::TNetworkModeCaps* aSystemNetworkMode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSYSTEMNETWORKBANDL_1, "TSY: CMmCustomTsy::GetSystemNetworkBandL");
+TFLOGSTRING("TSY: CMmCustomTsy::GetSystemNetworkBandL");
     TTsyReqHandle reqhandle = iTsyReqHandleStore->GetTsyReqHandle(
         ECustomTsyGetSystemNetworkBand );
 
@@ -6593,7 +6588,7 @@
     RMmCustomAPI::TNetworkModeCaps aSystemNetworkMode,
     TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETSYSTEMNETWORKBAND_1, "TSY: CMmCustomTsy::CompleteGetSystemNetworkBand. Result: %d", aResult);
+TFLOGSTRING2("TSY: CMmCustomTsy::CompleteGetSystemNetworkBand. Result: %d", aResult);
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyGetSystemNetworkBand );
@@ -6626,7 +6621,7 @@
 TInt CMmCustomTsy::GetSystemNetworkBandCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSYSTEMNETWORKBANDCANCEL_1, "TSY: CMmCustomTsy::GetSystemNetworkBandCancel");
+TFLOGSTRING("TSY: CMmCustomTsy::GetSystemNetworkBandCancel");
     // reset the pointer to client data
     iAvailableSystemNetworkBand = NULL;
     iSystemNetworkModeCaps = NULL;
@@ -6652,7 +6647,7 @@
     RMmCustomAPI::TBandSelection* aSystemNetworkBand,
     RMmCustomAPI::TNetworkModeCaps* aSystemNetworkModeCaps )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SETSYSTEMNETWORKBANDL_1, "TSY: CMmCustomTsy::SetSystemNetworkBandL");
+TFLOGSTRING("TSY: CMmCustomTsy::SetSystemNetworkBandL");
     TTsyReqHandle reqhandle = iTsyReqHandleStore->GetTsyReqHandle(
         ECustomTsySetSystemNetworkBand );
 
@@ -6702,7 +6697,7 @@
 void CMmCustomTsy::CompleteSetSystemNetworkBand(
     TInt aResult )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESETSYSTEMNETWORKBAND_1, "TSY: CMmCustomTsy::CompleteSetSystemNetworkBand");
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteSetSystemNetworkBand");
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsySetSystemNetworkBand );
@@ -6723,7 +6718,7 @@
 //
 void CMmCustomTsy::SetIccCfBootUpFlag( TBool aBootUp )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SETICCCFBOOTUPFLAG_1, "TSY: CMmCustomTsy::SetIccCfBootUpFlag, aBootUp=%d", aBootUp );
+TFLOGSTRING2("TSY: CMmCustomTsy::SetIccCfBootUpFlag, aBootUp=%d", aBootUp );
 
     iGetIccCfStatusBootUp = aBootUp;
     }
@@ -6737,7 +6732,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::TAppSupport* aAppSupport )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETUSIMSERVICESUPPORTL_1, "TSY: CMmCustomTsy::GetUSIMServiceSupportL");
+TFLOGSTRING("TSY: CMmCustomTsy::GetUSIMServiceSupportL");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(
         ECustomTsyGetUSIMServiceSupport );
@@ -6784,7 +6779,7 @@
     CMmDataPackage* aDataPackage,
     TInt aErrorCode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETUSIMSERVICESUPPORT_1, "TSY: CMmCustomTsy::CompleteGetUSIMServiceSupport");
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteGetUSIMServiceSupport");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyGetUSIMServiceSupport );
@@ -6821,7 +6816,7 @@
 //
 TInt CMmCustomTsy::GetUSIMServiceSupportCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETUSIMSERVICESUPPORTCANCEL_1, "TSY: CMmCustomTsy::GetUSIMServiceSupportCancel");
+TFLOGSTRING("TSY: CMmCustomTsy::GetUSIMServiceSupportCancel");
 
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -6847,7 +6842,7 @@
 TInt CMmCustomTsy::NotifyRemoteAlertingToneStatusChange(
     RMmCustomAPI::TRemoteAlertingToneStatus* aToneStatus )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYREMOTEALERTINGTONESTATUSCHANGE_1, "TSY: CMmCustomTsy::NotifyRemoteAlertingToneStatusChange");
+TFLOGSTRING("TSY: CMmCustomTsy::NotifyRemoteAlertingToneStatusChange");
 
     // save pointer to client data
     iToneStatus = aToneStatus;
@@ -6868,7 +6863,7 @@
     RMmCustomAPI::TRemoteAlertingToneStatus aToneStatus,
     TInt aErrorCode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYREMOTEALERTINGTONESTATUSCHANGE_1, "TSY: CMmCustomTsy::CompleteNotifyRemoteAlertingToneStatusChange");
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyRemoteAlertingToneStatusChange");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyNotifyRemoteAlertingToneStatusChange );

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmPacketTsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmPacketTsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -15,11 +15,7 @@
 
 
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CMmPacketTsyTraces.h"
-#endif
+#include <ctsy/tflogger.h>
 
 #include "CMmCustomTsy.h"
 #include "CMmPacketTsy.h"
@@ -51,7 +47,7 @@
     CMmCustomTsy* aMmCustomTsy, 
     CMmPhoneTsy* aMmPhone )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_NEWL_1,  "CustomTSY: CMmPacketTsy::NewL" );
+TFLOGSTRING( "CustomTSY: CMmPacketTsy::NewL" );
     CMmPacketTsy* mmPacketTsy = new ( ELeave ) CMmPacketTsy();
     CleanupStack::PushL( mmPacketTsy );
     mmPacketTsy->iMmCustomTsy = aMmCustomTsy;
@@ -64,7 +60,7 @@
 
 CMmPacketTsy::~CMmPacketTsy()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_DTOR_1,  "CustomTSY: CMmPacketTsy::~CMmPacketTsy" );
+TFLOGSTRING( "CustomTSY: CMmPacketTsy::~CMmPacketTsy" );
     delete iTsyReqHandleStore;
     }
 
@@ -164,7 +160,7 @@
     const TInt aIpc, 
     const TDataPackage& aPackage )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_DOEXTFUNCL_1,  "CustomTSY: CMmPacketTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle );
+TFLOGSTRING3( "CustomTSY: CMmPacketTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle );
     TInt ret( KErrNotSupported );
 
     switch ( aIpc )
@@ -176,7 +172,7 @@
             ret = GetEGprsInfo( aTsyReqHandle, aPackage.Des1n() );
             break;
         case ECustomSetAlwaysOnMode:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_DOEXTFUNCL_2,  "TSY:CMmPacketTsy::DoExtFuncL ECustomSetAlwaysOnMode");
+TFLOGSTRING( "TSY:CMmPacketTsy::DoExtFuncL ECustomSetAlwaysOnMode");
             ret = SetAlwaysOnL( aTsyReqHandle,
                ( REINTERPRET_CAST( RMmCustomAPI::TSetAlwaysOnMode*,
                               					aPackage.Ptr1() ) ) );
@@ -282,7 +278,7 @@
     const TInt aIpc, 
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_CANCELSERVICE_1,  "CustomTSY: CMmPacketTsy::CancelService IPC:%d", aIpc );
+TFLOGSTRING2( "CustomTSY: CMmPacketTsy::CancelService IPC:%d", aIpc );
     TInt ret( KErrNone );
 
     // Req handle type
@@ -338,7 +334,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     const TInt aError )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_REQCOMPLETED_1,  "CustomTSY: CMmPacketTsy::ReqCompleted Handle:%d Error:%d", aTsyReqHandle, aError );
+TFLOGSTRING3( "CustomTSY: CMmPacketTsy::ReqCompleted Handle:%d Error:%d", aTsyReqHandle, aError );
     iMmCustomTsy->ReqCompleted( aTsyReqHandle, aError );
     }
 
@@ -352,7 +348,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     TDes8* aGprsInformation )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_NOTIFYEGPRSINFOCHANGE_1,  "CustomTSY: CMmPacketTsy::NotifyEGprsInfoChange" );
+TFLOGSTRING( "CustomTSY: CMmPacketTsy::NotifyEGprsInfoChange" );
 
     RMmCustomAPI::TGprsInformation temp;
 	RMmCustomAPI::TGprsInformationPckg tempPckg(temp);
@@ -386,7 +382,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     TDes8* aGprsInformation )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_GETEGPRSINFO_1,  "CustomTSY: CMmPacketTsy::GetEGprsInfo" );
+TFLOGSTRING( "CustomTSY: CMmPacketTsy::GetEGprsInfo" );
 
     RMmCustomAPI::TGprsInformation temp;
 	RMmCustomAPI::TGprsInformationPckg tempPckg(temp);
@@ -423,14 +419,14 @@
 	    // if gprsSupportInCell is ETrue -> cell is supporting EGPRS connection 
 	    if ( edgeGprsSupportInCell )
 	        {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_GETEGPRSINFO_2,  "CustomTSY: CMmPacketTsy::GetEGprsInfo  RMmCustomAPI::EEdgeGprs" );
+	TFLOGSTRING( "CustomTSY: CMmPacketTsy::GetEGprsInfo  RMmCustomAPI::EEdgeGprs" );
 	        gprsInformation.iGprsInfo = RMmCustomAPI::EEdgeGprs; 
 	        }
 
 	    // else EGPRS connection is not supported
 	    else 
 	        {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_GETEGPRSINFO_3,  "CustomTSY: CMmPacketTsy::GetEGprsInfo  RMmCustomAPI::EGprs" );
+	TFLOGSTRING( "CustomTSY: CMmPacketTsy::GetEGprsInfo  RMmCustomAPI::EGprs" );
 	        gprsInformation.iGprsInfo = RMmCustomAPI::EGprs;
 	        }
 
@@ -452,7 +448,7 @@
 void CMmPacketTsy::CompleteNotifyEGprsInfoChange(
     const TBool aGprsSupportInCell )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_COMPLETENOTIFYEGPRSINFOCHANGE_1,  "CustomTSY: CMmPacketTsy::CompleteNotifyEGprsInfoChange" );
+TFLOGSTRING( "CustomTSY: CMmPacketTsy::CompleteNotifyEGprsInfoChange" );
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodePacketContextNotifyEGprsInfoChange );
 
@@ -465,14 +461,14 @@
         // if aGprsSupportInCell is ETrue -> cell is supporting edge GPRS
         if ( aGprsSupportInCell )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_COMPLETENOTIFYEGPRSINFOCHANGE_2,  "CustomTSY: CMmPacketTsy::CompleteNotifyEGprsInfoChange  RMmCustomAPI::EEdgeGprs" );
+TFLOGSTRING( "CustomTSY: CMmPacketTsy::CompleteNotifyEGprsInfoChange  RMmCustomAPI::EEdgeGprs" );
             gprsInformation.iGprsInfo = RMmCustomAPI::EEdgeGprs;
             }
 
         // if aGprsSupportInCell is EFalse -> cell is not supporting edge GPRS
         else 
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_COMPLETENOTIFYEGPRSINFOCHANGE_3,  "CustomTSY: CMmPacketTsy::CompleteNotifyEGprsInfoChange  RMmCustomAPI::EGprs" );
+TFLOGSTRING( "CustomTSY: CMmPacketTsy::CompleteNotifyEGprsInfoChange  RMmCustomAPI::EGprs" );
             gprsInformation.iGprsInfo = RMmCustomAPI::EGprs;
             }
                     
@@ -493,7 +489,7 @@
 	TTsyReqHandle aTsyReqHandle,
 	RMmCustomAPI::TSetAlwaysOnMode* aMode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_SETALWAYSONL_1,  "CMmPacketTsy::SetAlwaysOn Reg Handle = %d", aTsyReqHandle );
+TFLOGSTRING2( "CMmPacketTsy::SetAlwaysOn Reg Handle = %d", aTsyReqHandle );
 	
 	TInt ret( KErrGeneral );
 	
@@ -510,7 +506,7 @@
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_SETALWAYSONL_2,  "CMmPacketTsy::SetAlwaysOn packetDataSession is NULL " );
+TFLOGSTRING( "CMmPacketTsy::SetAlwaysOn packetDataSession is NULL " );		
         }	
 		
     return ret;
@@ -526,7 +522,7 @@
 	TTsyReqHandle aReqHandle, 
 	TInt aError )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_COMPLETESETALWAYSON_1,  "CMmPacketTsy::CompleteSetAlwaysOn" );
+TFLOGSTRING( "CMmPacketTsy::CompleteSetAlwaysOn" );
 
 	ReqCompleted( aReqHandle, aError );
 
@@ -540,7 +536,7 @@
 //
 void CMmPacketTsy::CancelSetAlwaysOn( TTsyReqHandle aReqHandle )
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_CANCELSETALWAYSON_1,  "CMmPacketTsy::CancelSetAlwaysOn" );
+TFLOGSTRING( "CMmPacketTsy::CancelSetAlwaysOn" );
 	
 	//Direct request to Service Tsy
 	iMmPhone->PacketDataSession()->CancelSetAlwaysOn( aReqHandle );

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSIMTsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSIMTsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,14 +16,9 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CMmSIMTsyTraces.h"
-#endif
-
 #include "CMmSIMTsy.h"
 #include <ctsy/pluginapi/cmmdatapackage.h>
+#include <ctsy/tflogger.h>
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -35,7 +30,7 @@
 void CMmSIMTsy::ConstructL(
     CMmCustomTsy* aMmCustomTsy )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CONSTRUCTL_1, "TSY: CMmSIMTsy::ConstructL");
+TFLOGSTRING("TSY: CMmSIMTsy::ConstructL");         
     iMmCustomTsy = aMmCustomTsy;
 
     // Create req handle store
@@ -64,7 +59,7 @@
         ( KPhEngMaxViagHomeZones * KPhEngMaxCacheId ) ); );
     if ( leaveCode )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CONSTRUCTL_2, "TSY: CMmSIMTsy::ConstructL: Could not construct o2 HomeZone dynamic cache, error=%d", leaveCode);
+TFLOGSTRING2("TSY: CMmSIMTsy::ConstructL: Could not construct o2 HomeZone dynamic cache, error=%d", leaveCode);
         iViagDynamicCache = NULL;
         }
     else
@@ -76,14 +71,14 @@
         iViagDynamicCache->AppendL( zero, ( KPhEngMaxViagHomeZones * 
             KPhEngMaxCacheId ) );
         iViagHomeZoneCacheReady = EFalse;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CONSTRUCTL_3, "TSY: CMmSIMTsy::ConstructL: o2 HomeZone dynamic cache array created.");
+TFLOGSTRING("TSY: CMmSIMTsy::ConstructL: o2 HomeZone dynamic cache array created.");
         }
     }
 
 CMmSIMTsy* CMmSIMTsy::NewL(
     CMmCustomTsy* aMmCustomTsy )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_NEWL_1, "TSY: CMmSIMTsy::NewL");
+TFLOGSTRING("TSY: CMmSIMTsy::NewL");    
     CMmSIMTsy* self = new (ELeave) CMmSIMTsy();
 
     CleanupStack::PushL( self );
@@ -95,7 +90,7 @@
 
 CMmSIMTsy::~CMmSIMTsy()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_DTOR_1, "TSY: CMmSIMTsy::~CMmSIMTsy()");
+TFLOGSTRING("TSY: CMmSIMTsy::~CMmSIMTsy()");         
     // delete all CB ID related
     ResetAndDestroySimCbTopics();
 
@@ -155,7 +150,7 @@
     const TInt aIpc, 
     const TDataPackage& aPackage )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_DOEXTFUNCL_1, "TSY: CMmSIMTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmSIMTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle);
     TInt ret( KErrGeneral );
 
     // Ensure the ReqHandleType is unset.
@@ -375,7 +370,7 @@
     RMmCustomAPI::TViagParams* aViagParameters, 
     RMmCustomAPI::TViagElement* aViagElements )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONEPARAMSL_1, "TSY: CMmSIMTsy::ReadViagHomeZoneParamsL");
+TFLOGSTRING("TSY: CMmSIMTsy::ReadViagHomeZoneParamsL");
     TInt ret( KErrNone);
 
     if ( ESIMTsyReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle(
@@ -424,7 +419,7 @@
 //
 void CMmSIMTsy::CheckViagHomezoneParamsL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CHECKVIAGHOMEZONEPARAMSL_1, "TSY: CMmSIMTsy::CheckViagHomezoneParamsL");
+TFLOGSTRING("TSY: CMmSIMTsy::CheckViagHomezoneParamsL");
     // Check if the request is pending
     if ( ESIMTsyReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle(
         ESIMRequestTypeReadParams )  && iViagParamsReadRequested )
@@ -433,7 +428,7 @@
         // read requests, set flag to EFalse.
         iViagParamsReadRequested = EFalse;
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CHECKVIAGHOMEZONEPARAMSL_2, "TSY: CMmSIMTsy::CheckViagHomezoneParamsL - Sending request" );
+TFLOGSTRING("TSY: CMmSIMTsy::CheckViagHomezoneParamsL - Sending request" );
         // send request to DOS (no parameters)
         // Void return value, there is nothing to be done if request fails.
         (void) iMmCustomTsy->Phone()->MessageManager()->HandleRequestL(
@@ -441,7 +436,7 @@
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CHECKVIAGHOMEZONEPARAMSL_3, "TSY: CMmSIMTsy::CheckViagHomezoneParamsL - VIAG homezone params not requested");
+TFLOGSTRING("TSY: CMmSIMTsy::CheckViagHomezoneParamsL - VIAG homezone params not requested");
         }
 
     StartDynamicCachingL();
@@ -459,7 +454,7 @@
     RMmCustomAPI::TViagElements* aElems, 
     TInt aError )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_1, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - aError: %d", aError );
+TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - aError: %d", aError );
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ESIMRequestTypeReadParams );
     if ( ESIMTsyReqHandleUnknown != reqHandle )
@@ -467,29 +462,29 @@
         if ( aError == KErrNone && iViagParams && iViagElems )
             {
             *iViagParams = *aParams;
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_2, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iSmsC: %S", iViagParams->iSmsC );
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_3, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iScp: %S",  iViagParams->iScp );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_4, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iSubscribedZoneAndVersion: %d", iViagParams->iSubscribedZoneAndVersion );
+TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iSmsC: %S", &iViagParams->iSmsC );
+TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iScp: %S",  &iViagParams->iScp );
+TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iSubscribedZoneAndVersion: %d", iViagParams->iSubscribedZoneAndVersion );
 
             for ( TUint8 i = 0; i < RMmCustomAPI::KViagElementCount; i++ )
                 {
                 iViagElems[ i ].iCoordinates.iX = aElems->At(i).iCoordinates.iX;
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_5, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iX: %d", i, aElems->At(i).iCoordinates.iX );
+TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iX: %d", i, aElems->At(i).iCoordinates.iX );
 
                 iViagElems[ i ].iCoordinates.iY = aElems->At(i).iCoordinates.iY;
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_6, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iY: %d", i, aElems->At(i).iCoordinates.iY );
+TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iY: %d", i, aElems->At(i).iCoordinates.iY );
 
                 iViagElems[ i ].iCoordinates.iR2 = aElems->
                     At(i).iCoordinates.iR2;
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_7, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iR2: %d", i, aElems->At(i).iCoordinates.iR2 );
+TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iR2: %d", i, aElems->At(i).iCoordinates.iR2 );
 
                 iViagElems[ i ].iCoordinates.iZoneId = aElems->
                     At(i).iCoordinates.iZoneId;
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_8, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iZoneId: %d", i, aElems->At(i).iCoordinates.iZoneId );
+TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iZoneId: %d", i, aElems->At(i).iCoordinates.iZoneId );
 
                 iViagElems[ i ].iName.Copy( aElems->At(i).iName );
                 iViagElems[ i ].iActiveFlag = aElems->At(i).iActiveFlag;
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_9, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iActiveFlag: %d", i, aElems->At(i).iActiveFlag );
+TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iActiveFlag: %d", i, aElems->At(i).iActiveFlag );
                 }
             }
         iMmCustomTsy->ReqCompleted( reqHandle, aError );
@@ -504,7 +499,7 @@
 //
 TInt CMmSIMTsy::ReadViagHomeZoneParamsCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONEPARAMSCANCEL_1, "TSY: CMmSIMTsy::ReadViagHomeZoneParamsCancel");
+TFLOGSTRING("TSY: CMmSIMTsy::ReadViagHomeZoneParamsCancel");
     // reset the pointer to client space
     iViagParams = NULL;
     iViagElems = NULL;
@@ -532,7 +527,7 @@
     RMmCustomAPI::TViagCacheRecordId* aViagRecordId,
     RMmCustomAPI::TViagCacheRecordContent* aViagRecordContent )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONECACHEL_1, "TSY: CMmSIMTsy::ReadViagHomeZoneCacheL");
+TFLOGSTRING("TSY: CMmSIMTsy::ReadViagHomeZoneCacheL");
     TInt ret( KErrGeneral );
 
     if ( ESIMTsyReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle(
@@ -569,7 +564,7 @@
     RMmCustomAPI::TViagCacheRecordContent* aViagRecord,
     TInt aError )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_1, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL");
+TFLOGSTRING("TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL");
     iLastViagHomeZoneCacheError = aError;
     if (iCurrentlyRetrievedCache == NULL)
         {
@@ -591,7 +586,7 @@
                 ( ( iCurrentlyRetrievedCache->iCacheId - 1 ) * 21 ) +
                 iCurrentlyRetrievedCache->iRecordId;
             iViagDynamicCache->At( arrayIndex ) = *aViagRecord;
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_2, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:Entry at cacheId=%d, recordId=%d read.", iCurrentlyRetrievedCache->iCacheId,iCurrentlyRetrievedCache->iRecordId);
+TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:Entry at cacheId=%d, recordId=%d read.", iCurrentlyRetrievedCache->iCacheId,iCurrentlyRetrievedCache->iRecordId);
 
             TRAP_IGNORE(
                 // loop. loop four caches times 21 entries!
@@ -623,14 +618,14 @@
                 delete iCurrentlyRetrievedCache;
                 iCurrentlyRetrievedCache = NULL;
                 iViagHomeZoneCacheReady = ETrue;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_3, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:Caching completed successfully!");
+TFLOGSTRING("TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:Caching completed successfully!");
 
                 if( 0 < iReadViagHomeZoneCacheRequests.Count() )
                     {
                     
                     for ( TInt i=0; i <iReadViagHomeZoneCacheRequests.Count() ; i++ )
                         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_4, "TSY: CMmSIMTsy::CompleteReadDynamicViagHomeZoneCacheRespL: for i:%d", i);
+TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadDynamicViagHomeZoneCacheRespL: for i:%d", i);
                         TReadViagHomeZoneCacheRequest* req = 
 		  			    iReadViagHomeZoneCacheRequests[ i ];
 		  			    
@@ -660,13 +655,13 @@
             // caching aborted
         delete iCurrentlyRetrievedCache;
         iCurrentlyRetrievedCache = NULL;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_5, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:There was a problem reading cache values from SIM, error=%d", aError);
+TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:There was a problem reading cache values from SIM, error=%d", aError);
             //iViagHomeZoneCacheReady = ETrue;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_6, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL: Caching completed unsuccessfully!");
+TFLOGSTRING("TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL: Caching completed unsuccessfully!");
 
             for (TInt i = 0; i < iReadViagHomeZoneCacheRequests.Count(); i++)
                 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_7, "TSY: CMmSIMTsy::CompleteReadDynamicViagHomeZoneCacheRespL: for i:%d", i);
+TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadDynamicViagHomeZoneCacheRespL: for i:%d", i);
                 TReadViagHomeZoneCacheRequest* req =
                         iReadViagHomeZoneCacheRequests[i];
                 iMmCustomTsy->ReqCompleted(req->iReqHandle, aError);
@@ -685,8 +680,8 @@
 TInt CMmSIMTsy::ReadViagHomeZoneCacheCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_1, "TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel");
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_2, "TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Handle:%d",aTsyReqHandle);
+TFLOGSTRING("TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel");
+TFLOGSTRING2("TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Handle:%d",aTsyReqHandle);
     // Reset the pointer to client space
     iViagReadCacheRecord = NULL;
 
@@ -701,7 +696,7 @@
             ESIMRequestTypeReadCache );
         if ( ESIMTsyReqHandleUnknown != reqHandle )
         	{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_3, "TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Completed with Cancel Handle:%d",reqHandle);
+TFLOGSTRING2("TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Completed with Cancel Handle:%d",reqHandle);	
 			// Complete request with cancel
 			iMmCustomTsy->ReqCompleted( reqHandle, KErrCancel );
         	}
@@ -719,7 +714,7 @@
                 if (aTsyReqHandle == req->iReqHandle)
                 	{
                 	// Complete the request if the request handle is found
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_4, "TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Complete with Cancel from array Handle:%d Id=%d ", req->iReqHandle,i);
+TFLOGSTRING3("TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Complete with Cancel from array Handle:%d Id=%d ", req->iReqHandle,i);
                     iMmCustomTsy->ReqCompleted( req->iReqHandle, KErrCancel );
 	                delete iReadViagHomeZoneCacheRequests[ i ];
 	                iReadViagHomeZoneCacheRequests.Remove(i);
@@ -742,8 +737,8 @@
     RMmCustomAPI::TViagCacheRecordId* aViagRecordId,
     RMmCustomAPI::TViagCacheRecordContent* aViagRecordContent )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_1, "TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache:Is ViagHomeZoneCache Ready =%d", iViagHomeZoneCacheReady);
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_2, "TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache iCacheId %d iRecordId %d",aViagRecordId->iCacheId,aViagRecordId->iRecordId );
+TFLOGSTRING2("TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache:Is ViagHomeZoneCache Ready =%d", iViagHomeZoneCacheReady);
+TFLOGSTRING3("TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache iCacheId %d iRecordId %d",aViagRecordId->iCacheId,aViagRecordId->iRecordId );
     TInt err = KErrNone;
 	//  KPhEngMaxViagHomeZones(4) * KPhEngMaxCacheId(21)
 	if ( 1 > aViagRecordId->iCacheId || 4 < aViagRecordId->iCacheId || 
@@ -753,7 +748,7 @@
 		}
     else if ( iViagDynamicCache && iViagHomeZoneCacheReady )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_3, "TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache: else if : Cache is ready, Reading cache possible");
+TFLOGSTRING("TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache: else if : Cache is ready, Reading cache possible");
         // copy data from dynamic cache to client
         // some arithmetics:
         //     cache ids range 1..4
@@ -766,7 +761,7 @@
         }
     else if ( !iViagHomeZoneCacheReady )
         {
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_4, "TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache: else if : Cache is NOT ready, Reading cache NOT possible");
+ TFLOGSTRING("TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache: else if : Cache is NOT ready, Reading cache NOT possible");
         //The request is already in processing because of previous request
         //Complete request with status value informing the client about
 		TReadViagHomeZoneCacheRequest* req = 
@@ -801,7 +796,7 @@
     RMmCustomAPI::TViagCacheRecordId* aViagRecordId,
     RMmCustomAPI::TViagCacheRecordContent* aViagRecordContent )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_WRITEVIAGHOMEZONECACHEL_1, "TSY: CCMmSIMTsy::WriteViagHomeZoneCacheL iCacheId %d iRecordId %d",aViagRecordId->iCacheId,aViagRecordId->iRecordId );
+TFLOGSTRING3("TSY: CCMmSIMTsy::WriteViagHomeZoneCacheL iCacheId %d iRecordId %d",aViagRecordId->iCacheId,aViagRecordId->iRecordId );
     TInt ret( KErrGeneral );
 
     if ( ESIMTsyReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle(
@@ -853,7 +848,7 @@
 void CMmSIMTsy::CompleteWriteViagHomeZoneCacheResp(
     TInt aError )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEWRITEVIAGHOMEZONECACHERESP_1, "TSY: CMmSIMTsy::CompleteWriteViagHomeZoneCacheResp");
+TFLOGSTRING("TSY: CMmSIMTsy::CompleteWriteViagHomeZoneCacheResp");
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ESIMRequestTypeWriteCache );
 
@@ -874,7 +869,7 @@
 void CMmSIMTsy::CompleteWriteViagHomeZoneUHZIUESettingsResp(
     TInt aError )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEWRITEVIAGHOMEZONEUHZIUESETTINGSRESP_1, "TSY: CMmSIMTsy::CompleteWriteViagHomeZoneUHZIUESettingsResp error = %d",aError);
+TFLOGSTRING2("TSY: CMmSIMTsy::CompleteWriteViagHomeZoneUHZIUESettingsResp error = %d",aError);
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ESIMRequestTypeWriteSettings );
 
@@ -913,12 +908,12 @@
 //
 void CMmSIMTsy::StartDynamicCachingL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_STARTDYNAMICCACHINGL_1, "TSY: CMmSIMTsy::StartDynamicCachingL");
+TFLOGSTRING("TSY: CMmSIMTsy::StartDynamicCachingL");
     iLastViagHomeZoneCacheError = KErrNone;
 	// Make sure there are no ongoing dynamic caching requests.. 
 	if( iCurrentlyRetrievedCache ) 
 		{ 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_STARTDYNAMICCACHINGL_2, "TSY: CMmSIMTsy::StartDynamicCachingL - iCurrentlyRetrievedCache already exists - no new request done");
+TFLOGSTRING("TSY: CMmSIMTsy::StartDynamicCachingL - iCurrentlyRetrievedCache already exists - no new request done");       
 		return; 
 		} 
 
@@ -927,10 +922,10 @@
         RMmCustomAPI::TViagCacheRecordId(); );
     if ( trapError )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_STARTDYNAMICCACHINGL_3, "TSY: CMmSIMTsy::StartDynamicCachingL:Could not start caching, error=%d", trapError);
+TFLOGSTRING2("TSY: CMmSIMTsy::StartDynamicCachingL:Could not start caching, error=%d", trapError);
         return;
     }
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_STARTDYNAMICCACHINGL_4, "TSY: CMmSIMTsy::StartDynamicCachingL:Starting caching now.");
+TFLOGSTRING("TSY: CMmSIMTsy::StartDynamicCachingL:Starting caching now.");
     iCurrentlyRetrievedCache->iCacheId = 1;  // caches range from 1 to 4
     iCurrentlyRetrievedCache->iRecordId = 0; // records range from 0 to 20
     // send request to DOS
@@ -951,7 +946,7 @@
 TInt CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsL(
     RMmCustomAPI::TViagUHZIUESettings* aSettings )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_WRITEVIAGHOMEZONEUHZIUESETTINGSL_1, "TSY: CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsL");
+TFLOGSTRING("TSY: CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsL");
     TInt ret( KErrGeneral );
 
     if ( ESIMTsyReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle(
@@ -982,7 +977,7 @@
 //
 TInt CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_WRITEVIAGHOMEZONEUHZIUESETTINGSCANCEL_1, "TSY: CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsCancel");
+TFLOGSTRING("TSY: CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsCancel");
     // check if handle is not in use.
     TTsyReqHandle scFileHandle = 
         iTsyReqHandleStore->GetTsyReqHandle( ESIMRequestTypeWriteSettings );
@@ -1014,7 +1009,7 @@
 TInt CMmSIMTsy::StartSimCbTopicBrowsingL(
     const TTsyReqHandle /*aTsyReqHandle */)
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_STARTSIMCBTOPICBROWSINGL_1, "TSY: CMmSIMTsy::StartSimCbTopicBrowsingL");
+TFLOGSTRING("TSY: CMmSIMTsy::StartSimCbTopicBrowsingL");
     // reset variables
     ResetAndDestroySimCbTopics();
     iGetNextSimCbTopicIndex = KNoCbIds;
@@ -1055,7 +1050,7 @@
     CArrayFixFlat<RMmCustomAPI::TSimCbTopic>* aTopics, 
     TInt aError )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETESTARTSIMCBTOPICBROWSING_1, "TSY: CMmSIMTsy::CompleteStartSimCbTopicBrowsing");
+TFLOGSTRING("TSY: CMmSIMTsy::CompleteStartSimCbTopicBrowsing");
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ESIMRequestTypeStartSimCbTopicBrowsing );
 
@@ -1098,7 +1093,7 @@
     TTsyReqHandle aTsyReqHandle, 
     RMmCustomAPI::TSimCbTopic *aSimCbTopic )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_GETNEXTSIMCBTOPIC_1, "TSY: CMmSIMTsy::GetNextSimCbTopic");
+TFLOGSTRING("TSY: CMmSIMTsy::GetNextSimCbTopic");
     // initialize ret with KErrNotFound
     TInt ret ( KErrNotFound );
 
@@ -1134,7 +1129,7 @@
     const TTsyReqHandle /*aTsyReqHandle */, 
     TUint* aSimCbTopicNumber )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_DELETESIMCBTOPICL_1, "TSY: CMmSIMTsy::DeleteSimCbTopicL");
+TFLOGSTRING("TSY: CMmSIMTsy::DeleteSimCbTopicL");
     TInt ret( KErrNone );
     TBool topicInSimMemoryDelete ( EFalse );
 
@@ -1193,7 +1188,7 @@
 void CMmSIMTsy::CompleteDeleteSimCbTopic(
     TInt aError )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEDELETESIMCBTOPIC_1, "TSY: CMmSIMTsy::CompleteDeleteSimCbTopic- aError: %d", aError);
+TFLOGSTRING2("TSY: CMmSIMTsy::CompleteDeleteSimCbTopic- aError: %d", aError);
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ESIMRequestTypeDeleteSimCbTopic );
 
@@ -1303,7 +1298,7 @@
     TInt aReqHandleType, 
     TInt aError )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETE_1,  "CustomTSY: CMmSIMTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError );
+TFLOGSTRING3( "CustomTSY: CMmSIMTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError );
 
     // All possible TSY req handle types are listed in the
     // switch case below.

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSimLockTsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSimLockTsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,13 +16,8 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CMmSimLockTsyTraces.h"
-#endif
-
 #include "CMmSimLockTsy.h"
+#include <ctsy/tflogger.h>
 #include <ctsy/pluginapi/cmmdatapackage.h>
 
 // ======== MEMBER FUNCTIONS ========
@@ -453,7 +448,7 @@
     TInt aReqHandleType, 
     TInt aError )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMLOCKTSY_COMPLETE_1,  "CMmCustomTsy: CMmSimLockTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError );
+TFLOGSTRING3( "CMmCustomTsy: CMmSimLockTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError );
 
     // All possible TSY req handle types are listed in the
     // switch case below.

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmWimTsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmWimTsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,14 +16,9 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CMmWimTsyTraces.h"
-#endif
-
 #include "CMmWimTsy.h"
 #include <ctsy/rmmcustomapi.h>
+#include <ctsy/tflogger.h>
 #include <ctsy/pluginapi/cmmdatapackage.h>
 
 // ======== MEMBER FUNCTIONS ========
@@ -508,7 +503,7 @@
     TInt aReqHandleType, 
     TInt aError )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETE_1,  "CustomTSY: CMmWimTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError );
+TFLOGSTRING3( "CustomTSY: CMmWimTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError );
     iMmCustomTsy->ReqCompleted( iTsyReqHandleStore->ResetTsyReqHandle( 
         aReqHandleType ), aError );
     }
@@ -524,7 +519,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     TDes8 *aATR )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_GETATRL_1,  "TSY: CMmWimTsy::GetATRL" );
+TFLOGSTRING( "TSY: CMmWimTsy::GetATRL" );
     
     TTsyReqHandle getAtrHandle = iTsyReqHandleStore->
         GetTsyReqHandle( EWIMRequestTypeGetATR );
@@ -534,7 +529,7 @@
         // The request is already in processing because of previous request
         // Complete request with status value informing the client about 
         // the situation.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_GETATRL_2,  "TSY: CMmWimTsy::GetATRL - KErrServerBusy" );
+TFLOGSTRING( "TSY: CMmWimTsy::GetATRL - KErrServerBusy" );
         iMmCustomTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy );
         }
     else
@@ -577,7 +572,7 @@
     TPtrC8& aData, 
     TInt aError )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETEGETATR_1,  "TSY: CMmWimTsy::CompleteGetATR ");
+TFLOGSTRING( "TSY: CMmWimTsy::CompleteGetATR ");
     // reset the reqhandle
     TTsyReqHandle tsyReqHandle = 
         iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypeGetATR );
@@ -611,7 +606,7 @@
 //
 TInt CMmWimTsy::GetATRCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_GETATRCANCEL_1,  "CMmWimTsy::GetATRCancel" );
+TFLOGSTRING( "CMmWimTsy::GetATRCancel" );
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EWIMRequestTypeGetATR );
@@ -637,7 +632,7 @@
 TInt CMmWimTsy::SimWarmResetL(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_SIMWARMRESETL_1,  "CMmWimTsy::SimWarmResetL");
+TFLOGSTRING( "CMmWimTsy::SimWarmResetL"); 
     TTsyReqHandle simWarmResetHandle = 
         iTsyReqHandleStore->GetTsyReqHandle( EWIMRequestTypeSimWarmReset );
         
@@ -646,7 +641,7 @@
         // The request is already in processing because of previous request
         // Complete request with status value informing the client about 
         // the situation.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_SIMWARMRESETL_2,  "TSY: CMmWimTsy::SimWarmResetL - KErrServerBusy" );
+TFLOGSTRING( "TSY: CMmWimTsy::SimWarmResetL - KErrServerBusy" );
         iMmCustomTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy );
         }
     else
@@ -683,7 +678,7 @@
 void CMmWimTsy::CompleteSimWarmReset(
     TInt aError )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETESIMWARMRESET_1,  "CMmWimTsy::CompleteSimWarmReset" );
+TFLOGSTRING( "CMmWimTsy::CompleteSimWarmReset" );
        
     // reset the reqhandle
     TTsyReqHandle tsyReqHandle = 
@@ -704,7 +699,7 @@
 //
 TInt CMmWimTsy::SimWarmResetCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_SIMWARMRESETCANCEL_1,  "TSY: CMmWimTsy::SimWarmResetCancel" );
+TFLOGSTRING( "TSY: CMmWimTsy::SimWarmResetCancel" );
     // reset the reqhandle
     TTsyReqHandle reqHandle =
         iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypeSimWarmReset );
@@ -728,7 +723,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     RMmCustomAPI::TSimCardReaderStatus* aSimCardReaderStatus )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_GETSIMCARDREADERSTATUSL_1,  "TSY: CMmWimTsy::GetSimCardReaderStatusL" );
+TFLOGSTRING( "TSY: CMmWimTsy::GetSimCardReaderStatusL" ); 
     TTsyReqHandle getSimCardReaderStatusHandle = 
         iTsyReqHandleStore->GetTsyReqHandle( 
         EWIMRequestTypeGetSimCardReaderStatus );
@@ -738,7 +733,7 @@
         // The request is already in processing because of previous request
         // Complete request with status value informing the client about 
         // the situation.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_GETSIMCARDREADERSTATUSL_2,  "TSY: CMmWimTsy::GetSimCardReaderStatusL - KErrServerBusy" );
+TFLOGSTRING( "TSY: CMmWimTsy::GetSimCardReaderStatusL - KErrServerBusy" );
         iMmCustomTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy );
         }
     else
@@ -781,7 +776,7 @@
     TPtrC8& aData, 
     TInt aError )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETEGETSIMCARDREADERSTATUS_1,  "CMmWimTsy::CompleteGetSimCardReaderStatus" );
+TFLOGSTRING( "CMmWimTsy::CompleteGetSimCardReaderStatus" );
     // reset the reqhandle
     TTsyReqHandle tsyReqHandle = 
         iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -816,7 +811,7 @@
 //
 TInt CMmWimTsy::GetSimCardReaderStatusCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_GETSIMCARDREADERSTATUSCANCEL_1,  "TSY: CMmWimTsy::GetSimCardReaderStatusCancel" );
+TFLOGSTRING( "TSY: CMmWimTsy::GetSimCardReaderStatusCancel" );
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EWIMRequestTypeGetSimCardReaderStatus );
@@ -843,7 +838,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     RMmCustomAPI::TSIMCardStatus* aCardStatus )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_NOTIFYSIMCARDSTATUS_1,  "TSY: CMmWimTsy::NotifySimCardStatus" );
+TFLOGSTRING( "TSY: CMmWimTsy::NotifySimCardStatus" );
     if ( NULL != aCardStatus )
         {
         // save pointer to client for response data
@@ -867,7 +862,7 @@
 void CMmWimTsy::CompleteNotifySimCardStatus(
     RMmCustomAPI::TSIMCardStatus aCardStatus )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETENOTIFYSIMCARDSTATUS_1,  "CMmWimTsy::CompleteNotifySimCardStatus" );
+TFLOGSTRING( "CMmWimTsy::CompleteNotifySimCardStatus" );
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EWIMRequestTypeNotifySimCardStatus );
@@ -893,7 +888,7 @@
 //
 TInt CMmWimTsy::NotifySimCardStatusCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_NOTIFYSIMCARDSTATUSCANCEL_1,  "TSY: CMmWimTsy::NotifySimCardStatusCancel" );
+TFLOGSTRING( "TSY: CMmWimTsy::NotifySimCardStatusCancel" );
     // reset pointer to client data
     iNotifiedSimCardStatus = NULL;
 
@@ -920,7 +915,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     RMmCustomAPI::TApduParameters* aApduParameters )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_SENDAPDUREQV2L_1,  "TSY: CMmWimTsy::SendAPDUReqV2L" );
+TFLOGSTRING( "TSY: CMmWimTsy::SendAPDUReqV2L" );
     TTsyReqHandle sendApduReqV2Handle = 
         iTsyReqHandleStore->GetTsyReqHandle( EWIMRequestTypeSendAPDUReqV2 );
     TInt ret = KErrNone; 
@@ -930,7 +925,7 @@
         // The request is already in processing because of previous request
         // Complete request with status value informing the client about 
         // the situation.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_SENDAPDUREQV2L_2,  "TSY: CMmWimTsy::SendAPDUReqV2L - KErrServerBusy" );
+TFLOGSTRING( "TSY: CMmWimTsy::SendAPDUReqV2L - KErrServerBusy" );
         iMmCustomTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy );
         return ret; 
         }
@@ -968,7 +963,7 @@
     TPtrC8 &aData, 
     TInt aError )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETESENDAPDUREQV2_1,  "TSY: CMmWimTsy::CompleteSendAPDUReqV2" );
+TFLOGSTRING( "TSY: CMmWimTsy::CompleteSendAPDUReqV2" );
     // reset the reqhandle
     TTsyReqHandle tsyReqHandle = 
         iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypeSendAPDUReqV2 );
@@ -1002,7 +997,7 @@
 //
 TInt CMmWimTsy::SendAPDUReqV2Cancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_SENDAPDUREQV2CANCEL_1,  "TSY: CMmWimTsy::SendAPDUReqV2Cancel" );
+TFLOGSTRING( "TSY: CMmWimTsy::SendAPDUReqV2Cancel" );
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EWIMRequestTypeSendAPDUReqV2 );
@@ -1028,7 +1023,7 @@
 TInt CMmWimTsy::PowerSimOnL(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_POWERSIMONL_1,  "TSY: CMmWimTsy::PowerSimOnL" );
+TFLOGSTRING( "TSY: CMmWimTsy::PowerSimOnL" ); 
     TTsyReqHandle powerSimOnHandle = 
         iTsyReqHandleStore->GetTsyReqHandle( EWIMRequestTypePowerSimOn );
         
@@ -1037,7 +1032,7 @@
         // The request is already in processing because of previous request
         // Complete request with status value informing the client about 
         // the situation.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_POWERSIMONL_2,  "TSY: CMmWimTsy::PowerSimOnL - KErrServerBusy" );
+TFLOGSTRING( "TSY: CMmWimTsy::PowerSimOnL - KErrServerBusy" );
         iMmCustomTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy );
         }
     else
@@ -1073,7 +1068,7 @@
 void CMmWimTsy::CompletePowerSimOn(
     TInt aError )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETEPOWERSIMON_1,  "TSY: CMmWimTsy::CompletePowerSimOn" );
+TFLOGSTRING( "TSY: CMmWimTsy::CompletePowerSimOn" );
     // reset the reqhandle
     TTsyReqHandle tsyReqHandle = 
         iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypePowerSimOn );
@@ -1093,7 +1088,7 @@
 //
 TInt CMmWimTsy::PowerSimOnCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_POWERSIMONCANCEL_1,  "TSY: CMmWimTsy::PowerSimOnCancel" );
+TFLOGSTRING( "TSY: CMmWimTsy::PowerSimOnCancel" );
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EWIMRequestTypePowerSimOn );
@@ -1116,7 +1111,7 @@
 TInt CMmWimTsy::PowerSimOffL(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_POWERSIMOFFL_1,  "TSY: CMmWimTsy::PowerSimOffL" );
+TFLOGSTRING( "TSY: CMmWimTsy::PowerSimOffL" ); 
     TTsyReqHandle powerSimOffHandle = 
         iTsyReqHandleStore->GetTsyReqHandle( EWIMRequestTypePowerSimOff );
         
@@ -1125,7 +1120,7 @@
         // The request is already in processing because of previous request
         // Complete request with status value informing the client about 
         // the situation.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_POWERSIMOFFL_2,  "TSY: CMmWimTsy::PowerSimOffL - KErrServerBusy" );
+TFLOGSTRING( "TSY: CMmWimTsy::PowerSimOffL - KErrServerBusy" );
         iMmCustomTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy );
         }
     else
@@ -1161,7 +1156,7 @@
 void CMmWimTsy::CompletePowerSimOff(
     TInt aError )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETEPOWERSIMOFF_1,  "TSY: CMmWimTsy::CompletePowerSimOff" );
+TFLOGSTRING( "TSY: CMmWimTsy::CompletePowerSimOff" );
     // reset the reqhandle
     TTsyReqHandle tsyReqHandle = 
         iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypePowerSimOff );
@@ -1181,7 +1176,7 @@
 //
 TInt CMmWimTsy::PowerSimOffCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_POWERSIMOFFCANCEL_1,  "TSY: CMmWimTsy::PowerSimOffCancel" );
+TFLOGSTRING( "TSY: CMmWimTsy::PowerSimOffCancel" );
     // reset the reqhandle
     TTsyReqHandle reqHandle =
         iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypePowerSimOff );

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxCompletion.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxCompletion.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,6 +16,7 @@
 
 
 // INCLUDE FILES
+#include <ctsy/tflogger.h>
 #include "cmmfaxcompletion.h"
 #include "cmmcalltsy.h"
 
@@ -24,15 +25,15 @@
 CMmFaxCompletion::CMmFaxCompletion() : CBase(), iTsyReqHandle ( 0 ),
 	iTelObject( NULL )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_CTOR_1, "TSY: CMmFaxCompletion::CMmFaxCompletion" );
+TFLOGSTRING("TSY: CMmFaxCompletion::CMmFaxCompletion" );
     }
 
 CMmFaxCompletion::~CMmFaxCompletion()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_DTOR_1, "TSY: CMmFaxCompletion::~CMmFaxCompletion");
+TFLOGSTRING("TSY: CMmFaxCompletion::~CMmFaxCompletion");
     if ( iTsyReqHandle )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_DTOR_2, "TSY: CMmFaxCompletion::~CMmFaxCompletion: request %d not completed!", iTsyReqHandle);
+TFLOGSTRING2("TSY: CMmFaxCompletion::~CMmFaxCompletion: request %d not completed!", iTsyReqHandle);
         // Completion should not be done here, because in some cases
         // operations are completed automatically by ETel!
         // CompleteOperation(KErrCancel);
@@ -49,7 +50,7 @@
 void CMmFaxCompletion::CompleteOperation(
         TInt aError )     // error Value         
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_COMPLETEOPERATION_1, "TSY: CMmFaxCompletion::CompleteOperation iTsyReqHandle: %d", iTsyReqHandle );
+TFLOGSTRING2("TSY: CMmFaxCompletion::CompleteOperation iTsyReqHandle: %d", iTsyReqHandle );
     if ( 0 < iTsyReqHandle )
         {
         iTelObject->ReqCompleted( iTsyReqHandle, aError );
@@ -69,7 +70,8 @@
     {
     if ( 0 < iTsyReqHandle )
         {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_CONFIGURE_1, "TSY: CMmFaxCompletion::Configure overwriting previous request %d with %d",iTsyReqHandle, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmFaxCompletion::Configure overwriting previous request %d with %d",
+            iTsyReqHandle, aTsyReqHandle);
         }
     
     iTsyReqHandle = aTsyReqHandle; 
@@ -86,7 +88,7 @@
         TTimeIntervalMicroSeconds& /*aCadence*/,    // cadence time
         TTime& /*aTime*/ )                          // time     
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_GETCADENCEANDTIMEOFLASTRING_1, "TSY: CMmFaxCompletion::GetCadenceAndTimeOfLastRing");
+TFLOGSTRING("TSY: CMmFaxCompletion::GetCadenceAndTimeOfLastRing");
     // Checking the usage of aCadence and aTime in the calling function
     // (fax server) shows that we don't need to change the values.
     // REINTERPRET_CAST(CTsyPhone*,iMmCall->Owner()->Owner())->
@@ -102,7 +104,7 @@
 void CMmFaxCompletion::RxConnectComplete(
         TInt aError )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_RXCONNECTCOMPLETE_1, "TSY: CMmFaxCompletion::RXConnectComplete ErrorValue: %d", aError);
+TFLOGSTRING2("TSY: CMmFaxCompletion::RXConnectComplete ErrorValue: %d", aError);
     CMmCallTsy* mmCall = REINTERPRET_CAST(CMmCallTsy*, iTelObject);
 
     // This is a good place to fill missing remote party phone number.
@@ -138,7 +140,7 @@
 void CMmFaxCompletion::RxFaxDataComplete(
         TInt aError ) // in: an error value
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_RXFAXDATACOMPLETE_1, "TSY: CMmFaxCompletion::RxFaxDataComplete ErrorValue: %d", aError);
+TFLOGSTRING2("TSY: CMmFaxCompletion::RxFaxDataComplete ErrorValue: %d", aError);
     if ( 0 < iTsyReqHandle )
         {
         iTelObject->ReqCompleted( iTsyReqHandle, aError );
@@ -156,7 +158,7 @@
         TInt aError )
     {
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_RXPOSTPAGECOMPLETE_1, "TSY: CMmFaxCompletion::RxPostPageComplete ErrorValue: %d", aError );
+TFLOGSTRING2("TSY: CMmFaxCompletion::RxPostPageComplete ErrorValue: %d", aError );
     if ( 0 < iTsyReqHandle)
         {
         iTelObject->ReqCompleted( iTsyReqHandle, aError );
@@ -173,7 +175,7 @@
 void CMmFaxCompletion::TxConnectComplete(
         TInt aError )	
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_TXCONNECTCOMPLETE_1, "TSY: CMmFaxCompletion::TXConnectComplete ErrorValue: %d", aError);
+TFLOGSTRING2("TSY: CMmFaxCompletion::TXConnectComplete ErrorValue: %d", aError);
 
     CMmCallTsy* mmCall = REINTERPRET_CAST(CMmCallTsy*,iTelObject);
 
@@ -199,7 +201,7 @@
 void CMmFaxCompletion::TxFaxDataComplete(
         TInt aError )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_TXFAXDATACOMPLETE_1, "TSY: CMmFaxCompletion::TxFaxDataComplete ErrorValue: %d", aError);
+TFLOGSTRING2("TSY: CMmFaxCompletion::TxFaxDataComplete ErrorValue: %d", aError);
 
     if ( 0 < iTsyReqHandle )
         {
@@ -217,7 +219,7 @@
 void CMmFaxCompletion::TxPostPageComplete(
         TInt aError )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_TXPOSTPAGECOMPLETE_1, "TSY: CMmFaxCompletion::TxPostPageComplete ErrorValue: %d", aError );
+TFLOGSTRING2("TSY: CMmFaxCompletion::TxPostPageComplete ErrorValue: %d", aError );
 
     if ( 0 < iTsyReqHandle )
         {
@@ -235,7 +237,7 @@
 void CMmFaxCompletion::FillAnswerback(
         CMmCallTsy* aMmCall ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_FILLANSWERBACK_1, "TSY: CMmFaxCompletion::FillAnswerback");
+TFLOGSTRING("TSY: CMmFaxCompletion::FillAnswerback");
 
     if ( aMmCall )
         {
@@ -246,7 +248,7 @@
 
             if ( 0 == faxProgress->iAnswerback.Length() )
                 { 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_FILLANSWERBACK_2, "TSY: CMmFaxCompletion::FillAnswerback Getting missing remote number from call info");
+TFLOGSTRING("TSY: CMmFaxCompletion::FillAnswerback Getting missing remote number from call info");
                 // Copy remote party phone number to Progress chunk's 
                 // answerback field. Answerback will hold only leftmost 20 
                 // numbers if the number is longer than that.

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxExt.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxExt.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,6 +16,7 @@
 
 
 //  INCLUDE FILES
+#include <ctsy/tflogger.h>
 #include "cmmfaxext.h"
 #include "cmmphonetsy.h"
 #include "cmmlinelist.h"
@@ -31,7 +32,7 @@
     CMmCallTsy* aMmCall )   // call that owns this object
     : iMmCall( reinterpret_cast<CMmFaxCallTsy*>( aMmCall ) )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_CTOR_1, "TSY: CMmFaxExt::CMmFaxExt: Call Id:%d", iMmCall->CallId() );
+TFLOGSTRING2("TSY: CMmFaxExt::CMmFaxExt: Call Id:%d", iMmCall->CallId() );
     iFax           = NULL;
     iFaxSession    = NULL;
     iFaxCompletion = NULL;
@@ -39,7 +40,7 @@
 
 void CMmFaxExt::ConstructL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_CONSTRUCTL_1, "TSY: CMmFaxExt::ConstructL");
+TFLOGSTRING("TSY: CMmFaxExt::ConstructL");
 
     // Create CMmFaxCompletion class for Fax Server.
     iFaxCompletion = new (ELeave) CMmFaxCompletion();
@@ -49,7 +50,7 @@
 CMmFaxExt* CMmFaxExt::NewL(
         CMmCallTsy* aMmCall )  // The call object which owns CMmFaxExt  
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_NEWL_1, "TSY: CMmFaxExt::NewL");
+TFLOGSTRING("TSY: CMmFaxExt::NewL");
 
     CMmFaxExt* self = new ( ELeave ) CMmFaxExt( aMmCall );
     CleanupStack::PushL( self );
@@ -68,14 +69,14 @@
 
     if ( iFax )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_DTOR_1, "TSY: CMmFaxExt::~CMmFaxExt: deleting iFax");
+TFLOGSTRING("TSY: CMmFaxExt::~CMmFaxExt: deleting iFax");
         delete iFax;
         iFax = NULL;
         }
 
     if (iFaxCompletion)
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_DTOR_2, "TSY: CMmFaxExt::~CMmFaxExt: deleting iFaxCompletion");
+TFLOGSTRING("TSY: CMmFaxExt::~CMmFaxExt: deleting iFaxCompletion");
         delete iFaxCompletion;
         iFaxCompletion = NULL;
         }
@@ -100,7 +101,7 @@
 void CMmFaxExt::CompleteOperation(
         TInt aError ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_COMPLETEOPERATION_1, "TSY: CMmFaxExt::CompleteOperation");
+TFLOGSTRING("TSY: CMmFaxExt::CompleteOperation");
      
     if ( iFaxCompletion )
         {
@@ -118,7 +119,7 @@
         const TTsyReqHandle aTsyReqHandle,  
         CTelObject* aTelObject )            
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_CONFIGURECOMPLETION_1, "TSY: CMmFaxExt::Configure");
+TFLOGSTRING("TSY: CMmFaxExt::Configure");
 
     iFaxCompletion->Configure( aTsyReqHandle, aTelObject );
     }
@@ -132,7 +133,7 @@
 CTelObject* CMmFaxExt::OpenNewObjectByNameL(
         const TDesC& aName )  
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_OPENNEWOBJECTBYNAMEL_1, "TSY: CMmFaxExt::OpenNewObjectByNameL");
+TFLOGSTRING("TSY: CMmFaxExt::OpenNewObjectByNameL");
 
     // check the name of opened object..
     _LIT(KFaxObjectName, "FAX");
@@ -179,7 +180,7 @@
 //
 TInt CMmFaxExt::FaxConnectHandler()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_FAXCONNECTHANDLER_1, "TSY: CMmFaxExt::FaxConnectHandler");
+TFLOGSTRING("TSY: CMmFaxExt::FaxConnectHandler");
 
     TInt errorCode( KErrNone );
 
@@ -209,7 +210,7 @@
 TInt CMmFaxExt::AnswerIncomingCall(
         const TTsyReqHandle& aTsyReqHandle ) // function identification handle
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_ANSWERINCOMINGCALL_1, "TSY: CMmFaxExt::AnswerIncomingCall");
+TFLOGSTRING("TSY: CMmFaxExt::AnswerIncomingCall");
     
     TInt ret( KErrGeneral );
 
@@ -254,7 +255,7 @@
         const TTsyReqHandle& aTsyReqHandle, 
         TDesC* aTelNumber )      
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_DIAL_1, "TSY: CMmFaxExt::Dial");
+TFLOGSTRING("TSY: CMmFaxExt::Dial");
     
     TInt ret( KErrGeneral );
 
@@ -293,12 +294,12 @@
                 ConfigureCompletion( aTsyReqHandle, iMmCall );
                 if( EDialAndTransmit == faxMode )
                     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_DIAL_2, "TSY: CMmFaxExt::FaxDial:TxConnect");
+TFLOGSTRING("TSY: CMmFaxExt::FaxDial:TxConnect");
                     iFaxSession->TxConnect();
                     }
                 else
                     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_DIAL_3, "TSY: CMmFaxExt::FaxDial:RxConnect");
+TFLOGSTRING("TSY: CMmFaxExt::FaxDial:RxConnect");
                     iFaxSession->RxConnect();
                     }
                 }
@@ -321,7 +322,7 @@
 //
 void CMmFaxExt::HangUp()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_HANGUP_1, "TSY: CMmFaxExt::HangUp");
+TFLOGSTRING("TSY: CMmFaxExt::HangUp");
     CleanUpFaxServer();
     }
 
@@ -344,7 +345,7 @@
 //
 void CMmFaxExt::GetFaxBaseL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_GETFAXBASEL_1, "TSY: CMmFaxExt::GetFaxBaseL");
+TFLOGSTRING("TSY: CMmFaxExt::GetFaxBaseL");
 
     TInt errorCode = iFaxServerLib.Load( KFaxServerName );
 
@@ -410,7 +411,7 @@
         const TDesC* aTelNumber,  // phone number
         const TFaxMode aFaxMode ) // fax mode
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_OPENFAXSERVER_1, "TSY: CMmFaxExt::OpenFaxServer");
+TFLOGSTRING("TSY: CMmFaxExt::OpenFaxServer");
 
     TInt errorCode ( KErrNone );
     TFaxServerSessionSettings faxSettings;
@@ -515,7 +516,7 @@
 //
 void CMmFaxExt::CleanUpFaxServer()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_CLEANUPFAXSERVER_1, "TSY: CMmFaxExt::CleanUpFaxServer");
+TFLOGSTRING("TSY: CMmFaxExt::CleanUpFaxServer");
 
     if ( iFaxSession )
         {
@@ -561,7 +562,7 @@
  TInt CMmFaxExt::GetFaxSettings(
         RCall::TFaxSessionSettings* aSettings ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_GETFAXSETTINGS_1, "TSY: CMmFaxExt::GetFaxSettings");
+TFLOGSTRING("TSY: CMmFaxExt::GetFaxSettings");
     *aSettings = iFaxSettings;
     return KErrNone;
     }
@@ -575,7 +576,7 @@
  TInt CMmFaxExt::SetFaxSettings(
         const RCall::TFaxSessionSettings* aSettings ) // in: fax settings.
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_SETFAXSETTINGS_1, "TSY: CMmFaxExt::SetFaxSettings");
+TFLOGSTRING("TSY: CMmFaxExt::SetFaxSettings");
         iFaxSettings = *aSettings;
         return KErrNone;
     }
@@ -599,7 +600,7 @@
 //
 void CMmFaxExt::DialCancel()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_DIALCANCEL_1, "TSY: CMmFaxExt::DialCancel");
+    TFLOGSTRING("TSY: CMmFaxExt::DialCancel");
     if ( iFax ) 
         {
         iFax->Terminate();

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmTsyFax.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmTsyFax.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,6 +16,7 @@
 
 
 //  INCLUDE FILES
+#include <ctsy/tflogger.h>
 #include "cmmtsyfax.h"
 #include "cmmfaxext.h"
 
@@ -27,12 +28,12 @@
     :  iFaxExt( aFaxExt )
     
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_CTOR_1 "TSY: CMmTsyFax::CMmTsyFax" );
+TFLOGSTRING("TSY: CMmTsyFax::CMmTsyFax" );
     }
 
 void CMmTsyFax::ConstructL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_CONSTRUCTL_1, "TSY: CMmTsyFax::ConstructL");
+TFLOGSTRING("TSY: CMmTsyFax::ConstructL");
     
     iTerminate     = EFalse;
     iDataDirection = EUnknown;
@@ -57,7 +58,7 @@
 CMmTsyFax* CMmTsyFax::NewL(
         CMmFaxExt* aFaxExt )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_NEWL_1, "TSY: CMmTsyFax::NewL");
+TFLOGSTRING("TSY: CMmTsyFax::NewL");
     //  Completes successfully if fax call has already been dialled creating
     //  a CFaxSession instance, and is not called if that is not true.
     CMmTsyFax* fax = new ( ELeave ) CMmTsyFax( aFaxExt );
@@ -71,7 +72,7 @@
 
 CMmTsyFax::~CMmTsyFax()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_DTOR_1, "TSY: CMmTsyFax::~CMmTsyFax" );
+TFLOGSTRING("TSY: CMmTsyFax::~CMmTsyFax" );
 
 	if( iFaxExt )
 		{
@@ -89,7 +90,7 @@
 void CMmTsyFax::CloseFax(
         TAny* aObj )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_CLOSEFAX_1, "TSY: CMmTsyFax::CloseFax");
+TFLOGSTRING("TSY: CMmTsyFax::CloseFax");
     
     ( ( CObject* )aObj )->Close();
     }
@@ -103,7 +104,7 @@
 TInt CMmTsyFax:: DeregisterNotification(
         const TInt /*aIpc*/ )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, DEREGISTERNOTIFICATION_1, "TSY: CMmTsyFax::DeregisterNotification");
+TFLOGSTRING("TSY: CMmTsyFax::DeregisterNotification");
     return KErrNone;
     }
 
@@ -115,7 +116,7 @@
 //
 void CMmTsyFax::Init()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_INIT_1, "TSY: CMmTsyFax::Init");
+TFLOGSTRING("TSY: CMmTsyFax::Init");
     }
 
 // ---------------------------------------------------------------------------
@@ -128,7 +129,7 @@
         const TTsyReqHandle aTsyReqHandle, 
         TDes8* aDes )                      
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_READ_1, "TSY: CMmTsyFax::Read : %d" , aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmTsyFax::Read : %d" , aTsyReqHandle);
 
     TInt errorCode( KErrNone );
 
@@ -172,7 +173,7 @@
         const TInt /*aIpc*/ 
         )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_REGISTERNOTIFICATION_1, "TSY: CMmTsyFax::RegisterNotification");
+TFLOGSTRING("TSY: CMmTsyFax::RegisterNotification");
     return KErrNone;
     }
 // ---------------------------------------------------------------------------
@@ -193,7 +194,7 @@
 //
 void CMmTsyFax::Terminate()
 	{    
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_TERMINATE_1, "TSY: CMmTsyFax::Terminate");
+TFLOGSTRING("TSY: CMmTsyFax::Terminate");
 	iTerminate = ETrue;
 	}
 
@@ -206,7 +207,7 @@
 TInt CMmTsyFax::TerminateFaxSession(
         const TTsyReqHandle aTsyReqHandle ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_TERMINATEFAXSESSION_1, "TSY: CMmTsyFax::TerminateFaxSession Handle: %d", aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmTsyFax::TerminateFaxSession Handle: %d", aTsyReqHandle);
     
     CFaxSession* session = iFaxExt->GetFaxSession();
 
@@ -235,7 +236,7 @@
 TInt CMmTsyFax::WaitForEndOfPage(
         const TTsyReqHandle aTsyReqHandle ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_WAITFORENDOFPAGE_1, "TSY: CMmTsyFax::WaitForEndOfPage  Handle:%d", aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmTsyFax::WaitForEndOfPage  Handle:%d", aTsyReqHandle);
 
     if ( !iFaxExt->GetFaxSession() 
          || iFaxExt->GetCallStatus() != RCall::EStatusConnected )
@@ -273,7 +274,7 @@
         const TTsyReqHandle aTsyReqHandle, 
         TDesC8* aDes )                     
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_WRITE_1, "TSY: CMmTsyFax::Write : %d" , aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmTsyFax::Write : %d" , aTsyReqHandle);
 
     TInt errorCode( KErrNone );

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmfax/cmmfaxextinterface.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmfax/cmmfaxextinterface.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,6 +16,7 @@
 
 
 //  INCLUDE FILES
+#include <ctsy/tflogger.h>
 #include "CMmFaxExtInterface.h"
 
 #ifdef FAX_IS_SUPPORTED

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaext.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -15,12 +15,6 @@
 
 
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmcallgsmwcdmaextTraces.h"
-#endif
-
 #include "cmmcallgsmwcdmaext.h"
 #include <featureuids.h>
 #include "cmmphonetsy.h"
@@ -29,6 +23,7 @@
 #include "cmmconferencecallgsmwcdmaext.h"
 #include <ctsy/pluginapi/cmmdatapackage.h>
 #include "cmmmessagemanagerbase.h"
+#include <ctsy/tflogger.h>
 
 #include "cmmvoicecalltsy.h"
 
@@ -242,7 +237,7 @@
     const TDesC* aTelNumber,
     TInt aExtensionId )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_1, "TSY: CMmCallGsmWcdmaExt::DialL extensionid %d", aExtensionId );
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::DialL extensionid %d", aExtensionId );
 
     // Reset iCallParams extended members 
     iCallParams.iAlphaId.Zero();
@@ -268,12 +263,12 @@
     RCall::TCallParams& callParams = ( *callParamsPckg )();
     
     TInt extensionId( callParams.ExtensionId() );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_2, "TSY: CMmCallGsmWcdmaExt::DialL callParams.extensionId %d ", extensionId);
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::DialL callParams.extensionId %d ", extensionId);
 
     if( ( RMobileCall::KETelMobileCallParamsV1 == extensionId ) || 
     		( RMobileCall::KETelMobileCallParamsV2 == extensionId ))
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_3, "TSY: CMmCallGsmWcdmaExt::DialL callparams V1, V2");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL callparams V1, V2");
 
         iCallParams.iSpeakerControl = callParams.iSpeakerControl;
 
@@ -293,7 +288,7 @@
 
         if ( RMobileCall::KETelMobileCallParamsV2 == extensionId ) 
             {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_4, "TSY: CMmCallGsmWcdmaExt::DialL callparams V2");
+    TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL callparams V2");
             RMobileCall::TMobileCallParamsV2Pckg* paramsPckgV2 = 
                 reinterpret_cast<RMobileCall::TMobileCallParamsV2Pckg*>( 
                 const_cast<TDesC8*>( aCallParams ) );
@@ -305,7 +300,7 @@
 
     else if( RMobileCall::KETelMobileCallParamsV7 == extensionId )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_5, "TSY: CMmCallGsmWcdmaExt::DialL callparams V7");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL callparams V7");        
         RMobileCall::TMobileCallParamsV7Pckg* paramsPckgV7 = 
             reinterpret_cast<RMobileCall::TMobileCallParamsV7Pckg*>( 
             const_cast<TDesC8*>( aCallParams ) );
@@ -314,7 +309,7 @@
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_6, "TSY: CMmCallGsmWcdmaExt::DialL callparams version unknown");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL callparams version unknown");
         iCallParams.iSpeakerControl = callParams.iSpeakerControl;
         iCallParams.iSpeakerVolume = callParams.iSpeakerVolume;
         iCallParams.iInterval = callParams.iInterval;
@@ -353,7 +348,7 @@
         //Pack call parameters and mobile call info
         // Use argument parameters since TMobileCallParamsV7 does not inherit from 3rd party params.
         package.PackData(const_cast<TDesC8*>(aCallParams), &iMobileCallInfo);
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_7, "TSY: CMmCallGsmWcdmaExt::DialL: KETelExt3rdPartyV1");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL: KETelExt3rdPartyV1");
     	//if it is a 3rd party client
     	return iMessageManager->HandleRequestL( EMobileCallDialISV, 
             &package );
@@ -365,7 +360,7 @@
         //Pack call parameters and mobile call info
         TPckg<RMobileCall::TMobileCallParamsV7> pckgToSend(iCallParams); 
         package.PackData(  &pckgToSend , &iMobileCallInfo );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_8, "TSY: CMmCallGsmWcdmaExt::DialL: KMultimodeCallTypeIDNoFdnCheck");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL: KMultimodeCallTypeIDNoFdnCheck");
         return iMessageManager->HandleRequestL( 
             EMobileCallDialNoFdnCheck, &package );
         }    
@@ -374,7 +369,7 @@
         //Pack call parameters and mobile call info
         TPckg<RMobileCall::TMobileCallParamsV7> pckgToSend(iCallParams); 
         package.PackData(  &pckgToSend , &iMobileCallInfo );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_9, "TSY: CMmCallGsmWcdmaExt::DialL: EEtelCallDial");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL: EEtelCallDial");    	    
     	return iMessageManager->HandleRequestL( EEtelCallDial, &package );
     	}
 
@@ -1160,7 +1155,7 @@
             }
         else
         	{
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_GETCALLPARAMS_1, "TSY: CMmCallGsmWcdmaExt::GetCallParams callparams version unknown");
+        	TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::GetCallParams callparams version unknown");
         	}
 
         }
@@ -1311,7 +1306,7 @@
 	        hscsdParams8.iBCRepeatIndicator = hscsdCallParamsV8->iBCRepeatIndicator;
 	          
 	        }
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_GETCALLPARAMS_2, "TSY: CMmCallGsmWcdmaExt::GetCallParams callparams version unknown");
+	    TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::GetCallParams callparams version unknown");
 	    
     	}
        
@@ -1555,7 +1550,8 @@
     if ( mmCall )
         {
         // Held call Id
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_TRANSFERL_1, "TSY: CMmCallGsmWcdmaExt::Transfer, CallId: %d", mmCall->CallId() );
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::Transfer, CallId: %d", \
+            mmCall->CallId() );
 
         //Create package
         CCallDataPackage package;
@@ -1604,7 +1600,7 @@
 TInt CMmCallGsmWcdmaExt::FillMobileCallInfoV3(
     RMobileCall::TMobileCallInfoV3* aInfoV3 )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_FILLMOBILECALLINFOV3_1, "TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV3 - extensionid=%d", aInfoV3->ExtensionId() );
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV3 - extensionid=%d", aInfoV3->ExtensionId() );    
     
     // V3 info parameters
     aInfoV3->iSecurity = iMobileCallInfo.iSecurity;
@@ -1621,7 +1617,7 @@
 TInt CMmCallGsmWcdmaExt::FillMobileCallInfoV7(
     RMobileCall::TMobileCallInfoV7* aInfoV7 )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_FILLMOBILECALLINFOV7_1, "TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV7 - extensionid=%d", aInfoV7->ExtensionId() );
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV7 - extensionid=%d", aInfoV7->ExtensionId() );
         
     // V7 info parameters
     // TCallParamOrigin iCallParamOrigin;    
@@ -1647,7 +1643,7 @@
 TInt CMmCallGsmWcdmaExt::FillMobileCallInfoV8(
     RMobileCall::TMobileCallInfoV8* aInfoV8 )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_FILLMOBILECALLINFOV8_1, "TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV8 - extensionid=%d", aInfoV8->ExtensionId() );
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV8 - extensionid=%d", aInfoV8->ExtensionId() );
    
     // V8 info parameters
     aInfoV8->iSubAddress = iMobileCallInfo.iSubAddress;
@@ -1689,7 +1685,7 @@
     MCtsySsmPluginCallback* aSsmPluginCallback,
     TCtsySsmCallbackData& aCallbackData  )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SETRFSTATE_1, "TSY: CMmCallGsmWcdmaExt::SetRfState - state=%d", aMtcState );
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::SetRfState - state=%d", aMtcState );
 
     TInt err ( KErrNotSupported );  
     if ( (iUsingFeatureManager) && (iFeatureControl.FeatureSupported(NFeature::KEmergencyCallsEnabledInOfflineMode ) == KFeatureSupported) )
@@ -1715,7 +1711,7 @@
        		}
        	else
        		{
-       		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SETRFSTATE_2, "TSY: CMmCallGsmWcdmaExt::SetRfState - bad state");
+       		TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::SetRfState - bad state");
        		// pass this error to callback
        		SsmPluginCallback (KErrArgument, aCallbackData);
        		}        		
@@ -1812,30 +1808,7 @@
         {
         iMobileCallInfo.iAlternatingCall = mobileCallInfo->iAlternatingCall;
         }
-    
-    // If a Mobile Originated call, take Alpha ID and Icon ID values from iCallParams, if valid.
-    if ( iMobileCallInfo.iRemoteParty.iDirection == RMobileCall::EMobileOriginated)
-        {
-        // Set the Alpha ID, if not set.
-        if ( iMobileCallInfo.iAlphaId.Length() <= 0 && 
-                iCallParams.iAlphaId.Length() > 0 &&
-                iCallParams.iAlphaId.Length() <= RMobileCall::KAlphaIdMaxSize )
-            {
-            iMobileCallInfo.iAlphaId.Zero();
-            iMobileCallInfo.iAlphaId.Copy(iCallParams.iAlphaId );
-            iMobileCallInfo.iValid |= RMobileCall::KCallAlphaId;
-            }
-        // Set the Icon ID, if not set.
-        if ( iMobileCallInfo.iIconId.iIdentifier == 0 && 
-                iMobileCallInfo.iIconId.iQualifier == RMobileCall::EIconQualifierNotSet &&
-                iCallParams.iIconId.iIdentifier > 0 &&
-                iCallParams.iIconId.iQualifier != RMobileCall::EIconQualifierNotSet )
-            {
-            iMobileCallInfo.iIconId.iIdentifier = iCallParams.iIconId.iIdentifier;
-            iMobileCallInfo.iIconId.iQualifier = iCallParams.iIconId.iQualifier;
-            iMobileCallInfo.iValid |= RMobileCall::KCallIconId;
-            }
-        }
+
  
     // TMobileCallInfoV3
     if ( (KETelExtMultimodeV3 == extensionId) ||
@@ -1849,7 +1822,7 @@
         	{
         	// V3 parameters
 	        iMobileCallInfo.iSecurity = mobileCallInfoV3->iSecurity;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SETMOBILECALLDATA_1, "TSY: CMmCallGsmWcdmaExt::SetMobileCallData V3 params copied");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::SetMobileCallData V3 params copied");         
         	}
         }
         
@@ -1867,20 +1840,14 @@
         	iMobileCallInfo.iCallParamOrigin = mobileCallInfoV7->iCallParamOrigin;
         	}
             
-        // Set the Alpha ID if call is not Mobile Originated.
-        // If MO, the Alpha ID would be set above from iCallParams
-        if(RMobileCall::KCallIconId & mobileCallInfo->iValid &&
-                iMobileCallInfo.iRemoteParty.iDirection != RMobileCall::EMobileOriginated) 
+        if(RMobileCall::KCallIconId & mobileCallInfo->iValid) 
         	{
         	// TIconId iIconId;
 	        iMobileCallInfo.iIconId.iIdentifier = mobileCallInfoV7->iIconId.iIdentifier;
 	        iMobileCallInfo.iIconId.iQualifier = mobileCallInfoV7->iIconId.iQualifier;
         	}
         
-        // Set the Icon ID if call is not Mobile Originated.
-        // If MO, Icon ID would be set above from iCallParams
-        if(RMobileCall::KCallAlphaId & mobileCallInfo->iValid &&
-                iMobileCallInfo.iRemoteParty.iDirection != RMobileCall::EMobileOriginated) 
+        if(RMobileCall::KCallAlphaId & mobileCallInfo->iValid) 
            	{
            	// TAlphaIdBuf iAlphaId;
    	        iMobileCallInfo.iAlphaId.Zero();
@@ -1894,7 +1861,7 @@
         	}
        
         
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SETMOBILECALLDATA_2, "TSY: CMmCallGsmWcdmaExt::SetMobileCallData V7 params copied");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::SetMobileCallData V7 params copied"); 
         }
         
     // TMobileCallInfoV8
@@ -1925,7 +1892,7 @@
         	iMobileCallInfo.iBCRepeatIndicator = mobileCallInfoV8->iBCRepeatIndicator;
         	}	 
 	    
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SETMOBILECALLDATA_3, "TSY: CMmCallGsmWcdmaExt::SetMobileCallData V8 params copied");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::SetMobileCallData V8 params copied"); 
 	       }
 	
 	//update validity flags
@@ -2056,7 +2023,7 @@
 
                if (KETelExtMultimodeV1 == extensionId )
                    {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_GETCURRENTHSCSDINFO_1, "TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV1");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV1");                   
                    RMobileCall::TMobileCallHscsdInfoV1Pckg* hscsdInfoPckg =
                        REINTERPRET_CAST( RMobileCall::TMobileCallHscsdInfoV1Pckg*,
                        aHSCSDInfo );
@@ -2072,7 +2039,7 @@
             
                else if (KEtelExtMultimodeV7 == extensionId )
                    {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_GETCURRENTHSCSDINFO_2, "TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV7");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV7");                  
                    RMobileCall::TMobileCallHscsdInfoV7Pckg* hscsdInfoPckg7 =
                        ( RMobileCall::TMobileCallHscsdInfoV7Pckg* )aHSCSDInfo;
                    RMobileCall::TMobileCallHscsdInfoV7& hscsdInfoV7 =
@@ -2097,7 +2064,7 @@
             
                else if (KEtelExtMultimodeV8 == extensionId )
                    {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_GETCURRENTHSCSDINFO_3, "TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV8");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV8");                  
                    RMobileCall::TMobileCallHscsdInfoV8Pckg* hscsdInfoPckg8 =
                        ( RMobileCall::TMobileCallHscsdInfoV8Pckg* )aHSCSDInfo;
                    RMobileCall::TMobileCallHscsdInfoV8& hscsdInfoV8 =
@@ -2161,8 +2128,8 @@
     const TDesC8* aCallParams,
     const TDesC* aTelNumber )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALDATACALLL_1, "TSY: CMmCallGsmWcdmaExt::DialDataCallL");
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALDATACALLL_2, "TSY: CMmCallGsmWcdmaExt::DialDataCallL aCallMode: %d", aCallMode);
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialDataCallL");
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::DialDataCallL aCallMode: %d", aCallMode);
 
 	iMobileCallInfo.iDialledParty.iTelNumber.Copy( *aTelNumber );
 	iMobileCallInfo.iDialledParty.iNumberPlan =
@@ -2402,13 +2369,13 @@
     
     if( KMultimodeCallTypeIDNoFdnCheck == iMmCallTsy->GetDialTypeId() )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALDATACALLL_3, "TSY: CMmCallGsmWcdmaExt::DialDataCallL: EMobileCallDialNoFdnCheck");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialDataCallL: EMobileCallDialNoFdnCheck");                      
         //Send request to the Domestic OS layer.
         return iMessageManager->HandleRequestL( EMobileCallDialNoFdnCheck, &package );
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALDATACALLL_4, "TSY: CMmCallGsmWcdmaExt::DialDataCallL: EEtelCallDial");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialDataCallL: EEtelCallDial");          
         //Send request to the Domestic OS layer.
         return iMessageManager->HandleRequestL( EEtelCallDial, &package );
         }        
@@ -3015,7 +2982,7 @@
 	
 	if ( KErrNone == aResult )
     	{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SSMPLUGINCALLBACK_1, "TSY:CMmCallGsmWcdmaExt::SsmPluginCallback: Dialing...");
+		TFLOGSTRING ("TSY:CMmCallGsmWcdmaExt::SsmPluginCallback: Dialing...");
 		
 		//at this point the RF should be enabled in all cases
 		TRAPD(err, result = iMessageManager->HandleRequestL(

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaextwithdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaextwithdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -15,11 +15,6 @@
 
 #ifdef USING_CTSY_DISPATCHER
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmcallgsmwcdmaextwithdispatcherTraces.h"
-#endif
-
 /**
  * This file contains additional function definitions for the CMmCallGsmWcdmaExt class
  * in CTSY for use when the CTSY is used with the CTSY Dispatcher. 
@@ -133,7 +128,8 @@
     if ( mmCall )
         {
         // Held call Id
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_TRANSFERL1_1, "TSY: CMmCallGsmWcdmaExt::Transfer, CallId: %d", mmCall->CallId() );
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::Transfer, CallId: %d", \
+            mmCall->CallId() );
 
 		// With the CTSY dispatcher, there are two call IDs sent from the CTSY
 		// The first (packed in iCallId of the data package is the call ID

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmconferencecallgsmwcdmaext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmconferencecallgsmwcdmaext.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -16,12 +16,6 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmconferencecallgsmwcdmaextTraces.h"
-#endif
-
 #include "cmmconferencecallgsmwcdmaext.h"
 #include "cmmphonetsy.h"
 #include "cmmconferencecalltsy.h"
@@ -186,7 +180,7 @@
 	RMobileConferenceCall::TMobileConferenceStatus aStatus,
     CMmCallList* aCallList )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_SWAPL_1, "TSY: CMmConferenceCallGsmWcdmaExt::SwapL");
+TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::SwapL");
 	TInt ret = KErrArgument;
 
 	// conference must be active or held
@@ -214,7 +208,7 @@
                 iNumberOfCallsToBeSwapped++;
                 }
             }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_SWAPL_2, "TSY: CMmConferenceCallGsmWcdmaExt::SwapL - Number of calls in conference: %d", iNumberOfCallsToBeSwapped);
+TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::SwapL - Number of calls in conference: %d", iNumberOfCallsToBeSwapped);
 
         // Find active and held call objects:
         CMmCallTsy* mmActiveCall = 
@@ -338,7 +332,7 @@
     RMobileCall::TMobileCallStatus aNewStatus,
     TInt aCallId )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_1, "TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, aNewStatus:%d, aCallId:%d", aNewStatus, aCallId );
+TFLOGSTRING3("TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, aNewStatus:%d, aCallId:%d", aNewStatus, aCallId );
 
     TBool statusChanged( EFalse );
 
@@ -346,8 +340,8 @@
     RMobileConferenceCall::TMobileConferenceStatus status 
             = iMmConferenceCallTsy->Status();
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_2, "TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, Current conf call iMmConferenceCallTsy->Status:%d ", status);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_3, "TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, Current conference extension iNewStatus:%d ", iNewStatus);
+TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, Current conf call iMmConferenceCallTsy->Status:%d ", status);
+TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, Current conference extension iNewStatus:%d ", iNewStatus);
     //get call list
     CMmCallList* callList = iMmConferenceCallTsy->Phone()->CallList();
 
@@ -472,9 +466,9 @@
         {
         // -1 indicates that there is no unhandled ghost operation anymore
         iCurrentGhostOperation = -1;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_4, "TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, statusChanged!! ");
+TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, statusChanged!! ");   
         }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_5, "TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged END, current conference extension iNewStatus:%d ", iNewStatus);
+TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged END, current conference extension iNewStatus:%d ", iNewStatus);
 
     return statusChanged;
     }
@@ -504,7 +498,7 @@
     RMobileConferenceCall::TMobileConferenceStatus aStatus,
     CMmCallList* aCallList )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CHECKCONFERENCECAPABILITY_1, "TSY: CMmConferenceCallGsmWcdmaExt::CheckConferenceCapability. aStatus:%d ", aStatus);
+TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::CheckConferenceCapability. aStatus:%d ", aStatus);     
     //Check if conference creation is possible. CC has to be in Idle state
     if ( RMobileConferenceCall::EConferenceIdle == aStatus  )
         {
@@ -708,7 +702,7 @@
     RMobileConferenceCall::TMobileConferenceStatus aStatus,
     CMmCallList& aCallList )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLESWAP_1, "TSY: CMmConferenceCallGsmWcdmaExt::HandleSwap. aStatus:%d ", aStatus);
+TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::HandleSwap. aStatus:%d ", aStatus);     
     TBool statusChanged( EFalse );
 
     //increment counter telling how many calls will still change state
@@ -750,8 +744,8 @@
     CMmCallList& aCallList,
     RMobileCall::TMobileCallStatus aNewStatus )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLEADDCALL_1, "TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. aStatus:%d ", aStatus);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLEADDCALL_2, "TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. aNewStatus:%d ", aNewStatus);
+TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. aStatus:%d ", aStatus); 
+TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. aNewStatus:%d ", aNewStatus); 
     TBool statusChanged( EFalse );
 
     //Handle adding a call to conference call
@@ -816,7 +810,7 @@
             UpdateCapsAfterJoin( aCallList );
             } 
         }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLEADDCALL_3, "TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. statusChanged:%d ", statusChanged);
+TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. statusChanged:%d ", statusChanged); 
     
     return statusChanged;
     }
@@ -886,8 +880,8 @@
 	TBool callFound( EFalse );
 	CMmCallTsy* mmCall = NULL;
 
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_1, "TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease aNewStatus %d, aCallId %d",aNewStatus , aCallId );
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_2, "TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease Calls in CC %d",iMmConferenceCallTsy->NumberOfCallsInConference());
+	TFLOGSTRING3("TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease aNewStatus %d, aCallId %d",aNewStatus , aCallId );
+	TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease Calls in CC %d",iMmConferenceCallTsy->NumberOfCallsInConference());
 
 	//first find the call object which has gone to idle state
 	for ( TInt i = 0; i < aCallList.GetNumberOfObjects(); i++ )
@@ -896,14 +890,14 @@
 
 		if(mmCall)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_3, "TSY: Previous Call ID: %d", mmCall->PreviousCallId() );
+			TFLOGSTRING2("TSY: Previous Call ID: %d", mmCall->PreviousCallId() );
 			if ( mmCall->PreviousCallId() == aCallId )
 				{
 				if ( 2 == iMmConferenceCallTsy->NumberOfCallsInConference() && mmCall->IsPartOfConference() &&
 						iMmConferenceCallTsy->ServiceRequested( 
 								CMmConferenceCallTsy::EMultimodeConferenceCallAddCall ) )
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_4, "TSY: STOP handling this case");
+					TFLOGSTRING("TSY: STOP handling this case");
 					return EFalse;
 					}
 				mmCall->ResetPreviousCallId();
@@ -988,7 +982,7 @@
 					if( remainingCall->MobileCallStatus() == RMobileCall::EStatusHold )
 						{
 						callStatus = RMobileCall::EStatusHold;
-						OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_5, "TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease Call with Hold status found" );
+						TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease Call with Hold status found" );
 						break;
 						}	
 					}
@@ -1274,7 +1268,7 @@
 TInt CMmConferenceCallGsmWcdmaExt::GetNewStatus(
     RMobileConferenceCall::TMobileConferenceStatus* aNewStatus )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_GETNEWSTATUS_1, "TSY: CMmConferenceCallGsmWcdmaExt::GetNewStatus. iNewStatus:%d ", iNewStatus );
+TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::GetNewStatus. iNewStatus:%d ", iNewStatus );     
     //copy new status
     *aNewStatus = iNewStatus;
     //delete new status from GSM extension
@@ -1290,7 +1284,7 @@
 //
 void CMmConferenceCallGsmWcdmaExt::ResetAttributes()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_RESETATTRIBUTES_1, "TSY: CMmConferenceCallGsmWcdmaExt::ResetAttributes. " );
+TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::ResetAttributes. " );     
     //Flag telling if this is not the first hold/active status indication
     //caused by client asking hold/resume for a single call.
     iCallControlStarted = EFalse;
@@ -1547,7 +1541,7 @@
     //get current conference call status
     RMobileConferenceCall::TMobileConferenceStatus status 
             = iMmConferenceCallTsy->Status();
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_1, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent. iMmConferenceCallTsy->Status():%d ", status );
+TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent. iMmConferenceCallTsy->Status():%d ", status );
 
     switch( confEvent )
         {
@@ -1558,7 +1552,7 @@
                 !iMmConferenceCallTsy->ServiceRequested( CMmConferenceCallTsy::
                     EMultimodeConferenceCallCreateConference ) )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_2, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Build");
+TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Build");
                 //We have to get 2 active status indications before the 
                 //conference has really gone to active state.
                 iCreateConferenceCounter = 2;
@@ -1570,7 +1564,7 @@
                 !iMmConferenceCallTsy->ServiceRequested( CMmConferenceCallTsy::
                     EMultimodeConferenceCallAddCall ) )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_3, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Build/Add");
+TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Build/Add");
                 iCurrentGhostOperation = confEvent;
                 }
             break;
@@ -1581,7 +1575,7 @@
                 !iMmConferenceCallTsy->ServiceRequested( CMmConferenceCallTsy::
                     EMultimodeConferenceCallAddCall ) )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_4, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Add");
+TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Add");
                 iCurrentGhostOperation = confEvent;
                 }
             break;
@@ -1591,7 +1585,7 @@
                 !iMmConferenceCallTsy->ServiceRequested( 
                 CMmConferenceCallTsy::EMultimodeConferenceCallSwap ) )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_5, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Swap");
+TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Swap");
                 iNumberOfCallsToBeSwapped 
                     = iMmConferenceCallTsy->NumberOfCallsInConference();
 
@@ -1602,14 +1596,14 @@
         case RMobileConferenceCall::EConferenceSplit:
             if ( !iGoOneToOneHandlingStarted )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_6, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Split");
+TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Split");
                 iGoOneToOneHandlingStarted = ETrue;
                 iCurrentGhostOperation = confEvent;
                 iGoOneToOneCallId = callId;
                 }
             break;
         default:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_7, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - No Actions");
+TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - No Actions");
             break;
         }
     }

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmphonegsmwcdmaext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmphonegsmwcdmaext.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmphonegsmwcdmaextTraces.h"
-#endif
-
 #include <etelmm.h>
 #include "cmmphonegsmwcdmaext.h"
 #include "cmmphonetsy.h"
@@ -159,7 +153,7 @@
 //
 TInt CMmPhoneGsmWcdmaExt::InitSimL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_INITSIML_1, "TSY: CMmPhoneGsmWcdmaExt::InitSimL");
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::InitSimL");
 
     TInt ret( KErrGeneral ); 
 
@@ -184,7 +178,7 @@
 TInt CMmPhoneGsmWcdmaExt::GetNetworkCaps( 
         TUint32* aCaps )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETNETWORKCAPS_1, "TSY: CMmPhoneGsmWcdmaExt::GetNetworkCaps");
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetNetworkCaps");
 
     *aCaps = RMobilePhone::KCapsGetRegistrationStatus 
        | RMobilePhone::KCapsNotifyRegistrationStatus
@@ -212,7 +206,7 @@
         RMobilePhone::TMobilePhoneNetworkInfoV1* aNetInfo,
         RMobilePhone::TMobilePhoneLocationAreaV1* aArea ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKV1_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkV1");
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkV1");
 
     if ( NULL != aNetInfo )
         {
@@ -248,7 +242,7 @@
         RMobilePhone::TMobilePhoneNetworkInfoV2* aNetInfo,
         RMobilePhone::TMobilePhoneLocationAreaV1* aArea ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKV2_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkV2");
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkV2");
 
     if ( NULL != aNetInfo )
         {       
@@ -286,7 +280,7 @@
         RMobilePhone::TMobilePhoneNetworkInfoV5* aNetInfo,
         RMobilePhone::TMobilePhoneLocationAreaV1* aArea ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKV5_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkV5" );
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkV5" );
 
     if ( NULL != aNetInfo )
         {        
@@ -329,7 +323,7 @@
         RMobilePhone::TMobilePhoneNetworkInfoV8* aNetInfo,
         RMobilePhone::TMobilePhoneLocationAreaV1* aArea ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORK_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetwork" );
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetwork" );
 
     if ( NULL != aNetInfo )
         {        
@@ -374,7 +368,7 @@
 TInt CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV1( 
         RMobilePhone::TMobilePhoneNetworkInfoV1* aNetInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATIONV1_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV1" );
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV1" );
 
     if ( NULL != aNetInfo )
         {      
@@ -404,7 +398,7 @@
 TInt CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV2( 
         RMobilePhone::TMobilePhoneNetworkInfoV2* aNetInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATIONV2_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV2" );
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV2" );
 
     if ( NULL != aNetInfo )
         {       
@@ -436,7 +430,7 @@
 TInt CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV5( 
         RMobilePhone::TMobilePhoneNetworkInfoV5* aNetInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATIONV5_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV5" );
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV5" );
     
     if ( NULL != aNetInfo )
         {       
@@ -473,7 +467,7 @@
 TInt CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocation( 
         RMobilePhone::TMobilePhoneNetworkInfoV8* aNetInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATION_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocation" );
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocation" );
     
     if ( NULL != aNetInfo )
         {       
@@ -515,7 +509,7 @@
         const RMobilePhone::TMobilePhoneLocationAreaV1& aArea  ) 
         
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_SETCURRENTNETWORK_1, "TSY: CMmPhoneGsmWcdmaExt::SetCurrentNetwork" );
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::SetCurrentNetwork" );
 
     *iCurrentNwInfo = aNetInfo;
     *iCurrentLocationArea = aArea;
@@ -532,7 +526,7 @@
 TInt CMmPhoneGsmWcdmaExt::GetNITZInfo( 
         RMobilePhone::TMobilePhoneNITZ* aNwtTimeInfo ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETNITZINFO_1, "TSY: CMmPhoneGsmWcdmaExt::GetNITZInfo" );
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetNITZInfo" );
 
     TInt ret( KErrNotFound );
     
@@ -574,7 +568,7 @@
 void CMmPhoneGsmWcdmaExt::ReceivedNITZInfo( 
         RMobilePhone::TMobilePhoneNITZ& aNITZInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_RECEIVEDNITZINFO_1, "TSY: CMmPhoneGsmWcdmaExt::ReceivedNITZInfo" );
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::ReceivedNITZInfo" );
 
     // This information is not necessarily available if network time 
     // indication is received only once in bootup, before registration to NW.
@@ -607,7 +601,7 @@
 //
 TInt CMmPhoneGsmWcdmaExt::GetCellInfoL() 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCELLINFOL_1, "TSY: CMmPhoneGsmWcdmaExt::GetCellInfoL" );
+    TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCellInfoL" );
     TInt ret = iMessageManager->HandleRequestL( ECtsyPhoneCellInfoReq );
     return ret;
     }
@@ -620,7 +614,7 @@
 //
 TInt CMmPhoneGsmWcdmaExt::NotifyCellInfoChangeL()
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_NOTIFYCELLINFOCHANGEL_1, "TSY: CMmPhoneGsmWcdmaExt::NotifyCellInfoChangeL" );
+    TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::NotifyCellInfoChangeL" );
     TInt ret = iMessageManager->HandleRequestL( ECtsyPhoneCellInfoIndReq );
     return ret;	
 	}
@@ -636,7 +630,7 @@
         RMobilePhone::TMobilePhoneRegistrationStatus aRegistrationStatus )
             // New registration status from network
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_COMPLETENOTIFYNETWORKREGISTRATIONSTATUSCHANGE_1, "TSY: CMmPhoneGsmWcdmaExt::CompleteNotifyNetworkRegistrationStatusChange" );
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::CompleteNotifyNetworkRegistrationStatusChange" );
 
     // If registration status not registered, then reset network information
     switch( aRegistrationStatus )
@@ -672,7 +666,7 @@
 TInt CMmPhoneGsmWcdmaExt::GetHomeNetworkV1(
         RMobilePhone::TMobilePhoneNetworkInfoV1* aHomeNetInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETHOMENETWORKV1_1, "TSY: CMmPhoneGsmWcdmaExt::GetHomeNetworkV1" );
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetHomeNetworkV1" );
 
     TInt ret( KErrNone );
 
@@ -710,7 +704,7 @@
 TInt CMmPhoneGsmWcdmaExt::GetHomeNetworkV2(
         RMobilePhone::TMobilePhoneNetworkInfoV2* aHomeNetInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETHOMENETWORKV2_1, "TSY: CMmPhoneGsmWcdmaExt::GetHomeNetworkV2" );
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetHomeNetworkV2" );
 
     TInt ret( KErrNone );
 
@@ -751,7 +745,7 @@
         RMobilePhone::TMobilePhoneNetworkInfoV5* aHomeNetInfo )
         // pointer to HomeNetInfo
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETHOMENETWORKV5_1, "TSY: CMmPhoneGsmWcdmaExt::GetHomeNetworkV5" );
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetHomeNetworkV5" );
 
     TInt ret( KErrNone );
 
@@ -797,7 +791,7 @@
         RMobilePhone::TMobilePhoneNetworkInfoV8* aHomeNetInfo )
         // pointer to HomeNetInfo
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETHOMENETWORK_1, "TSY: CMmPhoneGsmWcdmaExt::GetHomeNetwork" );
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetHomeNetwork" );
 
     TInt ret( KErrNone );
 
@@ -1240,7 +1234,7 @@
     {
     iSecCode.Copy( aCodes.iCode );
 
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_DELIVERCODE_1,  "TSY: CMmPhoneGsmWcdmaExt::DeliverCode iSecCode: %S", iSecCode );
+TFLOGSTRING2( "TSY: CMmPhoneGsmWcdmaExt::DeliverCode iSecCode: %S", &iSecCode );
 
     return KErrNone;
     }
@@ -1360,7 +1354,7 @@
 TInt CMmPhoneGsmWcdmaExt::SetLockSettingL( 
         CMmDataPackage* aPackage )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_SETLOCKSETTINGL_1, "LTSY: CMmPhoneGsmWcdmaExt::SetLockSettingL" );
+TFLOGSTRING("LTSY: CMmPhoneGsmWcdmaExt::SetLockSettingL" );
 
     TLockAndSetting lockAndSetting;
     aPackage->UnPackData( &lockAndSetting.iLock, &lockAndSetting.iSetting );
@@ -1516,7 +1510,7 @@
 void CMmPhoneGsmWcdmaExt::CompleteGetHomeNetwork( 
         CMmDataPackage* aDataPackage ) 
     {    
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_COMPLETEGETHOMENETWORK_1, "TSY: CMmPhoneGsmWcdmaExt::CompleteGetHomeNetwork" );
+TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::CompleteGetHomeNetwork" );
 
     RMobilePhone::TMobilePhoneNetworkInfoV8* 	homeInfo = NULL;
     aDataPackage->UnPackData ( &homeInfo );

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontextlist.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontextlist.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CmmpacketcontextlistTraces.h"
-#endif
-
 #include "Cmmpacketcontextlist.h"
 #include "Cmmpacketservicetsy.h"
 #include "Cmmpacketcontexttsy.h"
@@ -42,7 +36,7 @@
         CMmPacketServiceTsy* const aPacketService )
     {
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_NEWL_1, "TSY: CMmPacketContextList* CMmPacketContextList::NewL." );
+TFLOGSTRING("TSY: CMmPacketContextList* CMmPacketContextList::NewL." );
 
     CMmPacketContextList* const contextList =
         new ( ELeave ) CMmPacketContextList();
@@ -120,7 +114,7 @@
         const TUint8 /* aObjectId */,
         const TInfoName& aContextName )      
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_ADDOBJECT_1, "TSY: CMmPacketContextList::AddObject. Context Name: %S Channel Id: %d", aContextName, aChannelId );
+TFLOGSTRING3("TSY: CMmPacketContextList::AddObject. Context Name: %S Channel Id: %d", &aContextName, aChannelId );
 
     TInt ret( KErrArgument );
 
@@ -190,7 +184,7 @@
         CMmPacketContextTsy* const aContext )
     {
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_REMOVEOBJECT_1, "TSY: CMmPacketContextList::RemoveObject." );
+TFLOGSTRING("TSY: CMmPacketContextList::RemoveObject." );
 
     // Set ret to KErrArgument to check that context is in list
     TInt ret( KErrArgument );
@@ -218,7 +212,7 @@
                         if ( KErrNone == ret )
                             {
 
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_REMOVEOBJECT_2, "TSY: CMmPacketContextList::RemoveObject. Context Name: %S", iContextInfoArray[i].iContextName );
+TFLOGSTRING2("TSY: CMmPacketContextList::RemoveObject. Context Name: %S", &iContextInfoArray[i].iContextName );
                             // Release Proxy id
                             iProxyIdList[j].iIsFree = ETrue;
             
@@ -506,7 +500,7 @@
 
     *aCount = count;
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_ENUMERATENIFS_1, "TSY: CMmPacketContextList::EnumerateNifs. Number of Nifs: %d", aCount );
+TFLOGSTRING2("TSY: CMmPacketContextList::EnumerateNifs. Number of Nifs: %d", aCount );
     }
 
 // ---------------------------------------------------------------------------
@@ -520,7 +514,7 @@
         RPacketService::TNifInfoV2* aNifInfoV2 ) 
     {
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_GETNIFINFO_1, "TSY: CMmPacketContextList::GetNifInfo." );
+TFLOGSTRING("TSY: CMmPacketContextList::GetNifInfo." );
 
     TInt index = *aIndex;
 
@@ -631,7 +625,7 @@
         const TInfoName aExistingContextName, 
         TInt* aCount )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_ENUMERATECONTEXTSINNIF_1, "TSY: CMmPacketContextList::EnumerateContextsInNif." );
+TFLOGSTRING("TSY: CMmPacketContextList::EnumerateContextsInNif." );
 
     TInt count( 0 );
 
@@ -707,7 +701,7 @@
         const RPacketService::TContextNameInNif* aContextNameInNif,
         TDes* aContextName )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_GETCONTEXTNAMEINNIF_1, "TSY: CMmPacketContextList::GetContextNameInNif." );
+TFLOGSTRING("TSY: CMmPacketContextList::GetContextNameInNif." );
 
     TInt index = aContextNameInNif->iIndex;

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontexttsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontexttsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,16 +16,11 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CmmpacketcontexttsyTraces.h"
-#endif
-
 #include "Cmmpacketcontexttsy.h"
 #include "Cmmpacketcontextlist.h"
 #include "cmmpacketservicegsmwcdmaext.h"
 #include "CMmPacketTsy.h"
+#include <ctsy/tflogger.h>
 #include "MmTsy_timeoutdefs.h"
 #include "MmTsy_numberOfSlots.h"
 
@@ -43,7 +38,7 @@
         const TDes& aName,  
         const TUint8 aProxyId ) 
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NEWL_1,  "TSY: CMmPacketContextTsy::NewL. Context name:%S", aName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::NewL. Context name:%S", &aName );
 
     CMmPacketContextTsy* packetContext = new ( ELeave ) CMmPacketContextTsy();
 
@@ -66,7 +61,7 @@
     
 CMmPacketContextTsy::~CMmPacketContextTsy()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_DTOR_1,  "TSY: CMmPacketContextTsy::~CMmPacketContextTsy. Context name: %S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::~CMmPacketContextTsy. Context name: %S", &iContextName );
 	
 	if( iMmPacketService )
 		{
@@ -164,7 +159,7 @@
         const TInt aIpc, 
         const TDataPackage& aPackage )  
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_EXTFUNC_1,  "TSY: CMmPacketContextTsy::ExtFunc. IPC: %d Context name:%S", aIpc, iContextName );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::ExtFunc. IPC: %d Context name:%S", aIpc, &iContextName );
 
     TInt ret( KErrNone );
     TInt trapError( KErrNone );
@@ -222,7 +217,8 @@
         const TInt aIpc,      
         const TDataPackage& aPackage )   
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_DOEXTFUNCL_1,  "TSY: CMmPacketContextTsy::DoExtFuncL. IPC: %d Handle:%d",aIpc, aTsyReqHandle );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::DoExtFuncL. IPC: %d Handle:%d",
+                aIpc, aTsyReqHandle );
 
     TInt ret( KErrNotSupported );
 
@@ -388,7 +384,7 @@
 CTelObject::TReqMode CMmPacketContextTsy::ReqModeL( 
         const TInt aIpc ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REQMODEL_1,  "TSY: CMmPacketContextTsy::ReqModeL. IPC: %d", aIpc );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::ReqModeL. IPC: %d", aIpc );
 
     CTelObject::TReqMode reqMode( 0 );
     TBool doLeave( EFalse );
@@ -531,7 +527,8 @@
             break;
 
         }  
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NUMBEROFSLOTSL_1,  "TSY: CMmPacketContextTsy::NumberOfSlotsL. IPC: %d Number of slots: %d",aIpc, numberOfSlots );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::NumberOfSlotsL. IPC: %d Number of slots: %d",
+                aIpc, numberOfSlots );
 
     return numberOfSlots;
 
@@ -553,7 +550,8 @@
         const TInt aIpc,                            
         const TTsyReqHandle aTsyReqHandle )         
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_CANCELSERVICE_1,  "TSY: CMmPacketContextTsy::CancelService. IPC: %d Handle:%d",aIpc, aTsyReqHandle );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::CancelService. IPC: %d Handle:%d",
+                aIpc, aTsyReqHandle );
 
     TInt ret( KErrNone );
 	TTsyReqHandle reqHandle( NULL );
@@ -677,7 +675,7 @@
 TInt CMmPacketContextTsy::RegisterNotification( 
         const TInt aIpc )              
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REGISTERNOTIFICATION_1,  "TSY: CMmPacketContextTsy::RegisterNotification. IPC: %d", aIpc );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::RegisterNotification. IPC: %d", aIpc );
 
     TInt ret( KErrNone );
 
@@ -719,7 +717,7 @@
 TInt CMmPacketContextTsy::DeregisterNotification(
         const TInt aIpc )                          
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_DEREGISTERNOTIFICATION_1,  "TSY: CMmPacketContextTsy::DeregisterNotification. IPC: %d", aIpc );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::DeregisterNotification. IPC: %d", aIpc );
 
     TInt ret( KErrNone );
 
@@ -756,12 +754,12 @@
 CTelObject* CMmPacketContextTsy::OpenNewObjectL(    
         TDes& aNewName )                          
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_OPENNEWOBJECTL_1,  "TSY: CMmPacketContextTsy::OpenNewObjectL." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::OpenNewObjectL." );
 
     // Each context can have only one QoS
     if ( NULL != iQoSProfile )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_OPENNEWOBJECTL_2,  "TSY: CMmPacketContextTsy::OpenNewObjectL. Leaves with: %d", KErrAlreadyExists );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::OpenNewObjectL. Leaves with: %d", KErrAlreadyExists );
         User::Leave( KErrAlreadyExists );
         }
     
@@ -773,7 +771,7 @@
         iQoSProfileName.Copy( iContextName );
         aNewName.Copy( iQoSProfileName );
         }
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_OPENNEWOBJECTL_3,  "TSY: CMmPacketContextTsy::OpenNewObjectL. aNewName: %S", aNewName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::OpenNewObjectL. aNewName: %S", &aNewName );
 
     return iQoSProfile;
     }
@@ -789,11 +787,11 @@
 CTelObject* CMmPacketContextTsy::OpenNewObjectByNameL(    
         const TDesC& aName )                     
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_OPENNEWOBJECTBYNAMEL_1,  "TSY: CMmPacketContextTsy::OpenNewObjectByNameL. aName: %S", aName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::OpenNewObjectByNameL. aName: %S", &aName );
 
     if ( aName != iQoSProfileName )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_OPENNEWOBJECTBYNAMEL_2,  "TSY: CMmPacketContextTsy::OpenNewObjectByNameL. Leaves with: %d", KErrNotFound );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::OpenNewObjectByNameL. Leaves with: %d", KErrNotFound );
         User::Leave( KErrNotFound );
         }
 
@@ -808,7 +806,7 @@
 //
 TInt CMmPacketContextTsy::InitialiseContextL(RPacketContext::TDataChannelV2* aDataChannel )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_INITIALISECONTEXTL_1,  "TSY: CMmPacketContextTsy::InitialiseContextL." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::InitialiseContextL." );
 
     TInt ret( KErrNone );
 
@@ -832,7 +830,7 @@
 //
 void CMmPacketContextTsy::CompleteInitialiseContext(const TInt aResult )     
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEINITIALISECONTEXT_1,  "TSY: CMmPacketContextTsy::CompleteInitialiseContext. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteInitialiseContext. Error: %d", aResult );
 
     // Reset the req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -859,7 +857,7 @@
 //
 TInt CMmPacketContextTsy::ActivateL()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_ACTIVATEL_1,  "TSY: CMmPacketContextTsy::ActivateL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::ActivateL. Context name:%S", &iContextName );
 
     TInt ret( KErrGprsServicesNotAllowed );
 
@@ -887,7 +885,7 @@
 void CMmPacketContextTsy::CompleteActivate( 
         const TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEACTIVATE_1,  "TSY: CMmPacketContextTsy::CompleteActivate. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteActivate. Error: %d", aResult );
     // Reset the req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodePacketContextActivate );
@@ -908,7 +906,7 @@
 //
 TInt CMmPacketContextTsy::DeactivateL()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_DEACTIVATEL_1,  "TSY: CMmPacketContextTsy::DeactivateL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::DeactivateL. Context name:%S", &iContextName );
     TInt ret( KErrNone );
 
     // Call Deactivate
@@ -932,7 +930,7 @@
 void CMmPacketContextTsy::CompleteDeactivate( 
         const TInt aResult )    
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEDEACTIVATE_1,  "TSY: CMmPacketContextTsy::CompleteDeactivate. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteDeactivate. Error: %d", aResult );
     // Reset the req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodePacketContextDeactivate );
@@ -956,7 +954,7 @@
 //
 TInt CMmPacketContextTsy::DeleteL()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_DELETEL_1,  "TSY: CMmPacketContextTsy::DeleteL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::DeleteL. Context name:%S", &iContextName );
 
     TInt ret( KErrNone );
 
@@ -981,7 +979,7 @@
 void CMmPacketContextTsy::CompleteDelete( 
         const TInt aResult )        
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEDELETE_1,  "TSY: CMmPacketContextTsy::CompleteDelete. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteDelete. Error: %d", aResult );
     // Reset the req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodePacketContextDelete );
@@ -1003,7 +1001,7 @@
         const TTsyReqHandle aTsyReqHandle,    
         TPacketDataConfigBase* const aConfig )  
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETCONFIG_1,  "TSY: CMmPacketContextTsy::GetConfig. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::GetConfig. Context name:%S", &iContextName );
 
     // Get config
     TInt ret = iMmPacketContextGsmWcdmaExt->GetConfig( aConfig );
@@ -1024,7 +1022,8 @@
         const TTsyReqHandle aTsyReqHandle,         
         TUint* const aRate ) 
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETCONNECTIONSPEED_1,  "TSY: CMmPacketContextTsy::GetConnectionSpeed. Context name: %S Connection Speed:%u bps",iContextName, iConnectionSpeed );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::GetConnectionSpeed. Context name: %S Connection Speed:%d bps",
+             &iContextName, iConnectionSpeed );
 
     // Get current connection speed rate
     *aRate = iConnectionSpeed;
@@ -1045,7 +1044,7 @@
         const TTsyReqHandle aTsyReqHandle,   
         RPacketContext::TDataVolume* const aVolume ) 
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETDATAVOLUMETRANSFERREDL_1,  "TSY: CMmPacketContextTsy::GetDataVolumeTransferredL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::GetDataVolumeTransferredL. Context name:%S", &iContextName );
 
     TInt ret( KErrNone );
 
@@ -1082,7 +1081,7 @@
 void CMmPacketContextTsy::CompleteGetDataVolumeTransferred( 
         const TInt aResult )  
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEGETDATAVOLUMETRANSFERRED_1,  "TSY: CMmPacketContextTsy::CompleteGetDataVolumeTransferred. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteGetDataVolumeTransferred. Error: %d", aResult );
 
     // Reset the req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -1115,7 +1114,8 @@
         const TTsyReqHandle aTsyReqHandle,  
         TInt* const aError )    
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETLASTERRORCAUSE_1,  "TSY: CMmPacketContextTsy::GetLastErrorCause. Context name:%S Last error cause: %d",iContextName, iLastErrorCause );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::GetLastErrorCause. Context name:%S Last error cause: %d",
+             &iContextName, iLastErrorCause );
 
     *aError = iLastErrorCause;
     CMmPacketContextTsy::ReqCompleted( aTsyReqHandle, KErrNone );
@@ -1145,7 +1145,8 @@
         aQoSProfile->Zero();
         }
 
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETPROFILENAME_1,  "TSY: CMmPacketContextTsy::GetProfileName. Context name: %S QoS Profile Name: %S",iContextName, *aQoSProfile );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::GetProfileName. Context name: %S QoS Profile Name: %S",
+             &iContextName, aQoSProfile );
 
     CMmPacketContextTsy::ReqCompleted( aTsyReqHandle, KErrNone );
     return KErrNone;
@@ -1161,7 +1162,8 @@
         const TTsyReqHandle aTsyReqHandle,   
         RPacketContext::TContextStatus* const aContextStatus )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETSTATUS_1,  "TSY: CMmPacketContextTsy::GetStatus. Context name: %S Context Status:%d",iContextName, iContextStatus );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::GetStatus. Context name: %S Context Status:%d",
+             &iContextName, iContextStatus );
     *aContextStatus = iContextStatus;
     CMmPacketContextTsy::ReqCompleted( aTsyReqHandle, KErrNone );
 
@@ -1177,7 +1179,7 @@
 TInt CMmPacketContextTsy::NotifyConfigChanged(
         TPacketDataConfigBase* const aConfig )  
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NOTIFYCONFIGCHANGED_1,  "TSY: CMmPacketContextTsy::NotifyConfigChanged." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::NotifyConfigChanged." );
 
     // Call NotifyConfigChanged from extension
     TInt ret = iMmPacketContextGsmWcdmaExt->NotifyConfigChanged( *aConfig );
@@ -1212,7 +1214,8 @@
 //
 void CMmPacketContextTsy::CompleteNotifyConfigChanged()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETENOTIFYCONFIGCHANGED_1,  "TSY: CMmPacketContextTsy::CompleteNotifyConfigChanged.  Context name:%S",iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteNotifyConfigChanged.  Context name:%S",
+                &iContextName );
 
     // Get and reset req handle for R97/98 config notify
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -1252,7 +1255,7 @@
 TInt CMmPacketContextTsy::NotifyConnectionSpeedChange(
         TUint* const aRate )    
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NOTIFYCONNECTIONSPEEDCHANGE_1,  "TSY: CMmPacketContextTsy::NotifyConnectionSpeedChange." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::NotifyConnectionSpeedChange." );
 
     // Store pointer
     iRetNotifyConnectionSpeed = aRate;
@@ -1275,7 +1278,8 @@
     
     if ( iNotifyConnectionSpeed != iConnectionSpeed )
         {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETENOTIFYCONNECTIONSPEEDCHANGE_1,  "TSY: CMmPacketContextTsy::CompleteNotifyConnectionSpeedChange. Context name:%S Connection Speed:%u bps",iContextName, iConnectionSpeed );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::CompleteNotifyConnectionSpeedChange. Context name:%S Connection Speed:%d bps",
+            &iContextName, iConnectionSpeed );
 
         // Store the connection speed internally
         iNotifyConnectionSpeed = iConnectionSpeed;
@@ -1305,7 +1309,7 @@
 TInt CMmPacketContextTsy::NotifyStatusChange(
         RPacketContext::TContextStatus* const aContextStatus )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NOTIFYSTATUSCHANGE_1,  "TSY: CMmPacketContextTsy::NotifyStatusChange. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::NotifyStatusChange. Context name:%S", &iContextName );
     iRetNotifyStatus = aContextStatus;
     iReqHandleType = EMultimodePacketContextNotifyStatusChange;
 
@@ -1325,7 +1329,8 @@
     if ( aContextStatus != iContextStatus )
         {
         iContextStatus = aContextStatus;
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETENOTIFYSTATUSCHANGE_1,  "TSY: CMmPacketContextTsy::CompleteNotifyStatusChange. Context name: %S  Context status:%d",iContextName, iContextStatus );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::CompleteNotifyStatusChange. Context name: %S  Context status:%d",
+                    &iContextName, iContextStatus );
 
         if ( RPacketContext::EStatusActive == iContextStatus ||
              RPacketContext::EStatusInactive == iContextStatus ||
@@ -1364,7 +1369,7 @@
 TInt CMmPacketContextTsy::SetConfigL(
         TPacketDataConfigBase* const aConfig ) 
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_SETCONFIGL_1,  "TSY: CMmPacketContextTsy::SetConfigL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::SetConfigL. Context name:%S", &iContextName );
 
     // Call SetConfigL
     TInt ret = iMmPacketContextGsmWcdmaExt->SetConfigL( aConfig );
@@ -1388,7 +1393,7 @@
         const TInt aError,   
         TBool aIsAddMediaAuthorizationCalled )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETESETCONFIG_1,  "TSY: CMmPacketContextTsy::CompleteSetConfig. Error: %d", aError );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteSetConfig. Error: %d", aError );
     
     TTsyReqHandle reqHandle( EMultimodePacketContextReqHandleUnknown );
     //if context exists eg. its name length is bigger than zero
@@ -1477,7 +1482,7 @@
         RPacketContext::TDataVolume dataVolume )
     {
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_SETDATAVOLUME_1,  "TSY: CMmPacketContextTsy::SetDataVolume" );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::SetDataVolume" );
    
     if ( dataVolume.iBytesSent < iDataVolume.iBytesSent )
         {
@@ -1511,7 +1516,8 @@
         iLastErrorCause =  aErrorCause;           
         }
 
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_SETLASTERRORCAUSE_1,  "TSY: CMmPacketContextTsy::SetLastErrorCause.  aErrorCause: %d iLastErrorCause:%d", aErrorCause, iLastErrorCause );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::SetLastErrorCause.  aErrorCause: %d iLastErrorCause:%d", 
+             aErrorCause, iLastErrorCause );
 
     }
 
@@ -1534,7 +1540,8 @@
 //
 void CMmPacketContextTsy::ContextSuspended()
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_CONTEXTSUSPENDED_1,  "TSY: CMmPacketContextTsy::ContextSuspended. Context status before suspending: %d",iContextStatus );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::ContextSuspended. Context status before suspending: %d",
+                iContextStatus );
 
     if ( ( RPacketContext::EStatusActivating == iContextStatus ) ||
          ( RPacketContext::EStatusActive == iContextStatus ) ||
@@ -1562,7 +1569,8 @@
 
     iContextStatusBeforeSuspending = RPacketContext::EStatusUnknown;
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_CONTEXTRESUMED_1,  "TSY: CMmPacketContextTsy::ContextResumed. Context status when resumed: %d",iContextStatus );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::ContextResumed. Context status when resumed: %d",
+                iContextStatus );
 
     }
 
@@ -1596,7 +1604,7 @@
 //
 void CMmPacketContextTsy::RemoveQoS()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REMOVEQOS_1,  "TSY: CMmPacketContextTsy::RemoveQoS." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::RemoveQoS." );
 
     iQoSProfile = NULL;
     iQoSProfileName.Zero();
@@ -1612,7 +1620,8 @@
         const TTsyReqHandle aTsyReqHandle, 
         const TInt aError )   
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REQCOMPLETED_1,  "TSY: CMmPacketContextTsy::ReqCompleted. Handle:%d Error:%d", aTsyReqHandle, aError );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::ReqCompleted. Handle:%d Error:%d", 
+             aTsyReqHandle, aError );
 
     // Set last error cause
     if ( KErrNone != aError )
@@ -1778,7 +1787,7 @@
 void CMmPacketContextTsy::ResetDialUpContext()
     {
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_RESETDIALUPCONTEXT_1,  "TSY: CMmPacketContextTsy::ResetDialUpContext." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::ResetDialUpContext." );
 
     iDataVolume.iOverflowCounterSent = 0;
     iDataVolume.iBytesSent = 0;
@@ -1814,7 +1823,7 @@
         const TTsyReqHandle aTsyReqHandle,  
         TDes8* const aPacketFilter )  
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_ADDPACKETFILTERL_1,  "TSY: CMmPacketContextTsy::AddPacketFilterL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::AddPacketFilterL. Context name:%S", &iContextName );
 
     TInt ret( KErrGeneral );
 
@@ -1856,7 +1865,7 @@
         const TTsyReqHandle aTsyReqHandle,  
         TInt *aID ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REMOVEPACKETFILTER_1,  "TSY: CMmPacketContextTsy::RemovePacketFilter. RemovedFilter:%d", *aID );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::RemovePacketFilter. RemovedFilter:%d", *aID );
 
     TInt ret( KErrArgument );
 
@@ -1881,7 +1890,7 @@
 //
 TInt CMmPacketContextTsy::ModifyActiveContextL()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_MODIFYACTIVECONTEXTL_1,  "TSY: CMmPacketContextTsy::ModifyActiveContextL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::ModifyActiveContextL. Context name:%S", &iContextName );
     
     TInt ret( KErrNotReady );
 
@@ -1910,7 +1919,7 @@
 void CMmPacketContextTsy::CompleteModifyActiveContext(
         const TInt aResult )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEMODIFYACTIVECONTEXT_1,  "TSY: CMmPacketContextTsy::CompleteModifyActiveContext. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteModifyActiveContext. Context name:%S", &iContextName );
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
            EMultimodePacketContextModifyActiveContext );
@@ -2109,7 +2118,7 @@
         const TTsyReqHandle aTsyReqHandle,    
         TConnectionInfoBase* const aInfo )  
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETCONNECTIONINFO_1,  "TSY: CMmPacketContextTsy::GetConnectionInfo. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::GetConnectionInfo. Context name:%S", &iContextName );
 
     // Get config
     TInt ret = FillConnectionInfo( aInfo );
@@ -2129,7 +2138,7 @@
 TInt CMmPacketContextTsy::NotifyConnectionInfoChange(
         TConnectionInfoBase* const aInfo )    
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NOTIFYCONNECTIONINFOCHANGE_1,  "TSY: CMmPacketContextTsy::NotifyConnectionInfoChange." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::NotifyConnectionInfoChange." );
 
     // Store pointer
     iRetNotifyConnectionInfo = aInfo;
@@ -2148,7 +2157,7 @@
 void CMmPacketContextTsy::CompleteNotifyConnectionInfoChange(
         TConnectionInfoBase* const aInfo )    
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETENOTIFYCONNECTIONINFOCHANGE_1,  "TSY: CMmPacketContextTsy::CompleteNotifyConnectionInfoChange." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::CompleteNotifyConnectionInfoChange." );
 
     if ( NULL != aInfo &&
         TConnectionInfoBase::KConnectionInfoV1 == aInfo->ExtensionId() )
@@ -2197,7 +2206,7 @@
 TInt CMmPacketContextTsy::FillConnectionInfo(   
         TConnectionInfoBase* const aInfo )  
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_FILLCONNECTIONINFO_1,  "TSY: CMmPacketContextTsy::FillConnectionInfo" );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::FillConnectionInfo" );
 
     TInt ret = KErrNone;

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CmmpacketqostsyTraces.h"
-#endif
-
 #include "Cmmpacketservicetsy.h"
 #include "Cmmpacketqostsy.h"
 #include "Cmmpacketcontexttsy.h"
@@ -42,7 +36,7 @@
         CMmPacketServiceTsy* aMmPacketService,
         CMmPacketContextTsy* aMmPacketContext ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_NEWL_1, "TSY: CMmPacketQoSTsy::NewL." );
+TFLOGSTRING("TSY: CMmPacketQoSTsy::NewL." );
 
     CMmPacketQoSTsy* mmPacketQoS = new ( ELeave ) CMmPacketQoSTsy();
     CleanupClosePushL( *mmPacketQoS );
@@ -76,7 +70,7 @@
 
 CMmPacketQoSTsy::~CMmPacketQoSTsy()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_DTOR_1, "TSY: CMmPacketQoSTsy::~CMmPacketQoSTsy." );
+TFLOGSTRING("TSY: CMmPacketQoSTsy::~CMmPacketQoSTsy." );
     if( iMmPacketContext )
 	    {
 	    iMmPacketContext->RemoveQoS();	
@@ -124,7 +118,7 @@
         const TInt aIpc,     
         const TDataPackage& aPackage )      
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_EXTFUNC_1, "TSY: CMmPacketQoSTsy::ExtFunc. aIpc: %d", aIpc );
+TFLOGSTRING2("TSY: CMmPacketQoSTsy::ExtFunc. aIpc: %d", aIpc );
     TInt ret( KErrNone );
     TInt trapError( KErrNone );
 
@@ -174,7 +168,7 @@
         const TInt aIpc,        
         const TDataPackage& aPackage )  
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_DOEXTFUNCL_1, "TSY: CMmPacketQoSTsy::DoExtFuncL. IPC: %d  Handle:%u", aIpc, (TUint)aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmPacketQoSTsy::DoExtFuncL. IPC: %d  Handle:%d", aIpc, aTsyReqHandle);
     TInt ret( KErrNotSupported );
 
     switch ( aIpc )
@@ -207,7 +201,7 @@
 CTelObject::TReqMode CMmPacketQoSTsy::ReqModeL(    
         const TInt aIpc ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_REQMODEL_1, "TSY: CMmPacketQoSTsy::ReqModeL. IPC: %d", aIpc );
+TFLOGSTRING2("TSY: CMmPacketQoSTsy::ReqModeL. IPC: %d", aIpc );
     CTelObject::TReqMode reqMode( 0 );
 
     switch ( aIpc )
@@ -241,7 +235,7 @@
         const TInt aIpc ) 
     {
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_NUMBEROFSLOTSL_1, "TSY: CMmPacketQoSTsy::NumberOfSlotsL. IPC: %d", aIpc );
+TFLOGSTRING2("TSY: CMmPacketQoSTsy::NumberOfSlotsL. IPC: %d", aIpc );
 
     TInt numberOfSlots( 0 );
 
@@ -269,7 +263,7 @@
         const TInt aIpc,   
         const TTsyReqHandle aTsyReqHandle ) 
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_CANCELSERVICE_1, "TSY: CMmPacketQoSTsy::CancelService. IPC: %d  Handle:%u", aIpc, (TUint)aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmPacketQoSTsy::CancelService. IPC: %d  Handle:%d", aIpc, aTsyReqHandle);
      TInt ret( KErrNone );
 
      switch ( aIpc )
@@ -310,7 +304,7 @@
 TInt CMmPacketQoSTsy::RegisterNotification(    
         const TInt aIpc ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_REGISTERNOTIFICATION_1, "TSY: CMmPacketQoSTsy::RegisterNotification. IPC: %d", aIpc );
+TFLOGSTRING2("TSY: CMmPacketQoSTsy::RegisterNotification. IPC: %d", aIpc );
 
     if ( EPacketQoSNotifyProfileChanged == aIpc )
         {
@@ -330,7 +324,7 @@
 TInt CMmPacketQoSTsy::DeregisterNotification(
         const TInt aIpc )    
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_DEREGISTERNOTIFICATION_1, "TSY: CMmPacketQoSTsy::DeregisterNotification. IPC: %d", aIpc );
+TFLOGSTRING2("TSY: CMmPacketQoSTsy::DeregisterNotification. IPC: %d", aIpc );
 
     if ( EPacketQoSNotifyProfileChanged == aIpc )
         {
@@ -350,7 +344,7 @@
 CTelObject* CMmPacketQoSTsy::OpenNewObjectL(    
         TDes& /* aNewName*/ ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_OPENNEWOBJECTL_1, "TSY: CMmPacketQoSTsy::OpenNewObjectL. Leaves with:KErrNotSupported" );
+TFLOGSTRING("TSY: CMmPacketQoSTsy::OpenNewObjectL. Leaves with:KErrNotSupported" );
     User::Leave( KErrNotSupported );
     return NULL;
     }
@@ -367,7 +361,7 @@
 CTelObject* CMmPacketQoSTsy::OpenNewObjectByNameL(    
         const TDesC& /* aName */ )  
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_OPENNEWOBJECTBYNAMEL_1, "TSY: CMmPacketQoSTsy::OpenNewObjectByNameL. Leaves with:KErrNotSupported" );
+TFLOGSTRING("TSY: CMmPacketQoSTsy::OpenNewObjectByNameL. Leaves with:KErrNotSupported" );
     // Otherwise we can leave...
     User::Leave( KErrNotSupported );
     return NULL;
@@ -397,7 +391,7 @@
         const TTsyReqHandle aTsyReqHandle,   
         TDes8* aProfileCaps )   
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_GETPROFILECAPABILITIES_1, "TSY: CMmPacketQoSTsy::GetProfileCapabilities. TsyReqHandle: %u  aProfileCaps: 0x%08x", (TUint)aTsyReqHandle, (TUint)aProfileCaps);
+TFLOGSTRING3("TSY: CMmPacketQoSTsy::GetProfileCapabilities. TsyReqHandle: %d  aProfileCaps: %d", aTsyReqHandle, aProfileCaps );
      
     // Call GetProfileCapabilities from GSM/WCDMA extension
     TInt ret = iMmPacketQoSGsmWcdmaExt->GetProfileCapabilities( 
@@ -418,7 +412,7 @@
         const TTsyReqHandle aTsyReqHandle,
         TDes8* aProfile )      
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_GETPROFILEPARAMETERS_1, "TSY: CMmPacketQoSTsy::GetProfileParameters. TsyReqHandle: %u  aProfile: 0x%08x", (TUint)aTsyReqHandle, (TUint)aProfile );
+TFLOGSTRING3("TSY: CMmPacketQoSTsy::GetProfileParameters. TsyReqHandle: %d   aProfile: %d", aTsyReqHandle, aProfile );
   
     // Call GetProfileParameters method from GSM/WCDMA extension
     TInt ret = iMmPacketQoSGsmWcdmaExt->GetProfileParameters( aProfile );
@@ -439,7 +433,7 @@
 TInt CMmPacketQoSTsy::NotifyProfileChanged(
         TDes8* aProfile )  
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_NOTIFYPROFILECHANGED_1, "TSY: CMmPacketQoSTsy::NotifyProfileChanged. aProfile: 0x%08x", (TUint)aProfile);
+TFLOGSTRING2("TSY: CMmPacketQoSTsy::NotifyProfileChanged. aProfile: %d", aProfile );
 
     // Set Req Handle
     iReqHandleType = EMultimodePacketQoSNotifyParameterChanged;
@@ -457,7 +451,7 @@
 
 void CMmPacketQoSTsy::CompleteNotifyProfileChanged()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_COMPLETENOTIFYPROFILECHANGED_1, "TSY: CMmPacketQoSTsy::CompleteNotifyProfileChanged." );
+TFLOGSTRING("TSY: CMmPacketQoSTsy::CompleteNotifyProfileChanged." );
    
     // Reset tsy request handle. 
     TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -481,7 +475,7 @@
         const TTsyReqHandle aTsyReqHandle, 
         TDes8* aProfile )                
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_SETPROFILEPARAMETERSL_1, "TSY: CMmPacketQoSTsy::SetProfileParametersL. TsyReqHandle: %u  aProfile: 0x%08x", (TUint)aTsyReqHandle, (TUint)aProfile );
+TFLOGSTRING3("TSY: CMmPacketQoSTsy::SetProfileParametersL. TsyReqHandle: %d  aProfile: %d", aTsyReqHandle, &aProfile );
 
     // Call SetProfileParametersL from GSM/WCDMA extension
     TInt ret = iMmPacketQoSGsmWcdmaExt->SetProfileParametersL( aProfile );
@@ -521,7 +515,7 @@
 void CMmPacketQoSTsy::CompleteSetProfileParameters(
         const TInt aError )     
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_COMPLETESETPROFILEPARAMETERS_1, "TSY: CMmPacketQoSTsy::CompleteSetProfileParameters. Error: %d", aError );
+TFLOGSTRING2("TSY: CMmPacketQoSTsy::CompleteSetProfileParameters. Error: %d", aError );
 
     // Reset the request handle. 
     TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
@@ -612,7 +606,7 @@
         const TInt aError )     
        
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_REQCOMPLETED_1, "TSY: CMmPacketQoSTsy::Request Completed.  Handle: %d Error:%d", aTsyReqHandle, aError );
+TFLOGSTRING3("TSY: CMmPacketQoSTsy::Request Completed.  Handle: %d Error:%d", aTsyReqHandle, aError ); 
 
     CTelObject::ReqCompleted( aTsyReqHandle, aError );  
     }

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,13 +16,8 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CmmpacketservicetsyTraces.h"
-#endif
-
 #include "Cmmpacketservicetsy.h"
+#include <ctsy/tflogger.h>
 #include <ctsy/serviceapi/mmtsy_defaults.h>
 #include "MmTsy_timeoutdefs.h"
 #include "MmTsy_numberOfSlots.h"
@@ -51,7 +46,7 @@
         CMmMessageManagerBase* const aMessageManager,
         MLtsyFactoryBase* aFactory  ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NEWL_1, "TSY: CMmPacketServiceTsy::NewL" );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::NewL" );
     CMmPacketServiceTsy* const packetService =
         new ( ELeave ) CMmPacketServiceTsy();
 
@@ -61,7 +56,7 @@
     packetService->ConstructL( aFactory );
     CleanupStack::Pop();
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NEWL_2, "TSY: CMmPacketServiceTsy::NewL." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::NewL." );
     return packetService;
 
     }
@@ -83,7 +78,7 @@
 
 CMmPacketServiceTsy::~CMmPacketServiceTsy()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DTOR_1, "TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy" );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy" );
 
     if ( iMmPhone )
         {
@@ -113,19 +108,19 @@
 
     if ( NULL != iDialUpContext )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DTOR_2, "TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Close Dial-up Object." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Close Dial-up Object." );
 
         iDialUpContext->Close();
         }
 
     if ( NULL != iSecondaryDialUpContext )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DTOR_3, "TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Close Secondary Dial-up Object." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Close Secondary Dial-up Object." );
 
         iSecondaryDialUpContext->Close();
         }
         
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DTOR_4, "TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Closing iMutex Object." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Closing iMutex Object." );
     iMutex.Close();
 
 #ifdef USING_CTSY_DISPATCHER
@@ -307,7 +302,7 @@
 		    RPacketService::EStatusAttached, KErrNone );
 
         }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_UPDATEATTACHEDPACKETSTATUS_1, "TSY: CMmPacketServiceTsy::UpdateAttachedPacketStatus. Service Status: %d", iInternalSavedData.iServiceStatus );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::UpdateAttachedPacketStatus. Service Status: %d", iInternalSavedData.iServiceStatus );
     }
 
 //----------------------------------------------------------------------------
@@ -367,14 +362,14 @@
 
             if ( iDialUpContext != NULL )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_1, "TSY: CMmPacketServiceTsy::CompletePacketStatusChanged.  DialUp Context Resumed" );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompletePacketStatusChanged.  DialUp Context Resumed" );
 
                 iDialUpContext->ContextResumed();
                 }
 
             if ( iSecondaryDialUpContext != NULL )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_2, "TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. Secondary DialUp Context Resumed" );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. Secondary DialUp Context Resumed" );
 
                 iSecondaryDialUpContext->ContextResumed();
                 }
@@ -515,13 +510,13 @@
 
                     if ( iDialUpContext != NULL )
                         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_3, "TSY: CMmPacketServiceTsy::CompletePacketStatusChanged.  DialUp Context Suspended" );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompletePacketStatusChanged.  DialUp Context Suspended" );
                         iDialUpContext->ContextSuspended();
                         }
 
                     if ( iSecondaryDialUpContext != NULL )
                         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_4, "TSY: CMmPacketServiceTsy::CompletePacketStatusChanged.  DialUp Context Suspended" );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompletePacketStatusChanged.  DialUp Context Suspended" );
                         iSecondaryDialUpContext->ContextSuspended();
                         }
 
@@ -537,7 +532,7 @@
                 break;
             }
         }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_5, "TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. Service Status: %d", iInternalSavedData.iServiceStatus );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. Service Status: %d", iInternalSavedData.iServiceStatus );
     }
 
 //----------------------------------------------------------------------------
@@ -552,7 +547,7 @@
 void CMmPacketServiceTsy::ContextStatusChanged(
     const RPacketContext::TContextStatus aContextStatus )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_CONTEXTSTATUSCHANGED_1, "TSY: CMmPacketServiceTsy::ContextStatusChanged. Context Status: %d", aContextStatus );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::ContextStatusChanged. Context Status: %d", aContextStatus );
 
     if ( !iSuspended && ( RPacketService::EStatusUnattached !=
          iInternalSavedData.iServiceStatus ) )
@@ -609,7 +604,7 @@
 
 	aPackage->UnPackData( preferredBearer );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_PREFERREDBEARERCHANGED_1, "TSY: CMmPacketServiceTsy::PreferredBearerChanged. PreferredBearer: %d", preferredBearer );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::PreferredBearerChanged. PreferredBearer: %d", preferredBearer );
 
     iInternalSavedData.iPreferredBearer = preferredBearer;
 
@@ -625,7 +620,7 @@
 //
 TInt CMmPacketServiceTsy::AttachL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ATTACHL_1, "TSY: CMmPacketServiceTsy::AttachL." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::AttachL." );
 
     TInt ret( KErrAlreadyExists );
 
@@ -670,7 +665,7 @@
 void CMmPacketServiceTsy::CompleteAttach(
     const TInt aError )  //error value
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEATTACH_1, "TSY: CMmPacketServiceTsy::CompleteAttach. Error Value: %d", aError );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteAttach. Error Value: %d", aError );
 
     // Reset request handle. Returns the deleted request handle
     const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
@@ -694,7 +689,7 @@
 //
 TInt CMmPacketServiceTsy::DetachL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DETACHL_1, "TSY: CMmPacketServiceTsy::DetachL." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::DetachL." );
 
     TInt ret( KErrAlreadyExists );
 
@@ -767,7 +762,7 @@
 void CMmPacketServiceTsy::CompleteDetachL(
     const TInt aError ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEDETACHL_1, "TSY: CMmPacketServiceTsy::CompleteDetachL. Error Value: %d", aError );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteDetachL. Error Value: %d", aError );
 
     // Reset request handle. Returns the deleted request handle
     const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
@@ -802,7 +797,7 @@
     *aCount = iPacketContextList->NumberOfContexts();
     *aMaxAllowed = KMmMaxNumberOfContexts;
 
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATECONTEXTS_1, "TSY: CMmPacketServiceTsy::EnumerateContexts. Count: %d Max Allowed: %d", *aCount, *aMaxAllowed );
+TFLOGSTRING3("TSY: CMmPacketServiceTsy::EnumerateContexts. Count: %d Max Allowed: %d", *aCount, *aMaxAllowed );
     // Complete the request with KErrNone
     CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone );
 
@@ -817,7 +812,7 @@
 TInt CMmPacketServiceTsy::GetAttachModeL(
     RPacketService::TAttachMode* const aMode ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETATTACHMODEL_1, "TSY: CMmPacketServiceTsy::GetAttachModeL. Mode:%d", *aMode );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::GetAttachModeL. Mode:%d", *aMode );
 
     TInt ret( KErrServerBusy );
 
@@ -848,7 +843,7 @@
 void CMmPacketServiceTsy::CompleteGetAttachMode(
     const RPacketService::TAttachMode aAttachMode, TInt aResult ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEGETATTACHMODE_1, "TSY: CMmPacketServiceTsy::CompleteGetAttachMode. Attach Mode: %d", aAttachMode );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteGetAttachMode. Attach Mode: %d", aAttachMode );
 
     // Reset request handle. Returns the deleted request handle
     const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
@@ -885,7 +880,7 @@
         ret = iPacketContextList->GetContextNameByIndex(
             *aIndex, aInfo->iName );
 
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETCONTEXTINFO_1, "TSY: CMmPacketServiceTsy::GetContextInfo. Context Status: %d Context Name: %S", aInfo->iStatus, aInfo->iName );
+TFLOGSTRING3("TSY: CMmPacketServiceTsy::GetContextInfo. Context Status: %d Context Name: %S", aInfo->iStatus, &aInfo->iName );
         }
 
     // Complete request with ret
@@ -907,7 +902,7 @@
     {
     // Call DynamicCaps() from extension
     iMmPacketServiceGsmWcdmaExt->GetDynamicCaps( aCaps );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETDYNAMICCAPS_1, "TSY: CMmPacketServiceTsy::GetDynamicCaps." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::GetDynamicCaps." );
 
     // Complete the request with KErrNone
     CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone );
@@ -930,7 +925,7 @@
     {
     *aCurrentClass = iInternalSavedData.iMsClass;
     *aMaxClass = KMaxMsClass;
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETMSCLASS_1, "TSY: CMmPacketServiceTsy::GetMSClass. Current Class: %d Max Class: %d", *aCurrentClass, *aMaxClass );
+TFLOGSTRING3("TSY: CMmPacketServiceTsy::GetMSClass. Current Class: %d Max Class: %d", *aCurrentClass, *aMaxClass );
 
     // Complete the request with KErrNone
     CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone );
@@ -949,7 +944,7 @@
 TInt CMmPacketServiceTsy::GetNtwkRegStatusL(
     RPacketService::TRegistrationStatus* const aRegistrationStatus ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETNTWKREGSTATUSL_1, "TSY: CMmPacketServiceTsy::GetNtwkRegStatusL. Tsy Req Handle: %d", iTsyReqHandle );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::GetNtwkRegStatusL. Tsy Req Handle: %d", iTsyReqHandle );
 
     const TTsyReqHandle regHandle( iTsyReqHandleStore->GetTsyReqHandle(
         EMultimodePacketServiceGetNtwkRegStatus ) );
@@ -1005,7 +1000,7 @@
         CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus(
 												aRegistrationStatus );
         }
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEGETNTWKREGSTATUS_1, "TSY: CMmPacketServiceTsy::CompleteGetNtwkRegStatus. TSY Req Handle: %d Registration Status: %d", reqHandle, aRegistrationStatus );
+TFLOGSTRING3("TSY: CMmPacketServiceTsy::CompleteGetNtwkRegStatus. TSY Req Handle: %d Registration Status: %d", reqHandle, aRegistrationStatus );
     }
 
 //----------------------------------------------------------------------------
@@ -1021,7 +1016,7 @@
     RPacketService::TPreferredBearer* const aBearer )   
     {
     *aBearer = iInternalSavedData.iPreferredBearer;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETPREFERREDBEARER_1, "TSY: CMmPacketServiceTsy::GetPreferredBearer. Preferred Bearer: %d", *aBearer );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::GetPreferredBearer. Preferred Bearer: %d", *aBearer );
 
     // Complete the request with KErrNone
     CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone );
@@ -1049,7 +1044,7 @@
         case RPacketContext::EPdpTypePPP:
         case RPacketContext::EPdpTypeCDPD:
             iMmPacketServiceGsmWcdmaExt->GetStaticCaps( aCaps );
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETSTATICCAPS_1, "TSY: CMmPacketServiceTsy::GetStaticCaps." );
+            TFLOGSTRING("TSY: CMmPacketServiceTsy::GetStaticCaps." );
             
             // Complete the request with KErrNone
             CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, ret );
@@ -1072,7 +1067,7 @@
     {
     *aPacketStatus = iInternalSavedData.iServiceStatus;
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETSTATUS_1, "TSY: CMmPacketServiceTsy::GetStatus. Service Status: %d", *aPacketStatus );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::GetStatus. Service Status: %d", *aPacketStatus );
 
     // Complete the request with KErrNone
     CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone );
@@ -1090,7 +1085,7 @@
 TInt CMmPacketServiceTsy::NotifyChangeOfNtwkRegStatus(
     RPacketService::TRegistrationStatus* const aRegistrationStatus )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYCHANGEOFNTWKREGSTATUS_1, "TSY: CMmPacketServiceTsy::NotifyChangeOfNtwkRegStatus." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyChangeOfNtwkRegStatus." );
 
     // Set request handle and save pointer to aRegistrationStatus
     iNotifyDataPointers.iChangeOfNtwkRegStatus = aRegistrationStatus;
@@ -1107,7 +1102,7 @@
 void CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus(
     const RPacketService::TRegistrationStatus aRegistrationStatus )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCHANGEOFNTWKREGSTATUS_1, "TSY: CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus. Current reg Status: %d New reg Status: %d", iInternalSavedData.iRegistrationStatus, aRegistrationStatus );
+TFLOGSTRING3("TSY: CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus. Current reg Status: %d New reg Status: %d", iInternalSavedData.iRegistrationStatus, aRegistrationStatus );
 
     // If registration status changed
     if ( aRegistrationStatus != iInternalSavedData.iRegistrationStatus )
@@ -1141,7 +1136,7 @@
 void CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus(
     CMmDataPackage* aDataPackage, TInt aResult )		
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCHANGEOFNTWKREGSTATUS1_1, "TSY: CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus.");
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus.");
 
 	//Unpack necessary data from datapackage
 	RPacketService::TRegistrationStatus registrationStatus;
@@ -1186,7 +1181,7 @@
 TInt CMmPacketServiceTsy::NotifyContextActivationRequested(
     TPacketDataConfigBase* const aContextParameters ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYCONTEXTACTIVATIONREQUESTED_1, "TSY: CMmPacketServiceTsy::NotifyContextActivationRequested." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyContextActivationRequested." );
 
     TInt ret = KErrNone;
 
@@ -1246,7 +1241,7 @@
 void CMmPacketServiceTsy::CompleteNotifyContextActivationRequested(
     CMmDataPackage* aDataPackage )		//contains initial data
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTACTIVATIONREQUESTED_1, "TSY: CMmPacketServiceTsy::CompleteNotifyContextActivationRequested.");
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextActivationRequested.");
 
 	//Check if there is client request
 	if ( EMultimodePacketServiceReqHandleUnknown != 
@@ -1479,7 +1474,7 @@
 TInt CMmPacketServiceTsy::NotifyContextAdded(
     const TDataPackage& aPackage )   
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYCONTEXTADDED_1, "TSY: CMmPacketServiceTsy::NotifyContextAdded." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyContextAdded." );
 
 	TDes* const context = aPackage.Des1u();
 
@@ -1512,7 +1507,7 @@
 
 	aPackage->UnPackData( contextName, result  );
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_1, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded." );
 
 	if ( KErrNone != result )
         {
@@ -1523,7 +1518,7 @@
             // Context name forced to External2.
             contextName.Copy( KStringExternal2 );
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_2, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Create Secondary Dial-up Object." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Create Secondary Dial-up Object." );
         
             // Create object for externally created dial-up context
             TRAP( trapError, iSecondaryDialUpContext = CMmPacketContextTsy::NewL(
@@ -1536,7 +1531,7 @@
             // Context name forced to External.
             contextName.Copy( KStringExternal );
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_3, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Create Dial-up Object." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Create Dial-up Object." );
         
             // Create object for externally created dial-up context
             TRAP( trapError, iDialUpContext = CMmPacketContextTsy::NewL(
@@ -1586,7 +1581,7 @@
         //Check if dial-up context is created, and set default params
         if ( contextName.Compare( KStringExternal2 ) == 0 )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_4, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Reset Secondary Dial-up Object." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Reset Secondary Dial-up Object." );
             // Reset secondary dial-up context
             if(iSecondaryDialUpContext)
             	{
@@ -1596,7 +1591,7 @@
             }
         else if ( contextName.Compare( KStringExternal ) == 0 )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_5, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Reset Dial-up Object." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Reset Dial-up Object." );
             // Reset dial-up context
             if(iDialUpContext)
             	{
@@ -1615,7 +1610,7 @@
         // Add context name to the etel side memory
         *iNotifyDataPointers.iContextAdded = contextName;
         iNotifyDataPointers.iContextAdded = NULL;
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_6, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded. Context Name: %S", contextName );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded. Context Name: %S", &contextName );
 
         // Complete request with KErrNone
         CMmPacketServiceTsy::ReqCompleted( reqHandle, KErrNone );
@@ -1636,7 +1631,7 @@
 TInt CMmPacketServiceTsy::NotifyDynamicCapsChange(
     RPacketService::TDynamicCapsFlags* const aCaps ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYDYNAMICCAPSCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyDynamicCapsChange." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyDynamicCapsChange." );
 
     // Save pointer to aCaps
     iNotifyDataPointers.iDynamicCapsChange = aCaps;
@@ -1655,7 +1650,7 @@
 void CMmPacketServiceTsy::CompleteNotifyDynamicCapsChange(
     const RPacketService::TDynamicCapsFlags aCaps ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYDYNAMICCAPSCHANGE_1, "TSY: CMmPacketServiceTsy::CompleteNotifyDynamicCapsChange." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyDynamicCapsChange." );
 
     // Reset request handle. Returns the deleted request handle
     const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
@@ -1681,7 +1676,7 @@
 TInt CMmPacketServiceTsy::NotifyMSClassChange(
     RPacketService::TMSClass* const aNewClass ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYMSCLASSCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyMSClassChange." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyMSClassChange." );
 
     // Save aNewClass internally
     iNotifyDataPointers.iMSClassChange = aNewClass;
@@ -1699,7 +1694,7 @@
 void CMmPacketServiceTsy::CompleteNotifyMSClassChange(
     CMmDataPackage* aDataPackage )				
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYMSCLASSCHANGE_1, "TSY: CMmPacketServiceTsy::CompleteNotifyMSClassChange." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyMSClassChange." );
 
 	RPacketService::TMSClass newClass;
 	aDataPackage->UnPackData( newClass );
@@ -1719,7 +1714,7 @@
             *iNotifyDataPointers.iMSClassChange = newClass;
             iNotifyDataPointers.iMSClassChange = NULL;
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYMSCLASSCHANGE_2, "TSY: CMmPacketServiceTsy::CompleteNotifyMSClassChange. New Ms Class: %d", newClass );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteNotifyMSClassChange. New Ms Class: %d", newClass );
             // Complete request with KErrNone
             CMmPacketServiceTsy::ReqCompleted( reqHandle, KErrNone );
             }
@@ -1737,7 +1732,7 @@
 TInt CMmPacketServiceTsy::NotifyStatusChange(
     RPacketService::TStatus* const aPacketStatus ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYSTATUSCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyStatusChange." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyStatusChange." );
 
     // Save aPacketStatus to internal memory
     iNotifyDataPointers.iStatusChange = aPacketStatus;
@@ -1757,7 +1752,7 @@
     const RPacketService::TStatus& aPacketStatus,
     TInt aErrorCode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYSTATUSCHANGE_1, "TSY: CMmPacketServiceTsy::CompleteNotifyStatusChange." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyStatusChange." );
     if ( aPacketStatus != iInternalSavedData.iServiceStatus )
         {
         iInternalSavedData.iServiceStatus = aPacketStatus;
@@ -1771,7 +1766,7 @@
             *iNotifyDataPointers.iStatusChange = aPacketStatus;
             iNotifyDataPointers.iStatusChange = NULL;
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYSTATUSCHANGE_2, "TSY: CMmPacketServiceTsy::CompleteNotifyStatusChange. Service Status:%d", aPacketStatus );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteNotifyStatusChange. Service Status:%d", aPacketStatus );
             CMmPacketServiceTsy::ReqCompleted( reqHandle, aErrorCode );
             }
         }
@@ -1791,7 +1786,7 @@
 //
 TInt CMmPacketServiceTsy::RejectActivationRequestL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_REJECTACTIVATIONREQUESTL_1, "TSY: CMmPacketServiceTsy::RejectActivationRequestL." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::RejectActivationRequestL." );
 
     const TTsyReqHandle tsyRegHandle( iTsyReqHandleStore->GetTsyReqHandle(
         EMultimodePacketServiceRejectActivationRequest ) );
@@ -1821,7 +1816,7 @@
 //
 void CMmPacketServiceTsy::CompleteRejectActivationRequest()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEREJECTACTIVATIONREQUEST_1, "TSY: CMmPacketServiceTsy::CompleteRejectActivationRequest." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteRejectActivationRequest." );
 
     // Reset request handle. Returns the deleted request handle
     const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
@@ -1842,7 +1837,7 @@
 TInt CMmPacketServiceTsy::SetAttachModeL(
     const RPacketService::TAttachMode* aMode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_SETATTACHMODEL_1, "TSY: CMmPacketServiceTsy::SetAttachModeL." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::SetAttachModeL." );
 
     iAttachMode = *aMode;
 
@@ -1873,7 +1868,7 @@
 void CMmPacketServiceTsy::CompleteSetAttachMode(
     const TInt aError )  //error value
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETATTACHMODE_1, "TSY: CMmPacketServiceTsy::CompleteSetAttachMode. Error Value: %d", aError );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteSetAttachMode. Error Value: %d", aError );
 
     // Reset request handle. Returns the deleted request handle
     const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
@@ -1901,7 +1896,7 @@
     {
 	TAny* const dataPtr = aPackage.Ptr1();
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_SETPREFERREDBEARERL_1, "TSY: CMmPacketServiceTsy::SetPreferredBearerL. Preferred Bearer: %d", &dataPtr );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::SetPreferredBearerL. Preferred Bearer: %d", &dataPtr );
 
     const TTsyReqHandle reqHandle( iTsyReqHandleStore->GetTsyReqHandle(
         EMultimodePacketServiceSetPreferredBearer ) );
@@ -1936,7 +1931,7 @@
 void CMmPacketServiceTsy::CompleteSetPreferredBearer(
     const TInt aError )  //epoc error code
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETPREFERREDBEARER_1, "TSY: CMmPacketServiceTsy::CompleteSetPreferredBearer. Error: %d", aError );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteSetPreferredBearer. Error: %d", aError );
 
     // Reset request handle. Returns the deleted request handle
     const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
@@ -1948,7 +1943,7 @@
             {
             iInternalSavedData.iPreferredBearer =
                 iTemporarySavedData.iPreferredBearer;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETPREFERREDBEARER_2, "TSY: CMmPacketServiceTsy::CompleteSetPreferredBearer. Preferred Bearer: %d", iInternalSavedData.iPreferredBearer );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteSetPreferredBearer. Preferred Bearer: %d", iInternalSavedData.iPreferredBearer );
             }
 
         // Complete the client request
@@ -1968,7 +1963,7 @@
     const TInt aIpc,                    
     const TDataPackage& aPackage )     
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_EXTFUNC_1, "TSY: CMmPacketServiceTsy::ExtFunc. IPC: %d", aIpc );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::ExtFunc. IPC: %d", aIpc );
 
     TInt ret( KErrNone );
     TInt trapError( KErrNone );
@@ -2027,7 +2022,7 @@
     const TInt aIpc,                
     const TDataPackage& aPackage )  
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DOEXTFUNCL_1, "TSY: CMmPacketServiceTsy::DoExtFuncL. IPC: %d TSY Req Handle:%d", aIpc, iTsyReqHandle);
+TFLOGSTRING3("TSY: CMmPacketServiceTsy::DoExtFuncL. IPC: %d TSY Req Handle:%d", aIpc, iTsyReqHandle);
 
     TInt ret( KErrNotSupported );
 
@@ -2234,7 +2229,7 @@
 CTelObject::TReqMode CMmPacketServiceTsy::ReqModeL(
     const TInt aIpc ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_REQMODEL_1, "TSY: CMmPacketServiceTsy::ReqModeL. IPC: %d", aIpc );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::ReqModeL. IPC: %d", aIpc );
 
     CTelObject::TReqMode reqMode( 0 );
     switch ( aIpc )
@@ -2312,7 +2307,7 @@
 TInt CMmPacketServiceTsy::NumberOfSlotsL(
     const TInt aIpc ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NUMBEROFSLOTSL_1, "TSY: CMmPacketServiceTsy::NumberOfSlotsL. IPC: %d", aIpc );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::NumberOfSlotsL. IPC: %d", aIpc );
 
     TInt numberOfSlots( 0 );
     switch ( aIpc )
@@ -2365,7 +2360,7 @@
     const TInt aIpc,                    
     const TTsyReqHandle aTsyReqHandle ) 
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_CANCELSERVICE_1, "TSY: CMmPacketServiceTsy::CancelService. IPC: %d Tsy Req Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmPacketServiceTsy::CancelService. IPC: %d Tsy Req Handle:%d", aIpc, aTsyReqHandle);
 
     TInt ret( KErrNone );
     
@@ -2507,7 +2502,7 @@
 TInt CMmPacketServiceTsy::RegisterNotification(
     const TInt aIpc ) 
 	{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_REGISTERNOTIFICATION_1, "TSY: CMmPacketServiceTsy::RegisterNotification. IPC: %d", aIpc );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::RegisterNotification. IPC: %d", aIpc );
 
     TInt ret( KErrNone );
 
@@ -2540,7 +2535,7 @@
 TInt CMmPacketServiceTsy::DeregisterNotification(
     const TInt aIpc ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DEREGISTERNOTIFICATION_1, "TSY: CMmPacketServiceTsy::DeregisterNotification. IPC: %d", aIpc );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::DeregisterNotification. IPC: %d", aIpc );
 
     TInt ret( KErrNone );
 
@@ -2575,7 +2570,7 @@
 		TBool aAttemptAttach, 
 		TMbmsNetworkServiceStatus* aMBMSServiceStatus )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETMBMSNETWORKSERVICESTATUS_1, "TSY: CMmPacketServiceTsy:: TMbmsNetworkServiceStatus = %d", aMBMSServiceStatus );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy:: TMbmsNetworkServiceStatus = %d", aMBMSServiceStatus );	
 
    const TTsyReqHandle regHandle( iTsyReqHandleStore->GetTsyReqHandle(
    EMultimodePacketServiceGetMBMSStatus ) );
@@ -2627,7 +2622,7 @@
 void CMmPacketServiceTsy::CompleteGetMbmsNetworkServiceStatus( 
 	CMmDataPackage* aDataPackage, TInt aError )
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEGETMBMSNETWORKSERVICESTATUS_1, "TSY: CMmPacketServiceTsy::CompleteGetMbmsNetworkServiceStatus.");
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteGetMbmsNetworkServiceStatus.");
 
 	//Update the cache
 	TMbmsNetworkServiceStatus mbmsNetworkServiceStatus = EMbmsSupportUnknown;
@@ -2668,7 +2663,7 @@
 TInt CMmPacketServiceTsy::NotifyMbmsNetworkServiceStatusChange(
 	TMbmsNetworkServiceStatus* aMBMSServiceStatus )
 	{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYMBMSNETWORKSERVICESTATUSCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyMbmsNetworkServiceStatusChange TMbmsNetworkServiceStatus = %d", aMBMSServiceStatus );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::NotifyMbmsNetworkServiceStatusChange TMbmsNetworkServiceStatus = %d", aMBMSServiceStatus );
 	
 	// Set request handle and save pointer to aMBMSServiceStatus
     iNotifyDataPointers.iMBMSStatusChange = aMBMSServiceStatus;
@@ -2685,7 +2680,7 @@
 void CMmPacketServiceTsy::CompleteNotifyMbmsNetworkServiceStatusChange( 
 	CMmDataPackage* aDataPackage, TInt aResult )
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYMBMSNETWORKSERVICESTATUSCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyMbmsNetworkServiceStatusChange.");
+TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyMbmsNetworkServiceStatusChange.");
 	        
 	TInt result = aResult;        
 	if (aResult == KErrNone)
@@ -2739,7 +2734,7 @@
 //
 TInt CMmPacketServiceTsy::NotifyMbmsServiceAvailabilityChange()
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYMBMSSERVICEAVAILABILITYCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyMbmsServiceAvailabilityChange.");
+TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyMbmsServiceAvailabilityChange.");
 	
 	// Set request handle
     iReqHandleType =  EMultimodePacketServiceNotifyMbmsServiceAvailabilityChange;
@@ -2824,7 +2819,7 @@
 			}
     	aMaxAllowed = iMaxMonitoredServices;
     	
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATEMONITORSERVICELIST_1, "TSY: CMmPacketServiceTsy::EnumerateMonitorServiceList." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::EnumerateMonitorServiceList." ); 
       		
        	// Complete the request with KErrNone
     	CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone );	  
@@ -2897,7 +2892,7 @@
     }
 
 //----------------------------------------------------------------------------
-// CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceListL
+// CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceList
 // Completes update monitored service list request
 //----------------------------------------------------------------------------
 //
@@ -2905,7 +2900,7 @@
     CMmDataPackage* aDataPackage, 
     const TInt aResult)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEUPDATEMBMSMONITORSERVICELIST_1,  "TSY: CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceListL." );
+	TFLOGSTRING( "TSY: CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceListL." );
 
 	TInt result= aResult;
 	TInt err(KErrNone);
@@ -2955,7 +2950,7 @@
 //
 TInt CMmPacketServiceTsy::UpdateMbmsMonitorServiceListCancel( TTsyReqHandle aTsyReqHandle )	
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_UPDATEMBMSMONITORSERVICELISTCANCEL_1,  "TSY: CMmPacketServiceTsy::UpdateMbmsMonitorServiceListCancel ReqHandle %d", aTsyReqHandle );
+	TFLOGSTRING2( "TSY: CMmPacketServiceTsy::UpdateMbmsMonitorServiceListCancel ReqHandle %d", aTsyReqHandle );
 	
 	if ( aTsyReqHandle != EMultimodePacketServiceReqHandleUnknown )
         {
@@ -2978,7 +2973,7 @@
 //
 TInt CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase1L(RMobilePhone::TClientId* aClient,  TUint& aBufSize)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETMBMSMONITOREDSERVICESPHASE1L_1, "TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase1L called.");
+	TFLOGSTRING("TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase1L called.");
 	// Initialize ret value
 	TInt ret( KErrNone );
 	TInt leaveCode( KErrNone );
@@ -3014,7 +3009,7 @@
 TInt CMmPacketServiceTsy::GetSizeOfMonitoredServiceListL(RMobilePhone::TClientId* aClient,  TUint& aBufSize)
 	{
 	// read the list, store its content and then return size of this buffer to client
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETSIZEOFMONITOREDSERVICELISTL_1, "TSY: CMmPacketServiceTsy::GetSizeOfMonitoredServiceList called.");
+	TFLOGSTRING("TSY: CMmPacketServiceTsy::GetSizeOfMonitoredServiceList called.");
 	// create new list
 	CPcktMbmsMonitoredServiceList* currentList=CPcktMbmsMonitoredServiceList::NewL();
 	CleanupStack::PushL(currentList);
@@ -3046,7 +3041,7 @@
 	
     // return the CBufFlat's size to client
 	aBufSize=(read->iListBuf)->Size();
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETSIZEOFMONITOREDSERVICELISTL_2, "TSY: CMmPacketServiceTsy::GetSizeOfMonitoredServiceList: size=%d",aBufSize);
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::GetSizeOfMonitoredServiceList: size=%d",aBufSize);  	
     // Complete first phase of list retrieval
     ReqCompleted( iTsyReqHandle, KErrNone );
     CleanupStack::PopAndDestroy( currentList ); // Pop & destroy list
@@ -3063,7 +3058,7 @@
 	// Initialize ret value
     TInt ret( KErrNotFound );
     
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETMBMSMONITOREDSERVICESPHASE2_1, "TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase2 called");
+	TFLOGSTRING("TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase2 called");
 	CListReadAllAttempt* read=NULL;
 	
 	// Find the get Mbms monitored services from this client
@@ -3113,7 +3108,7 @@
 TInt CMmPacketServiceTsy::GetMbmsMonitoredServicesCancel( TTsyReqHandle aTsyReqHandle )
 	{
 	
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETMBMSMONITOREDSERVICESCANCEL_1, "TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase1LCancel called");
+TFLOGSTRING("TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase1LCancel called");	
     // Remove the read all attempt
     CListReadAllAttempt* read = NULL;
 
@@ -3153,7 +3148,7 @@
 CTelObject* CMmPacketServiceTsy::OpenNewObjectL(
     TDes& aNewName )  
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_1, "TSY: CMmPacketServiceTsy::OpenNewObjectL. %S", aNewName );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectL. %S", &aNewName );
     CTelObject* newContext = NULL;
     TUint8 proxyId( 0 );    
     TInt ret( KErrNone );
@@ -3164,7 +3159,7 @@
 
         if( KErrNone != ret )
             {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_2, "TSY: CMmPacketServiceTsy::OpenNewObjectL. Mbms Leaves with: %d", ret );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectL. Mbms Leaves with: %d", ret );
             User::Leave( ret );            
             }
             
@@ -3176,12 +3171,12 @@
             // Call Close() to context to remove it completely
             context->Close();
             context = NULL;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_3, "TSY: CMmPacketServiceTsy::OpenNewObjectL. Mbms Leaves  with: %d", ret );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectL. Mbms Leaves  with: %d", ret );
             User::Leave( ret );
             }
         else
             {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_4, "TSY: CMmPacketServiceTsy::OpenNewObjectL. New MBMS Context Name: %S Proxy Id: %d",aNewName, proxyId );
+TFLOGSTRING3("TSY: CMmPacketServiceTsy::OpenNewObjectL. New MBMS Context Name: %S Proxy Id: %d",&aNewName, proxyId );            
             newContext = context;            
             }        
         }
@@ -3196,7 +3191,7 @@
             // of context supported by this phone ( value KMmMaxNumberOfContexts )
             ret = CMmCommonStaticUtility::EpocErrorCode(
                 KErrOverflow, KErrUmtsMaxNumOfContextExceededByPhone );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_5, "TSY: CMmPacketServiceTsy::OpenNewObjectL. Leaves with: %d", ret );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectL. Leaves with: %d", ret );
             User::Leave( ret );
             }
         CMmPacketContextTsy* context = CMmPacketContextTsy::NewL( this, iHostCID, aNewName, proxyId );
@@ -3210,12 +3205,12 @@
             // Call Close() to context to remove it completely
             context->Close();
             context = NULL;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_6, "TSY: CMmPacketServiceTsy::OpenNewObjectL. Leaves with: %d", ret );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectL. Leaves with: %d", ret );
             User::Leave( ret );
             }
         else
             {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_7, "TSY: CMmPacketServiceTsy::OpenNewObjectL. New Context Name: %S Proxy Id: %d",aNewName, proxyId );
+TFLOGSTRING3("TSY: CMmPacketServiceTsy::OpenNewObjectL. New Context Name: %S Proxy Id: %d",&aNewName, proxyId );            
             newContext = context;            
             }
         }               
@@ -3230,12 +3225,12 @@
 CTelObject* CMmPacketServiceTsy::OpenNewObjectByNameL(
     const TDesC& aName )   
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_1, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Context Name: %S", aName );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Context Name: %S", &aName );
 
     // length of object's name cannot be over 16 chars
     if ( 16 < aName.Length() )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_2, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Leaves with: %d", KErrOverflow  );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Leaves with: %d", KErrOverflow  );
         User::Leave( KErrOverflow  );
         }
 
@@ -3244,12 +3239,12 @@
 
     if ( mmPacketContextName.Compare( KStringExternal ) == 0 )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_3, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Open Existing Dial-up Object." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Open Existing Dial-up Object." );
         mmPacketContext = iDialUpContext;
         }
     else if ( mmPacketContextName.Compare( KStringExternal2 ) == 0 )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_4, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Open Existing Secondary Dial-up Object." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Open Existing Secondary Dial-up Object." );
         mmPacketContext = iSecondaryDialUpContext;
         }
     else
@@ -3261,7 +3256,7 @@
     // If not found, Leaves
     if ( NULL == mmPacketContext )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_5, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Leaves with: %d", KErrNotFound );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Leaves with: %d", KErrNotFound );
         User::Leave( KErrNotFound );
         }
 
@@ -3430,14 +3425,14 @@
         }
     else if ( aObject == iDialUpContext && NULL != iDialUpContext )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETE_1, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Complete Dial-up Object Request." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Complete Dial-up Object Request." );
 
         iDialUpContext->Complete( aReqHandleType, aError );
         }
     else if ( aObject == iSecondaryDialUpContext 
               && NULL != iSecondaryDialUpContext )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETE_2, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Complete Dial-up Object Request." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Complete Dial-up Object Request." );
 
         iSecondaryDialUpContext->Complete( aReqHandleType, aError );
 
@@ -3576,7 +3571,7 @@
     const TTsyReqHandle aTsyReqHandle,  
     const TInt aError )                   
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_REQCOMPLETED_1, "TSY: CMmPacketServiceTsy::Request Completed. TSY Req Handle: %d Error:%d", aTsyReqHandle, aError );
+TFLOGSTRING3("TSY: CMmPacketServiceTsy::Request Completed. TSY Req Handle: %d Error:%d", aTsyReqHandle, aError );
 
     CTelObject::ReqCompleted( aTsyReqHandle, aError );
     }
@@ -3626,7 +3621,7 @@
 TInt CMmPacketServiceTsy::EnumerateNifs(
     TInt* aCount )   
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATENIFS_1, "TSY: CMmPacketServiceTsy::EnumerateNifs." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::EnumerateNifs." );
 
     iPacketContextList->EnumerateNifs( aCount );
 
@@ -3644,7 +3639,7 @@
     TInt* aIndex,                            
     RPacketService::TNifInfoV2* aNifInfoV2 ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETNIFINFO_1, "TSY: CMmPacketServiceTsy::GetNifInfo." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::GetNifInfo." );
 
     TInt ret = iPacketContextList->GetNifInfo( aIndex, aNifInfoV2 );
 
@@ -3666,7 +3661,7 @@
     TDesC* aExistingContextName,    
     TInt* aCount )                   
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATECONTEXTSINNIF_1, "TSY: CMmPacketServiceTsy::EnumerateContextsInNif." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::EnumerateContextsInNif." );
 
 	TInt ret = KErrNone;
 	if (aExistingContextName->Length() > KMaxInfoName)
@@ -3694,7 +3689,7 @@
     RPacketService::TContextNameInNif* aContextNameInNif,
     TDes* aContextName )                
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETCONTEXTNAMEINNIF_1, "TSY: CMmPacketServiceTsy::GetContextNameInNif." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::GetContextNameInNif." );
 
     TInt ret = iPacketContextList->GetContextNameInNif( aContextNameInNif,
         aContextName );
@@ -3712,7 +3707,7 @@
 TInt CMmPacketServiceTsy::SetDefaultContextParamsL(
     const TDataPackage& aPackage )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_SETDEFAULTCONTEXTPARAMSL_1, "TSY: CMmPacketServiceTsy::SetDefaultContextParamsL." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::SetDefaultContextParamsL." );
 
     TInt ret(KErrServerBusy);
 
@@ -3742,7 +3737,7 @@
 void CMmPacketServiceTsy::CompleteSetDefaultContextParams(
     TInt aCause )    
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETDEFAULTCONTEXTPARAMS_1, "TSY: CMmPacketServiceTsy::CompleteSetDefaultContextParams. aCause: %d", aCause );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteSetDefaultContextParams. aCause: %d", aCause );
 
     // Reset request handle. Returns the deleted request handle
     const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
@@ -3763,7 +3758,7 @@
 TInt CMmPacketServiceTsy::GetDefaultContextParams(
     TPacketDataConfigBase* aContextConfig )      
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETDEFAULTCONTEXTPARAMS_1, "TSY: CMmPacketServiceTsy::GetDefaultContextParams." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::GetDefaultContextParams." );
 
     TInt ret = iMmPacketServiceGsmWcdmaExt->GetDefaultContextParams(
         aContextConfig );
@@ -3799,7 +3794,7 @@
                 if ( RCall::EStatusUnknown != status &&
                      RCall::EStatusIdle != status )
                     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ISACTIVATIONALLOWED_1, "TSY: CMmPacketServiceTsy::IsActivationAllowed. CS call active, Context Activation not allowed" );
+    TFLOGSTRING("TSY: CMmPacketServiceTsy::IsActivationAllowed. CS call active, Context Activation not allowed" );
                     isAllowed = EFalse;
                     i = iMmPhone->CallList()->GetNumberOfObjects();
                     }
@@ -3828,7 +3823,7 @@
 void CMmPacketServiceTsy::CompleteNotifyEGprsInfoChange(
     CMmDataPackage* aDataPackage )		
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYEGPRSINFOCHANGE_1, "TSY: CMmPacketServiceTsy::CompleteNotifyEGprsInfoChange." );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyEGprsInfoChange." );
 
 	//Unpack data
 	TBool lastEdgeGprsSupport;
@@ -3892,7 +3887,7 @@
     //Unpack data
     aDataPackage->UnPackData( ntwkMode );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENETWORKMODECHANGE_1, "TSY: CMmPacketServiceTsy::CompleteNetworkModeChange. ntwkMode: %d", ntwkMode );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteNetworkModeChange. ntwkMode: %d", ntwkMode );
     iCurrentMode = ntwkMode;
     }
 
@@ -3921,7 +3916,7 @@
 //
 RHandleBase* CMmPacketServiceTsy::GlobalKernelObjectHandle()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_1, "TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle" );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle" );
 
     if ( KNullHandle == iMutex.Handle() )
         {
@@ -3929,16 +3924,16 @@
     
         if ( KErrNone == ret )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_2, "TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex created" );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex created" );
             }
         else
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_3, "TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex creation failed" );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex creation failed" );
             }                  
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_4, "TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex creation skipped" );
+TFLOGSTRING("TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex creation skipped" );
         }
          
     return &iMutex;
@@ -3953,8 +3948,8 @@
     TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::TSetAlwaysOnMode aMode )
 	{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_SETALWAYSONL_1, "TSY: CMmPacketServiceTsy::SetAlwaysOn Mode = %d", aMode );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_SETALWAYSONL_2,  "TSY: CMmPacketServiceTsy::SetAlwaysOn ReqHandle %d", aTsyReqHandle );
+TFLOGSTRING2("TSY: CMmPacketServiceTsy::SetAlwaysOn Mode = %d", aMode );
+TFLOGSTRING2( "TSY: CMmPacketServiceTsy::CompleteSetAlwaysOn ReqHandle %d", aTsyReqHandle );
 	TInt ret( KErrServerBusy );
 	
 	//Check if request is allready pending
@@ -3989,12 +3984,12 @@
 void CMmPacketServiceTsy::CompleteSetAlwaysOn( 
     TInt aError )
 	{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETALWAYSON_1,  "TSY: CMmPacketServiceTsy::CompleteSetAlwaysOn Error %d", aError );
+TFLOGSTRING2( "TSY: CMmPacketServiceTsy::CompleteSetAlwaysOn Error %d", aError );	
 
     const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
             								  EMultimodePacketSetAlwaysOn ) );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETALWAYSON_2,  "TSY: CMmPacketServiceTsy::CompleteSetAlwaysOn ReqHandle %d", reqHandle );
+TFLOGSTRING2( "TSY: CMmPacketServiceTsy::CompleteSetAlwaysOn ReqHandle %d", reqHandle );
 
     if ( EMultimodePacketServiceReqHandleUnknown != reqHandle )
     	{
@@ -4020,7 +4015,7 @@
 void CMmPacketServiceTsy::CancelSetAlwaysOn( 
     TTsyReqHandle aTsyReqHandle )
 	{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_CANCELSETALWAYSON_1,  "TSY: CMmPacketServiceTsy::CancelSetAlwaysOn ReqHandle %d", aTsyReqHandle );
+TFLOGSTRING2( "TSY: CMmPacketServiceTsy::CancelSetAlwaysOn ReqHandle %d", aTsyReqHandle );
 	
 	if ( aTsyReqHandle != EMultimodePacketServiceReqHandleUnknown )
         {
@@ -4039,12 +4034,12 @@
 //
 TInt CMmPacketServiceTsy::EnumerateMbmsActiveServiceList( TInt &aCount, TInt &aMaxAllowed )
     {   
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATEMBMSACTIVESERVICELIST_1,  "TSY: CMmPacketServiceTsy::EnumerateMbmsActiveServiceList. max: %d", aMaxAllowed );
+TFLOGSTRING2( "TSY: CMmPacketServiceTsy::EnumerateMbmsActiveServiceList. max: %d", aMaxAllowed );     
      
     aCount = EnumerateMbmsActiveServices();
     aMaxAllowed = iMaxActiveServices;
     
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATEMBMSACTIVESERVICELIST_2,  "TSY: CMmPacketServiceTsy::EnumerateActiveServiceList Count: %d, Max allowed %d", aCount, aMaxAllowed );
+TFLOGSTRING3( "TSY: CMmPacketServiceTsy::EnumerateActiveServiceList Count: %d, Max allowed %d", aCount, aMaxAllowed );     
     // Complete the request with KErrNone
     CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone );
     return KErrNone;    
@@ -4057,7 +4052,7 @@
 //   
 TInt CMmPacketServiceTsy::EnumerateMbmsActiveServices()
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATEMBMSACTIVESERVICES_1,  "TSY: CMmPacketServiceTsy::EnumerateMbmsActiveService. max: %d", iMaxActiveServices );
+TFLOGSTRING2( "TSY: CMmPacketServiceTsy::EnumerateMbmsActiveService. max: %d", iMaxActiveServices );     
     TInt ret( 0 );    
     
     for( TInt i = 0; i< iMBMSContextList->NumberOfContexts(); i++ )
@@ -4094,7 +4089,7 @@
     CMmDataPackage* aDataPackage,
     const TInt aResult)
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEENUMERATEMBMSACTIVESERVICELIST_1,  "TSY: CMmPacketServiceTsy::CompleteEnumerateMbmsActiveServiceList. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmPacketServiceTsy::CompleteEnumerateMbmsActiveServiceList. Error: %d", aResult ); 
            
     if( KErrNone == aResult && NULL != aDataPackage )
         {

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontextlist.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontextlist.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmmbmscontextlistTraces.h"
-#endif
-
 #include "cmmmbmscontextlist.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
@@ -38,7 +32,7 @@
 CMmMBMSContextList* CMmMBMSContextList::NewL()
     {
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTLIST_NEWL_1, "TSY: CMmMBMSContextList* CMmMBMSContextList::NewL." );
+TFLOGSTRING("TSY: CMmMBMSContextList* CMmMBMSContextList::NewL." );
 
     CMmMBMSContextList* const contextList =
         new ( ELeave ) CMmMBMSContextList();
@@ -75,7 +69,7 @@
 //
 TInt CMmMBMSContextList::AddContext( CMmMBMSContextTsy* aContext )      
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTLIST_ADDCONTEXT_1, "TSY: CMmMBMSContextList::AddContext.");
+TFLOGSTRING("TSY: CMmMBMSContextList::AddContext.");
 
     TInt ret( KErrArgument );
     
@@ -94,7 +88,7 @@
 TInt CMmMBMSContextList::RemoveContext( CMmMBMSContextTsy* aContext )
     {
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTLIST_REMOVECONTEXT_1, "TSY: CMmMBMSContextList::RemoveContext." );
+TFLOGSTRING("TSY: CMmMBMSContextList::RemoveContext." );
 
     TInt ret = RemoveObject(aContext);
 
@@ -110,7 +104,7 @@
 //
 CMmMBMSContextTsy* CMmMBMSContextList::ContextByIndex( TInt aIndex ) const
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTLIST_CONTEXTBYINDEX_1, "TSY: CMmMBMSContextList::ContextByIndex. aIndex: %d", aIndex );
+TFLOGSTRING2("TSY: CMmMBMSContextList::ContextByIndex. aIndex: %d", aIndex );
 	return (CMmMBMSContextTsy*)GetObjectByIndex(aIndex);
     }
 
@@ -123,7 +117,7 @@
 CMmMBMSContextTsy* CMmMBMSContextList::ContextByName(
         const TInfoName& aName ) //name of the context
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTLIST_CONTEXTBYNAME_1, "TSY: CMmMBMSContextList::ContextByName. Context Name: %S ", aName );
+TFLOGSTRING2("TSY: CMmMBMSContextList::ContextByName. Context Name: %S ", &aName );
     // Find name from context info list
     TInt size = NumberOfContexts();    
     for ( TInt i = 0; i < size; i++ )
@@ -164,7 +158,7 @@
         TUint8& aProxyId,     //proxy id of the context
         TInt aMaxContexts )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTLIST_GENERATENEWCONTEXTNAME_1, "TSY: CMmMBMSContextList::GenerateNewContextName." );
+TFLOGSTRING("TSY: CMmMBMSContextList::GenerateNewContextName." );    
     
 	if(aMaxContexts <= NumberOfContexts() )
 		{
@@ -195,7 +189,7 @@
 //
 TBool CMmMBMSContextList::IsMbmsContextReceiving()
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTLIST_ISMBMSCONTEXTRECEIVING_1, "TSY: CMmMBMSContextList::IsMbmsContextReceiving." );
+TFLOGSTRING("TSY: CMmMBMSContextList::IsMbmsContextReceiving." );  	
 	TInt size = NumberOfContexts();
 	for( TInt i = 0; i < size; i++ )
         {

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontexttsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontexttsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,15 +16,10 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmmbmscontexttsyTraces.h"
-#endif
-
 #include "cmmmbmscontexttsy.h"
 #include "cmmmbmscontextlist.h"
 #include "CMmPacketTsy.h"
+#include <ctsy/tflogger.h>
 #include "mbmstypes.h"
 #include "MmTsy_timeoutdefs.h"
 #include "MmTsy_numberOfSlots.h"
@@ -40,7 +35,7 @@
         const TDes& aName,  
         const TUint8 aProxyId  ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_NEWL_1,  "TSY: CMmMBMSContextTsy::NewL" );
+TFLOGSTRING( "TSY: CMmMBMSContextTsy::NewL" );
 
     CMmMBMSContextTsy* packetContext = new ( ELeave ) CMmMBMSContextTsy();
     CleanupClosePushL( *packetContext );    
@@ -79,7 +74,7 @@
     
 CMmMBMSContextTsy::~CMmMBMSContextTsy()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_DTOR_1,  "TSY: CMmMBMSContextTsy::~CMmMBMSContextTsy Context name: %S", iContextName );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::~CMmMBMSContextTsy Context name: %S", &iContextName );
 	
 	if( iMmPacketService )
 		{			
@@ -120,7 +115,7 @@
         TInt aIpc, 
         const TDataPackage& aPackage )  
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_EXTFUNC_1,  "TSY: CMmMBMSContextTsy::ExtFunc. IPC: %d Context name:%S", aIpc, iContextName );
+TFLOGSTRING3( "TSY: CMmMBMSContextTsy::ExtFunc. IPC: %d Context name:%S", aIpc, &iContextName );
 
     TInt ret( KErrNone );
     TInt trapError( KErrNone );
@@ -166,7 +161,8 @@
         TInt aIpc,      
         const TDataPackage& aPackage )   
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_DOEXTFUNCL_1,  "TSY: CMmMBMSContextTsy::DoExtFuncL. IPC: %d Handle:%d",aIpc, aTsyReqHandle );
+TFLOGSTRING3( "TSY: CMmMBMSContextTsy::DoExtFuncL. IPC: %d Handle:%d",
+                aIpc, aTsyReqHandle );
 
     TInt ret( KErrNotSupported );
 
@@ -259,7 +255,7 @@
 CTelObject::TReqMode CMmMBMSContextTsy::ReqModeL( 
         TInt aIpc ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_REQMODEL_1,  "TSY: CMmMBMSContextTsy::ReqModeL. IPC: %d", aIpc );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::ReqModeL. IPC: %d", aIpc );
 
     CTelObject::TReqMode reqMode( 0 );
     TBool doLeave( EFalse );
@@ -371,7 +367,7 @@
             break;
 
         }  
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_NUMBEROFSLOTSL_1,  "TSY: CMmMBMSContextTsy::NumberOfSlotsL. IPC: %d Number of slots: %d", aIpc, numberOfSlots );
+TFLOGSTRING3( "TSY: CMmMBMSContextTsy::NumberOfSlotsL. IPC: %d Number of slots: %d", aIpc, numberOfSlots );
 
     return numberOfSlots;
 
@@ -393,7 +389,7 @@
         TInt aIpc,                            
         TTsyReqHandle aTsyReqHandle )         
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_CANCELSERVICE_1,  "TSY: CMmMBMSContextTsy::CancelService. IPC: %d Handle:%d", aIpc, aTsyReqHandle );
+TFLOGSTRING3( "TSY: CMmMBMSContextTsy::CancelService. IPC: %d Handle:%d", aIpc, aTsyReqHandle );
 
     TInt ret( KErrNone );
 	//TTsyReqHandle reqHandle( NULL );
@@ -466,7 +462,7 @@
 TInt CMmMBMSContextTsy::RegisterNotification( 
         TInt aIpc )              
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_REGISTERNOTIFICATION_1,  "TSY: CMmMBMSContextTsy::RegisterNotification. IPC: %d", aIpc );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::RegisterNotification. IPC: %d", aIpc );
 
     TInt ret( KErrNone );
 
@@ -499,7 +495,7 @@
 TInt CMmMBMSContextTsy::DeregisterNotification(
         TInt aIpc )                          
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_DEREGISTERNOTIFICATION_1,  "TSY: CMmMBMSContextTsy::DeregisterNotification. IPC: %d", aIpc );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::DeregisterNotification. IPC: %d", aIpc );
 
     TInt ret( KErrNone );
 
@@ -526,7 +522,7 @@
 //
 TInt CMmMBMSContextTsy::InitialiseContextL( RPacketContext::TDataChannelV2* aDataChannel )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_INITIALISECONTEXTL_1,  "TSY: CMmMBMSContextTsy::InitialiseContextL. %S", iContextName );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::InitialiseContextL. %S", &iContextName );
 
     TInt ret( KErrArgument ); 
    
@@ -565,7 +561,7 @@
 
 void CMmMBMSContextTsy::CompleteInitialiseContext(TInt aResult, RPacketContext::TDataChannelV2* aDataChannel )     
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETEINITIALISECONTEXT_1,  "TSY: CMmMBMSContextTsy::CompleteInitialiseContext. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::CompleteInitialiseContext. Error: %d", aResult );
 
     iIsActivateAllowed = ETrue;
     if (KErrNone == aResult )
@@ -605,7 +601,7 @@
 //
 TInt CMmMBMSContextTsy::ActivateL()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_ACTIVATEL_1,  "TSY: CMmMBMSContextTsy::ActivateL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::ActivateL. Context name:%S", &iContextName );
 	
     TInt ret( KErrNotReady );
 
@@ -651,7 +647,7 @@
 //
 void CMmMBMSContextTsy::CompleteActivate(TInt aResult)
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETEACTIVATE_1,  "TSY: CMmMBMSContextTsy::CompleteActivate. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::CompleteActivate. Error: %d", aResult ); 
    
     // Reset the req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -667,7 +663,8 @@
         }        
     else
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETEACTIVATE_2,  "TSY: CMmMBMSContextTsy::CompleteActivate. ErrorCause: %d",aResult );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::CompleteActivate. ErrorCause: %d",
+             aResult );
         // Re-activation is allowed because activation has not succeeded
         iIsActivateAllowed = ETrue;
         }
@@ -690,7 +687,7 @@
 //
 TInt CMmMBMSContextTsy::DeactivateL()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_DEACTIVATEL_1,  "TSY: CMmMBMSContextTsy::DeactivateL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::DeactivateL. Context name:%S", &iContextName );
 
     TInt ret( KErrArgument );
 
@@ -723,7 +720,7 @@
         CMmDataPackage* aDataPackage,
         TInt aResult )    
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETEDEACTIVATE_1,  "TSY: CMmMBMSContextTsy::CompleteDeactivate. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::CompleteDeactivate. Error: %d", aResult );
     // Reset the req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodeMbmsContextDeactivate );
@@ -785,7 +782,7 @@
 //
 TInt CMmMBMSContextTsy::DeleteL()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_DELETEL_1,  "TSY: CMmMBMSContextTsy::DeleteL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::DeleteL. Context name:%S", &iContextName );
 
     TInt ret( KErrNotReady );
     if( RPacketContext::EStatusUnknown != ContextStatus() )
@@ -817,7 +814,7 @@
 void CMmMBMSContextTsy::CompleteDelete( 
         TInt aResult )        
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETEDELETE_1,  "TSY: CMmMBMSContextTsy::CompleteDelete. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::CompleteDelete. Error: %d", aResult );
 
     if( KErrNone == aResult )
         {
@@ -851,7 +848,7 @@
         TTsyReqHandle aTsyReqHandle,    
         TPacketDataConfigBase* aConfig )  
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_GETCONFIG_1,  "TSY: CMmMBMSContextTsy::GetConfig. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::GetConfig. Context name:%S", &iContextName );
     TInt ret( KErrNone );
     
     // Check that the mode given in aConfig is KConfigMBMS
@@ -883,7 +880,7 @@
         TTsyReqHandle aTsyReqHandle,  
         TInt* aError )    
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_GETLASTERRORCAUSE_1,  "TSY: CMmMBMSContextTsy::GetLastErrorCause. Context name:%S Last error cause: %d", iContextName, iLastErrorCause );
+TFLOGSTRING3( "TSY: CMmMBMSContextTsy::GetLastErrorCause. Context name:%S Last error cause: %d", &iContextName, iLastErrorCause );
 
     *aError = iLastErrorCause;
     CMmMBMSContextTsy::ReqCompleted( aTsyReqHandle, KErrNone );
@@ -903,7 +900,8 @@
     
      iLastErrorCause =  aErrorCause;           
     
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_SETLASTERRORCAUSE_1,  "TSY: CMmMBMSContextTsy::SetLastErrorCause.  aErrorCause: %d iLastErrorCause:%d", aErrorCause, iLastErrorCause );
+TFLOGSTRING3( "TSY: CMmMBMSContextTsy::SetLastErrorCause.  aErrorCause: %d iLastErrorCause:%d", 
+             aErrorCause, iLastErrorCause );
 
     }
 
@@ -917,7 +915,7 @@
         TTsyReqHandle aTsyReqHandle,   
         RPacketContext::TContextStatus* aContextStatus )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_GETSTATUS_1,  "TSY: CMmMBMSContextTsy::GetStatus. Context name: %S Context Status:%d", iContextName, iContextStatus );
+TFLOGSTRING3( "TSY: CMmMBMSContextTsy::GetStatus. Context name: %S Context Status:%d", &iContextName, iContextStatus );
     *aContextStatus = iContextStatus;
     CMmMBMSContextTsy::ReqCompleted( aTsyReqHandle, KErrNone );
 
@@ -933,7 +931,7 @@
 TInt CMmMBMSContextTsy::NotifyConfigChanged(
         TPacketDataConfigBase* aConfig )  
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_NOTIFYCONFIGCHANGED_1,  "TSY: CMmMBMSContextTsy::NotifyConfigChanged." );
+TFLOGSTRING( "TSY: CMmMBMSContextTsy::NotifyConfigChanged." );
 
     // Check that used mode is MBMS
     if (  TPacketDataConfigBase::KConfigMBMS != aConfig->ExtensionId() ) 
@@ -958,7 +956,8 @@
 void CMmMBMSContextTsy::CompleteNotifyConfigChanged(const CMmDataPackage* aDataPackage,
         TInt aResult)
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETENOTIFYCONFIGCHANGED_1,  "TSY: CMmMBMSContextTsy::CompleteNotifyConfigChanged.  Context name:%S",iContextName );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::CompleteNotifyConfigChanged.  Context name:%S",
+                &iContextName );
 	if(aDataPackage != NULL)
 		{
 		if ( KErrNone == aResult )
@@ -1016,7 +1015,7 @@
 TInt CMmMBMSContextTsy::NotifyStatusChange(
         RPacketContext::TContextStatus* aContextStatus )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_NOTIFYSTATUSCHANGE_1,  "TSY: CMmMBMSContextTsy::NotifyStatusChange. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::NotifyStatusChange. Context name:%S", &iContextName );
     iRetNotifyStatus = aContextStatus;
     iReqHandleType = EMultimodeMbmsContextNotifyStatusChange;
 
@@ -1035,7 +1034,8 @@
     if ( aContextStatus != iContextStatus )
         {
         iContextStatus = aContextStatus;
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETENOTIFYSTATUSCHANGE_1,  "TSY: CMmMBMSContextTsy::CompleteNotifyStatusChange. Context name: %S  Context status:%d",iContextName, iContextStatus );
+TFLOGSTRING3( "TSY: CMmMBMSContextTsy::CompleteNotifyStatusChange. Context name: %S  Context status:%d",
+                    &iContextName, iContextStatus );   
                     
         if ( RPacketContext::EStatusActive == iContextStatus ||
              RPacketContext::EStatusInactive == iContextStatus ||
@@ -1114,7 +1114,7 @@
 TInt CMmMBMSContextTsy::SetConfigL(
         TPacketDataConfigBase* aConfig ) 
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_SETCONFIGL_1,  "TSY: CMmMBMSContextTsy::SetConfigL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::SetConfigL. Context name:%S", &iContextName );
 
     TInt ret( KErrArgument );
            
@@ -1139,7 +1139,7 @@
             CMmDataPackage data;
             data.PackData( &( *aConfig ), &iContextName );
 
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_SETCONFIGL_2, "TSY: CMmMBMSContextTsy::SetConfigL. Context: %S", iContextName);
+TFLOGSTRING2("TSY: CMmMBMSContextTsy::SetConfigL. Context: %S", &iContextName);
 
             ret = iMmPacketService->MessageManager()->HandleRequestL(
                 EPacketContextSetConfig, &data ); 
@@ -1175,7 +1175,7 @@
 void CMmMBMSContextTsy::CompleteSetConfig( 
         TInt aError )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETESETCONFIG_1,  "TSY: CMmMBMSContextTsy::CompleteSetConfig. Error: %d", aError );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::CompleteSetConfig. Error: %d", aError );
     
     if( (KErrNone == aError) && (iConfig) && (iTempConfig) )
 	    {
@@ -1220,7 +1220,7 @@
         TTsyReqHandle aTsyReqHandle, 
         TInt aError )   
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_REQCOMPLETED_1,  "TSY: CMmMBMSContextTsy::ReqCompleted. Handle:%d Error:%d",  aTsyReqHandle, aError );
+TFLOGSTRING3( "TSY: CMmMBMSContextTsy::ReqCompleted. Handle:%d Error:%d",  aTsyReqHandle, aError );
 
     // Set last error cause
     if ( KErrNone != aError )
@@ -1300,7 +1300,7 @@
         const TInt aReqHandleType,    
         const TInt aError )        
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETE_1,  "TSY: CMmMBMSContextTsy::Complete. Req type %d", aReqHandleType );
+TFLOGSTRING2( "TSY: CMmMBMSContextTsy::Complete. Req type %d", aReqHandleType );
     
     
     // All possible TSY req handle types are listed in the
@@ -1384,7 +1384,7 @@
     TMbmsAction* aAction,
     TMbmsSessionId* aSession ) 
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_UPDATEMBMSSESSIONLIST_1, "TSY: CMmMBMSContextTsy::UpdateMbmsSessionList. Context: %S, action: %d", iContextName, *aAction);
+TFLOGSTRING3("TSY: CMmMBMSContextTsy::UpdateMbmsSessionList. Context: %S, action: %d", &iContextName, aAction);    
     TInt ret( KErrNone );
     
     if( iConfig->iMbmsSessionFlag )
@@ -1432,7 +1432,7 @@
 void CMmMBMSContextTsy::CompleteUpdateMbmsSessionList( 
         const TInt aResult )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETEUPDATEMBMSSESSIONLIST_1, "TSY: CMmMBMSContextTsy::CompleteUpdateMbmsSessionList. Context: %S, result: %d", iContextName, aResult);
+TFLOGSTRING3("TSY: CMmMBMSContextTsy::CompleteUpdateMbmsSessionList. Context: %S, result: %d", &iContextName, aResult);    
     
     TInt ret( aResult );
    
@@ -1526,7 +1526,7 @@
 	        TInt* aBufSize )
     {
     TInt ret( KErrNone );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_GETMBMSACTIVESERVICESPHASE1L_1, "TSY: CMmMBMSContextTsy::GetMbmsActiveServicesPhase1L");
+TFLOGSTRING("TSY: CMmMBMSContextTsy::GetMbmsActiveServicesPhase1L");
   
   	if (iServicesArray->iSessionIdList.Count() > 0)
   		{
@@ -1560,7 +1560,7 @@
         	RMobilePhone::TClientId* aClient,
 	        TDes8* aBuffer )   
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_GETMBMSACTIVESERVICESPHASE2L_1, "TSY: CMmMBMSContextTsy::GetMbmsActiveServicesPhase2L");
+TFLOGSTRING("TSY: CMmMBMSContextTsy::GetMbmsActiveServicesPhase2L");
 	
 	TInt error = KErrNone;

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmsmonitoredlist.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmsmonitoredlist.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -20,6 +20,7 @@
 #include <pcktlist.h>
 #include "mbmstypes.h"
 #include "cmmmbmsmonitoredlist.h"
+#include <ctsy/tflogger.h>
 
 
 // ============================ MEMBER FUNCTIONS ===============================

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaext.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 // INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmpacketcontextgsmwcdmaextTraces.h"
-#endif
-
 #include <in_sock.h>
 #include "cmmpacketcontextgsmwcdmaext.h"
 #include "Cmmpacketcontexttsy.h"
@@ -38,7 +32,7 @@
         CMmPacketContextTsy* const aMmPacketContextTsy, 
         CMmPacketServiceTsy* const aMmPacketServiceTsy  ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_NEWL_1,  "TSY: CMmPacketContextGsmWcdmaExt::NewL." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::NewL." );
 
     CMmPacketContextGsmWcdmaExt* packetContextGsmWcdmaExt = 
         new ( ELeave ) CMmPacketContextGsmWcdmaExt();
@@ -65,7 +59,7 @@
  
 CMmPacketContextGsmWcdmaExt::~CMmPacketContextGsmWcdmaExt()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_DTOR_1,  "TSY: CMmPacketContextGsmWcdmaExt::~CMmPacketContextGsmWcdmaExt." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::~CMmPacketContextGsmWcdmaExt." );
 
     TInfoName contextName;
     if( iMmPacketContextTsy )
@@ -163,7 +157,7 @@
 //
 TInt CMmPacketContextGsmWcdmaExt::InitialiseContextL(RPacketContext::TDataChannelV2* aDataChannel)
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_INITIALISECONTEXTL_1,  "TSY: CMmPacketContextGsmWcdmaExt::InitialiseContextL." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::InitialiseContextL." );
 
     TInt ret( KErrArgument );
 
@@ -197,7 +191,7 @@
 //
 void CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext(const TInt aResult) // Result
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEINITIALISECONTEXT_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext." );
 
     if ( KErrNone == aResult )
         {
@@ -232,7 +226,7 @@
 //
 TInt CMmPacketContextGsmWcdmaExt::ActivateL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_ACTIVATEL_1,  "TSY: CMmPacketContextGsmWcdmaExt::ActivateL " );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::ActivateL " );
 
     TInt ret( KErrArgument );
 
@@ -291,7 +285,8 @@
         CMmDataPackage* aDataPackage,
         TInt aResult ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEACTIVATE_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivate. Status: %d",aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivate. Status: %d",
+             aResult );
 
     if ( KErrNone == aResult )
         {
@@ -337,7 +332,8 @@
         }
     else
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEACTIVATE_2,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivate. ErrorCause: %d",aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivate. ErrorCause: %d",
+             aResult );
         // Re-activation is allowed because activation has not succeeded
         iIsActivateAllowed = ETrue;
         }
@@ -361,7 +357,7 @@
 void CMmPacketContextGsmWcdmaExt::CompleteActivatePhase2(  
         CMmDataPackage* aDataPackage, const TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEACTIVATEPHASE2_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivatePhase2. Status: %d", aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivatePhase2. Status: %d", aResult );
 
     if ( KErrNone == aResult )
         {
@@ -433,7 +429,7 @@
 //
 TInt CMmPacketContextGsmWcdmaExt::DeactivateL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_DEACTIVATEL_1,  "TSY: CMmPacketContextGsmWcdmaExt::DeactivateL." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::DeactivateL." );
 
     TInt ret( KErrArgument );
     //zero length
@@ -463,7 +459,7 @@
 void CMmPacketContextGsmWcdmaExt::CompleteDeactivate( 
         const TInt aResult )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEDEACTIVATE_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteDeactivate." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::CompleteDeactivate." );
 
     if ( KErrNone == aResult )
         {
@@ -491,7 +487,7 @@
 //
 TInt CMmPacketContextGsmWcdmaExt::DeleteL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_DELETEL_1,  "TSY: CMmPacketContextGsmWcdmaExt::DeleteL." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::DeleteL." );
 
     TInt ret( KErrNotReady );
 
@@ -520,7 +516,7 @@
 void CMmPacketContextGsmWcdmaExt::CompleteDelete( 
 		TInt const aResult )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEDELETE_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteDelete." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::CompleteDelete." );
 
     if( KErrNone == aResult )
         {
@@ -552,7 +548,7 @@
 TInt CMmPacketContextGsmWcdmaExt::GetConfig( 
 		TPacketDataConfigBase* const aConfig )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_GETCONFIG_1,  "TSY: CMmPacketContextGsmWcdmaExt::GetConfig." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::GetConfig." );
 
     TInt ret( KErrNone );
 
@@ -606,7 +602,7 @@
 //
 TInt CMmPacketContextGsmWcdmaExt::GetDataVolumeTransferredL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_GETDATAVOLUMETRANSFERREDL_1,  "TSY: CMmPacketContextGsmWcdmaExt::GetDataVolumeTransferredL." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::GetDataVolumeTransferredL." );
 
     TInt ret( KErrNone );
     TInfoName contextName = iMmPacketContextTsy->ContextName();
@@ -649,7 +645,8 @@
         {
         errorValue = KErrGeneral;
         }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEGETDATAVOLUMETRANSFERRED_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteGetDataVolumeTransferred. Error Value:%d",errorValue );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::CompleteGetDataVolumeTransferred. Error Value:%d",
+                errorValue );
 
     iMmPacketContextTsy->CompleteGetDataVolumeTransferred( errorValue );
 
@@ -665,7 +662,7 @@
 TInt CMmPacketContextGsmWcdmaExt::NotifyConfigChanged(
         TPacketDataConfigBase& aConfig )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_NOTIFYCONFIGCHANGED_1,  "TSY: CMmPacketContextGsmWcdmaExt::NotifyConfigChanged." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::NotifyConfigChanged." );
 
     TInt ret( KErrNone );
 
@@ -687,7 +684,7 @@
 //
 void CMmPacketContextGsmWcdmaExt::CompleteNotifyConfigChanged()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETENOTIFYCONFIGCHANGED_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteNotifyConfigChanged." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::CompleteNotifyConfigChanged." );
 
     if ( NULL != iConfig )
         {
@@ -720,7 +717,7 @@
 TInt CMmPacketContextGsmWcdmaExt::SetConfigL( 
 		TPacketDataConfigBase* const aConfig )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_SETCONFIGL_1,  "TSY: CMmPacketContextGsmWcdmaExt::SetConfigL." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::SetConfigL." );
 
     TInt ret( KErrNotSupported );
 
@@ -747,7 +744,7 @@
                  // Temporary store the configGPRS
                 *iTempConfig = configGPRS;
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_SETCONFIGL_2,  "TSY: CMmPacketContextGsmWcdmaExt::SetConfigL. NWIContext: %d", configGPRS.iNWIContext );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::SetConfigL. NWIContext: %d", configGPRS.iNWIContext );
 
                 TInfoName contextName = iMmPacketContextTsy->ContextName();
                 CMmDataPackage data;
@@ -830,7 +827,8 @@
 void CMmPacketContextGsmWcdmaExt::CompleteSetConfig( 
 		const TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETESETCONFIG_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteSetConfig. aStatus:%d",aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::CompleteSetConfig. aStatus:%d",
+                aResult );
 
 
     if ( NULL != iTempConfig )
@@ -887,7 +885,7 @@
         TBool& aContextType,                       
         TInfoName& aPrimaryContextName )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_GETCONFIGURATIONDATA_1,  "TSY: CMmPacketContextGsmWcdmaExt::GetConfigurationData." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::GetConfigurationData." );
 
     TInt ret( KErrNotReady );
 
@@ -922,7 +920,7 @@
     RPacketContext::TPacketFilterV2& contextFilter =
         ( *contextFilterPckg )();
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_ADDPACKETFILTERL_1,  "TSY: CMmPacketContextGsmWcdmaExt::AddPacketFilterL contextFilterId: %d", contextFilter.iId );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::AddPacketFilterL contextFilterId: %d", contextFilter.iId );
 
     // Check out Tft operation
     iFilterStatus = EAddPacketFilterStatusAdd;
@@ -1144,7 +1142,7 @@
 TInt CMmPacketContextGsmWcdmaExt::RemovePacketFilter( 
 			const TInt aID )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_REMOVEPACKETFILTER_1,  "TSY: CMmPacketContextGsmWcdmaExt::RemovePacketFilter. FilterId:%d", aID );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::RemovePacketFilter. FilterId:%d", aID );
 
     TInt ret( KErrArgument );
 
@@ -1219,7 +1217,7 @@
 //
 TInt CMmPacketContextGsmWcdmaExt::ModifyActiveContextL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_MODIFYACTIVECONTEXTL_1,  "TSY: CMmPacketContextGsmWcdmaExt::ModifyActiveContextL." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::ModifyActiveContextL." );
 
     TInt ret( KErrArgument );
     
@@ -1612,7 +1610,7 @@
 TInt CMmPacketContextGsmWcdmaExt::GetDnsInfoEtel(
             TDes8* const aDnsInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_GETDNSINFOETEL_1,  "TSY: CMmPacketContextGsmWcdmaExt::GetDnsInfoEtel." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::GetDnsInfoEtel." );
 
     // Unpack the aDnsInfo
     RPacketContext::TTDnsInfoV2Pckg* dnsInfoPckg =

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaextwithdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaextwithdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -22,11 +22,6 @@
 
 // INCLUDE FILES
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmpacketcontextgsmwcdmaextwithdispatcherTraces.h"
-#endif
-
 #include "cmmpacketservicegsmwcdmaext.h"
 
 // ---------------------------------------------------------------------------
@@ -39,7 +34,8 @@
 void CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext(const TDesC& aChannelId,  
         													const TInt aResult ) // Result
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEINITIALISECONTEXT1_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext. Status: aChannelId=%S, aResult=%d",aChannelId, aResult);
+TFLOGSTRING3( "TSY: CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext. Status: aChannelId=%S, aResult=%d",
+			&aChannelId, aResult);
 
       if ( KErrNone == aResult )
         {

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontexttsywithdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontexttsywithdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -22,11 +22,6 @@
 
 // INCLUDE FILES
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CmmpacketcontexttsywithdispatcherTraces.h"
-#endif
-
 #include "cmmpacketservicegsmwcdmaext.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
@@ -40,7 +35,7 @@
 TInt CMmPacketContextTsy::RemovePacketFilter(
         TInt *aID )    
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REMOVEPACKETFILTER1_1,  "TSY: CMmPacketContextTsy::RemovePacketFilter. RemovedFilter:%d", *aID );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::RemovePacketFilter. RemovedFilter:%d", *aID );
 
     // id must be value from 1 to 8
     if ( 0 < *aID && 8 >= *aID )

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketqosgsmwcdmaext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketqosgsmwcdmaext.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmpacketqosgsmwcdmaextTraces.h"
-#endif
-
 #include "Cmmpacketservicetsy.h"
 #include "Cmmpacketcontexttsy.h"
 #include "cmmpacketqosgsmwcdmaext.h"
@@ -49,7 +43,7 @@
     packetQoSGsmWcdmaExt->ConstructL();
     CleanupStack::Pop( packetQoSGsmWcdmaExt );
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_NEWL_1, "TSY: CMmPacketQoSGsmWcdmaExt::NewL. ");
+TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::NewL. ");
     return packetQoSGsmWcdmaExt;
     }
 
@@ -61,7 +55,7 @@
     
 CMmPacketQoSGsmWcdmaExt::~CMmPacketQoSGsmWcdmaExt()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_DTOR_1, "TSY: CMmPacketQoSGsmWcdmaExt::~CMmPacketQoSGsmWcdmaExt." );
+TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::~CMmPacketQoSGsmWcdmaExt." );
     }
 
 
@@ -74,7 +68,7 @@
 TInt CMmPacketQoSGsmWcdmaExt::GetProfileCapabilities(
         TDes8* aProfileCaps )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_GETPROFILECAPABILITIES_1, "TSY: CMmPacketQoSGsmWcdmaExt::GetProfileCapabilities." );
+TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::GetProfileCapabilities." );
 
     // Unpack the packet
     TPckg<TPacketDataConfigBase>* profileCapsPckg = 
@@ -135,7 +129,7 @@
     TPckg<TPacketDataConfigBase>* profilePckg = 
         ( TPckg<TPacketDataConfigBase>* ) aProfile;
     TPacketDataConfigBase& profile = ( *profilePckg )();
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_GETPROFILEPARAMETERS_1, "TSY: CMmPacketQoSGsmWcdmaExt::GetProfileParameters.");
+TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::GetProfileParameters.");
 
 // If extension is KConfigGPRS
     if ( TPacketDataConfigBase::KConfigGPRS == profile.ExtensionId() )
@@ -175,7 +169,7 @@
    else if ( TPacketDataConfigBase::KConfigRel5 == profile.ExtensionId() )
         { 
         
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_GETPROFILEPARAMETERS_2, "TSY: CMmPacketQoSGsmWcdmaExt::GetProfileParameters. Rel 5");
+TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::GetProfileParameters. Rel 5");            
         TPckg<RPacketQoS::TQoSR5Negotiated >* gprsProfilePckg = 
                 ( TPckg<RPacketQoS::TQoSR5Negotiated >* ) aProfile;
         RPacketQoS::TQoSR5Negotiated& gprsProfile = ( *gprsProfilePckg )();
@@ -239,7 +233,7 @@
 
 void CMmPacketQoSGsmWcdmaExt::NotifyProfileChangedCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_NOTIFYPROFILECHANGEDCANCEL_1,  "TSY: CMmPacketQoSGsmWcdmaExt::NotifyProfileChangedCancel." );
+TFLOGSTRING( "TSY: CMmPacketQoSGsmWcdmaExt::NotifyProfileChangedCancel." );
 
 	iQoSGPRSNotifyPckg = NULL;
 
@@ -253,7 +247,7 @@
 TInt CMmPacketQoSGsmWcdmaExt::SetProfileParametersL(
         TDes8* aProfile ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_SETPROFILEPARAMETERSL_1, "TSY: CMmPacketQoSGsmWcdmaExt::SetProfileParametersL. \t aProfile:%d", aProfile );
+TFLOGSTRING2("TSY: CMmPacketQoSGsmWcdmaExt::SetProfileParametersL. \t aProfile:%d", aProfile );
 
 	//Datapackage
 	CMmDataPackage data;
@@ -309,7 +303,7 @@
         }
     else if ( TPacketDataConfigBase::KConfigRel5 == profile.ExtensionId() )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_SETPROFILEPARAMETERSL_2, "TSY: CMmPacketQoSGsmWcdmaExt::SetProfileParameters. Rel 5");
+TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::SetProfileParameters. Rel 5");   
         TPckg<RPacketQoS::TQoSR5Requested >* gprsProfilePckg = 
              ( TPckg<RPacketQoS::TQoSR5Requested >* ) aProfile;
         RPacketQoS::TQoSR5Requested& gprsProfile = ( *gprsProfilePckg )();
@@ -355,7 +349,7 @@
 void CMmPacketQoSGsmWcdmaExt::CompleteSetProfileParameters(
 		const TInt aErrorValue )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_COMPLETESETPROFILEPARAMETERS_1, "TSY: CMmPacketQoSGsmWcdmaExt::CompleteSetProfileParameters.  \t aErrorValue:%d", aErrorValue );
+TFLOGSTRING2("TSY: CMmPacketQoSGsmWcdmaExt::CompleteSetProfileParameters.  \t aErrorValue:%d", aErrorValue );
 
     // Call CompleteSetProfileParameters from QoS Tsy
     iMmPacketQoSTsy->CompleteSetProfileParameters( aErrorValue );
@@ -385,7 +379,7 @@
 
 
    
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_1, "TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged . COPY new R99/R4 default values");
+TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged . COPY new R99/R4 default values");
 		//Copy negotiated values to minimun values
 		iRequested99.iMinTrafficClass = iQoSR99_R4Negotiated.iTrafficClass;
 	    iRequested99.iMinDeliveryOrderReqd = 
@@ -436,7 +430,7 @@
         iRequested99.iReqGuaranteedRate = iQoSR99_R4Negotiated.iGuaranteedRate;
 
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_2, "TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged . COPY new R97 default values");
+TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged . COPY new R97 default values");
         iRequested.iReqPrecedence = iQoSGPRSNegotiated.iPrecedence;
         iRequested.iMinPrecedence = iQoSGPRSNegotiated.iPrecedence;
 
@@ -454,7 +448,7 @@
         
 
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_3, "TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged . COPY new R5 default values");
+TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged . COPY new R5 default values");
 
         //Copy negotiated values to minimun values
         iRequestedR5.iMinTrafficClass = iQoSR5Negotiated.iTrafficClass;
@@ -518,7 +512,7 @@
             // Update the client side data through pointers
             gprsProfile = iQoSGPRSNegotiated;
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_4, "TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged.  R97/98 QoS Parameters in use");
+TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged.  R97/98 QoS Parameters in use");
             }
 
         // if client uses R99 QoS parameters and aQoS99Negotiated 
@@ -535,7 +529,7 @@
                                        
                 // Update the client side data through pointers
                 gprsProfile = iQoSR99_R4Negotiated;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_5, "TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged.  R99/R4 QoS Parameters in use");
+TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged.  R99/R4 QoS Parameters in use");
             
             }
 
@@ -551,7 +545,7 @@
 
             // Update the client side data through pointers
             gprsProfile = iQoSR5Negotiated;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_6, "TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged.  R5 QoS Parameters in use");
+TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged.  R5 QoS Parameters in use");
             }            
 
         if ( completeToClient )

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketservicegsmwcdmaext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketservicegsmwcdmaext.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmpacketservicegsmwcdmaextTraces.h"
-#endif
-
 #include "cmmpacketservicegsmwcdmaext.h"
 #include "Cmmpacketcontexttsy.h"
 #include "Cmmpacketcontextlist.h"
@@ -52,7 +46,7 @@
     packetServiceGsmWcdmaExt->ConstructL( aFactory );
     CleanupStack::Pop();
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_NEWL_1, "TSY: CMmPacketServiceGsmWcdmaExt::NewL.\n" );
+TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::NewL.\n" );
     return packetServiceGsmWcdmaExt;
 
     }
@@ -83,7 +77,7 @@
     
 CMmPacketServiceGsmWcdmaExt::~CMmPacketServiceGsmWcdmaExt()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_DTOR_1, "TSY: CMmPacketServiceGsmWcdmaExt::~CMmPacketServiceGsmWcdmaExt.\n" );
+TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::~CMmPacketServiceGsmWcdmaExt.\n" );
     }
     
 //----------------------------------------------------------------------------
@@ -135,7 +129,7 @@
 //
 TInt CMmPacketServiceGsmWcdmaExt::AttachL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_ATTACHL_1, "TSY: CMmPacketServiceGsmWcdmaExt::AttachL." );
+TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::AttachL." );
 
 	// Call and return
 	return iMmPacketServiceTsy->MessageManager()->HandleRequestL( 
@@ -151,7 +145,7 @@
 void CMmPacketServiceGsmWcdmaExt::CompleteAttach( 
 		TInt aErrorValue ) const
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEATTACH_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteAttach.\n  \t ErrorValue:%d\n", aErrorValue );
+TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteAttach.\n  \t ErrorValue:%d\n", aErrorValue );
 
 	if ( KErrNone == aErrorValue )
 		{
@@ -180,7 +174,7 @@
 //
 TInt CMmPacketServiceGsmWcdmaExt::DetachL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_DETACHL_1, "TSY: CMmPacketServiceGsmWcdmaExt::DetachL.\n  ");
+TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::DetachL.\n  ");
 
 	return iMmPacketServiceTsy->MessageManager()->
                                            HandleRequestL( EPacketDetach );
@@ -196,7 +190,7 @@
 void CMmPacketServiceGsmWcdmaExt::CompleteDetachL( 
 		TInt aErrorValue ) const
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEDETACHL_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteDetachL\n  \t ErrorValue:%d\n", aErrorValue );
+TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteDetachL\n  \t ErrorValue:%d\n", aErrorValue );
 
 	if ( KErrNone == aErrorValue )
 		{
@@ -223,7 +217,7 @@
 //
 TInt CMmPacketServiceGsmWcdmaExt::GetNtwkRegStatusL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_GETNTWKREGSTATUSL_1, "TSY: CMmPacketServiceGsmWcdmaExt::GetNtwkRegStatusL.\n" );
+TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::GetNtwkRegStatusL.\n" );
 
 	return iMmPacketServiceTsy->MessageManager()->HandleRequestL( 
 		EPacketGetNtwkRegStatus );
@@ -244,7 +238,7 @@
     //Unpack data
 	aDataPackage->UnPackData( regStatusClient );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEGETNTWKREGSTATUS_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteGetNtwkRegStatus.\n RegStatusClient = %d \t", regStatusClient);
+TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteGetNtwkRegStatus.\n  \t", regStatusClient);
 
     // Call CompleteGetNtwkRegStatus() from service tsy
 	iMmPacketServiceTsy->CompleteGetNtwkRegStatus( regStatusClient, 
@@ -260,7 +254,7 @@
 TInt CMmPacketServiceGsmWcdmaExt::SetAttachModeL(
 		RPacketService::TAttachMode aMode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_SETATTACHMODEL_1, "TSY: CMmPacketServiceGsmWcdmaExt::SetAttachModeL." );
+TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::SetAttachModeL." );
 
 	TInt ret( KErrNone );
 	CMmDataPackage data;
@@ -282,7 +276,7 @@
 		const TInt aErrorValue ) const
     {
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETESETATTACHMODE_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteSetAttachMode.\n  \t  Error Value:%d\n", aErrorValue );
+TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteSetAttachMode.\n  \t  Error Value:%d\n", aErrorValue );
 
     iMmPacketServiceTsy->CompleteSetAttachMode( aErrorValue );
 
@@ -295,7 +289,7 @@
 //
 TInt CMmPacketServiceGsmWcdmaExt::GetAttachModeL() 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_GETATTACHMODEL_1, "TSY: CMmPacketServiceGsmWcdmaExt::GetAttachModeL.\n\t " );
+TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::GetAttachModeL.\n\t " );
 
 	TBool calledOnInitPhase = EFalse;
 	CMmDataPackage data;
@@ -319,7 +313,7 @@
 
 	aDataPackage->UnPackData( attachMode );
 
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEGETATTACHMODE_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteGetAttachMode.\n  \t Status:%d\n\t ", attachMode );
+    TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteGetAttachMode.\n  \t Status:%d\n\t ", attachMode );
 
     iMmPacketServiceTsy->CompleteGetAttachMode( attachMode, aResult);
 
@@ -336,7 +330,7 @@
 	TInt ret( KErrNone );
 	TDataPackage package = aPackage;
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_SETPREFERREDBEARERL_1, "TSY: CMmPacketServiceGsmWcdmaExt::SetPreferredBearerL.");
+TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::SetPreferredBearerL.");
 
 	ret = iMmPacketServiceTsy->MessageManager()->HandleRequestL( 
 		 EPacketSetPrefBearer, &package );
@@ -353,7 +347,7 @@
 		TInt aErrorValue ) const  
     {
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETESETPREFERREDBEARER_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteSetPreferredBearer.\n\t Error Value:%d\n", aErrorValue );
+TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteSetPreferredBearer.\n\t Error Value:%d\n", aErrorValue );
 
     iMmPacketServiceTsy->CompleteSetPreferredBearer( aErrorValue );
 
@@ -372,7 +366,7 @@
     // Set caps
     *aCaps = iDynamicCaps;
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_GETDYNAMICCAPS_1, "TSY: CMmPacketServiceGsmWcdmaExt::GetDynamicCaps.\n\t Dynamic Caps:0x%08x\n", (TUint)*aCaps );
+TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::GetDynamicCaps.\n\t Dynamic Caps:%b\n", *aCaps );
 
     }
 
@@ -455,7 +449,7 @@
         // Call complete notify dynamic caps change from service tsy
         iMmPacketServiceTsy->CompleteNotifyDynamicCapsChange( iDynamicCaps );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_SETDYNAMICCAPSFLAG_1, "TSY: CMmPacketServiceGsmWcdmaExt::SetDynamicCapsFlag.\n\t Dynamic Caps:%u\n", (TUint)iDynamicCaps );
+TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::SetDynamicCapsFlag.\n\t Dynamic Caps:%b\n", iDynamicCaps );
 
         }
     }
@@ -549,7 +543,7 @@
         // Call complete notify dynamic caps change from service tsy
         iMmPacketServiceTsy->CompleteNotifyDynamicCapsChange( iDynamicCaps );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEDYNAMICCAPSCHANGE_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteDynamicCapsChange.\n\t Dynamic Caps:%x\n", (TUint)iDynamicCaps );
+TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteDynamicCapsChange.\n\t Dynamic Caps:%b\n", iDynamicCaps );
         }
     }
 
@@ -561,7 +555,7 @@
 void CMmPacketServiceGsmWcdmaExt::GetStaticCaps(
         TUint* const aCaps )const 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_GETSTATICCAPS_1, "TSY: CMmPacketServiceGsmWcdmaExt::GetStaticCaps.\n\t Static Caps:%u\n", iStaticCaps );
+TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::GetStaticCaps.\n\t Static Caps:%b\n", iStaticCaps );
 
     *aCaps = iStaticCaps;
 
@@ -706,7 +700,7 @@
 //
 TBool CMmPacketServiceGsmWcdmaExt::EGprsSupportInCell()
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_EGPRSSUPPORTINCELL_1, "TSY: CMmPacketServiceGsmWcdmaExt::EGprsSupportInCell.\n\t Last Edge Support:%u\n", (TUint)iLastEdgeGprsSupport );
+TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::EGprsSupportInCell.\n\t Last Edge Support:%b\n", iLastEdgeGprsSupport );
 
     return iLastEdgeGprsSupport;  
     }
@@ -721,7 +715,7 @@
 	{
 	iLastEdgeGprsSupport = aLastEdgeGprsSupport;
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_SETEDGEGPRSSUPPORT_1, "TSY: CMmPacketServiceGsmWcdmaExt::SetEdgeGprsSupport.\n\t Last Edge Support:%u\n", (TUint)iLastEdgeGprsSupport );
+TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::SetEdgeGprsSupport.\n\t Last Edge Support:%b\n", iLastEdgeGprsSupport );
 	}
 
 //----------------------------------------------------------------------------
@@ -733,7 +727,7 @@
 void CMmPacketServiceGsmWcdmaExt::CompleteTransferCapsChange(
         CMmDataPackage* aPackage )	
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETETRANSFERCAPSCHANGE_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteTransferCapsChange" );
+TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::CompleteTransferCapsChange" );
 
     // create temporary variable to hold the tranfer capabilities
     TDynamicTransferCapsFlags transferCaps;
@@ -741,7 +735,7 @@
     // unpack the data form the adaptation layer, contains the transfer caps
     aPackage->UnPackData( transferCaps );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETETRANSFERCAPSCHANGE_2, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteTransferCapsChange.\n\t Dynamic Caps:%u\n", (TUint)transferCaps );
+TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteTransferCapsChange.\n\t Dynamic Caps:%b\n", transferCaps );
 	
     // create temporary dynamic capability variable from the member variable
     RPacketService::TDynamicCapsFlags dynamicCaps( iDynamicCaps );
@@ -778,7 +772,7 @@
 //
 void CMmPacketServiceGsmWcdmaExt::CompleteGetStaticCaps( CMmDataPackage* aDataPackage, TInt aError  )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEGETSTATICCAPS_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteGetStaticCaps.");
+TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::CompleteGetStaticCaps.");
 
 	//Unpack necessary data from datapackage
 	if (KErrNone == aError)

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmbroadcasttsyTraces.h"
-#endif
-
 #include <mmlist.h>
 #include <etelmm.h>
 #include "cmmbroadcasttsy.h"
@@ -31,6 +25,7 @@
 #include "MmTsy_numberOfSlots.h"
 #include "cmmtsyreqhandlestore.h"
 #include <ctsy/pluginapi/cmmdatapackage.h>
+#include <ctsy/tflogger.h>
 #include "cmmnettsy.h"
 
 // ======== MEMBER FUNCTIONS ========
@@ -51,7 +46,7 @@
 
 void CMmBroadcastTsy::ConstructL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_CONSTRUCTL_1, "TSY: CMmBroadcastTsy::ConstructL");
+TFLOGSTRING("TSY: CMmBroadcastTsy::ConstructL");
 #ifdef REQHANDLE_TIMER   
     // create req handle store
     iTsyReqHandleStore = CMmTsyReqHandleStore::NewL( this, iMmPhone, 
@@ -87,7 +82,7 @@
 
 CMmBroadcastTsy::~CMmBroadcastTsy()
     {     
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_DTOR_1, "TSY: CMmBroadcastTsy::~CMmBroadcastTsy");
+TFLOGSTRING("TSY: CMmBroadcastTsy::~CMmBroadcastTsy");
     if ( iMmPhone )
         {
         // deregister tsy object from message manager
@@ -474,7 +469,7 @@
             // TSY supports only "accept all" and "reject all" filtering.
             cbsCaps.iFilterCaps = RMobileBroadcastMessaging::KCapsSimpleFilter;
             
-            OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_GETCAPS_1, "TSY:CMmBroadcastTsy::GetCaps:Mode caps=0x%08x, Filter caps=0x%08x",cbsCaps.iModeCaps,cbsCaps.iFilterCaps);
+            TFLOGSTRING3("TSY:CMmBroadcastTsy::GetCaps:Mode caps=0x%x, Filter caps=0x%x",cbsCaps.iModeCaps,cbsCaps.iFilterCaps);
             
             ret = KErrNone;
             ReqCompleted( aTsyReqHandle, ret );
@@ -533,7 +528,7 @@
     		    else if ( !iCbRoutingActivated )
     		        {
     		        // DOS's CB routing is not activated
-    		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_RECEIVEMESSAGEL_1, "TSY:CMmBroadcastTsy::ReceiveMessageL:DOS's CB routing is not activated, sending activation request.");
+    		TFLOGSTRING("TSY:CMmBroadcastTsy::ReceiveMessageL:DOS's CB routing is not activated, sending activation request.");    
 
     		        //Create package
     		        CMmDataPackage package;
@@ -562,7 +557,7 @@
     		        }
 		        else
 		            {
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_RECEIVEMESSAGEL_2, "TSY:CMmBroadcastTsy::ReceiveMessageL:DOS's CB routing is activated, waiting for messages.");
+		    TFLOGSTRING("TSY:CMmBroadcastTsy::ReceiveMessageL:DOS's CB routing is activated, waiting for messages.");    
 		            // routing is active, wait for messages from DOS
 		            iReqHandleType = EMultimodeBroadcastReceiveMessage;
 					
@@ -585,7 +580,7 @@
 void CMmBroadcastTsy::InternalCompleteCbRoutingRequest( 
     TInt aError )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_INTERNALCOMPLETECBROUTINGREQUEST_1, "TSY:CMmBroadcastTsy::InternalCompleteCbRoutingRequest:error=%d.", aError);
+TFLOGSTRING2("TSY:CMmBroadcastTsy::InternalCompleteCbRoutingRequest:error=%d.", aError);
     if ( KErrNone == aError )
         {
         iCbRoutingActivated = ETrue;
@@ -622,7 +617,7 @@
 //
 void CMmBroadcastTsy::CompleteReceivedWcdmaCbsMessagePageLeft()
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEDWCDMACBSMESSAGEPAGELEFT_1, "TSY:CMmBroadcastTsy::CompleteReceivedWcdmaCbsMessagePageLeft:Delivering page %d to client.", iWcdmaCbsMsgPageIndex);
+TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceivedWcdmaCbsMessagePageLeft:Delivering page %d to client.", iWcdmaCbsMsgPageIndex);    
 	RMobileBroadcastMessaging::TMobileBroadcastAttributesV2Pckg* 
 		attrPckg = reinterpret_cast
 		< RMobileBroadcastMessaging::TMobileBroadcastAttributesV2Pckg* >
@@ -643,7 +638,7 @@
 	cbAttrib.iNumberOfPages = ( *iCbsMsg )[iWcdmaCbsMsgPageIndex]
 		->iNumberOfPages;
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEDWCDMACBSMESSAGEPAGELEFT_2, "TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: cbAttrib.iNumberOfPages %d .", cbAttrib.iNumberOfPages);
+	TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: cbAttrib.iNumberOfPages %x .", cbAttrib.iNumberOfPages);
 
 	// Message Type
 	cbAttrib.iMessageType = ( *iCbsMsg )[iWcdmaCbsMsgPageIndex]
@@ -661,7 +656,7 @@
 	iReceiveCbMessagePtr->Copy( ( *iCbsMsg )[iWcdmaCbsMsgPageIndex]->iWcdmaCbsData.Ptr(), 
 						( *iCbsMsg )[iWcdmaCbsMsgPageIndex]->iInfoLength );
 	
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEDWCDMACBSMESSAGEPAGELEFT_3, "TSY:CMmBroadcastTsy::CompleteReceivedWcdmaCbsMessagePageLeft: AppendFormat in use iWcdmaCurrentPage: %d.", iWcdmaCurrentPage );
+	TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceivedWcdmaCbsMessagePageLeft: AppendFormat in use iWcdmaCurrentPage: %d.", iWcdmaCurrentPage );
 	_LIT8(KFormat, "%c");
 
 	// Append pagenumber to end of CBS message     
@@ -695,7 +690,7 @@
     TInt aError, 
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEGSMCBS_1, "TSY:CMmBroadcastTsy::CompleteReceiveMessageGsmCbs:error=%d.",aError);
+TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageGsmCbs:error=%d.",aError);    
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodeBroadcastReceiveMessage );
 
@@ -740,7 +735,7 @@
     TInt aError, 
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_1, "TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs:error=%d.", aError);
+TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs:error=%d.", aError);    
 	TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodeBroadcastReceiveMessage );
 
@@ -771,7 +766,7 @@
 
 				if ( KErrNone == trapError )
 					{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_2, "TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: %d pages received.",iWcdmaPageNumber);
+	TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: %d pages received.",iWcdmaPageNumber);    
 					// first page. index is 0
 					iWcdmaCbsMsgPageIndex = 0;
 					
@@ -799,7 +794,7 @@
 					cbAttrib.iNumberOfPages = ( *iCbsMsg )[iWcdmaCbsMsgPageIndex]
 						->iNumberOfPages;
 
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_3, "TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: cbAttrib.iNumberOfPages %d.", cbAttrib.iNumberOfPages);
+					TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: cbAttrib.iNumberOfPages %x .", cbAttrib.iNumberOfPages);
 				
 					// Message Type
 					cbAttrib.iMessageType = ( *iCbsMsg )
@@ -822,7 +817,7 @@
 					
 					_LIT8(KFormat, "%c");
 
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_4, "TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: 1st Page - AppendFormat in use iWcdmaCurrentPage: %d.", iWcdmaCurrentPage );
+					TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: 1st Page - AppendFormat in use iWcdmaCurrentPage: %d.", iWcdmaCurrentPage );
 					// insert current pagenumber end of CBS message
 					iReceiveCbMessagePtr->AppendFormat(KFormat, iWcdmaCurrentPage);
 					
@@ -857,7 +852,7 @@
 				aError = KErrCorrupt;
 				}			
 			}
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_5, "TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs:Completing with error=%d.", aError);
+TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs:Completing with error=%d.", aError);    
 			
 		ReqCompleted( reqHandle, aError );		
 		}		
@@ -880,7 +875,7 @@
 
     if ( iCbRoutingActivated )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_RECEIVEMESSAGECANCELL_1, "TSY:CMmBroadcastTsy::ReceiveMessageCancelL:Routing was active, sending de-activation request.");
+TFLOGSTRING("TSY:CMmBroadcastTsy::ReceiveMessageCancelL:Routing was active, sending de-activation request.");    
         // Create package
         CMmDataPackage package;
 
@@ -921,7 +916,7 @@
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_RECEIVEMESSAGECANCELL_2, "TSY:CMmBroadcastTsy::ReceiveMessageCancelL:Routing was not active.");
+TFLOGSTRING("TSY:CMmBroadcastTsy::ReceiveMessageCancelL:Routing was not active.");    
         ReqCompleted( aTsyReqHandle, KErrCancel );
         }
 
@@ -937,7 +932,7 @@
 void CMmBroadcastTsy::CompleteReceiveMessageCancel( 
     TInt aError )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEMESSAGECANCEL_1, "TSY:CMmBroadcastTsy::CompleteReceiveMessageCancel:error=%d.",aError);
+TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageCancel:error=%d.",aError);    
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodeBroadcastReceiveMessageCancel );
 
@@ -970,7 +965,7 @@
     RMobileBroadcastMessaging::TMobilePhoneBroadcastFilter* aSetting )
     {
     *aSetting = iCbFilterSetting;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_GETFILTERSETTING_1, "TSY:CMmBroadcastTsy::GetFilterSetting:Filter setting=0x%08x.",iCbFilterSetting);
+TFLOGSTRING2("TSY:CMmBroadcastTsy::GetFilterSetting:Filter setting=0x%x.",iCbFilterSetting);    
 
     ReqCompleted( aTsyReqHandle, KErrNone );
 
@@ -988,7 +983,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     RMobileBroadcastMessaging::TMobilePhoneBroadcastFilter const* aSetting )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_SETFILTERSETTINGL_1, "TSY:CMmBroadcastTsy::SetFilterSettingL:Old filter setting=0x%08x, setting to 0x%08x.",iCbFilterSetting,(TUint)*aSetting);
+TFLOGSTRING3("TSY:CMmBroadcastTsy::SetFilterSettingL:Old filter setting=0x%x, setting to 0x%x.",iCbFilterSetting,*aSetting);    
     if ( ( RMobileBroadcastMessaging::EBroadcastAcceptAll == *aSetting ) ||
          ( RMobileBroadcastMessaging::EBroadcastAcceptNone == *aSetting ) )
        {
@@ -1056,7 +1051,7 @@
 void CMmBroadcastTsy::CompleteSetFilterSetting( 
     TInt aError )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETESETFILTERSETTING_1, "TSY:CMmBroadcastTsy::CompleteSetFilterSetting:error=%d.",aError);
+TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteSetFilterSetting:error=%d.",aError);    
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodeBroadcastSetFilterSetting );
 
@@ -1099,7 +1094,7 @@
 TInt CMmBroadcastTsy::NotifyFilterSettingChange( 
     RMobileBroadcastMessaging::TMobilePhoneBroadcastFilter* aSetting )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_NOTIFYFILTERSETTINGCHANGE_1, "TSY:CMmBroadcastTsy::NotifyFilterSettingChange.");
+TFLOGSTRING("TSY:CMmBroadcastTsy::NotifyFilterSettingChange.");    
     iReqHandleType = EMultimodeBroadcastNotifyFilterSetting;
     iNotifyFilterSettingChangePtr = aSetting;
 
@@ -1116,7 +1111,7 @@
 TInt CMmBroadcastTsy::NotifyFilterSettingChangeCancel( 
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_NOTIFYFILTERSETTINGCHANGECANCEL_1, "TSY:CMmBroadcastTsy::NotifyFilterSettingChangeCancel.");
+TFLOGSTRING("TSY:CMmBroadcastTsy::NotifyFilterSettingChangeCancel.");    
     iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodeBroadcastNotifyFilterSetting );
     ReqCompleted( aTsyReqHandle, KErrCancel );
@@ -1133,7 +1128,7 @@
 //
 void CMmBroadcastTsy::CompleteNotifyFilterSettingChange()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETENOTIFYFILTERSETTINGCHANGE_1, "TSY:CMmBroadcastTsy::CompleteNotifyFilterSettingChange.");
+TFLOGSTRING("TSY:CMmBroadcastTsy::CompleteNotifyFilterSettingChange.");    
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodeBroadcastNotifyFilterSetting );
 
@@ -1142,7 +1137,7 @@
 		if ( iNotifyFilterSettingChangePtr )
 			{
 			*iNotifyFilterSettingChangePtr = iCbFilterSetting;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETENOTIFYFILTERSETTINGCHANGE_2, "TSY:CMmBroadcastTsy::CompleteNotifyFilterSettingChange.New filter setting is 0x%08x.",iCbFilterSetting);
+TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteNotifyFilterSettingChange.New filter setting is 0x%x.",iCbFilterSetting);    
 			}
 
         ReqCompleted( reqHandle, KErrNone );
@@ -1162,7 +1157,7 @@
     TInt*  )
     {
     // not supported.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_GETBROADCASTIDLISTPHASE1L_1, "TSY: CMmBroadcastTsy::GetBroadcastIdListPhase1L");
+TFLOGSTRING("TSY: CMmBroadcastTsy::GetBroadcastIdListPhase1L");    
     return KErrNotSupported;
     }
 
@@ -1179,7 +1174,7 @@
     RMobilePhone::TClientId const* , 
     TDes8*  )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_GETBROADCASTIDLISTPHASE2_1, "TSY:CMmBroadcastTsy::GetBroadcastIdListPhase2.List returned to client.");
+    TFLOGSTRING("TSY:CMmBroadcastTsy::GetBroadcastIdListPhase2.List returned to client.");    
     return KErrNotSupported;
     }
 
@@ -1194,7 +1189,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     TDes8 const* /*aBuffer*/ )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_STOREBROADCASTIDLISTL_1, "TSY:CMmBroadcastTsy::StoreBroadcastIdListL.");
+TFLOGSTRING("TSY:CMmBroadcastTsy::StoreBroadcastIdListL.");    
     ReqCompleted( aTsyReqHandle, KErrNotSupported );
 
     return KErrNone;

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsgsmext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsgsmext.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,15 +16,10 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmsmsgsmextTraces.h"
-#endif
-
 #include <e32std.h>        // error values
 #include <mmlist.h>
 #include "cmmsmsgsmext.h"
+#include <ctsy/tflogger.h>
 #include <ctsy/pluginapi/cmmdatapackage.h>
 #include "cmmphonetsy.h"
 #include <ctsy/serviceapi/cmmsmsutility.h>
@@ -82,7 +77,7 @@
 
     if ( KSimSmsNotPresent == aSmsMsg->iMessageStatus )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSGSMEXT_COMPLETERECEIVEMESSAGE_1, "TSY: CMmSmsGsmExt::CompleteReceiveMessage. Class 0, 1 or 3 message");
+TFLOGSTRING("TSY: CMmSmsGsmExt::CompleteReceiveMessage. Class 0, 1 or 3 message");
         
         // SMS message that is routed directly to the TSY. This message is not
         // acknowledge to the network.
@@ -94,7 +89,7 @@
         }
    else if ( aSmsMsg->iSmsClass2 && ( 0 != aSmsMsg->iLocation ) ) 
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSGSMEXT_COMPLETERECEIVEMESSAGE_2, "TSY: CMmSmsGsmExt::CompleteReceiveMessage. Class 2 message stored in SIM");
+TFLOGSTRING("TSY: CMmSmsGsmExt::CompleteReceiveMessage. Class 2 message stored in SIM");
         // Class 2 SMS message that is stored in SIM. This message is 
         // acknowledged to the network by SMS server.
 		msgAttributes.iStatus = RMobileSmsMessaging::EMtMessageUnknownStatus;
@@ -105,7 +100,7 @@
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSGSMEXT_COMPLETERECEIVEMESSAGE_3, "TSY: CMmSmsGsmExt::CompleteReceiveMessage. Class 2 message not stored in SIM");
+TFLOGSTRING("TSY: CMmSmsGsmExt::CompleteReceiveMessage. Class 2 message not stored in SIM");
         // Class 2 SMS message that is not stored in SIM. This message is 
         // acknowledged to the network by SMS server.
         msgAttributes.iStatus = 
@@ -185,7 +180,7 @@
     CArrayPtrFlat<CListReadAllAttempt>* aSmsReadAllArray, 
     TInt* aReadAllBufSizePtr )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSGSMEXT_COMPLETEREADALLSMSPHASE1L_1, "TSY: CMmSmsGsmExt::CompleteReadAllSmsPhase1L");
+TFLOGSTRING("TSY: CMmSmsGsmExt::CompleteReadAllSmsPhase1L");
     // read the list, store its content and then return size of this 
     // buffer to client
     CMobilePhoneGsmSmsList* list = CMobilePhoneGsmSmsList::NewL();

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmssendrequest.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmssendrequest.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -17,6 +17,7 @@
 
 //  INCLUDE FILES
 #include "cmmsmssendrequest.h"
+#include <ctsy/tflogger.h>
 
 // ======== MEMBER FUNCTIONS ========

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsstoragetsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsstoragetsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmsmsstoragetsyTraces.h"
-#endif
-
 #include <etelmm.h>
 #include "cmmsmsstoragetsy.h"
 #include "cmmphonetsy.h"
@@ -29,6 +23,7 @@
 #include "cmmsmsextinterface.h"
 #include "MmTsy_numberOfSlots.h"
 #include <ctsy/pluginapi/cmmdatapackage.h>
+#include <ctsy/tflogger.h>
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -39,7 +34,7 @@
 
 void CMmSmsStorageTsy::ConstructL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_CONSTRUCTL_1, "TSY: CMmSmsStorageTsy::ConstructL\n");
+TFLOGSTRING("TSY: CMmSmsStorageTsy::ConstructL\n");
     ResetVariables();
 
     iSmsListArray = new ( ELeave ) CArrayPtrFlat<TSmsMsg>( 1 );
@@ -70,7 +65,7 @@
 
 CMmSmsStorageTsy::~CMmSmsStorageTsy()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_DTOR_1, "TSY: CMmSmsStorageTsy::~CMmSmsStorageTsy");
+TFLOGSTRING("TSY: CMmSmsStorageTsy::~CMmSmsStorageTsy");
     if ( iMmPhone )
         {
         // deregister tsy object from message manager
@@ -83,9 +78,9 @@
         }
     iSmsListArray = NULL;
 
+    iSmsReadAllArray->ResetAndDestroy();
     if ( iSmsReadAllArray )
         {
-        iSmsReadAllArray->ResetAndDestroy();
         delete iSmsReadAllArray;
         }
 	iSmsReadAllArray = NULL;
@@ -115,7 +110,7 @@
 //
 void CMmSmsStorageTsy::Init()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_INIT_1, "TSY: CMmSmsStorageTsy::Init.");
+TFLOGSTRING("TSY: CMmSmsStorageTsy::Init.");	
     // Send request to the Domestic OS layer.
     TRAP_IGNORE( iMmPhone->MessageManager()->HandleRequestL( 
         EMobilePhoneStoreGetInfo ); );
@@ -649,7 +644,7 @@
     TInt aResult, 
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETEREADSMS_1, "TSY: CMmSmsStorageTsy::CompleteReadSms. Error: %d",aResult);
+TFLOGSTRING2("TSY: CMmSmsStorageTsy::CompleteReadSms. Error: %d",aResult);
     TTsyReqHandle reqHandle = iMmTsyReqHandleStore->ResetTsyReqHandle( 
         CMmSmsTsy::EMultimodeSimStSmsReadSms );
 
@@ -681,7 +676,7 @@
 
     if ( sizeof( RMobilePhoneStore::TMobilePhoneStoreEntryV1 ) > aSmsPckg->Length() )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_WRITESMSL_1, "TSY: CMmSmsStorageTsy::WriteSms bad size argument");
+        TFLOGSTRING ("TSY: CMmSmsStorageTsy::WriteSms bad size argument");
         // Complete the request with appropiate error        
         return KErrArgument;
         }
@@ -736,7 +731,7 @@
     TInt aResult, 
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETEWRITESMS_1, "TSY: CMmSmsStorageTsy::CompleteWriteSms. Error: %d",aResult);
+TFLOGSTRING2("TSY: CMmSmsStorageTsy::CompleteWriteSms. Error: %d",aResult);
     TTsyReqHandle reqHandle = iMmTsyReqHandleStore->ResetTsyReqHandle( 
         CMmSmsTsy::EMultimodeSimStSmsWriteSms );
 
@@ -832,7 +827,7 @@
 void CMmSmsStorageTsy::CompleteDeleteSms( 
     TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETEDELETESMS_1, "TSY: CMmSmsStorageTsy::CompleteDeleteSms. Error: %d", aResult);
+TFLOGSTRING2("TSY: CMmSmsStorageTsy::CompleteDeleteSms. Error: %d", aResult);
     TTsyReqHandle reqHandle = iMmTsyReqHandleStore->ResetTsyReqHandle( 
         CMmSmsTsy::EMultimodeSimStSmsEraseSms );
 
@@ -899,7 +894,7 @@
 void CMmSmsStorageTsy::CompleteDeleteAllSms( 
     TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETEDELETEALLSMS_1,  "TSY: CMmSmsStorageTsy::CompleteDeleteAllSms. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmSmsStorageTsy::CompleteDeleteAllSms. Error: %d", aResult );
     TTsyReqHandle reqHandle = iMmTsyReqHandleStore->ResetTsyReqHandle( 
         CMmSmsTsy::EMultimodeSimStSmsEraseAllSms );
 
@@ -965,12 +960,12 @@
         {
 		// if store has space, get "StoreAdded" notifications
 		iUsedEntries++;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_1, "TSY: CMmSmsStorageTsy::StoreEntryAdded notifications");
+TFLOGSTRING("TSY: CMmSmsStorageTsy::StoreEntryAdded notifications");
 		if ( iUsedEntries == iTotalEntries )
 			{ 
 		// if store gets full after class2 message, get "StoreAdded and 
 		// StoreFull" notifications
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_2, "TSY: CMmSmsStorageTsy::StoreEntryAdded and StoreFull notifications");
+TFLOGSTRING("TSY: CMmSmsStorageTsy::StoreEntryAdded and StoreFull notifications");	
 			aEvent = ( RMobilePhoneStore::KStoreFull | 
 			    RMobilePhoneStore::KStoreEntryAdded );
 			}
@@ -982,12 +977,12 @@
 		// if entry has been deleted from store, get "EntryDeleted" 
         // notification
 		iUsedEntries--;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_3, "TSY: CMmSmsStorageTsy::StoreEntryDeleted notifications");
+TFLOGSTRING("TSY: CMmSmsStorageTsy::StoreEntryDeleted notifications");
 		if ( (iUsedEntries+1) == iTotalEntries )
 			{
 		    // if store has been full, after deleting get notifications 
 		    // "EntryDeleted" and "StoreHasSpace"
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_4, "TSY: CMmSmsStorageTsy::StoreEntryDeleted and StoreHasSpace notifications");
+TFLOGSTRING("TSY: CMmSmsStorageTsy::StoreEntryDeleted and StoreHasSpace notifications");
 			aEvent = ( RMobilePhoneStore::KStoreHasSpace | 
 			    RMobilePhoneStore::KStoreEntryDeleted );
 			}
@@ -1009,7 +1004,7 @@
         *smsStoreEvent = aEvent;
         *iNotifySmsStoreEventIndexPtr = aLocation;
 
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_5, "TSY: CMmSmsStorageTsy::CompleteNotifyStoreEvent:notified client about event=0x%08x, location=%d", (TUint)aEvent, aLocation );
+TFLOGSTRING3("TSY: CMmSmsStorageTsy::CompleteNotifyStoreEvent:notified client about event=0x%x, location=%d", aEvent, aLocation );
         ReqCompleted( reqHandle, KErrNone );
         }
     }
@@ -1028,7 +1023,7 @@
     CRetrieveMobilePhoneSmsList::TBatchRequestData const* aRequest, 
     TInt* aBufSize )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_READALLSMSPHASE1L_1, "TSY: CMmSmsStorageTsy::ReadAllSmsPhase1L");
+TFLOGSTRING("TSY: CMmSmsStorageTsy::ReadAllSmsPhase1L");
     TInt ret( KErrNone );
 
     TTsyReqHandle readAllSmsHandle = iMmTsyReqHandleStore->GetTsyReqHandle( 
@@ -1050,7 +1045,7 @@
         }
     else   
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_READALLSMSPHASE1L_2, "TSY: CMmSmsStorageTsy::ReadAllSmsPhase1. SMS reading starts.");
+TFLOGSTRING("TSY: CMmSmsStorageTsy::ReadAllSmsPhase1. SMS reading starts.");
         // Client is asking for all SMS store entries
         iReadAllBufSizePtr = aBufSize;
         iReadAllId = aRequest->iClient;
@@ -1077,7 +1072,7 @@
             
             if ( KErrNone != ret )
             	{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_READALLSMSPHASE1L_3, "TSY: CMmSmsStorageTsy::ReadAllSmsPhase1L - and the returned value for EMobilePhoneStoreReadAllPhase1:%d", ret);
+TFLOGSTRING2("TSY: CMmSmsStorageTsy::ReadAllSmsPhase1L - and the returned value for EMobilePhoneStoreReadAllPhase1:%d", ret);
 				(void)iMmTsyReqHandleStore->ResetTsyReqHandle( CMmSmsTsy::EMultimodeSimStSmsReadAllSms );
 				// the returned value from ResetTsyReqHandle is not needed. 
             	}
@@ -1091,7 +1086,7 @@
 		// DOS layer returned with error
 	    if ( ret != KErrNone )
 	        {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_READALLSMSPHASE1L_4, "TSY: CMmSmsStorageTsy::ReadAllSmsPhase1L aTsyReqHandle: %u and ret:%d", (TUint)aTsyReqHandle, ret);
+TFLOGSTRING3("TSY: CMmSmsStorageTsy::ReadAllSmsPhase1L aTsyReqHandle: %d and ret:%d", aTsyReqHandle, ret);
 	        ReqCompleted( aTsyReqHandle, ret );
 	        }
 			
@@ -1111,7 +1106,7 @@
     RMobilePhone::TClientId const* aId, 
     TDes8* aBuffer )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_READALLSMSPHASE2_1, "TSY: CMmSmsStorageTsy::ReadAllSmsPhase2");
+TFLOGSTRING("TSY: CMmSmsStorageTsy::ReadAllSmsPhase2");
     CListReadAllAttempt* read = NULL;
 
     // Find the read attempt from this client
@@ -1148,7 +1143,7 @@
 TInt CMmSmsStorageTsy::ReadAllSmsCancel( 
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_READALLSMSCANCEL_1, "TSY: CMmSmsStorageTsy::ReadAllSmsCancel");
+TFLOGSTRING("TSY: CMmSmsStorageTsy::ReadAllSmsCancel");
     iMmTsyReqHandleStore->ResetTsyReqHandle( 
         CMmSmsTsy::EMultimodeSimStSmsReadAllSms );
 
@@ -1170,7 +1165,7 @@
 	TInt aResult,
     CMmDataPackage* aDataPackage )
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_RETRIEVESMSLISTREADSMSL_1, "TSY: CMmSmsStorageTsy::RetrieveSmsListReadSmsL");
+TFLOGSTRING("TSY: CMmSmsStorageTsy::RetrieveSmsListReadSmsL");
 
 	TTsyReqHandle reqHandle = iMmTsyReqHandleStore->GetTsyReqHandle( 
         CMmSmsTsy::EMultimodeSimStSmsReadAllSms );
@@ -1231,7 +1226,7 @@
     TInt aResult, 
 	TBool aReceivedClass2ToBeReSent )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETEREADALLSMSPHASE1_1, "TSY: CMmSmsStorageTsy::CompleteReadAllSmsPhase1. Complete read first phase error: %d", aResult);
+TFLOGSTRING2("TSY: CMmSmsStorageTsy::CompleteReadAllSmsPhase1. Complete read first phase error: %d", aResult);
     TTsyReqHandle reqHandle = iMmTsyReqHandleStore->ResetTsyReqHandle( 
         CMmSmsTsy::EMultimodeSimStSmsReadAllSms );
     if ( reqHandle )
@@ -1240,7 +1235,7 @@
         ReqCompleted( reqHandle, aResult );
         iSmsListArray->Reset();
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETEREADALLSMSPHASE1_2, "TSY: CMmSmsStorageTsy::CompleteReadAllSmsPhase1 aReceivedClass2ToBeReSent: %d",aReceivedClass2ToBeReSent);
+TFLOGSTRING2("TSY: CMmSmsStorageTsy::CompleteReadAllSmsPhase1 aReceivedClass2ToBeReSent: %d",aReceivedClass2ToBeReSent);
         if ( aReceivedClass2ToBeReSent )
             {
             // silently IGNORE if call to DOS fails

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmstsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmstsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmsmstsyTraces.h"
-#endif
-
 #include "cmmsmstsy.h"
 #include "cmmphonetsy.h"
 #include "cmmsmsstoragetsy.h"
@@ -43,12 +37,12 @@
 CMmSmsTsy::CMmSmsTsy():
     iReqHandleType(EMultimodeSmsReqHandleUnknown)
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_CTOR_1, "TSY: CMmSmsTsy::CMmSmsTsy: constructor");
+TFLOGSTRING("TSY: CMmSmsTsy::CMmSmsTsy: constructor");
     }
 
 void CMmSmsTsy::ConstructL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_CONSTRUCTL_1, "TSY: CMmSmsTsy::ConstructL");
+TFLOGSTRING("TSY: CMmSmsTsy::ConstructL");
 #ifdef REQHANDLE_TIMER   
     //create req handle store
     iTsyReqHandleStore = CMmTsyReqHandleStore::NewL( this, iMmPhone, 
@@ -88,7 +82,7 @@
         {
         iIsOffline = EFalse;
         }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_CONSTRUCTL_2, "TSY: CMmSmsTsy::ConstructL: iIsOffline has been initialised to %d", iIsOffline);
+TFLOGSTRING2("TSY: CMmSmsTsy::ConstructL: iIsOffline has been initialised to %d", iIsOffline);
 
     // there's no pending ResumeSmsReception request at startup
     iResumeSmsReceptionPending = EFalse;
@@ -114,7 +108,7 @@
 
 CMmSmsTsy::~CMmSmsTsy()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_DTOR_1, "TSY: CMmSmsTsy::~CMmSmsTsy");
+TFLOGSTRING("TSY: CMmSmsTsy::~CMmSmsTsy");
     if ( iMmPhone )
         {
         // deregister tsy object from message manager
@@ -255,7 +249,7 @@
     if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo() &&
         !IsRequestPossibleInOffline( aIpc ) )  
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_EXTFUNC_1, "TSY: Offline mode ON, request is not allowed: %d", aIpc );
+TFLOGSTRING2 ("TSY: Offline mode ON, request is not allowed: %d", aIpc );
         TInt error = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral, 
                 KErrGsmOfflineOpNotAllowed );
 
@@ -306,7 +300,7 @@
 
                 if ( KErrNone != leaveCode )
                     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_EXTFUNC_2, "CMmSmsTsy: Leave trapped!, IPC=%d, error value:%d", aIpc, leaveCode );
+TFLOGSTRING3("CMmSmsTsy: Leave trapped!, IPC=%d, error value:%d", aIpc, leaveCode );
                     ReqCompleted( aTsyReqHandle, leaveCode );
                     }
 
@@ -774,7 +768,7 @@
     TDes8* aMsgData, 
     TDes8* aMsgAttributes )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_RECEIVEMESSAGEL_1, "TSY: CMmSmsTsy::ReceiveMessageL\n");
+TFLOGSTRING("TSY: CMmSmsTsy::ReceiveMessageL\n");
 	
 	if(sizeof(RMobileSmsMessaging::TMobileSmsReceiveAttributesV1) > aMsgAttributes->Size())
 		{
@@ -859,18 +853,18 @@
     if ( ( KErrNone == aError ) && 
         ( KSmsRoutingActivated == aSmsRoutingStatus ) )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETEACTIVATESMSROUTING_1, "TSY: CMmSmsTsy::CompleteActivateSmsRouting SMS routing activated");
+TFLOGSTRING("TSY: CMmSmsTsy::CompleteActivateSmsRouting SMS routing activated");
         iServerRoutingActivity = ERoutingActivated;
         }
 	else if ( ( KErrNone == aError ) && 
 	    ( KSmsRoutingDeactivated == aSmsRoutingStatus ) )
 		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETEACTIVATESMSROUTING_2, "TSY: CMmSmsTsy::CompleteActivateSmsRouting SMS routing not activated");
+TFLOGSTRING("TSY: CMmSmsTsy::CompleteActivateSmsRouting SMS routing not activated");
         iServerRoutingActivity = ERoutingNotActivated;
 		}     
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETEACTIVATESMSROUTING_3, "TSY: CMmSmsTsy::CompleteActivateSmsRouting SMS routing activation failed");
+TFLOGSTRING("TSY: CMmSmsTsy::CompleteActivateSmsRouting SMS routing activation failed");
         iServerRoutingActivity = ERoutingNotActivated;
 
         TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -900,7 +894,7 @@
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( 
         EMultimodeSmsReceiveMessage );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETERECEIVEMESSAGE_1, "TSY: CMmSmsTsy::CompleteReceiveMessage. iClientStorageFull: %d", iClientStorageFull );
+TFLOGSTRING2("TSY: CMmSmsTsy::CompleteReceiveMessage. iClientStorageFull: %d", iClientStorageFull );
 
     // SMS successfully received
     if ( KErrNone == aError )
@@ -915,7 +909,7 @@
          // notification
 		 if ( smsClass2 && ( 0 != smsMsg->iLocation ) && iMmSmsStorageTsy ) 
     		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETERECEIVEMESSAGE_2, "TSY: CMmSmsTsy::CompleteReceiveMessage. CompleteNotifyStoreEvent happens");
+TFLOGSTRING("TSY: CMmSmsTsy::CompleteReceiveMessage. CompleteNotifyStoreEvent happens");
 			iMmSmsStorageTsy->CMmSmsStorageTsy::CompleteNotifyStoreEvent(
 			smsMsg->iLocation, RMobilePhoneStore::KStoreEntryAdded	);
     		}
@@ -992,7 +986,7 @@
                 iTsyReqHandleStore->ResetTsyReqHandle( 
                     EMultimodeSmsReceiveMessage );
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETERECEIVEMESSAGE_3, "TSY: CMmSmsTsy::CompleteReceiveMessage. Deliver SMS to the SMS stack");
+TFLOGSTRING("TSY: CMmSmsTsy::CompleteReceiveMessage. Deliver SMS to the SMS stack");
                 ReqCompleted( reqHandle, ret ); 
                 
                 // increase the count of expected acknowledgements
@@ -1061,7 +1055,7 @@
 					{
 					ret = trapError;
 					}
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETERECEIVEMESSAGE_4, "TSY: CMmSmsTsy::CompleteReceiveMessage.KErrGsmSMSUnspecifiedProtocolError ");
+TFLOGSTRING("TSY: CMmSmsTsy::CompleteReceiveMessage.KErrGsmSMSUnspecifiedProtocolError ");
                 }
             else // SMS Memory is full
                 {
@@ -1097,7 +1091,7 @@
 				{
 				ret = trapError;
 				}
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETERECEIVEMESSAGE_5, "TSY: CMmSmsTsy::CompleteReceiveMessage.KErrGsmSMSMemoryCapacityExceeded ");
+TFLOGSTRING("TSY: CMmSmsTsy::CompleteReceiveMessage.KErrGsmSMSMemoryCapacityExceeded ");
             }
         else if ( !reqHandle )
             {
@@ -1204,7 +1198,7 @@
             {
             if ( EFalse == iSmsMsgArray->At( i )->iDeleteAfterClientAck )
                 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_DELIVERCLASS2TOSMSSTACK_1, "TSY: CMmSmsTsy::DeliverClass2ToSmsStack. Deliver SMS to the SMS stack. Array count: %d", iSmsMsgArray->Count());
+TFLOGSTRING2("TSY: CMmSmsTsy::DeliverClass2ToSmsStack. Deliver SMS to the SMS stack. Array count: %d", iSmsMsgArray->Count());
 				// TSY can now delete the message if SMS stack ack message
                 // successfully
                 iSmsMsgArray->At( i )->iDeleteAfterClientAck = ETrue;
@@ -1241,7 +1235,7 @@
     const TDesC8* aMsgData, 
     TBool const * aMemoryFull )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_ACKSMSSTOREDL_1, "TSY: CMmSmsTsy::AckSmsStored. aMemoryFull: %d",*aMemoryFull);
+TFLOGSTRING2("TSY: CMmSmsTsy::AckSmsStored. aMemoryFull: %d",*aMemoryFull);
     TTsyReqHandle getAckStoredMessageHandle = 
        iTsyReqHandleStore->GetTsyReqHandle( EMultimodeSmsAckStored );
 
@@ -1253,7 +1247,7 @@
     else
     if ( iExpectAckOrNack <= 0 )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_ACKSMSSTOREDL_2, "TSY: CMmSmsTsy::AckSmsStoredL. -> ReceiveMessage not requested - error returned ");
+TFLOGSTRING("TSY: CMmSmsTsy::AckSmsStoredL. -> ReceiveMessage not requested - error returned ");        
         ReqCompleted( aTsyReqHandle, KErrNotReady );
         return KErrNone; 
         }
@@ -1271,7 +1265,7 @@
                  KErrNone == aMsgData->CompareF( 
                  iSmsMsgArray->At( i )->iSmsMsg ) )
                 {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_ACKSMSSTOREDL_3, "TSY: CMmSmsTsy::AckSmsStored. Delete SMS: %d, Array count: %d",i,iSmsMsgArray->Count());
+TFLOGSTRING3("TSY: CMmSmsTsy::AckSmsStored. Delete SMS: %d, Array count: %d",i,iSmsMsgArray->Count());
                 delete iSmsMsgArray->At( i ); // Delete object from memory
                 iSmsMsgArray->Delete( i );    // Delete pointer from array
                 iSmsMsgArray->Compress(); 
@@ -1366,7 +1360,7 @@
     const TDesC8* aMsgData, 
     TInt* aRpCause )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_NACKSMSSTOREDL_1, "TSY: CMmSmsTsy::NackSmsStored. aRpCause: %d",*aRpCause);
+TFLOGSTRING2("TSY: CMmSmsTsy::NackSmsStored. aRpCause: %d",*aRpCause);
     TTsyReqHandle nackHandle = 
         iTsyReqHandleStore->GetTsyReqHandle( EMultimodeSmsNackStored );
 
@@ -1380,7 +1374,7 @@
     else
     if ( iExpectAckOrNack <= 0 )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_NACKSMSSTOREDL_2, "TSY: CMmSmsTsy::AckSmsStoredL. -> ReceiveMessage not requested - error returned ");
+TFLOGSTRING("TSY: CMmSmsTsy::AckSmsStoredL. -> ReceiveMessage not requested - error returned ");        
         ReqCompleted( aTsyReqHandle, KErrNotReady );
         return KErrNone; 
         }
@@ -1511,7 +1505,7 @@
 TInt CMmSmsTsy::ResumeSmsReceptionL( 
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_RESUMESMSRECEPTIONL_1, "TSY: CMmSmsTsy::ResumeSmsReceptionL");
+TFLOGSTRING("TSY: CMmSmsTsy::ResumeSmsReceptionL");
     TTsyReqHandle resumeHandle = 
         iTsyReqHandleStore->GetTsyReqHandle( EMultimodeSmsResumeReception );
 
@@ -1587,7 +1581,7 @@
 void CMmSmsTsy::SetOffline( 
     TBool aIsOffline )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_SETOFFLINE_1, "TSY: CMmSmsTsy::SetOffline has been called with %d", aIsOffline);
+TFLOGSTRING2("TSY: CMmSmsTsy::SetOffline has been called with %d", aIsOffline);
 
     if ( !aIsOffline && iIsOffline )
         {
@@ -1632,7 +1626,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     RMobileSmsMessaging::TMobileSmsBearer* aBearer )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_SETMOSMSBEARER_1, "TSY: CMmSmsTsy::SetMoSmsBearer called");
+TFLOGSTRING("TSY: CMmSmsTsy::SetMoSmsBearer called");
     
     TTsyReqHandle setMoSmsBearerHandle = 
         iTsyReqHandleStore->GetTsyReqHandle( EMultimodeSmsSetMoSmsBearer );
@@ -1822,7 +1816,7 @@
 
         // save send request
         iSmsSendReq = smsSendReq;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_SENDMESSAGEL_1, "TSY: CMmSmsTsy::SendMessageL: Send request saved");
+TFLOGSTRING("TSY: CMmSmsTsy::SendMessageL: Send request saved");
 
         // send request to DOS
         // packed parameter: TSendSmsDataAndAttributes
@@ -1874,7 +1868,7 @@
 // --------------------------------------------------------------------------- 
 TBool CMmSmsTsy::IsRPError(TInt aError)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_ISRPERROR_1, "CMmSmsTsy::IsRPError(): %d", aError);
+    TFLOGSTRING2("CMmSmsTsy::IsRPError(): %d", aError);
     
     TBool  isRPError = EFalse;
     switch (aError)
@@ -1959,7 +1953,7 @@
         // DOS returned error to send request. Message might be tried to be 
 		// resent (see method ResendSms).
         // Timeout mechanism cannot access this part of code, ever.
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETESENDMESSAGE_1, "TSY: CMmSmsTsy::CompleteSendMessage. Resend counter: %d", iSmsSendReq->GetSendCounter());
+TFLOGSTRING2("TSY: CMmSmsTsy::CompleteSendMessage. Resend counter: %d", iSmsSendReq->GetSendCounter());
         }
     else
         {
@@ -2096,7 +2090,7 @@
 void CMmSmsTsy::CompleteSendSatMessage( 
     TInt aError )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETESENDSATMESSAGE_1, "TSY: CMmSmsTsy::CompleteSendSatMessage. Complete SAT SMS send Error: %d", aError);
+TFLOGSTRING2("TSY: CMmSmsTsy::CompleteSendSatMessage. Complete SAT SMS send Error: %d", aError);
     iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeSmsSendSatMessage );
     
     if ( iTsySatMessaging )
@@ -2250,7 +2244,7 @@
     RMobilePhone::TClientId const* aId, 
     TInt* aBufSize )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_READSMSPLISTPHASE1L_1, "TSY: CMmSmsTsy::ReadSmspListPhase1L");
+TFLOGSTRING("TSY: CMmSmsTsy::ReadSmspListPhase1L");
 
     TTsyReqHandle readSmspHandle = iTsyReqHandleStore->GetTsyReqHandle( 
         EMultimodeSmsReadSmspListPhase1 );
@@ -2465,7 +2459,7 @@
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodeSmsReadSmspListPhase1 );
     
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETEREADALLSMSPPHASE1_1, "TSY: CMmSmsTsy::CompleteReadAllSmspPhase1 Complete read first phase error: %d",aError);
+TFLOGSTRING2("TSY: CMmSmsTsy::CompleteReadAllSmspPhase1 Complete read first phase error: %d",aError);
     if ( KErrNone == aError )
         {
         aDataPackage->UnPackData( &smsParams );
@@ -2485,13 +2479,13 @@
             if ( KErrNone == trapError )
                 {
                 *iRetSMSPSize = iSMSPList->Size();
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETEREADALLSMSPPHASE1_2, "TSY: CMmSmsTsy::CompleteReadAllSmspPhase1: Phase 1 OK.");
+TFLOGSTRING("TSY: CMmSmsTsy::CompleteReadAllSmspPhase1: Phase 1 OK.");
                 // Complete first phase of read all SMSP sets
                 ReqCompleted( reqHandle, KErrNone );
                 }
             else
                 {   
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETEREADALLSMSPPHASE1_3, "TSY: CMmSmsTsy::CompleteReadAllSmspPhase1: Could not create SMSP list, trapError=%d",trapError);
+TFLOGSTRING2("TSY: CMmSmsTsy::CompleteReadAllSmspPhase1: Could not create SMSP list, trapError=%d",trapError);
                 // Complete with error
                 ReqCompleted( reqHandle, trapError );
                 }
@@ -3090,7 +3084,7 @@
                 sendData.iIpc )                
                 {
                 iSmsNoFdnCheckFlag = ESmsNoFdnCheckUsed;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_RESENDSMS_1, "TSY: CMmSmsTsy::ResendSms. EMobileSmsMessagingSendMessageNoFdnCheck: %d", sendData.iIpc);
+TFLOGSTRING2("TSY: CMmSmsTsy::ResendSms. EMobileSmsMessagingSendMessageNoFdnCheck: %d", sendData.iIpc);                
                 CompleteSendMessageNoFdnCheck( KErrGeneral, NULL );
                 }
             }
@@ -3147,7 +3141,7 @@
 TInt CMmSmsTsy::SendMessageNoFdnCheckCancel( 
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_SENDMESSAGENOFDNCHECKCANCEL_1, "TSY: CMmSmsTsy::SendMessageNoFdnCheckCancel" );
+TFLOGSTRING("TSY: CMmSmsTsy::SendMessageNoFdnCheckCancel" ); 
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodeSmsSendMessageNoFdnCheck );
@@ -3188,7 +3182,7 @@
         // DOS returned error to send request. Message might be tried to be 
 		// resent (see method ResendSms).
         // Timeout mechanism cannot access this part of code, ever.
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETESENDMESSAGENOFDNCHECK_1, "TSY: CMmSmsTsy::CompleteSendMessageNoFdnCheck. Resend counter: %d", iSmsSendReq->GetSendCounter());
+TFLOGSTRING2("TSY: CMmSmsTsy::CompleteSendMessageNoFdnCheck. Resend counter: %d", iSmsSendReq->GetSendCounter());
         }
     else
         {

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmussdtsyTraces.h"
-#endif
-
 #include <etelmm.h>
 #include <mmlist.h>
 #include "cmmussdtsy.h"
@@ -43,7 +37,7 @@
 void CMmUssdTsy::ConstructL(
     CMmPhoneTsy* aMmPhoneTsy )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_CONSTRUCTL_1, "TSY: CMmUssdTsy::ConstructL\n" );
+TFLOGSTRING("TSY: CMmUssdTsy::ConstructL\n" );
     iMmPhone = aMmPhoneTsy;
 
     // register .
@@ -82,7 +76,7 @@
 
 CMmUssdTsy::~CMmUssdTsy()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_DTOR_1, "TSY: CMmUssdTsy::~CMmUssdTsy" );
+TFLOGSTRING("TSY: CMmUssdTsy::~CMmUssdTsy" );
     // unregister.
     if ( iMmPhone )
         {
@@ -132,7 +126,7 @@
     if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo() && 
         ( !IsRequestPossibleInOffline( aIpc ) ) )  
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_EXTFUNC_1, "TSY: Offline mode ON, request is not allowed: %d", aIpc );
+TFLOGSTRING2 ("TSY: Offline mode ON, request is not allowed: %d", aIpc );
         ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral, 
             KErrGsmOfflineOpNotAllowed );
 
@@ -351,7 +345,7 @@
 TInt CMmUssdTsy::RegisterNotification(
     const TInt aIpc )                             // Notification IPC number
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_REGISTERNOTIFICATION_1,  "TSY: CMmUssdTsy::RegisterNotification. IPC: %d", aIpc );
+    TFLOGSTRING2( "TSY: CMmUssdTsy::RegisterNotification. IPC: %d", aIpc );
 
     TInt ret( KErrNone );
 
@@ -382,7 +376,7 @@
 TInt CMmUssdTsy::DeregisterNotification(
     const TInt aIpc )                             // Notification IPC number
     {        
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_DEREGISTERNOTIFICATION_1,  "TSY: CMmUssdTsy::DeregisterNotification. IPC: %d", aIpc );
+    TFLOGSTRING2( "TSY: CMmUssdTsy::DeregisterNotification. IPC: %d", aIpc );
 
     TInt ret( KErrNone );
 
@@ -522,7 +516,7 @@
     TInt aError, 
 	CMmDataPackage* aDataPackage )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_COMPLETERECEIVEMESSAGE_1, "TSY: CMmUssdTsy::CompleteReceiveMessage.\n" );
+TFLOGSTRING("TSY: CMmUssdTsy::CompleteReceiveMessage.\n" );
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( 
         EMultimodeUssdReceiveMessage );
 
@@ -563,8 +557,8 @@
     TDes8* aData, 
     TDes8* aAttributes )
     { 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_SENDMESSAGEL_1, "TSY: CMmUssdTsy::SendMessage - Data length: %d", aData->Length() );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_SENDMESSAGEL_2, "TSY: CMmUssdTsy::SendMessageL: iUssdNoFdnCheckFlag: %d", iUssdNoFdnCheckFlag);
+TFLOGSTRING2("TSY: CMmUssdTsy::SendMessage - Data length: %d", aData->Length() );
+TFLOGSTRING2("TSY: CMmUssdTsy::SendMessageL: iUssdNoFdnCheckFlag: %d", iUssdNoFdnCheckFlag);  
     TInt ret = KErrNone;
 
     if ( iSsTransactionOngoing )
@@ -669,7 +663,7 @@
 void CMmUssdTsy::CompleteSendMessage(
     TInt aError )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_COMPLETESENDMESSAGE_1, "TSY: CMmUssdTsy::CompleteSendMessage.\n" );
+TFLOGSTRING("TSY: CMmUssdTsy::CompleteSendMessage.\n" );
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( 
         EMultimodeUssdSendMessage );
 	
@@ -703,12 +697,12 @@
         // The request is already in processing because of previous request
         // Complete request with status value informing the client about 
         // the situation.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_SENDRELEASEL_1, "LTSY: CMmUssdTsy::SendRelease - KErrServerBusy");
+TFLOGSTRING("LTSY: CMmUssdTsy::SendRelease - KErrServerBusy");
         ReqCompleted( aTsyReqHandle, KErrServerBusy );
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_SENDRELEASEL_2, "TSY: CMmUssdTsy::SendRelease called");
+TFLOGSTRING("TSY: CMmUssdTsy::SendRelease called");
 
         TInt ret = KErrGeneral;
 
@@ -764,7 +758,7 @@
     TInt aErrorCode, 
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_COMPLETESENDRELEASE_1, "TSY: CMmUssdTsy::CompleteSendRelease" );
+TFLOGSTRING("TSY: CMmUssdTsy::CompleteSendRelease" );
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
 		EMultimodeUssdSendRelease );
@@ -811,18 +805,18 @@
     TDes8* aMsgData,
     TDes8* aMsgAttributes) // aMsgAttributes may be NULL
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_NOTIFYNETWORKRELEASE_1, "TSY: CMmUssdTsy::NotifyNetworkRelease" );
+TFLOGSTRING("TSY: CMmUssdTsy::NotifyNetworkRelease" );
     
 	if (aMsgData->MaxLength() < sizeof(RMobilePhone::TMobilePhoneSendSSRequestV3Pckg))
 		{
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_NOTIFYNETWORKRELEASE_2, "TSY: CMmNetTsy::NotifyNetworkRelease Bad size argument (arg1)");
+	    TFLOGSTRING ("TSY: CMmNetTsy::NotifyNetworkRelease Bad size argument (arg1)");
 	    // Complete the request with appropiate error        
 	    return KErrArgument;		
 		}
 	if (aMsgAttributes && 
 		aMsgAttributes->MaxLength() < sizeof(RMobileUssdMessaging::TMobileUssdAttributesV1Pckg))
 		{
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_NOTIFYNETWORKRELEASE_3, "TSY: CMmNetTsy::NotifyNetworkRelease Bad size argument (arg2)");
+	    TFLOGSTRING ("TSY: CMmNetTsy::NotifyNetworkRelease Bad size argument (arg2)");
 	    // Complete the request with appropiate error        
 	    return KErrArgument;			
 		}
@@ -872,7 +866,7 @@
     CMmDataPackage* aDataPackage )
     {
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_COMPLETENOTIFYNETWORKRELEASE_1, "TSY: CMmUssdTsy::CompleteNotifyNetworkRelease. Error: %d", aErrorCode );
+TFLOGSTRING2("TSY: CMmUssdTsy::CompleteNotifyNetworkRelease. Error: %d", aErrorCode );
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
 		EMultimodeUssdNotifyNetworkRelease );
@@ -1066,7 +1060,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     const TInt aError )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_REQCOMPLETED_1, "TSY: CMmUssdTsy::ReqCompleted. Handle: %d Error: %d", aTsyReqHandle, aError);
+TFLOGSTRING3("TSY: CMmUssdTsy::ReqCompleted. Handle: %d Error: %d", aTsyReqHandle, aError);
     CTelObject::ReqCompleted( aTsyReqHandle, aError );
     }
 #endif // TF_LOGGING_ENABLED
@@ -1117,7 +1111,7 @@
 TInt CMmUssdTsy::SendMessageNoFdnCheckCancel( 
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_SENDMESSAGENOFDNCHECKCANCEL_1, "TSY: CMmUssdTsy::SendMessageNoFdnCheckCancel" );
+TFLOGSTRING("TSY: CMmUssdTsy::SendMessageNoFdnCheckCancel" );
 
     // reset the req handle
     TTsyReqHandle reqHandle  = iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -1143,7 +1137,7 @@
 void CMmUssdTsy::CompleteSendMessageNoFdnCheck(
     TInt aError )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_COMPLETESENDMESSAGENOFDNCHECK_1, "TSY: CMmUssdTsy::CompleteSendMessageNoFdnCheck.\n" );
+TFLOGSTRING("TSY: CMmUssdTsy::CompleteSendMessageNoFdnCheck.\n" );
     // get reg handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( 
         EMultimodeUssdSendMessageNoFdnCheck );

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmenstoretsyTraces.h"
-#endif
-
 #include "cmmenstoretsy.h"
 #include "cmmtsyreqhandlestore.h"
 #include "CMmPrivateUtility.h"
@@ -89,7 +83,7 @@
 
 CMmENStoreTsy::~CMmENStoreTsy()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMENSTORETSY_DTOR_1, "TSY: CMmENStoreTsy::~CMmENStoreTsy");
+TFLOGSTRING("TSY: CMmENStoreTsy::~CMmENStoreTsy");
 
     if (iMmPhone )
         {

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmonstoretsyTraces.h"
-#endif
-
 #include "cmmonstoretsy.h"
 #include "cmmtsyreqhandlestore.h"
 #include "CMmPrivateUtility.h"
@@ -41,7 +35,7 @@
 
 void CMmONStoreTsy::ConstructL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_CONSTRUCTL_1, "TSY: CMmONStoreTsy::ConstructL");
+TFLOGSTRING("TSY: CMmONStoreTsy::ConstructL");
 
 #ifdef REQHANDLE_TIMER
     // Create req handle store
@@ -104,7 +98,7 @@
 
 CMmONStoreTsy::~CMmONStoreTsy()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DTOR_1, "TSY: CMmONStoreTsy::~CMmONStoreTsy");
+TFLOGSTRING("TSY: CMmONStoreTsy::~CMmONStoreTsy");
 
     if (iMmPhone )
         {
@@ -185,7 +179,7 @@
 CTelObject::TReqMode CMmONStoreTsy::ReqModeL(
     const TInt aIpc )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_REQMODEL_1, "TSY: CMmONStoreTsy::ReqModeL IPC %d", aIpc);
+TFLOGSTRING2("TSY: CMmONStoreTsy::ReqModeL IPC %d", aIpc);
     CTelObject::TReqMode ret=0;
     switch ( aIpc )
         {
@@ -297,7 +291,7 @@
     const TInt aIpc,
     const TDataPackage& aPackage )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_EXTFUNC_1, "TSY: CMmONStoreTsy::ExtFunc - IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmONStoreTsy::ExtFunc - IPC:%d Handle:%d", aIpc, aTsyReqHandle);   
                
     TInt ret = KErrNone;
     TInt trapError = KErrNone;
@@ -340,7 +334,7 @@
     const TInt aIpc,
     const TDataPackage& aPackage )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DOEXTFUNCL_1, "TSY: CMmONStoreTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmONStoreTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle);
 
     TAny* dataPtr=aPackage.Ptr1();
     TAny* dataPtr2=aPackage.Ptr2();
@@ -465,7 +459,7 @@
 //
 TInt CMmONStoreTsy::ReadL( TDes8* aEntry )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_READL_1, "TSY: CMmONStoreTsy::ReadL");
+TFLOGSTRING("TSY: CMmONStoreTsy::ReadL");
     // Initialize ret value
     TInt ret( KErrArgument );
 
@@ -508,7 +502,7 @@
     TInt aResult,
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEREAD_1, "TSY: CMmONStoreTsy::CompleteRead");
+TFLOGSTRING("TSY: CMmONStoreTsy::CompleteRead");
     // Response information
     TONStoreMsg* ONStoreResp = NULL;
     // unpack data if exists
@@ -519,7 +513,7 @@
         }
     else if ( KErrNone == aResult )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEREAD_2, "TSY: CMmONStoreTsy::CompleteRead result is KErrNone and aDataPackage is NULL!");
+TFLOGSTRING("TSY: CMmONStoreTsy::CompleteRead result is KErrNone and aDataPackage is NULL!");
         aResult = KErrArgument;
         }
 
@@ -585,7 +579,7 @@
 TInt CMmONStoreTsy::ReadCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_READCANCEL_1, "TSY: CMmONStoreTsy::ReadCancel");
+TFLOGSTRING("TSY: CMmONStoreTsy::ReadCancel");
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodeONStoreRead );
@@ -610,7 +604,7 @@
     const TTsyReqHandle aTsyReqHandle,
     TDesC8* aEntry )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_WRITEL_1, "TSY: CMmONStoreTsy::WriteL");
+TFLOGSTRING("TSY: CMmONStoreTsy::WriteL");
 
     // Unpack entry param to get the location
     RMobileONStore::TMobileONEntryV1Pckg* entryPckg =
@@ -668,7 +662,7 @@
     TInt aResult,
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEWRITE_1, "TSY: CMmONStoreTsy::CompleteWrite");
+TFLOGSTRING("TSY: CMmONStoreTsy::CompleteWrite");   
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodeONStoreWrite );
@@ -720,7 +714,7 @@
 TInt CMmONStoreTsy::WriteCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_WRITECANCEL_1, "TSY: CMmONStoreTsy::WriteCancel");
+TFLOGSTRING("TSY: CMmONStoreTsy::WriteCancel");
     // Check if cancelling is possible. If not, return KErrNone
     if ( iIsWriteCancellingPossible )
         {
@@ -749,7 +743,7 @@
     const TTsyReqHandle aTsyReqHandle,
     TInt* aIndex )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DELETEL_1, "TSY: CMmONStoreTsy::DeleteL");
+TFLOGSTRING("TSY: CMmONStoreTsy::DeleteL");
     // Initialize ret value
     TInt ret( KErrGeneral );
 
@@ -788,7 +782,7 @@
 void CMmONStoreTsy::CompleteDelete(
     TInt aResult )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEDELETE_1, "TSY: CMmONStoreTsy::CompleteDelete");
+TFLOGSTRING("TSY: CMmONStoreTsy::CompleteDelete");
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodeONStoreDelete );
@@ -818,7 +812,7 @@
 TInt CMmONStoreTsy::DeleteAllL (
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DELETEALLL_1, "TSY: CMmONStoreTsy::DeleteAllL");
+TFLOGSTRING("TSY: CMmONStoreTsy::DeleteAllL");
     // Init variable for DeleteAllPhase1
     iDeleteAllContinue = ETrue;
 
@@ -850,7 +844,7 @@
 void CMmONStoreTsy::CompleteDeleteAllPhase1L(
     TInt aResult )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEDELETEALLPHASE1L_1, "TSY: CMmONStoreTsy::CompleteDeleteAllPhase1L");
+TFLOGSTRING("TSY: CMmONStoreTsy::CompleteDeleteAllPhase1L");
     // Check that DeleteAll was called
     if ( iDeleteAllContinue )
         {
@@ -896,7 +890,7 @@
     // Check that deleted request handle was valid
     if ( EMultimodeONStoreReqHandleUnknown != reqHandle )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEDELETEALL_1, "TSY: CMmONStoreTsy::CompleteDeleteAll");
+TFLOGSTRING("TSY: CMmONStoreTsy::CompleteDeleteAll");        
         // Complete with error
         ReqCompleted( reqHandle, aResult );
 
@@ -914,7 +908,7 @@
     else if(EMultimodeONStoreReqHandleUnknown !=
 				 iTsyReqHandleStore->GetTsyReqHandle(EMultimodeONStoreStoreAll ))
     	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEDELETEALL_2, "TSY: CMmONStoreTsy::CompleteDeleteAll requested by StoreAllL.");
+TFLOGSTRING("TSY: CMmONStoreTsy::CompleteDeleteAll requested by StoreAllL.");
     	TInt ret (aResult);
 		    	
     	if(KErrNone == ret)
@@ -935,7 +929,7 @@
     	}
     else
     	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEDELETEALL_3, "TSY: CMmONStoreTsy::CompleteDeleteAll - the request has been cancelled or bad req handle");
+TFLOGSTRING("TSY: CMmONStoreTsy::CompleteDeleteAll - the request has been cancelled or bad req handle");
     	}
     }
 
@@ -948,7 +942,7 @@
 TInt CMmONStoreTsy::DeleteAllCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DELETEALLCANCEL_1, "TSY: CMmONStoreTsy::DeleteAllCancel");
+TFLOGSTRING("TSY: CMmONStoreTsy::DeleteAllCancel");
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodeONStoreDeleteAll );
@@ -974,7 +968,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMobileONStore::TMobileONStoreInfoV1* aInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_1, "TSY: CMmONStoreTsy::GetInfoL");
+TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL");
 
     TInt ret( KErrNone );
 
@@ -995,12 +989,12 @@
    	// Don't send request if pb init is still ongoing
 	// instead create an ADN book store and wait for it to initilize
     
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_2,  "TSY: CMmONStoreTsy::GetInfoL iPBList->GetNumberOfObjects() = %d", iMmPhone->PBList()->GetNumberOfObjects());
+TFLOGSTRING2( "TSY: CMmONStoreTsy::GetInfoL iPBList->GetNumberOfObjects() = %d", iMmPhone->PBList()->GetNumberOfObjects());
     CMmPhoneBookStoreTsy* pbStore = NULL;
 	for( TInt i = 0; (i < iMmPhone->PBList()->GetNumberOfObjects()) && (NULL == pbStore) ; i++ )
 	    {
 	    pbStore = iMmPhone->PBList()->GetMmPBByIndex( i );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_3,  "TSY: CMmONStoreTsy::GetInfoL index = %d", i);
+TFLOGSTRING2( "TSY: CMmONStoreTsy::GetInfoL index = %d", i);    
         if( (pbStore->GetPhonebookType() != KADNPhoneBook) && (pbStore->GetPhonebookType() != KFDNPhoneBook ) ) 
             {
             pbStore = NULL;
@@ -1008,12 +1002,12 @@
         else
             {
         
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_4, "TSY: CMmONStoreTsy::GetInfoL - found ADN or FDN store");
+TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - found ADN or FDN store");
 			}
    		}
 	if(NULL == pbStore)
 	    {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_5, "TSY: CMmONStoreTsy::GetInfoL - no ADN nor FDN store- creating ADN");
+TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - no ADN nor FDN store- creating ADN");
         pbStore = CMmPhoneBookStoreTsy::NewL( iMmPhone, KETelIccAdnPhoneBook );
         TInt addPBSucceeded = iMmPhone->PBList()->AddObject( pbStore );
         if(addPBSucceeded != KErrNone)
@@ -1029,13 +1023,13 @@
 
 	if ( !pbStore->IsPBInitDone())
 	    {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_6, "TSY: CMmONStoreTsy::GetInfoL - waiting for phone book to be initilized");
+TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - waiting for phone book to be initilized");
         // Save tsy req handle type
         iReqHandleType = EMultimodeONStoreGetInfo;
         return KErrNone;
 	    }
      
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_7, "TSY: CMmONStoreTsy::GetInfoL - PBInit done, complete");
+TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - PBInit done, complete");
         
     // Request to GSM extension, get used entries,
     // -1 as a index param-> specified location param not needed
@@ -1064,7 +1058,7 @@
     TInt aResult,
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEGETINFO_1, "TSY: CMmONStoreTsy::CompleteGetInfo - Result: %d", aResult );
+TFLOGSTRING2("TSY: CMmONStoreTsy::CompleteGetInfo - Result: %d", aResult );
 
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -1089,9 +1083,9 @@
 
             *iONStoreInfoChanged = iONStoreInfo;
 
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEGETINFO_2, "TSY: CMmONStoreTsy::CompleteGetInfo - Name: %S, Type: %d", iONStoreInfoChanged->iName, iONStoreInfoChanged->iType );
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEGETINFO_3, "TSY: CMmONStoreTsy::CompleteGetInfo - Total entries: %d, Used entries: %d", iONStoreInfoChanged->iTotalEntries, iONStoreInfoChanged->iUsedEntries );
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEGETINFO_4, "TSY: CMmONStoreTsy::CompleteGetInfo - Max Number length: %d, Max Name length: %d", iONStoreInfoChanged->iNumberLen, iONStoreInfoChanged->iTextLen );
+TFLOGSTRING3("TSY: CMmONStoreTsy::CompleteGetInfo - Name: %S, Type: %d", &iONStoreInfoChanged->iName, iONStoreInfoChanged->iType );
+TFLOGSTRING3("TSY: CMmONStoreTsy::CompleteGetInfo - Total entries: %d, Used entries: %d", iONStoreInfoChanged->iTotalEntries, iONStoreInfoChanged->iUsedEntries );
+TFLOGSTRING3("TSY: CMmONStoreTsy::CompleteGetInfo - Max Number length: %d, Max Name length: %d", iONStoreInfoChanged->iNumberLen, iONStoreInfoChanged->iTextLen );
             }
 
         // NULL the pointer to info supplied to TSY from the client
@@ -1110,7 +1104,7 @@
 //
 void CMmONStoreTsy::SetInfo()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_SETINFO_1, "TSY: CMmONStoreTsy::SetInfo");
+TFLOGSTRING("TSY: CMmONStoreTsy::SetInfo");
     // The name of the store
     iONStoreInfo.iName = KETelOwnNumberStore;
 
@@ -1142,7 +1136,7 @@
 TInt CMmONStoreTsy::GetInfoCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOCANCEL_1, "TSY: CMmONStoreTsy::GetInfoCancel");
+TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoCancel");
 
     iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreGetInfo );
 
@@ -1162,7 +1156,7 @@
     RMobilePhoneStore::TMobileStoreEvent* aEvent,
     TInt* aIndex )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_NOTIFYSTOREEVENT_1, "TSY: CMmONStoreTsy::NotifyStoreEvent");
+TFLOGSTRING("TSY: CMmONStoreTsy::NotifyStoreEvent");
     TTsyReqHandle requestHandle = iTsyReqHandleStore->GetTsyReqHandle( 
         EMultimodeONStoreNotifyStoreEvent );
 
@@ -1189,7 +1183,7 @@
 void CMmONStoreTsy::CompleteNotifyStoreEvent(
     TInt aLocation )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETENOTIFYSTOREEVENT_1, "TSY: CMmONStoreTsy::CompleteNotifyStoreEvent");
+TFLOGSTRING("TSY: CMmONStoreTsy::CompleteNotifyStoreEvent");
     // Reset request handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodeONStoreNotifyStoreEvent );
@@ -1218,7 +1212,7 @@
 TInt CMmONStoreTsy::NotifyStoreEventCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_NOTIFYSTOREEVENTCANCEL_1, "TSY: CMmONStoreTsy::NotifyStoreEventCancel");
+TFLOGSTRING("TSY: CMmONStoreTsy::NotifyStoreEventCancel");
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodeONStoreNotifyStoreEvent );
@@ -1245,7 +1239,7 @@
     const RMobilePhone::TClientId* aId, 
     TInt* aBufSize )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_READALLPHASE1L_1, "TSY: CMmONStoreTsy::ReadAllPhase1L");
+TFLOGSTRING("TSY: CMmONStoreTsy::ReadAllPhase1L");
     // Init return value
     TInt ret( KErrNone );
     
@@ -1288,12 +1282,12 @@
     TInt aError,
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALRETRIEVEONLISTREADSIZEL_1, "TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL");
+TFLOGSTRING("TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL");
     if ( KErrNone == aError )
         {
         TInt size;
         aDataPackage->UnPackData( size );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALRETRIEVEONLISTREADSIZEL_2, "TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL size=%d",size);
+TFLOGSTRING2("TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL size=%d",size);
         if( 0 < size )
             {
             *iReadAllBufSizePtr = size;
@@ -1302,7 +1296,7 @@
             }
         else
             {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALRETRIEVEONLISTREADSIZEL_3, "TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL size is %d", size);
+TFLOGSTRING2("TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL size is %d", size);
             CompleteReadAllPhase1Req( KErrNotFound );
             }
         }
@@ -1322,7 +1316,7 @@
 //
 void CMmONStoreTsy::MakeInternalRetrieveONListReadReqL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_MAKEINTERNALRETRIEVEONLISTREADREQL_1, "TSY: CMmONStoreTsy::MakeInternalRetrieveONListReadReqL");
+TFLOGSTRING("TSY: CMmONStoreTsy::MakeInternalRetrieveONListReadReqL");
     // Read one entry from the PhoneBook.
     TInt ret = iMmONStoreExtInterface->
         ReadL( EMmTsyONStoreReadEntryIPC,iReadAllONStoreIndex );
@@ -1349,7 +1343,7 @@
     TInt aError,
     CMmDataPackage* aDataPackage)
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALRETRIEVEONLISTREADENTRYL_1, "TSY: CMmONStoreTsy::InternalRetrieveONListReadEntryL");
+TFLOGSTRING("TSY: CMmONStoreTsy::InternalRetrieveONListReadEntryL");
     if ( KErrNone == aError )
         {
         // Check if there is data to save
@@ -1395,7 +1389,7 @@
 //
 TInt CMmONStoreTsy::CompleteReadAllPhase1L()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEREADALLPHASE1L_1, "TSY: CMmONStoreTsy::CompleteReadAllPhase1L");
+TFLOGSTRING("TSY: CMmONStoreTsy::CompleteReadAllPhase1L");
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(
         EMultimodeONStoreReadAll );
@@ -1474,7 +1468,7 @@
 void CMmONStoreTsy::CompleteReadAllPhase1Req(
     TInt aResult )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEREADALLPHASE1REQ_1, "TSY: CMmONStoreTsy::CompleteReadAllPhase1Req");
+TFLOGSTRING("TSY: CMmONStoreTsy::CompleteReadAllPhase1Req");
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodeONStoreReadAll );
@@ -1503,7 +1497,7 @@
 //
 void CMmONStoreTsy::DeleteONStoreListArrayElements()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DELETEONSTORELISTARRAYELEMENTS_1, "TSY: CMmONStoreTsy::DeleteONStoreListArrayElements");
+TFLOGSTRING("TSY: CMmONStoreTsy::DeleteONStoreListArrayElements");
     while( 0 == !iONStoreListArray->Count() )
         {
         // Delete list member
@@ -1526,7 +1520,7 @@
     const RMobilePhone::TClientId* aId,
     TDes8* aBuffer )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_READALLPHASE2_1, "TSY: CMmONStoreTsy::ReadAllPhase2");
+TFLOGSTRING("TSY: CMmONStoreTsy::ReadAllPhase2");
     // Initialize ret value
     TInt ret( KErrCorrupt );
 
@@ -1583,7 +1577,7 @@
 TInt CMmONStoreTsy::ReadAllCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_READALLCANCEL_1, "TSY: CMmONStoreTsy::ReadAllCancel");
+TFLOGSTRING("TSY: CMmONStoreTsy::ReadAllCancel");
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodeONStoreReadAll );
@@ -1611,7 +1605,7 @@
     const TTsyReqHandle aTsyReqHandle,
     TDes8* aBuffer )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_STOREALLL_1, "TSY: CMmONStoreTsy::StoreAllL");
+TFLOGSTRING("TSY: CMmONStoreTsy::StoreAllL");
     // Init return value
     TInt ret( KErrNone );
     
@@ -1631,7 +1625,7 @@
     // StoreAll overwrites ON phone store. So, first delete all store.
     ret = iMmONStoreExtInterface->DeleteAllL( 
         EMmTsyONStoreDeleteAllIPC );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_STOREALLL_2, "CMmONStoreTsy::StoreAllL - DeleteAllL() ret: %d", ret);
+TFLOGSTRING2("CMmONStoreTsy::StoreAllL - DeleteAllL() ret: %d", ret);
     
     // Message construction failed or phonet sender returned error
     if ( KErrNone != ret )
@@ -1660,13 +1654,13 @@
     TInt aError,
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALSTOREALLGETSIZEL_1, "CMmONStoreTsy::InternalStoreAllGetSizeL %d",aError);
+TFLOGSTRING2("CMmONStoreTsy::InternalStoreAllGetSizeL %d",aError);
     if ( KErrNone == aError )
         {
         TInt size;
         aDataPackage->UnPackData( size );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALSTOREALLGETSIZEL_2, "CMmONStoreTsy::InternalStoreAllGetSizeL size %d", size);
+TFLOGSTRING2("CMmONStoreTsy::InternalStoreAllGetSizeL size %d", size);
         // Check the size of ONStore and the ONList size from Client
         // Client's ONList size should not be greater than ONStore size
         if ( size > 0 && size >= iStoreAllONListSize )
@@ -1708,7 +1702,7 @@
 //
 void CMmONStoreTsy::MakeInternalStoreAllWriteReqL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_MAKEINTERNALSTOREALLWRITEREQL_1, "CMmONStoreTsy::MakeInternalStoreAllWriteReqL ");
+TFLOGSTRING("CMmONStoreTsy::MakeInternalStoreAllWriteReqL ");
     // Create ONList and push it to cleanup stack
     CMobilePhoneONList* aONList=CMobilePhoneONList::NewL();
     CleanupStack::PushL(aONList);
@@ -1784,7 +1778,7 @@
 void CMmONStoreTsy::InternalStoreAllWriteEntryL(
     TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALSTOREALLWRITEENTRYL_1, "CMmONStoreTsy::InternalStoreAllWriteEntryL %d",aResult);
+TFLOGSTRING2("CMmONStoreTsy::InternalStoreAllWriteEntryL %d",aResult);
 
 	TTsyReqHandle storeAllRequestHandle = 
 		iTsyReqHandleStore->GetTsyReqHandle(
@@ -1793,7 +1787,7 @@
 	if ( EMultimodeONStoreReqHandleUnknown == storeAllRequestHandle )
 		{
 		// The request has been cancelled or bad req handle
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALSTOREALLWRITEENTRYL_2, "The ON store request has been cancelled or bad req handle");
+TFLOGSTRING("The ON store request has been cancelled or bad req handle");
 		return;
 		}
 
@@ -1817,7 +1811,7 @@
 void CMmONStoreTsy::CompleteStoreAll(
     TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETESTOREALL_1, "CMmONStoreTsy::CompleteStoreAll %d",aResult);
+TFLOGSTRING2("CMmONStoreTsy::CompleteStoreAll %d",aResult);
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodeONStoreStoreAll );
@@ -1855,7 +1849,7 @@
 TInt CMmONStoreTsy::StoreAllCancel(
     TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_STOREALLCANCEL_1, "CMmONStoreTsy::StoreAllCancel");
+TFLOGSTRING("CMmONStoreTsy::StoreAllCancel");
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodeONStoreStoreAll );
@@ -1912,7 +1906,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     const TInt aError )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_REQCOMPLETED_1, "TSY: CMmONStoreTsy::ReqCompleted Completed - Handle:%d Error:%d", aTsyReqHandle, aError);
+TFLOGSTRING3("TSY: CMmONStoreTsy::ReqCompleted Completed - Handle:%d Error:%d", aTsyReqHandle, aError);
 
     CTelObject::ReqCompleted( aTsyReqHandle, aError );
     }
@@ -1999,7 +1993,7 @@
     TInt aReqHandleType,
     TInt aError )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETE_1,  "TSY: CMmONStoreTsy::Complete - ReqHandleType: %d Error: %d", aReqHandleType, aError );
+TFLOGSTRING3( "TSY: CMmONStoreTsy::Complete - ReqHandleType: %d Error: %d", aReqHandleType, aError );    
     //All possible TSY req handle types are listed in the
     //switch case below.
     switch( aReqHandleType )
@@ -2046,7 +2040,7 @@
 //
 void CMmONStoreTsy::PhoneBookStoreInitCompleteL(TInt aError)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_PHONEBOOKSTOREINITCOMPLETEL_1, "TSY: CMmONStoreTsy::PhoneBookStoreInitCompleteL ");
+    TFLOGSTRING("TSY: CMmONStoreTsy::PhoneBookStoreInitCompleteL ");
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreGetInfo );   
     if( EMultimodeONStoreReqHandleUnknown != reqHandle )
         {

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,16 +16,11 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmphonebookstoretsyTraces.h"
-#endif
-
 #include "cmmphonebookstoretsy.h"
 #include "cmmpblist.h"
 #include "cmmphonebookstoregsmext.h"
 #include "CMmCustomTsy.h"
+#include <ctsy/tflogger.h>
 #include <ctsy/rmmcustomapi.h>
 #include "cmmmessagemanagerbase.h"
 #include "cmmtsyreqhandlestore.h"
@@ -44,7 +39,7 @@
 
 void CMmPhoneBookStoreTsy::ConstructL( const TDesC& aName )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONSTRUCTL_1, "TSY: CMmPhoneBookStoreTsy::ConstructL - entered");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ConstructL - entered");
 #ifdef REQHANDLE_TIMER
     // Create req handle store
     iTsyReqHandleStore = CMmTsyReqHandleStore::NewL( this,
@@ -79,7 +74,7 @@
     // Set phonebookrelated name and number max values
     SetMaxNameAndNumLenght();
 
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONSTRUCTL_2, "TSY: CMmPhoneBookStoreTsy::ConstructL - PB %S", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ConstructL - PB %S", &iPhoneBookName);
 
     // Used entries is zero in the start
     iUsedEntries = 0;
@@ -95,9 +90,9 @@
     iRequestedOnPBRead = EFalse;
     iIsPBInitCompleted = EFalse;
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONSTRUCTL_3, "TSY: CMmPhoneBookStoreTsy::ConstructL - iIsPhonebookInitialized: %u", (TUint)iStoreInfoData->iIsPhonebookInitialized);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONSTRUCTL_4, "TSY: CMmPhoneBookStoreTsy::ConstructL - iSIMReady: %u", (TUint)bootState->iSIMReady);
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONSTRUCTL_5, "TSY: CMmPhoneBookStoreTsy::ConstructL - before initialization");
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ConstructL - iIsPhonebookInitialized: %i", iStoreInfoData->iIsPhonebookInitialized);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ConstructL - iSIMReady: %i", bootState->iSIMReady);
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ConstructL - before initialization");
     if(bootState->iSIMReady)
         {
         SimIsReady();
@@ -112,7 +107,7 @@
     CMmPhoneTsy* aMmPhone,
     const TDesC& aName )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_NEWL_1, "TSY: CMmPhoneBookStoreTsy::NewL - entered");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::NewL - entered");
     
     CMmPhoneBookStoreTsy* mmPhoneBookStoreTsy =
         new ( ELeave ) CMmPhoneBookStoreTsy();
@@ -131,7 +126,7 @@
 
 CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_1, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - PB %S", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - PB %S", &iPhoneBookName);
 
     if ( iMmPhoneTsy )
         {
@@ -141,11 +136,11 @@
             {
             RMmCustomAPI::TPndCacheStatus fdnCacheStatus = 
             iMmPhoneTsy->GetCustomTsy()->GetPhonebookCacheStatus( KFDNPhoneBook );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_2, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - FDN cachestatus %d", fdnCacheStatus);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - FDN cachestatus %d", fdnCacheStatus);
 
             RMmCustomAPI::TPndCacheStatus adnCacheStatus =
             iMmPhoneTsy->GetCustomTsy()->GetPhonebookCacheStatus( KADNPhoneBook );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_3, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - ADN cachestatus %d", adnCacheStatus);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - ADN cachestatus %d", adnCacheStatus);
 
             // Check if the caching is active
             if ( bootState->iCachingActive )
@@ -166,8 +161,8 @@
                         package.SetPhoneBookName( iPhoneBookName );
                         TRAP_IGNORE( iMmPhoneTsy->MessageManager()->HandleRequestL( 
                                 EMmTsyPhoneBookStoreCacheCancelIPC, &package ); );
-                        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_4, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CacheCancel for %d", iPhoneBookType);
-                        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_5, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CachingActive = EFalse");
+                        TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CacheCancel for %d", iPhoneBookType);
+                        TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CachingActive = EFalse");
 
                         bootState->iCachingActive = EFalse;
                         }
@@ -179,7 +174,7 @@
                                 || RMmCustomAPI::ECacheFailed == adnCacheStatus )) && (KFDNPhoneBook == iPhoneBookType) )  
 
                     {
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_6, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CachingActive = ETrue");
+                    TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CachingActive = ETrue");
                     // Set the caching back to active
                     bootState->iCachingActive = ETrue;                 
                     }
@@ -304,7 +299,7 @@
 CTelObject::TReqMode CMmPhoneBookStoreTsy::ReqModeL(
     const TInt aIpc )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_REQMODEL_1, "TSY: CMmPhoneBookStoreTsy::ReqModeL IPC:%d", aIpc);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReqModeL IPC:%d", aIpc);
 
     CTelObject::TReqMode ret = 0;
     switch ( aIpc )
@@ -443,7 +438,7 @@
     const TInt aIpc,
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CANCELSERVICE_1, "TSY: CMmPhoneBookStoreTsy::CancelService IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::CancelService IPC:%d Handle:%d", aIpc, aTsyReqHandle);
 
     TInt ret( KErrNone );
 
@@ -469,7 +464,7 @@
         default:
             break;
         }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CANCELSERVICE_2, "TSY: CMmPhoneBookStoreTsy::CancelService return: %d", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CancelService return: %d", ret);
 
     return ret;
     }
@@ -488,7 +483,7 @@
     const TInt aIpc,
     const TDataPackage& aPackage )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_EXTFUNC_1, "TSY: CMmPhoneBookStoreTsy::ExtFunc IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::ExtFunc IPC:%d Handle:%d", aIpc, aTsyReqHandle);
 
     TInt ret = KErrNone;
     TInt trapError = KErrNone;
@@ -542,7 +537,7 @@
     const TInt aIpc,
     const TDataPackage& aPackage )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DOEXTFUNCL_1, "TSY: CMmPhoneBookStoreTsy::DoExtFuncL IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::DoExtFuncL IPC:%d Handle:%d", aIpc, aTsyReqHandle);
 
     TAny* dataPtr=aPackage.Ptr1();
     TAny* dataPtr2=aPackage.Ptr2();
@@ -635,7 +630,7 @@
         {
         iPhoneBookType = KMBDNPhoneBook; //MBDN
         }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SETPHONEBOOKTYPE_1,  "TSY: CMmPhoneBookStoreTsy::SetPhoneBookType - Type: %d", iPhoneBookType);
+TFLOGSTRING2( "TSY: CMmPhoneBookStoreTsy::SetPhoneBookType - Type: %d", iPhoneBookType);
     }
 
 // ---------------------------------------------------------------------------
@@ -648,8 +643,8 @@
     TInt aResult,
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEPBSTOREINITIALIZATIONL_1, "TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL - Result: %d",aResult );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEPBSTOREINITIALIZATIONL_2, "TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL - PhoneBookType: %u",iPhoneBookType );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL - Result: %i",aResult );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL - PhoneBookType: %u",iPhoneBookType );
 
     // If initialization made successfully
     // fill phonebook related static data
@@ -676,7 +671,7 @@
     //Initialisation has failed
         {
         CMmCustomTsy* mmCustom = iMmPhoneTsy->GetCustomTsy();
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEPBSTOREINITIALIZATIONL_3, "TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL has failed" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL has failed" );
 
         if ( NULL != mmCustom )
             {
@@ -737,7 +732,7 @@
 //
 void CMmPhoneBookStoreTsy::SetMaxNameAndNumLenght()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SETMAXNAMEANDNUMLENGHT_1, "TSY: CMmPhoneBookStoreTsy::SetMaxNameAndNumLenght");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SetMaxNameAndNumLenght");
     switch ( iPhoneBookType )
         {
         case KADNPhoneBook:
@@ -786,7 +781,7 @@
     RMobilePhoneBookStore::TPBIndexAndNumEntries* aIndexAndEntries,
     TDes8* aPBData, TBool aContinuedRead )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_1, "TSY: CMmPhoneBookStoreTsy::ReadL");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL");
 
     // Initialise ret to KErrServerBusy
     TInt ret = KErrServerBusy;
@@ -804,7 +799,7 @@
     if ( !aContinuedRead && EMultimodePhoneBookStoreReqHandleUnknown != phoneBookStoreReadHandle )
         {
         // If request handle already exists return KErrServerBusy
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_2, "TSY: CMmPhoneBookStoreTsy::ReadL - Handle already exists");
+        TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Handle already exists");
         ReqCompleted( aTsyReqHandle, ret );
         }
     // check the buffer size
@@ -817,7 +812,7 @@
         !( iReadReqStore->iCaching ) &&
         (KADNPhoneBook == iPhoneBookType || KFDNPhoneBook == iPhoneBookType))
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_3, "TSY: CMmPhoneBookStoreTsy::ReadL - SIM refresh registration failed Cache info can be corrupted - ");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - SIM refresh registration failed Cache info can be corrupted - ");
 
         //Store Read req params for new request
         iReadReqStore->iReqHandle = aTsyReqHandle;
@@ -839,7 +834,7 @@
                 KFDNPhoneBook == iPhoneBookType ) &&
              ( !iStoreInfoData->iIsPhonebookInitialized || !iCacheReady ) )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_4, "TSY: CMmPhoneBookStoreTsy::ReadL - Initiliszation ongoing -> Read not possible");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Initiliszation ongoing -> Read not possible");
             // If phonebook initialisation is not ready for AND and FDN phonebooks,
             // complete with KErrInUse. This is done becauce TSY can not handle
             // multible simultaneously request to certain phonebook.
@@ -862,8 +857,8 @@
         // number of records.
         if ( ( 1 > iIndexToRead ) || ( 1 > aIndexAndEntries->iNumSlots ) )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_5, "TSY: CMmPhoneBookStoreTsy::ReadL - Index is less than 1 or aIndexAndEntries->iNumSlots is less then 1" );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_6, "TSY: CMmPhoneBookStoreTsy::ReadL - Index %d ", iIndexToRead);
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Index is less than 1 or aIndexAndEntries->iNumSlots is less then 1" );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadL - Index %i ", iIndexToRead);
             iIndexAndEntries = NULL;
             iIndexToRead = 0;
             ReqCompleted( aTsyReqHandle, KErrArgument );
@@ -871,8 +866,8 @@
         else if ( KBDNPhoneBook != iPhoneBookType && 
                   aIndexAndEntries->iNumSlots > iMultipleReadPosTo  )
             {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_7, "TSY: CMmPhoneBookStoreTsy::ReadL - iPhoneBookType %u: ", iPhoneBookType);
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_8, "TSY: CMmPhoneBookStoreTsy::ReadL - iNumSlots: %d > iMultipleReadPosTo: %d", aIndexAndEntries->iNumSlots, iMultipleReadPosTo );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadL - iPhoneBookType %i: ", iPhoneBookType);
+TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::ReadL - iNumSlots: %i > iMultipleReadPosTo: %i", aIndexAndEntries->iNumSlots, iMultipleReadPosTo );
             iIndexAndEntries = NULL;
             iIndexToRead = 0;
             ReqCompleted( aTsyReqHandle, KErrNotFound );
@@ -901,7 +896,7 @@
             // If cache request, but cache is not yet ready
             else if ( ( NULL == iPBStoreCache ) || !iCacheReady )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_9, "TSY: CMmPhoneBookStoreTsy::ReadL - Cache is not yet ready" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Cache is not yet ready" );
                 ret = KErrNotReady;
                 }
             // Set cache request for completion handling
@@ -912,7 +907,7 @@
                 if ( ( iNumEntriesToRead ) > iMultipleReadPosTo )
                     {
                     ret = KErrArgument;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_10, "TSY: CMmPhoneBookStoreTsy::ReadL - KErrArgument" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - KErrArgument" );
                     }
                 }
 
@@ -937,20 +932,20 @@
             // Handle cached request
             else
                 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_11, "TSY: CMmPhoneBookStoreTsy::ReadL - iIndexToRead %d ", iIndexToRead);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_12, "TSY: CMmPhoneBookStoreTsy::ReadL - iNumSlots %d ", iNumEntriesToRead);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadL - iIndexToRead %i ", iIndexToRead);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadL - iNumSlots %i ", iNumEntriesToRead);
                 ReadEntriesFromArrayL( EPBStoreCacheArray );
                 aIndexAndEntries->iNumSlots = iNumEntriesFilled;
                 //This condition will arise when client has sent a buffer insufficient to
                 //hold even one entry. KErrArgument has to be returned in this case.
                 if ( ( iRetFillBufferedDes == KErrOverflow ) && ( iNumEntriesFilled == 0 ) )
                     {
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_13, "TSY: CMmPhoneBookStoreTsy::ReadL - Insufficient buffer to hold even 1 entry." );
+                    TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Insufficient buffer to hold even 1 entry." );
                     ret = KErrArgument;
                     }
                 else if ( 0 == iNumEntriesFilled )
                     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_14, "TSY: CMmPhoneBookStoreTsy::ReadL - iNumEntriesFilled is 0 " );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - iNumEntriesFilled is 0 " );
                     ret = KErrNotFound;
                     }
                 ReqCompleted( aTsyReqHandle, ret );
@@ -984,7 +979,7 @@
     TInt aResult,
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEREADL_1, "TSY: CMmPhoneBookStoreTsy::CompleteReadL - aResult: %d",aResult );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteReadL - aResult: %i",aResult );
 
     TInt errCode = aResult;
     // Reset req handle. Returns the deleted req handle
@@ -1002,7 +997,7 @@
             //hold even one entry. KErrArgument has to be returned in this case.
             if ( ( iRetFillBufferedDes == KErrOverflow ) && ( iNumEntriesFilled == 0 ) )
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEREADL_2, "TSY: CMmPhoneBookStoreTsy::CompleteReadL - Insufficient buffer to hold even 1 entry." );
+                TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompleteReadL - Insufficient buffer to hold even 1 entry." );
                 errCode = KErrArgument;
                 }
             }
@@ -1032,7 +1027,7 @@
 //
 TInt CMmPhoneBookStoreTsy::CountEntriesL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COUNTENTRIESL_1, "TSY: CMmPhoneBookStoreTsy::CountEntriesL called");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CountEntriesL called");
 
     // before phonebook requests, phonebook must be initialized
     TInt returnValue( KErrNone );
@@ -1054,7 +1049,7 @@
     TInt aResult,
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECOUNTENTRIES_1, "TSY: CMmPhoneBookStoreTsy::CompleteCountEntries - Result: %d", aResult );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCountEntries - Result: %i", aResult );
     TInt numOfEntries( 0 );
 
     //reset request handle. Returns the deleted req handle.
@@ -1091,7 +1086,7 @@
 
 void CMmPhoneBookStoreTsy::CacheEntriesL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_1, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - entered");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - entered");
     // Get Phonebook related DLL -static data
 
     // Check if phonebook has been initialized successfully. Caching of ADN
@@ -1100,7 +1095,7 @@
          ( EFalse == iStoreInfoData->iIsPhonebookInitializeFailed ||
            KADNPhoneBook != iPhoneBookType ) )
         {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_2, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Cache PB %S ", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Cache PB %S ", &iPhoneBookName);
 
 		TInt ret = KErrNone;
 		CMmPhoneTsy::TNosBootState* bootState = iMmPhoneTsy->NosBootState();
@@ -1118,7 +1113,7 @@
                         iPBStoreCache->ResetAndDestroy();
                         delete iPBStoreCache;
                         iPBStoreCache = NULL;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_3, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Old cache deleted");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Old cache deleted");
                         }
                     
                     //Inform phonebook that the cache is not ready for refresh
@@ -1130,11 +1125,11 @@
                 }
             else if ( iCacheReady )
                 {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_4, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S cache entries ready", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S cache entries ready", &iPhoneBookName);
                 }
         if ( KErrNone != ret)
             {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_5, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S caching failed!", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S caching failed!", &iPhoneBookName);
             }
         }
     // Phonebook not initialized -> let's do it before caching
@@ -1142,7 +1137,7 @@
         || iStoreInfoData->iIsPhonebookInitializeFailed )
         && !iMmPhoneTsy->IsPBInitActive() )
         {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_6, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Starting initialization PB: %S", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Starting initialization PB: %S", &iPhoneBookName);
         // before phonebook requests, phonebook must be initialized
         iMmPhoneBookStoreExtInterface->InitPhonebook(
             EMmTsyPhoneBookStoreInitIPC, iPhoneBookName );
@@ -1164,8 +1159,8 @@
 void CMmPhoneBookStoreTsy::CompleteCachingL(
     TInt aResult, CMmDataPackage* aDataPackage )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_1, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - PB %S Caching completed", iPhoneBookName);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_2, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - Result: %d",aResult );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - PB %S Caching completed", &iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - Result: %i",aResult );
 	
 #ifdef USING_CTSY_DISPATCHER 		
 	aDataPackage->UnPackData(iPBStoreCache);
@@ -1181,7 +1176,7 @@
     // the number of used entries
     if ( KErrNone == aResult )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_3, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - iPBStoreCache->Count: %d",iPBStoreCache->Count() );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - iPBStoreCache->Count: %i",iPBStoreCache->Count() );
         iUsedEntries = iPBStoreCache->Count();
         //Set the caching ready only if request is successfull.
         //when FDN is on, the ADN caching is not successful. Meanwhile the FDN
@@ -1192,7 +1187,7 @@
         iCacheReady = ETrue;
         }
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_4, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - iUsedEntries: %d",iUsedEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - iUsedEntries: %i",iUsedEntries );
 
     bootState->iCachingActive = EFalse;
 
@@ -1201,7 +1196,7 @@
     // Check if client has requested caching before completing
     if ( NULL != mmCustom && !iMmPhoneTsy->IsRefreshOngoing() )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_5, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - Client refresh req complete" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - Client refresh req complete" );
         if ( KErrNone == aResult )
             {
             mmCustom->UpdateCacheStatus( RMmCustomAPI::ECacheReady,
@@ -1229,7 +1224,7 @@
     // through refresh
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_6, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - SIM refresh req complete" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - SIM refresh req complete" );
 
         // Check for which phonebook the caching must be completed
         if ( !iPhoneBookName.CompareF( KETelIccAdnPhoneBook ) )
@@ -1243,7 +1238,7 @@
         //NOTIFY THE PHONEBOOK that the cache is ready
         if ( NULL != mmCustom )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_7, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL, mmCustom->UpdateCacheStatus" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompleteCachingL, mmCustom->UpdateCacheStatus" );
             if ( KErrNone == aResult )
                 {
                 mmCustom->UpdateCacheStatus(
@@ -1265,8 +1260,8 @@
             mmCustom->GetPhonebookCacheStatus( KFDNPhoneBook );
         RMmCustomAPI::TPndCacheStatus adnCacheStatus =
             mmCustom->GetPhonebookCacheStatus( KADNPhoneBook );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_8, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - FDN cachestatus %d", fdnCacheStatus);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_9, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - ADN cachestatus %d", adnCacheStatus);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - FDN cachestatus %d", fdnCacheStatus);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - ADN cachestatus %d", adnCacheStatus);
 
 	    // Set caching back to active if either FDN or ADN is caching
         if ( RMmCustomAPI::ECacheNotReady == fdnCacheStatus 
@@ -1290,17 +1285,17 @@
 
     if ( EPBStoreCacheArray == aArrayType )
         {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READENTRIESFROMARRAYL_1, "TSY: CMmPhoneBookStoreTsy::ReadEntriesFromCache %S, iPBStoreCache", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadEntriesFromCache %S, iPBStoreCache", &iPhoneBookName);
         ptrToArray = iPBStoreCache;
         }
     else if ( EPBStoreReadEntriesArray == aArrayType )
         {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READENTRIESFROMARRAYL_2, "TSY: CMmPhoneBookStoreTsy::ReadEntriesFromEntryArray %S, iPBStoreReadEntries", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadEntriesFromEntryArray %S, iPBStoreReadEntries", &iPhoneBookName);
         ptrToArray = iPBStoreReadEntries;
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READENTRIESFROMARRAYL_3, "TSY: CMmPhoneBookStoreTsy::ReadEntriesFromEntryArray invalid aArrayType");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadEntriesFromEntryArray invalid aArrayType");
         User::Leave(KErrNotSupported);
         }
 
@@ -1337,7 +1332,7 @@
 //
 void CMmPhoneBookStoreTsy::ReadToCacheL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READTOCACHEL_1, "TSY: CMmPhoneBookStoreTsy::ReadToCacheL");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadToCacheL");
 
     // Call ReadL from GSM extension
     iMmPhoneBookStoreExtInterface->ReadToCacheL(
@@ -1356,8 +1351,8 @@
     CPhoneBookStoreEntry* aEntry,
     TBool aDeleteEntry )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_1, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL");
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_2, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iPBStoreCache->Count(): %d ", iPBStoreCache->Count() );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL");
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iPBStoreCache->Count(): %i ", iPBStoreCache->Count() );
 
     if(aEntry == NULL)
         {
@@ -1370,7 +1365,7 @@
 		User::Leave(KErrArgument);
         }
     
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_3, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - aEntry->Location(): %u ", aEntry->iLocation );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - aEntry->Location(): %i ", aEntry->iLocation );
 
     TInt result( KErrNotFound );
     TInt updateIndex( 0 );
@@ -1380,7 +1375,7 @@
         {
         if ( ( iPBStoreCache->At( index ) )->iLocation == aEntry->iLocation )
             {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_4, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iPBStoreCache->iLocation:  %u ", aEntry->iLocation);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iPBStoreCache->iLocation:  %i ", aEntry->iLocation);
             updateIndex =  index;
             result = KErrNone;
             }
@@ -1407,7 +1402,7 @@
             }     
         else
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_5, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL, Deleted entry is not in cache! ");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL, Deleted entry is not in cache! ");                
             }          
         }
     // Entry found
@@ -1419,7 +1414,7 @@
             ( aEntry->iEmail && aEntry->iEmail->MdcaCount() > 0 ) ||
             ( aEntry->iSne && aEntry->iSne->MdcaCount() > 0 ) )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_6, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - Change existing entry");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - Change existing entry");
             // Every update/deletion of an existing phonebook entry or the
             // addition of a new phone book entry, incremements the
             // iChangeCounter.
@@ -1431,13 +1426,13 @@
                 iPBStoreCache->At( updateIndex );
             if ( entryToDelete == iDeleteEntry )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_7, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iDeleteEntry");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iDeleteEntry");
                 // reset iDeleteEntry member
                 iDeleteEntry = NULL;
                 }
             if ( entryToDelete == iWriteEntry )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_8, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iWriteEntry");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iWriteEntry");
                 // reset iWriteEntry member
                 iWriteEntry = NULL;
                 }
@@ -1445,10 +1440,10 @@
             entryToDelete = NULL;
             iPBStoreCache->Delete( updateIndex );
             iPBStoreCache->InsertL( updateIndex, aEntry );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_9, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - updateIndex: %d", updateIndex);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - updateIndex: %i", updateIndex);
             if ( aEntry == iWriteEntry )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_10, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - aEntry == iWriteEntry");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - aEntry == iWriteEntry");
                 // reset iWriteEntry member
                 iWriteEntry = NULL;
                 }
@@ -1461,7 +1456,7 @@
         // Case: <Delete entry from cache>
         else
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_11, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - Delete entry");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - Delete entry");
             // decrease iUsedEntries
             iUsedEntries--;
 
@@ -1473,13 +1468,13 @@
                 iPBStoreCache->At( updateIndex );
             if ( entryToDelete == iDeleteEntry )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_12, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iDeleteEntry");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iDeleteEntry");
                 // reset iDeleteEntry member
                 iDeleteEntry = NULL;
                 }
             else
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_13, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iWriteEntry = NULL");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iWriteEntry = NULL");
                 // reset iWriteEntry member
                 iWriteEntry = NULL;
                 }
@@ -1536,7 +1531,7 @@
         if ( 0 == marked )
             {
             ret = pbBuffer->AddNewEntryTag();
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_1, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 0, ret: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 0, ret: %i ", ret);
             }
         // Append Index
         else if ( 1 == marked )
@@ -1544,7 +1539,7 @@
             ret = pbBuffer->PutTagAndValue(
                 RMobilePhoneBookStore::ETagPBAdnIndex, (TUint16)(
                 aPhoneBookStoreResp->iLocation ) );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_2, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 1, ret: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 1, ret: %i ", ret);
             }
         // Append Name
         else if ( 2 == marked )
@@ -1556,7 +1551,7 @@
                     RMobilePhoneBookStore::ETagPBText,
                     aPhoneBookStoreResp->iText->Des() );
                 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_3, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 2, ret: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 2, ret: %i ", ret);
             }
         // Append Number
         else if ( 3 == marked )
@@ -1568,7 +1563,7 @@
                     RMobilePhoneBookStore::ETagPBNumber,
                     aPhoneBookStoreResp->iNumber->Des() );
                 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_4, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 3, ret: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 3, ret: %i ", ret);
             }
         // Append Email
         else if ( 4 == marked )
@@ -1581,7 +1576,7 @@
                     RMobilePhoneBookStore::ETagPBEmailAddress,
                     aPhoneBookStoreResp->iEmail->MdcaPoint( numEmails ) );
                 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_5, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 4, ret: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 4, ret: %i ", ret);
             }
         // Append Sne
         else if ( 5 == marked )
@@ -1594,7 +1589,7 @@
                     RMobilePhoneBookStore::ETagPBSecondName,
                     aPhoneBookStoreResp->iSne->MdcaPoint( numSnes ) );
                 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_6, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 5, ret: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 5, ret: %i ", ret);
             }
         // Append Anr
         else if ( 6 == marked )
@@ -1608,7 +1603,7 @@
                     RMobilePhoneBookStore::ETagPBNumber,
                     aPhoneBookStoreResp->iAnr->MdcaPoint( numAnrs ) );
                 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_7, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 6, ret: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 6, ret: %i ", ret);
             }
 
         marked++;
@@ -1632,12 +1627,12 @@
     
     CleanupStack::PopAndDestroy(pbBuffer);
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_8, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - returnvalue: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - returnvalue: %i ", ret);
 
     //If simrefresh registration is failed prevent new cache
     if( KErrOverflow == ret && !( iMmPhoneTsy->GetSimRefreshRegister() ) )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_9, "TSY: CMmPhoneBookStoreTsy::ReadL - Prevent new cache" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Prevent new cache" );
         iReadReqStore->iCaching = ETrue;
         }
 
@@ -1656,7 +1651,7 @@
 TInt CMmPhoneBookStoreTsy::ReadCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READCANCEL_1, "TSY: CMmPhoneBookStoreTsy::ReadCancel - Handle:%d", aTsyReqHandle );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadCancel - Handle:%d", aTsyReqHandle );
 
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -1692,12 +1687,12 @@
     TDesC8* aPBData,
     TInt* aIndex )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_WRITEL_1, "TSY: CMmPhoneBookStoreTsy::WriteL - EtelIndex: %d",*aIndex );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::WriteL - EtelIndex: %i",*aIndex );
 
     //SDN phonebook can't be updated by user.
     if (iPhoneBookType == KSDNPhoneBook)
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_WRITEL_2, "TSY: CMmPhoneBookStoreTsy::WriteL - SDN phonebook entry can't be updated");
+        TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::WriteL - SDN phonebook entry can't be updated");
         ReqCompleted( aTsyReqHandle, KErrAccessDenied );
         }
     else
@@ -1734,7 +1729,7 @@
                 // Straight write-forwarding to SIM server,
                 TInt index = *aIndex;
     
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_WRITEL_3, "TSY: CMmPhoneBookStoreTsy::WriteL - Straight write-forwarding to SIM");
+    TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::WriteL - Straight write-forwarding to SIM");
                 ret = WriteByIndexL( index );
                 }
     
@@ -1818,7 +1813,7 @@
     TInt aResult,
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_1, "TSY: CMmPhoneBookStoreTsy::CompleteWriteL - Result: %d",aResult );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteWriteL - Result: %i",aResult );
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodePhoneBookStoreWrite );
@@ -1867,14 +1862,14 @@
                 //Update Adn Max Num Length
                 iStoreInfoData->iADNNumberLengthMax =
                     pbEntryInfo.iMaxNumLength;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_2, "TSY: CMmPhoneBookStoreTsy::CompleteWriteL: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteWriteL: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
                 }
             else if ( KFDNPhoneBook == iPhoneBookType )
                 {
                 //Update Fdn Max Num Length
                 iStoreInfoData->iFDNNumberLengthMax =
                     pbEntryInfo.iMaxNumLength;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_3, "TSY: CMmPhoneBookStoreTsy::CompleteWriteL:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteWriteL:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
                 }
             else if ( KVMBXPhoneBook == iPhoneBookType )
                 {
@@ -1884,7 +1879,7 @@
                     iStoreInfoData->iVMBXNumberLengthMax =
                         pbEntryInfo.iMaxNumLength;
                     }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_4, "TSY: CMmPhoneBookStoreTsy::CompleteWriteL:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteWriteL:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
                 }
             else if ( KMBDNPhoneBook == iPhoneBookType )
                 {
@@ -1894,7 +1889,7 @@
                     iStoreInfoData->iMBDNNumberLengthMax =
                         pbEntryInfo.iMaxNumLength;
                     }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_5, "TSY: CMmPhoneBookStoreTsy::CompleteWriteL:MBDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteWriteL:MBDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
                 }
             CompleteNotifyStoreEvent( pbEntryInfo.iLocation );
             }
@@ -1983,7 +1978,7 @@
                     ret = pbBuffer->GetValue( textPtr );
                     if ( iMaxTextLen < textPtr.Length() )
                         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_1, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Text length is more than KPBStoreTextSize " );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Text length is more than KPBStoreTextSize " );
                         ret = CMmCommonStaticUtility::EpocErrorCode(
                             KErrTooBig, KErrGsm0707TextStringTooLong );
                         }
@@ -2059,13 +2054,13 @@
                             }
                         break;
                     case RMobilePhoneBookStore::ETagPBText:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_2, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart ETagPBText" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart ETagPBText" );
                         break;
                     case RMobilePhoneBookStore::ETagPBTonNpi:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_3, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart ETagPBTonNpi" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart ETagPBTonNpi" );
                         break;
                     default:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_4, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart KErrArgument" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart KErrArgument" );
                         ret = KErrArgument;
                         break;
                     }
@@ -2073,7 +2068,7 @@
                 break;
                 // Unknown Tag, complete with KErrArgument
                 default:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_5, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Unknown Tag " );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Unknown Tag " );
                     ret = KErrArgument;
                     break;
                 }
@@ -2082,7 +2077,7 @@
             if ( KErrNone == ret )
                 {
                 ret = pbBuffer->GetTagAndType( tagValue, tagType );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_6, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::GetNewField tagValue: %d ", tagValue);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::GetNewField tagValue: %d ", tagValue);
                 }         
             }
         if ( KErrNotFound != ret )
@@ -2093,7 +2088,7 @@
     // Bad descriptor, no new entry found
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_7, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Bad descriptor " );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Bad descriptor " );
         returnValue = KErrArgument;
         }
 
@@ -2113,12 +2108,12 @@
     const TTsyReqHandle aTsyReqHandle,
     TInt* aIndex )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DELETEL_1, "TSY: CMmPhoneBookStoreTsy::DeleteL - aIndex: %d",*aIndex );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::DeleteL - aIndex: %i",*aIndex );
 
     //SDN phonebook can't be updated by user.
     if (iPhoneBookType == KSDNPhoneBook)
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DELETEL_2, "TSY: CMmPhoneBookStoreTsy::DeleteL - SDN phonebook entry can't be updated");
+        TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::DeleteL - SDN phonebook entry can't be updated");
         ReqCompleted( aTsyReqHandle, KErrAccessDenied );
         }
     else
@@ -2182,7 +2177,7 @@
     TInt aResult,
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_1, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteL - Result: %d",aResult );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteL - Result: %i",aResult );
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodePhoneStoreDelete );
@@ -2225,14 +2220,14 @@
                 //Update Adn Max Num Length
                 iStoreInfoData->iADNNumberLengthMax =
                     pbEntryInfo.iMaxNumLength;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_2, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteL: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteL: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
                 }
             else if ( KFDNPhoneBook == iPhoneBookType )
                 {
                 //Update Fdn Max Num Length
                 iStoreInfoData->iFDNNumberLengthMax =
                     pbEntryInfo.iMaxNumLength;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_3, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteL:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteL:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
                 }
             else if ( KVMBXPhoneBook == iPhoneBookType )
                 {
@@ -2242,7 +2237,7 @@
                     iStoreInfoData->iVMBXNumberLengthMax =
                         pbEntryInfo.iMaxNumLength;
                     }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_4, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteL:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteL:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
                 }
             }
         
@@ -2290,12 +2285,12 @@
 TInt CMmPhoneBookStoreTsy::DeleteAllL(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DELETEALLL_1, "TSY: CMmPhoneBookStoreTsy::DeleteAllL - Handle:%d", aTsyReqHandle );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::DeleteAllL - Handle:%d", aTsyReqHandle );
 
     //SDN phonebook can't be updated by user.
     if (iPhoneBookType == KSDNPhoneBook)
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DELETEALLL_2, "TSY: CMmPhoneBookStoreTsy::DeleteAllL - SDN phonebook entry can't be updated");
+        TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::DeleteAllL - SDN phonebook entry can't be updated");
         ReqCompleted( aTsyReqHandle, KErrAccessDenied );
         }
     else
@@ -2331,7 +2326,7 @@
     TInt aResult,
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_1, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll - Result: %d",aResult );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll - Result: %i",aResult );
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodePhoneStoreDeleteAll );
@@ -2363,14 +2358,14 @@
                 //Update Adn Max Num Length
                 iStoreInfoData->iADNNumberLengthMax =
                     pbEntryInfo.iMaxNumLength;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_2, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
                 }
             else if ( KFDNPhoneBook == iPhoneBookType )
                 {
                 //Update Fdn Max Num Length
                 iStoreInfoData->iFDNNumberLengthMax =
                     pbEntryInfo.iMaxNumLength;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_3, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
                 }
             else if ( KVMBXPhoneBook == iPhoneBookType )
                 {
@@ -2380,7 +2375,7 @@
                     iStoreInfoData->iVMBXNumberLengthMax =
                         pbEntryInfo.iMaxNumLength;
                     }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_4, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
                 }
 
             // Complete notify store event
@@ -2407,7 +2402,7 @@
     TDes8* aInfo )
     {
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_1, "TSY: CMmPhoneBookStoreTsy::GetInfoL Handle:%d", aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL Handle:%d", aTsyReqHandle);
 
     TInt ret( KErrNone );
     TTsyReqHandle getInfoHandle =
@@ -2458,12 +2453,12 @@
         // will be delivered to the client.
         if ( KBDNPhoneBook == iPhoneBookType )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_2, "TSY: CMmPhoneBookStoreTsy::GetInfoL - BDN" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - BDN" );
             }
         // If PB type is ADN, total entries and used entries already read
         else if ( KADNPhoneBook == iPhoneBookType )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_3, "TSY: CMmPhoneBookStoreTsy::GetInfoL - ADN" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - ADN" );
             ret = KErrNotReady;
 
             //if cache is ready, set information and get name length
@@ -2482,7 +2477,7 @@
                 // The total number of entries
                 iPhoneBookInfoChanged->iTotalEntries =
                     iStoreInfoData->iADNNumOfEntries;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_4, "TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %d",iStoreInfoData->iADNNumOfEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %i",iStoreInfoData->iADNNumOfEntries );
 
                 // Check if Email, SNE & ANR Caps are supported + GRP
 
@@ -2491,28 +2486,28 @@
                     iPhoneBookInfoChanged->iCaps =
                         iPhoneBookInfoChanged->iCaps |
                         RMobilePhoneBookStore::KCapsEmailAddressUsed;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_5, "TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> Email supported" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> Email supported" );
                     }
                 if ( iStoreInfoData->iSNENumOfEntriesPerEntry > 0 )
                     {
                     iPhoneBookInfoChanged->iCaps =
                         iPhoneBookInfoChanged->iCaps |
                         RMobilePhoneBookStore::KCapsSecondNameUsed;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_6, "TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> SNE supported" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> SNE supported" );
                     }
                 if ( iStoreInfoData->iANRNumOfEntriesPerEntry > 0 )
                     {
                     iPhoneBookInfoChanged->iCaps =
                         iPhoneBookInfoChanged->iCaps |
                         RMobilePhoneBookStore::KCapsAdditionalNumUsed;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_7, "TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> ANR supported" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> ANR supported" );
                     }
                 }
             }
         // If PB type is FDN, total entries and used entries already read
         else if ( KFDNPhoneBook == iPhoneBookType )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_8, "TSY: CMmPhoneBookStoreTsy::GetInfoL - FDN" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - FDN" );
             ret = KErrNotReady;
 
             //if cache is ready, set information and get name length
@@ -2531,19 +2526,19 @@
                 // The total number of entries
                 iPhoneBookInfoChanged->iTotalEntries =
                     iStoreInfoData->iFDNNumOfEntries;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_9, "TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %d",iStoreInfoData->iFDNNumOfEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %i",iStoreInfoData->iFDNNumOfEntries );
 
                 // Set caps by phonebook name
                 iPhoneBookInfoChanged->iCaps = KPBTypeFDNCaps;
                 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_10, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxNumLength: %d",iPhoneBookInfoChanged->iMaxNumLength );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_11, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxTextLength: %d",iPhoneBookInfoChanged->iMaxTextLength );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_12, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iTotalEntries: %d",iPhoneBookInfoChanged->iTotalEntries );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_13, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iUsedEntries: %d",iPhoneBookInfoChanged->iUsedEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxNumLength: %i",iPhoneBookInfoChanged->iMaxNumLength );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxTextLength: %i",iPhoneBookInfoChanged->iMaxTextLength );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iTotalEntries: %i",iPhoneBookInfoChanged->iTotalEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iUsedEntries: %i",iPhoneBookInfoChanged->iUsedEntries );
             }
         else if ( KSDNPhoneBook == iPhoneBookType )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_14, "TSY: CMmPhoneBookStoreTsy::GetInfoL - SDN" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - SDN" );
             ret = KErrNone;
 
             // The maximum length for the number in a phonebook entry
@@ -2557,7 +2552,7 @@
             // The total number of entries
             iPhoneBookInfoChanged->iTotalEntries =
                 iStoreInfoData->iSDNNumOfEntries;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_15, "TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %d",iStoreInfoData->iSDNNumOfEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %i",iStoreInfoData->iSDNNumOfEntries );
 
             if ( !iIsUsedEntriesCounted )
                 {
@@ -2574,7 +2569,7 @@
                 else
                     {
                     iPhoneBookInfoChanged = NULL;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_16, "TSY: CMmPhoneBookStoreTsy::GetInfoL, not ready to perform CountEntriesL()");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL, not ready to perform CountEntriesL()");
                     ret = KErrNotReady;
                     }
                 }
@@ -2582,7 +2577,7 @@
         //VMBX need to read total and used entries
         else if ( KVMBXPhoneBook == iPhoneBookType )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_17, "TSY: CMmPhoneBookStoreTsy::GetInfoL - VMBX" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - VMBX" );
             ret = KErrNone;
 
             // The maximum length for the number in a phonebook entry
@@ -2596,7 +2591,7 @@
             // The total number of entries
             iPhoneBookInfoChanged->iTotalEntries =
                 iStoreInfoData->iVMBXNumOfEntries;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_18, "TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %d",iStoreInfoData->iVMBXNumOfEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %i",iStoreInfoData->iVMBXNumOfEntries );
 
             // Set caps by the store info data 
             //iPhoneBookInfoChanged->iCaps = iStoreInfoData->iVMBXCaps;
@@ -2616,7 +2611,7 @@
                 else
                     {
                     iPhoneBookInfoChanged = NULL;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_19, "TSY: CMmPhoneBookStoreTsy::GetInfoL, not ready to perform CountEntriesL()");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL, not ready to perform CountEntriesL()");
                     ret = KErrNotReady;
                     }
                 }
@@ -2624,7 +2619,7 @@
          //MBDN
         else if ( KMBDNPhoneBook == iPhoneBookType )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_20, "TSY: CMmPhoneBookStoreTsy::GetInfoL - MBDN" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - MBDN" );
             ret = KErrNone;
 
             // The maximum length for the number in a phonebook entry
@@ -2638,9 +2633,9 @@
             // The total number of entries
             iPhoneBookInfoChanged->iTotalEntries =
                 iStoreInfoData->iMBDNNumOfEntries;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_21, "TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %d",iPhoneBookInfoChanged->iTotalEntries );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_22, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxNumLength: %d",iPhoneBookInfoChanged->iMaxNumLength );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_23, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxTextLength: %d",iPhoneBookInfoChanged->iMaxTextLength );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %i",iPhoneBookInfoChanged->iTotalEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxNumLength: %i",iPhoneBookInfoChanged->iMaxNumLength );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxTextLength: %i",iPhoneBookInfoChanged->iMaxTextLength );
 
             // Set caps by the store info data 
             iPhoneBookInfoChanged->iCaps = KPBTypeMBDNCaps;
@@ -2675,7 +2670,7 @@
 void CMmPhoneBookStoreTsy::CompleteGetInfo(
     TInt aError )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEGETINFO_1, "TSY: CMmPhoneBookStoreTsy::CompleteGetInfo - Result: %d", aError );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteGetInfo - Result: %i", aError );
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodePhoneStoreGetInfo );
@@ -2756,7 +2751,7 @@
 
     // Indicates the current number of entries that may be held in this store
     iPhoneBookInfoChanged->iUsedEntries = iUsedEntries;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SETINFO_1, "TSY: CMmPhoneBookStoreTsy::SetInfo - used entries: %d",iUsedEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::SetInfo - used entries: %i",iUsedEntries );
 
     // Indicates the total number of entries
     iPhoneBookInfoChanged->iTotalEntries = KNoInfoAvail;
@@ -2772,7 +2767,7 @@
 TInt CMmPhoneBookStoreTsy::GetInfoCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOCANCEL_1, "TSY: CMmPhoneBookStoreTsy::GetInfoCancel - Handle:%d", aTsyReqHandle );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoCancel - Handle:%d", aTsyReqHandle );
 
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -2805,7 +2800,7 @@
     RMobilePhoneStore::TMobileStoreEvent *aEvent,
     TInt* aIndex )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_NOTIFYSTOREEVENT_1, "TSY: CMmPhoneBookStoreTsy::NotifyStoreEvent - called" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::NotifyStoreEvent - called" );
 
     TTsyReqHandle requestHandle = iTsyReqHandleStore->GetTsyReqHandle(
         EMultimodePhoneStoreNotifyStoreEvent );
@@ -2833,7 +2828,7 @@
 TInt CMmPhoneBookStoreTsy::NotifyStoreEventCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_NOTIFYSTOREEVENTCANCEL_1, "TSY: CMmPhoneBookStoreTsy::NotifyStoreEventCancel - called" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::NotifyStoreEventCancel - called" );
 
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -2859,7 +2854,7 @@
 void CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent(
     TInt aLocation )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETENOTIFYSTOREEVENT_1, "TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - Called" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - Called" );
 
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -2871,8 +2866,8 @@
             REINTERPRET_CAST( RMobilePhoneStore::TMobileStoreEvent*,
             iNotifyPhoneBookStoreEventPtr );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETENOTIFYSTOREEVENT_2, "TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - StoreEvent %8X ", (TUint)iMobilePhoneBookStoreEvent );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETENOTIFYSTOREEVENT_3, "TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - location %d ", aLocation );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - StoreEvent %i ", iMobilePhoneBookStoreEvent );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - location %i ", aLocation );
         // Fill notify information
         *phoneBookStoreEvent = iMobilePhoneBookStoreEvent;
         *iNotifyPhoneBookStoreEventIndexPtr = aLocation;
@@ -2920,7 +2915,7 @@
 //
 void CMmPhoneBookStoreTsy::ResetVariables()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_RESETVARIABLES_1, "TSY: CMmPhoneBookStoreTsy::ResetVariables" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ResetVariables" );
 
     // Reset phonebooktype
     iPhoneBookType = 0;
@@ -2965,7 +2960,7 @@
 //
 void CMmPhoneBookStoreTsy::ResetCache()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_RESETCACHE_1, "TSY: CMmPhoneBookStoreTsy::ResetCache" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ResetCache" );
 
     // SDN and VMBX do not have cache. Skip reset if the cache pointer is null.
     if ( NULL != iPBStoreCache )
@@ -2985,7 +2980,7 @@
 //
 void CMmPhoneBookStoreTsy::ResetCacheReady()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_RESETCACHEREADY_1, "TSY: CMmPhoneBookStoreTsy::ResetCacheReady" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ResetCacheReady" );
     iCacheReady = EFalse;
     CMmCustomTsy* mmCustom = NULL;
 
@@ -2996,7 +2991,7 @@
 
     if ( NULL != mmCustom )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_RESETCACHEREADY_2, "TSY: CMmPhoneBookStoreTsy::ResetCacheReady, mmCustom->UpdateCacheStatus - not ready" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ResetCacheReady, mmCustom->UpdateCacheStatus - not ready" );
         mmCustom->UpdateCacheStatus( RMmCustomAPI::ECacheNotReady,
             iPhoneBookName );
         }
@@ -3028,7 +3023,7 @@
     const TTsyReqHandle aTsyReqHandle,
     const TInt aError )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_REQCOMPLETED_1, "TSY: CMmPhoneBookStoreTsy::ReqCompleted - Handle:%d Error:%d", aTsyReqHandle, aError);
+TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::ReqCompleted - Handle:%d Error:%d", aTsyReqHandle, aError);
     CTelObject::ReqCompleted( aTsyReqHandle, aError );
     }
 
@@ -3049,7 +3044,7 @@
     const TInt aReqHandleType,
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SETTYPEOFRESPONSE_1, "TSY: CMmPhoneBookStoreTsy::SetTypeOfResponse - Handle:%d Type:%d", aTsyReqHandle, aReqHandleType );
+TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::SetTypeOfResponse - Handle:%d Type:%d", aTsyReqHandle, aReqHandleType );
 
     TInt timeOut( 0 );
 
@@ -3148,7 +3143,7 @@
 //
 void CMmPhoneBookStoreTsy::ContinueReadL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONTINUEREADL_1, "TSY: CMmPhoneBookStoreTsy::ContinueReadL ");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ContinueReadL ");
 
     iRequestedOnPBRead = EFalse;
     //Reguest Read with stored parameters
@@ -3167,8 +3162,8 @@
 //    
 TBool CMmPhoneBookStoreTsy::IsPBInitDone()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_ISPBINITDONE_1, "TSY: CMmPhoneBookStoreTsy::IsPBInitDone: - PB %S", iPhoneBookName);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_ISPBINITDONE_2, "TSY: CMmPhoneBookStoreTsy::IsPBInitDone: - PB iIsPBInitCompleted = %d ", iIsPBInitCompleted );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::IsPBInitDone: - PB %S", &iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::IsPBInitDone: - PB iIsPBInitCompleted = %d ", iIsPBInitCompleted );
     
     return iIsPBInitCompleted;
     }
@@ -3181,7 +3176,7 @@
 // 
 TUint8 CMmPhoneBookStoreTsy::GetPhonebookType()
  	{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETPHONEBOOKTYPE_1,  "TSY: CMmPhoneBookStoreTsy::GetPhonebookType - iPhoneBookType: %d", iPhoneBookType);
+TFLOGSTRING2( "TSY: CMmPhoneBookStoreTsy::GetPhonebookType - iPhoneBookType: %d", iPhoneBookType);	            
  	return iPhoneBookType;
  	}
 
@@ -3273,14 +3268,14 @@
 void CMmPhoneBookStoreTsy::SimIsReady()
     {
     
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_1, "TSY: CMmPhoneBookStoreTsy::SimIsReady - iIsPhonebookInitialized: %u", (TUint)iStoreInfoData->iIsPhonebookInitialized);
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_2, "TSY: CMmPhoneBookStoreTsy::SimIsReady - before initialization");
+    TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::SimIsReady - iIsPhonebookInitialized: %i", iStoreInfoData->iIsPhonebookInitialized);
+    TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SimIsReady - before initialization");
         // Check if phonebook has been initialized
         if ( !iMmPhoneTsy->IsPBInitActive()
             && ( !iStoreInfoData->iIsPhonebookInitialized )
             )
             {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_3, "TSY: CMmPhoneBookStoreTsy::SimIsReady - starting initialization");
+    TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SimIsReady - starting initialization");
 
             // before phonebook requests, phonebook must be initialized
             iMmPhoneBookStoreExtInterface->InitPhonebook(
@@ -3290,12 +3285,12 @@
             }
         else if (iMmPhoneTsy->IsPBInitActive())
             {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_4, "TSY: CMmPhoneBookStoreTsy::SimIsReady - initialization active via other store, waiting for completion");
+    TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SimIsReady - initialization active via other store, waiting for completion");
             iIsPBInitCompleted = EFalse;
             }
         else
             {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_5, "TSY: CMmPhoneBookStoreTsy::SimIsReady - Initialization was done via other store");
+    TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SimIsReady - Initialization was done via other store");
             // Set initialization flag 
             iIsPBInitCompleted = ETrue;
             }
@@ -3304,7 +3299,7 @@
             && ( iPhoneBookType == KADNPhoneBook
             || iPhoneBookType == KFDNPhoneBook ) )
             {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_6, "TSY: CMmPhoneBookStoreTsy::SimIsReady - starting caching");
+    TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SimIsReady - starting caching");
             // Call CacheEntries method to read entries from SIM.
             CacheEntriesL();
             }

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsywithdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsywithdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -22,11 +22,6 @@
 
 // INCLUDE FILES
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmphonebookstoretsywithdispatcherTraces.h"
-#endif
-
 #include "cmmphonebookstoretsy.h"
 #include "cmmphonebookstoreextinterface.h"
 #include <ctsy/serviceapi/mmtsy_ipcdefs.h>
@@ -45,7 +40,7 @@
 
 void CMmPhoneBookStoreTsy::CacheEntriesL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_1, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - entered");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - entered");
     // Get Phonebook related DLL -static data
 
     // Check if phonebook has been initialized successfully. Caching of ADN
@@ -54,7 +49,7 @@
          ( EFalse == iStoreInfoData->iIsPhonebookInitializeFailed ||
            KADNPhoneBook != iPhoneBookType ) )
         {
-        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_2, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Cache PB %S ", iPhoneBookName);
+        TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Cache PB %S ", &iPhoneBookName);
         TInt ret = KErrNone;
 		CMmPhoneTsy::TNosBootState* bootState = iMmPhoneTsy->NosBootState();
 		
@@ -71,7 +66,7 @@
 					iPBStoreCache->ResetAndDestroy();
 					delete iPBStoreCache;
 					iPBStoreCache = NULL;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_3, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Old cache deleted");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Old cache deleted");
 					}
 				
 				//Inform phonebook that the cache is not ready for refresh
@@ -83,11 +78,11 @@
 			}
             else if ( iCacheReady )
                 {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_4, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S cache entries ready", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S cache entries ready", &iPhoneBookName);
                 }
         if ( KErrNone != ret)
             {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_5, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S caching failed!", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S caching failed!", &iPhoneBookName);
             }
         }
     // Phonebook not initialized -> let's do it before caching
@@ -95,7 +90,7 @@
         || iStoreInfoData->iIsPhonebookInitializeFailed )
         && !iMmPhoneTsy->IsPBInitActive() )
         {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_6, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Starting initialization PB: %S", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Starting initialization PB: %S", &iPhoneBookName);
         // before phonebook requests, phonebook must be initialized
         iMmPhoneBookStoreExtInterface->InitPhonebook(
             EMmTsyPhoneBookStoreInitIPC, iPhoneBookName );

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CMmMessageRouterProxy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CMmMessageRouterProxy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -16,12 +16,6 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CMmMessageRouterProxyTraces.h"
-#endif
-
 #include "cmmmessagerouterproxy.h"
 #include "cmmvoicecalltsy.h"
 #include "cmmdatacalltsy.h"
@@ -69,7 +63,7 @@
  CMmMessageRouterProxy* CMmMessageRouterProxy::NewL( 
     CTsyDelegates& aTsyDelegates )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_CTOR_1, "TSY: CMmMessageRouterProxy::NewL." );
+TFLOGSTRING("TSY: CMmMessageRouterProxy::NewL." );    
     CMmMessageRouterProxy* const routerproxy =
         new ( ELeave ) CMmMessageRouterProxy();
     CleanupStack::PushL( routerproxy );
@@ -98,7 +92,7 @@
     CMmDataPackage* aData, 
     TInt aResult )
 	{
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_COMPLETE_1, "TSY: CMmMessageRouterProxy::Complete. IPC = %d, result: %d", aIpc, aResult);
+TFLOGSTRING3("TSY: CMmMessageRouterProxy::Complete. IPC = %d, result: %d", aIpc, aResult);
 	RouteCompletion( aIpc, aData, aResult ); 
 	}
 	
@@ -262,7 +256,7 @@
 
 	        TName phoneBookName;
 	        phonebookData->GetPhoneBookName( phoneBookName );
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_1, "TSY: CMmMessageRouterProxy::RouteCompletion: PB Name: %S", phoneBookName);
+TFLOGSTRING2("TSY: CMmMessageRouterProxy::RouteCompletion: PB Name: %S", &phoneBookName);   
 
 	        for( TInt i = 0; i < iMmPhone->PBList()->GetNumberOfObjects(); i++ )
 	            {
@@ -276,7 +270,7 @@
 	            }
 	        if ( NULL == mmObject )
 	            {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_2, "TSY: CMmMessageRouterProxy::RouteCompletion: PB object not found!");
+TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion: PB object not found!");
 				iMmPhone->SetPBInitActiveStatus( EFalse );
 	            }
         	}
@@ -690,11 +684,7 @@
       			static_cast<CMmPhoneTsy*>( mmObject )->
       				CompleteTerminateAllCallsReq( aResult );
       			break;
-            case ECtsyPhoneTerminateActiveCallsComp:
-                static_cast<CMmPhoneTsy*>( mmObject )->
-                    CompleteTerminateActiveCallsReq( aResult );
-                break;
-                
+      			
             // Conference call functionality
             case EMobileConferenceCallCreateConference:                
                 static_cast<CMmConferenceCallTsy*>( mmObject )->
@@ -782,20 +772,20 @@
                     CompletePBStoreInitializationL( 
                     aResult, aDataPackage );
                     TBool done = EFalse;
-                    
+
                     // NOTE: The statement above is redundant, as the loop below calls CompletePBStoreInitializationL
                     // on every phonebook store. However, we need to be certain that changing the order in which
-                    // phonebook stores are initialised won't introduce side effects. (One future improvement)
+                    // phonebook stores are initialised won't introduce side effects. (One future improvement)                    
                     for( TInt i = 0; i < iMmPhone->PBList()->GetNumberOfObjects(); i++ )
         	            {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_3, "TSY: CMmMessageRouterProxy::RouteCompletion:EMmTsyPhoneBookStoreInitIPC for loop, check init statuses ");
+TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion:EMmTsyPhoneBookStoreInitIPC for loop, check init statuses ");
         	            CMmPhoneBookStoreTsy* pbStore = iMmPhone->PBList()->
         	                GetMmPBByIndex( i );
                         done = pbStore->IsPBInitDone();
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_4, "TSY: CMmMessageRouterProxy::RouteCompletion: active: %u, done: %u",(TUint)iMmPhone->IsPBInitActive(), (TUint)done);
+TFLOGSTRING3("TSY: CMmMessageRouterProxy::RouteCompletion: active: %i, done: %i",iMmPhone->IsPBInitActive(), done);
         	            if ( iMmPhone->IsPBInitActive() && !done ) 
         	                {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_5, "TSY: CMmMessageRouterProxy::RouteCompletion: complete also to: %S",*(pbStore->PhoneBookName()));
+TFLOGSTRING2("TSY: CMmMessageRouterProxy::RouteCompletion: complete also to: %S",pbStore->PhoneBookName());
         	                mmObject = static_cast<CBase*>( pbStore );
         	                static_cast<CMmPhoneBookStoreTsy*>( mmObject )->
                                 CompletePBStoreInitializationL( 
@@ -2612,10 +2602,18 @@
                     aDataPackage, aResult );
                 break;
             case EMmTsyPhoneBookStoreFdnInfoIPC:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_6, "TSY: CMmMessageRouterProxy::RouteCompletion: route to phonetsy EMmTsyPhoneBookStoreFdnInfoIPC");
+				TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion: route to phonetsy EMmTsyPhoneBookStoreFdnInfoIPC");               
                 static_cast<CMmPhoneTsy*>( mmObject )->
                     SaveFdnInfoDetails( aResult, aDataPackage );
                 break;
+			case ECtsyPhoneGetPreferredNetworksComp:
+				TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion: route to MmNetTsy ECtsyPhoneGetPreferredNetworksComp"); 				
+				static_cast<CMmPhoneTsy*>( mmObject )->GetNetTsy()->CompleteGetPreferredNetworksListPhase1(aResult, aDataPackage);
+				break;
+			case ECtsyPhoneStorePreferredNetworksListComp:
+				TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion: route to MmNetTsy ECtsyPhoneStorePreferredNetworksListComp"); 				
+				static_cast<CMmPhoneTsy*>( mmObject )->GetNetTsy()->CompleteStorePreferredNetworksList(aResult);
+				break;
             default:
                 break;
             }
@@ -2655,7 +2653,7 @@
                 
                 if ( NULL == mmObject )
                     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_7, "TSY: CMmMessageRouterProxy::RouteCompletion: Call object not found for mobile Call Info!");
+TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion: Call object not found for mobile Call Info!");
                     }
                 else
                     {
@@ -2694,7 +2692,7 @@
 
                     if ( NULL == mmCall )
                         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_8, "TSY: CMmMessageRouterProxy::RouteCompletion: Call object not found for Dial!");
+TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion: Call object not found for Dial!");
                         }
                     else
                         {
@@ -2723,7 +2721,7 @@
                                       CMmCallTsy::EMultimodeCallDialISV ) 
                                     && mmCall->CallMode() == callMode ) )
                                     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_9, "TSY: CMmMessageRouterProxy::RouteCompletion: Special case before CompleteDial");
+TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion: Special case before CompleteDial");                                    
                                     mmCall->CompleteDial( aResult );
                                     break;
                                     }
@@ -2732,7 +2730,7 @@
                                     CMmCallTsy::EMultimodeCallDialNoFdnCheck ) 
                                     && mmCall->CallMode() == callMode )
                                     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_10, "TSY: CMmMessageRouterProxy::RouteCompletion: Special case before CompleteDialNoFdn");
+TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion: Special case before CompleteDialNoFdn");                                          
                                     mmCall->CompleteDialNoFdn( aResult );
                                     break;
                                     }

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CTsyDelegates.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CTsyDelegates.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,14 +16,9 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CTsyDelegatesTraces.h"
-#endif
-
 #include "ctsydelegates.h"
 #include "cmmmessagemanagerbase.h"
+#include <ctsy/tflogger.h> 
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -49,7 +44,7 @@
 CBase* CTsyDelegates::GetTsyObject( 
     CMmMessageManagerBase::TTsyObjects aObject )
 	{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYDELEGATES_GETTSYOBJECT_1, "TSY: CTsyDelegates::GetTsyObject object=%d", aObject );
+TFLOGSTRING2("TSY: CTsyDelegates::GetTsyObject object=%d", aObject );
 	
 	CBase* object = NULL;	
  	object = iTsyObjectArray.At( aObject );	
@@ -66,7 +61,7 @@
     CMmMessageManagerBase::TTsyObjects aTsyObjectType,
     CBase* aTsyObject )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYDELEGATES_REGISTERTSYOBJECT_1, "TSY: CTsyDelegates::RegisterTsyObject type=%d address=0x%08x", TInt( aTsyObjectType ), (TUint)aTsyObject );
+TFLOGSTRING3("TSY: CTsyDelegates::RegisterTsyObject type=%d address=0x%x", TInt( aTsyObjectType ), aTsyObject );
 
     iTsyObjectArray[ aTsyObjectType ] = aTsyObject;
     }
@@ -79,7 +74,7 @@
 //
 void CTsyDelegates::DeregisterTsyObject( CBase* aTsyObject )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYDELEGATES_DEREGISTERTSYOBJECT_1, "TSY: CTsyDelegates::DeregisterTsyObject address=0x%08x", (TUint)aTsyObject );
+TFLOGSTRING2("TSY: CTsyDelegates::DeregisterTsyObject address=0x%x", aTsyObject );
 
     for( TInt i = 0; i < TInt( 
         CMmMessageManagerBase::EMaxNumOfTsyObjects ); i++ )

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/ChargingStatusObserver.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/ChargingStatusObserver.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-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"
@@ -18,13 +18,8 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ChargingStatusObserverTraces.h"
-#endif
-
 #include "ChargingStatusObserver.h"
+#include <ctsy/tflogger.h>
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -86,7 +81,7 @@
     
 	if ( KErrNone != errorStatus )
 	    {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCHARGINGSTATUSOBSERVER_RUNL_1, "TSY: CChargingStatusObserver::RunL - iStatus: %d", errorStatus );
+TFLOGSTRING2("TSY: CChargingStatusObserver::RunL - iStatus: %d", errorStatus );
 	    iChargingStatusNotifier.NotifyChargingStatus( errorStatus,
 	        batteryInfo );
         return;
@@ -95,7 +90,7 @@
     // property updated, get new value
     TInt level( 0 );
     TInt error = iChargingStatus.Get( level );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCHARGINGSTATUSOBSERVER_RUNL_2, "TSY: CChargingStatusObserver::RunL error: %d", error);
+TFLOGSTRING2("TSY: CChargingStatusObserver::RunL error: %d", error);
 
     if ( KErrNone == error )
         {

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmcalltsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmcalltsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmcalltsyTraces.h"
-#endif
-
 #include "cmmcalltsy.h"
 #include <featmgr/featurecontrol.h>
 #include <featureuids.h>
@@ -75,7 +69,7 @@
 
 CMmCallTsy::~CMmCallTsy()
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_DTOR_1, "TSY: CMmCallTsy::~CMmCallTsy. Call deleted iCallId:%d iCallName:%S",iCallId, iCallName);
+TFLOGSTRING3("TSY: CMmCallTsy::~CMmCallTsy. Call deleted iCallId:%d iCallName:%S",iCallId, &iCallName);
 
     TInt trapError( KErrNone );
 
@@ -128,7 +122,7 @@
                     {
                     iTelephonyAudioControl->TeardownTelephonyAudio( iCallName, 
                                                                     KErrNone );
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_DTOR_2, "TSY: CMmCallTsy::~CMmCallTsy Call routing tear down: Call name:%S", iCallName );
+TFLOGSTRING2("TSY: CMmCallTsy::~CMmCallTsy Call routing tear down: Call name:%S", &iCallName );
                     }
                 
             	}
@@ -329,7 +323,7 @@
     if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo () &&
         !IsRequestPossibleInOffline( aIpc ) )  
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_EXTFUNC_1, "TSY: Offline mode ON, request is not allowed: %d", aIpc );
+TFLOGSTRING2("TSY: Offline mode ON, request is not allowed: %d", aIpc );
         ret = CMmCommonStaticUtility::EpocErrorCode(
             KErrGeneral, KErrGsmOfflineOpNotAllowed );
 
@@ -693,7 +687,7 @@
 TInt CMmCallTsy::DialCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_DIALCANCEL_1, "TSY: CMmCallTsy::DialCancel. Req handle: %u, Call name: %S", aTsyReqHandle, iCallName);
+TFLOGSTRING3("TSY: CMmCallTsy::DialCancel. Req handle: %d, Call name: %S", aTsyReqHandle, &iCallName);
 
     TInt ret( KErrGeneral );
 
@@ -711,12 +705,12 @@
             {
             if ( RMobileCall::EStatusDisconnecting != iMobileCallStatus )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_DIALCANCEL_2, "TSY: CMmCallTsy::DialCancel Hangup called");
+TFLOGSTRING("TSY: CMmCallTsy::DialCancel Hangup called");                
             HangUp( aTsyReqHandle );
                 }
             else
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_DIALCANCEL_3, "TSY: CMmCallTsy::DialCancel skipped Hangup call");
+TFLOGSTRING("TSY: CMmCallTsy::DialCancel skipped Hangup call");
                 }      
             }
         }
@@ -732,8 +726,8 @@
 void CMmCallTsy::CompleteDial(
     TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEDIAL_1, "TSY: CMmCallTsy::CompleteDial. Result:%d", aResult );
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEDIAL_2, "TSY: CMmCallTsy::CompleteDial. Call Id:%d Call name:%S", iCallId, iCallName);
+TFLOGSTRING2("TSY: CMmCallTsy::CompleteDial. Result:%d", aResult ); 
+TFLOGSTRING3("TSY: CMmCallTsy::CompleteDial. Call Id:%d Call name:%S", iCallId, &iCallName);
 
 	//Set dial flag to false
 	SetDialFlag( EFalse );
@@ -744,7 +738,7 @@
 		{
 		//3rd Party Client
 		//reset req handle. Returns the deleted req handle
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEDIAL_3, "TSY: CMmCallTsy::CompleteDial. EMultimodeCallDialISV");
+TFLOGSTRING("TSY: CMmCallTsy::CompleteDial. EMultimodeCallDialISV");		
 	    reqHandle =
     	    iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeCallDialISV );
     	
@@ -752,7 +746,7 @@
 	else
 		{
 		//reset req handle. Returns the deleted req handle
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEDIAL_4, "TSY: CMmCallTsy::CompleteDial. EMultimodeCallDial");
+TFLOGSTRING("TSY: CMmCallTsy::CompleteDial. EMultimodeCallDial");		
 	    reqHandle =
     	    iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeCallDial );	
 		}
@@ -790,7 +784,7 @@
 TInt CMmCallTsy::AnswerIncomingCallCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_ANSWERINCOMINGCALLCANCEL_1, "TSY: CMmCallTsy::AnswerIncomingCallCancel. Req handle: %d,  Call name: %S", aTsyReqHandle, iCallName);
+TFLOGSTRING3("TSY: CMmCallTsy::AnswerIncomingCallCancel. Req handle: %d,  Call name: %S", aTsyReqHandle, &iCallName);
 
     TInt ret( KErrNone );
 
@@ -820,12 +814,12 @@
 void CMmCallTsy::CompleteAnswerIncomingCall(
     TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEANSWERINCOMINGCALL_1, "TSY: CMmCallTsy::CompleteAnswerIncomingCall. Result:%d", aResult );
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEANSWERINCOMINGCALL_2, "TSY: CMmCallTsy::CompleteAnswerIncomingCall. Call Id:%d Call name:%S", iCallId, iCallName);
+TFLOGSTRING2("TSY: CMmCallTsy::CompleteAnswerIncomingCall. Result:%d", aResult ); 
+TFLOGSTRING3("TSY: CMmCallTsy::CompleteAnswerIncomingCall. Call Id:%d Call name:%S", iCallId, &iCallName);
 
 	TTsyReqHandle reqHandle ( EMultimodeCallReqHandleUnknown );
 	
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEANSWERINCOMINGCALL_3, "TSY: CMmCallTsy::CompleteAnswerIncomingCall. iExtensionId:%d", iExtensionId );
+TFLOGSTRING2("TSY: CMmCallTsy::CompleteAnswerIncomingCall. iExtensionId:%d", iExtensionId );	
 	
 	if ( KETelExt3rdPartyV1 == iExtensionId )
 		{
@@ -900,8 +894,8 @@
 void CMmCallTsy::CompleteHangUp(
     TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEHANGUP_1, "TSY: CMmCallTsy::CompleteHangUp.\n  \t\t\t Result:%d", aResult );
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEHANGUP_2, "TSY: CMmCallTsy::CompleteHangUp. Call Id:%d Call name:%S", iCallId, iCallName);
+TFLOGSTRING2("TSY: CMmCallTsy::CompleteHangUp.\n  \t\t\t Result:%d", aResult ); 
+TFLOGSTRING3("TSY: CMmCallTsy::CompleteHangUp. Call Id:%d Call name:%S", iCallId, &iCallName);
 
     TInt ret( KErrNone );
 
@@ -1131,7 +1125,7 @@
     
     if(sizeof(RMobileCall::TMobileCallParamsV1) > aParams->MaxLength())
 	  	{
-	  	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_GETCALLPARAMS_1, "TSY: CMmCallTsy::GetCallParams bad size argument");
+	  	TFLOGSTRING ("TSY: CMmCallTsy::GetCallParams bad size argument");
 	  	// Complete the request with appropiate error        
 	  	return KErrArgument;
 	  	}
@@ -1610,7 +1604,7 @@
         {
 		if( IsPartOfConference() && RMobileCall::ERemoteTerminated == aEvent )
 			{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETENOTIFYCALLEVENT_1, "TSY: iIsRemoteReleasedCall = ETrue");
+TFLOGSTRING("TSY: iIsRemoteReleasedCall = ETrue");
 			iIsRemoteReleasedCall = ETrue;
 			}
         *iRetCallEvent = aEvent;
@@ -1688,7 +1682,7 @@
 TInt CMmCallTsy::FillMobileCallInfo(
     TDes8* aInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFO_1, "TSY: CMmCallTsy::FillMobileCallInfo");
+TFLOGSTRING("TSY: CMmCallTsy::FillMobileCallInfo");
 
     TInt ret = KErrArgument;
     TInt extensionId = 0;
@@ -1702,7 +1696,7 @@
             
         // get extensionid from the recieved data
         extensionId = callInfo.ExtensionId();
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFO_2, "TSY: CMmCallTsy::FillMobileCallInfo - extensionid=%d",callInfo.ExtensionId());
+TFLOGSTRING2("TSY: CMmCallTsy::FillMobileCallInfo - extensionid=%d",callInfo.ExtensionId());      
         }
  
     //TMobileCallInfoV1
@@ -1711,7 +1705,7 @@
     	 KEtelExtMultimodeV7 == extensionId ||
     	 KEtelExtMultimodeV8 == extensionId )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFO_3, "TSY: CMmCallTsy::FillMobileCallInfo - V1");
+TFLOGSTRING("TSY: CMmCallTsy::FillMobileCallInfo - V1");    
 
         // Set ret to KErrNone. We can fill this parameter class.
         ret = KErrNone;            
@@ -1732,7 +1726,7 @@
 		 KEtelExtMultimodeV7 == extensionId ||
     	 KEtelExtMultimodeV8 == extensionId )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFO_4, "TSY: CMmCallTsy::FillMobileCallInfo - V3");
+TFLOGSTRING("TSY: CMmCallTsy::FillMobileCallInfo - V3");                
             
         RMobileCall::TMobileCallInfoV3Pckg* paramsPckgV3 =
             reinterpret_cast<RMobileCall::TMobileCallInfoV3Pckg*>( aInfo );
@@ -1746,7 +1740,7 @@
     if ( KEtelExtMultimodeV7 == extensionId ||
     	 KEtelExtMultimodeV8 == extensionId )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFO_5, "TSY: CMmCallTsy::FillMobileCallInfo - V7");
+TFLOGSTRING("TSY: CMmCallTsy::FillMobileCallInfo - V7");
             
         RMobileCall::TMobileCallInfoV7Pckg* paramsPckgV7 =
             reinterpret_cast<RMobileCall::TMobileCallInfoV7Pckg*>( aInfo );
@@ -1759,7 +1753,7 @@
     // TMobileCallInfoV8
     if ( KEtelExtMultimodeV8 == extensionId )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFO_6, "TSY: CMmCallTsy::FillMobileCallInfo - V8");
+TFLOGSTRING("TSY: CMmCallTsy::FillMobileCallInfo - V8");
                 
         RMobileCall::TMobileCallInfoV8Pckg* paramsPckgV8 =
             reinterpret_cast<RMobileCall::TMobileCallInfoV8Pckg*>( aInfo );
@@ -1769,7 +1763,7 @@
         iMmCallExtInterface->FillMobileCallInfoV8( &info );
         }
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFO_7, "TSY: CMmCallTsy::FillMobileCallInfo end. ret=%d",ret);
+TFLOGSTRING2("TSY: CMmCallTsy::FillMobileCallInfo end. ret=%d",ret);
       
     return ret;
     }
@@ -1788,7 +1782,7 @@
     
     if( sizeof( RMobileCall::TMobileCallRemotePartyInfoV1 ) > aRemotePartyInfo->MaxLength() )
     	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_NOTIFYREMOTEPARTYINFOCHANGE_1, "TSY: CMmCallTsy::NotifyRemotePartyInfoChange Bad size argument");
+TFLOGSTRING ("TSY: CMmCallTsy::NotifyRemotePartyInfoChange Bad size argument");
         
         // Complete the request with appropiate error        
         ret = KErrArgument;
@@ -2237,7 +2231,7 @@
     //Overloads CTelObject::ReqCompleted for logging purposes. It 
     //prints the aTsyReqHandle and aError variable in the log file and then 
     //calls CTelObject::ReqCompleted.
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_REQCOMPLETED_1, "TSY: CMmCallTsy::Request Completed. Handle:%d Error:%d", aTsyReqHandle, aError);
+TFLOGSTRING3("TSY: CMmCallTsy::Request Completed. Handle:%d Error:%d", aTsyReqHandle, aError); 
 
     CTelObject::ReqCompleted(aTsyReqHandle,aError);
     }
@@ -2265,11 +2259,11 @@
 #ifdef TF_LOGGING_METHOD
 	if ( iIsPartOfConference )
 		{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_SETPARTOFCONFERENCE_1,  "TSY: CMmCallTsy::SetPartOfConference: Call %d has joined the conference", iCallId );
+TFLOGSTRING2( "TSY: CMmCallTsy::SetPartOfConference: Call %d has joined the conference", iCallId );
 		}
 	else
 		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_SETPARTOFCONFERENCE_2,  "TSY: CMmCallTsy::SetPartOfConference: Call has left the conference" );
+TFLOGSTRING( "TSY: CMmCallTsy::SetPartOfConference: Call has left the conference" );
 		}
 #endif // TF_LOGGING_METHOD
 
@@ -2368,7 +2362,7 @@
 	TInt aExtensionId )
 	{
 	iExtensionId = aExtensionId;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_SETEXTENSIONID_1, "TSY: CMmCallTsy::SetExtensionId.iExtensionId:%d",iExtensionId );
+TFLOGSTRING2("TSY: CMmCallTsy::SetExtensionId.iExtensionId:%d",iExtensionId );
 	}
 
 // ---------------------------------------------------------------------------
@@ -2392,7 +2386,7 @@
 	TBool aDialFlag )
 	{	
 	iDialFlag= aDialFlag;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_SETDIALFLAG_1, "TSY: CMmCallTsy::SetDialFlag. iDialFlag:%d",iDialFlag );
+TFLOGSTRING2("TSY: CMmCallTsy::SetDialFlag. iDialFlag:%d",iDialFlag );			
 	}
 
 // ---------------------------------------------------------------------------
@@ -2404,7 +2398,7 @@
 TBool CMmCallTsy::GetDialFlag()
 	{	
 	
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_GETDIALFLAG_1, "TSY: CMmCallTsy::GetDialFlag. iDialFlag:%d",iDialFlag );
+TFLOGSTRING2("TSY: CMmCallTsy::GetDialFlag. iDialFlag:%d",iDialFlag );			
 	return iDialFlag;	
 	}
 
@@ -2416,7 +2410,7 @@
 //
 TBool CMmCallTsy::IsRemoteReleasedCall() const
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_ISREMOTERELEASEDCALL_1, "TSY: CMmCallTsy::IsRemoteReleasedCall()");
+TFLOGSTRING("TSY: CMmCallTsy::IsRemoteReleasedCall()");
 	return iIsRemoteReleasedCall;
 	}
 
@@ -2439,7 +2433,7 @@
     
     // Unpack UUS parameters
 	RMobileCall::TMobileCallUUSRequestV1 requestUUS = ( *aUUSRequest )();	
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_ACTIVATEUUS_1, "TSY: CMmCallTsy::ActivateUUS() -ServiceReq:%u  -UUI:%S", requestUUS.iServiceReq, requestUUS.iUUI );
+TFLOGSTRING3("TSY: CMmCallTsy::ActivateUUS() -ServiceReq:%u  -UUI:%S", requestUUS.iServiceReq, &requestUUS.iUUI );
     // handle implicit UUS1 request only
     if ( requestUUS.iServiceReq & RMobileCall::KUUS1Implicit )
         {
@@ -2467,12 +2461,12 @@
 TInt CMmCallTsy::ReceiveUUI( const TTsyReqHandle aTsyReqHandle,
     RMobileCall::TMobileCallUUI* aUUI )
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_RECEIVEUUI_1, "TSY: CMmCallTsy::ReceiveUUI()" );
+TFLOGSTRING("TSY: CMmCallTsy::ReceiveUUI()" );
     
     // check are there any UUI information already in the buffer (UUS1)
     if ( 0 < iReceivedUUI.Length() )
         {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_RECEIVEUUI_2, "TSY: CMmCallTsy::ReceiveUUI() - information in BUFFER:%S", iReceivedUUI );
+TFLOGSTRING2("TSY: CMmCallTsy::ReceiveUUI() - information in BUFFER:%S", &iReceivedUUI );
         // copy and empty the buffered information
         *aUUI = iReceivedUUI;
         iReceivedUUI.Zero(); 
@@ -2482,7 +2476,7 @@
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_RECEIVEUUI_3, "TSY: CMmCallTsy::ReceiveUUI() - wait for next incoming UUI message" );
+TFLOGSTRING("TSY: CMmCallTsy::ReceiveUUI() - wait for next incoming UUI message" );
         // Save request handle and pointer of the UUI message. 
         iRetUUI = aUUI;
         iTsyReqHandleStore->SetTsyReqHandle(
@@ -2501,7 +2495,7 @@
 //
 TInt CMmCallTsy::ReceiveUUICancel( const TTsyReqHandle aTsyReqHandle )
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_RECEIVEUUICANCEL_1, "TSY: CMmCallTsy::ReceiveUUICancel()");
+TFLOGSTRING("TSY: CMmCallTsy::ReceiveUUICancel()");
     
     // reset the client side pointer, empty buffer and cancel the handle
     iRetUUI = NULL;
@@ -2520,12 +2514,12 @@
 void CMmCallTsy::CompleteReceiveUUI( CMmDataPackage* aDataPackage, 
     TInt aResult )
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETERECEIVEUUI_1, "TSY: CMmCallTsy::CompleteReceiveUUI()" );
+TFLOGSTRING("TSY: CMmCallTsy::CompleteReceiveUUI()" );
 
     RMobileCall::TMobileCallUUI* receiveUUI = NULL; 
     aDataPackage->UnPackData( &receiveUUI );
     
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETERECEIVEUUI_2, "TSY: CMmCallTsy::CompleteReceiveUUI() - receiveUUI:%S", *receiveUUI );
+TFLOGSTRING2("TSY: CMmCallTsy::CompleteReceiveUUI() - receiveUUI:%S", &receiveUUI );
     
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle =
@@ -2533,7 +2527,7 @@
 
     if ( EMultimodeCallReqHandleUnknown != reqHandle )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETERECEIVEUUI_3, "TSY: CMmCallTsy::CompleteReceiveUUI() - Handle found, complete" );
+TFLOGSTRING("TSY: CMmCallTsy::CompleteReceiveUUI() - Handle found, complete" );
         // Update the client side data through pointer        
         *iRetUUI = *receiveUUI;
         // Null client side pointer, data copied
@@ -2543,7 +2537,7 @@
         }
     else if ( KErrNone == aResult )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETERECEIVEUUI_4, "TSY: CMmCallTsy::CompleteReceiveUUI() - Handle NOT found, buffer" );
+TFLOGSTRING("TSY: CMmCallTsy::CompleteReceiveUUI() - Handle NOT found, buffer" );
         // set initial information to the buffer
         iReceivedUUI = *receiveUUI; 
         }
@@ -2559,7 +2553,7 @@
 	TUint8 aDialType )
 	{
 	iDialTypeId = aDialType;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_SETDIALTYPEID_1, "TSY: CMmCallTsy::SetDialTypeId.iDialType:%d",aDialType );
+TFLOGSTRING2("TSY: CMmCallTsy::SetDialTypeId.iDialType:%d",aDialType );
 	}
 
 // ---------------------------------------------------------------------------
@@ -2571,7 +2565,7 @@
 TUint8 CMmCallTsy::GetDialTypeId()
 	{	
 	
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_GETDIALTYPEID_1, "TSY: CMmCallTsy::GetDialType. iDialType:%d",iDialTypeId );
+TFLOGSTRING2("TSY: CMmCallTsy::GetDialType. iDialType:%d",iDialTypeId );			
 	return iDialTypeId;	
 	}
 
@@ -2584,8 +2578,8 @@
 void CMmCallTsy::CompleteDialNoFdn( 
     TInt aResult )
 	{	
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEDIALNOFDN_1, "TSY: CMmCallTsy::CompleteDialNoFdn. Result:%d", aResult );
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEDIALNOFDN_2, "TSY: CMmCallTsy::CompleteDialNoFdn. Call Id:%d Call name:%S", iCallId, iCallName);
+TFLOGSTRING2("TSY: CMmCallTsy::CompleteDialNoFdn. Result:%d", aResult ); 
+TFLOGSTRING3("TSY: CMmCallTsy::CompleteDialNoFdn. Call Id:%d Call name:%S", iCallId, &iCallName);
 
 	//Set dial flag to false
 	SetDialFlag( EFalse );
@@ -2635,7 +2629,8 @@
 		duration = tis.Int();
 		duration = duration % iMmPhone->KLifeTimeUpdateInterval;
 
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_UPDATELIFETIMER_1, "TSY: CMmCallTsy::UpdateLifeTimer - \duration: %d", duration);
+		TFLOGSTRING2("TSY: CMmCallTsy::UpdateLifeTimer - \
+		        duration: %d", duration);
 				
 		//errors: trap and ignore
         CMmDataPackage dataPackage;
@@ -2662,7 +2657,7 @@
 TInt CMmCallTsy::FillMobileCallInfoDefaults(
     RMobileCall::TMobileCallInfoV1* aInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFODEFAULTS_1, "TSY: CMmCallTsy::FillMobileCallInfoDefaults");
+TFLOGSTRING("TSY: CMmCallTsy::FillMobileCallInfoDefaults");    
 
     //set validity fields to 0 in the beginning.
     aInfo->iValid = 0;
@@ -2697,7 +2692,7 @@
     //ETrue if the call is an emergency call or EFalse if it is not.
     aInfo->iEmergency = iEmergencyCall;
     aInfo->iValid |= RMobileCall::KCallEmergency;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFODEFAULTS_2, "TSY: CMmCallTsy::FillMobileCallInfoDefaults end");
+TFLOGSTRING("TSY: CMmCallTsy::FillMobileCallInfoDefaults end");     
     return KErrNone;
     }

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 //INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmconferencecalltsyTraces.h"
-#endif
-
 #include "cmmconferencecalltsy.h"
 #include "cmmphonetsy.h"
 #include "cmmtsyreqhandlestore.h"
@@ -95,7 +89,7 @@
 CMmConferenceCallTsy::~CMmConferenceCallTsy()
     {
 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_DTOR_1, "TSY: CMmConferenceCallTsy::~CMmConferenceCallTsy");
+    TFLOGSTRING("TSY: CMmConferenceCallTsy::~CMmConferenceCallTsy");
 
     if ( iMmPhone )
         {
@@ -236,7 +230,8 @@
     const TInt aIpc,
     const TDataPackage& aPackage )
     {
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_DOEXTFUNCL_1, "TSY: CMmConferenceCallTsy::DoExtFuncL.\n  \t\t\t IPC:%d\n  \t\t\t Handle:%d",aIpc, aTsyReqHandle);
+	TFLOGSTRING3("TSY: CMmConferenceCallTsy::DoExtFuncL.\n  \t\t\t IPC:%d\n  \t\t\t Handle:%d",
+        aIpc, aTsyReqHandle);
 
     TInt ret( KErrNotSupported );
 
@@ -692,7 +687,7 @@
 TInt CMmConferenceCallTsy::CreateConferenceL(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_CREATECONFERENCEL_1, "TSY: CMmConferenceCallTsy::CreateConferenceL");
+TFLOGSTRING("TSY: CMmConferenceCallTsy::CreateConferenceL");
     //Store call object with status connected
 	iConnectedCall = 
 		iMmPhone->CallList()->GetMmCallByStatus( RMobileCall::EStatusConnected );
@@ -728,7 +723,7 @@
 void CMmConferenceCallTsy::CompleteCreateConference(
     TInt aResult )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETECREATECONFERENCE_1, "TSY: CMmConferenceCallTsy::CompleteCreateConference");
+TFLOGSTRING("TSY: CMmConferenceCallTsy::CompleteCreateConference");
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodeConferenceCallCreateConference );
@@ -785,7 +780,7 @@
     const TTsyReqHandle aTsyReqHandle,
     const TName* aCallName )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_ADDCALLL_1, "TSY: CMmConferenceCallTsy::AddCallL");
+TFLOGSTRING("TSY: CMmConferenceCallTsy::AddCallL");    
     //set return value to KErrNotFound
     TInt ret( KErrNotFound );
     
@@ -821,7 +816,7 @@
 void CMmConferenceCallTsy::CompleteAddCall(
     TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_1, "TSY: CMmConferenceCallTsy::CompleteAddCall, Result: %d", aResult );
+TFLOGSTRING2("TSY: CMmConferenceCallTsy::CompleteAddCall, Result: %d", aResult );
 
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -832,7 +827,7 @@
         {
         if ( (KErrNone == aResult) && (iAddCallName.Length() > 0) )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_2, "TSY: AddCall succeeded. AddCall request completed");
+TFLOGSTRING("TSY: AddCall succeeded. AddCall request completed");
             //notify call added using the call name received with AddCall
             //request
             CompleteNotifyConferenceEvent( iAddCallName,
@@ -847,11 +842,11 @@
 			{
 			//something special is needed here to handle a case where 
 			//CompleteAddCall fails
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_3, "TSY: AddCall failed");
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_4, "TSY: # of CC participants: %d", iNumOfCallsInConferenceCall );
+			TFLOGSTRING("TSY: AddCall failed");
+			TFLOGSTRING2("TSY: # of CC participants: %d", iNumOfCallsInConferenceCall );
 			if ( 2 == iNumOfCallsInConferenceCall )
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_5, "TSY: FIX FOR A ADDCALL & MT RELEASE CASE");
+				TFLOGSTRING("TSY: FIX FOR A ADDCALL & MT RELEASE CASE");
 				CMmCallTsy* mmCall = NULL;
 				CMmCallList* callList = iMmPhone->CallList();
 				CMmCallGsmWcdmaExt* mmCallGsmWcdmaExt = NULL;
@@ -863,12 +858,12 @@
 					mmCall = callList->GetMmCallByIndex(i);
 					status = mmCall->MobileCallStatus();
 
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_6, "TSY: Handling call, Call ID: %d", mmCall->CallId() );
+					TFLOGSTRING2("TSY: Handling call, Call ID: %d", mmCall->CallId() );
 
 					if ( status == RMobileCall::EStatusHold ||
 						status == RMobileCall::EStatusConnected )
 						{
-						OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_7, "TSY: Status was Held or Connected, reconstructing capabilities");
+						TFLOGSTRING("TSY: Status was Held or Connected, reconstructing capabilities");
 
 						// Fetch the active call extension
 						mmCallGsmWcdmaExt = static_cast<CMmCallGsmWcdmaExt*>(
@@ -892,7 +887,7 @@
 				}
 			else
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_8, "TSY: normal AddCall failure");
+				TFLOGSTRING("TSY: normal AddCall failure");
 				}
 			}
         ReqCompleted( reqHandle, aResult );
@@ -910,7 +905,7 @@
 void CMmConferenceCallTsy::RemoveNonParticipatingCall()
 	{
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_1, "TSY: CMmConferenceCallTsy::RemoveNonParticipatingCall");
+	TFLOGSTRING("TSY: CMmConferenceCallTsy::RemoveNonParticipatingCall");
 
 	RMobileCall::TMobileCallStatus statusOfCallsInConference(
 		RMobileCall::EStatusConnected);
@@ -920,7 +915,7 @@
 	TInt numberOfCallInConference(0);
 	TBool callReleased = EFalse;
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_2, "TSY: Conference status: %d", iStatus);
+	TFLOGSTRING2("TSY: Conference status: %d", iStatus);
 
 	if ( iStatus == RMobileConferenceCall::EConferenceHold )
 		{
@@ -940,7 +935,7 @@
 			CompleteNotifyConferenceEvent( 
 				mmCall->CallName(), 
 				RMobileConferenceCall::EConferenceCallRemoved );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_3, "TSY: Call removed from conference." );
+TFLOGSTRING("TSY: Call removed from conference." );
 			}
 		else if ( status == statusOfCallsInConference )
 			{
@@ -949,7 +944,7 @@
 			}
 		if ( mmCall->IsRemoteReleasedCall() )
 			{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_4, "TSY: One call is remote released");
+TFLOGSTRING("TSY: One call is remote released");
 			callReleased = ETrue;
 			}
 		}
@@ -957,7 +952,7 @@
 			iNumOfCallsInConferenceCall == 3 && callReleased )
 			{
 			iNumOfCallsInConferenceCall--;
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_5, "TSY: number of calls in conference decremented");
+			TFLOGSTRING("TSY: number of calls in conference decremented");
 		}
 
 	}
@@ -973,7 +968,7 @@
 TInt CMmConferenceCallTsy::SwapL(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_SWAPL_1, "TSY: CMmConferenceCallTsy::SwapL");
+TFLOGSTRING("TSY: CMmConferenceCallTsy::SwapL");      
     //direct request to extension
     TInt ret = iMmConferenceCallExtInterface->SwapL(
         iStatus, iMmPhone->CallList() );
@@ -1002,7 +997,7 @@
 void CMmConferenceCallTsy::CompleteSwap(
     TInt aResult )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETESWAP_1, "TSY: CMmConferenceCallTsy::CompleteSwap");
+TFLOGSTRING("TSY: CMmConferenceCallTsy::CompleteSwap");      
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodeConferenceCallSwap );
@@ -1156,7 +1151,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMobileConferenceCall::TMobileConferenceStatus* aStatus )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_GETCONFERENCESTATUS_1, "TSY: CMmConferenceCallTsy::GetConferenceStatus. iStatus:%d", iStatus );
+TFLOGSTRING2("TSY: CMmConferenceCallTsy::GetConferenceStatus. iStatus:%d", iStatus );     
     *aStatus = iStatus;
 
     ReqCompleted( aTsyReqHandle, KErrNone );
@@ -1228,7 +1223,7 @@
     TBool conferenceStatusChanged( EFalse );
 
     RMobileConferenceCall::TMobileConferenceStatus oldStatus = iStatus;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETENOTIFYCONFERENCESTATUSCHANGE_1, "TSY: CMmConferenceCallTsy::CompleteNotifyConferenceStatusChange. oldStatus:%d", oldStatus );
+TFLOGSTRING2("TSY: CMmConferenceCallTsy::CompleteNotifyConferenceStatusChange. oldStatus:%d", oldStatus );    
     iMmConferenceCallExtInterface->GetNewStatus( &iStatus );
 
     switch( iStatus )
@@ -1299,7 +1294,7 @@
     if ( ( EMultimodeConferenceCallReqHandleUnknown != reqHandle ) &&
         conferenceStatusChanged )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETENOTIFYCONFERENCESTATUSCHANGE_2, "TSY: CMmConferenceCallTsy::CompleteNotifyConferenceStatusChange. Cur. iStatus:%d", iStatus );
+TFLOGSTRING2("TSY: CMmConferenceCallTsy::CompleteNotifyConferenceStatusChange. Cur. iStatus:%d", iStatus );         
         //reset req handle.
         iTsyReqHandleStore->ResetTsyReqHandle(
             EMultimodeConferenceCallStatusChangeNotification );
@@ -1382,7 +1377,7 @@
     const TName& aName,
     RMobileConferenceCall::TMobileConferenceEvent aEvent )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETENOTIFYCONFERENCEEVENT_1, "TSY: CMmConferenceCallTsy::CompleteNotifyConferenceEvent.aEvent:%d", aEvent );
+TFLOGSTRING2("TSY: CMmConferenceCallTsy::CompleteNotifyConferenceEvent.aEvent:%d", aEvent );
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodeConferenceCallConferenceEventNotification );
@@ -1603,7 +1598,7 @@
 //
 void CMmConferenceCallTsy::ResetAttributes()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_RESETATTRIBUTES_1, "TSY: CMmConferenceCallTsy::ResetAttributes." );
+TFLOGSTRING("TSY: CMmConferenceCallTsy::ResetAttributes." );    
     //Name of the call to be added to Conference call
     iAddCallName.Zero();
     //Conference call capabilities
@@ -1761,7 +1756,8 @@
     const TTsyReqHandle aTsyReqHandle,
     const TInt aError )
     {
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_REQCOMPLETED_1, "TSY: CMmConferenceCallTsy::Request Completed. \n\t\t\tHandle:%d\n\t\t\t Error:%d",aTsyReqHandle, aError);
+	TFLOGSTRING3("TSY: CMmConferenceCallTsy::Request Completed. \n\t\t\tHandle:%d\n\t\t\t Error:%d",
+        aTsyReqHandle, aError);
 
     //call original ReqCompleted from CTelObject
     CTelObject::ReqCompleted( aTsyReqHandle, aError );

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatacalltsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatacalltsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmdatacalltsyTraces.h"
-#endif
-
 #include "cmmdatacalltsy.h"
 #include "cmmdatalinetsy.h"
 #include "cmmphonetsy.h"
@@ -49,7 +43,7 @@
     TDes& aName, 
     CMmMessageManagerBase* aMessageManager )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_NEWL_1, "TSY: CMmDataCallTsy::NewL. Call name: %S", aName);
+TFLOGSTRING2("TSY: CMmDataCallTsy::NewL. Call name: %S", &aName);
 
     CMmDataCallTsy* mmCall = NULL;
 
@@ -73,7 +67,8 @@
 
 CMmDataCallTsy::~CMmDataCallTsy()
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DTOR_1, "TSY: CMmDataCallTsy::~CMmDataCallTsy - Call deleted iCallId: %d iCallName: %S",iCallId, iCallName);
+TFLOGSTRING3("TSY: CMmDataCallTsy::~CMmDataCallTsy - Call deleted iCallId: %d iCallName: %S",
+    iCallId, &iCallName);
 
     // If Dial fails, Symbian CSD agent will close the call immediately.
     // This means that TSY has not yet received call status indications, 
@@ -150,7 +145,8 @@
     const TInt aIpc,
     const TDataPackage& aPackage )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DOEXTFUNCL_1, "TSY: CMmDataCallTsy::DoExtFuncL - IPC: %d Handle: %d",aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmDataCallTsy::DoExtFuncL - IPC: %d Handle: %d",
+    aIpc, aTsyReqHandle);
 
     TInt ret( KErrNone );
 
@@ -289,7 +285,7 @@
 CTelObject::TReqMode CMmDataCallTsy::ReqModeL(
     const TInt aIpc )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_REQMODEL_1, "TSY: CMmDataCallTsy::ReqModeL - IPC: %d", aIpc);
+TFLOGSTRING2("TSY: CMmDataCallTsy::ReqModeL - IPC: %d", aIpc);
 
     CTelObject::TReqMode ret( 0 ); // default return value
     
@@ -535,7 +531,8 @@
     const TInt aIpc,
     const TTsyReqHandle aTsyReqHandle )
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_CANCELSERVICE_1, "TSY: CMmDataCallTsy::CancelService - IPC: %d, Req handle: %d",aIpc, aTsyReqHandle);
+    TFLOGSTRING3("TSY: CMmDataCallTsy::CancelService - IPC: %d, Req handle: %d",
+        aIpc, aTsyReqHandle); 
 
     TInt ret( KErrNone );
 
@@ -640,8 +637,10 @@
 
         callDataPackage->UnPackData( callStatus );
 
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_1, "TSY: CMmDataCallTsy::CompleteNotifyStatusChange - \aResult: %d", aResult );
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_2, "TSY: CMmDataCallTsy::CompleteNotifyStatusChange - \Call status: %d, Call name: %S", callStatus, iCallName);
+        TFLOGSTRING2("TSY: CMmDataCallTsy::CompleteNotifyStatusChange - \
+            aResult: %d", aResult );
+        TFLOGSTRING3("TSY: CMmDataCallTsy::CompleteNotifyStatusChange - \
+            Call status: %d, Call name: %S", callStatus, &iCallName);
 
         switch( callStatus )
             {
@@ -761,12 +760,12 @@
 
                     if ( 0 < dialCancelHandle )
                         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_3, "TSY: CMmDataCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDial");
+TFLOGSTRING("TSY: CMmDataCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDial");                        
                         HangUp( dialCancelHandle );
                         } 
                     else if ( 0 < dialCancelHandleNoFdn )
                         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_4, "TSY: CMmDataCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDialNoFdnCheck");
+TFLOGSTRING("TSY: CMmDataCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDialNoFdnCheck");
                         HangUp( dialCancelHandleNoFdn );
                         } 
                     else
@@ -803,7 +802,7 @@
                 // Check if the call is for Call Back functionality.
                 // E.g. client has dialled server, which calls back to 
                 // save user the data call charging.
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_5, "TSY: CMmDataCallTsy::Check for waiting call");
+                TFLOGSTRING("TSY: CMmDataCallTsy::Check for waiting call");
                 if ( this == iMmPhone->WaitingCallForData() )
                     {
                     // Client has already tried to answer the incoming 
@@ -838,7 +837,7 @@
                         // it with CALL_CAUSE_NOT_ALLOWED    
                         if( RCall::EStatusAnswering == call->Status() )
                             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_6, "TSY: CMmDataCallTsy::CompleteNotifyStatusChange Answering not allowed!");
+TFLOGSTRING("TSY: CMmDataCallTsy::CompleteNotifyStatusChange Answering not allowed!");                                
                             TInt errorValue = 
                                 CMmCommonStaticUtility::EpocErrorCode( 
                                    KErrAccessDenied, KErrMMEtelCallForbidden );
@@ -1044,13 +1043,14 @@
     const TDesC8* aCallParams,
     TDesC* aTelNumber )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIAL_1, "TSY: CMmDataCallTsy::Dial - Req handle: %u, Call name: %S",aTsyReqHandle, iCallName);
+TFLOGSTRING3("TSY: CMmDataCallTsy::Dial - Req handle: %d, Call name: %S",
+    aTsyReqHandle, &iCallName);
 
 	if( aCallParams->Length()!= 0)
 		{
 		if(sizeof(RCall::TCallParams) > aCallParams->Length())
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIAL_2, "TSY: CMmDataCallTsy::Dial bad size argument");
+			TFLOGSTRING ("TSY: CMmDataCallTsy::Dial bad size argument");
 			// Complete the request with appropiate error        
 			return KErrArgument;
 			}
@@ -1070,7 +1070,7 @@
 	
 	if(!dialFlag )
 		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIAL_3, "TSY: CMmDataCallTsy::Dial ONGOING" );
+TFLOGSTRING("TSY: CMmDataCallTsy::Dial ONGOING" );		
 		SetDialFlag( ETrue );
 		TTsyReqHandle dialHandle = 
 			iTsyReqHandleStore->GetTsyReqHandle( EMultimodeCallDial );
@@ -1083,7 +1083,7 @@
 	
 		if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo() )  
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIAL_4, "TSY: Offline mode ON, Dial request is not allowed" );
+			TFLOGSTRING("TSY: Offline mode ON, Dial request is not allowed" );
 			TInt ret = CMmCommonStaticUtility::EpocErrorCode(
 				KErrGeneral, KErrGsmOfflineOpNotAllowed );
 	
@@ -1098,7 +1098,7 @@
 			// is still in use.
 			// Complete request with status value informing the client
 			// about the situation.
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIAL_5, "TSY: CMmDataCallTsy::Dial - KErrNotReady");
+			TFLOGSTRING("TSY: CMmDataCallTsy::Dial - KErrNotReady");
 			ReqCompleted( aTsyReqHandle, KErrNotReady );
 			}
 		else if ( 0 < dialHandle )
@@ -1106,7 +1106,7 @@
 			// The request is already in processing because of previous request
 			// Complete request with status value informing the client about 
 			// the situation.
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIAL_6, "TSY: CMmDataCallTsy::Dial - KErrServerBusy");
+			TFLOGSTRING("TSY: CMmDataCallTsy::Dial - KErrServerBusy");
 			ReqCompleted( aTsyReqHandle, KErrServerBusy );
 			}
 		else
@@ -1170,7 +1170,7 @@
 	
 				if ( KErrNone == ret )
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIAL_7, "TSY: CMmDataCallTsy::Dial - DialDataCall");
+					TFLOGSTRING("TSY: CMmDataCallTsy::Dial - DialDataCall");
 					TRAP( trapError,
 						ret = iMmCallExtInterface->DialDataCallL(
 							iCallMode, aCallParams, aTelNumber );
@@ -1231,8 +1231,9 @@
 void CMmDataCallTsy::CompleteDial(
     TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEDIAL_1, "TSY: CMmDataCallTsy::CompleteDial - Result: %d", aResult );
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEDIAL_2, "TSY: CMmDataCallTsy::CompleteDial - Call Id: %d, Call name: %S",iCallId, iCallName);
+TFLOGSTRING2("TSY: CMmDataCallTsy::CompleteDial - Result: %d", aResult ); 
+TFLOGSTRING3("TSY: CMmDataCallTsy::CompleteDial - Call Id: %d, Call name: %S",
+    iCallId, &iCallName);
     
     // Set dial flag to false
     SetDialFlag( EFalse );
@@ -1285,7 +1286,8 @@
     const TTsyReqHandle aTsyReqHandle,
     const TDesC8* )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_ANSWERINCOMINGCALL_1, "TSY: CMmDataCallTsy::AnswerIncomingCall. \n\t\t\t Handle: %d",aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmDataCallTsy::AnswerIncomingCall. \n\t\t\t Handle: %d",
+    aTsyReqHandle); 
 
     TTsyReqHandle answerCallHandle = 
         iTsyReqHandleStore->GetTsyReqHandle( EMultimodeCallAnswer );
@@ -1398,7 +1400,8 @@
 TInt CMmDataCallTsy::AnswerIncomingCallCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_ANSWERINCOMINGCALLCANCEL_1, "TSY: CMmDataCallTsy::AnswerIncomingCallCancel. Req handle: %u, Call name: %S",aTsyReqHandle, iCallName);
+TFLOGSTRING3("TSY: CMmDataCallTsy::AnswerIncomingCallCancel. Req handle: %d, Call name: %S",
+    aTsyReqHandle, &iCallName);
 
     TInt ret( KErrNone );
 
@@ -1416,7 +1419,8 @@
             }
         else 
             {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_ANSWERINCOMINGCALLCANCEL_2, "TSY: CMmDataCallTsy::AnswerIncomingCallCancel -- iCallStatus = %d", iCallStatus);
+TFLOGSTRING2("TSY: CMmDataCallTsy::AnswerIncomingCallCancel -- iCallStatus = %d", 
+    iCallStatus);       
             if ( RCall::EStatusUnknown == iCallStatus )
                 {               
                 // Cancel automatic answering
@@ -1460,8 +1464,10 @@
 void CMmDataCallTsy::CompleteAnswerIncomingCall(
     TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEANSWERINCOMINGCALL_1, "TSY: CMmDataCallTsy::CompleteAnswerIncomingCall - Result: %d",aResult );
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEANSWERINCOMINGCALL_2, "TSY: CMmDataCallTsy::CompleteAnswerIncomingCall - Call Id: %d, Call name: %S",iCallId, iCallName);
+TFLOGSTRING2("TSY: CMmDataCallTsy::CompleteAnswerIncomingCall - Result: %d",
+    aResult ); 
+TFLOGSTRING3("TSY: CMmDataCallTsy::CompleteAnswerIncomingCall - Call Id: %d, Call name: %S",
+    iCallId, &iCallName);
 
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle =
@@ -1523,7 +1529,8 @@
 TInt CMmDataCallTsy::HangUp(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_HANGUP_1, "TSY: CMmDataCallTsy::HangUp - Req. handle: %u, Call name: %S",aTsyReqHandle, iCallName);
+TFLOGSTRING3("TSY: CMmDataCallTsy::HangUp - Req. handle: %d, Call name: %S",
+    aTsyReqHandle, &iCallName);
 
     TInt hangUpCause( KErrNone );
     TInt ret( KErrNone );
@@ -1540,7 +1547,7 @@
         //The request is already in processing because of previous request
         //Complete request with status value informing the client about 
         //the situation.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_HANGUP_2, "TSY: CMmDataCallTsy::HangUp - KErrServerBusy");
+TFLOGSTRING("TSY: CMmDataCallTsy::HangUp - KErrServerBusy");
         ReqCompleted( aTsyReqHandle, KErrServerBusy );
         }
     else if ( RCall::EStatusIdle == iCallStatus &&
@@ -1548,7 +1555,7 @@
         {
         //Call object is already in idle state. Complete HangUp request with
         //error.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_HANGUP_3, "TSY: CMmDataCallTsy::HangUp - KErrNotReady");
+TFLOGSTRING("TSY: CMmDataCallTsy::HangUp - KErrNotReady");        
         ReqCompleted( aTsyReqHandle, KErrNotReady );
         }
     else
@@ -1584,7 +1591,7 @@
         //ownership.
         if ( RCall::EStatusRinging == iCallStatus )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_HANGUP_4, "TSY: CMmDataCallTsy::HangUp - Reject incoming call");
+            TFLOGSTRING("TSY: CMmDataCallTsy::HangUp - Reject incoming call");
             }
         //Phone Application is the first client that is started, it 
         //will always be the priority client and thus able to hangup calls
@@ -1661,8 +1668,10 @@
 void CMmDataCallTsy::CompleteHangUp(
     TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_1, "TSY: CMmDataCallTsy::CompleteHangUp.\n  \t\t\t Result: %d",aResult );
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_2, "TSY: CMmDataCallTsy::CompleteHangUp - Call Id: %d, Call name: %S", iCallId, iCallName);
+TFLOGSTRING2("TSY: CMmDataCallTsy::CompleteHangUp.\n  \t\t\t Result: %d",
+    aResult ); 
+TFLOGSTRING3("TSY: CMmDataCallTsy::CompleteHangUp - Call Id: %d, Call name: %S", 
+    iCallId, &iCallName);
 
     TInt ret( KErrNone );
 
@@ -1729,21 +1738,21 @@
     // Complete for DialCancel or AnswerIncomingCallCancel, success
     else if ( KErrNone == aResult ) 
         { 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_3, "TSY: CMmDataCallTsy::CompleteHangUp - EMultimodeCallDial");
+TFLOGSTRING("TSY: CMmDataCallTsy::CompleteHangUp - EMultimodeCallDial");           
         // Find out if this is cancelling of Dial
         TTsyReqHandle cancelHandle =
             iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeCallDial ); 
 
         if ( NULL == cancelHandle ) 
             { 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_4, "TSY: CMmDataCallTsy::CompleteHangUp - EMultimodeCallDialNoFdnCheck");
+TFLOGSTRING("TSY: CMmDataCallTsy::CompleteHangUp - EMultimodeCallDialNoFdnCheck");                
 	        // Find out if this is cancelling of DialNoFdnCheck
 	        cancelHandle = iTsyReqHandleStore->
             ResetTsyReqHandle( EMultimodeCallDialNoFdnCheck );
         
             if ( NULL == cancelHandle )
                 { 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_5, "TSY: CMmDataCallTsy::CompleteHangUp - EMultimodeCallAnswer");
+TFLOGSTRING("TSY: CMmDataCallTsy::CompleteHangUp - EMultimodeCallAnswer");                
                 // Find out if this is cancelling of AnswerIncomingCall
                 cancelHandle = iTsyReqHandleStore->ResetTsyReqHandle(
                     EMultimodeCallAnswer );
@@ -1752,7 +1761,7 @@
         
         if ( 0 < cancelHandle ) 
             { 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_6, "TSY: CMmDataCallTsy::CompleteHangUp with KErrCancel");
+TFLOGSTRING("TSY: CMmDataCallTsy::CompleteHangUp with KErrCancel");
              
             // Complete with error value KErrCancel
             ReqCompleted( cancelHandle, KErrCancel );
@@ -1785,7 +1794,7 @@
 
         if ( NULL == cancelHandle ) 
             { 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_7, "TSY: CMmDataCallTsy::CompleteHangUp - cancelling of EMultimodeCallDialNoFdnCheck");
+TFLOGSTRING("TSY: CMmDataCallTsy::CompleteHangUp - cancelling of EMultimodeCallDialNoFdnCheck");     
             // Find out if this is cancelling of DialNoFdnCheck
             TTsyReqHandle cancelHandle =
                 iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -1793,7 +1802,7 @@
             
             if ( NULL == cancelHandle )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_8, "TSY: CMmDataCallTsy::CompleteHangUp - cancelling of AnswerIncomingCall");
+TFLOGSTRING("TSY: CMmDataCallTsy::CompleteHangUp - cancelling of AnswerIncomingCall");                     
                 // Find out if this is cancelling of AnswerIncomingCall
                 cancelHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
                     EMultimodeCallAnswer );
@@ -1804,7 +1813,7 @@
         // Cancel to Dial or AnswerIncomingCall
         if ( 0 < cancelHandle ) 
             { 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_9, "TSY: CMmDataCallTsy::CompleteHangUp - with KErrNone");
+TFLOGSTRING("TSY: CMmDataCallTsy::CompleteHangUp - with KErrNone");             
             // Complete with success (KErrNone)
             ReqCompleted( cancelHandle, KErrNone ); 
 
@@ -2236,11 +2245,11 @@
     {
     //Incoming call detected, which is directed to this call object
     //which should be waiting for incoming call
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_CALLCOMINGFORWAITINGCALL_1, "TSY: CMmDataCallTsy::CallComingForWaitingCall");
+    TFLOGSTRING("TSY: CMmDataCallTsy::CallComingForWaitingCall");
 
     TInt ret( KErrNone );
 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_CALLCOMINGFORWAITINGCALL_2, "TSY: CMmDataCallTsy::AnswerIncomingCall - Data call");
+    TFLOGSTRING("TSY: CMmDataCallTsy::AnswerIncomingCall - Data call");
     //Answer incoming call
     TRAPD( trapError,
         ret = iMmCallExtInterface->AnswerIncomingDataCallL( iCallId );
@@ -2286,7 +2295,8 @@
     const TTsyReqHandle aTsyReqHandle,
     RCall::TCommPort* aCommPort )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_LOANDATAPORT_1, "TSY: CMmDataCallTsy::LoanDataPort - Client taking control: %S",iCallName );
+TFLOGSTRING2("TSY: CMmDataCallTsy::LoanDataPort - Client taking control: %S",
+    &iCallName );
 
     TInt ret( KErrNone );
 
@@ -2396,7 +2406,8 @@
 TInt CMmDataCallTsy::RecoverDataPort(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_RECOVERDATAPORT_1, "TSY: CMmDataCallTsy::RecoverDataPort - Client returning control: %S",iCallName );
+TFLOGSTRING2("TSY: CMmDataCallTsy::RecoverDataPort - Client returning control: %S",
+    &iCallName );
 
     TInt ret( KErrNone );
 
@@ -2455,7 +2466,8 @@
 //
 TInt CMmDataCallTsy::RecoverDataPortAndRelinquishOwnership()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_RECOVERDATAPORTANDRELINQUISHOWNERSHIP_1, "TSY: CMmDataCallTsy::RecoverDataPortAndRelinquishOwnership - \Client returning control: %S", iCallName );
+TFLOGSTRING2("TSY: CMmDataCallTsy::RecoverDataPortAndRelinquishOwnership - \
+    Client returning control: %S", &iCallName );
 
     TInt ret( KErrNone );
 
@@ -2532,7 +2544,7 @@
     const TTsyReqHandle aTsyReqHandle,
     const TDesC8* aCallParams )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_CONNECT_1, "TSY: CMmDataCallTsy::Connect");
+TFLOGSTRING("TSY: CMmDataCallTsy::Connect");      
     if ( CheckOwnership( aTsyReqHandle ) == CCallBase::EOwnedUnowned )
         {
         SetOwnership( aTsyReqHandle );
@@ -2566,7 +2578,7 @@
     	}
     if(sizeof(RMobileCall::TMobileCallParamsV1) > aCallParams->Length())
        	{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_CONNECT_2, "TSY: CMmDataCallTsy::Connect bad size argument");
+        TFLOGSTRING ("TSY: CMmDataCallTsy::Connect bad size argument");
         // Complete the request with appropiate error        
         return KErrArgument;
     	}
@@ -2791,7 +2803,8 @@
     TInt ret( KErrNone );
     // HSCSD parameters can be set only if this call has been opened
     // from the phone's data line.
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_SETDYNAMICHSCSDPARAMS_1, "TSY: CMmDataCallTsy::SetDynamicHscsdParams.\n  \t\t\t Air Intrf: %d\n  \t\t\t RX slots: %d", *aAiur, *aRxTimeslots);
+TFLOGSTRING3("TSY: CMmDataCallTsy::SetDynamicHscsdParams.\n  \t\t\t Air Intrf: %d\n  \t\t\t RX slots: %d", 
+    *aAiur, *aRxTimeslots);
 
     iReqHandleType = EMultimodeCallSetDynamicHscsdParams;
 
@@ -2831,7 +2844,7 @@
 void CMmDataCallTsy::CompleteSetDynamicHscsdParams(
     TInt aErrorCode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETESETDYNAMICHSCSDPARAMS_1, "TSY: CMmDataCallTsy::CompleteSetDynamicHscsdParams");
+TFLOGSTRING("TSY: CMmDataCallTsy::CompleteSetDynamicHscsdParams");    
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodeCallSetDynamicHscsdParams );
@@ -2852,7 +2865,7 @@
     const TTsyReqHandle aTsyReqHandle,
     TDes8* aHSCSDInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_GETCURRENTHSCSDINFO_1, "TSY: CMmDataCallTsy::GetCurrentHscsdInfo");
+TFLOGSTRING("TSY: CMmDataCallTsy::GetCurrentHscsdInfo");        
     TInt ret( KErrNone );
     // HSCSD info can be read only if this call has been opened from the 
     // phone's data line and call is connected.
@@ -2938,7 +2951,7 @@
 //
 void CMmDataCallTsy::CompleteNotifyHscsdInfoChange()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETENOTIFYHSCSDINFOCHANGE_1, "TSY: CMmDataCallTsy::CompleteNotifyHscsdInfoChange");
+TFLOGSTRING("TSY: CMmDataCallTsy::CompleteNotifyHscsdInfoChange");       
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodeCallNotifyHscsdInfoChange );
@@ -2978,7 +2991,8 @@
     const TDesC8* aCallParams,
     TDesC* aTelNumber )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIALNOFDNCHECK_1, "TSY: CMmDataCallTsy::DialNoFdnCheck - Req handle: %u, Call name: %S",aTsyReqHandle, iCallName);
+TFLOGSTRING3("TSY: CMmDataCallTsy::DialNoFdnCheck - Req handle: %d, Call name: %S",
+    aTsyReqHandle, &iCallName);
 
 	CMmCallList* callList = iMmPhone->CallList();
 	TBool dialFlag( EFalse );
@@ -2995,7 +3009,7 @@
 	
 	if( !dialFlag )
 		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIALNOFDNCHECK_2, "TSY: CMmDataCallTsy::DialNoFdnCheck ONGOING" );
+TFLOGSTRING("TSY: CMmDataCallTsy::DialNoFdnCheck ONGOING" );		
     		
     	SetDialFlag( ETrue );
     		
@@ -3010,11 +3024,11 @@
     
         if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo() )  
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIALNOFDNCHECK_3, "TSY: CMmDataCallTsy - DialNoFdnCheck - Offline mode ON, Dial request is not allowed" );
+TFLOGSTRING("TSY: CMmDataCallTsy - DialNoFdnCheck - Offline mode ON, Dial request is not allowed" );
             TInt ret = CMmCommonStaticUtility::EpocErrorCode(
                 KErrGeneral, KErrGsmOfflineOpNotAllowed );
             SetDialFlag( EFalse );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIALNOFDNCHECK_4, "TSY: CMmDataCallTsy::DialNoFdnCheck - RF inactive -> dial-flag false" );
+TFLOGSTRING("TSY: CMmDataCallTsy::DialNoFdnCheck - RF inactive -> dial-flag false" );        
             // Complete the request with appropiate error
             ReqCompleted ( aTsyReqHandle, ret ); 
             }
@@ -3026,7 +3040,7 @@
             // is still in use.
             // Complete request with status value informing the client
             // about the situation.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIALNOFDNCHECK_5, "TSY: CMmDataCallTsy::DialNoFdnCheck - KErrNotReady");
+TFLOGSTRING("TSY: CMmDataCallTsy::DialNoFdnCheck - KErrNotReady");
             ReqCompleted( aTsyReqHandle, KErrNotReady );
             }
         else if ( 0 < dialHandle )
@@ -3034,7 +3048,7 @@
             // Request is already in processing because of previous request
             // Complete request with status value informing the client about 
             // the situation.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIALNOFDNCHECK_6, "TSY: CMmDataCallTsy::DialNoFdnCheck - KErrServerBusy");
+TFLOGSTRING("TSY: CMmDataCallTsy::DialNoFdnCheck - KErrServerBusy");
             ReqCompleted( aTsyReqHandle, KErrServerBusy );
             }
         else
@@ -3090,7 +3104,7 @@
                     {
                     SetDialTypeId( KMultimodeCallTypeIDNoFdnCheck );
                     
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIALNOFDNCHECK_7, "TSY: CMmDataCallTsy::DialNoFdnCheck - DialDataCall");
+TFLOGSTRING("TSY: CMmDataCallTsy::DialNoFdnCheck - DialDataCall");
                     TRAP( trapError,
                         ret = iMmCallExtInterface->DialDataCallL(
                             iCallMode, aCallParams, aTelNumber );
@@ -3154,8 +3168,9 @@
 void CMmDataCallTsy::CompleteDialNoFdn(
     TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEDIALNOFDN_1, "TSY: CMmDataCallTsy::CompleteDialNoFdn - Result: %d", aResult );
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEDIALNOFDN_2, "TSY: CMmDataCallTsy::CompleteDialNoFdn - Call Id: %d, Call name: %S",iCallId, iCallName);
+TFLOGSTRING2("TSY: CMmDataCallTsy::CompleteDialNoFdn - Result: %d", aResult ); 
+TFLOGSTRING3("TSY: CMmDataCallTsy::CompleteDialNoFdn - Call Id: %d, Call name: %S",
+    iCallId, &iCallName);
     
     // Set dial flag to false
     SetDialFlag( EFalse );
@@ -3179,10 +3194,10 @@
             //complete caps change notification
             CompleteNotifyCapsChange();
             }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEDIALNOFDN_3, "TSY: CMmDataCallTsy::CompleteDialNoFdn before ReqComplete %d", aResult );
+TFLOGSTRING2("TSY: CMmDataCallTsy::CompleteDialNoFdn before ReqComplete %d", aResult );
         ReqCompleted( reqHandle, aResult );
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEDIALNOFDN_4, "TSY: CMmDataCallTsy::CompleteDialNoFdn - set dialtype to none ");
+TFLOGSTRING("TSY: CMmDataCallTsy::CompleteDialNoFdn - set dialtype to none ");
 	    //Set dial type to none 
 	    SetDialTypeId( KMultimodeCallTypeDialNone );
         }
@@ -3217,7 +3232,7 @@
     //Overloads CTelObject::ReqCompleted for logging purposes. It 
     //prints the aTsyReqHandle and aError variable in the log file and then 
     //calls CTelObject::ReqCompleted.
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_REQCOMPLETED_1, "TSY: CMmDataCallTsy::Request Completed. Handle:%d Error:%d", aTsyReqHandle, aError);
+TFLOGSTRING3("TSY: CMmDataCallTsy::Request Completed. Handle:%d Error:%d", aTsyReqHandle, aError); 
 
     CTelObject::ReqCompleted(aTsyReqHandle,aError);
     }

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatalinetsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatalinetsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 //INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmdatalinetsyTraces.h"
-#endif
-
 #include "cmmdatalinetsy.h"
 #include "cmmphonetsy.h"
 #include "cmmdatacalltsy.h"
@@ -43,7 +37,7 @@
 
 void CMmDataLineTsy::ConstructL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_CONSTRUCTL_1, "TSY: CMmDataLineTsy::ConstructL");
+TFLOGSTRING("TSY: CMmDataLineTsy::ConstructL");
 
     CMmLineTsy::ConstructL();
     }
@@ -54,7 +48,7 @@
     const TDesC& aName,
     CMmMessageManagerBase* aMessageManager )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_NEWL_1, "TSY: CMmDataLineTsy::NewL - Data line %S created", aName);
+TFLOGSTRING2("TSY: CMmDataLineTsy::NewL - Data line %S created", &aName);
     CMmDataLineTsy* mmLineTsy = NULL;
 
     if ( NULL != aMmPhone && RMobilePhone::ECircuitDataService == aMode )
@@ -75,7 +69,8 @@
 
 CMmDataLineTsy::~CMmDataLineTsy()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_DTOR_1, "TSY: CMmDataLineTsy::~CMmDataLineTsy - Line name: %S",iLineName);
+TFLOGSTRING2("TSY: CMmDataLineTsy::~CMmDataLineTsy - Line name: %S",
+    &iLineName);
 
     }
 
@@ -257,7 +252,8 @@
         reinterpret_cast<CCallDataPackage*>(aDataPackage);
     callDataPackage->GetCallIdAndMode( callId, callMode ); 
 
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYINCOMINGCALL_1, "TSY: CMmDataLineTsy::CompleteNotifyIncomingCall - \Line name: %S, Call id: %d", iLineName, callId );
+TFLOGSTRING3("TSY: CMmDataLineTsy::CompleteNotifyIncomingCall - \
+    Line name: %S, Call id: %d", &iLineName, callId );
 
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -423,7 +419,7 @@
 void CMmDataLineTsy::CompleteNotifyDiallingStatus(
     CMmDataPackage* aDataPackage )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_1, "TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus");
+TFLOGSTRING("TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus");
 
     TInt callId( -1 );
     TBool ghostCall( EFalse );
@@ -440,7 +436,8 @@
 
     if ( NULL == mmCall )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_2, "TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - \GhostCall");
+        TFLOGSTRING("TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - \
+            GhostCall");
         ghostCall = ETrue;
         }
     else
@@ -456,8 +453,8 @@
         resultNoFdnCheck = mmCall->IsServiceLocallyRequested( 
             CMmCallTsy::EMultimodeCallDialNoFdnCheck );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_3, "TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - IsDial: %d", result );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_4, "TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - IsDialNoFdnCheck: %d", resultNoFdnCheck );
+TFLOGSTRING2("TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - IsDial: %d", result );  
+TFLOGSTRING2("TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - IsDialNoFdnCheck: %d", resultNoFdnCheck );  
 
         if ( result || resultNoFdnCheck )
             {
@@ -473,7 +470,7 @@
                         CMmCallTsy::EMultimodeCallDialNoFdnCheck ) ) )
                     {
                     mmCall->SetCallId( callId );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_5, "TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - mmCall SetCallId: %d", callId);
+TFLOGSTRING2("TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - mmCall SetCallId: %d", callId);                           
                     mmCall->CompleteNotifyMobileCallInfoChange( 
                                 aDataPackage );
                     break;
@@ -482,14 +479,14 @@
             }
         else
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_6, "TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - Dial not found");
+TFLOGSTRING("TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - Dial not found");
             ghostCall = ETrue;
             }
         }
     //Ghost call handling starts here
     if ( ghostCall )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_7, "TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus -> CompleteNotifyAddBypassingCall");
+TFLOGSTRING("TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus -> CompleteNotifyAddBypassingCall");        
         //complete call added notification directly from here
         CompleteNotifyAddBypassingCall( aDataPackage ); 
         }

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,14 +16,9 @@
 
 
 //INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmdtmftsyTraces.h"
-#endif
-
 #include "cmmdtmftsy.h"
 #include <etelmmcs.h> 
+#include <ctsy/tflogger.h> 
 
 // include internal Tsy classes
 #include "cmmphonetsy.h"
@@ -64,7 +59,7 @@
     
 CMmDtmfTsy::~CMmDtmfTsy()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_DTOR_1, "TSY: CMmDtmfTsy::~CMmDtmfTsy");
+    TFLOGSTRING("TSY: CMmDtmfTsy::~CMmDtmfTsy");
     if (iMmPhone )
         {
         // deregister tsy object from message manager
@@ -150,7 +145,7 @@
 // ---------------------------------------------------------------------------
 TInt CMmDtmfTsy::NotifyDTMFEvent( TInt* aInfo )
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_NOTIFYDTMFEVENT_1, "TSY: CMmDtmfTsy::NotifyDTMFEvent");
+TFLOGSTRING("TSY: CMmDtmfTsy::NotifyDTMFEvent");
 
 	iDtmfInfo = aInfo; // save pointer to client data
 
@@ -167,7 +162,7 @@
 //
 void CMmDtmfTsy::CompleteNotifyDTMFEvent( TInt aInfo )
      {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_COMPLETENOTIFYDTMFEVENT_1, "TSY: CMmCustomTsy::CompleteNotifyDtmfEvent");
+TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyDtmfEvent");
     // reset request handle. Returns the deleted req handle.
 	TTsyReqHandle reqHandle =	
 		iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -188,7 +183,7 @@
 // ---------------------------------------------------------------------------
 TInt CMmDtmfTsy::NotifyDTMFEventCancel( const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_NOTIFYDTMFEVENTCANCEL_1, "TSY: CMmDtmfTsy::NotifyDtmfEventCancel");
+TFLOGSTRING("TSY: CMmDtmfTsy::NotifyDtmfEventCancel");
 
 	iDtmfInfo = NULL;
 	TTsyReqHandle reqHandle =	
@@ -457,7 +452,7 @@
 //
 TInt CMmDtmfTsy::SendDTMFTonesCancelL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_SENDDTMFTONESCANCELL_1, "TSY: CMmDtmfTsy::SendDTMFTonesCancel");
+TFLOGSTRING("TSY: CMmDtmfTsy::SendDTMFTonesCancel");
 
     TTsyReqHandle sendDTMFTonesHandle =
         iMmPhone->iTsyReqHandleStore->GetTsyReqHandle( 
@@ -491,7 +486,7 @@
 void CMmDtmfTsy::CompleteSendDTMFTonesCancel( 
     TInt aResult ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_COMPLETESENDDTMFTONESCANCEL_1, "TSY: CMmDtmfTsy::CompleteSendDTMFTonesCancel");
+TFLOGSTRING("TSY: CMmDtmfTsy::CompleteSendDTMFTonesCancel");
 
     // Get req handle. 
     TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->GetTsyReqHandle( 
@@ -613,7 +608,7 @@
 //
 TInt CMmDtmfTsy::NotifyStopInDTMFString()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_NOTIFYSTOPINDTMFSTRING_1, "TSY: CMmDtmfTsy::NotifyStopInDTMFString");
+TFLOGSTRING("TSY: CMmDtmfTsy::NotifyStopInDTMFString");
     //Set TSY request handle type
     iMmPhone->iReqHandleType = 
         CMmPhoneTsy::EMultimodePhoneNotifyStopInDTMFString;
@@ -648,7 +643,7 @@
 void CMmDtmfTsy::CompleteNotifyStopInDTMFString( 
 	CMmDataPackage* aDataPackage )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_COMPLETENOTIFYSTOPINDTMFSTRING_1, "TSY: CMmDtmfTsy::CompleteNotifyStopInDTMFString");
+TFLOGSTRING("TSY: CMmDtmfTsy::CompleteNotifyStopInDTMFString");
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle(
         CMmPhoneTsy::EMultimodePhoneNotifyStopInDTMFString );
@@ -675,7 +670,7 @@
      TBool aContinue )                  
                                            
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_CONTINUEDTMFSTRINGSENDINGL_1, "TSY: CMmDtmfTsy::ContinueDTMFStringSendingL aContinue:%d",aContinue);
+TFLOGSTRING2("TSY: CMmDtmfTsy::ContinueDTMFStringSendingL aContinue:%d",aContinue);
     TInt ret( KErrNone );
 
     TTsyReqHandle sendDTMFTonesHandle =

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsywithdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsywithdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -20,17 +20,12 @@
  * in CTSY for use when the CTSY is used with the CTSY Dispatcher.
  */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmdtmftsywithdispatcherTraces.h"
-#endif
-
 #include "cmmdtmftsy.h"
 #include "cmmphonetsy.h"
 #include "cmmtsyreqhandlestore.h"
 #include "cmmcalllist.h"
 #include "cmmcalltsy.h"
+#include <ctsy/tflogger.h>
 
 /**
  * Starts sending a single DTMF digit.
@@ -45,7 +40,7 @@
  */
 TInt CMmDtmfTsy::StartDTMFToneL(const TTsyReqHandle aTsyReqHandle, TChar* aTone)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_STARTDTMFTONEL_1, "TSY: CMmDtmfTsy::StartDTMFToneL");
+	TFLOGSTRING("TSY: CMmDtmfTsy::StartDTMFToneL");
 
     TInt ret = KErrServerBusy;
 
@@ -106,7 +101,7 @@
  */
 TInt CMmDtmfTsy::StopDTMFToneL(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_STOPDTMFTONEL_1, "TSY: CMmDtmfTsy::StopDTMFToneL");
+	TFLOGSTRING("TSY: CMmDtmfTsy::StopDTMFToneL");
 
     TInt ret = KErrServerBusy;
 
@@ -161,7 +156,7 @@
  */
 void CMmDtmfTsy::CompleteStartDTMFTone(TInt aResult)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_COMPLETESTARTDTMFTONE_1, "TSY: CMmDtmfTsy::CompleteStartDTMFTone aResult=%d", aResult);
+	TFLOGSTRING2("TSY: CMmDtmfTsy::CompleteStartDTMFTone aResult=%d", aResult);
 
     TTsyReqHandle reqHandle
         = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle(
@@ -181,7 +176,7 @@
  */
 void CMmDtmfTsy::CompleteStopDTMFTone(TInt aResult)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_COMPLETESTOPDTMFTONE_1, "TSY: CMmDtmfTsy::CompleteStopDTMFTone aResult=%d", aResult);
+	TFLOGSTRING2("TSY: CMmDtmfTsy::CompleteStopDTMFTone aResult=%d", aResult);
 
     TTsyReqHandle reqHandle
         = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle(
@@ -202,7 +197,7 @@
  */
 TInt CMmDtmfTsy::SendDTMFTonesL(const TTsyReqHandle aTsyReqHandle, const TDesC* aTones)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_SENDDTMFTONESL_1, "TSY: CMmDtmfTsy::SendDTMFTonesL");
+	TFLOGSTRING("TSY: CMmDtmfTsy::SendDTMFTonesL");
 
     TTsyReqHandle sendDTMFTonesHandle = iMmPhone->iTsyReqHandleStore
         ->GetTsyReqHandle(CMmPhoneTsy::EMultimodePhoneSendDTMFTones);
@@ -300,7 +295,7 @@
 //
 TInt CMmDtmfTsy::SendDTMFTonesCancelL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_SENDDTMFTONESCANCELL1_1, "TSY: CMmDtmfTsy::SendDTMFTonesCancel");
+TFLOGSTRING("TSY: CMmDtmfTsy::SendDTMFTonesCancel");
 
     TTsyReqHandle sendDTMFTonesHandle =
         iMmPhone->iTsyReqHandleStore->GetTsyReqHandle(

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxcalltsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxcalltsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 //INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmfaxcalltsyTraces.h"
-#endif
-
 #include "cmmfaxcalltsy.h"
 #include "cmmfaxlinetsy.h"
 #include "cmmphonetsy.h"
@@ -48,7 +42,7 @@
     TDes& aName, 
     CMmMessageManagerBase* aMessageManager )
     {
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_NEWL_1, "TSY: CMmFaxCallTsy::NewL. Call name: %S", aName);
+	TFLOGSTRING2("TSY: CMmFaxCallTsy::NewL. Call name: %S", &aName);
 
     CMmFaxCallTsy* mmCall = NULL;
 
@@ -72,7 +66,8 @@
 
 CMmFaxCallTsy::~CMmFaxCallTsy()
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DTOR_1, "TSY: CMmFaxCallTsy::~CMmFaxCallTsy. Call deleted \iCallId:%d iCallName:%S", iCallId, iCallName);
+    TFLOGSTRING3("TSY: CMmFaxCallTsy::~CMmFaxCallTsy. Call deleted \
+        iCallId:%d iCallName:%S", iCallId, &iCallName);
 
     // If Dial fails, Symbian CSD agent will close the call immediately.
     // This means that TSY has not yet received call status indications, 
@@ -206,7 +201,8 @@
     const TInt aIpc,
     const TDataPackage& aPackage )
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DOEXTFUNCL_1, "TSY: CMmFaxCallTsy::DoExtFuncL. IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+    TFLOGSTRING3("TSY: CMmFaxCallTsy::DoExtFuncL. IPC:%d Handle:%d", aIpc, 
+        aTsyReqHandle);
 
     TInt ret( KErrNone );
 
@@ -310,7 +306,7 @@
 CTelObject::TReqMode CMmFaxCallTsy::ReqModeL(
     const TInt aIpc )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_REQMODEL_1, "TSY: CMmFaxCallTsy::ReqModeL. IPC:%d",aIpc);
+    TFLOGSTRING2("TSY: CMmFaxCallTsy::ReqModeL. IPC:%d",aIpc); 
 
     CTelObject::TReqMode ret( 0 ); // default return value
     
@@ -553,7 +549,8 @@
     const TInt aIpc,
     const TTsyReqHandle aTsyReqHandle )
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_CANCELSERVICE_1, "TSY: CMmFaxCallTsy::CancelService. IPC: %d, Req handle: %d",aIpc, aTsyReqHandle);
+    TFLOGSTRING3("TSY: CMmFaxCallTsy::CancelService. IPC: %d, Req handle: %d",
+        aIpc, aTsyReqHandle); 
 
     TInt ret( KErrNone );
 
@@ -657,8 +654,10 @@
 
         callDataPackage->UnPackData( callStatus );
 
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_COMPLETENOTIFYSTATUSCHANGE_1, "TSY: CMmFaxCallTsy::CompleteNotifyStatusChange. aResult:%d",aResult );
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_COMPLETENOTIFYSTATUSCHANGE_2, "TSY: CMmFaxCallTsy::CompleteNotifyStatusChange. \Call status:%d Call name:%S", callStatus, iCallName);
+        TFLOGSTRING2("TSY: CMmFaxCallTsy::CompleteNotifyStatusChange. aResult:%d",
+            aResult ); 
+        TFLOGSTRING3("TSY: CMmFaxCallTsy::CompleteNotifyStatusChange. \
+            Call status:%d Call name:%S", callStatus, &iCallName); 
 
         switch( callStatus )
             {
@@ -974,7 +973,8 @@
     const TDesC8* aCallParams,
     TDesC* aTelNumber )
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DIAL_1, "TSY: CMmFaxCallTsy::Dial. Req handle: %u, Call name: %S", aTsyReqHandle, iCallName);
+    TFLOGSTRING3("TSY: CMmFaxCallTsy::Dial. Req handle: %d, Call name: %S", 
+        aTsyReqHandle, &iCallName);
 
 	CMmCallList* callList = iMmPhone->CallList();
 	TBool dialFlag( EFalse );
@@ -1003,7 +1003,7 @@
 
     if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo() )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DIAL_2, "TSY: Offline mode ON, Dial request is not allowed" );
+        TFLOGSTRING("TSY: Offline mode ON, Dial request is not allowed" );
         TInt ret = CMmCommonStaticUtility::EpocErrorCode(
             KErrGeneral, KErrGsmOfflineOpNotAllowed );
 
@@ -1018,7 +1018,7 @@
         //is still in use.
         //Complete request with status value informing the client
         //about the situation.
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DIAL_3, "TSY: CMmFaxCallTsy::Dial - KErrNotReady");
+        TFLOGSTRING("TSY: CMmFaxCallTsy::Dial - KErrNotReady");
         ReqCompleted( aTsyReqHandle, KErrNotReady );
         }
     else if ( 0 < dialHandle )
@@ -1026,7 +1026,7 @@
         //The request is already in processing because of previous request
         //Complete request with status value informing the client about 
         //the situation.
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DIAL_4, "TSY: CMmFaxCallTsy::Dial - KErrServerBusy");
+        TFLOGSTRING("TSY: CMmFaxCallTsy::Dial - KErrServerBusy");
         ReqCompleted( aTsyReqHandle, KErrServerBusy );
         }
     else
@@ -1117,7 +1117,8 @@
 TInt CMmFaxCallTsy::DialCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DIALCANCEL_1, "TSY: CMmFaxCallTsy::DialCancel. Req handle: %u, Call name: %S", aTsyReqHandle, iCallName);
+    TFLOGSTRING3("TSY: CMmFaxCallTsy::DialCancel. Req handle: %d, Call name: %S", 
+        aTsyReqHandle, &iCallName);
 
     TInt ret( KErrGeneral );
 
@@ -1143,7 +1144,8 @@
     const TTsyReqHandle aTsyReqHandle,
     const TDesC8* /*aCallParams*/ )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_ANSWERINCOMINGCALL_1, "TSY: CMmFaxCallTsy::AnswerIncomingCall. \n\t\t\t Handle:%d",aTsyReqHandle);
+    TFLOGSTRING2("TSY: CMmFaxCallTsy::AnswerIncomingCall. \n\t\t\t Handle:%d",
+        aTsyReqHandle); 
 
     TTsyReqHandle iAnswerCallHandle = iTsyReqHandleStore->
         GetTsyReqHandle( EMultimodeCallAnswer );
@@ -1225,7 +1227,8 @@
 TInt CMmFaxCallTsy::HangUp(
     const TTsyReqHandle aTsyReqHandle )
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_HANGUP_1, "TSY: CMmFaxCallTsy::HangUp. Req handle: %u, Call name: %S", aTsyReqHandle, iCallName);
+    TFLOGSTRING3("TSY: CMmFaxCallTsy::HangUp. Req handle: %d, Call name: %S", 
+        aTsyReqHandle, &iCallName);
 
     TInt hangUpCause( KErrNone );
     TInt ret( KErrNone );
@@ -1281,7 +1284,7 @@
         //ownership.
         if ( RCall::EStatusRinging == iCallStatus )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_HANGUP_2, "TSY: CMmFaxCallTsy::HangUp - Reject incoming call");
+            TFLOGSTRING("TSY: CMmFaxCallTsy::HangUp - Reject incoming call");
             }
         //Phone Application is the first client that is started, it 
         //will always be the priority client and thus able to hangup calls
@@ -1729,7 +1732,8 @@
     const TTsyReqHandle aTsyReqHandle,
     RCall::TCommPort* aCommPort )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_LOANDATAPORT_1, "TSY: CMmFaxCallTsy::LoanDataPort - Client taking control: %S",iCallName );
+TFLOGSTRING2("TSY: CMmFaxCallTsy::LoanDataPort - Client taking control: %S",
+    &iCallName );
 
     TInt ret( KErrNone );
 
@@ -1835,7 +1839,8 @@
 TInt CMmFaxCallTsy::RecoverDataPort(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_RECOVERDATAPORT_1, "TSY: CMmFaxCallTsy::RecoverDataPort - Client returning control: %S",iCallName );
+TFLOGSTRING2("TSY: CMmFaxCallTsy::RecoverDataPort - Client returning control: %S",
+    &iCallName );
 
     TInt ret( KErrNone );
 
@@ -1890,7 +1895,8 @@
 //
 TInt CMmFaxCallTsy::RecoverDataPortAndRelinquishOwnership()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_RECOVERDATAPORTANDRELINQUISHOWNERSHIP_1, "TSY: CMmFaxCallTsy::RecoverDataPortAndRelinquishOwnership - \Client returning control: %S", iCallName );
+TFLOGSTRING2("TSY: CMmFaxCallTsy::RecoverDataPortAndRelinquishOwnership - \
+    Client returning control: %S", &iCallName );
 
     TInt ret( KErrNone );

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxlinetsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxlinetsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmfaxlinetsyTraces.h"
-#endif
-
 #include "cmmfaxlinetsy.h"
 #include "cmmphonetsy.h"
 #include "cmmfaxcalltsy.h"
@@ -30,6 +24,7 @@
 #include "cmmcalllist.h"
 #include "cmmtsyreqhandlestore.h"
 #include "cmmmessagemanagerbase.h"
+#include <ctsy/tflogger.h>
 #include <ctsy/pluginapi/cmmdatapackage.h>
 
 // ======== MEMBER FUNCTIONS ========
@@ -65,7 +60,8 @@
 
 CMmFaxLineTsy::~CMmFaxLineTsy()
     {
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXLINETSY_DTOR_1, "TSY: CMmFaxLineTsy::~CMmFaxLineTsy. Line name: %S",iLineName);
+    TFLOGSTRING2("TSY: CMmFaxLineTsy::~CMmFaxLineTsy. Line name: %S",
+        &iLineName);
 
     iLastIncomingFaxCall = NULL;
     }
@@ -262,7 +258,8 @@
 
     callDataPackage->GetCallIdAndMode( callId, callMode ); 
 
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXLINETSY_COMPLETENOTIFYINCOMINGCALL_1, "TSY: CMmFaxLineTsy::CompleteNotifyIncomingCall - \Line name: %S, Call id: %d", iLineName, callId );
+    TFLOGSTRING3("TSY: CMmFaxLineTsy::CompleteNotifyIncomingCall - \
+        Line name: %S, Call id: %d", &iLineName, callId );
 
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -351,7 +348,7 @@
 void CMmFaxLineTsy::CompleteNotifyDiallingStatus(
     CMmDataPackage* aDataPackage )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXLINETSY_COMPLETENOTIFYDIALLINGSTATUS_1, "TSY: CMmFaxLineTsy::CompleteNotifyDiallingStatus");
+    TFLOGSTRING("TSY: CMmFaxLineTsy::CompleteNotifyDiallingStatus");
     TInt callId( -1 );
     TBool ghostCall( EFalse );
     RMobilePhone::TMobileService callMode( RMobilePhone::EFaxService );
@@ -366,7 +363,8 @@
 
     if ( NULL == mmCall )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXLINETSY_COMPLETENOTIFYDIALLINGSTATUS_2, "TSY: CMmFaxLineTsy::CompleteNotifyDiallingStatus - \GhostCall");
+        TFLOGSTRING("TSY: CMmFaxLineTsy::CompleteNotifyDiallingStatus - \
+            GhostCall");
         ghostCall = ETrue;
         }
     else
@@ -396,7 +394,8 @@
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXLINETSY_COMPLETENOTIFYDIALLINGSTATUS_3, "TSY: CMmFaxLineTsy::CompleteNotifyDiallingStatus - \Dial not found");
+            TFLOGSTRING("TSY: CMmFaxLineTsy::CompleteNotifyDiallingStatus - \
+                Dial not found");
             ghostCall = ETrue;
             }
         }
@@ -415,7 +414,7 @@
 //
 void CMmFaxLineTsy::ResetLastIncomingCall()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXLINETSY_RESETLASTINCOMINGCALL_1, "TSY: CMmFaxLineTsy::ResetLastIncomingCall");
+    TFLOGSTRING("TSY: CMmFaxLineTsy::ResetLastIncomingCall");
     iLastIncomingFaxCall = NULL;
     }

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinelist.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinelist.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 //INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmlinelistTraces.h"
-#endif
-
 #include "cmmlinelist.h"
 #include "cmmphonetsy.h"
 #include "cmmlinetsy.h"
@@ -87,7 +81,7 @@
         iIsLineInUse[ i ] = EFalse;                
         }    
        
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_CONSTRUCTL_1, "TSY: CMmLineList::ConstructL:iObjectContainer->Count()=%d", iObjectContainer->Count());
+TFLOGSTRING2("TSY: CMmLineList::ConstructL:iObjectContainer->Count()=%d", iObjectContainer->Count());        
        
     }
 
@@ -109,10 +103,10 @@
     {    
     CMmLineTsy* mmLine = NULL;
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETMMLINEBYMODE_1, "TSY: CMmLineList::GetMmLineByMode");
+TFLOGSTRING("TSY: CMmLineList::GetMmLineByMode");       
     if ( iObjectContainer  && iInitialised)
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETMMLINEBYMODE_2, "TSY: CMmLineList::GetMmLineByMode::iObjectContainer->Count()=%d", iObjectContainer->Count());
+TFLOGSTRING2("TSY: CMmLineList::GetMmLineByMode::iObjectContainer->Count()=%d", iObjectContainer->Count());        
        
         for ( TInt i = 0; i < iObjectContainer->Count(); i++ )
             {
@@ -143,14 +137,14 @@
     TInt aIndex )
     {
     CMmLineTsy* mmLine = NULL;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETMMLINEBYINDEX_1, "TSY: CMmLineList::GetMmLineByIndex");
+TFLOGSTRING("TSY: CMmLineList::GetMmLineByIndex");        
 	//This is for checking that return objects is right
    	CTelObject* tempObject = 
                     reinterpret_cast< CTelObject* >( this );
                     
     if ( iObjectContainer && iInitialised )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETMMLINEBYINDEX_2, "TSY: CMmLineList::GetMmLineByIndex:iObjectContainer->Count()=%d", iObjectContainer->Count());
+TFLOGSTRING2("TSY: CMmLineList::GetMmLineByIndex:iObjectContainer->Count()=%d", iObjectContainer->Count());        
 
         if ( aIndex >= 0 && aIndex < iObjectContainer->Count() )
             {
@@ -180,10 +174,10 @@
     {
     TInt ret ( KErrGeneral );
     
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_ADDLINEOBJECT_1, "TSY: CMmLineList::AddLineObject");
+TFLOGSTRING("TSY: CMmLineList::AddLineObject");            
     if ( iObjectContainer )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_ADDLINEOBJECT_2, "TSY: CMmLineList::AddLineObject:iObjectContainer->Count()=%d", iObjectContainer->Count());
+TFLOGSTRING2("TSY: CMmLineList::AddLineObject:iObjectContainer->Count()=%d", iObjectContainer->Count());            
 
         
         TInt trapError( KErrNone );    
@@ -301,10 +295,10 @@
     {
     CBase* mmObject = NULL;
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETOBJECTBYINDEX_1, "TSY: CMmLineList::GetObjectByIndex. aIndex=%d", aIndex );
+TFLOGSTRING2("TSY: CMmLineList::GetObjectByIndex. aIndex=%d", aIndex ); 
     if ( iObjectContainer )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETOBJECTBYINDEX_2, "TSY: CMmLineList::GetObjectByIndex. iObjectContainer->Count()=%d", iObjectContainer->Count());
+TFLOGSTRING2("TSY: CMmLineList::GetObjectByIndex. iObjectContainer->Count()=%d", iObjectContainer->Count()); 
 
         if ( iIsLineInUse[ aIndex ] )
             {

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinetsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinetsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmlinetsyTraces.h"
-#endif
-
 #include "cmmlinetsy.h"
 #include "cmmphonetsy.h"
 #include "cmmcalltsy.h"
@@ -29,6 +23,7 @@
 #include "cmmcalllist.h"
 #include "cmmtsyreqhandlestore.h"
 #include "MmTsy_numberOfSlots.h"
+#include <ctsy/tflogger.h>
 #include <ctsy/pluginapi/cmmdatapackage.h>
 #include <et_struct.h>
 
@@ -41,7 +36,7 @@
 
 void CMmLineTsy::ConstructL()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_CONSTRUCTL_1, "TSY: CMmLineTsy::ConstructL");
+    TFLOGSTRING("TSY: CMmLineTsy::ConstructL");
     //Initialise miscellaneous internal attributes
     InitInternalAttributesL();
 
@@ -61,7 +56,7 @@
 
 CMmLineTsy::~CMmLineTsy()
     {
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_DTOR_1, "TSY: CMmLineTsy::~CMmLineTsy. Line name: %S", iLineName);
+    TFLOGSTRING2("TSY: CMmLineTsy::~CMmLineTsy. Line name: %S", &iLineName);
 
     //delete req handle store
     delete iTsyReqHandleStore;
@@ -101,7 +96,7 @@
 CTelObject* CMmLineTsy::OpenNewObjectByNameL(
     const TDesC& aName )
     {
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_OPENNEWOBJECTBYNAMEL_1, "TSY: CMmLineTsy::OpenNewObjectByNameL %S", aName);
+    TFLOGSTRING2("TSY: CMmLineTsy::OpenNewObjectByNameL %S", &aName);
 
     TName mmCallName( aName );
     CMmCallTsy* mmCall = iMmPhone->CallList()->GetMmCallByName( &mmCallName );
@@ -170,7 +165,7 @@
 CTelObject::TReqMode CMmLineTsy::ReqModeL(
     const TInt aIpc )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_REQMODEL_1, "TSY: CMmLineTsy::ReqModeL IPC:%d",aIpc);
+    TFLOGSTRING2("TSY: CMmLineTsy::ReqModeL IPC:%d",aIpc);
     
     CTelObject::TReqMode ret( 0 );    // default return value
     
@@ -316,7 +311,8 @@
     const TInt aIpc,
     const TDataPackage& aPackage )
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_DOEXTFUNCL_1, "TSY: CMmLineTsy::DoExtFuncL IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+    TFLOGSTRING3("TSY: CMmLineTsy::DoExtFuncL IPC:%d Handle:%d", aIpc, \
+        aTsyReqHandle);
 
     TInt ret ( KErrNone );
 
@@ -780,7 +776,8 @@
     const TTsyReqHandle aTsyReqHandle,
     TName* aName )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_NOTIFYCALLADDED_1, "TSY: CMmLineTsy::NotifyCallAdded requested by client, \lineMode:%d", iLineMode);
+    TFLOGSTRING2("TSY: CMmLineTsy::NotifyCallAdded requested by client, \
+        lineMode:%d", iLineMode);
     // On return, contains the name of the new call.
     iRetCallAdded = aName;    
     iTsyReqHandleStore->SetTsyReqHandle( EMultimodeLineNotifyCallAdded,
@@ -799,7 +796,7 @@
 TInt CMmLineTsy::NotifyCallAddedCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_NOTIFYCALLADDEDCANCEL_1, "TSY: CMmLineTsy::NotifyCallAddedCancel requested by client");
+    TFLOGSTRING("TSY: CMmLineTsy::NotifyCallAddedCancel requested by client");
     iRetCallAdded = NULL;
     iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeLineNotifyCallAdded );
     ReqCompleted( aTsyReqHandle, KErrCancel );
@@ -816,7 +813,8 @@
 //
 void CMmLineTsy::CompleteNotifyCallAdded(const TDesC& aName )    
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_COMPLETENOTIFYCALLADDED_1, "TSY: CMmLineTsy::CompleteNotifyCallAdded entered, \CALL ADDED, Call name: %S, Call mode: %d", aName, iLineMode );
+    TFLOGSTRING3("TSY: CMmLineTsy::CompleteNotifyCallAdded entered, \
+    CALL ADDED, Call name: %S, Call mode: %d", &aName, iLineMode );
 
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -826,7 +824,7 @@
 
     if ( EMultimodeLineReqHandleUnknown != reqHandle )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_COMPLETENOTIFYCALLADDED_2, "TSY: CMmLineTsy::CompleteNotifyCallAdded, Completed!");
+        TFLOGSTRING("TSY: CMmLineTsy::CompleteNotifyCallAdded, Completed!");
         *iRetCallAdded = aName;
         ReqCompleted( reqHandle, KErrNone );
         }
@@ -901,7 +899,8 @@
     const TTsyReqHandle aTsyReqHandle,
     TCallInfoIndex* aCallInfoIndex )
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_GETCALLINFO_1, "TSY: CMmLineTsy::GetCallInfo - Line name: %S, Index: %d",iLineName, aCallInfoIndex->iIndex );
+    TFLOGSTRING3("TSY: CMmLineTsy::GetCallInfo - Line name: %S, Index: %d",
+        &iLineName, aCallInfoIndex->iIndex );
 
     TInt ret( KErrNotFound );
 
@@ -917,7 +916,8 @@
         aCallInfoIndex->iInfo.iStatus        = mmCall->Status();
         aCallInfoIndex->iInfo.iCallCapsFlags = mmCall->CallCaps();
 
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_GETCALLINFO_2, "TSY: CMmLineTsy::GetCallInfo - Call name: %S, Status: %d",aCallInfoIndex->iInfo.iCallName, aCallInfoIndex->iInfo.iStatus );
+        TFLOGSTRING3("TSY: CMmLineTsy::GetCallInfo - Call name: %S, Status: %d",
+            &aCallInfoIndex->iInfo.iCallName, aCallInfoIndex->iInfo.iStatus );
 
         ret = KErrNone;
         }
@@ -1201,7 +1201,9 @@
          mobileCallInfo->iStatus == RMobileCall::EStatusConnecting ||
          mobileCallInfo->iStatus == RMobileCall::EStatusConnected )
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_COMPLETENOTIFYADDBYPASSINGCALL_1, "TSY: CMmLineTsy::CompleteNotifyAddBypassingCall, \CALL INITIATED - NOT REQUESTED BY ETEL's CLIENT, Call ID: %d",callId );
+        TFLOGSTRING2("TSY: CMmLineTsy::CompleteNotifyAddBypassingCall, \
+            CALL INITIATED - NOT REQUESTED BY ETEL's CLIENT, Call ID: %d",
+            callId );
 
         //create new call object
         CMmCallTsy* mmGhostCall = CreateGhostCallObject(
@@ -1229,7 +1231,9 @@
         }
     else
         {
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_COMPLETENOTIFYADDBYPASSINGCALL_2, "TSY: CMmLineTsy::CompleteNotifyAddBypassingCall, \CALL NOT INITIATED - Call ID:%d, Call status:%d", callId, mobileCallInfo->iStatus);
+        TFLOGSTRING3("TSY: CMmLineTsy::CompleteNotifyAddBypassingCall, \
+            CALL NOT INITIATED - Call ID:%d, Call status:%d", 
+            callId, mobileCallInfo->iStatus);
         }
     }
 
@@ -1246,7 +1250,8 @@
     const TTsyReqHandle aTsyReqHandle,
     const TInt aError )
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_REQCOMPLETED_1, "TSY: CMmLineTsy::ReqCompleted Handle:%d Error:%d", aTsyReqHandle, aError);
+    TFLOGSTRING3("TSY: CMmLineTsy::ReqCompleted Handle:%d Error:%d", 
+        aTsyReqHandle, aError);
 
     CTelObject::ReqCompleted(aTsyReqHandle,aError);        
     }

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmmessagemanagerbase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmmessagemanagerbase.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,13 +16,8 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmmessagemanagerbaseTraces.h"
-#endif
-
 #include "cmmmessagemanagerbase.h"
+#include <ctsy/tflogger.h>
 #include "ctsydelegates.h"
 
 // ======== MEMBER FUNCTIONS ========
@@ -71,7 +66,7 @@
 // ---------------------------------------------------------------------------    
 EXPORT_C void CMmMessageManagerBase::SetPhoneTsy( CMmPhoneTsy* aMmPhone )    
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CMMMESSAGEMANAGERBASE_SETPHONETSY_1, "TSY: CMmMessageManagerBase::SetPhoneTsy : Phone=0x%x", aMmPhone );
+TFLOGSTRING2("TSY: CMmMessageManagerBase::SetPhoneTsy : Phone=0x%x", aMmPhone );   
     iMmPhone = aMmPhone;
     
     if( iMessageRouterProxy )
@@ -88,7 +83,7 @@
 TInt CMmMessageManagerBase::HandleRequestL(    
     const TInt aIpc )        
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEMANAGERBASE_HANDLEREQUESTL_1, "TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
+TFLOGSTRING2("TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
     return HandleRequestL( 
         aIpc, REINTERPRET_CAST( const CMmDataPackage*, NULL ) );
     }
@@ -103,7 +98,7 @@
     const TInt aIpc,      
     const CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEMANAGERBASE_HANDLEREQUESTL1_1, "TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
+TFLOGSTRING2("TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
    
     return iMessageRouter->ExtFuncL( aIpc, aDataPackage );
     }
@@ -118,7 +113,7 @@
     const TInt aIpc,        
     const TDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEMANAGERBASE_HANDLEREQUESTL2_1, "TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
+TFLOGSTRING2("TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
 
     // map the TDataPackage into a CMmDataPackage
     // Non-core Methods from the SOS layer using the DOS layer will perforn
@@ -181,7 +176,7 @@
 EXPORT_C void CMmMessageManagerBase::SetMessageRouter(
     MMessageRouter* aMessageRouter )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CMMMESSAGEMANAGERBASE_SETMESSAGEROUTER_1, "TSY: CMmMessageManagerBase::SetMessageRouter : MessageRouter=0x%08x", aMessageRouter );
+TFLOGSTRING2("TSY: CMmMessageManagerBase::SetMessageRouter : MessageRouter=0x%x", aMessageRouter );
     iMessageRouter = aMessageRouter;
     }

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmnettsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmnettsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -16,12 +16,6 @@
 
 
 //INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmnettsyTraces.h"
-#endif
-
 #include "cmmnettsy.h"
 #include "cmmphonetsy.h"
 #include "cmmtsyreqhandlestore.h"
@@ -31,6 +25,7 @@
 #include "cmmcalllist.h"
 #include "cmmcalltsy.h"
 #include "CMmCommonStaticUtility.h"
+#include "mmtsy_ipcdefs.h"
 #include <ctsy/serviceapi/gsmerror.h>
 
 // ======== MEMBER FUNCTIONS ========
@@ -52,7 +47,7 @@
 
 void CMmNetTsy::ConstructL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_CONSTRUCTL_1, "TSY: CMmNetTsy::ConstructL");
+TFLOGSTRING("TSY: CMmNetTsy::ConstructL");
 
     //set current NW mode
     iMode = RMobilePhone::ENetworkModeUnknown;
@@ -88,7 +83,7 @@
     
 CMmNetTsy::~CMmNetTsy()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_DTOR_1, "TSY: CMmNetTsy::~CMmNetTsy");
+TFLOGSTRING("TSY: CMmNetTsy::~CMmNetTsy");
 
     // Delete get detected networks list
     if ( iGetDetectedNetworks )
@@ -112,6 +107,12 @@
     
     // Destroy array        			
     iRegisterationStatusRequests.ResetAndDestroy();
+    
+    // delete buffers for PLMN List 
+	delete iClientIdGetPrefPLMN;
+	delete iGetPrefPLMNList;
+	delete iStorePrefPLMNList;
+	
     }
     
     
@@ -126,7 +127,8 @@
     const TInt aIpc, // IPC number of request          
     const TDataPackage& aPackage ) // Contains parameters for request
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_DOEXTFUNCL_1, "TSY: CMmPhoneTsy::DoExtFuncL.\n  \t\t\t IPC:%d\n \t\t\t Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmPhoneTsy::DoExtFuncL.\n  \t\t\t IPC:%d\n \t\t\t Handle:%d", 
+    aIpc, aTsyReqHandle);
 
     TInt ret ( KErrNone );
 
@@ -171,7 +173,7 @@
                 dataPtr2 ) );
             break;
         case EMobilePhoneGetNetworkName:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_DOEXTFUNCL_2, "TSY: CMmNetTsy::DoExtFuncL - EMobilePhoneGetNetworkName");
+TFLOGSTRING("TSY: CMmNetTsy::DoExtFuncL - EMobilePhoneGetNetworkName");
             ret = GetNetworkName( 
                 aTsyReqHandle, aPackage.Des1n(), aPackage.Des2n() );
             break;
@@ -182,12 +184,12 @@
             break;
         // Get Cell information
         case EMobilePhoneGetCellInfo:
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_DOEXTFUNCL_3, "TSY: CMmNetTsy::DoExtFuncL - EMobilePhoneGetCellInfo");
+        	TFLOGSTRING("TSY: CMmNetTsy::DoExtFuncL - EMobilePhoneGetCellInfo");
         	ret = GetCellInfoL(aTsyReqHandle, aPackage.Des1n());
         	break;
         // Notify cell information change
         case EMobilePhoneNotifyCellInfoChange:
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_DOEXTFUNCL_4, "TSY: CMmNetTsy::DoExtFuncL - EMobilePhoneNotifyCellInfoChange");
+        	TFLOGSTRING("TSY: CMmNetTsy::DoExtFuncL - EMobilePhoneNotifyCellInfoChange");
         	ret = NotifyCellInfoChangeL(aTsyReqHandle, aPackage.Des1n());
         	break;
         // Notify Current Network Change, no location
@@ -288,7 +290,23 @@
         case EMobilePhoneGetCurrentActiveUSimApplication:
             ret = GetCurrentActiveUSimApplicationL( aTsyReqHandle,
                 reinterpret_cast<RMobilePhone::TAID*>( dataPtr ) );
-            break;                        
+            break;
+		case EMobilePhoneGetPreferredNetworksPhase1:
+			ret = GetPreferredNetworksListPhase1L(aTsyReqHandle, 
+				                                  reinterpret_cast< RMobilePhone::TClientId*>( dataPtr ),
+                                                  reinterpret_cast< TInt* >( dataPtr2 ) );
+			break;
+        case EMobilePhoneGetPreferredNetworksPhase2:
+			ret = GetPreferredNetworksListPhase2
+				    (aTsyReqHandle, reinterpret_cast<RMobilePhone::TClientId*>(aPackage.Ptr1()),
+				     aPackage.Des2n());
+        	break;
+		case EMobilePhoneStorePreferredNetworksList:
+			ret = StorePreferredNetworksListL(aTsyReqHandle, aPackage.Des1n());
+			break;
+		case EMobilePhoneNotifyStorePreferredNetworksListChange:
+			ret = NotifyStorePreferredNetworksListChange();
+			break;
         default:
             ret = KErrNotSupported;
             break;
@@ -308,7 +326,7 @@
     const TInt aIpc, // IPC number of request.
     const TTsyReqHandle aTsyReqHandle ) // Request handle of given request.
     {
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_CANCELSERVICE_1, "TSY: CMmNetTsy::CancelService IPC: %d ret: %d", aIpc, aTsyReqHandle);
+	TFLOGSTRING3("TSY: CMmNetTsy::CancelService IPC: %d ret: %d", aIpc, aTsyReqHandle);
     TInt ret ( KErrNotSupported );
     
     //When the clients close their sub-sessions (eg. by calling RLine::Close), 
@@ -434,7 +452,18 @@
                 }
             break;
             }    
-        //Default case
+		case EMobilePhoneGetPreferredNetworksPhase1:
+			ret = GetPreferredNetworksListCancel(aTsyReqHandle);
+			break;
+		case EMobilePhoneStorePreferredNetworksList:
+			// LTSY doesn't have transcation mechanism so that storing request cannot be cancelled.
+			// So this cancellation request is ignored. 
+            ret = KErrNone; 
+			break;
+		case EMobilePhoneNotifyStorePreferredNetworksListChange:
+			ret = NotifyStorePreferredNetworksListChangeCancel(aTsyReqHandle);
+			break;
+	        //Default case
         default:
             ret = KErrNone; 
             break;
@@ -1100,7 +1129,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     TDes8* aNetworkInfoPckg ) const 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETHOMENETWORK_1, "TSY: CMmNetTsy::GetHomeNetwork" );
+TFLOGSTRING("TSY: CMmNetTsy::GetHomeNetwork" );
 
     TInt ret ( KErrNotSupported );
     
@@ -1175,12 +1204,12 @@
     TDes8* aNetworkInfoPckg,
     RMobilePhone::TMobilePhoneLocationAreaV1* aArea ) const 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCURRENTNETWORK_1, "TSY: CMmNetTsy::GetCurrentNetwork");
+TFLOGSTRING("TSY: CMmNetTsy::GetCurrentNetwork");
 
     TInt ret( KErrArgument );
     if ( ERfsStateInfoInactive == iMmPhoneTsy->GetRfStateInfo() )  
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCURRENTNETWORK_2, "TSY: CMmNetTsy::GetCurrentNetwork Offline mode ON, request is not allowed! ");
+TFLOGSTRING ("TSY: CMmNetTsy::GetCurrentNetwork Offline mode ON, request is not allowed! ");
         ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral,
                 KErrGsmOfflineOpNotAllowed );
                 
@@ -1263,10 +1292,10 @@
 //
 TInt CMmNetTsy::GetCellInfoL(const TTsyReqHandle aTsyReqHandle, TDes8* aCellInfoPckg)
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCELLINFOL_1, "TSY: CMmNetTsy::GetCellInfoL; Handle : %d", aTsyReqHandle);
+    TFLOGSTRING2("TSY: CMmNetTsy::GetCellInfoL; Handle : %d", aTsyReqHandle);
     if(sizeof(RMobilePhone::TMobilePhoneCellInfoV9) > aCellInfoPckg->MaxLength())
     	{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCELLINFOL_2, "TSY: CMmNetTsy::GetCellInfo Bad size argument");
+        TFLOGSTRING ("TSY: CMmNetTsy::GetCellInfo Bad size argument");
         // Complete the request with appropiate error        
         return KErrArgument;
     	}
@@ -1275,14 +1304,14 @@
     RMobilePhone::TMultimodeType& cellInfoTemp = ( *cellInfoTempPckg )();
 	if(cellInfoTemp.ExtensionId()!=KEtelExtMultimodeV9)
 		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCELLINFOL_3, "TSY: CMmNetTsy::GetCellInfo Bad version argument");
+        TFLOGSTRING ("TSY: CMmNetTsy::GetCellInfo Bad version argument");
         // Complete the request with appropiate error        
         return KErrArgument;
 		}
     TInt ret( KErrNotSupported );
     if ( ERfsStateInfoInactive == iMmPhoneTsy->GetRfStateInfo() )  
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCELLINFOL_4, "TSY: CMmNetTsy::GetCellInfo Offline mode ON, request is not allowed! ");
+        TFLOGSTRING ("TSY: CMmNetTsy::GetCellInfo Offline mode ON, request is not allowed! ");
         ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral, KErrGsmOfflineOpNotAllowed );
                 
         // Complete the request with appropiate error
@@ -1476,7 +1505,7 @@
         	}
 
         //Complete the client request
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_HANDLECELLINFOUPDATE_1, "TSY: CMmNetTsy::CompleteCellInfoReq client: %d; Handle: %d", i, req.iReqHandle );
+        TFLOGSTRING3("TSY: CMmNetTsy::CompleteCellInfoReq client: %d; Handle: %d", i, req.iReqHandle );
         iMmPhoneTsy->ReqCompleted( req.iReqHandle, aError );
 		}
     // Destroy array   
@@ -1505,13 +1534,13 @@
     TDes8* aNetworkNamePckg,
     TDes8* aPlmnPckg ) const   
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKNAME_1, "TSY: CMmNetTsy::GetNetworkName");
+TFLOGSTRING("TSY: CMmNetTsy::GetNetworkName");
     TInt ret ( KErrGeneral );
 
     if( sizeof(RMobilePhone::TMobilePhoneNetworkNameV3) > aNetworkNamePckg->MaxLength() ||
         sizeof(RMobilePhone::TMobilePhoneOPlmnV3) > aPlmnPckg->MaxLength() )
 	  	{
-	  	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKNAME_2, "TSY: CMmNetTsy::GetNetworkName bad size argument");
+	  	TFLOGSTRING ("TSY: CMmNetTsy::GetNetworkName bad size argument");
 	  	// Complete the request with appropiate error        
 	  	ret = KErrArgument;
 	  	}
@@ -1536,11 +1565,11 @@
         networkName.iShortName.Copy( networkInfo.iShortName );
         plmn.iCountryCode.Copy( networkInfo.iCountryCode );
         plmn.iNetworkId.Copy( networkInfo.iNetworkId );
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKNAME_3, "TSY: CMmNetTsy::GetNetworkName, iLongName: %S", networkName.iLongName);
+TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkName, iLongName: %S", &networkName.iLongName);
 
         if( KErrNone == ret )
             {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKNAME_4, "TSY: CMmNetTsy::GetNetworkName - completing, ret: %d", ret);
+TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkName - completing, ret: %d", ret);
             iMmPhoneTsy->ReqCompleted( aTsyReqHandle, ret );
             }
         }
@@ -1559,7 +1588,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     TDes8* aNetworkInfoPckg ) const 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCURRENTNETWORKNOLOCATION_1, "TSY: CMmNetTsy::GetCurrentNetworkNoLocation");
+TFLOGSTRING("TSY: CMmNetTsy::GetCurrentNetworkNoLocation"); 
   
     TInt ret( KErrNotSupported );
     
@@ -1627,7 +1656,7 @@
     const TTsyReqHandle aTsyReqHandle,
     TDes8* aNetworkInfoPckg )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCURRENTNETWORKNOLOCATIONCHANGEL_1, "TSY: CMmNetTsy::NotifyCurrentNetworkNoLocationChangeL");
+TFLOGSTRING("TSY: CMmNetTsy::NotifyCurrentNetworkNoLocationChangeL");
      
     // save the handle and the request type
     iMmPhoneTsy->iReqHandleType =
@@ -1652,7 +1681,7 @@
 TInt CMmNetTsy::NotifyCurrentNetworkNoLocationChangeCancel(
     const TTsyReqHandle aTsyReqHandle ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCURRENTNETWORKNOLOCATIONCHANGECANCEL_1, "TSY: CMmNetTsy::NotifyCurrentNetworkNoLocationChangeCancel");
+TFLOGSTRING("TSY: CMmNetTsy::NotifyCurrentNetworkNoLocationChangeCancel");
     
     // find the correct ReqHandle...  
     for ( TInt i = 0; i < iNotifyCurrentNwNoLocationRequests.Count(); i++ )
@@ -1688,7 +1717,7 @@
     TDes8* aNetworkInfoPckg, 
     RMobilePhone::TMobilePhoneLocationAreaV1* aArea ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCURRENTNETWORKCHANGEL_1, "TSY: CMmNetTsy::NotifyCurrentNetworkChangeL");
+TFLOGSTRING("TSY: CMmNetTsy::NotifyCurrentNetworkChangeL");
 
     TInt ret = KErrArgument;
     TInt length = aNetworkInfoPckg->MaxLength();
@@ -1726,7 +1755,7 @@
 TInt CMmNetTsy::NotifyCurrentNetworkChangeCancel(
     const TTsyReqHandle aTsyReqHandle ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCURRENTNETWORKCHANGECANCEL_1, "TSY: CMmNetTsy::NotifyCurrentNetworkChangeCancel");
+TFLOGSTRING("TSY: CMmNetTsy::NotifyCurrentNetworkChangeCancel");
 
     // find the correct ReqHandle...  
     for ( TInt i = 0; i < iNotifyCurrentNwRequests.Count(); i++ )
@@ -1761,14 +1790,14 @@
     CMmDataPackage* aDataPackage, 
     TInt aResult ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_1, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange");
+TFLOGSTRING("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange");
     
     // create a copy of the NW info sended by the LTSY
     RMobilePhone::TMobilePhoneNetworkInfoV8 networkInfo;
     RMobilePhone::TMobilePhoneLocationAreaV1 locationArea;
     
     aDataPackage->UnPackData ( networkInfo, locationArea );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_2, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, new extension ID: %d", networkInfo.ExtensionId() );
+TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, new extension ID: %d", networkInfo.ExtensionId() ); 
    
     // empty additional extension information...
     if ( KETelExtMultimodeV1 == networkInfo.ExtensionId() )
@@ -1810,17 +1839,17 @@
         TTsyReqHandle reqHandle =
             iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle(
             CMmPhoneTsy::EMultimodePhoneNotifyCurrentNetworkChange );            
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_3, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, req handler =%u", reqHandle );
+TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, req handler =%u", reqHandle );
 
         if ( CMmPhoneTsy::EMultimodePhoneReqHandleUnknown != reqHandle )
             {
             TInt requestCount = iNotifyCurrentNwRequests.Count();            
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_4, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, requestCount: %d ", requestCount );
+TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, requestCount: %d ", requestCount ); 
 
             // Complete all notification requests...
             for ( TInt i = 0; i < requestCount; i++ )
                 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_5, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, Loc; array: %d ", i );
+TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, Loc; array: %d ", i );                 
                
                 // copy the infromation to client, 0 = first index
                 switch ( ( *( iNotifyCurrentNwRequests[ 0 ].
@@ -1909,17 +1938,17 @@
         TTsyReqHandle reqHandle =
           iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle(
           CMmPhoneTsy::EMultimodePhoneNotifyCurrentNetworkNoLocationChange );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_6, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, req handler NoLoc =%u", reqHandle );
+TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, req handler NoLoc =%u", reqHandle );
 
         if ( CMmPhoneTsy::EMultimodePhoneReqHandleUnknown != reqHandle )
             {
             TInt requestCount = iNotifyCurrentNwNoLocationRequests.Count();            
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_7, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, requestCount NoLoc: %d ", requestCount );
+TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, requestCount NoLoc: %d ", requestCount );
             
             // Complete all requests...
             for ( TInt indx = 0; indx < requestCount; indx++ )
                 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_8, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, NoLoc; array: %d ", indx );
+TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, NoLoc; array: %d ", indx );                 
                 
                 // copy the infromation to client, 0 = first index
                 switch ( ( *( iNotifyCurrentNwNoLocationRequests[ 0 ].
@@ -2007,10 +2036,10 @@
     const TTsyReqHandle aTsyReqHandle,
     TDes8* aCellInfoPckg) 
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCELLINFOCHANGEL_1, "TSY: CMmNetTsy::NotifyCellInfoChangeL; Handel: %d", aTsyReqHandle);
+    TFLOGSTRING2("TSY: CMmNetTsy::NotifyCellInfoChangeL; Handel: %d", aTsyReqHandle);
     if(sizeof(RMobilePhone::TMobilePhoneCellInfoV9) > aCellInfoPckg->MaxLength())
     	{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCELLINFOCHANGEL_2, "TSY: CMmNetTsy::NotifyCellInfoChangeL Bad size argument");
+        TFLOGSTRING ("TSY: CMmNetTsy::NotifyCellInfoChangeL Bad size argument");
         // Complete the request with appropiate error        
         return KErrArgument;
     	}
@@ -2019,7 +2048,7 @@
     RMobilePhone::TMultimodeType& cellInfoTemp = ( *cellInfoTempPckg )();
 	if(cellInfoTemp.ExtensionId()!=KEtelExtMultimodeV9)
 		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCELLINFOCHANGEL_3, "TSY: CMmNetTsy::GetCellInfo Bad version argument");
+        TFLOGSTRING ("TSY: CMmNetTsy::GetCellInfo Bad version argument");
         // Complete the request with appropiate error        
         return KErrArgument;
 		}
@@ -2052,7 +2081,7 @@
 TInt CMmNetTsy::GetCellInfoCancel(
     const TTsyReqHandle aTsyReqHandle ) 
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCELLINFOCANCEL_1, "TSY: CMmNetTsy::GetCellInfoCancel; Handle: %d", aTsyReqHandle);
+    TFLOGSTRING2("TSY: CMmNetTsy::GetCellInfoCancel; Handle: %d", aTsyReqHandle);
     // find the correct ReqHandle...  
 	const TInt KReqCount = iCellInfoRequests.Count();
     for ( TInt i = 0; i < KReqCount; i++ )
@@ -2085,7 +2114,7 @@
 TInt CMmNetTsy::NotifyCellInfoChangeCancel(
     const TTsyReqHandle aTsyReqHandle ) 
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCELLINFOCHANGECANCEL_1, "TSY: CMmNetTsy::NotifyCellInfoChangeCancel; Handle: %d", aTsyReqHandle);
+    TFLOGSTRING2("TSY: CMmNetTsy::NotifyCellInfoChangeCancel; Handle: %d", aTsyReqHandle);
 
     // find the correct ReqHandle...  
 	const TInt KReqCount = iNotifyCellInfoRequests.Count();
@@ -2120,7 +2149,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     RMobilePhone::TMobilePhoneRegistrationStatus* aStatus ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_1, "TSY: CMmNetTsy::GetNetworkRegistrationStatusL Handle: %d", aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkRegistrationStatusL Handle: %d", aTsyReqHandle);
     
 	// If the modem is not ready (Common TSY has not received EMmTsyBootNotifyModemStatusReadyIPC
 	// from LTSY), we don't need to ask. Update registration status and complete client immediately. 
@@ -2151,17 +2180,15 @@
 			//get mode specific information 
 			TInt ret ( iMmPhoneTsy->iMmPhoneExtInterface->
 					GetNetworkRegistrationStatusL() );
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_2, "TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Sending request to LTSY" );
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_3, "TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Modem not ready" );
 
             if ( KErrNone != ret )
                 {
-                OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_4, "TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Complete with error %d", ret );
+                TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Complete with error %d", ret );
                 iMmPhoneTsy->ReqCompleted( aTsyReqHandle, ret );
                 }
             else
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_5, "TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Client to buffer" );
+TFLOGSTRING("TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Client to buffer" );
                 // save request handle in queue
     			TGetNetworkRegisterationRequest* req = 
     				new (ELeave) TGetNetworkRegisterationRequest();
@@ -2194,13 +2221,13 @@
 TInt CMmNetTsy::GetNetworkRegistrationStatusCancel( 
     const TTsyReqHandle aTsyReqHandle )
     {     
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKREGISTRATIONSTATUSCANCEL_1, "TSY: CMmNetTsy::GetNetworkRegistrationStatusCancel Handle: %d", aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkRegistrationStatusCancel Handle: %d", aTsyReqHandle);      
 
     TInt requestCount = iRegisterationStatusRequests.Count(); 
    
     if( 1 == requestCount )
     	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKREGISTRATIONSTATUSCANCEL_2, "TSY: CMmNetTsy::GetNetworkRegistrationStatusCancel 1 == requestCount  ");
+TFLOGSTRING("TSY: CMmNetTsy::GetNetworkRegistrationStatusCancel 1 == requestCount  ");     	
         //reset the req handle
 		TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle(
         	CMmPhoneTsy::EMultimodePhoneGetNetworkRegistrationStatus );    	
@@ -2232,7 +2259,7 @@
 void CMmNetTsy::CompleteGetNetworkRegistrationStatus(
     TInt aErrorValue )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETEGETNETWORKREGISTRATIONSTATUS_1, "TSY: CMmNetTsy::CompleteGetNetworkRegistrationStatus");
+TFLOGSTRING("TSY: CMmNetTsy::CompleteGetNetworkRegistrationStatus");       
      // Reset the req handle
     TTsyReqHandle reqHandle =
         iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle(
@@ -2250,7 +2277,7 @@
             
             //set value in client side
             *(req->iRetGetNWRegistrationStatus) = iNWRegistrationStatus;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETEGETNETWORKREGISTRATIONSTATUS_2, "TSY: CMmNetTsy::CompleteGetNetworkRegistrationStatus client: %d", i );
+TFLOGSTRING2("TSY: CMmNetTsy::CompleteGetNetworkRegistrationStatus client: %d", i );
         
 			//Complete the client request
             iMmPhoneTsy->ReqCompleted( req->iReqHandle, aErrorValue );
@@ -2306,7 +2333,7 @@
     CMmDataPackage* aDataPackage, //Contains information for client side
     TInt aResult ) // result code 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYNETWORKREGISTRATIONSTATUSCHANGE_1,  "TSY: CMmNetTsy::CompleteNotifyNetworkRegistrationStatusChange" );
+TFLOGSTRING( "TSY: CMmNetTsy::CompleteNotifyNetworkRegistrationStatusChange" );
 
     RMobilePhone::TMobilePhoneRegistrationStatus* regStatus = NULL;
     RMobilePhone::TMobilePhoneNetworkStatus* nwStatus = NULL;
@@ -2321,7 +2348,7 @@
 
         // Store NEW registration status
         iNWRegistrationStatus = *regStatus;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYNETWORKREGISTRATIONSTATUSCHANGE_2, "TSY: CMmNetTsy::CompleteNotifyNetworkRegistrationStatusChange, status: %d", iNWRegistrationStatus );
+TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyNetworkRegistrationStatusChange, status: %d", iNWRegistrationStatus );
 
         //reset req handle. Returns the deleted req handle
         TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->
@@ -2564,7 +2591,7 @@
 RMobilePhone::TMobilePhoneRegistrationStatus 
     CMmNetTsy::GetNetworkRegistrationStatus() const
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKMODE_1, "TSY: CMmNetTsy::GetNetworkRegistrationStatus: %d", iNWRegistrationStatus );
+TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkRegistrationStatus: %d", iNWRegistrationStatus );
     return iNWRegistrationStatus;
     }
 
@@ -2580,7 +2607,7 @@
         aNetworkSecurityLevel ) const //Network security level
         
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKSECURITYLEVEL_1, "TSY: CMmNetTsy::GetNetworkSecurityLevel");
+    TFLOGSTRING("TSY: CMmNetTsy::GetNetworkSecurityLevel");
     iMmPhoneTsy->PhoneExtInterface()->GetNetworkSecurityLevel (
         *aNetworkSecurityLevel );
 
@@ -2598,7 +2625,7 @@
     RMobilePhone::TMobilePhoneNetworkSecurity*
         aNetworkSecurityLevel ) 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYNETWORKSECURITYLEVELCHANGE_1, "TSY: CMmNetTsy::NotifyNetworkSecurityLevelChange");
+    TFLOGSTRING("TSY: CMmNetTsy::NotifyNetworkSecurityLevelChange");
     iMmPhoneTsy->iReqHandleType = 
         CMmPhoneTsy::EMultimodePhoneNotifyNetworkSecurityLevelChange;
     iRetNetworkSecurityLevel = aNetworkSecurityLevel;
@@ -2611,7 +2638,7 @@
 //
 TInt CMmNetTsy::NotifyNetworkSecurityLevelChangeCancel()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYNETWORKSECURITYLEVELCHANGECANCEL_1, "TSY: CMmNetTsy::NotifyNetworkSecurityLevelChangeCancel");
+    TFLOGSTRING("TSY: CMmNetTsy::NotifyNetworkSecurityLevelChangeCancel");
     iRetNetworkSecurityLevel = NULL;
     TTsyReqHandle reqHandle =
         iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle(
@@ -2795,7 +2822,7 @@
     const RMobilePhone::TMobilePhoneNetworkInfoV8& previousNetInfo, 
     const RMobilePhone::TMobilePhoneNetworkInfoV8& newNetInfo ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_ISNETWORKINFOCHANGED_1, "TSY: CMmNetTsy::IsNetworkInfoChanged" );
+TFLOGSTRING("TSY: CMmNetTsy::IsNetworkInfoChanged" );
 
     TBool ret ( ETrue );
 
@@ -2884,11 +2911,11 @@
                 }    
             //close the file
             file.Close();
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_READVARIANTOPTIONS_1, "TSY:CMmNetTsy::ReadVariantOptions:File successfully read.");
+TFLOGSTRING("TSY:CMmNetTsy::ReadVariantOptions:File successfully read.");
             }
         else
             {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_READVARIANTOPTIONS_2, "TSY:CMmNetTsy::ReadVariantOptions:Could not open file Z:\\private\\101f7989\\operatorVariants.ini, error=%d",err);
+TFLOGSTRING2("TSY:CMmNetTsy::ReadVariantOptions:Could not open file Z:\\private\\101f7989\\operatorVariants.ini, error=%d",err);
             }
 
         // close connection to file server
@@ -2896,9 +2923,9 @@
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_READVARIANTOPTIONS_3, "TSY:CMmNetTsy::ReadVariantOptions:Could not connect to file server.");
+TFLOGSTRING("TSY:CMmNetTsy::ReadVariantOptions:Could not connect to file server.");
         }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_READVARIANTOPTIONS_4, "TSY:CMmNetTsy::ReadVariantOptions:iCipheringIndicatorForcedOff=%d",iCipheringIndicatorForcedOff);
+TFLOGSTRING2("TSY:CMmNetTsy::ReadVariantOptions:iCipheringIndicatorForcedOff=%d",iCipheringIndicatorForcedOff);
     }
 
 // ---------------------------------------------------------------------------
@@ -2909,7 +2936,7 @@
 //
 TBool CMmNetTsy::CipheringIndicatorForcedOff()
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_CIPHERINGINDICATORFORCEDOFF_1, "TSY:CMmNetTsy::CipheringIndicatorForcedOff:iCipheringIndicatorForcedOff=%d",iCipheringIndicatorForcedOff);
+    TFLOGSTRING2("TSY:CMmNetTsy::CipheringIndicatorForcedOff:iCipheringIndicatorForcedOff=%d",iCipheringIndicatorForcedOff);
     return iCipheringIndicatorForcedOff;
     }
 
@@ -2924,7 +2951,7 @@
 	RMobilePhone::TClientId* aClient,
 	TInt* aBufSize )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETAUTHORIZATIONINFOPHASE1L_1, "TSY: CMmNetTsy::AuthorizationInfoPhase1L");
+TFLOGSTRING("TSY: CMmNetTsy::AuthorizationInfoPhase1L");
 
     TTsyReqHandle getAuthorizationInfoPhase1Handle =
         iMmPhoneTsy->iTsyReqHandleStore->GetTsyReqHandle(
@@ -2974,7 +3001,7 @@
 	CMmDataPackage* aDataPackage,
 	TInt aError )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_PROCESSGETAUTHORIZATIONINFOPHASE1L_1, "TSY: CMmNetTsy::ProcessGetAuthorizationInfoPhase1L");
+TFLOGSTRING("TSY: CMmNetTsy::ProcessGetAuthorizationInfoPhase1L");
 
     // Fetch the request handle
     TTsyReqHandle reqHandle =
@@ -3017,7 +3044,7 @@
 	RMobilePhone::TClientId* aClient,
 	TDes8* aBuffer )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETAUTHORIZATIONINFOPHASE2L_1, "TSY: CMmNetTsy::GetAuthorizationInfoPhase2L");
+TFLOGSTRING("TSY: CMmNetTsy::GetAuthorizationInfoPhase2L");
 	
 	TInt error = KErrNone;
 	
@@ -3098,7 +3125,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMobilePhone::TAID* aAID )
     {  
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCURRENTACTIVEUSIMAPPLICATIONL_1, "TSY:CMmNetTsy::GetCurrentActiveUSimApplicationL");
+TFLOGSTRING("TSY:CMmNetTsy::GetCurrentActiveUSimApplicationL");
 	TTsyReqHandle getCurrentActiveUSimApplicationHandle =
 	    iMmPhoneTsy->iTsyReqHandleStore->GetTsyReqHandle(
 	    CMmPhoneTsy::EMultimodePhoneGetCurrentActiveUSimApplication );
@@ -3141,7 +3168,7 @@
 //
 TInt CMmNetTsy::GetCurrentActiveUSimApplicationCancel()
     { 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCURRENTACTIVEUSIMAPPLICATIONCANCEL_1, "TSY: CMmNetTsy::GetCurrentActiveUSimApplicationCancel");
+TFLOGSTRING("TSY: CMmNetTsy::GetCurrentActiveUSimApplicationCancel");
     //reset the req handle
     TTsyReqHandle reqHandle =
         iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle(
@@ -3166,7 +3193,7 @@
     CMmDataPackage* aDataPackage,
     TInt aErrorValue )
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETEGETCURRENTACTIVEUSIMAPPLICATION_1, "TSY: CMmNetTsy::CompleteGetCurrentActiveUSimApplication");
+	TFLOGSTRING("TSY: CMmNetTsy::CompleteGetCurrentActiveUSimApplication");
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle =
         iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle(
@@ -3186,7 +3213,345 @@
         iMmPhoneTsy->ReqCompleted( reqHandle, aErrorValue );	        				                          
         }    	        
     }
-    
+
+// ---------------------------------------------------------------------------
+// CMmNetTsy::GetPreferredNetworksListPhase1L
+// Returns minimum size of a buffer to retreive the current Preferred Networks List from SIM
+// (other items were commented in a header).
+// ---------------------------------------------------------------------------
+//
+TInt CMmNetTsy::GetPreferredNetworksListPhase1L(const TTsyReqHandle /*aTsyReqHandle*/, 
+    											 RMobilePhone::TClientId const* aId, TInt* aBufSize)
+	{
+	TFLOGSTRING("TSY: CMmNetTsy::GetPreferredNetworksListPhase1");	
+	TTsyReqHandle getPrefPLMNHandle = iMmPhoneTsy->iTsyReqHandleStore->GetTsyReqHandle
+		                              (CMmPhoneTsy::EMultimodePhoneGetPreferredNetworksPhase1);
+	
+	if(CMmPhoneTsy::EMultimodePhoneReqHandleUnknown != getPrefPLMNHandle)
+		{
+        // The request is already processing because of previous request
+        // Complete request with status value informing the client about 
+        // the situation.
+		TFLOGSTRING("TSY GetPreferredNetworksListPhase1: the request is already processing because previous request.");
+		return KErrServerBusy;
+        }
+	else
+		{
+		TInt ret = iMmPhoneTsy->iMessageManager->HandleRequestL(ECtsyPhoneGetPreferredNetworksReq);
+
+		if(KErrNone == ret)
+			{
+			TFLOGSTRING("TSY: Successfully send IPC EMobilePhoneGetPreferredNetworksPhase1 to LTSY");
+			
+			iMmPhoneTsy->iReqHandleType = CMmPhoneTsy::EMultimodePhoneGetPreferredNetworksPhase1;
+			
+			// if iGetPrefPLMNList, iClientIdGetPrefPLMN, and/or iBufSizeGetPrefPLMN are not NULL, phase 1 is called twice without calling phase 2.
+			// In this case, we should ignore the previous phase 1 and delete buffers.
+			delete iGetPrefPLMNList;
+			iGetPrefPLMNList = NULL;
+			iBufSizeGetPrefPLMN = aBufSize;
+			delete iClientIdGetPrefPLMN;
+			iClientIdGetPrefPLMN = NULL;
+			// Copy client id (session and subsession handle). it's used for
+            // matching phase 1 and 2 of a request
+			iClientIdGetPrefPLMN = new ( ELeave ) RMobilePhone::TClientId( *aId ); 
+			
+			}
+		else
+			{
+			TFLOGSTRING2("TSY: GetPreferredNetworksListPhase1L LTSY returns error=%d", ret);			
+			return ret;
+			}
+		}
+	return KErrNone;
+	
+	}
+
+// ---------------------------------------------------------------------------
+// CMmNetTsy::GetPreferredNetworksListPhase2
+// Copies the current Preferred Networks List in the given buffer
+// (other items were commented in a header).
+// ---------------------------------------------------------------------------
+//
+TInt CMmNetTsy::GetPreferredNetworksListPhase2(const TTsyReqHandle aTsyReqHandle, 
+    											 RMobilePhone::TClientId const* aId, TDes8* aBuffer)
+	{
+	TFLOGSTRING2("TSY: CMmNetTsy::GetPreferredNetworksListPhase2: aTsyReqHandle=%d", aTsyReqHandle);	
+	TInt ret = KErrNone;
+	
+	if( ( iClientIdGetPrefPLMN->iSessionHandle == aId->iSessionHandle ) &&
+        ( iClientIdGetPrefPLMN->iSubSessionHandle == aId->iSubSessionHandle ) )
+		{
+		TFLOGSTRING3("TSY GetPreferredNetworksListPhase2: Phase 1 and Phase 2 client ID matched, Copy the streamed list to client buffer. session %d, subsession %d.",
+				iClientIdGetPrefPLMN->iSessionHandle, iClientIdGetPrefPLMN->iSubSessionHandle);		
+		if(iGetPrefPLMNList != NULL)
+			{
+			aBuffer->Copy( iGetPrefPLMNList->Ptr( 0 ) );
+			// MmPhoneTsy completes the request only if return an error
+			// so the request without error code has to complete here
+			iMmPhoneTsy->ReqCompleted(aTsyReqHandle, KErrNone);
+			}
+		else
+			{
+			ret = KErrNotReady;
+			}
+		}
+	else
+		{
+		TFLOGSTRING("TSY GetPreferredNetworksListPhase2: Phase 1 and Phase 2 client ID not matched, complete request with KErrCorrupt");			
+		ret = KErrCorrupt;
+		}
+
+	delete iClientIdGetPrefPLMN;
+	iClientIdGetPrefPLMN = NULL;
+
+	delete iGetPrefPLMNList;
+	iGetPrefPLMNList = NULL;
+	
+	iBufSizeGetPrefPLMN = NULL;
+	
+	return ret;
+	}
+
+// ---------------------------------------------------------------------------
+// CMmNetTsy::StorePreferredNetworksListL
+// Stores the Preferred Networks List into the SIM
+// (other items were commented in a header).
+// ---------------------------------------------------------------------------
+//
+TInt CMmNetTsy::StorePreferredNetworksListL(const TTsyReqHandle /*aTsyReqHandle*/, TDes8* aBuffer)
+	{
+	TFLOGSTRING("TSY: CMmNetTsy::StorePreferredNetworksList");	
+
+	TTsyReqHandle storePrefPLMNHandle = 
+			iMmPhoneTsy->iTsyReqHandleStore->GetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneStorePreferredNetworksList );
+
+	if(CMmPhoneTsy::EMultimodePhoneReqHandleUnknown != storePrefPLMNHandle)
+        {
+        // The request is already processing because of previous request.
+        // Complete request with status value informing the client about 
+        // the situation.
+		TFLOGSTRING("TSY StorePreferredNetworksListL: the request is already processing because previous request.");
+		return KErrServerBusy;
+        }
+    else
+        {
+    	iMmPhoneTsy->iReqHandleType = CMmPhoneTsy::EMultimodePhoneStorePreferredNetworksList;
+		delete iStorePrefPLMNList;
+		iStorePrefPLMNList = NULL;
+		iStorePrefPLMNList = CMobilePhoneStoredNetworkList::NewL();
+		iStorePrefPLMNList->RestoreL(*aBuffer);
+
+		CMmDataPackage package;
+		package.PackData(iStorePrefPLMNList);
+		TInt ret = iMmPhoneTsy->iMessageManager->HandleRequestL(ECtsyPhoneStorePreferredNetworksListReq, &package);
+		if(KErrNone == ret)
+			{
+			TFLOGSTRING("TSY StorePreferredNetworksListL: Successfully send IPC EMobilePhoneStorePreferredNetworksList to LTSY");
+
+			}
+		else
+			{
+			TFLOGSTRING2("TSY StorePreferredNetworksListL: LTSY returns error=%d", ret);		
+			delete iStorePrefPLMNList;
+			iStorePrefPLMNList = NULL;
+			return ret;
+			}
+    	}
+
+	return KErrNone;
+	}
+
+
+// ---------------------------------------------------------------------------
+// CMmNetTsy::GetPreferredNetworksListCancel
+// Cancels the request for Getting Preferred Networks List
+// (other items were commented in a header).
+// ---------------------------------------------------------------------------
+//
+TInt CMmNetTsy::GetPreferredNetworksListCancel(const TTsyReqHandle /*aTsyReqHandle*/)
+	{
+	TFLOGSTRING("TSY: CMmPhoneTsy::GetPreferredNetworksListCancel");
+
+	TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle(CMmPhoneTsy::EMultimodePhoneGetPreferredNetworksPhase1); 
+
+	if(CMmPhoneTsy::EMultimodePhoneReqHandleUnknown != reqHandle)
+		{
+		iBufSizeGetPrefPLMN = NULL;
+		delete iClientIdGetPrefPLMN;
+		iClientIdGetPrefPLMN = NULL;
+		delete iGetPrefPLMNList;
+		iGetPrefPLMNList = NULL;
+        iMmPhoneTsy->ReqCompleted( reqHandle, KErrCancel );        
+		}
+	//if reqHandle is 0, it means  phase 1 has completed and the list retrieval cannot be cancelled
+	return KErrNone;
+	}
+
+// ---------------------------------------------------------------------------
+// CMmNetTsy::NotifyStorePreferredNetworksListChange
+// Subscribes the notification for storing Preferred networks List
+// (other items were commented in a header).
+// ---------------------------------------------------------------------------
+//
+TInt CMmNetTsy::NotifyStorePreferredNetworksListChange()
+	{
+	TFLOGSTRING("TSY: CMmPhoneTsy::NotifyStorePreferredNetworksListChange");	
+	iMmPhoneTsy->iReqHandleType = CMmPhoneTsy::EMultimodePhoneNotifyStorePreferredNetworksListChange;
+
+	return KErrNone;
+	}
+
+// ---------------------------------------------------------------------------
+// CMmNetTsy::NotifyStorePreferredNetworksListChangeCancel
+// Cancels the notification request for storing Preferred Networks List
+// (other items were commented in a header).
+// ---------------------------------------------------------------------------
+//
+TInt CMmNetTsy::NotifyStorePreferredNetworksListChangeCancel(const TTsyReqHandle aTsyReqHandle)
+	{
+	TFLOGSTRING2("TSY: CMmNetTsy::NotifyStorePreferredNetworksListChangeCancel: aTsyReqHandle=%d", aTsyReqHandle);
+	TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle
+		                       (CMmPhoneTsy::EMultimodePhoneNotifyStorePreferredNetworksListChange);	
+
+	if(CMmPhoneTsy::EMultimodePhoneReqHandleUnknown != reqHandle)
+		{
+		iMmPhoneTsy->ReqCompleted( aTsyReqHandle, KErrCancel );
+		}
+	return KErrNone;
+	}
+
+// ---------------------------------------------------------------------------
+// CMmNetTsy::CompleteGetPreferredNetworksListPhase1
+// Completes the notification request for storing Preferred Networks List
+// (other items were commented in a header).
+// ---------------------------------------------------------------------------
+//
+void CMmNetTsy::CompleteGetPreferredNetworksListPhase1(TInt aError, CMmDataPackage* aDataPackage)
+	{
+	TFLOGSTRING2("TSY: CMmNetTsy::CompleteGetPreferredNetworksListPhase1: aError=%d", aError);
+
+	TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneGetPreferredNetworksPhase1 );
+
+	TFLOGSTRING2("TSY CompleteGetPreferredNetworksListPhase1: EMobilePhoneGetPreferredNetworksPhase1 reqHandle=%d", reqHandle);
+
+	TInt completeError = KErrNone;
+	
+	if(CMmPhoneTsy::EMultimodePhoneReqHandleUnknown == reqHandle)
+		{
+		TFLOGSTRING("TSY CompleteGetPreferredNetworksListPhase1: reqHandle is 0, cannot complete Phase1 list retrieval request!!");
+		delete iClientIdGetPrefPLMN;
+		iClientIdGetPrefPLMN = NULL;
+		}
+	else if(KErrNone == aError)
+		{
+		if(iGetPrefPLMNList == NULL)
+			{
+			TFLOGSTRING("TSY CompleteGetPreferredNetworksListPhase1: LTSY successfully retrieved the preferred networks list, unpack it");		
+			CMobilePhoneStoredNetworkList* list;
+			aDataPackage->UnPackData(&list);
+	
+			TRAPD(trapError, iGetPrefPLMNList = list->StoreLC(); CleanupStack::Pop();); // pop the CBufBase * allocated by StoreLC
+			if(KErrNone == trapError)
+				{
+				*iBufSizeGetPrefPLMN = iGetPrefPLMNList->Size();
+				TFLOGSTRING2("TSY CompleteGetPreferredNetworksListPhase1: first phase list retrieval is OK!!, client buffer = %d", *iBufSizeGetPrefPLMN);					
+				iMmPhoneTsy->ReqCompleted( reqHandle, KErrNone );
+			
+				}
+			else
+				{
+				TFLOGSTRING2("TSY CompleteGetPreferredNetworksListPhase1: failed to stream the list into the buffer, error = %d!!", trapError);
+				completeError = trapError;
+				}
+			}
+		else
+			{
+			TFLOGSTRING("TSY CompleteGetPreferredNetworksListPhase1: iGetPrefPLMNList is not null");
+			completeError = KErrServerBusy;
+			}
+		}
+	else
+		{
+		TFLOGSTRING2("TSY CompleteGetPreferredNetworksListPhase1: LTSY failed to retrieve preferred network list!! error = %d", aError);
+		completeError = aError;
+		}
+	
+	if(completeError != KErrNone)
+		{
+		iMmPhoneTsy->ReqCompleted( reqHandle, aError );
+		delete iClientIdGetPrefPLMN;
+		iClientIdGetPrefPLMN = NULL;
+		}
+	
+	iBufSizeGetPrefPLMN = NULL;
+	}
+
+// ---------------------------------------------------------------------------
+// CMmNetTsy::CompleteStorePreferredNetworksList
+// Completes an outstanding StorePreferredNetworksListL, which stores Preferred Networks List to LTSY layer
+// (other items were commented in a header).
+// ---------------------------------------------------------------------------
+//
+void CMmNetTsy::CompleteStorePreferredNetworksList(TInt aError)
+	{
+	TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteStorePreferredNetworksList: aError=%d", aError);	
+
+	TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneStorePreferredNetworksList );
+
+	TFLOGSTRING2("TSY CompleteStorePreferredNetworksList: EMobilePhoneStorePreferredNetworksList reqHandle=%d", reqHandle);
+
+	if(iStorePrefPLMNList != NULL)
+		{
+		delete iStorePrefPLMNList;
+		iStorePrefPLMNList = NULL;
+
+		}
+
+	if(KErrNone == aError)
+		{
+		if(CMmPhoneTsy::EMultimodePhoneReqHandleUnknown == reqHandle)
+			{
+			// we cannot complete the store request but complete the notifier.
+			TFLOGSTRING("TSY CompleteStorePreferredNetworksList: reqHandle is 0, cannot complete store list request!!");
+			}
+		else
+			{
+			TFLOGSTRING("TSY CompleteStorePreferredNetworksList: LTSY successfully stored the preferred networks list");
+			iMmPhoneTsy->ReqCompleted( reqHandle, KErrNone );
+			}
+		CompleteNotifyStorePreferredNetworksListChange();
+		}
+	else
+		{
+		TFLOGSTRING("TSY CompleteStorePreferredNetworksList: LTSY failed to store the preferred networks list");
+		iMmPhoneTsy->ReqCompleted( reqHandle, aError );
+		}
+	}
+
+// ---------------------------------------------------------------------------
+// CMmNetTsy::CompleteNotifyStorePreferredNetworksListChange
+// Completes the notification request for storing Preferred Networks List
+// (other items were commented in a header).
+// ---------------------------------------------------------------------------
+//
+void CMmNetTsy::CompleteNotifyStorePreferredNetworksListChange()
+	{
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyStorePreferredNetworksListChange");	
+
+	TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle
+		                      ( CMmPhoneTsy::EMultimodePhoneNotifyStorePreferredNetworksListChange );
+    if (CMmPhoneTsy::EMultimodePhoneReqHandleUnknown != reqHandle )
+        {
+    	iMmPhoneTsy->ReqCompleted( reqHandle, KErrNone);
+        }
+	else
+		{
+		TFLOGSTRING("TSY CompleteNotifyStorePreferredNetworksListChange: reqHandle is 0, cannot complete request for IPC EMobilePhoneNotifyStorePreferredNetworksListChange!!");
+
+		}
+	}
+
 //  End of File

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -14,11 +14,6 @@
 //
 
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmphonetsyTraces.h"
-#endif
-
 
 //INCLUDES
 #include <etelmm.h>
@@ -95,7 +90,7 @@
     CMmPhoneFactoryTsy* aMmPhoneFactoryTsy,
     MLtsyFactoryBase* aFactory )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CMMPHONETSY_NEWL_1, "TSY: CMmPhoneTsy::NewL - Phone model Id: %S", KPhoneModelId);
+TFLOGSTRING2("TSY: CMmPhoneTsy::NewL - Phone model Id: %S", &KPhoneModelId);
     CleanupStack::PushL( aMessageManager );
     CMmPhoneTsy* mmPhoneTsy = new (ELeave) CMmPhoneTsy();
 
@@ -135,9 +130,9 @@
 
 void CMmPhoneTsy::ConstructL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CONSTRUCTL_1, "TSY: CMmPhoneTsy::ConstructL");
+TFLOGSTRING("TSY: CMmPhoneTsy::ConstructL");
 	iCentRep = CRepository::NewL( KCRUidCtsyMEAlsLine );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CONSTRUCTL_2, "TSY: CMmPhoneTsy::ConstructL Central Repository opened successfully");
+TFLOGSTRING("TSY: CMmPhoneTsy::ConstructL Central Repository opened successfully");
 	
 	//iPublic Central Repositories
     iMWISCentRep = CRepository::NewL( KCRUidCtsyMessageWaitingIndicator );
@@ -187,7 +182,7 @@
 	// initialize HWRM & its observers
 	if(IsHWRMSupported())
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CONSTRUCTL_3, "TSY: HWRM Battery API is in use.");
+		TFLOGSTRING("TSY: HWRM Battery API is in use.");
 		iPowerManager = CHWRMPower::NewL();
 		iBattery = CBatteryInfoObserver::NewL( *iPowerManager, *this ); 
 		iChargingStatus = CChargingStatusObserver::NewL( *this );
@@ -354,7 +349,7 @@
     
 CMmPhoneTsy::~CMmPhoneTsy()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_DTOR_1, "TSY: CMmPhoneTsy::~CMmPhoneTsy");
+TFLOGSTRING("TSY: CMmPhoneTsy::~CMmPhoneTsy");
 
 	if(IsHWRMSupported())
 		{
@@ -564,7 +559,7 @@
         delete iSystemStatePluginHandler;
         }
     iSystemStatePluginHandler = NULL;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_DTOR_2, "TSY: CMmPhoneTsy::~CMmPhoneTsy DONE");
+TFLOGSTRING("TSY: CMmPhoneTsy::~CMmPhoneTsy DONE");
    }
 
 // ---------------------------------------------------------------------------
@@ -588,7 +583,7 @@
 //
 void CMmPhoneTsy::CompleteNotifyModemStatusReady()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYMODEMSTATUSREADY_1, "TSY: CMmPhoneTsy::CompleteNotifyModemStatusReady");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyModemStatusReady");
 
     TRAP_IGNORE(
     //update the network registration status
@@ -617,7 +612,7 @@
     {
     if ( !iBootState.iSIMReady )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_1, "TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - SIM is ready, start initialisations");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - SIM is ready, start initialisations");
 
         iBootState.iSIMReady = ETrue;
         iBootState.iADNReady = ETrue;
@@ -662,14 +657,14 @@
         // VIAG homezone parameters. 
         if ( iMmCustomTsy )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_2, "TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - CustomTSY ready");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - CustomTSY ready");
             // Get pointer to SIM Custom TSY
             CMmSIMTsy* simCustomTsy =
                 ( ( CMmSIMTsy* ) iMmCustomTsy->GetSIMTsyPtr() );
             
             if ( simCustomTsy )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_3, "TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - CheckViagHomeZoneParamsL()");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - CheckViagHomeZoneParamsL()");
                 simCustomTsy->CheckViagHomezoneParamsL();
                 iViagHomeZoneParamsChecked = ETrue;
                 }
@@ -678,7 +673,7 @@
         else
         	{
         	iViagHomeZoneParamsChecked = EFalse;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_4, "TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - CustomTSY NOT ready");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - CustomTSY NOT ready");        		
         	}
         } 
     }
@@ -722,7 +717,7 @@
 TInt CMmPhoneTsy::NotifyIndicatorChange(
     TUint32* aIndicatorState )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYINDICATORCHANGE_1, "TSY: CMmPhoneTsy::NotifyIndicatorChange");
+TFLOGSTRING("TSY: CMmPhoneTsy::NotifyIndicatorChange");
 
     // Update indicator state, we don't keep track of it
     // unless notify is on. So we need to update starting
@@ -741,17 +736,17 @@
 //
 void CMmPhoneTsy::CompleteNotifyIndicatorChange()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYINDICATORCHANGE_1, "TSY: CMmPhoneTsy::CompleteNotifyIndicatorChange");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyIndicatorChange");
 
     // first check if this notify is actually requested..
     if (NULL != iRetIndicatorState)
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYINDICATORCHANGE_2, "TSY: CMmPhoneTsy::CompleteNotifyIndicatorChange -- notify is on");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyIndicatorChange -- notify is on");
         TUint32 newIndicatorState = GetIndicatorState();
         if (newIndicatorState != iIndicatorState)
             {
             iIndicatorState = newIndicatorState;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYINDICATORCHANGE_3, "TSY: CMmPhoneTsy::CompleteNotifyIndicatorChange -- changed to 0x%08x", iIndicatorState);
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteNotifyIndicatorChange -- changed to 0x%x", iIndicatorState);
 
             //reset req handle. Returns the deleted req handle
             TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -777,7 +772,7 @@
 TInt CMmPhoneTsy::NotifyIndicatorChangeCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYINDICATORCHANGECANCEL_1, "TSY: CMmPhoneTsy::NotifyIndicatorChangeCancel");
+TFLOGSTRING("TSY: CMmPhoneTsy::NotifyIndicatorChangeCancel");
 
     iRetIndicatorState = NULL;
     iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -1068,7 +1063,8 @@
     if ( KErrNone != trapError || KErrNone != addLineSucceeded
         || KErrNone != addPBSucceeded )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_OPENNEWOBJECTBYNAMEL_1, "TSY: CMmPhoneTsy::OpenNewObjectByNameL - Failed: %d",trapError);
+TFLOGSTRING2("TSY: CMmPhoneTsy::OpenNewObjectByNameL - Failed: %d",
+    trapError);
 
         if ( mmLine )
             {
@@ -1125,7 +1121,7 @@
     const TInt aIpc,
     const TDataPackage& aPackage )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_EXTFUNC_1, "TSY: CMmPhoneTsy::ExtFunc, IPC:%d, Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmPhoneTsy::ExtFunc, IPC:%d, Handle:%d", aIpc, aTsyReqHandle);
 
     TInt ret = KErrNone;
     TInt trapError = KErrNone;
@@ -1143,7 +1139,7 @@
     if ( ERfsStateInfoInactive == iStateInfo &&
         !IsRequestPossibleInOffline( aIpc ) )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_EXTFUNC_2, "TSY: Offline mode ON, request is not allowed: %d", aIpc );
+TFLOGSTRING2 ("TSY: Offline mode ON, request is not allowed: %d", aIpc );
         ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral,
                 KErrGsmOfflineOpNotAllowed );
 
@@ -1195,7 +1191,7 @@
     const TInt aIpc,
     const TDataPackage& aPackage )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_DOEXTFUNCL_1, "TSY: CMmPhoneTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmPhoneTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle);
 
     TInt ret = KErrNone;
 
@@ -1235,7 +1231,11 @@
         case EMobilePhoneAuthorizationInfoPhase2:
         case EMobilePhoneGetCellInfo:
         case EMobilePhoneNotifyCellInfoChange:
-        case EMobilePhoneGetCurrentActiveUSimApplication:                
+        case EMobilePhoneGetCurrentActiveUSimApplication:
+        case EMobilePhoneGetPreferredNetworksPhase1:
+        case EMobilePhoneGetPreferredNetworksPhase2:
+        case EMobilePhoneStorePreferredNetworksList:
+        case EMobilePhoneNotifyStorePreferredNetworksListChange:
             //direct this request to the net specific DoExtFuncL
             ret = iMmNetTsy->DoExtFuncL ( aTsyReqHandle, aIpc, aPackage );
             break;
@@ -1343,10 +1343,6 @@
         case EMobilePhoneTerminateAllCalls:
             ret = TerminateAllCallsL( aTsyReqHandle );
             break;			
-        // Active calls termination
-        case EMobilePhoneTerminateActiveCalls:
-            ret = TerminateActiveCallsL( aTsyReqHandle );
-            break;          
       // DTMF
 		// forward request to the DTMF-specific Tsy
         case EMobilePhoneGetDTMFCaps:
@@ -1618,7 +1614,6 @@
         //indicates that same method has been called and has not been 
         //completed, the method should return KErrServerBusy.
         case EMobilePhoneTerminateAllCalls:
-        case EMobilePhoneTerminateActiveCalls:
         case EMobilePhoneGetFdnStatus:
         case EMobilePhoneGetCustomerServiceProfile:
         case EMobilePhoneGetDetectedNetworksV2Phase1:
@@ -1641,6 +1636,9 @@
         case EMobilePhoneDeleteAPNName:
         case EMobilePhoneAppendAPNName:
         case EMobilePhoneGetSecurityCodeInfo:
+		case EMobilePhoneGetPreferredNetworksPhase1:
+		case EMobilePhoneGetPreferredNetworksPhase2:		
+		case EMobilePhoneStorePreferredNetworksList:
 
         //SS related methods.
         case EMobilePhoneGetCallForwardingStatusPhase1:
@@ -1764,6 +1762,7 @@
         case EMobilePhoneNotifySendNetworkServiceRequest:
         case EMobilePhoneNotifyAllSendNetworkServiceRequest: 
         case EMobilePhoneNotifyCellInfoChange:
+		case EMobilePhoneNotifyStorePreferredNetworksListChange:
             ret=KReqModeMultipleCompletionEnabled | KReqModeRePostImmediately;
             break;
         // Cancel Requests
@@ -1778,7 +1777,7 @@
             break;
 
         }
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_REQMODEL_1, "TSY: CMmPhoneTsy::ReqModeL - IPC:%d, Mode:%d", aIpc, ret);
+	TFLOGSTRING3("TSY: CMmPhoneTsy::ReqModeL - IPC:%d, Mode:%d", aIpc, ret);
 
     return ret;
     }
@@ -1914,6 +1913,9 @@
         case EMobilePhoneNotifyCellInfoChange:
         	numberOfSlots = KMmPhoneCellInfoChangeSlots;
         	break;
+		case EMobilePhoneNotifyStorePreferredNetworksListChange:
+			numberOfSlots = KMmPhoneStorePreferredNetworksListChangeSlots;
+            break;
         default:
             // Unknown or invalid Phone IPC
             User::Leave( KErrNotSupported );
@@ -1933,7 +1935,7 @@
     const TInt aIpc,
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CANCELSERVICE_1, "TSY: CMmPhoneTsy::CancelService - IPC:%d, Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmPhoneTsy::CancelService - IPC:%d, Handle:%d", aIpc, aTsyReqHandle);
 
     TInt ret ( KErrNotSupported );
 
@@ -1972,6 +1974,9 @@
         case EMobilePhoneGetCellInfo:
         case EMobilePhoneNotifyCellInfoChange:
         case EMobilePhoneGetCurrentActiveUSimApplication:        
+        case EMobilePhoneGetPreferredNetworksPhase1:
+        case EMobilePhoneStorePreferredNetworksList:
+        case EMobilePhoneNotifyStorePreferredNetworksListChange:
         	ret = iMmNetTsy->CancelService( aIpc, aTsyReqHandle );
             break;
 		// forward SS cancellations
@@ -2024,7 +2029,6 @@
         case EMobilePhoneNotifyDefaultPrivacyChange:
         case EMobilePhoneSetDefaultPrivacy:
         case EMobilePhoneTerminateAllCalls:
-        case EMobilePhoneTerminateActiveCalls:
         case EMobilePhoneSetNetworkSelectionSetting:        
             ret = KErrNone;
             break;
@@ -2445,7 +2449,7 @@
 //
 TInt CMmPhoneTsy::TerminateAllCallsL(const TTsyReqHandle aTsyReqHandle)
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TERMINATEALLCALLSL_1, "TSY: CMmPhoneTsy::TerminateAllCalls");
+TFLOGSTRING("TSY: CMmPhoneTsy::TerminateAllCalls");
 
 	// Check if some other client has already requested this
 	TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(EMultimodePhoneTerminateAllCalls);
@@ -2495,7 +2499,7 @@
 		}
 	else
 		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TERMINATEALLCALLSL_2, "TSY: CMmPhoneTsy::TerminateAllCalls - Already requested");
+TFLOGSTRING("TSY: CMmPhoneTsy::TerminateAllCalls - Already requested");
 		ReqCompleted( aTsyReqHandle, KErrServerBusy );
 		}
 	return KErrNone;
@@ -2513,63 +2517,6 @@
 	     }	 
 	}
 
-
-// ---------------------------------------------------------------------------
-// CMmPhoneTsy::TerminateActiveCallsL
-// Terminates all active calls simultaneously.
-// ---------------------------------------------------------------------------
-//
-TInt CMmPhoneTsy::TerminateActiveCallsL(const TTsyReqHandle aTsyReqHandle)
-    {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TERMINATEACTIVECALLSL_1, "TSY: CMmPhoneTsy::TerminateActiveCalls");
-
-    // Check if some other client has already requested this
-    TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(EMultimodePhoneTerminateActiveCalls);
-    
-    if (EMultimodePhoneReqHandleUnknown >= reqHandle )
-        {
-        // The request is not already in processing because of a previous request
-
-        TInt err = iMessageManager->HandleRequestL(ECtsyPhoneTerminateActiveCallsReq);
-        if ( err == KErrNone )
-            {
-#ifdef REQHANDLE_TIMER
-            SetTypeOfResponse( EMultimodePhoneTerminateActiveCalls, aTsyReqHandle );
-#else
-            iTsyReqHandleStore->SetTsyReqHandle( 
-                    iReqHandleType, aTsyReqHandle );
-#endif //REQHANDLE_TIMER
-            }
-        else
-            {
-            // request failed, complete with error value
-            ReqCompleted( aTsyReqHandle, err );
-            } 
-        }
-    else
-        {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TERMINATEACTIVECALLSL_2, "TSY: CMmPhoneTsy::TerminatActiveCalls - Already requested"); 
-        ReqCompleted( aTsyReqHandle, KErrServerBusy );
-        }
-    return KErrNone;
-    }
-// ---------------------------------------------------------------------------
-// CMmPhoneTsy::CompleteTerminateActiveCallsReq
-// Description: Complete TerminateActiveCallsRequest
-// ---------------------------------------------------------------------------
-//
-void CMmPhoneTsy::CompleteTerminateActiveCallsReq(TInt aErrorCode)
-    {
-    // Reset req handle. Returns the deleted req handle
-     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
-         EMultimodePhoneTerminateActiveCalls );
-    
-     if ( EMultimodePhoneReqHandleUnknown != reqHandle )
-         {
-         ReqCompleted( reqHandle, aErrorCode );
-         }   
-    }
-
 // ---------------------------------------------------------------------------
 // CMmPhoneTsy::RegisterNotification
 // This function is used by ETel Server to subscribe
@@ -2625,6 +2572,7 @@
         case EMobilePhoneNotifySendNetworkServiceRequest:
         case EMobilePhoneNotifyAllSendNetworkServiceRequest:
         case EMobilePhoneNotifyCellInfoChange:
+        case EMobilePhoneNotifyStorePreferredNetworksListChange:
             ret = KErrNone;
             break;
         default:
@@ -2690,6 +2638,7 @@
         case EMobilePhoneNotifySendNetworkServiceRequest:
         case EMobilePhoneNotifyAllSendNetworkServiceRequest:
         case EMobilePhoneNotifyCellInfoChange:
+		case EMobilePhoneNotifyStorePreferredNetworksListChange:
             ret = KErrNone;
             break;
         default:
@@ -2782,7 +2731,7 @@
     const RMobilePhone::TMobileName* aStoreName )
     {
     TInt ret( KErrArgument );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETPHONESTOREINFOL_1, "TSY: CMmPhoneTsy::GetPhoneStoreInfoL" );
+TFLOGSTRING("TSY: CMmPhoneTsy::GetPhoneStoreInfoL" );
     
     if(sizeof(RMobilePhoneStore::TMobilePhoneStoreInfoV1) <= aInfo->MaxLength())
       	{
@@ -2795,7 +2744,7 @@
              
         if ( KETelExtMultimodeV1 != storeInfo.ExtensionId() )
     		{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETPHONESTOREINFOL_2, "TSY: Phonebook not supported. Only KETelExtMultimodeV1 types supported for RMobilePhone::GetPhoneStoreInfo" );
+			TFLOGSTRING("TSY: Phonebook not supported. Only KETelExtMultimodeV1 types supported for RMobilePhone::GetPhoneStoreInfo" );
     		ret = KErrNotSupported;
     		}
     	else
@@ -2810,7 +2759,7 @@
     	         0x0 == aStoreName->Compare( KETelMeSmsStore )              
     	       )
     	        {
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETPHONESTOREINFOL_3, "TSY: Phonebook name is not supported. " );
+				TFLOGSTRING("TSY: Phonebook name is not supported. " );
     	        ret = KErrNotSupported;
     	        }
     	    else
@@ -2899,7 +2848,7 @@
     const TTsyReqHandle aTsyReqHandle,
     TDes8* aCspFile )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETCUSTOMERSERVICEPROFILEL_1, "TSY: CMmPhoneTsy::GetCustomerServiceProfileL" );
+TFLOGSTRING("TSY: CMmPhoneTsy::GetCustomerServiceProfileL" );
     
     TInt ret = KErrArgument;
     
@@ -2916,7 +2865,7 @@
 
         if ( 0 < reqHandle )
             {
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETCUSTOMERSERVICEPROFILEL_2, "TSY: CMmPhoneTsy::GetCustomerServiceProfileL one req already ongoing" );
+ TFLOGSTRING("TSY: CMmPhoneTsy::GetCustomerServiceProfileL one req already ongoing" );  
             ret = KErrNone;
             //The request is already in processing because of previous request
             //Complete request with status value informing the client about
@@ -2962,7 +2911,7 @@
     TInt aErrorCode )
     {
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETCUSTOMERSERVICEPROFILE_1, "TSY: CMmPhoneTsy::CompleteGetCustomerServiceProfile" );
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetCustomerServiceProfile" );
     
     // Check if the get was called internally during boot
     if( iCspFileQueryInBoot )
@@ -2995,7 +2944,7 @@
             //set value in client side
             *(req->iRetCspFile) = aCspFile;
 			//reset the return pointer
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETCUSTOMERSERVICEPROFILE_2, "TSY: CMmPhoneTsy::CompleteGetCustomerServiceProfile queue handling" );
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetCustomerServiceProfile queue handling" ); 
             ReqCompleted( req->iReqHandle, aErrorCode );
 			}
         // Complete the client request
@@ -3013,14 +2962,14 @@
 //
 TInt CMmPhoneTsy::GetCustomerServiceProfileCancel( const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETCUSTOMERSERVICEPROFILECANCEL_1, "TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel aTsyReqHandle: %d", aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel aTsyReqHandle: %d", aTsyReqHandle);   
 
     TInt customerServiceProfileRequestsCount = iCustomerServiceProfileRequests.Count();
 
     //reset the req handle if only one req remains
     if( 1 == customerServiceProfileRequestsCount )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETCUSTOMERSERVICEPROFILECANCEL_2, "TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel - one req");
+        TFLOGSTRING("TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel - one req");       
         TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
                 EMultimodePhoneGetCustomerServiceProfile );       
         }
@@ -3028,7 +2977,7 @@
     // go through array if one or more requests remain and find the correct request handle to cancel
     for ( TInt i=0; i < customerServiceProfileRequestsCount ; i++ )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETCUSTOMERSERVICEPROFILECANCEL_3, "TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel - queued requests");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel - queued requests");
 
         TCustomerServiceProfileIdRequest* req =
         iCustomerServiceProfileRequests[ i ];
@@ -3075,7 +3024,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMobilePhone::TMobilePhoneBatteryInfoV1* aInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETBATTERYINFOL_1, "TSY: CMmPhoneTsy::GetBatteryInfoL");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetBatteryInfoL");
 
     // Battery info is requested when phone is booted up and updated when
     // EM server sends indications.
@@ -3095,7 +3044,7 @@
 TInt CMmPhoneTsy::NotifyBatteryInfoChange(
     RMobilePhone::TMobilePhoneBatteryInfoV1* aInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYBATTERYINFOCHANGE_1, "TSY: CMmPhoneTsy::NotifyBatteryInfoChange");
+TFLOGSTRING("TSY: CMmPhoneTsy::NotifyBatteryInfoChange");
 
     iRetBatteryInfo = aInfo;
     iReqHandleType = EMultimodePhoneNotifyBatteryInfoChange;
@@ -3113,7 +3062,7 @@
     CMmDataPackage* aDataPackage,
     TInt aErrorCode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYBATTERYINFOCHANGE_1, "TSY: CMmPhoneTsy::CompleteNotifyBatteryInfoChange");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyBatteryInfoChange");
 
     if ( KErrNone == aErrorCode )
         {
@@ -3123,7 +3072,7 @@
         iBatteryInfo = *batteryInfo;
         }
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYBATTERYINFOCHANGE_2, "TSY: CMmPhoneTsy::CompleteNotifyBatteryInfoChange, battery status: %d", (TInt)iBatteryInfo.iStatus);
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteNotifyBatteryInfoChange, battery status: %d", (TInt)iBatteryInfo.iStatus);
 
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -3150,7 +3099,7 @@
 TInt CMmPhoneTsy::NotifyBatteryInfoChangeCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYBATTERYINFOCHANGECANCEL_1, "TSY: CMmPhoneTsy::NotifyBatteryInfoChangeCancel");
+TFLOGSTRING("TSY: CMmPhoneTsy::NotifyBatteryInfoChangeCancel");
 
     iRetBatteryInfo = NULL;
     iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -3235,12 +3184,12 @@
     
     if ( iBootState.iSIMReady )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICEPROVIDERNAMEL_1, "TSY: CMmPhoneTsy::GetServiceProviderNameL -Sim ready");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceProviderNameL -Sim ready");
 
         if ( sizeof( RMobilePhone::TMobilePhoneServiceProviderNameV2 ) >
              aName->MaxLength() )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICEPROVIDERNAMEL_2, "TSY: CMmPhoneTsy::GetServiceProviderNameL -Invalid parameter!");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceProviderNameL -Invalid parameter!");        
             ret = KErrArgument;
             }
 		else
@@ -3258,7 +3207,7 @@
         if ( KErrNone == ret )
             {
             // save reqhandle to queue
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICEPROVIDERNAMEL_3, "TSY: CMmPhoneTsy::GetServiceProviderNameL - Client to queue");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceProviderNameL - Client to queue");
             RMobilePhone::TMobilePhoneServiceProviderNameV2Pckg* nameV2Pckg =
                 REINTERPRET_CAST( 
                     RMobilePhone::TMobilePhoneServiceProviderNameV2Pckg*, 
@@ -3279,7 +3228,7 @@
          }
      else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICEPROVIDERNAMEL_4, "TSY: CMmPhoneTsy::GetServiceProviderNameL - Sim not ready");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceProviderNameL - Sim not ready");
         ret = KErrNotReady;
         }
 
@@ -3297,7 +3246,7 @@
     CMmDataPackage* aDataPackage,
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_1, "TSY: CMmPhoneTsy::CompleteGetServiceProviderName Error %d", aErrorCode );
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceProviderName Error %d", aErrorCode );
    
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -3312,24 +3261,24 @@
             {
             aDataPackage->UnPackData( &name );
 
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_2, "TSY: CMmPhoneTsy::CompleteGetServiceProviderName name: %S", name->iSPName );
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceProviderName name: %S", &name->iSPName );
 		    for ( TInt i=0; i < requestCount ; i++ )
 		        {
 		        TServiceProviderNameRequest* req = 
 		            iServiceProviderNameRequests[ i ];
 		        *(req->iServiceProviderName) = *name;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_3, "TSY: CMmPhoneTsy::CompleteGetServiceProviderName client %d", i );
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceProviderName client %d", i );
 		        ReqCompleted( req->iReqHandle, aErrorCode );
 		        }
             }
         else
         	{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_4, "TSY: CMmPhoneTsy::CompleteGetServiceProviderName Error %d", aErrorCode );
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceProviderName Error %d", aErrorCode );
         	for ( TInt i=0; i < requestCount ; i++ )
 		        {
 		        TServiceProviderNameRequest* req = 
 		            iServiceProviderNameRequests[ i ];
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_5, "TSY: CMmPhoneTsy::CompleteGetServiceProviderName Error queue: %d", i );
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceProviderName Error queue: %d", i );
 		        ReqCompleted( req->iReqHandle, aErrorCode );
 		        }	
         	}
@@ -3348,14 +3297,14 @@
 //
 TInt CMmPhoneTsy::GetServiceProviderNameCancel( const TTsyReqHandle aTsyReqHandle )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICEPROVIDERNAMECANCEL_1, "TSY: CMmPhoneTsy::GetServiceProviderNameCancel aTsyReqHandle: %d", aTsyReqHandle);
+    TFLOGSTRING2("TSY: CMmPhoneTsy::GetServiceProviderNameCancel aTsyReqHandle: %d", aTsyReqHandle);   
 
     TInt requestCount = iServiceProviderNameRequests.Count();
     
     //reset the req handle if only one req remains
     if( 1 == requestCount )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICEPROVIDERNAMECANCEL_2, "TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel - one req");
+        TFLOGSTRING("TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel - one req");       
         TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
                 EMultimodePhoneGetServiceProviderName );       
         }
@@ -3363,7 +3312,7 @@
     // qo throw array if several requests and find correct reqhandle to cancel
     for ( TInt i = 0; i < requestCount; i++ )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICEPROVIDERNAMECANCEL_3, "TSY: CMmPhoneTsy::GetServiceProviderNameCancel - queued requests");
+        TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceProviderNameCancel - queued requests");
 
         TServiceProviderNameRequest* req =
         iServiceProviderNameRequests[i];
@@ -3512,8 +3461,10 @@
       }
    else
       {
-      OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_DOGETPHONEIDL_1, "TSY: CMmPhoneTsy::GetPhoneIdL - iManufacturer: %S, iModel: %S", iPhoneIdentity.iManufacturer, iPhoneIdentity.iModel );
-      OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_DOGETPHONEIDL_2, "TSY: CMmPhoneTsy::GetPhoneIdL - iRevision: %S, iSerialNumber: %S", iPhoneIdentity.iRevision, iPhoneIdentity.iSerialNumber);
+      TFLOGSTRING3("TSY: CMmPhoneTsy::GetPhoneIdL - iManufacturer: %S, iModel: %S", &iPhoneIdentity.iManufacturer, 
+             		                                                                      &iPhoneIdentity.iModel );             
+      TFLOGSTRING3("TSY: CMmPhoneTsy::GetPhoneIdL - iRevision: %S, iSerialNumber: %S", &iPhoneIdentity.iRevision, 
+             		                                                                         &iPhoneIdentity.iSerialNumber);
      	  
 	  *aId = iPhoneIdentity;
 	  ReqCompleted( aTsyReqHandle, KErrNone );	   
@@ -3535,7 +3486,7 @@
         // Copy serial number
         iPhoneIdentity.iSerialNumber.Copy(aSerialData.Left( aSerialData.Length() ) );
         
-        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID_1, "TSY: CMmPhoneTsy::CompletePhoneSerialNumber - iSerialNumber: %S", iPhoneIdentity.iSerialNumber );
+        TFLOGSTRING2("TSY: CMmPhoneTsy::CompletePhoneSerialNumber - iSerialNumber: %S", &iPhoneIdentity.iSerialNumber );
         }
 
     //reset req handle. Returns the deleted req handle
@@ -3561,7 +3512,7 @@
 //
 TInt CMmPhoneTsy::MobilePhoneGetPhoneIdCancel(const TTsyReqHandle aTsyReqHandle )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_MOBILEPHONEGETPHONEIDCANCEL_1, "TSY: CMmPhoneTsy::MobilePhoneGetPhoneIdCancel");
+    TFLOGSTRING("TSY: CMmPhoneTsy::MobilePhoneGetPhoneIdCancel");    
     
     TInt reqCount = iGetPhoneIdRequests.Count();
     
@@ -3635,7 +3586,7 @@
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSUBSCRIBERIDL_1, "TSY: CMmPhoneTsy::GetSubscriberIdL - queued requests add req to queue");
+			TFLOGSTRING("TSY: CMmPhoneTsy::GetSubscriberIdL - queued requests add req to queue");
 			TSubscriberIdRequest* req = new (ELeave) TSubscriberIdRequest();
 			req->iReqHandle = aTsyReqHandle;
 			req->iRetSubscrId = aId;
@@ -3665,7 +3616,7 @@
     {
     TInt ret( KErrGeneral );
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETINDICATORCAPS_1, "TSY: CMmPhoneTsy::GetIndicatorCaps" );
+TFLOGSTRING("TSY: CMmPhoneTsy::GetIndicatorCaps" );
     if(	 NULL != aActCaps && NULL != aIndCaps )
     	{
     	*aActCaps = RMobilePhone::KCapsGetIndicator | 
@@ -3691,7 +3642,7 @@
     const TTsyReqHandle aTsyReqHandle,
     TUint32* aIndicators )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETINDICATORS_1,  "TSY: CMmPhoneTsy::GetIndicators" );
+TFLOGSTRING( "TSY: CMmPhoneTsy::GetIndicators" );
     TInt ret( KErrGeneral );
 
     if( aIndicators )
@@ -3716,7 +3667,7 @@
 	TUint32 indicators( 0 );
 
 	//Charger connected?
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETINDICATORSTATE_1,  "TSY: CMmPhoneTsy::GetIndicatorState charger: %d", (TInt)iBatteryInfo.iStatus );
+TFLOGSTRING2( "TSY: CMmPhoneTsy::GetIndicatorState charger: %d", (TInt)iBatteryInfo.iStatus );
 	if( RMobilePhone::EBatteryConnectedButExternallyPowered == 
         iBatteryInfo.iStatus )
 		{
@@ -3733,7 +3684,7 @@
 			{
 			indicators |= RMobilePhone::KIndNetworkAvailable;
 			}
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETINDICATORSTATE_2,  "TSY: CMmPhoneTsy::GetIndicatorState network: %d", (TInt)networkRegStatus );
+TFLOGSTRING2( "TSY: CMmPhoneTsy::GetIndicatorState network: %d", (TInt)networkRegStatus );
 		}
 
 	//Call in progress?
@@ -3745,12 +3696,12 @@
 		CMmCallTsy* mmCall = CallList()->GetMmCallByIndex( i );
 		if ( RMobileCall::EStatusConnected == mmCall->MobileCallStatus() )
 			{
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETINDICATORSTATE_3,  "TSY: CMmPhoneTsy::GetIndicatorState call id: %d, status: %d", mmCall->CallId(), (TInt)mmCall->MobileCallStatus() );
+TFLOGSTRING3( "TSY: CMmPhoneTsy::GetIndicatorState call id: %d, status: %d", mmCall->CallId(), (TInt)mmCall->MobileCallStatus() );
 			indicators |= RMobilePhone::KIndCallInProgress;
 			break;
 			}
 		}
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETINDICATORSTATE_4,  "TSY: CMmPhoneTsy::GetIndicatorState - ok, Indicators: %d", indicators );
+TFLOGSTRING2( "TSY: CMmPhoneTsy::GetIndicatorState - ok, Indicators: %d", indicators );
 
     return indicators;
 	}
@@ -3765,7 +3716,7 @@
     TBuf8<RMobilePhone::KIMSISize> aImsiData,
     TInt aError )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_1, "TSY: CMmPhoneTsy::CompleteGetSubscriberIdL, aError=%d", aError );
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetSubscriberIdL, aError=%d", aError );
 
     // Set the flag to EFalse
     iTSYSubscriberIdReq = EFalse;
@@ -3775,19 +3726,19 @@
   
     // Retrieve previous IMSI value from the Central Repository
 	iCFISPrivateCentRep->Get( KCtsyIMSI, subscriberIdTmp );
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_2, "TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Get old IMSI from CenRep: %S", subscriberIdTmp );
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Get old IMSI from CenRep: %S", &subscriberIdTmp );
 	
     if ( ( KErrNone == aError ) && ( 0 < aImsiData.Length() ) )
         {
         // Copy new IMSI value to the member variable
         iSubscriberId.Copy( aImsiData.Left( aImsiData.Length() ) );
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_3, "TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Copy new IMSI: %S", iSubscriberId );
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Copy new IMSI: %S", &iSubscriberId );
         }
     
     // check the boot state security, is the security ready (PIN query)
     if ( iBootState.iSecReady )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_4, "TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Security ready");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Security ready");
   
         // Check has the IMSI changed and is there previous info: or an error
         if ( KErrNotFound == subscriberIdTmp.Match( iSubscriberId ) && 
@@ -3804,7 +3755,7 @@
             iCFISPrivateCentRep->Reset();
             // Reset MWIS support
             iMmSupplServTsy->SetIccSupportForMWIS( ETrue );   
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_5, "TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Central Repositories have been reseted!");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Central Repositories have been reseted!");     
             
             // intialize the previous SIM related data
             if ( iMmCustomTsy )
@@ -3816,7 +3767,7 @@
             // get new infromation from lower levels, if sim is ready
             if ( iBootState.iSIMReady )
                 {                       
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_6, "TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - SIM ready, retrive intial ICC SIM data.");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - SIM ready, retrive intial ICC SIM data."); 
 
                 // update ALS line information 
                 iMessageManager->HandleRequestL( EMobilePhoneGetALSLine );
@@ -3839,7 +3790,7 @@
         {    
     	// Write new IMSI value to the central repository
     	iCFISPrivateCentRep->Set( KCtsyIMSI, iSubscriberId );
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_7, "TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Write new IMSI to the CenRep: %S", iSubscriberId );
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Write new IMSI to the CenRep: %S", &iSubscriberId );
         }
         
     //reset req handle. Returns the deleted req handle
@@ -3900,7 +3851,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMobilePhone::TMobilePhoneALSLine* aALSLine )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETALSLINEL_1, "TSY: CMmPhoneTsy::GetALSLineL");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetALSLineL");
 	
     TInt ret ( KErrNone );
 	TBool alsSupportedBySim;
@@ -4016,7 +3967,7 @@
     RMobilePhone::TMobilePhoneALSLine aAlsStatus,
     TInt aErrorCode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETALSLINE_1, "TSY: CMmPhoneTsy::CompleteGetAlsLine - ALS line" );
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetAlsLine - ALS line" );
 
     //check if value has been updated
     if ( aAlsStatus != iAlsLine )
@@ -4056,7 +4007,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMobilePhone::TMobilePhoneALSLine* aALSLine )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SETALSLINEL_1, "TSY: CMmPhoneTsy::SetALSLineL");
+TFLOGSTRING("TSY: CMmPhoneTsy::SetALSLineL");
     TInt ret ( KErrNone );
 	TBool alsSupportedBySim ( EFalse );
 	
@@ -4129,7 +4080,7 @@
 void CMmPhoneTsy::CompleteSetAlsLine(
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETESETALSLINE_1, "TSY: CMmPhoneTsy::CompleteSetAlsLine - ALS line: %d", iTempAlsLine );
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteSetAlsLine - ALS line: %d", iTempAlsLine );
 
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -4218,7 +4169,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMobilePhone::TMobilePhoneFdnStatus* aFdnStatus )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETFDNSTATUSL_1,  "TSY: CMmPhoneTsy::GetFdnStatusL" );
+TFLOGSTRING( "TSY: CMmPhoneTsy::GetFdnStatusL" );
 
     TInt ret ( KErrServerBusy );
 
@@ -4262,7 +4213,7 @@
         CMmDataPackage* aDataPackage,
         TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETFDNSTATUS_1, "TSY: CMmPhoneTsy::CompleteGetFdnStatus - Error: %d", aErrorCode );
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetFdnStatus - Error: %d", aErrorCode );
 
 
     //reset req handle. Returns the deleted req handle
@@ -4295,7 +4246,7 @@
 TInt CMmPhoneTsy::GetFdnStatusCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETFDNSTATUSCANCEL_1,  "TSY: CMmPhoneTsy::GetFdnStatusCancel" );
+TFLOGSTRING( "TSY: CMmPhoneTsy::GetFdnStatusCancel" );
     iRetGetFdnStatus = NULL;
     
     iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneGetFdnStatus );
@@ -4345,7 +4296,8 @@
 void CMmPhoneTsy::CompleteSetFdnSettingL(
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETESETFDNSETTINGL_1, "TSY: CMmPhoneTsy::CompleteSetFdnSettingL - Error: %d",aErrorCode);
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteSetFdnSettingL - Error: %d",
+    aErrorCode);
 
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -4602,14 +4554,14 @@
     if ( CMmPhoneGsmWcdmaExt::EICCTypeSim2GGsm ==  currentIccType)
         {
         *aCaps = RMobilePhone::KCapsSimAccessSupported;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETICCACCESSCAPS_1, "TSY: CMmPhoneTsy::GetIccAccessCaps: aCaps = KCapsSimAccessSupported.");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetIccAccessCaps: aCaps = KCapsSimAccessSupported.");
         }
     // 3G USIM
     else if ( CMmPhoneGsmWcdmaExt::EICCTypeSim3G == currentIccType )
         {
         *aCaps = RMobilePhone::KCapsUSimAccessSupported +
             RMobilePhone::KCapsSimAccessSupported;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETICCACCESSCAPS_2, "TSY: CMmPhoneTsy::GetIccAccessCaps: aCaps = KCapsUSimAccessSupported + KCapsSimAccessSupported.");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetIccAccessCaps: aCaps = KCapsUSimAccessSupported + KCapsSimAccessSupported.");
         }
     ReqCompleted( aTsyReqHandle, ret );
 
@@ -4673,11 +4625,11 @@
             {
             case CMmPhoneGsmWcdmaExt::EICCTypeSim2GGsm:     // 2G SIM
                 *iICCCaps = RMobilePhone::KCapsSimAccessSupported;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYICCACCESSCAPSCHANGE_1, "TSY: CMmPhoneTsy::CompleteNotifyIccAccessCapsChange: KCapsSimAccessSupported.");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyIccAccessCapsChange: KCapsSimAccessSupported.");
                 break;
             case CMmPhoneGsmWcdmaExt::EICCTypeSim3G:   // 3G USIM
                 *iICCCaps = RMobilePhone::KCapsUSimAccessSupported;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYICCACCESSCAPSCHANGE_2, "TSY: CMmPhoneTsy::CompleteNotifyIccAccessCapsChange: KCapsUSimAccessSupported.");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyIccAccessCapsChange: KCapsUSimAccessSupported.");
                 break;
 
             default:
@@ -4722,7 +4674,7 @@
         ret = GetServiceTableL( aTsyReqHandle, aTable, serviceTableV1 );
         }
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICETABLECHECKPARAMETERSL_1, "TSY: CMmPhoneTsy::GetServiceTableCheckParametersL - ret:%d",ret);
+TFLOGSTRING2("TSY: CMmPhoneTsy::GetServiceTableCheckParametersL - ret:%d",ret);
     return ret;
     }        
 
@@ -4737,7 +4689,7 @@
     RMobilePhone::TMobilePhoneServiceTable* aTable,
     RMobilePhone::TMobilePhoneServiceTableV1* aTableData )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICETABLEL_1, "TSY: CMmPhoneTsy::GetServiceTableL - Handle:%d", aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmPhoneTsy::GetServiceTableL - Handle:%d", aTsyReqHandle);
     TInt ret( KErrServerBusy );
 
     TTsyReqHandle serviceTableHandle =
@@ -4792,7 +4744,7 @@
             // if SIM is not ready, store request and complete it when SIM is ready
             if ( !iBootState.iSIMReady )
 		        {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICETABLEL_2, "TSY: CMmPhoneTsy::GetServiceTableL - request when SIM not ready - store req" );
+TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceTableL - request when SIM not ready - store req" );
 		    	TServiceTableRequests* req = new (ELeave) TServiceTableRequests();
 		    	req->iReqHandle = aTsyReqHandle;
 		    	req->iTable = aTable;
@@ -4804,7 +4756,7 @@
             if( RMobilePhone::ESIMServiceTable == 
                     *aTable && iServiceTableDataCache )
             	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICETABLEL_3, "TSY: CMmPhoneTsy::GetServiceTableL ESIMServiceTable returned from cache");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceTableL ESIMServiceTable returned from cache");
             	*aTableData = *iServiceTableDataCache;
             	ReqCompleted( aTsyReqHandle, ret );
             	return KErrNone;
@@ -4812,7 +4764,7 @@
            	else if ( RMobilePhone::EUSIMServiceTable== 
                           *aTable && iServiceTableUSIMDataCache )
            		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICETABLEL_4, "TSY: CMmPhoneTsy::GetServiceTableL EUSIMServiceTable returned from cache");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceTableL EUSIMServiceTable returned from cache");
            		*aTableData = *iServiceTableUSIMDataCache;
             	ReqCompleted( aTsyReqHandle, ret );
             	return KErrNone;
@@ -4821,7 +4773,7 @@
             	{
             	if( !iSimRefreshRegisterOk && !( iServiceTableReq->iCaching ) )
             		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICETABLEL_5, "TSY: CMmPhoneTsy::GetServiceTableL sim refresh registration failed - possible old data - cache and complete ");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceTableL sim refresh registration failed - possible old data - cache and complete ");
             		//Store reguest parameters for completion
             		iServiceTableReq->iReqHandle = aTsyReqHandle;
             		iServiceTableReq->iTable = aTable;
@@ -4896,7 +4848,7 @@
 //
 void CMmPhoneTsy::CacheServiceTablesL()
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHESERVICETABLESL_1, "TSY: CMmPhoneTsy::CacheServiceTables.");
+TFLOGSTRING("TSY: CMmPhoneTsy::CacheServiceTables.");
 
 	// Start caching if it is not already ongoing
 	if ( (((iSimCacheQueue && ( KCacheServiceTable & iSimCacheQueue )) )
@@ -4925,11 +4877,11 @@
 //
 void CMmPhoneTsy::CompleteCacheServiceTablesL( const TInt aError )
 	{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_1, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL Error = %d", aError);
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL Error = %d", aError);
 	if ( ( iSimCacheQueue && ( KCacheServiceTable & iSimCacheQueue ) ) 
             && IsRefreshOngoing() )
 		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_2, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL");
 		CompleteCacheSimL( KCacheServiceTable, aError );
 		}
 		
@@ -4937,42 +4889,42 @@
 		
 	// check pending requests and proceed if any
     TInt serviceTableRequestsCount = iServiceTableRequests.Count();
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_3, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - serviceTableRequestsCount: %d", serviceTableRequestsCount );
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - serviceTableRequestsCount: %d", serviceTableRequestsCount );
 
 	 if ( serviceTableRequestsCount )
 	 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_4, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Completing pending ServiceTableRequests");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Completing pending ServiceTableRequests");
 		// check request type for every pending request and complete
 		for ( TInt i = 0; i < serviceTableRequestsCount; i++ )
 			{
 			TServiceTableRequests* req = iServiceTableRequests[ i ];
 			if ( RMobilePhone::ESIMServiceTable == *req->iTable )
 				{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_5, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - pending ESIMServiceTableRequest");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - pending ESIMServiceTableRequest");
 				*(req->iTableData) = *iServiceTableDataCache;
 				}
 			else if ( RMobilePhone::EUSIMServiceTable == *req->iTable )
 				{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_6, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - pending ESIMServiceTableRequest");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - pending ESIMServiceTableRequest");
 				*(req->iTableData) = *iServiceTableUSIMDataCache;
 				}
 			else 
 				{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_7, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - pending BadRequest - KErrGeneral");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - pending BadRequest - KErrGeneral");
 				ret = KErrGeneral;	
 				}
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_8, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - ReqCompleted for pending req withHandle:%d", req->iReqHandle);
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - ReqCompleted for pending req withHandle:%d", req->iReqHandle);
 			ReqCompleted(req->iReqHandle, ret);
 			}
 		// Reset req handle
 		iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneGetServiceTable );
 		iServiceTableRequests.ResetAndDestroy();
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_9, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Reset and ResetAndDestroy!");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Reset and ResetAndDestroy!");	
 		}
 		
 	if ( ENoRequest != iPendingServiceTableReq )
 		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_10, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL completing client request");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL completing client request");
 		// Complete client request if pending
 		
 		// Reset req handle. Returns the deleted req handle
@@ -5008,7 +4960,7 @@
 	     	
 	     	if ( iCalledOnGet && ( iServiceTableReq->iCaching ) )
 				{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_11, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Called when reading service tables - ");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Called when reading service tables - ");
 				iCalledOnGet = EFalse;
 				iSimCacheQueue = 0;
 				iRefreshOngoing = EFalse;
@@ -5027,7 +4979,7 @@
 	        	iPendingServiceTableReq = ENoRequest;
 	        	
 	        	// Complete request if error occured
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_12, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Completing req if error occurred");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Completing req if error occurred");
 	        	ReqCompleted( reqHandle, ret );
 				}
 	        }	
@@ -5045,36 +4997,36 @@
     RMobilePhone::TMobilePhoneServiceTableV1 aTableData,
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_1, "TSY: CMmPhoneTsy::CompleteGetServiceTableL Error = %d", aErrorCode);
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceTableL Error = %d", aErrorCode);
     // Check if timeout has happend, complete to all pending ServiceTable
     // requests and clear queue
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_2, "TSY: CMmPhoneTsy::CompleteGetServiceTableL");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL");
 	if ( KErrTimedOut == aErrorCode )
 		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_3, "TSY: CMmPhoneTsy::CompleteGetServiceTableL - Timeout happened");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL - Timeout happened");
 		// Reset req handle. Returns the deleted req handle
 	    TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
             EMultimodePhoneGetServiceTable );
 
 	    if ( EMultimodePhoneReqHandleUnknown != reqHandle )
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_4, "TSY: CMmPhoneTsy::CompleteGetServiceTableL - in EMultimodePhoneReqHandleUnknown != reqHandle" );
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL - in EMultimodePhoneReqHandleUnknown != reqHandle" );
 	    	{
 			// count pending requests and proceed if any
 			TInt serviceTableRequestsCount = iServiceTableRequests.Count();
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_5, "TSY: CMmPhoneTsy::CompleteGetServiceTableL - serviceTableRequestsCount: %d", serviceTableRequestsCount );
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceTableL - serviceTableRequestsCount: %d", serviceTableRequestsCount );
 	 		if ( serviceTableRequestsCount )
 	 			{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_6, "TSY: CMmPhoneTsy::CompleteGetServiceTableL - Completing pending ServiceTableRequests");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL - Completing pending ServiceTableRequests");
 				// complete pending requests
 				for ( TInt i = 0; i < serviceTableRequestsCount; i++ )
 					{
 					TServiceTableRequests* req = iServiceTableRequests[ i ];
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_7, "TSY: CMmPhoneTsy::CompleteGetServiceTableL - ReqCompleted for pending req withHandle:%d", req->iReqHandle);
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceTableL - ReqCompleted for pending req withHandle:%d", req->iReqHandle);
 					ReqCompleted(req->iReqHandle, aErrorCode);
 					}
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_8, "TSY: CMmPhoneTsy::CompleteGetServiceTableL - in iServiceTableRequests.ResetAndDestroy()" );
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL - in iServiceTableRequests.ResetAndDestroy()" );
 				iServiceTableRequests.ResetAndDestroy();	
 				}
 	        }
@@ -5082,7 +5034,7 @@
 
     if ( ESIMRequest == iPendingServiceTableCacheReq )
 		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_9, "TSY: CMmPhoneTsy::CompleteGetServiceTableL got Service Table");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL got Service Table");
 		
 		delete iServiceTableDataCache;
 		iServiceTableDataCache = NULL;
@@ -5100,7 +5052,7 @@
             iMmPhoneExtInterface->CurrentICCType() ) &&
             ENoRequest != iPendingServiceTableCacheReq )
 			{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_10, "TSY: CMmPhoneTsy::CompleteGetServiceTableL requesting USIM Service Table");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL requesting USIM Service Table");
 
 			RMobilePhone::TMobilePhoneServiceTable serviceTable = 
 				RMobilePhone::EUSIMServiceTable;
@@ -5125,7 +5077,7 @@
 		}
 	else if ( EUSIMRequest == iPendingServiceTableCacheReq )
 		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_11, "TSY: CMmPhoneTsy::CompleteGetServiceTableL got USIM Service Table");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL got USIM Service Table");
 
 		delete iServiceTableUSIMDataCache;
 		iServiceTableUSIMDataCache = NULL;
@@ -5149,7 +5101,7 @@
 	if ( ENoRequest != iPendingServiceTableReq &&
         ENoRequest == iPendingServiceTableCacheReq )
 		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_12, "TSY: CMmPhoneTsy::CompleteGetServiceTableL completing client request");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL completing client request");
 		// Complete client request if pending
 		
 		// Reset req handle. Returns the deleted req handle
@@ -5165,7 +5117,7 @@
 		
 	    		if( KErrNone == aErrorCode )
 	    			{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_13, "TSY: CMmPhoneTsy::CompleteGetServiceTableL copy SIM ST data to client");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL copy SIM ST data to client");
 	    			iServiceTableDataCache = new (ELeave) 
 					    RMobilePhone::TMobilePhoneServiceTableV1();
 	    			*iServiceTableDataCache	= aTableData;
@@ -5179,7 +5131,7 @@
 				
 	        	if( KErrNone == aErrorCode )
 	        		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_14, "TSY: CMmPhoneTsy::CompleteGetServiceTableL copy USIM ST data to client");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL copy USIM ST data to client");
 	        		iServiceTableUSIMDataCache = new (ELeave) 
 					    RMobilePhone::TMobilePhoneServiceTableV1();
 	        		*iServiceTableUSIMDataCache = aTableData;	
@@ -5204,7 +5156,7 @@
 TInt CMmPhoneTsy::GetServiceTableCancel (
 	const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICETABLECANCEL_1, "TSY: CMmPhoneTsy::GetServiceTableCancel");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceTableCancel");
     iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneGetServiceTable );
     ReqCompleted( aTsyReqHandle, KErrCancel );
 
@@ -5220,7 +5172,7 @@
 //
 TInt CMmPhoneTsy::SimRefreshRegisterL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SIMREFRESHREGISTERL_1,  "TSY: CMmPhoneTsy::SimRefreshRegisterL" );
+TFLOGSTRING( "TSY: CMmPhoneTsy::SimRefreshRegisterL" );
 
     TInt ret( KErrNone );
 
@@ -5239,7 +5191,7 @@
     if ( KErrNone != ret )
         {
         // the sending has failed
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SIMREFRESHREGISTERL_2,  "TSY: CMmPhoneTsy::SimRefreshRegisterL, Registration for Refresh failed" );
+TFLOGSTRING( "TSY: CMmPhoneTsy::SimRefreshRegisterL, Registration for Refresh failed" );
         }
 
     return ret;
@@ -5254,7 +5206,7 @@
 void CMmPhoneTsy::CompleteSimRefreshRegister(
      TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETESIMREFRESHREGISTER_1, "TSY: CMmPhoneTsy::CompleteSimRefreshRegisterL Error = %d", aErrorCode );
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteSimRefreshRegisterL Error = %d", aErrorCode );
 
 	if( KErrNone == aErrorCode )
 		{
@@ -5270,7 +5222,7 @@
 //
 TBool CMmPhoneTsy::GetSimRefreshRegister()
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSIMREFRESHREGISTER_1,  "TSY: CMmPhoneTsy::GetSimRefreshRegister iSimRefreshRegisterOk = %d", iSimRefreshRegisterOk );
+TFLOGSTRING2( "TSY: CMmPhoneTsy::GetSimRefreshRegister iSimRefreshRegisterOk = %d", iSimRefreshRegisterOk );
 
 	return iSimRefreshRegisterOk;		
     }
@@ -5285,7 +5237,7 @@
     {
 	if( KErrNone != aErrorCode)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEUPDATELIFETIMER_1, "TSY: CMmPhoneTsy::CompleteUpdateLifeTimer Error = %d", aErrorCode );
+		TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteUpdateLifeTimer Error = %d", aErrorCode );
 		}
     }    
 
@@ -5344,7 +5296,7 @@
 void CMmPhoneTsy::CompleteSimRefreshNowL(
     TUint16 aFilesToRefresh )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETESIMREFRESHNOWL_1, "TSY: CMmPhoneTsy::CompleteSimRefreshNowL filemask: %d", aFilesToRefresh);
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteSimRefreshNowL filemask: %d", aFilesToRefresh);
 
     // Set flag to indicate that refresh has started
     iRefreshOngoing = ETrue;
@@ -5394,13 +5346,13 @@
         //FDN requested? (FDN has the first priority)
         if( KCacheFdn & iSimCacheQueue )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_1,  "TSY: CMmPhoneTsy::CacheNextL - FDN" );
+TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - FDN" );
             pbRequested = KETelIccFdnPhoneBook;
             resetFlag = KCacheFdn;
             }
         else if( KCacheALSline & iSimCacheQueue )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_2,  "TSY: CMmPhoneTsy::CacheNextL - ALS" );
+TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - ALS" );
 			ResetMEAlsInfo();
 			pbRequested = KNullDesC;
 			cacheStarted = ETrue;
@@ -5408,7 +5360,7 @@
         //ADN requested?
         else if( KCacheAdn & iSimCacheQueue )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_3,  "TSY: CMmPhoneTsy::CacheNextL - ADN" );
+TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - ADN" );
             //NOTE: Here should be added the checking of FDN active state
             pbRequested = KETelIccAdnPhoneBook;
             resetFlag = KCacheAdn;
@@ -5417,7 +5369,7 @@
         //checked and the queue can be reset)
         else
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_4,  "TSY: CMmPhoneTsy::CacheNextL - Unknown" );
+TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - Unknown" );
             pbRequested = KNullDesC;
             resetFlag = iSimCacheQueue;
             }
@@ -5426,7 +5378,7 @@
         if( (pbRequested!=KNullDesC) && (iPBList) )
             {
             TInt numberOfPBooks = iPBList->GetNumberOfObjects();
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_5,  "TSY: CMmPhoneTsy::CacheNextL - Num Of PBs: %d", numberOfPBooks );
+TFLOGSTRING2( "TSY: CMmPhoneTsy::CacheNextL - Num Of PBs: %d", numberOfPBooks );
 
             //Browse through the phonebook names for the one required
             for( TInt i=0; i < numberOfPBooks; i++ )
@@ -5447,23 +5399,24 @@
                     	TRAP_IGNORE( MessageManager()->HandleRequestL( 
                             EMmTsyPhoneBookStoreCacheCancelIPC, &package ); );
 
-
+#if ( TF_LOGGING_METHOD > 0 )
                     	if ( pbRequested == KETelIccFdnPhoneBook ) 
                     	    {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_6,  "TSY: CMmPhoneTsy::CacheNextL - CancelCache for : KETelIccFdnPhoneBook" );
+TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - CancelCache for : KETelIccFdnPhoneBook" ); 
                             }
                     	else 
                     	    {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_7,  "TSY: CMmPhoneTsy::CacheNextL - CancelCache for : KETelIccAdnPhoneBook" );
+TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - CancelCache for : KETelIccAdnPhoneBook" ); 
                             }
+#endif // TF_LOGGING_METHOD
                     	}                   
                     // perform the various stages of phonebook 
                     // cache re-initialisation
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_8,  "TSY: CMmPhoneTsy::CacheNextL - Resetting cache.");
+TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - Resetting cache.");
                     pbStore->ResetCacheReady();
                     pbStore->ResetInitialisationStatus();
                     pbStore->ResetCache();
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_9,  "TSY: CMmPhoneTsy::CacheNextL -> Cache entries" );
+TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL -> Cache entries" );
                     pbStore->CacheEntriesL();
 
                     cacheStarted = ETrue;
@@ -5477,14 +5430,14 @@
         //so the file is removed from the cache queue
         if( !cacheStarted )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_10,  "TSY: CMmPhoneTsy::CacheNextL - No PB Could be found, or Unknown request" );
+TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - No PB Could be found, or Unknown request" );
             CompleteCacheSimL( resetFlag, ETrue ); //complete with error
             }
         }
     //more files in the queue?
     result = ( iSimCacheQueue )? ETrue : EFalse;
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_11,  "TSY: CMmPhoneTsy::CacheNextL: (Success/Fail = 1/0) %d",(TInt)result );
+TFLOGSTRING2( "TSY: CMmPhoneTsy::CacheNextL: (Success/Fail = 1/0) %d",(TInt)result );
     return result;
     }
 
@@ -5500,7 +5453,7 @@
     TUint8	aFileType,
     TBool	aReadError)
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESIML_1,  "TSY: CMmPhoneTsy::CompleteCacheSimL, FileType: 0x%x", aFileType );
+TFLOGSTRING2( "TSY: CMmPhoneTsy::CompleteCacheSimL, FileType: 0x%x", aFileType );
 
     TBool filesInCacheQueue(EFalse); //By default: "no more files in cache"
 
@@ -5536,7 +5489,7 @@
         }
      else
      	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESIML_2,  "TSY: CMmPhoneTsy::CompleteCacheSimL, caching still in progress." );
+TFLOGSTRING( "TSY: CMmPhoneTsy::CompleteCacheSimL, caching still in progress." );
      	}
     }
 
@@ -5549,7 +5502,7 @@
 void CMmPhoneTsy::NotifySimRefreshCompletionL(
     TBool aReadError )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYSIMREFRESHCOMPLETIONL_1,  "TSY: CMmPhoneTsy::NotifySimRefreshCompletionL error = %d",aReadError );
+TFLOGSTRING2( "TSY: CMmPhoneTsy::NotifySimRefreshCompletionL error = %d",aReadError );
 
     // Refresh is finished, update flag
     iRefreshOngoing = EFalse;
@@ -5575,7 +5528,7 @@
 TInt CMmPhoneTsy::ImsAuthenticationL( 
     TDes8* aAuthenticationData )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_IMSAUTHENTICATIONL_1, "TSY: CMmPhoneTsy::ImsAuthenticationL");
+TFLOGSTRING("TSY: CMmPhoneTsy::ImsAuthenticationL");
 
 	TInt ret = KErrServerBusy;
     
@@ -5628,7 +5581,7 @@
     CMmDataPackage* aDataPackage, 
     TInt aResult )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEIMSAUTHENTICATION_1, "TSY: CMmPhoneTsy::CompleteImsAuthentication");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteImsAuthentication");
 
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -5695,7 +5648,7 @@
 //
 TInt CMmPhoneTsy::ImsAuthenticationCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_IMSAUTHENTICATIONCANCEL_1, "TSY: CMmPhoneTsy::ImsAuthenticationCancel");
+TFLOGSTRING("TSY: CMmPhoneTsy::ImsAuthenticationCancel");
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodePhoneIMSAuthenticate );
@@ -5721,7 +5674,7 @@
 TInt CMmPhoneTsy::GetMailboxNumbersL(
     TDes8* aMailBox )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETMAILBOXNUMBERSL_1, "TSY: CMmPhoneTsy::GetMailboxNumbersL");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetMailboxNumbersL");
     TInt ret = KErrServerBusy;
     
     // Check if request handle already exists
@@ -5758,7 +5711,7 @@
                         found = ETrue;
                         if( !pbStore->IsPBInitDone() )
                             {
-                            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETMAILBOXNUMBERSL_2, "TSY: CMmPhoneTsy::GetMailboxNumbersL VoiceMailBox initilizing was not complete... Waiting for completion");
+                            TFLOGSTRING("TSY: CMmPhoneTsy::GetMailboxNumbersL VoiceMailBox initilizing was not complete... Waiting for completion");
                             iReqHandleType = EMultimodePhoneGetMailboxNumbers;
                             return KErrNone;
                             }
@@ -5766,7 +5719,7 @@
                     }
                 if(!found)
                     {
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETMAILBOXNUMBERSL_3, "TSY: CMmPhoneTsy::GetMailboxNumbersL VoiceMailBox should be created...");
+                    TFLOGSTRING("TSY: CMmPhoneTsy::GetMailboxNumbersL VoiceMailBox should be created...");
                     iMmPhoneBookStoreTsy = 
                         CMmPhoneBookStoreTsy::NewL( this, KETelIccVoiceMailBox );
                     
@@ -5806,7 +5759,7 @@
     CMmDataPackage* aDataPackage, 
     TInt aResult )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETMAILBOXNUMBERS_1, "TSY: CMmPhoneTsy::CompleteGetMailboxNumbers");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetMailboxNumbers");
 
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -5843,7 +5796,7 @@
 //
 TInt CMmPhoneTsy::GetMailboxNumbersCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETMAILBOXNUMBERSCANCEL_1, "TSY: CMmPhoneTsy::GetMailboxNumbersCancel");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetMailboxNumbersCancel");
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodePhoneGetMailboxNumbers );
@@ -5978,7 +5931,7 @@
     //Check if the object is the Phone object
     if( this == aObject )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_1, "TSY: CMmPhoneTsy::TimerExpired - this == aObject");
+TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - this == aObject");
         //call phone object to complete this request
         this->Complete( aReqHandleType, error );
         }
@@ -5989,14 +5942,14 @@
     //Check if the object is a Call object
     for ( i = 0; i < iCallList->GetNumberOfObjects(); i++ )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_2, "TSY: CMmPhoneTsy::TimerExpired - iCallList->GetNumberOfObjects()");
+TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iCallList->GetNumberOfObjects()");
         //Get call object
         CMmCallTsy* call = iCallList->GetMmCallByIndex( i );
         //check if the current call is the object that we are
         //trying to find
         if( call == aObject )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_3, "TSY: CMmPhoneTsy::TimerExpired - call == aObject");
+TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - call == aObject");
             //call the complete method
             call->Complete( aReqHandleType, error );
             //object found, break
@@ -6007,7 +5960,7 @@
     // Check if the object is a ConferenceCall object
     if ( iMmConferenceCall == aObject )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_4, "TSY: CMmPhoneTsy::TimerExpired - iMmConferenceCall");
+TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iMmConferenceCall");
         iMmConferenceCall->Complete( aReqHandleType, error );
         }
     //OTHER MODULES
@@ -6015,14 +5968,14 @@
     //Check if the object is a PBStore object
     for ( i = 0; i < iPBList->GetNumberOfObjects(); i++ )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_5, "TSY: CMmPhoneTsy::TimerExpired - iPBList->GetNumberOfObjects()");
+TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iPBList->GetNumberOfObjects()");
         //Get PBStore object
         CMmPhoneBookStoreTsy* pbStore = iPBList->GetMmPBByIndex( i );
         //check if the current PB is the object that we are
         //trying to find
         if ( pbStore == aObject )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_6, "TSY: CMmPhoneTsy::TimerExpired - aPBStore == aObject");
+TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - aPBStore == aObject");
             //call the complete method
 			pbStore->Complete( aReqHandleType, error );
             //object found, break
@@ -6033,41 +5986,41 @@
     // Check if the object is the SMS object
     if ( iMmSmsTsy == aObject )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_7, "TSY: CMmPhoneTsy::TimerExpired - iMmSmsTsy == aObject");
+TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iMmSmsTsy == aObject");
         //call the complete method
         iMmSmsTsy->Complete( aReqHandleType, error );
         }
     // Check if the object is the Broadcast object
     else if ( iMmBroadcastTsy == aObject )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_8, "TSY: CMmPhoneTsy::TimerExpired - iMmBroadcastTsy == aObject");
+TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iMmBroadcastTsy == aObject");
         //call the complete method
         iMmBroadcastTsy->Complete( aReqHandleType, error );
         }
     // Check if the object is the USSD object
     else if ( iMmUssdTsy == aObject )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_9, "TSY: CMmPhoneTsy::TimerExpired - iMmUssdTsy == aObject");
+TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iMmUssdTsy == aObject");
         //call the complete method
         iMmUssdTsy->Complete( aReqHandleType, error );
         }
     // Check if the object is the ONstore object
     else if ( iMmONStoreTsy == aObject )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_10, "TSY: CMmPhoneTsy::TimerExpired - iMmONStoreTsy == aObject");
+TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iMmONStoreTsy == aObject");
         //call the complete method
         iMmONStoreTsy->Complete( aReqHandleType, error );
         }
     // Check if the object is the ENstore object
     else if ( iMmENStoreTsy == aObject )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_11, "TSY: CMmPhoneTsy::TimerExpired - iMmENStoreTsy == aObject");
+TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iMmENStoreTsy == aObject");
         //call the complete method
         iMmENStoreTsy->Complete( aReqHandleType, error );
         }
     else if ( iMmCustomTsy == aObject )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_12, "TSY: CMmPhoneTsy::TimerExpired - iMmCustomTsy == aObject");
+TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iMmCustomTsy == aObject");
         iMmCustomTsy->Complete( aReqHandleType, error , aIPC );
         }
 
@@ -6079,13 +6032,13 @@
     // Data session
     else if ( NULL != iMmPacketServiceTsy )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_13, "TSY: CMmPhoneTsy::TimerExpired - NULL != iMmPacketServiceTsy");
+TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - NULL != iMmPacketServiceTsy");
         //call the complete method
         iMmPacketServiceTsy->Complete( aObject, aReqHandleType, error );
         }
     else
     	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_14, "TSY: CMmPhoneTsy::TimerExpired - else");
+TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - else");		
         }
     }
 
@@ -6121,10 +6074,6 @@
         case EMultimodePhoneTerminateAllCalls:
             timeOut = KMmPhoneTerminateAllCallsTimeOut;
             break;
-      // Active Calls Termination
-        case EMultimodePhoneTerminateActiveCalls:
-            timeOut = KMmPhoneTerminateActiveCallsTimeOut;
-            break;
       //NET
         case EMultimodePhoneSelectNetwork:
             timeOut = KMmPhoneSelectNetworkTimeOut;
@@ -6323,15 +6272,12 @@
 	RMobilePhone::TMobilePhoneServiceTableV1 emptyServiceTable;
 	RMobilePhoneStore::TMobilePhoneStoreInfoV1 emptyPhoneStoreInfo;
 	TInt trapError = KErrNone;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETE_1, "TSY: CMmPhoneTsy::Complete - ReqHandleType: %d", aReqHandleType);
+TFLOGSTRING2("TSY: CMmPhoneTsy::Complete - ReqHandleType: %d", aReqHandleType);	
     switch( aReqHandleType )
         {
         case EMultimodePhoneTerminateAllCalls:
         	CompleteTerminateAllCallsReq(aError);
         	break;
-        case EMultimodePhoneTerminateActiveCalls:
-            CompleteTerminateActiveCallsReq(aError);
-            break;
       //DTMF
         case EMultimodePhoneSendDTMFTones:
         case EMultimodePhoneStartDTMFTone:
@@ -6456,7 +6402,7 @@
             CompleteGetFdnStatus( NULL, aError );
             break;         
         default:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETE_2, "TSY: CMmPhoneTsy::Complete default handle type" );
+TFLOGSTRING("TSY: CMmPhoneTsy::Complete default handle type" );        
             if ( iTsyReqHandleStore->GetTsyReqHandle(
                     aReqHandleType ))
             	{
@@ -6541,7 +6487,7 @@
     const TTsyReqHandle aTsyReqHandle,
     const TInt aError  )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_REQCOMPLETED_1, "TSY: CMmPhoneTsy::Request Completed - Handle:%d Error:%d", aTsyReqHandle, aError);
+TFLOGSTRING3("TSY: CMmPhoneTsy::Request Completed - Handle:%d Error:%d", aTsyReqHandle, aError);
 
     CTelObject::ReqCompleted( aTsyReqHandle, aError );
 
@@ -6769,7 +6715,6 @@
     return iMmSecurityTsy;
     }
 
-
 // ---------------------------------------------------------------------------
 // CMmPhoneTsy::IsRequestPossibleInOffLine
 // Checks wether a ETel request can be performed or not while offline mode is
@@ -6899,7 +6844,7 @@
             break;
         }
 
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_ISREQUESTPOSSIBLEINOFFLINE_1, "TSY: CMmPhoneTsy::IsRequestPossibleInOffline - IPC:%d, ret:%d", aIpc, isRequestPossible);
+TFLOGSTRING3("TSY: CMmPhoneTsy::IsRequestPossibleInOffline - IPC:%d, ret:%d", aIpc, isRequestPossible);
     return isRequestPossible;
     }
 
@@ -6916,7 +6861,7 @@
     iCallForwardingNumber.Zero();
     aDataPackage->UnPackData( iCallForwardingNumber );
 
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETCALLFORWARDINGNUMBER_1, "TSY: CMmPhoneTsy::CompleteGetCallForwardingNumber number = %S ", iCallForwardingNumber);
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetCallForwardingNumber number = %S ", &iCallForwardingNumber);
 
     }
 
@@ -6930,7 +6875,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     TUint32* aIndex )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_ENUMERATEAPNENTRIESL_1, "TSY: CMmPhoneTsy::EnumerateAPNEntries");
+TFLOGSTRING("TSY: CMmPhoneTsy::EnumerateAPNEntries");
 
     // Check if request handle already exists
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( 
@@ -6982,7 +6927,7 @@
 //
 TInt CMmPhoneTsy::EnumerateAPNEntriesCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_ENUMERATEAPNENTRIESCANCEL_1, "CMmPhoneTsy::EnumerateAPNEntriesCancel");
+TFLOGSTRING("CMmPhoneTsy::EnumerateAPNEntriesCancel");
     iRetAPNEntries = NULL;
     
     //reset the req handle
@@ -7008,7 +6953,7 @@
     CMmDataPackage* aDataPackage, 
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEENUMERATEAPNENTRIES_1, "TSY: CMmPhoneTsy::CompleteEnumerateAPNEntries Error: %d", aErrorCode);
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteEnumerateAPNEntries Error: %d", aErrorCode);
 
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -7044,7 +6989,7 @@
     TUint32* aIndex, 
     TDes8* aAPN )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETAPNNAMEL_1, "TSY: CMmPhoneTsy::GetAPNnameL");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetAPNnameL");    
 
     TInt ret = KErrServerBusy;
     
@@ -7098,7 +7043,7 @@
 //
 TInt CMmPhoneTsy::GetAPNnameCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETAPNNAMECANCEL_1, "CMmPhoneTsy::GetAPNnameCancel");
+TFLOGSTRING("CMmPhoneTsy::GetAPNnameCancel");
     iRetAPNname = NULL;
     
     //reset the req handle
@@ -7124,7 +7069,7 @@
     CMmDataPackage* aDataPackage, 
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETAPNNAME_1, "TSY: CMmPhoneTsy::CompleteGetAPNname Error: %d", aErrorCode);
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetAPNname Error: %d", aErrorCode);
     
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -7166,7 +7111,7 @@
 void CMmPhoneTsy::SetAlsState( 
 	TBool aState )
 	{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SETALSSTATE_1, "TSY: CMmPhoneTsy::SetAlsState Error: %d", aState);
+TFLOGSTRING2("TSY: CMmPhoneTsy::SetAlsState Error: %d", aState);
 	
 	// Check where set was called
 	if( iCspFileAlsSet )
@@ -7203,7 +7148,7 @@
 RMobilePhone::TMobilePhoneALSLine CMmPhoneTsy::MapMEALSLine( 
 	TInt aAlsLineInfo )
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_MAPMEALSLINE_1, "TSY: CMmPhoneTsy::MapMEALSLine");
+TFLOGSTRING("TSY: CMmPhoneTsy::MapMEALSLine");
 
 	RMobilePhone::TMobilePhoneALSLine lineInfo;
 	
@@ -7211,23 +7156,23 @@
 		{
 		case 0://TInt from CentRep
 			lineInfo = RMobilePhone::EAlternateLinePrimary;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_MAPMEALSLINE_2, "TSY: CMmPhoneTsy::MapMEALSInfo Line line = EAlternateLinePrimary");
+TFLOGSTRING("TSY: CMmPhoneTsy::MapMEALSInfo Line line = EAlternateLinePrimary");
 			break;
 		case 1://TInt from CentRep
 			lineInfo = RMobilePhone::EAlternateLineAuxiliary;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_MAPMEALSLINE_3, "TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineAuxiliary");
+TFLOGSTRING("TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineAuxiliary");
 			break;
 		case 2://TInt from CentRep
 			lineInfo = RMobilePhone::EAlternateLineUnknown;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_MAPMEALSLINE_4, "TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineUnknown");
+TFLOGSTRING("TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineUnknown");
 			break;
 		case 3://TInt from CentRep
 			lineInfo = RMobilePhone::EAlternateLineNotAvailable;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_MAPMEALSLINE_5, "TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineNotAvailable");
+TFLOGSTRING("TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineNotAvailable");
 			break;
 		default:
 			lineInfo = RMobilePhone::EAlternateLineUnknown;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_MAPMEALSLINE_6, "TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineUnknown");
+TFLOGSTRING("TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineUnknown");
 			break;
 		}
 		
@@ -7243,13 +7188,13 @@
 void CMmPhoneTsy::ResetMEAlsInfo()
 	{
 	
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_RESETMEALSINFO_1, "TSY: CMmPhoneTsy::ResetMEAlsInfo");
+TFLOGSTRING("TSY: CMmPhoneTsy::ResetMEAlsInfo");
 	
 	iCentRep->Reset();
 	
 	if( iSimCacheQueue && ( KCacheALSline & iSimCacheQueue ) )
 	    { 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_RESETMEALSINFO_2, "TSY: CMmPhoneTsy::ResetMEAlsInfo -> CompleteCacheSimL");
+TFLOGSTRING("TSY: CMmPhoneTsy::ResetMEAlsInfo -> CompleteCacheSimL");
         // function can leave, so there for it must be trapped, the error 
         // value is ingnored, because the functionality doesn't depend on it
 	    TRAP_IGNORE( CompleteCacheSimL( KCacheALSline, EFalse ) );	
@@ -7265,7 +7210,7 @@
 //
 CRepository* CMmPhoneTsy::GetCfisCenRep()
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETCFISCENREP_1, "TSY: CMmPhoneTsy::GetCfisCenRep");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetCfisCenRep");
 
 	if( iCFISCentRep )
 		{
@@ -7283,7 +7228,7 @@
 //
 CRepository* CMmPhoneTsy::GetMwisCenRep()
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETMWISCENREP_1, "TSY: CMmPhoneTsy::GetMwisCenRep");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetMwisCenRep");
 
 	if( iMWISCentRep )
 		{
@@ -7301,7 +7246,7 @@
 //
 CRepository* CMmPhoneTsy::GetCfisPRCenRep()
 	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETCFISPRCENREP_1, "TSY: CMmPhoneTsy::GetCfisPRCenRep");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetCfisPRCenRep");
 
 	if( iCFISPrivateCentRep )
 		{
@@ -7319,7 +7264,7 @@
 //
 void CMmPhoneTsy::GetSubscriberIdForTSYL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSUBSCRIBERIDFORTSYL_1, "TSY: CMmPhoneTsy::GetSubscriberIdForTSYL");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetSubscriberIdForTSYL");
     
     // Check if some client has already requested this
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( 
@@ -7333,7 +7278,7 @@
         }
     else
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSUBSCRIBERIDFORTSYL_2, "TSY: CMmPhoneTsy::GetSubscriberIdForTSYL - Already requested");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetSubscriberIdForTSYL - Already requested");
         }
     }
 	
@@ -7346,7 +7291,7 @@
 TInt CMmPhoneTsy::AppendAPNNameL( 
     RMobilePhone::TAPNEntryV3* aAPNEntry )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_APPENDAPNNAMEL_1, "TSY: CMmPhoneTsy::AppendAPNNameL");
+TFLOGSTRING("TSY: CMmPhoneTsy::AppendAPNNameL");
 
     TInt ret ( KErrServerBusy );
 
@@ -7379,7 +7324,7 @@
 //
 TInt CMmPhoneTsy::AppendAPNNameCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_APPENDAPNNAMECANCEL_1, "TSY: CMmPhoneTsy::AppendAPNNameCancel");
+TFLOGSTRING("TSY: CMmPhoneTsy::AppendAPNNameCancel");
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodePhoneAppendAPNName );
@@ -7402,7 +7347,7 @@
 void CMmPhoneTsy::CompleteAppendAPNName( 
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEAPPENDAPNNAME_1, "TSY: CMmPhoneTsy::CompleteAppendAPNName. Error: %d", aErrorCode);
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteAppendAPNName. Error: %d", aErrorCode);
     
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodePhoneAppendAPNName );
@@ -7423,7 +7368,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     TUint32* aIndex )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_DELETEAPNNAMEL_1, "TSY: CMmPhoneTsy::DeleteAPNNameL, index = %d", aIndex);
+TFLOGSTRING2("TSY: CMmPhoneTsy::DeleteAPNNameL, index = %d", aIndex);
 
     // get the handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( 
@@ -7463,7 +7408,7 @@
 //
 TInt CMmPhoneTsy::DeleteAPNNameCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_DELETEAPNNAMECANCEL_1, "TSY: CMmPhoneTsy::DeleteAPNNameCancel");
+TFLOGSTRING("TSY: CMmPhoneTsy::DeleteAPNNameCancel");
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodePhoneDeleteAPNName );
@@ -7485,7 +7430,7 @@
 void CMmPhoneTsy::CompleteDeleteAPNName( 
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEDELETEAPNNAME_1, "TSY: CMmPhoneTsy::CompleteDeleteAPNName. Error: %d", aErrorCode);
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteDeleteAPNName. Error: %d", aErrorCode);
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodePhoneDeleteAPNName );
@@ -7505,7 +7450,7 @@
 //
 TInt CMmPhoneTsy::NotifyAPNListChanged()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYAPNLISTCHANGED_1, "TSY: CMmPhoneTsy::NotifyAPNListChanged");
+TFLOGSTRING("TSY: CMmPhoneTsy::NotifyAPNListChanged");
 
     iReqHandleType = EMultimodePhoneNotifyAPNListChange;
     
@@ -7521,7 +7466,7 @@
 //
 TInt CMmPhoneTsy::NotifyAPNListChangedCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYAPNLISTCHANGEDCANCEL_1, "TSY: CMmPhoneTsy::NotifyAPNListChangedCancel");
+TFLOGSTRING("TSY: CMmPhoneTsy::NotifyAPNListChangedCancel");
     
     TTsyReqHandle reqHandle = iTsyReqHandleStore->
         ResetTsyReqHandle( EMultimodePhoneNotifyAPNListChange );
@@ -7543,7 +7488,7 @@
 void CMmPhoneTsy::CompleteNotifyAPNListChanged( 
     TInt aErrorCode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYAPNLISTCHANGED_1, "TSY: CMmPhoneTsy::CompleteNotifyAPNListChanged");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyAPNListChanged");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodePhoneNotifyAPNListChange );
@@ -7565,7 +7510,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     RMobilePhone::TAPNControlListServiceStatus* aAPNControlListServiceStatus )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SETAPNCONTROLLISTSERVICESTATUSL_1, "TSY: CMmPhoneTsy::SetAPNControlListServiceStatusL.");
+TFLOGSTRING("TSY: CMmPhoneTsy::SetAPNControlListServiceStatusL.");
 
     iSetAclStatus = aAPNControlListServiceStatus;
     
@@ -7607,7 +7552,7 @@
 //
 TInt CMmPhoneTsy::SetAPNControlListServiceStatusCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SETAPNCONTROLLISTSERVICESTATUSCANCEL_1, "TSY: CMmPhoneTsy::SetAPNControlListServiceStatusCancel");
+TFLOGSTRING("TSY: CMmPhoneTsy::SetAPNControlListServiceStatusCancel");
     
     // erase pointer to client data
     iSetAclStatus = NULL;
@@ -7633,7 +7578,7 @@
 void CMmPhoneTsy::CompleteSetAPNControlListServiceStatus( 
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETESETAPNCONTROLLISTSERVICESTATUS_1, "TSY: CMmPhoneTsy::CompleteSetAPNControlListServiceStatus. Error: %d", aErrorCode);
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteSetAPNControlListServiceStatus. Error: %d", aErrorCode);
 
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -7656,7 +7601,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     RMobilePhone::TAPNControlListServiceStatus* aAPNControlListServiceStatus )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETAPNCONTROLLISTSERVICESTATUSL_1, "TSY: CMmPhoneTsy::GetAPNControlListServiceStatusL");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetAPNControlListServiceStatusL");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( 
         EMultimodePhoneGetAPNControlListServiceStatus );
@@ -7697,7 +7642,7 @@
 //
 TInt CMmPhoneTsy::GetAPNControlListServiceStatusCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETAPNCONTROLLISTSERVICESTATUSCANCEL_1, "TSY: CMmPhoneTsy::GetAPNControlListServiceStatusCancel");
+TFLOGSTRING("TSY: CMmPhoneTsy::GetAPNControlListServiceStatusCancel");
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodePhoneGetAPNControlListServiceStatus );
@@ -7720,7 +7665,7 @@
     CMmDataPackage* aDataPackage, 
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETAPNCONTROLLISTSERVICESTATUS_1, "TSY: CMmPhoneTsy::CompleteGetAPNControlListServiceStatus. Error %d", aErrorCode);
+TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetAPNControlListServiceStatus. Error %d", aErrorCode);
     
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodePhoneGetAPNControlListServiceStatus );
@@ -7759,7 +7704,7 @@
 TInt CMmPhoneTsy::NotifyAPNControlListServiceStatusChange( 
     RMobilePhone::TAPNControlListServiceStatus* aAPNControlListServiceStatus )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYAPNCONTROLLISTSERVICESTATUSCHANGE_1, "TSY: CMmPhoneTsy::NotifyAPNControlListServiceStatusChange");
+TFLOGSTRING("TSY: CMmPhoneTsy::NotifyAPNControlListServiceStatusChange");
     
     iRetNotifyAclStatus = aAPNControlListServiceStatus;
     iReqHandleType = EMultimodePhoneNotifyAPNControlListServiceStatusChange;
@@ -7776,7 +7721,7 @@
 //
 TInt CMmPhoneTsy::NotifyAPNControlListServiceStatusChangeCancel()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYAPNCONTROLLISTSERVICESTATUSCHANGECANCEL_1, "TSY: CMmPhoneTsy::NotifyAPNControlListServiceStatusChangeCancel");
+TFLOGSTRING("TSY: CMmPhoneTsy::NotifyAPNControlListServiceStatusChangeCancel");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodePhoneNotifyAPNControlListServiceStatusChange );
@@ -7801,7 +7746,7 @@
     CMmDataPackage* aDataPackage, 
     TInt aErrorCode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYAPNCONTROLLISTSERVICESTATUSCHANGE_1, "TSY: CMmPhoneTsy::CompleteNotifyAPNControlListServiceStatusChange");
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyAPNControlListServiceStatusChange");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
         EMultimodePhoneNotifyAPNControlListServiceStatusChange );
@@ -7887,7 +7832,8 @@
     CMmDataPackage dataPackage;
     dataPackage.PackData( &duration );
 
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYCALLDURATIONCHANGE_1, "TSY: CMmPhoneTsy::CompleteNotifyCallDurationChange - \duration: %d", duration);
+    TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteNotifyCallDurationChange - \
+         duration: %d", duration);
 
 #ifdef USING_CTSY_DISPATCHER	
     TRAP_IGNORE(iMessageManager->HandleRequestL( 
@@ -7905,16 +7851,16 @@
 // Receives error notifications from Telephony audio control
 // ---------------------------------------------------------------------------
 //
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#if TF_LOGGING_METHOD == 1
 void CMmPhoneTsy::NotifyTelephonyAudioControlError( const TName& aCallName, 
                                                     const TInt& aError )
     {       
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYTELEPHONYAUDIOCONTROLERROR_1, "TSY: CMmPhoneTsy::NotifyAudioControlError. Call name:%S, Error code %d", aCallName, aError );
+    TFLOGSTRING3("TSY: CMmPhoneTsy::NotifyAudioControlError. Call name:%S, Error code %d", &aCallName, aError );
 #else
 void CMmPhoneTsy::NotifyTelephonyAudioControlError( const TName& /*aCallName*/, 
                                                     const TInt& /*aError*/ )
     {
-#endif // 
+#endif // TF_LOGGING_METHOD
     
     TInt callCount( iCallList->GetNumberOfObjects() );
     // find all the audio calls and hang up them all
@@ -7941,8 +7887,8 @@
 //    
 void CMmPhoneTsy::SetPBInitActiveStatus( TBool aIsInitializationActive )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SETPBINITACTIVESTATUS_1, "TSY: CMmPhoneTsy::SetPBInitActiveStatus: - prev.status %u", (TUint)iIsInitializationActive);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SETPBINITACTIVESTATUS_2, "TSY: CMmPhoneTsy::SetPBInitActiveStatus: %u", (TUint)aIsInitializationActive);
+TFLOGSTRING2("TSY: CMmPhoneTsy::SetPBInitActiveStatus: - prev.status %i", iIsInitializationActive);    
+TFLOGSTRING2("TSY: CMmPhoneTsy::SetPBInitActiveStatus: %i", aIsInitializationActive);
     
     iIsInitializationActive = aIsInitializationActive;
     }
@@ -7955,7 +7901,7 @@
 //    
 TBool CMmPhoneTsy::IsPBInitActive()
     {   
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_ISPBINITACTIVE_1, "TSY: CMmPhoneTsy::IsPBInitActive: %x", (TUint)iIsInitializationActive);
+TFLOGSTRING2("TSY: CMmPhoneTsy::IsPBInitActive: %i", iIsInitializationActive);
     
     return iIsInitializationActive;
     }
@@ -7988,7 +7934,7 @@
 //
 TBool CMmPhoneTsy::IsSIMReady()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_ISSIMREADY_1, "TSY: CMmPhoneTsy::IsSIMReady: %u", (TUint)iBootState.iSIMReady);
+	TFLOGSTRING2("TSY: CMmPhoneTsy::IsSIMReady: %i", iBootState.iSIMReady);
 	return iBootState.iSIMReady;
 	}
 
@@ -8000,7 +7946,7 @@
 //   
 void CMmPhoneTsy::SaveFdnInfoDetails( TInt aResult, CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SAVEFDNINFODETAILS_1, "TSY: CMmPhoneTsy::SaveFdnInfoDetails aResult:  %d", aResult );
+TFLOGSTRING2("TSY: CMmPhoneTsy::SaveFdnInfoDetails aResult:  %d", aResult );
 
    // Store FDN info only in successfull case
     if ( KErrNone == aResult )
@@ -8011,9 +7957,9 @@
        iPhoneBookState->iFDNNumberLengthMax = pbFdnInfo.iFDNNumberLengthMax;
        iPhoneBookState->iFDNTextLengthMax = pbFdnInfo.iFDNTextLengthMax;
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SAVEFDNINFODETAILS_2, "TSY: CMmPhoneTsy::SaveFdnInfoDetails - iFDNNumOfEntries: %d",iPhoneBookState->iFDNNumOfEntries );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SAVEFDNINFODETAILS_3, "TSY: CMmPhoneTsy::SaveFdnInfoDetails - iFDNNumberLengthMax: %d",iPhoneBookState->iFDNNumberLengthMax );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SAVEFDNINFODETAILS_4, "TSY: CMmPhoneTsy::SaveFdnInfoDetails - iFDNTextLengthMax: %d",iPhoneBookState->iFDNTextLengthMax );
+TFLOGSTRING2("TSY: CMmPhoneTsy::SaveFdnInfoDetails - iFDNNumOfEntries: %i",iPhoneBookState->iFDNNumOfEntries );
+TFLOGSTRING2("TSY: CMmPhoneTsy::SaveFdnInfoDetails - iFDNNumberLengthMax: %i",iPhoneBookState->iFDNNumberLengthMax );
+TFLOGSTRING2("TSY: CMmPhoneTsy::SaveFdnInfoDetails - iFDNTextLengthMax: %i",iPhoneBookState->iFDNTextLengthMax );
        }
     }
 
@@ -8025,7 +7971,7 @@
 //    
 TBool CMmPhoneTsy::IsModemStatusReady() const
     {   
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_ISMODEMSTATUSREADY_1, "TSY: CMmPhoneTsy::IsModemStatusReady: %u", (TUint)iIsModemReady );
+TFLOGSTRING2("TSY: CMmPhoneTsy::IsModemStatusReady: %i", iIsModemReady );
     
     return iIsModemReady;
     }
@@ -8038,7 +7984,7 @@
 //    
 void CMmPhoneTsy::PhoneBookStoreInitCompleteL(TInt aError)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_PHONEBOOKSTOREINITCOMPLETEL_1, "TSY: CMmPhoneTsy::PhoneBookStoreInitCompleteL ");
+    TFLOGSTRING("TSY: CMmPhoneTsy::PhoneBookStoreInitCompleteL ");
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(
         EMultimodePhoneGetMailboxNumbers );   
     if( EMultimodePhoneReqHandleUnknown != reqHandle )

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsywithdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsywithdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -15,11 +15,6 @@
 
 #ifdef USING_CTSY_DISPATCHER
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmphonetsywithdispatcherTraces.h"
-#endif
-
 /**
  * This file contains additional function definitions for the CMmPhoneTsy class
  * in CTSY for use when the CTSY is used with the CTSY Dispatcher.
@@ -57,11 +52,11 @@
 			iPhoneIdentity.iSerialNumber.Copy(aPhoneId.iSerialNumber);
 			}
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID1_1, "TSY: CMmPhoneTsy::CompleteGetPhoneId :");
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID1_2, "Manufacturer: %S,", iPhoneIdentity.iManufacturer);
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID1_3, "Model: %S,", iPhoneIdentity.iModel);
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID1_4, "Revision: %S,", iPhoneIdentity.iRevision);
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID1_5, "SerialNumber: %S", iPhoneIdentity.iSerialNumber);
+TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetPhoneId :");
+TFLOGSTRING2("				Manufacturer: %S,", &iPhoneIdentity.iManufacturer);
+TFLOGSTRING2("				Model: %S,", &iPhoneIdentity.iModel);
+TFLOGSTRING2("				Revision: %S,", &iPhoneIdentity.iRevision);
+TFLOGSTRING2("				SerialNumber: %S", &iPhoneIdentity.iSerialNumber);
         }
 
     //reset req handle. Returns the deleted req handle

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -16,12 +16,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmsecuritytsyTraces.h"
-#endif
-
 #include "cmmsecuritytsy.h"
 #include "cmmphonetsy.h"
 #include "cmmtsyreqhandlestore.h"
@@ -36,7 +30,7 @@
 CMmSecurityTsy* CMmSecurityTsy::NewL(    
         CMmPhoneTsy* aPhoneTsy ) // Ptr to PhoneTsy   
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_NEWL_1, "TSY: CMmSecurityTsy::NewL");
+TFLOGSTRING("TSY: CMmSecurityTsy::NewL");
     CMmSecurityTsy* const mmSecurityTsy = new ( ELeave ) CMmSecurityTsy();
     CleanupStack::PushL( mmSecurityTsy );
     mmSecurityTsy->iMmPhoneTsy = aPhoneTsy;
@@ -52,7 +46,7 @@
 
 void CMmSecurityTsy::ConstructL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_CONSTRUCTL_1, "TSY: CMmSecurityTsy::ConstructL");
+TFLOGSTRING("TSY: CMmSecurityTsy::ConstructL");
     // Is security codes (PIN and phone password) checked in boot
     iSecurityCheckedForBoot = EFalse;
 
@@ -78,7 +72,7 @@
       
 CMmSecurityTsy::~CMmSecurityTsy()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_DTOR_1, "TSY: CMmSecurityTsy::~CMmSecurityTsy");
+TFLOGSTRING("TSY: CMmSecurityTsy::~CMmSecurityTsy");
     }  
     
 // ---------------------------------------------------------------------------
@@ -92,7 +86,7 @@
     const TInt aIpc, 
     const TDataPackage& aPackage ) 
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_DOEXTFUNCL_1, "TSY: CMmSecurityTsy::DoExtFuncL.\n  \t\t\t IPC:%d\n  \t\t\t Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmSecurityTsy::DoExtFuncL.\n  \t\t\t IPC:%d\n  \t\t\t Handle:%d", aIpc, aTsyReqHandle);
 
     TInt ret ( KErrNone );
 
@@ -294,9 +288,9 @@
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
-TInt CMmSecurityTsy::GetLockInfoL( const TTsyReqHandle aTsyReqHandle, const TDataPackage& aPackage )
+TInt CMmSecurityTsy::GetLockInfoL( const TTsyReqHandle aTsyReqHandle, const TDataPackage& aPackage ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_GETLOCKINFOL_1, "LTSY: CMmSecurityTsy::GetLockInfoL - Client call");
+TFLOGSTRING("LTSY: CMmSecurityTsy::GetLockInfoL - Client call");
     
     TInt ret ( KErrArgument );
     
@@ -337,7 +331,7 @@
     RMobilePhone::TMobilePhoneLock* aLock, 
     TDes8* aLockInfo ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_NOTIFYLOCKINFOCHANGE_1, "LTSY: CMmSecurityTsy::NotifyLockInfoChange - Lock: %d", aLock);
+TFLOGSTRING2("LTSY: CMmSecurityTsy::NotifyLockInfoChange - Lock: %d", aLock);
     
     TInt ret( KErrNone );
     
@@ -368,7 +362,7 @@
 TInt CMmSecurityTsy::NotifyLockInfoChangeCancel(
     const TTsyReqHandle aTsyReqHandle ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_NOTIFYLOCKINFOCHANGECANCEL_1, "LTSY: CMmSecurityTsy::NotifyLockInfoChangeCancel");
+TFLOGSTRING("LTSY: CMmSecurityTsy::NotifyLockInfoChangeCancel");
     
     iRetNotifyLockInfoChange = NULL;
     iRetNotifyPhoneLockChange = NULL;
@@ -435,7 +429,7 @@
     const TTsyReqHandle aTsyReqHandle,    
     const TDataPackage& aPackage ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_SETLOCKSETTINGL_1, "LTSY: CMmSecurityTsy::SetLockSettingL - Client call" );
+TFLOGSTRING("LTSY: CMmSecurityTsy::SetLockSettingL - Client call" );
 
     TInt ret( KErrNone );
 
@@ -507,7 +501,8 @@
         reinterpret_cast<RMobilePhone::TMobilePhoneLockSetting* >
         ( aPackage.Ptr2() );
 
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_LOCKSETTINGL_1, "LTSY: CMmSecurityTsy::LockSetting - Lock:%d, Setting:%d",*lock, *setting );
+TFLOGSTRING3("LTSY: CMmSecurityTsy::LockSetting - Lock:%d, Setting:%d",
+    *lock, *setting );
 
     // Some SIM cards might not support PIN1 disable. Thus
     // return error if client tries to disable it.
@@ -552,7 +547,7 @@
                     event = RMobilePhone::EUniversalPinRequired;
                     if ( RMobilePhone::ELockReplaced == *setting )
                         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_LOCKSETTINGL_2, "TSY: CMmSecurityTsy::LockSetting RMobilePhone::ELockReplaced");
+TFLOGSTRING("TSY: CMmSecurityTsy::LockSetting RMobilePhone::ELockReplaced");
                         iActiveCodeToUpinState = EActiveCodeToUpinAskUpin;
                         }
                     break;
@@ -613,7 +608,7 @@
     RMobilePhone::TMobilePhoneLockStatus, 
     RMobilePhone::TMobilePhoneLockSetting ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETESETLOCKSETTING_1, "LTSY: CMmSecurityTsy::CompleteSetLockSetting - Error:%d", aErrorCode);
+TFLOGSTRING2("LTSY: CMmSecurityTsy::CompleteSetLockSetting - Error:%d", aErrorCode);
 
     TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->
         ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneSetLockSetting );
@@ -676,7 +671,7 @@
 TInt CMmSecurityTsy::CompleteChangeSecurityCode(
     TInt aErrorCode ) // Error code
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETECHANGESECURITYCODE_1, "TSY: CMmSecurityTsy::CompleteChangeSecurityCode - Error:%d", aErrorCode);
+    TFLOGSTRING2("TSY: CMmSecurityTsy::CompleteChangeSecurityCode - Error:%d", aErrorCode);
 
 
     TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->
@@ -713,7 +708,7 @@
     // Thus this is the only way to get the information in boot.
     if  ( iSecurityCheckedForBoot == EFalse )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_NOTIFYSECURITYEVENTL_1,  "TSY: CMmSecurityTsy::NotifySecurityEvent - Checking PIN state");
+TFLOGSTRING( "TSY: CMmSecurityTsy::NotifySecurityEvent - Checking PIN state");
         // We can't do anything if sending fails. If this happens,
         // then every send to IsaApi should fail.
         (void)iMmPhoneTsy->iMmPhoneExtInterface->GetICCTypeL();
@@ -724,7 +719,7 @@
     if ( iIsSecurityCodeRequestCachedInBoot  && 
          !iMmPhoneTsy->iBootState.iSecReady  )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_NOTIFYSECURITYEVENTL_2,  "TSY: CMmSecurityTsy::NotifySecurityEventL - Completing security code event");
+TFLOGSTRING( "TSY: CMmSecurityTsy::NotifySecurityEventL - Completing security code event");
 
         CompleteNotifySecurityEventL( RMobilePhone::EPhonePasswordRequired,
             KErrNone );
@@ -767,13 +762,14 @@
     RMobilePhone::TMobilePhoneSecurityEvent aEvent, 
     TInt aErrorCode ) 
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETENOTIFYSECURITYEVENTL_1, "TSY: CMmSecurityTsy::CompleteNotifySecurityEvent - Event: %d, Error: %d",aEvent, aErrorCode );
+TFLOGSTRING3("TSY: CMmSecurityTsy::CompleteNotifySecurityEvent - Event: %d, Error: %d",
+    aEvent, aErrorCode );
 
 	if ( iLastPinRequested != EPinUnknown && 
 		( RMobilePhone::EPin1Verified == aEvent ) || 
 		( RMobilePhone::EPin2Verified == aEvent ) )
 		{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETENOTIFYSECURITYEVENTL_2,  "TSY: CMmSecurityTsy::CompleteNotifySecurityEvent - iLastPinRequested != EPinUnknown");
+TFLOGSTRING( "TSY: CMmSecurityTsy::CompleteNotifySecurityEvent - iLastPinRequested != EPinUnknown");
     	iLastPinRequested = EPinUnknown;
         }
 
@@ -809,7 +805,7 @@
                !iIsSecurityCodeRequestCachedInBoot  )
 
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETENOTIFYSECURITYEVENTL_3, "TSY: CMmSecurityTsy::CompleteNotifySecurityEvent - Caching event");
+TFLOGSTRING("TSY: CMmSecurityTsy::CompleteNotifySecurityEvent - Caching event");
             iIsSecurityCodeRequestCachedInBoot = ETrue;
             }
 
@@ -966,12 +962,12 @@
 
         if ( RMobilePhone::ESecurityCodePin1 == *type )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL_1, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN VERIFY REQUESTED");
+TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN VERIFY REQUESTED");
             iLastPinRequested = EPin1Requested;
             }
         if ( RMobilePhone::ESecurityCodePin2 == *type )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL_2, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN2 VERIFY REQUESTED");
+TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN2 VERIFY REQUESTED");
             iLastPinRequested = EPin2Requested;
             }
         //This is to prevent unnecessary PIN1 request after PUK code 
@@ -980,14 +976,14 @@
                ( RMobilePhone::ESecurityCodePuk2 == *type ) ) &&  
                ( 0 < codes->iUnblockCode.Length() ) )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL_3, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PUK VERIFY REQUESTED");
+TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PUK VERIFY REQUESTED");
             iPukCodeVerify = ETrue;
             }
         //This is to prevent unnecessary PIN1 request after phone password
         //request (PYRA-5UBCLC)
         if ( RMobilePhone::ESecurityCodePhonePassword == *type )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL_4, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PHONE PASSWORD VERIFY REQUESTED");
+TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PHONE PASSWORD VERIFY REQUESTED");
             iPhonePasswordVerify = ETrue;
             }
         iMmPhoneTsy->iMmPhoneExtInterface->DeliverCode( *codes );
@@ -1080,7 +1076,7 @@
 void CMmSecurityTsy::CompleteVerifySecurityCodeL(
         TInt aErrorCode ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_1, "TSY: CMmSecurityTsy::CompleteVerifySecurityCode - Error:%d", aErrorCode);
+TFLOGSTRING2("TSY: CMmSecurityTsy::CompleteVerifySecurityCode - Error:%d", aErrorCode);
 
     TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->
         ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneVerifySecurityCode );
@@ -1117,7 +1113,7 @@
             // IF PIN1 REQUESTED LAST
             if ( iLastPinRequested == EPin1Requested )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_2, "TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN VERIFICATION NEEDED");
+TFLOGSTRING("TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN VERIFICATION NEEDED");
             	CompleteNotifySecurityEventL( RMobilePhone::EPin1Required,
                 KErrNone );
             	iLastPinRequested = EPinUnknown;
@@ -1125,7 +1121,7 @@
             // IF PIN2 REQUESTED LAST
             if (iLastPinRequested == EPin2Requested)
             	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_3, "TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN2");
+TFLOGSTRING("TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN2");
             	iLastPinRequested = EPinUnknown;
             	}
             }
@@ -1133,7 +1129,7 @@
                   phoneSetLockSettingHandle && EActiveCodeToUpinAskUpin == 
                                                       iActiveCodeToUpinState )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_4, "TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - iActiveCodeToUpinState = EActiveCodeToUpinAskPin");
+TFLOGSTRING("TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - iActiveCodeToUpinState = EActiveCodeToUpinAskPin");
             if ( KErrNone == aErrorCode )
                 {
                 iActiveCodeToUpinState = EActiveCodeToUpinAskPin;
@@ -1266,7 +1262,7 @@
 void CMmSecurityTsy::CompleteAbortSecurityCode(
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEABORTSECURITYCODE_1, "TSY: CMmSecurityTsy::CompleteAbortSecurityCode - Error:%d", aErrorCode);
+TFLOGSTRING2("TSY: CMmSecurityTsy::CompleteAbortSecurityCode - Error:%d", aErrorCode);
 
     TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->
         ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneAbortSecurityCode );
@@ -1299,7 +1295,7 @@
     CMmDataPackage* aDataPackage, 
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEGETLOCKINFO_1, "LTSY: CMmSecurityTsy::CompleteGetLockInfo - Error:%d", aErrorCode);
+TFLOGSTRING2("LTSY: CMmSecurityTsy::CompleteGetLockInfo - Error:%d", aErrorCode);
 
     TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->
         ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneGetLockInfo );
@@ -1365,7 +1361,7 @@
     RMobilePhone::TMobilePhoneSecurityCode* aSecurityCode, 
     TDes8* aSecurityCodeInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_GETSECURITYCODEINFOL_1, "TSY: CMmSecurityTsy::GetSecurityCodeInfoL");
+TFLOGSTRING("TSY: CMmSecurityTsy::GetSecurityCodeInfoL");
 
     TInt ret( KErrNone );
     
@@ -1482,7 +1478,7 @@
     CMmDataPackage* aDataPackage, 
     TInt aErrorCode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEGETSECURITYCODEINFO_1, "TSY: CMmSecurityTsy::CompleteGetSecurityCodeInfo");
+TFLOGSTRING("TSY: CMmSecurityTsy::CompleteGetSecurityCodeInfo");
 
 	RMobilePhone::TMobilePhoneSecurityCode* securityCode;
 	RMobilePhone::TMobilePhoneSecurityCodeInfoV5* securityCodeInfoV5;
@@ -1528,7 +1524,7 @@
 TInt CMmSecurityTsy::GetSecurityCodeInfoCancel( 
     TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_GETSECURITYCODEINFOCANCEL_1, "TSY: CMmSecurityTsy::GetSecurityCodeInfoCancel");
+TFLOGSTRING("TSY: CMmSecurityTsy::GetSecurityCodeInfoCancel");
 
 	RMobilePhone::TMobilePhoneSecurityCode secCode = RMobilePhone::ESecurityCodePin1;
 	TBool reqHandleExist = EFalse;
@@ -1653,7 +1649,7 @@
     RMobilePhone::TMobilePhoneSecurityCode* aSecurityCode, 
     TDes8* aSecurityCodeInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_NOTIFYSECURITYCODEINFOCHANGE_1, "TSY: CMmSecurityTsy::NotifySecurityCodeInfoChange");
+TFLOGSTRING("TSY: CMmSecurityTsy::NotifySecurityCodeInfoChange");
 
     TInt ret( KErrNone );
 
@@ -1683,7 +1679,7 @@
     CMmDataPackage* aDataPackage, 
     TInt aErrorCode )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETENOTIFYSECURITYCODEINFOCHANGE_1, "TSY: CMmSecurityTsy::CompleteNotifySecurityCodeInfoChange");
+TFLOGSTRING("TSY: CMmSecurityTsy::CompleteNotifySecurityCodeInfoChange");
 
     TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->
         ResetTsyReqHandle( 
@@ -1727,7 +1723,7 @@
 TInt CMmSecurityTsy::NotifySecurityCodeInfoChangeCancel( 
     TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_NOTIFYSECURITYCODEINFOCHANGECANCEL_1, "TSY: CMmSecurityTsy::NotifySecurityCodeInfoChangeCancel");
+TFLOGSTRING("TSY: CMmSecurityTsy::NotifySecurityCodeInfoChangeCancel");
 
     iRetNotifySecurityCodeInfo = NULL;
     iRetNotifySecurityCode = NULL;

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsywithdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsywithdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -21,12 +21,6 @@
  */
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmsecuritytsywithdispatcherTraces.h"
-#endif
-
 #include "cmmsecuritytsy.h"
 #include "cmmphonetsy.h"
 #include "cmmtsyreqhandlestore.h"
@@ -75,12 +69,12 @@
             {
             if ( RMobilePhone::ESecurityCodePin1 == *type )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL1_1, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN VERIFY REQUESTED");
+TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN VERIFY REQUESTED");
 				iLastPinRequested = EPin1Requested;
 				}
 			if ( RMobilePhone::ESecurityCodePin2 == *type )
 				{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL1_2, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN2 VERIFY REQUESTED");
+TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN2 VERIFY REQUESTED");
 				iLastPinRequested = EPin2Requested;
                 }
             //This is to prevent unnecessary PIN1 request after PUK code 
@@ -89,14 +83,14 @@
                    ( RMobilePhone::ESecurityCodePuk2 == *type ) ) &&  
                    ( 0 < codes->iUnblockCode.Length() ) )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL1_3, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PUK VERIFY REQUESTED");
+TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PUK VERIFY REQUESTED");
                 iPukCodeVerify = ETrue;
                 }
             //This is to prevent unnecessary PIN1 request after phone password
             //request (PYRA-5UBCLC)
             if ( RMobilePhone::ESecurityCodePhonePassword == *type )
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL1_4, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PHONE PASSWORD VERIFY REQUESTED");
+TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PHONE PASSWORD VERIFY REQUESTED");
                 iPhonePasswordVerify = ETrue;
                 }
             iMmPhoneTsy->iMmPhoneExtInterface->DeliverCode( *codes );
@@ -165,7 +159,7 @@
 void CMmSecurityTsy::CompleteVerifySecurityCodeL(
         TInt aErrorCode ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_1, "TSY: CMmSecurityTsy::CompleteVerifySecurityCode - Error:%d", aErrorCode);
+TFLOGSTRING2("TSY: CMmSecurityTsy::CompleteVerifySecurityCode - Error:%d", aErrorCode);
 
     TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->
         ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneVerifySecurityCode );
@@ -202,7 +196,7 @@
 			// IF PIN1 REQUESTED LAST
 			if ( iLastPinRequested == EPin1Requested )
 				{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_2, "TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN VERIFICATION NEEDED");
+TFLOGSTRING("TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN VERIFICATION NEEDED");
 				CompleteNotifySecurityEventL( RMobilePhone::EPin1Required,
 						KErrNone );
 				iLastPinRequested = EPinUnknown;
@@ -210,7 +204,7 @@
 			// IF PIN2 REQUESTED LAST
 			if (iLastPinRequested == EPin2Requested)
 				{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_3, "TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN2");
+TFLOGSTRING("TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN2");
 				iLastPinRequested = EPinUnknown;
 				}
             }
@@ -218,7 +212,7 @@
                   phoneSetLockSettingHandle && EActiveCodeToUpinAskUpin == 
                                                       iActiveCodeToUpinState )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_4, "TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - iActiveCodeToUpinState = EActiveCodeToUpinAskPin");
+TFLOGSTRING("TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - iActiveCodeToUpinState = EActiveCodeToUpinAskPin");
             if ( KErrNone == aErrorCode )
                 {
                 iActiveCodeToUpinState = EActiveCodeToUpinAskPin;

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsupplservtsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsupplservtsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,13 +16,8 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmsupplservtsyTraces.h"
-#endif
-
 #include "cmmsupplservtsy.h"
+#include <ctsy/tflogger.h> 
 
 // include internal Tsy classes
 #include "cmmphonetsy.h"
@@ -712,7 +707,7 @@
                 }
             else
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETEGETCALLFORWARDINGSTATUSPHASE1L_1, "TSY: CMmSupplServTsy::CompleteGetCallForwardingStatusPhase1L: No response received.");
+TFLOGSTRING("TSY: CMmSupplServTsy::CompleteGetCallForwardingStatusPhase1L: No response received.");
                 aErrorCode = KErrNotFound;
                 }
             }
@@ -892,7 +887,7 @@
     if ( !cancelSetCallForwardingStatus )
         {
         // Cancellation called although request is not going on
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETCALLFORWARDINGSTATUSCANCEL_1, "TSY: CMmSupplServTsy::SetCallForwardingStatusCancel - KErrServerBusy");
+        TFLOGSTRING("TSY: CMmSupplServTsy::SetCallForwardingStatusCancel - KErrServerBusy");
         iMmPhone->ReqCompleted( aTsyReqHandle, KErrServerBusy );
         }
     else
@@ -1127,7 +1122,7 @@
                 }
             else
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETEGETCALLBARRINGSTATUSPHASE1L_1, "TSY: CMmSupplServTsy::CompleteGetCallBarringStatusPhase1L: No response received.");
+TFLOGSTRING("TSY: CMmSupplServTsy::CompleteGetCallBarringStatusPhase1L: No response received.");
                 aErrorCode = KErrNotFound;
                 }
             }
@@ -1247,7 +1242,7 @@
         //The request is already in processing because of previous request
         //Complete request with status value informing the client about 
         //the situation.
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETCALLBARRINGSTATUSCANCEL_1, "TSY: CMmPhoneTsy::SetCallBarringStatusCancel - KErrServerBusy");
+        TFLOGSTRING("TSY: CMmPhoneTsy::SetCallBarringStatusCancel - KErrServerBusy");
         iMmPhone->ReqCompleted( aTsyReqHandle, KErrServerBusy );
         }
     else
@@ -1348,11 +1343,14 @@
         RMobilePhone::TMobilePhonePasswordChangeV2& ssPassword = 
             ( *ssPasswordPckg )();
 
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETSSPASSWORDL_1, "TSY: CMmSupplServTsy::SetSSPassword - SS service: %d", *aSsService );
+        TFLOGSTRING2("TSY: CMmSupplServTsy::SetSSPassword - SS service: %d", 
+            *aSsService );
 
-        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETSSPASSWORDL_2, "TSY: CMmSupplServTsy::SetSSPassword - Old PW: %S", ssPassword.iOldPassword );
+        TFLOGSTRING2("TSY: CMmSupplServTsy::SetSSPassword - Old PW: %S", 
+            &ssPassword.iOldPassword );
 
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETSSPASSWORDL_3, "TSY: CMmSupplServTsy::SetSSPassword - New PW: %S, Verify PW: %S", ssPassword.iNewPassword, ssPassword.iVerifiedPassword );
+        TFLOGSTRING3("TSY: CMmSupplServTsy::SetSSPassword - New PW: %S, Verify PW: %S", 
+            &ssPassword.iNewPassword, &ssPassword.iVerifiedPassword );
 
         // Packed parameters: TMobilePhonePasswordChangeV2 and TUint16
         TUint16 ssServiceUnsigned = static_cast<TUint16>( *aSsService );
@@ -1415,7 +1413,7 @@
         //The request is already in processing because of previous request
         //Complete request with status value informing the client about 
         //the situation.
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETSSPASSWORDCANCEL_1, "TSY: CMmSupplServTsy::SetSSPasswordCancel - KErrServerBusy");
+        TFLOGSTRING("TSY: CMmSupplServTsy::SetSSPasswordCancel - KErrServerBusy");
         iMmPhone->ReqCompleted( aTsyReqHandle, KErrServerBusy );
         }
     else
@@ -1577,7 +1575,7 @@
                 }
             else
                 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETEGETCALLWAITINGSTATUSPHASE1L_1, "TSY: CMmSupplServTsy::CompleteGetCallWaitingStatusPhase1L: No response received.");
+TFLOGSTRING("TSY: CMmSupplServTsy::CompleteGetCallWaitingStatusPhase1L: No response received.");
                 aErrorCode = KErrNotFound;
                 }
             }
@@ -1676,7 +1674,7 @@
         //The request is already in processing because of previous request
         //Complete request with status value informing the client about 
         //the situation.
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETCALLWAITINGSTATUSCANCEL_1, "TSY: CMmSupplServTsy::SetCallWaitingStatusCancel - KErrServerBusy");
+        TFLOGSTRING("TSY: CMmSupplServTsy::SetCallWaitingStatusCancel - KErrServerBusy");
         iMmPhone->ReqCompleted( aTsyReqHandle, KErrServerBusy );
         }
     else
@@ -1873,7 +1871,7 @@
     const TDesC* aServiceString )
     {
     TInt ret = KErrNone;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SENDNETWORKSERVICEREQUESTL_1, "TSY: CMmSupplServTsy::SendNetworkServiceRequestL: iSsNoFdnCheckFlag: %d", iSsNoFdnCheckFlag);
+TFLOGSTRING2("TSY: CMmSupplServTsy::SendNetworkServiceRequestL: iSsNoFdnCheckFlag: %d", iSsNoFdnCheckFlag);       
     if ( iSsTransactionOngoing )
 	    {
 	    ret = KErrServerBusy;
@@ -1957,7 +1955,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     RMobilePhone::TMobilePhoneMessageWaitingV1* aMessageWaiting )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_1, "TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL");
+TFLOGSTRING("TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL");
     
     // check if parameter is correct type of class
     if ( KETelExtMultimodeV1 != aMessageWaiting->ExtensionId() )
@@ -1978,7 +1976,7 @@
             {
             TInt ret( KErrNone );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_2, "TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL, MWIS supported:%d", iMessageWaitingSupportedByIcc );
+TFLOGSTRING2("TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL, MWIS supported:%d", iMessageWaitingSupportedByIcc );
 
 			if (iMmPhone->IsSIMReady())
 				{
@@ -2012,7 +2010,7 @@
 			        ret = ReadIccMessageWaitingIndicatorsFromCentRep( 
 			            iMessageWaiting );
 			        
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_3, "TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL, Error during the reading from CentRep:%d", ret);
+			TFLOGSTRING2("TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL, Error during the reading from CentRep:%d", ret);
 				
 				   	if ( KErrNone == ret )
 				   		{
@@ -2034,7 +2032,7 @@
 			}
 			else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_4, "TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL - save reqHandle to queue");
+			TFLOGSTRING("TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL - save reqHandle to queue");
 			// Save reqHandle to queue for completion
 			TMwisInfoRequest* req = new (ELeave) TMwisInfoRequest();
 			req->iReqHandle = aTsyReqHandle;
@@ -2057,7 +2055,7 @@
     RMobilePhone::TMobilePhoneMessageWaitingV1* aMessageWaiting, 
     TInt aErrorCode )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_1, "TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, bootup=%d, Error: %d", iGetIccSupportAtBoot, aErrorCode );
+TFLOGSTRING3("TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, bootup=%d, Error: %d", iGetIccSupportAtBoot, aErrorCode );
              
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle(
@@ -2085,7 +2083,7 @@
             }
         else 
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_2, "TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, NOT supported by SIM" );
+TFLOGSTRING("TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, NOT supported by SIM" );
             SetIccSupportForMWIS( EFalse );
             
             // read the data from the Central Repository
@@ -2096,7 +2094,7 @@
         // Go through the request queue and complete same information to all reguests
         for ( TInt i = 0; i < iMwisInfoRequests.Count(); i++ )
         	{
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_3, "TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, Going throw request queue" );
+        	TFLOGSTRING("TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, Going throw request queue" );
         	TMwisInfoRequest* req = iMwisInfoRequests[ i ];
         	//set value in client side
         	*(req->iMwisInfo) = iMessageWaiting;
@@ -2126,7 +2124,7 @@
             iMessageWaiting.iDisplayStatus = aMessageWaiting->iDisplayStatus;
             aErrorCode = iMwisCentRep->Set( KCtsyMessageWaitingDisplayStatus, 
                 aMessageWaiting->iDisplayStatus );
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_4, "TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, CPHS bootup, status=%d, error=%d ", aMessageWaiting->iDisplayStatus, aErrorCode );
+TFLOGSTRING3("TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, CPHS bootup, status=%d, error=%d ", aMessageWaiting->iDisplayStatus, aErrorCode );
             }
         else
             {
@@ -2145,12 +2143,12 @@
 TInt CMmSupplServTsy::GetIccMessageWaitingIndicatorsCancel( 
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSCANCEL_1, "TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsCancel");
+TFLOGSTRING("TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsCancel");
     
 	//reset the req handle if only one req remains
 	if( 1 == iMwisInfoRequests.Count() )
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSCANCEL_2, "TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsCancel - one req");
+		TFLOGSTRING("TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsCancel - one req");
 		TTsyReqHandle reqHandle = iMmPhone->
 		iTsyReqHandleStore->ResetTsyReqHandle(
 				CMmPhoneTsy::EMultimodePhoneGetIccMessageWaitingIndicators);
@@ -2158,7 +2156,7 @@
 	// qo through array if several requests and find correct reqhandle to cancel
 	for ( TInt i = 0; i < iMwisInfoRequests.Count(); i++ )
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSCANCEL_3, "TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsCancel - queued requests");
+		TFLOGSTRING("TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsCancel - queued requests");
 		TMwisInfoRequest* req = iMwisInfoRequests[ i ];
 		if( aTsyReqHandle == req->iReqHandle  )
 			{
@@ -2182,13 +2180,13 @@
     const TTsyReqHandle aTsyReqHandle, 
     TDes8* aParams )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSL_1, "TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsL");
+TFLOGSTRING("TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsL");
     
     TInt ret( KErrNone ); 
 
     if ( sizeof( RMobilePhone::TMobilePhoneMessageWaitingV1 ) > aParams->MaxLength() )
 	  	{
-	  	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSL_2, "TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsL bad size argument");
+	  	TFLOGSTRING ("TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsL bad size argument");
 	  	// Complete the request with appropiate error        
         ret = KErrArgument;
 	  	}
@@ -2202,7 +2200,7 @@
             CMmPhoneTsy::EMultimodePhoneGetIccMessageWaitingIndicators ) ) )
         {
         
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSL_3, "TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsL, MWIS supported:%d",iMessageWaitingSupportedByIcc );
+TFLOGSTRING2("TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsL, MWIS supported:%d",iMessageWaitingSupportedByIcc );
     
         RMobilePhone::TMobilePhoneMessageWaitingV1Pckg* paramsPckgV1 = 
             reinterpret_cast<RMobilePhone::TMobilePhoneMessageWaitingV1Pckg*>( aParams );
@@ -2260,7 +2258,7 @@
 void CMmSupplServTsy::CompleteSetIccMessageWaitingIndicators( 
     TInt aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETESETICCMESSAGEWAITINGINDICATORS_1, "TSY: CMmSupplServTsy::CompleteSetIccMessageWaitingIndicators, Error: %d", aErrorCode );
+TFLOGSTRING2("TSY: CMmSupplServTsy::CompleteSetIccMessageWaitingIndicators, Error: %d", aErrorCode );    
    
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle(
@@ -2284,7 +2282,7 @@
             }
         else
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETESETICCMESSAGEWAITINGINDICATORS_2, "TSY: CMmSupplServTsy::CompleteSetIccMessageWaitingIndicators, not supported by SIM" );
+TFLOGSTRING("TSY: CMmSupplServTsy::CompleteSetIccMessageWaitingIndicators, not supported by SIM" );
             SetIccSupportForMWIS( EFalse );
             
             // reset error value, return possible cenrep error value
@@ -2306,7 +2304,7 @@
     // So go through the request queue and complete all the request.
     for ( TInt i = 0; i < iMwisInfoRequests.Count(); i++ )
     	{
-    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETESETICCMESSAGEWAITINGINDICATORS_3, "TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, Going throw request queue" );
+    	TFLOGSTRING("TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, Going throw request queue" );
     	TMwisInfoRequest* req = iMwisInfoRequests[ i ];
     	//set value in client side
     	*(req->iMwisInfo) = iMessageWaiting;
@@ -2327,7 +2325,7 @@
 TInt CMmSupplServTsy::SetIccMessageWaitingIndicatorsCancel( 
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSCANCEL_1, "TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsCancel");
+TFLOGSTRING("TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsCancel");
     
     // As cancel is called, the client memory address pointed to is no longer 
     // valid -> NULL it
@@ -2348,7 +2346,7 @@
 TInt CMmSupplServTsy::NotifyIccMessageWaitingIndicatorsChange( 
     RMobilePhone::TMobilePhoneMessageWaitingV1* aMessageWaiting )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_NOTIFYICCMESSAGEWAITINGINDICATORSCHANGE_1, "TSY: CMmSupplServTsy::NotifyIccMessageWaitingIndicatorsChangeL");
+TFLOGSTRING("TSY: CMmSupplServTsy::NotifyIccMessageWaitingIndicatorsChangeL");
     
     TInt ret( KErrNone );
     
@@ -2379,7 +2377,7 @@
     RMobilePhone::TMobilePhoneMessageWaitingV1* aMessageWaiting,
     TInt& aErrorCode )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETENOTIFYICCMESSAGEWAITINGINDICATORCHANGE_1, "TSY: CMmSupplServTsy::CompleteNotifyIccMessageWaitingIndicatorChange, error:%d", aErrorCode );
+TFLOGSTRING2("TSY: CMmSupplServTsy::CompleteNotifyIccMessageWaitingIndicatorChange, error:%d", aErrorCode );
     
     if ( IsMwisInfoChanged( *aMessageWaiting ) )
         {
@@ -2401,7 +2399,7 @@
             if ( aMessageWaiting->iDisplayStatus != 
                 iMessageWaiting.iDisplayStatus )
                 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETENOTIFYICCMESSAGEWAITINGINDICATORCHANGE_2, "TSY: CMmSupplServTsy::CompleteNotifyIccMessageWaitingIndicatorChange, CPHS information changed status=%d ", aMessageWaiting->iDisplayStatus);
+TFLOGSTRING2("TSY: CMmSupplServTsy::CompleteNotifyIccMessageWaitingIndicatorChange, CPHS information changed status=%d ", aMessageWaiting->iDisplayStatus);
                 // update only CPHS supported information
                 iMessageWaiting.iDisplayStatus = 
                     aMessageWaiting->iDisplayStatus;
@@ -2440,7 +2438,7 @@
 TInt CMmSupplServTsy::NotifyIccMessageWaitingIndicatorChangeCancel( 
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_NOTIFYICCMESSAGEWAITINGINDICATORCHANGECANCEL_1, "TSY: CMmSupplServTsy::NotifyIccMessageWaitingIndicatorChangeCancel");
+TFLOGSTRING("TSY: CMmSupplServTsy::NotifyIccMessageWaitingIndicatorChangeCancel");
     
     // Null the pointer to client-side data
     iRetNotifyMessageWaiting = NULL;  
@@ -2459,7 +2457,7 @@
 //
 void CMmSupplServTsy::SetIccSupportForMWIS( TBool aSupport )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETICCSUPPORTFORMWIS_1, "TSY: CMmSupplServTsy::SetIccSupportForMWIS, support%d ", aSupport );
+TFLOGSTRING2("TSY: CMmSupplServTsy::SetIccSupportForMWIS, support%d ", aSupport );
     
     iMessageWaitingSupportedByIcc = aSupport; 
     }
@@ -2473,7 +2471,7 @@
 TInt CMmSupplServTsy::ReadIccMessageWaitingIndicatorsFromCentRep( 
     RMobilePhone::TMobilePhoneMessageWaitingV1& aMessageWaiting )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_READICCMESSAGEWAITINGINDICATORSFROMCENTREP_1, "TSY: CMmSupplServTsy::ReadIccMessageWaitingIndicatorsFromCentRep");
+TFLOGSTRING("TSY: CMmSupplServTsy::ReadIccMessageWaitingIndicatorsFromCentRep");
     
     TInt retval( KErrNone );
     TInt tempVal( 0 );
@@ -2528,32 +2526,32 @@
 TInt CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep( 
     const RMobilePhone::TMobilePhoneMessageWaitingV1& aMessageWaiting )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_1, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep");
+TFLOGSTRING("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep");
     
     TInt retval( KErrNone );
 	
 	// Write new values to the central repository       
     retval = iMwisCentRep->Set( KCtsyMessageWaitingDisplayStatus, 
         aMessageWaiting.iDisplayStatus );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_2, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iDisplayStatus:%u", aMessageWaiting.iDisplayStatus );
+TFLOGSTRING2("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iDisplayStatus:%u", aMessageWaiting.iDisplayStatus );            
     retval = iMwisCentRep->Set( KCtsyMessageWaitingVoiceMailCount,
         aMessageWaiting.iVoiceMsgs );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_3, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iVoiceMsgs:%u", aMessageWaiting.iVoiceMsgs );
+TFLOGSTRING2("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iVoiceMsgs:%u", aMessageWaiting.iVoiceMsgs );            
     retval = iMwisCentRep->Set( KCtsyMessageWaitingAuxLineCount,
         aMessageWaiting.iAuxVoiceMsgs );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_4, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iAuxVoiceMsgs:%u", aMessageWaiting.iAuxVoiceMsgs );
+TFLOGSTRING2("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iAuxVoiceMsgs:%u", aMessageWaiting.iAuxVoiceMsgs );            
     retval = iMwisCentRep->Set( KCtsyMessageWaitingDataCount,
         aMessageWaiting.iDataMsgs );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_5, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iDataMsgs:%u", aMessageWaiting.iDataMsgs );
+TFLOGSTRING2("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iDataMsgs:%u", aMessageWaiting.iDataMsgs );            
     retval = iMwisCentRep->Set( KCtsyMessageWaitingFaxCount,
         aMessageWaiting.iFaxMsgs );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_6, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iFaxMsgs:%u", aMessageWaiting.iFaxMsgs );
+TFLOGSTRING2("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iFaxMsgs:%u", aMessageWaiting.iFaxMsgs );            
     retval = iMwisCentRep->Set( KCtsyMessageWaitingEmailCount,
         aMessageWaiting.iEmailMsgs );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_7, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iEmailMsgs:%u", aMessageWaiting.iEmailMsgs );
+TFLOGSTRING2("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iEmailMsgs:%u", aMessageWaiting.iEmailMsgs );            
     retval = iMwisCentRep->Set( KCtsyMessageWaitingOtherMessageCount,
         aMessageWaiting.iOtherMsgs );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_8, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iOtherMsgs:%u", aMessageWaiting.iOtherMsgs );
+TFLOGSTRING2("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iOtherMsgs:%u", aMessageWaiting.iOtherMsgs );            
 
     return retval;
     }
@@ -2567,7 +2565,7 @@
 TBool CMmSupplServTsy::IsMwisInfoChanged( 
     const RMobilePhone::TMobilePhoneMessageWaitingV1& aNewMessageWaiting )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_ISMWISINFOCHANGED_1, "TSY: CMmSupplServTsy::IsMwisInfoChanged");
+TFLOGSTRING("TSY: CMmSupplServTsy::IsMwisInfoChanged");
     
     TBool retval( ETrue ); 
     
@@ -2617,11 +2615,11 @@
     const RMobilePhone::TMobilePhoneNotifySendSSOperation* aOperation,
     TDes8* aSendSSRequestPckg )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_NOTIFYSENDNETWORKSERVICEREQUEST_1, "TSY: CMmSupplServTsy::NotifySendNetworkServiceRequest" );
+TFLOGSTRING("TSY: CMmSupplServTsy::NotifySendNetworkServiceRequest" );
  
 	if(sizeof(RMobilePhone::TMobilePhoneSendSSRequestV3) > aSendSSRequestPckg->MaxLength())
 		{
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_NOTIFYSENDNETWORKSERVICEREQUEST_2, "TSY: CMmNetTsy::NotifySendNetworkServiceRequest Bad size argument");
+	    TFLOGSTRING ("TSY: CMmNetTsy::NotifySendNetworkServiceRequest Bad size argument");
 	    // Complete the request with appropiate error        
 	    return KErrArgument;
 		}
@@ -2650,7 +2648,7 @@
 void CMmSupplServTsy::CompleteSendNetworkServiceRequestInd(
     TInt aErrorCode, CMmDataPackage* aDataPackage  )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETESENDNETWORKSERVICEREQUESTIND_1, "TSY: CMmSupplServTsy::CompleteSendNetworkServiceRequestInd. Error: %d", aErrorCode );
+TFLOGSTRING2("TSY: CMmSupplServTsy::CompleteSendNetworkServiceRequestInd. Error: %d", aErrorCode );
   
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -2697,7 +2695,7 @@
 TInt CMmSupplServTsy::NotifySendNetworkServiceRequestCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_NOTIFYSENDNETWORKSERVICEREQUESTCANCEL_1, "TSY: CMmSupplServTsy::NotifySendNetworkServiceRequestCancel");
+TFLOGSTRING("TSY: CMmSupplServTsy::NotifySendNetworkServiceRequestCancel");
 
     // Clear data pointers        
 	iRetSSDataPtrIndRequest = NULL;
@@ -2722,7 +2720,7 @@
     RMobilePhone::TMobilePhoneNotifySendSSOperation* aOperation,
     TDes8* aRequestComplete )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_NOTIFYALLSENDNETWORKSERVICEREQUEST_1, "TSY: CMmSupplServTsy::NotifyAllSendNetworkRequest" );
+TFLOGSTRING("TSY: CMmSupplServTsy::NotifyAllSendNetworkRequest" );
  
     TPckg<RMobilePhone::TMobilePhoneSendSSRequestV3>* ssDataPckg = 
         reinterpret_cast<TPckg<RMobilePhone::TMobilePhoneSendSSRequestV3>*>
@@ -2755,7 +2753,7 @@
 void CMmSupplServTsy::CompleteNotifyAllSendNetworkServiceRequest(
     TInt aErrorCode, CMmDataPackage* aDataPackage  )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETENOTIFYALLSENDNETWORKSERVICEREQUEST_1, "TSY: CMmSupplServTsy::CompleteNotifyAllSendNetworkRequest. Error: %d", aErrorCode );
+TFLOGSTRING2("TSY: CMmSupplServTsy::CompleteNotifyAllSendNetworkRequest. Error: %d", aErrorCode );
    
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -2789,7 +2787,7 @@
 TInt CMmSupplServTsy::NotifyAllSendNetworkServiceRequestCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_NOTIFYALLSENDNETWORKSERVICEREQUESTCANCEL_1, "TSY: CMmSupplServTsy::NotifyAllSendNetworkServiceRequestCancel");
+TFLOGSTRING("TSY: CMmSupplServTsy::NotifyAllSendNetworkServiceRequestCancel");   
 
     // Clear data pointers        
     iRetSSOperationPtr = NULL;
@@ -2813,7 +2811,7 @@
 //
 void CMmSupplServTsy::SetIccMwisBootUpFlag( TBool aBootUp )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETICCMWISBOOTUPFLAG_1, "TSY: CMmSupplServTsy::SetIccMwisBootUpFlag, aBootUp=%d", aBootUp );
+TFLOGSTRING2("TSY: CMmSupplServTsy::SetIccMwisBootUpFlag, aBootUp=%d", aBootUp );
 
     iGetIccSupportAtBoot = aBootUp;
     }

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicecalltsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicecalltsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmvoicecalltsyTraces.h"
-#endif
-
 #include "cmmvoicecalltsy.h"
 
 #include <featmgr/featurecontrol.h>
@@ -57,7 +51,7 @@
     CMmMessageManagerBase* aMessageManager,
     MTelephonyAudioControl* aTelephonyAudioControl )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_NEWL_1, "TSY: CMmVoiceCallTsy::NewL. Call name: %S", aName);
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::NewL. Call name: %S", &aName);
 
     CMmVoiceCallTsy* mmCall = NULL;
 
@@ -84,7 +78,7 @@
 
 CMmVoiceCallTsy::~CMmVoiceCallTsy()
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DTOR_1, "TSY: CMmVoiceCallTsy::~CMmVoiceCallTsy. Call deleted iCallId:%d iCallName:%S", iCallId, iCallName);
+TFLOGSTRING3("TSY: CMmVoiceCallTsy::~CMmVoiceCallTsy. Call deleted iCallId:%d iCallName:%S", iCallId, &iCallName);
     }
 
 
@@ -124,7 +118,7 @@
     const TInt aIpc,
     const TDataPackage& aPackage )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DOEXTFUNCL_1, "TSY: CMmVoiceCallTsy::DoExtFuncL. IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmVoiceCallTsy::DoExtFuncL. IPC:%d Handle:%d", aIpc, aTsyReqHandle);
 
     TInt ret( KErrNone );
 
@@ -272,7 +266,7 @@
 CTelObject::TReqMode CMmVoiceCallTsy::ReqModeL(
     const TInt aIpc )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_REQMODEL_1, "TSY: CMmVoiceCallTsy::ReqModeL. IPC:%d",aIpc);
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::ReqModeL. IPC:%d",aIpc); 
 
     CTelObject::TReqMode ret( 0 ); // default return value
     
@@ -516,7 +510,7 @@
     const TInt aIpc,
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_CANCELSERVICE_1, "TSY: CMmVoiceCallTsy::CancelService. IPC: %d, Req handle: %d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmVoiceCallTsy::CancelService. IPC: %d, Req handle: %d", aIpc, aTsyReqHandle); 
 
     TInt ret( KErrNone );
 
@@ -637,8 +631,8 @@
         callDataPackage->GetCallIdAndMode( callId, callMode ); 
         callDataPackage->UnPackData( callStatus );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_1, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. aResult:%d", aResult );
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_2, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. Call status:%d Call name:%S", callStatus, iCallName);
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. aResult:%d", aResult ); 
+TFLOGSTRING3("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. Call status:%d Call name:%S", callStatus, &iCallName); 
 
         TTsyReqHandle holdHandle = 
             iTsyReqHandleStore->GetTsyReqHandle( EMultimodeMobileCallHold );
@@ -670,7 +664,7 @@
                         if( call->IsEmergencyCall() )
                             {
                             numberOfEmergencyCalls++;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_3, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. numberOfEmergencyCalls:%d", numberOfEmergencyCalls );
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. numberOfEmergencyCalls:%d", numberOfEmergencyCalls );                             
                             }
                         }
 
@@ -712,11 +706,11 @@
                         {
                         iTelephonyAudioControl->CallStateChange(
                         iCallName, RMobileCall::EStatusDisconnecting );
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_4, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. Call routing state changed to EStatusDisconnecting: Call name:%S", iCallName );
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. Call routing state changed to EStatusDisconnecting: Call name:%S", &iCallName );   
                         }
                     iTelephonyAudioControl->TeardownTelephonyAudio(
                     iCallName, aResult );
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_5, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. Call routing teared down: Call name:%S", iCallName);
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. Call routing teared down: Call name:%S", &iCallName);   
                     iTelephonyAudioControlSetup = EFalse;
                     }
 
@@ -743,7 +737,7 @@
                         CompleteHangUp( aResult );
                         CompleteAnswerIncomingCall( aResult );
                         }
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_6, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - CompleteDial's called");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - CompleteDial's called");                          
                     CompleteDial( aResult );
                     CompleteDialNoFdn( aResult );
                     CompleteDialEmergencyCall( aResult );
@@ -753,7 +747,7 @@
                 // hanging.
                 else
                     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_7, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - Try to complete Dial and HangUp");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - Try to complete Dial and HangUp");                      
                     iLastExitCode = KErrGeneral;
                     TInt errorValue = CMmCommonStaticUtility::EpocErrorCode( 
                         KErrNotReady, KErrNotFound );
@@ -799,7 +793,7 @@
                 if ( KETelExt3rdPartyV1 != GetExtensionId() )
                     {
                     //non 3rd party client
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_8, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - StopTimeOuts");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - StopTimeOuts");                    	                    
                     iTsyReqHandleStore->StopTimeout( EMultimodeCallDial );
                     iTsyReqHandleStore->StopTimeout(
                     EMultimodeMobileCallDialEmergencyCall );
@@ -809,7 +803,7 @@
                 else
                     {
                     //3rd party client
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_9, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - StopTimeOut EMultimodeCallDialISV");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - StopTimeOut EMultimodeCallDialISV");                    	                    
                     iTsyReqHandleStore->StopTimeout( EMultimodeCallDialISV );
                     }
 #endif // REQHANDLE_TIMER
@@ -840,28 +834,28 @@
 
                     if ( 0 < dialCancelHandle ) 
                         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_10, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDial");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDial");                        
                         HangUp( dialCancelHandle );
                         }
                     else if ( 0 < dialCancelHandleISV )
                         {
                         //3rd party client
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_11, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDialISV");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDialISV");
                         HangUp( dialCancelHandleISV );
                         }
                     else if ( 0 < dialEmergCancelHandle )
                         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_12, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeMobileCallDialEmergencyCall");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeMobileCallDialEmergencyCall");                        
                         HangUp( dialEmergCancelHandle );
                         }
 					else if ( 0 < dialCancelHandleNoFdn )
                         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_13, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDialNoFdn");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDialNoFdn");
                         HangUp( dialCancelHandleNoFdn );
                         }  
                     else
                         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_14, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - iDialCancelFlag = CMmCallTsy::EDialCancelNotCalled");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - iDialCancelFlag = CMmCallTsy::EDialCancelNotCalled");                        
                         iDialCancelFlag = CMmCallTsy::EDialCancelNotCalled;
                         }
                     }
@@ -896,7 +890,7 @@
                         // it with CALL_CAUSE_NOT_ALLOWED    
                         if( RCall::EStatusAnswering == call->Status() )
                             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_15, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange Answering not allowed!");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange Answering not allowed!");                    
                             TInt errorValue = 
                                 CMmCommonStaticUtility::EpocErrorCode( 
                                    KErrAccessDenied, KErrMMEtelCallForbidden );
@@ -906,7 +900,7 @@
                     }
                 
                 //check previous status. If status is answering
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_16, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - EStatusConnected");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - EStatusConnected");
                 if ( RCall::EStatusAnswering == iCallStatus )
                     {  
                 	// don't start timers if error occurred
@@ -944,13 +938,13 @@
                         || ( iTsyReqHandleStore->GetTsyReqHandle( 
                             EMultimodeCallDialISV ) ) )
                         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_17, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange.EStatusConnected - Before CompleteDial");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange.EStatusConnected - Before CompleteDial");                        
                         CompleteDial( aResult ); 
                         }
                      if( iTsyReqHandleStore->GetTsyReqHandle( 
                             EMultimodeCallDialNoFdnCheck ) )
                         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_18, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange.EStatusConnected - Before CompleteDialNoFdn");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange.EStatusConnected - Before CompleteDialNoFdn");                        
                         CompleteDialNoFdn( aResult );                                                 
 
                         }
@@ -1010,13 +1004,13 @@
                     {
                     if(  KMultimodeCallTypeIDNoFdnCheck == GetDialTypeId() )
                    	    {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_19, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnecting - Before CompleteDialNoFdn");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnecting - Before CompleteDialNoFdn");                   	    
                    	    //CompleteDialNoFdn in case remote user is busy
                         CompleteDialNoFdn( aResult );
                    	    }
                     else
                         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_20, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnecting - Before CompleteDial");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnecting - Before CompleteDial");                        
                         //CompleteDial in case remote user is busy
                         CompleteDial( aResult );
                         }                   	    
@@ -1050,13 +1044,13 @@
                 
                 if(  KMultimodeCallTypeIDNoFdnCheck == GetDialTypeId() )
                    	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_21, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnectingWithInband - Before CompleteDialNoFdn");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnectingWithInband - Before CompleteDialNoFdn");                   	                       	
                    	//CompleteDialNoFdn in case remote user is busy
                     CompleteDialNoFdn( aResult );
                    	}
                 else
                     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_22, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnectingWithInband - Before  CompleteDial");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnectingWithInband - Before  CompleteDial");                   	                        
                     //CompleteDial in case remote user is busy
                     CompleteDial( aResult );        
                     }
@@ -1210,7 +1204,7 @@
     const TDesC8* aCallParams,
     TDesC* aTelNumber )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_1, "TSY: CMmVoiceCallTsy::Dial. Req handle: %u, Call name: %S", aTsyReqHandle, iCallName);
+TFLOGSTRING3("TSY: CMmVoiceCallTsy::Dial. Req handle: %d, Call name: %S", aTsyReqHandle, &iCallName);
 
     TBool isDialISV = iIsDialISV;
     iIsDialISV = EFalse;
@@ -1219,7 +1213,7 @@
 		{
 		if ( sizeof( RMobileCall::TCallParams ) > aCallParams->Length() )
 			{
-	      	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_2, "TSY: CMmVoiceCallTsy::Dial bad size argument");
+	      	TFLOGSTRING ("TSY: CMmVoiceCallTsy::Dial bad size argument");
 	      	// Complete the request with appropiate error        
 	      	return KErrArgument;
 	      	}
@@ -1297,7 +1291,7 @@
         
         if ( KETelExt3rdPartyV1 == extensionId && !isDialISV )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_3, "TSY: CMmVoiceCallTsy::Dial - KErrArgument");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::Dial - KErrArgument");
             //Complete the request with appropiate error
             ReqCompleted ( aTsyReqHandle, KErrArgument );
             SetDialFlag( EFalse ); 
@@ -1305,7 +1299,7 @@
 
         else if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo() )  
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_4, "TSY: Offline mode ON, Dial request is not allowed" );
+TFLOGSTRING("TSY: Offline mode ON, Dial request is not allowed" );
             ret = CMmCommonStaticUtility::EpocErrorCode(
                 KErrGeneral, KErrGsmOfflineOpNotAllowed );
 
@@ -1321,7 +1315,7 @@
             //is still in use.
             //Complete request with status value informing the client about 
             //the situation.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_5, "TSY: CMmVoiceCallTsy::Dial - KErrNotReady");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::Dial - KErrNotReady");
             ReqCompleted( aTsyReqHandle, KErrNotReady );
             SetDialFlag( EFalse );
             }
@@ -1332,7 +1326,7 @@
             //The request is already processing because of previous request
             //Complete request with status value informing the client about 
             //the situation.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_6, "TSY: CMmVoiceCallTsy::Dial - KErrServerBusy");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::Dial - KErrServerBusy");
             ReqCompleted( aTsyReqHandle, KErrServerBusy );
             SetDialFlag( EFalse );
             }
@@ -1341,7 +1335,7 @@
             && ( KETelExt3rdPartyV1 != activeCall->GetExtensionId() ) )
             {
             //a 3rd party client call cannot put on Hold a "normal" call
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_7, "TSY: CMmVoiceCallTsy::Dial - KErrServerBusy");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::Dial - KErrServerBusy");
             ReqCompleted( aTsyReqHandle, KErrServerBusy );
             SetDialFlag( EFalse );
             }
@@ -1351,11 +1345,11 @@
         else if ( extensionId == KETelExt3rdPartyV1 && 
                                         !i3rdPartyEmergencyNumberCheckDone )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_8, "TSY: CMmVoiceCallTsy::Dial - For 3rd party client number check must be done every time ");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::Dial - For 3rd party client number check must be done every time ");
             
             TInt ret( KErrGeneral );
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_9, "TSY: CMmVoiceCallTsy::Dial - 3rd party client number check iNumberCheckMode.iCheckMode = RMmCustomAPI::EEmerNumberCheckNormal ");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::Dial - 3rd party client number check iNumberCheckMode.iCheckMode = RMmCustomAPI::EEmerNumberCheckNormal ");
             iNumberCheckMode.iCheckMode = RMmCustomAPI::EEmerNumberCheckNormal;
             iNumberCheckMode.iNumber.Copy( *aTelNumber );
                     
@@ -1369,7 +1363,7 @@
             
             if ( NULL == mmCustom )
             	{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_10, "TSY: CMmVoiceCallTsy::Dial - CustomTSY is not yet created!");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::Dial - CustomTSY is not yet created!");        	
             	ReqCompleted( aTsyReqHandle, KErrNotReady );
             	SetDialFlag( EFalse );
             	}
@@ -1408,7 +1402,7 @@
         
         else
             {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_11, "TSY: CMmVoiceCallTsy::Dial - UUS services: %u", iUUSRequest.iServiceReq );
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::Dial - UUS services: %u", iUUSRequest.iServiceReq );
 
             // UUS1 will be embedded within the call set-up message
             if ( iUUSRequest.iServiceReq & RMobileCall::KUUS1Implicit )
@@ -1434,7 +1428,7 @@
                 // complete the dial with error value 
                 if ( KErrNone != ret )
                     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_12, "TSY: CMmVoiceCallTsy::Dial - UUS ERROR:%d", ret );
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::Dial - UUS ERROR:%d", ret );
                     // Complete the request with appropiate error
                     ReqCompleted ( aTsyReqHandle, KErrGsmCCResourceNotAvailable );
                     ClearCallStatus(); 
@@ -1515,7 +1509,7 @@
     const TTsyReqHandle aTsyReqHandle,
     const TDesC8* aCallParams )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_ANSWERINCOMINGCALL_1, "TSY: CMmVoiceCallTsy::AnswerIncomingCall. \n\t\t\t Handle:%d", aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::AnswerIncomingCall. \n\t\t\t Handle:%d", aTsyReqHandle); 
 
     TInt trapError( KErrNone );
     
@@ -1668,7 +1662,7 @@
 TInt CMmVoiceCallTsy::HangUp(
     const TTsyReqHandle aTsyReqHandle )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_HANGUP_1, "TSY: CMmVoiceCallTsy::HangUp. Req handle: %u, Call name: %S", aTsyReqHandle, iCallName);
+TFLOGSTRING3("TSY: CMmVoiceCallTsy::HangUp. Req handle: %d, Call name: %S", aTsyReqHandle, &iCallName);
 
     TInt ret( KErrNone );
     TInt trapError( KErrNone );
@@ -1790,8 +1784,8 @@
 void CMmVoiceCallTsy::CompleteHangUp(
     TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETEHANGUP_1, "TSY: CMmVoiceCallTsy::CompleteHangUp.\n  \t\t\t Result:%d", aResult );
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETEHANGUP_2, "TSY: CMmVoiceCallTsy::CompleteHangUp. Call Id:%d Call name:%S", iCallId, iCallName);
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::CompleteHangUp.\n  \t\t\t Result:%d", aResult ); 
+TFLOGSTRING3("TSY: CMmVoiceCallTsy::CompleteHangUp. Call Id:%d Call name:%S", iCallId, &iCallName);
 
     TInt ret( KErrNone );
 
@@ -2155,7 +2149,7 @@
     const TTsyReqHandle aTsyReqHandle, 
     const TDataPackage& aNumber )
     {
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIALEMERGENCYCALL_1, "TSY: CMmVoiceCallTsy::DialEmergencyCall number %S", *(aNumber.Des1u()));
+    TFLOGSTRING2("TSY: CMmVoiceCallTsy::DialEmergencyCall number %S", aNumber.Des1u());
         
     if(aNumber.Des1u()->MaxLength() > RMobileENStore::KEmergencyNumberSize)
         {
@@ -2211,8 +2205,8 @@
 void CMmVoiceCallTsy::CompleteDialEmergencyCall(
     TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETEDIALEMERGENCYCALL_1, "TSY: CMmVoiceCallTsy::CompleteDialEmergencyCall. Result:%d", aResult );
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETEDIALEMERGENCYCALL_2, "TSY: CMmVoiceCallTsy::CompleteDialEmergencyCall. Call Id:%d Call name:%S", iCallId, iCallName);
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::CompleteDialEmergencyCall. Result:%d", aResult ); 
+TFLOGSTRING3("TSY: CMmVoiceCallTsy::CompleteDialEmergencyCall. Call Id:%d Call name:%S", iCallId, &iCallName);
 
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->
@@ -2260,7 +2254,7 @@
 TInt CMmVoiceCallTsy::FillMobileCallInfo(
     TDes8* aInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_FILLMOBILECALLINFO_1, "TSY: CMmVoiceCallTsy::FillMobileCallInfo");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::FillMobileCallInfo");
 
     TInt ret = KErrArgument;
     TInt extensionId = 0;
@@ -2274,7 +2268,7 @@
             
         // get extensionid from the recieved data
         extensionId = callInfo.ExtensionId();
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_FILLMOBILECALLINFO_2, "TSY: CMmVoiceCallTsy::FillMobileCallInfo - extensionid=%d",callInfo.ExtensionId());
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::FillMobileCallInfo - extensionid=%d",callInfo.ExtensionId());      
         }
     
     //TMobileCallInfoV1
@@ -2283,7 +2277,7 @@
     	 KEtelExtMultimodeV7 == extensionId ||
     	 KEtelExtMultimodeV8 == extensionId )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_FILLMOBILECALLINFO_3, "TSY: CMmVoiceCallTsy::FillMobileCallInfo - V1");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::FillMobileCallInfo - V1");  
         // Set ret to KErrNone. We can fill this parameter class.
         ret = KErrNone;                
             
@@ -2303,7 +2297,7 @@
        	 KEtelExtMultimodeV7 == extensionId ||
        	 KEtelExtMultimodeV8 == extensionId )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_FILLMOBILECALLINFO_4, "TSY: CMmVoiceCallTsy::FillMobileCallInfo - V3");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::FillMobileCallInfo - V3");                
             
         RMobileCall::TMobileCallInfoV3Pckg* paramsPckgV3 =
             reinterpret_cast<RMobileCall::TMobileCallInfoV3Pckg*>( aInfo );
@@ -2317,7 +2311,7 @@
     if ( KEtelExtMultimodeV7 == extensionId ||
     	 KEtelExtMultimodeV8 == extensionId	)
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_FILLMOBILECALLINFO_5, "TSY: CMmVoiceCallTsy::FillMobileCallInfo - V7");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::FillMobileCallInfo - V7");
             
         RMobileCall::TMobileCallInfoV7Pckg* paramsPckgV7 =
             reinterpret_cast<RMobileCall::TMobileCallInfoV7Pckg*>( aInfo );
@@ -2330,7 +2324,7 @@
     // TMobileCallInfoV8
     if ( KEtelExtMultimodeV8 == extensionId )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_FILLMOBILECALLINFO_6, "TSY: CMmVoiceCallTsy::FillMobileCallInfo - V8");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::FillMobileCallInfo - V8");
                 
         RMobileCall::TMobileCallInfoV8Pckg* paramsPckgV8 =
             reinterpret_cast<RMobileCall::TMobileCallInfoV8Pckg*>( aInfo );
@@ -2340,7 +2334,7 @@
         iMmCallExtInterface->FillMobileCallInfoV8( &info );
         }
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_FILLMOBILECALLINFO_7, "TSY: CMmVoiceCallTsy::FillMobileCallInfo end. ret=%d",ret);
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::FillMobileCallInfo end. ret=%d",ret);
       
     return ret;
     }
@@ -2458,7 +2452,7 @@
 
     if ( EMultimodeCallReqHandleUnknown != reqHandle )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETESWAP_1, "TSY: Swap complete, Call ID: %d", iCallId );
+TFLOGSTRING2("TSY: Swap complete, Call ID: %d", iCallId );
         ReqCompleted( reqHandle, aResult );
         }
         (reinterpret_cast<CMmVoiceLineTsy*>( iMmLine ))->
@@ -2734,19 +2728,19 @@
 //
 void CMmVoiceCallTsy::Complete3rdPartyCallNbrCheck( TBool aIsEmergencyNbr )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETE3RDPARTYCALLNBRCHECK_1, "TSY: CMmVoiceCallTsy::Complete3rdPartyCallNbrCheck " );
+TFLOGSTRING("TSY: CMmVoiceCallTsy::Complete3rdPartyCallNbrCheck " );
 
     if( i3rdPartyEmergencyNumberCheckDone )
         {
         if( aIsEmergencyNbr )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETE3RDPARTYCALLNBRCHECK_2, "TSY: CMmVoiceCallTsy::Complete3rdPartyCallNbrCheck - Emergency number" );
+TFLOGSTRING("TSY: CMmVoiceCallTsy::Complete3rdPartyCallNbrCheck - Emergency number" );
             CompleteDial( KErrNotSupported );
             i3rdPartyEmergencyNumberCheckDone = EFalse;
             }
         else
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETE3RDPARTYCALLNBRCHECK_3, "TSY: CMmVoiceCallTsy::Complete3rdPartyCallNbrCheck - NOT Emergency nbr - DIAL" );
+TFLOGSTRING("TSY: CMmVoiceCallTsy::Complete3rdPartyCallNbrCheck - NOT Emergency nbr - DIAL" );            
             i3rdPartyEmergencyNumberCheckDone = ETrue;
             iIsDialISV = ETrue;
             
@@ -2783,7 +2777,7 @@
     const TDesC8* aCallParams,
     TDesC* aTelNumber )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIALNOFDNCHECK_1, "TSY: CMmVoiceCallTsy::DialNoFdnCheck. Req handle: %u, Call name: %S", (TUint)aTsyReqHandle, iCallName );
+TFLOGSTRING3("TSY: CMmVoiceCallTsy::DialNoFdnCheck. Req handle: %d, Call name: %S", aTsyReqHandle, &iCallName );            	
 	TInt ret( KErrGeneral );
     	
 	// Check that there is no dial on going for another call
@@ -2838,7 +2832,7 @@
 	    
 	  	if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo() )  
 	        {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIALNOFDNCHECK_2, "TSY: Offline mode ON, DialNoFdnCheck request is not allowed" );
+TFLOGSTRING("TSY: Offline mode ON, DialNoFdnCheck request is not allowed" );
 	        ret = CMmCommonStaticUtility::EpocErrorCode(
 	            KErrGeneral, KErrGsmOfflineOpNotAllowed );
 
@@ -2853,7 +2847,7 @@
 	        //is still in use.
 	        //Complete request with status value informing the client about 
 	        //the situation.
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIALNOFDNCHECK_3, "TSY: CMmVoiceCallTsy::DialNoFdnCheck - KErrNotReady");
+TFLOGSTRING("TSY: CMmVoiceCallTsy::DialNoFdnCheck - KErrNotReady");
 	        ReqCompleted( aTsyReqHandle, KErrNotReady );
 	        SetDialFlag(EFalse);
 	        }
@@ -2872,7 +2866,7 @@
 	                iCallMode, paramsPckgV1, aTelNumber, 
 	                KMultimodeCallTypeIDNoFdnCheck ));
 	                
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIALNOFDNCHECK_4, "TSY: CMmVoiceCallTsy::DialNoFdnCheck ret = %d", ret);
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::DialNoFdnCheck ret = %d", ret);          
 			if(err != KErrNone)
 				{
 				ret = err;
@@ -2900,7 +2894,7 @@
 	            }
 			else
             	{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIALNOFDNCHECK_5, "TSY: CMmVoiceCallTsy::DialNoFdnCheck Before ReqCompleted ret = %d", ret);
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::DialNoFdnCheck Before ReqCompleted ret = %d", ret);               	
             	ReqCompleted( aTsyReqHandle, ret );
             	ClearCallStatus();
             	SetDialFlag(EFalse);
@@ -3010,7 +3004,7 @@
             {
             iTelephonyAudioControl->CallStateChange( aCallName, 
                                                      aMobileCallStatus );
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_UPDATECALLROUTINGCONTROL_1, "TSY: CMmVoiceCallTsy::UpdateCallRoutingControl. Call routing state changed to EStatusDialling: Call name:%S", iCallName );
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::UpdateCallRoutingControl. Call routing state changed to EStatusDialling: Call name:%S", &iCallName );   
             }
         else
             {
@@ -3019,7 +3013,7 @@
                                     MTelephonyAudioControl::ECallTypeVoice,
                                     iEmergencyCall,  
                                     iCallDirection );
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_UPDATECALLROUTINGCONTROL_2, "TSY: CMmVoiceCallTsy::CMmVoiceCallTsy::UpdateCallRoutingControl. Call routing setup: Call name:%S", iCallName );
+TFLOGSTRING2("TSY: CMmVoiceCallTsy::CMmVoiceCallTsy::UpdateCallRoutingControl. Call routing setup: Call name:%S", &iCallName );
             iTelephonyAudioControlSetup = ETrue; 
             }
         }

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicelinetsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicelinetsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmvoicelinetsyTraces.h"
-#endif
-
 #include "cmmvoicelinetsy.h"
 #include "cmmphonetsy.h"
 #include "cmmvoicecalltsy.h"
@@ -40,7 +34,7 @@
 
 void CMmVoiceLineTsy::ConstructL()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_CONSTRUCTL_1, "TSY: CMmVoiceLineTsy::ConstructL");
+    TFLOGSTRING("TSY: CMmVoiceLineTsy::ConstructL");
     CMmLineTsy::ConstructL();
     }
 
@@ -51,7 +45,7 @@
     CMmMessageManagerBase* aMessageManager,
     MTelephonyAudioControl* aTelephonyAudioControl )
     {
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_NEWL_1, "TSY: CMmVoiceLineTsy::NewL, Voice line %S created", aName);
+    TFLOGSTRING2("TSY: CMmVoiceLineTsy::NewL, Voice line %S created", &aName);
     CMmVoiceLineTsy* mmLineTsy = NULL;
 
     if ( aMmPhone != NULL && ( aMode == RMobilePhone::EVoiceService 
@@ -72,7 +66,8 @@
 
 CMmVoiceLineTsy::~CMmVoiceLineTsy()
     {
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_DTOR_1, "TSY: CMmVoiceLineTsy::~CMmVoiceLineTsy. Line name: %S", iLineName);
+    TFLOGSTRING2("TSY: CMmVoiceLineTsy::~CMmVoiceLineTsy. Line name: %S", \
+        &iLineName);
     }
 
 // ---------------------------------------------------------------------------
@@ -262,7 +257,8 @@
 
     callDataPackage->GetCallIdAndMode( callId, callMode ); 
 
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYINCOMINGCALL_1, "TSY: CMmVoiceLineTsy::CompleteNotifyIncomingCall - Line \name: %S, Call id: %d", iLineName, callId );
+    TFLOGSTRING3("TSY: CMmVoiceLineTsy::CompleteNotifyIncomingCall - Line \
+        name: %S, Call id: %d", &iLineName, callId );
 
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( 
@@ -340,7 +336,7 @@
 void CMmVoiceLineTsy::CompleteNotifyDiallingStatus(
     CMmDataPackage* aDataPackage )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_1, "TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus");
+    TFLOGSTRING("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus");
     TInt callId( -1 );
     TBool ghostCall( EFalse );
     RMobilePhone::TMobileService callMode( RMobilePhone::EVoiceService );
@@ -355,7 +351,8 @@
 
     if ( NULL == mmCall )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_2, "TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - \GhostCall");
+        TFLOGSTRING("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - \
+            GhostCall");
         ghostCall = ETrue;
         }
     else
@@ -383,7 +380,7 @@
 
         if ( result || resultNoFdnCheck || resultISV )
             {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_3, "TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - Not Emergency call");
+TFLOGSTRING("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - Not Emergency call");
             for ( TInt i = 0; i < iMmPhone->CallList()->GetNumberOfObjects(); 
                       i++ )
                 {    
@@ -400,7 +397,7 @@
                         CMmCallTsy::EMultimodeCallDialNoFdnCheck ) ) ) )
                     {
                     mmCall->SetCallId( callId );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_4, "TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - mmCall SetCallId: %d", callId);
+TFLOGSTRING2("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - mmCall SetCallId: %d", callId);                      
                     mmCall->CompleteNotifyMobileCallInfoChange( 
                                 aDataPackage );
                     break;   
@@ -409,7 +406,8 @@
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_5, "TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - \Dial not found");
+            TFLOGSTRING("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - \
+                Dial not found");
             ghostCall = ETrue;
             }
         }

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmCommonStaticUtility.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmCommonStaticUtility.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,18 +16,13 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CMmCommonStaticUtilityTraces.h"
-#endif
-
 #include <etelmm.h>
 #include <etelmmerr.h>
 #include <exterror.h>
 #include <ctsy/serviceapi/gsmerror.h>
 #include "CMmCommonStaticUtility.h"
 
+#include <ctsy/tflogger.h>
 #include <in_sock.h>
 
 // ======== MEMBER FUNCTIONS ========
@@ -44,12 +39,14 @@
     TInt aCoreErrorCode, // core error
     TInt aExtendedErrorCode ) // extended error
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCOMMONSTATICUTILITY_EPOCERRORCODE_1, "TSY: CMmStaticUtility::EpocErrorCode, Error mapping done, \Core error: %d, Extended error: %d", aCoreErrorCode, aExtendedErrorCode );
+TFLOGSTRING3("TSY: CMmStaticUtility::EpocErrorCode, Error mapping done, \
+Core error: %d, Extended error: %d", aCoreErrorCode, aExtendedErrorCode );
 
     TInt errorCode = ( aCoreErrorCode & 0x0000FFFF ) |
                      ( aExtendedErrorCode << 16 );
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCOMMONSTATICUTILITY_EPOCERRORCODE_2, "TSY: CMmStaticUtility::EpocErrorCode. It was mapped \to the following Symbian OS error: %d", errorCode );
+TFLOGSTRING2("TSY: CMmStaticUtility::EpocErrorCode. It was mapped \
+to the following Symbian OS error: %d", errorCode );
 
     return errorCode;
     }

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CResponseTimer.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CResponseTimer.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,16 +16,11 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CResponseTimerTraces.h"
-#endif
-
 #include "CResponseTimer.h"
 #include "cmmphonetsy.h"
 #include "CResponseTimerStore.h"
 #include "MmTsy_timeoutdefs.h"
+#include <ctsy/tflogger.h>
 
 #ifdef REQHANDLE_TIMER
 
@@ -121,7 +116,7 @@
         //if the entry is expired, complete and delete it
         if ( aEntry->GetTimeStamp() <= iBeatCounter )
             {   
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRESPONSETIMER_BEAT_1, "TSY: Request completed due timer expiration, IPC: %d", aEntry->GetIPC() );
+TFLOGSTRING2("TSY: Request completed due timer expiration, IPC: %d", aEntry->GetIPC() ); 
             
             //call completion of the request due expired timer 
             iPhone->TimerExpired( aEntry->GetUserObject(),

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CResponseTimerStore.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CResponseTimerStore.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,16 +16,11 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CResponseTimerStoreTraces.h"
-#endif
-
 #include "CResponseTimerStore.h"
 #include "cmmphonetsy.h"
 #include "CResponseTimer.h"
 #include "MmTsy_timeoutdefs.h"
+#include <ctsy/tflogger.h>
 
 #ifdef REQHANDLE_TIMER
 
@@ -221,7 +216,7 @@
     if ( KErrNone != ret )
         {
         //log problem
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRESPONSETIMERSTORE_ADDTIMEENTRY_1, "Error inserting entry in the Timer table.");
+TFLOGSTRING("Error inserting entry in the Timer table.");
         }
     }

--- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/cmmtsyreqhandlestore.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/cmmtsyreqhandlestore.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmtsyreqhandlestoreTraces.h"
-#endif
-
 #include <e32std.h>
 #include "cmmtsyreqhandlestore.h"
 #include "cmmphonetsy.h"
@@ -47,7 +41,7 @@
     TInt aNumberOfRequests, //number of requests
     TTsyReqHandle* aFirstElement ) //pointer to the first element
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_NEWL_1, "TSY:CMmTsyReqHandleStore::NewL aNumberOfRequests=%d aFirstElement=0x%08x",aNumberOfRequests, (TUint)aFirstElement);
+    TFLOGSTRING3("TSY:CMmTsyReqHandleStore::NewL aNumberOfRequests=%d aFirstElement=%x",aNumberOfRequests,aFirstElement);
     
     CMmTsyReqHandleStore* tsyReqHandleStore 
             = new ( ELeave ) CMmTsyReqHandleStore();
@@ -62,7 +56,7 @@
         *( tsyReqHandleStore->iReqHandles + i ) = 0;
 
     CleanupStack::Pop();
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_NEWL_2, "TSY:CMmTsyReqHandleStore::NewL returns tsyReqHandleStore=0x%08x", (TUint)tsyReqHandleStore);
+    TFLOGSTRING2("TSY:CMmTsyReqHandleStore::NewL returns tsyReqHandleStore=%x",tsyReqHandleStore);
     return tsyReqHandleStore;
     }
 
@@ -74,8 +68,8 @@
     TInt aNumberOfRequests, 
     TTsyReqHandle* aFirstElement ) 
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_NEWL1_1, "TSY:CMmTsyReqHandleStore::NewL aCTelObject=0x%08x aPhone=0x%08x",(TUint)aCTelObject, (TUint)aPhone);
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_NEWL1_2, "TSY:CMmTsyReqHandleStore::NewL aNumberOfRequests=%d aFirstElement=0x%08x",aNumberOfRequests,(TUint)aFirstElement);
+    TFLOGSTRING3("TSY:CMmTsyReqHandleStore::NewL aCTelObject=%x aPhone=%x",aCTelObject,aPhone);
+    TFLOGSTRING3("TSY:CMmTsyReqHandleStore::NewL aNumberOfRequests=%d aFirstElement=%x",aNumberOfRequests,aFirstElement);
     CMmTsyReqHandleStore* tsyReqHandleStore 
             = new ( ELeave ) CMmTsyReqHandleStore();
     
@@ -105,7 +99,7 @@
 TTsyReqHandle CMmTsyReqHandleStore::GetTsyReqHandle(
     const TInt aIndex )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_GETTSYREQHANDLE_1, "TSY:CMmTsyReqHandleStore::GetTsyReqHandle aIndex=%d", aIndex);
+    TFLOGSTRING2("TSY:CMmTsyReqHandleStore::GetTsyReqHandle aIndex=%d", aIndex);
     TTsyReqHandle ret( NULL );
 
     //check the bounds
@@ -127,7 +121,7 @@
     const TInt aIndex, 
     const TTsyReqHandle aTsyReqHandle ) 
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_SETTSYREQHANDLE_1, "TSY:CMmTsyReqHandleStore::SetTsyReqHandle aIndex=%d aTsyReqHandle=0x%08x", aIndex, (TUint)aTsyReqHandle);
+    TFLOGSTRING3("TSY:CMmTsyReqHandleStore::SetTsyReqHandle aIndex=%d aTsyReqHandle=%d ", aIndex, aTsyReqHandle);
     if ( aIndex >= 0 && aIndex < iNumOfRequests )
         {
         *( iReqHandles + aIndex ) = aTsyReqHandle;
@@ -150,8 +144,8 @@
     TInt aTimeout, 
     TInt aIPC ) 
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_SETTSYREQHANDLE1_1, "TSY:CMmTsyReqHandleStore::SetTsyReqHandle aIndex=%d, aTsyReqHandle=0x%08x",aIndex,(TUint)aTsyReqHandle);
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_SETTSYREQHANDLE1_2, "TSY:CMmTsyReqHandleStore::SetTsyReqHandle aTimeout=%d  IPC=%d", aTimeout, aIPC);
+    TFLOGSTRING3("TSY:CMmTsyReqHandleStore::SetTsyReqHandle aIndex=%d, aTsyReqHandle=%d",aIndex,aTsyReqHandle);
+    TFLOGSTRING3("TSY:CMmTsyReqHandleStore::SetTsyReqHandle aTimeout=%d  IPC=%d", aTimeout, aIPC);
     
     if ( aIndex >= 0 && aIndex < iNumOfRequests )
         {
@@ -167,7 +161,6 @@
                                                    iCTelObject,
                                                    aTimeout,
                                                    aIPC );
-     
         }
     }
 
@@ -184,7 +177,7 @@
 TTsyReqHandle CMmTsyReqHandleStore::ResetTsyReqHandle(    
     const TInt aIndex ) 
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_RESETTSYREQHANDLE_1, "TSY:CMmTsyReqHandleStore::ResetTsyReqHandle aIndex=%d", aIndex);
+TFLOGSTRING2("TSY:CMmTsyReqHandleStore::ResetTsyReqHandle aIndex=%d", aIndex);
     //req handle was not used.
     TInt ret = 0;
 
@@ -216,7 +209,7 @@
     
         }
     }
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_RESETTSYREQHANDLE_2, "TSY:CMmTsyReqHandleStore::ResetTsyReqHandle aIndex=%d, ret=%d", aIndex, ret);
+TFLOGSTRING3("TSY:CMmTsyReqHandleStore::ResetTsyReqHandle aIndex=%d, ret=%d", aIndex, ret);
     return ret;
 }
 
@@ -232,7 +225,7 @@
     const TInt aHandle, 
     const TInt aTimeout ) 
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_POSTPONETIMEOUT_1, "TSY:CMmTsyReqHandleStore::PostponeTimeout aHandle=%d, aTimeout=%d",aHandle,aTimeout);
+    TFLOGSTRING3("TSY:CMmTsyReqHandleStore::PostponeTimeout aHandle=%d, aTimeout=%d",aHandle,aTimeout);
     // call ResetEntryTimeout 
     iPhone->GetTimeStampStore()->ResetEntryTimeout( aHandle,
                                                     this,
@@ -250,7 +243,7 @@
 void CMmTsyReqHandleStore::StopTimeout(
     const TInt aHandle ) 
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_STOPTIMEOUT_1, "TSY:CMmTsyReqHandleStore::StopTimeout aHandle=%d",aHandle);
+    TFLOGSTRING2("TSY:CMmTsyReqHandleStore::StopTimeout aHandle=%d",aHandle);
     iPhone->GetTimeStampStore()->DeleteEntryByHandle( aHandle, this );
     }

--- a/telephonyserverplugins/common_tsy/commontsy/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyserverplugins/common_tsy/commontsy/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1684 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_CMMMESSAGEMANAGERBASE_SETMESSAGEROUTER_1=0x2
-[TRACE]TRACE_BORDER[0x84]_CMMMESSAGEMANAGERBASE_SETPHONETSY_1=0x1
-[TRACE]TRACE_BORDER[0x84]_CMMPHONETSY_NEWL_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CCHARGINGSTATUSOBSERVER_RUNL_1=0x3e9
-[TRACE]TRACE_INTERNALS[0x88]_CCHARGINGSTATUSOBSERVER_RUNL_2=0x3ea
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETENOTIFYFILTERSETTINGCHANGE_1=0x2a7
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETENOTIFYFILTERSETTINGCHANGE_2=0x2a8
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEDWCDMACBSMESSAGEPAGELEFT_1=0x296
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEDWCDMACBSMESSAGEPAGELEFT_2=0x297
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEDWCDMACBSMESSAGEPAGELEFT_3=0x298
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEMESSAGECANCEL_1=0x2a1
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEGSMCBS_1=0x299
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_1=0x29a
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_2=0x29b
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_3=0x29c
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_4=0x29d
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_5=0x29e
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETESETFILTERSETTING_1=0x2a4
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_CONSTRUCTL_1=0x290
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_DTOR_1=0x291
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_GETBROADCASTIDLISTPHASE1L_1=0x2a9
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_GETBROADCASTIDLISTPHASE2_1=0x2aa
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_GETCAPS_1=0x292
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_GETFILTERSETTING_1=0x2a2
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_INTERNALCOMPLETECBROUTINGREQUEST_1=0x295
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_NOTIFYFILTERSETTINGCHANGECANCEL_1=0x2a6
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_NOTIFYFILTERSETTINGCHANGE_1=0x2a5
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_RECEIVEMESSAGECANCELL_1=0x29f
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_RECEIVEMESSAGECANCELL_2=0x2a0
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_RECEIVEMESSAGEL_1=0x293
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_RECEIVEMESSAGEL_2=0x294
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_SETFILTERSETTINGL_1=0x2a3
-[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_STOREBROADCASTIDLISTL_1=0x2ab
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALDATACALLL_1=0x12e
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALDATACALLL_2=0x12f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALDATACALLL_3=0x130
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALDATACALLL_4=0x131
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_1=0x117
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_2=0x118
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_3=0x119
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_4=0x11a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_5=0x11b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_6=0x11c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_7=0x11d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_8=0x11e
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_9=0x11f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_FILLMOBILECALLINFOV3_1=0x123
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_FILLMOBILECALLINFOV7_1=0x124
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_FILLMOBILECALLINFOV8_1=0x125
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_GETCALLPARAMS_1=0x120
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_GETCALLPARAMS_2=0x121
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_GETCURRENTHSCSDINFO_1=0x12b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_GETCURRENTHSCSDINFO_2=0x12c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_GETCURRENTHSCSDINFO_3=0x12d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_SETMOBILECALLDATA_1=0x128
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_SETMOBILECALLDATA_2=0x129
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_SETMOBILECALLDATA_3=0x12a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_SETRFSTATE_1=0x126
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_SETRFSTATE_2=0x127
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_SSMPLUGINCALLBACK_1=0x132
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_TRANSFERL1_1=0x133
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_TRANSFERL_1=0x122
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_ACTIVATEUUS_1=0x40c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_ANSWERINCOMINGCALLCANCEL_1=0x3f5
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEANSWERINCOMINGCALL_1=0x3f6
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEANSWERINCOMINGCALL_2=0x3f7
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEANSWERINCOMINGCALL_3=0x3f8
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEDIALNOFDN_1=0x417
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEDIALNOFDN_2=0x418
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEDIAL_1=0x3f1
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEDIAL_2=0x3f2
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEDIAL_3=0x3f3
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEDIAL_4=0x3f4
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEHANGUP_1=0x3f9
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEHANGUP_2=0x3fa
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETENOTIFYCALLEVENT_1=0x3fc
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETERECEIVEUUI_1=0x411
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETERECEIVEUUI_2=0x412
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETERECEIVEUUI_3=0x413
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETERECEIVEUUI_4=0x414
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_DIALCANCEL_1=0x3ee
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_DIALCANCEL_2=0x3ef
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_DIALCANCEL_3=0x3f0
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_DTOR_1=0x3eb
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_DTOR_2=0x3ec
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_EXTFUNC_1=0x3ed
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFODEFAULTS_1=0x41a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFODEFAULTS_2=0x41b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFO_1=0x3fd
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFO_2=0x3fe
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFO_3=0x3ff
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFO_4=0x400
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFO_5=0x401
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFO_6=0x402
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFO_7=0x403
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_GETCALLPARAMS_1=0x3fb
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_GETDIALFLAG_1=0x40a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_GETDIALTYPEID_1=0x416
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_ISREMOTERELEASEDCALL_1=0x40b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_NOTIFYREMOTEPARTYINFOCHANGE_1=0x404
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_RECEIVEUUICANCEL_1=0x410
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_RECEIVEUUI_1=0x40d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_RECEIVEUUI_2=0x40e
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_RECEIVEUUI_3=0x40f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_REQCOMPLETED_1=0x405
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_SETDIALFLAG_1=0x409
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_SETDIALTYPEID_1=0x415
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_SETEXTENSIONID_1=0x408
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_SETPARTOFCONFERENCE_1=0x406
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_SETPARTOFCONFERENCE_2=0x407
-[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_UPDATELIFETIMER_1=0x419
-[TRACE]TRACE_INTERNALS[0x88]_CMMCOMMONSTATICUTILITY_EPOCERRORCODE_1=0x67f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCOMMONSTATICUTILITY_EPOCERRORCODE_2=0x680
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_1=0x136
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_2=0x137
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_3=0x138
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_4=0x139
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_5=0x13a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_CHECKCONFERENCECAPABILITY_1=0x13b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_1=0x147
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_2=0x148
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_3=0x149
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_4=0x14a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_5=0x14b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_6=0x14c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_7=0x14d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_GETNEWSTATUS_1=0x145
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLEADDCALL_1=0x13d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLEADDCALL_2=0x13e
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLEADDCALL_3=0x13f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_1=0x140
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_2=0x141
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_3=0x142
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_4=0x143
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_5=0x144
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLESWAP_1=0x13c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_RESETATTRIBUTES_1=0x146
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_SWAPL_1=0x134
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_SWAPL_2=0x135
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_ADDCALLL_1=0x420
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_1=0x421
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_2=0x422
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_3=0x423
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_4=0x424
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_5=0x425
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_6=0x426
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_7=0x427
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_8=0x428
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETECREATECONFERENCE_1=0x41f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETENOTIFYCONFERENCEEVENT_1=0x433
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETENOTIFYCONFERENCESTATUSCHANGE_1=0x431
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETENOTIFYCONFERENCESTATUSCHANGE_2=0x432
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETESWAP_1=0x42f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_CREATECONFERENCEL_1=0x41e
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_DOEXTFUNCL_1=0x41d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_DTOR_1=0x41c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_GETCONFERENCESTATUS_1=0x430
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_1=0x429
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_2=0x42a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_3=0x42b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_4=0x42c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_5=0x42d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_REQCOMPLETED_1=0x435
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_RESETATTRIBUTES_1=0x434
-[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_SWAPL_1=0x42e
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_CHECKSECURITYCODEL_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_COMPLETECHECKSECURITYCODECANCEL_1=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_COMPLETECHECKSECURITYCODE_1=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_COMPLETEDISABLEPHONELOCK_1=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_COMPLETE_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_CONSTRUCTL_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_DELIVERCODEL_1=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_ISBLOCKED_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_NEWL_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CHECKEMERGENCYNUMBERL_1=0x66
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CHECKEMERGENCYNUMBERL_2=0x67
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CHECKEMERGENCYNUMBERL_3=0x68
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CHECKRANDVALIDITYL_1=0x44
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CHECKTWODIGITDIALSUPPORTL_1=0x74
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETECHECKEMERGENCYNUMBER_1=0x69
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETECHECKEMERGENCYNUMBER_2=0x6a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETECHECKEMERGENCYNUMBER_3=0x6b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETALSBLOCKED_1=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_1=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_2=0x5f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_3=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_4=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETCELLINFO_1=0xa5
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_1=0x99
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_2=0x9a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_3=0x9b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_4=0x9c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_5=0x9d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_6=0x9e
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETSIMFILEINFO_1=0x7f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETSIMFILEINFO_2=0x80
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETSYSTEMNETWORKBAND_1=0xac
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETUSIMSERVICESUPPORT_1=0xb2
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYALSBLOCKEDCHANGED_1=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYCELLINFOCHANGE_1=0xa7
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYCIPHERINGINFOCHANGE_1=0x62
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYCIPHERINGINFOCHANGE_2=0x63
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYCIPHERINGINFOCHANGE_3=0x64
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYDTMFEVENT_1=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYHSXPASTATUS_1=0x94
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYHSXPASTATUS_2=0x95
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYHSXPASTATUS_3=0x96
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYICCCALLFORWARDINGSTATUSCHANGE_1=0xa0
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYICCCALLFORWARDINGSTATUSCHANGE_2=0xa1
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYICCCALLFORWARDINGSTATUSCHANGE_3=0xa2
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYNETWORKCONNECTIONFAILURE_1=0x78
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYRAUEVENT_1=0x8b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYREMOTEALERTINGTONESTATUSCHANGE_1=0xb5
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEREADHSXPASTATUS_1=0x8d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEREADHSXPASTATUS_2=0x8e
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETERESETNETSERVER_1=0x76
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETERESETNETSERVER_2=0x77
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESETALSBLOCKED_1=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESETDRIVEMODE_1=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESETSYSTEMNETWORKBAND_1=0xaf
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_1=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_10=0x40
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_11=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_12=0x42
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_13=0x43
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_2=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_3=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_4=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_5=0x3b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_6=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_7=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_8=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_9=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESSADDITIONALINFONOTIFICATION_1=0x73
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETETERMINATECALL_1=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEWRITEHSXPASTATUS_1=0x91
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETE_1=0x65
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CONSTRUCTL_1=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CONSTRUCTL_2=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CONSTRUCTL_3=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CONSTRUCTL_4=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CONSTRUCTL_5=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CONSTRUCTL_6=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CREATERANDDB_1=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CREATERANDDB_2=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CREATERANDDB_3=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CREATERANDDB_4=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_DOEXTFUNCL_1=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_DTOR_1=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_EXTFUNC_1=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETALSBLOCKEDL_1=0x54
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETALSPPSUPPORTCANCEL_1=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETALSPPSUPPORTCANCEL_2=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETALSPPSUPPORTL_1=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETALSPPSUPPORTL_2=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETALSPPSUPPORTL_3=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETCELLINFOCANCEL_1=0xa4
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETCELLINFOL_1=0xa3
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETCURRENTSYSTEMNETWORKMODECANCEL_1=0x7a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETCURRENTSYSTEMNETWORKMODEL_1=0x79
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETDIAGNOSTICINFO_1=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETDIAGNOSTICINFO_2=0x50
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETDIAGNOSTICINFO_3=0x51
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETDIAGNOSTICINFO_4=0x52
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETICCCALLFORWARDINGSTATUSCANCEL_1=0x9f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETICCCALLFORWARDINGSTATUSL_1=0x98
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETLIFETIMEL_1=0x81
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETLIFETIMEL_2=0x82
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETLIFETIMEL_3=0x83
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETLIFETIMEL_4=0x84
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETLIFETIMEL_5=0x85
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETLIFETIMEL_6=0x86
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETPHONEBOOKCACHESTATUS_1=0xa9
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETPNDCACHESTATUS_1=0x6c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETPNDCACHESTATUS_2=0x6d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETPNDCACHESTATUS_3=0x6e
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETPNDCACHESTATUS_4=0x6f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREMOTEALERTINGTONESTATUS_1=0x53
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_1=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_10=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_11=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_12=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_13=0x20
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_14=0x21
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_15=0x22
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_16=0x23
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_17=0x24
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_18=0x25
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_19=0x26
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_2=0x15
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_20=0x27
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_21=0x28
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_3=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_4=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_5=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_6=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_7=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_8=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_9=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETSIMFILEINFOCANCEL_1=0x7e
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETSIMFILEINFOL_1=0x7b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETSIMFILEINFOL_2=0x7c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETSIMFILEINFOL_3=0x7d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETSYSTEMNETWORKBANDCANCEL_1=0xad
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETSYSTEMNETWORKBANDL_1=0xab
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETUSIMSERVICESUPPORTCANCEL_1=0xb3
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETUSIMSERVICESUPPORTL_1=0xb1
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_INSERTBLOBSTORANDDB_1=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_INSERTBLOBSTORANDDB_2=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NEWL_1=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NOTIFYCELLINFOCHANGECANCEL_1=0xa8
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NOTIFYCELLINFOCHANGE_1=0xa6
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NOTIFYDTMFEVENT_1=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NOTIFYHSXPASTATUSCANCEL_1=0x97
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NOTIFYHSXPASTATUS_1=0x93
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NOTIFYRAUEVENT_1=0x8a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NOTIFYREMOTEALERTINGTONESTATUSCHANGE_1=0xb4
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_READHSXPASTATUSCANCEL_1=0x8f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_READHSXPASTATUSL_1=0x8c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_REQCOMPLETED_1=0xaa
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_RESETNETSERVERL_1=0x75
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SETALSBLOCKEDL_1=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SETDRIVEMODEL_1=0x87
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SETICCCFBOOTUPFLAG_1=0xb0
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SETOBJECTFORISVDIALNUMBERCHECK_1=0x89
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SETSYSTEMNETWORKBANDL_1=0xae
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_1=0x29
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_10=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_11=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_12=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_13=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_14=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_2=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_3=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_4=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_5=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_6=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_7=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_8=0x30
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_9=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SSADDITIONALINFONOTIFICATIONCANCEL_1=0x72
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SSADDITIONALINFONOTIFICATION_1=0x71
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_UPDATEBITCOUNTER_1=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_UPDATECACHESTATUS_1=0x70
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_WRITEHSXPASTATUSCANCEL_1=0x92
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_WRITEHSXPASTATUSL_1=0x90
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_ANSWERINCOMINGCALLCANCEL_1=0x44b
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_ANSWERINCOMINGCALLCANCEL_2=0x44c
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_ANSWERINCOMINGCALL_1=0x44a
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_CALLCOMINGFORWAITINGCALL_1=0x45c
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_CALLCOMINGFORWAITINGCALL_2=0x45d
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_CANCELSERVICE_1=0x43a
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEANSWERINCOMINGCALL_1=0x44d
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEANSWERINCOMINGCALL_2=0x44e
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEDIALNOFDN_1=0x46e
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEDIALNOFDN_2=0x46f
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEDIALNOFDN_3=0x470
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEDIALNOFDN_4=0x471
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEDIAL_1=0x448
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEDIAL_2=0x449
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_1=0x453
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_2=0x454
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_3=0x455
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_4=0x456
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_5=0x457
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_6=0x458
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_7=0x459
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_8=0x45a
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_9=0x45b
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETENOTIFYHSCSDINFOCHANGE_1=0x466
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_1=0x43b
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_2=0x43c
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_3=0x43d
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_4=0x43e
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_5=0x43f
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_6=0x440
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETESETDYNAMICHSCSDPARAMS_1=0x464
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_CONNECT_1=0x461
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_CONNECT_2=0x462
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIALNOFDNCHECK_1=0x467
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIALNOFDNCHECK_2=0x468
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIALNOFDNCHECK_3=0x469
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIALNOFDNCHECK_4=0x46a
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIALNOFDNCHECK_5=0x46b
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIALNOFDNCHECK_6=0x46c
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIALNOFDNCHECK_7=0x46d
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIAL_1=0x441
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIAL_2=0x442
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIAL_3=0x443
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIAL_4=0x444
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIAL_5=0x445
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIAL_6=0x446
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIAL_7=0x447
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DOEXTFUNCL_1=0x438
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DTOR_1=0x437
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_GETCURRENTHSCSDINFO_1=0x465
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_HANGUP_1=0x44f
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_HANGUP_2=0x450
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_HANGUP_3=0x451
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_HANGUP_4=0x452
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_LOANDATAPORT_1=0x45e
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_NEWL_1=0x436
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_RECOVERDATAPORTANDRELINQUISHOWNERSHIP_1=0x460
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_RECOVERDATAPORT_1=0x45f
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_REQCOMPLETED_1=0x472
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_REQMODEL_1=0x439
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_SETDYNAMICHSCSDPARAMS_1=0x463
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_1=0x477
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_2=0x478
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_3=0x479
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_4=0x47a
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_5=0x47b
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_6=0x47c
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_7=0x47d
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYINCOMINGCALL_1=0x476
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_CONSTRUCTL_1=0x473
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_DTOR_1=0x475
-[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_NEWL_1=0x474
-[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_COMPLETENOTIFYDTMFEVENT_1=0x480
-[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_COMPLETENOTIFYSTOPINDTMFSTRING_1=0x485
-[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_COMPLETESENDDTMFTONESCANCEL_1=0x483
-[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_COMPLETESTARTDTMFTONE_1=0x489
-[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_COMPLETESTOPDTMFTONE_1=0x48a
-[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_CONTINUEDTMFSTRINGSENDINGL_1=0x486
-[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_DTOR_1=0x47e
-[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_NOTIFYDTMFEVENTCANCEL_1=0x481
-[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_NOTIFYDTMFEVENT_1=0x47f
-[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_NOTIFYSTOPINDTMFSTRING_1=0x484
-[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_SENDDTMFTONESCANCELL1_1=0x48c
-[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_SENDDTMFTONESCANCELL_1=0x482
-[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_SENDDTMFTONESL_1=0x48b
-[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_STARTDTMFTONEL_1=0x487
-[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_STOPDTMFTONEL_1=0x488
-[TRACE]TRACE_INTERNALS[0x88]_CMMENSTORETSY_DTOR_1=0x2fc
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_ANSWERINCOMINGCALL_1=0x499
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_CANCELSERVICE_1=0x491
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_COMPLETENOTIFYSTATUSCHANGE_1=0x492
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_COMPLETENOTIFYSTATUSCHANGE_2=0x493
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_DIALCANCEL_1=0x498
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_DIAL_1=0x494
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_DIAL_2=0x495
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_DIAL_3=0x496
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_DIAL_4=0x497
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_DOEXTFUNCL_1=0x48f
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_DTOR_1=0x48e
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_HANGUP_1=0x49a
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_HANGUP_2=0x49b
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_LOANDATAPORT_1=0x49c
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_NEWL_1=0x48d
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_RECOVERDATAPORTANDRELINQUISHOWNERSHIP_1=0x49e
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_RECOVERDATAPORT_1=0x49d
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_REQMODEL_1=0x490
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXLINETSY_COMPLETENOTIFYDIALLINGSTATUS_1=0x4a1
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXLINETSY_COMPLETENOTIFYDIALLINGSTATUS_2=0x4a2
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXLINETSY_COMPLETENOTIFYDIALLINGSTATUS_3=0x4a3
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXLINETSY_COMPLETENOTIFYINCOMINGCALL_1=0x4a0
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXLINETSY_DTOR_1=0x49f
-[TRACE]TRACE_INTERNALS[0x88]_CMMFAXLINETSY_RESETLASTINCOMINGCALL_1=0x4a4
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_ADDLINEOBJECT_1=0x4aa
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_ADDLINEOBJECT_2=0x4ab
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_CONSTRUCTL_1=0x4a5
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_GETMMLINEBYINDEX_1=0x4a8
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_GETMMLINEBYINDEX_2=0x4a9
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_GETMMLINEBYMODE_1=0x4a6
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_GETMMLINEBYMODE_2=0x4a7
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_GETOBJECTBYINDEX_1=0x4ac
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_GETOBJECTBYINDEX_2=0x4ad
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_COMPLETENOTIFYADDBYPASSINGCALL_1=0x4b9
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_COMPLETENOTIFYADDBYPASSINGCALL_2=0x4ba
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_COMPLETENOTIFYCALLADDED_1=0x4b5
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_COMPLETENOTIFYCALLADDED_2=0x4b6
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_CONSTRUCTL_1=0x4ae
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_DOEXTFUNCL_1=0x4b2
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_DTOR_1=0x4af
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_GETCALLINFO_1=0x4b7
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_GETCALLINFO_2=0x4b8
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_NOTIFYCALLADDEDCANCEL_1=0x4b4
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_NOTIFYCALLADDED_1=0x4b3
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_OPENNEWOBJECTBYNAMEL_1=0x4b0
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_REQCOMPLETED_1=0x4bb
-[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_REQMODEL_1=0x4b1
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTLIST_ADDCONTEXT_1=0x226
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTLIST_CONTEXTBYINDEX_1=0x228
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTLIST_CONTEXTBYNAME_1=0x229
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTLIST_GENERATENEWCONTEXTNAME_1=0x22a
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTLIST_ISMBMSCONTEXTRECEIVING_1=0x22b
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTLIST_NEWL_1=0x225
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTLIST_REMOVECONTEXT_1=0x227
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_ACTIVATEL_1=0x237
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_CANCELSERVICE_1=0x232
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETEACTIVATE_1=0x238
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETEACTIVATE_2=0x239
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETEDEACTIVATE_1=0x23b
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETEDELETE_1=0x23d
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETEINITIALISECONTEXT_1=0x236
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETENOTIFYCONFIGCHANGED_1=0x243
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETENOTIFYSTATUSCHANGE_1=0x245
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETESETCONFIG_1=0x248
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETEUPDATEMBMSSESSIONLIST_1=0x24c
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETE_1=0x24a
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_DEACTIVATEL_1=0x23a
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_DELETEL_1=0x23c
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_DEREGISTERNOTIFICATION_1=0x234
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_DOEXTFUNCL_1=0x22f
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_DTOR_1=0x22d
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_EXTFUNC_1=0x22e
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_GETCONFIG_1=0x23e
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_GETLASTERRORCAUSE_1=0x23f
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_GETMBMSACTIVESERVICESPHASE1L_1=0x24d
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_GETMBMSACTIVESERVICESPHASE2L_1=0x24e
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_GETSTATUS_1=0x241
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_INITIALISECONTEXTL_1=0x235
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_NEWL_1=0x22c
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_NOTIFYCONFIGCHANGED_1=0x242
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_NOTIFYSTATUSCHANGE_1=0x244
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_NUMBEROFSLOTSL_1=0x231
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_REGISTERNOTIFICATION_1=0x233
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_REQCOMPLETED_1=0x249
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_REQMODEL_1=0x230
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_SETCONFIGL_1=0x246
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_SETCONFIGL_2=0x247
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_SETLASTERRORCAUSE_1=0x240
-[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_UPDATEMBMSSESSIONLIST_1=0x24b
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEMANAGERBASE_HANDLEREQUESTL1_1=0x4bd
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEMANAGERBASE_HANDLEREQUESTL2_1=0x4be
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEMANAGERBASE_HANDLEREQUESTL_1=0x4bc
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_COMPLETE_1=0x3db
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_CTOR_1=0x3da
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_1=0x3dc
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_10=0x3e5
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_2=0x3dd
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_3=0x3de
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_4=0x3df
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_5=0x3e0
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_6=0x3e1
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_7=0x3e2
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_8=0x3e3
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_9=0x3e4
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_CANCELSERVICE_1=0x4c5
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_CIPHERINGINDICATORFORCEDOFF_1=0x4f8
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETEGETCURRENTACTIVEUSIMAPPLICATION_1=0x4fe
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETEGETNETWORKREGISTRATIONSTATUS_1=0x4eb
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETEGETNETWORKREGISTRATIONSTATUS_2=0x4ec
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_1=0x4d7
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_2=0x4d8
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_3=0x4d9
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_4=0x4da
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_5=0x4db
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_6=0x4dc
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_7=0x4dd
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_8=0x4de
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYNETWORKREGISTRATIONSTATUSCHANGE_1=0x4ed
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYNETWORKREGISTRATIONSTATUSCHANGE_2=0x4ee
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_CONSTRUCTL_1=0x4bf
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_DOEXTFUNCL_1=0x4c1
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_DOEXTFUNCL_2=0x4c2
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_DOEXTFUNCL_3=0x4c3
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_DOEXTFUNCL_4=0x4c4
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_DTOR_1=0x4c0
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETAUTHORIZATIONINFOPHASE1L_1=0x4f9
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETAUTHORIZATIONINFOPHASE2L_1=0x4fb
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCELLINFOCANCEL_1=0x4e2
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCELLINFOL_1=0x4c9
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCELLINFOL_2=0x4ca
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCELLINFOL_3=0x4cb
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCELLINFOL_4=0x4cc
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCURRENTACTIVEUSIMAPPLICATIONCANCEL_1=0x4fd
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCURRENTACTIVEUSIMAPPLICATIONL_1=0x4fc
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCURRENTNETWORKNOLOCATION_1=0x4d2
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCURRENTNETWORK_1=0x4c7
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCURRENTNETWORK_2=0x4c8
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETHOMENETWORK_1=0x4c6
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKMODE_1=0x4ef
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKNAME_1=0x4ce
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKNAME_2=0x4cf
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKNAME_3=0x4d0
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKNAME_4=0x4d1
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKREGISTRATIONSTATUSCANCEL_1=0x4e9
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKREGISTRATIONSTATUSCANCEL_2=0x4ea
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_1=0x4e4
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_2=0x4e5
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_3=0x4e6
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_4=0x4e7
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_5=0x4e8
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKSECURITYLEVEL_1=0x4f0
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_HANDLECELLINFOUPDATE_1=0x4cd
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_ISNETWORKINFOCHANGED_1=0x4f3
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCELLINFOCHANGECANCEL_1=0x4e3
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCELLINFOCHANGEL_1=0x4df
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCELLINFOCHANGEL_2=0x4e0
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCELLINFOCHANGEL_3=0x4e1
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCURRENTNETWORKCHANGECANCEL_1=0x4d6
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCURRENTNETWORKCHANGEL_1=0x4d5
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCURRENTNETWORKNOLOCATIONCHANGECANCEL_1=0x4d4
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCURRENTNETWORKNOLOCATIONCHANGEL_1=0x4d3
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYNETWORKSECURITYLEVELCHANGECANCEL_1=0x4f2
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYNETWORKSECURITYLEVELCHANGE_1=0x4f1
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_PROCESSGETAUTHORIZATIONINFOPHASE1L_1=0x4fa
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_READVARIANTOPTIONS_1=0x4f4
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_READVARIANTOPTIONS_2=0x4f5
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_READVARIANTOPTIONS_3=0x4f6
-[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_READVARIANTOPTIONS_4=0x4f7
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEDELETEALLPHASE1L_1=0x30c
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEDELETEALL_1=0x30d
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEDELETEALL_2=0x30e
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEDELETEALL_3=0x30f
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEDELETE_1=0x30a
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEGETINFO_1=0x318
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEGETINFO_2=0x319
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEGETINFO_3=0x31a
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEGETINFO_4=0x31b
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETENOTIFYSTOREEVENT_1=0x31f
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEREADALLPHASE1L_1=0x327
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEREADALLPHASE1REQ_1=0x328
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEREAD_1=0x303
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEREAD_2=0x304
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETESTOREALL_1=0x333
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEWRITE_1=0x307
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETE_1=0x336
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_CONSTRUCTL_1=0x2fd
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_DELETEALLCANCEL_1=0x310
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_DELETEALLL_1=0x30b
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_DELETEL_1=0x309
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_DELETEONSTORELISTARRAYELEMENTS_1=0x329
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_DOEXTFUNCL_1=0x301
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_DTOR_1=0x2fe
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_EXTFUNC_1=0x300
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOCANCEL_1=0x31d
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOL_1=0x311
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOL_2=0x312
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOL_3=0x313
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOL_4=0x314
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOL_5=0x315
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOL_6=0x316
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOL_7=0x317
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALRETRIEVEONLISTREADENTRYL_1=0x326
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALRETRIEVEONLISTREADSIZEL_1=0x322
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALRETRIEVEONLISTREADSIZEL_2=0x323
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALRETRIEVEONLISTREADSIZEL_3=0x324
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALSTOREALLGETSIZEL_1=0x32e
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALSTOREALLGETSIZEL_2=0x32f
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALSTOREALLWRITEENTRYL_1=0x331
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALSTOREALLWRITEENTRYL_2=0x332
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_MAKEINTERNALRETRIEVEONLISTREADREQL_1=0x325
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_MAKEINTERNALSTOREALLWRITEREQL_1=0x330
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_NOTIFYSTOREEVENTCANCEL_1=0x320
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_NOTIFYSTOREEVENT_1=0x31e
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_PHONEBOOKSTOREINITCOMPLETEL_1=0x337
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_READALLCANCEL_1=0x32b
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_READALLPHASE1L_1=0x321
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_READALLPHASE2_1=0x32a
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_READCANCEL_1=0x305
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_READL_1=0x302
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_REQCOMPLETED_1=0x335
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_REQMODEL_1=0x2ff
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_SETINFO_1=0x31c
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_STOREALLCANCEL_1=0x334
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_STOREALLL_1=0x32c
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_STOREALLL_2=0x32d
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_WRITECANCEL_1=0x308
-[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_WRITEL_1=0x306
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_ACTIVATEL_1=0x253
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_ADDPACKETFILTERL_1=0x264
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEACTIVATEPHASE2_1=0x256
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEACTIVATE_1=0x254
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEACTIVATE_2=0x255
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEDEACTIVATE_1=0x258
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEDELETE_1=0x25a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEGETDATAVOLUMETRANSFERRED_1=0x25d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEINITIALISECONTEXT1_1=0x268
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEINITIALISECONTEXT_1=0x252
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETENOTIFYCONFIGCHANGED_1=0x25f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETESETCONFIG_1=0x262
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_DEACTIVATEL_1=0x257
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_DELETEL_1=0x259
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_DTOR_1=0x250
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_GETCONFIGURATIONDATA_1=0x263
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_GETCONFIG_1=0x25b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_GETDATAVOLUMETRANSFERREDL_1=0x25c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_GETDNSINFOETEL_1=0x267
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_INITIALISECONTEXTL_1=0x251
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_MODIFYACTIVECONTEXTL_1=0x266
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_NEWL_1=0x24f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_NOTIFYCONFIGCHANGED_1=0x25e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_REMOVEPACKETFILTER_1=0x265
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_SETCONFIGL_1=0x260
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_SETCONFIGL_2=0x261
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_ADDOBJECT_1=0x166
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_ENUMERATECONTEXTSINNIF_1=0x16b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_ENUMERATENIFS_1=0x169
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_GETCONTEXTNAMEINNIF_1=0x16c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_GETNIFINFO_1=0x16a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_NEWL_1=0x165
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_REMOVEOBJECT_1=0x167
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_REMOVEOBJECT_2=0x168
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_ACTIVATEL_1=0x17d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_ADDPACKETFILTERL_1=0x199
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_CANCELSERVICE_1=0x173
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETEACTIVATE_1=0x17e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETEDEACTIVATE_1=0x180
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETEDELETE_1=0x182
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETEGETDATAVOLUMETRANSFERRED_1=0x186
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETEINITIALISECONTEXT_1=0x17c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETEMODIFYACTIVECONTEXT_1=0x19c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETENOTIFYCONFIGCHANGED_1=0x18b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETENOTIFYCONNECTIONINFOCHANGE_1=0x19f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETENOTIFYCONNECTIONSPEEDCHANGE_1=0x18d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETENOTIFYSTATUSCHANGE_1=0x18f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETESETCONFIG_1=0x191
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_CONTEXTRESUMED_1=0x195
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_CONTEXTSUSPENDED_1=0x194
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_DEACTIVATEL_1=0x17f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_DELETEL_1=0x181
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_DEREGISTERNOTIFICATION_1=0x175
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_DOEXTFUNCL_1=0x170
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_DTOR_1=0x16e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_EXTFUNC_1=0x16f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_FILLCONNECTIONINFO_1=0x1a0
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_GETCONFIG_1=0x183
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_GETCONNECTIONINFO_1=0x19d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_GETCONNECTIONSPEED_1=0x184
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_GETDATAVOLUMETRANSFERREDL_1=0x185
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_GETLASTERRORCAUSE_1=0x187
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_GETPROFILENAME_1=0x188
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_GETSTATUS_1=0x189
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_INITIALISECONTEXTL_1=0x17b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_MODIFYACTIVECONTEXTL_1=0x19b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_NEWL_1=0x16d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_NOTIFYCONFIGCHANGED_1=0x18a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_NOTIFYCONNECTIONINFOCHANGE_1=0x19e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_NOTIFYCONNECTIONSPEEDCHANGE_1=0x18c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_NOTIFYSTATUSCHANGE_1=0x18e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_NUMBEROFSLOTSL_1=0x172
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_OPENNEWOBJECTBYNAMEL_1=0x179
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_OPENNEWOBJECTBYNAMEL_2=0x17a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_OPENNEWOBJECTL_1=0x176
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_OPENNEWOBJECTL_2=0x177
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_OPENNEWOBJECTL_3=0x178
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_REGISTERNOTIFICATION_1=0x174
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_REMOVEPACKETFILTER1_1=0x269
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_REMOVEPACKETFILTER_1=0x19a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_REMOVEQOS_1=0x196
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_REQCOMPLETED_1=0x197
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_REQMODEL_1=0x171
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_RESETDIALUPCONTEXT_1=0x198
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_SETCONFIGL_1=0x190
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_SETDATAVOLUME_1=0x192
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_SETLASTERRORCAUSE_1=0x193
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_1=0x273
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_2=0x274
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_3=0x275
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_4=0x276
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_5=0x277
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_6=0x278
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_COMPLETESETPROFILEPARAMETERS_1=0x272
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_DTOR_1=0x26b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_GETPROFILECAPABILITIES_1=0x26c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_GETPROFILEPARAMETERS_1=0x26d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_GETPROFILEPARAMETERS_2=0x26e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_NEWL_1=0x26a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_NOTIFYPROFILECHANGEDCANCEL_1=0x26f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_SETPROFILEPARAMETERSL_1=0x270
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_SETPROFILEPARAMETERSL_2=0x271
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_CANCELSERVICE_1=0x1a7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_COMPLETENOTIFYPROFILECHANGED_1=0x1af
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_COMPLETESETPROFILEPARAMETERS_1=0x1b1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_DEREGISTERNOTIFICATION_1=0x1a9
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_DOEXTFUNCL_1=0x1a4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_DTOR_1=0x1a2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_EXTFUNC_1=0x1a3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_GETPROFILECAPABILITIES_1=0x1ac
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_GETPROFILEPARAMETERS_1=0x1ad
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_NEWL_1=0x1a1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_NOTIFYPROFILECHANGED_1=0x1ae
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_NUMBEROFSLOTSL_1=0x1a6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_OPENNEWOBJECTBYNAMEL_1=0x1ab
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_OPENNEWOBJECTL_1=0x1aa
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_REGISTERNOTIFICATION_1=0x1a8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_REQCOMPLETED_1=0x1b2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_REQMODEL_1=0x1a5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_SETPROFILEPARAMETERSL_1=0x1b0
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_ATTACHL_1=0x27b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEATTACH_1=0x27c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEDETACHL_1=0x27e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEDYNAMICCAPSCHANGE_1=0x289
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEGETATTACHMODE_1=0x284
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEGETNTWKREGSTATUS_1=0x280
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEGETSTATICCAPS_1=0x28f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETESETATTACHMODE_1=0x282
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETESETPREFERREDBEARER_1=0x286
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETETRANSFERCAPSCHANGE_1=0x28d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETETRANSFERCAPSCHANGE_2=0x28e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_DETACHL_1=0x27d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_DTOR_1=0x27a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_EGPRSSUPPORTINCELL_1=0x28b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_GETATTACHMODEL_1=0x283
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_GETDYNAMICCAPS_1=0x287
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_GETNTWKREGSTATUSL_1=0x27f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_GETSTATICCAPS_1=0x28a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_NEWL_1=0x279
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_SETATTACHMODEL_1=0x281
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_SETDYNAMICCAPSFLAG_1=0x288
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_SETEDGEGPRSSUPPORT_1=0x28c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_SETPREFERREDBEARERL_1=0x285
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ATTACHL_1=0x1c1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_CANCELSERVICE_1=0x1ef
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_CANCELSETALWAYSON_1=0x220
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEATTACH_1=0x1c2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEDETACHL_1=0x1c4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEENUMERATEMBMSACTIVESERVICELIST_1=0x224
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEGETATTACHMODE_1=0x1c7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEGETMBMSNETWORKSERVICESTATUS_1=0x1f3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEGETNTWKREGSTATUS_1=0x1cc
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENETWORKMODECHANGE_1=0x217
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCHANGEOFNTWKREGSTATUS1_1=0x1d2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCHANGEOFNTWKREGSTATUS_1=0x1d1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTACTIVATIONREQUESTED_1=0x1d4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_1=0x1d6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_2=0x1d7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_3=0x1d8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_4=0x1d9
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_5=0x1da
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_6=0x1db
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYDYNAMICCAPSCHANGE_1=0x1dd
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYEGPRSINFOCHANGE_1=0x216
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYMBMSNETWORKSERVICESTATUSCHANGE_1=0x1f5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYMSCLASSCHANGE_1=0x1df
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYMSCLASSCHANGE_2=0x1e0
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYSTATUSCHANGE_1=0x1e2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYSTATUSCHANGE_2=0x1e3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_1=0x1ba
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_2=0x1bb
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_3=0x1bc
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_4=0x1bd
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_5=0x1be
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEREJECTACTIVATIONREQUEST_1=0x1e5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETESETALWAYSON_1=0x21e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETESETALWAYSON_2=0x21f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETESETATTACHMODE_1=0x1e7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETESETDEFAULTCONTEXTPARAMS_1=0x213
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETESETPREFERREDBEARER_1=0x1e9
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETESETPREFERREDBEARER_2=0x1ea
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEUPDATEMBMSMONITORSERVICELIST_1=0x1f8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETE_1=0x20b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETE_2=0x20c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_CONTEXTSTATUSCHANGED_1=0x1bf
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_DEREGISTERNOTIFICATION_1=0x1f1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_DETACHL_1=0x1c3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_DOEXTFUNCL_1=0x1ec
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_DTOR_1=0x1b5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_DTOR_2=0x1b6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_DTOR_3=0x1b7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_DTOR_4=0x1b8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ENUMERATECONTEXTSINNIF_1=0x210
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ENUMERATECONTEXTS_1=0x1c5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ENUMERATEMBMSACTIVESERVICELIST_1=0x221
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ENUMERATEMBMSACTIVESERVICELIST_2=0x222
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ENUMERATEMBMSACTIVESERVICES_1=0x223
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ENUMERATEMONITORSERVICELIST_1=0x1f7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ENUMERATENIFS_1=0x20e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_EXTFUNC_1=0x1eb
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETATTACHMODEL_1=0x1c6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETCONTEXTINFO_1=0x1c8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETCONTEXTNAMEINNIF_1=0x211
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETDEFAULTCONTEXTPARAMS_1=0x214
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETDYNAMICCAPS_1=0x1c9
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETMBMSMONITOREDSERVICESCANCEL_1=0x1fe
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETMBMSMONITOREDSERVICESPHASE1L_1=0x1fa
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETMBMSMONITOREDSERVICESPHASE2_1=0x1fd
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETMBMSNETWORKSERVICESTATUS_1=0x1f2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETMSCLASS_1=0x1ca
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETNIFINFO_1=0x20f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETNTWKREGSTATUSL_1=0x1cb
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETPREFERREDBEARER_1=0x1cd
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETSIZEOFMONITOREDSERVICELISTL_1=0x1fb
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETSIZEOFMONITOREDSERVICELISTL_2=0x1fc
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETSTATICCAPS_1=0x1ce
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETSTATUS_1=0x1cf
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_1=0x218
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_2=0x219
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_3=0x21a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_4=0x21b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ISACTIVATIONALLOWED_1=0x215
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NEWL_1=0x1b3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NEWL_2=0x1b4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYCHANGEOFNTWKREGSTATUS_1=0x1d0
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYCONTEXTACTIVATIONREQUESTED_1=0x1d3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYCONTEXTADDED_1=0x1d5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYDYNAMICCAPSCHANGE_1=0x1dc
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYMBMSNETWORKSERVICESTATUSCHANGE_1=0x1f4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYMBMSSERVICEAVAILABILITYCHANGE_1=0x1f6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYMSCLASSCHANGE_1=0x1de
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYSTATUSCHANGE_1=0x1e1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NUMBEROFSLOTSL_1=0x1ee
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_1=0x206
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_2=0x207
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_3=0x208
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_4=0x209
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_5=0x20a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTL_1=0x1ff
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTL_2=0x200
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTL_3=0x201
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTL_4=0x202
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTL_5=0x203
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTL_6=0x204
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTL_7=0x205
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_PREFERREDBEARERCHANGED_1=0x1c0
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_REGISTERNOTIFICATION_1=0x1f0
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_REJECTACTIVATIONREQUESTL_1=0x1e4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_REQCOMPLETED_1=0x20d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_REQMODEL_1=0x1ed
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_SETALWAYSONL_1=0x21c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_SETALWAYSONL_2=0x21d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_SETATTACHMODEL_1=0x1e6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_SETDEFAULTCONTEXTPARAMSL_1=0x212
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_SETPREFERREDBEARERL_1=0x1e8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_UPDATEATTACHEDPACKETSTATUS_1=0x1b9
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_UPDATEMBMSMONITORSERVICELISTCANCEL_1=0x1f9
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_CANCELSERVICE_1=0xba
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_CANCELSETALWAYSON_1=0xc6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_COMPLETENOTIFYEGPRSINFOCHANGE_1=0xc0
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_COMPLETENOTIFYEGPRSINFOCHANGE_2=0xc1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_COMPLETENOTIFYEGPRSINFOCHANGE_3=0xc2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_COMPLETESETALWAYSON_1=0xc5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_DOEXTFUNCL_1=0xb8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_DOEXTFUNCL_2=0xb9
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_DTOR_1=0xb7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_GETEGPRSINFO_1=0xbd
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_GETEGPRSINFO_2=0xbe
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_GETEGPRSINFO_3=0xbf
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_NEWL_1=0xb6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_NOTIFYEGPRSINFOCHANGE_1=0xbc
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_REQCOMPLETED_1=0xbb
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_SETALWAYSONL_1=0xc3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_SETALWAYSONL_2=0xc4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_1=0x3d4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_2=0x3d5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_3=0x3d6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_4=0x3d7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_5=0x3d8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_6=0x3d9
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL_1=0x360
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL_2=0x361
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL_3=0x362
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL_4=0x363
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL_5=0x364
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL_6=0x365
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CANCELSERVICE_1=0x345
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CANCELSERVICE_2=0x346
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_1=0x366
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_2=0x367
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_3=0x368
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_4=0x369
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_5=0x36a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_6=0x36b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_7=0x36c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_8=0x36d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_9=0x36e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECOUNTENTRIES_1=0x35f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_1=0x3a1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_2=0x3a2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_3=0x3a3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_4=0x3a4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_1=0x39b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_2=0x39c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_3=0x39d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_4=0x39e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEGETINFO_1=0x3bc
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETENOTIFYSTOREEVENT_1=0x3c1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETENOTIFYSTOREEVENT_2=0x3c2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETENOTIFYSTOREEVENT_3=0x3c3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEPBSTOREINITIALIZATIONL_1=0x34a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEPBSTOREINITIALIZATIONL_2=0x34b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEPBSTOREINITIALIZATIONL_3=0x34c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEREADL_1=0x35c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEREADL_2=0x35d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_1=0x38d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_2=0x38e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_3=0x38f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_4=0x390
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_5=0x391
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CONSTRUCTL_1=0x338
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CONSTRUCTL_2=0x339
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CONSTRUCTL_3=0x33a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CONSTRUCTL_4=0x33b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CONSTRUCTL_5=0x33c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CONTINUEREADL_1=0x3ca
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COUNTENTRIESL_1=0x35e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DELETEALLL_1=0x39f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DELETEALLL_2=0x3a0
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DELETEL_1=0x399
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DELETEL_2=0x39a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DOEXTFUNCL_1=0x348
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DTOR_1=0x33e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DTOR_2=0x33f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DTOR_3=0x340
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DTOR_4=0x341
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DTOR_5=0x342
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DTOR_6=0x343
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_EXTFUNC_1=0x347
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_1=0x380
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_2=0x381
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_3=0x382
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_4=0x383
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_5=0x384
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_6=0x385
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_7=0x386
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_8=0x387
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_9=0x388
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOCANCEL_1=0x3be
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_1=0x3a5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_10=0x3ae
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_11=0x3af
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_12=0x3b0
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_13=0x3b1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_14=0x3b2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_15=0x3b3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_16=0x3b4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_17=0x3b5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_18=0x3b6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_19=0x3b7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_2=0x3a6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_20=0x3b8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_21=0x3b9
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_22=0x3ba
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_23=0x3bb
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_3=0x3a7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_4=0x3a8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_5=0x3a9
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_6=0x3aa
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_7=0x3ab
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_8=0x3ac
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_9=0x3ad
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETPHONEBOOKTYPE_1=0x3cd
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_ISPBINITDONE_1=0x3cb
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_ISPBINITDONE_2=0x3cc
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_NEWL_1=0x33d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_NOTIFYSTOREEVENTCANCEL_1=0x3c0
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_NOTIFYSTOREEVENT_1=0x3bf
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READCANCEL_1=0x389
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READENTRIESFROMARRAYL_1=0x36f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READENTRIESFROMARRAYL_2=0x370
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READENTRIESFROMARRAYL_3=0x371
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_1=0x34e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_10=0x357
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_11=0x358
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_12=0x359
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_13=0x35a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_14=0x35b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_2=0x34f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_3=0x350
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_4=0x351
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_5=0x352
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_6=0x353
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_7=0x354
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_8=0x355
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_9=0x356
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READTOCACHEL_1=0x372
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_REQCOMPLETED_1=0x3c8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_REQMODEL_1=0x344
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_RESETCACHEREADY_1=0x3c6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_RESETCACHEREADY_2=0x3c7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_RESETCACHE_1=0x3c5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_RESETVARIABLES_1=0x3c4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_1=0x392
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_2=0x393
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_3=0x394
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_4=0x395
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_5=0x396
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_6=0x397
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_7=0x398
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SETINFO_1=0x3bd
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SETMAXNAMEANDNUMLENGHT_1=0x34d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SETPHONEBOOKTYPE_1=0x349
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SETTYPEOFRESPONSE_1=0x3c9
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SIMISREADY_1=0x3ce
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SIMISREADY_2=0x3cf
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SIMISREADY_3=0x3d0
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SIMISREADY_4=0x3d1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SIMISREADY_5=0x3d2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SIMISREADY_6=0x3d3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_1=0x373
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_10=0x37c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_11=0x37d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_12=0x37e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_13=0x37f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_2=0x374
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_3=0x375
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_4=0x376
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_5=0x377
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_6=0x378
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_7=0x379
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_8=0x37a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_9=0x37b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_WRITEL_1=0x38a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_WRITEL_2=0x38b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_WRITEL_3=0x38c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_COMPLETEGETHOMENETWORK_1=0x164
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_COMPLETENOTIFYNETWORKREGISTRATIONSTATUSCHANGE_1=0x15d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_DELIVERCODE_1=0x162
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCELLINFOL_1=0x15b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATIONV1_1=0x154
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATIONV2_1=0x155
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATIONV5_1=0x156
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATION_1=0x157
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKV1_1=0x150
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKV2_1=0x151
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKV5_1=0x152
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORK_1=0x153
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETHOMENETWORKV1_1=0x15e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETHOMENETWORKV2_1=0x15f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETHOMENETWORKV5_1=0x160
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETHOMENETWORK_1=0x161
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETNETWORKCAPS_1=0x14f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETNITZINFO_1=0x159
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_INITSIML_1=0x14e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_NOTIFYCELLINFOCHANGEL_1=0x15c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_RECEIVEDNITZINFO_1=0x15a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_SETCURRENTNETWORK_1=0x158
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_SETLOCKSETTINGL_1=0x163
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_APPENDAPNNAMECANCEL_1=0x5b7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_APPENDAPNNAMEL_1=0x5b6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_1=0x579
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_10=0x582
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_11=0x583
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_2=0x57a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_3=0x57b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_4=0x57c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_5=0x57d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_6=0x57e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_7=0x57f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_8=0x580
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_9=0x581
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHESERVICETABLESL_1=0x557
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CANCELSERVICE_1=0x513
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEAPPENDAPNNAME_1=0x5b8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_1=0x558
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_10=0x561
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_11=0x562
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_12=0x563
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_2=0x559
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_3=0x55a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_4=0x55b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_5=0x55c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_6=0x55d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_7=0x55e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_8=0x55f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_9=0x560
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESIML_1=0x584
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESIML_2=0x585
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEDELETEAPNNAME_1=0x5bb
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEENUMERATEAPNENTRIES_1=0x5a4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETALSLINE_1=0x546
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETAPNCONTROLLISTSERVICESTATUS_1=0x5c4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETAPNNAME_1=0x5a7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETCALLFORWARDINGNUMBER_1=0x5a1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETCUSTOMERSERVICEPROFILE_1=0x51d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETCUSTOMERSERVICEPROFILE_2=0x51e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETFDNSTATUS_1=0x54a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETMAILBOXNUMBERS_1=0x58d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETPHONEID1_1=0x5d4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETPHONEID1_2=0x5d5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETPHONEID1_3=0x5d6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETPHONEID1_4=0x5d7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETPHONEID1_5=0x5d8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETPHONEID_1=0x535
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_1=0x52b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_2=0x52c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_3=0x52d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_4=0x52e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_5=0x52f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_1=0x564
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_10=0x56d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_11=0x56e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_12=0x56f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_13=0x570
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_14=0x571
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_2=0x565
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_3=0x566
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_4=0x567
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_5=0x568
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_6=0x569
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_7=0x56a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_8=0x56b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_9=0x56c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_1=0x53e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_2=0x53f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_3=0x540
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_4=0x541
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_5=0x542
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_6=0x543
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_7=0x544
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEIMSAUTHENTICATION_1=0x588
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYAPNCONTROLLISTSERVICESTATUSCHANGE_1=0x5c7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYAPNLISTCHANGED_1=0x5be
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYBATTERYINFOCHANGE_1=0x524
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYBATTERYINFOCHANGE_2=0x525
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYCALLDURATIONCHANGE_1=0x5c8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYICCACCESSCAPSCHANGE_1=0x54f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYICCACCESSCAPSCHANGE_2=0x550
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYINDICATORCHANGE_1=0x50a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYINDICATORCHANGE_2=0x50b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYINDICATORCHANGE_3=0x50c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYMODEMSTATUSREADY_1=0x504
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_1=0x505
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_2=0x506
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_3=0x507
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_4=0x508
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETESETALSLINE_1=0x548
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETESETAPNCONTROLLISTSERVICESTATUS_1=0x5c1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETESETFDNSETTINGL_1=0x54c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETESIMREFRESHNOWL_1=0x578
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETESIMREFRESHREGISTER_1=0x575
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEUPDATELIFETIMER_1=0x577
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETE_1=0x59d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETE_2=0x59e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CONSTRUCTL_1=0x4ff
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CONSTRUCTL_2=0x500
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CONSTRUCTL_3=0x501
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_DELETEAPNNAMECANCEL_1=0x5ba
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_DELETEAPNNAMEL_1=0x5b9
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_DOEXTFUNCL_1=0x511
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_DOGETPHONEIDL_1=0x533
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_DOGETPHONEIDL_2=0x534
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_DTOR_1=0x502
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_DTOR_2=0x503
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_ENUMERATEAPNENTRIESCANCEL_1=0x5a3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_ENUMERATEAPNENTRIESL_1=0x5a2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_EXTFUNC_1=0x50f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_EXTFUNC_2=0x510
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETALSLINEL_1=0x545
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETAPNCONTROLLISTSERVICESTATUSCANCEL_1=0x5c3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETAPNCONTROLLISTSERVICESTATUSL_1=0x5c2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETAPNNAMECANCEL_1=0x5a6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETAPNNAMEL_1=0x5a5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETBATTERYINFOL_1=0x522
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETCFISCENREP_1=0x5b1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETCFISPRCENREP_1=0x5b3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETCUSTOMERSERVICEPROFILECANCEL_1=0x51f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETCUSTOMERSERVICEPROFILECANCEL_2=0x520
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETCUSTOMERSERVICEPROFILECANCEL_3=0x521
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETCUSTOMERSERVICEPROFILEL_1=0x51b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETCUSTOMERSERVICEPROFILEL_2=0x51c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETFDNSTATUSCANCEL_1=0x54b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETFDNSTATUSL_1=0x549
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETICCACCESSCAPS_1=0x54d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETICCACCESSCAPS_2=0x54e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETINDICATORCAPS_1=0x538
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETINDICATORSTATE_1=0x53a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETINDICATORSTATE_2=0x53b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETINDICATORSTATE_3=0x53c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETINDICATORSTATE_4=0x53d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETINDICATORS_1=0x539
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETMAILBOXNUMBERSCANCEL_1=0x58e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETMAILBOXNUMBERSL_1=0x58a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETMAILBOXNUMBERSL_2=0x58b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETMAILBOXNUMBERSL_3=0x58c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETMWISCENREP_1=0x5b2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETPHONESTOREINFOL_1=0x518
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETPHONESTOREINFOL_2=0x519
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETPHONESTOREINFOL_3=0x51a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICEPROVIDERNAMECANCEL_1=0x530
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICEPROVIDERNAMECANCEL_2=0x531
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICEPROVIDERNAMECANCEL_3=0x532
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICEPROVIDERNAMEL_1=0x527
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICEPROVIDERNAMEL_2=0x528
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICEPROVIDERNAMEL_3=0x529
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICEPROVIDERNAMEL_4=0x52a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICETABLECANCEL_1=0x572
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICETABLECHECKPARAMETERSL_1=0x551
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICETABLEL_1=0x552
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICETABLEL_2=0x553
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICETABLEL_3=0x554
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICETABLEL_4=0x555
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICETABLEL_5=0x556
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSIMREFRESHREGISTER_1=0x576
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSUBSCRIBERIDFORTSYL_1=0x5b4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSUBSCRIBERIDFORTSYL_2=0x5b5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSUBSCRIBERIDL_1=0x537
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_IMSAUTHENTICATIONCANCEL_1=0x589
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_IMSAUTHENTICATIONL_1=0x587
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_ISMODEMSTATUSREADY_1=0x5d2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_ISPBINITACTIVE_1=0x5cc
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_ISREQUESTPOSSIBLEINOFFLINE_1=0x5a0
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_ISSIMREADY_1=0x5cd
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_MAPMEALSLINE_1=0x5a9
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_MAPMEALSLINE_2=0x5aa
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_MAPMEALSLINE_3=0x5ab
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_MAPMEALSLINE_4=0x5ac
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_MAPMEALSLINE_5=0x5ad
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_MAPMEALSLINE_6=0x5ae
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_MOBILEPHONEGETPHONEIDCANCEL_1=0x536
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYAPNCONTROLLISTSERVICESTATUSCHANGECANCEL_1=0x5c6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYAPNCONTROLLISTSERVICESTATUSCHANGE_1=0x5c5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYAPNLISTCHANGEDCANCEL_1=0x5bd
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYAPNLISTCHANGED_1=0x5bc
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYBATTERYINFOCHANGECANCEL_1=0x526
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYBATTERYINFOCHANGE_1=0x523
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYINDICATORCHANGECANCEL_1=0x50d
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYINDICATORCHANGE_1=0x509
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYSIMREFRESHCOMPLETIONL_1=0x586
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYTELEPHONYAUDIOCONTROLERROR_1=0x5c9
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_OPENNEWOBJECTBYNAMEL_1=0x50e
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_PHONEBOOKSTOREINITCOMPLETEL_1=0x5d3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_REQCOMPLETED_1=0x59f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_REQMODEL_1=0x512
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_RESETMEALSINFO_1=0x5af
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_RESETMEALSINFO_2=0x5b0
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SAVEFDNINFODETAILS_1=0x5ce
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SAVEFDNINFODETAILS_2=0x5cf
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SAVEFDNINFODETAILS_3=0x5d0
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SAVEFDNINFODETAILS_4=0x5d1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SETALSLINEL_1=0x547
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SETALSSTATE_1=0x5a8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SETAPNCONTROLLISTSERVICESTATUSCANCEL_1=0x5c0
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SETAPNCONTROLLISTSERVICESTATUSL_1=0x5bf
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SETPBINITACTIVESTATUS_1=0x5ca
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SETPBINITACTIVESTATUS_2=0x5cb
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SIMREFRESHREGISTERL_1=0x573
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SIMREFRESHREGISTERL_2=0x574
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TERMINATEACTIVECALLSL_1=0x516
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TERMINATEACTIVECALLSL_2=0x517
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TERMINATEALLCALLSL_1=0x514
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TERMINATEALLCALLSL_2=0x515
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_1=0x58f
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_10=0x598
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_11=0x599
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_12=0x59a
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_13=0x59b
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_14=0x59c
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_2=0x590
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_3=0x591
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_4=0x592
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_5=0x593
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_6=0x594
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_7=0x595
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_8=0x596
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_9=0x597
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEABORTSECURITYCODE_1=0x5f2
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETECHANGESECURITYCODE_1=0x5e4
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEGETLOCKINFO_1=0x5f3
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEGETSECURITYCODEINFO_1=0x5f5
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETENOTIFYSECURITYCODEINFOCHANGE_1=0x5f8
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETENOTIFYSECURITYEVENTL_1=0x5e7
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETENOTIFYSECURITYEVENTL_2=0x5e8
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETENOTIFYSECURITYEVENTL_3=0x5e9
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETESETLOCKSETTING_1=0x5e3
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_1=0x5fe
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_2=0x5ff
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_3=0x600
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_4=0x601
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_1=0x5ee
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_2=0x5ef
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_3=0x5f0
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_4=0x5f1
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_CONSTRUCTL_1=0x5da
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_DOEXTFUNCL_1=0x5dc
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_DTOR_1=0x5db
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_GETLOCKINFOL_1=0x5dd
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_GETSECURITYCODEINFOCANCEL_1=0x5f6
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_GETSECURITYCODEINFOL_1=0x5f4
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_LOCKSETTINGL_1=0x5e1
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_LOCKSETTINGL_2=0x5e2
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_NEWL_1=0x5d9
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_NOTIFYLOCKINFOCHANGECANCEL_1=0x5df
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_NOTIFYLOCKINFOCHANGE_1=0x5de
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_NOTIFYSECURITYCODEINFOCHANGECANCEL_1=0x5f9
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_NOTIFYSECURITYCODEINFOCHANGE_1=0x5f7
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_NOTIFYSECURITYEVENTL_1=0x5e5
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_NOTIFYSECURITYEVENTL_2=0x5e6
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_SETLOCKSETTINGL_1=0x5e0
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL1_1=0x5fa
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL1_2=0x5fb
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL1_3=0x5fc
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL1_4=0x5fd
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL_1=0x5ea
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL_2=0x5eb
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL_3=0x5ec
-[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL_4=0x5ed
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMLOCKTSY_COMPLETE_1=0xfa
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_CHECKVIAGHOMEZONEPARAMSL_1=0xce
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_CHECKVIAGHOMEZONEPARAMSL_2=0xcf
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_CHECKVIAGHOMEZONEPARAMSL_3=0xd0
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEDELETESIMCBTOPIC_1=0xf8
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_1=0xdc
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_2=0xdd
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_3=0xde
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_4=0xdf
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_5=0xe0
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_6=0xe1
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_7=0xe2
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_1=0xd1
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_2=0xd2
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_3=0xd3
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_4=0xd4
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_5=0xd5
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_6=0xd6
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_7=0xd7
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_8=0xd8
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_9=0xd9
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETESTARTSIMCBTOPICBROWSING_1=0xf5
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEWRITEVIAGHOMEZONECACHERESP_1=0xec
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEWRITEVIAGHOMEZONEUHZIUESETTINGSRESP_1=0xed
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETE_1=0xf9
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_CONSTRUCTL_1=0xc7
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_CONSTRUCTL_2=0xc8
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_CONSTRUCTL_3=0xc9
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_DELETESIMCBTOPICL_1=0xf7
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_DOEXTFUNCL_1=0xcc
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_DTOR_1=0xcb
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_GETNEXTSIMCBTOPIC_1=0xf6
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_NEWL_1=0xca
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_1=0xe7
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_2=0xe8
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_3=0xe9
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_4=0xea
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_1=0xe3
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_2=0xe4
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_3=0xe5
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_4=0xe6
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READVIAGHOMEZONECACHEL_1=0xdb
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READVIAGHOMEZONEPARAMSCANCEL_1=0xda
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READVIAGHOMEZONEPARAMSL_1=0xcd
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_STARTDYNAMICCACHINGL_1=0xee
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_STARTDYNAMICCACHINGL_2=0xef
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_STARTDYNAMICCACHINGL_3=0xf0
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_STARTDYNAMICCACHINGL_4=0xf1
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_STARTSIMCBTOPICBROWSINGL_1=0xf4
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_WRITEVIAGHOMEZONECACHEL_1=0xeb
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_WRITEVIAGHOMEZONEUHZIUESETTINGSCANCEL_1=0xf3
-[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_WRITEVIAGHOMEZONEUHZIUESETTINGSL_1=0xf2
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSGSMEXT_COMPLETEREADALLSMSPHASE1L_1=0x2af
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSGSMEXT_COMPLETERECEIVEMESSAGE_1=0x2ac
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSGSMEXT_COMPLETERECEIVEMESSAGE_2=0x2ad
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSGSMEXT_COMPLETERECEIVEMESSAGE_3=0x2ae
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETEDELETEALLSMS_1=0x2b7
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETEDELETESMS_1=0x2b6
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_1=0x2b8
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_2=0x2b9
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_3=0x2ba
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_4=0x2bb
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_5=0x2bc
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETEREADALLSMSPHASE1_1=0x2c4
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETEREADALLSMSPHASE1_2=0x2c5
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETEREADSMS_1=0x2b3
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETEWRITESMS_1=0x2b5
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_CONSTRUCTL_1=0x2b0
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_DTOR_1=0x2b1
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_INIT_1=0x2b2
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_READALLSMSCANCEL_1=0x2c2
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_READALLSMSPHASE1L_1=0x2bd
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_READALLSMSPHASE1L_2=0x2be
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_READALLSMSPHASE1L_3=0x2bf
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_READALLSMSPHASE1L_4=0x2c0
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_READALLSMSPHASE2_1=0x2c1
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_RETRIEVESMSLISTREADSMSL_1=0x2c3
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_WRITESMSL_1=0x2b4
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_ACKSMSSTOREDL_1=0x2d6
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_ACKSMSSTOREDL_2=0x2d7
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_ACKSMSSTOREDL_3=0x2d8
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETEACTIVATESMSROUTING_1=0x2cd
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETEACTIVATESMSROUTING_2=0x2ce
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETEACTIVATESMSROUTING_3=0x2cf
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETEREADALLSMSPPHASE1_1=0x2e3
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETEREADALLSMSPPHASE1_2=0x2e4
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETEREADALLSMSPPHASE1_3=0x2e5
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETERECEIVEMESSAGE_1=0x2d0
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETERECEIVEMESSAGE_2=0x2d1
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETERECEIVEMESSAGE_3=0x2d2
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETERECEIVEMESSAGE_4=0x2d3
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETERECEIVEMESSAGE_5=0x2d4
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETESENDMESSAGENOFDNCHECK_1=0x2e8
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETESENDMESSAGE_1=0x2e0
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETESENDSATMESSAGE_1=0x2e1
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_CONSTRUCTL_1=0x2c7
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_CONSTRUCTL_2=0x2c8
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_CTOR_1=0x2c6
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_DELIVERCLASS2TOSMSSTACK_1=0x2d5
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_DTOR_1=0x2c9
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_EXTFUNC_1=0x2ca
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_EXTFUNC_2=0x2cb
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_ISRPERROR_1=0x2df
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_NACKSMSSTOREDL_1=0x2d9
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_NACKSMSSTOREDL_2=0x2da
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_READSMSPLISTPHASE1L_1=0x2e2
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_RECEIVEMESSAGEL_1=0x2cc
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_RESENDSMS_1=0x2e6
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_RESUMESMSRECEPTIONL_1=0x2db
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_SENDMESSAGEL_1=0x2de
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_SENDMESSAGENOFDNCHECKCANCEL_1=0x2e7
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_SETMOSMSBEARER_1=0x2dd
-[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_SETOFFLINE_1=0x2dc
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETEGETCALLBARRINGSTATUSPHASE1L_1=0x604
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETEGETCALLFORWARDINGSTATUSPHASE1L_1=0x602
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETEGETCALLWAITINGSTATUSPHASE1L_1=0x60a
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_1=0x611
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_2=0x612
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_3=0x613
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_4=0x614
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETENOTIFYALLSENDNETWORKSERVICEREQUEST_1=0x633
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETENOTIFYICCMESSAGEWAITINGINDICATORCHANGE_1=0x620
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETENOTIFYICCMESSAGEWAITINGINDICATORCHANGE_2=0x621
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETESENDNETWORKSERVICEREQUESTIND_1=0x630
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETESETICCMESSAGEWAITINGINDICATORS_1=0x61b
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETESETICCMESSAGEWAITINGINDICATORS_2=0x61c
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETESETICCMESSAGEWAITINGINDICATORS_3=0x61d
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSCANCEL_1=0x615
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSCANCEL_2=0x616
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSCANCEL_3=0x617
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_1=0x60d
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_2=0x60e
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_3=0x60f
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_4=0x610
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_ISMWISINFOCHANGED_1=0x62d
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_NOTIFYALLSENDNETWORKSERVICEREQUESTCANCEL_1=0x634
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_NOTIFYALLSENDNETWORKSERVICEREQUEST_1=0x632
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_NOTIFYICCMESSAGEWAITINGINDICATORCHANGECANCEL_1=0x622
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_NOTIFYICCMESSAGEWAITINGINDICATORSCHANGE_1=0x61f
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_NOTIFYSENDNETWORKSERVICEREQUESTCANCEL_1=0x631
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_NOTIFYSENDNETWORKSERVICEREQUEST_1=0x62e
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_NOTIFYSENDNETWORKSERVICEREQUEST_2=0x62f
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_READICCMESSAGEWAITINGINDICATORSFROMCENTREP_1=0x624
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SENDNETWORKSERVICEREQUESTL_1=0x60c
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETCALLBARRINGSTATUSCANCEL_1=0x605
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETCALLFORWARDINGSTATUSCANCEL_1=0x603
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETCALLWAITINGSTATUSCANCEL_1=0x60b
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSCANCEL_1=0x61e
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSL_1=0x618
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSL_2=0x619
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSL_3=0x61a
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETICCMWISBOOTUPFLAG_1=0x635
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETICCSUPPORTFORMWIS_1=0x623
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETSSPASSWORDCANCEL_1=0x609
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETSSPASSWORDL_1=0x606
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETSSPASSWORDL_2=0x607
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETSSPASSWORDL_3=0x608
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_1=0x625
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_2=0x626
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_3=0x627
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_4=0x628
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_5=0x629
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_6=0x62a
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_7=0x62b
-[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_8=0x62c
-[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_GETTSYREQHANDLE_1=0x687
-[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_NEWL1_1=0x685
-[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_NEWL1_2=0x686
-[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_NEWL_1=0x683
-[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_NEWL_2=0x684
-[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_POSTPONETIMEOUT_1=0x68d
-[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_RESETTSYREQHANDLE_1=0x68b
-[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_RESETTSYREQHANDLE_2=0x68c
-[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_SETTSYREQHANDLE1_1=0x689
-[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_SETTSYREQHANDLE1_2=0x68a
-[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_SETTSYREQHANDLE_1=0x688
-[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_STOPTIMEOUT_1=0x68e
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_COMPLETENOTIFYNETWORKRELEASE_1=0x2f8
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_COMPLETERECEIVEMESSAGE_1=0x2ee
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_COMPLETESENDMESSAGENOFDNCHECK_1=0x2fb
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_COMPLETESENDMESSAGE_1=0x2f1
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_COMPLETESENDRELEASE_1=0x2f4
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_CONSTRUCTL_1=0x2e9
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_DEREGISTERNOTIFICATION_1=0x2ed
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_DTOR_1=0x2ea
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_EXTFUNC_1=0x2eb
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_NOTIFYNETWORKRELEASE_1=0x2f5
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_NOTIFYNETWORKRELEASE_2=0x2f6
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_NOTIFYNETWORKRELEASE_3=0x2f7
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_REGISTERNOTIFICATION_1=0x2ec
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_REQCOMPLETED_1=0x2f9
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_SENDMESSAGEL_1=0x2ef
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_SENDMESSAGEL_2=0x2f0
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_SENDMESSAGENOFDNCHECKCANCEL_1=0x2fa
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_SENDRELEASEL_1=0x2f2
-[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_SENDRELEASEL_2=0x2f3
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_ANSWERINCOMINGCALL_1=0x65d
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_CANCELSERVICE_1=0x63a
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETE3RDPARTYCALLNBRCHECK_1=0x66c
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETE3RDPARTYCALLNBRCHECK_2=0x66d
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETE3RDPARTYCALLNBRCHECK_3=0x66e
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETEDIALEMERGENCYCALL_1=0x662
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETEDIALEMERGENCYCALL_2=0x663
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETEHANGUP_1=0x65f
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETEHANGUP_2=0x660
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_1=0x63b
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_10=0x644
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_11=0x645
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_12=0x646
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_13=0x647
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_14=0x648
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_15=0x649
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_16=0x64a
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_17=0x64b
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_18=0x64c
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_19=0x64d
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_2=0x63c
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_20=0x64e
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_21=0x64f
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_22=0x650
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_3=0x63d
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_4=0x63e
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_5=0x63f
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_6=0x640
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_7=0x641
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_8=0x642
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_9=0x643
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETESWAP_1=0x66b
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIALEMERGENCYCALL_1=0x661
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIALNOFDNCHECK_1=0x66f
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIALNOFDNCHECK_2=0x670
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIALNOFDNCHECK_3=0x671
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIALNOFDNCHECK_4=0x672
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIALNOFDNCHECK_5=0x673
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_1=0x651
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_10=0x65a
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_11=0x65b
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_12=0x65c
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_2=0x652
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_3=0x653
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_4=0x654
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_5=0x655
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_6=0x656
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_7=0x657
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_8=0x658
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_9=0x659
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DOEXTFUNCL_1=0x638
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DTOR_1=0x637
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_FILLMOBILECALLINFO_1=0x664
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_FILLMOBILECALLINFO_2=0x665
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_FILLMOBILECALLINFO_3=0x666
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_FILLMOBILECALLINFO_4=0x667
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_FILLMOBILECALLINFO_5=0x668
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_FILLMOBILECALLINFO_6=0x669
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_FILLMOBILECALLINFO_7=0x66a
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_HANGUP_1=0x65e
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_NEWL_1=0x636
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_REQMODEL_1=0x639
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_UPDATECALLROUTINGCONTROL_1=0x674
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_UPDATECALLROUTINGCONTROL_2=0x675
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_1=0x67a
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_2=0x67b
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_3=0x67c
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_4=0x67d
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_5=0x67e
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_COMPLETENOTIFYINCOMINGCALL_1=0x679
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_CONSTRUCTL_1=0x676
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_DTOR_1=0x678
-[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_NEWL_1=0x677
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETEGETATR_1=0xfe
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETEGETSIMCARDREADERSTATUS_1=0x106
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETENOTIFYSIMCARDSTATUS_1=0x109
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETEPOWERSIMOFF_1=0x115
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETEPOWERSIMON_1=0x111
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETESENDAPDUREQV2_1=0x10d
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETESIMWARMRESET_1=0x102
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETE_1=0xfb
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_GETATRCANCEL_1=0xff
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_GETATRL_1=0xfc
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_GETATRL_2=0xfd
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_GETSIMCARDREADERSTATUSCANCEL_1=0x107
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_GETSIMCARDREADERSTATUSL_1=0x104
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_GETSIMCARDREADERSTATUSL_2=0x105
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_NOTIFYSIMCARDSTATUSCANCEL_1=0x10a
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_NOTIFYSIMCARDSTATUS_1=0x108
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_POWERSIMOFFCANCEL_1=0x116
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_POWERSIMOFFL_1=0x113
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_POWERSIMOFFL_2=0x114
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_POWERSIMONCANCEL_1=0x112
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_POWERSIMONL_1=0x10f
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_POWERSIMONL_2=0x110
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_SENDAPDUREQV2CANCEL_1=0x10e
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_SENDAPDUREQV2L_1=0x10b
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_SENDAPDUREQV2L_2=0x10c
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_SIMWARMRESETCANCEL_1=0x103
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_SIMWARMRESETL_1=0x100
-[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_SIMWARMRESETL_2=0x101
-[TRACE]TRACE_INTERNALS[0x88]_CRESPONSETIMERSTORE_ADDTIMEENTRY_1=0x682
-[TRACE]TRACE_INTERNALS[0x88]_CRESPONSETIMER_BEAT_1=0x681
-[TRACE]TRACE_INTERNALS[0x88]_CTSYDELEGATES_DEREGISTERTSYOBJECT_1=0x3e8
-[TRACE]TRACE_INTERNALS[0x88]_CTSYDELEGATES_GETTSYOBJECT_1=0x3e6
-[TRACE]TRACE_INTERNALS[0x88]_CTSYDELEGATES_REGISTERTSYOBJECT_1=0x3e7

--- a/telephonyserverplugins/common_tsy/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -95,10 +95,9 @@
 #endif
 
 // variant information. c32.exe SID is 101F7989
-../commontsy/inc/operatorVariants.ini	z:/private/101f7989/operatorvariants.ini
-
-// by default load the non-dispatcher LTSY
-../phonetsy/data/ltsydata.ini 			z:/private/101f7989/ltsydata.ini
+../commontsy/inc/operatorVariants.ini	/epoc32/data/z/private/101f7989/operatorvariants.ini
+../commontsy/inc/operatorVariants.ini	/epoc32/release/winscw/udeb/z/private/101f7989/operatorvariants.ini
+../commontsy/inc/operatorVariants.ini	/epoc32/release/winscw/urel/z/private/101f7989/operatorvariants.ini
 
 // ROM
 
@@ -140,7 +139,6 @@
 PRJ_TESTMMPFILES
 // component tests
 #include "../test/component/group/bld.inf"
-
 // integration tests
 #include "../test/integration/group/bld.inf"

--- a/telephonyserverplugins/common_tsy/group/ctsy.iby	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/group/ctsy.iby	Wed Sep 01 12:40:21 2010 +0100
@@ -36,7 +36,6 @@
 
 // c32.exe SID is 101F7989
 data=ZPRIVATE\101f7989\operatorVariants.ini		private\101f7989\operatorVariants.ini
-data=ZPRIVATE\101f7989\ltsydata.ini				private\101f7989\ltsydata.ini
 
 //*** customapi ***
 file=ABI_DIR\DEBUG_DIR\CUSTOMAPI.DLL        Sys\Bin\CUSTOMAPI.DLL

--- a/telephonyserverplugins/common_tsy/phonetsy/data/ltsydata.ini	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-[LicenseeTSY]
-LicenseeTsyDllName = licenseetsy.dll
-LicenseeTsyUid3 = 0x2000BEE4

--- a/telephonyserverplugins/common_tsy/phonetsy/group/phonetsy.mmh	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/phonetsy/group/phonetsy.mmh	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -38,8 +38,6 @@
 USERINCLUDE     ../../commontsy/inc/mmgsmwcdma
 USERINCLUDE     ../../licenseetsy_lib/inc
 
-USERINCLUDE ../traces
-
 // Default system include paths for OS extension layer modules.
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 #ifdef	CTSY_DISPATCHER
@@ -56,9 +54,11 @@
 #else
 	LIBRARY         commontsyfordispatcher.lib   // Common TSY for Dispatcher
 #endif //CTSY_DISPATCHER
+LIBRARY         flogger.lib     // Logging
 LIBRARY         licenseetsy.lib // LTSY 
 LIBRARY         featmgr.lib     // for featuremanager
-LIBRARY         efsrv.lib		// config file reading
+
+#include <comms-infras/commsdebugutility.mmh>
 
 //  End of file

--- a/telephonyserverplugins/common_tsy/phonetsy/src/cmmphonefactorytsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/phonetsy/src/cmmphonefactorytsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,33 +16,26 @@
 
 
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmphonefactorytsyTraces.h"
-#endif
 #include <featmgr/featurecontrol.h>
 #include <featureuids.h>
 
-#include <ctsy/mmtsy_names.h>
-#include <ctsy/serviceapi/ctsysatmessagingbase.h>
-
-#include "cmmmessagemanagerbase.h"
 #include "cmmphonefactorytsy.h"
 #include "cmmphonetsy.h"
+#include <ctsy/mmtsy_names.h>
 #include "MmTsy_conf.h"
-
-_LIT(KLtsyIniFile, "ltsydata.ini");
+#include "cmmmessagemanagerbase.h"
+#include <ctsy/serviceapi/ctsysatmessagingbase.h>
 
 #ifdef USING_CTSY_DISPATCHER
-_LIT(KDefaultLicenseeTsyDllName, "ctsydispatcher.dll");
-const TInt KDefaultLicenseeTsyUID3 =  0x10285C38;
-#else
-_LIT(KDefaultLicenseeTsyDllName, "licenseetsy.dll");
-const TInt KDefaultLicenseeTsyUID3 = 0x2000BEE4;
-#endif //USING_CTSY_DISPATCHER
+_LIT(KLicenseeTsyDllName, "licenseetsy.dll");
+_LIT(KCtsyDispatcherDllName, "ctsydispatcher.dll");
+
+const TInt KLicenseeTsyUID3 = 0x2000BEE4;
+const TInt KCtsyDispatcherUID3 =  0x10285C38;
 
 typedef MLtsyFactoryBase*(*TFactoryBaseNewL)();
 
+#endif //USING_CTSY_DISPATCHER
 // ======== MEMBER FUNCTIONS ========
 
 CMmPhoneFactoryTsy::CMmPhoneFactoryTsy()
@@ -69,8 +62,10 @@
 
 CMmPhoneFactoryTsy::~CMmPhoneFactoryTsy()
     {
+#ifdef USING_CTSY_DISPATCHER
     iLoadedLib.Close();
-    }
+#endif //USING_CTSY_DISPATCHER
+	}
 
 // ---------------------------------------------------------------------------
 // CMmPhoneFactoryTsy::NewPhoneL
@@ -80,38 +75,91 @@
 //
 CPhoneBase* CMmPhoneFactoryTsy::NewPhoneL( const TDesC& aName )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWPHONEL_1, "TSY: CMmPhoneFactoryTsy::NewL - NEW LOG");
+TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewL - NEW LOG");
 
     iPhoneTsy = NULL;
 
     // In case of debug build, print flag info.
 #ifdef TF_LOGGING_ENABLED
     
-    RFeatureControl featureControl;
-    TInt err = featureControl.Open();
-    if (err != KErrNone)
+	RFeatureControl featureControl;
+	TInt err = featureControl.Open();
+	if (err != KErrNone)
+		{
+TFLOGSTRING("CMmPhoneFactoryTsy::NewPhoneL - failed to connect to FeatMgr");
+		}
+	else if (featureControl.FeatureSupported(NFeature::KCsVideoTelephony) == KFeatureSupported) 
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWPHONEL_2, "CMmPhoneFactoryTsy::NewPhoneL - failed to connect to FeatMgr");
+TFLOGSTRING("TSY: __CS_VIDEO_TELEPHONY -flag is on");
         }
-    else if (featureControl.FeatureSupported(NFeature::KCsVideoTelephony) == KFeatureSupported) 
+	else if (featureControl.FeatureSupported(NFeature::KEmergencyCallsEnabledInOfflineMode) == KFeatureSupported)
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWPHONEL_3, "TSY: __CS_VIDEO_TELEPHONY -flag is on");
-        }
-    else if (featureControl.FeatureSupported(NFeature::KEmergencyCallsEnabledInOfflineMode) == KFeatureSupported)
-        {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWPHONEL_4, "TSY: __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE -flag is on");
+TFLOGSTRING("TSY: __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE -flag is on");
         }
 
-    featureControl.Close();
+	featureControl.Close();
 #endif
-    
+	
     // Check if the Phone Name is OK
     if ( KErrNone == aName.CompareF( KMmTsyPhoneName ) )
         {
         iMessageRouter = NULL;
-                
-        // Dynamic loading of LTSY
-        iLtsyFactory = LoadLibraryL();
+
+        // Create Message Manager (the 'core' of the LTSY Plug-in API)
+        CMmMessageManagerBase* messageManager = CMmMessageManagerBase::NewL();
+        if ( messageManager )
+            {
+	        CleanupStack::PushL( messageManager );
+        
+            // LTSY Plug-in API successfully created
+TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewL - Starting to open LicenceeTSY");
+            
+            // get TSY message manager callback object
+            MmMessageManagerCallback* callBack = 
+                messageManager->GetMessageManagerCallback();
+            
+#ifdef USING_CTSY_DISPATCHER
+            iLtsyFactory = LoadLibraryL();
+#else
+            // library entry for LTSY, get base factory object
+            iLtsyFactory = LTsyFactoryL();
+            
+#endif //USING_CTSY_DISPATCHER
+
+            if( iLtsyFactory )
+                {
+                // Get message router from LTSY. All current interface versions
+                // have the same GetMessageRouter defined in version 1.
+                MLtsyFactoryV1* ptr_v1 = 
+                	static_cast<MLtsyFactoryV1*>( iLtsyFactory );
+                        
+                iMessageRouter = ptr_v1->GetMessageRouter( *callBack );
+		        User::LeaveIfNull( iMessageRouter );
+        
+		        // Licencee Tsy successfully created
+TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewL -  LicenceeTSY successfully opened");
+
+	            // set the pointer to the message router object
+	            messageManager->SetMessageRouter( iMessageRouter );
+
+	            // Ownership of messageManager passed to iPhoneTsy.
+                CleanupStack::Pop( messageManager );
+	            // Create Phone Tsy (which creates the whole Common TSY)
+TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewL - Starting to open CommonTSY");
+	            iPhoneTsy = CMmPhoneTsy::NewL( 
+	                messageManager, this, iLtsyFactory );
+
+	            if ( iPhoneTsy )
+	                {
+TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewL - CommonTSY successfully opened");
+	                messageManager->SetPhoneTsy( iPhoneTsy );
+	                }
+                }
+            else
+            	{
+    	        CleanupStack::PopAndDestroy( messageManager );
+            	}
+            }
         }
 
     return iPhoneTsy;
@@ -239,24 +287,21 @@
     
     if ( KErrNone == aName.CompareF( KSatToolkit ) )
         {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWSIMATK_1, "TSY: CMmPhoneFactoryTsy::NewSimAtk - Starting to open SimAtkTSY");
-       
-        if (iLtsyFactory == NULL)
-            {
-            TRAP_IGNORE(iLtsyFactory = LoadLibraryL());
-            }
-        
-        if (iLtsyFactory != NULL)
+TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewSimAtk - Starting to open SimAtkTSY");
+
+        if( iLtsyFactory )
             {
             // Get SIM ATK TSY messaging service from LicenseeTsy
-            MLtsyFactoryV1* ptr_v1 = static_cast<MLtsyFactoryV1*>( iLtsyFactory );
+            MLtsyFactoryV1* ptr_v1 = 
+            	static_cast<MLtsyFactoryV1*>( iLtsyFactory );
      
-#ifdef USING_CTSY_DISPATCHER        
-            satMessaging = ptr_v1->GetSatMessagingService(iPhoneTsy->SmsService());
+#ifdef USING_CTSY_DISPATCHER     	
+           	satMessaging = ptr_v1->GetSatMessagingService( 
+            	iPhoneTsy->SmsService() );
 #else
-            satMessaging = ptr_v1->GetSatMessagingService( );
+           	satMessaging = ptr_v1->GetSatMessagingService( );
 #endif
-            }        
+            }
         }
 
     return satMessaging;
@@ -284,7 +329,7 @@
 //
 EXPORT_C CPhoneFactoryBase* LibEntry()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LIBENTRY_1, "TSY: CPhoneFactoryBase::LibEntry()...");
+TFLOGSTRING("TSY: CPhoneFactoryBase::LibEntry()...");
     // return NULL if instantiation fails
     CMmPhoneFactoryTsy* factory(NULL);
     TRAP_IGNORE(factory = CMmPhoneFactoryTsy::NewL()); 
@@ -293,209 +338,48 @@
 
 #ifdef USING_CTSY_DISPATCHER
 TBool CMmPhoneFactoryTsy::UsingCtsyDispatcher()
-/**
- * Function to determine whether the setup is using the CTSY Dispatcher layer.
- */
-    {
-    return ETrue; 
-    }
+	{
+	//function to determine whether the setup is using the CTSY Dispatcher layer.
+#ifdef USING_CTSY_DISPATCHER 
+	return ETrue; 
+#else
+	return EFalse;
+#endif
+	}
+
+MLtsyFactoryBase* CMmPhoneFactoryTsy::LoadLibraryL()
+	{
+	//load library.  This can either be LicenseeTsy or CtsyDispatcher dlls
+	TPtrC dllname;
+	TInt uid3_int;
+	if(UsingCtsyDispatcher())
+		{
+		dllname.Set(KCtsyDispatcherDllName);
+		uid3_int = KCtsyDispatcherUID3;
+		}
+	else
+		{
+		dllname.Set(KLicenseeTsyDllName);
+		uid3_int = KLicenseeTsyUID3;
+		}
+	
+	TFLOGSTRING3("TSY: CMmPhoneFactoryTsy::LoadLibraryL - Loading Dll=%S, UID3=0x%x", &dllname, uid3_int);
+	
+	TUidType uid(KNullUid, KNullUid, TUid::Uid(uid3_int));
+	
+	User::LeaveIfError(iLoadedLib.Load(dllname));
+	
+	// Check the Uid3 is as expected
+	if(iLoadedLib.Type()[2]!=TUid::Uid(uid3_int))
+		User::Leave(KErrBadLibraryEntryPoint);
+	
+	TFactoryBaseNewL libEntry=(TFactoryBaseNewL)iLoadedLib.Lookup(1);	
+	MLtsyFactoryBase* factory=(*libEntry)();	// libEntry may leave.
+	
+	return factory;
+	}
 #endif //USING_CTSY_DISPATCHER
 
-// ---------------------------------------------------------------------------
-// CMmPhoneFactoryTsy::LoadLibraryL
-// Dynamically loads a LTSY.
-// ---------------------------------------------------------------------------
-//
-MLtsyFactoryBase* CMmPhoneFactoryTsy::LoadLibraryL()
-    {
-    TPtrC ltsyDllName(0, NULL);
-    TUint ltsyDllUid = 0;
-    
-#ifdef USING_CTSY_DISPATCHER 
-    ltsyDllName.Set(KDefaultLicenseeTsyDllName);
-    ltsyDllUid = KDefaultLicenseeTsyUID3; 
-#else
-    RBuf configData;
-    CleanupClosePushL(configData);
-    
-    TRAPD(ret,
-          {
-          ReadConfigFileL(&configData);
-          ltsyDllName.Set(ReadDllNameFromConfigL(configData));
-          ltsyDllUid = ReadDllUidFromConfigL(configData);
-          });
-    
-    if (ret != KErrNone)
-        {
-        ltsyDllName.Set(KDefaultLicenseeTsyDllName);
-        ltsyDllUid = KDefaultLicenseeTsyUID3;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CMMPHONEFACTORYTSY_LOADLIBRARYL_1A, "TSY: Failed to load LTSY dll details from ini (error: %d), using defaults", ret);
-        }
-#endif
-    
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_LOADLIBRARYL_1, "TSY: CMmPhoneFactoryTsy::LoadLibraryL - Loading Dll=%S, UID3=0x%8X", ltsyDllName, ltsyDllUid);
-    User::LeaveIfError(iLoadedLib.Load(ltsyDllName));
-    
-#ifndef USING_CTSY_DISPATCHER
-    CleanupStack::PopAndDestroy();  // configData
-#endif
-    
-    // Check the Uid3 is as expected
-    if (iLoadedLib.Type()[2] != TUid::Uid(ltsyDllUid))
-        {
-        User::Leave(KErrBadLibraryEntryPoint);
-        }
-    
-    TFactoryBaseNewL libEntry = reinterpret_cast<TFactoryBaseNewL>(iLoadedLib.Lookup(1));   
-    MLtsyFactoryBase* factory = (*libEntry)();    // libEntry may leave.
-    User::LeaveIfNull(factory);
-    
-    InitCtsyL(factory);
-    
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_LOADLIBRARYL_2, "TSY: Loaded LTSY");
-    return factory;
-    }
-
-void CMmPhoneFactoryTsy::InitCtsyL(MLtsyFactoryBase* aLtsyFactory)
-/**
- * Initialises iPhoneTsy
- */
-    {    
-    if (iPhoneTsy != NULL)
-        {
-        return;
-        }
-    
-    // Create Message Manager (the 'core' of the LTSY Plug-in API)
-    CMmMessageManagerBase* messageManager = CMmMessageManagerBase::NewL();
-    User::LeaveIfNull(messageManager);
-    CleanupStack::PushL( messageManager );
-
-    // get TSY message manager callback object
-    MmMessageManagerCallback* callBack = 
-        messageManager->GetMessageManagerCallback();
-
-    // Get message router from LTSY. All current interface versions
-    // have the same GetMessageRouter defined in version 1.
-    MLtsyFactoryV1* ptr_v1 = 
-         static_cast<MLtsyFactoryV1*>( aLtsyFactory );
-             
-    iMessageRouter = ptr_v1->GetMessageRouter( *callBack );
-    User::LeaveIfNull( iMessageRouter );
-    
-    // set the pointer to the message router object
-    messageManager->SetMessageRouter( iMessageRouter );
-
-    // Ownership of messageManager to be passed to iPhoneTsy.
-    CleanupStack::Pop( messageManager );
-    
-    // LTSY Plug-in API successfully created
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_INITLTSYL_1, "TSY: CMmPhoneFactoryTsy::NewL - Starting to open CommonTSY");
-    // Create Phone Tsy (which creates the whole Common TSY)
-    iPhoneTsy = CMmPhoneTsy::NewL(messageManager, this, aLtsyFactory);
+//  End of File
 
-    if (iPhoneTsy != NULL)
-        {
-        // Licencee Tsy successfully created
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_NORMAL, CMMPHONEFACTORYTSY_INITLTSYL_2, "TSY: CMmPhoneFactoryTsy::NewL -  CommonTSY successfully opened");
-        messageManager->SetPhoneTsy( iPhoneTsy );
-        }
-    else
-        {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_WARNING, CMMPHONEFACTORYTSY_INITLTSYL_3, "TSY: CMmPhoneFactoryTsy::NewL - CommonTSY not opened");
-        }
-    }
 
-TPtrC CMmPhoneFactoryTsy::ReadDllNameFromConfigL(const TDesC& aConfigData)
-    {
-    _LIT(KLicenseeTsyDllKeyName, "LicenseeTsyDllName");
-    TPtrC dllName = GetValueForKeyL(aConfigData, KLicenseeTsyDllKeyName);
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_READDLLNAMEFROMCONFIGL_1, "TSY: Config file: LTSY DLL name = %S", dllName);
-    return dllName;
-    }
-
-TUint CMmPhoneFactoryTsy::ReadDllUidFromConfigL(const TDesC& aConfigData)
-    {
-    _LIT(KLicenseeTsyUid3, "LicenseeTsyUid3");
-
-    const TDesC& rawUid = GetValueForKeyL(aConfigData, KLicenseeTsyUid3);
-    // only take the right 8 characters (ie discard the "0x")
-    ASSERT(rawUid.Length() >= 8);
-    TLex lex(rawUid.Right(8));   
-    TUint uid;
-    User::LeaveIfError(lex.Val(uid, EHex));
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_READUIDFROMCONFIGL_1, "TSY: Config file: LTSY UID3 = 0x%x", uid);
-    return uid;
-    }
-
-/*static*/
-void CMmPhoneFactoryTsy::ReadConfigFileL(RBuf* aConfigData)
-/**
- * Reads config file from system drive or, if not present, from ROM
- *
- * @param aConfigData This buffer gets created and has the ini file contents loaded into it
- */
-    {
-    RFs fs;
-    User::LeaveIfError(fs.Connect());
-    CleanupClosePushL(fs);
-
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_READCONFIGFILE_1, "TSY: Trying to load from %d (C) drive", fs.GetSystemDrive());
-    fs.SetSessionToPrivate(fs.GetSystemDrive());
-
-    RFile configFile;
-    TInt ret = configFile.Open(fs, KLtsyIniFile, EFileShareExclusive);
-    if (ret == KErrNotFound)
-        {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_READCONFIGFILE_2, "TSY: Trying to load ini from %d (Z) drive, as read for system drive returned error %d", EDriveZ, ret);
-        User::LeaveIfError(fs.SetSessionToPrivate(EDriveZ));
-        User::LeaveIfError(configFile.Open(fs, KLtsyIniFile, EFileShareExclusive));
-        }
-
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_READCONFIGFILE_3, "TSY: Reading ini file %S", KLtsyIniFile);
-    
-    CleanupClosePushL(configFile);
-
-    TInt configFileSize;
-    User::LeaveIfError(configFile.Size(configFileSize));
-
-    RBuf8 fileBuf;
-    User::LeaveIfError(fileBuf.Create(configFileSize));
-    CleanupClosePushL(fileBuf);
-    User::LeaveIfError(configFile.Read(fileBuf));
-
-    aConfigData->CreateL(configFileSize);
-    aConfigData->Copy(fileBuf);
-
-    CleanupStack::PopAndDestroy(3, &fs); // fs, configFile, fileBuf
-    }
-
-/*static*/
-TPtrC CMmPhoneFactoryTsy::GetValueForKeyL(const TDesC& aKeysValues, const TDesC& aKey)
-/**
- * Gets the value for a specified key. The expected format is
- * <pre>
- * key1 value1
- * key2 value2
- * </pre>
- * 
- * However the parsing is flexible enough to allow "key1 =value1" as it allows an equals separator and extra whitespace
- * The value cannot include whitespace, even if quoted.
- */
-    {
-    // this matches the bracket expression in this regexp: \w+\s*=?\s*(\w+)[\s$]
-    TInt startOfKey = aKeysValues.Find(aKey);
-    TLex valueExtractor(aKeysValues);
-    valueExtractor.Inc(startOfKey + aKey.Length());
-    valueExtractor.SkipSpaceAndMark();
-    // allow equals separating key and value
-    if (valueExtractor.Peek() == '=')
-        {
-        valueExtractor.Inc();
-        valueExtractor.SkipSpaceAndMark();
-        }
-    
-    TPtrC value = valueExtractor.NextToken();
-    __ASSERT_ALWAYS(value.Length() > 0, User::Leave(KErrCorrupt));
-    return value;
-    }

--- a/telephonyserverplugins/common_tsy/phonetsy/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyserverplugins/common_tsy/phonetsy/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_LOADLIBRARYL_1=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_2=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_3=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_4=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_5=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_6=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_7=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_8=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWSIMATK_1=0x9
-[TRACE]TRACE_INTERNALS[0x88]_LIBENTRY_1=0xc

--- a/telephonyserverplugins/common_tsy/systemstateplugin/group/ctsysystemstateplugin.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/systemstateplugin/group/ctsysystemstateplugin.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -29,8 +29,6 @@
 USERINCLUDE		../../commontsy/inc/mmutility 
 USERINCLUDE		../../commontsy/inc
 
-USERINCLUDE ../traces
-
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 
@@ -47,4 +45,6 @@
 
 LIBRARY			ssmadaptationcli.lib
 
+#include <comms-infras/commsdebugutility.mmh>
 
+

--- a/telephonyserverplugins/common_tsy/systemstateplugin/src/ctsysystemstateplugin.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/systemstateplugin/src/ctsysystemstateplugin.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -13,13 +13,8 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ctsysystemstatepluginTraces.h"
-#endif
-
 #include "ctsysystemstateplugin.h"
+#include <ctsy/tflogger.h>
 
 CCtsySystemStatePlugin* CCtsySystemStatePlugin::NewL()
 	{
@@ -57,7 +52,7 @@
 // ---------------------------------------------------------------------------
 TInt CCtsySystemStatePlugin::Connect()
 	{	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_CONNECT_1, "CCtsySystemStatePlugin::Connect()");
+	TFLOGSTRING("CCtsySystemStatePlugin::Connect()");		
 
 	TInt error (KErrNone);
 	if (!iConnected)	 
@@ -71,7 +66,7 @@
         error = iSsmEmergencyCallRf.SetAsPriorityClient();
 		if (KErrNone != error)
 			{
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_CONNECT_2, "CCtsySystemStatePlugin::Connect()  - SetAsPriorityClient returned %d", error);
+            TFLOGSTRING2("CCtsySystemStatePlugin::Connect()  - SetAsPriorityClient returned %d", error);
             error = KErrNone;
 			}
 	}	
@@ -87,7 +82,7 @@
 void CCtsySystemStatePlugin::ActivateRfForEmergencyCall(MCtsySsmPluginCallback* aSsmPluginCallback,
                                                         TCtsySsmCallbackData& aCallbackData)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_ACTIVATERFFOREMERGENCYCALL_1, "CCtsySystemStatePlugin::ActivateRfForEmergencyCall()" );
+	TFLOGSTRING("CCtsySystemStatePlugin::ActivateRfForEmergencyCall()" );
 
 	iAoChangeRfForEmergencyCall->ActivateRfForEmergencyCall(aSsmPluginCallback, aCallbackData);	
 	}
@@ -100,12 +95,12 @@
 // ---------------------------------------------------------------------------
 void CCtsySystemStatePlugin::DeactivateRfAfterEmergencyCall()
 	{	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_DEACTIVATERFAFTEREMERGENCYCALL_1, "CCtsySystemStatePlugin::DeactivateRfForEmergencyCall()" );
+	TFLOGSTRING("CCtsySystemStatePlugin::DeactivateRfForEmergencyCall()" );		
 	//try to connect
 	TInt err = Connect();
 	if (err)
 		{
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_DEACTIVATERFAFTEREMERGENCYCALL_2, "CCtsySystemStatePlugin::DeactivateRfAfterEmergencyCall() failed to connect %d", err);
+	    TFLOGSTRING2("CCtsySystemStatePlugin::DeactivateRfAfterEmergencyCall() failed to connect %d", err);
 		//do nothing
 		return;
 		}
@@ -119,7 +114,7 @@
 // ---------------------------------------------------------------------------	
 void CCtsySystemStatePlugin::Close()
 	{			
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_CLOSE_1, "CCtsySystemStatePlugin::Close()" );
+	TFLOGSTRING("CCtsySystemStatePlugin::Close()" );				
 	if (iConnected)	
 		{	
 		// if there is some request...
@@ -164,7 +159,7 @@
 void CChangeRfForEmergencyCall::ActivateRfForEmergencyCall(MCtsySsmPluginCallback* aSsmPluginCallback,
 														   TCtsySsmCallbackData& aCallbackData)
    {	
-   OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCHANGERFFOREMERGENCYCALL_ACTIVATERFFOREMERGENCYCALL_1, "CChangeRfForEmergencyCall::ActivateRfForEmergencyCall()" );
+   TFLOGSTRING("CChangeRfForEmergencyCall::ActivateRfForEmergencyCall()" );     
 
    if (EDeactivateBusy == iBusy)
       {
@@ -201,7 +196,7 @@
 // --------------------------------------------------------------------------- 
 void CChangeRfForEmergencyCall::DeactivateRfAfterEmergencyCall()
    {	
-   OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCHANGERFFOREMERGENCYCALL_DEACTIVATERFAFTEREMERGENCYCALL_1, "CChangeRfForEmergencyCall::DeactivateRfAfterEmergencyCall()" );
+   TFLOGSTRING("CChangeRfForEmergencyCall::DeactivateRfAfterEmergencyCall()" );     
 
 		// if we've already sent request  
 		if (EActivateBusy == iBusy)

--- a/telephonyserverplugins/common_tsy/systemstateplugin/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyserverplugins/common_tsy/systemstateplugin/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CCHANGERFFOREMERGENCYCALL_ACTIVATERFFOREMERGENCYCALL_1=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CCHANGERFFOREMERGENCYCALL_DEACTIVATERFAFTEREMERGENCYCALL_1=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CCTSYSYSTEMSTATEPLUGIN_ACTIVATERFFOREMERGENCYCALL_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CCTSYSYSTEMSTATEPLUGIN_CLOSE_1=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CCTSYSYSTEMSTATEPLUGIN_CONNECT_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CCTSYSYSTEMSTATEPLUGIN_CONNECT_2=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CCTSYSYSTEMSTATEPLUGIN_DEACTIVATERFAFTEREMERGENCYCALL_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CCTSYSYSTEMSTATEPLUGIN_DEACTIVATERFAFTEREMERGENCYCALL_2=0x5

--- a/telephonyserverplugins/common_tsy/test/component/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,4 @@
-//
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -13,7 +12,6 @@
 //
 // Description:
 //
-//
 
 
 PRJ_MMPFILES
@@ -56,10 +54,6 @@
 ../scripts/te_ctsycomponent_timeout_all.script  	z:/testdata/scripts/te_ctsycomponent_timeout_all.script
 ../scripts/te_ctsycomponent_fullrun.script			z:/testdata/scripts/te_ctsycomponent_fullrun.script
 
-// Scripts which can be used to copy/remove MockLtsy ini file to/from C: drive
-../scripts/mockltsy_copy_ini_file.script			z:/testdata/scripts/mockltsy_copy_ini_file.script
-../scripts/mockltsy_remove_ini_file.script			z:/testdata/scripts/mockltsy_remove_ini_file.script
-
 ../scripts/te_ctsycomponent_lbs_individual.script	z:/testdata/scripts/te_ctsycomponent_lbs_individual.script
 ../scripts/te_ctsycomponent_smsstore_individual.script	z:/testdata/scripts/te_ctsycomponent_smsstore_individual.script
 ../scripts/te_ctsycomponent_datacallcontrol_individual.script	z:/testdata/scripts/te_ctsycomponent_datacallcontrol_individual.script

--- a/telephonyserverplugins/common_tsy/test/component/group/component_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/group/component_test.pkg	Wed Sep 01 12:40:21 2010 +0100
@@ -35,6 +35,7 @@
 "\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_messagewaiting_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_messagewaiting_individual.script"
 "\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_enstore_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_enstore_individual.script"
 "\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_mbmscontext_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_mbmscontext_individual.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\group\commsdbg.ini"-"c:\logs\commsdbg.ini"
 "\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\102029A2.txt"-"c:\private\10202be9\102029A2.txt"
 "\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\10282DFE.txt"-"c:\private\10202be9\10282DFE.txt"
 "\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\10282826.txt"-"c:\private\10202be9\10282826.txt"

--- a/telephonyserverplugins/common_tsy/test/component/group/te_ctsy_component.iby	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/group/te_ctsy_component.iby	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,4 @@
-//
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -13,7 +12,6 @@
 //
 // Description:
 //
-//
 
 #ifndef __TE_CTSY_COMPONENT_IBY__
 #define __TE_CTSY_COMPONENT_IBY__
@@ -35,7 +33,7 @@
 file=ABI_DIR\DEBUG_DIR\te_ctsy_component.exe		SYSTEM_BINDIR\te_ctsy_component.exe
 
 // executables needed by te_ctsy_component.exe
-file=ABI_DIR\DEBUG_DIR\mocklicenseetsy.dll     	SYSTEM_BINDIR\mocklicenseetsy.dll
+file=ABI_DIR\DEBUG_DIR\licenseetsy.dll     	SYSTEM_BINDIR\licenseetsy.dll
 file=ABI_DIR\DEBUG_DIR\mockltsydll.dll     	SYSTEM_BINDIR\mockltsydll.dll
 
 // MockHWRM
@@ -55,12 +53,6 @@
 data=ZPRIVATE/10202be9/10205043.txt 	private\10202be9\10205043.txt
 #endif //HWRM_IS_SUPPORTED
 
-// MockLTSY
-data=EPOCROOT##epoc32\data\z\testdata\configs\ltsydata_mock.ini 		     	testdata\configs\ltsydata_mock.ini
-// MockLTSY scripts that allow dynamic loading of mocklicenseetsy.dll
-data=EPOCROOT##epoc32\data\z\testdata\scripts\mockltsy_copy_ini_file.script		testdata\scripts\mockltsy_copy_ini_file.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\mockltsy_remove_ini_file.script		testdata\scripts\mockltsy_remove_ini_file.script
-
 // Runnable Scripts
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_ctsycomponent.script			testdata\scripts\te_ctsycomponent.script
 data=EPOCROOT##epoc32\data\z\testdata\scripts\te_ctsycomponent_timeout_all.script    testdata\scripts\te_ctsycomponent_timeout_all.script

--- a/telephonyserverplugins/common_tsy/test/component/group/te_ctsy_component_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callemergency_individual.script"-"c:\testdata\scripts\te_ctsycomponent_callemergency_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_datacallcontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_datacallcontrol_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callbarring_individual.script"-"c:\testdata\scripts\te_ctsycomponent_callbarring_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_sessionmanagement_individual.script"-"c:\testdata\scripts\te_ctsycomponent_sessionmanagement_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_eapauthentication_individual.script"-"c:\testdata\scripts\te_ctsycomponent_eapauthentication_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_usernetworkaccess_individual.script"-"c:\testdata\scripts\te_ctsycomponent_usernetworkaccess_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_networkcontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_networkcontrol_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_dtmf_individual.script"-"c:\testdata\scripts\te_ctsycomponent_dtmf_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_packetservice_individual.script"-"c:\testdata\scripts\te_ctsycomponent_packetservice_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_smsstore_individual.script"-"c:\testdata\scripts\te_ctsycomponent_smsstore_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_supplementaryservicecaps_individual.script"-"c:\testdata\scripts\te_ctsycomponent_supplementaryservicecaps_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_usimapplication_individual.script"-"c:\testdata\scripts\te_ctsycomponent_usimapplication_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonecontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonecontrol_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_smspstore_individual.script"-"c:\testdata\scripts\te_ctsycomponent_smspstore_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_smsmessaging_individual.script"-"c:\testdata\scripts\te_ctsycomponent_smsmessaging_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonecapability_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonecapability_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_smartcardapplication_individual.script"-"c:\testdata\scripts\te_ctsycomponent_smartcardapplication_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_alternatelineservice_individual.script"-"c:\testdata\scripts\te_ctsycomponent_alternatelineservice_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_ussdmessaging_individual.script"-"c:\testdata\scripts\te_ctsycomponent_ussdmessaging_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonebookstore_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonebookstore_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_privacy_individual.script"-"c:\testdata\scripts\te_ctsycomponent_privacy_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callforwarding_individual.script"-"c:\testdata\scripts\te_ctsycomponent_callforwarding_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_multicallcallcontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_multicallcallcontrol_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_networksecurity_individual.script"-"c:\testdata\scripts\te_ctsycomponent_networksecurity_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callwaiting_individual.script"-"c:\testdata\scripts\te_ctsycomponent_callwaiting_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_signalstrength_individual.script"-"c:\testdata\scripts\te_ctsycomponent_signalstrength_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonepower_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonepower_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_linecontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_linecontrol_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_personalisation_individual.script"-"c:\testdata\scripts\te_ctsycomponent_personalisation_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_multimediacallcontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_multimediacallcontrol_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phoneidentity_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phoneidentity_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_conferencecallcontrol_individual.script"-"c:\testdata\scripts\te_ctsycomponent_conferencecallcontrol_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonestore_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonestore_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonesecurity_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonesecurity_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_authorisation_individual.script"-"c:\testdata\scripts\te_ctsycomponent_authorisation_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_apncontrollist_individual.script"-"c:\testdata\scripts\te_ctsycomponent_apncontrollist_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_packetqos_individual.script"-"c:\testdata\scripts\te_ctsycomponent_packetqos_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_packetcontext_individual.script"-"c:\testdata\scripts\te_ctsycomponent_packetcontext_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_trafficchannel_individual.script"-"c:\testdata\scripts\te_ctsycomponent_trafficchannel_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_alternatingcall_individual.script"-"c:\testdata\scripts\te_ctsycomponent_alternatingcall_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callownership_individual.script"-"c:\testdata\scripts\te_ctsycomponent_callownership_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_subscriberinfo_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_subscriberinfo_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_airtimeduration_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_airtimeduration_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_customipc_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_customipc_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_usertousersignalling_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_usertousersignalling_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_featmgr_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_featmgr_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_systemstate_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_systemstate_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callcontrol_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callcontrol_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callinformation_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callinformation_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_telephonyaudiocontrol_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_telephonyaudiocontrol_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_onstore_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_onstore_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_broadcastmessaging_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_broadcastmessaging_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callcompletion_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callcompletion_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_callcost_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_callcost_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_mms_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_mms_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_fax_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_fax_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_fixeddialling_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_fixeddialling_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_ims_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_ims_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_indicator_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_indicator_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_lbs_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_lbs_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_mailboxnumbers_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_mailboxnumbers_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_messagewaiting_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_messagewaiting_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_enstore_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_enstore_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_mbmscontext_individual.script"-"c:\TestData\Scripts\te_ctsycomponent_mbmscontext_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\102029A2.txt"-"c:\private\10202be9\102029A2.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\10282DFE.txt"-"c:\private\10202be9\10282DFE.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\10282826.txt"-"c:\private\10202be9\10282826.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\cenrep_ini\10282827.txt"-"c:\private\10202be9\10282827.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\standard.ini"-"c:\testdata\configs\standard.ini"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001b.ini"-"c:\testdata\configs\testgetphoneid0001b.ini"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001c.ini"-"c:\testdata\configs\testgetphoneid0001c.ini"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001d.ini"-"c:\testdata\configs\testgetphoneid0001d.ini"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001e.ini"-"c:\testdata\configs\testgetphoneid0001e.ini"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001f.ini"-"c:\testdata\configs\testgetphoneid0001f.ini"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001g.ini"-"c:\testdata\configs\testgetphoneid0001g.ini"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001h.ini"-"c:\testdata\configs\testgetphoneid0001h.ini"
-"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\testdata\testgetphoneid0001i.ini"-"c:\testdata\configs\testgetphoneid0001i.ini"
\ No newline at end of file

--- a/telephonyserverplugins/common_tsy/test/component/inc/cctsycallcontrolfu.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/inc/cctsycallcontrolfu.h	Wed Sep 01 12:40:21 2010 +0100
@@ -115,12 +115,6 @@
 	void TestTerminateAllCalls0002L();
 	void TestTerminateAllCalls0004L();
 	void TestTerminateAllCalls0005L();
-    void TestTerminateActiveCalls0001L();
-    void TestTerminateActiveCalls0001bL();
-    void TestTerminateActiveCalls0001cL();
-    void TestTerminateActiveCalls0002L();
-    void TestTerminateActiveCalls0004L();
-    void TestTerminateActiveCalls0005L();
 	void TestSetIncomingCallType0001L();
 	void TestAnswerIncomingCallISV0001L();
 	void TestAnswerIncomingCallISV0002L();

--- a/telephonyserverplugins/common_tsy/test/component/inc/cctsyfixeddiallingfu.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/inc/cctsyfixeddiallingfu.h	Wed Sep 01 12:40:21 2010 +0100
@@ -38,7 +38,6 @@
 	void TestDialNoFdnCheck0001L();
 	void TestDialNoFdnCheck0001bL();
 	void TestDialNoFdnCheck0001cL();
-	void TestDialNoFdnCheck0001dL();
 	void TestDialNoFdnCheck0002L();
 	void TestDialNoFdnCheck0004L();
 	void TestDialNoFdnCheck0005L();

--- a/telephonyserverplugins/common_tsy/test/component/inc/cctsynetworkcontrolfu.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/inc/cctsynetworkcontrolfu.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 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"
@@ -105,11 +105,23 @@
 	void TestSetNetworkSelectionSetting0005L();
 	void TestGetLastUsedAccessTechnology0001L();
 	void TestStorePreferredNetworksListL0001L();
+    void TestStorePreferredNetworksListL0001aL();
+    void TestStorePreferredNetworksListL0001bL();
+    void TestStorePreferredNetworksListL0002L();
+    void TestStorePreferredNetworksListL0004L();    
+	void TestRetrieveMobilePhonePreferredNetworks0001L();
+	void TestRetrieveMobilePhonePreferredNetworks0001aL();
+	void TestRetrieveMobilePhonePreferredNetworks0001bL();
+	void TestRetrieveMobilePhonePreferredNetworks0001cL();
+	void TestRetrieveMobilePhonePreferredNetworks0002L();
+    void TestRetrieveMobilePhonePreferredNetworks0004L();	
 	void TestGetNetworkRegistrationStatus0001L();
 	void TestGetNetworkRegistrationStatus0002L();
 	void TestGetNetworkRegistrationStatus0004L();
 	void TestGetNetworkRegistrationStatus0005L();
 	void TestNotifyPreferredNetworksListChange0001L();
+    void TestNotifyPreferredNetworksListChange0002L();
+    void TestNotifyPreferredNetworksListChange0004L();    
 	void TestNotifyNetworkSelectionSettingChange0001L();
 	void TestNotifyNetworkSelectionSettingChange0002L();
 	void TestNotifyNetworkSelectionSettingChange0004L();

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/bwins/licenseetsyu.def	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,3 @@
+EXPORTS
+	?LTsyFactoryL@@YAPAVMLtsyFactoryBase@@XZ @ 1 NONAME ; class MLtsyFactoryBase * LTsyFactoryL(void)
+

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/bwins/mocklicenseetsyu.def	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LTsyFactoryL@@YAPAVMLtsyFactoryBase@@XZ @ 1  NONAME ; class MLtsyFactoryBase * LTsyFactoryL(void)
-

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/data/ltsydata_mock.ini	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-[LicenseeTSY]
-LicenseeTsyDllName = mocklicenseetsy.dll
-LicenseeTsyUid3 = 0x2002EA67

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/eabi/licenseetsyu.def	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,947 @@
+EXPORTS
+	_Z12LTsyFactoryLv @ 1 NONAME
+	_ZTI14TMockLtsyData1I10TGsmCbsMsgE @ 2 NONAME
+	_ZTI14TMockLtsyData1I11TONStoreMsgE @ 3 NONAME
+	_ZTI14TMockLtsyData1I12TRfStateInfoE @ 4 NONAME
+	_ZTI14TMockLtsyData1I12TServiceTypeE @ 5 NONAME
+	_ZTI14TMockLtsyData1I14TContextParamsE @ 6 NONAME
+	_ZTI14TMockLtsyData1I16TENStoreResponseE @ 7 NONAME
+	_ZTI14TMockLtsyData1I20TLockSettingPasswordE @ 8 NONAME
+	_ZTI14TMockLtsyData1I21TContextConfigurationE @ 9 NONAME
+	_ZTI14TMockLtsyData1I24TCbsCbmiAndLangAndFilterE @ 10 NONAME
+	_ZTI14TMockLtsyData1I25TMbmsNetworkServiceStatusE @ 11 NONAME
+	_ZTI14TMockLtsyData1I25TSendSmsDataAndAttributesE @ 12 NONAME
+	_ZTI14TMockLtsyData1I31TMmMbmsMonitorServiceListParamsE @ 13 NONAME
+	_ZTI14TMockLtsyData1I4TBufILi10EEE @ 14 NONAME
+	_ZTI14TMockLtsyData1I4TBufILi128EEE @ 15 NONAME
+	_ZTI14TMockLtsyData1I4TBufILi15EEE @ 16 NONAME
+	_ZTI14TMockLtsyData1I4TBufILi16EEE @ 17 NONAME
+	_ZTI14TMockLtsyData1I4TBufILi32EEE @ 18 NONAME
+	_ZTI14TMockLtsyData1I4TBufILi6EEE @ 19 NONAME
+	_ZTI14TMockLtsyData1I5TBuf8ILi128EEE @ 20 NONAME
+	_ZTI14TMockLtsyData1I5TBuf8ILi15EEE @ 21 NONAME
+	_ZTI14TMockLtsyData1I5TBuf8ILi16EEE @ 22 NONAME
+	_ZTI14TMockLtsyData1I5TCharE @ 23 NONAME
+	_ZTI14TMockLtsyData1I5TTimeE @ 24 NONAME
+	_ZTI14TMockLtsyData1I7TSmsMsgE @ 25 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI11TAlsSupportEE @ 26 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI11TOperatorIdEE @ 27 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI11TViagParamsEE @ 28 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI12THSxPAStatusEE @ 29 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI12TSetAlsBlockEE @ 30 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI12TSimFileInfoEE @ 31 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI13TSetDriveModeEE @ 32 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI14TBandSelectionEE @ 33 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI16TNetworkModeCapsEE @ 34 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI16TSetAlwaysOnModeEE @ 35 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI18TGetAlsBlockStatusEE @ 36 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI18TViagCacheRecordIdEE @ 37 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI19TViagUHZIUESettingsEE @ 38 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI20TEmerNumberCheckModeEE @ 39 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI5TApduEE @ 40 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI9TDtmfInfoEE @ 41 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone11TAPNEntryV3EE @ 42 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone14TMobileServiceEE @ 43 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone16TMobilePhoneLockEE @ 44 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone16TMobilePhoneNITZEE @ 45 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone19TMobilePhoneALSLineEE @ 46 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone21TMobilePhoneFdnStatusEE @ 47 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone21TMobilePhoneIdServiceEE @ 48 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone22TImsAuthenticateDataV5EE @ 49 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 50 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 51 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockStatusEE @ 52 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCBConditionEE @ 53 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCFConditionEE @ 54 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone23TMobilePhoneNetworkModeEE @ 55 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 56 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone24TMobilePhoneServiceTableEE @ 57 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 58 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 59 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 60 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 61 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 62 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 63 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneSecurityEventEE @ 64 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 65 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 66 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 67 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 68 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone28TAPNControlListServiceStatusEE @ 69 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 70 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 71 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 72 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 73 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 74 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 75 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 76 NONAME
+	_ZTI14TMockLtsyData1IN14RMobileONStore16TMobileONEntryV1EE @ 77 NONAME
+	_ZTI14TMockLtsyData1IN14RPacketContext17TContextConfig_R5EE @ 78 NONAME
+	_ZTI14TMockLtsyData1IN14RPacketContext18TContextConfigCDMAEE @ 79 NONAME
+	_ZTI14TMockLtsyData1IN14RPacketContext18TContextConfigGPRSEE @ 80 NONAME
+	_ZTI14TMockLtsyData1IN14RPacketContext20TContextConfigR99_R4EE @ 81 NONAME
+	_ZTI14TMockLtsyData1IN14RPacketService11TAttachModeEE @ 82 NONAME
+	_ZTI14TMockLtsyData1IN14RPacketService16TPreferredBearerEE @ 83 NONAME
+	_ZTI14TMockLtsyData1IN14RPacketService19TRegistrationStatusEE @ 84 NONAME
+	_ZTI14TMockLtsyData1IN14RPacketService7TStatusEE @ 85 NONAME
+	_ZTI14TMockLtsyData1IN14RPacketService8TMSClassEE @ 86 NONAME
+	_ZTI14TMockLtsyData1IN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 87 NONAME
+	_ZTI14TMockLtsyData1IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 88 NONAME
+	_ZTI14TMockLtsyData1IN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 89 NONAME
+	_ZTI14TMockLtsyData1IN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 90 NONAME
+	_ZTI14TMockLtsyData1IN19RMobileSmsMessaging16TMobileSmsBearerEE @ 91 NONAME
+	_ZTI14TMockLtsyData1IN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 92 NONAME
+	_ZTI14TMockLtsyData1IN6RPhone7TStatusEE @ 93 NONAME
+	_ZTI14TMockLtsyData1IP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 94 NONAME
+	_ZTI14TMockLtsyData1IP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 95 NONAME
+	_ZTI14TMockLtsyData1IP13CArrayPtrFlatI14TSmsParametersEE @ 96 NONAME
+	_ZTI14TMockLtsyData1IP13CArrayPtrFlatI16TENStoreResponseEE @ 97 NONAME
+	_ZTI14TMockLtsyData1IP13CArrayPtrFlatI7TSmsMsgEE @ 98 NONAME
+	_ZTI14TMockLtsyData1IP18CMobilePhoneCFListE @ 99 NONAME
+	_ZTI14TMockLtsyData1IP18CMobilePhoneCWListE @ 100 NONAME
+	_ZTI14TMockLtsyData1IP25CMobilePhoneNetworkListV2E @ 101 NONAME
+	_ZTI14TMockLtsyData1IP27CMobilePhoneBroadcastIdListE @ 102 NONAME
+	_ZTI14TMockLtsyData1IP29CPcktMbmsMonitoredServiceListE @ 103 NONAME
+	_ZTI14TMockLtsyData1IP4TBufILi100EEE @ 104 NONAME
+	_ZTI14TMockLtsyData1IP6TDesC8E @ 105 NONAME
+	_ZTI14TMockLtsyData1IPN12RMmCustomAPI20TSimCardReaderStatusEE @ 106 NONAME
+	_ZTI14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 107 NONAME
+	_ZTI14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 108 NONAME
+	_ZTI14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 109 NONAME
+	_ZTI14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 110 NONAME
+	_ZTI14TMockLtsyData1IPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 111 NONAME
+	_ZTI14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 112 NONAME
+	_ZTI14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 113 NONAME
+	_ZTI14TMockLtsyData1IPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 114 NONAME
+	_ZTI14TMockLtsyData1IhE @ 115 NONAME
+	_ZTI14TMockLtsyData1IiE @ 116 NONAME
+	_ZTI14TMockLtsyData1IjE @ 117 NONAME
+	_ZTI14TMockLtsyData1IlE @ 118 NONAME
+	_ZTI14TMockLtsyData1ImE @ 119 NONAME
+	_ZTI14TMockLtsyData1IsE @ 120 NONAME
+	_ZTI14TMockLtsyData1ItE @ 121 NONAME
+	_ZTI14TMockLtsyData2I14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 122 NONAME
+	_ZTI14TMockLtsyData2I14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 123 NONAME
+	_ZTI14TMockLtsyData2I14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 124 NONAME
+	_ZTI14TMockLtsyData2I21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 125 NONAME
+	_ZTI14TMockLtsyData2I4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 126 NONAME
+	_ZTI14TMockLtsyData2I4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 127 NONAME
+	_ZTI14TMockLtsyData2I4TBufILi16EE12TContextMiscE @ 128 NONAME
+	_ZTI14TMockLtsyData2I4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 129 NONAME
+	_ZTI14TMockLtsyData2I4TBufILi16EE5TBuf8ILi1EEE @ 130 NONAME
+	_ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 131 NONAME
+	_ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 132 NONAME
+	_ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 133 NONAME
+	_ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 134 NONAME
+	_ZTI14TMockLtsyData2I4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 135 NONAME
+	_ZTI14TMockLtsyData2I4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 136 NONAME
+	_ZTI14TMockLtsyData2I4TBufILi16EES1_E @ 137 NONAME
+	_ZTI14TMockLtsyData2I4TBufILi16EEiE @ 138 NONAME
+	_ZTI14TMockLtsyData2I5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 139 NONAME
+	_ZTI14TMockLtsyData2I5TTimeiE @ 140 NONAME
+	_ZTI14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 141 NONAME
+	_ZTI14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 142 NONAME
+	_ZTI14TMockLtsyData2IN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 143 NONAME
+	_ZTI14TMockLtsyData2IN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 144 NONAME
+	_ZTI14TMockLtsyData2IN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 145 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 146 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 147 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 148 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 149 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 150 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 151 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 152 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 153 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 154 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 155 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 156 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 157 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 158 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 159 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 160 NONAME
+	_ZTI14TMockLtsyData2IN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 161 NONAME
+	_ZTI14TMockLtsyData2IN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 162 NONAME
+	_ZTI14TMockLtsyData2IN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 163 NONAME
+	_ZTI14TMockLtsyData2IN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 164 NONAME
+	_ZTI14TMockLtsyData2IN14RPacketService7TStatusEiE @ 165 NONAME
+	_ZTI14TMockLtsyData2IN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 166 NONAME
+	_ZTI14TMockLtsyData2IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 167 NONAME
+	_ZTI14TMockLtsyData2IN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 168 NONAME
+	_ZTI14TMockLtsyData2IP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 169 NONAME
+	_ZTI14TMockLtsyData2IP13CArrayPtrFlatI7TSmsMsgEiE @ 170 NONAME
+	_ZTI14TMockLtsyData2IP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 171 NONAME
+	_ZTI14TMockLtsyData2IP6TDesC8S1_E @ 172 NONAME
+	_ZTI14TMockLtsyData2IP6TDesC8iE @ 173 NONAME
+	_ZTI14TMockLtsyData2Ih4TBufILi10EEE @ 174 NONAME
+	_ZTI14TMockLtsyData2IhiE @ 175 NONAME
+	_ZTI14TMockLtsyData2IiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 176 NONAME
+	_ZTI14TMockLtsyData2IiP7TSmsMsgE @ 177 NONAME
+	_ZTI14TMockLtsyData2IiiE @ 178 NONAME
+	_ZTI14TMockLtsyData2IjiE @ 179 NONAME
+	_ZTI14TMockLtsyData2IlaE @ 180 NONAME
+	_ZTI14TMockLtsyData2Is5TBuf8ILi165EEE @ 181 NONAME
+	_ZTI15CMockLtsyEngine @ 182 NONAME
+	_ZTI16CMmCustomStubExt @ 183 NONAME
+	_ZTI16CMmMessageRouter @ 184 NONAME
+	_ZTI17TMockLtsyData1BufI10TGsmCbsMsgE @ 185 NONAME
+	_ZTI17TMockLtsyData1BufI11TONStoreMsgE @ 186 NONAME
+	_ZTI17TMockLtsyData1BufI12TRfStateInfoE @ 187 NONAME
+	_ZTI17TMockLtsyData1BufI12TServiceTypeE @ 188 NONAME
+	_ZTI17TMockLtsyData1BufI14TContextParamsE @ 189 NONAME
+	_ZTI17TMockLtsyData1BufI16TENStoreResponseE @ 190 NONAME
+	_ZTI17TMockLtsyData1BufI20TLockSettingPasswordE @ 191 NONAME
+	_ZTI17TMockLtsyData1BufI21TContextConfigurationE @ 192 NONAME
+	_ZTI17TMockLtsyData1BufI24TCbsCbmiAndLangAndFilterE @ 193 NONAME
+	_ZTI17TMockLtsyData1BufI25TMbmsNetworkServiceStatusE @ 194 NONAME
+	_ZTI17TMockLtsyData1BufI25TSendSmsDataAndAttributesE @ 195 NONAME
+	_ZTI17TMockLtsyData1BufI31TMmMbmsMonitorServiceListParamsE @ 196 NONAME
+	_ZTI17TMockLtsyData1BufI4TBufILi10EEE @ 197 NONAME
+	_ZTI17TMockLtsyData1BufI4TBufILi128EEE @ 198 NONAME
+	_ZTI17TMockLtsyData1BufI4TBufILi15EEE @ 199 NONAME
+	_ZTI17TMockLtsyData1BufI4TBufILi16EEE @ 200 NONAME
+	_ZTI17TMockLtsyData1BufI4TBufILi32EEE @ 201 NONAME
+	_ZTI17TMockLtsyData1BufI4TBufILi6EEE @ 202 NONAME
+	_ZTI17TMockLtsyData1BufI5TBuf8ILi128EEE @ 203 NONAME
+	_ZTI17TMockLtsyData1BufI5TBuf8ILi15EEE @ 204 NONAME
+	_ZTI17TMockLtsyData1BufI5TBuf8ILi16EEE @ 205 NONAME
+	_ZTI17TMockLtsyData1BufI5TCharE @ 206 NONAME
+	_ZTI17TMockLtsyData1BufI5TTimeE @ 207 NONAME
+	_ZTI17TMockLtsyData1BufI7TSmsMsgE @ 208 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI11TAlsSupportEE @ 209 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI11TOperatorIdEE @ 210 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI11TViagParamsEE @ 211 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI12THSxPAStatusEE @ 212 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI12TSetAlsBlockEE @ 213 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI12TSimFileInfoEE @ 214 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI13TSetDriveModeEE @ 215 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI14TBandSelectionEE @ 216 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI16TNetworkModeCapsEE @ 217 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI16TSetAlwaysOnModeEE @ 218 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI18TGetAlsBlockStatusEE @ 219 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI18TViagCacheRecordIdEE @ 220 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI19TViagUHZIUESettingsEE @ 221 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI20TEmerNumberCheckModeEE @ 222 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI5TApduEE @ 223 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI9TDtmfInfoEE @ 224 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone11TAPNEntryV3EE @ 225 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone14TMobileServiceEE @ 226 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneLockEE @ 227 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneNITZEE @ 228 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone19TMobilePhoneALSLineEE @ 229 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneFdnStatusEE @ 230 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneIdServiceEE @ 231 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone22TImsAuthenticateDataV5EE @ 232 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 233 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 234 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockStatusEE @ 235 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCBConditionEE @ 236 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCFConditionEE @ 237 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneNetworkModeEE @ 238 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 239 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneServiceTableEE @ 240 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 241 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 242 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 243 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 244 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 245 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 246 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneSecurityEventEE @ 247 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 248 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 249 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 250 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 251 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone28TAPNControlListServiceStatusEE @ 252 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 253 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 254 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 255 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 256 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 257 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 258 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 259 NONAME
+	_ZTI17TMockLtsyData1BufIN14RMobileONStore16TMobileONEntryV1EE @ 260 NONAME
+	_ZTI17TMockLtsyData1BufIN14RPacketContext17TContextConfig_R5EE @ 261 NONAME
+	_ZTI17TMockLtsyData1BufIN14RPacketContext18TContextConfigCDMAEE @ 262 NONAME
+	_ZTI17TMockLtsyData1BufIN14RPacketContext18TContextConfigGPRSEE @ 263 NONAME
+	_ZTI17TMockLtsyData1BufIN14RPacketContext20TContextConfigR99_R4EE @ 264 NONAME
+	_ZTI17TMockLtsyData1BufIN14RPacketService11TAttachModeEE @ 265 NONAME
+	_ZTI17TMockLtsyData1BufIN14RPacketService16TPreferredBearerEE @ 266 NONAME
+	_ZTI17TMockLtsyData1BufIN14RPacketService19TRegistrationStatusEE @ 267 NONAME
+	_ZTI17TMockLtsyData1BufIN14RPacketService7TStatusEE @ 268 NONAME
+	_ZTI17TMockLtsyData1BufIN14RPacketService8TMSClassEE @ 269 NONAME
+	_ZTI17TMockLtsyData1BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 270 NONAME
+	_ZTI17TMockLtsyData1BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 271 NONAME
+	_ZTI17TMockLtsyData1BufIN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 272 NONAME
+	_ZTI17TMockLtsyData1BufIN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 273 NONAME
+	_ZTI17TMockLtsyData1BufIN19RMobileSmsMessaging16TMobileSmsBearerEE @ 274 NONAME
+	_ZTI17TMockLtsyData1BufIN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 275 NONAME
+	_ZTI17TMockLtsyData1BufIN6RPhone7TStatusEE @ 276 NONAME
+	_ZTI17TMockLtsyData1BufIP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 277 NONAME
+	_ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 278 NONAME
+	_ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI14TSmsParametersEE @ 279 NONAME
+	_ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI16TENStoreResponseEE @ 280 NONAME
+	_ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI7TSmsMsgEE @ 281 NONAME
+	_ZTI17TMockLtsyData1BufIP18CMobilePhoneCFListE @ 282 NONAME
+	_ZTI17TMockLtsyData1BufIP18CMobilePhoneCWListE @ 283 NONAME
+	_ZTI17TMockLtsyData1BufIP25CMobilePhoneNetworkListV2E @ 284 NONAME
+	_ZTI17TMockLtsyData1BufIP27CMobilePhoneBroadcastIdListE @ 285 NONAME
+	_ZTI17TMockLtsyData1BufIP29CPcktMbmsMonitoredServiceListE @ 286 NONAME
+	_ZTI17TMockLtsyData1BufIP4TBufILi100EEE @ 287 NONAME
+	_ZTI17TMockLtsyData1BufIP6TDesC8E @ 288 NONAME
+	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI20TSimCardReaderStatusEE @ 289 NONAME
+	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 290 NONAME
+	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 291 NONAME
+	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 292 NONAME
+	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 293 NONAME
+	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 294 NONAME
+	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 295 NONAME
+	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 296 NONAME
+	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 297 NONAME
+	_ZTI17TMockLtsyData1BufIhE @ 298 NONAME
+	_ZTI17TMockLtsyData1BufIiE @ 299 NONAME
+	_ZTI17TMockLtsyData1BufIjE @ 300 NONAME
+	_ZTI17TMockLtsyData1BufIlE @ 301 NONAME
+	_ZTI17TMockLtsyData1BufImE @ 302 NONAME
+	_ZTI17TMockLtsyData1BufIsE @ 303 NONAME
+	_ZTI17TMockLtsyData1BufItE @ 304 NONAME
+	_ZTI17TMockLtsyData2BufI14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 305 NONAME
+	_ZTI17TMockLtsyData2BufI14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 306 NONAME
+	_ZTI17TMockLtsyData2BufI14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 307 NONAME
+	_ZTI17TMockLtsyData2BufI21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 308 NONAME
+	_ZTI17TMockLtsyData2BufI4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 309 NONAME
+	_ZTI17TMockLtsyData2BufI4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 310 NONAME
+	_ZTI17TMockLtsyData2BufI4TBufILi16EE12TContextMiscE @ 311 NONAME
+	_ZTI17TMockLtsyData2BufI4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 312 NONAME
+	_ZTI17TMockLtsyData2BufI4TBufILi16EE5TBuf8ILi1EEE @ 313 NONAME
+	_ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 314 NONAME
+	_ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 315 NONAME
+	_ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 316 NONAME
+	_ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 317 NONAME
+	_ZTI17TMockLtsyData2BufI4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 318 NONAME
+	_ZTI17TMockLtsyData2BufI4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 319 NONAME
+	_ZTI17TMockLtsyData2BufI4TBufILi16EES1_E @ 320 NONAME
+	_ZTI17TMockLtsyData2BufI4TBufILi16EEiE @ 321 NONAME
+	_ZTI17TMockLtsyData2BufI5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 322 NONAME
+	_ZTI17TMockLtsyData2BufI5TTimeiE @ 323 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 324 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 325 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 326 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 327 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 328 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 329 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 330 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 331 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 332 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 333 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 334 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 335 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 336 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 337 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 338 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 339 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 340 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 341 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 342 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 343 NONAME
+	_ZTI17TMockLtsyData2BufIN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 344 NONAME
+	_ZTI17TMockLtsyData2BufIN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 345 NONAME
+	_ZTI17TMockLtsyData2BufIN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 346 NONAME
+	_ZTI17TMockLtsyData2BufIN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 347 NONAME
+	_ZTI17TMockLtsyData2BufIN14RPacketService7TStatusEiE @ 348 NONAME
+	_ZTI17TMockLtsyData2BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 349 NONAME
+	_ZTI17TMockLtsyData2BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 350 NONAME
+	_ZTI17TMockLtsyData2BufIN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 351 NONAME
+	_ZTI17TMockLtsyData2BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 352 NONAME
+	_ZTI17TMockLtsyData2BufIP13CArrayPtrFlatI7TSmsMsgEiE @ 353 NONAME
+	_ZTI17TMockLtsyData2BufIP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 354 NONAME
+	_ZTI17TMockLtsyData2BufIP6TDesC8S1_E @ 355 NONAME
+	_ZTI17TMockLtsyData2BufIP6TDesC8iE @ 356 NONAME
+	_ZTI17TMockLtsyData2BufIh4TBufILi10EEE @ 357 NONAME
+	_ZTI17TMockLtsyData2BufIhiE @ 358 NONAME
+	_ZTI17TMockLtsyData2BufIiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 359 NONAME
+	_ZTI17TMockLtsyData2BufIiP7TSmsMsgE @ 360 NONAME
+	_ZTI17TMockLtsyData2BufIiiE @ 361 NONAME
+	_ZTI17TMockLtsyData2BufIjiE @ 362 NONAME
+	_ZTI17TMockLtsyData2BufIlaE @ 363 NONAME
+	_ZTI17TMockLtsyData2BufIs5TBuf8ILi165EEE @ 364 NONAME
+	_ZTI18CMockLtsyFactoryV1 @ 365 NONAME
+	_ZTI18CMockLtsyFactoryV2 @ 366 NONAME
+	_ZTI18CMockLtsyFactoryV3 @ 367 NONAME
+	_ZTI18TMockLtsyCallData1I4TBufILi129EEE @ 368 NONAME
+	_ZTI18TMockLtsyCallData1IN11RMobileCall16TMobileCallEventEE @ 369 NONAME
+	_ZTI18TMockLtsyCallData1IN11RMobileCall17TMobileCallInfoV1EE @ 370 NONAME
+	_ZTI18TMockLtsyCallData1IN11RMobileCall17TMobileCallStatusEE @ 371 NONAME
+	_ZTI18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV1EE @ 372 NONAME
+	_ZTI18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV2EE @ 373 NONAME
+	_ZTI18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV7EE @ 374 NONAME
+	_ZTI18TMockLtsyCallData1IN11RMobileCall21TMobileCallDataCapsV1EE @ 375 NONAME
+	_ZTI18TMockLtsyCallData1IN11RMobileCall22TMobileCallHscsdInfoV8EE @ 376 NONAME
+	_ZTI18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV1EE @ 377 NONAME
+	_ZTI18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV2EE @ 378 NONAME
+	_ZTI18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV8EE @ 379 NONAME
+	_ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV1EE @ 380 NONAME
+	_ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV2EE @ 381 NONAME
+	_ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV7EE @ 382 NONAME
+	_ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV8EE @ 383 NONAME
+	_ZTI18TMockLtsyCallData1IN12RMobilePhone19TMobilePhonePrivacyEE @ 384 NONAME
+	_ZTI18TMockLtsyCallData1IN5RCall14TBearerServiceEE @ 385 NONAME
+	_ZTI18TMockLtsyCallData1IN5RCall7TStatusEE @ 386 NONAME
+	_ZTI18TMockLtsyCallData1IN5RCall9TCommPortEE @ 387 NONAME
+	_ZTI18TMockLtsyCallData1IiE @ 388 NONAME
+	_ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 389 NONAME
+	_ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 390 NONAME
+	_ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 391 NONAME
+	_ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 392 NONAME
+	_ZTI18TMockLtsyCallData2IN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 393 NONAME
+	_ZTI18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 394 NONAME
+	_ZTI18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 395 NONAME
+	_ZTI18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 396 NONAME
+	_ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 397 NONAME
+	_ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 398 NONAME
+	_ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 399 NONAME
+	_ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 400 NONAME
+	_ZTI18TMockLtsyCallData2IiiE @ 401 NONAME
+	_ZTI19CMockSmsMessHandler @ 402 NONAME
+	_ZTI20CMockCallMessHandler @ 403 NONAME
+	_ZTI21CMockPhoneMessHandler @ 404 NONAME
+	_ZTI21TMockLtsyCallData1BufI4TBufILi129EEE @ 405 NONAME
+	_ZTI21TMockLtsyCallData1BufIN11RMobileCall16TMobileCallEventEE @ 406 NONAME
+	_ZTI21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallInfoV1EE @ 407 NONAME
+	_ZTI21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallStatusEE @ 408 NONAME
+	_ZTI21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV1EE @ 409 NONAME
+	_ZTI21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV2EE @ 410 NONAME
+	_ZTI21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV7EE @ 411 NONAME
+	_ZTI21TMockLtsyCallData1BufIN11RMobileCall21TMobileCallDataCapsV1EE @ 412 NONAME
+	_ZTI21TMockLtsyCallData1BufIN11RMobileCall22TMobileCallHscsdInfoV8EE @ 413 NONAME
+	_ZTI21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV1EE @ 414 NONAME
+	_ZTI21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV2EE @ 415 NONAME
+	_ZTI21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV8EE @ 416 NONAME
+	_ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV1EE @ 417 NONAME
+	_ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV2EE @ 418 NONAME
+	_ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV7EE @ 419 NONAME
+	_ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV8EE @ 420 NONAME
+	_ZTI21TMockLtsyCallData1BufIN12RMobilePhone19TMobilePhonePrivacyEE @ 421 NONAME
+	_ZTI21TMockLtsyCallData1BufIN5RCall14TBearerServiceEE @ 422 NONAME
+	_ZTI21TMockLtsyCallData1BufIN5RCall7TStatusEE @ 423 NONAME
+	_ZTI21TMockLtsyCallData1BufIN5RCall9TCommPortEE @ 424 NONAME
+	_ZTI21TMockLtsyCallData1BufIiE @ 425 NONAME
+	_ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 426 NONAME
+	_ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 427 NONAME
+	_ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 428 NONAME
+	_ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 429 NONAME
+	_ZTI21TMockLtsyCallData2BufIN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 430 NONAME
+	_ZTI21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 431 NONAME
+	_ZTI21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 432 NONAME
+	_ZTI21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 433 NONAME
+	_ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 434 NONAME
+	_ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 435 NONAME
+	_ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 436 NONAME
+	_ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 437 NONAME
+	_ZTI21TMockLtsyCallData2BufIiiE @ 438 NONAME
+	_ZTI21TMockLtsyContextData1I4TBufILi16EEE @ 439 NONAME
+	_ZTI21TMockLtsyContextData2I4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 440 NONAME
+	_ZTI21TMockLtsyContextData2I4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 441 NONAME
+	_ZTI23CMockPcktQoSMessHandler @ 442 NONAME
+	_ZTI23TMockLtsyPacketQoSData1I4TBufILi16EEE @ 443 NONAME
+	_ZTI23TMockLtsyPhoneBookData1I10TPBFdnInfoE @ 444 NONAME
+	_ZTI23TMockLtsyPhoneBookData1I12TPBEntryInfoE @ 445 NONAME
+	_ZTI23TMockLtsyPhoneBookData1I16CStorageInfoDataE @ 446 NONAME
+	_ZTI23TMockLtsyPhoneBookData1IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 447 NONAME
+	_ZTI23TMockLtsyPhoneBookData1IP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 448 NONAME
+	_ZTI23TMockLtsyPhoneBookData1IiE @ 449 NONAME
+	_ZTI23TMockLtsyPhoneBookData2IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 450 NONAME ABSENT
+	_ZTI23TMockLtsyPhoneBookData2IiP20CPhoneBookStoreEntryE @ 451 NONAME
+	_ZTI24TMockLtsyContextData1BufI4TBufILi16EEE @ 452 NONAME
+	_ZTI24TMockLtsyContextData2BufI4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 453 NONAME
+	_ZTI24TMockLtsyContextData2BufI4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 454 NONAME
+	_ZTI26CMmCustomMessHandlerGsmExt @ 455 NONAME
+	_ZTI26CMockTelephonyAudioControl @ 456 NONAME
+	_ZTI26TMockLtsyPhoneBookData1BufI10TPBFdnInfoE @ 457 NONAME
+	_ZTI26TMockLtsyPhoneBookData1BufI12TPBEntryInfoE @ 458 NONAME
+	_ZTI26TMockLtsyPhoneBookData1BufI16CStorageInfoDataE @ 459 NONAME
+	_ZTI26TMockLtsyPhoneBookData1BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 460 NONAME
+	_ZTI26TMockLtsyPhoneBookData1BufIP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 461 NONAME
+	_ZTI26TMockLtsyPhoneBookData1BufIiE @ 462 NONAME
+	_ZTI26TMockLtsyPhoneBookData2BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 463 NONAME ABSENT
+	_ZTI26TMockLtsyPhoneBookData2BufIiP20CPhoneBookStoreEntryE @ 464 NONAME
+	_ZTI27CMockPcktContextMessHandler @ 465 NONAME
+	_ZTI27CMockPcktServiceMessHandler @ 466 NONAME
+	_ZTI30CMockPhoneBookStoreMessHandler @ 467 NONAME
+	_ZTV14TMockLtsyData1I10TGsmCbsMsgE @ 468 NONAME
+	_ZTV14TMockLtsyData1I11TONStoreMsgE @ 469 NONAME
+	_ZTV14TMockLtsyData1I12TRfStateInfoE @ 470 NONAME
+	_ZTV14TMockLtsyData1I12TServiceTypeE @ 471 NONAME
+	_ZTV14TMockLtsyData1I14TContextParamsE @ 472 NONAME
+	_ZTV14TMockLtsyData1I16TENStoreResponseE @ 473 NONAME
+	_ZTV14TMockLtsyData1I20TLockSettingPasswordE @ 474 NONAME
+	_ZTV14TMockLtsyData1I21TContextConfigurationE @ 475 NONAME
+	_ZTV14TMockLtsyData1I24TCbsCbmiAndLangAndFilterE @ 476 NONAME
+	_ZTV14TMockLtsyData1I25TMbmsNetworkServiceStatusE @ 477 NONAME
+	_ZTV14TMockLtsyData1I25TSendSmsDataAndAttributesE @ 478 NONAME
+	_ZTV14TMockLtsyData1I31TMmMbmsMonitorServiceListParamsE @ 479 NONAME
+	_ZTV14TMockLtsyData1I4TBufILi10EEE @ 480 NONAME
+	_ZTV14TMockLtsyData1I4TBufILi128EEE @ 481 NONAME
+	_ZTV14TMockLtsyData1I4TBufILi15EEE @ 482 NONAME
+	_ZTV14TMockLtsyData1I4TBufILi16EEE @ 483 NONAME
+	_ZTV14TMockLtsyData1I4TBufILi32EEE @ 484 NONAME
+	_ZTV14TMockLtsyData1I4TBufILi6EEE @ 485 NONAME
+	_ZTV14TMockLtsyData1I5TBuf8ILi128EEE @ 486 NONAME
+	_ZTV14TMockLtsyData1I5TBuf8ILi15EEE @ 487 NONAME
+	_ZTV14TMockLtsyData1I5TBuf8ILi16EEE @ 488 NONAME
+	_ZTV14TMockLtsyData1I5TCharE @ 489 NONAME
+	_ZTV14TMockLtsyData1I5TTimeE @ 490 NONAME
+	_ZTV14TMockLtsyData1I7TSmsMsgE @ 491 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI11TAlsSupportEE @ 492 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI11TOperatorIdEE @ 493 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI11TViagParamsEE @ 494 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI12THSxPAStatusEE @ 495 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI12TSetAlsBlockEE @ 496 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI12TSimFileInfoEE @ 497 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI13TSetDriveModeEE @ 498 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI14TBandSelectionEE @ 499 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI16TNetworkModeCapsEE @ 500 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI16TSetAlwaysOnModeEE @ 501 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI18TGetAlsBlockStatusEE @ 502 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI18TViagCacheRecordIdEE @ 503 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI19TViagUHZIUESettingsEE @ 504 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI20TEmerNumberCheckModeEE @ 505 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI5TApduEE @ 506 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI9TDtmfInfoEE @ 507 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone11TAPNEntryV3EE @ 508 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone14TMobileServiceEE @ 509 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone16TMobilePhoneLockEE @ 510 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone16TMobilePhoneNITZEE @ 511 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone19TMobilePhoneALSLineEE @ 512 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone21TMobilePhoneFdnStatusEE @ 513 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone21TMobilePhoneIdServiceEE @ 514 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone22TImsAuthenticateDataV5EE @ 515 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 516 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 517 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockStatusEE @ 518 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCBConditionEE @ 519 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCFConditionEE @ 520 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone23TMobilePhoneNetworkModeEE @ 521 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 522 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone24TMobilePhoneServiceTableEE @ 523 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 524 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 525 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 526 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 527 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 528 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 529 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneSecurityEventEE @ 530 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 531 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 532 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 533 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 534 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone28TAPNControlListServiceStatusEE @ 535 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 536 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 537 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 538 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 539 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 540 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 541 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 542 NONAME
+	_ZTV14TMockLtsyData1IN14RMobileONStore16TMobileONEntryV1EE @ 543 NONAME
+	_ZTV14TMockLtsyData1IN14RPacketContext17TContextConfig_R5EE @ 544 NONAME
+	_ZTV14TMockLtsyData1IN14RPacketContext18TContextConfigCDMAEE @ 545 NONAME
+	_ZTV14TMockLtsyData1IN14RPacketContext18TContextConfigGPRSEE @ 546 NONAME
+	_ZTV14TMockLtsyData1IN14RPacketContext20TContextConfigR99_R4EE @ 547 NONAME
+	_ZTV14TMockLtsyData1IN14RPacketService11TAttachModeEE @ 548 NONAME
+	_ZTV14TMockLtsyData1IN14RPacketService16TPreferredBearerEE @ 549 NONAME
+	_ZTV14TMockLtsyData1IN14RPacketService19TRegistrationStatusEE @ 550 NONAME
+	_ZTV14TMockLtsyData1IN14RPacketService7TStatusEE @ 551 NONAME
+	_ZTV14TMockLtsyData1IN14RPacketService8TMSClassEE @ 552 NONAME
+	_ZTV14TMockLtsyData1IN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 553 NONAME
+	_ZTV14TMockLtsyData1IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 554 NONAME
+	_ZTV14TMockLtsyData1IN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 555 NONAME
+	_ZTV14TMockLtsyData1IN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 556 NONAME
+	_ZTV14TMockLtsyData1IN19RMobileSmsMessaging16TMobileSmsBearerEE @ 557 NONAME
+	_ZTV14TMockLtsyData1IN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 558 NONAME
+	_ZTV14TMockLtsyData1IN6RPhone7TStatusEE @ 559 NONAME
+	_ZTV14TMockLtsyData1IP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 560 NONAME
+	_ZTV14TMockLtsyData1IP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 561 NONAME
+	_ZTV14TMockLtsyData1IP13CArrayPtrFlatI14TSmsParametersEE @ 562 NONAME
+	_ZTV14TMockLtsyData1IP13CArrayPtrFlatI16TENStoreResponseEE @ 563 NONAME
+	_ZTV14TMockLtsyData1IP13CArrayPtrFlatI7TSmsMsgEE @ 564 NONAME
+	_ZTV14TMockLtsyData1IP18CMobilePhoneCFListE @ 565 NONAME
+	_ZTV14TMockLtsyData1IP18CMobilePhoneCWListE @ 566 NONAME
+	_ZTV14TMockLtsyData1IP25CMobilePhoneNetworkListV2E @ 567 NONAME
+	_ZTV14TMockLtsyData1IP27CMobilePhoneBroadcastIdListE @ 568 NONAME
+	_ZTV14TMockLtsyData1IP29CPcktMbmsMonitoredServiceListE @ 569 NONAME
+	_ZTV14TMockLtsyData1IP4TBufILi100EEE @ 570 NONAME
+	_ZTV14TMockLtsyData1IP6TDesC8E @ 571 NONAME
+	_ZTV14TMockLtsyData1IPN12RMmCustomAPI20TSimCardReaderStatusEE @ 572 NONAME
+	_ZTV14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 573 NONAME
+	_ZTV14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 574 NONAME
+	_ZTV14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 575 NONAME
+	_ZTV14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 576 NONAME
+	_ZTV14TMockLtsyData1IPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 577 NONAME
+	_ZTV14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 578 NONAME
+	_ZTV14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 579 NONAME
+	_ZTV14TMockLtsyData1IPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 580 NONAME
+	_ZTV14TMockLtsyData1IhE @ 581 NONAME
+	_ZTV14TMockLtsyData1IiE @ 582 NONAME
+	_ZTV14TMockLtsyData1IjE @ 583 NONAME
+	_ZTV14TMockLtsyData1IlE @ 584 NONAME
+	_ZTV14TMockLtsyData1ImE @ 585 NONAME
+	_ZTV14TMockLtsyData1IsE @ 586 NONAME
+	_ZTV14TMockLtsyData1ItE @ 587 NONAME
+	_ZTV14TMockLtsyData2I14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 588 NONAME
+	_ZTV14TMockLtsyData2I14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 589 NONAME
+	_ZTV14TMockLtsyData2I14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 590 NONAME
+	_ZTV14TMockLtsyData2I21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 591 NONAME
+	_ZTV14TMockLtsyData2I4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 592 NONAME
+	_ZTV14TMockLtsyData2I4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 593 NONAME
+	_ZTV14TMockLtsyData2I4TBufILi16EE12TContextMiscE @ 594 NONAME
+	_ZTV14TMockLtsyData2I4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 595 NONAME
+	_ZTV14TMockLtsyData2I4TBufILi16EE5TBuf8ILi1EEE @ 596 NONAME
+	_ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 597 NONAME
+	_ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 598 NONAME
+	_ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 599 NONAME
+	_ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 600 NONAME
+	_ZTV14TMockLtsyData2I4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 601 NONAME
+	_ZTV14TMockLtsyData2I4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 602 NONAME
+	_ZTV14TMockLtsyData2I4TBufILi16EES1_E @ 603 NONAME
+	_ZTV14TMockLtsyData2I4TBufILi16EEiE @ 604 NONAME
+	_ZTV14TMockLtsyData2I5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 605 NONAME
+	_ZTV14TMockLtsyData2I5TTimeiE @ 606 NONAME
+	_ZTV14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 607 NONAME
+	_ZTV14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 608 NONAME
+	_ZTV14TMockLtsyData2IN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 609 NONAME
+	_ZTV14TMockLtsyData2IN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 610 NONAME
+	_ZTV14TMockLtsyData2IN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 611 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 612 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 613 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 614 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 615 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 616 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 617 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 618 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 619 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 620 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 621 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 622 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 623 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 624 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 625 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 626 NONAME
+	_ZTV14TMockLtsyData2IN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 627 NONAME
+	_ZTV14TMockLtsyData2IN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 628 NONAME
+	_ZTV14TMockLtsyData2IN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 629 NONAME
+	_ZTV14TMockLtsyData2IN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 630 NONAME
+	_ZTV14TMockLtsyData2IN14RPacketService7TStatusEiE @ 631 NONAME
+	_ZTV14TMockLtsyData2IN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 632 NONAME
+	_ZTV14TMockLtsyData2IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 633 NONAME
+	_ZTV14TMockLtsyData2IN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 634 NONAME
+	_ZTV14TMockLtsyData2IP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 635 NONAME
+	_ZTV14TMockLtsyData2IP13CArrayPtrFlatI7TSmsMsgEiE @ 636 NONAME
+	_ZTV14TMockLtsyData2IP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 637 NONAME
+	_ZTV14TMockLtsyData2IP6TDesC8S1_E @ 638 NONAME
+	_ZTV14TMockLtsyData2IP6TDesC8iE @ 639 NONAME
+	_ZTV14TMockLtsyData2Ih4TBufILi10EEE @ 640 NONAME
+	_ZTV14TMockLtsyData2IhiE @ 641 NONAME
+	_ZTV14TMockLtsyData2IiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 642 NONAME
+	_ZTV14TMockLtsyData2IiP7TSmsMsgE @ 643 NONAME
+	_ZTV14TMockLtsyData2IiiE @ 644 NONAME
+	_ZTV14TMockLtsyData2IjiE @ 645 NONAME
+	_ZTV14TMockLtsyData2IlaE @ 646 NONAME
+	_ZTV14TMockLtsyData2Is5TBuf8ILi165EEE @ 647 NONAME
+	_ZTV15CMockLtsyEngine @ 648 NONAME
+	_ZTV16CMmCustomStubExt @ 649 NONAME
+	_ZTV16CMmMessageRouter @ 650 NONAME
+	_ZTV17TMockLtsyData1BufI10TGsmCbsMsgE @ 651 NONAME
+	_ZTV17TMockLtsyData1BufI11TONStoreMsgE @ 652 NONAME
+	_ZTV17TMockLtsyData1BufI12TRfStateInfoE @ 653 NONAME
+	_ZTV17TMockLtsyData1BufI12TServiceTypeE @ 654 NONAME
+	_ZTV17TMockLtsyData1BufI14TContextParamsE @ 655 NONAME
+	_ZTV17TMockLtsyData1BufI16TENStoreResponseE @ 656 NONAME
+	_ZTV17TMockLtsyData1BufI20TLockSettingPasswordE @ 657 NONAME
+	_ZTV17TMockLtsyData1BufI21TContextConfigurationE @ 658 NONAME
+	_ZTV17TMockLtsyData1BufI24TCbsCbmiAndLangAndFilterE @ 659 NONAME
+	_ZTV17TMockLtsyData1BufI25TMbmsNetworkServiceStatusE @ 660 NONAME
+	_ZTV17TMockLtsyData1BufI25TSendSmsDataAndAttributesE @ 661 NONAME
+	_ZTV17TMockLtsyData1BufI31TMmMbmsMonitorServiceListParamsE @ 662 NONAME
+	_ZTV17TMockLtsyData1BufI4TBufILi10EEE @ 663 NONAME
+	_ZTV17TMockLtsyData1BufI4TBufILi128EEE @ 664 NONAME
+	_ZTV17TMockLtsyData1BufI4TBufILi15EEE @ 665 NONAME
+	_ZTV17TMockLtsyData1BufI4TBufILi16EEE @ 666 NONAME
+	_ZTV17TMockLtsyData1BufI4TBufILi32EEE @ 667 NONAME
+	_ZTV17TMockLtsyData1BufI4TBufILi6EEE @ 668 NONAME
+	_ZTV17TMockLtsyData1BufI5TBuf8ILi128EEE @ 669 NONAME
+	_ZTV17TMockLtsyData1BufI5TBuf8ILi15EEE @ 670 NONAME
+	_ZTV17TMockLtsyData1BufI5TBuf8ILi16EEE @ 671 NONAME
+	_ZTV17TMockLtsyData1BufI5TCharE @ 672 NONAME
+	_ZTV17TMockLtsyData1BufI5TTimeE @ 673 NONAME
+	_ZTV17TMockLtsyData1BufI7TSmsMsgE @ 674 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI11TAlsSupportEE @ 675 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI11TOperatorIdEE @ 676 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI11TViagParamsEE @ 677 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI12THSxPAStatusEE @ 678 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI12TSetAlsBlockEE @ 679 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI12TSimFileInfoEE @ 680 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI13TSetDriveModeEE @ 681 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI14TBandSelectionEE @ 682 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI16TNetworkModeCapsEE @ 683 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI16TSetAlwaysOnModeEE @ 684 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI18TGetAlsBlockStatusEE @ 685 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI18TViagCacheRecordIdEE @ 686 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI19TViagUHZIUESettingsEE @ 687 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI20TEmerNumberCheckModeEE @ 688 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI5TApduEE @ 689 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI9TDtmfInfoEE @ 690 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone11TAPNEntryV3EE @ 691 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone14TMobileServiceEE @ 692 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneLockEE @ 693 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneNITZEE @ 694 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone19TMobilePhoneALSLineEE @ 695 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneFdnStatusEE @ 696 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneIdServiceEE @ 697 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone22TImsAuthenticateDataV5EE @ 698 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 699 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 700 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockStatusEE @ 701 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCBConditionEE @ 702 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCFConditionEE @ 703 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneNetworkModeEE @ 704 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 705 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneServiceTableEE @ 706 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 707 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 708 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 709 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 710 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 711 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 712 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneSecurityEventEE @ 713 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 714 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 715 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 716 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 717 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone28TAPNControlListServiceStatusEE @ 718 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 719 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 720 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 721 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 722 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 723 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 724 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 725 NONAME
+	_ZTV17TMockLtsyData1BufIN14RMobileONStore16TMobileONEntryV1EE @ 726 NONAME
+	_ZTV17TMockLtsyData1BufIN14RPacketContext17TContextConfig_R5EE @ 727 NONAME
+	_ZTV17TMockLtsyData1BufIN14RPacketContext18TContextConfigCDMAEE @ 728 NONAME
+	_ZTV17TMockLtsyData1BufIN14RPacketContext18TContextConfigGPRSEE @ 729 NONAME
+	_ZTV17TMockLtsyData1BufIN14RPacketContext20TContextConfigR99_R4EE @ 730 NONAME
+	_ZTV17TMockLtsyData1BufIN14RPacketService11TAttachModeEE @ 731 NONAME
+	_ZTV17TMockLtsyData1BufIN14RPacketService16TPreferredBearerEE @ 732 NONAME
+	_ZTV17TMockLtsyData1BufIN14RPacketService19TRegistrationStatusEE @ 733 NONAME
+	_ZTV17TMockLtsyData1BufIN14RPacketService7TStatusEE @ 734 NONAME
+	_ZTV17TMockLtsyData1BufIN14RPacketService8TMSClassEE @ 735 NONAME
+	_ZTV17TMockLtsyData1BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 736 NONAME
+	_ZTV17TMockLtsyData1BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 737 NONAME
+	_ZTV17TMockLtsyData1BufIN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 738 NONAME
+	_ZTV17TMockLtsyData1BufIN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 739 NONAME
+	_ZTV17TMockLtsyData1BufIN19RMobileSmsMessaging16TMobileSmsBearerEE @ 740 NONAME
+	_ZTV17TMockLtsyData1BufIN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 741 NONAME
+	_ZTV17TMockLtsyData1BufIN6RPhone7TStatusEE @ 742 NONAME
+	_ZTV17TMockLtsyData1BufIP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 743 NONAME
+	_ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 744 NONAME
+	_ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI14TSmsParametersEE @ 745 NONAME
+	_ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI16TENStoreResponseEE @ 746 NONAME
+	_ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI7TSmsMsgEE @ 747 NONAME
+	_ZTV17TMockLtsyData1BufIP18CMobilePhoneCFListE @ 748 NONAME
+	_ZTV17TMockLtsyData1BufIP18CMobilePhoneCWListE @ 749 NONAME
+	_ZTV17TMockLtsyData1BufIP25CMobilePhoneNetworkListV2E @ 750 NONAME
+	_ZTV17TMockLtsyData1BufIP27CMobilePhoneBroadcastIdListE @ 751 NONAME
+	_ZTV17TMockLtsyData1BufIP29CPcktMbmsMonitoredServiceListE @ 752 NONAME
+	_ZTV17TMockLtsyData1BufIP4TBufILi100EEE @ 753 NONAME
+	_ZTV17TMockLtsyData1BufIP6TDesC8E @ 754 NONAME
+	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI20TSimCardReaderStatusEE @ 755 NONAME
+	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 756 NONAME
+	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 757 NONAME
+	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 758 NONAME
+	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 759 NONAME
+	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 760 NONAME
+	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 761 NONAME
+	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 762 NONAME
+	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 763 NONAME
+	_ZTV17TMockLtsyData1BufIhE @ 764 NONAME
+	_ZTV17TMockLtsyData1BufIiE @ 765 NONAME
+	_ZTV17TMockLtsyData1BufIjE @ 766 NONAME
+	_ZTV17TMockLtsyData1BufIlE @ 767 NONAME
+	_ZTV17TMockLtsyData1BufImE @ 768 NONAME
+	_ZTV17TMockLtsyData1BufIsE @ 769 NONAME
+	_ZTV17TMockLtsyData1BufItE @ 770 NONAME
+	_ZTV17TMockLtsyData2BufI14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 771 NONAME
+	_ZTV17TMockLtsyData2BufI14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 772 NONAME
+	_ZTV17TMockLtsyData2BufI14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 773 NONAME
+	_ZTV17TMockLtsyData2BufI21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 774 NONAME
+	_ZTV17TMockLtsyData2BufI4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 775 NONAME
+	_ZTV17TMockLtsyData2BufI4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 776 NONAME
+	_ZTV17TMockLtsyData2BufI4TBufILi16EE12TContextMiscE @ 777 NONAME
+	_ZTV17TMockLtsyData2BufI4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 778 NONAME
+	_ZTV17TMockLtsyData2BufI4TBufILi16EE5TBuf8ILi1EEE @ 779 NONAME
+	_ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 780 NONAME
+	_ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 781 NONAME
+	_ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 782 NONAME
+	_ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 783 NONAME
+	_ZTV17TMockLtsyData2BufI4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 784 NONAME
+	_ZTV17TMockLtsyData2BufI4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 785 NONAME
+	_ZTV17TMockLtsyData2BufI4TBufILi16EES1_E @ 786 NONAME
+	_ZTV17TMockLtsyData2BufI4TBufILi16EEiE @ 787 NONAME
+	_ZTV17TMockLtsyData2BufI5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 788 NONAME
+	_ZTV17TMockLtsyData2BufI5TTimeiE @ 789 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 790 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 791 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 792 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 793 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 794 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 795 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 796 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 797 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 798 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 799 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 800 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 801 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 802 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 803 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 804 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 805 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 806 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 807 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 808 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 809 NONAME
+	_ZTV17TMockLtsyData2BufIN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 810 NONAME
+	_ZTV17TMockLtsyData2BufIN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 811 NONAME
+	_ZTV17TMockLtsyData2BufIN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 812 NONAME
+	_ZTV17TMockLtsyData2BufIN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 813 NONAME
+	_ZTV17TMockLtsyData2BufIN14RPacketService7TStatusEiE @ 814 NONAME
+	_ZTV17TMockLtsyData2BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 815 NONAME
+	_ZTV17TMockLtsyData2BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 816 NONAME
+	_ZTV17TMockLtsyData2BufIN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 817 NONAME
+	_ZTV17TMockLtsyData2BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 818 NONAME
+	_ZTV17TMockLtsyData2BufIP13CArrayPtrFlatI7TSmsMsgEiE @ 819 NONAME
+	_ZTV17TMockLtsyData2BufIP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 820 NONAME
+	_ZTV17TMockLtsyData2BufIP6TDesC8S1_E @ 821 NONAME
+	_ZTV17TMockLtsyData2BufIP6TDesC8iE @ 822 NONAME
+	_ZTV17TMockLtsyData2BufIh4TBufILi10EEE @ 823 NONAME
+	_ZTV17TMockLtsyData2BufIhiE @ 824 NONAME
+	_ZTV17TMockLtsyData2BufIiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 825 NONAME
+	_ZTV17TMockLtsyData2BufIiP7TSmsMsgE @ 826 NONAME
+	_ZTV17TMockLtsyData2BufIiiE @ 827 NONAME
+	_ZTV17TMockLtsyData2BufIjiE @ 828 NONAME
+	_ZTV17TMockLtsyData2BufIlaE @ 829 NONAME
+	_ZTV17TMockLtsyData2BufIs5TBuf8ILi165EEE @ 830 NONAME
+	_ZTV18CMockLtsyFactoryV1 @ 831 NONAME
+	_ZTV18CMockLtsyFactoryV2 @ 832 NONAME
+	_ZTV18CMockLtsyFactoryV3 @ 833 NONAME
+	_ZTV18TMockLtsyCallData1I4TBufILi129EEE @ 834 NONAME
+	_ZTV18TMockLtsyCallData1IN11RMobileCall16TMobileCallEventEE @ 835 NONAME
+	_ZTV18TMockLtsyCallData1IN11RMobileCall17TMobileCallInfoV1EE @ 836 NONAME
+	_ZTV18TMockLtsyCallData1IN11RMobileCall17TMobileCallStatusEE @ 837 NONAME
+	_ZTV18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV1EE @ 838 NONAME
+	_ZTV18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV2EE @ 839 NONAME
+	_ZTV18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV7EE @ 840 NONAME
+	_ZTV18TMockLtsyCallData1IN11RMobileCall21TMobileCallDataCapsV1EE @ 841 NONAME
+	_ZTV18TMockLtsyCallData1IN11RMobileCall22TMobileCallHscsdInfoV8EE @ 842 NONAME
+	_ZTV18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV1EE @ 843 NONAME
+	_ZTV18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV2EE @ 844 NONAME
+	_ZTV18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV8EE @ 845 NONAME
+	_ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV1EE @ 846 NONAME
+	_ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV2EE @ 847 NONAME
+	_ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV7EE @ 848 NONAME
+	_ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV8EE @ 849 NONAME
+	_ZTV18TMockLtsyCallData1IN12RMobilePhone19TMobilePhonePrivacyEE @ 850 NONAME
+	_ZTV18TMockLtsyCallData1IN5RCall14TBearerServiceEE @ 851 NONAME
+	_ZTV18TMockLtsyCallData1IN5RCall7TStatusEE @ 852 NONAME
+	_ZTV18TMockLtsyCallData1IN5RCall9TCommPortEE @ 853 NONAME
+	_ZTV18TMockLtsyCallData1IiE @ 854 NONAME
+	_ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 855 NONAME
+	_ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 856 NONAME
+	_ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 857 NONAME
+	_ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 858 NONAME
+	_ZTV18TMockLtsyCallData2IN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 859 NONAME
+	_ZTV18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 860 NONAME
+	_ZTV18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 861 NONAME
+	_ZTV18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 862 NONAME
+	_ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 863 NONAME
+	_ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 864 NONAME
+	_ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 865 NONAME
+	_ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 866 NONAME
+	_ZTV18TMockLtsyCallData2IiiE @ 867 NONAME
+	_ZTV19CMockSmsMessHandler @ 868 NONAME
+	_ZTV20CMockCallMessHandler @ 869 NONAME
+	_ZTV21CMockPhoneMessHandler @ 870 NONAME
+	_ZTV21TMockLtsyCallData1BufI4TBufILi129EEE @ 871 NONAME
+	_ZTV21TMockLtsyCallData1BufIN11RMobileCall16TMobileCallEventEE @ 872 NONAME
+	_ZTV21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallInfoV1EE @ 873 NONAME
+	_ZTV21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallStatusEE @ 874 NONAME
+	_ZTV21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV1EE @ 875 NONAME
+	_ZTV21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV2EE @ 876 NONAME
+	_ZTV21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV7EE @ 877 NONAME
+	_ZTV21TMockLtsyCallData1BufIN11RMobileCall21TMobileCallDataCapsV1EE @ 878 NONAME
+	_ZTV21TMockLtsyCallData1BufIN11RMobileCall22TMobileCallHscsdInfoV8EE @ 879 NONAME
+	_ZTV21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV1EE @ 880 NONAME
+	_ZTV21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV2EE @ 881 NONAME
+	_ZTV21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV8EE @ 882 NONAME
+	_ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV1EE @ 883 NONAME
+	_ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV2EE @ 884 NONAME
+	_ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV7EE @ 885 NONAME
+	_ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV8EE @ 886 NONAME
+	_ZTV21TMockLtsyCallData1BufIN12RMobilePhone19TMobilePhonePrivacyEE @ 887 NONAME
+	_ZTV21TMockLtsyCallData1BufIN5RCall14TBearerServiceEE @ 888 NONAME
+	_ZTV21TMockLtsyCallData1BufIN5RCall7TStatusEE @ 889 NONAME
+	_ZTV21TMockLtsyCallData1BufIN5RCall9TCommPortEE @ 890 NONAME
+	_ZTV21TMockLtsyCallData1BufIiE @ 891 NONAME
+	_ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 892 NONAME
+	_ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 893 NONAME
+	_ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 894 NONAME
+	_ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 895 NONAME
+	_ZTV21TMockLtsyCallData2BufIN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 896 NONAME
+	_ZTV21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 897 NONAME
+	_ZTV21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 898 NONAME
+	_ZTV21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 899 NONAME
+	_ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 900 NONAME
+	_ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 901 NONAME
+	_ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 902 NONAME
+	_ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 903 NONAME
+	_ZTV21TMockLtsyCallData2BufIiiE @ 904 NONAME
+	_ZTV21TMockLtsyContextData1I4TBufILi16EEE @ 905 NONAME
+	_ZTV21TMockLtsyContextData2I4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 906 NONAME
+	_ZTV21TMockLtsyContextData2I4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 907 NONAME
+	_ZTV23CMockPcktQoSMessHandler @ 908 NONAME
+	_ZTV23TMockLtsyPacketQoSData1I4TBufILi16EEE @ 909 NONAME
+	_ZTV23TMockLtsyPhoneBookData1I10TPBFdnInfoE @ 910 NONAME
+	_ZTV23TMockLtsyPhoneBookData1I12TPBEntryInfoE @ 911 NONAME
+	_ZTV23TMockLtsyPhoneBookData1I16CStorageInfoDataE @ 912 NONAME
+	_ZTV23TMockLtsyPhoneBookData1IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 913 NONAME
+	_ZTV23TMockLtsyPhoneBookData1IP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 914 NONAME
+	_ZTV23TMockLtsyPhoneBookData1IiE @ 915 NONAME
+	_ZTV23TMockLtsyPhoneBookData2IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 916 NONAME ABSENT
+	_ZTV23TMockLtsyPhoneBookData2IiP20CPhoneBookStoreEntryE @ 917 NONAME
+	_ZTV24TMockLtsyContextData1BufI4TBufILi16EEE @ 918 NONAME
+	_ZTV24TMockLtsyContextData2BufI4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 919 NONAME
+	_ZTV24TMockLtsyContextData2BufI4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 920 NONAME
+	_ZTV26CMmCustomMessHandlerGsmExt @ 921 NONAME
+	_ZTV26CMockTelephonyAudioControl @ 922 NONAME
+	_ZTV26TMockLtsyPhoneBookData1BufI10TPBFdnInfoE @ 923 NONAME
+	_ZTV26TMockLtsyPhoneBookData1BufI12TPBEntryInfoE @ 924 NONAME
+	_ZTV26TMockLtsyPhoneBookData1BufI16CStorageInfoDataE @ 925 NONAME
+	_ZTV26TMockLtsyPhoneBookData1BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 926 NONAME
+	_ZTV26TMockLtsyPhoneBookData1BufIP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 927 NONAME
+	_ZTV26TMockLtsyPhoneBookData1BufIiE @ 928 NONAME
+	_ZTV26TMockLtsyPhoneBookData2BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 929 NONAME ABSENT
+	_ZTV26TMockLtsyPhoneBookData2BufIiP20CPhoneBookStoreEntryE @ 930 NONAME
+	_ZTV27CMockPcktContextMessHandler @ 931 NONAME
+	_ZTV27CMockPcktServiceMessHandler @ 932 NONAME
+	_ZTV30CMockPhoneBookStoreMessHandler @ 933 NONAME
+	_ZTI14TMockLtsyData1IN12RMobilePhone21TMobilePhoneDTMFEventEE @ 934 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneDTMFEventEE @ 935 NONAME
+	_ZTV14TMockLtsyData1IN12RMobilePhone21TMobilePhoneDTMFEventEE @ 936 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneDTMFEventEE @ 937 NONAME
+	_ZTI14TMockLtsyData1IN12RMmCustomAPI15TApduParametersEE @ 938 NONAME
+	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI15TApduParametersEE @ 939 NONAME
+	_ZTV14TMockLtsyData1IN12RMmCustomAPI15TApduParametersEE @ 940 NONAME
+	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI15TApduParametersEE @ 941 NONAME
+	_ZTI14TMockLtsyData1IP29CMobilePhoneStoredNetworkListE @ 942 NONAME
+	_ZTI17TMockLtsyData1BufIP29CMobilePhoneStoredNetworkListE @ 943 NONAME
+	_ZTV14TMockLtsyData1IP29CMobilePhoneStoredNetworkListE @ 944 NONAME
+	_ZTV17TMockLtsyData1BufIP29CMobilePhoneStoredNetworkListE @ 945 NONAME
+

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/eabi/mocklicenseetsyu.def	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,943 +0,0 @@
-EXPORTS
-	_Z12LTsyFactoryLv @ 1 NONAME
-	_ZTI14TMockLtsyData1I10TGsmCbsMsgE @ 2 NONAME
-	_ZTI14TMockLtsyData1I11TONStoreMsgE @ 3 NONAME
-	_ZTI14TMockLtsyData1I12TRfStateInfoE @ 4 NONAME
-	_ZTI14TMockLtsyData1I12TServiceTypeE @ 5 NONAME
-	_ZTI14TMockLtsyData1I14TContextParamsE @ 6 NONAME
-	_ZTI14TMockLtsyData1I16TENStoreResponseE @ 7 NONAME
-	_ZTI14TMockLtsyData1I20TLockSettingPasswordE @ 8 NONAME
-	_ZTI14TMockLtsyData1I21TContextConfigurationE @ 9 NONAME
-	_ZTI14TMockLtsyData1I24TCbsCbmiAndLangAndFilterE @ 10 NONAME
-	_ZTI14TMockLtsyData1I25TMbmsNetworkServiceStatusE @ 11 NONAME
-	_ZTI14TMockLtsyData1I25TSendSmsDataAndAttributesE @ 12 NONAME
-	_ZTI14TMockLtsyData1I31TMmMbmsMonitorServiceListParamsE @ 13 NONAME
-	_ZTI14TMockLtsyData1I4TBufILi10EEE @ 14 NONAME
-	_ZTI14TMockLtsyData1I4TBufILi128EEE @ 15 NONAME
-	_ZTI14TMockLtsyData1I4TBufILi15EEE @ 16 NONAME
-	_ZTI14TMockLtsyData1I4TBufILi16EEE @ 17 NONAME
-	_ZTI14TMockLtsyData1I4TBufILi32EEE @ 18 NONAME
-	_ZTI14TMockLtsyData1I4TBufILi6EEE @ 19 NONAME
-	_ZTI14TMockLtsyData1I5TBuf8ILi128EEE @ 20 NONAME
-	_ZTI14TMockLtsyData1I5TBuf8ILi15EEE @ 21 NONAME
-	_ZTI14TMockLtsyData1I5TBuf8ILi16EEE @ 22 NONAME
-	_ZTI14TMockLtsyData1I5TCharE @ 23 NONAME
-	_ZTI14TMockLtsyData1I5TTimeE @ 24 NONAME
-	_ZTI14TMockLtsyData1I7TSmsMsgE @ 25 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI11TAlsSupportEE @ 26 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI11TOperatorIdEE @ 27 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI11TViagParamsEE @ 28 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI12THSxPAStatusEE @ 29 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI12TSetAlsBlockEE @ 30 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI12TSimFileInfoEE @ 31 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI13TSetDriveModeEE @ 32 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI14TBandSelectionEE @ 33 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI16TNetworkModeCapsEE @ 34 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI16TSetAlwaysOnModeEE @ 35 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI18TGetAlsBlockStatusEE @ 36 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI18TViagCacheRecordIdEE @ 37 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI19TViagUHZIUESettingsEE @ 38 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI20TEmerNumberCheckModeEE @ 39 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI5TApduEE @ 40 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI9TDtmfInfoEE @ 41 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone11TAPNEntryV3EE @ 42 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone14TMobileServiceEE @ 43 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone16TMobilePhoneLockEE @ 44 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone16TMobilePhoneNITZEE @ 45 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone19TMobilePhoneALSLineEE @ 46 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone21TMobilePhoneFdnStatusEE @ 47 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone21TMobilePhoneIdServiceEE @ 48 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone22TImsAuthenticateDataV5EE @ 49 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 50 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 51 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockStatusEE @ 52 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCBConditionEE @ 53 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCFConditionEE @ 54 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone23TMobilePhoneNetworkModeEE @ 55 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 56 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone24TMobilePhoneServiceTableEE @ 57 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 58 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 59 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 60 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 61 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 62 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 63 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneSecurityEventEE @ 64 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 65 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 66 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 67 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 68 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone28TAPNControlListServiceStatusEE @ 69 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 70 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 71 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 72 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 73 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 74 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 75 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 76 NONAME
-	_ZTI14TMockLtsyData1IN14RMobileONStore16TMobileONEntryV1EE @ 77 NONAME
-	_ZTI14TMockLtsyData1IN14RPacketContext17TContextConfig_R5EE @ 78 NONAME
-	_ZTI14TMockLtsyData1IN14RPacketContext18TContextConfigCDMAEE @ 79 NONAME
-	_ZTI14TMockLtsyData1IN14RPacketContext18TContextConfigGPRSEE @ 80 NONAME
-	_ZTI14TMockLtsyData1IN14RPacketContext20TContextConfigR99_R4EE @ 81 NONAME
-	_ZTI14TMockLtsyData1IN14RPacketService11TAttachModeEE @ 82 NONAME
-	_ZTI14TMockLtsyData1IN14RPacketService16TPreferredBearerEE @ 83 NONAME
-	_ZTI14TMockLtsyData1IN14RPacketService19TRegistrationStatusEE @ 84 NONAME
-	_ZTI14TMockLtsyData1IN14RPacketService7TStatusEE @ 85 NONAME
-	_ZTI14TMockLtsyData1IN14RPacketService8TMSClassEE @ 86 NONAME
-	_ZTI14TMockLtsyData1IN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 87 NONAME
-	_ZTI14TMockLtsyData1IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 88 NONAME
-	_ZTI14TMockLtsyData1IN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 89 NONAME
-	_ZTI14TMockLtsyData1IN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 90 NONAME
-	_ZTI14TMockLtsyData1IN19RMobileSmsMessaging16TMobileSmsBearerEE @ 91 NONAME
-	_ZTI14TMockLtsyData1IN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 92 NONAME
-	_ZTI14TMockLtsyData1IN6RPhone7TStatusEE @ 93 NONAME
-	_ZTI14TMockLtsyData1IP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 94 NONAME
-	_ZTI14TMockLtsyData1IP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 95 NONAME
-	_ZTI14TMockLtsyData1IP13CArrayPtrFlatI14TSmsParametersEE @ 96 NONAME
-	_ZTI14TMockLtsyData1IP13CArrayPtrFlatI16TENStoreResponseEE @ 97 NONAME
-	_ZTI14TMockLtsyData1IP13CArrayPtrFlatI7TSmsMsgEE @ 98 NONAME
-	_ZTI14TMockLtsyData1IP18CMobilePhoneCFListE @ 99 NONAME
-	_ZTI14TMockLtsyData1IP18CMobilePhoneCWListE @ 100 NONAME
-	_ZTI14TMockLtsyData1IP25CMobilePhoneNetworkListV2E @ 101 NONAME
-	_ZTI14TMockLtsyData1IP27CMobilePhoneBroadcastIdListE @ 102 NONAME
-	_ZTI14TMockLtsyData1IP29CPcktMbmsMonitoredServiceListE @ 103 NONAME
-	_ZTI14TMockLtsyData1IP4TBufILi100EEE @ 104 NONAME
-	_ZTI14TMockLtsyData1IP6TDesC8E @ 105 NONAME
-	_ZTI14TMockLtsyData1IPN12RMmCustomAPI20TSimCardReaderStatusEE @ 106 NONAME
-	_ZTI14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 107 NONAME
-	_ZTI14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 108 NONAME
-	_ZTI14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 109 NONAME
-	_ZTI14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 110 NONAME
-	_ZTI14TMockLtsyData1IPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 111 NONAME
-	_ZTI14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 112 NONAME
-	_ZTI14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 113 NONAME
-	_ZTI14TMockLtsyData1IPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 114 NONAME
-	_ZTI14TMockLtsyData1IhE @ 115 NONAME
-	_ZTI14TMockLtsyData1IiE @ 116 NONAME
-	_ZTI14TMockLtsyData1IjE @ 117 NONAME
-	_ZTI14TMockLtsyData1IlE @ 118 NONAME
-	_ZTI14TMockLtsyData1ImE @ 119 NONAME
-	_ZTI14TMockLtsyData1IsE @ 120 NONAME
-	_ZTI14TMockLtsyData1ItE @ 121 NONAME
-	_ZTI14TMockLtsyData2I14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 122 NONAME
-	_ZTI14TMockLtsyData2I14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 123 NONAME
-	_ZTI14TMockLtsyData2I14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 124 NONAME
-	_ZTI14TMockLtsyData2I21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 125 NONAME
-	_ZTI14TMockLtsyData2I4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 126 NONAME
-	_ZTI14TMockLtsyData2I4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 127 NONAME
-	_ZTI14TMockLtsyData2I4TBufILi16EE12TContextMiscE @ 128 NONAME
-	_ZTI14TMockLtsyData2I4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 129 NONAME
-	_ZTI14TMockLtsyData2I4TBufILi16EE5TBuf8ILi1EEE @ 130 NONAME
-	_ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 131 NONAME
-	_ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 132 NONAME
-	_ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 133 NONAME
-	_ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 134 NONAME
-	_ZTI14TMockLtsyData2I4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 135 NONAME
-	_ZTI14TMockLtsyData2I4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 136 NONAME
-	_ZTI14TMockLtsyData2I4TBufILi16EES1_E @ 137 NONAME
-	_ZTI14TMockLtsyData2I4TBufILi16EEiE @ 138 NONAME
-	_ZTI14TMockLtsyData2I5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 139 NONAME
-	_ZTI14TMockLtsyData2I5TTimeiE @ 140 NONAME
-	_ZTI14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 141 NONAME
-	_ZTI14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 142 NONAME
-	_ZTI14TMockLtsyData2IN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 143 NONAME
-	_ZTI14TMockLtsyData2IN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 144 NONAME
-	_ZTI14TMockLtsyData2IN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 145 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 146 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 147 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 148 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 149 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 150 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 151 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 152 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 153 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 154 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 155 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 156 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 157 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 158 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 159 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 160 NONAME
-	_ZTI14TMockLtsyData2IN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 161 NONAME
-	_ZTI14TMockLtsyData2IN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 162 NONAME
-	_ZTI14TMockLtsyData2IN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 163 NONAME
-	_ZTI14TMockLtsyData2IN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 164 NONAME
-	_ZTI14TMockLtsyData2IN14RPacketService7TStatusEiE @ 165 NONAME
-	_ZTI14TMockLtsyData2IN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 166 NONAME
-	_ZTI14TMockLtsyData2IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 167 NONAME
-	_ZTI14TMockLtsyData2IN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 168 NONAME
-	_ZTI14TMockLtsyData2IP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 169 NONAME
-	_ZTI14TMockLtsyData2IP13CArrayPtrFlatI7TSmsMsgEiE @ 170 NONAME
-	_ZTI14TMockLtsyData2IP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 171 NONAME
-	_ZTI14TMockLtsyData2IP6TDesC8S1_E @ 172 NONAME
-	_ZTI14TMockLtsyData2IP6TDesC8iE @ 173 NONAME
-	_ZTI14TMockLtsyData2Ih4TBufILi10EEE @ 174 NONAME
-	_ZTI14TMockLtsyData2IhiE @ 175 NONAME
-	_ZTI14TMockLtsyData2IiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 176 NONAME
-	_ZTI14TMockLtsyData2IiP7TSmsMsgE @ 177 NONAME
-	_ZTI14TMockLtsyData2IiiE @ 178 NONAME
-	_ZTI14TMockLtsyData2IjiE @ 179 NONAME
-	_ZTI14TMockLtsyData2IlaE @ 180 NONAME
-	_ZTI14TMockLtsyData2Is5TBuf8ILi165EEE @ 181 NONAME
-	_ZTI15CMockLtsyEngine @ 182 NONAME
-	_ZTI16CMmCustomStubExt @ 183 NONAME
-	_ZTI16CMmMessageRouter @ 184 NONAME
-	_ZTI17TMockLtsyData1BufI10TGsmCbsMsgE @ 185 NONAME
-	_ZTI17TMockLtsyData1BufI11TONStoreMsgE @ 186 NONAME
-	_ZTI17TMockLtsyData1BufI12TRfStateInfoE @ 187 NONAME
-	_ZTI17TMockLtsyData1BufI12TServiceTypeE @ 188 NONAME
-	_ZTI17TMockLtsyData1BufI14TContextParamsE @ 189 NONAME
-	_ZTI17TMockLtsyData1BufI16TENStoreResponseE @ 190 NONAME
-	_ZTI17TMockLtsyData1BufI20TLockSettingPasswordE @ 191 NONAME
-	_ZTI17TMockLtsyData1BufI21TContextConfigurationE @ 192 NONAME
-	_ZTI17TMockLtsyData1BufI24TCbsCbmiAndLangAndFilterE @ 193 NONAME
-	_ZTI17TMockLtsyData1BufI25TMbmsNetworkServiceStatusE @ 194 NONAME
-	_ZTI17TMockLtsyData1BufI25TSendSmsDataAndAttributesE @ 195 NONAME
-	_ZTI17TMockLtsyData1BufI31TMmMbmsMonitorServiceListParamsE @ 196 NONAME
-	_ZTI17TMockLtsyData1BufI4TBufILi10EEE @ 197 NONAME
-	_ZTI17TMockLtsyData1BufI4TBufILi128EEE @ 198 NONAME
-	_ZTI17TMockLtsyData1BufI4TBufILi15EEE @ 199 NONAME
-	_ZTI17TMockLtsyData1BufI4TBufILi16EEE @ 200 NONAME
-	_ZTI17TMockLtsyData1BufI4TBufILi32EEE @ 201 NONAME
-	_ZTI17TMockLtsyData1BufI4TBufILi6EEE @ 202 NONAME
-	_ZTI17TMockLtsyData1BufI5TBuf8ILi128EEE @ 203 NONAME
-	_ZTI17TMockLtsyData1BufI5TBuf8ILi15EEE @ 204 NONAME
-	_ZTI17TMockLtsyData1BufI5TBuf8ILi16EEE @ 205 NONAME
-	_ZTI17TMockLtsyData1BufI5TCharE @ 206 NONAME
-	_ZTI17TMockLtsyData1BufI5TTimeE @ 207 NONAME
-	_ZTI17TMockLtsyData1BufI7TSmsMsgE @ 208 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI11TAlsSupportEE @ 209 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI11TOperatorIdEE @ 210 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI11TViagParamsEE @ 211 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI12THSxPAStatusEE @ 212 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI12TSetAlsBlockEE @ 213 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI12TSimFileInfoEE @ 214 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI13TSetDriveModeEE @ 215 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI14TBandSelectionEE @ 216 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI16TNetworkModeCapsEE @ 217 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI16TSetAlwaysOnModeEE @ 218 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI18TGetAlsBlockStatusEE @ 219 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI18TViagCacheRecordIdEE @ 220 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI19TViagUHZIUESettingsEE @ 221 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI20TEmerNumberCheckModeEE @ 222 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI5TApduEE @ 223 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI9TDtmfInfoEE @ 224 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone11TAPNEntryV3EE @ 225 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone14TMobileServiceEE @ 226 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneLockEE @ 227 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneNITZEE @ 228 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone19TMobilePhoneALSLineEE @ 229 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneFdnStatusEE @ 230 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneIdServiceEE @ 231 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone22TImsAuthenticateDataV5EE @ 232 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 233 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 234 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockStatusEE @ 235 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCBConditionEE @ 236 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCFConditionEE @ 237 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneNetworkModeEE @ 238 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 239 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneServiceTableEE @ 240 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 241 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 242 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 243 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 244 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 245 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 246 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneSecurityEventEE @ 247 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 248 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 249 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 250 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 251 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone28TAPNControlListServiceStatusEE @ 252 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 253 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 254 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 255 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 256 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 257 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 258 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 259 NONAME
-	_ZTI17TMockLtsyData1BufIN14RMobileONStore16TMobileONEntryV1EE @ 260 NONAME
-	_ZTI17TMockLtsyData1BufIN14RPacketContext17TContextConfig_R5EE @ 261 NONAME
-	_ZTI17TMockLtsyData1BufIN14RPacketContext18TContextConfigCDMAEE @ 262 NONAME
-	_ZTI17TMockLtsyData1BufIN14RPacketContext18TContextConfigGPRSEE @ 263 NONAME
-	_ZTI17TMockLtsyData1BufIN14RPacketContext20TContextConfigR99_R4EE @ 264 NONAME
-	_ZTI17TMockLtsyData1BufIN14RPacketService11TAttachModeEE @ 265 NONAME
-	_ZTI17TMockLtsyData1BufIN14RPacketService16TPreferredBearerEE @ 266 NONAME
-	_ZTI17TMockLtsyData1BufIN14RPacketService19TRegistrationStatusEE @ 267 NONAME
-	_ZTI17TMockLtsyData1BufIN14RPacketService7TStatusEE @ 268 NONAME
-	_ZTI17TMockLtsyData1BufIN14RPacketService8TMSClassEE @ 269 NONAME
-	_ZTI17TMockLtsyData1BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 270 NONAME
-	_ZTI17TMockLtsyData1BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 271 NONAME
-	_ZTI17TMockLtsyData1BufIN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 272 NONAME
-	_ZTI17TMockLtsyData1BufIN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 273 NONAME
-	_ZTI17TMockLtsyData1BufIN19RMobileSmsMessaging16TMobileSmsBearerEE @ 274 NONAME
-	_ZTI17TMockLtsyData1BufIN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 275 NONAME
-	_ZTI17TMockLtsyData1BufIN6RPhone7TStatusEE @ 276 NONAME
-	_ZTI17TMockLtsyData1BufIP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 277 NONAME
-	_ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 278 NONAME
-	_ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI14TSmsParametersEE @ 279 NONAME
-	_ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI16TENStoreResponseEE @ 280 NONAME
-	_ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI7TSmsMsgEE @ 281 NONAME
-	_ZTI17TMockLtsyData1BufIP18CMobilePhoneCFListE @ 282 NONAME
-	_ZTI17TMockLtsyData1BufIP18CMobilePhoneCWListE @ 283 NONAME
-	_ZTI17TMockLtsyData1BufIP25CMobilePhoneNetworkListV2E @ 284 NONAME
-	_ZTI17TMockLtsyData1BufIP27CMobilePhoneBroadcastIdListE @ 285 NONAME
-	_ZTI17TMockLtsyData1BufIP29CPcktMbmsMonitoredServiceListE @ 286 NONAME
-	_ZTI17TMockLtsyData1BufIP4TBufILi100EEE @ 287 NONAME
-	_ZTI17TMockLtsyData1BufIP6TDesC8E @ 288 NONAME
-	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI20TSimCardReaderStatusEE @ 289 NONAME
-	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 290 NONAME
-	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 291 NONAME
-	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 292 NONAME
-	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 293 NONAME
-	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 294 NONAME
-	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 295 NONAME
-	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 296 NONAME
-	_ZTI17TMockLtsyData1BufIPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 297 NONAME
-	_ZTI17TMockLtsyData1BufIhE @ 298 NONAME
-	_ZTI17TMockLtsyData1BufIiE @ 299 NONAME
-	_ZTI17TMockLtsyData1BufIjE @ 300 NONAME
-	_ZTI17TMockLtsyData1BufIlE @ 301 NONAME
-	_ZTI17TMockLtsyData1BufImE @ 302 NONAME
-	_ZTI17TMockLtsyData1BufIsE @ 303 NONAME
-	_ZTI17TMockLtsyData1BufItE @ 304 NONAME
-	_ZTI17TMockLtsyData2BufI14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 305 NONAME
-	_ZTI17TMockLtsyData2BufI14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 306 NONAME
-	_ZTI17TMockLtsyData2BufI14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 307 NONAME
-	_ZTI17TMockLtsyData2BufI21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 308 NONAME
-	_ZTI17TMockLtsyData2BufI4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 309 NONAME
-	_ZTI17TMockLtsyData2BufI4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 310 NONAME
-	_ZTI17TMockLtsyData2BufI4TBufILi16EE12TContextMiscE @ 311 NONAME
-	_ZTI17TMockLtsyData2BufI4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 312 NONAME
-	_ZTI17TMockLtsyData2BufI4TBufILi16EE5TBuf8ILi1EEE @ 313 NONAME
-	_ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 314 NONAME
-	_ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 315 NONAME
-	_ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 316 NONAME
-	_ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 317 NONAME
-	_ZTI17TMockLtsyData2BufI4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 318 NONAME
-	_ZTI17TMockLtsyData2BufI4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 319 NONAME
-	_ZTI17TMockLtsyData2BufI4TBufILi16EES1_E @ 320 NONAME
-	_ZTI17TMockLtsyData2BufI4TBufILi16EEiE @ 321 NONAME
-	_ZTI17TMockLtsyData2BufI5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 322 NONAME
-	_ZTI17TMockLtsyData2BufI5TTimeiE @ 323 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 324 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 325 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 326 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 327 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 328 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 329 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 330 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 331 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 332 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 333 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 334 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 335 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 336 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 337 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 338 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 339 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 340 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 341 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 342 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 343 NONAME
-	_ZTI17TMockLtsyData2BufIN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 344 NONAME
-	_ZTI17TMockLtsyData2BufIN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 345 NONAME
-	_ZTI17TMockLtsyData2BufIN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 346 NONAME
-	_ZTI17TMockLtsyData2BufIN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 347 NONAME
-	_ZTI17TMockLtsyData2BufIN14RPacketService7TStatusEiE @ 348 NONAME
-	_ZTI17TMockLtsyData2BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 349 NONAME
-	_ZTI17TMockLtsyData2BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 350 NONAME
-	_ZTI17TMockLtsyData2BufIN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 351 NONAME
-	_ZTI17TMockLtsyData2BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 352 NONAME
-	_ZTI17TMockLtsyData2BufIP13CArrayPtrFlatI7TSmsMsgEiE @ 353 NONAME
-	_ZTI17TMockLtsyData2BufIP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 354 NONAME
-	_ZTI17TMockLtsyData2BufIP6TDesC8S1_E @ 355 NONAME
-	_ZTI17TMockLtsyData2BufIP6TDesC8iE @ 356 NONAME
-	_ZTI17TMockLtsyData2BufIh4TBufILi10EEE @ 357 NONAME
-	_ZTI17TMockLtsyData2BufIhiE @ 358 NONAME
-	_ZTI17TMockLtsyData2BufIiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 359 NONAME
-	_ZTI17TMockLtsyData2BufIiP7TSmsMsgE @ 360 NONAME
-	_ZTI17TMockLtsyData2BufIiiE @ 361 NONAME
-	_ZTI17TMockLtsyData2BufIjiE @ 362 NONAME
-	_ZTI17TMockLtsyData2BufIlaE @ 363 NONAME
-	_ZTI17TMockLtsyData2BufIs5TBuf8ILi165EEE @ 364 NONAME
-	_ZTI18CMockLtsyFactoryV1 @ 365 NONAME
-	_ZTI18CMockLtsyFactoryV2 @ 366 NONAME
-	_ZTI18CMockLtsyFactoryV3 @ 367 NONAME
-	_ZTI18TMockLtsyCallData1I4TBufILi129EEE @ 368 NONAME
-	_ZTI18TMockLtsyCallData1IN11RMobileCall16TMobileCallEventEE @ 369 NONAME
-	_ZTI18TMockLtsyCallData1IN11RMobileCall17TMobileCallInfoV1EE @ 370 NONAME
-	_ZTI18TMockLtsyCallData1IN11RMobileCall17TMobileCallStatusEE @ 371 NONAME
-	_ZTI18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV1EE @ 372 NONAME
-	_ZTI18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV2EE @ 373 NONAME
-	_ZTI18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV7EE @ 374 NONAME
-	_ZTI18TMockLtsyCallData1IN11RMobileCall21TMobileCallDataCapsV1EE @ 375 NONAME
-	_ZTI18TMockLtsyCallData1IN11RMobileCall22TMobileCallHscsdInfoV8EE @ 376 NONAME
-	_ZTI18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV1EE @ 377 NONAME
-	_ZTI18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV2EE @ 378 NONAME
-	_ZTI18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV8EE @ 379 NONAME
-	_ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV1EE @ 380 NONAME
-	_ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV2EE @ 381 NONAME
-	_ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV7EE @ 382 NONAME
-	_ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV8EE @ 383 NONAME
-	_ZTI18TMockLtsyCallData1IN12RMobilePhone19TMobilePhonePrivacyEE @ 384 NONAME
-	_ZTI18TMockLtsyCallData1IN5RCall14TBearerServiceEE @ 385 NONAME
-	_ZTI18TMockLtsyCallData1IN5RCall7TStatusEE @ 386 NONAME
-	_ZTI18TMockLtsyCallData1IN5RCall9TCommPortEE @ 387 NONAME
-	_ZTI18TMockLtsyCallData1IiE @ 388 NONAME
-	_ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 389 NONAME
-	_ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 390 NONAME
-	_ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 391 NONAME
-	_ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 392 NONAME
-	_ZTI18TMockLtsyCallData2IN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 393 NONAME
-	_ZTI18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 394 NONAME
-	_ZTI18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 395 NONAME
-	_ZTI18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 396 NONAME
-	_ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 397 NONAME
-	_ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 398 NONAME
-	_ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 399 NONAME
-	_ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 400 NONAME
-	_ZTI18TMockLtsyCallData2IiiE @ 401 NONAME
-	_ZTI19CMockSmsMessHandler @ 402 NONAME
-	_ZTI20CMockCallMessHandler @ 403 NONAME
-	_ZTI21CMockPhoneMessHandler @ 404 NONAME
-	_ZTI21TMockLtsyCallData1BufI4TBufILi129EEE @ 405 NONAME
-	_ZTI21TMockLtsyCallData1BufIN11RMobileCall16TMobileCallEventEE @ 406 NONAME
-	_ZTI21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallInfoV1EE @ 407 NONAME
-	_ZTI21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallStatusEE @ 408 NONAME
-	_ZTI21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV1EE @ 409 NONAME
-	_ZTI21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV2EE @ 410 NONAME
-	_ZTI21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV7EE @ 411 NONAME
-	_ZTI21TMockLtsyCallData1BufIN11RMobileCall21TMobileCallDataCapsV1EE @ 412 NONAME
-	_ZTI21TMockLtsyCallData1BufIN11RMobileCall22TMobileCallHscsdInfoV8EE @ 413 NONAME
-	_ZTI21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV1EE @ 414 NONAME
-	_ZTI21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV2EE @ 415 NONAME
-	_ZTI21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV8EE @ 416 NONAME
-	_ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV1EE @ 417 NONAME
-	_ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV2EE @ 418 NONAME
-	_ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV7EE @ 419 NONAME
-	_ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV8EE @ 420 NONAME
-	_ZTI21TMockLtsyCallData1BufIN12RMobilePhone19TMobilePhonePrivacyEE @ 421 NONAME
-	_ZTI21TMockLtsyCallData1BufIN5RCall14TBearerServiceEE @ 422 NONAME
-	_ZTI21TMockLtsyCallData1BufIN5RCall7TStatusEE @ 423 NONAME
-	_ZTI21TMockLtsyCallData1BufIN5RCall9TCommPortEE @ 424 NONAME
-	_ZTI21TMockLtsyCallData1BufIiE @ 425 NONAME
-	_ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 426 NONAME
-	_ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 427 NONAME
-	_ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 428 NONAME
-	_ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 429 NONAME
-	_ZTI21TMockLtsyCallData2BufIN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 430 NONAME
-	_ZTI21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 431 NONAME
-	_ZTI21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 432 NONAME
-	_ZTI21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 433 NONAME
-	_ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 434 NONAME
-	_ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 435 NONAME
-	_ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 436 NONAME
-	_ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 437 NONAME
-	_ZTI21TMockLtsyCallData2BufIiiE @ 438 NONAME
-	_ZTI21TMockLtsyContextData1I4TBufILi16EEE @ 439 NONAME
-	_ZTI21TMockLtsyContextData2I4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 440 NONAME
-	_ZTI21TMockLtsyContextData2I4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 441 NONAME
-	_ZTI23CMockPcktQoSMessHandler @ 442 NONAME
-	_ZTI23TMockLtsyPacketQoSData1I4TBufILi16EEE @ 443 NONAME
-	_ZTI23TMockLtsyPhoneBookData1I10TPBFdnInfoE @ 444 NONAME
-	_ZTI23TMockLtsyPhoneBookData1I12TPBEntryInfoE @ 445 NONAME
-	_ZTI23TMockLtsyPhoneBookData1I16CStorageInfoDataE @ 446 NONAME
-	_ZTI23TMockLtsyPhoneBookData1IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 447 NONAME
-	_ZTI23TMockLtsyPhoneBookData1IP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 448 NONAME
-	_ZTI23TMockLtsyPhoneBookData1IiE @ 449 NONAME
-	_ZTI23TMockLtsyPhoneBookData2IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 450 NONAME ABSENT
-	_ZTI23TMockLtsyPhoneBookData2IiP20CPhoneBookStoreEntryE @ 451 NONAME
-	_ZTI24TMockLtsyContextData1BufI4TBufILi16EEE @ 452 NONAME
-	_ZTI24TMockLtsyContextData2BufI4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 453 NONAME
-	_ZTI24TMockLtsyContextData2BufI4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 454 NONAME
-	_ZTI26CMmCustomMessHandlerGsmExt @ 455 NONAME
-	_ZTI26CMockTelephonyAudioControl @ 456 NONAME
-	_ZTI26TMockLtsyPhoneBookData1BufI10TPBFdnInfoE @ 457 NONAME
-	_ZTI26TMockLtsyPhoneBookData1BufI12TPBEntryInfoE @ 458 NONAME
-	_ZTI26TMockLtsyPhoneBookData1BufI16CStorageInfoDataE @ 459 NONAME
-	_ZTI26TMockLtsyPhoneBookData1BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 460 NONAME
-	_ZTI26TMockLtsyPhoneBookData1BufIP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 461 NONAME
-	_ZTI26TMockLtsyPhoneBookData1BufIiE @ 462 NONAME
-	_ZTI26TMockLtsyPhoneBookData2BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 463 NONAME ABSENT
-	_ZTI26TMockLtsyPhoneBookData2BufIiP20CPhoneBookStoreEntryE @ 464 NONAME
-	_ZTI27CMockPcktContextMessHandler @ 465 NONAME
-	_ZTI27CMockPcktServiceMessHandler @ 466 NONAME
-	_ZTI30CMockPhoneBookStoreMessHandler @ 467 NONAME
-	_ZTV14TMockLtsyData1I10TGsmCbsMsgE @ 468 NONAME
-	_ZTV14TMockLtsyData1I11TONStoreMsgE @ 469 NONAME
-	_ZTV14TMockLtsyData1I12TRfStateInfoE @ 470 NONAME
-	_ZTV14TMockLtsyData1I12TServiceTypeE @ 471 NONAME
-	_ZTV14TMockLtsyData1I14TContextParamsE @ 472 NONAME
-	_ZTV14TMockLtsyData1I16TENStoreResponseE @ 473 NONAME
-	_ZTV14TMockLtsyData1I20TLockSettingPasswordE @ 474 NONAME
-	_ZTV14TMockLtsyData1I21TContextConfigurationE @ 475 NONAME
-	_ZTV14TMockLtsyData1I24TCbsCbmiAndLangAndFilterE @ 476 NONAME
-	_ZTV14TMockLtsyData1I25TMbmsNetworkServiceStatusE @ 477 NONAME
-	_ZTV14TMockLtsyData1I25TSendSmsDataAndAttributesE @ 478 NONAME
-	_ZTV14TMockLtsyData1I31TMmMbmsMonitorServiceListParamsE @ 479 NONAME
-	_ZTV14TMockLtsyData1I4TBufILi10EEE @ 480 NONAME
-	_ZTV14TMockLtsyData1I4TBufILi128EEE @ 481 NONAME
-	_ZTV14TMockLtsyData1I4TBufILi15EEE @ 482 NONAME
-	_ZTV14TMockLtsyData1I4TBufILi16EEE @ 483 NONAME
-	_ZTV14TMockLtsyData1I4TBufILi32EEE @ 484 NONAME
-	_ZTV14TMockLtsyData1I4TBufILi6EEE @ 485 NONAME
-	_ZTV14TMockLtsyData1I5TBuf8ILi128EEE @ 486 NONAME
-	_ZTV14TMockLtsyData1I5TBuf8ILi15EEE @ 487 NONAME
-	_ZTV14TMockLtsyData1I5TBuf8ILi16EEE @ 488 NONAME
-	_ZTV14TMockLtsyData1I5TCharE @ 489 NONAME
-	_ZTV14TMockLtsyData1I5TTimeE @ 490 NONAME
-	_ZTV14TMockLtsyData1I7TSmsMsgE @ 491 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI11TAlsSupportEE @ 492 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI11TOperatorIdEE @ 493 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI11TViagParamsEE @ 494 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI12THSxPAStatusEE @ 495 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI12TSetAlsBlockEE @ 496 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI12TSimFileInfoEE @ 497 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI13TSetDriveModeEE @ 498 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI14TBandSelectionEE @ 499 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI16TNetworkModeCapsEE @ 500 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI16TSetAlwaysOnModeEE @ 501 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI18TGetAlsBlockStatusEE @ 502 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI18TViagCacheRecordIdEE @ 503 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI19TViagUHZIUESettingsEE @ 504 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI20TEmerNumberCheckModeEE @ 505 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI5TApduEE @ 506 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI9TDtmfInfoEE @ 507 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone11TAPNEntryV3EE @ 508 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone14TMobileServiceEE @ 509 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone16TMobilePhoneLockEE @ 510 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone16TMobilePhoneNITZEE @ 511 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone19TMobilePhoneALSLineEE @ 512 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone21TMobilePhoneFdnStatusEE @ 513 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone21TMobilePhoneIdServiceEE @ 514 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone22TImsAuthenticateDataV5EE @ 515 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 516 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 517 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockStatusEE @ 518 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCBConditionEE @ 519 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCFConditionEE @ 520 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone23TMobilePhoneNetworkModeEE @ 521 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 522 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone24TMobilePhoneServiceTableEE @ 523 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 524 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 525 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 526 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 527 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 528 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 529 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneSecurityEventEE @ 530 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 531 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 532 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 533 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 534 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone28TAPNControlListServiceStatusEE @ 535 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 536 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 537 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 538 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 539 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 540 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 541 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 542 NONAME
-	_ZTV14TMockLtsyData1IN14RMobileONStore16TMobileONEntryV1EE @ 543 NONAME
-	_ZTV14TMockLtsyData1IN14RPacketContext17TContextConfig_R5EE @ 544 NONAME
-	_ZTV14TMockLtsyData1IN14RPacketContext18TContextConfigCDMAEE @ 545 NONAME
-	_ZTV14TMockLtsyData1IN14RPacketContext18TContextConfigGPRSEE @ 546 NONAME
-	_ZTV14TMockLtsyData1IN14RPacketContext20TContextConfigR99_R4EE @ 547 NONAME
-	_ZTV14TMockLtsyData1IN14RPacketService11TAttachModeEE @ 548 NONAME
-	_ZTV14TMockLtsyData1IN14RPacketService16TPreferredBearerEE @ 549 NONAME
-	_ZTV14TMockLtsyData1IN14RPacketService19TRegistrationStatusEE @ 550 NONAME
-	_ZTV14TMockLtsyData1IN14RPacketService7TStatusEE @ 551 NONAME
-	_ZTV14TMockLtsyData1IN14RPacketService8TMSClassEE @ 552 NONAME
-	_ZTV14TMockLtsyData1IN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 553 NONAME
-	_ZTV14TMockLtsyData1IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 554 NONAME
-	_ZTV14TMockLtsyData1IN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 555 NONAME
-	_ZTV14TMockLtsyData1IN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 556 NONAME
-	_ZTV14TMockLtsyData1IN19RMobileSmsMessaging16TMobileSmsBearerEE @ 557 NONAME
-	_ZTV14TMockLtsyData1IN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 558 NONAME
-	_ZTV14TMockLtsyData1IN6RPhone7TStatusEE @ 559 NONAME
-	_ZTV14TMockLtsyData1IP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 560 NONAME
-	_ZTV14TMockLtsyData1IP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 561 NONAME
-	_ZTV14TMockLtsyData1IP13CArrayPtrFlatI14TSmsParametersEE @ 562 NONAME
-	_ZTV14TMockLtsyData1IP13CArrayPtrFlatI16TENStoreResponseEE @ 563 NONAME
-	_ZTV14TMockLtsyData1IP13CArrayPtrFlatI7TSmsMsgEE @ 564 NONAME
-	_ZTV14TMockLtsyData1IP18CMobilePhoneCFListE @ 565 NONAME
-	_ZTV14TMockLtsyData1IP18CMobilePhoneCWListE @ 566 NONAME
-	_ZTV14TMockLtsyData1IP25CMobilePhoneNetworkListV2E @ 567 NONAME
-	_ZTV14TMockLtsyData1IP27CMobilePhoneBroadcastIdListE @ 568 NONAME
-	_ZTV14TMockLtsyData1IP29CPcktMbmsMonitoredServiceListE @ 569 NONAME
-	_ZTV14TMockLtsyData1IP4TBufILi100EEE @ 570 NONAME
-	_ZTV14TMockLtsyData1IP6TDesC8E @ 571 NONAME
-	_ZTV14TMockLtsyData1IPN12RMmCustomAPI20TSimCardReaderStatusEE @ 572 NONAME
-	_ZTV14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 573 NONAME
-	_ZTV14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 574 NONAME
-	_ZTV14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 575 NONAME
-	_ZTV14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 576 NONAME
-	_ZTV14TMockLtsyData1IPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 577 NONAME
-	_ZTV14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 578 NONAME
-	_ZTV14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 579 NONAME
-	_ZTV14TMockLtsyData1IPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 580 NONAME
-	_ZTV14TMockLtsyData1IhE @ 581 NONAME
-	_ZTV14TMockLtsyData1IiE @ 582 NONAME
-	_ZTV14TMockLtsyData1IjE @ 583 NONAME
-	_ZTV14TMockLtsyData1IlE @ 584 NONAME
-	_ZTV14TMockLtsyData1ImE @ 585 NONAME
-	_ZTV14TMockLtsyData1IsE @ 586 NONAME
-	_ZTV14TMockLtsyData1ItE @ 587 NONAME
-	_ZTV14TMockLtsyData2I14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 588 NONAME
-	_ZTV14TMockLtsyData2I14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 589 NONAME
-	_ZTV14TMockLtsyData2I14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 590 NONAME
-	_ZTV14TMockLtsyData2I21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 591 NONAME
-	_ZTV14TMockLtsyData2I4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 592 NONAME
-	_ZTV14TMockLtsyData2I4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 593 NONAME
-	_ZTV14TMockLtsyData2I4TBufILi16EE12TContextMiscE @ 594 NONAME
-	_ZTV14TMockLtsyData2I4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 595 NONAME
-	_ZTV14TMockLtsyData2I4TBufILi16EE5TBuf8ILi1EEE @ 596 NONAME
-	_ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 597 NONAME
-	_ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 598 NONAME
-	_ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 599 NONAME
-	_ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 600 NONAME
-	_ZTV14TMockLtsyData2I4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 601 NONAME
-	_ZTV14TMockLtsyData2I4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 602 NONAME
-	_ZTV14TMockLtsyData2I4TBufILi16EES1_E @ 603 NONAME
-	_ZTV14TMockLtsyData2I4TBufILi16EEiE @ 604 NONAME
-	_ZTV14TMockLtsyData2I5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 605 NONAME
-	_ZTV14TMockLtsyData2I5TTimeiE @ 606 NONAME
-	_ZTV14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 607 NONAME
-	_ZTV14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 608 NONAME
-	_ZTV14TMockLtsyData2IN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 609 NONAME
-	_ZTV14TMockLtsyData2IN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 610 NONAME
-	_ZTV14TMockLtsyData2IN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 611 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 612 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 613 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 614 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 615 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 616 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 617 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 618 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 619 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 620 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 621 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 622 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 623 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 624 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 625 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 626 NONAME
-	_ZTV14TMockLtsyData2IN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 627 NONAME
-	_ZTV14TMockLtsyData2IN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 628 NONAME
-	_ZTV14TMockLtsyData2IN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 629 NONAME
-	_ZTV14TMockLtsyData2IN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 630 NONAME
-	_ZTV14TMockLtsyData2IN14RPacketService7TStatusEiE @ 631 NONAME
-	_ZTV14TMockLtsyData2IN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 632 NONAME
-	_ZTV14TMockLtsyData2IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 633 NONAME
-	_ZTV14TMockLtsyData2IN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 634 NONAME
-	_ZTV14TMockLtsyData2IP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 635 NONAME
-	_ZTV14TMockLtsyData2IP13CArrayPtrFlatI7TSmsMsgEiE @ 636 NONAME
-	_ZTV14TMockLtsyData2IP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 637 NONAME
-	_ZTV14TMockLtsyData2IP6TDesC8S1_E @ 638 NONAME
-	_ZTV14TMockLtsyData2IP6TDesC8iE @ 639 NONAME
-	_ZTV14TMockLtsyData2Ih4TBufILi10EEE @ 640 NONAME
-	_ZTV14TMockLtsyData2IhiE @ 641 NONAME
-	_ZTV14TMockLtsyData2IiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 642 NONAME
-	_ZTV14TMockLtsyData2IiP7TSmsMsgE @ 643 NONAME
-	_ZTV14TMockLtsyData2IiiE @ 644 NONAME
-	_ZTV14TMockLtsyData2IjiE @ 645 NONAME
-	_ZTV14TMockLtsyData2IlaE @ 646 NONAME
-	_ZTV14TMockLtsyData2Is5TBuf8ILi165EEE @ 647 NONAME
-	_ZTV15CMockLtsyEngine @ 648 NONAME
-	_ZTV16CMmCustomStubExt @ 649 NONAME
-	_ZTV16CMmMessageRouter @ 650 NONAME
-	_ZTV17TMockLtsyData1BufI10TGsmCbsMsgE @ 651 NONAME
-	_ZTV17TMockLtsyData1BufI11TONStoreMsgE @ 652 NONAME
-	_ZTV17TMockLtsyData1BufI12TRfStateInfoE @ 653 NONAME
-	_ZTV17TMockLtsyData1BufI12TServiceTypeE @ 654 NONAME
-	_ZTV17TMockLtsyData1BufI14TContextParamsE @ 655 NONAME
-	_ZTV17TMockLtsyData1BufI16TENStoreResponseE @ 656 NONAME
-	_ZTV17TMockLtsyData1BufI20TLockSettingPasswordE @ 657 NONAME
-	_ZTV17TMockLtsyData1BufI21TContextConfigurationE @ 658 NONAME
-	_ZTV17TMockLtsyData1BufI24TCbsCbmiAndLangAndFilterE @ 659 NONAME
-	_ZTV17TMockLtsyData1BufI25TMbmsNetworkServiceStatusE @ 660 NONAME
-	_ZTV17TMockLtsyData1BufI25TSendSmsDataAndAttributesE @ 661 NONAME
-	_ZTV17TMockLtsyData1BufI31TMmMbmsMonitorServiceListParamsE @ 662 NONAME
-	_ZTV17TMockLtsyData1BufI4TBufILi10EEE @ 663 NONAME
-	_ZTV17TMockLtsyData1BufI4TBufILi128EEE @ 664 NONAME
-	_ZTV17TMockLtsyData1BufI4TBufILi15EEE @ 665 NONAME
-	_ZTV17TMockLtsyData1BufI4TBufILi16EEE @ 666 NONAME
-	_ZTV17TMockLtsyData1BufI4TBufILi32EEE @ 667 NONAME
-	_ZTV17TMockLtsyData1BufI4TBufILi6EEE @ 668 NONAME
-	_ZTV17TMockLtsyData1BufI5TBuf8ILi128EEE @ 669 NONAME
-	_ZTV17TMockLtsyData1BufI5TBuf8ILi15EEE @ 670 NONAME
-	_ZTV17TMockLtsyData1BufI5TBuf8ILi16EEE @ 671 NONAME
-	_ZTV17TMockLtsyData1BufI5TCharE @ 672 NONAME
-	_ZTV17TMockLtsyData1BufI5TTimeE @ 673 NONAME
-	_ZTV17TMockLtsyData1BufI7TSmsMsgE @ 674 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI11TAlsSupportEE @ 675 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI11TOperatorIdEE @ 676 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI11TViagParamsEE @ 677 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI12THSxPAStatusEE @ 678 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI12TSetAlsBlockEE @ 679 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI12TSimFileInfoEE @ 680 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI13TSetDriveModeEE @ 681 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI14TBandSelectionEE @ 682 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI16TNetworkModeCapsEE @ 683 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI16TSetAlwaysOnModeEE @ 684 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI18TGetAlsBlockStatusEE @ 685 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI18TViagCacheRecordIdEE @ 686 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI19TViagUHZIUESettingsEE @ 687 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI20TEmerNumberCheckModeEE @ 688 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI5TApduEE @ 689 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI9TDtmfInfoEE @ 690 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone11TAPNEntryV3EE @ 691 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone14TMobileServiceEE @ 692 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneLockEE @ 693 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneNITZEE @ 694 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone19TMobilePhoneALSLineEE @ 695 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneFdnStatusEE @ 696 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneIdServiceEE @ 697 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone22TImsAuthenticateDataV5EE @ 698 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 699 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 700 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockStatusEE @ 701 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCBConditionEE @ 702 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCFConditionEE @ 703 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneNetworkModeEE @ 704 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 705 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneServiceTableEE @ 706 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 707 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 708 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 709 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 710 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 711 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 712 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneSecurityEventEE @ 713 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 714 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 715 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 716 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 717 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone28TAPNControlListServiceStatusEE @ 718 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 719 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 720 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 721 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 722 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 723 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 724 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 725 NONAME
-	_ZTV17TMockLtsyData1BufIN14RMobileONStore16TMobileONEntryV1EE @ 726 NONAME
-	_ZTV17TMockLtsyData1BufIN14RPacketContext17TContextConfig_R5EE @ 727 NONAME
-	_ZTV17TMockLtsyData1BufIN14RPacketContext18TContextConfigCDMAEE @ 728 NONAME
-	_ZTV17TMockLtsyData1BufIN14RPacketContext18TContextConfigGPRSEE @ 729 NONAME
-	_ZTV17TMockLtsyData1BufIN14RPacketContext20TContextConfigR99_R4EE @ 730 NONAME
-	_ZTV17TMockLtsyData1BufIN14RPacketService11TAttachModeEE @ 731 NONAME
-	_ZTV17TMockLtsyData1BufIN14RPacketService16TPreferredBearerEE @ 732 NONAME
-	_ZTV17TMockLtsyData1BufIN14RPacketService19TRegistrationStatusEE @ 733 NONAME
-	_ZTV17TMockLtsyData1BufIN14RPacketService7TStatusEE @ 734 NONAME
-	_ZTV17TMockLtsyData1BufIN14RPacketService8TMSClassEE @ 735 NONAME
-	_ZTV17TMockLtsyData1BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 736 NONAME
-	_ZTV17TMockLtsyData1BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 737 NONAME
-	_ZTV17TMockLtsyData1BufIN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 738 NONAME
-	_ZTV17TMockLtsyData1BufIN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 739 NONAME
-	_ZTV17TMockLtsyData1BufIN19RMobileSmsMessaging16TMobileSmsBearerEE @ 740 NONAME
-	_ZTV17TMockLtsyData1BufIN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 741 NONAME
-	_ZTV17TMockLtsyData1BufIN6RPhone7TStatusEE @ 742 NONAME
-	_ZTV17TMockLtsyData1BufIP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 743 NONAME
-	_ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 744 NONAME
-	_ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI14TSmsParametersEE @ 745 NONAME
-	_ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI16TENStoreResponseEE @ 746 NONAME
-	_ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI7TSmsMsgEE @ 747 NONAME
-	_ZTV17TMockLtsyData1BufIP18CMobilePhoneCFListE @ 748 NONAME
-	_ZTV17TMockLtsyData1BufIP18CMobilePhoneCWListE @ 749 NONAME
-	_ZTV17TMockLtsyData1BufIP25CMobilePhoneNetworkListV2E @ 750 NONAME
-	_ZTV17TMockLtsyData1BufIP27CMobilePhoneBroadcastIdListE @ 751 NONAME
-	_ZTV17TMockLtsyData1BufIP29CPcktMbmsMonitoredServiceListE @ 752 NONAME
-	_ZTV17TMockLtsyData1BufIP4TBufILi100EEE @ 753 NONAME
-	_ZTV17TMockLtsyData1BufIP6TDesC8E @ 754 NONAME
-	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI20TSimCardReaderStatusEE @ 755 NONAME
-	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 756 NONAME
-	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 757 NONAME
-	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 758 NONAME
-	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 759 NONAME
-	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 760 NONAME
-	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 761 NONAME
-	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 762 NONAME
-	_ZTV17TMockLtsyData1BufIPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 763 NONAME
-	_ZTV17TMockLtsyData1BufIhE @ 764 NONAME
-	_ZTV17TMockLtsyData1BufIiE @ 765 NONAME
-	_ZTV17TMockLtsyData1BufIjE @ 766 NONAME
-	_ZTV17TMockLtsyData1BufIlE @ 767 NONAME
-	_ZTV17TMockLtsyData1BufImE @ 768 NONAME
-	_ZTV17TMockLtsyData1BufIsE @ 769 NONAME
-	_ZTV17TMockLtsyData1BufItE @ 770 NONAME
-	_ZTV17TMockLtsyData2BufI14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 771 NONAME
-	_ZTV17TMockLtsyData2BufI14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 772 NONAME
-	_ZTV17TMockLtsyData2BufI14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 773 NONAME
-	_ZTV17TMockLtsyData2BufI21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 774 NONAME
-	_ZTV17TMockLtsyData2BufI4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 775 NONAME
-	_ZTV17TMockLtsyData2BufI4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 776 NONAME
-	_ZTV17TMockLtsyData2BufI4TBufILi16EE12TContextMiscE @ 777 NONAME
-	_ZTV17TMockLtsyData2BufI4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 778 NONAME
-	_ZTV17TMockLtsyData2BufI4TBufILi16EE5TBuf8ILi1EEE @ 779 NONAME
-	_ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 780 NONAME
-	_ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 781 NONAME
-	_ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 782 NONAME
-	_ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 783 NONAME
-	_ZTV17TMockLtsyData2BufI4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 784 NONAME
-	_ZTV17TMockLtsyData2BufI4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 785 NONAME
-	_ZTV17TMockLtsyData2BufI4TBufILi16EES1_E @ 786 NONAME
-	_ZTV17TMockLtsyData2BufI4TBufILi16EEiE @ 787 NONAME
-	_ZTV17TMockLtsyData2BufI5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 788 NONAME
-	_ZTV17TMockLtsyData2BufI5TTimeiE @ 789 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 790 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 791 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 792 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 793 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 794 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 795 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 796 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 797 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 798 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 799 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 800 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 801 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 802 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 803 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 804 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 805 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 806 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 807 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 808 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 809 NONAME
-	_ZTV17TMockLtsyData2BufIN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 810 NONAME
-	_ZTV17TMockLtsyData2BufIN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 811 NONAME
-	_ZTV17TMockLtsyData2BufIN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 812 NONAME
-	_ZTV17TMockLtsyData2BufIN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 813 NONAME
-	_ZTV17TMockLtsyData2BufIN14RPacketService7TStatusEiE @ 814 NONAME
-	_ZTV17TMockLtsyData2BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 815 NONAME
-	_ZTV17TMockLtsyData2BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 816 NONAME
-	_ZTV17TMockLtsyData2BufIN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 817 NONAME
-	_ZTV17TMockLtsyData2BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 818 NONAME
-	_ZTV17TMockLtsyData2BufIP13CArrayPtrFlatI7TSmsMsgEiE @ 819 NONAME
-	_ZTV17TMockLtsyData2BufIP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 820 NONAME
-	_ZTV17TMockLtsyData2BufIP6TDesC8S1_E @ 821 NONAME
-	_ZTV17TMockLtsyData2BufIP6TDesC8iE @ 822 NONAME
-	_ZTV17TMockLtsyData2BufIh4TBufILi10EEE @ 823 NONAME
-	_ZTV17TMockLtsyData2BufIhiE @ 824 NONAME
-	_ZTV17TMockLtsyData2BufIiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 825 NONAME
-	_ZTV17TMockLtsyData2BufIiP7TSmsMsgE @ 826 NONAME
-	_ZTV17TMockLtsyData2BufIiiE @ 827 NONAME
-	_ZTV17TMockLtsyData2BufIjiE @ 828 NONAME
-	_ZTV17TMockLtsyData2BufIlaE @ 829 NONAME
-	_ZTV17TMockLtsyData2BufIs5TBuf8ILi165EEE @ 830 NONAME
-	_ZTV18CMockLtsyFactoryV1 @ 831 NONAME
-	_ZTV18CMockLtsyFactoryV2 @ 832 NONAME
-	_ZTV18CMockLtsyFactoryV3 @ 833 NONAME
-	_ZTV18TMockLtsyCallData1I4TBufILi129EEE @ 834 NONAME
-	_ZTV18TMockLtsyCallData1IN11RMobileCall16TMobileCallEventEE @ 835 NONAME
-	_ZTV18TMockLtsyCallData1IN11RMobileCall17TMobileCallInfoV1EE @ 836 NONAME
-	_ZTV18TMockLtsyCallData1IN11RMobileCall17TMobileCallStatusEE @ 837 NONAME
-	_ZTV18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV1EE @ 838 NONAME
-	_ZTV18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV2EE @ 839 NONAME
-	_ZTV18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV7EE @ 840 NONAME
-	_ZTV18TMockLtsyCallData1IN11RMobileCall21TMobileCallDataCapsV1EE @ 841 NONAME
-	_ZTV18TMockLtsyCallData1IN11RMobileCall22TMobileCallHscsdInfoV8EE @ 842 NONAME
-	_ZTV18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV1EE @ 843 NONAME
-	_ZTV18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV2EE @ 844 NONAME
-	_ZTV18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV8EE @ 845 NONAME
-	_ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV1EE @ 846 NONAME
-	_ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV2EE @ 847 NONAME
-	_ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV7EE @ 848 NONAME
-	_ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV8EE @ 849 NONAME
-	_ZTV18TMockLtsyCallData1IN12RMobilePhone19TMobilePhonePrivacyEE @ 850 NONAME
-	_ZTV18TMockLtsyCallData1IN5RCall14TBearerServiceEE @ 851 NONAME
-	_ZTV18TMockLtsyCallData1IN5RCall7TStatusEE @ 852 NONAME
-	_ZTV18TMockLtsyCallData1IN5RCall9TCommPortEE @ 853 NONAME
-	_ZTV18TMockLtsyCallData1IiE @ 854 NONAME
-	_ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 855 NONAME
-	_ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 856 NONAME
-	_ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 857 NONAME
-	_ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 858 NONAME
-	_ZTV18TMockLtsyCallData2IN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 859 NONAME
-	_ZTV18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 860 NONAME
-	_ZTV18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 861 NONAME
-	_ZTV18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 862 NONAME
-	_ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 863 NONAME
-	_ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 864 NONAME
-	_ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 865 NONAME
-	_ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 866 NONAME
-	_ZTV18TMockLtsyCallData2IiiE @ 867 NONAME
-	_ZTV19CMockSmsMessHandler @ 868 NONAME
-	_ZTV20CMockCallMessHandler @ 869 NONAME
-	_ZTV21CMockPhoneMessHandler @ 870 NONAME
-	_ZTV21TMockLtsyCallData1BufI4TBufILi129EEE @ 871 NONAME
-	_ZTV21TMockLtsyCallData1BufIN11RMobileCall16TMobileCallEventEE @ 872 NONAME
-	_ZTV21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallInfoV1EE @ 873 NONAME
-	_ZTV21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallStatusEE @ 874 NONAME
-	_ZTV21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV1EE @ 875 NONAME
-	_ZTV21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV2EE @ 876 NONAME
-	_ZTV21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV7EE @ 877 NONAME
-	_ZTV21TMockLtsyCallData1BufIN11RMobileCall21TMobileCallDataCapsV1EE @ 878 NONAME
-	_ZTV21TMockLtsyCallData1BufIN11RMobileCall22TMobileCallHscsdInfoV8EE @ 879 NONAME
-	_ZTV21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV1EE @ 880 NONAME
-	_ZTV21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV2EE @ 881 NONAME
-	_ZTV21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV8EE @ 882 NONAME
-	_ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV1EE @ 883 NONAME
-	_ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV2EE @ 884 NONAME
-	_ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV7EE @ 885 NONAME
-	_ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV8EE @ 886 NONAME
-	_ZTV21TMockLtsyCallData1BufIN12RMobilePhone19TMobilePhonePrivacyEE @ 887 NONAME
-	_ZTV21TMockLtsyCallData1BufIN5RCall14TBearerServiceEE @ 888 NONAME
-	_ZTV21TMockLtsyCallData1BufIN5RCall7TStatusEE @ 889 NONAME
-	_ZTV21TMockLtsyCallData1BufIN5RCall9TCommPortEE @ 890 NONAME
-	_ZTV21TMockLtsyCallData1BufIiE @ 891 NONAME
-	_ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 892 NONAME
-	_ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 893 NONAME
-	_ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 894 NONAME
-	_ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 895 NONAME
-	_ZTV21TMockLtsyCallData2BufIN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 896 NONAME
-	_ZTV21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 897 NONAME
-	_ZTV21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 898 NONAME
-	_ZTV21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 899 NONAME
-	_ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 900 NONAME
-	_ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 901 NONAME
-	_ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 902 NONAME
-	_ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 903 NONAME
-	_ZTV21TMockLtsyCallData2BufIiiE @ 904 NONAME
-	_ZTV21TMockLtsyContextData1I4TBufILi16EEE @ 905 NONAME
-	_ZTV21TMockLtsyContextData2I4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 906 NONAME
-	_ZTV21TMockLtsyContextData2I4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 907 NONAME
-	_ZTV23CMockPcktQoSMessHandler @ 908 NONAME
-	_ZTV23TMockLtsyPacketQoSData1I4TBufILi16EEE @ 909 NONAME
-	_ZTV23TMockLtsyPhoneBookData1I10TPBFdnInfoE @ 910 NONAME
-	_ZTV23TMockLtsyPhoneBookData1I12TPBEntryInfoE @ 911 NONAME
-	_ZTV23TMockLtsyPhoneBookData1I16CStorageInfoDataE @ 912 NONAME
-	_ZTV23TMockLtsyPhoneBookData1IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 913 NONAME
-	_ZTV23TMockLtsyPhoneBookData1IP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 914 NONAME
-	_ZTV23TMockLtsyPhoneBookData1IiE @ 915 NONAME
-	_ZTV23TMockLtsyPhoneBookData2IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 916 NONAME ABSENT
-	_ZTV23TMockLtsyPhoneBookData2IiP20CPhoneBookStoreEntryE @ 917 NONAME
-	_ZTV24TMockLtsyContextData1BufI4TBufILi16EEE @ 918 NONAME
-	_ZTV24TMockLtsyContextData2BufI4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 919 NONAME
-	_ZTV24TMockLtsyContextData2BufI4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 920 NONAME
-	_ZTV26CMmCustomMessHandlerGsmExt @ 921 NONAME
-	_ZTV26CMockTelephonyAudioControl @ 922 NONAME
-	_ZTV26TMockLtsyPhoneBookData1BufI10TPBFdnInfoE @ 923 NONAME
-	_ZTV26TMockLtsyPhoneBookData1BufI12TPBEntryInfoE @ 924 NONAME
-	_ZTV26TMockLtsyPhoneBookData1BufI16CStorageInfoDataE @ 925 NONAME
-	_ZTV26TMockLtsyPhoneBookData1BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 926 NONAME
-	_ZTV26TMockLtsyPhoneBookData1BufIP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 927 NONAME
-	_ZTV26TMockLtsyPhoneBookData1BufIiE @ 928 NONAME
-	_ZTV26TMockLtsyPhoneBookData2BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 929 NONAME ABSENT
-	_ZTV26TMockLtsyPhoneBookData2BufIiP20CPhoneBookStoreEntryE @ 930 NONAME
-	_ZTV27CMockPcktContextMessHandler @ 931 NONAME
-	_ZTV27CMockPcktServiceMessHandler @ 932 NONAME
-	_ZTV30CMockPhoneBookStoreMessHandler @ 933 NONAME
-	_ZTI14TMockLtsyData1IN12RMobilePhone21TMobilePhoneDTMFEventEE @ 934 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneDTMFEventEE @ 935 NONAME
-	_ZTV14TMockLtsyData1IN12RMobilePhone21TMobilePhoneDTMFEventEE @ 936 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneDTMFEventEE @ 937 NONAME
-	_ZTI14TMockLtsyData1IN12RMmCustomAPI15TApduParametersEE @ 938 NONAME
-	_ZTI17TMockLtsyData1BufIN12RMmCustomAPI15TApduParametersEE @ 939 NONAME
-	_ZTV14TMockLtsyData1IN12RMmCustomAPI15TApduParametersEE @ 940 NONAME
-	_ZTV17TMockLtsyData1BufIN12RMmCustomAPI15TApduParametersEE @ 941 NONAME
-

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -18,8 +18,7 @@
 PRJ_PLATFORMS
 DEFAULT
 
-PRJ_TESTEXPORTS 
-../data/ltsydata_mock.ini 			z:/testdata/configs/ltsydata_mock.ini
+PRJ_EXPORTS
 
 PRJ_TESTMMPFILES
 mockltsy.mmp

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group/mockltsy.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group/mockltsy.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -14,10 +14,10 @@
 * Description:
 *
 */
-TARGET          mocklicenseetsy.dll
+TARGET          licenseetsy.dll
 
 TARGETTYPE      DLL
-UID             0x1000008D 0x2002EA67
+UID             0x1000008D 0x2000BEE4
 
 CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
 
@@ -46,14 +46,15 @@
 
 USERINCLUDE     ../inc
 USERINCLUDE     ../../mockltsydll/inc
+USERINCLUDE		../../../../../commontsy/inc // tflogger.h
 USERINCLUDE		../../../../../commontsy/inc/mmutility // mmtsy_csd_defs.h
 USERINCLUDE		../../../../../commontsy/inc/mmgsmwcdma // mmgsmwcdmaprivateutils.h
-USERINCLUDE		../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 LIBRARY         euser.lib
+LIBRARY         flogger.lib
 LIBRARY			estlib.lib
 LIBRARY 		estor.lib
 LIBRARY			etel.lib
@@ -65,6 +66,8 @@
 LIBRARY			etelpckt.lib
 LIBRARY			customapi.lib
 
+#include <comms-infras/commsdebugutility.mmh>
+
 UNPAGED

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/inc/cmockphonemesshandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/inc/cmockphonemesshandler.h	Wed Sep 01 12:40:21 2010 +0100
@@ -48,6 +48,7 @@
     RPointerArray<RMobilePhone::TMobilePhoneNetworkInfoV1> iNetworkInfoV1List;
     RPointerArray<RMobilePhone::TMobilePhoneNetworkInfoV2> iNetworkInfoV2List;
     RPointerArray<RMobilePhone::TMobilePhoneNetworkInfoV5> iNetworkInfoV5List;
+    RPointerArray<CMobilePhoneStoredNetworkList> iStoredNetworkLists;    
     };
 
 #endif // CMockPhoneMessHandler_H

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/Cmmcustommesshandlergsmext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/Cmmcustommesshandlergsmext.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -14,13 +14,8 @@
 //
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CmmcustommesshandlergsmextTraces.h"
-#endif
-
 #include "CMmCustomMessHandlerGsmExt.h"
+#include <ctsy/tflogger.h>
 #include <ctsy/pluginapi/cmmdatapackage.h>
 #include <ctsy/serviceapi/mmtsy_ipcdefs.h>
 #include <ctsy/pluginapi/mmmessagemanagercallback.h>
@@ -40,7 +35,7 @@
 CMmCustomMessHandlerGsmExt* CMmCustomMessHandlerGsmExt::NewL( 
     CMmMessageRouter* aMessageRouter ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMMESSHANDLERGSMEXT_NEWL_1, "TSY: CMmCustomMessHandlerGsmExt::NewL.\n" );
+TFLOGSTRING("TSY: CMmCustomMessHandlerGsmExt::NewL.\n" );
     
     CMmCustomMessHandlerGsmExt* self = new( ELeave ) 
         CMmCustomMessHandlerGsmExt();
@@ -55,7 +50,7 @@
 
 CMmCustomMessHandlerGsmExt::~CMmCustomMessHandlerGsmExt()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMMESSHANDLERGSMEXT_DTOR_1, "TSY: CMmCustomMessHandlerGsmExt::~CMmCustomMessHandlerGsmExt.\n");
+TFLOGSTRING("TSY: CMmCustomMessHandlerGsmExt::~CMmCustomMessHandlerGsmExt.\n");
     }
 
 // ---------------------------------------------------------------------------

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmmcustomstubext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmmcustomstubext.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -13,14 +13,9 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmcustomstubextTraces.h"
-#endif
-
 #include <ctsy/pluginapi/mmmessagemanagercallback.h>
 //#include "Telephony.h"
+#include <ctsy/tflogger.h>
 #include "cmmcustomstubext.h"
 #include <ctsy/pluginapi/cmmdatapackage.h>
 #include "cmmmessagerouter.h"
@@ -66,7 +61,7 @@
 //
 void CMmCustomStubExt::InitializeL() 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSTUBEXT_INITIALIZEL_1,  "TSY: CMmCustomStubExt::InitializeL. " );
+TFLOGSTRING( "TSY: CMmCustomStubExt::InitializeL. " );  
     }
 
 // ---------------------------------------------------------------------------
@@ -77,7 +72,7 @@
 void CMmCustomStubExt::SetMessageRouter( 
     CMmMessageRouter* aMessageRouter )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSTUBEXT_SETMESSAGEROUTER_1,  "TSY: CMmCustomStubExt::SetMessageRouter. " );
+TFLOGSTRING( "TSY: CMmCustomStubExt::SetMessageRouter. " ); 
     iMessageRouter = aMessageRouter;
     }

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmmmessagerouter.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmmmessagerouter.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -451,6 +451,10 @@
         case EMobilePhoneGetCipheringIndicatorStatus:
         case EMobilePhoneNotifySecurityCapsChange:
         case EMmTsySimRefreshRegisterIPC:
+        case ECtsyPhoneGetPreferredNetworksReq:
+        case ECtsyPhoneGetPreferredNetworksComp:
+        case ECtsyPhoneStorePreferredNetworksListReq:
+        case ECtsyPhoneStorePreferredNetworksListComp:
         
         // APNControl
         case EMobilePhoneGetAPNname: 
@@ -495,8 +499,6 @@
 		case EMmTsyUpdateLifeTimeIPC:                     		
 		case ECtsyPhoneTerminateAllCallsReq:
 		case ECtsyPhoneTerminateAllCallsComp:
-        case ECtsyPhoneTerminateActiveCallsReq:
-        case ECtsyPhoneTerminateActiveCallsComp:
         case EMobilePhoneNotifyIccAccessCapsChange:
 
             messHandler = iPhoneMessHandler;

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockcallmesshandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockcallmesshandler.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -14,6 +14,7 @@
 //
 
 #include "cmockcallmesshandler.h"
+#include <ctsy/tflogger.h>
 #include "MmTsy_Csd_Defs.h"
 #include "cmmmessagerouter.h"
 #include <ctsy/pluginapi/mmmessagemanagercallback.h>

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktcontextmesshandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktcontextmesshandler.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -15,6 +15,7 @@
 
 #include <etelpckt.h>
 #include "cmockpcktcontextmesshandler.h"
+#include <ctsy/tflogger.h>
 #include <pcktcs.h>
 #include <ctsy/pluginapi/mmmessagemanagercallback.h>
 #include "cmockltsyengine.h"

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktqosmesshandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktqosmesshandler.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -13,13 +13,8 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmockpcktqosmesshandlerTraces.h"
-#endif
-
 #include "cmockpcktqosmesshandler.h"
+#include <ctsy/tflogger.h>
 #include <pcktcs.h>
 #include <ctsy/pluginapi/mmmessagemanagercallback.h>
 #include "cmockltsyengine.h"
@@ -69,7 +64,7 @@
     	{
     	case EPacketQoSSetProfileParams:
     		{
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMOCKPCKTQOSMESSHANDLER_EXTFUNCL_1, "Mock: CMockPcktQoSMessHandler. aIpc: %d  aMmDataPackage: 0x%08x", aIpc, (TUint)aMmDataPackage );
+TFLOGSTRING3("Mock: CMockPcktQoSMessHandler. aIpc: %d  aMmDataPackage: %d", aIpc, &aMmDataPackage );
     		TDes8* profile = NULL;
     		TContextParams contextParams; 
     		
@@ -78,7 +73,7 @@
    			TPckg<TPacketDataConfigBase>* profilePckg = ( TPckg<TPacketDataConfigBase>* ) profile;
  		    TPacketDataConfigBase& base = ( *profilePckg )();
  		    
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMOCKPCKTQOSMESSHANDLER_EXTFUNCL_2, "Mock: CMockPcktQoSMessHandler. base.ExtensionId(): %d", base.ExtensionId() );
+TFLOGSTRING2("Mock: CMockPcktQoSMessHandler. base.ExtensionId(): %d", base.ExtensionId() );
 
  		    switch(base.ExtensionId())
  		    	{
@@ -153,7 +148,7 @@
 			break;
 			case EPacketQoSSetProfileParams:
 			{			
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMOCKPCKTQOSMESSHANDLER_COMPLETEL_1, "Mock: Complete. aIpc = %d, aData = %s", aIpc, aData);
+TFLOGSTRING3("Mock: Complete. aIpc = %d, aData = %S", aIpc, &aData);
 				TMockLtsyData1Buf< TInfoName > ret;
 				ret.DeserialiseL(aData);
 				dataPackage.PackData(ret.Data1Ptr());

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktservicemesshandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktservicemesshandler.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -18,6 +18,7 @@
 #include "mmockmesshandlerbase.h"
 #include <ctsy/pluginapi/mmmessagemanagercallback.h>
 #include <ctsy/pluginapi/cmmdatapackage.h>
+#include <ctsy/tflogger.h>
 #include <pcktcs.h>
 #include "cmockltsyengine.h"
 #include "tmockltsydata.h"

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockphonebookstoremesshandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockphonebookstoremesshandler.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -18,6 +18,7 @@
 #include <ctsy/pluginapi/mmmessagemanagercallback.h>
 #include <ctsy/pluginapi/cmmdatapackage.h>
 #include <ctsy/serviceapi/mmtsy_ipcdefs.h>
+#include <ctsy/tflogger.h>
 #include "cmmmessagerouter.h"
 #include "cmockltsyengine.h"
 #include "tmockltsydata.h"

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockphonemesshandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockphonemesshandler.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -64,6 +64,7 @@
 	iNetworkInfoV1List.ResetAndDestroy();
 	iNetworkInfoV2List.ResetAndDestroy();
 	iNetworkInfoV5List.ResetAndDestroy();
+	iStoredNetworkLists.ResetAndDestroy();
     }
 
 /**
@@ -356,15 +357,22 @@
 						   RMobilePhone::TMobilePhoneCBChangeV1> data(condition, *info);
 			return iMessageRouter->MockLtsyEngine()->ExecuteCommandL(aIpc,data);
 			}
-		case ECtsyPhoneTerminateAllCallsReq:		
+		case ECtsyPhoneTerminateAllCallsReq:
 			{
 			TInt callId(0);
 			aMmDataPackage->UnPackData(callId);
 			TMockLtsyData1< TInt > data(callId);
 			return iMessageRouter->MockLtsyEngine()->ExecuteCommandL(aIpc, data);
 			}
-        case ECtsyPhoneTerminateActiveCallsReq: 
-		case ECtsyPhoneCellInfoReq:
+        case ECtsyPhoneStorePreferredNetworksListReq:
+            {
+            CMobilePhoneStoredNetworkList* list = NULL;
+            aMmDataPackage->UnPackData(&list);
+            TMockLtsyData1<CMobilePhoneStoredNetworkList*> data(list);
+            return iMessageRouter->MockLtsyEngine()->ExecuteCommandL(aIpc,data);
+            }
+        case ECtsyPhoneGetPreferredNetworksReq:
+    	case ECtsyPhoneCellInfoReq:
     	case ECtsyPhoneCellInfoIndReq:			
     	case EMobilePhoneSelectNetworkCancel:
     	case EMobilePhoneGetFdnStatus:
@@ -935,11 +943,19 @@
 			}
 			break;
 		case ECtsyPhoneTerminateAllCallsComp:
-		case ECtsyPhoneTerminateActiveCallsComp:
+        case ECtsyPhoneStorePreferredNetworksListComp:
 			{
 			// no parameter is required
-			}
-			break;
+			}		
+            break;
+        case ECtsyPhoneGetPreferredNetworksComp:
+            {
+            CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
+            iStoredNetworkLists.Append(list);
+            TSerializer<CMobilePhoneStoredNetworkList>::DeserialiseL(aData, *list);
+            dataPackage.PackData(list);
+            }
+            break;
 		default:
 			{
 			// shouldnt get here. will panic MessageManager()->Complete if allowed to continue

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmocksmsmesshandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmocksmsmesshandler.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -16,7 +16,8 @@
 #include <ctsy/pluginapi/mmmessagemanagercallback.h>
 #include "cmocksmsmesshandler.h" 
 #include <ctsy/serviceapi/mmtsy_ipcdefs.h> 
-#include "etelmm.h"
+#include "etelmm.h" 
+#include <ctsy/tflogger.h> 
 #include "cmockltsyengine.h"
 #include "tmockltsydata.h"
 #include <ctsy/serviceapi/cmmsmsutility.h>

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/ipcnames.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/ipcnames.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -340,7 +340,6 @@
 _LIT(KEMobilePhoneStartDTMFTone, "EMobilePhoneStartDTMFTone");
 _LIT(KEMobilePhoneStopDTMFTone, "EMobilePhoneStopDTMFTone");
 _LIT(KEMobilePhoneTerminateAllCalls, "EMobilePhoneTerminateAllCalls");
-_LIT(KEMobilePhoneTerminateActiveCalls, "EMobilePhoneTerminateActiveCalls");
 _LIT(KEMobileCallActivateCCBSCancel, "EMobileCallActivateCCBSCancel");
 _LIT(KEMobileCallAnswerISVCancel, "EMobileCallAnswerISVCancel");
 _LIT(KEMobileCallAnswerMultimediaCallAsVoiceCancel, "EMobileCallAnswerMultimediaCallAsVoiceCancel");
@@ -364,7 +363,6 @@
 _LIT(KEMobilePhoneReadDTMFTonesCancel, "EMobilePhoneReadDTMFTonesCancel");
 _LIT(KEMobilePhoneSendDTMFTonesCancel, "EMobilePhoneSendDTMFTonesCancel");
 _LIT(KEMobilePhoneTerminateAllCallsCancel, "EMobilePhoneTerminateAllCallsCancel");
-_LIT(KEMobilePhoneTerminateActiveCallsCancel, "EMobilePhoneTerminateActiveCallsCancel");
 _LIT(KEMobileConferenceCallGetMobileCallInfo, "EMobileConferenceCallGetMobileCallInfo");
 _LIT(KEMobilePhoneEnumerateAPNEntries, "EMobilePhoneEnumerateAPNEntries");
 _LIT(KEMobilePhoneGetAPNname, "EMobilePhoneGetAPNname");
@@ -781,8 +779,6 @@
 _LIT(KECtsyPacketMbmsContextNotifyConfigChanged, "ECtsyPacketMbmsContextNotifyConfigChanged");
 _LIT(KECtsyPhoneTerminateAllCallsReq, "ECtsyPhoneTerminateAllCallsReq");
 _LIT(KECtsyPhoneTerminateAllCallsComp, "ECtsyPhoneTerminateAllCallsComp");
-_LIT(KECtsyPhoneTerminateActiveCallsReq, "ECtsyPhoneTerminateActiveCallsReq");
-_LIT(KECtsyPhoneTerminateActiveCallsComp, "ECtsyPhoneTerminateActiveCallsComp");
 _LIT(KECtsyPhoneSendNetworkServiceRequestReq, "ECtsyPhoneSendNetworkServiceRequestReq");
 _LIT(KECtsyPhoneSendNetworkServiceRequestIndReq, "ECtsyPhoneSendNetworkServiceRequestIndReq");
 _LIT(KECtsyPhoneSendNetworkServiceRequestInd, "ECtsyPhoneSendNetworkServiceRequestInd");
@@ -1112,7 +1108,6 @@
 	case EMobilePhoneStartDTMFTone : return KEMobilePhoneStartDTMFTone;
 	case EMobilePhoneStopDTMFTone : return KEMobilePhoneStopDTMFTone;
 	case EMobilePhoneTerminateAllCalls : return KEMobilePhoneTerminateAllCalls;
-    case EMobilePhoneTerminateActiveCalls : return KEMobilePhoneTerminateActiveCalls;
 	case EMobileCallActivateCCBSCancel : return KEMobileCallActivateCCBSCancel;
 	case EMobileCallAnswerISVCancel : return KEMobileCallAnswerISVCancel;
 	case EMobileCallAnswerMultimediaCallAsVoiceCancel : return KEMobileCallAnswerMultimediaCallAsVoiceCancel;
@@ -1136,7 +1131,6 @@
 	case EMobilePhoneReadDTMFTonesCancel : return KEMobilePhoneReadDTMFTonesCancel;
 	case EMobilePhoneSendDTMFTonesCancel : return KEMobilePhoneSendDTMFTonesCancel;
 	case EMobilePhoneTerminateAllCallsCancel : return KEMobilePhoneTerminateAllCallsCancel;
-    case EMobilePhoneTerminateActiveCallsCancel : return KEMobilePhoneTerminateActiveCallsCancel;
 	case EMobileConferenceCallGetMobileCallInfo : return KEMobileConferenceCallGetMobileCallInfo;
 	case EMobilePhoneEnumerateAPNEntries : return KEMobilePhoneEnumerateAPNEntries;
 	case EMobilePhoneGetAPNname : return KEMobilePhoneGetAPNname;
@@ -1558,8 +1552,6 @@
 	case ECtsyPacketMbmsContextNotifyConfigChanged : return KECtsyPacketMbmsContextNotifyConfigChanged;
 	case ECtsyPhoneTerminateAllCallsReq : return KECtsyPhoneTerminateAllCallsReq;
 	case ECtsyPhoneTerminateAllCallsComp : return KECtsyPhoneTerminateAllCallsComp;
-    case ECtsyPhoneTerminateActiveCallsReq : return KECtsyPhoneTerminateActiveCallsReq;
-    case ECtsyPhoneTerminateActiveCallsComp : return KECtsyPhoneTerminateActiveCallsComp;
 	case ECtsyPhoneSendNetworkServiceRequestReq : return KECtsyPhoneSendNetworkServiceRequestReq;
 	case ECtsyPhoneSendNetworkServiceRequestIndReq : return KECtsyPhoneSendNetworkServiceRequestIndReq;
 	case ECtsyPhoneSendNetworkServiceRequestInd : return KECtsyPhoneSendNetworkServiceRequestInd;

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMMESSHANDLERGSMEXT_DTOR_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMMESSHANDLERGSMEXT_NEWL_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSTUBEXT_INITIALIZEL_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSTUBEXT_SETMESSAGEROUTER_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CMOCKPCKTQOSMESSHANDLER_COMPLETEL_1=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CMOCKPCKTQOSMESSHANDLER_EXTFUNCL_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CMOCKPCKTQOSMESSHANDLER_EXTFUNCL_2=0x6

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/bwins/mockltsydllu.def	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/bwins/mockltsydllu.def	Wed Sep 01 12:40:21 2010 +0100
@@ -183,4 +183,9 @@
 	?IsEqual@?$TComparator@VTApduParameters@RMmCustomAPI@@@@SAHABVTApduParameters@RMmCustomAPI@@0@Z @ 182 NONAME ; int TComparator<class RMmCustomAPI::TApduParameters>::IsEqual(class RMmCustomAPI::TApduParameters const &, class RMmCustomAPI::TApduParameters const &)
 	?IsEqual@?$TComparator@VTSimFileInfo@RMmCustomAPI@@@@SAHABVTSimFileInfo@RMmCustomAPI@@0@Z @ 183 NONAME ; int TComparator<class RMmCustomAPI::TSimFileInfo>::IsEqual(class RMmCustomAPI::TSimFileInfo const &, class RMmCustomAPI::TSimFileInfo const &)
 	?IsEqual@?$TComparator@VTMobileDataCallParamsV8@RMobileCall@@@@SAHABVTMobileDataCallParamsV8@RMobileCall@@0@Z @ 184 NONAME ; int TComparator<class RMobileCall::TMobileDataCallParamsV8>::IsEqual(class RMobileCall::TMobileDataCallParamsV8 const &, class RMobileCall::TMobileDataCallParamsV8 const &)
+	?DeserialiseL@?$TSerializer@VCMobilePhoneStoredNetworkList@@@@SAXABVTDesC8@@AAVCMobilePhoneStoredNetworkList@@@Z @ 185 NONAME ; void TSerializer<class CMobilePhoneStoredNetworkList>::DeserialiseL(class TDesC8 const &, class CMobilePhoneStoredNetworkList &)
+	?ConstructL@?$TConstructor@VCMobilePhoneStoredNetworkList@@@@SAXAAPAVCMobilePhoneStoredNetworkList@@@Z @ 186 NONAME ; void TConstructor<class CMobilePhoneStoredNetworkList>::ConstructL(class CMobilePhoneStoredNetworkList * &)
+	?SerialiseL@?$TSerializer@VCMobilePhoneStoredNetworkList@@@@SAXABVCMobilePhoneStoredNetworkList@@AAVRBuf8@@@Z @ 187 NONAME ; void TSerializer<class CMobilePhoneStoredNetworkList>::SerialiseL(class CMobilePhoneStoredNetworkList const &, class RBuf8 &)
+	?IsEqual@?$TComparator@VCMobilePhoneStoredNetworkList@@@@SAHABVCMobilePhoneStoredNetworkList@@0@Z @ 188 NONAME ; int TComparator<class CMobilePhoneStoredNetworkList>::IsEqual(class CMobilePhoneStoredNetworkList const &, class CMobilePhoneStoredNetworkList const &)
+	?IsEqual@?$TComparator@VTMobilePreferredNetworkEntryV3@RMobilePhone@@@@SAHABVTMobilePreferredNetworkEntryV3@RMobilePhone@@0@Z @ 189 NONAME ; int TComparator<class RMobilePhone::TMobilePreferredNetworkEntryV3>::IsEqual(class RMobilePhone::TMobilePreferredNetworkEntryV3 const &, class RMobilePhone::TMobilePreferredNetworkEntryV3 const &)

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/eabi/mockltsydllu.def	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/eabi/mockltsydllu.def	Wed Sep 01 12:40:21 2010 +0100
@@ -1,208 +1,213 @@
 EXPORTS
 	_ZN10TDestroyerI21TContextConfigurationE7DestroyERS0_ @ 1 NONAME
-	_ZN10TDestroyerIP12CArrayPtrSegI20CPhoneBookStoreEntryEE7DestroyERS3_ @ 2 NONAME
-	_ZN10TDestroyerIP20CPhoneBookStoreEntryE7DestroyERS1_ @ 3 NONAME
-	_ZN10TDestroyerIP6TDesC8E7DestroyES1_ @ 4 NONAME
-	_ZN11TComparatorI14TContextParamsE7IsEqualERKS0_S3_ @ 5 NONAME
-	_ZN11TComparatorI16TENStoreResponseE7IsEqualERKS0_S3_ @ 6 NONAME
-	_ZN11TComparatorI20TLockSettingPasswordE7IsEqualERKS0_S3_ @ 7 NONAME
-	_ZN11TComparatorI21TContextConfigurationE7IsEqualERKS0_S3_ @ 8 NONAME
-	_ZN11TComparatorI24TCbsCbmiAndLangAndFilterE7IsEqualERKS0_S3_ @ 9 NONAME
-	_ZN11TComparatorI27CMobilePhoneBroadcastIdListE7IsEqualERKS0_S3_ @ 10 NONAME
-	_ZN11TComparatorI4TBufILi16EEE7IsEqualERKS1_S4_ @ 11 NONAME
-	_ZN11TComparatorI4TBufILi32EEE7IsEqualERKS1_S4_ @ 12 NONAME
-	_ZN11TComparatorI4TBufILi6EEE7IsEqualERKS1_S4_ @ 13 NONAME
-	_ZN11TComparatorIN11RMobileCall17TMobileCallInfoV1EE7IsEqualERKS1_S4_ @ 14 NONAME
-	_ZN11TComparatorIN11RMobileCall19TMobileCallParamsV1EE7IsEqualERKS1_S4_ @ 15 NONAME
-	_ZN11TComparatorIN12RMobilePhone11TAPNEntryV3EE7IsEqualERKS1_S4_ @ 16 NONAME
-	_ZN11TComparatorIN12RMobilePhone19TCodeAndUnblockCodeEE7IsEqualERKS1_S4_ @ 17 NONAME
-	_ZN11TComparatorIN12RMobilePhone22TImsAuthenticateDataV5EE7IsEqualERKS1_S4_ @ 18 NONAME
-	_ZN11TComparatorIN12RMobilePhone22TMobilePhoneCFChangeV1EE7IsEqualERKS1_S4_ @ 19 NONAME
-	_ZN11TComparatorIN12RMobilePhone24TMobilePhoneSecurityCodeEE7IsEqualERKS1_S4_ @ 20 NONAME
-	_ZN11TComparatorIN12RMobilePhone28TMobilePhonePasswordChangeV2EE7IsEqualES1_S1_ @ 21 NONAME
-	_ZN11TComparatorIN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE7IsEqualERKS1_S4_ @ 22 NONAME
-	_ZN11TComparatorIN14RMobileONStore16TMobileONEntryV1EE7IsEqualES1_S1_ @ 23 NONAME
-	_ZN11TComparatorIN14RPacketContext17TContextConfig_R5EE7IsEqualERKS1_S4_ @ 24 NONAME
-	_ZN11TComparatorIN14RPacketContext18TContextConfigGPRSEE7IsEqualERKS1_S4_ @ 25 NONAME
-	_ZN11TComparatorIN14RPacketContext20TContextConfigR99_R4EE7IsEqualERKS1_S4_ @ 26 NONAME
-	_ZN11TComparatorIN14RPacketContext24CTFTMediaAuthorizationV3EE7IsEqualERKS1_S4_ @ 27 NONAME
-	_ZN11TComparatorIN25RMobileBroadcastMessaging25TMobileBroadcastIdEntryV1EE7IsEqualERKS1_S4_ @ 28 NONAME
-	_ZN11TComparatorIN5RCall9TCommPortEE7IsEqualES1_S1_ @ 29 NONAME
-	_ZN11TComparatorIP12CArrayPtrSegI20CPhoneBookStoreEntryEE7IsEqualERKS3_S6_ @ 30 NONAME
-	_ZN11TComparatorIP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE7IsEqualEPKS3_S7_ @ 31 NONAME
-	_ZN11TComparatorIP20CPhoneBookStoreEntryE7IsEqualERKS1_S4_ @ 32 NONAME
-	_ZN11TComparatorIP25CMobilePhoneNetworkListV2E7IsEqualEPKS0_S4_ @ 33 NONAME
-	_ZN11TComparatorIP5TPckgIN14RMobileONStore16TMobileONEntryV1EEE7IsEqualEPKS3_S4_ @ 34 NONAME
-	_ZN11TComparatorIP6TDesC8E7IsEqualEPKS0_S4_ @ 35 NONAME
-	_ZN11TComparatorIPN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE7IsEqualERKS2_S5_ @ 36 NONAME
-	_ZN11TSerializerI21TContextConfigurationE10SerialiseLERKS0_R5RBuf8 @ 37 NONAME
-	_ZN11TSerializerI21TContextConfigurationE12DeserialiseLERK6TDesC8RS0_ @ 38 NONAME
-	_ZN11TSerializerI27CMobilePhoneBroadcastIdListE10SerialiseLERKS0_R5RBuf8 @ 39 NONAME
-	_ZN11TSerializerI27CMobilePhoneBroadcastIdListE12DeserialiseLERK6TDesC8RS0_ @ 40 NONAME
-	_ZN11TSerializerIN14RPacketContext24CTFTMediaAuthorizationV3EE10SerialiseLERKS1_R5RBuf8 @ 41 NONAME
-	_ZN11TSerializerIN14RPacketContext24CTFTMediaAuthorizationV3EE12DeserialiseLERK6TDesC8RS1_ @ 42 NONAME
-	_ZN11TSerializerIP12CArrayPtrSegI20CPhoneBookStoreEntryEE10SerialiseLEPKS2_R5RBuf8 @ 43 NONAME
-	_ZN11TSerializerIP12CArrayPtrSegI20CPhoneBookStoreEntryEE12DeserialiseLERK6TDesC8RS3_ @ 44 NONAME
-	_ZN11TSerializerIP20CPhoneBookStoreEntryE10SerialiseLEPKS0_R5RBuf8 @ 45 NONAME
-	_ZN11TSerializerIP20CPhoneBookStoreEntryE12DeserialiseLERK6TDesC8RS1_ @ 46 NONAME
-	_ZN11TSerializerIP25CMobilePhoneNetworkListV2E10SerialiseLEPKS0_R5RBuf8 @ 47 NONAME
-	_ZN11TSerializerIP25CMobilePhoneNetworkListV2E12DeserialiseLERK6TDesC8RS1_ @ 48 NONAME
-	_ZN11TSerializerIP6TDesC8E10SerialiseLEPKS0_R5RBuf8 @ 49 NONAME
-	_ZN11TSerializerIP6TDesC8E12DeserialiseLERKS0_RS1_ @ 50 NONAME
-	_ZN11TSerializerIPN14RPacketContext24CTFTMediaAuthorizationV3EE10SerialiseLEPKS1_R5RBuf8 @ 51 NONAME
-	_ZN11TSerializerIPN14RPacketContext24CTFTMediaAuthorizationV3EE12DeserialiseLERK6TDesC8RS2_ @ 52 NONAME
-	_ZN12TConstructorI27CMobilePhoneBroadcastIdListE10ConstructLERPS0_ @ 53 NONAME
-	_ZN12TConstructorIN14RPacketContext24CTFTMediaAuthorizationV3EE10ConstructLERPS1_ @ 54 NONAME
-	_ZN18TMockLtsyCallData012DeserialiseLERK6TDesC8 @ 55 NONAME
-	_ZN18TMockLtsyCallData0C1EiN12RMobilePhone14TMobileServiceE @ 56 NONAME
-	_ZN18TMockLtsyCallData0C1Ev @ 57 NONAME
-	_ZN18TMockLtsyCallData0C2EiN12RMobilePhone14TMobileServiceE @ 58 NONAME
-	_ZN18TMockLtsyCallData0C2Ev @ 59 NONAME
-	_ZN21TMockLtsyContextData012DeserialiseLERK6TDesC8 @ 60 NONAME
-	_ZN21TMockLtsyContextData024ContextConfigurationTypeEv @ 61 NONAME
-	_ZN21TMockLtsyContextData06ConfigEv @ 62 NONAME
-	_ZN21TMockLtsyContextData0C1ERN14RPacketContext18TContextConfigGPRSEi @ 63 NONAME
-	_ZN21TMockLtsyContextData0C1Ev @ 64 NONAME
-	_ZN21TMockLtsyContextData0C2ERN14RPacketContext18TContextConfigGPRSEi @ 65 NONAME
-	_ZN21TMockLtsyContextData0C2Ev @ 66 NONAME
-	_ZN22TPacketQoSR5Negotiated12InternalizeLER11RReadStream @ 67 NONAME
-	_ZN22TPacketQoSR5NegotiatedC1Ev @ 68 NONAME
-	_ZN22TPacketQoSR5NegotiatedC2Ev @ 69 NONAME
-	_ZN23TMockLtsyPacketQoSData012DeserialiseLERK6TDesC8 @ 70 NONAME
-	_ZN23TMockLtsyPacketQoSData015QoSR5NegotiatedEv @ 71 NONAME
-	_ZN23TMockLtsyPacketQoSData017QoSGPRSNegotiatedEv @ 72 NONAME
-	_ZN23TMockLtsyPacketQoSData019QoSR99_R4NegotiatedEv @ 73 NONAME
-	_ZN23TMockLtsyPacketQoSData0C1ER24TPacketQoSGPRSNegotiatedR26TPacketQoSR99_R4NegotiatedR22TPacketQoSR5Negotiated @ 74 NONAME
-	_ZN23TMockLtsyPacketQoSData0C1Ev @ 75 NONAME
-	_ZN23TMockLtsyPacketQoSData0C2ER24TPacketQoSGPRSNegotiatedR26TPacketQoSR99_R4NegotiatedR22TPacketQoSR5Negotiated @ 76 NONAME
-	_ZN23TMockLtsyPacketQoSData0C2Ev @ 77 NONAME
-	_ZN23TMockLtsyPhoneBookData012DeserialiseLERK6TDesC8 @ 78 NONAME
-	_ZN23TMockLtsyPhoneBookData013PhoneBookNameEv @ 79 NONAME
-	_ZN23TMockLtsyPhoneBookData0C1ER4TBufILi128EE @ 80 NONAME
-	_ZN23TMockLtsyPhoneBookData0C1Ev @ 81 NONAME
-	_ZN23TMockLtsyPhoneBookData0C2ER4TBufILi128EE @ 82 NONAME
-	_ZN23TMockLtsyPhoneBookData0C2Ev @ 83 NONAME
-	_ZN24TPacketQoSGPRSNegotiated12InternalizeLER11RReadStream @ 84 NONAME
-	_ZN24TPacketQoSGPRSNegotiatedC1Ev @ 85 NONAME
-	_ZN24TPacketQoSGPRSNegotiatedC2Ev @ 86 NONAME
-	_ZN26TPacketQoSR99_R4Negotiated12InternalizeLER11RReadStream @ 87 NONAME
-	_ZN26TPacketQoSR99_R4NegotiatedC1Ev @ 88 NONAME
-	_ZN26TPacketQoSR99_R4NegotiatedC2Ev @ 89 NONAME
-	_ZN9RMockLtsy10ServerNameEv @ 90 NONAME
-	_ZN9RMockLtsy7ExpectLEiRK6TDesC8ii @ 91 NONAME
-	_ZN9RMockLtsy7ExpectLEiii @ 92 NONAME
-	_ZN9RMockLtsy9CompleteLEiiRK6TDesC8i @ 93 NONAME
-	_ZN9RMockLtsy9CompleteLEiii @ 94 NONAME
-	_ZNK14TMockLtsyData0eqERK6TDesC8 @ 95 NONAME
-	_ZNK18TMockLtsyCallData010SerialiseLER5RBuf8 @ 96 NONAME
-	_ZNK18TMockLtsyCallData06CallIdEv @ 97 NONAME
-	_ZNK18TMockLtsyCallData08CallModeEv @ 98 NONAME
-	_ZNK18TMockLtsyCallData0eqERK6TDesC8 @ 99 NONAME
-	_ZNK21TMockLtsyContextData010SerialiseLER5RBuf8 @ 100 NONAME
-	_ZNK21TMockLtsyContextData0eqERK6TDesC8 @ 101 NONAME
-	_ZNK22TPacketQoSR5Negotiated12ExternalizeLER12RWriteStream @ 102 NONAME
-	_ZNK22TPacketQoSR5NegotiatedeqERKS_ @ 103 NONAME
-	_ZNK23TMockLtsyPacketQoSData010SerialiseLER5RBuf8 @ 104 NONAME
-	_ZNK23TMockLtsyPacketQoSData0eqERK6TDesC8 @ 105 NONAME
-	_ZNK23TMockLtsyPhoneBookData010SerialiseLER5RBuf8 @ 106 NONAME
-	_ZNK23TMockLtsyPhoneBookData0eqERK6TDesC8 @ 107 NONAME
-	_ZNK24TPacketQoSGPRSNegotiated12ExternalizeLER12RWriteStream @ 108 NONAME
-	_ZNK24TPacketQoSGPRSNegotiatedeqERKS_ @ 109 NONAME
-	_ZNK26TPacketQoSR99_R4Negotiated12ExternalizeLER12RWriteStream @ 110 NONAME
-	_ZNK26TPacketQoSR99_R4NegotiatedeqERKS_ @ 111 NONAME
-	_ZTI14TMockLtsyData0 @ 112 NONAME
-	_ZTI18TMockLtsyCallData0 @ 113 NONAME
-	_ZTI21TMockLtsyContextData0 @ 114 NONAME
-	_ZTI23TMockLtsyPacketQoSData0 @ 115 NONAME
-	_ZTI23TMockLtsyPhoneBookData0 @ 116 NONAME
-	_ZTI9RMockLtsy @ 117 NONAME
-	_ZTV14TMockLtsyData0 @ 118 NONAME
-	_ZTV18TMockLtsyCallData0 @ 119 NONAME
-	_ZTV21TMockLtsyContextData0 @ 120 NONAME
-	_ZTV23TMockLtsyPacketQoSData0 @ 121 NONAME
-	_ZTV23TMockLtsyPhoneBookData0 @ 122 NONAME
-	_ZTV9RMockLtsy @ 123 NONAME
-	_ZN10TDestroyerI25TSendSmsDataAndAttributesE7DestroyERS0_ @ 124 NONAME
-	_ZN10TDestroyerIPN12RMobilePhone14TMultimodeTypeEE7DestroyES2_ @ 125 NONAME
-	_ZN11TComparatorI18CMobilePhoneCFListE7IsEqualERKS0_S3_ @ 126 NONAME
-	_ZN11TComparatorI18CMobilePhoneCWListE7IsEqualERKS0_S3_ @ 127 NONAME
-	_ZN11TComparatorI20CMobilePhoneListBaseE7IsEqualERKS0_S3_ @ 128 NONAME
-	_ZN11TComparatorI25TSendSmsDataAndAttributesE7IsEqualERKS0_S3_ @ 129 NONAME
-	_ZN11TSerializerI18CMobilePhoneCFListE10SerialiseLERKS0_R5RBuf8 @ 130 NONAME
-	_ZN11TSerializerI18CMobilePhoneCFListE12DeserialiseLERK6TDesC8RS0_ @ 131 NONAME
-	_ZN11TSerializerI18CMobilePhoneCWListE10SerialiseLERKS0_R5RBuf8 @ 132 NONAME
-	_ZN11TSerializerI18CMobilePhoneCWListE12DeserialiseLERK6TDesC8RS0_ @ 133 NONAME
-	_ZN11TSerializerI20CMobilePhoneListBaseE10SerialiseLERKS0_R5RBuf8 @ 134 NONAME
-	_ZN11TSerializerI20CMobilePhoneListBaseE12DeserialiseLERK6TDesC8RS0_ @ 135 NONAME
-	_ZN11TSerializerI25TSendSmsDataAndAttributesE10SerialiseLES0_R5RBuf8 @ 136 NONAME
-	_ZN11TSerializerI25TSendSmsDataAndAttributesE12DeserialiseLERK6TDesC8RS0_ @ 137 NONAME
-	_ZN12TConstructorI18CMobilePhoneCFListE10ConstructLERPS0_ @ 138 NONAME
-	_ZN12TConstructorI18CMobilePhoneCWListE10ConstructLERPS0_ @ 139 NONAME
-	_ZN12TConstructorI20CMobilePhoneSmspListE10ConstructLERPS0_ @ 140 NONAME
-	_ZN12TConstructorIN12RMobilePhone14TMultimodeTypeEE10ConstructLERPS1_ @ 141 NONAME
-	_ZN11TComparatorI4TBufILi10EEE7IsEqualERKS1_S4_ @ 142 NONAME
-	_ZN11TComparatorI4TBufILi15EEE7IsEqualERKS1_S4_ @ 143 NONAME
-	_ZN11TComparatorIN12RMmCustomAPI11TMmCellInfoEE7IsEqualERKS1_S4_ @ 144 NONAME
-	_ZN11TComparatorIN12RMmCustomAPI18TViagCacheRecordIdEE7IsEqualERKS1_S4_ @ 145 NONAME
-	_ZN11TComparatorIN12RMmCustomAPI20TEmerNumberCheckModeEE7IsEqualERKS1_S4_ @ 146 NONAME
-	_ZN11TComparatorIN12RMmCustomAPI23TViagCacheRecordContentEE7IsEqualERKS1_S4_ @ 147 NONAME
-	_ZN11TComparatorIN12RMmCustomAPI24TSimAuthenticationEapAkaEE7IsEqualERKS1_S4_ @ 148 NONAME
-	_ZN11TComparatorIN12RMmCustomAPI24TSimAuthenticationEapSimEE7IsEqualERKS1_S4_ @ 149 NONAME
-	_ZN11TComparatorIN12RMmCustomAPI5TApduEE7IsEqualERKS1_S4_ @ 150 NONAME
-	_ZN11TComparatorIN12RMobilePhone21TMobilePhoneCspFileV1EE7IsEqualERKS1_S4_ @ 151 NONAME
-	_ZN11TComparatorIN12RMobilePhone26TMobilePhoneServiceTableV1EE7IsEqualERKS1_S4_ @ 152 NONAME
-	_ZN11TComparatorI5TBuf8ILi16EEE7IsEqualERKS1_S4_ @ 153 NONAME
-	_ZN11TComparatorIN12RMobilePhone11TAuthInfoV8EE7IsEqualERKS1_S4_ @ 154 NONAME
-	_ZN11TComparatorIN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE7IsEqualERKS1_S4_ @ 155 NONAME
-	_ZN11TComparatorIN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE7IsEqualERKS1_S4_ @ 156 NONAME
-	_ZN11TComparatorIN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE7IsEqualERKS1_S4_ @ 157 NONAME
-	_ZN11TComparatorIN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE7IsEqualERKS1_S4_ @ 158 NONAME
-	_ZN11TComparatorIN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE7IsEqualERKS1_S4_ @ 159 NONAME
-	_ZN11TComparatorIN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE7IsEqualERKS1_S4_ @ 160 NONAME
-	_ZN11TComparatorIN11RMobileCall17TMobileCallInfoV8EE7IsEqualERKS1_S4_ @ 161 NONAME
-	_ZN11TComparatorIN11RMobileCall19TMobileCallParamsV7EE7IsEqualERKS1_S4_ @ 162 NONAME
-	_ZN10TDestroyerI31TMmMbmsMonitorServiceListParamsE7DestroyERS0_ @ 163 NONAME
-	_ZN11TComparatorI11TMbmsActionE7IsEqualERKS0_S3_ @ 164 NONAME
-	_ZN11TComparatorI25TMbmsNetworkServiceStatusE7IsEqualERKS0_S3_ @ 165 NONAME
-	_ZN11TComparatorI29CPcktMbmsMonitoredServiceListE7IsEqualERKS0_S3_ @ 166 NONAME
-	_ZN11TComparatorI30TMmMbmsActiveServiceListParamsE7IsEqualERKS0_S3_ @ 167 NONAME
-	_ZN11TComparatorI31TMmMbmsMonitorServiceListParamsE7IsEqualERKS0_S3_ @ 168 NONAME
-	_ZN11TSerializerI29CPcktMbmsMonitoredServiceListE10SerialiseLERKS0_R5RBuf8 @ 169 NONAME
-	_ZN11TSerializerI29CPcktMbmsMonitoredServiceListE12DeserialiseLERK6TDesC8RS0_ @ 170 NONAME
-	_ZN11TSerializerI31TMmMbmsMonitorServiceListParamsE10SerialiseLERKS0_R5RBuf8 @ 171 NONAME
-	_ZN11TSerializerI31TMmMbmsMonitorServiceListParamsE12DeserialiseLERK6TDesC8RS0_ @ 172 NONAME
-	_ZN11TSerializerIN18RPacketMbmsContext12CMbmsSessionEE10SerialiseLERKS1_R5RBuf8 @ 173 NONAME
-	_ZN11TSerializerIN18RPacketMbmsContext12CMbmsSessionEE12DeserialiseLERK6TDesC8RS1_ @ 174 NONAME
-	_ZN12TConstructorI29CPcktMbmsMonitoredServiceListE10ConstructLERPS0_ @ 175 NONAME
-	_ZN12TConstructorIN18RPacketMbmsContext12CMbmsSessionEE10ConstructLERPS1_ @ 176 NONAME
-	_ZN11TSerializerI30TMmMbmsActiveServiceListParamsE10SerialiseLERKS0_R5RBuf8 @ 177 NONAME
-	_ZN11TSerializerI30TMmMbmsActiveServiceListParamsE12DeserialiseLERK6TDesC8RS0_ @ 178 NONAME
-	_ZN10TDestroyerIN12RMmCustomAPI13TOperatorLogoEE7DestroyERS1_ @ 179 NONAME
-	_ZN11TSerializerIN12RMmCustomAPI13TOperatorLogoEE10SerialiseLERKS1_R5RBuf8 @ 180 NONAME
-	_ZN11TSerializerIN12RMmCustomAPI13TOperatorLogoEE12DeserialiseLERK6TDesC8RS1_ @ 181 NONAME
-	_ZN11TComparatorI20CMobilePhoneSmspListE7IsEqualERKS0_S3_ @ 182 NONAME
-	_ZN11TComparatorI5TBuf8ILi165EEE7IsEqualERKS1_S4_ @ 183 NONAME
-	_ZN11TComparatorI5TBuf8ILi252EEE7IsEqualERKS1_S4_ @ 184 NONAME
-	_ZN11TComparatorI5TBuf8ILi253EEE7IsEqualERKS1_S4_ @ 185 NONAME
-	_ZN11TComparatorI5TBuf8ILi50EEE7IsEqualERKS1_S4_ @ 186 NONAME
-	_ZN11TComparatorIN11RMobileCall22TMobileCallHscsdInfoV8EE7IsEqualERKS1_S4_ @ 187 NONAME
-	_ZN11TComparatorIN11RMobileCall24TMobileHscsdCallParamsV8EE7IsEqualERKS1_S4_ @ 188 NONAME
-	_ZN11TComparatorIN11RMobileCall7TIconIdEE7IsEqualERKS1_S4_ @ 189 NONAME
-	_ZN11TComparatorIN12RMobilePhone14TMobileAddressEE7IsEqualERKS1_S4_ @ 190 NONAME
-	_ZN11TComparatorIN12RMobilePhone22TMobilePhoneCBChangeV1EE7IsEqualERKS1_S4_ @ 191 NONAME
-	_ZN11TComparatorIN12RMobilePhone28TMobilePhonePasswordChangeV1EE7IsEqualES1_S1_ @ 192 NONAME
-	_ZN11TComparatorIN15RMobileSmsStore17TMobileSmsEntryV1EE7IsEqualERKS1_S4_ @ 193 NONAME
-	_ZN11TComparatorIN15RMobileSmsStore20TMobileGsmSmsEntryV1EE7IsEqualERKS1_S4_ @ 194 NONAME
-	_ZN11TComparatorIN17RMobilePhoneStore24TMobilePhoneStoreEntryV1EE7IsEqualERKS1_S4_ @ 195 NONAME
-	_ZN11TComparatorIN19RMobileSmsMessaging18TMobileSmspEntryV1EE7IsEqualERKS1_S4_ @ 196 NONAME
-	_ZN11TComparatorIN19RMobileSmsMessaging22TMobileSmsAttributesV1EE7IsEqualERKS1_S4_ @ 197 NONAME
-	_ZN11TComparatorIN19RMobileSmsMessaging26TMobileSmsSendAttributesV1EE7IsEqualERKS1_S4_ @ 198 NONAME
-	_ZN11TComparatorIN20RMobileUssdMessaging23TMobileUssdAttributesV1EE7IsEqualERKS1_S4_ @ 199 NONAME
-	_ZN11TSerializerI20CMobilePhoneSmspListE10SerialiseLERKS0_R5RBuf8 @ 200 NONAME
-	_ZN11TSerializerI20CMobilePhoneSmspListE12DeserialiseLERK6TDesC8RS0_ @ 201 NONAME
-	_ZN11TSerializerIP7TDesC16E10SerialiseLEPKS0_R5RBuf8 @ 202 NONAME
-	_ZN11TSerializerIP7TDesC16E12DeserialiseLERK6TDesC8RS1_ @ 203 NONAME
-	_ZN11TComparatorIN12RMmCustomAPI15TApduParametersEE7IsEqualERKS1_S4_ @ 204 NONAME
-	_ZN11TComparatorIN12RMmCustomAPI12TSimFileInfoEE7IsEqualERKS1_S4_ @ 205 NONAME
-	_ZN11TComparatorIN11RMobileCall23TMobileDataCallParamsV8EE7IsEqualERKS1_S4_ @ 206 NONAME
+	_ZN10TDestroyerI25TSendSmsDataAndAttributesE7DestroyERS0_ @ 2 NONAME
+	_ZN10TDestroyerI31TMmMbmsMonitorServiceListParamsE7DestroyERS0_ @ 3 NONAME
+	_ZN10TDestroyerIN12RMmCustomAPI13TOperatorLogoEE7DestroyERS1_ @ 4 NONAME
+	_ZN10TDestroyerIP12CArrayPtrSegI20CPhoneBookStoreEntryEE7DestroyERS3_ @ 5 NONAME
+	_ZN10TDestroyerIP20CPhoneBookStoreEntryE7DestroyERS1_ @ 6 NONAME
+	_ZN10TDestroyerIP6TDesC8E7DestroyES1_ @ 7 NONAME
+	_ZN10TDestroyerIPN12RMobilePhone14TMultimodeTypeEE7DestroyES2_ @ 8 NONAME
+	_ZN11TComparatorI11TMbmsActionE7IsEqualERKS0_S3_ @ 9 NONAME
+	_ZN11TComparatorI14TContextParamsE7IsEqualERKS0_S3_ @ 10 NONAME
+	_ZN11TComparatorI16TENStoreResponseE7IsEqualERKS0_S3_ @ 11 NONAME
+	_ZN11TComparatorI18CMobilePhoneCFListE7IsEqualERKS0_S3_ @ 12 NONAME
+	_ZN11TComparatorI18CMobilePhoneCWListE7IsEqualERKS0_S3_ @ 13 NONAME
+	_ZN11TComparatorI20CMobilePhoneListBaseE7IsEqualERKS0_S3_ @ 14 NONAME
+	_ZN11TComparatorI20CMobilePhoneSmspListE7IsEqualERKS0_S3_ @ 15 NONAME
+	_ZN11TComparatorI20TLockSettingPasswordE7IsEqualERKS0_S3_ @ 16 NONAME
+	_ZN11TComparatorI21TContextConfigurationE7IsEqualERKS0_S3_ @ 17 NONAME
+	_ZN11TComparatorI24TCbsCbmiAndLangAndFilterE7IsEqualERKS0_S3_ @ 18 NONAME
+	_ZN11TComparatorI25TMbmsNetworkServiceStatusE7IsEqualERKS0_S3_ @ 19 NONAME
+	_ZN11TComparatorI25TSendSmsDataAndAttributesE7IsEqualERKS0_S3_ @ 20 NONAME
+	_ZN11TComparatorI27CMobilePhoneBroadcastIdListE7IsEqualERKS0_S3_ @ 21 NONAME
+	_ZN11TComparatorI29CMobilePhoneStoredNetworkListE7IsEqualERKS0_S3_ @ 22 NONAME
+	_ZN11TComparatorI29CPcktMbmsMonitoredServiceListE7IsEqualERKS0_S3_ @ 23 NONAME
+	_ZN11TComparatorI30TMmMbmsActiveServiceListParamsE7IsEqualERKS0_S3_ @ 24 NONAME
+	_ZN11TComparatorI31TMmMbmsMonitorServiceListParamsE7IsEqualERKS0_S3_ @ 25 NONAME
+	_ZN11TComparatorI4TBufILi10EEE7IsEqualERKS1_S4_ @ 26 NONAME
+	_ZN11TComparatorI4TBufILi15EEE7IsEqualERKS1_S4_ @ 27 NONAME
+	_ZN11TComparatorI4TBufILi16EEE7IsEqualERKS1_S4_ @ 28 NONAME
+	_ZN11TComparatorI4TBufILi32EEE7IsEqualERKS1_S4_ @ 29 NONAME
+	_ZN11TComparatorI4TBufILi6EEE7IsEqualERKS1_S4_ @ 30 NONAME
+	_ZN11TComparatorI5TBuf8ILi165EEE7IsEqualERKS1_S4_ @ 31 NONAME
+	_ZN11TComparatorI5TBuf8ILi16EEE7IsEqualERKS1_S4_ @ 32 NONAME
+	_ZN11TComparatorI5TBuf8ILi252EEE7IsEqualERKS1_S4_ @ 33 NONAME
+	_ZN11TComparatorI5TBuf8ILi253EEE7IsEqualERKS1_S4_ @ 34 NONAME
+	_ZN11TComparatorI5TBuf8ILi50EEE7IsEqualERKS1_S4_ @ 35 NONAME
+	_ZN11TComparatorIN11RMobileCall17TMobileCallInfoV1EE7IsEqualERKS1_S4_ @ 36 NONAME
+	_ZN11TComparatorIN11RMobileCall17TMobileCallInfoV8EE7IsEqualERKS1_S4_ @ 37 NONAME
+	_ZN11TComparatorIN11RMobileCall19TMobileCallParamsV1EE7IsEqualERKS1_S4_ @ 38 NONAME
+	_ZN11TComparatorIN11RMobileCall19TMobileCallParamsV7EE7IsEqualERKS1_S4_ @ 39 NONAME
+	_ZN11TComparatorIN11RMobileCall22TMobileCallHscsdInfoV8EE7IsEqualERKS1_S4_ @ 40 NONAME
+	_ZN11TComparatorIN11RMobileCall23TMobileDataCallParamsV8EE7IsEqualERKS1_S4_ @ 41 NONAME
+	_ZN11TComparatorIN11RMobileCall24TMobileHscsdCallParamsV8EE7IsEqualERKS1_S4_ @ 42 NONAME
+	_ZN11TComparatorIN11RMobileCall7TIconIdEE7IsEqualERKS1_S4_ @ 43 NONAME
+	_ZN11TComparatorIN12RMmCustomAPI11TMmCellInfoEE7IsEqualERKS1_S4_ @ 44 NONAME
+	_ZN11TComparatorIN12RMmCustomAPI12TSimFileInfoEE7IsEqualERKS1_S4_ @ 45 NONAME
+	_ZN11TComparatorIN12RMmCustomAPI15TApduParametersEE7IsEqualERKS1_S4_ @ 46 NONAME
+	_ZN11TComparatorIN12RMmCustomAPI18TViagCacheRecordIdEE7IsEqualERKS1_S4_ @ 47 NONAME
+	_ZN11TComparatorIN12RMmCustomAPI20TEmerNumberCheckModeEE7IsEqualERKS1_S4_ @ 48 NONAME
+	_ZN11TComparatorIN12RMmCustomAPI23TViagCacheRecordContentEE7IsEqualERKS1_S4_ @ 49 NONAME
+	_ZN11TComparatorIN12RMmCustomAPI24TSimAuthenticationEapAkaEE7IsEqualERKS1_S4_ @ 50 NONAME
+	_ZN11TComparatorIN12RMmCustomAPI24TSimAuthenticationEapSimEE7IsEqualERKS1_S4_ @ 51 NONAME
+	_ZN11TComparatorIN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE7IsEqualERKS1_S4_ @ 52 NONAME
+	_ZN11TComparatorIN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE7IsEqualERKS1_S4_ @ 53 NONAME
+	_ZN11TComparatorIN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE7IsEqualERKS1_S4_ @ 54 NONAME
+	_ZN11TComparatorIN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE7IsEqualERKS1_S4_ @ 55 NONAME
+	_ZN11TComparatorIN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE7IsEqualERKS1_S4_ @ 56 NONAME
+	_ZN11TComparatorIN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE7IsEqualERKS1_S4_ @ 57 NONAME
+	_ZN11TComparatorIN12RMmCustomAPI5TApduEE7IsEqualERKS1_S4_ @ 58 NONAME
+	_ZN11TComparatorIN12RMobilePhone11TAPNEntryV3EE7IsEqualERKS1_S4_ @ 59 NONAME
+	_ZN11TComparatorIN12RMobilePhone11TAuthInfoV8EE7IsEqualERKS1_S4_ @ 60 NONAME
+	_ZN11TComparatorIN12RMobilePhone14TMobileAddressEE7IsEqualERKS1_S4_ @ 61 NONAME
+	_ZN11TComparatorIN12RMobilePhone19TCodeAndUnblockCodeEE7IsEqualERKS1_S4_ @ 62 NONAME
+	_ZN11TComparatorIN12RMobilePhone21TMobilePhoneCspFileV1EE7IsEqualERKS1_S4_ @ 63 NONAME
+	_ZN11TComparatorIN12RMobilePhone22TImsAuthenticateDataV5EE7IsEqualERKS1_S4_ @ 64 NONAME
+	_ZN11TComparatorIN12RMobilePhone22TMobilePhoneCBChangeV1EE7IsEqualERKS1_S4_ @ 65 NONAME
+	_ZN11TComparatorIN12RMobilePhone22TMobilePhoneCFChangeV1EE7IsEqualERKS1_S4_ @ 66 NONAME
+	_ZN11TComparatorIN12RMobilePhone24TMobilePhoneSecurityCodeEE7IsEqualERKS1_S4_ @ 67 NONAME
+	_ZN11TComparatorIN12RMobilePhone26TMobilePhoneServiceTableV1EE7IsEqualERKS1_S4_ @ 68 NONAME
+	_ZN11TComparatorIN12RMobilePhone28TMobilePhonePasswordChangeV1EE7IsEqualES1_S1_ @ 69 NONAME
+	_ZN11TComparatorIN12RMobilePhone28TMobilePhonePasswordChangeV2EE7IsEqualES1_S1_ @ 70 NONAME
+	_ZN11TComparatorIN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE7IsEqualERKS1_S4_ @ 71 NONAME
+	_ZN11TComparatorIN14RMobileONStore16TMobileONEntryV1EE7IsEqualES1_S1_ @ 72 NONAME
+	_ZN11TComparatorIN14RPacketContext17TContextConfig_R5EE7IsEqualERKS1_S4_ @ 73 NONAME
+	_ZN11TComparatorIN14RPacketContext18TContextConfigGPRSEE7IsEqualERKS1_S4_ @ 74 NONAME
+	_ZN11TComparatorIN14RPacketContext20TContextConfigR99_R4EE7IsEqualERKS1_S4_ @ 75 NONAME
+	_ZN11TComparatorIN14RPacketContext24CTFTMediaAuthorizationV3EE7IsEqualERKS1_S4_ @ 76 NONAME
+	_ZN11TComparatorIN15RMobileSmsStore17TMobileSmsEntryV1EE7IsEqualERKS1_S4_ @ 77 NONAME
+	_ZN11TComparatorIN15RMobileSmsStore20TMobileGsmSmsEntryV1EE7IsEqualERKS1_S4_ @ 78 NONAME
+	_ZN11TComparatorIN17RMobilePhoneStore24TMobilePhoneStoreEntryV1EE7IsEqualERKS1_S4_ @ 79 NONAME
+	_ZN11TComparatorIN19RMobileSmsMessaging18TMobileSmspEntryV1EE7IsEqualERKS1_S4_ @ 80 NONAME
+	_ZN11TComparatorIN19RMobileSmsMessaging22TMobileSmsAttributesV1EE7IsEqualERKS1_S4_ @ 81 NONAME
+	_ZN11TComparatorIN19RMobileSmsMessaging26TMobileSmsSendAttributesV1EE7IsEqualERKS1_S4_ @ 82 NONAME
+	_ZN11TComparatorIN20RMobileUssdMessaging23TMobileUssdAttributesV1EE7IsEqualERKS1_S4_ @ 83 NONAME
+	_ZN11TComparatorIN25RMobileBroadcastMessaging25TMobileBroadcastIdEntryV1EE7IsEqualERKS1_S4_ @ 84 NONAME
+	_ZN11TComparatorIN5RCall9TCommPortEE7IsEqualES1_S1_ @ 85 NONAME
+	_ZN11TComparatorIP12CArrayPtrSegI20CPhoneBookStoreEntryEE7IsEqualERKS3_S6_ @ 86 NONAME
+	_ZN11TComparatorIP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE7IsEqualEPKS3_S7_ @ 87 NONAME
+	_ZN11TComparatorIP20CPhoneBookStoreEntryE7IsEqualERKS1_S4_ @ 88 NONAME
+	_ZN11TComparatorIP25CMobilePhoneNetworkListV2E7IsEqualEPKS0_S4_ @ 89 NONAME
+	_ZN11TComparatorIP5TPckgIN14RMobileONStore16TMobileONEntryV1EEE7IsEqualEPKS3_S4_ @ 90 NONAME
+	_ZN11TComparatorIP6TDesC8E7IsEqualEPKS0_S4_ @ 91 NONAME
+	_ZN11TComparatorIPN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE7IsEqualERKS2_S5_ @ 92 NONAME
+	_ZN11TSerializerI18CMobilePhoneCFListE10SerialiseLERKS0_R5RBuf8 @ 93 NONAME
+	_ZN11TSerializerI18CMobilePhoneCFListE12DeserialiseLERK6TDesC8RS0_ @ 94 NONAME
+	_ZN11TSerializerI18CMobilePhoneCWListE10SerialiseLERKS0_R5RBuf8 @ 95 NONAME
+	_ZN11TSerializerI18CMobilePhoneCWListE12DeserialiseLERK6TDesC8RS0_ @ 96 NONAME
+	_ZN11TSerializerI20CMobilePhoneListBaseE10SerialiseLERKS0_R5RBuf8 @ 97 NONAME
+	_ZN11TSerializerI20CMobilePhoneListBaseE12DeserialiseLERK6TDesC8RS0_ @ 98 NONAME
+	_ZN11TSerializerI20CMobilePhoneSmspListE10SerialiseLERKS0_R5RBuf8 @ 99 NONAME
+	_ZN11TSerializerI20CMobilePhoneSmspListE12DeserialiseLERK6TDesC8RS0_ @ 100 NONAME
+	_ZN11TSerializerI21TContextConfigurationE10SerialiseLERKS0_R5RBuf8 @ 101 NONAME
+	_ZN11TSerializerI21TContextConfigurationE12DeserialiseLERK6TDesC8RS0_ @ 102 NONAME
+	_ZN11TSerializerI25TSendSmsDataAndAttributesE10SerialiseLES0_R5RBuf8 @ 103 NONAME
+	_ZN11TSerializerI25TSendSmsDataAndAttributesE12DeserialiseLERK6TDesC8RS0_ @ 104 NONAME
+	_ZN11TSerializerI27CMobilePhoneBroadcastIdListE10SerialiseLERKS0_R5RBuf8 @ 105 NONAME
+	_ZN11TSerializerI27CMobilePhoneBroadcastIdListE12DeserialiseLERK6TDesC8RS0_ @ 106 NONAME
+	_ZN11TSerializerI29CMobilePhoneStoredNetworkListE10SerialiseLERKS0_R5RBuf8 @ 107 NONAME
+	_ZN11TSerializerI29CMobilePhoneStoredNetworkListE12DeserialiseLERK6TDesC8RS0_ @ 108 NONAME
+	_ZN11TSerializerI29CPcktMbmsMonitoredServiceListE10SerialiseLERKS0_R5RBuf8 @ 109 NONAME
+	_ZN11TSerializerI29CPcktMbmsMonitoredServiceListE12DeserialiseLERK6TDesC8RS0_ @ 110 NONAME
+	_ZN11TSerializerI30TMmMbmsActiveServiceListParamsE10SerialiseLERKS0_R5RBuf8 @ 111 NONAME
+	_ZN11TSerializerI30TMmMbmsActiveServiceListParamsE12DeserialiseLERK6TDesC8RS0_ @ 112 NONAME
+	_ZN11TSerializerI31TMmMbmsMonitorServiceListParamsE10SerialiseLERKS0_R5RBuf8 @ 113 NONAME
+	_ZN11TSerializerI31TMmMbmsMonitorServiceListParamsE12DeserialiseLERK6TDesC8RS0_ @ 114 NONAME
+	_ZN11TSerializerIN12RMmCustomAPI13TOperatorLogoEE10SerialiseLERKS1_R5RBuf8 @ 115 NONAME
+	_ZN11TSerializerIN12RMmCustomAPI13TOperatorLogoEE12DeserialiseLERK6TDesC8RS1_ @ 116 NONAME
+	_ZN11TSerializerIN14RPacketContext24CTFTMediaAuthorizationV3EE10SerialiseLERKS1_R5RBuf8 @ 117 NONAME
+	_ZN11TSerializerIN14RPacketContext24CTFTMediaAuthorizationV3EE12DeserialiseLERK6TDesC8RS1_ @ 118 NONAME
+	_ZN11TSerializerIN18RPacketMbmsContext12CMbmsSessionEE10SerialiseLERKS1_R5RBuf8 @ 119 NONAME
+	_ZN11TSerializerIN18RPacketMbmsContext12CMbmsSessionEE12DeserialiseLERK6TDesC8RS1_ @ 120 NONAME
+	_ZN11TSerializerIP12CArrayPtrSegI20CPhoneBookStoreEntryEE10SerialiseLEPKS2_R5RBuf8 @ 121 NONAME
+	_ZN11TSerializerIP12CArrayPtrSegI20CPhoneBookStoreEntryEE12DeserialiseLERK6TDesC8RS3_ @ 122 NONAME
+	_ZN11TSerializerIP20CPhoneBookStoreEntryE10SerialiseLEPKS0_R5RBuf8 @ 123 NONAME
+	_ZN11TSerializerIP20CPhoneBookStoreEntryE12DeserialiseLERK6TDesC8RS1_ @ 124 NONAME
+	_ZN11TSerializerIP25CMobilePhoneNetworkListV2E10SerialiseLEPKS0_R5RBuf8 @ 125 NONAME
+	_ZN11TSerializerIP25CMobilePhoneNetworkListV2E12DeserialiseLERK6TDesC8RS1_ @ 126 NONAME
+	_ZN11TSerializerIP6TDesC8E10SerialiseLEPKS0_R5RBuf8 @ 127 NONAME
+	_ZN11TSerializerIP6TDesC8E12DeserialiseLERKS0_RS1_ @ 128 NONAME
+	_ZN11TSerializerIP7TDesC16E10SerialiseLEPKS0_R5RBuf8 @ 129 NONAME
+	_ZN11TSerializerIP7TDesC16E12DeserialiseLERK6TDesC8RS1_ @ 130 NONAME
+	_ZN11TSerializerIPN14RPacketContext24CTFTMediaAuthorizationV3EE10SerialiseLEPKS1_R5RBuf8 @ 131 NONAME
+	_ZN11TSerializerIPN14RPacketContext24CTFTMediaAuthorizationV3EE12DeserialiseLERK6TDesC8RS2_ @ 132 NONAME
+	_ZN12TConstructorI18CMobilePhoneCFListE10ConstructLERPS0_ @ 133 NONAME
+	_ZN12TConstructorI18CMobilePhoneCWListE10ConstructLERPS0_ @ 134 NONAME
+	_ZN12TConstructorI20CMobilePhoneSmspListE10ConstructLERPS0_ @ 135 NONAME
+	_ZN12TConstructorI27CMobilePhoneBroadcastIdListE10ConstructLERPS0_ @ 136 NONAME
+	_ZN12TConstructorI29CMobilePhoneStoredNetworkListE10ConstructLERPS0_ @ 137 NONAME
+	_ZN12TConstructorI29CPcktMbmsMonitoredServiceListE10ConstructLERPS0_ @ 138 NONAME
+	_ZN12TConstructorIN12RMobilePhone14TMultimodeTypeEE10ConstructLERPS1_ @ 139 NONAME
+	_ZN12TConstructorIN14RPacketContext24CTFTMediaAuthorizationV3EE10ConstructLERPS1_ @ 140 NONAME
+	_ZN12TConstructorIN18RPacketMbmsContext12CMbmsSessionEE10ConstructLERPS1_ @ 141 NONAME
+	_ZN18TMockLtsyCallData012DeserialiseLERK6TDesC8 @ 142 NONAME
+	_ZN18TMockLtsyCallData0C1EiN12RMobilePhone14TMobileServiceE @ 143 NONAME
+	_ZN18TMockLtsyCallData0C1Ev @ 144 NONAME
+	_ZN18TMockLtsyCallData0C2EiN12RMobilePhone14TMobileServiceE @ 145 NONAME
+	_ZN18TMockLtsyCallData0C2Ev @ 146 NONAME
+	_ZN21TMockLtsyContextData012DeserialiseLERK6TDesC8 @ 147 NONAME
+	_ZN21TMockLtsyContextData024ContextConfigurationTypeEv @ 148 NONAME
+	_ZN21TMockLtsyContextData06ConfigEv @ 149 NONAME
+	_ZN21TMockLtsyContextData0C1ERN14RPacketContext18TContextConfigGPRSEi @ 150 NONAME
+	_ZN21TMockLtsyContextData0C1Ev @ 151 NONAME
+	_ZN21TMockLtsyContextData0C2ERN14RPacketContext18TContextConfigGPRSEi @ 152 NONAME
+	_ZN21TMockLtsyContextData0C2Ev @ 153 NONAME
+	_ZN22TPacketQoSR5Negotiated12InternalizeLER11RReadStream @ 154 NONAME
+	_ZN22TPacketQoSR5NegotiatedC1Ev @ 155 NONAME
+	_ZN22TPacketQoSR5NegotiatedC2Ev @ 156 NONAME
+	_ZN23TMockLtsyPacketQoSData012DeserialiseLERK6TDesC8 @ 157 NONAME
+	_ZN23TMockLtsyPacketQoSData015QoSR5NegotiatedEv @ 158 NONAME
+	_ZN23TMockLtsyPacketQoSData017QoSGPRSNegotiatedEv @ 159 NONAME
+	_ZN23TMockLtsyPacketQoSData019QoSR99_R4NegotiatedEv @ 160 NONAME
+	_ZN23TMockLtsyPacketQoSData0C1ER24TPacketQoSGPRSNegotiatedR26TPacketQoSR99_R4NegotiatedR22TPacketQoSR5Negotiated @ 161 NONAME
+	_ZN23TMockLtsyPacketQoSData0C1Ev @ 162 NONAME
+	_ZN23TMockLtsyPacketQoSData0C2ER24TPacketQoSGPRSNegotiatedR26TPacketQoSR99_R4NegotiatedR22TPacketQoSR5Negotiated @ 163 NONAME
+	_ZN23TMockLtsyPacketQoSData0C2Ev @ 164 NONAME
+	_ZN23TMockLtsyPhoneBookData012DeserialiseLERK6TDesC8 @ 165 NONAME
+	_ZN23TMockLtsyPhoneBookData013PhoneBookNameEv @ 166 NONAME
+	_ZN23TMockLtsyPhoneBookData0C1ER4TBufILi128EE @ 167 NONAME
+	_ZN23TMockLtsyPhoneBookData0C1Ev @ 168 NONAME
+	_ZN23TMockLtsyPhoneBookData0C2ER4TBufILi128EE @ 169 NONAME
+	_ZN23TMockLtsyPhoneBookData0C2Ev @ 170 NONAME
+	_ZN24TPacketQoSGPRSNegotiated12InternalizeLER11RReadStream @ 171 NONAME
+	_ZN24TPacketQoSGPRSNegotiatedC1Ev @ 172 NONAME
+	_ZN24TPacketQoSGPRSNegotiatedC2Ev @ 173 NONAME
+	_ZN26TPacketQoSR99_R4Negotiated12InternalizeLER11RReadStream @ 174 NONAME
+	_ZN26TPacketQoSR99_R4NegotiatedC1Ev @ 175 NONAME
+	_ZN26TPacketQoSR99_R4NegotiatedC2Ev @ 176 NONAME
+	_ZN9RMockLtsy10ServerNameEv @ 177 NONAME
+	_ZN9RMockLtsy7ExpectLEiRK6TDesC8ii @ 178 NONAME
+	_ZN9RMockLtsy7ExpectLEiii @ 179 NONAME
+	_ZN9RMockLtsy9CompleteLEiiRK6TDesC8i @ 180 NONAME
+	_ZN9RMockLtsy9CompleteLEiii @ 181 NONAME
+	_ZNK14TMockLtsyData0eqERK6TDesC8 @ 182 NONAME
+	_ZNK18TMockLtsyCallData010SerialiseLER5RBuf8 @ 183 NONAME
+	_ZNK18TMockLtsyCallData06CallIdEv @ 184 NONAME
+	_ZNK18TMockLtsyCallData08CallModeEv @ 185 NONAME
+	_ZNK18TMockLtsyCallData0eqERK6TDesC8 @ 186 NONAME
+	_ZNK21TMockLtsyContextData010SerialiseLER5RBuf8 @ 187 NONAME
+	_ZNK21TMockLtsyContextData0eqERK6TDesC8 @ 188 NONAME
+	_ZNK22TPacketQoSR5Negotiated12ExternalizeLER12RWriteStream @ 189 NONAME
+	_ZNK22TPacketQoSR5NegotiatedeqERKS_ @ 190 NONAME
+	_ZNK23TMockLtsyPacketQoSData010SerialiseLER5RBuf8 @ 191 NONAME
+	_ZNK23TMockLtsyPacketQoSData0eqERK6TDesC8 @ 192 NONAME
+	_ZNK23TMockLtsyPhoneBookData010SerialiseLER5RBuf8 @ 193 NONAME
+	_ZNK23TMockLtsyPhoneBookData0eqERK6TDesC8 @ 194 NONAME
+	_ZNK24TPacketQoSGPRSNegotiated12ExternalizeLER12RWriteStream @ 195 NONAME
+	_ZNK24TPacketQoSGPRSNegotiatedeqERKS_ @ 196 NONAME
+	_ZNK26TPacketQoSR99_R4Negotiated12ExternalizeLER12RWriteStream @ 197 NONAME
+	_ZNK26TPacketQoSR99_R4NegotiatedeqERKS_ @ 198 NONAME
+	_ZTI14TMockLtsyData0 @ 199 NONAME
+	_ZTI18TMockLtsyCallData0 @ 200 NONAME
+	_ZTI21TMockLtsyContextData0 @ 201 NONAME
+	_ZTI23TMockLtsyPacketQoSData0 @ 202 NONAME
+	_ZTI23TMockLtsyPhoneBookData0 @ 203 NONAME
+	_ZTI9RMockLtsy @ 204 NONAME
+	_ZTV14TMockLtsyData0 @ 205 NONAME
+	_ZTV18TMockLtsyCallData0 @ 206 NONAME
+	_ZTV21TMockLtsyContextData0 @ 207 NONAME
+	_ZTV23TMockLtsyPacketQoSData0 @ 208 NONAME
+	_ZTV23TMockLtsyPhoneBookData0 @ 209 NONAME
+	_ZTV9RMockLtsy @ 210 NONAME
+	_ZN11TComparatorIN12RMobilePhone30TMobilePreferredNetworkEntryV3EE7IsEqualERKS1_S4_ @ 211 NONAME

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -14,8 +14,8 @@
 //
 
 PRJ_TESTEXPORTS
-../inc/rmockltsy.h      SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(test/rmockltsy.h)
-../inc/tmockltsydata.h  SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(test/tmockltsydata.h)
+../inc/rmockltsy.h      SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(test/rmockltsy.h)
+../inc/tmockltsydata.h  SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(test/tmockltsydata.h)
 
 PRJ_TESTMMPFILES
 mockltsydll.mmp

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/inc/tmockltsydata.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/inc/tmockltsydata.h	Wed Sep 01 12:40:21 2010 +0100
@@ -3799,6 +3799,50 @@
     IMPORT_C static void ConstructL(CMobilePhoneSmspList*& aData);    
 	};
 
+/**
+TConstructor specialisation for CMobilePhoneStoredNetworkList
+*/
+template <>
+class TConstructor<CMobilePhoneStoredNetworkList>
+    {
+public:
+    IMPORT_C static void ConstructL(CMobilePhoneStoredNetworkList*& aData);    
+	};
+
+/**
+TSerializer specialisation for CMobilePhoneStoredNetworkList
+*/
+template <>
+class TSerializer<CMobilePhoneStoredNetworkList>
+    {
+public:
+    IMPORT_C static void SerialiseL(const CMobilePhoneStoredNetworkList& aData, RBuf8& aBuffer);
+    IMPORT_C static void DeserialiseL(const TDesC8& aPackedData, CMobilePhoneStoredNetworkList& aData);
+    };
+
+/**
+TComparator Specialisation for CMobilePhoneStoredNetworkList
+*/
+template<>
+class TComparator<CMobilePhoneStoredNetworkList>
+    {
+public: 
+    IMPORT_C static TBool TComparator<CMobilePhoneStoredNetworkList>::
+        IsEqual(const CMobilePhoneStoredNetworkList& aData1,
+                const CMobilePhoneStoredNetworkList& aData2);
+    };
+
+/**
+TComparator Specialisation for RMobilePhone::TMobilePreferredNetworkEntryV3
+*/
+template<>
+class TComparator<RMobilePhone::TMobilePreferredNetworkEntryV3>
+    {
+public: 
+    IMPORT_C static TBool TComparator<RMobilePhone::TMobilePreferredNetworkEntryV3>::
+        IsEqual(const RMobilePhone::TMobilePreferredNetworkEntryV3& aData1,
+                const RMobilePhone::TMobilePreferredNetworkEntryV3& aData2);
+    };
 
 /**
 TComparator Specialisation for RMobilePhone::TAID

--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/src/tmockltsydata.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/src/tmockltsydata.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -2381,6 +2381,44 @@
    	aData = CMobilePhoneSmspList::NewL();
 	}
 
+EXPORT_C void TConstructor<CMobilePhoneStoredNetworkList>::
+		ConstructL(CMobilePhoneStoredNetworkList*& aData)
+	{
+   	aData = CMobilePhoneStoredNetworkList::NewL();
+	}
+
+EXPORT_C void TSerializer<CMobilePhoneStoredNetworkList>::
+		SerialiseL(const CMobilePhoneStoredNetworkList& aData, RBuf8& aBuffer)
+	{
+        return TSerializer<CMobilePhoneListBase>::SerialiseL(aData, aBuffer);      	
+	}
+
+EXPORT_C void TSerializer<CMobilePhoneStoredNetworkList>::
+		DeserialiseL(const TDesC8& aPackedData, CMobilePhoneStoredNetworkList& aData)
+	{
+    TSerializer<CMobilePhoneListBase>::DeserialiseL(aPackedData, aData);    
+	}
+
+EXPORT_C TBool TComparator<CMobilePhoneStoredNetworkList>::
+    IsEqual(const CMobilePhoneStoredNetworkList& aData1, 
+            const CMobilePhoneStoredNetworkList& aData2)
+    {
+    return TComparator< CMobilePhoneEditableList
+            <RMobilePhone::TMobilePreferredNetworkEntryV3>* >::
+            IsEqual(&aData1, &aData2);
+    }
+
+EXPORT_C TBool TComparator<RMobilePhone::TMobilePreferredNetworkEntryV3>::
+    IsEqual(const RMobilePhone::TMobilePreferredNetworkEntryV3& aData1, 
+            const RMobilePhone::TMobilePreferredNetworkEntryV3& aData2)
+    {
+
+    return  (aData1.iAccess == aData2.iAccess) &&
+            (aData1.iUserDefined == aData2.iUserDefined) &&
+            (aData1.iCountryCode.Compare(aData2.iCountryCode) == 0) &&
+            (aData1.iNetworkId.Compare(aData2.iNetworkId) == 0) &&
+            (TComparator<RMobilePhone::TMultimodeType>::IsEqual(aData1, aData2));
+    }
 //***************************************************
 
 EXPORT_C TBool TComparator<CMobilePhoneListBase>::

--- a/telephonyserverplugins/common_tsy/test/component/scripts/mockltsy_copy_ini_file.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-//
-// Copyright (c) 2010 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:
-// Copies the file ltsydata_mock.ini from Z: (ROM or simulated ROM) to the C: drive
-// Two reasons for doing this are:
-//   a) It loads the MockLtsy dll (mocklicenseetsy.dll) as the one to use as the LTsy component
-//   b) The file can be edited (or deleted) allowing fall-back to the "normal" licenseetsy.dll
-//
-//
-
-
-// 101f7989 is SID of C32.exe so this should already exist
-RUN_UTILS MkDir       	c:\private\101f7989
-
-// Copy ltsydata_mock.ini from Z: to C:
-RUN_UTILS CopyFile    	 z:\testdata\configs\ltsydata_mock.ini           c:\private\101f7989\ltsydata.ini
-RUN_UTILS MakeReadWrite	 c:\private\101f7989\ltsydata.ini

--- a/telephonyserverplugins/common_tsy/test/component/scripts/mockltsy_remove_ini_file.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-//
-// Copyright (c) 2010 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:
-// Deletes the file ltsydata_mock.ini from the C: drive
-// Use this in conjunction with mockltsy_copy_ini_file.script
-// 
-
-RUN_UTILS DeleteFile  c:\private\101f7989\ltsydata.ini

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -14,8 +14,6 @@
 // Description:
 //
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
-
 LOAD_SUITE te_ctsy_component
 
 RUN_SCRIPT z:\TestData\Scripts\te_ctsycomponent_packetservice_individual.script
@@ -92,6 +90,9 @@
 
 
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script
+
 
 
+
+
+

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_airtimeduration_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_airtimeduration_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -41,4 +38,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyAirTimeDurationFU.TestNotifyAirTimeDurationChange0001L
 END_TESTCASE BA-CTSY-ATD-MNATDC-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_alternatelineservice_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_alternatelineservice_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -85,5 +82,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyAlternateLineServiceFU.TestNotifyALSLineChange0004L
 END_TESTCASE BA-CTSY-ALLS-MNALC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script
-

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_alternatingcall_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_alternatingcall_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -140,4 +137,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyAlternatingCallFU.TestNotifyAlternatingCallModeChange0001L
 END_TESTCASE BA-CTSY-ALTC-MNACMC-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_apncontrollist_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_apncontrollist_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -305,4 +302,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyAPNControlListFU.TestNotifyAPNControlListServiceStatusChange0004L
 END_TESTCASE BA-CTSY-ACL-MNACLSSC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_authorisation_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_authorisation_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -63,4 +60,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyAuthorisationAndAuthenticationFU.TestSmartCardAuthenticate0001L
 END_TESTCASE BA-CTSY-AAA-MSCA-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_broadcastmessaging_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_broadcastmessaging_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -304,5 +301,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyBroadcastMessagingFU.TestGetCaps0003L
 END_TESTCASE BA-CTSY-BRMSG-BGC-0003
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callbarring_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callbarring_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -206,4 +203,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallBarringFU.TestNotifyCallBarringStatusChange0004L
 END_TESTCASE BA-CTSY-CBAR-MNCBSC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callcompletion_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callcompletion_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -161,5 +158,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallCompletionFU.TestNotifyCCBSStatusChange0001L
 END_TESTCASE BA-CTSY-CCOM-MNCCBSSC-0001
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callcontrol_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callcontrol_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -781,73 +778,6 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallControlFU.TestTerminateAllCalls0005L
 END_TESTCASE BA-CTSY-CCON-MTAC-0005
 
-START_TESTCASE BA-CTSY-CCON-MTACTC-0001
-//!@SYMTestCaseID BA-CTSY-CCON-MTACTC-0001
-//!@SYMComponent telephony_ctsy
-//!@SYMTestCaseDesc Test support in CTSY for RMobilePhone::TerminateActiveCalls When the call status is EStatusHold
-//!@SYMTestPriority High
-//!@SYMTestActions Invokes RMobilePhone::TerminateActiveCalls
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallControlFU.TestTerminateActiveCalls0001L
-END_TESTCASE BA-CTSY-CCON-MTACTC-0001
-
-START_TESTCASE BA-CTSY-CCON-MTACTC-0001b
-//!@SYMTestCaseID BA-CTSY-CCON-MTACTC-0001b
-//!@SYMComponent telephony_ctsy
-//!@SYMTestCaseDesc Test support in CTSY for RMobilePhone::TerminateActiveCalls When the call status is EStatusRinging
-//!@SYMTestPriority High
-//!@SYMTestActions Invokes RMobilePhone::TerminateActiveCalls
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallControlFU.TestTerminateActiveCalls0001bL
-END_TESTCASE BA-CTSY-CCON-MTACTC-0001b
-
-START_TESTCASE BA-CTSY-CCON-MTACTC-0001c
-//!@SYMTestCaseID BA-CTSY-CCON-MTACTC-0001c
-//!@SYMComponent telephony_ctsy
-//!@SYMTestCaseDesc Test support in CTSY for RMobilePhone::TerminateActiveCalls When the call status is EStatusConnecting
-//!@SYMTestPriority High
-//!@SYMTestActions Invokes RMobilePhone::TerminateActiveCalls
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallControlFU.TestTerminateActiveCalls0001cL
-END_TESTCASE BA-CTSY-CCON-MTACTC-0001c
-
-
-START_TESTCASE BA-CTSY-CCON-MTACTC-0002
-//!@SYMTestCaseID BA-CTSY-CCON-MTACTC-0002
-//!@SYMComponent telephony_ctsy
-//!@SYMTestCaseDesc Test support in CTSY for cancelling RMobilePhone::TerminateActiveCalls
-//!@SYMTestPriority High
-//!@SYMTestActions Invokes RMobilePhone::TerminateActiveCalls
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallControlFU.TestTerminateActiveCalls0002L
-END_TESTCASE BA-CTSY-CCON-MTACTC-0002
-
-START_TESTCASE BA-CTSY-CCON-MTACTC-0004
-//!@SYMTestCaseID BA-CTSY-CCON-MTACTC-0004
-//!@SYMComponent telephony_ctsy
-//!@SYMTestCaseDesc Test support in CTSY for multiple client requests of RMobilePhone::TerminateActiveCalls
-//!@SYMTestPriority High
-//!@SYMTestActions Invokes RMobilePhone::TerminateActiveCalls
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallControlFU.TestTerminateActiveCalls0004L
-END_TESTCASE BA-CTSY-CCON-MTACTC-0004
-
-START_TESTCASE BA-CTSY-CCON-MTACTC-0005
-//!@SYMTestCaseID BA-CTSY-CCON-MTACTC-0005
-//!@SYMComponent telephony_ctsy
-//!@SYMTestCaseDesc Test support in CTSY for RMobilePhone::TerminateActiveCalls with timeout
-//!@SYMTestPriority High
-//!@SYMTestActions Invokes RMobilePhone::TerminateActiveCalls and tests for timeout
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallControlFU.TestTerminateActiveCalls0005L
-END_TESTCASE BA-CTSY-CCON-MTACTC-0005
-
 START_TESTCASE BA-CTSY-CCON-MSICT-0001
 //!@SYMTestCaseID BA-CTSY-CCON-MSICT-0001
 //!@SYMComponent telephony_ctsy
@@ -1067,5 +997,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallControlFU.TestUpdateLifeTime0001L
 END_TESTCASE BA-CTSY-CCON-CNUA-0001
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callcost_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callcost_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -96,4 +93,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallCostFU.TestSetPuct0001L
 END_TESTCASE BA-CTSY-CCOS-MSP-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callemergency_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callemergency_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -128,6 +125,4 @@
 //!@SYMTestExpectedResults Pass
 //!@SYMTestType CT
 RUN_TEST_STEP 360 te_ctsy_component TEFUnit.CCTsyCallEmergencyFU.TestDialEmergencyCall0005L
-END_TESTCASE BA-CTSY-CEMG-CDEC-0005
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script
+END_TESTCASE BA-CTSY-CEMG-CDEC-0005
\ No newline at end of file

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callforwarding_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callforwarding_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -183,5 +180,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallForwardingFU.TestNotifyCallForwardingStatusChange0004L
 END_TESTCASE BA-CTSY-CFOR-MNCFSC-0004
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callinformation_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callinformation_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -1647,5 +1644,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallInformationFU.TestNotifyLineHookChange00011L
 END_TESTCASE BA-CTSY-CALLI-LNHCC-00011
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callownership_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callownership_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -139,5 +136,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallOwnershipFU.TestTransferOwnership0006L
 END_TESTCASE BA-CTSY-COWN-CTO-0006
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callwaiting_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callwaiting_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -140,4 +137,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallWaitingFU.TestNotifyCallWaitingStatusChange0004L
 END_TESTCASE BA-CTSY-CWAT-MCWSC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_conferencecallcontrol_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_conferencecallcontrol_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -480,5 +477,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyConferenceCallControlFU.TestGetMobileCallInfo0003L
 END_TESTCASE BA-CTSY-CONC-CGMCI-0003
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_customipc_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_customipc_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -2401,4 +2398,4 @@
 END_TESTCASE BA-CTSY-CIPC-GUSS-0004
 
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script
+

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_datacallcontrol_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_datacallcontrol_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -491,5 +488,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyDataCallControlFU.TestNotifyMobileDataCallCapsChange00011L
 END_TESTCASE BA-CTSY-DATC-CNMDCCC-00011
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_dtmf_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_dtmf_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -219,4 +216,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyDTMFFU.TestContinueDTMFStringSending0001L
 END_TESTCASE BA-CTSY-DTMF-MCDSS-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_eapauthentication_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_eapauthentication_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -29,5 +26,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyEAPAuthenticationFU.TestOpen0001L
 END_TESTCASE BA-CTSY-EAP-EO-0001
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_enstore_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_enstore_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -198,4 +195,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyENStoreFU.TestStart0004L
 END_TESTCASE BA-CTSY-PBEN-ESS-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fax_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fax_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -96,4 +93,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFaxFU.TestWrite0001L
 END_TESTCASE BA-CTSY-FAX-FW-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_featmgr_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_featmgr_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -29,5 +26,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFeatMgr.TestFeatMgr0001L
 END_TESTCASE BA-CTSY-FEAT-FEATMGR-0001
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fixeddialling_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fixeddialling_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -41,17 +38,6 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFixedDiallingFU.TestDialNoFdnCheck0001cL
 END_TESTCASE BA-CTSY-FXD-CDNFC-0001c
 
-START_TESTCASE BA-CTSY-FXD-CDNFC-0001d
-//!@SYMTestCaseID BA-CTSY-FXD-CDNFC-0001d
-//!@SYMComponent telephony_ctsy
-@SYMTestCaseDesc est support in CTSY for RMobileCall::DialNoFdnCheck for voice calls with extended parameters (RMobileCall::TCallParamsV7)
-//!@SYMTestPriority High
-//!@SYMTestActions Invokes RMobileCall::DialNoFdnCheck for voice calls
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
-RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFixedDiallingFU.TestDialNoFdnCheck0001dL
-END_TESTCASE BA-CTSY-FXD-CDNFC-0001d
-
 START_TESTCASE BA-CTSY-FXD-CDNFC-0002
 //!@SYMTestCaseID BA-CTSY-FXD-CDNFC-0002
 //!@SYMComponent telephony_ctsy
@@ -192,4 +178,4 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFixedDiallingFU.TestNotifyFdnStatusChange0004L
 END_TESTCASE BA-CTSY-FXD-MNFSC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script
+

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fullrun.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fullrun.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,10 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
-
 
 LOAD_SUITE te_ctsy_component
 
@@ -91,4 +87,4 @@
 // TimeOut
 RUN_SCRIPT z:\TestData\Scripts\te_ctsycomponent_timeout_all.script
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script
+

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_ims_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_ims_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -74,4 +71,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyIMSFU.TestNotifyImsAuthorizationInfoChange0001L
 END_TESTCASE BA-CTSY-IMS-MNIAIC-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_indicator_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_indicator_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -96,4 +93,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyIndicatorFU.TestNotifyIndicatorChange0004L
 END_TESTCASE BA-CTSY-IND-MNIC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_knownfailures_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_knownfailures_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -223,4 +220,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhoneBookStoreFU.TestWrite00021L
 END_TESTCASE BA-CTSY-PBSTR-PBSW-00021
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_lbs_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_lbs_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -118,4 +115,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyLBSFU.TestSendMolr0001L
 END_TESTCASE BA-CTSY-LBS-LSM-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_linecontrol_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_linecontrol_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -460,5 +457,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyLineControlFU.TestNotifyMobileLineStatusChange00014L
 END_TESTCASE BA-CTSY-LINC-LNMLSC-00014
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_mailboxnumbers_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_mailboxnumbers_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -107,4 +104,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyMailboxNumbersFU.TestNotifyMailboxNumbersChange0001L
 END_TESTCASE BA-CTSY-MBXN-MNMNC-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_mbmscontext_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_mbmscontext_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,10 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
-
 
 LOAD_SUITE te_ctsy_component
 
@@ -387,4 +383,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyMbmsContextFU.TestNotifyStatusChange0003L
 END_TESTCASE BA-CTSY-MCF-PNSC-0003
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_messagewaiting_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_messagewaiting_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,13 +13,13 @@
 //
 // Description:
 //
-//
+//! @file                   te_ctsycomponent_messagewaiting_individual.script
+//! @SYMScriptAuthor        
+//! @SYMTestSuiteName       te_ctsy_component
+//! @SYMScriptCreationDate  
 
 PRINT Run Message Waiting test cases for suite te_ctsy_component
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
-
-
 LOAD_SUITE te_ctsy_component
 
 START_TESTCASE BA-CTSY-MSGW-MCMW-0001
@@ -178,4 +178,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyMessageWaitingFU.TestNotifyIccMessageWaitingIndicatorsChange0004L
 END_TESTCASE BA-CTSY-MSGW-MNIMWC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_mms_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_mms_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -74,4 +71,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyMMSFU.TestSetMmsUserPreferences0001L
 END_TESTCASE BA-CTSY-MMS-MSMUP-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_multicallcallcontrol_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_multicallcallcontrol_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -63,4 +60,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyMulticallCallControlFU.TestNotifyMulticallIndicatorChange0001L
 END_TESTCASE BA-CTSY-MCC-MNMIC-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_multimediacallcontrol_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_multimediacallcontrol_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -85,4 +82,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyMultimediaCallControlFU.TestSetMultimediaCallPreference0001L
 END_TESTCASE BA-CTSY-MMCC-MSMCP-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_networkcontrol_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_networkcontrol_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -715,17 +712,154 @@
 END_TESTCASE BA-CTSY-NTWC-MGLUAT-0001
 
 START_TESTCASE BA-CTSY-NTWC-MSPNL-0001
-//!@SYMTestCaseID BA-CTSY-NTWC-MSPNL-0001
-//!@SYMPREQ 1551
-//!@SYMComponent telephony_ctsy
-//!@SYMTestCaseDesc Test support in CTSY for RMobilePhone::StorePreferredNetworksListL
-//!@SYMTestPriority High
-//!@SYMTestActions Invokes RMobilePhone::StorePreferredNetworksListL
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
+//!@SYMTestCaseID          BA-CTSY-NTWC-MSPNL-0001
+//!@SYMPREQ                417-71654
+//!@SYMComponent           telephony_ctsy
+//!@SYMTestCaseDesc        Test support in CTSY for RMobilePhone::StorePreferredNetworksListL
+//!@SYMTestPriority        High
+//!@SYMTestActions         1. Invoke RMobilePhone::StorePreferredNetworksListL with a list of Preferred Networks.
+//!@SYMTestExpectedResults LTSY receives the same list of Preferred Networks. 
+//!@SYMTestType            CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestStorePreferredNetworksListL0001L
 END_TESTCASE BA-CTSY-NTWC-MSPNL-0001
 
+START_TESTCASE BA-CTSY-NTWC-MSPNL-0001a
+//!@SYMTestCaseID          BA-CTSY-NTWC-MSPNL-0001a
+//!@SYMPREQ                417-71654
+//!@SYMComponent           telephony_ctsy
+//!@SYMTestCaseDesc        Test support in CTSY for RMobilePhone::StorePreferredNetworksListL with empty list
+//!@SYMTestPriority        High
+//!@SYMTestActions         1. Invoke RMobilePhone::StorePreferredNetworksListL with an empty list of Preferred Networks.
+//!@SYMTestExpectedResults LTSY receives an empty list of Preferred Networks.
+//!@SYMTestType            CT
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestStorePreferredNetworksListL0001aL
+END_TESTCASE BA-CTSY-NTWC-MSPNL-0001a
+
+START_TESTCASE BA-CTSY-NTWC-MSPNL-0001b
+//!@SYMTestCaseID          BA-CTSY-NTWC-MSPNL-0001b
+//!@SYMPREQ                417-71654
+//!@SYMComponent           telephony_ctsy
+//!@SYMTestCaseDesc        Test support in CTSY for RMobilePhone::StorePreferredNetworksListL
+//!@   			   with error and with duplicate LTSY complete message
+//!@SYMTestPriority        High
+//!@SYMTestActions         1. Invoke RMobilePhone::StorePreferredNetworksListL.
+//!                        2. LTSY returns error.  
+//!                        3. Test code receives error.
+//!                        3. Invoke RMobilePhone:StorePreferredNetworksListL.
+//!                        4. LTSY returns duplicate complete message with KErrNone
+//!                        5. Duplicate complete message is ignored and test code receives KErrNone.  
+//!@SYMTestExpectedResults All tests pass. 
+//!@SYMTestType            CT
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestStorePreferredNetworksListL0001bL
+END_TESTCASE BA-CTSY-NTWC-MSPNL-0001b
+
+START_TESTCASE BA-CTSY-NTWC-MSPNL-0002
+//!@SYMTestCaseID          BA-CTSY-NTWC-MSPNL-0002
+//!@SYMPREQ                417-71654
+//!@SYMComponent           telephony_ctsy
+//!@SYMTestCaseDesc        Test support in CTSY for Cancelling RMobilePhone::StorePreferredNetworksListL
+//!@SYMTestPriority        High
+//!@SYMTestActions         1. Invoke RMobilePhone::StorePreferredNetworksListL.
+//!                        2. Cancel the outstanding request.
+//!                        3. LTSY ignores cancelling the request and stores the preferred networks list.
+//!@SYMTestExpectedResults Request status of the operation is KErrNone. 
+//!@SYMTestType            CT
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestStorePreferredNetworksListL0002L
+END_TESTCASE BA-CTSY-NTWC-MSPNL-0002
+
+START_TESTCASE BA-CTSY-NTWC-MSPNL-0004
+//!@SYMTestCaseID          BA-CTSY-NTWC-MSPNL-0004
+//!@SYMPREQ                417-71654
+//!@SYMComponent           telephony_ctsy
+//!@SYMTestCaseDesc        Test support in CTSY for multiple client requests to RMobilePhone::StorePreferredNetworksListL
+//!@SYMTestPriority        High
+//!@SYMTestActions         1. Invoke RMobilePhone::StorePreferredNetworksListL.
+//!                        2. Invoke RMobilePhone::StorePreferredNetworksListL from second client.
+//!@SYMTestExpectedResults Second cleint receives KErrServerBusy. 
+//!@SYMTestType            CT
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestStorePreferredNetworksListL0004L
+END_TESTCASE BA-CTSY-NTWC-MSPNL-0004
+
+START_TESTCASE BA-CTSY-NTWC-CRMPPN-0001
+//!@SYMTestCaseID          BA-CTSY-NTWC-CRMPPN-0001
+//!@SYMPREQ                417-71654
+//!@SYMComponent           telephony_ctsy
+//!@SYMTestCaseDesc        Test support in CTSY for CRetrieveMobilePhonePreferredNetworks::Start
+//!@SYMTestPriority        High
+//!@SYMTestActions         1. Invoke CRetrieveMobilePhonePreferredNetworks::Start.
+//!                        2. Add a new entry to the list.
+//!                        3. Invoke RMobilePhone::StorePreferredNetworksListL. 
+//!@SYMTestExpectedResults LTSY receives the modified list and test code receives KErrNone. 
+//!@SYMTestType            CT
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestRetrieveMobilePhonePreferredNetworks0001L
+END_TESTCASE BA-CTSY-NTWC-CRMPPN-0001
+
+START_TESTCASE BA-CTSY-NTWC-CRMPPN-0001a
+//!@SYMTestCaseID          BA-CTSY-NTWC-CRMPPN-0001a
+//!@SYMPREQ                417-71654
+//!@SYMComponent           telephony_ctsy
+//!@SYMTestCaseDesc        Test support in CTSY for CRetrieveMobilePhonePreferredNetworks::Start
+//!@SYMTestPriority        High
+//!@SYMTestActions         1. Invoke CRetrieveMobilePhonePreferredNetworks::Start.
+//!                        2. Remove an entry from the list.
+//!                        3. Invoke RMobilePhone::StorePreferredNetworksListL. 
+//!@SYMTestExpectedResults LTSY receives the modified list and test code receives KErrNone. 
+//!@SYMTestType            CT
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestRetrieveMobilePhonePreferredNetworks0001aL
+END_TESTCASE BA-CTSY-NTWC-CRMPPN-0001a
+
+START_TESTCASE BA-CTSY-NTWC-CRMPPN-0001b
+//!@SYMTestCaseID          BA-CTSY-NTWC-CRMPPN-0001b
+//!@SYMPREQ                417-71654
+//!@SYMComponent           telephony_ctsy
+//!@SYMTestCaseDesc        Test support in CTSY for CRetrieveMobilePhonePreferredNetworks::Start with empty list
+//!@SYMTestPriority        High
+//!@SYMTestActions         1. Invoke CRetrieveMobilePhonePreferredNetworks::Start.
+//!                        2. LTSY returns an empty list of preferred networks.
+//!@SYMTestExpectedResults Test code receives an empty list of preferred networks. 
+//!@SYMTestType            CT
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestRetrieveMobilePhonePreferredNetworks0001bL
+END_TESTCASE BA-CTSY-NTWC-CRMPPN-0001b
+
+START_TESTCASE BA-CTSY-NTWC-CRMPPN-0001c
+//!@SYMTestCaseID          BA-CTSY-NTWC-CRMPPN-0001c
+//!@SYMPREQ                417-71654
+//!@SYMComponent           telephony_ctsy
+//!@SYMTestCaseDesc        Test support in CTSY for CRetrieveMobilePhonePreferredNetworks::Start with error
+//!@SYMTestPriority        High
+//!@SYMTestActions         1. Invoke CRetrieveMobilePhonePreferredNetworks::Start.
+//!                        2. LTSY returns error.
+//!@SYMTestExpectedResults Test code receives error. 
+//!@SYMTestType            CT
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestRetrieveMobilePhonePreferredNetworks0001cL
+END_TESTCASE BA-CTSY-NTWC-CRMPPN-0001c
+
+START_TESTCASE BA-CTSY-NTWC-CRMPPN-0002
+//!@SYMTestCaseID          BA-CTSY-NTWC-CRMPPN-0002
+//!@SYMPREQ                417-71654
+//!@SYMComponent           telephony_ctsy
+//!@SYMTestCaseDesc        Test support in CTSY for Cancelling CRetrieveMobilePhonePreferredNetworks::Start
+//!@SYMTestPriority        High
+//!@SYMTestActions         1. Invoke CRetrieveMobilePhonePreferredNetworks::Start.
+//!                        2. Cancel outstanding request.
+//!@SYMTestExpectedResults Request status of the operation is KErrCancel
+//!@SYMTestType            CT
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestRetrieveMobilePhonePreferredNetworks0002L
+END_TESTCASE BA-CTSY-NTWC-CRMPPN-0002
+
+START_TESTCASE BA-CTSY-NTWC-CRMPPN-0004
+//!@SYMTestCaseID          BA-CTSY-NTWC-CRMPPN-0004
+//!@SYMPREQ                417-71654
+//!@SYMComponent           telephony_ctsy
+//!@SYMTestCaseDesc        Test support in CTSY for multiple client requests to CRetrieveMobilePhonePreferredNetworks::Start
+//!@SYMTestPriority        High
+//!@SYMTestActions         1. Invoke CRetrieveMobilePhonePreferredNetworks::Start.
+//!                        2. Invoke CRetrieveMobilePhonePreferredNetworks::Start from second client.
+//!@SYMTestExpectedResults Second client receives KErrInUse.
+//!@SYMTestType            CT
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestRetrieveMobilePhonePreferredNetworks0004L
+END_TESTCASE BA-CTSY-NTWC-CRMPPN-0004
+
 START_TESTCASE BA-CTSY-NTWC-MGNRS-0001
 //!@SYMTestCaseID BA-CTSY-NTWC-MGNRS-0001
 //!@SYMPREQ 1551
@@ -764,17 +898,44 @@
 END_TESTCASE BA-CTSY-NTWC-MGNRS-0004
 
 START_TESTCASE BA-CTSY-NTWC-MNPNLC-0001
-//!@SYMTestCaseID BA-CTSY-NTWC-MNPNLC-0001
-//!@SYMPREQ 1551
-//!@SYMComponent telephony_ctsy
-//!@SYMTestCaseDesc Test support in CTSY for RMobilePhone::NotifyPreferredNetworksListChange
-//!@SYMTestPriority High
-//!@SYMTestActions Invokes RMobilePhone::NotifyPreferredNetworksListChange
-//!@SYMTestExpectedResults Pass
-//!@SYMTestType CT
+//!@SYMPREQ                417-71654
+//!@SYMComponent           telephony_ctsy
+//!@SYMTestCaseDesc        Test support in CTSY for RMobilePhone::NotifyPreferredNetworksListChange
+//!@SYMTestPriority        High
+//!@SYMTestActions         1. Invoke RMobilePhone::NotifyPreferredNetworksListChange.
+//!                        2. Invoke RMobilePhone::StorePreferredNetworksListL.
+//!@SYMTestExpectedResults Test code receives preferred network list notification
+//!@SYMTestType            CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestNotifyPreferredNetworksListChange0001L
 END_TESTCASE BA-CTSY-NTWC-MNPNLC-0001
 
+START_TESTCASE BA-CTSY-NTWC-MNPNLC-0002
+//!@SYMTestCaseID          BA-CTSY-NTWC-MNPNLC-0002
+//!@SYMPREQ                417-71654
+//!@SYMComponent           telephony_ctsy
+//!@SYMTestCaseDesc        Test support in CTSY for Cancelling RMobilePhone::NotifyPreferredNetworksListChange
+//!@SYMTestPriority        High
+//!@SYMTestActions         1. Invoke RMobilePhone::NotifyPreferredNetworksListChange.
+//!                        2. Cancel subscription to preferred network list change.
+//!                        3. Invoke RMobilePhone::StorePreferredNetworksListL.
+//!@SYMTestExpectedResults Test code does not receive preferred network list notification
+//!@SYMTestType            CT
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestNotifyPreferredNetworksListChange0002L
+END_TESTCASE BA-CTSY-NTWC-MNPNLC-0002
+
+START_TESTCASE BA-CTSY-NTWC-MNPNLC-0004
+//!@SYMPREQ                417-71654
+//!@SYMComponent           telephony_ctsy
+//!@SYMTestCaseDesc        Test support in CTSY for multiple client requests to RMobilePhone::NotifyPreferredNetworksListChange
+//!@SYMTestPriority        High
+//!@SYMTestActions         1. Invoke RMobilePhone::NotifyPreferredNetworksListChange.
+//!                        1. Invoke RMobilePhone::NotifyPreferredNetworksListChange from second client.
+//!                        2. Invoke RMobilePhone::StorePreferredNetworksListL.
+//!@SYMTestExpectedResults Clients receive preferred network list notification
+//!@SYMTestType            CT
+RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestNotifyPreferredNetworksListChange0004L
+END_TESTCASE BA-CTSY-NTWC-MNPNLC-0004
+
 START_TESTCASE BA-CTSY-NTWC-MNNSSC-0001
 //!@SYMTestCaseID BA-CTSY-NTWC-MNNSSC-0001
 //!@SYMPREQ 1551
@@ -945,4 +1106,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestNotifyCellInfoChange0004L
 END_TESTCASE BA-CTSY-NTWC-PNCIC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_networksecurity_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_networksecurity_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -120,4 +117,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkSecurityFU.TestNotifyNetworkSecurityLevelChange0004L
 END_TESTCASE BA-CTSY-NTWS-MNNSLC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_onstore_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_onstore_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,10 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
-
 
 LOAD_SUITE te_ctsy_component
 
@@ -398,4 +394,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyONStoreFU.TestStart0004L
 END_TESTCASE BA-CTSY-PBON-OSS-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetcontext_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetcontext_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -741,4 +738,5 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPacketContextFU.TestNotifyConnectionInfoChange0004L
 END_TESTCASE BA-CTSY-PKTC-PCNCIC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script
+
+

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetcontext_individual_no_adaptive_tcp_receive_window.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetcontext_individual_no_adaptive_tcp_receive_window.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -675,5 +672,6 @@
 RUN_TEST_STEP !PanicCode=-28 100 te_ctsy_component TEFUnit.CCTsyPacketContextFU.TestOpenExistingContext0003L
 END_TESTCASE BA-CTSY-PKTC-PCONEC-0003
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script
+
 
+

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetqos_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetqos_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -414,5 +411,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPacketQoSFU.TestOpenExistingQoS0004L
 END_TESTCASE BA-CTSY-PKTQ-QOEQ-0004
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetservice_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetservice_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -1402,4 +1399,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPacketServiceFU.TestRetrievePcktMbmsSessionListStart0002L
 END_TESTCASE BA-CTSY-PKTS-PMSLS-0002
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_personalisation_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_personalisation_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -52,4 +49,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPersonalisationFU.TestSetPersonalisationStatus0001L
 END_TESTCASE BA-CTSY-PERS-MSPS-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonebookstore_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonebookstore_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -1897,6 +1894,4 @@
 //!@SYMTestExpectedResults Pass
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhoneBookStoreFU.TestOpen0001L
-END_TESTCASE BA-CTSY-PBSTR-PBSO2-0001
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script
+END_TESTCASE BA-CTSY-PBSTR-PBSO2-0001
\ No newline at end of file

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonebookstore_individual_fail.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonebookstore_individual_fail.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -1911,4 +1908,10 @@
 END_TESTCASE BA-CTSY-PBSTR-PBSR3-0002
 
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script
+
+
+
+
+
+
+

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonecapability_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonecapability_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -95,5 +92,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhoneCapabilityFU.TestGetMultimodeCaps0001L
 END_TESTCASE BA-CTSY-PCAP-MGMC-0001
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonecontrol_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonecontrol_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -106,5 +103,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhoneControlFU.TestGetStatus0001L
 END_TESTCASE BA-CTSY-PCON-PGS-0001
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phoneidentity_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phoneidentity_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -281,4 +278,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhoneIdentityFU.TestNotifyIdentitySuppressionRejected0001L
 END_TESTCASE BA-CTSY-PID-MNISR-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonepower_hwrm_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonepower_hwrm_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -86,4 +83,3 @@
 RUN_TEST_STEP 400 te_ctsy_component TEFUnit.CCTsyPhonePowerFU.TestHWRMNotifyBatteryInfoChange0004L
 END_TESTCASE BA-CTSY-PPHWRM-MNBIC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonepower_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonepower_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -86,4 +83,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhonePowerFU.TestNotifyBatteryInfoChange0004L
 END_TESTCASE BA-CTSY-PP-MNBIC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonesecurity_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonesecurity_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -493,4 +490,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhoneSecurityFU.TestNotifySecurityCapsChange0004L
 END_TESTCASE BA-CTSY-NTWS-MNSCC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonestore_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonestore_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -63,4 +60,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhoneStoreFU.TestGetPhoneStoreInfo0004L
 END_TESTCASE BA-CTSY-PSTR-MGPSI-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_privacy_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_privacy_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -173,4 +170,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPrivacyFU.TestNotifyDefaultPrivacyChange0001L
 END_TESTCASE BA-CTSY-PRI-MNDPC-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_sessionmanagement_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_sessionmanagement_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -261,4 +258,4 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySessionManagementFU.TestInitialiseMM0001L
 END_TESTCASE BA-CTSY-SESMG-MIM-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script
+

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_signalstrength_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_signalstrength_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -85,4 +82,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySignalStrengthFU.TestNotifySignalStrengthChange0004L
 END_TESTCASE BA-CTSY-SIGS-MNSSC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smartcardapplication_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smartcardapplication_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -96,4 +93,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySmartCardApplicationFU.TestNotifySmartCardAppInfoChange0001L
 END_TESTCASE BA-CTSY-SMCA-MNSCAIC-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smsmessaging_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smsmessaging_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -563,5 +560,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySmsMessagingFU.TestGetCaps0003L
 END_TESTCASE BA-CTSY-SMSM-SGC-0003
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smspstore_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smspstore_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -52,4 +49,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySMSPStoreFU.TestStart0004L
 END_TESTCASE BA-CTSY-SMSP-CRMPSL-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smsstore_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smsstore_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -305,4 +302,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySmsStoreFU.TestStartBatch0001L
 END_TESTCASE BA-CTSY-PBSMS-SMSSSB-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_subscriberinfo_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_subscriberinfo_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -239,4 +236,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySubscriberInfoFU.TestGetIccIdentity0001L
 END_TESTCASE BA-CTSY-SUBI-MGII-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_supplementaryservicecaps_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_supplementaryservicecaps_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -63,4 +60,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySupplementaryServiceCapsFU.TestNotifyCallServiceCapsChange0004L
 END_TESTCASE BA-CTSY-SUSC-MCSCC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_systemstate_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_systemstate_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -29,5 +26,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySystemState.TestSystemState0001L
 END_TESTCASE BA-CTSY-SYSS-SYSSPLG-0001
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_telephonyaudiocontrol_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_telephonyaudiocontrol_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -128,5 +125,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyTelephonyAudioControlFU.TestNotifyTelephonyAudioControlError0001L
 END_TESTCASE BA-CTSY-CRC-CRCNTACE-0001
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_timeout_all.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_timeout_all.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -1988,5 +1985,3 @@
 //!@SYMTestType CT
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCustomIPCFU.TestGetUSIMServiceSupport0005L
 END_TESTCASE BA-CTSY-CIPC-GUSS-0005
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_trafficchannel_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_trafficchannel_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -85,4 +82,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyTrafficChannelFU.TestNotifyTrafficChannelConfirmation00011L
 END_TESTCASE BA-CTSY-TRCH-CNTCC-00011
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_usernetworkaccess_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_usernetworkaccess_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -173,4 +170,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyUserNetworkAccessFU.TestSendNetworkServiceRequestNoFdnCheck0004L
 END_TESTCASE BA-CTSY-USNA-MSNSRNFC-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_usertousersignalling_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_usertousersignalling_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -283,4 +280,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyUserToUserSignallingFU.TestNotifyUUSSettingChange0001L
 END_TESTCASE BA-CTSY-UUS-MNUSC-0001
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_usimapplication_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_usimapplication_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -129,4 +126,4 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyUSIMApplicationFU.TestGetCurrentActiveUSimApplication0004L
 END_TESTCASE BA-CTSY-SUBI-MGIK-0004
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script
+

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_ussdmessaging_individual.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_ussdmessaging_individual.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -272,4 +269,3 @@
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyUssdMessagingFU.TestGetCaps0003L
 END_TESTCASE BA-CTSY-USSDM-UGC-0003
 
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsyintegration_mbms_auto.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsyintegration_mbms_auto.script	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,9 +13,6 @@
 //
 // Description:
 //
-//
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script
 
 LOAD_SUITE te_ctsy_component
 
@@ -569,5 +566,3 @@
 //!@SYMTestCaseDependencies live/manual
 RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyUCaseMbms027.CCtsyIntegrationTestMbms0002L
 END_TESTCASE BA-CTSY-INT-MB-0046
-
-RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script

--- a/telephonyserverplugins/common_tsy/test/component/src/cctsycallcontrolfu.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/src/cctsycallcontrolfu.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -114,12 +114,6 @@
 	ADD_TEST_STEP_ISO_CPP(CCTsyCallControlFU, TestTerminateAllCalls0002L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyCallControlFU, TestTerminateAllCalls0004L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyCallControlFU, TestTerminateAllCalls0005L);	
-    ADD_TEST_STEP_ISO_CPP(CCTsyCallControlFU, TestTerminateActiveCalls0001L);
-    ADD_TEST_STEP_ISO_CPP(CCTsyCallControlFU, TestTerminateActiveCalls0001bL);
-    ADD_TEST_STEP_ISO_CPP(CCTsyCallControlFU, TestTerminateActiveCalls0001cL);
-    ADD_TEST_STEP_ISO_CPP(CCTsyCallControlFU, TestTerminateActiveCalls0002L);
-    ADD_TEST_STEP_ISO_CPP(CCTsyCallControlFU, TestTerminateActiveCalls0004L);
-    ADD_TEST_STEP_ISO_CPP(CCTsyCallControlFU, TestTerminateActiveCalls0005L);  
 	ADD_TEST_STEP_ISO_CPP(CCTsyCallControlFU, TestSetIncomingCallType0001L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyCallControlFU, TestAnswerIncomingCallISV0001L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyCallControlFU, TestAnswerIncomingCallISV0002L);
@@ -2071,11 +2065,6 @@
     callParams0.iInterval = callParams.iInterval;
     callParams0.iWaitForDialTone = callParams.iWaitForDialTone; 
     RCall::TCallParamsPckg   pckgCallParams0(callParams0);
-    // We should expect the appropriate Alpha ID and Icon ID
-    callInfo.iValid |= (RMobileCall::KCallAlphaId | RMobileCall::KCallIconId);    
-    callInfo.iAlphaId.Copy(_L("Alpha Id"));
-    callInfo.iIconId.iQualifier = RMobileCall::ESelfExplanatory;
-    callInfo.iIconId.iIdentifier = 0x0A;
 
     expectData.Close();
     TMockLtsyCallData2< RMobileCall::TMobileCallParamsV7, RMobileCall::TMobileCallInfoV8 >
@@ -9984,7 +9973,7 @@
 	TRequestStatus requestStatus;
     
 	//-----------------------------------------------------------------------
-	// TEST 0: with no active calls 
+	// TEST 0: with no active calls (request should not reach the LTSY)
 	//----------------------------------------------------------------------
 	
 	iPhone.TerminateAllCalls(requestStatus);
@@ -10288,426 +10277,6 @@
 	CleanupStack::PopAndDestroy(4, this); // call, line, expectData, this
 	}
 
-/**
-@SYMTestCaseID BA-CTSY-CCON-MTACTC-0001
-@SYMComponent  telephony_ctsy
-@SYMTestCaseDesc Test support in CTSY for RMobilePhone::TerminateActiveCalls  When the call status is EStatusHold
-@SYMTestPriority High
-@SYMTestActions Invokes RMobilePhone::TerminateActiveCalls
-@SYMTestExpectedResults Pass
-@SYMTestType CT
-*/
-void CCTsyCallControlFU::TestTerminateActiveCalls0001L()
-    {
-    OpenEtelServerL(EUseExtendedError);
-    CleanupStack::PushL(TCleanupItem(Cleanup,this));
-    OpenPhoneL();
-
-    RBuf8 expectData;
-    CleanupClosePushL(expectData); // PUSH
-    
-    TRequestStatus requestStatus;
-    
-    //-----------------------------------------------------------------------
-    // TEST 0: with no active calls 
-    //----------------------------------------------------------------------
-    iMockLTSY.ExpectL(ECtsyPhoneTerminateActiveCallsReq,KErrNone);
-    iMockLTSY.CompleteL(ECtsyPhoneTerminateActiveCallsComp, KErrNone);
-    iPhone.TerminateActiveCalls(requestStatus);
-    User::WaitForRequest(requestStatus);
-    ASSERT_EQUALS(KErrNone, requestStatus.Int());
-    AssertMockLtsyStatusL();
-    
-    //-------------------------------------------------------------------------
-    // TEST A: failure to dispatch request to LTSY
-    //-------------------------------------------------------------------------
-
-    // open new line and call for KMmTsyVoice1LineName
-    RLine line;
-    RCall call;
-    TInt errorCode = OpenNewLineLC(iPhone, line, KMmTsyVoice1LineName); // PUSH
-    ASSERT_EQUALS(KErrNone, errorCode);
-
-    // create new incoming call
-    TName incomingCallName;
-    TInt callId = 1;
-    errorCode = CreateIncomingCallL(line, callId, incomingCallName, 
-            RMobilePhone::EVoiceService, RMobileCall::EStatusHold);   
-    
-    ASSERT_EQUALS(KErrNone, errorCode);
-        
-    CleanupClosePushL(call); // PUSH
-    errorCode = call.OpenExistingCall(line, incomingCallName);
-    ASSERT_EQUALS(KErrNone, errorCode);
-    //-------------------------------------------------------------------------
-
-    TMockLtsyData1<TInt> mockData(callId);
-    mockData.SerialiseL(expectData);
-    iMockLTSY.ExpectL(ECtsyPhoneTerminateActiveCallsReq, expectData, KErrNotSupported);
-    iPhone.TerminateActiveCalls(requestStatus);
-
-    User::WaitForRequest(requestStatus);
-    ASSERT_EQUALS(KErrNotSupported, requestStatus.Int());
-    AssertMockLtsyStatusL();
-
-    
-    
-    //-------------------------------------------------------------------------
-    // TEST B: failure on completion of pending request from LTSY->CTSY
-    //-------------------------------------------------------------------------
-    iMockLTSY.ExpectL(ECtsyPhoneTerminateActiveCallsReq, expectData);
-    iMockLTSY.CompleteL(ECtsyPhoneTerminateActiveCallsComp, KErrGeneral);
-
-    iPhone.TerminateActiveCalls(requestStatus);
-
-    User::WaitForRequest(requestStatus);
-    ASSERT_EQUALS(KErrGeneral, requestStatus.Int());
-    AssertMockLtsyStatusL();
-    
-    //-------------------------------------------------------------------------
-    // TEST C: Successful completion request of
-    // RMobilePhone::TerminateActiveCalls.
-    //-------------------------------------------------------------------------
-    
-    iMockLTSY.ExpectL(ECtsyPhoneTerminateActiveCallsReq, expectData);
-    iMockLTSY.CompleteL(ECtsyPhoneTerminateActiveCallsComp, KErrNone);
-    
-    iPhone.TerminateActiveCalls(requestStatus);
-    User::WaitForRequest(requestStatus);
-    ASSERT_EQUALS(KErrNone, requestStatus.Int());
-    AssertMockLtsyStatusL();
-    
-    //-------------------------------------------------------------------------
-    // TEST E: Unsolicited completion of RMobilePhone::TerminateActiveCalls
-    // from LTSY.
-    //-------------------------------------------------------------------------
-
-    TRequestStatus mockLtsyStatus;
-    iMockLTSY.NotifyTerminated(mockLtsyStatus);
-    iMockLTSY.CompleteL(ECtsyPhoneTerminateActiveCallsComp, KErrNone);
-    User::WaitForRequest(mockLtsyStatus);
-    ASSERT_EQUALS(KErrNone, mockLtsyStatus.Int());
-    AssertMockLtsyStatusL();
-        
-    CleanupStack::PopAndDestroy(4, this); // call, line, expectData, this
-    }
-
-
-/**
-@SYMTestCaseID BA-CTSY-CCON-MTACTC-000B1
-@SYMComponent  telephony_ctsy
-@SYMTestCaseDesc Test support in CTSY for RMobilePhone::TerminateActiveCalls When the call status is EStatusRinging
-@SYMTestPriority High
-@SYMTestActions Invokes RMobilePhone::TerminateActiveCalls
-@SYMTestExpectedResults Pass
-@SYMTestType CT
-*/
-void CCTsyCallControlFU::TestTerminateActiveCalls0001bL()
-    {
-    OpenEtelServerL(EUseExtendedError);
-    CleanupStack::PushL(TCleanupItem(Cleanup,this));
-    OpenPhoneL();
-
-    RBuf8 expectData;
-    CleanupClosePushL(expectData); // PUSH
-        
-    TRequestStatus requestStatus;
-    // open new line and call for KMmTsyVoice1LineName
-    RLine line;
-    RCall call;
-    TInt errorCode = OpenNewLineLC(iPhone, line, KMmTsyVoice1LineName); // PUSH
-    ASSERT_EQUALS(KErrNone, errorCode);
-
-    // create new incoming call
-    TName incomingCallName;
-    TInt callId = 1;
-    errorCode = CreateIncomingCallL(line, callId, incomingCallName, 
-    RMobilePhone::EVoiceService, RMobileCall::EStatusRinging);   
-        
-    ASSERT_EQUALS(KErrNone, errorCode);
-    CleanupClosePushL(call); // PUSH
-    errorCode = call.OpenExistingCall(line, incomingCallName);
-    ASSERT_EQUALS(KErrNone, errorCode);
-    iMockLTSY.ExpectL(ECtsyPhoneTerminateActiveCallsReq,KErrNone);
-    iMockLTSY.CompleteL(ECtsyPhoneTerminateActiveCallsComp, KErrNone);
-    iPhone.TerminateActiveCalls(requestStatus);
-    User::WaitForRequest(requestStatus);
-    ASSERT_EQUALS(KErrNone, requestStatus.Int());
-    AssertMockLtsyStatusL();
-        
-    CleanupStack::PopAndDestroy(4, this); // call, line, expectData, this
-    }
-    
-/**
-@SYMTestCaseID BA-CTSY-CCON-MTACTC-000C1
-@SYMComponent  telephony_ctsy
-@SYMTestCaseDesc Test support in CTSY for RMobilePhone::TerminateActiveCalls When the call status is EStatusConnecting
-@SYMTestPriority High
-@SYMTestActions Invokes RMobilePhone::TerminateActiveCalls
-@SYMTestExpectedResults Pass
-@SYMTestType CT
-*/
-void CCTsyCallControlFU::TestTerminateActiveCalls0001cL()
-    {
-    OpenEtelServerL(EUseExtendedError);
-    CleanupStack::PushL(TCleanupItem(Cleanup,this));
-    OpenPhoneL();
-
-    RBuf8 expectData;
-    CleanupClosePushL(expectData); // PUSH
-        
-    TRequestStatus requestStatus;
-    // open new line and call for KMmTsyVoice1LineName
-    RLine line;    
-    TInt errorCode = OpenNewLineLC(iPhone, line, KMmTsyVoice1LineName); // PUSH
-    ASSERT_EQUALS(KErrNone, errorCode);
-
-    // create new incoming call
-    TName incomingCallName;
-    TInt callId = 1;
-    errorCode = CreateIncomingCallL(line, callId, incomingCallName, 
-                RMobilePhone::EVoiceService, RMobileCall::EStatusConnecting);   
-        
-    ASSERT_EQUALS(KErrNone, errorCode);
-    RCall call;    
-    CleanupClosePushL(call); // PUSH
-    errorCode = call.OpenExistingCall(line, incomingCallName);
-    ASSERT_EQUALS(KErrNone, errorCode);
-    iMockLTSY.ExpectL(ECtsyPhoneTerminateActiveCallsReq,KErrNone);
-    iMockLTSY.CompleteL(ECtsyPhoneTerminateActiveCallsComp, KErrNone);
-    iPhone.TerminateActiveCalls(requestStatus);
-    User::WaitForRequest(requestStatus);
-    ASSERT_EQUALS(KErrNone, requestStatus.Int());
-    AssertMockLtsyStatusL();
-        
-    CleanupStack::PopAndDestroy(4, this); // call, line, expectData, this
-    }
-
-
-
-/**
-@SYMTestCaseID BA-CTSY-CCON-MTACTC-0002
-@SYMComponent  telephony_ctsy
-@SYMTestCaseDesc Test support in CTSY for cancelling RMobilePhone::TerminateActiveCalls
-@SYMTestPriority High
-@SYMTestActions Invokes RMobilePhone::TerminateActiveCalls and cancels it
-@SYMTestExpectedResults Pass
-@SYMTestType CT
-*/
-void CCTsyCallControlFU::TestTerminateActiveCalls0002L()
-    {
-    OpenEtelServerL(EUseExtendedError);
-    CleanupStack::PushL(TCleanupItem(Cleanup,this));
-    OpenPhoneL();
-    
-    RBuf8 expectData;
-    CleanupClosePushL(expectData); // PUSH
-    
-    //-------------------------------------------------------------------------
-    
-    // open new line and call for KMmTsyVoice1LineName
-    RLine line;
-    RCall call;
-    TInt errorCode = OpenNewLineLC(iPhone, line, KMmTsyVoice1LineName); // PUSH
-    ASSERT_EQUALS(KErrNone, errorCode);
-
-    // create new incoming call
-    TName incomingCallName;
-    TInt callId = 1;
-    errorCode = CreateIncomingCallL(line, callId, incomingCallName, 
-            RMobilePhone::EVoiceService, RMobileCall::EStatusHold);   
-    
-    ASSERT_EQUALS(KErrNone, errorCode);
-        
-    CleanupClosePushL(call); // PUSH
-    errorCode = call.OpenExistingCall(line, incomingCallName);
-    ASSERT_EQUALS(KErrNone, errorCode);
-    //-------------------------------------------------------------------------
-    
-    //-------------------------------------------------------------------------
-    // Test A: cancelling of RMobilePhone::TerminateActiveCalls
-    //-------------------------------------------------------------------------
-
-    TMockLtsyData1<TInt> mockData(callId);
-    mockData.SerialiseL(expectData);
-    
-    TRequestStatus mockLtsyStatus;
-    iMockLTSY.NotifyTerminated(mockLtsyStatus);
-        
-    // Expect call down to LTSY for this IPC
-    iMockLTSY.ExpectL(ECtsyPhoneTerminateActiveCallsReq, expectData);
-
-    // Queue response to be delayed to give time for cancel to come through
-    // There is no interface for cancelling the simple TerminateActiveCalls request once passed to LTSY, 
-    // however this test will still emulate the completion of the request which will finally return from LTSY regardless.
-    
-    iMockLTSY.CompleteL(ECtsyPhoneTerminateActiveCallsComp, KErrNone, 10);
-
-    TRequestStatus requestStatus;
-    iPhone.TerminateActiveCalls(requestStatus);
-    iPhone.CancelAsyncRequest(EMobilePhoneTerminateActiveCalls);
-    User::WaitForRequest(requestStatus);
-    INFO_PRINTF2(_L("requestStatus.Int() %d"),(requestStatus.Int()));
-    ASSERT_EQUALS(KErrNone, requestStatus.Int());
-    
-    AssertMockLtsyStatusL();
-    
-    User::WaitForRequest(mockLtsyStatus);
-    INFO_PRINTF2(_L("mockLtsyStatus.Int() %d"),(mockLtsyStatus.Int()));
-    
-    AssertMockLtsyStatusL();
-    
-    CleanupStack::PopAndDestroy(4, this); // call, line, expectData, this
-    }
-
-/**
-@SYMTestCaseID BA-CTSY-CCON-MTACTC-0004
-@SYMComponent  telephony_ctsy
-@SYMTestCaseDesc Test support in CTSY for multiple client requests of RMobilePhone::TerminateActiveCalls
-@SYMTestPriority High
-@SYMTestActions Invokes RMobilePhone::TerminateActiveCalls on multiple clients
-@SYMTestExpectedResults Pass
-@SYMTestType CT
-*/
-void CCTsyCallControlFU::TestTerminateActiveCalls0004L()
-    {
-
-    OpenEtelServerL(EUseExtendedError);
-    CleanupStack::PushL(TCleanupItem(Cleanup,this));
-    OpenPhoneL();
-        
-    // Open second client
-    RTelServer telServer2;
-    TInt ret = telServer2.Connect();
-    ASSERT_EQUALS(KErrNone, ret);
-    CleanupClosePushL(telServer2);
-
-    RMobilePhone phone2;
-    ret = phone2.Open(iTelServer,KMmTsyPhoneName);
-    ASSERT_EQUALS(KErrNone, ret);
-    CleanupClosePushL(phone2);
-
-    //
-    // set up line and call for first client
-    
-    RLine line;
-    RCall call;
-    TInt errorCode = OpenNewLineLC(iPhone, line, KMmTsyVoice1LineName); // PUSH
-    ASSERT_EQUALS(KErrNone, errorCode);
-
-    // create new incoming call
-    TName incomingCallName;
-    TInt callId = 1;
-    errorCode = CreateIncomingCallL(line, callId, incomingCallName, 
-            RMobilePhone::EVoiceService, RMobileCall::EStatusHold);   
-    
-    ASSERT_EQUALS(KErrNone, errorCode);
-        
-    CleanupClosePushL(call); // PUSH
-    errorCode = call.OpenExistingCall(line, incomingCallName);
-    ASSERT_EQUALS(KErrNone, errorCode);
-    
-    //
-    // set up call for second client
-    
-    RLine line2;
-    RCall call2;
-    errorCode = OpenNewLineLC(phone2, line2, KMmTsyVoice1LineName); // PUSH
-    ASSERT_EQUALS(KErrNone, errorCode);
-
-    // create new incoming call
-    TName incomingCallName2;
-    TInt callId2 = 2;
-    errorCode = CreateIncomingCallL(line2, callId2, incomingCallName2, 
-            RMobilePhone::EVoiceService, RMobileCall::EStatusHold);   
-    
-    ASSERT_EQUALS(KErrNone, errorCode);
-        
-    CleanupClosePushL(call2); // PUSH
-    errorCode = call2.OpenExistingCall(line2, incomingCallName2);
-    ASSERT_EQUALS(KErrNone, errorCode);
-    
-    // let's start testing...
-    
-    RBuf8 expectData;
-    CleanupClosePushL(expectData); // PUSH
-    TMockLtsyData1<TInt> mockData(callId);
-    mockData.SerialiseL(expectData);
-    
-    iMockLTSY.ExpectL(ECtsyPhoneTerminateActiveCallsReq, expectData);
-    iMockLTSY.CompleteL(ECtsyPhoneTerminateActiveCallsComp, KErrNone, 20);
-    TRequestStatus requestStatus;
-    TRequestStatus requestStatus2;
-    iPhone.TerminateActiveCalls(requestStatus);
-    phone2.TerminateActiveCalls(requestStatus2);
-    
-    User::WaitForRequest(requestStatus);
-    ASSERT_EQUALS(KErrNone, requestStatus.Int());
-    
-    User::WaitForRequest(requestStatus2);
-    ASSERT_EQUALS(KErrServerBusy, requestStatus2.Int());
-    
-    AssertMockLtsyStatusL();
-    
-    CleanupStack::PopAndDestroy(8, this);   // expectData,
-                                            // call2, line2, call, line,
-                                            // phone2, telServer2, this
-    }
-
-/**
-@SYMTestCaseID BA-CTSY-CCON-MTACTC-0005
-@SYMComponent  telephony_ctsy
-@SYMTestCaseDesc Test support in CTSY for RMobilePhone::TerminateActiveCalls with timeout.
-@SYMTestPriority High
-@SYMTestActions Invokes RMobilePhone::TerminateActiveCalls and tests for timeout.
-@SYMTestExpectedResults Pass
-@SYMTestType CT
-*/
-void CCTsyCallControlFU::TestTerminateActiveCalls0005L()
-    {
-    OpenEtelServerL(EUseExtendedError);
-    CleanupStack::PushL(TCleanupItem(Cleanup,this));
-    OpenPhoneL();
-
-    RBuf8 expectData;
-    CleanupClosePushL(expectData); // PUSH
-   
-    
-    // open new line and call for KMmTsyVoice1LineName
-    RLine line;
-    RCall call;
-    TInt errorCode = OpenNewLineLC(iPhone, line, KMmTsyVoice1LineName); // PUSH
-    ASSERT_EQUALS(KErrNone, errorCode);
-
-    
-    // create new incoming call
-    TName incomingCallName;
-    TInt callId = 1;
-    errorCode = CreateIncomingCallL(line, callId, incomingCallName, 
-            RMobilePhone::EVoiceService, RMobileCall::EStatusHold);   
-    
-    ASSERT_EQUALS(KErrNone, errorCode);
-        
-    CleanupClosePushL(call); // PUSH
-    errorCode = call.OpenExistingCall(line, incomingCallName);
-    ASSERT_EQUALS(KErrNone, errorCode);
-    //-------------------------------------------------------------------------
-
-    TMockLtsyData1<TInt> mockData(callId);
-    mockData.SerialiseL(expectData);    
-    //-------------------------------------------------------------------------
-    // Test A: Test timeout of RMobilePhone::TerminateActiveCalls
-    //-------------------------------------------------------------------------
-    
-    TRequestStatus requestStatus;
-    iMockLTSY.ExpectL(ECtsyPhoneTerminateActiveCallsReq, expectData);
-    iPhone.TerminateActiveCalls(requestStatus);
-    User::WaitForRequest(requestStatus);
-    AssertMockLtsyStatusL();
-    ASSERT_EQUALS(KErrTimedOut, requestStatus.Int());
-
-    CleanupStack::PopAndDestroy(4, this); // call, line, expectData, this
-    }
 
 /**
 @SYMTestCaseID BA-CTSY-CCON-MSICT-0001

--- a/telephonyserverplugins/common_tsy/test/component/src/cctsyfixeddiallingfu.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/src/cctsyfixeddiallingfu.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -35,7 +35,6 @@
 	ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0001L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0001bL);
     ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0001cL);
-    ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0001dL);
 	ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0002L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0004L);	
 	ADD_TEST_STEP_ISO_CPP(CCTsyFixedDiallingFU, TestDialNoFdnCheck0005L);
@@ -540,13 +539,12 @@
 
     TRequestStatus requestStatus;    
     _LIT(KSomeNumber, "123456789");   
-    _LIT(KAlphaID, "Alpha ID");
 
     RMobilePhone::TMobileService mobileService = RMobilePhone::EVoiceService;    
     TInt expecteCallId = 0;
 
-    RMobileCall::TMobileCallParamsV7 callParams; 
-    RMobileCall::TMobileCallParamsV7Pckg    pckgCallParams(callParams);
+    RMobileCall::TMobileCallParamsV1 callParams; 
+    RMobileCall::TMobileCallParamsV1Pckg    pckgCallParams(callParams);
     RMobileCall::TMobileCallInfoV8 callInfo;   
     callParams.iSpeakerControl  = RCall::EMonitorSpeakerControlOnUntilCarrier;
     callParams.iSpeakerVolume   = RCall::EMonitorSpeakerVolumeLow;
@@ -557,17 +555,7 @@
     callParams.iCug.iCugIndex = 0xFFFF;
     callParams.iCug.iSuppressPrefCug = EFalse;
     callParams.iCug.iSuppressOA = EFalse;
-    
     callParams.iAutoRedial = EFalse;
-    callParams.iBearerMode = RMobileCall::EMulticallNewBearer;
-    callParams.iCallParamOrigin = RMobileCall::EOriginatorSIM;   
-    callParams.iBCRepeatIndicator = RMobileCall::EBCAlternateMode;      
-    callParams.iIconId.iQualifier = RMobileCall::ENoIconId;   
-    callParams.iAlphaId = KAlphaID;
-
-    
-    
-    
     callInfo.iValid = RMobileCall::KCallDialledParty | RMobileCall::KCallAlternating;    
     callInfo.iService   = mobileService;
     callInfo.iStatus    = RMobileCall::EStatusUnknown;
@@ -584,7 +572,7 @@
     callInfo.iDialledParty.iTypeOfNumber = 
             RMobilePhone::EUnknownNumber;   
 
-    TMockLtsyCallData2< RMobileCall::TMobileCallParamsV7, RMobileCall::TMobileCallInfoV8 >
+    TMockLtsyCallData2< RMobileCall::TMobileCallParamsV1, RMobileCall::TMobileCallInfoV8 >
     mockCallData(expecteCallId, mobileService, callParams, callInfo);
     mockCallData.SerialiseL(expectData);
     
@@ -611,156 +599,12 @@
     callParamsX.iWaitForDialTone = RCall::EDialToneWait;
     TPckg<RCall::TCallParams> pckgCallParamsX(callParamsX);
         
-    
-    TPckg<RMobileCall::TMobileCallParamsV7> mmParamsPckgV7(callParams);
-    call.DialNoFdnCheck(requestStatus, mmParamsPckgV7, KSomeNumber);   
+    call.DialNoFdnCheck(requestStatus, pckgCallParamsX, KSomeNumber);   
         
     User::WaitForRequest(requestStatus);          
     ASSERT_EQUALS(KErrNone, requestStatus.Int());
     AssertMockLtsyStatusL();   
     
-    RMobileCall::TMobileCallInfoV7 info;
-    RMobileCall::TMobileCallInfoV7Pckg  infoPckg(info);
-        
-    TInt ret = call.GetMobileCallInfo(infoPckg);
-    ASSERT_EQUALS(KErrNone, ret);
-    
-    ASSERT_TRUE(info.iAlphaId.Compare(KAlphaID)==KErrNone);
-    
-    CleanupStack::PopAndDestroy(5,this);
-    
-    }
-
-/**
-@SYMTestCaseID BA-CTSY-FXD-CDNFC-0001d
-@SYMComponent  telephony_ctsy
-@SYMTestCaseDesc Test support in CTSY for RMobileCall::DialNoFdnCheck for voice calls with extended parameters (RMobileCall::TCallParamsV7)
-@SYMTestPriority High
-@SYMTestActions Invokes RMobileCall::DialNoFdnCheck for voice calls
-@SYMTestExpectedResults Pass
-@SYMTestType CT
-*/
-void CCTsyFixedDiallingFU::TestDialNoFdnCheck0001dL()
-    {
-    
-    OpenEtelServerL(EUseExtendedError);
-    CleanupStack::PushL(TCleanupItem(Cleanup,this));
-    OpenPhoneL();
-
-    RBuf8 expectData;
-    CleanupClosePushL(expectData);
-
-    RBuf8 completeData;
-    CleanupClosePushL(completeData);
-
-    TInt errorCode = KErrNone;    
-
-    //-- For Voice1 -------------------------
-
-    TBuf<256> lineName(KMmTsyVoice1LineName);    
-    // Open new line
-    RLine line;
-    errorCode = line.Open(iPhone, lineName);
-    ASSERT_EQUALS(KErrNone, errorCode);
-    CleanupClosePushL(line);      
-    // open call
-    _LIT(KDoubleColon, "::");    
-    TBuf<256> name;
-    name = KMmTsyPhoneName;
-    name.Append(KDoubleColon);
-    name.Append(lineName);
-    name.Append(KDoubleColon);
-
-    RMobileCall call;
-    errorCode = call.OpenNewCall(line, name);
-    ASSERT_EQUALS(KErrNone, errorCode);
-    CleanupClosePushL(call);   
-
-    TRequestStatus requestStatus;    
-    _LIT(KSomeNumber, "123456789");   
-    // Alpha ID to pass through TMobileCallParamsV7
-    _LIT(KAlphaID, "Alpha ID");
-
-    RMobilePhone::TMobileService mobileService = RMobilePhone::EVoiceService;    
-    TInt expecteCallId = 0;
-
-    RMobileCall::TMobileCallParamsV7 callParams; 
-    RMobileCall::TMobileCallParamsV7Pckg    pckgCallParams(callParams); 
-    callParams.iSpeakerControl  = RCall::EMonitorSpeakerControlOnUntilCarrier;
-    callParams.iSpeakerVolume   = RCall::EMonitorSpeakerVolumeLow;
-    callParams.iInterval        = 100;
-    callParams.iWaitForDialTone = RCall::EDialToneWait;
-    callParams.iIdRestrict = RMobileCall::EIdRestrictDefault;
-    callParams.iCug.iExplicitInvoke = EFalse;
-    callParams.iCug.iCugIndex = 0xFFFF;
-    callParams.iCug.iSuppressPrefCug = EFalse;
-    callParams.iCug.iSuppressOA = EFalse;
-    
-    callParams.iAutoRedial = EFalse;
-    callParams.iBearerMode = RMobileCall::EMulticallNewBearer;
-    callParams.iCallParamOrigin = RMobileCall::EOriginatorSIM;   
-    callParams.iBCRepeatIndicator = RMobileCall::EBCAlternateMode;      
-    callParams.iIconId.iQualifier = RMobileCall::ENoIconId;   
-    callParams.iIconId.iIdentifier = 123;   
-    callParams.iAlphaId = KAlphaID;
-
-    // Create the basic TMobileCallInfoV3 object to pass back
-    RMobileCall::TMobileCallInfoV8 callInfo;   
-    callInfo.iValid = RMobileCall::KCallDialledParty | RMobileCall::KCallAlternating;    
-    callInfo.iService   = mobileService;
-    callInfo.iStatus    = RMobileCall::EStatusUnknown;
-    callInfo.iCallId    =-1;
-    callInfo.iExitCode  =0; 
-    callInfo.iEmergency =0;
-    callInfo.iForwarded =0; 
-    callInfo.iPrivacy               = RMobilePhone::EPrivacyUnspecified;
-    callInfo.iAlternatingCall       = RMobilePhone::EAlternatingModeUnspecified;    
-    //callInfo.iDuration.iIntervel  = 0;            // this is protected value
-    callInfo.iDialledParty.iTelNumber.Copy( KSomeNumber );
-    callInfo.iDialledParty.iNumberPlan = 
-            RMobilePhone::EUnknownNumberingPlan;
-    callInfo.iDialledParty.iTypeOfNumber = 
-            RMobilePhone::EUnknownNumber;   
-
-    TMockLtsyCallData2< RMobileCall::TMobileCallParamsV7, RMobileCall::TMobileCallInfoV8 >
-    mockCallData(expecteCallId, mobileService, callParams, callInfo);
-    mockCallData.SerialiseL(expectData);
-    
-    iMockLTSY.ExpectL(EMobileCallDialNoFdnCheck, expectData);
-
-    TInt callId = 1;
-    
-    completeData.Close();
-    TMockLtsyCallData1<RMobileCall::TMobileCallInfoV1> callInfoData(callId, mobileService, callInfo);
-    callInfoData.SerialiseL(completeData);
-    //Complete Mobile Call Info in order to set the call ID 
-    iMockLTSY.CompleteL(EMobileCallGetMobileCallInfo, KErrNone, completeData);
-    
-    TMockLtsyCallData0 mockDataComplete(callId, mobileService);
-    completeData.Close();
-    mockDataComplete.SerialiseL(completeData);
-    // Complete the Dial
-    iMockLTSY.CompleteL(EMobileCallDialNoFdnCheck, KErrNone, completeData);
-    
-    TPckg<RMobileCall::TMobileCallParamsV7> mmParamsPckgV7(callParams);
-    call.DialNoFdnCheck(requestStatus, mmParamsPckgV7, KSomeNumber);   
-        
-    User::WaitForRequest(requestStatus);          
-    ASSERT_EQUALS(KErrNone, requestStatus.Int());
-    AssertMockLtsyStatusL();   
-    
-    RMobileCall::TMobileCallInfoV7 info;
-    RMobileCall::TMobileCallInfoV7Pckg  infoPckg(info);
-        
-    TInt ret = call.GetMobileCallInfo(infoPckg);
-    ASSERT_EQUALS(KErrNone, ret);
-    
-    // The check to make sure that the AlphaID persisted in CTSY and returned properly.
-    ASSERT_TRUE(info.iAlphaId.Compare(KAlphaID)==KErrNone);
-    // The check to make sure that the IconID persisted in CTSY and returned properly.
-    ASSERT_TRUE(info.iIconId.iIdentifier == 123);
-    ASSERT_EQUALS(info.iIconId.iQualifier, RMobileCall::ENoIconId);
-    
     CleanupStack::PopAndDestroy(5,this);
     
     }

--- a/telephonyserverplugins/common_tsy/test/component/src/cctsynetworkcontrolfu.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/src/cctsynetworkcontrolfu.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 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"
@@ -99,11 +99,23 @@
 	ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestSetNetworkSelectionSetting0005L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestGetLastUsedAccessTechnology0001L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestStorePreferredNetworksListL0001L);
+    ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestStorePreferredNetworksListL0001aL);
+    ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestStorePreferredNetworksListL0001bL);
+    ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestStorePreferredNetworksListL0002L);
+    ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestStorePreferredNetworksListL0004L);    
+    ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestRetrieveMobilePhonePreferredNetworks0001L);
+    ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestRetrieveMobilePhonePreferredNetworks0001aL);
+    ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestRetrieveMobilePhonePreferredNetworks0001bL);
+    ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestRetrieveMobilePhonePreferredNetworks0001cL);
+    ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestRetrieveMobilePhonePreferredNetworks0002L);
+    ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestRetrieveMobilePhonePreferredNetworks0004L);    
 	ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestGetNetworkRegistrationStatus0001L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestGetNetworkRegistrationStatus0002L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestGetNetworkRegistrationStatus0004L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestGetNetworkRegistrationStatus0005L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestNotifyPreferredNetworksListChange0001L);
+    ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestNotifyPreferredNetworksListChange0002L);
+    ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestNotifyPreferredNetworksListChange0004L);    
 	ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestNotifyNetworkSelectionSettingChange0001L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestNotifyNetworkSelectionSettingChange0002L);
 	ADD_TEST_STEP_ISO_CPP(CCTsyNetworkControlFU, TestNotifyNetworkSelectionSettingChange0004L);
@@ -5221,14 +5233,14 @@
 
 
 /**
-@SYMTestCaseID BA-CTSY-NTWC-MSPNL-0001
-@SYMPREQ 1551
-@SYMComponent  telephony_ctsy
-@SYMTestCaseDesc Test support in CTSY for RMobilePhone::StorePreferredNetworksListL
-@SYMTestPriority High
-@SYMTestActions Invokes RMobilePhone::StorePreferredNetworksListL
-@SYMTestExpectedResults Pass
-@SYMTestType CT
+@SYMTestCaseID          BA-CTSY-NTWC-MSPNL-0001
+@SYMPREQ                417-71654
+@SYMComponent           telephony_ctsy
+@SYMTestCaseDesc        Test support in CTSY for RMobilePhone::StorePreferredNetworksListL
+@SYMTestPriority        High
+@SYMTestActions         1. Invoke RMobilePhone::StorePreferredNetworksListL with a list of Preferred Networks.
+@SYMTestExpectedResults LTSY receives the same list of Preferred Networks. 
+@SYMTestType            CT
 */
 void CCTsyNetworkControlFU::TestStorePreferredNetworksListL0001L()
 	{
@@ -5240,21 +5252,858 @@
 	RBuf8 data;
 	CleanupClosePushL(data);
 
-	TRequestStatus requestStatus;
-	CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
-	CleanupStack::PushL(list);
-	
+    TRequestStatus requestStatus;
+	
+	// --- prepare data ---
+
+    CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
+    CleanupStack::PushL(list);
+	
+    RMobilePhone::TMobilePreferredNetworkEntryV3 prefNetworks[3];
+    
+    prefNetworks[0].iAccess = RMobilePhone::KNetworkAccessGsm;
+    prefNetworks[0].iCountryCode = _L("262");
+    prefNetworks[0].iNetworkId = _L("01");
+    
+    prefNetworks[1].iAccess = RMobilePhone::KNetworkAccessGsm;
+    prefNetworks[1].iCountryCode = _L("262");
+    prefNetworks[1].iNetworkId = _L("02");
+
+    prefNetworks[2].iAccess = RMobilePhone::KNetworkAccessGsm;
+    prefNetworks[2].iCountryCode = _L("262");
+    prefNetworks[2].iNetworkId = _L("03");
+        
+    for( TInt i=0; i < 3; ++i )
+        {
+        list->AddEntryL(prefNetworks[i]);
+        }
+    
+    TMockLtsyData1<CMobilePhoneStoredNetworkList*> listData(list);    
+    listData.SerialiseL(data);
+    
+    // Invoke Store request
+    
+    iMockLTSY.ExpectL(ECtsyPhoneStorePreferredNetworksListReq, data);
+    iMockLTSY.CompleteL(ECtsyPhoneStorePreferredNetworksListComp, KErrNone);
+    
 	iPhone.StorePreferredNetworksListL(requestStatus, list);
 
 	User::WaitForRequest(requestStatus);
 	AssertMockLtsyStatusL();
-	ASSERT_EQUALS(KErrNotSupported, requestStatus.Int());
-
-	AssertMockLtsyStatusL();
-	CleanupStack::PopAndDestroy(3, this); // data, this, list
-	
+	ASSERT_EQUALS(KErrNone, requestStatus.Int());
+
+	CleanupStack::PopAndDestroy(3, this); // list, data, this
 	}
 
+/**
+@SYMTestCaseID          BA-CTSY-NTWC-MSPNL-0001a
+@SYMPREQ                417-71654
+@SYMComponent           telephony_ctsy
+@SYMTestCaseDesc        Test support in CTSY for RMobilePhone::StorePreferredNetworksListL with empty list
+@SYMTestPriority        High
+@SYMTestActions         1. Invoke RMobilePhone::StorePreferredNetworksListL with an empty list of Preferred Networks.
+@SYMTestExpectedResults LTSY receives an empty list of Preferred Networks.
+@SYMTestType            CT
+*/
+void CCTsyNetworkControlFU::TestStorePreferredNetworksListL0001aL()
+    {
+
+    OpenEtelServerL(EUseExtendedError);
+    CleanupStack::PushL(TCleanupItem(Cleanup,this));
+    OpenPhoneL();
+
+    RBuf8 data;
+    CleanupClosePushL(data);
+
+    TRequestStatus requestStatus;
+    
+    // --- prepare data ---
+    
+    CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
+    CleanupStack::PushL(list);
+
+    TMockLtsyData1<CMobilePhoneStoredNetworkList*> listData(list);    
+    listData.SerialiseL(data);
+    
+    // Invoke Store request
+    
+    iMockLTSY.ExpectL(ECtsyPhoneStorePreferredNetworksListReq, data);
+    iMockLTSY.CompleteL(ECtsyPhoneStorePreferredNetworksListComp, KErrNone);
+
+    iPhone.StorePreferredNetworksListL(requestStatus, list);
+
+    User::WaitForRequest(requestStatus);
+    AssertMockLtsyStatusL();
+    ASSERT_EQUALS(KErrNone, requestStatus.Int());
+
+    CleanupStack::PopAndDestroy(3, this); // list, data, this
+    }
+
+/**
+@SYMTestCaseID          BA-CTSY-NTWC-MSPNL-0001b
+@SYMPREQ                417-71654
+@SYMComponent           telephony_ctsy
+@SYMTestCaseDesc        Test support in CTSY for RMobilePhone::StorePreferredNetworksListL 
+                        with error and with duplicate LTSY complete message
+@SYMTestPriority        High
+@SYMTestActions         1. Invoke RMobilePhone::StorePreferredNetworksListL.
+                        2. LTSY returns error.
+                        3. Test code receives error.
+                        3. Invoke RMobilePhone:StorePreferredNetworksListL.
+                        4. LTSY returns duplicate complete message with KErrNone
+                        5. Duplicate complete message is ignored and test code receives KErrNone.  
+@SYMTestExpectedResults All tests pass. 
+@SYMTestType            CT
+*/
+void CCTsyNetworkControlFU::TestStorePreferredNetworksListL0001bL()
+    {
+
+    OpenEtelServerL(EUseExtendedError);
+    CleanupStack::PushL(TCleanupItem(Cleanup,this));
+    OpenPhoneL();
+
+    RBuf8 data;
+    CleanupClosePushL(data);
+
+    TRequestStatus requestStatus;
+
+    // --- prepare data ---
+    
+    CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
+    CleanupStack::PushL(list);
+
+    RMobilePhone::TMobilePreferredNetworkEntryV3 prefNetwork;
+    
+    prefNetwork.iAccess = RMobilePhone::KNetworkAccessGsm;
+    prefNetwork.iCountryCode = _L("262");
+    prefNetwork.iNetworkId = _L("01");
+    
+    list->AddEntryL(prefNetwork);
+    
+    TMockLtsyData1<CMobilePhoneStoredNetworkList*> listData(list);    
+    listData.SerialiseL(data);
+    
+    // Invoke Store request - LTSY returns KErrUnknown
+    
+    iMockLTSY.ExpectL(ECtsyPhoneStorePreferredNetworksListReq, data);
+    iMockLTSY.CompleteL(ECtsyPhoneStorePreferredNetworksListComp, KErrUnknown);
+    
+    iPhone.StorePreferredNetworksListL(requestStatus, list);
+
+    User::WaitForRequest(requestStatus);
+    AssertMockLtsyStatusL();
+    ASSERT_EQUALS(KErrUnknown, requestStatus.Int());
+
+    // Invoke Store request - LTSY returns duplicate complete messages with KErrNone
+    
+    iMockLTSY.ExpectL(ECtsyPhoneStorePreferredNetworksListReq, data);
+    iMockLTSY.CompleteL(ECtsyPhoneStorePreferredNetworksListComp, KErrNone);
+    iMockLTSY.CompleteL(ECtsyPhoneStorePreferredNetworksListComp, KErrNone);    
+
+    iPhone.StorePreferredNetworksListL(requestStatus, list);
+
+    User::WaitForRequest(requestStatus);
+    AssertMockLtsyStatusL();
+    ASSERT_EQUALS(KErrNone, requestStatus.Int());
+    
+    // Invoke Store request - LTSY returns KErrNotSupported
+    
+    iMockLTSY.ExpectL(ECtsyPhoneStorePreferredNetworksListReq, data, KErrNotSupported);
+    
+    iPhone.StorePreferredNetworksListL(requestStatus, list);
+
+    User::WaitForRequest(requestStatus);
+    AssertMockLtsyStatusL();
+    ASSERT_EQUALS(KErrNotSupported, requestStatus.Int());
+   
+    CleanupStack::PopAndDestroy(3, this); // list, data, this
+    }
+
+/**
+@SYMTestCaseID          BA-CTSY-NTWC-MSPNL-0002
+@SYMPREQ                417-71654
+@SYMComponent           telephony_ctsy
+@SYMTestCaseDesc        Test support in CTSY for Cancelling RMobilePhone::StorePreferredNetworksListL
+@SYMTestPriority        High
+@SYMTestActions         1. Invoke RMobilePhone::StorePreferredNetworksListL.
+                        2. Cancel the outstanding request.
+                        3. LTSY ignores cancelling the request and stores the preferred networks list.
+@SYMTestExpectedResults Request status of the operation is KErrNone. 
+@SYMTestType            CT
+*/
+void CCTsyNetworkControlFU::TestStorePreferredNetworksListL0002L()
+    {
+
+    OpenEtelServerL(EUseExtendedError);
+    CleanupStack::PushL(TCleanupItem(Cleanup,this));
+    OpenPhoneL();
+
+    RBuf8 data;
+    CleanupClosePushL(data);
+
+    TRequestStatus requestStatus;
+
+    // --- prepare data ---
+    
+    CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
+    CleanupStack::PushL(list);
+
+    RMobilePhone::TMobilePreferredNetworkEntryV3 prefNetwork;
+    
+    prefNetwork.iAccess = RMobilePhone::KNetworkAccessGsm;
+    prefNetwork.iCountryCode = _L("262");
+    prefNetwork.iNetworkId = _L("01");
+    
+    list->AddEntryL(prefNetwork);
+    
+    TMockLtsyData1<CMobilePhoneStoredNetworkList*> listData(list);    
+    listData.SerialiseL(data);
+    
+    // Invoke Store request
+    
+    iMockLTSY.ExpectL(ECtsyPhoneStorePreferredNetworksListReq, data);
+    iMockLTSY.CompleteL(ECtsyPhoneStorePreferredNetworksListComp, KErrNone);
+    
+    iPhone.StorePreferredNetworksListL(requestStatus, list);
+
+    // Cancel outstanding request
+    iPhone.CancelAsyncRequest(EMobilePhoneStorePreferredNetworksList);    
+    
+    User::WaitForRequest(requestStatus);
+    AssertMockLtsyStatusL();
+    ASSERT_EQUALS(KErrNone, requestStatus.Int());
+
+    CleanupStack::PopAndDestroy(3, this); // list, data, this
+    
+    }
+
+/**
+@SYMTestCaseID          BA-CTSY-NTWC-MSPNL-0004
+@SYMPREQ                417-71654
+@SYMComponent           telephony_ctsy
+@SYMTestCaseDesc        Test support in CTSY for multiple client requests to RMobilePhone::StorePreferredNetworksListL
+@SYMTestPriority        High
+@SYMTestActions         1. Invoke RMobilePhone::StorePreferredNetworksListL.
+                        2. Invoke RMobilePhone::StorePreferredNetworksListL from second client.
+@SYMTestExpectedResults Second cleint receives KErrServerBusy. 
+@SYMTestType            CT
+*/
+void CCTsyNetworkControlFU::TestStorePreferredNetworksListL0004L()
+    {
+
+    OpenEtelServerL(EUseExtendedError);
+    CleanupStack::PushL(TCleanupItem(Cleanup,this));
+    OpenPhoneL();
+
+    RBuf8 data;
+    CleanupClosePushL(data);
+
+    TRequestStatus requestStatus;
+
+    // Open second client
+    RTelServer telServer2;
+    TInt ret = telServer2.Connect();
+    ASSERT_EQUALS(KErrNone, ret);
+    CleanupClosePushL(telServer2);
+
+    RMobilePhone phone2;
+    ret = phone2.Open(iTelServer,KMmTsyPhoneName);
+    ASSERT_EQUALS(KErrNone, ret);
+    CleanupClosePushL(phone2);
+    
+    TRequestStatus requestStatus2;
+    
+    // --- prepare data ---
+    
+    CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
+    CleanupStack::PushL(list);
+
+    RMobilePhone::TMobilePreferredNetworkEntryV3 prefNetwork;
+    
+    prefNetwork.iAccess = RMobilePhone::KNetworkAccessGsm;
+    prefNetwork.iCountryCode = _L("262");
+    prefNetwork.iNetworkId = _L("01");
+    
+    list->AddEntryL(prefNetwork);
+    
+    TMockLtsyData1<CMobilePhoneStoredNetworkList*> listData(list);    
+    listData.SerialiseL(data);
+    
+    // Invoke Store request
+    
+    iMockLTSY.ExpectL(ECtsyPhoneStorePreferredNetworksListReq, data);
+        
+    iPhone.StorePreferredNetworksListL(requestStatus, list);
+    
+    // Invoke store request from second client
+    
+    phone2.StorePreferredNetworksListL(requestStatus2, list);
+    
+    // Wait for second request
+    User::WaitForRequest(requestStatus2);
+    AssertMockLtsyStatusL();
+    ASSERT_EQUALS(KErrServerBusy, requestStatus2.Int());
+    
+    iMockLTSY.CompleteL(ECtsyPhoneStorePreferredNetworksListComp, KErrNone);
+    
+    // Wait for first request
+    User::WaitForRequest(requestStatus);
+    AssertMockLtsyStatusL();
+    ASSERT_EQUALS(KErrNone, requestStatus.Int());
+    
+    CleanupStack::PopAndDestroy(5, this); // list, phone2, telServer2, data, this
+    
+    }
+
+/**
+@SYMTestCaseID          BA-CTSY-NTWC-CRMPPN-0001
+@SYMPREQ                417-71654
+@SYMComponent           telephony_ctsy
+@SYMTestCaseDesc        Test support in CTSY for CRetrieveMobilePhonePreferredNetworks::Start
+@SYMTestPriority        High
+@SYMTestActions         1. Invoke CRetrieveMobilePhonePreferredNetworks::Start.
+                        2. Add a new entry to the list.
+                        3. Invoke RMobilePhone::StorePreferredNetworksListL. 
+@SYMTestExpectedResults LTSY receives the modified list and test code receives KErrNone. 
+@SYMTestType            CT
+*/
+void CCTsyNetworkControlFU::TestRetrieveMobilePhonePreferredNetworks0001L()
+    {
+
+    OpenEtelServerL(EUseExtendedError);
+    CleanupStack::PushL(TCleanupItem(Cleanup,this));
+    OpenPhoneL();
+
+    RBuf8 data;
+    CleanupClosePushL(data);
+
+    // --- prepare data ---
+    
+    CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
+    CleanupStack::PushL(list);
+            
+    RMobilePhone::TMobilePreferredNetworkEntryV3 prefNetwork;
+    
+    prefNetwork.iAccess = RMobilePhone::KNetworkAccessGsm;
+    prefNetwork.iCountryCode = _L("262");
+    prefNetwork.iNetworkId = _L("01");
+    
+    list->AddEntryL(prefNetwork);
+    
+    TMockLtsyData1<CMobilePhoneStoredNetworkList*> completeLtsyData(list);    
+    completeLtsyData.SerialiseL(data);    
+    
+    CFilteringActiveScheduler scheduler;
+    CActiveScheduler::Install(&scheduler);
+
+    CRetrieveMobilePhonePreferredNetworks* retrieveMobilePhonePreferredNetworks = 
+                        CRetrieveMobilePhonePreferredNetworks::NewL(iPhone);
+    CleanupStack::PushL(retrieveMobilePhonePreferredNetworks);
+    
+    CActiveRetriever::ResetRequestsNumber();
+    CActiveRetriever* activeRetriever = 
+                        CActiveRetriever::NewL(*retrieveMobilePhonePreferredNetworks);
+    CleanupStack::PushL(activeRetriever);
+    scheduler.AddRetrieverL(*activeRetriever);
+    
+    // Invoke retrieve request
+    
+    iMockLTSY.ExpectL(ECtsyPhoneGetPreferredNetworksReq);
+    iMockLTSY.CompleteL(ECtsyPhoneGetPreferredNetworksComp, KErrNone, data);    
+    
+    retrieveMobilePhonePreferredNetworks->Start(activeRetriever->Status());
+    
+    activeRetriever->Activate();
+    scheduler.StartScheduler();
+
+    AssertMockLtsyStatusL();    
+    ASSERT_EQUALS(0, CActiveRetriever::ResetRequestsNumber());
+    ASSERT_EQUALS(KErrNone, activeRetriever->iStatus.Int());
+    
+    CMobilePhoneStoredNetworkList*  retrievedList = 
+            retrieveMobilePhonePreferredNetworks->RetrieveListL();
+    CleanupStack::PushL( retrievedList );
+    
+    // Check Retrieved list
+    
+    ASSERT_EQUALS(list->Enumerate(), retrievedList->Enumerate());
+    ASSERT_EQUALS(list->GetEntryL(0).iAccess, retrievedList->GetEntryL(0).iAccess);
+    ASSERT_EQUALS(list->GetEntryL(0).iCountryCode, retrievedList->GetEntryL(0).iCountryCode);
+    ASSERT_EQUALS(list->GetEntryL(0).iNetworkId, retrievedList->GetEntryL(0).iNetworkId);    
+    
+    CleanupStack::PopAndDestroy(3, 
+            retrieveMobilePhonePreferredNetworks); // retrievedList
+                                                   // activeRetriever
+                                                   // retrieveMobilePhonePreferredNetworks
+
+    CActiveScheduler::Install(NULL);
+    
+    // Add new entry to the list
+    
+    RMobilePhone::TMobilePreferredNetworkEntryV3 prefNetwork2;
+    prefNetwork2.iAccess = RMobilePhone::KNetworkAccessGsm;
+    prefNetwork2.iCountryCode = _L("262");
+    prefNetwork2.iNetworkId = _L("02");
+      
+    list->AddEntryL(prefNetwork2);
+     
+    TMockLtsyData1<CMobilePhoneStoredNetworkList*> completeLtsyData2(list);
+    completeLtsyData2.SerialiseL(data);
+
+    // Invoke Store request
+    
+    iMockLTSY.ExpectL(ECtsyPhoneStorePreferredNetworksListReq, data);
+    iMockLTSY.CompleteL(ECtsyPhoneStorePreferredNetworksListComp, KErrNone);      
+  
+    TRequestStatus requestStatus;
+    iPhone.StorePreferredNetworksListL(requestStatus, list);
+
+    User::WaitForRequest(requestStatus);
+   
+    AssertMockLtsyStatusL();
+    ASSERT_EQUALS(KErrNone, requestStatus.Int());
+    
+    CleanupStack::PopAndDestroy(3, this); // list, data, this
+
+    }
+
+/**
+@SYMTestCaseID          BA-CTSY-NTWC-CRMPPN-0001a
+@SYMPREQ                417-71654
+@SYMComponent           telephony_ctsy
+@SYMTestCaseDesc        Test support in CTSY for CRetrieveMobilePhonePreferredNetworks::Start
+@SYMTestPriority        High
+@SYMTestActions         1. Invoke CRetrieveMobilePhonePreferredNetworks::Start.
+                        2. Remove an entry from the list.
+                        3. Invoke RMobilePhone::StorePreferredNetworksListL. 
+@SYMTestExpectedResults LTSY receives the modified list and test code receives KErrNone. 
+@SYMTestType            CT
+*/
+void CCTsyNetworkControlFU::TestRetrieveMobilePhonePreferredNetworks0001aL()
+    {
+
+    OpenEtelServerL(EUseExtendedError);
+    CleanupStack::PushL(TCleanupItem(Cleanup,this));
+    OpenPhoneL();
+
+    RBuf8 data;
+    CleanupClosePushL(data);
+
+    // --- prepare data ---
+    
+    CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
+    CleanupStack::PushL(list);
+            
+    RMobilePhone::TMobilePreferredNetworkEntryV3 prefNetworks[2];
+    
+    prefNetworks[0].iAccess = RMobilePhone::KNetworkAccessGsm;
+    prefNetworks[0].iCountryCode = _L("262");
+    prefNetworks[0].iNetworkId = _L("01");
+
+    prefNetworks[1].iAccess = RMobilePhone::KNetworkAccessGsm;
+    prefNetworks[1].iCountryCode = _L("262");
+    prefNetworks[1].iNetworkId = _L("02");
+    
+    for (int i = 0; i < 2; ++i)
+        {
+        list->AddEntryL(prefNetworks[i]);
+        }
+    
+    CFilteringActiveScheduler scheduler;
+    CActiveScheduler::Install(&scheduler);
+
+    CRetrieveMobilePhonePreferredNetworks* retrieveMobilePhonePreferredNetworks = 
+                        CRetrieveMobilePhonePreferredNetworks::NewL(iPhone);
+    CleanupStack::PushL(retrieveMobilePhonePreferredNetworks);
+    
+    CActiveRetriever::ResetRequestsNumber();
+    CActiveRetriever* activeRetriever = 
+                        CActiveRetriever::NewL(*retrieveMobilePhonePreferredNetworks);
+    CleanupStack::PushL(activeRetriever);
+    scheduler.AddRetrieverL(*activeRetriever);
+        
+    TMockLtsyData1<CMobilePhoneStoredNetworkList*> completeLtsyData(list);    
+    completeLtsyData.SerialiseL(data);
+    
+    // Invoke Retrieve request
+    
+    iMockLTSY.ExpectL(ECtsyPhoneGetPreferredNetworksReq);
+    iMockLTSY.CompleteL(ECtsyPhoneGetPreferredNetworksComp, KErrNone, data);    
+    
+    retrieveMobilePhonePreferredNetworks->Start(activeRetriever->Status());
+    activeRetriever->Activate();
+    scheduler.StartScheduler();
+
+    ASSERT_EQUALS(0, CActiveRetriever::ResetRequestsNumber());
+    ASSERT_EQUALS(KErrNone, activeRetriever->iStatus.Int());
+    AssertMockLtsyStatusL();    
+    
+    CMobilePhoneStoredNetworkList*  retrievedList = 
+            retrieveMobilePhonePreferredNetworks->RetrieveListL();
+    CleanupStack::PushL( retrievedList );
+    
+    // Check retrieved list
+    
+    ASSERT_EQUALS(list->Enumerate(), retrievedList->Enumerate());
+    ASSERT_EQUALS(list->GetEntryL(0).iAccess, retrievedList->GetEntryL(0).iAccess);
+    ASSERT_EQUALS(list->GetEntryL(0).iCountryCode, retrievedList->GetEntryL(0).iCountryCode);
+    ASSERT_EQUALS(list->GetEntryL(0).iNetworkId, retrievedList->GetEntryL(0).iNetworkId);    
+    ASSERT_EQUALS(list->GetEntryL(1).iAccess, retrievedList->GetEntryL(1).iAccess);
+    ASSERT_EQUALS(list->GetEntryL(1).iCountryCode, retrievedList->GetEntryL(1).iCountryCode);
+    ASSERT_EQUALS(list->GetEntryL(1).iNetworkId, retrievedList->GetEntryL(1).iNetworkId);    
+    
+    CleanupStack::PopAndDestroy(3, 
+            retrieveMobilePhonePreferredNetworks); // retrievedList
+                                                   // activeRetriever
+                                                   // retrieveMobilePhonePreferredNetworks
+
+    CActiveScheduler::Install(NULL);
+    
+    // Remove the last entry from the list
+    
+    list->DeleteEntryL(1);
+    
+    TMockLtsyData1<CMobilePhoneStoredNetworkList*> completeLtsyData2(list);
+    completeLtsyData2.SerialiseL(data);
+
+    // Invoke Store request
+    
+    iMockLTSY.ExpectL(ECtsyPhoneStorePreferredNetworksListReq, data);
+    iMockLTSY.CompleteL(ECtsyPhoneStorePreferredNetworksListComp, KErrNone);      
+  
+    TRequestStatus requestStatus;
+    iPhone.StorePreferredNetworksListL(requestStatus, list);
+
+    User::WaitForRequest(requestStatus);
+    AssertMockLtsyStatusL();
+    ASSERT_EQUALS(KErrNone, requestStatus.Int());
+    
+    CleanupStack::PopAndDestroy(3, this); // list, data, this
+
+    }
+
+/**
+@SYMTestCaseID          BA-CTSY-NTWC-CRMPPN-0001b
+@SYMPREQ                417-71654
+@SYMComponent           telephony_ctsy
+@SYMTestCaseDesc        Test support in CTSY for CRetrieveMobilePhonePreferredNetworks::Start with empty list
+@SYMTestPriority        High
+@SYMTestActions         1. Invoke CRetrieveMobilePhonePreferredNetworks::Start.
+                        2. LTSY returns an empty list of preferred networks.
+@SYMTestExpectedResults Test code receives an empty list of preferred networks. 
+@SYMTestType            CT
+*/
+void CCTsyNetworkControlFU::TestRetrieveMobilePhonePreferredNetworks0001bL()
+    {
+
+    OpenEtelServerL(EUseExtendedError);
+    CleanupStack::PushL(TCleanupItem(Cleanup,this));
+    OpenPhoneL();
+
+    RBuf8 data;
+    CleanupClosePushL(data);
+
+    // --- prepare data ---
+    
+    CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
+    CleanupStack::PushL(list);
+                
+    CFilteringActiveScheduler scheduler;
+    CActiveScheduler::Install(&scheduler);
+
+    CRetrieveMobilePhonePreferredNetworks* retrieveMobilePhonePreferredNetworks = 
+                        CRetrieveMobilePhonePreferredNetworks::NewL(iPhone);
+    CleanupStack::PushL(retrieveMobilePhonePreferredNetworks);
+    
+    CActiveRetriever::ResetRequestsNumber();
+    CActiveRetriever* activeRetriever = 
+                        CActiveRetriever::NewL(*retrieveMobilePhonePreferredNetworks);
+    CleanupStack::PushL(activeRetriever);
+    scheduler.AddRetrieverL(*activeRetriever);
+        
+    TMockLtsyData1<CMobilePhoneStoredNetworkList*> completeLtsyData(list);    
+    completeLtsyData.SerialiseL(data);
+
+    // Invoke Retrieve request
+    
+    iMockLTSY.ExpectL(ECtsyPhoneGetPreferredNetworksReq);
+    iMockLTSY.CompleteL(ECtsyPhoneGetPreferredNetworksComp, KErrNone, data);    
+    
+    retrieveMobilePhonePreferredNetworks->Start(activeRetriever->Status());
+    activeRetriever->Activate();
+    scheduler.StartScheduler();
+
+    ASSERT_EQUALS(0, CActiveRetriever::ResetRequestsNumber());
+    ASSERT_EQUALS(KErrNone, activeRetriever->iStatus.Int());
+    AssertMockLtsyStatusL();    
+    
+    CMobilePhoneStoredNetworkList*  retrievedList = 
+            retrieveMobilePhonePreferredNetworks->RetrieveListL();
+    CleanupStack::PushL( retrievedList );
+    
+    // Check retrieved list is empty
+    
+    ASSERT_EQUALS(list->Enumerate(), retrievedList->Enumerate());
+    
+    CleanupStack::PopAndDestroy(3, 
+            retrieveMobilePhonePreferredNetworks); // retrievedList
+                                                   // activeRetriever
+                                                   // retrieveMobilePhonePreferredNetworks
+
+    CActiveScheduler::Install(NULL);
+        
+    CleanupStack::PopAndDestroy(3, this); // list, data, this
+
+    }
+
+/**
+@SYMTestCaseID          BA-CTSY-NTWC-CRMPPN-0001c
+@SYMPREQ                417-71654
+@SYMComponent           telephony_ctsy
+@SYMTestCaseDesc        Test support in CTSY for CRetrieveMobilePhonePreferredNetworks::Start with error
+@SYMTestPriority        High
+@SYMTestActions         1. Invoke CRetrieveMobilePhonePreferredNetworks::Start.
+                        2. LTSY returns error.
+@SYMTestExpectedResults Test code receives error. 
+@SYMTestType            CT
+*/
+void CCTsyNetworkControlFU::TestRetrieveMobilePhonePreferredNetworks0001cL()
+    {
+
+    OpenEtelServerL(EUseExtendedError);
+    CleanupStack::PushL(TCleanupItem(Cleanup,this));
+    OpenPhoneL();
+
+    RBuf8 data;
+    CleanupClosePushL(data);
+
+    // --- prepare data ---
+    
+    CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
+    CleanupStack::PushL(list);
+  
+    CFilteringActiveScheduler scheduler;
+    CActiveScheduler::Install(&scheduler);
+
+    CRetrieveMobilePhonePreferredNetworks* retrieveMobilePhonePreferredNetworks = 
+                        CRetrieveMobilePhonePreferredNetworks::NewL(iPhone);
+    CleanupStack::PushL(retrieveMobilePhonePreferredNetworks);
+    
+    CActiveRetriever::ResetRequestsNumber();
+    CActiveRetriever* activeRetriever = 
+                        CActiveRetriever::NewL(*retrieveMobilePhonePreferredNetworks);
+    CleanupStack::PushL(activeRetriever);
+    scheduler.AddRetrieverL(*activeRetriever);
+        
+    TMockLtsyData1<CMobilePhoneStoredNetworkList*> completeLtsyData(list);    
+    completeLtsyData.SerialiseL(data);
+    
+    // Invoke Retrieve request - LTSY returns KErrUnknown
+    
+    iMockLTSY.ExpectL(ECtsyPhoneGetPreferredNetworksReq);
+    iMockLTSY.CompleteL(ECtsyPhoneGetPreferredNetworksComp, KErrUnknown, data);    
+    
+    retrieveMobilePhonePreferredNetworks->Start(activeRetriever->Status());
+    activeRetriever->Activate();
+    scheduler.StartScheduler();
+
+    ASSERT_EQUALS(0, CActiveRetriever::ResetRequestsNumber());
+    ASSERT_EQUALS(KErrUnknown, activeRetriever->iStatus.Int());
+    AssertMockLtsyStatusL();    
+
+    // Invoke Retrieve request - LTSY returns KErrNotSupported
+    
+    iMockLTSY.ExpectL(ECtsyPhoneGetPreferredNetworksReq, KErrNotSupported);
+    
+    retrieveMobilePhonePreferredNetworks->Start(activeRetriever->Status());
+    activeRetriever->Activate();
+    scheduler.StartScheduler();
+
+    ASSERT_EQUALS(0, CActiveRetriever::ResetRequestsNumber());
+    ASSERT_EQUALS(KErrNotSupported, activeRetriever->iStatus.Int());
+    AssertMockLtsyStatusL();    
+    
+    CleanupStack::PopAndDestroy(2, 
+            retrieveMobilePhonePreferredNetworks); // activeRetriever
+                                                   // retrieveMobilePhonePreferredNetworks
+
+    CActiveScheduler::Install(NULL);
+        
+    CleanupStack::PopAndDestroy(3, this); // list, data, this
+
+    }
+
+/**
+@SYMTestCaseID          BA-CTSY-NTWC-CRMPPN-0002
+@SYMPREQ                417-71654
+@SYMComponent           telephony_ctsy
+@SYMTestCaseDesc        Test support in CTSY for Cancelling CRetrieveMobilePhonePreferredNetworks::Start
+@SYMTestPriority        High
+@SYMTestActions         1. Invoke CRetrieveMobilePhonePreferredNetworks::Start.
+                        2. Cancel outstanding request.
+@SYMTestExpectedResults Request status of the operation is KErrCancel
+@SYMTestType            CT
+*/
+void CCTsyNetworkControlFU::TestRetrieveMobilePhonePreferredNetworks0002L()
+    {
+     OpenEtelServerL(EUseExtendedError);
+     CleanupStack::PushL(TCleanupItem(Cleanup,this));
+     OpenPhoneL();
+
+     RBuf8 data;
+     CleanupClosePushL(data);
+
+     // --- prepare data ---
+     
+     CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
+     CleanupStack::PushL(list);
+        
+     CFilteringActiveScheduler scheduler;
+     CActiveScheduler::Install(&scheduler);
+
+     CRetrieveMobilePhonePreferredNetworks* retrieveMobilePhonePreferredNetworks = 
+                         CRetrieveMobilePhonePreferredNetworks::NewL(iPhone);
+     CleanupStack::PushL(retrieveMobilePhonePreferredNetworks);
+     
+     CActiveRetriever::ResetRequestsNumber();
+     CActiveRetriever* activeRetriever = 
+                         CActiveRetriever::NewL(*retrieveMobilePhonePreferredNetworks);
+     CleanupStack::PushL(activeRetriever);
+     scheduler.AddRetrieverL(*activeRetriever);
+         
+     TMockLtsyData1<CMobilePhoneStoredNetworkList*> completeLtsyData(list);    
+     completeLtsyData.SerialiseL(data);
+     
+     // Invoke Retrieve request
+     
+     TRequestStatus mockLtsyStatus;
+     iMockLTSY.NotifyTerminated(mockLtsyStatus);     
+     iMockLTSY.ExpectL(ECtsyPhoneGetPreferredNetworksReq);
+     iMockLTSY.CompleteL(ECtsyPhoneGetPreferredNetworksComp, KErrNone, data);    
+     
+     retrieveMobilePhonePreferredNetworks->Start(activeRetriever->Status());
+     activeRetriever->Activate();
+     
+     // Cancel Retrieve request
+
+     iPhone.CancelAsyncRequest(EMobilePhoneGetPreferredNetworksPhase1);    
+     scheduler.StartScheduler();
+
+     User::WaitForRequest(mockLtsyStatus);
+     
+     ASSERT_EQUALS(0, CActiveRetriever::ResetRequestsNumber());
+     ASSERT_EQUALS(KErrNone, mockLtsyStatus.Int());     
+     ASSERT_EQUALS(KErrCancel, activeRetriever->iStatus.Int());
+     AssertMockLtsyStatusL();    
+        
+     CleanupStack::PopAndDestroy(2, 
+             retrieveMobilePhonePreferredNetworks); // activeRetriever
+                                                    // retrieveMobilePhonePreferredNetworks
+
+     CActiveScheduler::Install(NULL);
+         
+     CleanupStack::PopAndDestroy(3, this); // list, data, this
+    
+    }
+
+/**
+@SYMTestCaseID          BA-CTSY-NTWC-CRMPPN-0004
+@SYMPREQ                417-71654
+@SYMComponent           telephony_ctsy
+@SYMTestCaseDesc        Test support in CTSY for multiple client requests to CRetrieveMobilePhonePreferredNetworks::Start
+@SYMTestPriority        High
+@SYMTestActions         1. Invoke CRetrieveMobilePhonePreferredNetworks::Start.
+                        2. Invoke CRetrieveMobilePhonePreferredNetworks::Start from second client.
+@SYMTestExpectedResults Second client receives KErrInUse.
+@SYMTestType            CT
+*/
+void CCTsyNetworkControlFU::TestRetrieveMobilePhonePreferredNetworks0004L()
+    {
+     OpenEtelServerL(EUseExtendedError);
+     CleanupStack::PushL(TCleanupItem(Cleanup,this));
+     OpenPhoneL();
+
+     RBuf8 data;
+     CleanupClosePushL(data);
+
+     // Open second client
+     RTelServer telServer2;
+     TInt ret = telServer2.Connect();
+     ASSERT_EQUALS(KErrNone, ret);
+     CleanupClosePushL(telServer2);
+
+     RMobilePhone phone2;
+     ret = phone2.Open(iTelServer,KMmTsyPhoneName);
+     ASSERT_EQUALS(KErrNone, ret);
+     CleanupClosePushL(phone2);
+     
+     // --- prepare data ---
+     
+     CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
+     CleanupStack::PushL(list);
+        
+     CFilteringActiveScheduler scheduler;
+     CActiveScheduler::Install(&scheduler);
+
+     // Create first retriever
+     
+     CRetrieveMobilePhonePreferredNetworks* retrieveMobilePhonePreferredNetworks = 
+                         CRetrieveMobilePhonePreferredNetworks::NewL(iPhone);
+     CleanupStack::PushL(retrieveMobilePhonePreferredNetworks);
+     
+     CActiveRetriever::ResetRequestsNumber();
+     CActiveRetriever* activeRetriever = 
+                         CActiveRetriever::NewL(*retrieveMobilePhonePreferredNetworks);
+     CleanupStack::PushL(activeRetriever);
+     scheduler.AddRetrieverL(*activeRetriever);
+
+     // Create second retriever
+     
+     CRetrieveMobilePhonePreferredNetworks* retrieveMobilePhonePreferredNetworks2 = 
+                         CRetrieveMobilePhonePreferredNetworks::NewL(phone2);
+     CleanupStack::PushL(retrieveMobilePhonePreferredNetworks2);
+     
+     CActiveRetriever::ResetRequestsNumber();
+     CActiveRetriever* activeRetriever2 = 
+                         CActiveRetriever::NewL(*retrieveMobilePhonePreferredNetworks2);
+     CleanupStack::PushL(activeRetriever2);
+     scheduler.AddRetrieverL(*activeRetriever2);
+     
+     TMockLtsyData1<CMobilePhoneStoredNetworkList*> completeLtsyData(list);    
+     completeLtsyData.SerialiseL(data);
+         
+     TRequestStatus mockLtsyStatus;
+     iMockLTSY.ExpectL(ECtsyPhoneGetPreferredNetworksReq);
+     iMockLTSY.CompleteL(ECtsyPhoneGetPreferredNetworksComp, KErrNone, data);    
+     
+     // Invoke Retrieve request
+       
+     retrieveMobilePhonePreferredNetworks->Start(activeRetriever->Status());
+     activeRetriever->Activate();
+
+     // Invoke Retrieve request from second client
+     
+     retrieveMobilePhonePreferredNetworks->Start(activeRetriever2->Status());
+     activeRetriever2->Activate();
+     
+     scheduler.StartScheduler();
+     
+     ASSERT_EQUALS(0, CActiveRetriever::ResetRequestsNumber());
+     ASSERT_EQUALS(KErrNone, activeRetriever->iStatus.Int());
+     ASSERT_EQUALS(KErrInUse, activeRetriever2->iStatus.Int());
+     AssertMockLtsyStatusL();    
+        
+     CleanupStack::PopAndDestroy(4, 
+             retrieveMobilePhonePreferredNetworks); // activeRetriever2
+                                                    // retrieveMobilePhonePreferredNetworks2
+                                                    // activeRetriever
+                                                    // retrieveMobilePhonePreferredNetworks
+     
+     CActiveScheduler::Install(NULL);
+         
+     CleanupStack::PopAndDestroy(5, this); // list, phone2, telServer2, data, this
+    
+    }
 
 /**
 @SYMTestCaseID BA-CTSY-NTWC-MGNRS-0001
@@ -5573,15 +6422,17 @@
 	CleanupStack::PopAndDestroy(2, this); // data, this
 
 	}
+
 /**
-@SYMTestCaseID BA-CTSY-NTWC-MNPNLC-0001
-@SYMPREQ 1551
-@SYMComponent  telephony_ctsy
-@SYMTestCaseDesc Test support in CTSY for RMobilePhone::NotifyPreferredNetworksListChange
-@SYMTestPriority High
-@SYMTestActions Invokes RMobilePhone::NotifyPreferredNetworksListChange
-@SYMTestExpectedResults Pass
-@SYMTestType CT
+@SYMTestCaseID          BA-CTSY-NTWC-MNPNLC-0001
+@SYMPREQ                417-71654
+@SYMComponent           telephony_ctsy
+@SYMTestCaseDesc        Test support in CTSY for RMobilePhone::NotifyPreferredNetworksListChange
+@SYMTestPriority        High
+@SYMTestActions         1. Invoke RMobilePhone::NotifyPreferredNetworksListChange.
+                        2. Invoke RMobilePhone::StorePreferredNetworksListL.
+@SYMTestExpectedResults Test code receives preferred network list notification
+@SYMTestType            CT
 */
 void CCTsyNetworkControlFU::TestNotifyPreferredNetworksListChange0001L()
 	{
@@ -5592,19 +6443,218 @@
 
 	RBuf8 data;
 	CleanupClosePushL(data);
-
-	TRequestStatus requestStatus;
+    
+    TRequestStatus requestStatus;   
+
+    // --- prepare data ---
+
+    CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
+    CleanupStack::PushL(list);
+
+    RMobilePhone::TMobilePreferredNetworkEntryV3 prefNetwork;
+    
+    prefNetwork.iAccess = RMobilePhone::KNetworkAccessGsm;
+    prefNetwork.iCountryCode = _L("262");
+    prefNetwork.iNetworkId = _L("01");
+    
+    list->AddEntryL(prefNetwork);
+    
+    TMockLtsyData1<CMobilePhoneStoredNetworkList*> listData(list);    
+    listData.SerialiseL(data);
+    
+	// Invoke Notify request
 	
 	iPhone.NotifyPreferredNetworksListChange(requestStatus);
 
+	// Invoke Store request
+	    
+    iMockLTSY.ExpectL(ECtsyPhoneStorePreferredNetworksListReq, data);
+    iMockLTSY.CompleteL(ECtsyPhoneStorePreferredNetworksListComp, KErrNone);
+    
+    TRequestStatus storeRequestStatus;
+    iPhone.StorePreferredNetworksListL(storeRequestStatus, list);
+
+    User::WaitForRequest(storeRequestStatus);
+    ASSERT_EQUALS(KErrNone, storeRequestStatus.Int());    
+    AssertMockLtsyStatusL();
+	
 	User::WaitForRequest(requestStatus);
-	AssertMockLtsyStatusL();
-	ASSERT_EQUALS(KErrNotSupported, requestStatus.Int());
-
-	CleanupStack::PopAndDestroy(2, this); // data, this
+	
+	ASSERT_EQUALS(KErrNone, requestStatus.Int());
+
+	CleanupStack::PopAndDestroy(3, this); // list, data, this
 	
 	}
 
+/**
+@SYMTestCaseID          BA-CTSY-NTWC-MNPNLC-0002
+@SYMPREQ                417-71654
+@SYMComponent           telephony_ctsy
+@SYMTestCaseDesc        Test support in CTSY for Cancelling RMobilePhone::NotifyPreferredNetworksListChange
+@SYMTestPriority        High
+@SYMTestActions         1. Invoke RMobilePhone::NotifyPreferredNetworksListChange.
+                        2. Cancel subscription to preferred network list change.
+                        3. Invoke RMobilePhone::StorePreferredNetworksListL.
+@SYMTestExpectedResults Test code does not receive preferred network list notification
+@SYMTestType            CT
+*/
+void CCTsyNetworkControlFU::TestNotifyPreferredNetworksListChange0002L()
+    {
+    
+    OpenEtelServerL(EUseExtendedError);
+    CleanupStack::PushL(TCleanupItem(Cleanup,this));
+    OpenPhoneL();
+
+    RBuf8 data;
+    CleanupClosePushL(data);
+    
+    TRequestStatus requestStatus;
+
+    // --- prepare data ---
+
+    CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
+    CleanupStack::PushL(list);
+
+    RMobilePhone::TMobilePreferredNetworkEntryV3 prefNetwork;
+     
+    prefNetwork.iAccess = RMobilePhone::KNetworkAccessGsm;
+    prefNetwork.iCountryCode = _L("262");
+    prefNetwork.iNetworkId = _L("01");
+     
+    list->AddEntryL(prefNetwork);
+     
+    TMockLtsyData1<CMobilePhoneStoredNetworkList*> listData(list);    
+    listData.SerialiseL(data);
+    
+    // Invoke Notify request
+    
+    iPhone.NotifyPreferredNetworksListChange(requestStatus);
+
+    // Cancel Notify request
+    
+    iPhone.CancelAsyncRequest(EMobilePhoneNotifyStorePreferredNetworksListChange);
+
+    TRequestStatus mockLtsyStatus;    
+    iMockLTSY.NotifyTerminated(mockLtsyStatus);
+    
+    User::WaitForRequest(requestStatus);
+    AssertMockLtsyStatusL();
+    ASSERT_EQUALS(KErrCancel, requestStatus.Int());
+    
+    // Invoke Store request
+    
+    iMockLTSY.ExpectL(ECtsyPhoneStorePreferredNetworksListReq, data);
+    iMockLTSY.CompleteL(ECtsyPhoneStorePreferredNetworksListComp, KErrNone);    
+    
+    TRequestStatus storeRequestStatus;
+    iPhone.StorePreferredNetworksListL(storeRequestStatus, list);
+
+    User::WaitForRequest(mockLtsyStatus);
+    AssertMockLtsyStatusL();
+    ASSERT_EQUALS(KErrNone, mockLtsyStatus.Int());
+    
+    User::WaitForRequest(storeRequestStatus);
+    AssertMockLtsyStatusL();
+    ASSERT_EQUALS(KErrNone, storeRequestStatus.Int());    
+    
+    // Start timer and check if any notification is received
+
+    TRequestStatus waitStatus = KRequestPending;
+    RTimer timer;
+    timer.CreateLocal();
+    CleanupClosePushL(timer);
+    timer.After(waitStatus, TTimeIntervalMicroSeconds32(KOneSecond));  // Wait 1 sec
+    
+    User::WaitForRequest(requestStatus, waitStatus);     
+    AssertMockLtsyStatusL();
+    ASSERT_EQUALS(KErrNone, waitStatus.Int()); // timer fired
+    ASSERT_EQUALS(KErrCancel, requestStatus.Int());
+    
+    CleanupStack::PopAndDestroy(4, this); // timer, list, data, this
+      
+    }
+
+/**
+@SYMTestCaseID          BA-CTSY-NTWC-MNPNLC-0004
+@SYMPREQ                417-71654
+@SYMComponent           telephony_ctsy
+@SYMTestCaseDesc        Test support in CTSY for multiple client requests to RMobilePhone::NotifyPreferredNetworksListChange
+@SYMTestPriority        High
+@SYMTestActions         1. Invoke RMobilePhone::NotifyPreferredNetworksListChange.
+                        1. Invoke RMobilePhone::NotifyPreferredNetworksListChange from second client.
+                        2. Invoke RMobilePhone::StorePreferredNetworksListL.
+@SYMTestExpectedResults Clients receive preferred network list notification
+@SYMTestType            CT
+*/
+void CCTsyNetworkControlFU::TestNotifyPreferredNetworksListChange0004L()
+    {
+
+    OpenEtelServerL(EUseExtendedError);
+    CleanupStack::PushL(TCleanupItem(Cleanup,this));
+    OpenPhoneL();
+
+    RBuf8 data;
+    CleanupClosePushL(data);
+    
+    // Open second client
+    RTelServer telServer2;
+    TInt ret = telServer2.Connect();
+    ASSERT_EQUALS(KErrNone, ret);
+    CleanupClosePushL(telServer2);
+
+    RMobilePhone phone2;
+    ret = phone2.Open(iTelServer,KMmTsyPhoneName);
+    ASSERT_EQUALS(KErrNone, ret);
+    CleanupClosePushL(phone2);
+    
+    TRequestStatus requestStatus;
+    TRequestStatus requestStatus2;    
+
+    // --- prepare data ---
+
+    CMobilePhoneStoredNetworkList* list = CMobilePhoneStoredNetworkList::NewL();
+    CleanupStack::PushL(list);
+
+    RMobilePhone::TMobilePreferredNetworkEntryV3 prefNetwork;
+    
+    prefNetwork.iAccess = RMobilePhone::KNetworkAccessGsm;
+    prefNetwork.iCountryCode = _L("262");
+    prefNetwork.iNetworkId = _L("01");
+    
+    list->AddEntryL(prefNetwork);
+    
+    TMockLtsyData1<CMobilePhoneStoredNetworkList*> listData(list);    
+    listData.SerialiseL(data);
+    
+    // Invoke Notify request
+    
+    iPhone.NotifyPreferredNetworksListChange(requestStatus);
+
+    // Invoke Notify request for second client
+    
+    phone2.NotifyPreferredNetworksListChange(requestStatus2);
+    
+    // Invoke Store request
+        
+    iMockLTSY.ExpectL(ECtsyPhoneStorePreferredNetworksListReq, data);
+    iMockLTSY.CompleteL(ECtsyPhoneStorePreferredNetworksListComp, KErrNone);
+    
+    TRequestStatus storeRequestStatus;
+    iPhone.StorePreferredNetworksListL(storeRequestStatus, list);
+
+    User::WaitForRequest(storeRequestStatus);
+    ASSERT_EQUALS(KErrNone, storeRequestStatus.Int());    
+    AssertMockLtsyStatusL();
+    
+    User::WaitForRequest(requestStatus);
+    User::WaitForRequest(requestStatus2);
+    
+    ASSERT_EQUALS(KErrNone, requestStatus.Int());
+    ASSERT_EQUALS(KErrNone, requestStatus2.Int());    
+
+    CleanupStack::PopAndDestroy(5, this); // list, phone2, telServer2, data, this
+    
+    }
 
 /**
 @SYMTestCaseID BA-CTSY-NTWC-MNNSSC-0001

--- a/telephonyserverplugins/common_tsy/test/integration/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -13,9 +13,6 @@
 // Description:
 //
 
-//To resolve RPS dependency for integration tests
-// RPS
-#include "../../RPS/group/bld.inf"
 
 PRJ_EXPORTS
 
@@ -29,6 +26,12 @@
 ../testdata/ctsyintegration_data.ini				z:/testdata/configs/ctsyintegration_data.ini
 ../testdata/uk_commdb.cfg					z:/testdata/configs/uk_commdb.cfg
 
+../../RPS/group/RPSSlave.oby    	/epoc32/rom/include/rpsslave.oby
+../../RPS/group/RPSSlave.iby   	/epoc32/rom/include/rpsslave.iby
+   
+../../RPS/group/RPSSlaveAutoexec.bat		/epoc32/data/z/rpsslaveautoexec.bat
+
+
 ./te_ctsyintegrationtestsuite.iby   				/epoc32/rom/include/te_ctsyintegrationtestsuite.iby
 
 ../scripts_implemented/te_ctsy_trpat_test_setup.script			z:/testdata/scripts/te_ctsy_trpat_test_setup.script
@@ -123,6 +126,9 @@
 
 
 PRJ_TESTMMPFILES
-
+//To resolve RPS dependency for integration tests
+../../RPS/group/RpsCommon.mmp
+../../RPS/group/RPSMaster.mmp
+../../RPS/group/RPSSlave.mmp
 
 te_ctsyintegrationtestsuite.mmp

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/test/integration/group/integration_test.pkg	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,61 @@
+// Copyright (c) 2007-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:
+//
+
+
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\testdata\ctsyintegration_setup.ini"-"c:\testdata\configs\ctsyintegration_setup.ini"
+// note using NTN version of config data here:
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\testdata\ctsyintegration_ntn_data.ini"-"c:\testdata\configs\ctsyintegration_data.ini"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\testdata\uk_commdb.cfg"-"c:\testdata\configs\uk_commdb.cfg"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\testdata\testexecute.ini"-"c:\system\data\testexecute.ini"
+
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_airtimeduration_auto.script"-"c:\testdata\scripts\te_ctsyintegration_airtimeduration_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_alternatelineservice_auto.script"-"c:\testdata\scripts\te_ctsyintegration_alternatelineservice_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_apncontrollist_auto.script"-"c:\testdata\scripts\te_ctsyintegration_apncontrollist_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_broadcastmessaging_auto.script"-"c:\testdata\scripts\te_ctsyintegration_broadcastmessaging_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_callbarring_auto.script"-"c:\testdata\scripts\te_ctsyintegration_callbarring_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_callcontrol_auto.script"-"c:\testdata\scripts\te_ctsyintegration_callcontrol_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_callcost_auto.script"-"c:\testdata\scripts\te_ctsyintegration_callcost_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_callforwarding_auto.script"-"c:\testdata\scripts\te_ctsyintegration_callforwarding_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_callownership_auto.script"-"c:\testdata\scripts\te_ctsyintegration_callownership_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_callwaiting_auto.script"-"c:\testdata\scripts\te_ctsyintegration_callwaiting_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_conferencecallcontrol1_auto.script"-"c:\testdata\scripts\te_ctsyintegration_conferencecallcontrol1_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_conferencecallcontrol2_auto.script"-"c:\testdata\scripts\te_ctsyintegration_conferencecallcontrol2_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_conferencecallcontrol3_auto.script"-"c:\testdata\scripts\te_ctsyintegration_conferencecallcontrol3_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_customapi_auto.script"-"c:\testdata\scripts\te_ctsyintegration_customapi_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_dtmf_auto.script"-"c:\testdata\scripts\te_ctsyintegration_dtmf_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_enstore_auto.script"-"c:\testdata\scripts\te_ctsyintegration_enstore_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_fixeddialling_auto.script"-"c:\testdata\scripts\te_ctsyintegration_fixeddialling_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_indicator_auto.script"-"c:\testdata\scripts\te_ctsyintegration_indicator_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_mailboxnumbers_auto.script"-"c:\testdata\scripts\te_ctsyintegration_mailboxnumbers_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_networkcontrol_auto.script"-"c:\testdata\scripts\te_ctsyintegration_networkcontrol_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_networksecurity_auto.script"-"c:\testdata\scripts\te_ctsyintegration_networksecurity_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_onstore_auto.script"-"c:\testdata\scripts\te_ctsyintegration_onstore_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_packetcontext_auto.script"-"c:\testdata\scripts\te_ctsyintegration_packetcontext_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_packetservice_auto.script"-"c:\testdata\scripts\te_ctsyintegration_packetservice_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_phonebookstore_auto.script"-"c:\testdata\scripts\te_ctsyintegration_phonebookstore_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_phonecapability_auto.script"-"c:\testdata\scripts\te_ctsyintegration_phonecapability_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_phoneidentity_auto.script"-"c:\testdata\scripts\te_ctsyintegration_phoneidentity_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_phonepower_auto.script"-"c:\testdata\scripts\te_ctsyintegration_phonepower_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_phonesecurity_auto.script"-"c:\testdata\scripts\te_ctsyintegration_phonesecurity_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_phonestore_auto.script"-"c:\testdata\scripts\te_ctsyintegration_phonestore_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_signalstrength_auto.script"-"c:\testdata\scripts\te_ctsyintegration_signalstrength_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_smsmessaging_auto.script"-"c:\testdata\scripts\te_ctsyintegration_smsmessaging_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_smspstore_auto.script"-"c:\testdata\scripts\te_ctsyintegration_smspstore_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_smsstore_auto.script"-"c:\testdata\scripts\te_ctsyintegration_smsstore_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_subscriberinfo_auto.script"-"c:\testdata\scripts\te_ctsyintegration_subscriberinfo_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_supplementaryservicecaps_auto.script"-"c:\testdata\scripts\te_ctsyintegration_supplementaryservicecaps_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_usernetworkaccess_auto.script"-"c:\testdata\scripts\te_ctsyintegration_usernetworkaccess_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_usimapplication_auto.script"-"c:\testdata\scripts\te_ctsyintegration_usimapplication_auto.script"
+"\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\integration\scripts_implemented\te_ctsyintegration_ussdmessaging_auto.script"-"c:\testdata\scripts\te_ctsyintegration_ussdmessaging_auto.script"

--- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestairtimeduration.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestairtimeduration.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -103,6 +103,12 @@
 	//
 	// TEST START
 	//
+		
+	// Check RMobilePhone::GetAirTimeDuration returns duration == 0.
+	TTimeIntervalSeconds timeBeforeDial;
+	TTimeIntervalSeconds timeAfterDial;
+	ASSERT_EQUALS(customApi.GetAirTimeDuration(timeBeforeDial), KErrNone, _L("RMmCustomAPI::GetAirTimeDuration returned with an error"))
+	ASSERT_EQUALS(timeBeforeDial.Int(),0,_L("RMmCustomAPI::GetAirTimeDuration did not return zero time duration as expected"))
 
 	// Dial a number that answers. 
 	TPtrC number; 
@@ -114,19 +120,14 @@
 	ASSERT_EQUALS(WaitForRequestWithTimeOut(dialStatus, ETimeMedium), KErrNone, _L("RCall::Dial timed-out"))
 	ASSERT_EQUALS(dialStatus.Int(), KErrNone, _L("RCall::Dial returned with an error"))
 
-	// Note that the air time reported before dialing a call is the last call airtime
-	TTimeIntervalSeconds timeOne;
-	TTimeIntervalSeconds timeTwo;
-	ASSERT_EQUALS(customApi.GetAirTimeDuration(timeOne), KErrNone, _L("RMmCustomAPI::GetAirTimeDuration returned with an error"))
-
 	// Wait for two second and check RMobilePhone::GetAirTimeDuration returns duration > previous duration. Repeat for 20 seconds. 
 	TInt count=1;
 	do
 		{
 		User::After(KOneSecond*2);
-		ASSERT_EQUALS(customApi.GetAirTimeDuration(timeTwo), KErrNone, _L("RMmCustomAPI::GetAirTimeDuration returned with an error"))
-		ASSERT_TRUE(timeTwo.Int()>timeOne.Int(),_L("RMmCustomAPI::GetAirTimeDuration did not return bigger time duration then the previous one"))
-		timeOne=timeTwo;
+		ASSERT_EQUALS(customApi.GetAirTimeDuration(timeAfterDial), KErrNone, _L("RMmCustomAPI::GetAirTimeDuration returned with an error"))
+		ASSERT_TRUE(timeAfterDial.Int()>timeBeforeDial.Int(),_L("RMmCustomAPI::GetAirTimeDuration did not return bigger time duration then the previous one"))
+		timeBeforeDial=timeAfterDial;
 		count++;
 		}while(count!=10);

--- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestcallforwarding.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestcallforwarding.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -210,7 +210,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingAllConditionalCases for EAllServices"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingAllConditionalCases, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingAllConditionalCases for EAllServices failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for EAllServices"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EAllServices failed"));
@@ -398,7 +398,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ETelephony"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for ETelephony failed"));
 		}
-	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
 		{
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for EVoiceService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EVoiceService failed"));
@@ -430,7 +430,7 @@
 			{
 			ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EFaxService failed"));
 			}
-		else if(operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+		else if(operatorName==EOperatorOrange || operatorName==EOperatorO2)
 			{
 			ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSTeleserviceNotProvisioned), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EFaxService failed"));			
 			}
@@ -440,7 +440,7 @@
 	
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for EShortMessageService"));
 		
-		if(operatorName==EOperatorTMobile || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+		if(operatorName==EOperatorTMobile || operatorName==EOperatorO2)
 			{
 			ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSIncompatibility), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EShortMessageService failed"));
 			}
@@ -561,7 +561,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EAllServices"));
 		CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EAllServices failed"));
 		}
-	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
 		{
 		// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EAllServices and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -688,7 +688,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EAllServices"));
 		CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EAllServices failed"));
 		}
-	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
 		{
 		// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EAllServices and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -731,7 +731,7 @@
 		{
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EAuxVoiceService failed"));
 		}
-	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
 		{
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSTeleserviceNotProvisioned), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EAuxVoiceService failed"));
 		}
@@ -749,7 +749,7 @@
 		{
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSIllegalOperation), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EPacketDataService failed"));
 		}
-	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
 		{
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EPacketDataService failed"));
 		}
@@ -762,7 +762,7 @@
 		{
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EFaxService failed"));
 		}
-	else if(operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorOrange || operatorName==EOperatorO2)
 		{
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSTeleserviceNotProvisioned), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EFaxService failed"));
 		}
@@ -779,7 +779,7 @@
 		{
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EShortMessageService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2)
 		{
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EShortMessageService failed")); 
 		}
@@ -911,7 +911,7 @@
 		{		
 		CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EAllServices failed"));
 		}
-	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
 		{
 		CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSErrorStatus), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EAllServices failed"));
 		}
@@ -1081,7 +1081,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ETelephony"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ETelephony failed"));
 		}
-	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
 		{
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EVoiceService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSErrorStatus), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EVoiceService failed"));
@@ -1106,7 +1106,7 @@
 		
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EFaxService"));
 		
-		if(operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+		if(operatorName==EOperatorOrange || operatorName==EOperatorO2)
 			{
 			ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSTeleserviceNotProvisioned ), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EFaxService failed"));
 			}
@@ -1119,7 +1119,7 @@
 		
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EShortMessageService"));
 		
-		if(operatorName==EOperatorTMobile || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+		if(operatorName==EOperatorTMobile || operatorName==EOperatorO2)
 			{
 			ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSIncompatibility), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EShortMessageService failed"));
 			}
@@ -1239,7 +1239,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EAllServices"));
 		CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EAllServices failed"));
 		}
-	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
 		{
 		// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionActivate and aInfo.iServiceGroup=RMobilePhone::EAllServices, aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -1371,7 +1371,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EAllServices"));
 		CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EAllServices failed"));
 		}
-	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2)
 		{
 		// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionActivate and aInfo.iServiceGroup=RMobilePhone::EAllServices, aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -1440,7 +1440,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionDeactivate ECallForwardingUnconditional for ETelephony"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionDeactivate ECallForwardingUnconditional for ETelephony failed"));
 		}	
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionDeactivate ECallForwardingUnconditional for EVoiceService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionDeactivate ECallForwardingUnconditional for EVoiceService failed"));
@@ -1465,7 +1465,7 @@
 		
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionDeactivate ECallForwardingUnconditional for EFaxService"));
 
-		if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorNTN)
+		if(operatorName==EOperatorO2 || operatorName==EOperatorOrange)
 			{	
 			ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSTeleserviceNotProvisioned), _L("SetCallForwardingStatusUtil with EServiceActionDeactivate ECallForwardingUnconditional for EFaxService failed"));
 			}
@@ -1478,7 +1478,7 @@
 		
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionDeactivate ECallForwardingUnconditional for EShortMessageService"));
 
-		if(operatorName==EOperatorO2 || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) 
+		if(operatorName==EOperatorO2 || operatorName==EOperatorTMobile) 
 			{
 			ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionDeactivate ECallForwardingUnconditional for EShortMessageService failed"));
 			}
@@ -1626,7 +1626,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ETelephony"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ETelephony failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		// ===  Register call forwarding unconditional for all services ===
 		
@@ -1901,7 +1901,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingBusy for EVoiceService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingBusy for EVoiceService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		// aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -1997,7 +1997,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ECircuitDataService"));
@@ -2065,7 +2065,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingNoReply for ECircuitDataService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingNoReply), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingNoReply for ECircuitDataService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingNoReply for ECircuitDataService"));
@@ -2134,7 +2134,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingNotReachable for EVoiceService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingNotReachable), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingNotReachable for EVoiceService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
 		
@@ -2315,7 +2315,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EVoiceService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EVoiceService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -2551,7 +2551,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingBusy for EVoiceService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingBusy for EVoiceService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
 		// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingBusy and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 
@@ -2677,7 +2677,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingNotReachable for EVoiceService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingNotReachable), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingNotReachable for EVoiceService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingNotReachable for EVoiceService"));
@@ -2787,7 +2787,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingNoReply for EVoiceService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingNoReply), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingNoReply for EVoiceService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingNoReply for EVoiceService"));
@@ -2995,7 +2995,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EVoiceService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with ECallForwardingUnconditional for EVoiceService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=RMobilePhone::ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -3030,7 +3030,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EVoiceService"));	
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with ECallForwardingUnconditional for EVoiceService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=RMobilePhone::ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=different valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
@@ -3159,13 +3159,13 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingBusy for EVoiceService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingBusy for EVoiceService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{	
 		// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=RMobilePhone::ECallForwardingNoReply and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=10 
 		// Check RMobilePhone::NotifyCallForwardingStatusChange completes with aCondition=ECallForwardingBusy
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingBusy for EVoiceService"));
-		if(operatorName==EOperatorTMobile || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+		if(operatorName==EOperatorTMobile || operatorName==EOperatorO2)
 			{
 			ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingBusy for EVoiceService failed"));			
 			}
@@ -3194,13 +3194,13 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingBusy for EVoiceService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingBusy for EVoiceService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=RMobilePhone::ECallForwardingNoReply and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=different valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=20 
 		// Check RMobilePhone::NotifyCallForwardingStatusChange completes with aCondition=ECallForwardingBusy
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingBusy for EVoiceService"));
-		if(operatorName==EOperatorTMobile || operatorName==EOperatorO2 || operatorName==EOperatorNTN)
+		if(operatorName==EOperatorTMobile || operatorName==EOperatorO2)
 			{
 			ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingBusy for EVoiceService failed"));
 			}
@@ -3334,7 +3334,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EVoiceService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EVoiceService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		newSetting.iAction=RMobilePhone::EServiceActionRegister;
 		// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 
@@ -3373,7 +3373,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService"));	
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::ECircuitDataService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ECircuitDataService"));	
@@ -3401,7 +3401,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::ECircuitDataService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ECircuitDataService"));
@@ -3429,7 +3429,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EPacketDataService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 	
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ECircuitDataService"));
@@ -3458,7 +3458,7 @@
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ETelephony"));
 		ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ETelephony failed"));
 		}
-	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN)
+	else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile)
 		{
 		// Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::ETelephony and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1
 		DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ETelephony"));

--- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestcallwaiting.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestcallwaiting.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -273,7 +273,6 @@
 			count = 1; //O2 supports only speech
 			break;
 		case EOperatorVodafone:
-		case EOperatorNTN:
 		case EOperatorOrange:
 		case EOperatorTMobile: 
 			count = 4; //vodafone, orange and tmobile support speech, voice and data
@@ -815,7 +814,6 @@
 			count = 1; //O2 supports only speech
 			break;
 		case EOperatorVodafone:
-		case EOperatorNTN:
 		case EOperatorOrange:
 		case EOperatorTMobile: 
 			count = 3; //vodafone, orange and tmobile support speech, voice and data

--- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestmultibearerinteroperability.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestmultibearerinteroperability.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -489,11 +489,11 @@
 
 
 	// Start downloading a file via HTTP. 
-	TBuf<140> host(_L("developer.symbian.org"));
-	TBuf<140> page(_L("/wiki/images/1/12/Common_Design_Patterns_for_Symbian_OS_Sample_Chapter.pdf"));
+	TBuf<140> host(_L("developer.symbian.com"));
+    TBuf<140> page(_L("/main/downloads/papers/IMS_Introduction_Part_1.pdf"));
     CHTTPDownload* download = new (ELeave) CHTTPDownload(this);
     CleanupStack::PushL(download);
-    ASSERT_TRUE(download->StartDownloadL(host,page), _L("Download Failed - perhaps page has moved!"));
+    ASSERT_TRUE(download->StartDownloadL(host,page), _L("Download Failed"));
     
  	// Get context info	
 	TExtEtelRequestStatus getContextInfo(packetService, EPacketGetContextInfo);
@@ -800,11 +800,11 @@
 	ASSERT_EQUALS(dialStatus.Int(), KErrNone,  _L("RCall::Dial returned with an error"));
 
 	// Start downloading a file e.g. via HTTP. 
-	TBuf<140> host(_L("developer.symbian.org"));
-	TBuf<140> page(_L("/wiki/images/1/12/Common_Design_Patterns_for_Symbian_OS_Sample_Chapter.pdf"));
-    CHTTPDownload* download = new (ELeave) CHTTPDownload(this);
+	TBuf<140> host(_L("developer.symbian.com"));
+    TBuf<140> page(_L("/main/downloads/papers/IMS_Introduction_Part_1.pdf"));
+    CHTTPDownload *download = new (ELeave) CHTTPDownload(this);
     CleanupStack::PushL(download);
-    ASSERT_TRUE(download->StartDownloadL(host,page), _L("Download Failed - perhaps page has moved!"));
+    ASSERT_TRUE(download->StartDownloadL(host,page),_L("CHTTPDownload::StartDownloadL failed"));
     
 	// Verify file is downloading. 
 	ASSERT_TRUE(download->VerifyDownloading(), _L("CHTTPDownload::VerifyDownloading did not return ETrue as expected. File is not downloaded."));

--- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestpacketcontext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestpacketcontext.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -12426,11 +12426,11 @@
 	// ===  Send and receive some data and check data transferred advances ===
 	
 	// Activate context with ESOCK server
-	TBuf<140> host(_L("developer.symbian.org"));
-    TBuf<140> page(_L("/wiki/images/1/12/Common_Design_Patterns_for_Symbian_OS_Sample_Chapter.pdf"));
+	TBuf<140> host(_L("developer.symbian.com"));
+    TBuf<140> page(_L("/main/downloads/papers/IMS_Introduction_Part_1.pdf"));
     CHTTPDownload *download = new (ELeave) CHTTPDownload(this);
     CleanupStack::PushL(download);
-    ASSERT_TRUE(download->StartDownloadL(host,page),_L("Download Failed - perhaps page has moved!"));
+    ASSERT_TRUE(download->StartDownloadL(host,page),_L("Download Failed"));
     
     // Check RPacketService::GetNifInfo with aCount = 0 returns valid name in iContextName 
 	TInt nifInfoCount = 0;

--- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestsmsmessaging.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestsmsmessaging.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -76,9 +76,6 @@
 	case EOperatorVodafone:
 		network = &KNetworkVodafone;
 		break;
-	case EOperatorNTN:
-		network = &KNetworkNTN;
-		break;
 	case EOperatorOrange:
 		network = &KNetworkOrange;
 		break;

--- a/telephonyserverplugins/common_tsy/test/integration/src/chttpdownload.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/chttpdownload.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -24,8 +24,8 @@
 // Declare a static, counter fot active downloads, to know when to open and close the server socket session
 TInt CHTTPDownload::iActiveDownload = 0;
 
-_LIT(KDefaultHost, "developer.symbian.org");
-_LIT(KDefaultPage, "/wiki/images/1/12/Common_Design_Patterns_for_Symbian_OS_Sample_Chapter.pdf");
+_LIT(KDefaultHost, "www.smartphoneshow.com");
+_LIT(KDefaultPage, "/newt/l/downloads/symbian/presentations/Day1Pres1_NigelClifford_Symbian_keynote.pdf");
 const TInt KDefaultPort = 80;
 const TInt KBufferSize = 4096;

--- a/telephonyserverplugins/common_tsy/test/integration/src/comparisonfunctions.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/comparisonfunctions.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -206,28 +206,18 @@
 		{
 		if(aLogError == ELogError)
 			{
-			TBuf<255> apn, username, password;
-			apn.Copy(iValue.iAccessPointName);
-			username.Copy(iValue.iProtocolConfigOption.iAuthInfo.iUsername);
-			password.Copy(iValue.iProtocolConfigOption.iAuthInfo.iPassword);
 			_LIT(KAssertRPacketContextErrorEqualsTextA,"FAILURE");
 			_LIT(KAssertRPacketContextErrorEqualsTextB," Got apn=%S,username=%S,password=%S");
 			_LIT(KAssertRPacketContextErrorEqualsTextC," Expected apn=%S,username=%S,password=%S");
 			ERR_PRINTF1(KAssertRPacketContextErrorEqualsTextA);
 			ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextB, 
-				&apn,
-				&username,
-				&password);
-			apn.SetLength(0);
-			username.SetLength(0);
-			password.SetLength(0);
-			apn.Copy(iExpected.iAccessPointName);
-			username.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iUsername);
-			password.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iPassword);
+				&iValue.iAccessPointName,
+				&iValue.iProtocolConfigOption.iAuthInfo.iUsername,
+				&iValue.iProtocolConfigOption.iAuthInfo.iPassword);
 			ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextC,
-				&apn,
-				&username,
-				&password);	
+				&iExpected.iAccessPointName,
+				&iExpected.iProtocolConfigOption.iAuthInfo.iUsername,
+				&iExpected.iProtocolConfigOption.iAuthInfo.iPassword);	
 			}
 		return EFalse;
 		}
@@ -256,30 +246,18 @@
 		{
 		if(aLogError == ELogError)
 			{
-			TBuf<255> apn, username, password;
-			apn.Copy(iValue.iAccessPointName);
-			username.Copy(iValue.iProtocolConfigOption.iAuthInfo.iUsername);
-			password.Copy(iValue.iProtocolConfigOption.iAuthInfo.iPassword);
-
 			_LIT(KAssertRPacketContextErrorEqualsTextA,"FAILURE");
 			_LIT(KAssertRPacketContextErrorEqualsTextB," Got apn=%S,username=%S,password=%S");
 			_LIT(KAssertRPacketContextErrorEqualsTextC," Expected apn=%S,username=%S,password=%S");
 			ERR_PRINTF1(KAssertRPacketContextErrorEqualsTextA);
 			ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextB, 
-				&apn,
-				&username,
-				&password);
-			apn.SetLength(0);
-			username.SetLength(0);
-			password.SetLength(0);
-			apn.Copy(iExpected.iAccessPointName);
-			username.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iUsername);
-			password.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iPassword);
+				&iValue.iAccessPointName,
+				&iValue.iProtocolConfigOption.iAuthInfo.iUsername,
+				&iValue.iProtocolConfigOption.iAuthInfo.iPassword);
 			ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextC,
-				&apn,
-				&username,
-				&password);	
-
+				&iExpected.iAccessPointName,
+				&iExpected.iProtocolConfigOption.iAuthInfo.iUsername,
+				&iExpected.iProtocolConfigOption.iAuthInfo.iPassword);	
 			}
 		return EFalse;
 		}
@@ -308,28 +286,18 @@
 		{
 		if(aLogError == ELogError)
 			{
-			TBuf<255> apn, username, password;
-			apn.Copy(iValue.iAccessPointName);
-			username.Copy(iValue.iProtocolConfigOption.iAuthInfo.iUsername);
-			password.Copy(iValue.iProtocolConfigOption.iAuthInfo.iPassword);
 			_LIT(KAssertRPacketContextErrorEqualsTextA,"FAILURE");
 			_LIT(KAssertRPacketContextErrorEqualsTextB," Got apn=%S,username=%S,password=%S");
 			_LIT(KAssertRPacketContextErrorEqualsTextC," Expected apn=%S,username=%S,password=%S");
 			ERR_PRINTF1(KAssertRPacketContextErrorEqualsTextA);
 			ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextB, 
-				&apn,
-				&username,
-				&password);
-			apn.SetLength(0);
-			username.SetLength(0);
-			password.SetLength(0);
-			apn.Copy(iExpected.iAccessPointName);
-			username.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iUsername);
-			password.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iPassword);
+				&iValue.iAccessPointName,
+				&iValue.iProtocolConfigOption.iAuthInfo.iUsername,
+				&iValue.iProtocolConfigOption.iAuthInfo.iPassword);
 			ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextC,
-				&apn,
-				&username,
-				&password);	
+				&iExpected.iAccessPointName,
+				&iExpected.iProtocolConfigOption.iAuthInfo.iUsername,
+				&iExpected.iProtocolConfigOption.iAuthInfo.iPassword);	
 			}
 		return EFalse;
 		}

--- a/telephonyserverplugins/common_tsy/test/integration/src/tnetworktsytesthelper.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/tnetworktsytesthelper.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -613,8 +613,7 @@
         {
         aOperatorName = EOperatorAnite;
         }
-    else if ( ptrNetworkName.Find(_L("NTN")) >=0 
-            ||  ptrNetworkName.Find(_L("NOKIA")) >=0)
+    else if ( ptrNetworkName.Find(_L("NTN")) >=0 )
         {
         aOperatorName = EOperatorNTN;
         }

--- a/telephonyserverplugins/common_tsy/test/integration/src/tpacketservicetsytesthelper.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/src/tpacketservicetsytesthelper.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -82,19 +82,7 @@
 		{
 		// Request has completed with incorrect result. Consume any outstanding
 		// Repost notification until timeout or we get the right result.
-		DEBUG_PRINTF3(_L("State %d Expected %d waiting for correct state"), aContextStatus, aExpectedContextStatus);
-
-		if (RPacketContext::EStatusActive == aContextStatus)
-			{
-			// === NTN Failure ===
-			ERR_PRINTF1(_L("<font color=Orange>$NTNKnownFailure: Context Activation success (EStatusActive = 3)</font>"));
-			// Nothing else to wait for now!
-			// Deactivate the context with RPacketContext::Deactivate
-			TExtEtelRequestStatus contextDeactivateStatus(aPacketContext, EPacketContextDeactivate);
-			aPacketContext.Deactivate(contextDeactivateStatus);
-			User::Leave(iTestStep.WaitForRequestWithTimeOut(contextDeactivateStatus, ETimeLong));
-			}
-
+		
 		aPacketContext.NotifyStatusChange(aRequestStatus, aContextStatus);
 		err = iTestStep.WaitForRequestWithTimeOut(aRequestStatus, ETimeVeryLong);
 		}
@@ -789,13 +777,8 @@
         }
 	else if(ptrNetworkName.Find(_L("NTN")) != KErrNotFound)   // NTN
         {
-		section.Copy(KIniSectionNTNGprs);
-		DEBUG_PRINTF1(_L("Retrieving NTN GPRS settings"));
-        }
-	else if(ptrNetworkName.Find(_L("NOKIA")) != KErrNotFound)   // NTN
-        {
-		section.Copy(KIniSectionNTNGprs);
-		DEBUG_PRINTF1(_L("Retrieving NTN GPRS settings"));
+        section.Copy(KIniSectionVodafoneGprs);
+        DEBUG_PRINTF1(_L("Retrieving NTN GPRS settings"));
         }
 	else if( (ptrNetworkName.Find(_L("01")) >=0) || 
 			(ptrNetworkName.Find(_L("ANITE")) >=0) ) // Anite

--- a/telephonyserverplugins/common_tsy/test/integration/testdata/ctsyintegration_ntn_data.ini	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/integration/testdata/ctsyintegration_ntn_data.ini	Wed Sep 01 12:40:21 2010 +0100
@@ -8,11 +8,11 @@
 VoiceNumberInt1=99900
 VoiceNumberIntExHC=99900
 VoiceNumberDoesNotConnect=0
-SmsReceptor=+3584544109099
+SmsReceptor=01632960000
 
 
 [DataNumbers]
-DataNumber1=+3584544109099
+DataNumber1=01632960000
 DataNumber2=0
 
 [FaxNumbers]
@@ -20,7 +20,7 @@
 FaxNumber2=0
 
 [OwnNumbers]
-OwnVoiceNumber1=+3584544268603
+OwnVoiceNumber1=
 OwnVoiceNumber2=
 OwnDataNumber=
 OwnFaxNumber=
@@ -136,7 +136,7 @@
 Pin2=
 
 [NTNPasswords]
-CallBarring1=1234
+CallBarring1=0000
 Pin1=1234
 Pin2=5678
 Puk1=11111111
@@ -153,8 +153,8 @@
 NTN= +358454400051
 
 [BoardParams]
-PhoneLock=12345
+PhoneLock=
 
 [SIMParams]
-Puk1=11111111
-Puk2=22222222
+Puk1=
+Puk2=

--- a/telephonyserverplugins/ctsydispatchlayer/exportinc/ltsylogger.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/exportinc/ltsylogger.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -27,11 +27,18 @@
 
 #include <e32base.h>
 
-#ifdef OST_TRACE_COMPILER_IN_USE
+#ifdef _DEBUG
 
+#include <comms-infras/commsdebugutility.h>
 _LIT8(KTsySubSystem, "tsy");
 _LIT8(KTsyCompnt, "ctsydis");
 
+	/** Regular logging macro */
+	#define LOG(format, ARGS...)	\
+		{ \
+		RFileLogger::WriteFormat(KTsySubSystem, KTsyCompnt, format, ##ARGS); \
+		}
+	
 	/** Macros to log function entry and exit */
 	//#define TSYLOGENTRYEXIT(aFunc) 	TLogEntryExit __logger((aFunc), KTsyCompnt)
 	
@@ -77,6 +84,7 @@
 	
 #else // _DEBUG
 
+	#define LOG(format, ARGS...)
 	#define TSYLOGENTRYEXIT
 	#define TSYLOGENTRYEXITARGS(aFunc, aFmt, ARGS...)
 	#define TSYLOGSETEXITERR(aErr)	aErr // So that we don't lose the return code in UREL!

--- a/telephonyserverplugins/ctsydispatchlayer/group/ctsydispatcher.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/group/ctsydispatcher.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -22,6 +22,8 @@
 CAPABILITY	       all -tcb
 VENDORID        0x70000001
 
+// For logging
+#include <comms-infras/commsdebugutility.mmh>
 
 MACRO USING_CTSY_DISPATCHER
 
@@ -30,7 +32,7 @@
 
 USERINCLUDE     ../inc 
 USERINCLUDE     ../../common_tsy/commontsy/exportinc/serviceapi
-USERINCLUDE		../traces
+
 
 SOURCEPATH      ../src
 
@@ -74,5 +76,6 @@
 LIBRARY			bafl.lib //needed for CPhoneBookStoreEntry
 LIBRARY         customapi.lib
 
+//DEBUGLIBRARY    ComsDbgUtil.lib

--- a/telephonyserverplugins/ctsydispatchlayer/src/ccallcontroldispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/ccallcontroldispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ccallcontroldispatcherTraces.h"
-#endif
-
 #include "ccallcontroldispatcher.h"
 
 #include <ctsy/ltsy/mltsydispatchcallcontrolinterface.h>
@@ -2315,7 +2309,7 @@
 		CallbackQueryIsEmergencyNumber(&aIpcDataPackage);
 		break;
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCALLCONTROLDISPATCHER_CALLBACKSYNC_1, "WARNING: CCallControlDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc);
+		LOG(_L8("WARNING: CCallControlDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc);
 		__ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc));
 		break;
 		} // switch (aIpcDataPackage.iIpc)

--- a/telephonyserverplugins/ctsydispatchlayer/src/ccallcontrolmultipartydispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/ccallcontrolmultipartydispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ccallcontrolmultipartydispatcherTraces.h"
-#endif
-
 #include "ccallcontrolmultipartydispatcher.h"
 
 #include <ctsy/ltsy/mltsydispatchcallcontrolmultipartyinterface.h>
@@ -421,7 +415,7 @@
 		{
 
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCALLCONTROLMULTIPARTYDISPATCHER_CALLBACKSYNC_1, "WARNING: CCallControlMultipartyDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc);
+		LOG(_L8("WARNING: CCallControlMultipartyDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc);
 		__ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc));
 		break;
 		} // switch (aIpcDataPackage.iIpc)

--- a/telephonyserverplugins/ctsydispatchlayer/src/ccellbroadcastdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/ccellbroadcastdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ccellbroadcastdispatcherTraces.h"
-#endif
-
 #include "ccellbroadcastdispatcher.h"
 
 #include <ctsy/ltsy/mltsydispatchcellbroadcastinterface.h>
@@ -483,7 +477,7 @@
 		{
 	
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCELLBROADCASTDISPATCHER_CALLBACKSYNC_1, "WARNING: CCellBroadcastDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc);
+		LOG(_L8("WARNING: CCellBroadcastDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc);
 		__ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc));
 		break;		
 		} // switch (aIpcDataPackage.iIpc)

--- a/telephonyserverplugins/ctsydispatchlayer/src/cctsydispatchercallback.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/cctsydispatchercallback.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,11 +13,6 @@
 // Description:
 //
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cctsydispatchercallbackTraces.h"
-#endif
-
 #include <etelsat.h>
 #include <in_sock.h>
 #include "ccallcontroldispatcher.h"
@@ -4183,8 +4178,7 @@
 	//initial invetigation shows a "ExitInfo 2,23,USER"  
 	
 	TSYLOGENTRYEXIT;
-	
-	OstTraceDefExt5(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYDISPATCHERCALLBACK_CALLBACKSUPPLEMENTARYSERVICESRECEIVEUSSDMESSAGEIND_1,"aError=%d, aDcs=%d, aType=%d, aFormat=%d aMessage=%s", aError, aDcs, aType, aFormat,aMessage);
+	LOG(_L8("aError=%d, aDcs=%d, aType=%d, aFormat=%d"),aError, aDcs, aType, aFormat)
 		
 	// Forward completion to correct dispatcher object to handle
 	__ASSERT_DEBUG(iDispatcherHolder, CtsyDispatcherPanic(EInvalidNullPtr));

--- a/telephonyserverplugins/ctsydispatchlayer/src/cmessagerouter.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/cmessagerouter.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmessagerouterTraces.h"
-#endif
-
 #include <e32def.h>
 #include <satcs.h>
 #include <pcktcs.h>
@@ -320,7 +314,7 @@
 
     // Kick off boot sequence
     TInt ret = ExtFuncL(EMmTsyBootNotifyModemStatusReadyIPC, NULL);
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_STARTBOOTSEQUENCEL_1, "ExtFuncL(EMmTsyBootNotifyModemStatusReadyIPC returned %d", ret);
+    LOG(_L8("ExtFuncL(EMmTsyBootNotifyModemStatusReadyIPC returned %d"), ret);
     User::LeaveIfError(ret);
     } // CMessageRouter::StartBootSequenceL
 
@@ -1051,7 +1045,7 @@
 		ret = iCtsyDispatcherSatDispatcher->DispatchGetUssdControlSupportedL();
 		break;
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_EXTFUNCL_1, "WARNING: CMessageRouter::ExtFuncL unhandled IPC=%d", aIpc);
+		LOG(_L8("WARNING: CMessageRouter::ExtFuncL unhandled IPC=%d"), aIpc);
 	 	break;
 		} // switch (aIpc)
 
@@ -1086,31 +1080,31 @@
 
 	TUint32 indmask;
 	iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchCallControlFuncUnitId, EIndIdGroup1, indmask);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_1, "CallControl indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask);
+	LOG(_L8("CallControl indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask);
 	iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchPhoneFuncUnitId, EIndIdGroup1, indmask);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_2, "Security indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask);
+	LOG(_L8("Security indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask);
 	iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchSecurityFuncUnitId, EIndIdGroup1, indmask);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_3, "CallControl indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask);
+	LOG(_L8("CallControl indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask);
 	iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchPhonebookEnFuncUnitId, EIndIdGroup1, indmask);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_4, "Phonebook EN indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask);
+	LOG(_L8("Phonebook EN indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask);
 	iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchCellBroadcastFuncUnitId, EIndIdGroup1, indmask);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_5, "Cell Broadcast indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask);
+	LOG(_L8("Cell Broadcast indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask);
 	iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchPhonebookOnFuncUnitId, EIndIdGroup1, indmask);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_6, "Phonebook ON indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask);
+	LOG(_L8("Phonebook ON indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask);
 	iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchPhonebookFuncUnitId, EIndIdGroup1, indmask);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_7, "Phonebook indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask);
+	LOG(_L8("Phonebook indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask);
 	iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchSimFuncUnitId, EIndIdGroup1, indmask);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_8, "SIM indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask);
+	LOG(_L8("SIM indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask);
 	iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchSmsFuncUnitId, EIndIdGroup1, indmask);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_9, "Sms indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask);
+	LOG(_L8("Sms indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask);
 	iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchCallControlMultipartyFuncUnitId, EIndIdGroup1, indmask);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_10, "Call Control Multiparty indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask);
+	LOG(_L8("Call Control Multiparty indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask);
 	iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchSupplementaryServicesFuncUnitId, EIndIdGroup1, indmask);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_11, "Supplementary Services indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask);
+	LOG(_L8("Supplementary Services indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask);
 	iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchPacketServicesFuncUnitId, EIndIdGroup1, indmask);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_12, "Packet Services indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask);
+	LOG(_L8("Packet Services indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask);
 	iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchSatFuncUnitId, EIndIdGroup1, indmask);
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_13, "SAT indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask);
+	LOG(_L8("SAT indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask);
 	}
 
 void CMessageRouter::RetrieveNetworkInfoL()

--- a/telephonyserverplugins/ctsydispatchlayer/src/cpacketservicesdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/cpacketservicesdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cpacketservicesdispatcherTraces.h"
-#endif
-
 #include "cpacketservicesdispatcher.h"
 
 #include <ctsy/ltsy/mltsydispatchpacketservicesinterface.h>
@@ -2314,7 +2308,7 @@
 		{
 
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPACKETSERVICESDISPATCHER_CALLBACKSYNC_1, "WARNING: CPacketServicesDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc);
+		LOG(_L8("WARNING: CPacketServicesDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc);
 		__ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc));
 		break;
 		} // switch (aIpcDataPackage.iIpc)

--- a/telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cphonebookdispatcherTraces.h"
-#endif
-
 #include "cphonebookdispatcher.h"
 
 #include <ctsy/ltsy/mltsydispatchphonebookinterface.h>
@@ -1055,7 +1049,7 @@
  * @param aPhonebook The phonebook to reset the cache for.
  */
 	{
-	TSYLOGENTRYEXITARGS(_L8("aError=%d, aPhonebook=%d"), aError, aPhonebook);
+	TSYLOGENTRYEXITARGS(_L8("aError=%d,aPhonebook=%d"), aError, aPhonebook);
 
 	__ASSERT_DEBUG(aPhonebook != DispatcherPhonebook::EUnknown, CtsyDispatcherPanic(EInvalidParameter));
 	
@@ -1077,8 +1071,8 @@
  * @param aMaxNumberLength The maximum number length in the Fdn phonebook.
  */
 	{
-	TSYLOGENTRYEXITARGS(_L8("aError=%d, aTotalEntries=%d, aMaxTextLength=%d, aMaxNumberLength=%d"), 
-							aError, aTotalEntries, aMaxTextLength, aMaxNumberLength);
+	TSYLOGENTRYEXITARGS(_L8("aError=%d,aTotalEntries=%d,aMaxTextLength=%d,aMaxNumberLength=%d"), 
+							aError,aTotalEntries,aMaxTextLength,aMaxNumberLength);
 
 	TName phoneBookName(KETelIccFdnPhoneBook);
 	CPhoneBookDataPackage phoneBookDataPackage;
@@ -1110,7 +1104,7 @@
  * @see CPhoneBookEntry::ExternalizeToTlvEntry()
  */
 	{
-	TSYLOGENTRYEXITARGS(_L8("aError=%d, aPhonebook=%d"), aError, aPhonebook);
+	TSYLOGENTRYEXITARGS(_L8("aError=%d,aPhonebook=%d"), aError, aPhonebook);
 	
 	__ASSERT_DEBUG(aPhonebook != DispatcherPhonebook::EUnknown, CtsyDispatcherPanic(EInvalidParameter));	
 	
@@ -1121,7 +1115,7 @@
 	
 	if((aError == KErrNone) && (aPhonebook != DispatcherPhonebook::EUnknown))
 		{
-		//fill the CTSY pointer
+		//fill the CTSY pointer		
         TRAP ( aError, 
                 CArrayPtrSeg<CPhoneBookStoreEntry>* readEntries = new(ELeave) CArrayPtrSeg<CPhoneBookStoreEntry>(1);
                 iPhonebookReadPtrs[aPhonebook] = readEntries;
@@ -1180,7 +1174,7 @@
  * @see CPhoneBookEntry::ExternalizeToTlvEntry()
  */
 	{
-	TSYLOGENTRYEXITARGS(_L8("aError=%d, aPhonebook=%d"), aError, aPhonebook);
+	TSYLOGENTRYEXITARGS(_L8("aError=%d,aPhonebook=%d"), aError, aPhonebook);
 	
 	__ASSERT_DEBUG(aPhonebook != DispatcherPhonebook::EUnknown, CtsyDispatcherPanic(EInvalidParameter));
 	
@@ -1195,7 +1189,7 @@
                 CArrayPtrSeg<CPhoneBookStoreEntry>* readEntries = new(ELeave) CArrayPtrSeg<CPhoneBookStoreEntry>(1);
                 iPhonebookCachePtrs[aPhonebook] = readEntries;
                 FillCtsyPhoneBookStoreL(aPhonebookEntries, *(iPhonebookCachePtrs[aPhonebook])));
-		
+        
 		if(aError)
 			{
 			iPhonebookCachePtrs[aPhonebook]->ResetAndDestroy();
@@ -1343,7 +1337,7 @@
  * @see RMobilePhoneBookStore::Write() 
  */
 	{
-	TSYLOGENTRYEXITARGS(_L8("aError=%d, aPhonebook=%d, aIndex=%d, aMaxNumberLength=%d"), aError, aPhonebook, aIndex, aMaxNumberLength);
+	TSYLOGENTRYEXITARGS(_L8("aError=%d,aPhonebook=%d,aIndex=%d,aMaxNumberLength=%d"), aError, aPhonebook, aIndex, aMaxNumberLength);
 
 	__ASSERT_DEBUG(aPhonebook != DispatcherPhonebook::EUnknown, CtsyDispatcherPanic(EInvalidParameter));
 	
@@ -1515,7 +1509,7 @@
 		{
 	
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBOOKDISPATCHER_CALLBACKSYNC_1, "WARNING: CPhonebookDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc);
+		LOG(_L8("WARNING: CPhonebookDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc);
 		__ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc));
 		break;		
 		} // switch (aIpcDataPackage.iIpc)

--- a/telephonyserverplugins/ctsydispatchlayer/src/cphonebookendispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/cphonebookendispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cphonebookendispatcherTraces.h"
-#endif
-
 #include "cphonebookendispatcher.h"
 
 #include <ctsy/ltsy/mltsydispatchphonebookeninterface.h>
@@ -337,7 +331,7 @@
 		{
 	
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBOOKENDISPATCHER_CALLBACKSYNC_1, "WARNING: CPhonebookEnDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc);
+		LOG(_L8("WARNING: CPhonebookEnDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc);
 		__ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc));
 		break;		
 		} // switch (aIpcDataPackage.iIpc)

--- a/telephonyserverplugins/ctsydispatchlayer/src/cphonebookondispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/cphonebookondispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cphonebookondispatcherTraces.h"
-#endif
-
 #include "cphonebookondispatcher.h"
 
 #include <ctsy/ltsy/mltsydispatchphonebookoninterface.h>
@@ -629,7 +623,7 @@
 		{
 	
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBOOKONDISPATCHER_CALLBACKSYNC_1, "WARNING: CPhonebookOnDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc);
+		LOG(_L8("WARNING: CPhonebookOnDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc);
 		__ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc));
 		break;		
 		} // switch (aIpcDataPackage.iIpc)

--- a/telephonyserverplugins/ctsydispatchlayer/src/cphonedispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/cphonedispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cphonedispatcherTraces.h"
-#endif
-
 #include "cphonedispatcher.h"
 
 #include <ctsy/ltsy/mltsydispatchphoneinterface.h>
@@ -2411,7 +2405,7 @@
 		{
 
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEDISPATCHER_CALLBACKSYNC_1, "WARNING: CPhoneDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc);
+		LOG(_L8("WARNING: CPhoneDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc);
 		__ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc));
 		break;		
 		} // switch (aIpcDataPackage.iIpc)

--- a/telephonyserverplugins/ctsydispatchlayer/src/csatdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/csatdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csatdispatcherTraces.h"
-#endif
-
 #include "csatdispatcher.h"
 
 #include <etelsat.h>
@@ -2129,7 +2123,7 @@
 		{
 	
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDISPATCHER_CALLBACKSYNC_1, "WARNING: CSatDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc);
+		LOG(_L8("WARNING: CSatDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc);
 		__ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc));
 		break;		
 		} // switch (aIpcDataPackage.iIpc)

--- a/telephonyserverplugins/ctsydispatchlayer/src/csecuritydispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/csecuritydispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csecuritydispatcherTraces.h"
-#endif
-
 #include <ctsy/rmmcustomapi.h>
 #include "csecuritydispatcher.h"
 
@@ -855,7 +849,7 @@
 		{
 	
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSECURITYDISPATCHER_CALLBACKSYNC_1, "WARNING: CSecurityDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc);
+		LOG(_L8("WARNING: CSecurityDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc);
 		__ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc));
 		break;		
 		} // switch (aIpcDataPackage.iIpc)

--- a/telephonyserverplugins/ctsydispatchlayer/src/csimdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/csimdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csimdispatcherTraces.h"
-#endif
-
 #include "csimdispatcher.h"
 
 #include <ctsy/ltsy/mltsydispatchsiminterface.h>
@@ -1745,7 +1739,7 @@
 		{
 	
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDISPATCHER_CALLBACKSYNC_1, "WARNING: CSimDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc);
+		LOG(_L8("WARNING: CSimDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc);
 		__ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc));
 		break;		
 		} // switch (aIpcDataPackage.iIpc)

--- a/telephonyserverplugins/ctsydispatchlayer/src/csmsdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/csmsdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csmsdispatcherTraces.h"
-#endif
-
 #include <ctsy/serviceapi/cmmsmsutility.h>
 #include "csmsdispatcher.h"
 
@@ -814,7 +808,7 @@
 		CallbackActivateSmsRouting(&aIpcDataPackage);
 		break;
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDISPATCHER_CALLBACKSYNC_1, "WARNING: CSmsDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc);
+		LOG(_L8("WARNING: CSmsDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc);
 		__ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc));
 		break;		
 		} // switch (aIpcDataPackage.iIpc)

--- a/telephonyserverplugins/ctsydispatchlayer/src/csupplementaryservicesdispatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/csupplementaryservicesdispatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,12 +13,6 @@
 // Description:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csupplementaryservicesdispatcherTraces.h"
-#endif
-
 #include "csupplementaryservicesdispatcher.h"
 
 #include <ctsy/ltsy/mltsydispatchsupplementaryservicesinterface.h>
@@ -1288,7 +1282,7 @@
 		{
 	
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSUPPLEMENTARYSERVICESDISPATCHER_CALLBACKSYNC_1, "WARNING: CSupplementaryServicesDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc);
+		LOG(_L8("WARNING: CSupplementaryServicesDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc);
 		__ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc));
 		break;		
 		} // switch (aIpcDataPackage.iIpc)

--- a/telephonyserverplugins/ctsydispatchlayer/src/ltsylogger.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/ltsylogger.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -22,15 +22,11 @@
  @internalComponent
 */
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ltsyloggerTraces.h"
-#endif
+#include <ctsy/ltsy/ltsylogger.h>
 
-#include <ctsy/ltsy/ltsylogger.h>
-//#include <e32debug.h>
-
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#ifdef _DEBUG
+#include <e32debug.h>
+#include <comms-infras/commsdebugutility.h>
 
 const TInt KLineLength = 255;
 
@@ -40,7 +36,7 @@
 */
 	:iFnName(aFnName), iLayer(aLayer), iErr(KErrNone)
 	{
-    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TLOGENTRYEXIT_TLOGENTRYEXIT_1, "%s", iFnName);
+	RFileLogger::WriteFormat(KTsySubSystem, iLayer, _L8(">>%S"), &iFnName);
 	};
 
 EXPORT_C TLogEntryExit::TLogEntryExit(const TDesC8& aFnName, const TDesC8& aLayer, TRefByValue<const TDesC8> aFmt, ...)
@@ -56,9 +52,7 @@
 	line.Append(iFnName);
 	line.Append(' ');
 	line.Append(aFmt);
-	TBuf8<KLineLength> evaluatedLine;
-	evaluatedLine.FormatList(line,list);
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TLOGENTRYEXIT_TLOGENTRYEXIT1_1, "%s", evaluatedLine);
+	RFileLogger::WriteFormat(KTsySubSystem, iLayer, line, list);
 	};
 
 EXPORT_C TLogEntryExit::TLogEntryExit(const TDesC8& aFnName, const TDesC8& aLayer, TRefByValue<const TDesC16> aFmt, ...)
@@ -75,9 +69,7 @@
 	line.Insert(0,_L(">>"));
 	line.Append(' ');
 	line.Append(aFmt);
-	TBuf<KLineLength> evaluatedLine;
-	evaluatedLine.FormatList(line,list);
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TLOGENTRYEXIT_TLOGENTRYEXIT2_1, "%S", evaluatedLine);
+	RFileLogger::WriteFormat(KTsySubSystem, iLayer, line, list);
 	};
 			
 EXPORT_C TLogEntryExit::~TLogEntryExit()
@@ -87,11 +79,11 @@
 	{
 	if (iErr == KErrNone)
 		{
-        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TLOGENTRYEXIT_TLOGENTRYEXIT_DTOR_1, "%s",iFnName);
+		RFileLogger::WriteFormat(KTsySubSystem, iLayer, _L8("<<%S"), &iFnName);
 		}
 	else
 		{
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TLOGENTRYEXIT_TLOGENTRYEXIT_DTOR_2, "%s [err=%d]",iFnName, iErr);
+		RFileLogger::WriteFormat(KTsySubSystem, iLayer, _L8("<<%S [err=%d]"), &iFnName, iErr);
 		}
 	};
 
@@ -103,4 +95,4 @@
 EXPORT_C TLogEntryExit::TLogEntryExit(const TDesC8& /*aFnName*/, const TDesC8& /*aLayer*/, TRefByValue<const TDesC16> /*aFmt*/, ...){};
 EXPORT_C TLogEntryExit::~TLogEntryExit() {};
 
-#endif // #ifdef OST_TRACE_COMPILER_IN_USE
+#endif // #ifdef _DEBUG

--- a/telephonyserverplugins/ctsydispatchlayer/test/dispatchertests/group/te_ctsydispatcher_component.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-
-
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent.script"-"c:\testdata\scripts\te_ctsydispatchcomponent.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_multiparty_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_multiparty_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_callcontrol_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_callcontrol_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_cellbroadcast_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_cellbroadcast_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_packetservices_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_packetservices_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phonebook_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phonebook_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phonebooken_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phonebooken_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phonebookon_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phonebookon_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phone_hwrm_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phone_hwrm_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phone_individual.scriptt"-"c:\testdata\scripts\te_ctsydispatchcomponent_phone_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_sat_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_sat_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_security_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_security_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_sim_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_sim_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_sms_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_sms_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_suppl_serv_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_suppl_serv_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phonebooken_negative_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phonebooken_negative_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phonebookon_neg_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phonebookon_neg_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phonebook_negative_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phonebook_negative_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_cellbroadcast_neg_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_cellbroadcast_neg_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_sim_neg_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_sim_neg_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_sms_neg_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_sms_neg_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_multiparty_neg_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_multiparty_neg_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_callcontrol_negative_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_callcontrol_negative_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_packetservices_neg_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_packetservices_neg_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_phone_negative_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_phone_negative_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_security_negative_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_security_negative_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_suppl_serv_negative_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_suppl_serv_negative_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_sat_neg_individual.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_sat_neg_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\test\dispatchertests\scripts\te_ctsydispatchcomponent_timeout.script"-"c:\testdata\scripts\te_ctsydispatchcomponent_timeout.script"
-
-
-
-
-

--- a/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/group/ltsyskeleton.mmh	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/group/ltsyskeleton.mmh	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -51,9 +51,11 @@
 LIBRARY 		euser.lib
 LIBRARY         ctsydispatcher.lib
 LIBRARY			etelmm.lib
+DEBUGLIBRARY    ComsDbgUtil.lib
 
 
 // For logging
+#include <comms-infras/commsdebugutility.mmh>
 macro LTSY
 macro DEBUG_ALLOC // Define to add logging of object allocation

--- a/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/inc/ltsymacros.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/inc/ltsymacros.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -38,6 +38,8 @@
 		#define MTEST_DECLARE_EVENT_COUNTER TInt iCounter;
 //all we are doing is is simulating "events from received from baseband occuring at interval of 5s.
 		#define MTEST_WAIT_FOR_NEXT_EVENT	User::After(500000);iCounter++;	
+				
+		#define MTEST_LOG_RECEIVE_EVENT_NO LOG(_L8("LtsyReceiveThread simulated event = %d"), iCounter);
 		#define MTEST_COUNTER_EXCEEDED_SHUTDOWN_RECEIVETHREAD   if(iCounter>3) err = KShutdownLtsyReceiveThread;
 
 	#else
@@ -54,6 +56,7 @@
 		#define MTEST_QUERY_IND_SUPPORT_MOCKLTSYENGINE(A,B, C)
 		#define MTEST_DECLARE_EVENT_COUNTER
 		#define MTEST_WAIT_FOR_NEXT_EVENT
+		#define MTEST_LOG_RECEIVE_EVENT_NO
 		#define MTEST_COUNTER_EXCEEDED_SHUTDOWN_RECEIVETHREAD   
 	#endif

--- a/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/cltsyreceivethreadeventstatehandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/cltsyreceivethreadeventstatehandler.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -14,11 +14,6 @@
 // Implements AO to retrieve lists
 //
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cltsyreceivethreadeventstatehandlerTraces.h"
-#endif
-
 #include "cltsyreceivethreadeventstatehandler.h"
 #include <ctsy/ltsy/ltsylogger.h>
 #include "ltsypaniccodes.h"
@@ -83,7 +78,7 @@
 	//Add LTSY specific handling here.
 	
 	// Can be removed in real LTSY implementation
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CLTSYRECEIVETHREADEVENTSTATEHANDLER_HANDLERECEIVEEVENT_1,"LtsyReceiveThread simulated event = %d", iCounter);
+	MTEST_LOG_RECEIVE_EVENT_NO
 	MTEST_COUNTER_EXCEEDED_SHUTDOWN_RECEIVETHREAD
 	//

--- a/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/creceivethreadmanager.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/creceivethreadmanager.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,11 +13,6 @@
 // Description:
 //
 
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "creceivethreadmanagerTraces.h"
-#endif
-
 #include "creceivethreadmanager.h"
 #include <ctsy/ltsy/ltsylogger.h>
 
@@ -76,7 +71,7 @@
  
  TInt CReceiveThreadManager::StartReceiveThreadFn(TAny* aArg)
  	{
- 	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVETHREADMANAGER_SPAWNRECEIVETHREADL_1, "StartReceiveThreadFn, thread id = %d", RThread().Id().Id());
+ 	LOG(_L8("StartReceiveThreadFn, thread id = %d"), RThread().Id().Id());
  	
 	// Create a cleanup stack object
 	CTrapCleanup* cleanup=CTrapCleanup::New();
@@ -88,7 +83,7 @@
  	TInt err =  signaller->WaitLoop();
  	
  	delete cleanup;
- 	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVETHREADMANAGER_SPAWNRECEIVETHREADL_2, "StartReceiveThreadFn, thread id = %d, Terminated with err = %d", RThread().Id().Id(), err);
+ 	LOG(_L8("StartReceiveThreadFn, thread id = %d, Terminated with err = %d"), RThread().Id().Id(), err);
  	return err;
  	}
 
@@ -145,13 +140,13 @@
 	User::LeaveIfError(iThread.Open(aID));
 	iThread.Logon(iStatus);
 	SetActive();
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVETHREADLIFEWATCHER_LOGONL_1, "CReceiveThreadLifeWatcher::LogonL.  Watching thread id = %d", iThread.Id().Id());
+	LOG(_L8("CReceiveThreadLifeWatcher::LogonL.  Watching thread id = %d"), iThread.Id().Id());
 	}
 
 void CReceiveThreadLifeWatcher::RunL()
 	{
 	TSYLOGENTRYEXIT;
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVETHREADLIFEWATCHER_RUNL_1, "CReceiveThreadLifeWatcher::RunL iThread = %d, iStatus=%d, exit reason = %d", iThread.Id().Id(), iStatus.Int(), iThread.ExitReason() );
+	LOG(_L8("CReceiveThreadLifeWatcher::RunL iThread = %d, iStatus=%d, exit reason = %d"), iThread.Id().Id(), iStatus.Int(), iThread.ExitReason() );
 	iReceiveThreadLifeObserver.HandleReceiveThreadLifeWatcherComplete(iStatus.Int());
 	}

--- a/telephonyserverplugins/ctsydispatchlayer/test/mockltsy_under_ctsydispatch/group/mockltsy_under_ctsydispatch.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/test/mockltsy_under_ctsydispatch/group/mockltsy_under_ctsydispatch.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -25,7 +25,6 @@
 OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 USERINCLUDE 	../inc 
-USERINCLUDE		../traces
 
 
 SOURCEPATH 		../src

--- a/telephonyserverplugins/ctsydispatchlayer/test/mockltsy_under_ctsydispatch/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyserverplugins/ctsydispatchlayer/test/mockltsy_under_ctsydispatch/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_CLTSYRECEIVETHREADEVENTSTATEHANDLER_HANDLERECEIVEEVENT_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CRECEIVETHREADLIFEWATCHER_LOGONL_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CRECEIVETHREADLIFEWATCHER_RUNL_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CRECEIVETHREADMANAGER_SPAWNRECEIVETHREADL_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CRECEIVETHREADMANAGER_SPAWNRECEIVETHREADL_2=0x2

--- a/telephonyserverplugins/ctsydispatchlayer/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyserverplugins/ctsydispatchlayer/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_TLOGENTRYEXIT_TLOGENTRYEXIT1_1=0x2
-[TRACE]TRACE_BORDER[0x84]_TLOGENTRYEXIT_TLOGENTRYEXIT2_1=0x3
-[TRACE]TRACE_BORDER[0x84]_TLOGENTRYEXIT_TLOGENTRYEXIT_1=0x1
-[TRACE]TRACE_BORDER[0x84]_TLOGENTRYEXIT_TLOGENTRYEXIT_DTOR_1=0x4
-[TRACE]TRACE_BORDER[0x84]_TLOGENTRYEXIT_TLOGENTRYEXIT_DTOR_2=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CCALLCONTROLDISPATCHER_CALLBACKSYNC_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CCALLCONTROLMULTIPARTYDISPATCHER_CALLBACKSYNC_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CCELLBROADCASTDISPATCHER_CALLBACKSYNC_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CCTSYDISPATCHERCALLBACK_CALLBACKSUPPLEMENTARYSERVICESRECEIVEUSSDMESSAGEIND_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_EXTFUNCL_1=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_1=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_10=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_11=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_12=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_13=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_2=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_3=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_4=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_5=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_6=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_7=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_8=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_9=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_STARTBOOTSEQUENCEL_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CPACKETSERVICESDISPATCHER_CALLBACKSYNC_1=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEBOOKDISPATCHER_CALLBACKSYNC_1=0x15
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEBOOKENDISPATCHER_CALLBACKSYNC_1=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEBOOKONDISPATCHER_CALLBACKSYNC_1=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEDISPATCHER_CALLBACKSYNC_1=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CSATDISPATCHER_CALLBACKSYNC_1=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CSECURITYDISPATCHER_CALLBACKSYNC_1=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDISPATCHER_CALLBACKSYNC_1=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_CSMSDISPATCHER_CALLBACKSYNC_1=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CSUPPLEMENTARYSERVICESDISPATCHER_CALLBACKSYNC_1=0x1d

--- a/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/group/licenseetsy.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/group/licenseetsy.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-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"
@@ -27,16 +27,16 @@
 
 SOURCEPATH      ../src
 
-SOURCE          cmmmessagerouter.cpp
-SOURCE          cmmcustomstubext.cpp
-SOURCE          cmmmockmesshandler.cpp
+SOURCE          CMmMessageRouter.CPP
+SOURCE          CmmCustomStubExt.cpp
+SOURCE          CMmMockMessHandler.cpp
 
 USERINCLUDE     ../inc
 USERINCLUDE     ../../simatk_tsy_stub/inc
-USERINCLUDE 	../traces 
 
 
 LIBRARY         euser.lib    
+LIBRARY         flogger.lib     // logging
 LIBRARY         commontsy.lib   // CommonTSY
 LIBRARY         etelmm.lib   // Etelmm
 LIBRARY         simatktsy.lib   // Sim Atk TSY

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/inc/tflogger.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,112 @@
+// Copyright (c) 2002-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:
+//
+
+#ifndef __TFLOGGER_H__
+#define __TFLOGGER_H__
+
+// CONSTANTS
+#ifndef _DEBUG
+
+// UREL BUILD:
+#define TF_LOGGING_METHOD  0   // No logging in UREL builds
+
+#else
+
+// UDEB BUILD:
+#define TF_LOGGING_METHOD  1   // 0 = No logging, 
+                               // 1 = Flogger, 
+                               // 2 = RDebug
+#endif
+
+
+#if TF_LOGGING_METHOD > 0
+#define TF_LOGGING_ENABLED     // This is for backward compatibility
+#endif
+
+// FUNCTION PROTOTYPES
+#if TF_LOGGING_METHOD == 1      // Flogger
+
+#include <flogger.h>
+_LIT(KTfLogFolder,"TF");
+_LIT(KTfLogFile,"TFLOG.TXT");
+
+#elif TF_LOGGING_METHOD == 2    // RDebug
+
+#include <e32svr.h>
+
+#endif
+
+
+/*
+-----------------------------------------------------------------------------
+
+	LOGGING MACROs
+
+	USE THESE MACROS IN YOUR CODE !
+
+-----------------------------------------------------------------------------
+*/
+
+#if TF_LOGGING_METHOD == 1      // Flogger
+
+#define TFLOGTEXT(AAA)                RFileLogger::Write(KTfLogFolder(),KTfLogFile(),EFileLoggingModeAppend, AAA)
+#define TFLOGSTRING(AAA)              /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RFileLogger::Write(KTfLogFolder(),KTfLogFile(),EFileLoggingModeAppend,tempLogDes()); } while (0)
+#define TFLOGSTRING2(AAA,BBB)         /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RFileLogger::WriteFormat(KTfLogFolder(),KTfLogFile(),EFileLoggingModeAppend,TRefByValue<const TDesC>(tempLogDes()),BBB); } while (0)
+#define TFLOGSTRING3(AAA,BBB,CCC)     /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RFileLogger::WriteFormat(KTfLogFolder(),KTfLogFile(),EFileLoggingModeAppend,TRefByValue<const TDesC>(tempLogDes()),BBB,CCC); } while (0)
+#define TFLOGSTRING4(AAA,BBB,CCC,DDD) /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RFileLogger::WriteFormat(KTfLogFolder(),KTfLogFile(),EFileLoggingModeAppend,TRefByValue<const TDesC>(tempLogDes()),BBB,CCC,DDD); } while (0)
+
+
+#elif TF_LOGGING_METHOD == 2    // RDebug
+
+#define TFLOGTEXT(AAA)                RDebug::Print(AAA)
+#define TFLOGSTRING(AAA)              /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RDebug::Print(tempLogDes); } while (0)
+#define TFLOGSTRING2(AAA,BBB)         /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RDebug::Print(tempLogDes, BBB); } while (0)
+#define TFLOGSTRING3(AAA,BBB,CCC)     /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RDebug::Print(tempLogDes, BBB, CCC); } while (0)
+#define TFLOGSTRING4(AAA,BBB,CCC,DDD) /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RDebug::Print(tempLogDes, BBB, CCC, DDD); } while (0)
+
+#else	// TF_LOGGING_METHOD == 0 or invalid
+
+#define TFLOGTEXT(AAA)                // Example: TFLOGTEXT(own_desc);
+#define TFLOGSTRING(AAA)              // Example: TFLOGSTRING("Test");
+#define TFLOGSTRING2(AAA,BBB)         // Example: TFLOGSTRING("Test %i", aValue);
+#define TFLOGSTRING3(AAA,BBB,CCC)     // Example: TFLOGSTRING("Test %i %i", aValue1, aValue2);
+#define TFLOGSTRING4(AAA,BBB,CCC,DDD) // Example: TFLOGSTRING("Test %i %i %i", aValue1, aValue2, aValue3);
+
+#endif  // TF_LOGGING_METHOD
+
+#if TF_LOGGING_METHOD == 1 || TF_LOGGING_METHOD == 2 
+
+// Note, #x and __FILE__ must be stored to char string first, making them 16bit 
+// strings with _LIT will not work in all compilers. 
+
+#define TF_ASSERT(x) /*lint --e{717} */ do { if (!(x)) { const TUint8 tempX8[] = #x; \
+	TBuf<sizeof(tempX8)> tempX; \
+	tempX.Copy(TPtrC8(tempX8)); const TUint8 tempF8[] = __FILE__; TBuf<sizeof(tempF8)> tempF;\
+	tempF.Copy(TPtrC8(tempF8)); \
+    TFLOGSTRING4("TSY: ASSERT FAILED: %S, file %S, line %d", &tempX, &tempF, __LINE__ ); } } while(0) 
+        
+#define TF_ASSERT_NOT_REACHED() /*lint --e{717} */ do {  const TUint8 tempF8[] = __FILE__;\
+	 TBuf<sizeof(tempF8)> tempF; tempF.Copy(TPtrC8(tempF8));\
+	 TFLOGSTRING3("TSY: ASSERT FAILED: unreachable code, file %S, line %d", &tempF, __LINE__ ); } while (0) 
+
+#else  // TF_LOGGING_METHOD == 0 or invalid
+
+#define TF_ASSERT(x) 
+#define TF_ASSERT_NOT_REACHED() 
+
+#endif  // TF_LOGGING_METHOD == 1 || TF_LOGGING_METHOD == 2
+
+
+#endif	// __TFLOGGER_H__
+
+//  End of File

--- a/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/src/cmmcustomstubext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/src/cmmcustomstubext.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-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"
@@ -11,14 +11,9 @@
 // Contributors:
 //
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmcustomstubextTraces.h"
-#endif
-
 #include "cmmmessagerouter.h"
 #include "cmmcustomstubext.h"
+#include "tflogger.h"
 #include <ctsy/pluginapi/cmmdatapackage.h>
 
 const TUint KPhoneInfoDescSize = 15;
@@ -83,7 +78,7 @@
         ret = KErrNone;
         } 
     
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSTUBEXT_DOEXTFUNCL_1,  "TSY: CMmCustomStubExt::DoExtFuncL. ret: %d ", ret );
+ TFLOGSTRING2( "TSY: CMmCustomStubExt::DoExtFuncL. ret: %d ", ret );    
     return ret; 
     }
 
@@ -108,7 +103,7 @@
 void CMmCustomStubExt::InitializeL( 
     MCustomVendorExtComplete& aMCustomVendorExtComplete ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSTUBEXT_INITIALIZEL_1,  "TSY: CMmCustomStubExt::InitializeL. " );
+TFLOGSTRING( "TSY: CMmCustomStubExt::InitializeL. " ); 
     
     iVendorExtComplete = &aMCustomVendorExtComplete; 
     }
@@ -122,7 +117,7 @@
 void CMmCustomStubExt::SetMessageRouter( 
     CMmMessageRouter* aMessageRouter )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSTUBEXT_SETMESSAGEROUTER_1,  "TSY: CMmCustomStubExt::SetMessageRouter. " );
+TFLOGSTRING( "TSY: CMmCustomStubExt::SetMessageRouter. " ); 
     iMessageRouter = aMessageRouter;
     iFirstTime  = ETrue;
     }

--- a/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/src/cmmmockmesshandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/src/cmmmockmesshandler.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-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"
@@ -12,15 +12,10 @@
 //
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmmockmesshandlerTraces.h"
-#endif
-
 #include "cmmmockmesshandler.h"
 #include "cmmmessagerouter.h"
 #include "cmmcustomstubext.h"
+#include "tflogger.h"
 #include <pcktcs.h>
 #include <ctsy/rmmcustomapi.h>
 
@@ -41,7 +36,7 @@
     if ( !iTimer )
         {
         iTimer = CPeriodic::NewL( CActive::EPriorityStandard );
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMOCKMESSHANDLER_CONSTRUCTL_1, "TSY: CMmMockMessHandler::ConstructL: timer created" );
+ TFLOGSTRING("TSY: CMmMockMessHandler::ConstructL: timer created" );
         }
     }
 
@@ -71,7 +66,7 @@
     TInt aIpc, 
     const CMmDataPackage* /*aDataPackage*/)
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMOCKMESSHANDLER_EXTFUNCL_1, "TSY: CMmMockMessHandler::ExtFuncL. IPC: %d", aIpc );
+TFLOGSTRING2("TSY: CMmMockMessHandler::ExtFuncL. IPC: %d", aIpc );
     
     // callback indicators
     TInt ret( KErrNotSupported );
@@ -327,7 +322,7 @@
 //
 void CMmMockMessHandler::GetHomeNetwork()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMOCKMESSHANDLER_GETHOMENETWORK_1, "TSY: CMmMockMessHandler::GetHomeNetwork.");
+TFLOGSTRING("TSY: CMmMockMessHandler::GetHomeNetwork."); 
     
     iMyNetworkInfo.iMode = RMobilePhone::ENetworkModeGsm,
     iMyNetworkInfo.iStatus = RMobilePhone::ENetworkStatusCurrent,
@@ -356,7 +351,7 @@
 //
 void CMmMockMessHandler::GetHomeNetworkInfo()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMOCKMESSHANDLER_GETHOMENETWORKINFO_1, "TSY: CMmMockMessHandler::GetHomeNetworkInfo.");
+TFLOGSTRING("TSY: CMmMockMessHandler::GetHomeNetworkInfo.");
     // call for completion 
     TRAP_IGNORE( ExtFuncL( EMobilePhoneGetHomeNetwork, NULL ); );
     }
@@ -369,7 +364,7 @@
 //
 TInt CMmMockMessHandler::TimerCallback( TAny* aThis )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMOCKMESSHANDLER_TIMERCALLBACK_1, "TSY: CMmMockMessHandler::TimerCallback.");
+TFLOGSTRING("TSY: CMmMockMessHandler::TimerCallback.");
 
     // cancel the callback timer
     ( ( CMmMockMessHandler* )aThis )->iTimer->Cancel();
@@ -386,7 +381,7 @@
     data.PackData( &tmp );
     package = &data; 
     
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMOCKMESSHANDLER_TIMERCALLBACK_2, "TSY: CMmMockMessHandler::TimerCallback: IPC EMobilePhoneGetPhoneId  Phone Id : %s", phoneid );
+TFLOGSTRING2("TSY: CMmMockMessHandler::TimerCallback: IPC EMobilePhoneGetPhoneId  Phone Id : %d", phoneid );    
     ( ( CMmMockMessHandler* ) aThis )->iMessageRouter->MessageManager()->
         Complete( EMobilePhoneGetPhoneId, package, KErrNone );    
     
@@ -397,7 +392,7 @@
     data.PackData( &temp );
     package = &data;
     
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMOCKMESSHANDLER_TIMERCALLBACK_3, "TSY:CMmMockMessHandler::TimerCallback: IPC EMobilePhoneGetSubscriberId  Dummy imsi : %s", imsi );
+TFLOGSTRING2("TSY:CMmMockMessHandler::TimerCallback: IPC EMobilePhoneGetSubscriberId  Dummy imsi : %d", imsi );    
     ( ( CMmMockMessHandler* ) aThis )->iMessageRouter->MessageManager()->
         Complete( EMobilePhoneGetSubscriberId, package, KErrNone );

--- a/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSTUBEXT_DOEXTFUNCL_1=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSTUBEXT_INITIALIZEL_1=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSTUBEXT_SETMESSAGEROUTER_1=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CMMMOCKMESSHANDLER_CONSTRUCTL_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CMMMOCKMESSHANDLER_EXTFUNCL_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CMMMOCKMESSHANDLER_GETHOMENETWORKINFO_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CMMMOCKMESSHANDLER_GETHOMENETWORK_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CMMMOCKMESSHANDLER_TIMERCALLBACK_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CMMMOCKMESSHANDLER_TIMERCALLBACK_2=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CMMMOCKMESSHANDLER_TIMERCALLBACK_3=0xc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/multimodetsy/Multimode/ETELFAX.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,86 @@
+// 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:
+//
+
+#include "ETELFAX.H"
+#include "mSLOGGER.H"
+#include "CALL.H"
+#include "PHONE.H"
+#include "NOTIFY.H"
+
+
+CFaxCompletion::CFaxCompletion() 
+	: CBase(), iTelObject(NULL), iCall(NULL)
+	{}
+
+CFaxCompletion::~CFaxCompletion()
+	{}
+
+void CFaxCompletion::RxConnectComplete(TInt aError)
+	{
+	LOGTEXT(_L8("ETelFaxBase:\tReceive Connect Complete"));
+	iCall->ChangeLineStatus(RCall::EStatusConnected);
+	__ASSERT_ALWAYS(iCall->ChangeCallStatus(RMobileCall::EStatusConnected) == KErrNone,Panic(EGeneral));
+	iTelObject->ReqCompleted(iTsyReqHandle,aError);
+	}
+
+void CFaxCompletion::RxFaxDataComplete(TInt aError)
+	{
+	LOGTEXT(_L8("ETelFaxBase:\tReceive Fax Data Complete"));
+	iCall->iPhoneGlobals->iNotificationStore->CheckNotification(iCall->iFaxSession,EFaxReadOrWriteCompleted,aError);
+	}
+
+void CFaxCompletion::RxPostPageComplete(TInt aError)
+	{
+	LOGTEXT(_L8("ETelFaxBase:\tReceive Post Page Complete"));
+	iCall->iPhoneGlobals->iNotificationStore->CheckNotification(iCall->iFaxSession,EEndOfFaxPageCompleted,aError);
+	}
+
+void CFaxCompletion::TxConnectComplete(TInt aError)
+	{
+	LOGTEXT2(_L8("ETelFaxBase:\tTransmission Connect Complete with %d"),aError);
+	iCall->ChangeLineStatus(RCall::EStatusConnected);		
+	__ASSERT_ALWAYS(iCall->ChangeCallStatus(RMobileCall::EStatusConnected) == KErrNone,Panic(EGeneral));
+	iTelObject->ReqCompleted(iTsyReqHandle,aError);
+	}
+
+void CFaxCompletion::TxFaxDataComplete(TInt aError)
+	{
+	LOGTEXT(_L8("ETelFaxBase:\tTransmission Fax Data Complete"));
+	iCall->iPhoneGlobals->iNotificationStore->CheckNotification(iCall->iFaxSession,EFaxReadOrWriteCompleted,aError);
+	}
+
+void CFaxCompletion::TxPostPageComplete(TInt aError)
+	{
+	LOGTEXT(_L8("ETelFaxBase:\tTransmission Post Page Complete"));
+	iCall->iPhoneGlobals->iNotificationStore->CheckNotification(iCall->iFaxSession,EEndOfFaxPageCompleted,aError);
+	}
+
+void CFaxCompletion::GetCadenceAndTimeOfLastRing(TTimeIntervalMicroSeconds& aCadence,TTime& aTime)
+	{
+	aCadence=0;
+	aTime=0;
+	}
+
+void CFaxCompletion::Configure(TTsyReqHandle aTsyReqHandle,CTelObject* aTelObject)
+	{
+	iTsyReqHandle = aTsyReqHandle;
+	iTelObject = aTelObject;
+	iCall = REINTERPRET_CAST(CCallMobileFax*,aTelObject);
+	}
+
+CTelObject* CFaxCompletion::TelObject() const
+	{
+	return iTelObject;
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/multimodetsy/Multimode/ETELFAX.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,61 @@
+// 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
+ @internalAll 
+*/
+
+#ifndef __ETELFAX_H
+#define __ETELFAX_H
+
+#include "et_tsy.h"
+#include "faxstd.h"
+
+#include <faxserv.h>	// new!!
+
+//
+//	CFaxCompletion class is used by Fax Server to complete functions
+//
+class CCallMobileFax;
+class CPhoneGlobals;
+class CTelObject;
+class CFaxCompletion : public MFaxCompletionBase, public CBase
+	{
+public:
+	CFaxCompletion();
+	~CFaxCompletion();
+
+// Rx Fax
+	virtual void RxConnectComplete(TInt aError);
+	virtual void RxFaxDataComplete(TInt aError);
+	virtual void RxPostPageComplete(TInt aError);
+
+// Tx Fax
+	virtual void TxConnectComplete(TInt aError);
+	virtual void TxFaxDataComplete(TInt aError);
+	virtual void TxPostPageComplete(TInt aError);
+
+	virtual void GetCadenceAndTimeOfLastRing(TTimeIntervalMicroSeconds& aCadence,TTime& aTime);
+public:
+	void Configure(TTsyReqHandle aTsyReqHandle,CTelObject* aTelObject);
+	CTelObject* TelObject() const;
+private:
+	TTsyReqHandle iTsyReqHandle;	//	}	Used for client-side synchronous requests
+	CTelObject* iTelObject;			//	}
+	CCallMobileFax* iCall;
+	};
+
+#endif

--- a/telephonyserverplugins/multimodetsy/Multimode/gprs/Gprs.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/Multimode/gprs/Gprs.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -75,7 +75,7 @@
     iATGprsClass        = CATGprsClass::NewL(iIo, this, iInit, iPhoneGlobals);
     iATGprsNtwkRegStatusChange= CATGprsNtwkRegStatusChange::NewL(iIo,this,iPhoneGlobals);
     iATGprsNtwkRegStatus= CATGprsNtwkRegStatus::NewL(iIo, this, iInit, iPhoneGlobals,iATGprsNtwkRegStatusChange);
-   	User::LeaveIfError(iMutex.CreateGlobal(KNullDesC, EOwnerProcess));
+   	iMutex.CreateGlobal(KNullDesC, EOwnerProcess);
     }
     
 RHandleBase* CGprs::GlobalKernelObjectHandle()

--- a/telephonyserverplugins/multimodetsy/eabi/MMU.DEF	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/eabi/MMU.DEF	Wed Sep 01 12:40:21 2010 +0100
@@ -1,6 +1,6 @@
 EXPORTS
 	LibEntry @ 1 NONAME
-	_ZTI10CATDialFax @ 2 NONAME ABSENT
+	_ZTI10CATDialFax @ 2 NONAME ; #<TI>#
 	_ZTI10CATSetCBST @ 3 NONAME ; #<TI>#
 	_ZTI10CCallEntry @ 4 NONAME ; #<TI>#
 	_ZTI10CCallHayes @ 5 NONAME ; #<TI>#
@@ -14,17 +14,17 @@
 	_ZTI11CLineMobile @ 13 NONAME ; #<TI>#
 	_ZTI11CNotifyBase @ 14 NONAME ; #<TI>#
 	_ZTI11CPhoneHayes @ 15 NONAME ; #<TI>#
-	_ZTI12CATAnswerFax @ 16 NONAME ABSENT
+	_ZTI12CATAnswerFax @ 16 NONAME ; #<TI>#
 	_ZTI12CATDialVoice @ 17 NONAME ; #<TI>#
 	_ZTI12CATGetSignal @ 18 NONAME ; #<TI>#
 	_ZTI12CATGprsClass @ 19 NONAME ; #<TI>#
-	_ZTI12CATHangUpFax @ 20 NONAME ABSENT
+	_ZTI12CATHangUpFax @ 20 NONAME ; #<TI>#
 	_ZTI12CATQuickInit @ 21 NONAME ; #<TI>#
 	_ZTI12CCommChatter @ 22 NONAME ; #<TI>#
 	_ZTI12CGprsContext @ 23 NONAME ; #<TI>#
 	_ZTI12CPhoneMobile @ 24 NONAME ; #<TI>#
 	_ZTI13CATAnswerData @ 25 NONAME ; #<TI>#
-	_ZTI13CATConnectFax @ 26 NONAME ABSENT
+	_ZTI13CATConnectFax @ 26 NONAME ; #<TI>#
 	_ZTI13CATGetBattery @ 27 NONAME ; #<TI>#
 	_ZTI13CATGprsAttach @ 28 NONAME ; #<TI>#
 	_ZTI13CATGprsDetach @ 29 NONAME ; #<TI>#
@@ -40,9 +40,9 @@
 	_ZTI14CATNetworkInfo @ 39 NONAME ; #<TI>#
 	_ZTI14CATSmsCommands @ 40 NONAME ; #<TI>#
 	_ZTI14CATWaitForCall @ 41 NONAME ; #<TI>#
-	_ZTI14CCallMobileFax @ 42 NONAME ABSENT
-	_ZTI14CFaxCompletion @ 43 NONAME ABSENT
-	_ZTI14CLineMobileFax @ 44 NONAME ABSENT
+	_ZTI14CCallMobileFax @ 42 NONAME ; #<TI>#
+	_ZTI14CFaxCompletion @ 43 NONAME ; #<TI>#
+	_ZTI14CLineMobileFax @ 44 NONAME ; #<TI>#
 	_ZTI14CMobileONStore @ 45 NONAME ; #<TI>#
 	_ZTI14CNotifications @ 46 NONAME ; #<TI>#
 	_ZTI14CSetLineToIdle @ 47 NONAME ; #<TI>#
@@ -127,8 +127,8 @@
 	_ZTI7CATBase @ 126 NONAME ; #<TI>#
 	_ZTI7CATInit @ 127 NONAME ; #<TI>#
 	_ZTI8CGprsQoS @ 128 NONAME ; #<TI>#
-	_ZTI9CFaxHayes @ 129 NONAME ABSENT
-	_ZTV10CATDialFax @ 130 NONAME ABSENT
+	_ZTI9CFaxHayes @ 129 NONAME ; #<TI>#
+	_ZTV10CATDialFax @ 130 NONAME ; #<VT>#
 	_ZTV10CATSetCBST @ 131 NONAME ; #<VT>#
 	_ZTV10CCallEntry @ 132 NONAME ; #<VT>#
 	_ZTV10CCallHayes @ 133 NONAME ; #<VT>#
@@ -142,17 +142,17 @@
 	_ZTV11CLineMobile @ 141 NONAME ; #<VT>#
 	_ZTV11CNotifyBase @ 142 NONAME ; #<VT>#
 	_ZTV11CPhoneHayes @ 143 NONAME ; #<VT>#
-	_ZTV12CATAnswerFax @ 144 NONAME ABSENT
+	_ZTV12CATAnswerFax @ 144 NONAME ; #<VT>#
 	_ZTV12CATDialVoice @ 145 NONAME ; #<VT>#
 	_ZTV12CATGetSignal @ 146 NONAME ; #<VT>#
 	_ZTV12CATGprsClass @ 147 NONAME ; #<VT>#
-	_ZTV12CATHangUpFax @ 148 NONAME ABSENT
+	_ZTV12CATHangUpFax @ 148 NONAME ; #<VT>#
 	_ZTV12CATQuickInit @ 149 NONAME ; #<VT>#
 	_ZTV12CCommChatter @ 150 NONAME ; #<VT>#
 	_ZTV12CGprsContext @ 151 NONAME ; #<VT>#
 	_ZTV12CPhoneMobile @ 152 NONAME ; #<VT>#
 	_ZTV13CATAnswerData @ 153 NONAME ; #<VT>#
-	_ZTV13CATConnectFax @ 154 NONAME ABSENT
+	_ZTV13CATConnectFax @ 154 NONAME ; #<VT>#
 	_ZTV13CATGetBattery @ 155 NONAME ; #<VT>#
 	_ZTV13CATGprsAttach @ 156 NONAME ; #<VT>#
 	_ZTV13CATGprsDetach @ 157 NONAME ; #<VT>#
@@ -168,9 +168,9 @@
 	_ZTV14CATNetworkInfo @ 167 NONAME ; #<VT>#
 	_ZTV14CATSmsCommands @ 168 NONAME ; #<VT>#
 	_ZTV14CATWaitForCall @ 169 NONAME ; #<VT>#
-	_ZTV14CCallMobileFax @ 170 NONAME ABSENT
-	_ZTV14CFaxCompletion @ 171 NONAME ABSENT
-	_ZTV14CLineMobileFax @ 172 NONAME ABSENT
+	_ZTV14CCallMobileFax @ 170 NONAME ; #<VT>#
+	_ZTV14CFaxCompletion @ 171 NONAME ; #<VT>#
+	_ZTV14CLineMobileFax @ 172 NONAME ; #<VT>#
 	_ZTV14CMobileONStore @ 173 NONAME ; #<VT>#
 	_ZTV14CNotifications @ 174 NONAME ; #<VT>#
 	_ZTV14CSetLineToIdle @ 175 NONAME ; #<VT>#
@@ -255,5 +255,5 @@
 	_ZTV7CATBase @ 254 NONAME ; #<VT>#
 	_ZTV7CATInit @ 255 NONAME ; #<VT>#
 	_ZTV8CGprsQoS @ 256 NONAME ; #<VT>#
-	_ZTV9CFaxHayes @ 257 NONAME ABSENT
+	_ZTV9CFaxHayes @ 257 NONAME ; #<VT>#

--- a/telephonyserverplugins/multimodetsy/group/mmtsy.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/group/mmtsy.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -31,7 +31,7 @@
 SOURCEPATH	../Multimode
 SOURCE	      Mbattery.cpp mPHBKCOM.CPP Mphbook.cpp mPHONE.CPP 
 SOURCE	      Msignal.cpp mSLOGGER.CPP Mphbkinf.cpp
-SOURCE	      mnetwork.cpp Mimsi.cpp Mownnum.cpp monstore.cpp
+SOURCE	      ETELFAX.CPP mnetwork.cpp Mimsi.cpp Mownnum.cpp monstore.cpp
 
 SOURCEPATH    ../Multimode/sms
 SOURCE	      mSMSCSCA.CPP
@@ -48,7 +48,7 @@
 SOURCE        ATIO.CPP CALL.CPP LINE.CPP PHONE.CPP NOTIFY.CPP
 SOURCE        ATINIT.CPP ATANSWER.CPP ATCONNCT.CPP
 SOURCE        ATNOCARR.CPP ATERROR.CPP ATESCAPE.CPP ATO.CPP
-SOURCE	      ATWAIT.CPP SCHAT.CPP
+SOURCE	      ATWAIT.CPP FAX.CPP SCHAT.CPP
 SOURCE        SCOMM.CPP TSYCONFG.CPP PHONEFAC.CPP panic.cpp
 SOURCE        set_cbst.cpp
 
@@ -64,7 +64,7 @@
 USERINCLUDE   ../Multimode
 USERINCLUDE   ../Multimode/sms
 USERINCLUDE   ../Multimode/gprs
-
+USERINCLUDE   ../../../fax/faxclientandserver/FAXSVR
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 USERINCLUDE ../hayes

--- a/telephonyserverplugins/multimodetsy/group/te_mmtsy_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-
-
-"\sf\os\cellularsrv\telephonyserverplugins\multimodetsy\test\Te_LoopBack\Te_LoopBack.script"-"c:\testdata\scripts\Te_LoopBack.script"
-
-
-
-

--- a/telephonyserverplugins/multimodetsy/hayes/ATANSWER.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/ATANSWER.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -481,3 +481,72 @@
 	CATDataCallConnectCommands::Complete(aError,aSource);
 	}
 
+//
+//	CATAnswerFax
+//
+
+CATAnswerFax* CATAnswerFax::NewL(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals)
+	{
+	CATAnswerFax* answer=new(ELeave) CATAnswerFax(aIo, aTelObject, aInit,aPhoneGlobals);
+	CleanupStack::PushL(answer);
+	answer->ConstructL();
+	CleanupStack::Pop();
+	return answer;
+	}
+
+CATAnswerFax::CATAnswerFax(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals)
+											: CATFaxCallConnectCommands(aIo,aTelObject,aInit,aPhoneGlobals)
+	{}
+
+CATAnswerFax::~CATAnswerFax()
+	{}
+
+void CATAnswerFax::Start(TTsyReqHandle aTsyReqHandle, TAny* /*aParams*/)
+	{
+	LOGTEXT(_L8("Starting Answer fax call"));
+//	CATFaxCallConnectCommands::Start(aTsyReqHandle,aParams);	
+
+	//-- the change made by Dmitry Lyokhin. PIA-586KGE defect fix
+	//-- CATFaxCallConnectCommands::Start(); starts answering a fax call from sending 
+	//-- init strings to the modem that occassionally causes a collision with incoming "+CRING".
+	//-- now state machine starts with EATCallInitCompleted state that does nothing.
+
+	iReqHandle=aTsyReqHandle;
+	__ASSERT_ALWAYS(iIo->AddExpectString(this,KNotifyMeIfErrorString) != NULL, Panic(EGeneral));
+	
+	iPreConnectState=CATCallConnectCommands::EATCallInitCompleted; 
+
+	LOGTEXT2(_L8("-CATAnswerFax::Start, iPreConnectState=%d"), iPreConnectState);
+
+	EventSignal(EReadCompletion);	// EReadCompletion is a dummy enum here
+	}
+
+void CATAnswerFax::Stop(TTsyReqHandle aTsyReqHandle)
+//
+//	If still doing pre-answer command, cancel that, otherwise tell the fax server to cancel
+//
+	{
+	LOGTEXT(_L8("Cancelling Answer Fax Call Command"));
+	CATFaxCallConnectCommands::Stop(aTsyReqHandle);
+	}
+
+void CATAnswerFax::EventSignal(TEventSource aSource)
+	{
+	if((aSource==ETimeOutCompletion)
+		&&(iPreConnectState!=EATWaitForATCheckOK))
+		{
+		LOGTEXT(_L8("Timeout Error during Answer"));
+		Complete(KErrTimedOut,aSource);
+		return;
+		}
+	if (iPreConnectState!=CATCallConnectCommands::EATInitCompleted
+		&& iPreConnectState!=CATCallConnectCommands::ENotInProgress)
+		{
+		CATCallConnectCommands::PreConnectEventSignal(aSource);
+		}
+	}
+
+void CATAnswerFax::CompleteSuccessfully()
+	{
+	REINTERPRET_CAST(CCallMobileFax*,iTelObject)->FaxAnswer(iReqHandle);	
+	}

--- a/telephonyserverplugins/multimodetsy/hayes/ATANSWER.H	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/ATANSWER.H	Wed Sep 01 12:40:21 2010 +0100
@@ -92,6 +92,21 @@
 		} iState;
 	};
 
-
+class CCallMobileFax;
+class CATAnswerFax : public CATFaxCallConnectCommands
+/**
+@internalComponent
+*/
+	{
+public:
+	static CATAnswerFax* NewL(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals);
+	~CATAnswerFax();
+	void Start(TTsyReqHandle aTsyReqHandle, TAny* aParams);
+	void Stop(TTsyReqHandle aTsyReqHandle);
+protected:
+	CATAnswerFax(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals);
+	virtual void EventSignal(TEventSource aSource);
+	virtual void CompleteSuccessfully();
+	};
 
 #endif

--- a/telephonyserverplugins/multimodetsy/hayes/ATCALL.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/ATCALL.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -744,7 +744,11 @@
 		iPreConnectState=ECancelling;
 		AddStdExpectStrings();
 		}
-
+	else
+		{
+		CCallMobileFax* faxCall = REINTERPRET_CAST(CCallMobileFax*,iTelObject);
+		faxCall->FaxCancelCommand(aTsyReqHandle);
+		}
 	}
 
 void CATFaxCallConnectCommands::Complete(TInt aError,TEventSource aSource)

--- a/telephonyserverplugins/multimodetsy/hayes/ATCONNCT.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/ATCONNCT.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -244,4 +244,57 @@
 		}
 	}
 
+//
+//	CATConnectFax
+//
 
+CATConnectFax* CATConnectFax::NewL(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals)
+	{
+	CATConnectFax* connect=new(ELeave) CATConnectFax(aIo, aTelObject, aInit,aPhoneGlobals);
+	CleanupStack::PushL(connect);
+	connect->ConstructL();
+	CleanupStack::Pop();
+	return connect;
+	}
+
+CATConnectFax::CATConnectFax(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals)
+											: CATFaxCallConnectCommands(aIo,aTelObject,aInit,aPhoneGlobals)
+	{}
+
+CATConnectFax::~CATConnectFax()
+	{}
+
+void CATConnectFax::Start(TTsyReqHandle aTsyReqHandle, TAny* aParams)
+	{
+	LOGTEXT(_L8("Starting immediate connect fax call"));
+	CATFaxCallConnectCommands::Start(aTsyReqHandle,aParams);	
+	}
+
+void CATConnectFax::Stop(TTsyReqHandle aTsyReqHandle)
+	{
+	LOGTEXT(_L8("Cancelling Connect Fax Call Command"));
+	CATFaxCallConnectCommands::Stop(aTsyReqHandle);
+	}
+
+void CATConnectFax::EventSignal(TEventSource aSource)
+	{
+	if((aSource==ETimeOutCompletion)
+		&&(iPreConnectState!=EATWaitForATCheckOK))
+		{
+		LOGTEXT(_L8("Timeout Error during Connect"));
+		Complete(KErrTimedOut,aSource);
+		return;
+		}
+
+	if (iPreConnectState!=CATCallConnectCommands::EATInitCompleted
+		&& iPreConnectState!=CATCallConnectCommands::ENotInProgress)
+		{
+		CATCallConnectCommands::PreConnectEventSignal(aSource);
+		}
+	}
+
+void CATConnectFax::CompleteSuccessfully()
+	{
+	REINTERPRET_CAST(CCallMobileFax*,iTelObject)->FaxConnect(iReqHandle);	
+	}
+

--- a/telephonyserverplugins/multimodetsy/hayes/ATCONNCT.H	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/ATCONNCT.H	Wed Sep 01 12:40:21 2010 +0100
@@ -57,5 +57,20 @@
 	TBuf8<KCommsDbSvrMaxFieldLength> iNoDialToneString;
 	};
 
+class CATConnectFax : public CATFaxCallConnectCommands
+/**
+@internalComponent
+*/
+	{
+public:
+	static CATConnectFax* NewL(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals);
+	~CATConnectFax();
+	virtual void Start(TTsyReqHandle aTsyReqHandle, TAny* aParams);
+	virtual void Stop(TTsyReqHandle aTsyReqHandle);
+protected:
+	CATConnectFax(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals);
+	virtual void EventSignal(TEventSource aSource);
+	virtual void CompleteSuccessfully();
+	};
 
 #endif

--- a/telephonyserverplugins/multimodetsy/hayes/ATDIAL.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/ATDIAL.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -774,3 +774,63 @@
 
 	return EFalse;		// We were unable to send a +CBST string 
 	}
+
+
+
+//
+//	CATDialFax
+//
+
+CATDialFax*	 CATDialFax::NewL(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals)
+	{
+	CATDialFax* dial=new(ELeave) CATDialFax(aIo, aTelObject, aInit,aPhoneGlobals);
+	CleanupStack::PushL(dial);
+	dial->ConstructL();
+	CleanupStack::Pop();
+	return dial;
+	}
+
+CATDialFax::CATDialFax(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals)
+											: CATFaxCallConnectCommands(aIo,aTelObject,aInit,aPhoneGlobals)
+	{}
+
+CATDialFax::~CATDialFax()
+	{
+	iIo->WriteAndTimerCancel(this);	
+	}
+
+void CATDialFax::Start(TTsyReqHandle aTsyReqHandle, TAny* aParams)
+	{
+	LOGTEXT(_L8("Starting dial fax call command"));
+	iTelnum=REINTERPRET_CAST(TDesC*,aParams);
+	CATFaxCallConnectCommands::Start(aTsyReqHandle,aParams);
+	}
+
+void CATDialFax::Stop(TTsyReqHandle aTsyReqHandle)
+	{
+	LOGTEXT(_L8("Cancelling Dial Fax Call Command"));
+	CATFaxCallConnectCommands::Stop(aTsyReqHandle);
+	}
+
+void CATDialFax::EventSignal(TEventSource aSource)
+	{
+	if((aSource==ETimeOutCompletion)
+		&&(iPreConnectState!=EATWaitForATCheckOK))
+		{
+		LOGTEXT(_L8("Timeout Error during Dial"));
+		Complete(KErrTimedOut,aSource);
+		return;
+		}
+
+	if (iPreConnectState!=CATCallConnectCommands::EATInitCompleted
+		&& iPreConnectState!=CATCallConnectCommands::ENotInProgress)
+		{
+		CATCallConnectCommands::PreConnectEventSignal(aSource);
+		}
+	}
+
+void CATDialFax::CompleteSuccessfully()
+	{
+	REINTERPRET_CAST(CCallMobileFax*,iTelObject)->FaxDial(iReqHandle,iTelnum);	
+	}
+

--- a/telephonyserverplugins/multimodetsy/hayes/ATDIAL.H	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/ATDIAL.H	Wed Sep 01 12:40:21 2010 +0100
@@ -138,4 +138,26 @@
 	};
 
 
+class CCallMobileFax;
+class CATDialFax : public CATFaxCallConnectCommands
+/**
+@internalComponent
+*/
+	{
+public:
+	static CATDialFax* NewL(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals);
+	~CATDialFax();
+
+private:
+	CATDialFax(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals);
+
+	// CATCommands inherited stuff
+	virtual void Start(TTsyReqHandle aTsyReqHandle, TAny* aParams);
+	virtual void Stop(TTsyReqHandle aTsyReqHandle);
+	virtual void EventSignal(TEventSource aSource);
+	virtual void CompleteSuccessfully();
+private:
+	TDesC* iTelnum;
+	};
+
 #endif

--- a/telephonyserverplugins/multimodetsy/hayes/ATHANGUP.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/ATHANGUP.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -487,3 +487,53 @@
 		}	
 	iState=EATNotInProgress;
 	}
+
+//
+//	CATHangUpFax
+//
+
+CATHangUpFax* CATHangUpFax::NewL(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals)
+	{
+	CATHangUpFax* hangup=new(ELeave) CATHangUpFax(aIo, aTelObject, aInit,aPhoneGlobals);
+	CleanupStack::PushL(hangup);
+	hangup->ConstructL();
+	CleanupStack::Pop();
+	return hangup;
+	}
+
+CATHangUpFax::CATHangUpFax(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals)
+											: CATCallAlterCommands(aIo,aTelObject,aInit,aPhoneGlobals)
+	{}
+
+CATHangUpFax::~CATHangUpFax()
+	{}
+
+void CATHangUpFax::Start(TTsyReqHandle aTsyReqHandle, TAny* /*aParams*/)
+//
+//	When a fax call is terminated, modem is set to not initialised so that if a data call
+//  follows it will initialise the modem again.
+//
+	{
+	LOGTEXT(_L8("Starting HangUp fax call"));
+	iReqHandle=aTsyReqHandle;
+	iPhoneGlobals->iNotificationStore->CheckNotification(REINTERPRET_CAST(CCallBase*,iTelObject),EBegunHangingUp);
+	CCallMobileFax* faxCall = REINTERPRET_CAST(CCallMobileFax*,iTelObject);
+//	iPhoneGlobals->iPhoneStatus.iInitStatus = EPhoneNotInitialised;
+	faxCall->FaxHangUp(aTsyReqHandle);
+	}
+
+void CATHangUpFax::Stop(TTsyReqHandle aTsyReqHandle)
+//
+//	Too late to stop hang up process here. Only hope is if escape sequence or init sequence
+//	had to be performed first
+//
+	{
+	__ASSERT_ALWAYS(aTsyReqHandle == iReqHandle,Panic(EIllegalTsyReqHandle));
+	LOGTEXT(_L8("Too late to cancel Hang Up Command"));
+	}
+
+void CATHangUpFax::EventSignal(TEventSource /*aSource*/)
+	{}
+
+void CATHangUpFax::Complete(TInt /*aError*/,TEventSource /*aSource*/)
+	{}

--- a/telephonyserverplugins/multimodetsy/hayes/ATHANGUP.H	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/ATHANGUP.H	Wed Sep 01 12:40:21 2010 +0100
@@ -84,4 +84,22 @@
 		EHangUpCancelling
 		} iState;
 	};
+
+class CCallMobileFax;
+class CATHangUpFax : public CATCallAlterCommands
+/**
+@internalComponent
+*/
+	{
+public:
+	static CATHangUpFax* NewL(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals);
+	~CATHangUpFax();
+	virtual void Start(TTsyReqHandle aTsyReqHandle, TAny* aParams);
+	virtual void Stop(TTsyReqHandle aTsyReqHandle);
+protected:
+	CATHangUpFax(CATIO* aIo, CTelObject* aTelObject,CATInit* aInit,CPhoneGlobals* aPhoneGlobals);
+	virtual void EventSignal(TEventSource aSource);
+	virtual void Complete(TInt aError,TEventSource aSource);
+	};
+
 #endif

--- a/telephonyserverplugins/multimodetsy/hayes/CALL.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/CALL.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -16,6 +16,7 @@
 #include <commsdattypesv1_1.h>
 #include "CALL.H"		// Header file for this source file
 #include "NOTIFY.H"
+#include "FAX.H"
 #include "ATDIAL.H"
 #include "ATANSWER.H"
 #include "ATCONNCT.H"
@@ -33,6 +34,8 @@
 #include "set_cbst.h"		// for CATSetCBST class
 #include "et_struct.h"
 
+_LIT(KFaxServerName,"FaxSvr.dll");
+
 
 //
 // CAcquireEntry class
@@ -2048,3 +2051,713 @@
 	ReqCompleted(aTsyReqHandle,KErrNone);
 	return KErrNone;
 	}
+
+// local function needed below
+
+LOCAL_C void SetFaxSessionSettings(RCall::TFaxSessionSettings& aTrg, const RCall::TFaxSessionSettings& aSrc)
+	{
+	aTrg.iMode=aSrc.iMode;
+	aTrg.iFaxRetrieveType=aSrc.iFaxRetrieveType;
+	aTrg.iFaxClass=aSrc.iFaxClass;
+	aTrg.iFaxId=aSrc.iFaxId;
+	aTrg.iMaxSpeed=aSrc.iMaxSpeed;
+	aTrg.iMinSpeed=aSrc.iMinSpeed;
+	aTrg.iPreferredECM=aSrc.iPreferredECM;
+	aTrg.iFaxOnDemandDelay=aSrc.iFaxOnDemandDelay;
+	aTrg.iTxResolution=aSrc.iTxResolution;
+	aTrg.iTxCompression=aSrc.iTxCompression;
+	aTrg.iTxPages=aSrc.iTxPages;
+	aTrg.iRxResolution=aSrc.iRxResolution;
+	aTrg.iRxResolution=aSrc.iRxResolution;
+	}
+
+//
+//	CCallMobileFax - fax call functionality
+//	At construction, phone init sequence may not have yet determined phone's capabilities so
+//	create object anyway and check in the function calls whether fax is supported by phone
+//
+
+CCallMobileFax* CCallMobileFax::NewL(CATIO* aATIO,CATInit* aInit,CPhoneGlobals* aPhoneGlobals,const TName& aName)
+	{
+	CCallMobileFax* faxCall=new(ELeave) CCallMobileFax(aATIO,aInit,aPhoneGlobals);
+	TCleanupItem newCallFaxHayesClose(CloseCall,faxCall);
+	CleanupStack::PushL(newCallFaxHayesClose);
+	faxCall->ConstructL(aName);
+	CleanupStack::Pop();
+	return faxCall;
+	}
+
+CCallMobileFax::CCallMobileFax(CATIO* aATIO,CATInit* aInit,CPhoneGlobals* aPhoneGlobals)
+	: CCallMobile(aATIO,aInit,aPhoneGlobals),iFaxSession(NULL),iFax(NULL)
+	{}
+
+void CCallMobileFax::ConstructL(const TName& aName)
+	{
+	CCallHayes::ConstructL(aName);
+	iCallInfo.iLineOwnerName = KFaxLineName;
+	iDialFax=CATDialFax::NewL(iIo,this,iInit,iPhoneGlobals);
+	iConnectFax=CATConnectFax::NewL(iIo,this,iInit,iPhoneGlobals);
+	iAnswerFax=CATAnswerFax::NewL(iIo,this,iInit,iPhoneGlobals);
+	iHangUpFax=CATHangUpFax::NewL(iIo,this,iInit,iPhoneGlobals);
+	iFaxSettings.iMode = RCall::ETransmit;
+	iFaxSettings.iFaxRetrieveType = RCall::EFaxOnDemand;
+	iFaxSettings.iFaxClass = EClassAuto;
+	iFaxSettings.iMaxSpeed = 9600;
+	iFaxSettings.iMinSpeed = 2400;
+	iFaxSettings.iPreferredECM = EFalse;
+	iFaxSettings.iFaxOnDemandDelay = 20;
+	iFaxSettings.iTxResolution = EFaxNormal;
+	iFaxSettings.iTxCompression = EModifiedHuffman;
+	iFaxSettings.iTxPages = 0;
+	iFaxSettings.iRxResolution = EFaxNormal;
+	iFaxSettings.iRxCompression = EModifiedHuffman;
+	iFaxCompletion = new (ELeave) CFaxCompletion();
+	iFaxProgress=CreateFaxProgressChunk();
+	if(iFaxProgress==NULL)
+		User::Leave(KErrEtelFaxChunkNotCreated);
+	}
+
+CCallMobileFax::~CCallMobileFax()
+//
+//	Removes itself from array of calls in CLineMobileData
+//
+	{
+	__ASSERT_DEBUG(iFaxSession==NULL,Panic(EFaxServerNotNull));
+	DeleteFaxProgressChunk();		// This deallocates the memory pointed to by iFaxProgress
+	delete iDialFax;
+	delete iConnectFax;
+	delete iAnswerFax;
+	delete iHangUpFax;	
+	delete iFaxCompletion;
+	delete iFileHandles;
+	}
+
+void CCallMobileFax::CollateCoreCaps(const TTsyReqHandle aTsyReqHandle, TUint32* aCallCaps)
+	{
+	*aCallCaps = RCall::KCapsFax;
+	if (ValidateFaxClass(iFaxSettings.iFaxClass)==KErrNone
+		 && (!(REINTERPRET_CAST(CLineMobileFax*,Owner())->iFaxOpened==TRUE && iFax==NULL))
+		 && iPhoneGlobals->iPhoneStatus.iModemDetected==RPhone::EDetectedPresent)
+		 //	check that fax class is OK and that no other fax call has opened a fax object
+		{
+		TCallOwnership owner = CheckOwnership(aTsyReqHandle);
+		if (ValidateRequest(aTsyReqHandle,RCall::EStatusIdle)==KErrNone)
+			*aCallCaps |= (RCall::KCapsDial | RCall::KCapsConnect);
+		TInt ret=KErrNone;
+		if (owner==CCallBase::EOwnedFalse)	// call owned by another client
+			ret=KErrEtelNotCallOwner;
+		else 
+			{
+			if (!iIsForIncomingCall)	
+				{
+				if (REINTERPRET_CAST(CPhoneHayes*,Owner()->Owner())->CheckForOutstandingAnswer())
+					ret=KErrEtelAnswerAlreadyOutstanding;
+				}
+			else
+				ret=KErrEtelAnswerAlreadyOutstanding;
+			}
+		if (ret==KErrNone && (iCallInfo.iMobileStatus==RMobileCall::EStatusIdle || iCallInfo.iMobileStatus==RMobileCall::EStatusRinging))
+			*aCallCaps |= RCall::KCapsAnswer;
+		if (owner==CCallBase::EOwnedTrue && iCallInfo.iMobileStatus==RMobileCall::EStatusConnected)
+			{
+			*aCallCaps |= RCall::KCapsHangUp;
+			}
+		}
+	}
+
+TInt CCallMobileFax::OpenFax(TDesC* aTelNumber,TFaxMode aFaxMode)
+//
+//	Open CETelFaxHayes object with desired settings
+//
+	{
+	TFaxServerSessionSettings faxSettings;
+	faxSettings.iPhoneNumber.Copy(*aTelNumber);
+	faxSettings.iLogging = ETrue;
+	TInt ret = iPhoneGlobals->iConfiguration->ConfigModemString(TPtrC(KCDTypeNameFaxInitString),faxSettings.iFaxInitString);
+	if (!ret)
+		{
+		ret = iPhoneGlobals->iConfiguration->ConfigModemString(TPtrC(KCDTypeNameCsyName),faxSettings.iPortDriverName);
+		}
+	if (!ret)
+		{
+		ret = iPhoneGlobals->iConfiguration->ConfigModemString(TPtrC(KCDTypeNamePortName),faxSettings.iCommPortName);
+		}
+	if (ret)
+		return ret;
+	if(faxSettings.iFaxInitString.Length()==0)
+		faxSettings.iFaxInitString=KAT2Command;			
+	faxSettings.iMode = aFaxMode;
+	faxSettings.iFaxClass = iFaxSettings.iFaxClass;
+	faxSettings.iFaxId = iFaxSettings.iFaxId;
+	faxSettings.iMaxSpeed = iFaxSettings.iMaxSpeed;
+	faxSettings.iMinSpeed = iFaxSettings.iMinSpeed;
+	faxSettings.iPreferredECM = iFaxSettings.iPreferredECM;
+	faxSettings.iFaxOnDemandDelay = iFaxSettings.iFaxOnDemandDelay;
+	faxSettings.iTxResolution = iFaxSettings.iTxResolution;
+	faxSettings.iTxCompression = iFaxSettings.iTxCompression;
+	faxSettings.iTxPages = iFaxSettings.iTxPages;
+	faxSettings.iRxResolution = iFaxSettings.iRxResolution;
+	faxSettings.iRxCompression = iFaxSettings.iRxCompression;
+	return iFaxSession->FxOpen(faxSettings,iFaxProgress);
+	}
+
+TInt CCallMobileFax::ValidateFaxClass(TFaxClass& aFaxClass)
+	{
+	if ((iPhoneGlobals->iPhoneStatus.iDataAndFaxFlags & KFaxCaps) == 0)
+		{
+		return KErrNotSupported;
+		}
+	switch (aFaxClass)
+		{
+	case EClassAuto:		// TSY decides what class "AUTO" refers to!
+		{
+		if ((iPhoneGlobals->iPhoneStatus.iDataAndFaxFlags & RPhone::KCapsFaxClassTwoPointZero))
+			aFaxClass =  EClass2point0;
+		else if ((iPhoneGlobals->iPhoneStatus.iDataAndFaxFlags & RPhone::KCapsFaxClassTwo)) 
+			aFaxClass = EClass2;
+		else if ((iPhoneGlobals->iPhoneStatus.iDataAndFaxFlags & RPhone::KCapsFaxClassOne))
+			aFaxClass = EClass1;
+		break;
+		}
+	case EClass1:
+		if ((iPhoneGlobals->iPhoneStatus.iDataAndFaxFlags & RPhone::KCapsFaxClassOne)==0)
+			return KErrEtelWrongModemType;
+		break;
+	case EClass1point0:
+		if ((iPhoneGlobals->iPhoneStatus.iDataAndFaxFlags & RPhone::KCapsFaxClassOnePointZero)==0)
+			return KErrEtelWrongModemType;
+		break;
+	case EClass2:
+		if ((iPhoneGlobals->iPhoneStatus.iDataAndFaxFlags & RPhone::KCapsFaxClassTwo)==0)
+			return KErrEtelWrongModemType;
+		break;
+	case EClass2point0:
+		if ((iPhoneGlobals->iPhoneStatus.iDataAndFaxFlags & RPhone::KCapsFaxClassTwoPointZero)==0)
+			return KErrEtelWrongModemType;
+		break;
+	case EClass2point1:
+		if ((iPhoneGlobals->iPhoneStatus.iDataAndFaxFlags & RPhone::KCapsFaxClassTwoPointOne)==0)
+			return KErrEtelWrongModemType;
+		break;
+	default:
+		return KErrEtelWrongModemType;
+		}
+	return KErrNone;
+	}
+
+typedef CFaxSession* (*TFaxServerEntry)();
+void CCallMobileFax::GetFaxBaseL()
+	{
+	__ASSERT_DEBUG(iFaxCompletion,Panic(EFaxCompletionPtrNull));
+	RFs fs;
+	(void)User::LeaveIfError(fs.Connect());
+
+	TInt r=iFaxServerLib.Load(KFaxServerName);
+	if (r==KErrNone)
+		{
+		// Check the Uid2
+#if defined (_UNICODE)
+		if(iFaxServerLib.Type()[1]!=TUid::Uid(KUidUnicodeDynamicFaxServer))
+			r = KErrBadLibraryEntryPoint;
+#else
+		if(iFaxServerLib.Type()[1]!=TUid::Uid(KUidDynamicFaxServer))
+			r = KErrBadLibraryEntryPoint;
+#endif
+		if (r==KErrNone)
+			{	
+			TFaxServerEntry libEntry=(TFaxServerEntry)iFaxServerLib.Lookup(1);
+			if (libEntry!=NULL)
+				{
+				TRAP(r,iFaxSession=(*libEntry)());	// libEntry may leave.
+				if (r==KErrNone)
+					{
+					LOGTEXT(_L8("Loaded Fax Server"));
+					iFaxSession->SetCallBack(iFaxCompletion);
+					}
+				else
+					iFaxServerLib.Close();
+				}
+			else
+				{
+				r = KErrBadLibraryEntryPoint;
+				iFaxServerLib.Close();
+				}
+			}
+		else
+			iFaxServerLib.Close();
+		}
+	fs.Close();
+	(void)User::LeaveIfError(r);
+	}
+
+TInt CCallMobileFax::FaxConnectHandler(const TTsyReqHandle aTsyReqHandle)
+	{
+	TInt ret = ValidateFaxClass(iFaxSettings.iFaxClass);
+	if (ret!=KErrNone)
+		{
+		(void)SetUnowned();
+		ReqCompleted(aTsyReqHandle,ret);
+		return ret;
+		}
+	if (REINTERPRET_CAST(CLineMobileFax*,Owner())->iFaxOpened==TRUE && iFax==NULL)
+		{
+		(void)SetUnowned();
+		ReqCompleted(aTsyReqHandle,KErrEtelNotFaxOwner);
+		return ret;
+		}
+	
+	TRAPD(res,GetFaxBaseL());
+	if (res!=KErrNone)
+		{
+		(void)SetUnowned();
+		ReqCompleted(aTsyReqHandle,res);
+		}
+	iPhoneGlobals->iEventSignalActive = EFalse; 
+	return res;
+	}
+
+void CCallMobileFax::FaxDial(const TTsyReqHandle aTsyReqHandle,TDesC* aTelNumber)
+//
+//	Called once any initialising has been done. Checks here that modem supports fax,
+//	and that no other CCallHayes has opened a fax object
+//
+	{
+	if (FaxConnectHandler(aTsyReqHandle)!=KErrNone)	// ReqCompleted is called inside FaxConnectHandler
+													// if there is an error
+		return;
+	TFaxMode faxMode;
+	if (iFaxSettings.iMode==RCall::ETransmit)
+		{
+		faxMode = EDialAndTransmit;
+		}
+	else	// we're receiving
+		{
+		if (iFaxSettings.iFaxRetrieveType==RCall::EFaxPoll)
+			faxMode = EDialAndReceivePoll;
+		else 
+			faxMode = EDialAndReceiveFaxBack;
+		}
+	TInt res = OpenFax(aTelNumber,faxMode);
+	if (res!=KErrNone)	// make sure cleaned up.
+		{
+		ReqCompleted(aTsyReqHandle,res);
+		return;
+		}
+	ChangeLineStatus(RCall::EStatusDialling);
+	// EStatusDialling always results in KErrNone return
+	(void) ChangeCallStatus(RMobileCall::EStatusDialling);
+	iPhoneGlobals->iNotificationStore->CheckNotification(this,EBegunConnecting);
+	iFaxCompletion->Configure(aTsyReqHandle,this);
+	iIo->Cancel();
+	iPhoneGlobals->iPhoneStatus.iPortAccess = EPortAccessDenied; // so CATIO won't queue a read
+	
+	if (faxMode == EDialAndTransmit)
+		{
+		LOGTEXT(_L8("About to call CETelFaxBase::TxConnect"));
+		//this transfers ownership of the file handles object to the fax session object.
+		iFaxSession->SetFaxHeaderFile(iFileHandles);
+		//we now aren't resonsible for its deletion.
+		iFileHandles = NULL;
+		iFaxSession->TxConnect();
+		}
+	else
+		{
+		LOGTEXT(_L8("About to call CETelFaxBase::RxConnect"));
+		iFaxSession->RxConnect();
+		}
+	}
+
+TInt CCallMobileFax::Dial(const TTsyReqHandle aTsyReqHandle,const TDesC8* aCallParams,TDesC* aTelNumber)
+//
+//	Dial a fax call
+//	Check that call is not owned by another client, and line is idle  
+//
+	{
+	TInt ret = ValidateRequest(aTsyReqHandle,RCall::EStatusIdle);
+	if (ret==KErrNone)
+		{
+		(void)SetOwnership(aTsyReqHandle);
+		SetCallParams(aCallParams);
+		LOGTEXT(_L8("FaxCall:\tSubmitting Dial Command"));
+		iDialFax->ExecuteCommand(aTsyReqHandle,aTelNumber,&iCallInfo);
+		}
+	else
+		ReqCompleted(aTsyReqHandle,ret);
+	return KErrNone;
+	}
+
+void CCallMobileFax::FaxCancelCommand(const TTsyReqHandle aTsyReqHandle)
+//
+//	Cancels the fax session (for ConnectCancel and AnswerCancel as well)
+//
+	{
+	LOGTEXT(_L8("FaxCall:\tCancel Fax call and Unload module"));
+	if(!iFaxSession)							// if iFaxSession is NULL
+		{										// then CleanUpFaxServer has already been called
+		LOGTEXT(_L8("FaxCall:\tModule already unloaded, completing..."));
+		ReqCompleted(aTsyReqHandle,KErrCancel);	// so return without further processing
+		return;
+		}
+
+	LOGTEXT(_L8("FaxCall:\tClosing down fax server module"));
+	iFaxSession->Cancel();
+	CleanUpFaxServer();
+	iIo->Read();
+	SetToIdle();
+	ReqCompleted(aTsyReqHandle,KErrCancel);
+	}
+
+TInt CCallMobileFax::DialCancel(const TTsyReqHandle aTsyReqHandle)
+	{
+	LOGTEXT2(_L8("FaxCall:\tDialCancel(%d) called"),aTsyReqHandle);
+	iDialFax->CancelCommand(aTsyReqHandle);
+	return KErrNone;
+	}
+
+void CCallMobileFax::FaxConnect(const TTsyReqHandle aTsyReqHandle)
+//
+//	Called once any initialising has been done. Checks here that modem supports fax.
+//
+	{
+	if (FaxConnectHandler(aTsyReqHandle)!=KErrNone)
+		return;
+	TFaxMode faxMode;
+	if (iFaxSettings.iMode==RCall::ETransmit)
+		faxMode = EImmediateTransmit;
+	else
+		faxMode = EImmediateReceive;
+	TBuf<1> null;
+	null.Zero();
+	TInt res = OpenFax(&null,faxMode);
+	if (res!=KErrNone)
+		{
+		ReqCompleted(aTsyReqHandle,res);
+		return;
+		}
+	ChangeLineStatus(RCall::EStatusConnecting);
+	// EStatusConnecting always returns KErrNone
+	(void)ChangeCallStatus(RMobileCall::EStatusConnecting);
+	iPhoneGlobals->iNotificationStore->CheckNotification(this,EBegunConnecting);
+	iFaxCompletion->Configure(aTsyReqHandle,this);
+	iIo->Cancel();
+	iPhoneGlobals->iPhoneStatus.iPortAccess = EPortAccessDenied; // so CATIO won't queue a read
+	if (faxMode == EImmediateTransmit)
+		iFaxSession->TxConnect();
+	else
+		iFaxSession->RxConnect();
+	}
+
+TInt CCallMobileFax::Connect(const TTsyReqHandle aTsyReqHandle,const TDesC8* aCallParams)
+//
+//	Immediate connect to a fax call
+//	Check that call is not owned by another client, and line is idle  
+//
+	{
+	TInt ret = ValidateRequest(aTsyReqHandle,RCall::EStatusIdle);
+	if (ret==KErrNone)
+		{
+		(void)SetOwnership(aTsyReqHandle);
+		SetCallParams(aCallParams);
+		LOGTEXT(_L8("FaxCall:\tSubmitting Connect Command"));
+		iConnectFax->ExecuteCommand(aTsyReqHandle,NULL,&iCallInfo);
+		}
+	else
+		ReqCompleted(aTsyReqHandle,ret);
+	return KErrNone;
+	}
+
+TInt CCallMobileFax::ConnectCancel(const TTsyReqHandle aTsyReqHandle)
+	{
+	LOGTEXT2(_L8("FaxCall:\tConnectCancel(%d) called"),aTsyReqHandle);
+	iConnectFax->CancelCommand(aTsyReqHandle);
+	return KErrNone;
+	}
+
+void CCallMobileFax::FaxAnswer(const TTsyReqHandle aTsyReqHandle)
+	{
+	if (FaxConnectHandler(aTsyReqHandle)!=KErrNone)
+		return;
+	TFaxMode faxMode;
+	if (iFaxSettings.iMode==RCall::ETransmit)
+		faxMode = EWaitForRingAndTransmit;
+	else
+		faxMode = EWaitForRingAndReceive;
+	TBuf<1> null;
+	null.Zero();
+	TInt res = OpenFax(&null,faxMode);
+	if (res!=KErrNone)
+		{
+		ReqCompleted(aTsyReqHandle,res);
+		return;
+		}
+	LOGTEXT(_L8("FaxCall:\tAnswering Fax call"));
+	ChangeLineStatus(RCall::EStatusAnswering);
+	// EStatusAnswering always results in KerrNone return
+	(void)ChangeCallStatus(RMobileCall::EStatusAnswering);
+	CPhoneHayes* phone=STATIC_CAST(CPhoneHayes*,Owner()->Owner());
+	phone->StopRingCounter();		// RING should no longer come in
+	iPhoneGlobals->iNotificationStore->CheckNotification(this,EBegunConnecting);
+	iFaxCompletion->Configure(aTsyReqHandle,this);
+	iIo->Cancel();
+	iPhoneGlobals->iPhoneStatus.iPortAccess = EPortAccessDenied; // so CATIO won't queue a read
+	if (faxMode == EWaitForRingAndTransmit)
+		iFaxSession->TxConnect();
+	else
+		iFaxSession->RxConnect();
+	}
+
+TInt CCallMobileFax::AnswerIncomingCall(const TTsyReqHandle aTsyReqHandle,const TDesC8* aCallParams)
+//
+//	Answer a fax call
+//
+	{
+	TInt ret=KErrNone;
+	CCallBase::TCallOwnership owned = CheckOwnership(aTsyReqHandle);
+	if (owned==CCallBase::EOwnedFalse)	// call owned by another client
+		{
+		ret=KErrEtelNotCallOwner;
+		}
+	else if (REINTERPRET_CAST(CPhoneHayes*,Owner()->Owner())->CheckForOutstandingAnswer())
+		ret=KErrEtelAnswerAlreadyOutstanding;
+
+	if (ret==KErrNone)
+		{
+		CLineHayes* line = STATIC_CAST(CLineHayes*,Owner());
+		CPhoneHayes* phone=STATIC_CAST(CPhoneHayes*,line->Owner());
+		phone->CancelOtherRingingCall(line);
+		line->FreePreAllocCallIfNecessary();
+		SetCallParams(aCallParams);
+		if (iCallInfo.iMobileStatus==RMobileCall::EStatusRinging)
+			{
+			LOGTEXT(_L8("FaxCall:\tSubmitting Answer Command"));
+			iAnswerFax->ExecuteCommand(aTsyReqHandle,NULL,&iCallInfo);
+			}
+		else	// This call is now a client-designated Incoming Call object.
+			{
+			iIsForIncomingCall=ETrue;
+			iAnswerTsyReqHandle = aTsyReqHandle;
+			}
+		return KErrNone;
+		}
+	ReqCompleted(aTsyReqHandle,ret);
+	return KErrNone;
+	}
+
+TInt CCallMobileFax::AnswerIncomingCallCancel(const TTsyReqHandle aTsyReqHandle)
+//
+//	Cancel the answer command if possible
+//
+	{
+	LOGTEXT2(_L8("FaxCall:\tAnswerCancel(%d) called"),aTsyReqHandle);
+	if (iIsForIncomingCall)
+		{
+		iIsForIncomingCall=EFalse;
+		ReqCompleted(aTsyReqHandle,KErrCancel);
+		}
+	else
+		iAnswerFax->CancelCommand(aTsyReqHandle);
+	return KErrNone;
+	}
+
+void CCallMobileFax::AnswerImmediately()
+	{
+	(void)SetOwnership(iAnswerTsyReqHandle);
+	// EStatusRinging always results in KErrNone return
+	(void)ChangeCallStatus(RMobileCall::EStatusRinging);// new 14/1/99
+	iPhoneGlobals->iNotificationStore->CheckNotification(this,ERingOccurred);
+	iIsForIncomingCall=EFalse;
+	LOGTEXT(_L8("FaxCall:\tSubmitting Answer command"));
+	iAnswerFax->ExecuteCommand(iAnswerTsyReqHandle,NULL,&iCallInfo);
+	}		
+
+void CCallMobileFax::FaxHangUp(const TTsyReqHandle aTsyReqHandle)
+//
+//	Fax server reconfigures port so no need to here.
+//
+	{
+	if (iFaxSession)
+		{
+		// EStatusDisconnecting always results in KErrNone return
+		(void)ChangeCallStatus(RMobileCall::EStatusDisconnecting);
+		ChangeLineStatus(RCall::EStatusHangingUp);
+		iPhoneGlobals->iNotificationStore->CheckNotification(this,EBegunHangingUp);
+		CleanUpFaxServer();
+		iIo->Read();
+		SetToIdle();
+		}
+	ReqCompleted(aTsyReqHandle,KErrNone);
+	}
+
+TInt CCallMobileFax::HangUp(const TTsyReqHandle aTsyReqHandle)
+//
+//	Terminate a fax call. Checks fax capability, call ownership and line status.
+//
+	{
+	if ((iPhoneGlobals->iPhoneStatus.iDataAndFaxFlags & KFaxCaps) == 0)
+		{
+		ReqCompleted(aTsyReqHandle,KErrNotSupported);
+		return KErrNone;
+		}
+	if (CheckOwnership(aTsyReqHandle)==CCallBase::EOwnedFalse)
+		{
+		ReqCompleted(aTsyReqHandle,KErrEtelNotCallOwner);
+		return KErrNone;
+		}	
+	if (iPhoneGlobals->iPhoneStatus.iLineStatus != RCall::EStatusConnected)
+		{
+		ReqCompleted(aTsyReqHandle,KErrNone);
+		return KErrNone;
+		}
+	LOGTEXT(_L8("FaxCall:\tHanging up"));
+	iHangUpFax->ExecuteCommand(aTsyReqHandle,NULL,&iCallInfo);
+	return KErrNone;
+	}
+
+TInt CCallMobileFax::HangUpCancel(const TTsyReqHandle aTsyReqHandle)
+	{
+	iHangUpFax->CancelCommand(aTsyReqHandle);
+	return KErrNone;
+	}
+
+TInt CCallMobileFax::RelinquishOwnership()
+//
+//	Called by server to tell TSY to either pass ownership on to another interested client
+//	or hang up immediately
+//
+	{
+	LOGTEXT(_L8("FaxCall:\tRelinquish Ownership"));
+	if(iList->iAcquireList.IsEmpty()) 
+		{
+		if (iDialFax->IsPreConnectInProgress()	  ||
+			iConnectFax->IsPreConnectInProgress() ||
+			iAnswerFax->IsPreConnectInProgress())	// fax server has not yet been started
+			{
+			iCallInfo.iClientPanicOccurred = EPanicOccurredWithoutDataPortLoan;
+			return KErrNone;
+			}
+		(void)SetUnowned();
+		TInt ret = KErrNone;
+		if (iCallInfo.iMobileStatus==RMobileCall::EStatusDialling		||
+			 iCallInfo.iMobileStatus==RMobileCall::EStatusConnecting	||
+			 iCallInfo.iMobileStatus==RMobileCall::EStatusAnswering		||
+			 iCallInfo.iMobileStatus==RMobileCall::EStatusConnected		||
+			 iCallInfo.iMobileStatus==RMobileCall::EStatusDisconnecting
+			 )
+			{
+			LOGTEXT(_L8("FaxCall:\tHanging up"));
+			ChangeLineStatus(RCall::EStatusHangingUp);
+			// EStatusDisconnecting always results in KErrNone return
+			(void)ChangeCallStatus(RMobileCall::EStatusDisconnecting);
+			CleanUpFaxServer();
+			ChangeLineStatus(RCall::EStatusIdle);
+			// EStatusIdle always results in KErrNone return
+			(void)ChangeCallStatus(RMobileCall::EStatusIdle);
+			iPhoneGlobals->iPhoneStatus.iMode = RPhone::EModeIdle;
+			iIo->Cancel();
+			TCommConfig aConfigPckg;
+			TInt ret = iPhoneGlobals->iConfiguration->PortConfig(aConfigPckg,EConfigTypeInit);
+			if (ret==KErrNone)
+				ret = iIo->ConfigurePort(aConfigPckg);
+			if (ret)
+				iPhoneGlobals->iPhoneStatus.iInitStatus = EPhoneNotInitialised;
+			else
+				iIo->Read();			// should a read be queued in this case?
+			}
+		RelinquishOwnershipCompleted(ret);
+		return KErrNone;
+		}
+	CAcquireEntry* entry=iList->iAcquireList.First();
+	if (entry) 
+		{
+		(void)SetOwnership(entry->iTsyReqHandle);
+		ReqCompleted(entry->iTsyReqHandle,KErrNone);
+		iList->Remove(entry);
+		}
+	RelinquishOwnershipCompleted(KErrNone);
+	return KErrNone;
+	}
+
+TInt CCallMobileFax::GetFaxSettings(const TTsyReqHandle aTsyReqHandle,RCall::TFaxSessionSettings* aSettings)
+//
+//	Which are stored privately in CCallMobileFax
+//
+	{	
+	LOGTEXT(_L8("FaxCall:\tGetting fax settings"));
+	SetFaxSessionSettings(*aSettings,iFaxSettings);
+	ReqCompleted(aTsyReqHandle,KErrNone);
+	return KErrNone;
+	}
+
+TInt CCallMobileFax::SetFaxSettings(const TTsyReqHandle aTsyReqHandle,const RCall::TFaxSessionSettings* aSettings)
+	{	
+	LOGTEXT(_L8("FaxCall:\tSetting fax settings"));
+	TUint phoneCaps = iPhoneGlobals->iPhoneStatus.iDataAndFaxFlags;
+	if (aSettings->iFaxClass==EClass1 && (phoneCaps&RPhone::KCapsFaxClassOne) ||
+		aSettings->iFaxClass==EClass2 && (phoneCaps&RPhone::KCapsFaxClassTwo) ||
+		aSettings->iFaxClass==EClass2point0 && (phoneCaps&RPhone::KCapsFaxClassTwoPointZero) ||
+		aSettings->iFaxClass==EClass1point0 && (phoneCaps&RPhone::KCapsFaxClassOnePointZero) ||
+		aSettings->iFaxClass==EClass2point1 && (phoneCaps&RPhone::KCapsFaxClassTwoPointOne)  ||
+		aSettings->iFaxClass==EClassAuto)
+		{
+		SetFaxSessionSettings(iFaxSettings,*aSettings);
+		ReqCompleted(aTsyReqHandle,KErrNone);
+		}
+	else if (iPhoneGlobals->iPhoneStatus.iInitStatus!=EPhoneInitialised)
+		ReqCompleted(aTsyReqHandle,KErrEtelUnknownModemCapability);
+	else
+		ReqCompleted(aTsyReqHandle,KErrNotSupported);
+	return KErrNone;
+	}
+
+TInt CCallMobileFax::SetFaxSharedHeaderFile(const TTsyReqHandle aTsyReqHandle, CFaxSharedFileHandles* aFaxSharedFileHandles)
+	{
+	//if we already own an object delete and re-point to new one.
+	if(iFileHandles)
+		{
+		delete iFileHandles;
+		iFileHandles = NULL;
+		}
+	iFileHandles = aFaxSharedFileHandles;	
+
+	ReqCompleted(aTsyReqHandle,KErrNone);	
+	return KErrNone;
+	}
+
+CTelObject* CCallMobileFax::OpenNewObjectByNameL(const TDesC& /*aName*/)
+//
+//	Only want one CFaxHayes object to be opened per phone.
+//	Previously only the connected call could open a CFaxHayes object, so it was easy to check
+//	whether one had already been opened. Now a fax call can open a fax object at any time
+//	making it less clear how to check that no other call has opened one.
+//
+	{
+	if (iPhoneGlobals->iPhoneStatus.iLineStatus != GetCoreCallStatus())
+		{	// ie another fax call is in progress so this call cannot open a fax object
+		User::Leave(KErrEtelNotCallOwner);
+		}
+	TBool& faxOpened = REINTERPRET_CAST(CLineMobileFax*,Owner())->iFaxOpened;
+	if (faxOpened==TRUE)
+		{
+		User::Leave(KErrAlreadyExists);
+		}
+	faxOpened=ETrue;
+	iFax = CFaxHayes::NewL(this,iPhoneGlobals);
+	return iFax;
+	}
+
+void CCallMobileFax::RemoveFax(CFaxHayes* aFaxHayes)
+	{
+	if (iFax == aFaxHayes)
+		iFax=NULL;
+	REINTERPRET_CAST(CLineMobileFax*,Owner())->iFaxOpened=EFalse;
+	}
+
+void CCallMobileFax::CleanUpFaxServer()
+	{
+	LOGTEXT(_L8("Closing down Fax Server"));
+	(void)iFaxSession->FxClose();
+	iFaxServerLib.Close();
+	iFaxSession = NULL;
+	iPhoneGlobals->iPhoneStatus.iPortAccess = EPortAccessAllowed; 
+	iPhoneGlobals->iEventSignalActive = EFalse;				
+	}

--- a/telephonyserverplugins/multimodetsy/hayes/CALL.H	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/CALL.H	Wed Sep 01 12:40:21 2010 +0100
@@ -25,6 +25,7 @@
 #include <et_phone.h>
 #include "TSYCONFG.H"
 #include "ATBASE.H"
+#include "faxstd.h"
 #include <f32file.h>
 //
 // CAcquireEntry
@@ -337,4 +338,72 @@
 	CATSetToOnlineDataMode* iATSetToOnlineDataMode;
 	};
 
+class CATDialFax;
+class CATConnectFax;
+class CATAnswerFax;
+class CATHangUpFax;
+class CFaxHayes;
+class CFaxSession;	// the class defined by the fax server
+class CFaxCompletion;
+class CCallMobileFax : public CCallMobile
+/**
+@internalComponent
+*/
+	{
+public:
+	static CCallMobileFax* NewL(CATIO* aATIO,CATInit* aInit,CPhoneGlobals* aPhoneGlobals,const TName& aName);
+	CCallMobileFax(CATIO* aATIO,CATInit* aInit,CPhoneGlobals* aGlobals);
+	~CCallMobileFax();
+
+// MTelObjectTSY pure virtual
+	virtual CTelObject* OpenNewObjectByNameL(const TDesC&);
+
+// MCallBaseTSY pure virtuals
+	virtual TInt Dial(const TTsyReqHandle aTsyReqHandle,const TDesC8* aCallParams,TDesC* aTelNumber);
+	virtual TInt DialCancel(const TTsyReqHandle aTsyReqHandle);
+	virtual TInt Connect(const TTsyReqHandle aTsyReqHandle,const TDesC8* aCallParams);
+	virtual TInt ConnectCancel(const TTsyReqHandle aTsyReqHandle);
+	virtual TInt AnswerIncomingCall(const TTsyReqHandle aTsyReqHandle,const TDesC8* aCallParams);
+	virtual TInt AnswerIncomingCallCancel(const TTsyReqHandle aTsyReqHandle);
+	virtual TInt HangUp(const TTsyReqHandle aTsyReqHandle);
+	virtual TInt HangUpCancel(const TTsyReqHandle aTsyReqHandle);
+	virtual TInt RelinquishOwnership();
+	virtual TInt GetFaxSettings(const TTsyReqHandle aTsyReqHandle,RCall::TFaxSessionSettings* aSettings);
+	virtual TInt SetFaxSettings(const TTsyReqHandle aTsyReqHandle,const RCall::TFaxSessionSettings* aSettings);
+	virtual TInt SetFaxSharedHeaderFile(const TTsyReqHandle aTsyReqHandle, CFaxSharedFileHandles* aFaxSharedFileHandles);
+// CCallHayes pure virtual
+	virtual void AnswerImmediately();
+
+	virtual void CollateCoreCaps(const TTsyReqHandle aTsyReqHandle, TUint32* aCallCaps);
+
+	TInt FaxConnectHandler(const TTsyReqHandle aTsyReqHandle);
+	TInt ValidateFaxClass(TFaxClass& aFaxClass);
+	void FaxCancelCommand(const TTsyReqHandle aTsyReqHandle);
+	void FaxDial(const TTsyReqHandle aTsyReqHandle,TDesC* aTelNumber);
+	void FaxConnect(const TTsyReqHandle aTsyReqHandle);
+	void FaxAnswer(const TTsyReqHandle aTsyReqHandle);
+	void FaxHangUp(const TTsyReqHandle aTsyReqHandle);
+
+	TInt OpenFax(TDesC* aTelNumber,TFaxMode aFaxMode);
+	void GetFaxBaseL();
+	void RemoveFax(CFaxHayes* aFaxHayes);
+	void CleanUpFaxServer();
+private:
+	void ConstructL(const TName& aName);
+public:
+	CFaxSession* iFaxSession;
+private:
+	CATDialFax* iDialFax;
+	CATConnectFax* iConnectFax;
+	CATAnswerFax* iAnswerFax;
+	CATHangUpFax* iHangUpFax;
+	RCall::TFaxSessionSettings iFaxSettings;
+	CFaxHayes* iFax;
+	CFaxCompletion* iFaxCompletion;
+	RLibrary iFaxServerLib;
+	RFax::TProgress* iFaxProgress;
+	CFaxSharedFileHandles* iFileHandles;
+	};
+
+
 #endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/multimodetsy/hayes/FAX.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +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:
+//
+
+#include "NOTIFY.H"
+#include "ETELFAX.H"
+#include "FAX.H"
+#include "mSLOGGER.H"
+
+//
+// CFaxHayes - Fax functionality
+//
+
+void CFaxHayes::CloseFax(TAny* aObj)
+//
+// Utility func for cleanup stack
+//
+	{
+	((CObject*)aObj)->Close();
+	}
+
+CFaxHayes* CFaxHayes::NewL(CCallMobileFax* aCallFaxHayes,CPhoneGlobals* aPhoneGlobals)
+//
+//	Completes successfully if fax call has already been dialled creating a CETelFaxBase 
+//  instance, and is not called if that is not true.
+//
+	{
+	CFaxHayes* fax=new(ELeave) CFaxHayes(aCallFaxHayes,aPhoneGlobals);
+	TCleanupItem newFaxHayesClose(CloseFax,fax);
+	CleanupStack::PushL(newFaxHayesClose);
+	fax->ConstructL();
+    CleanupStack::Pop();
+	return fax;
+	}
+	
+RHandleBase* CFaxHayes::GlobalKernelObjectHandle()
+	{	
+	return iOwner->GlobalKernelObjectHandle();
+	}
+
+CFaxHayes::CFaxHayes(CCallMobileFax* aCallFaxHayes,CPhoneGlobals* aPhoneGlobals)
+								 : iPhoneGlobals(aPhoneGlobals), iOwner(aCallFaxHayes)
+	{}
+
+void CFaxHayes::ConstructL()
+//
+//	Used to be that CFaxHayes could not be constructed before a call had been initiated
+//  ie the fax server was started and the call had a pointer to CETelFaxBase.
+//	Now, to solve the problem of the fax progress being only available after phase C, 
+//  RFax can be opened before a call has begun to connect. So in the event of this happening,
+//  each function of CFaxHayes must check that the fax server has been started.
+//	
+//	
+	{
+	LOGTEXT(_L8("CFaxHayes::ConstructL()"));
+	iDataDirection = EUnknown;
+	}
+
+CFaxHayes::~CFaxHayes()
+	{
+	iOwner->RemoveFax(this);
+	iPhoneGlobals->iNotificationStore->RemoveClientFromLastEvents(this);
+	}
+
+CTelObject::TReqMode CFaxHayes::ReqModeL(const TInt aIpc)
+	{
+	TReqMode reqMode = CFaxBase::ReqModeL(aIpc);
+	if ((reqMode & KReqModeFlowControlObeyed) && iPhoneGlobals->iPhoneStatus.iDataPortLoaned)
+		{
+		LOGTEXT2(_L8("ReqModeL Leaving with KErrInUse as data port is loaned (aIpc=%d)"),aIpc);
+		User::Leave(KErrInUse);
+		}
+	return reqMode;
+	}
+
+TInt CFaxHayes::RegisterNotification(const TInt /*aIpc*/)
+	{
+	return KErrNone;
+	}
+TInt CFaxHayes::DeregisterNotification(const TInt /*aIpc*/)
+	{
+	return KErrNone;
+	}
+
+void CFaxHayes::Init()
+	{}
+
+TInt CFaxHayes::CheckAndSetRegistrationParams(const TInt /*aIpc*/,const TDes8* /*aDes1*/,const TDes8* /*aDes2*/)
+	{
+	return KErrNone;
+	}
+
+TInt CFaxHayes::Read(const TTsyReqHandle aTsyReqHandle, TDes8* aDes)
+//
+//	Read fax data into descriptor, asynchronously. Use NotificationStore to notify client 
+//	when completed
+//
+    {
+	if (iOwner->iFaxSession==NULL)
+		{
+		ReqCompleted(aTsyReqHandle,KErrNotReady);
+		return KErrNone;
+		}	
+	LOGTEXT(_L8("Fax:\tCalling RxFaxData"));
+	iDataDirection = EReceiveData;
+	CFaxSession* session = iOwner->iFaxSession;
+
+	iPhoneGlobals->iNotificationStore->RegisterNotification(EReadOrWriteFax,aTsyReqHandle,this);
+	session->RxFaxData(*aDes);
+	return KErrNone;
+	}
+
+TInt CFaxHayes::Write(const TTsyReqHandle aTsyReqHandle, TDesC8* aDes)
+//
+//	Send fax data in descriptor to fax module, asynchronously
+//
+    {
+	if (iOwner->iFaxSession==NULL)
+		{
+		ReqCompleted(aTsyReqHandle,KErrNotReady);
+		return KErrNone;
+		}	
+	LOGTEXT(_L8("Fax:\tCalling TxFaxData"));
+	iDataDirection = ESendData;
+	CFaxSession* session = iOwner->iFaxSession;
+	iPhoneGlobals->iNotificationStore->RegisterNotification(EReadOrWriteFax,aTsyReqHandle,this);
+	session->TxFaxData(*aDes);
+	return KErrNone;
+	}
+
+TInt CFaxHayes::WaitForEndOfPage(const TTsyReqHandle aTsyReqHandle)
+//
+//	Send request for notification of end of page to fax module
+//
+    {
+	if (iOwner->iFaxSession==NULL)
+		{
+		ReqCompleted(aTsyReqHandle,KErrNotReady);
+		return KErrNone;
+		}	
+	LOGTEXT(_L8("Fax:\tCalling Wait for end of page"));
+	CFaxSession* session = iOwner->iFaxSession;
+	if (iDataDirection==EUnknown)
+		{
+		ReqCompleted(aTsyReqHandle,KErrUnknown); // client hasn't read or written data yet
+		return KErrNone;
+		}
+	iPhoneGlobals->iNotificationStore->RegisterNotification(EEndOfFaxPage,aTsyReqHandle,this);
+	LOGTEXT(_L8("Fax:\tEnd Of Page Notification lodged"));	
+	if (iDataDirection==EReceiveData)
+		session->RxPostPage();
+	else 
+		session->TxPostPage();
+	return KErrNone;
+	}
+
+TInt CFaxHayes::TerminateFaxSession(const TTsyReqHandle aTsyReqHandle)
+//
+//	Cancel the entire fax session. Server completes fax notification requests that it knows
+//	as notifications. TSY treats ReadOrWrite and EndOfPage as notifications although they 
+//  have no Cancel function, so it must remove them from its notification list here 
+//	explicitly
+//
+    {
+	if (iOwner->iFaxSession==NULL)
+		{
+		ReqCompleted(aTsyReqHandle,KErrNotReady);
+		return KErrNone;
+		}	
+	LOGTEXT(_L8("Fax:\tCancelling fax session"));
+	CFaxSession* session= iOwner->iFaxSession;
+	session->Cancel();
+	iPhoneGlobals->iNotificationStore->CheckNotification(session,EFaxSessionTerminated,KErrCancel);
+	ReqCompleted(aTsyReqHandle,KErrNone);	
+	return KErrNone;
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/multimodetsy/hayes/FAX.H	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,67 @@
+// 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
+ @internalAll 
+*/
+
+#ifndef __FAX_H__
+#define __FAX_H__
+
+#include "CALL.H"
+#include "ETELFAX.H"
+
+//
+// CFaxHayes
+//
+
+class CFaxHayes : public CFaxBase
+/**
+@internalComponent
+*/
+	{
+public:
+	enum TDataDirection
+		{
+		ESendData,
+		EReceiveData,
+		EUnknown
+		};
+	static CFaxHayes* NewL(CCallMobileFax* aCallFaxHayes,CPhoneGlobals* aPhoneGlobals);
+	CFaxHayes(CCallMobileFax* aCallFaxHayes,CPhoneGlobals* aPhoneGlobals);
+	void ConstructL();
+	~CFaxHayes();
+	virtual void Init();
+	static void CloseFax(TAny* aObj);
+public: 
+	virtual CTelObject::TReqMode ReqModeL(const TInt aIpc);
+	virtual TInt RegisterNotification(const TInt aIpc);
+	virtual TInt DeregisterNotification(const TInt aIpc);
+    virtual TInt Read(const TTsyReqHandle aTsyReqHandle,TDes8* aFaxPage);
+    virtual TInt Write(const TTsyReqHandle aTsyReqHandle,TDesC8* aFaxPage);
+	virtual TInt WaitForEndOfPage(const TTsyReqHandle aTsyReqHandle);
+	virtual TInt TerminateFaxSession(const TTsyReqHandle aTsyReqHandle);
+	virtual TInt CheckAndSetRegistrationParams(const TInt aIpc,const TDes8* aDes1,const TDes8* aDes2);
+	RHandleBase* GlobalKernelObjectHandle();
+	
+
+private:
+	CPhoneGlobals* iPhoneGlobals;
+	CCallMobileFax* iOwner;
+	TDataDirection iDataDirection;
+	};
+
+#endif

--- a/telephonyserverplugins/multimodetsy/hayes/LINE.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/LINE.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -903,6 +903,143 @@
 		}
 	}
 
+//
+// CLineMobileFax
+// Fax Specific Line Functionality
+//
+CLineMobileFax* CLineMobileFax::NewL(CATIO* aATIO, CATInit* aInit,CPhoneGlobals* aPhoneGlobals,const TName& aName)
+	{
+	CLineMobileFax* FaxLine=new(ELeave) CLineMobileFax(aATIO,aInit,aPhoneGlobals);
+	TCleanupItem newLineFaxHayesClose(CloseLine,FaxLine);
+	CleanupStack::PushL(newLineFaxHayesClose);
+	FaxLine->ConstructL(aName);
+	CleanupStack::Pop();
+	return FaxLine;
+	}
+
+CLineMobileFax::CLineMobileFax(CATIO* aATIO, CATInit* aInit,CPhoneGlobals* aPhoneGlobals)
+	:CLineMobile(aATIO,aInit,aPhoneGlobals)
+	{}
+
+void CLineMobileFax::ConstructL(const TName& aName)
+//
+//	Constructs a call which is to be used only when an incoming call arrives
+//	and no client has designated an existing call to answer it. TSY holds responsibility to close 
+//	it unless a RING occurs, when the line will add the call to the linked list of calls 
+//  and alert any interested clients that a "new" call has been created - if any client then
+//	opens a handle on it, the TSY relinquishes any responsibility to close it in the future
+//	as the client has that responsibility. When the client opens a handle on it, using OpenByName
+//	the line will create a new PreAlloc'ed call. If no client opens a handle, when the line 
+//	stops ringing the line will remove the pre-alloc'ed call from the list and keep the pointer
+//	to it separately in CLineHayes::iPreAlloc, so any subsequent attempt by a client to 
+//  open a handle on it will fail with KErrDoesNotExist or something similar. 
+//
+	{
+	CLineHayes::ConstructL(aName);
+	TName preAllocName;
+	GenerateName(preAllocName);
+	CCallMobileFax* newCall=CCallMobileFax::NewL(iIo,iInit,iPhoneGlobals,preAllocName);
+	TCleanupItem newLineClose(CloseLine,newCall);
+	CleanupStack::PushL(newLineClose); 
+	newCall->SetNameL(&preAllocName);
+	newCall->SetOwnedByTSY();
+	newCall->SetOwner(this);	
+	iPreAlloc = CCallEntry::NewL(newCall);
+	CleanupStack::Pop();
+	}
+
+CLineMobileFax::~CLineMobileFax()
+	{}
+
+void CLineMobileFax::GenerateName(TDes& aName) 
+	{
+	aName.Append(KFaxCallName);
+	aName.AppendNum(iNameIndex++);
+	}
+
+CTelObject* CLineMobileFax::OpenNewObjectByNameL(const TDesC& aName)
+//
+//	Open a Fax call 
+//
+	{
+	CCallEntry* entry = NULL;
+	entry=CheckNewObject(aName); //if found in call list, must be a pre-alloc'ed call
+	if (!entry)	
+		{
+		CCallMobileFax* newCall=CCallMobileFax::NewL(iIo,iInit,iPhoneGlobals,aName);
+		TCleanupItem newLineClose(CloseLine,newCall);
+		CleanupStack::PushL(newLineClose); 
+		AppendNewCallL(newCall);
+		CleanupStack::Pop();
+		iPhoneGlobals->iNotificationStore->CheckNotification(this,ECallAdded);
+		return newCall;
+		}
+	else  // this is a pre-allocated call
+		{
+		TName preAllocatedCallName;	// pre-allocate next call
+		GenerateName(preAllocatedCallName);
+		CCallMobileFax* call=CCallMobileFax::NewL(iIo,iInit,iPhoneGlobals,preAllocatedCallName);
+		call->SetOwnedByTSY();
+		(void)User::LeaveIfError(call->SetName(&preAllocatedCallName));
+		call->SetOwner(this);
+		iPreAlloc = CCallEntry::NewL(call);
+
+		CCallHayes* oldpreAllocCall = entry->iCallHayes;
+		oldpreAllocCall->SetUnownedByTSY();
+		return oldpreAllocCall;
+		}
+	}
+
+CTelObject* CLineMobileFax::OpenNewObjectL(TDes& aNewName)
+//
+//	Open a fax call
+//
+	{
+	GenerateName(aNewName);
+	CCallMobileFax* newCall=CCallMobileFax::NewL(iIo,iInit,iPhoneGlobals,aNewName);
+	TCleanupItem newLineClose(CloseLine,newCall);
+	CleanupStack::PushL(newLineClose); 
+	AppendNewCallL(newCall);
+	CleanupStack::Pop();
+	iPhoneGlobals->iNotificationStore->CheckNotification(this,ECallAdded);
+	return newCall;
+	}
+
+TInt CLineMobileFax::GetCaps(const TTsyReqHandle aTsyReqHandle,RLine::TCaps* aLineCaps)
+	{
+	aLineCaps->iFlags = RLine::KCapsEventIncomingCall;
+	if (iPhoneGlobals->iPhoneStatus.iDataAndFaxFlags & KFaxCaps)
+		{
+		aLineCaps->iFlags |= RLine::KCapsFax;
+		}
+	ReqCompleted(aTsyReqHandle,KErrNone);
+	return KErrNone;
+	}
+
+TInt CLineMobileFax::GetCallInfo(const TTsyReqHandle aTsyReqHandle,TCallInfoIndex* aCallInfoIndex)
+//
+//	Provide info about fax call
+//
+	{
+	LOGTEXT(_L8("FaxLine:\tGet Fax Call Info"));
+	CCallEntry* callEntry;
+	TDblQueIter<CCallEntry> iter(iCalls);
+	iter.SetToFirst();
+	for (TInt i=0;i<(TInt)(aCallInfoIndex->iIndex);i++)
+		{
+		iter++;
+		}
+	callEntry=iter;
+	if (callEntry)
+		{
+		callEntry->iCallHayes->GetCallInfo(aCallInfoIndex);
+		aCallInfoIndex->iInfo.iCallCapsFlags |= RCall::KCapsFax;
+		ReqCompleted(aTsyReqHandle,KErrNone);
+		}
+	else
+		ReqCompleted(aTsyReqHandle,KErrNotFound);
+	return KErrNone;
+	}
 
 CCallEntry* CCallEntry::NewL(CCallHayes* aCallHayes)
 //

--- a/telephonyserverplugins/multimodetsy/hayes/LINE.H	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/LINE.H	Wed Sep 01 12:40:21 2010 +0100
@@ -187,6 +187,36 @@
 	void ConstructL(const TName& aName);
 	};
 
+//
+// CLineMobileFax - Fax Specific Line Functionality
+//
+class CCallMobileFax;
+class CLineMobileFax : public CLineMobile
+/**
+@internalComponent
+*/
+	{
+public:
+	static CLineMobileFax* NewL(CATIO* aATIO,CATInit* aInit,CPhoneGlobals* aPhoneGlobals,const TName& aName);
+	CLineMobileFax(CATIO* aATIO,CATInit* aInit,CPhoneGlobals*);
+	~CLineMobileFax();
+
+// MTelObjectTSY pure virtuals
+	virtual CTelObject* OpenNewObjectByNameL(const TDesC& aName);
+	virtual CTelObject* OpenNewObjectL(TDes& aNewName);
+
+// MLineBaseTSY pure virtuals
+	virtual TInt GetCaps(const TTsyReqHandle aTsyReqHandle,RLine::TCaps* aCaps);
+    virtual TInt GetCallInfo(const TTsyReqHandle,TCallInfoIndex*);
+
+protected:
+	void GenerateName(TDes& aName);
+	void ConstructL(const TName& aName);
+
+public:
+	TBool iFaxOpened;	// so that a CCallHayes instance knows whether another CCallHayes has opened a CFaxHayes object
+	};
+
 class CCallEntry : public CBase
 /**
 @internalComponent

--- a/telephonyserverplugins/multimodetsy/hayes/NOTIFY.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/NOTIFY.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -13,7 +13,7 @@
 // Description:
 //
 
-
+#include "ETELFAX.H"
 #include "PHONE.H"
 #include "LINE.H"
 #include "CALL.H"

--- a/telephonyserverplugins/multimodetsy/hayes/PHONE.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/PHONE.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -282,6 +282,14 @@
 			iPhoneGlobals->iPhoneStatus.iLineStatus = RCall::EStatusIdle;
 		return iDataLine;
 		}
+	else if (!aName.CompareF(KFaxLineName))
+		{
+		__ASSERT_ALWAYS(iFaxLine==NULL,Panic(ELineAlreadyExists));
+		iFaxLine=CLineMobileFax::NewL(iIo,iInit,iPhoneGlobals,aName);
+		if (iPhoneGlobals->iPhoneStatus.iLineStatus == RCall::EStatusUnknown)
+			iPhoneGlobals->iPhoneStatus.iLineStatus = RCall::EStatusIdle;
+		return iFaxLine;
+		}
 	
 	else if (!aName.CompareF(KVoiceLineName)) //Added for Java Demo 4.4.99
 		{
@@ -459,7 +467,21 @@
 //
 	{
 	LOGTEXT(_L8("Phone:\tGet Line Info"));
-	 if (aParams->iIndex==KDataLineIndex)
+	if (aParams->iIndex==KFaxLineIndex)
+		{
+		if (iFaxLine!=NULL)
+			{
+			aParams->iInfo.iStatus = iPhoneGlobals->iPhoneStatus.iLineStatus;
+			aParams->iInfo.iName = iFaxLine->iLineName;
+			aParams->iInfo.iLineCapsFlags = (RLine::KCapsFax|RLine::KCapsEventIncomingCall);
+			}
+		else
+			{
+			aParams->iInfo = iDefaultFaxLineInfo;
+			}
+		ReqCompleted(aTsyReqHandle,KErrNone);
+		}
+	else if (aParams->iIndex==KDataLineIndex)
 		{
 		if (iDataLine!=NULL)
 			{
@@ -501,6 +523,8 @@
 	{
 	if (aLineHayes == iDataLine)
 		iDataLine=NULL;
+	if (aLineHayes == iFaxLine)
+		iFaxLine=NULL;
 	if (aLineHayes == iVoiceLine)
 		iVoiceLine=NULL;
 	}
@@ -527,6 +551,9 @@
 		CLineHayes* line=NULL;
 		switch (aIndex)
 			{
+		case KFaxLineIndex:
+			line=iFaxLine;
+			break;
 		case KDataLineIndex:
 			line=iDataLine;
 			break;
@@ -572,7 +599,25 @@
 		LOGTEXT(_L8("SetAmbiguousDataFaxCallRinging()\tInterpretting as data call"));
 		return;
 		}
-	// So both lines MIGHT exist.  It's then down to Notify on incoming call notifications,
+	if((iFaxLine)&&(iFaxLine->AnswerIfPossible()))		// Second priority: if we're waiting for a Fax call, answer it
+		{
+		LOGTEXT(_L8("SetAmbiguousDataFaxCallRinging()\tInterpretting as fax call"));
+		return;
+		}
+// If there are no "answer an incoming call" requests, then see if we can determine it from the lines that are open...
+	if(!iFaxLine && iDataLine)	
+		{
+		LOGTEXT(_L8("SetAmbiguousDataFaxCallRinging()\tLine object creation: SetPreAllocCall on DataLine"));
+		iDataLine->SetPreAllocCall();
+		return;
+		}
+	if(!iDataLine && iFaxLine)
+		{
+		LOGTEXT(_L8("SetAmbiguousDataFaxCallRinging()\tLine object creation: SetPreAllocCall on FaxLine"));
+		iFaxLine->SetPreAllocCall();
+		return;
+		}
+// So both lines MIGHT exist.  It's then down to Notify on incoming call notifications,
 // and we'll make a priority call in favour of data...
 // First ensure that either a Data line or a Fax line does exist (Nokia 7110 fix: returns
 // +CRING: REL ASYNC for a voice call (hence a voice line is created). This response
@@ -581,7 +626,8 @@
 		{
 		LOGTEXT(_L8("SetAmbiguousDataFaxCallRinging()\tA DataLine has been found. Now checking for an outstanding Notification"));
 		
-		if(iDataLine->IsNotifyIncomingCallOutstanding())
+		if((iDataLine->IsNotifyIncomingCallOutstanding())&&
+		   (!iFaxLine->IsNotifyIncomingCallOutstanding()))
 			{
 			LOGTEXT(_L8("SetAmbiguousDataFaxCallRinging()\tNotify: SetPreAllocCall on DataLine"));
 			iDataLine->SetPreAllocCall();
@@ -589,6 +635,18 @@
 		}
 	else 
 		LOGTEXT(_L8("SetAmbiguousDataFaxCallRinging()\tNo DataLine has been found; this may be a voice call"));
+	if (iFaxLine)
+		{
+		LOGTEXT(_L8("SetAmbiguousDataFaxCallRinging()\tA FaxLine has been found. Now checking for an outstanding Notification"));
+		if ((iFaxLine->IsNotifyIncomingCallOutstanding()) &&
+			(!iDataLine->IsNotifyIncomingCallOutstanding()))
+			{	
+			LOGTEXT(_L8("SetAmbiguousDataFaxCallRinging()\tNotify: SetPreAllocCall on FaxLine"));
+			iFaxLine->SetPreAllocCall();
+			}
+		}
+	else 
+		LOGTEXT(_L8("SetAmbiguousDataFaxCallRinging()\tNo FaxLine has been found; this may be a voice call"));
 	}
 
 void CPhoneHayes::StopRinging()
@@ -600,6 +658,11 @@
 										// the call may have been opened by a client but not
 										// answered.
 		}
+	if (iFaxLine)
+		{
+		(void)iFaxLine->StopMyCallRinging();
+		iFaxLine->ResetPreAllocCall();	// ditto
+		}
 	if (iVoiceLine)
 		{
 		(void)iVoiceLine->StopMyCallRinging();
@@ -617,7 +680,8 @@
 	{
 	if (iDataLine)
 		iDataLine->SetCallsHookStatus(aHookStatus);
-	
+	if (iFaxLine)
+		iFaxLine->SetCallsHookStatus(aHookStatus);
 	}
 
 TBool CPhoneHayes::CheckForOutstandingAnswer() const
@@ -628,7 +692,8 @@
 	TBool check=EFalse;
 	if (iDataLine)
 		check = iDataLine->CheckForOutstandingAnswer();
-	
+	if (!check && iFaxLine)
+		check = iFaxLine->CheckForOutstandingAnswer();
 	if (!check && iVoiceLine)
 		check = iVoiceLine->CheckForOutstandingAnswer();
 	return check;
@@ -636,6 +701,12 @@
 
 void CPhoneHayes::CancelOtherRingingCall(CLineHayes* aLine) const
 	{
+	if (iFaxLine && aLine!=iFaxLine)
+		{
+		(void)iFaxLine->StopMyCallRinging();
+		iFaxLine->ResetPreAllocCall();	
+		}
+
 	if (iDataLine && aLine!=iDataLine)
 		{
 		(void)iDataLine->StopMyCallRinging();

--- a/telephonyserverplugins/multimodetsy/hayes/SCHAT.CPP	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/hayes/SCHAT.CPP	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -147,6 +147,7 @@
 				{
 				LOGTEXT2(_L8("SChat:\tFound match against =>%S<"), &cs->iMatch);
 				iNotify->ChatStringMatchL(cs);
+				cs = iter;	// In case user removed cs;
 				}
 			}
 		}
@@ -159,6 +160,7 @@
 				{
 				LOGTEXT2(_L8("SChat:\tFound match against partial line =>%S<"), &cs->iMatch);
 				iNotify->ChatStringMatchL(cs);
+				cs = iter;	// In case user removed cs;
 				}
 			}
 		}

--- a/telephonyserverplugins/multimodetsy/test/Te_LoopBack/Te_LoopBack.script	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/test/Te_LoopBack/Te_LoopBack.script	Wed Sep 01 12:40:21 2010 +0100
@@ -525,6 +525,18 @@
 //
 END_TESTCASE TEL-MMTSY-NA-0039
 
+START_TESTCASE TEL-MMTSY-NA-0040
+//!@SYMTestCaseID TEL-MMTSY-NA-0040
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc
+//!@SYMTestPriority critical
+//!@SYMTestActions Test signal strength information for an incoming fax
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+//
+RUN_TEST_STEP 60 Te_LoopBack TestDriveSsFax
+//
+END_TESTCASE TEL-MMTSY-NA-0040
 
 START_TESTCASE TEL-MMTSY-NA-0041
 //!@SYMTestCaseID TEL-MMTSY-NA-0041
@@ -552,6 +564,32 @@
 //
 END_TESTCASE TEL-MMTSY-NA-0042
 
+START_TESTCASE TEL-MMTSY-NA-0043
+//!@SYMTestCaseID TEL-MMTSY-NA-0043
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Drive Prem Close
+//!@SYMTestPriority critical
+//!@SYMTestActions Tests performing a premature closure of a fax session
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+//
+RUN_TEST_STEP 90 Te_LoopBack TestDrivePremClose
+//
+END_TESTCASE TEL-MMTSY-NA-0043
+
+START_TESTCASE TEL-MMTSY-NA-0044
+//!@SYMTestCaseID TEL-MMTSY-NA-0044
+//!@SYMREQ REQ0000
+//!@SYMTestCaseDesc Test Drive Two Fax Rx
+//!@SYMTestPriority critical
+//!@SYMTestActions Test two fax receive
+//!@SYMTestExpectedResults Pass
+//!@SYMTestType CT
+//
+RUN_TEST_STEP 90 Te_LoopBack TestDriveTwoFaxRx
+//
+END_TESTCASE TEL-MMTSY-NA-0044
+
 START_TESTCASE TEL-MMTSY-NA-0045
 //!@SYMTestCaseID TEL-MMTSY-NA-0045
 //!@SYMREQ REQ0000

--- a/telephonyserverplugins/multimodetsy/test/Te_LoopBack/Te_LoopBackcincall.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/test/Te_LoopBack/Te_LoopBackcincall.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -23,6 +23,7 @@
 #include <e32test.h>
 #include <mmretrieve.h>
 #include <etelmm.h>
+#include <faxstd.h>
 #include "Te_LoopBackcincall.h"
 #include "../../hayes/TSYCONFG.H" // for KInternetAccessPoint
 
@@ -57,7 +58,7 @@
 	{
 	_LIT(KVoiceLineName, "Voice");
 	_LIT(KDataLineName,  "Data");
-	//_LIT(KFaxLineName,   "Fax");
+	_LIT(KFaxLineName,   "Fax");
 
 	RLine voiceLine;
 	INFO_PRINTF1(_L("Opening Voice Line\n"));
@@ -73,6 +74,13 @@
 	INFO_PRINTF1(_L("Opening New Data Call\n"));
 	TESTL(dataCall.OpenNewCall(dataLine) == KErrNone);
 
+	RLine faxLine;
+	INFO_PRINTF1(_L("Opening Fax Line\n"));
+	TESTL(faxLine.Open(iPhone,KFaxLineName) == KErrNone);
+	RCall faxCall;
+	INFO_PRINTF1(_L("Opening New Fax Call\n"));
+	TESTL(faxCall.OpenNewCall(faxLine) == KErrNone);
+
 	TRequestStatus stat1, stat2, stat3, reqStatus;
 
 	RMobilePhone::TMMTableSettings tableSettings;
@@ -86,30 +94,49 @@
 	INFO_PRINTF1(_L("Answering a Voice Call...\n"));
 	voiceCall.AnswerIncomingCall(stat1);
 	dataCall.AnswerIncomingCall(stat2);
+	faxCall.AnswerIncomingCall(stat3);
 	User::WaitForRequest(stat1);
 	TESTL(stat1 == KErrNone);
 	dataCall.AnswerIncomingCallCancel();
+	faxCall.AnswerIncomingCallCancel();
 	User::WaitForRequest(stat2);
+	User::WaitForRequest(stat3);
 	User::After(1000000L);
 	INFO_PRINTF1(_L("Hangup a Voice Call...\n"));
 	TESTL(voiceCall.HangUp() == KErrNone);
 
+// Now wait for an incoming fax call...
+	INFO_PRINTF1(_L("Answering a Fax Call...\n"));
+	RCall::TFaxSessionSettings faxSessionSettings;
+	faxSessionSettings.iMode = RCall::EReceive;
+	faxSessionSettings.iFaxRetrieveType = RCall::EFaxOnDemand;
+	faxSessionSettings.iFaxClass = EClassAuto;
+	faxSessionSettings.iFaxId.Zero();
+	faxSessionSettings.iMaxSpeed = 14400;
+	faxSessionSettings.iMinSpeed = 12000;
+	faxSessionSettings.iRxResolution = EFaxNormal;
+	faxSessionSettings.iRxCompression = EModifiedHuffman;
+	faxCall.SetFaxSettings(faxSessionSettings);
+
+	faxCall.AnswerIncomingCall(stat3);
+	User::WaitForRequest(stat3);
+	TESTL(stat3 == KFaxErrReceiveTimeout); 		// We don't actually send any data
+	User::After(300000L);
+	INFO_PRINTF1(_L("Hangup a Fax Call...\n"));
+	TESTL(faxCall.HangUp() == KErrNone);
+
 // Now wait for an incoming data call...
 	INFO_PRINTF1(_L("Answering a Data Call\n"));
-	TInt ret = dataCall.AnswerIncomingCall();
-	INFO_PRINTF2(_L("ret=%d "),ret);
-	if (ret == KErrNone)
-	    {
-	    SetTestStepResult(EPass);
-	    }
-	else
-	    SetTestStepResult(EFail);
-	    
-	 User::After(300000L);
+	TESTL(dataCall.AnswerIncomingCall() == KErrNone);
+	User::After(300000L);
 	TESTL(dataCall.HangUp() == KErrNone);
 
 //	Get the FaxSettings before closing the line and call
+	TInt ret = faxCall.GetFaxSettings(faxSessionSettings);
+	TEST_CHECKL(ret, KErrNone, _L("*** Failed to get fax setttings ***"));
 	
+	faxCall.Close();
+	faxLine.Close();
 	dataCall.Close();
 	dataLine.Close();
 	voiceCall.Close();

--- a/telephonyserverplugins/multimodetsy/test/Te_LoopBack/Te_LoopBackcincall.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/test/Te_LoopBack/Te_LoopBackcincall.h	Wed Sep 01 12:40:21 2010 +0100
@@ -166,7 +166,52 @@
 	{	ERxString, (TText8*)"ATH",			0, ERxEvent	},
 	{	ETxString, (TText8*)"NO CARRIER",	0, ETxEvent	},
 
+//
+//  Now, finally, we handle an Incoming Call Fax request
+//
+	{	EWait,		NULL,					4,	ETimeOutEvent	},
+	{	ETxString, (TText8*)"\r\n+CRING: FAX\r\n",	0, ETxEvent|EFailIfTimeOut	},
 
+//	{	ERxString, (TText8*)"ATM0L0X3S8=0",	0, ERxEvent	},
+//	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+FCLASS=2",	0, ERxEvent	},
+	{	ETxString, (TText8*)"\r\nOK\r\n",	0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT",			0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+FDCC=?",	0, ERxEvent	},
+	{	ETxString, (TText8*)"(0-1),(0-3),(0-4),(0-2),(0-3),(0-1),(0-1),(0-7)",
+											0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+FDCC=0,3,0,2,0,0,0,0",	0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+FAA=0",		0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+FCR=1",		0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+FLID=\"",	0, ERxEvent	},
+	{	ERxString, (TText8*)"\"",			0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"ATA",			0, ERxEvent	},
+	{	ETxString, (TText8*)"+FCO",			0, ETxEvent|EFailIfTimeOut	},
+	{	ETxString, (TText8*)"+FCS:0,3,0,2,0,0,0,0",			0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+FDR",		0, ERxEvent	},
+	{	ETxString, (TText8*)"CONNECT",		0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"ATH",			0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"ATE0+FCLASS=0",0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
 
 //
 // Now we handle an incoming data call
@@ -333,7 +378,49 @@
 	{	ERxString, (TText8*)"ATH",			0, ERxEvent	},
 	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
 
+	{	EWait,		NULL,					4,	ETimeOutEvent	},
+	{	ETxString, (TText8*)"\r\n+CRING: REL ASYNC\r\n",	0, ETxEvent|EFailIfTimeOut	},
 
+//	{	ERxString, (TText8*)"AT",			0, ERxEvent	},
+//	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+FCLASS=2",	0, ERxEvent	},
+	{	ETxString, (TText8*)"\r\nOK\r\n",	0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT",			0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+FDCC=?",	0, ERxEvent	},
+	{	ETxString, (TText8*)"(0-1),(0-3),(0-4),(0-2),(0-3),(0-1),(0-1),(0-7)",
+											0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+FDCC=0,3,0,2,0,0,0,0",	0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+FAA=0",		0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+FCR=1",		0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+FLID=\"",	0, ERxEvent	},
+	{	ERxString, (TText8*)"\"",			0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"ATA",			0, ERxEvent	},
+	{	ETxString, (TText8*)"+FCO",			0, ETxEvent|EFailIfTimeOut	},
+	{	ETxString, (TText8*)"+FCS:0,3,0,2,0,0,0,0",			0, ETxEvent|EFailIfTimeOut	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"AT+FDR",		0, ERxEvent	},
+	{	ETxString, (TText8*)"CONNECT",		0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"ATH",			0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
+
+	{	ERxString, (TText8*)"ATE0+FCLASS=0",0, ERxEvent	},
+	{	ETxStringOK, NULL,					0, ETxEvent|EFailIfTimeOut	},
 
 //
 // Now we handle an incoming data call

--- a/telephonyserverplugins/multimodetsy/test/Te_LoopBack/Te_LoopBackcssfax.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/test/Te_LoopBack/Te_LoopBackcssfax.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -26,7 +26,7 @@
 #include <e32test.h>
 #include <etelmm.h>
 #include <et_clsvr.h>
-
+#include <faxstd.h>
 
 #include "Te_LoopBackcssfax.h"
 #include "../../hayes/TSYCONFG.H" // for KInternetAccessPoint
@@ -104,6 +104,7 @@
 	TESTL(stat1==KErrAccessDenied);			// The port is "access denied" by this time
 
 	User::WaitForRequest(stat2);
+	TESTL(stat2==KFaxErrReceiveTimeout);		// We don't actually send any data
 	User::After(300000L);
 	TESTL(faxCall.HangUp()==KErrNone);

--- a/telephonyserverplugins/multimodetsy/test/Te_LoopBack/Te_LoopBackctwofaxrx.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/test/Te_LoopBack/Te_LoopBackctwofaxrx.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -22,6 +22,7 @@
 
 #include <e32test.h>
 #include <etelmm.h>
+#include <faxstd.h>
 #include "Te_LoopBackctwofaxrx.h"
 #include "../../hayes/TSYCONFG.H" // for KInternetAccessPoint
 
@@ -91,6 +92,7 @@
 	faxCall.SetFaxSettings(faxSessionSettings);
 	faxCall.AnswerIncomingCall(stat2);
 	User::WaitForRequest(stat2);
+	TESTL(stat2==KFaxErrReceiveTimeout);		// We don't actually send any data
 	User::After(300000L);
 	TESTL(faxCall.HangUp()==KErrNone);
 	faxCall.Close();
@@ -118,6 +120,7 @@
 	faxCall2.SetFaxSettings(faxSessionSettings);
 	faxCall2.AnswerIncomingCall(stat2);
 	User::WaitForRequest(stat2);
+	TESTL(stat2==KFaxErrReceiveTimeout);		// We don't actually send any data
 	User::After(300000L);
 	TESTL(faxCall2.HangUp()==KErrNone);
 	faxCall2.Close();

--- a/telephonyserverplugins/multimodetsy/test/Te_LoopBack/Te_Loopbackcfaxpremclose.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/test/Te_LoopBack/Te_Loopbackcfaxpremclose.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -23,6 +23,7 @@
 
 #include <e32test.h>
 #include <etelmm.h>
+#include <faxstd.h>
 #include "Te_Loopbackcfaxpremclose.h"
 #include "../../hayes/TSYCONFG.H" // for KInternetAccessPoint

--- a/telephonyserverplugins/simatktsy/group/commonsimatktsy.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/group/commonsimatktsy.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -28,6 +28,7 @@
 MACRO USING_CTSY_DISPATCHER
 #define USING_CTSY_DISPATCHER
 //#endif
+MACRO TF_SAT_LOGGING
 
 SOURCEPATH      ../src
 // SatTsy (the "main" module)
@@ -97,10 +98,12 @@
 
 USERINCLUDE     ../inc
 USERINCLUDE		../exportinc/utility
-USERINCLUDE		../traces
 
 #ifdef USING_CTSY_DISPATCHER
 USERINCLUDE		../exportinc
+
+//needed for tflogger.h (ideally change all "" to <> and remove)
+USERINCLUDE	../../common_tsy/commontsy/inc
 #endif //USING_CTSY_DISPATCHER
 
 
@@ -116,6 +119,8 @@
 LIBRARY         etelmm.lib      // ETel Multimode API
 LIBRARY         ETel.lib        // Etel server and core API
 
+#include <comms-infras/commsdebugutility.mmh>
+
 START WINS      
 BASEADDRESS     0x65000000
 END

--- a/telephonyserverplugins/simatktsy/group/cstktsyutility.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/group/cstktsyutility.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -24,9 +24,14 @@
 UID             0x1000008D 0x102078E0
 
 #define USING_CTSY_DISPATCHER
+MACRO TF_SAT_LOGGING
 USERINCLUDE     ../inc
 USERINCLUDE		../exportinc/utility
-USERINCLUDE		../traces
+
+#ifdef USING_CTSY_DISPATCHER
+//needed for tflogger.h (ideally change all "" to <> and remove
+USERINCLUDE	../../common_tsy/commontsy/inc
+#endif //USING_CTSY_DISPATCHER
 
 SOURCEPATH      ../utility/src
 
@@ -46,6 +51,8 @@
 // Symbian
 LIBRARY         euser.lib	// E32 user library
 
+#include <comms-infras/commsdebugutility.mmh>
+
 UNPAGED
 
 SMPSAFE

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyCallControlRequest.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyCallControlRequest.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -20,18 +20,13 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyCallControlRequestTraces.h"
-#endif
-
 #include <satcs.h>							// Etel SAT IPC definitions
 #include "CSatTsy.h"						// Tsy class header
 #include "CSatNotifyCallControlRequest.h"   // Tsy class header
 #include "CSatNotificationsTsy.h"			// Class header
 #include "CBerTlv.h"						// Ber Tlv data handling
 #include "CSatDataPackage.h"				// Parameter packing 
+#include "TfLogger.h"						// For TFLOGSTRING
 #include "TSatUtility.h"					// Utilities
 #include "CSatTsyReqHandleStore.h"			// Request handle class
 #include "cmmmessagemanagerbase.h"			// Message manager class for forwarding req.
@@ -46,13 +41,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_NEWL_1, "CSAT: CSatNotifyCallControlRequest::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::NewL");
    	CSatNotifyCallControlRequest* const satNotifyCallControlRequest = 
         new ( ELeave ) CSatNotifyCallControlRequest( aNotificationsTsy );
     CleanupStack::PushL( satNotifyCallControlRequest );
     satNotifyCallControlRequest->ConstructL();
     CleanupStack::Pop( satNotifyCallControlRequest );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_NEWL_2, "CSAT: CSatNotifyCallControlRequest::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::NewL, end of method");
     return satNotifyCallControlRequest;
     }
 
@@ -66,7 +61,8 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_DTOR_1, "CSAT: CSatNotifyCallControlRequest::~CSatNotifyCallControlRequest");
+    TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::\
+        ~CSatNotifyCallControlRequest");
     }
     
 // -----------------------------------------------------------------------------
@@ -92,7 +88,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_CONSTRUCTL_1, "CSAT: CSatNotifyCallControlRequest::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::ConstructL");
     }
 
 // -----------------------------------------------------------------------------
@@ -107,7 +103,7 @@
         const TDataPackage& aPackage 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_NOTIFY_1, "CSAT: CSatNotifyCallControlRequest::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::Notify");
 
     // Save data pointer to client side for completion
     iCallControlV2Pckg = reinterpret_cast<RSat::TCallControlV2Pckg*>( 
@@ -130,7 +126,7 @@
         const TTsyReqHandle aTsyReqHandle // Tsy request handle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_CANCELNOTIFICATION_1, "CSAT: CSatNotifyCallControlRequest::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::CancelNotification");   
     // Reset the request handle
     iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( CSatTsy::ESatNotifyCallControlRequestPCmdReqType );
@@ -151,7 +147,7 @@
         TInt aErrorCode 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFYL_1, "CSAT: CSatNotifyCallControlRequest::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::CompleteNotifyL");   
     RSat::TAlphaIdBuf alphaId;
     RSat::TControlResult result;
 	// Unpack data
@@ -173,7 +169,7 @@
         TInt aErrorCode                
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_COMPLETEALPHAID_1, "CSAT: CSatNotifyCallControlRequest::CompleteAlphaId");
+    TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::CompleteAlphaId");	
 
 	// Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
@@ -196,13 +192,15 @@
             callControlV2.SetCcGeneralResult( aResult );          
             callControlV2.SetAlphaId( validity, alphaIdTemp );  
             }
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_COMPLETEALPHAID_2,  "CSAT: CSatNotifyCallControlRequest::CompleteAlphaId completing" );
+        TFLOGSTRING( "CSAT: CSatNotifyCallControlRequest::CompleteAlphaId\
+            completing" );
         // Complete notification
         iNotificationsTsy->iSatTsy->ReqCompleted( reqHandle, aErrorCode );
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_COMPLETEALPHAID_3,  "CSAT: CSatNotifyCallControlRequest::CompleteAlphaId Request not ongoing" );
+        TFLOGSTRING( "CSAT: CSatNotifyCallControlRequest::CompleteAlphaId\
+            Request not ongoing" );
         }
     }

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyCloseChannel.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyCloseChannel.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyCloseChannelTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyCloseChannel.h" // Class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_NEWL_1, "CSAT: CSatNotifyCloseChannel::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::NewL");
    	CSatNotifyCloseChannel* const satNotifyCloseChannel = 
         new ( ELeave ) CSatNotifyCloseChannel( aNotificationsTsy );
     CleanupStack::PushL( satNotifyCloseChannel );
     satNotifyCloseChannel->ConstructL();
     CleanupStack::Pop( satNotifyCloseChannel );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_NEWL_2, "CSAT: CSatNotifyCloseChannel::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::NewL, end of method");
     return satNotifyCloseChannel;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_DTOR_1, "CSAT: CSatNotifyCloseChannel::~CSatNotifyCloseChannel");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::~CSatNotifyCloseChannel");
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +88,8 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_CONSTRUCTL_1, "CSAT: CSatNotifyCloseChannel::~CSatNotifyCloseChannel, does nothing");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::~CSatNotifyCloseChannel, \
+    	does nothing");
     }
 
 // -----------------------------------------------------------------------------
@@ -108,7 +104,7 @@
         const TDataPackage& aPackage    
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_NOTIFY_1, "CSAT: CSatNotifyCloseChannel::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::Notify");
 
     // Save data pointer to client side for completion
     iCloseChannelRspV2Pckg = reinterpret_cast<RSat::TCloseChannelV2Pckg*>( 
@@ -133,7 +129,7 @@
         const TTsyReqHandle aTsyReqHandle 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_CANCELNOTIFICATION_1, "CSAT: CSatNotifyCloseChannel::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CancelNotification");
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( CSatTsy::ESatNotifyCloseChannelPCmdReqType );
@@ -156,7 +152,7 @@
         TInt aErrorCode                  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_1, "CSAT: CSatNotifyCloseChannel::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CompleteNotifyL");
     TInt ret( KErrNone );
     // Unpack parameters
     TPtrC8* data;
@@ -206,7 +202,8 @@
 	            closeChannelV2.iAlphaId.iStatus = RSat::EAlphaIdNotPresent;            
 		        if ( KErrNotFound != returnValue )
 		            {
-		            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_2, "CSAT: CSatNotifyCloseChannel::CompleteNotifyL Alpha ID present");
+		            TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CompleteNotifyL\
+		            	Alpha ID present");
 		            TUint16 alphaIdLength = alphaIdentifier.GetLength();
 		            if ( alphaIdLength )
 		                {
@@ -226,7 +223,8 @@
 		                }
 		            else
 		                {
-		                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_3, "CSAT: CSatNotifyCloseChannel::CompleteNotifyL Alpha ID is NULL");
+		                TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CompleteNotifyL\
+		                	Alpha ID is NULL");
 		                closeChannelV2.iAlphaId.iStatus = RSat::EAlphaIdNull;
 		                }
 		            }
@@ -238,7 +236,8 @@
         	else
         		{
             	// Required values missing
-            	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_4, "CSAT: CSatNotifyCloseChannel::CompleteNotifyL, required values missing (Device Identities)");
+            	TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CompleteNotifyL,\
+            	    required values missing (Device Identities)");
             	ret = KErrCorrupt;
 	            CreateTerminalRespL( pCmdNumber, RSat::KErrorRequiredValuesMissing, KNullDesC16 );
         		}
@@ -252,7 +251,8 @@
         }
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_5, "CSAT: CSatNotifyCloseChannel::CompleteNotifyL Request not ongoing");
+		TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CompleteNotifyL\
+			Request not ongoing");
 		// Request not on, returning response immediately
 		TBuf16<1> additionalInfo;	
         additionalInfo.Append ( RSat::KNoSpecificMeProblem );
@@ -273,7 +273,7 @@
         TDes8* aRsp 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_1, "CSAT: CSatNotifyCloseChannel::TerminalResponseL");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::TerminalResponseL");
     TInt   ret( KErrNone );
     
     TBuf16<1> additionalInfo;
@@ -298,7 +298,8 @@
         && ( RSat::KBearerIndepProtocolError != rspV2.iGeneralResult ) 
         && ( RSat::KFramesError != rspV2.iGeneralResult ))
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_2, "CSAT: CSatNotifyCloseChannel::TerminalResponseL Invalid General Result");
+        TFLOGSTRING("CSAT: CSatNotifyCloseChannel::TerminalResponseL\
+        	Invalid General Result");
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -311,7 +312,8 @@
         	}
     	else
         	{
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_3, "CSAT: CSatNotifyCloseChannel::TerminalResponseL Invalid Additional Info");
+        	TFLOGSTRING("CSAT: CSatNotifyCloseChannel::TerminalResponseL\
+        		Invalid Additional Info");
         	ret = KErrCorrupt;
         	}
         }
@@ -321,7 +323,8 @@
     	}
     else
     	{
-    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_4, "CSAT: CSatNotifyCloseChannel::TerminalResponseL Invalid Additional Info type");
+    	TFLOGSTRING("CSAT: CSatNotifyCloseChannel::TerminalResponseL\
+    		Invalid Additional Info type");
     	ret = KErrCorrupt;
     	}
             
@@ -347,7 +350,7 @@
         const TDesC16& aAdditionalInfo	
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_CREATETERMINALRESPL_1, "CSAT: CSatNotifyCloseChannel::CreateTerminalRespL");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CreateTerminalRespL");
     TTlv tlvSpecificData;
     // Append general result tag
     tlvSpecificData.AddTag( KTlvResultTag );
@@ -364,7 +367,8 @@
         // Unsuccessful result requires an additional info byte
         for ( TInt i = 0; i < aAdditionalInfo.Length(); i++ )
         	{
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_CREATETERMINALRESPL_2, "CSAT: CSatNotifyCloseChannel::CreateTerminalRespL, Unsuccessful result");
+        	TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CreateTerminalRespL,\
+        	    Unsuccessful result");
         	tlvSpecificData.AddByte( static_cast<TUint8>( 
         	    aAdditionalInfo[i] ) );
         	}

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyDisplayText.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyDisplayText.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyDisplayTextTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyDisplayText.h"  // Class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -48,13 +43,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )  
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_NEWL_1, "CSAT: CSatNotifyDisplayText::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyDisplayText::NewL");
    	CSatNotifyDisplayText* const satNotifyDisplayText = 
         new ( ELeave ) CSatNotifyDisplayText( aNotificationsTsy );
     CleanupStack::PushL( satNotifyDisplayText );
     satNotifyDisplayText->ConstructL();
     CleanupStack::Pop( satNotifyDisplayText );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_NEWL_2, "CSAT: CSatNotifyDisplayText::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyDisplayText::NewL, end of method");
     return satNotifyDisplayText;
     }
 
@@ -65,7 +60,7 @@
 //  
 CSatNotifyDisplayText::~CSatNotifyDisplayText()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_DTOR_1, "CSAT: CSatNotifyDisplayText::~CSatNotifyDisplayText");
+    TFLOGSTRING("CSAT: CSatNotifyDisplayText::~CSatNotifyDisplayText");
     }
         
 // -----------------------------------------------------------------------------
@@ -91,7 +86,7 @@
         void
         )
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_CONSTRUCTL_1, "CSAT: CSatNotifyDisplayText::ConstructL");
+	TFLOGSTRING("CSAT: CSatNotifyDisplayText::ConstructL");
 	}
        	
 // -----------------------------------------------------------------------------
@@ -106,7 +101,7 @@
         const TDataPackage& aPackage 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_NOTIFY_1, "CSAT: CSatNotifyDisplayText::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyDisplayText::Notify");
     // Save data pointer to client side for completion
     iDisplayTextV2Pckg = reinterpret_cast<RSat::TDisplayTextV2Pckg*>( 
         aPackage.Des1n() );    
@@ -129,7 +124,7 @@
         const TTsyReqHandle aTsyReqHandle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_CANCELNOTIFICATION_1, "CSAT: CSatNotifyDisplayText::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifyDisplayText::CancelNotification");    
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( CSatTsy::ESatNotifyDisplayTextPCmdReqType );
@@ -152,13 +147,14 @@
         TInt aErrorCode                  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_1, "CSAT: CSatNotifyDisplayText::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyDisplayText::CompleteNotifyL");
     TInt ret( KErrNone );
 
     // Unpack parameters
     TPtrC8* data;
     aDataPackage->UnPackData( &data );
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_2, "CSAT: CSatNotifyDisplayText::CompleteNotifyL, dataLength: %d", data->Length());
+    TFLOGSTRING2("CSAT: CSatNotifyDisplayText::CompleteNotifyL, dataLength: \
+        %d", data->Length());
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( 
@@ -251,7 +247,8 @@
                 // Return terminal response immediately.
                 else
                     {            
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_3, "CSAT: CSatNotifyDisplayText::CompleteNotifyL, Text string empty");
+                    TFLOGSTRING("CSAT: CSatNotifyDisplayText::CompleteNotifyL,\
+                        Text string empty");  
 					CreateTerminalRespL( pCmdNumber, 
 					    RSat::KCmdDataNotUnderstood, KNullDesC16 );
 					// Indicate Client that response was corrupted
@@ -260,7 +257,8 @@
                 }    
 			else
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_4, "CSAT: CSatNotifyDisplayText::CompleteNotifyL, Test string missing");
+                TFLOGSTRING("CSAT: CSatNotifyDisplayText::CompleteNotifyL,\
+                    Test string missing");
 	            CreateTerminalRespL( 
 					pCmdNumber, RSat::KErrorRequiredValuesMissing,  
 					KNullDesC16 );
@@ -287,7 +285,8 @@
         } // End of if ( CSatTsy::ESatReqHandleUnknown != reqHandle )
     else 
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_5, "CSAT: CSatNotifyDisplayText::CompleteNotifyL, Request not ongoing");
+        TFLOGSTRING("CSAT: CSatNotifyDisplayText::CompleteNotifyL,\
+            Request not ongoing");
     	TBuf16<1> additionalInfo;
         // Request not on, returning response immediately
         additionalInfo.Append( RSat::KNoSpecificMeProblem );
@@ -307,7 +306,7 @@
         TDes8* aRsp  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_TERMINALRESPONSEL_1, "CSAT: CSatNotifyDisplayText::TerminalResponseL");
+    TFLOGSTRING("CSAT: CSatNotifyDisplayText::TerminalResponseL");
 
     TInt ret( KErrNone );
     TBuf16<1> additionalInfo;
@@ -329,7 +328,8 @@
         && ( RSat::KCmdBeyondMeCapabilities != rspV1.iGeneralResult )
         )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_TERMINALRESPONSEL_2, "CSAT: CSatNotifyDisplayText::TerminalResponseL, Invalid General Result");
+        TFLOGSTRING("CSAT: CSatNotifyDisplayText::TerminalResponseL,\
+            Invalid General Result");
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -344,7 +344,8 @@
 			}
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_TERMINALRESPONSEL_3, "CSAT: CSatNotifyDisplayText::TerminalResponseL, Invalid Additional Info");
+            TFLOGSTRING("CSAT: CSatNotifyDisplayText::TerminalResponseL,\
+                Invalid Additional Info");
             // Invalid additional info field
             ret = KErrCorrupt;
             }
@@ -369,7 +370,7 @@
         const TDesC16& aAdditionalInfo
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_CREATETERMINALRESPL_1, "CSAT: CSatNotifyDisplayText::CreateTerminalRespL");
+    TFLOGSTRING("CSAT: CSatNotifyDisplayText::CreateTerminalRespL");
     TTlv tlvSpecificData;
     // Create General Result TLV here
     tlvSpecificData.AddTag( KTlvResultTag );

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyGetChannelStatus.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyGetChannelStatus.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyGetChannelStatusTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyGetChannelStatus.h"  // Class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_NEWL_1, "CSAT: CSatNotifyGetChannelStatus::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::NewL");
    	CSatNotifyGetChannelStatus* const satNotifyGetChannelStatus = 
         new ( ELeave ) CSatNotifyGetChannelStatus( aNotificationsTsy );
     CleanupStack::PushL( satNotifyGetChannelStatus );
     satNotifyGetChannelStatus->ConstructL();
     CleanupStack::Pop( satNotifyGetChannelStatus );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_NEWL_2, "CSAT: CSatNotifyGetChannelStatus::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::NewL, end of method");
     return satNotifyGetChannelStatus;
     }
 
@@ -67,7 +62,8 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_DTOR_1, "CSAT: CSatNotifyGetChannelStatus::~CSatNotifyGetChannelStatus");
+    TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::~CSatNotifyGetChannelStatus"
+        );
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +89,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_CONSTRUCTL_1, "CSAT: CSatNotifyGetChannelStatus::ConstructL, does nothing");
+    TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::ConstructL, does nothing");
     }
 
 // -----------------------------------------------------------------------------
@@ -108,7 +104,7 @@
         const TDataPackage& aPackage 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_NOTIFY_1, "CSAT: CSatNotifyGetChannelStatus::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::Notify");
     // Save data pointers to client side for completion
     iGetChannelStatusRspV2Pckg = reinterpret_cast<RSat::TGetChannelStatusV2Pckg*>( 
         aPackage.Des1n() );         
@@ -131,7 +127,7 @@
         const TTsyReqHandle aTsyReqHandle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_CANCELNOTIFICATION_1, "CSAT: CSatNotifyGetChannelStatus::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::CancelNotification");
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( CSatTsy::ESatNotifyGetChannelStatusPCmdReqType );
@@ -154,7 +150,7 @@
         TInt aErrorCode                 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_COMPLETENOTIFYL_1, "CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL");
 
     TInt ret( KErrNone );	
     // Unpack parameters
@@ -181,7 +177,8 @@
         // Complete right away if error has occured, otherwise continue..
         if ( KErrNone == aErrorCode )
             {
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_COMPLETENOTIFYL_2, "CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL aErrorCode: %d", aErrorCode );
+            TFLOGSTRING2("CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL\
+                aErrorCode: %d", aErrorCode );
 	        // Fill the Get Channel status structure             
 	        RSat::TGetChannelStatusV2& channelStatusV2 = 
 	            ( *iGetChannelStatusRspV2Pckg )();
@@ -197,7 +194,8 @@
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_COMPLETENOTIFYL_3, "CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL Request not ongoing");
+		TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL\
+		    Request not ongoing");
    		// Request not on, returning response immediately
 		TBuf16<1> additionalInfo;
 		additionalInfo.Append( RSat::KNoSpecificMeProblem );
@@ -219,7 +217,7 @@
         TDes8* aRsp
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSEL_1, "CSAT: CSatNotifyGetChannelStatus::TerminalResponseL");
+    TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::TerminalResponseL");
     TInt   ret( KErrNone );
     
     TBuf16<RSat::KAdditionalInfoMaxSize> additionalInfo;
@@ -243,7 +241,8 @@
         && ( RSat::KCmdNumberNotKnown != rspV2.iGeneralResult )
         && ( RSat::KErrorRequiredValuesMissing != rspV2.iGeneralResult ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSEL_2, "CSAT: CSatNotifyGetChannelStatus::TerminalResponseL, Invalid General Result");
+        TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::TerminalResponseL,\
+            Invalid General Result");
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -253,7 +252,8 @@
         {
         if ( !rspV2.iAdditionalInfo.Length() )
         	{
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSEL_3, "CSAT: CSatNotifyGetChannelStatus::TerminalResponseL, Invalid Additional Info");
+        	TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::TerminalResponseL,\
+                Invalid Additional Info");
 	        ret = KErrCorrupt;
 	        }
 	    else
@@ -287,7 +287,7 @@
         const TDesC16& aAdditionalInfo
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_CREATETERMINALRESPL_1, "CSAT: CSatMessHandler::CreateTerminalRespL");
+    TFLOGSTRING("CSAT: CSatMessHandler::CreateTerminalRespL");
     TTlv tlvSpecificData;
     // Append general result tag
     tlvSpecificData.AddTag( KTlvResultTag );
@@ -319,7 +319,8 @@
         }
    	else
    		{
-    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_CREATETERMINALRESPL_2, "CSAT: CSatMessHandler::CreateTerminalRespL - mandatory channel status missing");
+    	TFLOGSTRING("CSAT: CSatMessHandler::CreateTerminalRespL - \
+    		 mandatory channel status missing");
    		}       
 
     // Prepare data

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyGetInkey.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyGetInkey.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyGetInkeyTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyGetInkey.h"     // Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_NEWL_1, "CSAT: CSatNotifyGetInkey::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyGetInkey::NewL");
    	CSatNotifyGetInkey* const satNotifyGetInkey = 
         new ( ELeave ) CSatNotifyGetInkey( aNotificationsTsy );
     CleanupStack::PushL( satNotifyGetInkey );
     satNotifyGetInkey->ConstructL();
     CleanupStack::Pop( satNotifyGetInkey );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_NEWL_2, "CSAT: CSatNotifyGetInkey::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyGetInkey::NewL, end of method");
     return satNotifyGetInkey;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_DTOR_1, "CSAT: CSatNotifyGetInkey::~CSatNotifyGetInkey");
+    TFLOGSTRING("CSAT: CSatNotifyGetInkey::~CSatNotifyGetInkey");
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +88,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_CONSTRUCTL_1, "CSAT: CSatNotifyGetInkey::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifyGetInkey::ConstructL");
     }
     
 // -----------------------------------------------------------------------------
@@ -107,7 +102,7 @@
         const TDataPackage& aPackage   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_NOTIFY_1, "CSAT: CSatNotifyGetInkey::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyGetInkey::Notify");
     // Save data pointer to client side for completion
     iGetInkeyV2Pckg = reinterpret_cast<RSat::TGetInkeyV2Pckg*>( 
         aPackage.Des1n() );    
@@ -132,7 +127,7 @@
         const TTsyReqHandle aTsyReqHandle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_CANCELNOTIFICATION_1, "CSAT: CSatNotifyGetInkey::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifyGetInkey::CancelNotification");
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( CSatTsy::ESatNotifyGetInkeyPCmdReqType );
@@ -154,7 +149,7 @@
         TInt aErrorCode  
         ) 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_COMPLETENOTIFYL_1, "CSAT: CSatNotifyGetInkey::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyGetInkey::CompleteNotifyL");
     TInt ret( KErrNone );
     TInt returnValue( KErrNone );
 
@@ -235,7 +230,8 @@
                 }
             else
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_COMPLETENOTIFYL_2, "CSAT: CSatNotifyGetInkey::CompleteNotifyL, No Help available");
+                TFLOGSTRING("CSAT: CSatNotifyGetInkey::CompleteNotifyL,\
+                    No Help available");
                 // No help
                 getInkeyV2.iHelp = RSat::ENoHelpAvailable;
                 }
@@ -263,7 +259,8 @@
                 }
             else
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_COMPLETENOTIFYL_3, "CSAT: CSatNotifyGetInkey::CompleteNotifyL, Required values missing");
+                TFLOGSTRING("CSAT: CSatNotifyGetInkey::CompleteNotifyL,\
+                    Required values missing");
                 additionalInfo.Zero();
                 additionalInfo.Append( KNoCause );
                 CreateTerminalRespL( pCmdNumber, 
@@ -286,7 +283,8 @@
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_COMPLETENOTIFYL_4, "CSAT: CSatNotifyGetInkey::CompleteNotifyL, Request not ongoing");
+        TFLOGSTRING("CSAT: CSatNotifyGetInkey::CompleteNotifyL,\
+            Request not ongoing");
 		additionalInfo.Zero();
         additionalInfo.Append( KNoCause );
         CreateTerminalRespL( pCmdNumber, RSat::KMeUnableToProcessCmd, 
@@ -306,7 +304,7 @@
         TDes8* aRsp
         )
     {   
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_TERMINALRESPONSEL_1, "CSAT: CSatNotifyGetInkey::TerminalResponseL");
+	TFLOGSTRING("CSAT: CSatNotifyGetInkey::TerminalResponseL");
     
 	TInt ret( KErrNone );
 
@@ -321,7 +319,8 @@
          ( RSat::KTextString != rspV2.iInfoType ) && 
          ( RSat::KNoAdditionalInfo != rspV2.iInfoType ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_TERMINALRESPONSEL_2, "CSAT: CSatNotifyGetInkey::TerminalResponseL, Invalid Infotype");
+        TFLOGSTRING("CSAT: CSatNotifyGetInkey::TerminalResponseL,\
+            Invalid Infotype");
         ret = KErrCorrupt;
         }
 
@@ -331,7 +330,8 @@
          ( RSat::ECharUcs2Alphabet  != rspV2.iRspFormat ) && 
          ( RSat::EYesNo != rspV2.iRspFormat ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_TERMINALRESPONSEL_3, "CSAT: CSatNotifyGetInkey::TerminalResponseL, Invalid Response Format");
+        TFLOGSTRING("CSAT: CSatNotifyGetInkey::TerminalResponseL,\
+            Invalid Response Format");
         ret = KErrCorrupt;
         }
     
@@ -346,7 +346,8 @@
          ( RSat::KErrorRequiredValuesMissing != rspV2.iGeneralResult ) &&
          ( RSat::KSuccessRequestedIconNotDisplayed != rspV2.iGeneralResult ))
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_TERMINALRESPONSEL_4, "CSAT: CSatNotifyGetInkey::TerminalResponseL, Invalid General Result");
+        TFLOGSTRING("CSAT: CSatNotifyGetInkey::TerminalResponseL,\
+            Invalid General Result");
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -355,7 +356,8 @@
     if ( ( RSat::KMeProblem == rspV2.iInfoType ) &&  
          ( NULL == rspV2.iAdditionalInfo.Length() ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_TERMINALRESPONSEL_5, "CSAT: CSatNotifyGetInkey::TerminalResponseL, Invalid Additional Info, ME Problem");
+        TFLOGSTRING("CSAT: CSatNotifyGetInkey::TerminalResponseL,\
+            Invalid Additional Info, ME Problem");
         // Invalid additional info field
         ret = KErrCorrupt;
         }
@@ -363,7 +365,8 @@
     if ( ( RSat::KTextString == rspV2.iInfoType ) && 
          ( NULL == rspV2.iAdditionalInfo.Length() ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_TERMINALRESPONSEL_6, "CSAT: CSatNotifyGetInkey::TerminalResponseL, Invalid Additional Info");
+        TFLOGSTRING("CSAT: CSatNotifyGetInkey::TerminalResponseL,\
+            Invalid Additional Info");
         ret = KErrCorrupt;
         }
 	
@@ -392,7 +395,7 @@
         TUint8  aDcs          
 		)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_CREATETERMINALRESPL_1, "CSAT: CSatNotifyGetInkey::CreateTerminalRespL");
+	TFLOGSTRING("CSAT: CSatNotifyGetInkey::CreateTerminalRespL");
 
 	TTlv tlvSpecificData;
     tlvSpecificData.AddTag( KTlvResultTag );  
@@ -433,7 +436,8 @@
             {
             TSatUtility::Copy16to8LE( aAdditionalInfo, character);
             tlvSpecificData.AddData( character );
-            OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_CREATETERMINALRESPL_2, "CSAT:CSatNotifyGetInkey::CreateTerminalRespL, %s character", character );
+            TFLOGSTRING2("CSAT:CSatNotifyGetInkey::CreateTerminalRespL, %s \
+            	character", &character );
             }
         else
             {

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyGetInput.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyGetInput.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyGetInputTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyGetInput.h"     // Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_NEWL_1, "CSAT: CSatNotifyGetInput::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyGetInput::NewL");
    	CSatNotifyGetInput* const satNotifyGetInput = 
         new ( ELeave ) CSatNotifyGetInput( aNotificationsTsy );
     CleanupStack::PushL( satNotifyGetInput );
     satNotifyGetInput->ConstructL();
     CleanupStack::Pop( satNotifyGetInput );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_NEWL_2, "CSAT: CSatNotifyGetInput::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyGetInput::NewL, end of method");
     return satNotifyGetInput;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_DTOR_1, "CSAT: CSatNotifyGetInput::~CSatNotifyGetInput");
+    TFLOGSTRING("CSAT: CSatNotifyGetInput::~CSatNotifyGetInput");
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +88,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CONSTRUCTL_1, "CSAT: CSatNotifyGetInput::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifyGetInput::ConstructL");
     }
     
 // -----------------------------------------------------------------------------
@@ -107,7 +102,7 @@
         const TDataPackage& aPackage
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_NOTIFY_1, "CSAT: CSatNotifyGetInput::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyGetInput::Notify");
     // Save data pointer to client side for completion
     iGetInputV1Pckg = reinterpret_cast<RSat::TGetInputV1Pckg*>( 
         aPackage.Des1n() );
@@ -130,7 +125,7 @@
         const TTsyReqHandle aTsyReqHandle
         )
     {   
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CANCELNOTIFICATION_1, "CSAT: CSatNotifyGetInput::CancelNotification");
+	TFLOGSTRING("CSAT: CSatNotifyGetInput::CancelNotification");
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
 		ResetTsyReqHandle( 
@@ -153,7 +148,7 @@
         TInt aErrorCode  
         ) 
     {   
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_COMPLETENOTIFYL_1, "CSAT: CSatNotifyGetInput::CompleteNotifyL");
+	TFLOGSTRING("CSAT: CSatNotifyGetInput::CompleteNotifyL");
     TInt returnValue( KErrNone );
     TInt ret( KErrNone );
     // Unpack parameters
@@ -244,7 +239,8 @@
                 }
             else
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_COMPLETENOTIFYL_2, "CSAT: CSatNotifyGetInput::CompleteNotifyL, No Help available");
+                TFLOGSTRING("CSAT: CSatNotifyGetInput::CompleteNotifyL,\
+                    No Help available");
                 // No help
                 getInputV1.iHelp = RSat::ENoHelpAvailable;
                 }
@@ -262,7 +258,8 @@
                 }
             else
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_COMPLETENOTIFYL_3, "CSAT: CSatNotifyGetInput::CompleteNotifyL, Input text missing");
+                TFLOGSTRING("CSAT: CSatNotifyGetInput::CompleteNotifyL,\
+                    Input text missing");
                 additionalInfo.Zero();
                 additionalInfo.Append( KNoCause );
                 CreateTerminalRespL( pCmdNumber, 
@@ -271,7 +268,7 @@
                 ret = KErrCorrupt;
                 }
 
-            OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_COMPLETENOTIFYL_4, "CSAT: GetInput, text: %S", getInputV1.iText );
+            TFLOGSTRING2("CSAT: GetInput, text: %S", &getInputV1.iText );
 
 			// Response length expected                                     
 			CTlv responseLength;
@@ -287,7 +284,8 @@
 				if ( RSat::KGetInputTextMaxSize < 
 				    getInputV1.iRspLength.iMinRspLength )
 					{	
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_COMPLETENOTIFYL_5, "CSAT: CSatNotifyGetInput::CompleteNotifyL, Input text length exceeded");
+					TFLOGSTRING("CSAT: CSatNotifyGetInput::CompleteNotifyL,\
+					    Input text length exceeded");
 					additionalInfo.Zero();
                     additionalInfo.Append( KNoCause );
 					CreateTerminalRespL( pCmdNumber, 
@@ -302,7 +300,8 @@
 				}				
 			else
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_COMPLETENOTIFYL_6, "CSAT: CSatNotifyGetInput::CompleteNotifyL, Response length TLV missing");
+				TFLOGSTRING("CSAT: CSatNotifyGetInput::CompleteNotifyL,\
+				    Response length TLV missing");
 				// Mandatory reponse length tlv is missing
 				additionalInfo.Zero();
                 additionalInfo.Append( KNoCause );
@@ -335,7 +334,8 @@
 	
 	else 
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_COMPLETENOTIFYL_7, "CSAT: CSatNotifyGetInput::CompleteNotifyL, Request not ongoing");
+		TFLOGSTRING("CSAT: CSatNotifyGetInput::CompleteNotifyL,\
+		    Request not ongoing");
 		// Request not on, returning response immediately
 		additionalInfo.Zero();
         additionalInfo.Append( KNoCause );		
@@ -358,7 +358,7 @@
         TDes8* aRsp 
         )
     {    	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_TERMINALRESPONSEL_1, "CSAT: CSatNotifyGetInput::TerminalResponseL");
+	TFLOGSTRING("CSAT: CSatNotifyGetInput::TerminalResponseL");
     
 	TInt returnValue( KErrNone );
 	TBuf<1>additionalInfo;
@@ -367,8 +367,11 @@
             reinterpret_cast<RSat::TGetInputRspV1Pckg*>( aRsp );
     RSat::TGetInputRspV1& rspV1 = ( *aRspPckg ) ();
 
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_TERMINALRESPONSEL_2, "CSAT: CSatNotifyGetInput::TerminalResponseL, iAdditionalInfo: %S, iInfoType: %u", rspV1.iAdditionalInfo, rspV1.iInfoType);
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_TERMINALRESPONSEL_3, "CSAT:CSatNotifyGetInput::TerminalResponseL, iGeneralResult: 0x%02x", (TUint)rspV1.iGeneralResult);
+    TFLOGSTRING3("CSAT: CSatNotifyGetInput::TerminalResponseL, \
+        iAdditionalInfo: %S, iInfoType: %d", 
+        &rspV1.iAdditionalInfo, rspV1.iInfoType);
+    TFLOGSTRING2("CSAT:CSatNotifyGetInput::TerminalResponseL, \
+        iGeneralResult: %d", rspV1.iGeneralResult);
 	
 	// Get Proactive command number
     TUint8 pCmdNumber( rspV1.PCmdNumber() );
@@ -388,7 +391,8 @@
         && ( RSat::KMeUnableToProcessCmd != rspV1.iGeneralResult )
         && ( RSat::KCmdBeyondMeCapabilities != rspV1.iGeneralResult ))
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_TERMINALRESPONSEL_4, "CSAT: CSatNotifyGetInput::TerminalResponseL, Invalid General Result");
+		TFLOGSTRING("CSAT: CSatNotifyGetInput::TerminalResponseL,\
+		    Invalid General Result");
         // Invalid general result
         returnValue = KErrCorrupt;
         }
@@ -404,7 +408,8 @@
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_TERMINALRESPONSEL_5, "CSAT: CSatNotifyGetInput::TerminalResponseL, Invalid Additional Info");
+            TFLOGSTRING("CSAT: CSatNotifyGetInput::TerminalResponseL,\
+		        Invalid Additional Info");
             // Invalid additional info field
             returnValue = KErrCorrupt;
             }
@@ -432,7 +437,7 @@
 	    TUint8   aDcs              
 	    )
 	{	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CREATETERMINALRESPL_1, "CSAT: CSatNotifyGetInput::CreateTerminalRespL");
+	TFLOGSTRING("CSAT: CSatNotifyGetInput::CreateTerminalRespL");
     TTlv tlvSpecificData;
 	TBuf8<KGetInputStringMaxSize> string;
 
@@ -456,12 +461,14 @@
 
         if ( aTextString.Length() )
     		{
-            OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CREATETERMINALRESPL_2, "CSAT: CSatNotifyGetInput::CreateTerminalRespL aTextString: %S", aTextString);
+            TFLOGSTRING2("CSAT: CSatNotifyGetInput::CreateTerminalRespL \
+                aTextString: %S", &aTextString);
             switch ( aDcs )
                 {
                 case RSat::EUcs2Alphabet:
                     {
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CREATETERMINALRESPL_3, "CSAT: CSatNotifyGetInput::CreateTerminalRespL EUcs2Alphabet");
+                    TFLOGSTRING("CSAT: CSatNotifyGetInput::CreateTerminalRespL \
+                        EUcs2Alphabet");
                      // Data coding scheme UCS2 (16-bit)
                     tlvSpecificData.AddByte( KUCS2DCS );   
                     
@@ -476,7 +483,8 @@
                 case RSat::EDigitOnlyPacked:
                 case RSat::ESmsDefaultAlphabetPacked:
                     {
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CREATETERMINALRESPL_4, "CSAT: CSatNotifyGetInput::CreateTerminalRespL EDigitOnlyPacked/ESmsDefaultAlphabetPacked");
+                    TFLOGSTRING("CSAT: CSatNotifyGetInput::CreateTerminalRespL \
+                        EDigitOnlyPacked/ESmsDefaultAlphabetPacked");
                     // Data coding scheme 7-bit default sms
                     tlvSpecificData.AddByte( K7BitDefaultSmsDCS );  
                     TSatUtility::UCSToPacked7( aTextString, string );
@@ -487,7 +495,8 @@
                 case RSat::EDigitOnlyUnpacked:
                 case RSat::ESmsDefaultAlphabetUnpacked:
                     {
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CREATETERMINALRESPL_5, "CSAT: CSatNotifyGetInput::CreateTerminalRespL EDigitOnlyUnpacked/ESmsDefaultAlphabetUnpacked");
+                    TFLOGSTRING("CSAT: CSatNotifyGetInput::CreateTerminalRespL \
+                        EDigitOnlyUnpacked/ESmsDefaultAlphabetUnpacked");
                     // Data coding scheme 8-bit
                     tlvSpecificData.AddByte( K8BitDCS );
                     TSatUtility::ConvertUnicode16To7Bit( aTextString, string );
@@ -499,7 +508,8 @@
                     break;
                 }
 
-            OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CREATETERMINALRESPL_6, "CSAT: CSatNotifyGetInput::CreateTerminalRespL string: %s", string);
+            TFLOGSTRING2("CSAT: CSatNotifyGetInput::CreateTerminalRespL \
+                string: %S", &string);
             }
         }
     // Prepare data

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyLanguageNotification.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyLanguageNotification.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyLanguageNotificationTraces.h"
-#endif
-
 #include <satcs.h>                  		// Etel SAT IPC definitions
 #include "CSatTsy.h"                		// Tsy class header
 #include "CSatNotifyLanguageNotification.h" // Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                		// Ber Tlv data handling
 #include "TTlv.h"							// TTlv class
 #include "CSatDataPackage.h"         		// Parameter packing 
+#include "TfLogger.h"               		// For TFLOGSTRING
 #include "TSatUtility.h"            		// Utilities
 #include "CSatTsyReqHandleStore.h"  		// Request handle class
 #include "cmmmessagemanagerbase.h" 			// Message manager class for 
@@ -48,13 +43,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_NEWL_1, "CSAT: CSatNotifyLanguageNotification::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::NewL");
    	CSatNotifyLanguageNotification* const satNotifyLanguageNotification = 
         new ( ELeave ) CSatNotifyLanguageNotification( aNotificationsTsy );
     CleanupStack::PushL( satNotifyLanguageNotification );
     satNotifyLanguageNotification->ConstructL();
     CleanupStack::Pop( satNotifyLanguageNotification );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_NEWL_2, "CSAT: CSatNotifyLanguageNotification::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::NewL, end of method");
     return satNotifyLanguageNotification;
     }
 
@@ -68,7 +63,8 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_DTOR_1, "CSAT: CSatNotifyLanguageNotification::~CSatNotifyLanguageNotification");
+    TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::\
+        ~CSatNotifyLanguageNotification");
     }
     
 // -----------------------------------------------------------------------------
@@ -94,7 +90,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_CONSTRUCTL_1, "CSAT: CSatNotifyLanguageNotification::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::ConstructL");
     }
 
 // -----------------------------------------------------------------------------
@@ -108,7 +104,7 @@
         const TDataPackage& aPackage   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_NOTIFY_1, "CSAT: CSatNotifyLanguageNotification::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::Notify");
     // Save data pointer to client side for completion
     iLanguageNotificationV2Pckg = reinterpret_cast<RSat::
     	TLanguageNotificationV2Pckg*>( aPackage.Des1n() );
@@ -134,7 +130,7 @@
         const TTsyReqHandle aTsyReqHandle 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_CANCELNOTIFICATION_1, "CSAT: CSatNotifyLanguageNotification::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::CancelNotification"); 
     // Reset the request handle
     iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( 
         CSatTsy::ESatNotifyLanguageNotificationPCmdReqType );
@@ -158,7 +154,7 @@
         TInt aErrorCode  
         ) 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_COMPLETENOTIFYL_1, "CSAT: CSatNotifyLanguageNotification::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::CompleteNotifyL");
 
     TInt returnValue( KErrNone );
     TInt ret( KErrNone );
@@ -205,7 +201,8 @@
 
             if ( !cmdQualifier )
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_COMPLETENOTIFYL_2, "CSAT: CSatNotifyLanguageNotification::CompleteNotifyL, No specific language used");
+                TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::\
+                    CompleteNotifyL, No specific language used");
                 // No specific language used
                 languageNotificationV2.iNotificationType = 
                     RSat::ENonSpecificLangNotification;
@@ -240,7 +237,8 @@
         }// End of if( CSatTsy::ESatReqHandleUnknown != reqHandle )
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_COMPLETENOTIFYL_3, "CSAT: CSatNotifyLanguageNotification::CompleteNotifyL, Request not ongoing");
+        TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::CompleteNotifyL,\
+            Request not ongoing");
         additionalInfo.Zero();
         additionalInfo.Append( KNoCause );
         CreateTerminalRespL( pCmdNumber, RSat::KMeUnableToProcessCmd,
@@ -259,7 +257,7 @@
         TDes8* aRsp
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_TERMINALRESPONSEL_1, "CSAT:CSatNotifyLanguageNotification::TerminalResponseL");
+    TFLOGSTRING("CSAT:CSatNotifyLanguageNotification::TerminalResponseL");
     TInt ret( KErrNone );
     TBuf<1> additionalInfo;
     additionalInfo.FillZ(1);
@@ -288,7 +286,7 @@
         TDesC16& aAdditionalInfo    
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_CREATETERMINALRESPL_1, "CSAT:CSatNotifyLanguageNotification::CreateTerminalRespL");
+    TFLOGSTRING("CSAT:CSatNotifyLanguageNotification::CreateTerminalRespL");	    
     TTlv tlvSpecificData;
     // Create General Result TLV here
     tlvSpecificData.AddTag( KTlvResultTag );

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyLaunchBrowser.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyLaunchBrowser.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyLaunchBrowserTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyLaunchBrowser.h"// Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_NEWL_1, "CSAT: CSatNotifyLaunchBrowser::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::NewL");
    	CSatNotifyLaunchBrowser* const satNotifyLaunchBrowser = 
         new ( ELeave ) CSatNotifyLaunchBrowser( aNotificationsTsy );
     CleanupStack::PushL( satNotifyLaunchBrowser );
     satNotifyLaunchBrowser->ConstructL();
     CleanupStack::Pop( satNotifyLaunchBrowser );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_NEWL_2, "CSAT: CSatNotifyLaunchBrowser::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::NewL, end of method");
     return satNotifyLaunchBrowser;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_DTOR_1, "CSAT: CSatNotifyLaunchBrowser::~CSatNotifyLaunchBrowser");
+    TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::~CSatNotifyLaunchBrowser");
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +88,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_CONSTRUCTL_1, "CSAT: CSatNotifyLaunchBrowser::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ConstructL");
     iSsStatus = CSatNotificationsTsy::ENotBusy;
     }
     
@@ -109,7 +104,7 @@
         const TDataPackage& aPackage   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_NOTIFY_1, "CSAT: CSatNotifyLaunchBrowser::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::Notify");
     // Save data pointer to client side for completion
     iLaunchBrowserV2Pckg = reinterpret_cast<RSat::TLaunchBrowserV2Pckg*>( 
         aPackage.Des1n() );
@@ -133,7 +128,7 @@
         const TTsyReqHandle aTsyReqHandle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_CANCELNOTIFICATION_1, "CSAT: CSatNotifyLaunchBrowser::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CancelNotification");
     
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
@@ -160,7 +155,7 @@
         TInt aErrorCode
         )
     {  
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_1, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL");
+	TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL");
 	TInt ret( KErrNone );
 	TInt returnValue( KErrNone );		
     // Unpack parameters
@@ -188,7 +183,8 @@
 		// Check if busy 
     	if ( CSatNotificationsTsy::ENotBusy != iSsStatus )
     		{
-    		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_2, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, iSsStatus is busy");
+    		TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, \
+    			iSsStatus is busy");
 
         	if( CSatNotificationsTsy::EUssdBusy == iSsStatus)
     			{
@@ -205,7 +201,8 @@
     		}
     	else
     		{	    
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_3, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL No SS Transaction ongoing");
+			TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL \
+				No SS Transaction ongoing");
 			// Complete right away if error has occured, otherwise continue..
 	        if ( KErrNone == aErrorCode )
 	            {			
@@ -239,7 +236,8 @@
             		case KLaunchBrowserCmdQualifierNotUsed:
             		case KLaunchBrowserCmdQualifierReserved:
             			{
-            			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_4, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, Command Type not understood");
+            			TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::\
+            			    CompleteNotifyL, Command Type not understood");
             			CreateTerminalRespL( pCmdNumber, 
             			    RSat::KCmdTypeNotUnderstood, KNoCause );
                         ret = KErrCorrupt;
@@ -300,7 +298,8 @@
 					
 					if ( KErrNotFound != returnValue )
 						{
-						OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_5, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, Alpha ID present");
+						TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::\
+					        CompleteNotifyL, Alpha ID present");
 						TUint8 alphaIdLength( alphaIdentifier.GetLength() );
 						if ( alphaIdLength )
 							{
@@ -319,7 +318,8 @@
 							}
 						else
 							{
-							OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_6, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, Alpha ID is NULL");
+							TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::\
+							    CompleteNotifyL, Alpha ID is NULL");
 							launchBrowserV2.iAlphaId.iStatus = 
 							    RSat::EAlphaIdNull;
 							}
@@ -341,7 +341,8 @@
         }// End of if ( reqHandle != CSatTsy::ESatReqHandleUnknown ) 
 	else 
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_7, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, Request not ongoing");
+        TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, \
+            Request not ongoing");  
         // Request not on, returning response immediately
 		CreateTerminalRespL( pCmdNumber, RSat::KMeUnableToProcessCmd, 
 			KNoCause );
@@ -362,7 +363,7 @@
         TDes8* aRsp
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_1, "CSAT: CSatNotifyLaunchBrowser::TerminalResponseL");
+    TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::TerminalResponseL");
 	TInt   ret( KErrNone );
     TUint8 additionalInfo( KNoCause );
     RSat::TLaunchBrowserRspV2Pckg* aRspPckg = 
@@ -387,7 +388,8 @@
          ( RSat::KNetworkUnableToProcessCmd != rspV2.iGeneralResult ) &&
          ( RSat::KCmdNumberNotKnown != rspV2.iGeneralResult ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_2, "CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, Invalid General Result");
+        TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, \
+            Invalid General Result");
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -400,7 +402,8 @@
          ( RSat::KMeUnableToReadProvisioningData != rspV2.iInfoType ) && 
          ( RSat::KNoSpecificBrowserError != rspV2.iInfoType ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_3, "CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, Invalid Info Type");
+        TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, \
+            Invalid Info Type");
         ret = KErrCorrupt;
         }
 
@@ -414,7 +417,8 @@
 			}
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_4, "CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, Invalid Additional Info");
+            TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, \
+                Invalid Additional Info");
             // Invalid additional info field
             ret = KErrCorrupt;
             }
@@ -438,7 +442,8 @@
 	{
 	// Unpack parameters
 	aDataPackage->UnPackData( iSsStatus );
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_SETSSSTATUS_1, "CSAT: CSatNotifyLaunchBrowser::SetSatTsySsStatus, status: %d", iSsStatus );
+	TFLOGSTRING2("CSAT: CSatNotifyLaunchBrowser::SetSatTsySsStatus, status: %d", 
+		iSsStatus );
 	}
     
 // -----------------------------------------------------------------------------
@@ -453,7 +458,7 @@
         RSat::TLaunchBrowserV2& aLaunchBrowserV2
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEBROWSERIDL_1, "CSAT: CSatNotifyLaunchBrowser::ParseBrowserId");
+    TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseBrowserId");
     TInt ret( KErrNone );
     CTlv browserId; // optional
 	TInt returnValue = aBerTlv.TlvByTagValue( &browserId, 
@@ -476,7 +481,8 @@
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEBROWSERIDL_2, "CSAT: CSatNotifyLaunchBrowser::ParseBrowserId, Browser ID not set");
+		TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseBrowserId, \
+            Browser ID not set");
 		aLaunchBrowserV2.iBrowserId = RSat::EBrowserIdNotSet;
 		}
 	return ret;
@@ -494,7 +500,7 @@
         RSat::TLaunchBrowserV2& aLaunchBrowserV2
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEURLL_1, "CSAT: CSatNotifyLaunchBrowser::ParseUrl");
+    TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseUrl");
     TInt ret( KErrNone );
     CTlv url; // mandatory
 	TInt returnValue = aBerTlv.TlvByTagValue( &url, KTlvUrlTag );
@@ -503,7 +509,8 @@
 		{
 		if ( RSat::KUrlMaxSize < url.GetLength() )
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEURLL_2, "CSAT: CSatNotifyLaunchBrowser::ParseUrl, False URL length");
+			TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseUrl, \
+			    False URL length");				
 			CreateTerminalRespL( aPCmdNumber, RSat::KMeUnableToProcessCmd, 
 			    KNoCause );
 			ret = KErrCorrupt;
@@ -515,7 +522,8 @@
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEURLL_3, "CSAT: CSatNotifyLaunchBrowser::ParseUrl, Required values missing");
+		TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseUrl, \
+            Required values missing");								
 		CreateTerminalRespL( aPCmdNumber, RSat::KErrorRequiredValuesMissing, 
 	        KNoCause );
 		ret = KErrCorrupt;
@@ -535,7 +543,7 @@
         RSat::TLaunchBrowserV2& aLaunchBrowserV2
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEPROVISIONINGFILELISTL_1, "CSAT: CSatNotifyLaunchBrowser::ParseProvisioningFileList");
+    TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseProvisioningFileList");
     TInt ret( KErrNone );
     
     CTlv provisioningFileList; // optional
@@ -591,7 +599,8 @@
 			if ( ( RSat::KFileRefMaxSize < stringLength ) || 
 			     ( 4 > stringLength ) )
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEPROVISIONINGFILELISTL_2, "CSAT: CSatNotifyLaunchBrowser::ParseProvisioningFileList, False string length");
+				TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::\
+				    ParseProvisioningFileList, False string length");				
 			    CreateTerminalRespL( aPCmdNumber, RSat::KLaunchBrowserError, 
 				    RSat::KMeUnableToReadProvisioningData );
 				ret = KErrCorrupt;
@@ -609,7 +618,8 @@
 			 // Adding the new fileref
 			if ( KErrNoMemory == aLaunchBrowserV2.AddFileRef( newFileRef ) )
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEPROVISIONINGFILELISTL_3, "CSAT: CSatNotifyLaunchBrowser::ParseProvisioningFileList, Menu items corrupted");
+				TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::\
+				    ParseProvisioningFileList, Menu items corrupted");
 				// Too many or long menuitems				
 			    CreateTerminalRespL( aPCmdNumber, RSat::KLaunchBrowserError, 
 				    RSat::KMeUnableToReadProvisioningData );
@@ -635,7 +645,7 @@
         RSat::TLaunchBrowserV2& aLaunchBrowserV2
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEBEARERLISTL_1, "CSAT: CSatNotifyLaunchBrowser::ParseBearerList");
+    TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseBearerList");
     TInt ret( KErrNone );
     // Bearers (optional)
 	CTlv bearerList;
@@ -660,7 +670,8 @@
 				
 			if ( 0x00 == aLaunchBrowserV2.iBearerList.Length() )
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEBEARERLISTL_2, "CSAT: CSatNotifyLaunchBrowser::ParseBearerList, Bearer unvailable");
+				TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseBearerList,\
+				    Bearer unvailable");
 				CreateTerminalRespL( aPCmdNumber, RSat::KLaunchBrowserError, 
 				    RSat::KBearerUnvailable );
 				ret = KErrCorrupt;
@@ -668,7 +679,8 @@
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEBEARERLISTL_3, "CSAT: CSatNotifyLaunchBrowser::ParseBearerList, Bearer List length exceeded");
+			TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseBearerList,\
+			    Bearer List length exceeded");
 			CreateTerminalRespL( aPCmdNumber, RSat::KCmdDataNotUnderstood, 
 			    RSat::KCmdDataNotUnderstood );
 			ret = KErrCorrupt;
@@ -690,7 +702,7 @@
         TUint8 aAdditionalInfo		
 		)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_CREATETERMINALRESPL_1, "CSAT: CSatNotifyLaunchBrowser::CreateTerminalRespL");
+	TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CreateTerminalRespL");
     TTlv tlvSpecificData;
     tlvSpecificData.AddTag( KTlvResultTag );
     // Create General Result TLV here

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyLocalInfo.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyLocalInfo.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -20,18 +20,13 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyLocalInfoTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyLocalInfo.h"    // Class header
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_NEWL_1, "CSAT: CSatNotifyLocalInfo::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyLocalInfo::NewL");
    	CSatNotifyLocalInfo* const satNotifyLocalInfo = 
         new ( ELeave ) CSatNotifyLocalInfo( aNotificationsTsy );
     CleanupStack::PushL( satNotifyLocalInfo );
     satNotifyLocalInfo->ConstructL();
     CleanupStack::Pop( satNotifyLocalInfo );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_NEWL_2, "CSAT: CSatNotifyLocalInfo::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyLocalInfo::NewL, end of method");
     return satNotifyLocalInfo;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_DTOR_1, "CSAT: CSatNotifyLocalInfo::~CSatNotifyLocalInfo");
+    TFLOGSTRING("CSAT: CSatNotifyLocalInfo::~CSatNotifyLocalInfo");
     }
     
 // -----------------------------------------------------------------------------
@@ -98,7 +93,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_CONSTRUCTL_1, "CSAT: CSatNotifyLocalInfo::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifyLocalInfo::ConstructL");
     // IMEI of the ME
     iIMEI.Zero();
     // Clear NMR (Network Measurement result)
@@ -123,7 +118,7 @@
         const TDataPackage& aPackage    
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_NOTIFY_1, "CSAT: CSatNotifyLocalInfo::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyLocalInfo::Notify");
     // Save data pointer to client side for completion
     iLocalInfoV3Pckg = reinterpret_cast<RSat::TLocalInfoV3Pckg*>( 
         aPackage.Des1n() );
@@ -146,7 +141,7 @@
         const TTsyReqHandle aTsyReqHandle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_CANCELNOTIFICATION_1, "CSAT: CSatNotifyLocalInfo::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CancelNotification"); 
     // Reset the request handle
     iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( 
         CSatTsy::ESatNotifyLocalInfoPCmdReqType );
@@ -168,7 +163,7 @@
         TInt aErrorCode                 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_1, "CSAT: CSatNotifyLocalInfo::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteNotifyL");
 
     TInt ret( KErrNone );
     TPtrC8* data;
@@ -197,7 +192,8 @@
         {
         case RSat::KProvideLocalInfo:
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_2, "CSAT: CSatNotifyLocalInfo::CompleteNotifyL request: LOCAL INFO");
+            TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteNotifyL\
+            	request: LOCAL INFO");
             iLocalInfoIsOngoing = ETrue;
             // Get Local Info
             dataPackage.PackData( &iLocalInfoIsOngoing );
@@ -207,7 +203,8 @@
             }
         case RSat::KProvideLocalInfoImei:
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_3, "CSAT: CSatNotifyLocalInfo:: CompleteNotifyL, request: IMEI");
+            TFLOGSTRING("CSAT: CSatNotifyLocalInfo:: CompleteNotifyL, \
+            	request: IMEI");
             // Check if IMEI is received
             if ( iIMEI.Length() )
                 {
@@ -224,7 +221,7 @@
             }
         case RSat::KProvideLocalInformationNmr:
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_4, "CSAT: CSatNotifyLocalInfo:: request: NMR");
+            TFLOGSTRING("CSAT: CSatNotifyLocalInfo:: request: NMR");
             iLocalInfoIsOngoing = ETrue;
             // Request Network Measurement Results
             dataPackage.PackData( &iLocalInfoIsOngoing );
@@ -234,13 +231,15 @@
             }
         case RSat::KProvideLocalInfoDateTimeTimeZone:
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_5, "CSAT: CSatNotifyLocalInfo:: request: DATE/TIME/TIMEZONE");
+            TFLOGSTRING("CSAT: CSatNotifyLocalInfo:: request: \
+            	DATE/TIME/TIMEZONE");
             SetDateTimeTimeZone();	
             break;
             }
         case RSat::KProvideLocalInfoLanguage:
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_6, "CSAT: CSatNotifyLocalInfo::CompleteNotifyL request, Language");
+            TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteNotifyL request, \
+                Language");
 		    // Reset req handle. Returns the deleted req handle
 		    TTsyReqHandle reqHandle = 
 		        iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( 
@@ -274,7 +273,8 @@
                 }
             else
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_7, "CSAT: CSatNotifyLocalInfo::CompleteNotifyL No reqHandle");
+                TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteNotifyL\
+                	 No reqHandle");
                 iLocalInfoRspV3.iGeneralResult = 
                     RSat::KMeUnableToProcessCmd;
                 iLocalInfoRspV3.iAdditionalInfo.Append( 
@@ -285,7 +285,8 @@
             }
         case RSat::KProvideLocalInfoTimingAdv:
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_8, "CSAT: CSatNotifyLocalInfo::CompleteNotifyL request: TimingAdvance");
+            TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteNotifyL\
+            	 request: TimingAdvance");       
             iLocalInfoIsOngoing = ETrue;
             dataPackage.PackData( &iLocalInfoIsOngoing );
             // Request service
@@ -295,7 +296,8 @@
             }
         case RSat::KProvideLocalInfoAccTech:
         	{
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_9, "CSAT: CSatNotifyLocalInfo::CompleteNotifyL request: Access Technology");
+            TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteNotifyL\
+            	request: Access Technology");
             iLocalInfoIsOngoing = ETrue;
 			dataPackage.PackData( &iLocalInfoIsOngoing );
             // Request Access technology
@@ -343,7 +345,7 @@
         TDes8* aRsp
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_TERMINALRESPONSEL_1, "CSAT: CSatNotifyLocalInfo::TerminalResponseL");
+    TFLOGSTRING("CSAT: CSatNotifyLocalInfo::TerminalResponseL");
 
     TInt ret( KErrNone );
     TBuf<RSat::KAdditionalInfoMaxSize> additionalInfo;    
@@ -360,7 +362,8 @@
             && ( RSat::KMeUnableToProcessCmd != rspV1.iGeneralResult )
             && ( RSat::KCmdBeyondMeCapabilities != rspV1.iGeneralResult ) )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_TERMINALRESPONSEL_2, "CSAT: CSatNotifyLocalInfo::TerminalResponseL, Invalid General Result");
+            TFLOGSTRING("CSAT: CSatNotifyLocalInfo::TerminalResponseL,\
+                Invalid General Result");
             // Invalid general result
             ret = KErrCorrupt;
             }
@@ -374,7 +377,8 @@
         if ( ( RSat::KMeProblem == rspV1.iInfoType ) &&
              ( NULL == rspV1.iAdditionalInfo.Length() ) )
             {   
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_TERMINALRESPONSEL_3, "CSAT: CSatNotifyLocalInfo::TerminalResponseL, Invalid Additional Info");
+            TFLOGSTRING("CSAT: CSatNotifyLocalInfo::TerminalResponseL,\
+                Invalid Additional Info");
             // Invalid additional info field
             ret = KErrCorrupt;
             }
@@ -411,7 +415,7 @@
         TDesC16& aAdditionalInfo		
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_1, "CSAT: CSatNotifyLocalInfo::CreateTerminalRespL");
+    TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CreateTerminalRespL");
     // Create and append response data
     TTlv tlvSpecificData;
     // Create General Result TLV 
@@ -502,7 +506,8 @@
                 }
             case RSat::KProvideLocalInfoTimingAdv:
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_2, "CSAT: CSatNotifyLocalInfo::CreateTerminalRespL, TimingAdvance");
+                TFLOGSTRING("CSAT: CSatNotifyLocalInfo::\
+                 	CreateTerminalRespL, TimingAdvance");
                 // Timing advance result
                 tlvSpecificData.AddTag( KTlvTimingAdvanceTag );
                 tlvSpecificData.AddByte( iMEStatus );
@@ -511,7 +516,8 @@
                 }
             case RSat::KProvideLocalInfoLanguage:
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_3, "CSAT: CSatNotifyLocalInfo::CreateTerminalRespL, LocalInfoLanguage");
+                TFLOGSTRING("CSAT: CSatNotifyLocalInfo::\
+                	CreateTerminalRespL, LocalInfoLanguage");
                 
                 if ( aAdditionalInfo.Length() )
                     {
@@ -529,7 +535,8 @@
                 }
             case RSat::KProvideLocalInfoAccTech:
             	{
-            	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_4, "CSAT: CSatNotifyLocalInfo::CreateTerminalRespL, Access Technology");
+            	TFLOGSTRING("CSAT: CSatNotifyLocalInfo::\
+            		CreateTerminalRespL, Access Technology");	
             	// Access technology result
                 tlvSpecificData.AddTag( KTlvAccessTechnologyTag );
                 tlvSpecificData.AddByte( iCurrentAccTech );
@@ -566,7 +573,7 @@
         TInt /*aErrorCode*/
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETETERMINALRESPDATAL_1, "CSAT: CSatNotifyLocalInfo::CompleteTerminalRespDataL");
+    TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteTerminalRespDataL");
     TInt ret( KErrNone );
     // Unpack parameters
     CSatNotificationsTsy::TTerminalRespData* terminalRespData;
@@ -588,7 +595,7 @@
 		TInt /*aErrorCode*/ 
 		)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETEUPDATELOCALINFO_1, "CSAT: CSatNotifyLocalInfo::CompleteUpdateLocalInfo");
+	TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteUpdateLocalInfo");
 	aDataPackage->UnPackData( iLocalInformation );	
 	}
 	
@@ -603,7 +610,7 @@
         TInt /*aErrorCode*/ 
         )
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETEUPDATENETINFO_1, "CSAT: CSatNotifyLocalInfo::CompleteUpdateNetInfo");
+	TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteUpdateNetInfo");
 	aDataPackage->UnPackData( iNMR, iBCCHChannelList );	
 	}
 	
@@ -618,7 +625,7 @@
         TInt /*aErrorCode*/ 
         )
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETEUPDATETIMINGADVANDMESTATUS_1, "CSAT: CSatNotifyLocalInfo::CompleteUpdateTimingAdvAndMEStatus");
+	TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteUpdateTimingAdvAndMEStatus");
 	aDataPackage->UnPackData( iTimingAdvance, iMEStatus );		
 	}
 	
@@ -633,7 +640,7 @@
 		TInt /*aErrorCode*/ 
 		)      
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETEUPDATEACCTECH_1, "CSAT: CSatNotifyLocalInfo::CompleteUpdateAccTech");
+	TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteUpdateAccTech");
 	aDataPackage->UnPackData( iCurrentAccTech );	
 	}
 // -----------------------------------------------------------------------------
@@ -647,7 +654,7 @@
 		TInt /*aErrorCode*/ 
 		)      
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETEUPDATEIMEI_1, "CSAT: CSatNotifyLocalInfo::CompleteUpdateIMEI");
+	TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteUpdateIMEI");
 	aDataPackage->UnPackData( iIMEI );	
 	}
 
@@ -662,7 +669,7 @@
 		TInt /*aErrorCode*/ 
 		)      
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETEUPDATETIMEZONE_1, "CSAT: CSatNotifyLocalInfo::CompleteUpdateTimeZone");
+	TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteUpdateTimeZone");
 	aDataPackage->UnPackData( iTimeZone );	
 	}
 	
@@ -677,7 +684,7 @@
 		// None
 		)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_TLOCALINFORMATION_1, "CSAT: CSatNotifyLocalInfo::LocalInformation");
+	TFLOGSTRING("CSAT: CSatNotifyLocalInfo::LocalInformation");
 	return iLocalInformation;
 	}
 	
@@ -691,7 +698,7 @@
 		// None
 		)
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_SETDATETIMETIMEZONE_1, "CSAT: CSatNotifyLocalInfo::SetDateTimeTimeZone");
+    TFLOGSTRING("CSAT: CSatNotifyLocalInfo::SetDateTimeTimeZone");        
     TTime time;
     TLocale locale;
     TDateTime dateTime;
@@ -755,7 +762,7 @@
 		TTlv* aTlvSpecificData
 		)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_SETINFORMATIONNMR_1, "CSAT: CSatNotifyLocalInfo::SetInformationNmr");
+	TFLOGSTRING("CSAT: CSatNotifyLocalInfo::SetInformationNmr");
     if ( iNMR.Length() )
         {
         // Network measurement result

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyMoSmControlRequest.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyMoSmControlRequest.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyMoSmControlRequestTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyMoSmControlRequest.h"  // Class header
@@ -34,6 +28,7 @@
 #include "BerTlv_defs.h"            // Ber Tlv specific definitions
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h" 	// Message manager class for forwarding req.
@@ -49,13 +44,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_NEWL_1, "CSAT: CSatNotifyMoSmControlRequest::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::NewL");
    	CSatNotifyMoSmControlRequest* const satNotifyMoSmControlRequest = 
         new ( ELeave ) CSatNotifyMoSmControlRequest( aNotificationsTsy );
     CleanupStack::PushL( satNotifyMoSmControlRequest );
     satNotifyMoSmControlRequest->ConstructL();
     CleanupStack::Pop( satNotifyMoSmControlRequest );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_NEWL_2, "CSAT: CSatNotifyMoSmControlRequest::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::NewL, end of method");
     return satNotifyMoSmControlRequest;
     }
 
@@ -69,7 +64,8 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_DTOR_1, "CSAT: CSatNotifyMoSmControlRequest::~CSatNotifyMoSmControlRequest");
+    TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::\
+    	~CSatNotifyMoSmControlRequest");
     }
     
 // -----------------------------------------------------------------------------
@@ -95,13 +91,14 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_CONSTRUCTL_1, "CSAT: CSatNotifyMoSmControlRequest::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::ConstructL");
     // Checks if MO-SMS control should be activated
     iNotificationsTsy->iSatTsy->MessageManager()->HandleRequestL( 
     		ESatTsyMoSmsControlActivation );	
     // Initialize MO-SMS Control to deactivated
     iIsMoSmsCtrlActivated = EFalse; 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_CONSTRUCTL_2, "CSAT: CSatNotifyMoSmControlRequest::ConstructL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::ConstructL, \
+    	end of method"); 	
     }
 
 // -----------------------------------------------------------------------------
@@ -116,7 +113,7 @@
         const TDataPackage& aPackage 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_NOTIFY_1, "CSAT: CSatNotifyMoSmControlRequest::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::Notify");
 
     // Save data pointer to client side for completion      
     iMoSmControlV1Pckg = reinterpret_cast<RSat::TMoSmControlV1Pckg*>(
@@ -140,7 +137,7 @@
         const TTsyReqHandle aTsyReqHandle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_CANCELNOTIFICATION_1, "CSAT: CSatNotifyMoSmControlRequest::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::CancelNotification");
     
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
@@ -165,7 +162,7 @@
         TInt aErrorCode                
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_1, "CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL" );
+    TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL" );
     
     CSatNotificationsTsy::TMoSmCtrlData moSmCtrlData;
 
@@ -189,11 +186,13 @@
 		TDesC8* atkData = NULL;
 		aDataPackage->UnPackData( &atkData );
     	
-    	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_2, "CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL Data length: %d", ( *atkData ).Length() );
+    	TFLOGSTRING2("CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL\
+    	    Data length: %d", ( *atkData ).Length() );
     	
 	    if ( KTlvMaxSize < ( *atkData ).Length() )
 	    	{
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_3, "CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL, Data length exceeded" );
+            TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL, \
+                Data length exceeded" );                
             // Data not consistent, reject the call
             moSmCtrlData.iResult = KMoSmCtrlResultNotAllowed;
 	        isDataOk = EFalse;
@@ -206,7 +205,8 @@
 
             if ( KMoSmCtrlResultAllowedWithModifications == ( *atkData )[0] )
                 {
-                OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_4, "CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL Addr1: %s, Addr2: %s", addr1, addr2 );
+                TFLOGSTRING3("CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL\
+    	            Addr1: %s, Addr2: %s", &addr1, &addr2 );
                 simRespDataConsistent = VerifyNotificationData( addr1, addr2 );      
                 }
                 
@@ -217,7 +217,8 @@
                 }
             else
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_5, "CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL, NAA response data not consistent" );
+                TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL, \
+                	NAA response data not consistent" );                
                 // Data not consistent, reject the sms
                 moSmCtrlData.iResult = KMoSmCtrlResultNotAllowed;
 	        	isDataOk = EFalse;
@@ -299,12 +300,15 @@
 	        } // If MO SM Ctrl Activated and data ok
 	    else
 	        {
-	        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_6, "LSAT: CSatMoSmsCtrlMessHandler::CompleteNotifyL, iIsMoSmsCtrlActivated: %d, isDataOk: %d ", iIsMoSmsCtrlActivated, isDataOk);
+	        TFLOGSTRING3("LSAT: CSatMoSmsCtrlMessHandler::CompleteNotifyL, \
+    	        iIsMoSmsCtrlActivated: %d, isDataOk: %d ", 
+    	        iIsMoSmsCtrlActivated, isDataOk);
 	        }
     	} // if KErrNone
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_7, "LSAT: CSatMoSmsCtrlMessHandler::CompleteNotifyL, Error in notification ");
+        TFLOGSTRING("LSAT: CSatMoSmsCtrlMessHandler::CompleteNotifyL, \
+        	Error in notification ");
         moSmCtrlData.iResult = KMoSmCtrlResultNotAllowed;
         // Pack data and send response right away to NAA
     	CSatDataPackage dataPackage;
@@ -328,11 +332,13 @@
 	    TInt /*aResult*/
 	    )   
     {   
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_CREATEMOSMSCTRLENVELOPEL_1, "CSAT: CSatNotifyMoSmControlRequest::CreateMoSmsCtrlEnvelopeL");
+    TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::\
+        CreateMoSmsCtrlEnvelopeL"); 
     // Check first if the MO-SMS is activated
     if ( iIsMoSmsCtrlActivated )
         {  
-    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_CREATEMOSMSCTRLENVELOPEL_2, "CSAT: CSatNotifyMoSmControlRequest::CreateMoSmsCtrlEnvelopeL, MO SM Ctrl Activated");
+    	TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::\
+    		CreateMoSmsCtrlEnvelopeL, MO SM Ctrl Activated");
     	
 	    CSatNotificationsTsy::TAddressData* addressData;
 	    
@@ -384,7 +390,8 @@
     {
     // Unpack data
     aDataPackage->UnPackData( iIsMoSmsCtrlActivated );
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_SETACTIVATIONSTATUS_1, "CSAT: CSatNotifyMoSmControlRequest::SetActivationStatus, %d",iIsMoSmsCtrlActivated );
+    TFLOGSTRING2("CSAT: CSatNotifyMoSmControlRequest::SetActivationStatus, %d",
+    	iIsMoSmsCtrlActivated );
     }
 
 // -----------------------------------------------------------------------------
@@ -397,7 +404,7 @@
 		void
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_ACTIVATIONSTATUS_1, "CSAT: CSatNotifyMoSmControlRequest::ActivationStatus");
+    TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::ActivationStatus");
     return iIsMoSmsCtrlActivated;
     }
     
@@ -412,7 +419,7 @@
 		TDes8& aAddr 
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_CLEANADDRESSDATA_1, "CSAT: CSatNotifyMoSmControlRequest::CleanAddressData");
+    TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::CleanAddressData");
     // Starts from index 1, since index 0 is for TON/NPI    
     for ( TInt i=1; i < aAddr.Length(); i++ )
         {
@@ -445,7 +452,7 @@
 	    RSat::TAlphaId& aAlphaId
 	    )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_1, "CSAT: CSatNotifyMoSmControlRequest::ParseNotification");
+    TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::ParseNotification");
     
     // Input data:
     // aAtkData[0] : result
@@ -489,7 +496,8 @@
         // Check which TLV is received
         if ( ( KTlvAddressTag == tag ) && ( !address1_got ) )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_2, "CSAT: CSatNotifyMoSmControlRequest::ParseNotification Address 1");
+            TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::ParseNotification\
+                Address 1");
             // RP address first
             address1_got = ETrue;
             // Copy data to output variable
@@ -502,7 +510,8 @@
             }
         else if ( KTlvAddressTag == tag )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_3, "CSAT: CSatNotifyMoSmControlRequest::ParseNotification Address 2");
+            TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::ParseNotification\
+                Address 2");
             // TP address. Copy data to output variable
             aAddr2.Copy( aAtkData.Mid( indexInBerTlv + nn + 2, lengthTlv ) );         
             if ( KReservedTonNpi1 != aAddr2[0] && 
@@ -513,7 +522,8 @@
             }
         else if ( KTlvAlphaIdentifierTag == tag )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_4, "CSAT: CSatNotifyMoSmControlRequest::ParseNotification Alpha ID");
+            TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::ParseNotification\
+                Alpha ID");
             // Alpha id must be converted to TBuf16/unicode
             if ( lengthTlv )
                 {
@@ -524,7 +534,8 @@
                 }
             else
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_5, "CSAT: CSatNotifyMoSmControlRequest:: ParseNotification. Alpha ID is NULL");
+                TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest:: \
+                	ParseNotification. Alpha ID is NULL");
                 aAlphaId.iStatus = RSat::EAlphaIdNull;
                 }  
             }
@@ -548,7 +559,7 @@
 		TDes8& aTPAddr 
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_VERIFYNOTIFICATIONDATA_1, "CSAT: CSatNotifyMoSmControlRequest::VerifyNotificationData");
+    TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::VerifyNotificationData");
     TBool ret( ETrue );    
     if ( ( 0 == aRPAddr.Length() && 0 == aTPAddr.Length() ) || 
          ( KMoSmCtrlMaxLengthAddr1Addr2 <= (

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyMoreTime.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyMoreTime.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyMoreTimeTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyMoreTime.h"  	// Class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMORETIME_NEWL_1, "CSAT: CSatNotifyMoreTime::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyMoreTime::NewL");
    	CSatNotifyMoreTime* const satNotifyMoreTime = 
         new ( ELeave ) CSatNotifyMoreTime( aNotificationsTsy );
     CleanupStack::PushL( satNotifyMoreTime );
     satNotifyMoreTime->ConstructL();
     CleanupStack::Pop( satNotifyMoreTime );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMORETIME_NEWL_2, "CSAT: CSatNotifyMoreTime::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyMoreTime::NewL, end of method");
     return satNotifyMoreTime;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMORETIME_DTOR_1, "CSAT: CSatNotifyMoreTime::~CSatNotifyMoreTime");
+    TFLOGSTRING("CSAT: CSatNotifyMoreTime::~CSatNotifyMoreTime");
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +88,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMORETIME_CONSTRUCTL_1, "CSAT: CSatNotifyMoreTime::ConstructL, does nothing");
+    TFLOGSTRING("CSAT: CSatNotifyMoreTime::ConstructL, does nothing");
     }
 
 // -----------------------------------------------------------------------------
@@ -107,7 +102,7 @@
         TInt /*aErrorCode*/              
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMORETIME_COMPLETENOTIFYL_1, "CSAT: CSatNotifyMoreTime::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyMoreTime::CompleteNotifyL");
     TInt ret( KErrNone );
     // Unpack parameters
     TPtrC8* data;
@@ -141,7 +136,7 @@
         TUint8 aGeneralResult			 
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMORETIME_CREATETERMINALRESPL_1, "CSAT: CSatNotifyMoreTime::CreateTerminalRespL");
+    TFLOGSTRING("CSAT: CSatNotifyMoreTime::CreateTerminalRespL");
     // Create and append response data
     TTlv tlvSpecificData;
 	// General result

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyOpenChannel.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyOpenChannel.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyOpenChannelTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyOpenChannel.h"  // Class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_NEWL_1, "CSAT: CSatNotifyOpenChannel::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyOpenChannel::NewL");
    	CSatNotifyOpenChannel* const satNotifyOpenChannel = 
         new ( ELeave ) CSatNotifyOpenChannel( aNotificationsTsy );
     CleanupStack::PushL( satNotifyOpenChannel );
     satNotifyOpenChannel->ConstructL();
     CleanupStack::Pop( satNotifyOpenChannel );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_NEWL_2, "CSAT: CSatNotifyOpenChannel::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyOpenChannel::NewL, end of method");
     return satNotifyOpenChannel;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_DTOR_1, "CSAT: CSatNotifyOpenChannel::~CSatNotifyOpenChannel");
+    TFLOGSTRING("CSAT: CSatNotifyOpenChannel::~CSatNotifyOpenChannel");
     }
     
 // -----------------------------------------------------------------------------
@@ -94,7 +89,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_CONSTRUCTL_1, "CSAT: CSatNotifyOpenChannel::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifyOpenChannel::ConstructL");
     }
 
 // -----------------------------------------------------------------------------
@@ -109,7 +104,7 @@
         const TDataPackage& aPackage
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_NOTIFY_1, "CSAT: CSatNotifyOpenChannel::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyOpenChannel::Notify");
     // Save data pointers to client side for completion
     iOpenBaseChannelV2Pckg = reinterpret_cast<RSat::TOpenChannelBaseV2Pckg*>( 
         aPackage.Des1n() );  
@@ -139,7 +134,7 @@
         const TTsyReqHandle aTsyReqHandle 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_CANCELNOTIFICATION_1, "CSAT: CSatNotifyOpenChannel::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifyOpenChannel::CancelNotification");
     
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
@@ -166,7 +161,7 @@
         TInt aErrorCode                  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_1, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyOpenChannel::CompleteNotifyL");
 
     TInt ret( KErrNone );	
     // Unpack parameters
@@ -209,7 +204,9 @@
                 	{
                 	case KBipCsdBearer:
                     	{
-                    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_2, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Command not supported: Csd Bearer");
+                    	TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\
+                    	    CompleteNotifyL, Command not supported: \
+                    	    Csd Bearer");
                     	// Buffer size
             	        iBufferSize = bufferSize.GetLongInfo( 
             	            ETLV_BufferSize );
@@ -217,7 +214,8 @@
                     	iBearerType = RSat::ECSDBearer;
                     	iBearer = bearerDescription.GetData( 
                     	    ETLV_BearerParameters ); 
-                        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_3, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, BipCsdBearer ");
+                        TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\
+                            CompleteNotifyL, BipCsdBearer ");
                         CreateTerminalRespL( pCmdNumber, 
 							RSat::KCmdBeyondMeCapabilities, KNullDesC16 );
                         ret = KErrCorrupt; 
@@ -274,7 +272,8 @@
                 	default:
                     	{
                     	// Bearer not supported (RFU)
-                    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_4, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Bearer not supported");
+                    	TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\
+                    	    CompleteNotifyL, Bearer not supported");
                     	// Required values missing
                     	iBearer.FillZ( 1 );
                     	iBufferSize = 0;
@@ -289,7 +288,8 @@
             	}
         	else
             	{
-            	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_5, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, required values missing");
+            	TFLOGSTRING("CSAT: CSatNotifyOpenChannel::CompleteNotifyL,\
+            	    required values missing");
             	// Required values missing
             	iBearer.FillZ( 1 );
             	iBufferSize = 0;
@@ -358,14 +358,16 @@
                     	}
                 	else
                     	{
-                    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_6, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Alpha ID is NULL");
+                    	TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\
+                    	    CompleteNotifyL, Alpha ID is NULL");
                     	openChannelV2->iAlphaId.iStatus = RSat::EAlphaIdNull;
                     	}
                		}
             	// Alpha id not present
             	else
                 	{
-                	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_7, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Alpha ID not present");
+                	TFLOGSTRING("CSAT: CSatNotifyOpenChannel::CompleteNotifyL,\
+                	    Alpha ID not present");
                 	openChannelV2->iAlphaId.iStatus = RSat::EAlphaIdNotPresent;
                 	}
 
@@ -409,7 +411,8 @@
                 	}
             	else
                 	{
-                	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_8, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Protocol not present");
+                	TFLOGSTRING("CSAT: CSatNotifyOpenChannel::CompleteNotifyL,\
+                	    Protocol not present");
                 	openChannelV2->iSimMeInterface.iTransportProto =
                     	RSat::EProtocolNotPresent;
                 	}
@@ -484,7 +487,8 @@
                         	}
                     	default:
                         	{
-                        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_9, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Address not set");
+                        	TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\
+                        	    CompleteNotifyL, Address not set");
                         	openChannelV2->iDestinationAddress.iType = 
                         	    RSat::EAddressNotSet;
                         	break;
@@ -538,7 +542,9 @@
                                 		}
                                 	default:
                                     	{
-                                    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_10, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Address not set");
+                                    	TFLOGSTRING("CSAT:\
+                                    	    CSatNotifyOpenChannel::\
+                                    	    CompleteNotifyL, Address not set");
                                 		openCsChannelV2.iLocalAddress.iType = 
                                     		RSat::EAddressNotSet;
                                 		}
@@ -552,7 +558,8 @@
                             		}
                        			else
                             		{
-                            		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_11, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Address not present");
+                            		TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\
+                            		    CompleteNotifyL, Address not present");
                             		openCsChannelV2.iLocalAddress.iType = 
                                 		RSat::EAddressNotPresent;
                             		}    
@@ -584,7 +591,9 @@
                                     	}
                                     default:
                                     	{
-                                    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_12, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Address not set");
+                                    	TFLOGSTRING("CSAT: \
+                                    	    CSatNotifyOpenChannel::\
+                                    	    CompleteNotifyL, Address not set");
                                     	openGprsChannelV4.iLocalAddress.iType = 
                                         	RSat::EAddressNotSet;
                                     	}
@@ -599,7 +608,8 @@
                                 	}
                             	else
                                 	{
-                                	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_13, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Address not present");
+                                	TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\
+                                	    CompleteNotifyL, Address not present");
                                 	openGprsChannelV4.iLocalAddress.iType = 
                                     	RSat::EAddressNotPresent;
                                 	}    
@@ -608,7 +618,8 @@
                             	}
                         	default:
                             	{
-                            	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_14, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Unknown Bearer type");
+                            	TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\
+                            	    CompleteNotifyL, Unknown Bearer type");
                             	break;
                             	}
                             	
@@ -618,7 +629,8 @@
             	} // if ( KErrNone == ret )
             else
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_15, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Error when parsing Bearer data");
+                TFLOGSTRING("CSAT: CSatNotifyOpenChannel::CompleteNotifyL,\
+                    Error when parsing Bearer data");
                 }
             } // if ( KErrNone == aErrorCode )
 		else
@@ -631,7 +643,8 @@
     else
         {
         // Request not on, returning response immediately
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_16, "CSAT:  CSatNotifyOpenChannel::CompleteNotifyL, Request not ongoing");
+        TFLOGSTRING("CSAT:  CSatNotifyOpenChannel::CompleteNotifyL, \
+            Request not ongoing");
         // additional info must be provided with KMeUnableToProcessCmd 
 		TBuf16<1> additionalInfo;
 		additionalInfo.Append( RSat::KNoSpecificMeProblem );
@@ -654,7 +667,7 @@
         TDes8* aRsp 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_1, "CSAT: CSatNotifyOpenChannel::TerminalResponseL");
+    TFLOGSTRING("CSAT: CSatNotifyOpenChannel::TerminalResponseL");
 
     TInt ret( KErrNone );
 
@@ -666,7 +679,8 @@
 
     TUint8 pCmdNumber( rspV2.PCmdNumber() );
     
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_2, "CSAT: CSatNotifyOpenChannel::TerminalResponseL, General result: %d", rspV2.iGeneralResult);
+    TFLOGSTRING2("CSAT: CSatNotifyOpenChannel::TerminalResponseL, \
+        General result: %d", rspV2.iGeneralResult);
 
     // Check that general result value is valid
     if ( ( RSat::KSuccess != rspV2.iGeneralResult ) 
@@ -689,7 +703,8 @@
         && ( RSat::KAccessTechUnableProcessCmd != rspV2.iGeneralResult )
         && ( RSat::KFramesError != rspV2.iGeneralResult ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_3, "CSAT: CSatNotifyOpenChannel::TerminalResponseL, Invalid General Result");
+        TFLOGSTRING("CSAT: CSatNotifyOpenChannel::TerminalResponseL, \
+            Invalid General Result");
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -703,7 +718,8 @@
         // Check the length of additional info
         if ( rspV2.iAdditionalInfo.Length() <= 0 )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_4, "CSAT: CSatNotifyOpenChannel::TerminalResponseL, Invalid Additional Info");
+            TFLOGSTRING("CSAT: CSatNotifyOpenChannel::TerminalResponseL, \
+                Invalid Additional Info");
             // Invalid additional info field
             ret = KErrCorrupt;
             }
@@ -726,7 +742,8 @@
 	    }
 	else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_5, "CSAT: CSatNotifyOpenChannel::TerminalResponseL, Invalid Additional Info type");
+        TFLOGSTRING("CSAT: CSatNotifyOpenChannel::TerminalResponseL, \
+                     Invalid Additional Info type");
         ret = KErrCorrupt;
         }
         
@@ -756,7 +773,7 @@
         const TDesC16& aAdditionalInfo
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_CREATETERMINALRESPL_1, "CSAT: CSatMessHandler::CreateTerminalRespL");
+    TFLOGSTRING("CSAT: CSatMessHandler::CreateTerminalRespL");
     // Create and append response data
     TTlv tlvSpecificData;
     // Create General Result TLV here
@@ -783,7 +800,8 @@
         // Successful result: could/must provide an additional info byte
 		if ( aAdditionalInfo.Length() > 0 )
         	{
-        	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_CREATETERMINALRESPL_2, "CSAT: CSatMessHandler::CreateTerminalRespL, Unsuccessful result: aAddtionalInfo: %d", aAdditionalInfo[0]);
+        	TFLOGSTRING2("CSAT: CSatMessHandler::CreateTerminalRespL,\
+				Unsuccessful result: aAddtionalInfo: %d", aAdditionalInfo[0]);
 			tlvSpecificData.AddByte( static_cast<TUint8>( aAdditionalInfo[0] ) );
             }
         }
@@ -797,7 +815,8 @@
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_CREATETERMINALRESPL_3, "CSAT: CSatMessHandler::CreateTerminalRespL: No Bearer Description data available");
+        TFLOGSTRING("CSAT: CSatMessHandler::CreateTerminalRespL: \
+        	No Bearer Description data available");
         }
         
     // Append Buffer Size

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyPlayTone.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyPlayTone.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyPlayToneTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyPlayTone.h"     // Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_NEWL_1, "CSAT: CSatNotifyPlayTone::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyPlayTone::NewL");
    	CSatNotifyPlayTone* const satNotifyPlayTone = 
         new ( ELeave ) CSatNotifyPlayTone( aNotificationsTsy );
     CleanupStack::PushL( satNotifyPlayTone );
     satNotifyPlayTone->ConstructL();
     CleanupStack::Pop( satNotifyPlayTone );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_NEWL_2, "CSAT: CSatNotifyPlayTone::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyPlayTone::NewL, end of method");
     return satNotifyPlayTone;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_DTOR_1, "CSAT: CSatNotifyPlayTone::~CSatNotifyPlayTone");
+    TFLOGSTRING("CSAT: CSatNotifyPlayTone::~CSatNotifyPlayTone");
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +88,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_CONSTRUCTL_1, "CSAT: CSatNotifyPlayTone::ConstructL, does nothing");
+    TFLOGSTRING("CSAT: CSatNotifyPlayTone::ConstructL, does nothing");
     }
 
 // -----------------------------------------------------------------------------
@@ -107,7 +102,7 @@
         const TDataPackage& aPackage
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_NOTIFY_1, "CSAT: CSatNotifyPlayTone::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyPlayTone::Notify");
     // Save data pointer to client side for completion
     iPlayToneV2Pckg = reinterpret_cast<RSat::TPlayToneV2Pckg*>( 
         aPackage.Des1n() );
@@ -132,7 +127,7 @@
         const TTsyReqHandle aTsyReqHandle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_CANCELNOTIFICATION_1, "CSAT: CSatNotifyPlayTone::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifyPlayTone::CancelNotification");    
     // Reset the request handle
     iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( CSatTsy::ESatNotifyPlayTonePCmdReqType );
@@ -155,7 +150,7 @@
 		TInt aErrorCode  
         ) 
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_1, "CSAT: CSatNotifyPlayTone::CompleteNotifyL");
+	TFLOGSTRING("CSAT: CSatNotifyPlayTone::CompleteNotifyL");
 	TInt returnValue( KErrNone );
     TInt ret( KErrNone );
     
@@ -196,7 +191,8 @@
             
 			if ( KErrNotFound != returnValue )
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_2, "CSAT: CSatNotifyPlayTone::CompleteNotifyL, Alpha ID present");
+				TFLOGSTRING("CSAT: CSatNotifyPlayTone::CompleteNotifyL,\
+				    Alpha ID present");
 				TUint16 alphaIdLength = alphaIdentifier.GetLength();
 				if ( alphaIdLength )
 					{
@@ -216,7 +212,8 @@
 					}
 				else
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_3, "CSAT: CSatNotifyPlayTone::CompleteNotifyL, Alpha ID is NULL");
+					TFLOGSTRING("CSAT: CSatNotifyPlayTone::CompleteNotifyL,\
+					    Alpha ID is NULL");
 					playToneV2.iAlphaId.iStatus = RSat::EAlphaIdNull;
 					}
 				}
@@ -229,7 +226,8 @@
 				{
 				playToneV2.iTone = ( RSat::TTone ) tone.GetShortInfo( 
 				    ETLV_Tone );
-			    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_4, "CSAT: CSatNotifyPlayTone::CompleteNotifyL, Tone Selection: %d", playToneV2.iTone);
+			    TFLOGSTRING2("CSAT: CSatNotifyPlayTone::CompleteNotifyL,\
+				    Tone Selection: %d", playToneV2.iTone);
 				}
         
 			// Duration of the tone (optional)
@@ -250,7 +248,8 @@
 		}// End of if ( CSatTsy::ESatReqHandleUnknown != reqHandle )			
 	else 
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_5, "CSAT: CSatNotifyPlayTone::CompleteNotifyL, Request not ongoing");
+		TFLOGSTRING("CSAT: CSatNotifyPlayTone::CompleteNotifyL,\
+		    Request not ongoing");
 		// Request not on, returning response immediately
 		additionalInfo.Zero();
 		additionalInfo.Append( KNoCause );
@@ -273,7 +272,7 @@
         TDes8* aRsp
         )
 	{    
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_1,  "CSAT: CSatNotifyPlayTone::TerminalResponseL" );
+	TFLOGSTRING( "CSAT: CSatNotifyPlayTone::TerminalResponseL" );
 
     TInt ret( KErrNone );
     TBuf<1>additionalInfo;
@@ -294,7 +293,8 @@
 		 ( RSat::KCmdBeyondMeCapabilities != rspV1.iGeneralResult ) && 
 		 ( RSat::KCmdDataNotUnderstood != rspV1.iGeneralResult ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_2,  "CSAT: CSatNotifyPlayTone::TerminalResponseL, Invalid General Result" );
+        TFLOGSTRING( "CSAT: CSatNotifyPlayTone::TerminalResponseL,\
+            Invalid General Result" );
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -310,12 +310,14 @@
 			}
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_3,  "CSAT: CSatNotifyPlayTone::TerminalResponseL, Invalid Additional Info" );
+            TFLOGSTRING( "CSAT: CSatNotifyPlayTone::TerminalResponseL,\
+                Invalid Additional Info" );
             // Invalid additional info field
             ret = KErrCorrupt;
             }
         }
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_4,  "CSAT: CSatNotifyPlayTone::TerminalResponseL: AdditionalInfo: %S", additionalInfo );
+	TFLOGSTRING2( "CSAT: CSatNotifyPlayTone::TerminalResponseL: \
+		AdditionalInfo: %s", &additionalInfo );
 
     CreateTerminalRespL( pCmdNumber, static_cast< TUint8 >( 
     	rspV1.iGeneralResult ), additionalInfo );                            
@@ -336,7 +338,7 @@
         TDesC16&  aAdditionalInfo            
 	    )    	
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_CREATETERMINALRESPL_1, "CSAT: CSatNotifyPlayTone::CreateTerminalRespL");
+	TFLOGSTRING("CSAT: CSatNotifyPlayTone::CreateTerminalRespL");
     TTlv tlvSpecificData;
     tlvSpecificData.AddTag( KTlvResultTag );
 	//General result

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyPollInterval.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyPollInterval.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyPollIntervalTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyPollInterval.h" // Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h" 	// Message manager class for forwarding req.
@@ -49,13 +44,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_NEWL_1, "CSAT: CSatNotifyPollInterval::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyPollInterval::NewL");
    	CSatNotifyPollInterval* const satNotifyPollInterval = 
         new ( ELeave ) CSatNotifyPollInterval( aNotificationsTsy );
     CleanupStack::PushL( satNotifyPollInterval );
     satNotifyPollInterval->ConstructL();
     CleanupStack::Pop( satNotifyPollInterval );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_NEWL_2, "CSAT: CSatNotifyPollInterval::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyPollInterval::NewL, end of method");
     return satNotifyPollInterval;
     }
 
@@ -69,7 +64,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_DTOR_1, "CSAT: CSatNotifyPollInterval::~CSatNotifyPollInterval");
+    TFLOGSTRING("CSAT: CSatNotifyPollInterval::~CSatNotifyPollInterval");
     }
     
 // -----------------------------------------------------------------------------
@@ -95,7 +90,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_CONSTRUCTL_1, "CSAT: CSatNotifyPollInterval::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifyPollInterval::ConstructL");
     }
     
 // -----------------------------------------------------------------------------
@@ -110,7 +105,7 @@
         TInt /*aErrorCode*/  
         ) 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_COMPLETENOTIFYL_1, "CSAT: CSatNotifyPollInterval::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyPollInterval::CompleteNotifyL");
     TInt returnValue( KErrNone );
     TPtrC8* data;
     aDataPackage->UnPackData( &data );
@@ -172,7 +167,8 @@
                     }
                 default:
                 	{
-                 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_COMPLETENOTIFYL_2, "CSAT: CSatNotifyPollInterval::CompleteNotifyL, Time unit unknown.");
+                 	TFLOGSTRING("CSAT: CSatNotifyPollInterval::\
+                 	    CompleteNotifyL, Time unit unknown.");
 	        		returnValue = KErrNotFound;
                  	// Command data not understood
                  	CreateTerminalRespL( pCmdNumber, 
@@ -226,7 +222,7 @@
         TUint8 aDcs               	
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_CREATETERMINALRESPL_1, "CSAT: CSatNotifyPollInterval::CreateTerminalRespL");
+    TFLOGSTRING("CSAT: CSatNotifyPollInterval::CreateTerminalRespL");   
     TTlv tlvSpecificData;
     tlvSpecificData.AddTag( KTlvResultTag );     
     tlvSpecificData.AddByte( aGeneralResult );
@@ -247,7 +243,9 @@
                 }
             default:
                 {
-                OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_CREATETERMINALRESPL_2, "CSAT: CSatNotifyPollInterval::CreateTerminalRespL, Additional Info: %d", aAdditionalInfo);
+                TFLOGSTRING2("CSAT: CSatNotifyPollInterval::\
+                    CreateTerminalRespL, Additional Info: %d", 
+                    aAdditionalInfo);  
                 tlvSpecificData.AddByte( aAdditionalInfo );
                 break;
                 }

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyPollingOff.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyPollingOff.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyPollingOffTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyPollingOff.h"   // Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h" 	// Message manager class for forwarding req.
@@ -48,13 +43,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINGOFF_NEWL_1, "CSAT: CSatNotifyPollingOff::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyPollingOff::NewL");
    	CSatNotifyPollingOff* const satNotifyPollingOff = 
         new ( ELeave ) CSatNotifyPollingOff( aNotificationsTsy );
     CleanupStack::PushL( satNotifyPollingOff );
     satNotifyPollingOff->ConstructL();
     CleanupStack::Pop( satNotifyPollingOff );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINGOFF_NEWL_2, "CSAT: CSatNotifyPollingOff::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyPollingOff::NewL, end of method");
     return satNotifyPollingOff;
     }
 
@@ -68,7 +63,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINGOFF_DTOR_1, "CSAT: CSatNotifyPollingOff::~CSatNotifyPollingOff");
+    TFLOGSTRING("CSAT: CSatNotifyPollingOff::~CSatNotifyPollingOff");
     }
     
 // -----------------------------------------------------------------------------
@@ -94,7 +89,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINGOFF_CONSTRUCTL_1, "CSAT: CSatNotifyPollingOff::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifyPollingOff::ConstructL");
     }
 
 // -----------------------------------------------------------------------------
@@ -109,7 +104,7 @@
         TInt /*aErrorCode*/  
         ) 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINGOFF_COMPLETENOTIFYL_1, "CSAT: CSatNotifyPollingOff::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyPollingOff::CompleteNotifyL");
     TPtrC8* data;
     TBuf<1> additionalInfo;
     aDataPackage->UnPackData( &data );
@@ -156,7 +151,7 @@
         TDesC16& aAdditionalInfo            
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINGOFF_CREATETERMINALRESPL_1, "CSAT: CSatNotifyPollingOff::CreateTerminalRespL");
+    TFLOGSTRING("CSAT: CSatNotifyPollingOff::CreateTerminalRespL");    
     
     TTlv tlvSpecificData;
     tlvSpecificData.AddTag( KTlvResultTag );
@@ -178,7 +173,9 @@
                 }
             default:
                 {
-                OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINGOFF_CREATETERMINALRESPL_2, "CSAT: CSatNotifyPollingOff::CreateTerminalRespL, Additional Info: %d", aAdditionalInfo[0]);
+                TFLOGSTRING2("CSAT: CSatNotifyPollingOff::\
+                    CreateTerminalRespL, Additional Info: %d", 
+                    aAdditionalInfo[0]);
                 tlvSpecificData.AddByte( static_cast<TUint8>( 
                 	aAdditionalInfo[0] ) );
                 break;

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyReceiveData.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyReceiveData.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 // INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyReceiveDataTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyReceiveData.h" 	// Class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_NEWL_1, "CSAT: CSatNotifyMoreTime::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyMoreTime::NewL");
    	CSatNotifyReceiveData* const satNotifyReceiveData = 
         new ( ELeave ) CSatNotifyReceiveData( aNotificationsTsy );
     CleanupStack::PushL( satNotifyReceiveData );
     satNotifyReceiveData->ConstructL();
     CleanupStack::Pop( satNotifyReceiveData );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_NEWL_2, "CSAT: CSatNotifyMoreTime::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyMoreTime::NewL, end of method");
     return satNotifyReceiveData;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_DTOR_1, "CSAT: CSatNotifyMoreTime::~CSatNotifyReceiveData");
+    TFLOGSTRING("CSAT: CSatNotifyMoreTime::~CSatNotifyReceiveData");
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +88,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_CONSTRUCTL_1, "CSAT: CSatNotifyMoreTime::ConstructL, does nothing");
+    TFLOGSTRING("CSAT: CSatNotifyMoreTime::ConstructL, does nothing");
     }
 
 // -----------------------------------------------------------------------------
@@ -108,7 +103,7 @@
         const TDataPackage& aPackage    
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_NOTIFY_1, "CSAT: CSatNotifyReceiveData::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyReceiveData::Notify");
     // Save data pointer to client side for completion
     iReceiveDataRspV2Pckg = reinterpret_cast<RSat::TReceiveDataV2Pckg*>( 
         aPackage.Des1n() );     
@@ -131,7 +126,7 @@
         const TTsyReqHandle aTsyReqHandle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_CANCELNOTIFICATION_1, "CSAT: CSatNotifyReceiveData::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifyReceiveData::CancelNotification");
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( CSatTsy::ESatNotifyReceiveDataPCmdReqType );
@@ -154,7 +149,7 @@
         TInt aErrorCode                  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_1, "CSAT: CSatNotifyReceiveData::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyReceiveData::CompleteNotifyL");
     TInt ret( KErrNone );
 	TBuf<1> noAdditionalInfo( 0 );
     // Unpack parameters
@@ -229,7 +224,8 @@
 	                    }
 	                else
 	                    {
-	                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_2, "CSAT: CSatNotifyReceiveData::CompleteNotifyL, Alpha ID is NULL");
+	                    TFLOGSTRING("CSAT: CSatNotifyReceiveData::\
+	                    	CompleteNotifyL, Alpha ID is NULL");
 	                    receiveDataV2.iAlphaId.iStatus = RSat::EAlphaIdNull;
 	                    }
 	                }
@@ -241,7 +237,8 @@
 	            }
 	        else
 	            {
-	            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_3, "CSAT: CSatNotifyReceiveData::CompleteNotifyL, Required values missing");
+	            TFLOGSTRING("CSAT: CSatNotifyReceiveData::CompleteNotifyL, \
+	            	Required values missing");
 	            // Required values missing
 	            TUint8 channelDataLength( 0 );
 	            CreateTerminalRespL( 
@@ -260,7 +257,8 @@
         }
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_4, "CSAT: CSatNotifyReceiveData::CompleteNotifyL, Request not ongoing");
+		TFLOGSTRING("CSAT: CSatNotifyReceiveData::CompleteNotifyL, \
+			Request not ongoing");
 		// Request not on, returning response immediately
     	TUint8 channelDataLength( 0 );
 		TBuf16<1> additionalInfo;
@@ -284,7 +282,7 @@
         TDes8* aRsp
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_TERMINALRESPONSEL_1, "CSAT: CSatNotifyReceiveData::TerminalResponseL");
+    TFLOGSTRING("CSAT: CSatNotifyReceiveData::TerminalResponseL");
 
     TInt ret( KErrNone );
     
@@ -311,7 +309,8 @@
         && ( RSat::KErrorRequiredValuesMissing != rspV2.iGeneralResult )
         && ( RSat::KBearerIndepProtocolError != rspV2.iGeneralResult ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_TERMINALRESPONSEL_2, "CSAT: CSatNotifyReceiveData::TerminalResponseL, Invalid general result");
+        TFLOGSTRING("CSAT: CSatNotifyReceiveData::TerminalResponseL, \
+			Invalid general result");
         ret = KErrCorrupt;
         }
 
@@ -326,7 +325,8 @@
         	}
     	else
         	{
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_TERMINALRESPONSEL_3, "CSAT: CSatNotifyReceiveData::TerminalResponseL, Additional Info is Corrupted");
+        	TFLOGSTRING("CSAT: CSatNotifyReceiveData::TerminalResponseL, \
+			Additional Info is Corrupted");
         	ret = KErrCorrupt;
         	}
         }
@@ -351,7 +351,7 @@
         TUint8 aChannelDataLength
 		)
 	{   	
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_CREATETERMINALRESPL_1, "CSAT: CSatNotifyReceiveData::CreateTerminalRespL");
+    TFLOGSTRING("CSAT: CSatNotifyReceiveData::CreateTerminalRespL");
     TTlv tlvSpecificData;
     // Append general result tag
     tlvSpecificData.AddTag( KTlvResultTag );

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyRefresh.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyRefresh.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyRefreshTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyRefresh.h"  	// Class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -50,13 +45,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_NEWL_1, "CSAT: CSatNotifyRefresh::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyRefresh::NewL");
    	CSatNotifyRefresh* const satNotifyRefresh = 
         new ( ELeave ) CSatNotifyRefresh( aNotificationsTsy );
     CleanupStack::PushL( satNotifyRefresh );
     satNotifyRefresh->ConstructL();
     CleanupStack::Pop( satNotifyRefresh );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_NEWL_2, "CSAT: CSatNotifyRefresh::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyRefresh::NewL, end of method");
     return satNotifyRefresh;
     }
 
@@ -70,7 +65,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_DTOR_1, "CSAT: CSatNotifyRefresh::~CSatNotifyRefresh");
+    TFLOGSTRING("CSAT: CSatNotifyRefresh::~CSatNotifyRefresh");
     }
     
 // -----------------------------------------------------------------------------
@@ -96,7 +91,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_CONSTRUCTL_1, "CSAT: CSatNotifyRefresh::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifyRefresh::ConstructL");
     }
 
 // -----------------------------------------------------------------------------
@@ -110,7 +105,7 @@
         const TDataPackage& aPackage  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_NOTIFY_1, "CSAT: CSatNotifyRefresh::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyRefresh::Notify");
 
     // Save data pointer to client side for completion
     iRefreshV2Pckg = reinterpret_cast<RSat::TRefreshV2Pckg*>( 
@@ -141,7 +136,7 @@
         const TDataPackage& aPackage 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_NOTIFYREFRESHREQUIRED_1, "CSAT: CSatNotifyRefresh::NotifyRefreshRequired");
+    TFLOGSTRING("CSAT: CSatNotifyRefresh::NotifyRefreshRequired");
 
     // Save data pointer to client side for completion
     iRefreshRequiredV2Pckg = reinterpret_cast<RSat::TRefreshV2Pckg*>( 
@@ -171,7 +166,7 @@
         const TTsyReqHandle aTsyReqHandle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_CANCELNOTIFICATION_1,  "CSAT: CSatNotifyRefresh::CancelNotification" );
+    TFLOGSTRING( "CSAT: CSatNotifyRefresh::CancelNotification" );
     
     // Reset the request handle
     iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( 
@@ -196,7 +191,7 @@
     	const TTsyReqHandle aTsyReqHandle
      	)
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_CANCELREFRESHREQUIREDNOTIFICATION_1,  "CSAT: CSatNotifyRefresh::CancelRefreshRequiredNotification" );
+    TFLOGSTRING( "CSAT: CSatNotifyRefresh::CancelRefreshRequiredNotification" );
         
     // Reset the request handle
     iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( 
@@ -223,14 +218,15 @@
         TInt aErrorCode                 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_1, "CSAT: CSatNotifyRefresh::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL");
 
     TInt ret( KErrNone );
 	TBuf<1> additionalInfo;	
     // Unpack parameters
     TPtrC8* data;
     aDataPackage->UnPackData( &data );
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_2, "CSAT: CSatNotifyRefresh::CompleteNotifyL, dataLength: %d", data->Length());
+    TFLOGSTRING2("CSAT: CSatNotifyRefresh::CompleteNotifyL, dataLength: %d", 
+        data->Length());
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
         TsyReqHandle( CSatTsy::ESatNotifyRefreshPCmdReqType );
@@ -327,7 +323,8 @@
 	        else if ( KFileChangeNotification == iNotificationsTsy->
 	        	iTerminalRespData.iCommandDetails[KCommandQualifier] )
 	            {
-	            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_3, "CSAT: CSatNotifyRefresh::CompleteNotifyL, File list missing");
+	            TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL,\
+	                File list missing");
 	            // File list object is missing, return terminal resp immediately.
 	            ret = KErrCorrupt;
 	            additionalInfo.Zero();
@@ -343,7 +340,9 @@
 	                {
 	                case KSimInitFullFileChangeNotification:
 	                    {
-	                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_4, "CSAT: CSatNotifyRefresh::CompleteNotifyL, Refresh mode: Sim init and full file change notification");
+	                    TFLOGSTRING("CSAT: CSatNotifyRefresh::\
+	                    	CompleteNotifyL, Refresh mode: Sim init \
+	                    	and full file change notification");
 	                    refreshV2.iType = 
 	                        RSat::ESimInitFullFileChangeNotification;
 	                    iInternalCache = CSatNotificationsTsy::ECacheEFSST + 
@@ -352,8 +351,11 @@
 	                    }
 	                case KFileChangeNotification:
 	                    {
-	                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_5, "CSAT: CSatNotifyRefresh::CompleteNotifyL Refresh mode: File Change Notification");
-	                    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_6, "CSAT: CSatNotifyRefresh::CompleteNotifyL Number of files: %d", refreshV2.iFileList.Length() );
+	                    TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL\
+	                    	Refresh mode: File Change Notification");
+	                    TFLOGSTRING2("CSAT: CSatNotifyRefresh::CompleteNotifyL\
+	                    	Number of files: %d", 
+	                    	refreshV2.iFileList.Length() );
 	                    refreshV2.iType = RSat::EFileChangeNotification;
 	                    
 	                    if ( ( KErrNotFound != refreshV2.iFileList.Locate( 
@@ -376,14 +378,19 @@
 	                    }
 	                case KSimInitFileChangeNotification:
 	                    {
-	                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_7, "CSAT: CSatNotifyRefresh::CompleteNotifyL, Refresh mode: Sim init and file change notification");
-	                    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_8, "CSAT: CSatNotifyRefresh::CompleteNotifyL Number of files: %d", refreshV2.iFileList.Length() );
+	                    TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL,\
+	                    	Refresh mode: Sim init and file \
+	                    	change notification");
+	                    TFLOGSTRING2("CSAT: CSatNotifyRefresh::CompleteNotifyL\
+	                    	Number of files: %d", 
+	                    	refreshV2.iFileList.Length() );
 	                    refreshV2.iType = RSat::ESimInitFileChangeNotification;
 	                    break;
 	                    }
 	                case KSimInit:
 	                    {
-	                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_9, "CSAT: CSatNotifyRefresh::CompleteNotifyL Refresh mode: Sim init ");
+	                    TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL\
+	                    	Refresh mode: Sim init ");
 	                    refreshV2.iType = RSat::ESimInit;
 	                    iInternalCache = CSatNotificationsTsy::ECacheEFSST 
 	                    	+ CSatNotificationsTsy::ECacheEFCBMID;
@@ -394,14 +401,16 @@
 	                case KSimReset:
 	                    {
 	                    refreshV2.iType = RSat::ESimReset;
-	                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_10, "CSAT: CSatNotifyRefresh::CompleteNotifyL Refresh mode: Reset");
+	                    TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL\
+	                    	Refresh mode: Reset");
 	                    iInternalCache = CSatNotificationsTsy::ECacheEFSST + 
 	                    	CSatNotificationsTsy::ECacheEFCBMID;
 	                    break;
 	                    }
 	                case KUSIMApplicationReset:
 	                    {
-	                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_11, "CSAT: CSatNotifyRefresh::CompleteNotifyL Refresh mode: USIM Application Reset");
+	                    TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL\
+	                    	Refresh mode: USIM Application Reset");
 	                    refreshV2.iType = RSat::EUsimApplicationReset;
 	                    iInternalCache = CSatNotificationsTsy::ECacheEFSST + 
 	                    	CSatNotificationsTsy::ECacheEFCBMID;
@@ -409,13 +418,15 @@
 	                    }
 	                case K3GSessionReset:
 	                    {
-	                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_12, "CSAT: CSatNotifyRefresh::CompleteNotifyL Refresh mode: 3G Session Reset");
+	                    TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL\
+	                    	Refresh mode: 3G Session Reset");
 	                    refreshV2.iType = RSat::E3GSessionReset;
 	                    break;
 	                    }
 	                default:
 	                    {
-	                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_13, "CSAT: CSatNotifyRefresh::CompleteNotifyL Refresh type not set!");
+	                    TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL\
+	                    	Refresh type not set!");
 	                    // This migth be an error case
 	                    refreshV2.iType = RSat::ERefreshTypeNotSet;
 	                    break;
@@ -450,7 +461,8 @@
         }
     else
     	{        
-    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_14, "CSAT: CSatNotifyRefresh::CompleteNotifyL, One or more of the requests not ongoing");
+    	TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL,\
+    	    One or more of the requests not ongoing");
         // Some of the request were not on, returning response immediately
         additionalInfo.Zero();
         additionalInfo.Append( RSat::KNoSpecificMeProblem );
@@ -474,7 +486,7 @@
         TDes8* aRsp
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_TERMINALRESPONSEL_1, "CSAT: CSatNotifyRefresh::TerminalResponseL");
+    TFLOGSTRING("CSAT: CSatNotifyRefresh::TerminalResponseL");
 
     RSat::TRefreshRspV1Pckg* aRspPckg = 
             reinterpret_cast<RSat::TRefreshRspV1Pckg*>( aRsp );
@@ -496,7 +508,8 @@
     		( RSat::KSuccess != rspV1.iGeneralResult ) ) && 
     		( EImsiNotEqual != iImsiState ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_TERMINALRESPONSEL_2, "CSAT: CSatNotifyRefresh::TerminalResponseL, S60 has done the Refresh" );
+        TFLOGSTRING("CSAT: CSatNotifyRefresh::TerminalResponseL, \
+        	S60 has done the Refresh" );
         // Send terminal response
         CreateTerminalRespL( pCmdNumber, (TUint8) rspV1.iGeneralResult, 
         	additionalInfo );
@@ -526,10 +539,11 @@
         // None
     	)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETEIMSICHANGE_1, "CSAT: CSatNotifyRefresh::CompleteImsiChange");
+    TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteImsiChange");
     if ( ERefreshSimInitReceived == iImsiState )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETEIMSICHANGE_2, "CSAT: CSatNotifyRefresh::CompleteImsiChange, IMSI not equal");
+        TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteImsiChange, \
+            IMSI not equal");
         iImsiState = EImsiNotEqual;
         }        
     }    
@@ -547,7 +561,7 @@
         TDesC16& aAdditionalInfo		   
 		)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_CREATETERMINALRESPL_1, "CSAT: CSatNotifyRefresh::CreateTerminalRespL");
+	TFLOGSTRING("CSAT: CSatNotifyRefresh::CreateTerminalRespL");
     // Create and append response data
     TTlv tlvSpecificData;
     // append result tag
@@ -587,7 +601,7 @@
 		const TDataPackage& aPackage
     	)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_REFRESHALLOWEDL_1, "CSAT: CSatNotifyRefresh::RefreshAllowed ");
+    TFLOGSTRING("CSAT: CSatNotifyRefresh::RefreshAllowed ");       
     RSat::TRefreshRspV1Pckg* aRspPckg = 
             reinterpret_cast<RSat::TRefreshRspV1Pckg*>( aPackage.Des1n() );
     RSat::TRefreshRspV1& rspV1 = ( *aRspPckg ) ();
@@ -611,7 +625,8 @@
     else
         {
         // Refresh not allowed by the client
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_REFRESHALLOWEDL_2, "CSAT: CSatNotifyRefresh::RefreshAllowed, refresh was not allowed by the client");
+        TFLOGSTRING("CSAT: CSatNotifyRefresh::RefreshAllowed, refresh was not \
+            allowed by the client");
 		TBuf<RSat::KAdditionalInfoMaxSize> additionalInfo;
 		additionalInfo.Append(RSat::KNoSpecificMeProblem);
         if ( RSat::KNoAdditionalInfo != rspV1.iInfoType )
@@ -639,7 +654,7 @@
         TInt /*aErrorCode*/              
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETETERMINALRESPDATAL_1, "CSAT: CSatNotifyRefresh::CompleteTerminalRespDataL");
+    TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteTerminalRespDataL");
     TInt ret( KErrNone );
     CSatNotificationsTsy::TTerminalRespData* terminalRespData;
     // Send terminal response
@@ -666,11 +681,13 @@
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( CSatTsy::ESatNotifyRefreshPCmdReqType );
 		
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETEREQUEST_1, "CSAT: CSatNotifyRefresh::CompleteRequest.\n\t\t\t Handle:%d\n\t\t\t Error:%d", reqHandle, aErrorCode);
+    TFLOGSTRING3("CSAT: CSatNotifyRefresh::CompleteRequest.\
+    	 \n\t\t\t Handle:%d\n\t\t\t Error:%d", reqHandle, aErrorCode);
     	 		
     iNotificationsTsy->iSatTsy->ReqCompleted( reqHandle, aErrorCode);
 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETEREQUEST_2, "CSAT: CSatNotifyRefresh::CompleteRequest. Request is now completed");
+    TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteRequest. Request is \
+    	now completed");    
     }     
 #else //USING_CTSY_DISPATCHER
 void CSatNotifyRefresh::CompleteRequest
@@ -685,13 +702,15 @@
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( CSatTsy::ESatNotifyRefreshPCmdReqType );
 
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETEREQUEST1_1, "CSAT: CSatNotifyRefresh::CompleteRequest. \n\t\t\t Handle:%d\n\t\t\t Error:%d", reqHandle, retValue);
+    TFLOGSTRING3("CSAT: CSatNotifyRefresh::CompleteRequest.\
+    	 \n\t\t\t Handle:%d\n\t\t\t Error:%d", reqHandle, retValue);
     	 		   
     if(CSatTsy::ESatReqHandleUnknown != reqHandle) 
     	{
         iNotificationsTsy->iSatTsy->ReqCompleted( reqHandle, retValue );
 
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETEREQUEST1_2, "CSAT: CSatNotifyRefresh::CompleteRequest. Request is now completed");
+        TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteRequest. Request is \
+        	now completed");
     	} 
     
     }

--- a/telephonyserverplugins/simatktsy/src/CSatNotifySelectItem.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySelectItem.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifySelectItemTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifySelectItem.h"   // Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_NEWL_1, "CSAT: CSatNotifySelectItem::NewL");
+    TFLOGSTRING("CSAT: CSatNotifySelectItem::NewL");
    	CSatNotifySelectItem* const satNotifySelectItem = 
         new ( ELeave ) CSatNotifySelectItem( aNotificationsTsy );
     CleanupStack::PushL( satNotifySelectItem );
     satNotifySelectItem->ConstructL();
     CleanupStack::Pop( satNotifySelectItem );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_NEWL_2, "CSAT: CSatNotifySelectItem::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifySelectItem::NewL, end of method");
     return satNotifySelectItem;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_DTOR_1, "CSAT: CSatNotifySelectItem::~CSatNotifySelectItem");
+    TFLOGSTRING("CSAT: CSatNotifySelectItem::~CSatNotifySelectItem");
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +88,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_CONSTRUCTL_1, "CSAT: CSatNotifySelectItem::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifySelectItem::ConstructL");
     // Initiliaze Item Next Indicator flag
     iItemNextIndicatorRemoved = EFalse;
     }
@@ -110,7 +105,7 @@
         const TDataPackage& aPackage    
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_NOTIFY_1, "CSAT: CSatNotifySelectItem::Notify");
+    TFLOGSTRING("CSAT: CSatNotifySelectItem::Notify");
     // Save data pointer to client side for completion
     iSelectItemV2Pckg = reinterpret_cast<RSat::TSelectItemV2Pckg*>( 
         aPackage.Des1n() );
@@ -133,7 +128,7 @@
         const TTsyReqHandle aTsyReqHandle 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_CANCELNOTIFICATION_1, "CSAT: CSatNotifySelectItem::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifySelectItem::CancelNotification");  
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( CSatTsy::ESatNotifySelectItemPCmdReqType );
@@ -156,7 +151,7 @@
 		TInt aErrorCode
         )
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_1, "CSAT: CSatNotifySelectItem::CompleteNotifyL");
+	TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL");
 	TInt ret( KErrNone );
     // Unpack parameters
     TPtrC8* data;
@@ -228,7 +223,8 @@
 						}
 					else
 						{
-						OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_2, "CSAT: CSatNotifySelectItem::CompleteNotifyL, Alpha ID is NULL");
+						TFLOGSTRING("CSAT: CSatNotifySelectItem::\
+						    CompleteNotifyL, Alpha ID is NULL");
 						selectItemV2.iAlphaId.iStatus = RSat::EAlphaIdNull;
 						}
 					}
@@ -236,7 +232,8 @@
 			// Alpha id not present
 			else 
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_3, "CSAT: CSatNotifySelectItem::CompleteNotifyL Alpha ID not present");
+				TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL\
+				    Alpha ID not present");
 				selectItemV2.iAlphaId.iStatus = RSat::EAlphaIdNotPresent;
 				}
 			// Help information
@@ -247,7 +244,8 @@
 				}
 			else
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_4, "CSAT: CSatNotifySelectItem::CompleteNotifyL, No Help available");
+				TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL,\
+				    No Help available");
 				// No help
 				selectItemV2.iHelp = RSat::ENoHelpAvailable;
 				}
@@ -326,12 +324,14 @@
 				}
 			else if ( KErrNotFound == retValue )
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_5, "CSAT: CSatNotifySelectItem::CompleteNotifyL, No Icon ID");
+				TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL,\
+				    No Icon ID");
 				selectItemV2.iIconListQualifier = RSat::ENoIconId;
 				}
 			else
 				{
-        		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_6, "CSAT: CSatNotifySelectItem::CompleteNotifyL, Return value not valid.");
+        		TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL, \
+        			Return value not valid.");
 				}
              
             ret = HandleItemsL( pCmdNumber, &berTlv, ret, iconIdList, 
@@ -350,7 +350,8 @@
         } // End of if ( CSatTsy::ESatReqHandleUnknown != reqHandle )
 	else 
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_7, "CSAT: CSatNotifySelectItem::CompleteNotifyL, Request not ongoing");
+        TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL,\
+            Request not ongoing");
         // Request not on, returning response immediately       
 		additionalInfo.Zero();
         additionalInfo.Append( KNoCause );
@@ -371,7 +372,7 @@
         TDes8* aRsp 
         ) 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_1, "CSAT:: CSatNotifySelectItem::TerminalResponseL");
+    TFLOGSTRING("CSAT:: CSatNotifySelectItem::TerminalResponseL");
 
     TInt   ret( KErrNone );
     TBuf<1> additionalInfo;
@@ -391,7 +392,8 @@
         && ( RSat::KMeUnableToProcessCmd != rspV1.iGeneralResult )
         && ( RSat::KCmdBeyondMeCapabilities != rspV1.iGeneralResult ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_2, "CSAT: CSatNotifySelectItem::CompleteNotifyL, Invalid General Result");
+        TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL,\
+            Invalid General Result");
         ret = KErrCorrupt;
         }
     // If there is ME (Mobile Entity) error or there there should be 
@@ -404,14 +406,17 @@
         // Check the length of additional info
         if ( rspV1.iAdditionalInfo.Length() != 0 )
             {
-            OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_3, "CSAT: CSatNotifySelectItem::TerminalResponseL, Additional info: %S", rspV1.iAdditionalInfo);
+            TFLOGSTRING2("CSAT: CSatNotifySelectItem::TerminalResponseL, \
+                Additional info: %S", &rspV1.iAdditionalInfo);
             additionalInfo.Zero();
             additionalInfo.Append( rspV1.iAdditionalInfo[0] );
-            OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_4, "CSAT: CSatNotifySelectItem::TerminalResponseL, Additional info: %S", additionalInfo);
+            TFLOGSTRING2("CSAT: CSatNotifySelectItem::TerminalResponseL, \
+                Additional info: %S", &additionalInfo);
 			}
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_5, "CSAT: CSatNotifySelectItem::CompleteNotifyL, Invalid Additional Info");
+            TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL,\
+                Invalid Additional Info");
             ret = KErrCorrupt;
             }
         }
@@ -420,12 +425,14 @@
     	{
     	if (iItemNextIndicatorRemoved)
     		{
-    		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_6, "CSatNotifySelectItem::TerminalResponseL, Partial Comprehension, iItemNextIndicatorRemoved");
+    		TFLOGSTRING("CSatNotifySelectItem::TerminalResponseL, Partial Comprehension, \
+    			iItemNextIndicatorRemoved");
         	rspV1.iGeneralResult = RSat::KPartialComprehension;
     		}
     	if (iItemsIconIdListRemoved)
     		{
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_7, "CSatNotifySelectItem::TerminalResponseL, Partial Comprehension, iItemsIconIdListRemoved");
+        	TFLOGSTRING("CSatNotifySelectItem::TerminalResponseL, Partial Comprehension, \
+        		iItemsIconIdListRemoved");
         	rspV1.iGeneralResult = RSat::KPartialComprehension;
     		}
     	}
@@ -453,7 +460,8 @@
 	    TDesC16& aAdditionalInfo			
 	    )	
 	{	    
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_CREATETERMINALRESPL_1, "CSAT: CSatNotifySelectItem::CreateTerminalRespL, Additional info: %S", aAdditionalInfo);
+	TFLOGSTRING2("CSAT: CSatNotifySelectItem::CreateTerminalRespL, \
+        Additional info: %S", &aAdditionalInfo);
 
 	TTlv tlvSpecificData;    
     // Create General Result TLV here
@@ -522,7 +530,7 @@
 		RSat::TSelectItemV2* aSelectItemV2
 		)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_HANDLEITEMSL_1, "CSAT: CSatNotifySelectItem::HandleItemsL");
+	TFLOGSTRING("CSAT: CSatNotifySelectItem::HandleItemsL");
 	TInt ret( aRet );
 
 	CTlv item;
@@ -667,7 +675,8 @@
 				if ( KErrNoMemory == aSelectItemV2->AddItem( 
 					newItem, itemNextIndicator[i], aIconIdList[i] ) )
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_HANDLEITEMSL_2, "CSAT: CSatNotifySelectItem::HandleItemsL, Icon data length exceeded, AddItem1");
+					TFLOGSTRING("CSAT: CSatNotifySelectItem::HandleItemsL,\
+					    Icon data length exceeded, AddItem1");
 					// Too many or long menu items
 					ret = KErrCorrupt;
 					}
@@ -676,7 +685,8 @@
 			else if ( KErrNoMemory == aSelectItemV2->AddItemIcon( 
 				newItem, aIconIdList[i] ) )
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_HANDLEITEMSL_3, "CSAT: CSatNotifySelectItem::HandleItemsL, Icon data length exceeded, AddItemIcon");
+				TFLOGSTRING("CSAT: CSatNotifySelectItem::HandleItemsL,\
+			        Icon data length exceeded, AddItemIcon");
 				// Too many or long menu items
 				ret = KErrCorrupt;
 				}
@@ -690,7 +700,8 @@
 				if ( KErrNoMemory == aSelectItemV2->AddItem( 
 					newItem, itemNextIndicator[i] ) )
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_HANDLEITEMSL_4, "CSAT: CSatNotifySelectItem::HandleItemsL, Icon data length exceeded, AddItem2");
+					TFLOGSTRING("CSAT: CSatNotifySelectItem::HandleItemsL,\
+			            Icon data length exceeded, AddItem2");
 					// Too many or long menu items
 					ret = KErrCorrupt;
 					}
@@ -701,7 +712,8 @@
 				TInt retAdd = aSelectItemV2->AddItem( newItem );
 				if ( KErrNoMemory == retAdd ) 
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_HANDLEITEMSL_5, "CSAT: CSatNotifySelectItem::HandleItemsL, AddItem failed -> KErrNoMemory");
+					TFLOGSTRING("CSAT: CSatNotifySelectItem::HandleItemsL,\
+			            AddItem failed -> KErrNoMemory");
 					// Too many or long menu items
 					// If there is not enough space left in the buffer used
 					// by the menu KErrNoMemory is returned.

--- a/telephonyserverplugins/simatktsy/src/CSatNotifySendData.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendData.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifySendDataTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifySendData.h" 	// Class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_NEWL_1, "CSAT: CSatNotifySendData::NewL");
+    TFLOGSTRING("CSAT: CSatNotifySendData::NewL");
    	CSatNotifySendData* const satNotifySendData = 
         new ( ELeave ) CSatNotifySendData( aNotificationsTsy );
     CleanupStack::PushL( satNotifySendData );
     satNotifySendData->ConstructL();
     CleanupStack::Pop( satNotifySendData );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_NEWL_2, "CSAT: CSatNotifySendData::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifySendData::NewL, end of method");
     return satNotifySendData;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_DTOR_1, "CSAT: CSatNotifySendData::~CSatNotifySendData");
+    TFLOGSTRING("CSAT: CSatNotifySendData::~CSatNotifySendData");
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +88,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_CONSTRUCTL_1, "CSAT: CSatNotifySendData::ConstructL, does nothing");
+    TFLOGSTRING("CSAT: CSatNotifySendData::ConstructL, does nothing");
     }
     
 // -----------------------------------------------------------------------------
@@ -108,7 +103,7 @@
         const TDataPackage& aPackage    
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_NOTIFY_1, "CSAT: CSatNotifySendData::Notify");
+    TFLOGSTRING("CSAT: CSatNotifySendData::Notify");
     // Save data pointer to client side for completion
     iSendDataRspV2Pckg = reinterpret_cast<RSat::TSendDataV2Pckg*>( 
         aPackage.Des1n() );
@@ -131,7 +126,7 @@
         const TTsyReqHandle aTsyReqHandle 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_CANCELNOTIFICATION_1, "CSAT: CSatNotifySendData::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifySendData::CancelNotification");
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( CSatTsy::ESatNotifySendDataPCmdReqType );
@@ -154,7 +149,7 @@
         TInt aErrorCode                  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_COMPLETENOTIFYL_1, "CSAT: CSatNotifySendData::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifySendData::CompleteNotifyL");  
     TInt ret( KErrNone );
 	TBuf<1> noAdditionalInfo( 0 );
     // Unpack parameters
@@ -228,7 +223,8 @@
 	                
 	            if ( KErrNotFound != returnValue )
 	                {
-	                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_COMPLETENOTIFYL_2, "CSAT: CSatNotifySendData::CompleteNotifyL Alpha ID found");
+	                TFLOGSTRING("CSAT: CSatNotifySendData::CompleteNotifyL \
+	                	Alpha ID found");
 	                TUint16 alphaIdLength = alphaIdentifier.GetLength();
 	                if ( alphaIdLength )
 	                    {
@@ -243,7 +239,8 @@
 	                    }
 	                else
 	                    {
-	                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_COMPLETENOTIFYL_3, "CSAT: CSatNotifySendData::CompleteNotifyL Alpha id is NULL");
+	                    TFLOGSTRING("CSAT: CSatNotifySendData::CompleteNotifyL\
+	                    	Alpha id is NULL");
 	                    sendDataV2.iAlphaId.iStatus = RSat::EAlphaIdNull;
 	                    }
 	                }
@@ -255,7 +252,8 @@
 	            }
 	        else
 	            {
-	            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_COMPLETENOTIFYL_4, "CSAT: CSatNotifySendData::CompleteNotifyL Required values missing");
+	            TFLOGSTRING("CSAT: CSatNotifySendData::CompleteNotifyL \
+	            	Required values missing");
 	            // Required values missing
 	            TUint8 channelDataLength( 0 );
 	            CreateTerminalRespL( 
@@ -274,7 +272,8 @@
         }
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_COMPLETENOTIFYL_5, "CSAT: CSatNotifySendData::CompleteNotifyL Request not ongoing");
+		TFLOGSTRING("CSAT: CSatNotifySendData::CompleteNotifyL \
+	    	Request not ongoing");
 		// Request not on, returning response immediately       
         TUint8 channelDataLength( 0 );
 		TBuf16<1> additionalInfo;	
@@ -297,7 +296,7 @@
         TDes8* aRsp
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_TERMINALRESPONSEL_1, "CSAT: CSatNotifySendData::TerminalResponseL");
+    TFLOGSTRING("CSAT: CSatNotifySendData::TerminalResponseL");
     TInt   ret( KErrNone );
     
     TBuf16<RSat::KAdditionalInfoMaxSize> additionalInfo;
@@ -323,7 +322,8 @@
         && ( RSat::KErrorRequiredValuesMissing != rspV2.iGeneralResult )
         && ( RSat::KBearerIndepProtocolError != rspV2.iGeneralResult ) )
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_TERMINALRESPONSEL_2, "CSAT: CSatNotifySendData::TerminalResponseL, Invalid general result: %d", rspV2.iGeneralResult);
+        TFLOGSTRING2("CSAT: CSatNotifySendData::TerminalResponseL, \
+        	Invalid general result: %d", rspV2.iGeneralResult);
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -336,7 +336,8 @@
         	}
 	    else
 	        {
-	        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_TERMINALRESPONSEL_3, "CSAT: CSatNotifySendData::TerminalResponseL, Additional Info corrupted ");
+	        TFLOGSTRING("CSAT: CSatNotifySendData::TerminalResponseL, \
+        		Additional Info corrupted ");
 	        ret = KErrCorrupt;
 	        }
 		}     
@@ -361,7 +362,7 @@
         TUint8 aChannelDataLength	
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_CREATETERMINALRESPL_1, "CSAT: CSatNotifySendData::CreateTerminalRespL");
+    TFLOGSTRING("CSAT: CSatNotifySendData::CreateTerminalRespL");
     TTlv tlvSpecificData;
     // Append general result tag
     tlvSpecificData.AddTag( KTlvResultTag );
@@ -396,7 +397,8 @@
 	        }
 	    default:
 	    	{
-	    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_CREATETERMINALRESPL_2, "CSAT: CSatNotifySendData::CreateTerminalRespL Unknown General result");
+	    	TFLOGSTRING("CSAT: CSatNotifySendData::CreateTerminalRespL\
+	    		Unknown General result");
 	    	}
 	    }

--- a/telephonyserverplugins/simatktsy/src/CSatNotifySendDtmf.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendDtmf.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
  
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifySendDtmfTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifySendDtmf.h"     // Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_NEWL_1, "CSAT: CSatNotifySendDtmf::NewL");
+    TFLOGSTRING("CSAT: CSatNotifySendDtmf::NewL");  
    	CSatNotifySendDtmf* const satNotifySendDtmf = 
         new ( ELeave ) CSatNotifySendDtmf( aNotificationsTsy );
     CleanupStack::PushL( satNotifySendDtmf );
     satNotifySendDtmf->ConstructL();
     CleanupStack::Pop( satNotifySendDtmf );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_NEWL_2, "CSAT: CSatNotifySendDtmf::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifySendDtmf::NewL, end of method");  
     return satNotifySendDtmf;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     { 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_DTOR_1, "CSAT: CSatNotifySendDtmf::~CSatNotifySendDtmf");
+    TFLOGSTRING("CSAT: CSatNotifySendDtmf::~CSatNotifySendDtmf");  
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +88,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_CONSTRUCTL_1, "CSAT: CSatNotifySendDtmf::ConstructL, does nothing");
+    TFLOGSTRING("CSAT: CSatNotifySendDtmf::ConstructL, does nothing");  
     }
 
 // -----------------------------------------------------------------------------
@@ -107,7 +102,7 @@
         const TDataPackage& aPackage   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_NOTIFY_1, "CSAT: CSatNotifySendDtmf::Notify");
+    TFLOGSTRING("CSAT: CSatNotifySendDtmf::Notify");  
     // Save data pointer to client side for completion
     iSendDtmfV1Pckg = reinterpret_cast<RSat::TSendDtmfV1Pckg*>( 
         aPackage.Des1n() );
@@ -133,7 +128,7 @@
         const TTsyReqHandle aTsyReqHandle 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_CANCELNOTIFICATION_1, "CSAT: CSatNotifySendDtmf::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifySendDtmf::CancelNotification"); 
     // Reset the request handle
     iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( 
         CSatTsy::ESatNotifySendDtmfPCmdReqType );
@@ -157,7 +152,7 @@
         TInt aErrorCode  
         ) 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_1, "CSAT: CSatNotifySendDtmf::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifySendDtmf::CompleteNotifyL"); 
     TInt returnValue( KErrNone );
     TInt ret( KErrNone );
     // Unpack parameters
@@ -203,7 +198,8 @@
     
                 if ( RSat::KAlphaIdMaxSize < alphaIdLength )
                     {
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_2, "CSAT: CSatNotifySendDtmf::CompleteNotifyL, Alpha ID length exceeded");
+                    TFLOGSTRING("CSAT: CSatNotifySendDtmf::CompleteNotifyL,\
+                        Alpha ID length exceeded"); 
                     // String too long
                     additionalInfo.Zero();
                     additionalInfo.Append( KNoCause );                  
@@ -224,14 +220,16 @@
                     }
                 else
                 	{
-                	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_3, "CSAT: CSatNotifySendDtmf::CompleteNotifyL, Alpha ID is NULL");
+                	TFLOGSTRING("CSAT: CSatNotifySendDtmf::CompleteNotifyL,\
+                        Alpha ID is NULL"); 
                     sendDtmfV1.iAlphaId.iStatus = RSat::EAlphaIdNull;                     
                     }
                 }
             // Alpha id not present
             else 
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_4, "CSAT: CSatNotifySendDtmf::CompleteNotifyL, Alpha ID not present");
+                TFLOGSTRING("CSAT: CSatNotifySendDtmf::CompleteNotifyL,\
+                    Alpha ID not present"); 
                 sendDtmfV1.iAlphaId.iStatus = RSat::EAlphaIdNotPresent;
                 }
 
@@ -252,13 +250,15 @@
 	            if ( ( dtmfStringLength && ( sendDtmf.Data()[2] == 0xFF ) ) ||
 	                !dtmfStringLength )
 	                {
-	                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_5, "CSAT: CSatNotifySendDtmf::CompleteNotifyL, Data not understood");
+	                TFLOGSTRING("CSAT: CSatNotifySendDtmf::CompleteNotifyL,\
+                        Data not understood"); 
 	                generalResult = RSat::KCmdDataNotUnderstood; 
 	                ret = KErrCorrupt;
 	                }
 	            else if( RSat::KDtmfStringMaxSize < dtmfStringLength )
 	                {
-	                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_6, "CSAT: CSatNotifySendDtmf::CompleteNotifyL, Cmd beyond ME capabilities");
+	                TFLOGSTRING("CSAT: CSatNotifySendDtmf::CompleteNotifyL,\
+                        Cmd beyond ME capabilities"); 
 	                generalResult = RSat::KCmdBeyondMeCapabilities;
 	                ret = KErrCorrupt;
 	                }
@@ -269,7 +269,8 @@
 
 	            if( KErrCorrupt == ret )
 	                {
-	                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_7, "CSAT: CSatNotifySendDtmf::CompleteNotifyL, DTMF length exceeded");
+	                TFLOGSTRING("CSAT: CSatNotifySendDtmf::CompleteNotifyL,\
+                        DTMF length exceeded"); 
                     // String too long
                     additionalInfo.Zero();
                     additionalInfo.Append( KNoCause );
@@ -318,7 +319,7 @@
         TDes8* aRsp 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_TERMINALRESPONSEL_1, "CSAT:CSatNotifySendDtmf::TerminalResponseL");
+    TFLOGSTRING("CSAT:CSatNotifySendDtmf::TerminalResponseL");
     
     TInt ret( KErrNone );
     TBuf<1> additionalInfo;
@@ -342,7 +343,8 @@
          ( RSat::KPSessionTerminatedByUser != rspV1.iGeneralResult ) && 
          ( RSat::KErrorRequiredValuesMissing != rspV1.iGeneralResult ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_TERMINALRESPONSEL_2, "CSAT:CSatNotifySendDtmf::TerminalResponseL, Invalid General result");
+        TFLOGSTRING("CSAT:CSatNotifySendDtmf::TerminalResponseL,\
+                Invalid General result");
         ret = KErrCorrupt;
         }
         
@@ -355,7 +357,8 @@
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_TERMINALRESPONSEL_3, "CSAT:CSatNotifySendDtmf::TerminalResponseL, Invalid Info Type");
+            TFLOGSTRING("CSAT:CSatNotifySendDtmf::TerminalResponseL,\
+                Invalid Info Type");
             ret = KErrCorrupt;
             }
         }
@@ -385,7 +388,7 @@
         TDesC16& aAdditionalInfo          
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_CREATETERMINALRESPL_1, "CSAT: CSatNotifySendDtmf::CreateTerminalRespL");
+    TFLOGSTRING("CSAT: CSatNotifySendDtmf::CreateTerminalRespL");   
     
     TTlv tlvSpecificData;
     // Append general result tag

--- a/telephonyserverplugins/simatktsy/src/CSatNotifySendSm.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendSm.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifySendSmTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifySendSm.h"       // Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_NEWL_1, "CSAT: CSatNotifySendSm::NewL");
+    TFLOGSTRING("CSAT: CSatNotifySendSm::NewL");
    	CSatNotifySendSm* const satNotifySendSm = 
         new ( ELeave ) CSatNotifySendSm( aNotificationsTsy );
     CleanupStack::PushL( satNotifySendSm );
     satNotifySendSm->ConstructL();
     CleanupStack::Pop( satNotifySendSm );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_NEWL_2, "CSAT: CSatNotifySendSm::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifySendSm::NewL, end of method");
     return satNotifySendSm;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_DTOR_1, "CSAT: CSatNotifySendSm::~CSatNotifySendSm");
+    TFLOGSTRING("CSAT: CSatNotifySendSm::~CSatNotifySendSm");
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +88,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CONSTRUCTL_1, "CSAT: CSatNotifySendSm::ConstructL, does nothing");
+    TFLOGSTRING("CSAT: CSatNotifySendSm::ConstructL, does nothing");
     }
     
 // -----------------------------------------------------------------------------
@@ -107,7 +102,7 @@
         const TDataPackage& aPackage
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_NOTIFY_1, "CSAT: CSatNotifySendSm::Notify");
+    TFLOGSTRING("CSAT: CSatNotifySendSm::Notify");
     // Save data pointer to client side for completion
     iSendSmV1Pckg = reinterpret_cast<RSat::TSendSmV1Pckg*>( 
         aPackage.Des1n() );
@@ -129,7 +124,7 @@
         const TTsyReqHandle aTsyReqHandle 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CANCELNOTIFICATION_1, "CSAT: CSatNotifySendSm::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifySendSm::CancelNotification");   
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( CSatTsy::ESatNotifySendSmPCmdReqType );
@@ -152,7 +147,7 @@
         TInt aErrorCode                 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_COMPLETENOTIFYL_1, "CSAT: CSatNotifySendSm::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifySendSm::CompleteNotifyL");
     TInt ret( KErrNone );
 	TBuf<1> additionalInfo;
 	// Unpack parameters
@@ -200,7 +195,8 @@
 				
 				if ( KErrCorrupt == ret )
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_COMPLETENOTIFYL_2, "CSAT: CSatNotifySendSm::CompleteNotifyL, Invalid data");
+					TFLOGSTRING("CSAT: CSatNotifySendSm::CompleteNotifyL,\
+					    Invalid data");
 					additionalInfo.Zero();
                     additionalInfo.Append( KNoCause );
 					CreateTerminalRespL( pCmdNumber, 
@@ -225,7 +221,8 @@
 						ret = PackSms( smsTpdu, sendSmV1.iSmsTpdu );
 						if ( KErrNone != ret )
 							{
-							OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_COMPLETENOTIFYL_3, "CSAT: CSatNotifySendSm::CompleteNotifyL, Invalid TPDU");
+							TFLOGSTRING("CSAT: CSatNotifySendSm::\
+							    CompleteNotifyL, Invalid TPDU");
 							// TPDU is invalid or packing cannot be requested 
 							// if tpdu is something else than SMS-SUBMIT
 							additionalInfo.Zero();
@@ -241,7 +238,8 @@
 						}
 					else
 						{
-						OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_COMPLETENOTIFYL_4, "CSAT: CSatNotifySendSm::CompleteNotifyL, Packing not required");
+						TFLOGSTRING("CSAT: CSatNotifySendSm::CompleteNotifyL,\
+						    Packing not required");
 						}
 					}
 				else
@@ -251,7 +249,8 @@
 				}
 			else
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_COMPLETENOTIFYL_5, "CSAT: CSatNotifySendSm::CompleteNotifyL, Missing TPDU");
+				TFLOGSTRING("CSAT: CSatNotifySendSm::CompleteNotifyL,\
+				    Missing TPDU");
 				// TPdu is missing, returning response immediately
 				additionalInfo.Zero();
                 additionalInfo.Append( KNoCause );
@@ -278,7 +277,8 @@
         } // End of if ( CSatTsy::ESatReqHandleUnknown != reqHandle )
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_COMPLETENOTIFYL_6, "CSAT: CSatNotifySendSm::CompleteNotifyL, Request not ongoing");
+		TFLOGSTRING("CSAT: CSatNotifySendSm::CompleteNotifyL,\
+		    Request not ongoing");
 		// Request not on, returning response immediately
 		additionalInfo.Zero();
         additionalInfo.Append( KNoCause );       
@@ -298,7 +298,7 @@
         TDes8* aRsp 
         )
     {  
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_TERMINALRESPONSEL_1,  "CSAT::CSatNotifySendSm::TerminalResponseL" );
+    TFLOGSTRING( "CSAT::CSatNotifySendSm::TerminalResponseL" );
     
     TInt ret( KErrNone );
     TBuf<1> additionalInfo;
@@ -307,7 +307,8 @@
     RSat::TSendSmRspV1& rspV1 = ( *aRspPckg ) ();
     // Get Proactive command number
     TUint8 pCmdNumber( rspV1.PCmdNumber() );
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_TERMINALRESPONSEL_2,  "CSAT::CSatNotifySendSm::TerminalResponseL: GeneralResult: %d", static_cast<TUint8>( rspV1.iGeneralResult ) );
+    TFLOGSTRING2( "CSAT::CSatNotifySendSm::TerminalResponseL: GeneralResult: \
+        %d", static_cast<TUint8>( rspV1.iGeneralResult ) );
 
     // Check that general result value is valid
     if ( ( RSat::KSuccess != rspV1.iGeneralResult ) && 
@@ -318,7 +319,8 @@
          ( RSat::KModifiedByCallControl != rspV1.iGeneralResult ) && 
          ( RSat::KSuccessRequestedIconNotDisplayed != rspV1.iGeneralResult ) )        
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_TERMINALRESPONSEL_3,  "CSAT::CSatNotifySendSm::TerminalResponseL, Invalid General result" );
+        TFLOGSTRING( "CSAT::CSatNotifySendSm::TerminalResponseL,\
+            Invalid General result" );
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -332,7 +334,8 @@
         // Check the length of additional info
         if ( 0 == rspV1.iAdditionalInfo.Length() )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_TERMINALRESPONSEL_4,  "CSAT::CSatNotifySendSm::TerminalResponseL, Invalid Additional Info" );
+            TFLOGSTRING( "CSAT::CSatNotifySendSm::TerminalResponseL,\
+                Invalid Additional Info" );
             // No info
             ret = KErrCorrupt;
             }
@@ -368,7 +371,7 @@
         TDesC16& aAdditionalInfo		
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CREATETERMINALRESPL_1,  "CSAT::CSatNotifySendSm::CreateTerminalRespL" );
+    TFLOGSTRING( "CSAT::CSatNotifySendSm::CreateTerminalRespL" );
     // Create and append response data
     TTlv tlvSpecificData;
     // Create General Result TLV here
@@ -383,7 +386,8 @@
         {
 		if( aAdditionalInfo.Length() > 0 )
 	        {
-	        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CREATETERMINALRESPL_2,  "CSAT::CSatNotifySendSm::CreateTerminalRespL, Unsuccessful result" );
+	        TFLOGSTRING( "CSAT::CSatNotifySendSm::CreateTerminalRespL,\
+	            Unsuccessful result" );
 	        // If there is ME, Network or SMS error, append additional info
 	        tlvSpecificData.AddByte( static_cast<TUint8>( aAdditionalInfo[0] ) );
 	        }
@@ -415,7 +419,7 @@
 		RSat::TSendSmV1& aSendSmV1
 		)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_1,  "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData" );
+	TFLOGSTRING( "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData" );
 	TInt returnValue;
 	TPtrC8 sourceString; // Used in unicode conversions
 	// Alpha id string (optional)
@@ -443,13 +447,15 @@
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_2,  "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData, Alpha ID is NULL" );
+			TFLOGSTRING( "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData,\
+			    Alpha ID is NULL" );
 			aSendSmV1.iAlphaId.iStatus = RSat::EAlphaIdNull;
 			}
 		}
 	else 
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_3,  "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData, Alpha ID not present" );
+		TFLOGSTRING( "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData,\
+		    Alpha ID not present" );
 		aSendSmV1.iAlphaId.iStatus = RSat::EAlphaIdNotPresent;
 		}
 	// The address data object holds the RP_Destination_Address of the Service 
@@ -485,11 +491,13 @@
 				// Converting back to ASCII format
 				TSatUtility::BCDToAscii( sourceString, tempScaNumber );
 				aSendSmV1.iAddress.iTelNumber.Copy( tempScaNumber );
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_4, "CSAT: SendSm, SCA number: %S", aSendSmV1.iAddress.iTelNumber );
+				TFLOGSTRING2("CSAT: SendSm, SCA number: %S", 
+					&aSendSmV1.iAddress.iTelNumber );
 				}
        		else
       			{
-      			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_5,  "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData Address TLV found, TON/NPI present, but number epmpty" );
+      			TFLOGSTRING( "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData\
+      			    Address TLV found, TON/NPI present, but number epmpty" );
         		// Address TLV found, TON/NPI present, but number epmpty.
        			aSendSmV1.iAddress.iTypeOfNumber = RSat::EUnknownNumber;
         		aSendSmV1.iAddress.iNumberPlan = RSat::EUnknownNumberingPlan;
@@ -497,7 +505,8 @@
 		    }
 		else
 		    {
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_6,  "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData Address TLV found, but the Value part doesn't exist");
+		    TFLOGSTRING( "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData\
+		        Address TLV found, but the Value part doesn't exist");
 		    // Address TLV found, but the Value part doesn't exist
 		    aSendSmV1.iAddress.iTypeOfNumber = RSat::EUnknownNumber;
 		    aSendSmV1.iAddress.iNumberPlan = RSat::EUnknownNumberingPlan;
@@ -505,7 +514,8 @@
 		}
 	else
 	    {
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_7,  "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData Address TLV not found");
+	    TFLOGSTRING( "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData\
+	        Address TLV not found");
 	    // Address TLV not found
 	    aSendSmV1.iAddress.iTypeOfNumber = RSat::ETypeOfNumberNotSet;
 	    aSendSmV1.iAddress.iNumberPlan = RSat::ENumberingPlanNotSet;  
@@ -522,7 +532,7 @@
 	    TPtrC8 aTpdu    
 	    )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CHECKTPDU_1,  "CSAT::CSatNotifySendSm::CheckTpdu");
+    TFLOGSTRING( "CSAT::CSatNotifySendSm::CheckTpdu");
     TInt ret( KErrNone );
 
     if ( KSATSmsMTISubmitOrSubmitReport == ( aTpdu[0] & KMask3 ) ) 
@@ -535,7 +545,8 @@
         
         if ( !dcs && KSmsMaxSize < tpUdl )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CHECKTPDU_2,  "CSAT::CSatNotifySendSm::CheckTpdu, False DCS Length");
+            TFLOGSTRING( "CSAT::CSatNotifySendSm::CheckTpdu,\
+                False DCS Length");
             // DCS is 7-bit and message is over 160 bytes, set ret to corrupt
             ret = KErrCorrupt;
             }
@@ -543,13 +554,15 @@
         	iTerminalRespData.iCommandDetails[KCommandQualifier] ) )
             && ( KSmsMaxSizeWithoutPacking < tpUdl && dcs ) )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CHECKTPDU_3,  "CSAT::CSatNotifySendSm::CheckTpdu, TP-UD Too long without packing");
+            TFLOGSTRING( "CSAT::CSatNotifySendSm::CheckTpdu,\
+                TP-UD Too long without packing");
             // TP-UD is too long without packing
             ret = KErrCorrupt;
             }
         else if ( ( KSmsMaxSize < tpUdl ) && dcs )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CHECKTPDU_4,  "CSAT::CSatNotifySendSm::CheckTpdu, TP-UD is too long even with packing");
+            TFLOGSTRING( "CSAT::CSatNotifySendSm::CheckTpdu,\
+                TP-UD is too long even with packing");
             // TP-UD is too long even with packing
             ret = KErrCorrupt;
             }
@@ -563,7 +576,8 @@
         // SMS-COMMAND
         if ( KSMSCommandMaxSize < GetTpUdl( aTpdu ) )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CHECKTPDU_5,  "CSAT::CSatNotifySendSm::CheckTpdu, False SMS Command length");
+            TFLOGSTRING( "CSAT::CSatNotifySendSm::CheckTpdu,\
+                False SMS Command length");
             ret = KErrCorrupt;
             }
 		else
@@ -586,7 +600,7 @@
 	    TPtrC8 aTpdu  
 	    )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_GETTPUDL_1,  "CSAT::CSatNotifySendSm::GetTpUdl");
+    TFLOGSTRING( "CSAT::CSatNotifySendSm::GetTpUdl");
     TUint8 ret( 0 );
     if ( KSATSmsMTISubmitOrSubmitReport == ( aTpdu[0] & KMask3 ) )
         {
@@ -661,7 +675,7 @@
 	    TPtrC8 aTpdu 
 	    )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_GETTPDCS_1,  "CSAT::CSatNotifySendSm::GetTpDcs");
+    TFLOGSTRING( "CSAT::CSatNotifySendSm::GetTpDcs");
     TUint8 retValue( NULL );
     if ( KSATSmsMTISubmitOrSubmitReport == ( aTpdu[0] & KMask3 ) )
         {
@@ -697,7 +711,7 @@
 	    TTpdu& aSendSm  
 	    )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_PACKSMS_1,  "CSAT::CSatNotifySendSm::PackSms");
+    TFLOGSTRING( "CSAT::CSatNotifySendSm::PackSms");
     // See 3GPP TS 23.040 and TS 23.038: 
     // Packing of Basic elements of the SMS SUBMIT type
     TInt ret( KErrNone );
@@ -783,7 +797,7 @@
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_PACKSMS_2,  "CSAT::CSatNotifySendSm::PackSms, No headers");
+            TFLOGSTRING( "CSAT::CSatNotifySendSm::PackSms, No headers");
             // No headers, lets pack all the characters in SMS message
             TBool endOfTPDU( EFalse );
             TUint8 move( 0 );
@@ -829,7 +843,7 @@
                     }
                 else
                     {
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_PACKSMS_3,  "CSAT::CSatNotifySendSm::PackSms, Corrupted");
+                    TFLOGSTRING( "CSAT::CSatNotifySendSm::PackSms, Corrupted");
                     ret = KErrCorrupt;
                     break;
                     }

--- a/telephonyserverplugins/simatktsy/src/CSatNotifySendSs.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendSs.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifySendSsTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatCCTsy.h"              // Call Control Tsy class header
@@ -34,6 +28,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -49,13 +44,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_NEWL_1, "CSAT: CSatNotifySendSs::NewL");
+    TFLOGSTRING("CSAT: CSatNotifySendSs::NewL");
    	CSatNotifySendSs* const satNotifySendSs = 
         new ( ELeave ) CSatNotifySendSs( aNotificationsTsy );
     CleanupStack::PushL( satNotifySendSs );
     satNotifySendSs->ConstructL();
     CleanupStack::Pop( satNotifySendSs );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_NEWL_2, "CSAT: CSatNotifySendSs::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifySendSs::NewL, end of method");
     return satNotifySendSs;
     }
 
@@ -69,7 +64,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_DTOR_1, "CSAT: CSatNotifySendSs::~CSatNotifySendSs");
+    TFLOGSTRING("CSAT: CSatNotifySendSs::~CSatNotifySendSs");
     }
     
 // -----------------------------------------------------------------------------
@@ -95,7 +90,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CONSTRUCTL_1, "CSAT: CSatNotifySendSs::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifySendSs::ConstructL");
     }
    
 // -----------------------------------------------------------------------------
@@ -110,7 +105,7 @@
         const TDataPackage& aPackage
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_NOTIFY_1, "CSAT: CSatNotifySendSs::Notify");
+    TFLOGSTRING("CSAT: CSatNotifySendSs::Notify");
     // Save data pointer to client side for completion
     iSendSsV1Pckg = reinterpret_cast<RSat::TSendSsV1Pckg*>( 
         aPackage.Des1n() );
@@ -135,7 +130,7 @@
         const TTsyReqHandle aTsyReqHandle 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CANCELNOTIFICATION_1, "CSAT: CSatNotifySendSs::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifySendSs::CancelNotification"); 
     
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
@@ -161,7 +156,7 @@
         TInt aErrorCode                  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_1, "CSAT: CSatNotifySendSs::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL");
 	TInt ret( KErrNone );
 
     // Unpack parameters
@@ -234,13 +229,15 @@
 					}
 				else
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_2, "CSAT: CSatNotifySendSs::CompleteNotifyL, Alpha ID is NULL");
+					TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\
+					    Alpha ID is NULL");
 					sendSsV1.iAlphaId.iStatus = RSat::EAlphaIdNull;
 					}
 				}
 			else
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_3, "CSAT: CSatNotifySendSs::CompleteNotifyL, Alpha ID not present");
+				TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\
+				    Alpha ID not present");
 				sendSsV1.iAlphaId.iStatus = RSat::EAlphaIdNotPresent;
 				}
 
@@ -296,7 +293,8 @@
 						}
 					else
 						{
-						OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_4, "CSAT: CSatNotifySendSs::CompleteNotifyL, Data corrupted");
+						TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\
+							Data corrupted");
 						CreateTerminalRespL( pCmdNumber, RSat::KCmdDataNotUnderstood,
 								KNullDesC16 );
 						ret = KErrCorrupt;
@@ -305,7 +303,8 @@
 					}
 				else
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_5, "CSAT: CSatNotifySendSs::CompleteNotifyL, SS String length exceeded");
+					TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\
+						SS String length exceeded");
 					// SS string is too long
 					CreateTerminalRespL( pCmdNumber, RSat::KCmdDataNotUnderstood,
 							KNullDesC16 );
@@ -314,7 +313,8 @@
 				}
 			else
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_6, "CSAT: CSatNotifySendSs::CompleteNotifyL, SS String missing");
+				TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\
+				    SS String missing");
 				// Mandatory tlv is missing, returning response immediately
 				CreateTerminalRespL(
 					pCmdNumber, RSat::KErrorRequiredValuesMissing, 
@@ -337,7 +337,8 @@
         } // End of if ( reqHandle != CSatTsy::ESatReqHandleUnknown )
     else 
 		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_7, "CSAT: CSatNotifySendSs::CompleteNotifyL, Request not ongoing");
+        TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\
+            Request not ongoing");
         // Request not on, returning response immediately
 		TBuf<1> additionalInfo;
 		additionalInfo.Append( RSat::KNoSpecificMeProblem );
@@ -359,7 +360,7 @@
         TDes8* aRsp
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_TERMINALRESPONSEL_1, "CSAT:: CSatNotifySendSs::TerminalResponseL");
+    TFLOGSTRING("CSAT:: CSatNotifySendSs::TerminalResponseL");  
     TInt ret( KErrNone );
     // Buffer for additional information
     TBuf<RSat::KAdditionalInfoMaxSize> additionalInfo;
@@ -386,7 +387,8 @@
         && ( RSat::KErrorRequiredValuesMissing != rspV2.iGeneralResult )
         && ( RSat::KInteractionWithCCPermanentError != rspV2.iGeneralResult ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_TERMINALRESPONSEL_2, "CSAT:: CSatNotifySendSs::TerminalResponseL, Invalid General Result");
+        TFLOGSTRING("CSAT:: CSatNotifySendSs::TerminalResponseL,\
+            Invalid General Result");
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -445,7 +447,8 @@
     
 	if ( !isValidAddInfo )
 		{
-    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_TERMINALRESPONSEL_3, "CSAT: CSatNotifyCloseChannel::TerminalResponseL Invalid Additional Info");
+    	TFLOGSTRING("CSAT: CSatNotifyCloseChannel::TerminalResponseL\
+    		Invalid Additional Info");
     	ret = KErrCorrupt;
 		}
         
@@ -478,7 +481,7 @@
         const TDesC16& aAdditionalInfo
 		)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CREATETERMINALRESPL_1, "CSAT:: CSatNotifySendSs::CreateTerminalRespL");
+	TFLOGSTRING("CSAT:: CSatNotifySendSs::CreateTerminalRespL");
     // Create and append response data
     TTlv tlvSpecificData;
     tlvSpecificData.AddTag( KTlvResultTag );    
@@ -514,7 +517,7 @@
     	RSat::TSsString& aSsString 
     	)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CHECKCALLFORWARDING_1, "CSAT:: CSatNotifySendSs::CheckCallForwarding");
+    TFLOGSTRING("CSAT:: CSatNotifySendSs::CheckCallForwarding");
     _LIT8(KCFU,"*21*");    // Call forwarding unconditional (CFU)
     _LIT8(KCFB,"*67*");    // Call forwarding on Mobile Subscriber Busy(CFB)
     _LIT8(KCFNRy, "*61*"); // Call forwarding on No Reply (CFNRy)
@@ -536,7 +539,8 @@
         }
     if ( KErrNotFound != pos )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CHECKCALLFORWARDING_2, "CSAT:: CSatNotifySendSs::CheckCallForwarding, String is for call forwarding");
+        TFLOGSTRING("CSAT:: CSatNotifySendSs::CheckCallForwarding,\
+            String is for call forwarding");
         aSsString.iSsString.Zero();
         aSsString.iSsString.Append( aSource.Left( pos + 4 ) );
         aSsString.iSsString.Append( KPlusMarkCharacterCode );
@@ -557,12 +561,13 @@
     	TPtrC8 aSsString 
     	)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_1, "CSAT:: CSatNotifySendSs::CheckSsStringValidity");
+    TFLOGSTRING("CSAT:: CSatNotifySendSs::CheckSsStringValidity");
     TInt ret( KErrNone );
     
     if ( !aSsString.Length() )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_2, "CSAT:: CSatNotifySendSs::CheckSsStringValidity, String length is NULL");
+        TFLOGSTRING("CSAT:: CSatNotifySendSs::CheckSsStringValidity,\
+            String length is NULL");
         // If length is zero
         ret = KErrCorrupt;
         }
@@ -576,7 +581,8 @@
         || ( KErrNotFound != aSsString.Find( KWild ) )
         || ( KErrNotFound != aSsString.Find( KExpansionDigit ) ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_3, "CSAT:: CSatNotifySendSs::CheckSsStringValidity, Incompatible character found");
+        TFLOGSTRING("CSAT:: CSatNotifySendSs::CheckSsStringValidity,\
+            Incompatible character found");
         ret = KErrCorrupt;
         }
     return ret;

--- a/telephonyserverplugins/simatktsy/src/CSatNotifySendUssd.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendUssd.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifySendUssdTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifySendUssd.h"     // Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_NEWL_1, "CSAT: CSatNotifySendUssd::NewL");
+    TFLOGSTRING("CSAT: CSatNotifySendUssd::NewL");
    	CSatNotifySendUssd* const satNotifySendUssd = 
         new ( ELeave ) CSatNotifySendUssd( aNotificationsTsy );
     CleanupStack::PushL( satNotifySendUssd );
     satNotifySendUssd->ConstructL();
     CleanupStack::Pop( satNotifySendUssd );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_NEWL_2, "CSAT: CSatNotifySendUssd::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifySendUssd::NewL, end of method");
     return satNotifySendUssd;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_DTOR_1, "CSAT: CSatNotifySendUssd::~CSatNotifySendUssd");
+    TFLOGSTRING("CSAT: CSatNotifySendUssd::~CSatNotifySendUssd");
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +88,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_CONSTRUCTL_1, "CSAT: CSatNotifySendUssd::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifySendUssd::ConstructL");
     }
    
 // -----------------------------------------------------------------------------
@@ -108,7 +103,7 @@
         const TDataPackage& aPackage 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_NOTIFY_1, "CSAT: CSatNotifySendUssd::Notify");
+    TFLOGSTRING("CSAT: CSatNotifySendUssd::Notify");
 
     // Save data pointer to client side for completion
     iSendUssdV1Pckg = reinterpret_cast<RSat::TSendUssdV1Pckg*>( 
@@ -135,7 +130,7 @@
         const TTsyReqHandle aTsyReqHandle 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_CANCELNOTIFICATION_1, "CSAT: CSatNotifySendUssd::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifySendUssd::CancelNotification");
     
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
@@ -159,7 +154,7 @@
         TInt aErrorCode                  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_1, "CSAT: CSatNotifySendUssd::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifySendUssd::CompleteNotifyL");	
 	TInt ret( KErrNone );
 	TInt returnValue( KErrNone );
 	TBuf<1> additionalInfo;
@@ -208,7 +203,8 @@
 				TUint16 alphaIdLength = alphaIdentifier.GetLength() ;
 				if ( RSat::KAlphaIdMaxSize < alphaIdLength )
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_2, "CSAT: CSatNotifySendUssd::CompleteNotifyL, Alpha ID length exceeded");
+					TFLOGSTRING("CSAT: CSatNotifySendUssd::CompleteNotifyL,\
+					    Alpha ID length exceeded");
 					// String too long
 					additionalInfo.Zero();
                     additionalInfo.Append( KNoCause );
@@ -234,13 +230,15 @@
 					}
 				else
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_3, "CSAT: CSatNotifySendUssd::CompleteNotifyL, Alpha ID is NULL");
+					TFLOGSTRING("CSAT: CSatNotifySendUssd::CompleteNotifyL,\
+					    Alpha ID is NULL");
 					sendUssdV1.iAlphaId.iStatus = RSat::EAlphaIdNull;
 					}  
 				}
 			else
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_4, "CSAT: CSatNotifySendUssd::CompleteNotifyL, Alpha ID not present");
+				TFLOGSTRING("CSAT: CSatNotifySendUssd::CompleteNotifyL,\
+				    Alpha ID not present");
 				sendUssdV1.iAlphaId.iStatus = RSat::EAlphaIdNotPresent;
 				}
 
@@ -275,7 +273,8 @@
 	                  && RSat::KStringMaxSize<8*ussdStringLengthInBytes/7))
                 	{
                 	// The Ussd text string is too long.
-                	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_5, "CSAT:CSatNotifySendUssd::CompleteNotifyL, USSD String too long");
+                	TFLOGSTRING("CSAT:CSatNotifySendUssd::CompleteNotifyL, \
+                	    USSD String too long");
 					// Text string too long
 					ret = KErrCorrupt;
 					additionalInfo.Zero();
@@ -312,7 +311,8 @@
 	                        }
 	                    default:
 	                        {
-	                        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_6, "CSAT:CSatNotifySendUssd::CompleteNotifyL, USSD DCS has a reserved value");
+	                        TFLOGSTRING("CSAT:CSatNotifySendUssd::CompleteNotifyL, \
+	                            USSD DCS has a reserved value");
 	                        // The DCS has a reserved value
 	                        ret = KErrCorrupt;
 							additionalInfo.Zero();
@@ -352,7 +352,8 @@
         } // End of if ( reqHandle != CSatTsy::ESatReqHandleUnknown )	
 	else 
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_7, "CSAT: CSatNotifySendUssd::CompleteNotifyL, Request not ongoing");
+        TFLOGSTRING("CSAT: CSatNotifySendUssd::CompleteNotifyL,\
+            Request not ongoing");
         // Request not on, returning response immediately
         additionalInfo.Zero();
         additionalInfo.Append( KNoCause );
@@ -375,7 +376,7 @@
         TDes8* aRsp 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_1, "CSAT: CSatNotifySendUssd::TerminalResponseL");
+    TFLOGSTRING("CSAT: CSatNotifySendUssd::TerminalResponseL");
 	
     TInt ret( KErrNone );
     TBuf<RSat::KAdditionalInfoMaxSize> additionalInfo;
@@ -402,7 +403,8 @@
         && ( RSat::KCmdBeyondMeCapabilities != rspV1.iGeneralResult )
         && ( RSat::KUssdReturnError != rspV1.iGeneralResult ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_2, "CSAT: CSatNotifySendUssd::CompleteNotifyL, Invalid General Result");
+        TFLOGSTRING("CSAT: CSatNotifySendUssd::CompleteNotifyL,\
+            Invalid General Result");
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -419,7 +421,8 @@
         if ( 0 == rspV1.iAdditionalInfo.Length() )
             {
             // No info
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_3, "CSAT:CSatNotifySendUssd::TerminalResponseL, AdditionalInfoType set, but no additional info available");
+            TFLOGSTRING("CSAT:CSatNotifySendUssd::TerminalResponseL, \
+            	AdditionalInfoType set, but no additional info available");            
             ret = KErrCorrupt;
             }
         else if ( RSat::KTextString == rspV1.iInfoType )
@@ -430,7 +433,8 @@
             // performed successfully, SAT Server uses the 
             // rspV1.iUssdString.iUssdString to return the USSD string
             // sent by the network.
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_4, "CSAT:CSatNotifySendUssd::TerminalResponseL, AdditionalInfoType set to TextString.");
+            TFLOGSTRING("CSAT:CSatNotifySendUssd::TerminalResponseL, \
+            	AdditionalInfoType set to TextString.");            
             }            
         else
             {
@@ -467,7 +471,7 @@
 		TUint8 aDcs		
 		)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_CREATETERMINALRESPL_1, "CSAT: CSatNotifySendUssd::CreateTerminalRespL");
+	TFLOGSTRING("CSAT: CSatNotifySendUssd::CreateTerminalRespL");
     TTlv tlvSpecificData;
     TBuf8<RSat::KStringMaxSize> string;
 
@@ -529,7 +533,9 @@
                 // Reserved
                 // The general result should in fact prevent reaching this branch of
                 // the switch.
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_CREATETERMINALRESPL_2, "TSY:CSatMessHandler::SendUssdTerminalRespL, The DCS sent by the network has a reserved value. The general result should have been set to UssdReturnError");
+                TFLOGSTRING("TSY:CSatMessHandler::SendUssdTerminalRespL, \
+                    The DCS sent by the network has a reserved value. The general result \
+                    should have been set to UssdReturnError");
                 break;
                 }                        
             }

--- a/telephonyserverplugins/simatktsy/src/CSatNotifySetUpCall.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySetUpCall.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifySetUpCallTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifySetUpCall.h"    // Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_NEWL_1, "CSAT: CSatNotifySetupCall::NewL");
+    TFLOGSTRING("CSAT: CSatNotifySetupCall::NewL"); 
     CSatNotifySetUpCall* const satNotifySetUpCall = 
         new ( ELeave ) CSatNotifySetUpCall( aNotificationsTsy );
     CleanupStack::PushL( satNotifySetUpCall );
     satNotifySetUpCall->ConstructL();
     CleanupStack::Pop( satNotifySetUpCall );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_NEWL_2, "CSAT: CSatNotifySetupCall::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifySetupCall::NewL, end of method"); 
     return satNotifySetUpCall;
     }
 
@@ -67,7 +62,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_DTOR_1, "CSAT: CSatNotifySetupCall::~CSatNotifySetUpCall");
+    TFLOGSTRING("CSAT: CSatNotifySetupCall::~CSatNotifySetUpCall"); 
     }
         
 // -----------------------------------------------------------------------------
@@ -93,7 +88,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_CONSTRUCTL_1, "CSAT: CSatNotifySetupCall::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifySetupCall::ConstructL"); 
     iCallConnectedEvent.Zero();
     }
     
@@ -108,14 +103,15 @@
         const TDataPackage& aPackage   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_NOTIFY_1, "CSAT: CSatNotifySetupCall::Notify");
+    TFLOGSTRING("CSAT: CSatNotifySetupCall::Notify"); 
     // Save data pointer to client side for completion
     iSetUpCallV1Pckg = reinterpret_cast<RSat::TSetUpCallV1Pckg*>( 
         aPackage.Des1n() );
     // Save the request handle
     iNotificationsTsy->iSatTsy->SaveReqHandle( aTsyReqHandle, 
 		CSatTsy::ESatNotifySetUpCallPCmdReqType );   
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_NOTIFY_2, "CSAT: CSatNotifySetUpCall::Notify\t Handle:%d",aTsyReqHandle);
+    TFLOGSTRING2("CSAT: CSatNotifySetUpCall::Notify\t Handle:%d",
+           aTsyReqHandle);
     // Check if requested notification is already pending
     iNotificationsTsy->NotifySatReadyForNotification( KSetUpCall );   
 
@@ -135,7 +131,7 @@
         const TTsyReqHandle aTsyReqHandle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_CANCELNOTIFICATION_1, "CSAT: CSatNotifySetUpCall::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifySetUpCall::CancelNotification");   
     // Reset the request handle 
     iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( 
         CSatTsy::ESatNotifySetUpCallPCmdReqType );
@@ -159,7 +155,7 @@
         TInt aErrorCode  
         ) 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_1, "CSAT: CSatNotifySetupCall::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL");
     TInt returnValue( KErrNone );
     TInt ret( KErrNone );
     iCCResult = 0;
@@ -185,7 +181,8 @@
     
     TUint8 pCmdNumber( commandDetails.GetShortInfo( ETLV_CommandNumber ) );
                 
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_2, "CSAT: CSatNotifySetUpCall::CompleteNotifyL\t Handle:%d",reqHandle);
+    TFLOGSTRING2("CSAT: CSatNotifySetUpCall::CompleteNotifyL\t Handle:%d",
+           reqHandle);
     // In case the request was ongoing, continue..
     if ( CSatTsy::ESatReqHandleUnknown  != reqHandle )
         {
@@ -198,7 +195,9 @@
             // Transaction ID
             setUpCallV1.SetPCmdNumber( pCmdNumber );
             
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_3, "CSAT: CSatNotifySetupCall::CompleteNotifyL CommandQualifier %d", iNotificationsTsy->iTerminalRespData.iCommandDetails[ KCommandQualifier ]);
+            TFLOGSTRING2("CSAT: CSatNotifySetupCall::CompleteNotifyL \
+            	CommandQualifier %d", iNotificationsTsy->iTerminalRespData.
+            	iCommandDetails[ KCommandQualifier ]);
 
             switch ( iNotificationsTsy->iTerminalRespData.
             		iCommandDetails[ KCommandQualifier ] )
@@ -242,7 +241,8 @@
                     }
                 default:
                     {
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_4, "CSAT: CSatNotifySetupCall::CompleteNotifyL,Call type not set");
+                    TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL,\
+                        Call type not set");
                     // Call type not set
                     setUpCallV1.iType = RSat::ESetUpCallTypeNotSet;
                     break;
@@ -275,7 +275,9 @@
                      // Get alpha id string
                     sourceString.Set( alphaIdentifier.GetData( 
                         ETLV_AlphaIdentifier ) );
-                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_5, "CSAT: CSatNotifySetupCall::CompleteNotifyL User confirmation phase: sourceString %s", sourceString );
+                    TFLOGSTRING2("CSAT: CSatNotifySetupCall::CompleteNotifyL User \
+                        confirmation phase: sourceString %s", 
+                        &sourceString );               
                     // Convert and set the alpha id
                     TSatUtility::SetAlphaId( sourceString ,
                         setUpCallV1.iAlphaIdConfirmationPhase.iAlphaId ); 
@@ -285,7 +287,8 @@
                 // is zero
                 else
                     {
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_6, "CSAT: CSatNotifySetupCall::CompleteNotifyL User confirmation phase: Alpha Id missing");
+                    TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL \
+                        User confirmation phase: Alpha Id missing");
                     setUpCallV1.iAlphaIdConfirmationPhase.iStatus = 
                         RSat::EAlphaIdNull;
                     }
@@ -293,7 +296,8 @@
             // No alpha id for user confirmation phase
             else
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_7, "CSAT: CSatNotifySetupCall::CompleteNotifyL, User confirmation phase: Alpha ID not present");
+                TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL,\
+                    User confirmation phase: Alpha ID not present");
                 setUpCallV1.iAlphaIdConfirmationPhase.iStatus = 
                     RSat::EAlphaIdNotPresent;
                 }  
@@ -313,7 +317,9 @@
                      // Get alpha id string
                     sourceString.Set( alphaIdentifier.GetData( 
                         ETLV_AlphaIdentifier ) );
-                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_8, "CSAT: CSatNotifySetupCall::CompleteNotifyL Call Set Up phase: sourceString %s",sourceString );
+                    TFLOGSTRING2("CSAT: CSatNotifySetupCall::CompleteNotifyL \
+                        Call Set Up phase: sourceString %s",
+                        &sourceString );
                     // Convert and set the alpha id
                     TSatUtility::SetAlphaId( sourceString,
                         setUpCallV1.iAlphaIdCallSetUpPhase.iAlphaId ); 
@@ -322,7 +328,8 @@
                 // Alpha id found for set up call phase,  but length is zero
                 else
                     {
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_9, "CSAT: CSatNotifySetupCall::CompleteNotifyL Call Set Up phase: Alpha Id is NULL");
+                    TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL \
+                        Call Set Up phase: Alpha Id is NULL"); 
                     setUpCallV1.iAlphaIdCallSetUpPhase.iStatus = 
                         RSat::EAlphaIdNull;
                     }
@@ -331,7 +338,8 @@
             // No alpha id set up call phase
             else
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_10, "CSAT: CSatNotifySetupCall::CompleteNotifyL, Alpha ID not present");
+                TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL,\
+                    Alpha ID not present");
                 setUpCallV1.iAlphaIdCallSetUpPhase.iStatus = 
                     RSat::EAlphaIdNotPresent;
                 }  
@@ -401,7 +409,8 @@
                     // Set actual number
                     setUpCallV1.iAddress.iTelNumber.Copy( tempNumber );
 
-                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_11, "CSAT: CSatNotifySetUpCall::CompleteNotifyL, TelNumber: %S", setUpCallV1.iAddress.iTelNumber );
+                    TFLOGSTRING2("CSAT: CSatNotifySetUpCall::CompleteNotifyL, \
+                    	TelNumber: %S", &setUpCallV1.iAddress.iTelNumber );
                     	
                     iNotificationsTsy->iSatTsy->StoreProactiveAddress( 
                         &tempNumber );
@@ -409,7 +418,8 @@
                 }
             else
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_12, "CSAT: CSatNotifySetupCall::CompleteNotifyL, Request not ongoing");
+                TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL,\
+                    Request not ongoing");
                 additionalInfo.Zero();
                 additionalInfo.Append( KNoCause );
                 // Request not on, returning response immediately
@@ -431,7 +441,8 @@
                 setUpCallV1.iCapabilityConfigParams.Append( capabilityConfig.
                     GetData( ETLV_CapabilityConfigurationParameters ) );
 
-                OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_13, "CSAT: CSatNotifySetUpCall::CompleteNotifyL, CapabilityParams: %s", setUpCallV1.iCapabilityConfigParams );
+                TFLOGSTRING2("CSAT: CSatNotifySetUpCall::CompleteNotifyL, \
+                   CapabilityParams: %s", &setUpCallV1.iCapabilityConfigParams );
                 }
 
             // Called Party SubAddress
@@ -468,7 +479,8 @@
                         setUpCallV1.iSubAddress );
                     }
                 
-                OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_14, "CSAT: CSatNotifySetUpCall, SubAddress: %S", setUpCallV1.iSubAddress );
+                TFLOGSTRING2("CSAT: CSatNotifySetUpCall, SubAddress: %S", 
+                    &setUpCallV1.iSubAddress );
                 }
 
             // Duration ( optional, maximum duration for the redial mechanism )
@@ -499,7 +511,8 @@
                         }
                     default:
                         {
-                        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_15, "CSAT: CSatNotifySetupCall::CompleteNotifyL, time unit not set");
+                        TFLOGSTRING("CSAT: CSatNotifySetupCall::\
+                            CompleteNotifyL, time unit not set");
                         setUpCallV1.iDuration.iTimeUnit = 
                             RSat::ETimeUnitNotSet;
                         break;
@@ -510,7 +523,8 @@
                 setUpCallV1.iDuration.iNumOfUnits = 
                     callDuration.GetShortInfo( ETLV_TimeInterval );
 
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_16, "CSAT: CSatNotifySetUpCall::CompleteNotifyL Max Duration for the Redial Mechanism" );
+                TFLOGSTRING("CSAT: CSatNotifySetUpCall::CompleteNotifyL Max \
+                	Duration for the Redial Mechanism" );
 
                 // Check that Time interval value is not invalid
                 if ( NULL == setUpCallV1.iDuration.iNumOfUnits )
@@ -535,7 +549,8 @@
         }        
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_17, "CSAT: CSatNotifySetupCall::CompleteNotifyL, Request not ongoing");
+        TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL,\
+            Request not ongoing");
         additionalInfo.Zero();
         additionalInfo.Append( KNoCause );
         // Request not on, returning response immediately
@@ -556,7 +571,7 @@
         TDes8* aRsp
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_TERMINALRESPONSEL_1, "CSAT:CSatNotifySetUpCall::TerminalResponseL");
+    TFLOGSTRING("CSAT:CSatNotifySetUpCall::TerminalResponseL");
 
     TInt    ret( KErrNone );
     TBuf<1> additionalInfo;
@@ -582,7 +597,8 @@
         && ( RSat::KErrorRequiredValuesMissing != rspV2.iGeneralResult ) 
         && ( RSat::KInteractionWithCCPermanentError != rspV2.iGeneralResult) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_TERMINALRESPONSEL_2, "CSAT:CSatNotifySetUpCall::TerminalResponseL, Invalid General Result");
+        TFLOGSTRING("CSAT:CSatNotifySetUpCall::TerminalResponseL,\
+            Invalid General Result");
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -601,7 +617,8 @@
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_TERMINALRESPONSEL_3, "CSAT:CSatNotifySetUpCall::TerminalResponseL, Invalid Additional Info");
+            TFLOGSTRING("CSAT:CSatNotifySetUpCall::TerminalResponseL,\
+                Invalid Additional Info");
             ret = KErrCorrupt;
             }
         }
@@ -650,7 +667,7 @@
         TDesC16& aAdditionalInfo            
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_CREATETERMINALRESPL_1, "CSAT: CSatNotifySetUpCall::CreateTerminalRespL");
+    TFLOGSTRING("CSAT: CSatNotifySetUpCall::CreateTerminalRespL");    
     // Create and append response data
     TTlv tlvSpecificData;
     tlvSpecificData.AddTag( KTlvResultTag );
@@ -668,7 +685,8 @@
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_CREATETERMINALRESPL_2,  "CSAT: CSatNotifySetUpCall::CreateTerminalRespL aAdditionalInfo.Length() == 0" );
+            TFLOGSTRING( "CSAT: CSatNotifySetUpCall::CreateTerminalRespL \
+                aAdditionalInfo.Length() == 0" ); 
             }
         }
     
@@ -696,7 +714,7 @@
         const TDesC8& aEnvelope
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_STORECALLCONNECTEDEVENT_1, "CSAT: CSatNotifySetUpCall::StoreCallConnectedEvent");
+    TFLOGSTRING("CSAT: CSatNotifySetUpCall::StoreCallConnectedEvent");
     // Store it to the buffer
     iCallConnectedEvent = aEnvelope;
     }

--- a/telephonyserverplugins/simatktsy/src/CSatNotifySetUpEventList.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySetUpEventList.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifySetUpEventListTraces.h"
-#endif
-
 #include <satcs.h>                   // Etel SAT IPC definitions
 #include "CSatTsy.h"                 // Tsy class header
 #include "CSatNotifySetUpEventList.h"// Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                 // Ber Tlv data handling
 #include "TTlv.h"					 // TTlv class 
 #include "CSatDataPackage.h"         // Parameter packing 
+#include "TfLogger.h"                // For TFLOGSTRING
 #include "TSatUtility.h"             // Utilities
 #include "CSatTsyReqHandleStore.h"   // Request handle class
 #include "cmmmessagemanagerbase.h"   // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
 		CSatNotificationsTsy* aNotificationsTsy
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_NEWL_1, "CSAT: CSatNotifySetUpEventList::NewL");
+    TFLOGSTRING("CSAT: CSatNotifySetUpEventList::NewL");
    	CSatNotifySetUpEventList* const satNotifySetUpEventList = 
         new ( ELeave ) CSatNotifySetUpEventList( aNotificationsTsy );
     CleanupStack::PushL( satNotifySetUpEventList );
     satNotifySetUpEventList->ConstructL();
     CleanupStack::Pop( satNotifySetUpEventList );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_NEWL_2, "CSAT: CSatNotifySetUpEventList::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifySetUpEventList::NewL, end of method");
     return satNotifySetUpEventList;	
     }
     
@@ -67,7 +62,7 @@
 		// None
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_DTOR_1, "CSAT: CSatNotifySetUpEventList::~CSatNotifySetUpEventList");
+    TFLOGSTRING("CSAT: CSatNotifySetUpEventList::~CSatNotifySetUpEventList");
     }    
 // -----------------------------------------------------------------------------
 // CSatNotifySetUpEventList::CSatNotifySetUpEventList
@@ -92,7 +87,7 @@
 		// None
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_CONSTRUCTL_1, "CSAT: CSatNotifySetUpEventList::ConstructL, does nothing");
+    TFLOGSTRING("CSAT: CSatNotifySetUpEventList::ConstructL, does nothing");
     }
 
 // -----------------------------------------------------------------------------
@@ -106,7 +101,7 @@
         const TDataPackage& aPackage   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_NOTIFY_1, "CSAT: CSatNotifySetUpEventList::Notify");
+    TFLOGSTRING("CSAT: CSatNotifySetUpEventList::Notify");  
     // Save data pointer to client side for completion
     iSetUpEventListV1Pckg = reinterpret_cast<RSat::TSetUpEventListV1Pckg*>( 
         aPackage.Des1n() );
@@ -134,7 +129,7 @@
         const TTsyReqHandle aTsyReqHandle 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_CANCELNOTIFICATION_1, "CSAT: CSatNotifySetUpEventList::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifySetUpEventList::CancelNotification");
     
     // Reset the request handle
     iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( 
@@ -160,7 +155,7 @@
         TInt aErrorCode  
         ) 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_1, "CSAT: CSatNotifySetUpEventList::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifySetUpEventList::CompleteNotifyL");    
     TInt ret( KErrNone );
     TUint8 generalResult( RSat::KSuccess );
 
@@ -209,7 +204,8 @@
                 TUint16 eventListLength = eventListTlv.GetLength();
                 if ( !eventListLength )
                     {
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_2, "CSAT: CSatNotifySetUpEventList::CompleteNotifyL, Event list empty");
+                    TFLOGSTRING("CSAT: CSatNotifySetUpEventList::\
+                        CompleteNotifyL, Event list empty"); 
                     setUpEventListV1.iType = RSat::ERemoveExistingEventList;
                     // Remove events from TSY:s list, No events = 0
                     iNotificationsTsy->iSatTsy->SetUpEventList( 0 );
@@ -333,14 +329,16 @@
                 }// if( KErrNone == ret )
             else
             	{
-            	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_3, "CSAT: CSatNotifySetUpEventList::CompleteNotifyL, Event list missing");
+            	TFLOGSTRING("CSAT: CSatNotifySetUpEventList::CompleteNotifyL,\
+            	    Event list missing"); 
            		// Event list is missing
             	generalResult = RSat::KErrorRequiredValuesMissing;
             	}    
             }// if ( KErrNone == aErrorCode )        	    
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_4, "CSAT: CSatNotifySetUpEventList::CompleteNotifyL, Error occurred in LSAT");
+            TFLOGSTRING("CSAT: CSatNotifySetUpEventList::CompleteNotifyL,\
+                Error occurred in LSAT");
             // Error code received from LicenceeSimAtkTsy
             return ret;
             }
@@ -348,7 +346,8 @@
         } // if ( CSatTsy::ESatReqHandleUnknown != reqHandle )    
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_5, "CSAT: CSatNotifySetUpEventList::CompleteNotifyL, Request not ongoing");
+        TFLOGSTRING("CSAT: CSatNotifySetUpEventList::CompleteNotifyL,\
+            Request not ongoing"); 
         generalResult = RSat::KMeUnableToProcessCmd;
         }
 
@@ -380,7 +379,7 @@
         TDes8* aRsp
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_1, "CSAT:CSatNotifySetUpEventList::TerminalResponseL");
+    TFLOGSTRING("CSAT:CSatNotifySetUpEventList::TerminalResponseL");
 
     TInt ret( KErrNone );
     TBuf<1> additionalInfo;
@@ -403,7 +402,8 @@
 		&& ( RSat::KCmdNumberNotKnown != rspV1.iGeneralResult )
         && ( RSat::KErrorRequiredValuesMissing != rspV1.iGeneralResult ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_2, "CSAT:CSatNotifySetUpEventList::TerminalResponseL, Invalid General Result");
+        TFLOGSTRING("CSAT:CSatNotifySetUpEventList::TerminalResponseL,\
+            Invalid General Result");
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -411,7 +411,8 @@
 	if ((RSat::KMeUnableToProcessCmd == rspV1.iGeneralResult) && (RSat::KMeProblem != rspV1.iInfoType))
 	{
 	// it's obligatory to provide additional info and KMeProblem flag for KMeUnableToProcessCmd error code
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_3, "CSAT:CSatNotifySetUpEventList::TerminalResponseL, KMeProblem flag is not specified");
+    TFLOGSTRING("CSAT:CSatNotifySetUpEventList::TerminalResponseL,\
+                KMeProblem flag is not specified");        
     ret = KErrCorrupt;   
 	}
     
@@ -425,7 +426,8 @@
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_4, "CSAT:CSatNotifySetUpEventList::TerminalResponseL, Invalid Additional Info");
+            TFLOGSTRING("CSAT:CSatNotifySetUpEventList::TerminalResponseL,\
+                Invalid Additional Info");
             // Invalid additional info field
             ret = KErrCorrupt;
             }
@@ -460,7 +462,7 @@
         TDesC16& aAdditionalInfo       
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_CREATETERMINALRESPL_1, "CSAT: CSatNotifySetUpEventList::CreateTerminalRespL");
+    TFLOGSTRING("CSAT: CSatNotifySetUpEventList::CreateTerminalRespL");    
     // Create and append response data
     TTlv tlvSpecificData;
     // Create General Result TLV here

--- a/telephonyserverplugins/simatktsy/src/CSatNotifySetUpIdleModeText.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySetUpIdleModeText.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifySetUpIdleModeTextTraces.h"
-#endif
-
 #include <satcs.h>						// Etel SAT IPC definitions
 #include "CSatTsy.h"					// Tsy class header
 #include "CSatNotifySetUpIdleModeText.h"// Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"					// Ber Tlv data handling
 #include "TTlv.h"						// TTlv class
 #include "CSatDataPackage.h"			// Parameter packing 
+#include "TfLogger.h"					// For TFLOGSTRING
 #include "TSatUtility.h"				// Utilities
 #include "CSatTsyReqHandleStore.h"		// Request handle class
 #include "cmmmessagemanagerbase.h"		// Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_NEWL_1, "CSAT: CSatNotifySetUpIdleModeText::NewL");
+    TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::NewL");
    	CSatNotifySetUpIdleModeText* const satNotifySetUpIdleModeText = 
         new ( ELeave ) CSatNotifySetUpIdleModeText( aNotificationsTsy );
     CleanupStack::PushL( satNotifySetUpIdleModeText );
     satNotifySetUpIdleModeText->ConstructL();
     CleanupStack::Pop( satNotifySetUpIdleModeText );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_NEWL_2, "CSAT: CSatNotifySetUpIdleModeText::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::NewL, end of method");
     return satNotifySetUpIdleModeText;
     }
 
@@ -67,7 +62,8 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_DTOR_1, "CSAT: CSatNotifySetUpIdleModeText::~CSatNotifySetUpIdleModeText");
+    TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::\
+        ~CSatNotifySetUpIdleModeText");
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +89,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_CONSTRUCTL_1, "CSAT: CSatNotifySetUpIdleModeText::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::ConstructL");
     }
 
 // -----------------------------------------------------------------------------
@@ -108,7 +104,7 @@
         const TDataPackage& aPackage    
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_NOTIFY_1, "CSAT: CSatNotifySetUpIdleModeText::Notify");
+    TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::Notify");
     // Save data pointer to client side for completion
     iSetUpIdleModeTextV1Pckg = reinterpret_cast<RSat::
     	TSetUpIdleModeTextV1Pckg*>( aPackage.Des1n() );
@@ -133,7 +129,7 @@
         const TTsyReqHandle aTsyReqHandle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_CANCELNOTIFICATION_1, "CSAT: CSatNotifySetUpIdleModeText::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::CancelNotification");
     
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
@@ -158,7 +154,7 @@
         TInt aErrorCode                  
         )
     {   
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_COMPLETENOTIFYL_1, "CSAT: CSatNotifySetUpIdleModeText::CompleteNotifyL");
+	TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::CompleteNotifyL");
     TInt ret( KErrNone );
 	TInt returnValue( KErrNone );
 	TBuf<1> additionalInfo;	
@@ -228,7 +224,8 @@
 				( ( RSat::ERemoveExistingIdleModeText == setUpIdleModeTextV1.iType) && 
 				  ( RSat::ENotSelfExplanatory==setUpIdleModeTextV1.iIconId.iQualifier)) )
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_COMPLETENOTIFYL_2, "CSAT: CSatNotifySetUpIdleModeText::CompleteNotifyL, Invalid Data");
+				TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::\
+								    CompleteNotifyL, Invalid Data");
 				additionalInfo.Zero();
                 additionalInfo.Append( KNoCause );
 				CreateTerminalRespL( pCmdNumber, RSat::KCmdDataNotUnderstood, 
@@ -247,7 +244,8 @@
         } // End of if ( reqHandle != CSatTsy::ESatReqHandleUnknown )
     else 
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_COMPLETENOTIFYL_3, "CSAT: CSatNotifySetUpIdleModeText::CompleteNotifyL, Request not ongoing");
+        TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::CompleteNotifyL,\
+            Request not ongoing");
         // Request not on, returning response immediately
 		additionalInfo.Zero();
         additionalInfo.Append( KNoCause );
@@ -270,7 +268,7 @@
         TDes8* aRsp 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSEL_1, "CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL");
+    TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL");
 
 	TInt   ret( KErrNone );
     TBuf<1> additionalInfo;
@@ -291,7 +289,8 @@
          ( RSat::KCmdDataNotUnderstood != rspV1.iGeneralResult ) &&
          ( RSat::KSuccessRequestedIconNotDisplayed != rspV1.iGeneralResult ) )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSEL_2, "CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL, Invalid General Result");
+        TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL,\
+            Invalid General Result");
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -306,7 +305,8 @@
 			}
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSEL_3, "CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL, Invalid Additional Info");
+            TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL,\
+                Invalid Additional Info");
             // Invalid additional info field
             ret = KErrCorrupt;
             }
@@ -331,7 +331,7 @@
         TDesC16& aAdditionalInfo			
 		)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_CREATETERMINALRESPL_1, "CSAT: CSatNotifySetUpIdleModeText::CreateTerminalRespL");
+	TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::CreateTerminalRespL");
 	TTlv tlvSpecificData;
     // Create General Result TLV here
     tlvSpecificData.AddTag( KTlvResultTag );

--- a/telephonyserverplugins/simatktsy/src/CSatNotifySetUpMenu.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySetUpMenu.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifySetUpMenuTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifySetUpMenu.h"    // Tsy class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_NEWL_1, "CSAT: CSatNotifySetUpMenu::NewL");
+    TFLOGSTRING("CSAT: CSatNotifySetUpMenu::NewL");
    	CSatNotifySetUpMenu* const satNotifySetUpMenu = 
         new ( ELeave ) CSatNotifySetUpMenu( aNotificationsTsy );
     CleanupStack::PushL( satNotifySetUpMenu );
     satNotifySetUpMenu->ConstructL();
     CleanupStack::Pop( satNotifySetUpMenu );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_NEWL_2, "CSAT: CSatNotifySetUpMenu::NewL");
+    TFLOGSTRING("CSAT: CSatNotifySetUpMenu::NewL");
     return satNotifySetUpMenu;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_DTOR_1, "CSAT: CSatNotifySetUpMenu::~CSatNotifySetUpMenu");
+    TFLOGSTRING("CSAT: CSatNotifySetUpMenu::~CSatNotifySetUpMenu");
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +88,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_CONSTRUCTL_1, "CSAT: CSatNotifySetUpMenu::ConstructL");
+    TFLOGSTRING("CSAT: CSatNotifySetUpMenu::ConstructL");
     iItemsNextIndicatorRemoved = EFalse;
     }
 
@@ -109,7 +104,7 @@
         const TDataPackage& aPackage    
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_NOTIFY_1, "CSAT: CSatNotifySetUpMenu::Notify");
+    TFLOGSTRING("CSAT: CSatNotifySetUpMenu::Notify");
     // Save data pointer to client side for completion
     iSetUpMenuV2Pckg = reinterpret_cast<RSat::TSetUpMenuV2Pckg*>( 
         aPackage.Des1n() );
@@ -133,7 +128,7 @@
         const TTsyReqHandle aTsyReqHandle		
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_CANCELNOTIFICATION_1, "CSAT: CSatNotifySetUpMenu::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CancelNotification");
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( CSatTsy::ESatNotifySetUpMenuPCmdReqType );
@@ -155,7 +150,7 @@
         TInt aErrorCode                  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_1, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL");
     TInt ret( KErrNone );
 	TInt returnValue( KErrNone );
 	// Unpack parameters
@@ -167,7 +162,8 @@
         iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle(
 		CSatTsy::ESatNotifySetUpMenuPCmdReqType );
 		
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_2, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL reqHandle is :%d", reqHandle );
+	TFLOGSTRING2("CSAT: CSatNotifySetUpMenu::CompleteNotifyL reqHandle is :%d", 
+        reqHandle );
 					
 	// Get ber tlv 
     CBerTlv berTlv;
@@ -225,7 +221,7 @@
     
 				TUint16 alphaIdLength = alphaIdentifier.GetLength();
 
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_3, "CSAT: Alpha ID length:%d", alphaIdLength );
+				TFLOGSTRING2("CSAT: Alpha ID length:%d", alphaIdLength );
 
 				if ( RSat::KAlphaIdMaxSize < alphaIdLength )
 					{
@@ -243,11 +239,13 @@
 					// Set SAT toolikit name, send SAT SMS logging purpose
 					iToolKitName.Copy( menu.iAlphaId.iAlphaId );
 
-					OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_4, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, iToolKitName:%S", iToolKitName );
+					TFLOGSTRING2("CSAT: CSatNotifySetUpMenu::CompleteNotifyL, \
+                        iToolKitName:%S", &iToolKitName );
 					}
 				else
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_5, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Wrong length of alpha id.");
+					TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL,\
+        				Wrong length of alpha id.");
 					}
 
 				// Alpha Id status
@@ -257,7 +255,8 @@
 					}
 				else
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_6, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Alpha ID is NULL");
+					TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL,\
+					    Alpha ID is NULL");
 					menu.iAlphaId.iStatus = RSat::EAlphaIdNull;
 					}
 
@@ -270,7 +269,8 @@
 					}
 				else
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_7, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, No Help available");
+					TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL,\
+					    No Help available");
 					// No help
 					menu.iHelp = RSat::ENoHelpAvailable;
 					}
@@ -307,12 +307,14 @@
                 }
             else if ( KErrNotFound == retValue )
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_8, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, No Icon ID");
+                TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL,\
+                    No Icon ID");
                 menu.iIconListQualifier = RSat::ENoIconId;
                 }
             else
             	{
-	            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_9, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Wrong return value of icon identifier list.");
+	            TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL, \
+        			Wrong return value of icon identifier list.");	
            		}	
            	
 	        //Items Data
@@ -374,7 +376,8 @@
                     // Suffle through all the menu items
                     stringLength = 0;
 
-                    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_10, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, item number:%d", i );
+                    TFLOGSTRING2("CSAT: CSatNotifySetUpMenu::CompleteNotifyL, \
+                        item number:%d", i );
                     
                     // Fill the new item
                     newItem.iItemId = itemsData.GetShortInfo( 
@@ -401,12 +404,14 @@
                             newItem.iItemString );
                         }
             
-                    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_11, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL newItem.iItemString:%S", newItem.iItemString );
+                    TFLOGSTRING2("CSAT: CSatNotifySetUpMenu::CompleteNotifyL \
+                        newItem.iItemString:%S", &newItem.iItemString );
 
 	                // Adding the new menuitem
 	                if( NULL != iconIdList.Size()  && ( i < iconIdList.Length() ) )
 	                    {
-	                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_12, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL Icons on the list" );
+	                    TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL \
+	                            Icons on the list" );
 	                    if( ( NULL != itemNextIndicator.Size() ) 
 	                        && ( i < itemNextIndicator.Length() ) )
 	                        {
@@ -414,7 +419,8 @@
 	                        if ( KErrNoMemory == menu.AddItem( newItem, 
 	                             itemNextIndicator[i], iconIdList[i] ) )
 	                            {
-	                            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_13, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Menu item length exceeded");
+	                            TFLOGSTRING("CSAT: CSatNotifySetUpMenu::\
+	                                CompleteNotifyL, Menu item length exceeded");
 	                            // Too many or long menu items
 	                            ret = KErrCorrupt;
 	                            }
@@ -423,7 +429,8 @@
 	                    else if ( KErrNoMemory == menu.AddItemIcon( newItem, 
 	                        iconIdList[i] ) )
 	                        {
-	                        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_14, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Menu item length exceeded");
+	                        TFLOGSTRING("CSAT: CSatNotifySetUpMenu::\
+	                            CompleteNotifyL, Menu item length exceeded");
 	                        // Too many or long menu items
 	                        ret = KErrCorrupt;
 	                        }
@@ -438,7 +445,8 @@
 	                        if ( KErrNoMemory == menu.AddItem( newItem, 
 	                            itemNextIndicator[i] ) )
 	                            {
-	                            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_15, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Menu item length exceeded");
+	                            TFLOGSTRING("CSAT: CSatNotifySetUpMenu::\
+	                                CompleteNotifyL, Menu item length exceeded");
 	                            // Too many or long menu items
 	                            ret = KErrCorrupt;
 	                            }
@@ -449,7 +457,8 @@
 	                        TInt retAdd = menu.AddItem( newItem );
 	                        if ( KErrNoMemory == retAdd )
 	                            {
-	                            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_16, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Menu item length exceeded");
+	                            TFLOGSTRING("CSAT: CSatNotifySetUpMenu::\
+	                                CompleteNotifyL, Menu item length exceeded");
 	                            // Too many or long menu items
 	                            // If there is not enough space left in the buffer used 
 	                            // by the menu KErrNoMemory is returned.
@@ -478,12 +487,14 @@
         	}
         
 		// Complete to the client side
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_17, "CSAT: Completing CSatNotifySetUpMenu: error %d",aErrorCode );
+		TFLOGSTRING2("CSAT: Completing CSatNotifySetUpMenu: error %d",
+			aErrorCode );
 		iNotificationsTsy->iSatTsy->ReqCompleted( reqHandle, ret );
 		} 
     else 
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_18, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Request not ongoing");
+        TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL, \
+            Request not ongoing");
 		TBuf16<1>additionalInfo;
         additionalInfo.Append ( RSat::KNoSpecificMeProblem );
 		CreateTerminalRespL( pCmdNumber,                         
@@ -502,7 +513,7 @@
         TDes8* aRsp
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_TERMINALRESPONSEL_1, "CSAT: CSatNotifySetUpMenu::TerminalResponseL");
+    TFLOGSTRING("CSAT: CSatNotifySetUpMenu::TerminalResponseL");
 
     TInt ret( KErrNone );
     TBuf16<1> additionalInfo;
@@ -541,7 +552,8 @@
         
     if( RSat::KSuccess == rspV1.iGeneralResult && iItemsNextIndicatorRemoved )
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_TERMINALRESPONSEL_2, "CSatNotifySetUpMenu::TerminalResponseL, iItemsNextIndicatorRemoved");
+		TFLOGSTRING("CSatNotifySetUpMenu::TerminalResponseL, \
+			iItemsNextIndicatorRemoved");
 		rspV1.iGeneralResult = RSat::KPartialComprehension;
 		}
 		
@@ -566,7 +578,7 @@
         const TDesC16& aAdditionalInfo		
 		)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_CREATETERMINALRESPL_1, "CSAT: CSatNotifySetUpMenu::CreateTerminalRespL");
+	TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CreateTerminalRespL");	
     // Create and append response data
     TTlv tlvSpecificData;
     // Create General Result TLV here

--- a/telephonyserverplugins/simatktsy/src/CSatNotifySimSessionEnd.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySimSessionEnd.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,16 +20,11 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifySimSessionEndTraces.h"
-#endif
-
 #include "CSatTsy.h"                    // Main tsy class header
 #include "CSatNotifySimSessionEnd.h"    // Class header
 #include "CSatNotificationsTsy.h"       // Tsy class header
 #include "CSatDataPackage.h"            // Parameter packing 
+#include "TfLogger.h"                   // For TFLOGSTRING
 #include "CSatTsyReqHandleStore.h"      // Request handle class
 #include "CBerTlv.h"                    // Ber Tlv data handling
 #include "TSatUtility.h"                // (U)SIM Status constants
@@ -44,13 +39,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_NEWL_1, "CSAT: CSatNotifySimSessionEnd::NewL");
+    TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::NewL");
    	CSatNotifySimSessionEnd* const satNotifySimSessionEnd = 
         new ( ELeave ) CSatNotifySimSessionEnd( aNotificationsTsy );
     CleanupStack::PushL( satNotifySimSessionEnd );
     satNotifySimSessionEnd->ConstructL();
     CleanupStack::Pop( satNotifySimSessionEnd );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_NEWL_2, "CSAT: CSatNotifySimSessionEnd::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::NewL, end of method");
     return satNotifySimSessionEnd;
     }
 
@@ -64,7 +59,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_DTOR_1, "CSAT: CSatNotifySimSessionEnd::~CSatNotifySimSessionEnd");
+    TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::~CSatNotifySimSessionEnd");
     }
     
 // -----------------------------------------------------------------------------
@@ -90,7 +85,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_CONSTRUCTL_1, "CSAT: CSatNotifySimSessionEnd::ConstructL, does nothing");
+    TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::ConstructL, does nothing");
     }
 
 // -----------------------------------------------------------------------------
@@ -104,7 +99,7 @@
         const TDataPackage& /*aPackage*/   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_NOTIFY_1, "CSAT: CSatNotifySimSessionEnd::Notify");
+    TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::Notify");
     // Save the request handle
     iNotificationsTsy->iSatTsy->SaveReqHandle( aTsyReqHandle, 
 		CSatTsy::ESatNotifyProactiveSimSessionEndReqType );
@@ -126,7 +121,7 @@
         const TTsyReqHandle aTsyReqHandle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_CANCELNOTIFICATION_1, "CSAT: CSatNotifySimSessionEnd::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::CancelNotification"); 
     
     // Reset the request handle
     TTsyReqHandle reqHandle = 
@@ -148,7 +143,7 @@
         TInt aErrorCode  
         ) 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_COMPLETENOTIFYL_1, "CSAT: CSatNotifySimSessionEnd::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::CompleteNotifyL");
     
     // Unpack data
     TUint8 sw1;
@@ -164,7 +159,8 @@
 	    // In case the request was ongoing, complete the request to the client.
 	    if ( CSatTsy::ESatReqHandleUnknown != reqHandle )
 	        {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_COMPLETENOTIFYL_2, "CSAT: CSatNotifySimSessionEnd::CompleteNotifyL, SIM SESSION END");
+            TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::CompleteNotifyL, \
+            	SIM SESSION END");
 	        iNotificationsTsy->iSatTsy->ReqCompleted( reqHandle, aErrorCode );
 	        }
         }

--- a/telephonyserverplugins/simatktsy/src/CSatNotifyTimerMgmt.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyTimerMgmt.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyTimerMgmtTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyTimerMgmt.h"    // Class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
 #include "MSatTsy_IPCDefs.h"        // Sat Tsy internal request types
@@ -48,13 +43,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_NEWL_1, "CSAT: CSatNotifyTimerMgmt::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::NewL");
    	CSatNotifyTimerMgmt* const satNotifyTimerMgmt = 
         new ( ELeave ) CSatNotifyTimerMgmt( aNotificationsTsy );
     CleanupStack::PushL( satNotifyTimerMgmt );
     satNotifyTimerMgmt->ConstructL();
     CleanupStack::Pop( satNotifyTimerMgmt );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_NEWL_2, "CSAT: CSatNotifyTimerMgmt::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::NewL, end of method");
     return satNotifyTimerMgmt;
     }
 
@@ -68,7 +63,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_DTOR_1, "CSAT: CSatNotifyTimerMgmt::~CSatNotifyTimerMgmt");
+    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::~CSatNotifyTimerMgmt");
     }
     
 // -----------------------------------------------------------------------------
@@ -94,7 +89,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_CONSTRUCTL_1, "CSAT: CSatNotifyTimerMgmt::ConstructL, does nothing");
+    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::ConstructL, does nothing");
     }
 
 // -----------------------------------------------------------------------------
@@ -108,7 +103,7 @@
         TInt aErrorCode                  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_1, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::CompleteNotifyL");
 
     TInt ret( KErrNone );
     TInt returnValue( KErrNone );
@@ -190,19 +185,22 @@
 
                             if ( KErrNone != ret )
                                 {
-                                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_2, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Unable to process cmd");
+                                TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\
+                                    CompleteNotifyL, Unable to process cmd");
                                 generalResult = RSat::KMeUnableToProcessCmd;
                                 }
                             }
                         else
                             {
-                            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_3, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Data not understood");
+                            TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\
+                                CompleteNotifyL, Data not understood");
                             generalResult = RSat::KCmdDataNotUnderstood;
                             }
                         }
                     else
                         {
-                        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_4, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Timer value missing");
+                        TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\
+                            CompleteNotifyL, Timer value missing");
                         generalResult = RSat::KErrorRequiredValuesMissing;
                         }
                     }
@@ -245,20 +243,23 @@
                         }
                     else
                         {
-                        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_5, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Contradiction with timer state");
+                        TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\
+                            CompleteNotifyL, Contradiction with timer state");
                         generalResult = RSat::KContradictionWithTimerState;
                         }
                     }
                 else
                     {
-                    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_6, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Cmd type not understood");
+                    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\
+                        CompleteNotifyL, Cmd type not understood");
                     generalResult = RSat::KCmdTypeNotUnderstood;
                     }
                 }
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_7, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Required values missing");
+            TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\
+                CompleteNotifyL, Required values missing");
             generalResult = RSat::KErrorRequiredValuesMissing;
             }
 
@@ -281,7 +282,7 @@
         TUint8 aGeneralResult	
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_CREATETERMINALRESPL_1, "CSAT: CSatNotifyTimerMgmt::CreateTerminalRespL");
+    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::CreateTerminalRespL");
 
     // Create and append response data
     TTlv tlvSpecificData;
@@ -350,7 +351,7 @@
          TPtrC8 time
          )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_CONVERTTOSECONDS_1, "CSAT: CSatNotifyTimerMgmt::ConvertToSeconds");
+    TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::ConvertToSeconds");
     TUint32 timeValue( 0 );
     // Value of a timer, expressed using 
     // the format hour, minute, second

--- a/telephonyserverplugins/simatktsy/src/CSatTsyReqHandleStore.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatTsyReqHandleStore.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,14 +20,9 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatTsyReqHandleStoreTraces.h"
-#endif
-
 #include "CSatTsyReqHandleStore.h"  // Class header
 #include "CSatTsy.h"                // Main tsy class header
+#include "TfLogger.h"               // For TFLOGSTRING
 
 // -----------------------------------------------------------------------------
 // CSatTsyReqHandleStore::NewL
@@ -42,7 +37,7 @@
         TTsyReqHandle* aFirstElement // Pointer to the first element
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_NEWL_1,  "CSAT: CSatTsyReqHandleStore::NewL" );
+    TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::NewL" );
     CSatTsyReqHandleStore* tsyReqHandleStore = new ( ELeave ) 
         CSatTsyReqHandleStore();
  
@@ -57,7 +52,7 @@
         }
 
     CleanupStack::Pop( tsyReqHandleStore );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_NEWL_2,  "CSAT: CSatTsyReqHandleStore::NewL, end of method" );
+    TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::NewL, end of method" );
     return tsyReqHandleStore;
     }
 
@@ -72,7 +67,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_DTOR_1,  "CSAT: CSatTsyReqHandleStore::~CSatTsyReqHandleStore" );
+    TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::~CSatTsyReqHandleStore" );
     }
 
 // -----------------------------------------------------------------------------
@@ -85,7 +80,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_CTOR_1,  "CSAT: CSatTsyReqHandleStore::CSatTsyReqHandleStore" );
+    TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::CSatTsyReqHandleStore" );
     }
 
 // -----------------------------------------------------------------------------
@@ -98,7 +93,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_CONSTRUCTL_1,  "CSAT: CSatTsyReqHandleStore::ConstructL" );
+    TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::ConstructL" );
     }
 
 // -----------------------------------------------------------------------------
@@ -111,7 +106,7 @@
         const TInt aIndex  // TSY req handle index
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_TSYREQHANDLE_1,  "CSAT: CSatTsyReqHandleStore::TsyReqHandle" );
+    TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::TsyReqHandle" );
     TTsyReqHandle ret( NULL );
 
     // Check the bounds
@@ -121,7 +116,8 @@
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_TSYREQHANDLE_2,  "CSAT: CSatTsyReqHandleStore::TsyReqHandle, Out of bounds" );
+        TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::TsyReqHandle, \
+            Out of bounds" );
         }
     return ret;
     }
@@ -137,15 +133,17 @@
         const TTsyReqHandle   aTsyReqHandle   // Request handle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_SETTSYREQHANDLE_1,  "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle" );
+    TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle" );
     if ( ( aIndex >= 0 ) && ( aIndex < iNumOfRequests ) )
         {
         *( iReqHandles + aIndex ) = aTsyReqHandle;
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_SETTSYREQHANDLE_2,  "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle, %d saved", aTsyReqHandle );
+        TFLOGSTRING2( "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle, %d saved", 
+            aTsyReqHandle );
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_SETTSYREQHANDLE_3,  "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle, Request handle not saved" );
+        TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle,\
+            Request handle not saved" );
         }
     }
 
@@ -162,7 +160,7 @@
         )
     {
 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_1,  "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle" );
+    TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle" );
     // Req handle was not used.
     TInt ret = 0;
 
@@ -176,11 +174,13 @@
 
             // Reset req handle
             *( iReqHandles + aIndex ) = 0;
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_2,  "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle, index %d removed", aIndex );
+            TFLOGSTRING2( "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle, index \
+            	%d removed", aIndex );
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_3, "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle, Not in use");
+            TFLOGSTRING("CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle,\
+                Not in use");
             }
         }
     else
@@ -188,7 +188,8 @@
         // Do nothing    
         }
             
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_4, "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle reqHandle is :%d", ret );
+	TFLOGSTRING2("CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle \
+	    reqHandle is :%d", ret ); 
 		
     return ret;
     }

--- a/telephonyserverplugins/simatktsy/src/CTsyDelegates.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CTsyDelegates.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,14 +16,9 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CTsyDelegatesTraces.h"
-#endif
-
 #include "ctsydelegates.h"
 #include "cmmmessagemanagerbase.h"
+#include "tflogger.h" 
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -49,7 +44,7 @@
 CBase* CTsyDelegates::GetTsyObject( 
     CMmMessageManagerBase::TTsyObjects aObject )
 	{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYDELEGATES_GETTSYOBJECT_1, "TSY: CTsyDelegates::GetTsyObject object=%d", aObject );
+TFLOGSTRING2("TSY: CTsyDelegates::GetTsyObject object=%d", aObject );
 	
 	CBase* object = NULL;	
  	object = iTsyObjectArray.At( aObject );	
@@ -66,7 +61,7 @@
     CMmMessageManagerBase::TTsyObjects aTsyObjectType,
     CBase* aTsyObject )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYDELEGATES_REGISTERTSYOBJECT_1, "TSY: CTsyDelegates::RegisterTsyObject type=%d address=0x%x", TInt( aTsyObjectType ), aTsyObject );
+TFLOGSTRING3("TSY: CTsyDelegates::RegisterTsyObject type=%d address=0x%x", TInt( aTsyObjectType ), aTsyObject );
 
     iTsyObjectArray[ aTsyObjectType ] = aTsyObject;
     }
@@ -79,7 +74,7 @@
 //
 void CTsyDelegates::DeregisterTsyObject( CBase* aTsyObject )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYDELEGATES_DEREGISTERTSYOBJECT_1, "TSY: CTsyDelegates::DeregisterTsyObject address=0x%x", aTsyObject );
+TFLOGSTRING2("TSY: CTsyDelegates::DeregisterTsyObject address=0x%x", aTsyObject );
 
     for( TInt i = 0; i < TInt( 
         CMmMessageManagerBase::EMaxNumOfTsyObjects ); i++ )

--- a/telephonyserverplugins/simatktsy/src/TSatEventList.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/TSatEventList.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -19,13 +19,8 @@
 
 
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "TSatEventListTraces.h"
-#endif
-
 #include "TSatEventList.h"   // Class header
+#include "TfLogger.h"        // For TFLOGSTRING
 
 // -----------------------------------------------------------------------------
 // TSatEventList::TSatEventList
@@ -37,7 +32,7 @@
         void 
         ) : iEvents( 0 )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS ,TSATEVENTLIST_CTOR_1,  "CSAT: TSatEventList::TSatEventList" );
+    TFLOGSTRING( "CSAT: TSatEventList::TSatEventList" );
     }
 
 // -----------------------------------------------------------------------------
@@ -53,12 +48,14 @@
 
     if( iEvents & TUint32( aEvent ) )
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSATEVENTLIST_ISENABLED_1,  "CSAT: TSatEventList::IsEventEnabled, Event Enabled: %d", aEvent );
+        TFLOGSTRING2( "CSAT: TSatEventList::IsEventEnabled, \
+            Event Enabled: %d", aEvent );
         return ETrue;
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSATEVENTLIST_ISENABLED_2,  "CSAT: TSatEventList::IsEventEnabled, Event Not enabled" );
+        TFLOGSTRING( "CSAT: TSatEventList::IsEventEnabled, \
+            Event Not enabled" );
         return EFalse;
         }
 
@@ -74,7 +71,7 @@
         RSat::TEventList aEvent
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSATEVENTLIST_REMOVEFROMEVENTLIST_1,  "CSAT: TSatEventList::RemoveFromEventList" );
+    TFLOGSTRING( "CSAT: TSatEventList::RemoveFromEventList" );
     iEvents &= ~TUint32( aEvent );
     }
 
@@ -88,7 +85,7 @@
         RSat::TEventList aEvent
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSATEVENTLIST_ADDTOEVENTLIST_1,  "CSAT: TSatEventList::AddToEventList" );
+    TFLOGSTRING( "CSAT: TSatEventList::AddToEventList" );
     iEvents |= TUint32( aEvent );
     }
 
@@ -102,7 +99,7 @@
         TUint32 aEvent
         )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSATEVENTLIST_SETEVENTLIST_1,  "CSAT: TSatEventList::SetEventList aEvent:%d", aEvent );
+    TFLOGSTRING2( "CSAT: TSatEventList::SetEventList aEvent:%d", aEvent );
     iEvents = aEvent;
     }

--- a/telephonyserverplugins/simatktsy/src/cmmmessagemanagerbase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/cmmmessagemanagerbase.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,13 +16,8 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmmessagemanagerbaseTraces.h"
-#endif
-
 #include "cmmmessagemanagerbase.h"
+#include "tflogger.h"
 #include "ctsydelegates.h"
 #include "csatmessagerouterproxy.h"
 #include <ctsy/pluginapi/mmessagerouter.h>
@@ -76,7 +71,7 @@
 TInt CMmMessageManagerBase::HandleRequestL(    
     const TInt aIpc )        
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEMANAGERBASE_HANDLEREQUESTL_1, "TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
+TFLOGSTRING2("TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
     return HandleRequestL( 
         aIpc, REINTERPRET_CAST( const CMmDataPackage*, NULL ) );
     }
@@ -91,7 +86,7 @@
     const TInt aIpc,      
     const CMmDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEMANAGERBASE_HANDLEREQUESTL1_1, "TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
+TFLOGSTRING2("TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
    
     return iMessageRouter.ExtFuncL( aIpc, aDataPackage );
     }
@@ -106,7 +101,7 @@
     const TInt aIpc,        
     const TDataPackage* aDataPackage )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEMANAGERBASE_HANDLEREQUESTL2_1, "TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
+TFLOGSTRING2("TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc );
 
     // map the TDataPackage into a CMmDataPackage
     // Non-core Methods from the SOS layer using the DOS layer will perforn

--- a/telephonyserverplugins/simatktsy/src/csatcctsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csatcctsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -21,18 +21,13 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csatcctsyTraces.h"
-#endif
-
 #include "etelsat.h"                // SAT specific Etel definitions
 #include "CSatDataPackage.h"        // Parameter packing 
 #include "CSatCCTsy.h"              // Class header
 #include "CSatTsy.h"                // SAT TSY general class
 #include "CSatNotificationsTsy.h"   // SAT TSY Notifications class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "msattsy_ipcdefs.h"		// Sat Tsy specific request types
 #include "TSatUtility.h"			// Utility class
 #include "TTlv.h"					// TTlv class
@@ -49,13 +44,13 @@
         CSatNotificationsTsy* aNotificationsTsy   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_NEWL_1, "CSAT: CSatCCTsy::NewL");
+    TFLOGSTRING("CSAT: CSatCCTsy::NewL");
     CSatCCTsy* const satCcTsy = new ( ELeave ) CSatCCTsy( aNotificationsTsy );
     CleanupStack::PushL( satCcTsy );
     satCcTsy->iSatTsy = aSatTsy;
     satCcTsy->ConstructL();
     CleanupStack::Pop( satCcTsy );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_NEWL_2, "CSAT: CSatCCTsy::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatCCTsy::NewL, end of method");
     return satCcTsy;
     }
 
@@ -69,7 +64,7 @@
         //None   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_DTOR_1, "CSAT: CSatCCTsy::~CSatCCTsy");
+    TFLOGSTRING("CSAT: CSatCCTsy::~CSatCCTsy");
     // Unregister.
     iSatTsy->MessageManager()->RegisterTsyObject(
 		CMmMessageManagerBase::ESatCCTsyObjType, NULL );
@@ -85,7 +80,7 @@
         //None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CONSTRUCTL_1, "CSAT: CSatCCTsy::ConstructL\n" );
+    TFLOGSTRING("CSAT: CSatCCTsy::ConstructL\n" );
     // Register.
     iSatTsy->MessageManager()->RegisterTsyObject(
 		CMmMessageManagerBase::ESatCCTsyObjType, this );
@@ -122,7 +117,7 @@
 		 TInt /*aResult*/
 		 )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_COMPLETEBEARERCAPABILITY_1, "CSAT: CSatCCTsy::CompleteBearerCapability");
+    TFLOGSTRING("CSAT: CSatCCTsy::CompleteBearerCapability");
     TPtrC8* bearerData = NULL;
 
     // Unpack parameters 
@@ -139,7 +134,7 @@
         CSatDataPackage* aDataPackage
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATEENVELOPEL_1, "CSAT: CSatCCTsy::CreateEnvelope");
+    TFLOGSTRING("CSAT: CSatCCTsy::CreateEnvelope");
     TCCInfo* ccInfo;
     
     // Unpack parameters
@@ -164,7 +159,8 @@
             }
         default:
             {
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATEENVELOPEL_2, "CSAT: CSatCCTsy::CreateEnvelope, Unidentified tag: %d", ccInfo->iTag );
+            TFLOGSTRING2("CSAT: CSatCCTsy::CreateEnvelope,\
+                Unidentified tag: %d", ccInfo->iTag );
             }
         }
     }
@@ -179,7 +175,7 @@
         CSatDataPackage* aDataPackage
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CHECKIFALPHAIDPRESENT_1, "CSAT: CSatCCTsy::CheckIfAlphaIdPresent");
+    TFLOGSTRING("CSAT: CSatCCTsy::CheckIfAlphaIdPresent"); 
     TDesC8* atkData;            
     RSat::TControlResult* result;
     
@@ -271,7 +267,8 @@
                         // can be made.
                         if ( 0 != alphaIdLength )
                             {
-                            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CHECKIFALPHAIDPRESENT_2, "CSAT: CSatCCTsy::CheckIfAlphaIdPresent. inform user.");
+                            TFLOGSTRING("CSAT: CSatCCTsy::CheckIfAlphaIdPresent.\
+                                inform user.");
 
                             TPtrC8 sourceString;
                             sourceString.Set( ( *atkData ).Mid( index + 
@@ -286,7 +283,8 @@
                             }
                         else
                             {
-                            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CHECKIFALPHAIDPRESENT_3, "CSAT: CSatCCTsy::CheckIfAlphaIdPresent. AlphaID length: 0.");
+                            TFLOGSTRING("CSAT: CSatCCTsy::CheckIfAlphaIdPresent.\
+                                AlphaID length: 0.");
                             }
 
                         // Update index
@@ -295,7 +293,8 @@
                         }
                     default:
                         {
-                        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CHECKIFALPHAIDPRESENT_4, "CSAT: CSatCCTsy::CheckIfAlphaIdPresent Unknown tag.");
+                        TFLOGSTRING("CSAT: CSatCCTsy::CheckIfAlphaIdPresent\
+                            Unknown tag.");
                         index = envLength;
                         break;
                         }
@@ -305,7 +304,8 @@
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CHECKIFALPHAIDPRESENT_5, "CSAT: CSatCCTsy::CheckIfAlphaIdPresent. Input data missing!");
+        TFLOGSTRING("CSAT: CSatCCTsy::CheckIfAlphaIdPresent. \
+            Input data missing!");
         }
     }
     
@@ -320,7 +320,7 @@
         CSatDataPackage* aDataPackage 
         )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_COMPLETECCEVENTL_1, "CSAT: CSatCCTsy::CompleteCCEventL, aIpc: %d", aIpc);
+    TFLOGSTRING2("CSAT: CSatCCTsy::CompleteCCEventL, aIpc: %d", aIpc);
     TCCInfo* ccInfo;
     
     // Unpack parameters
@@ -387,7 +387,7 @@
             }
         default:
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_COMPLETECCEVENTL_2, "CSAT: CSatCCTsy::CompleteCCEventL, Unknown event!");
+            TFLOGSTRING("CSAT: CSatCCTsy::CompleteCCEventL, Unknown event!");
             }
         }
     }   
@@ -404,7 +404,7 @@
         const TUint8 aTonNpi 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_SETTONNPIFORSS_1, "CSAT: CSatCCTsy::SetTonNpiForSS");
+    TFLOGSTRING("CSAT: CSatCCTsy::SetTonNpiForSS");
     iTonNpiForSS = aTonNpi;
     iTonNpiPresent = ETrue;
     }
@@ -419,7 +419,7 @@
     	CSatDataPackage* aDataPackage
     	)
     { 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_SETUSSDSTATUS_1, "CSAT: CSatCCTsy::SetUssdStatus." );
+    TFLOGSTRING("CSAT: CSatCCTsy::SetUssdStatus." );    
     // Unpack parameters 
     aDataPackage->UnPackData( iUssdTlvSupported ); 
     }  
@@ -436,12 +436,12 @@
         const TDesC8& aAddress 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_STOREADDRESSFORCC_1, "CSAT: CSatCCTsy::StoreAddressForCC");
+    TFLOGSTRING("CSAT: CSatCCTsy::StoreAddressForCC");
     
     if ( NULL == &aAddress )
         {
         iProactiveCommandAddress.Zero();
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_STOREADDRESSFORCC_2, "CSAT: CSatCCTsy::StoreAddressForCC, address cleared");
+        TFLOGSTRING("CSAT: CSatCCTsy::StoreAddressForCC, address cleared");
         }
     else
         {
@@ -456,7 +456,7 @@
                 iProactiveCommandAddress.Delete( 0, 1 );
                 }
             }
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_STOREADDRESSFORCC_3, "CSAT: CSatCCTsy::StoreAddressForCC, Address stored");
+        TFLOGSTRING("CSAT: CSatCCTsy::StoreAddressForCC, Address stored");
         }
     }     
        
@@ -470,7 +470,7 @@
 		const TCCInfo* aCCInfo
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATECALLENVELOPEL_1, "CSAT: CSatCCTsy::CreateCallEnvelopeL" );
+    TFLOGSTRING("CSAT: CSatCCTsy::CreateCallEnvelopeL" );
     // Create envelope
     TTlv envelope;
     envelope.Begin( KBerTlvCallControlTag );
@@ -527,7 +527,8 @@
             }
         else
         	{
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATECALLENVELOPEL_2, "CSAT: CSatCCTsy::CreateCallEnvelopeL, Bearer data length exceeded, data not added" );
+        	TFLOGSTRING("CSAT: CSatCCTsy::CreateCallEnvelopeL,\
+        	    Bearer data length exceeded, data not added" );
         	}
         }
 
@@ -561,7 +562,7 @@
 		const TCCInfo* aCCInfo
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATESSENVELOPEL_1, "CSAT: CSatCCTsy::CreateSSEnvelopeL" );
+    TFLOGSTRING("CSAT: CSatCCTsy::CreateSSEnvelopeL" );
     // There is no TON and NPI in SS cc request. Information is part of the 
     // number string: Spec ETSI TS 122 030 v5.0.0 says that if number starts
     // with +, TON is international and if it starts without it, it's unknown.
@@ -693,7 +694,7 @@
 		const TCCInfo* aCCInfo
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATEUSSDENVELOPEL_1, "CSAT: CSatCCTsy::CreateUSSDEnvelopeL" );
+    TFLOGSTRING("CSAT: CSatCCTsy::CreateUSSDEnvelopeL" );
     // Create USSD envelope
     TTlv envelope;
         
@@ -772,7 +773,7 @@
         const TDesC8& aUSSDString
         )
     {    
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_ISONLYDIGITSINUSSD_1, "CSAT: CSatCCTsy::IsOnlyDigitsInUssd." );
+    TFLOGSTRING("CSAT: CSatCCTsy::IsOnlyDigitsInUssd." );        
     // Unpack it
     TBuf8<KMaxUssdStringLengthInBytes> ussdString;
     TSatUtility::Packed7to8Unpacked( aUSSDString, ussdString );    
@@ -803,7 +804,7 @@
         const TDesC8& aAddress 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_HASPROACTIVEORIGIN_1, "CSAT: CSatCCTsy::HasProactiveOrigin");
+    TFLOGSTRING("CSAT: CSatCCTsy::HasProactiveOrigin");
     TBool match( EFalse );
     
     if ( aAddress.Length() )
@@ -814,20 +815,21 @@
             // It means we need to drop the first character out from comparison
             if ( iProactiveCommandAddress == aAddress.Mid( 1 ) )
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_HASPROACTIVEORIGIN_2, "CSAT: CSatCCTsy::HasProactiveOrigin, Match!");
+                TFLOGSTRING("CSAT: CSatCCTsy::HasProactiveOrigin, Match!");
                 match = ETrue;
                 }
             }
         // Otherwise we can use the whole string for checking
         else if ( iProactiveCommandAddress == aAddress )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_HASPROACTIVEORIGIN_3, "CSAT: CSatCCTsy::HasProactiveOrigin, Match!");
+            TFLOGSTRING("CSAT: CSatCCTsy::HasProactiveOrigin, Match!");
             match = ETrue;
             }
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_HASPROACTIVEORIGIN_4, "CSAT: CSatCCTsy::HasProactiveOrigin, Invalid input address");
+        TFLOGSTRING("CSAT: CSatCCTsy::HasProactiveOrigin, \
+            Invalid input address");
         }
         
     return match;

--- a/telephonyserverplugins/simatktsy/src/csatdatadownloadtsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csatdatadownloadtsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -19,12 +19,6 @@
 
 
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csatdatadownloadtsyTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include <etelmm.h> 				// Etel MM Definitions
 #include "CSatDataPackage.h"        // Parameter packing 
@@ -32,6 +26,7 @@
 #include "CSatTsy.h"                // Sat Tsy class
 #include "TSatUtility.h"            // Utilities
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "CBerTlv.h"                // Ber Tlv
 #include "TTlv.h"					// TTlv class
 #include "MSatTsy_IPCDefs.h"        // Sat Tsy internal request types
@@ -46,14 +41,14 @@
         CSatTsy* aSatTsy  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_NEWL_1,  "CSAT: CSatDataDownloadTsy::NewL" );
+    TFLOGSTRING( "CSAT: CSatDataDownloadTsy::NewL" );
     CSatDataDownloadTsy* const satDataDownloadTsy = 
         new ( ELeave ) CSatDataDownloadTsy();
     CleanupStack::PushL( satDataDownloadTsy );
     satDataDownloadTsy->iSatTsy = aSatTsy;
     satDataDownloadTsy->ConstructL();
     CleanupStack::Pop( satDataDownloadTsy );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_NEWL_2,  "CSAT: CSatDataDownloadTsy::NewL, end of method" );
+    TFLOGSTRING( "CSAT: CSatDataDownloadTsy::NewL, end of method" );
     return satDataDownloadTsy; 
     }
 
@@ -67,7 +62,7 @@
         void   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_DTOR_1,  "CSAT: CSatDataDownloadTsy::~CSatDataDownloadTsy" );
+    TFLOGSTRING( "CSAT: CSatDataDownloadTsy::~CSatDataDownloadTsy" );
     // Unregister
     iSatTsy->MessageManager()->RegisterTsyObject(
 		CMmMessageManagerBase::ESatDataDownloadTsyObjType, NULL );
@@ -96,7 +91,7 @@
         void
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CONSTRUCTL_1,  "CSAT: CSatDataDownloadTsy::ConstructL" );
+    TFLOGSTRING( "CSAT: CSatDataDownloadTsy::ConstructL" );
     // Register
     iSatTsy->MessageManager()->RegisterTsyObject(
 		CMmMessageManagerBase::ESatDataDownloadTsyObjType, this );
@@ -115,7 +110,7 @@
          const CSatDataPackage* aDataPackage
          )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_COMPLETECELLBROADCASTDDLL_1,  "CSAT:CSatDataDownloadTsy::CompleteCellBroadcastDdlL" );
+    TFLOGSTRING( "CSAT:CSatDataDownloadTsy::CompleteCellBroadcastDdlL" );
 
     TBuf8<KCbsMsgMaxLength> aPdu;
     aDataPackage->UnPackData( aPdu );     
@@ -157,7 +152,7 @@
         const CSatDataPackage* aDataPackage
         )
     {  
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_COMPLETESMSPPDDLL_1,  "CSAT:CSatDataDownloadTsy::CompleteSmsPpDdlL" );
+    TFLOGSTRING( "CSAT:CSatDataDownloadTsy::CompleteSmsPpDdlL" );
     TBuf8<KAddrMaxLength> smsScAddress;
     TBuf8<RMobileSmsMessaging::KGsmTpduSize> smsTpdu;
     
@@ -177,7 +172,8 @@
              KSmsTpduProtcolIdUSimDdl == iSmsTpdu.iProtocolId && 
             ( !( iSmsTpdu.iDcs & 0x01 ) ) && ( iSmsTpdu.iDcs & 0x02 ) )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_COMPLETESMSPPDDLL_2,  "CSAT:CSatDataDownloadTsy::CompleteSmsPpDdlL, SMS PP DDL is not supported, Store SMS to EFsms" );
+            TFLOGSTRING( "CSAT:CSatDataDownloadTsy::CompleteSmsPpDdlL,\
+                SMS PP DDL is not supported, Store SMS to EFsms" ); 
             CreateEntryForSavingSmsL( smsScAddress, smsTpdu );
             }
         }
@@ -195,7 +191,8 @@
         const TDesC8& aSmsTpdu
         )
     {  
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CREATEENTRYFORSAVINGSMSL_1,  "CSAT:CSatDataDownloadTsy::CreateEntryForSavingSms SC Addr. length: %d", aSmsScAddress.Length() );
+    TFLOGSTRING2( "CSAT:CSatDataDownloadTsy::CreateEntryForSavingSms\
+        SC Addr. length: %d", aSmsScAddress.Length() );
     TInt offset = 0;
     
     // Check that the SC address length contains the length in
@@ -231,7 +228,8 @@
         // Copy the Service Centre address and TPDU data
         smsEntry.iServiceCentre.iTelNumber.Copy( scAddress16 );
                 
-        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CREATEENTRYFORSAVINGSMSL_2, "CSAT:CSatDataDownloadTsy::CreateEntryForSavingSms, iTelNumber: %S", smsEntry.iServiceCentre.iTelNumber );
+        TFLOGSTRING2("CSAT:CSatDataDownloadTsy::CreateEntryForSavingSms,\
+            iTelNumber: %S", &smsEntry.iServiceCentre.iTelNumber );
             
         smsEntry.iMsgData.Copy( aSmsTpdu ); 
         
@@ -262,7 +260,7 @@
         TInt aResult
         )  
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CREATESMSDELIVERREPORTL_1, "CSAT: CSatDataDownloadTsy::CreateSmsDeliverReportL");
+    TFLOGSTRING("CSAT: CSatDataDownloadTsy::CreateSmsDeliverReportL");
     TBuf8<KTpduMaxSize> reportData;
        
     // Get User Data length
@@ -271,7 +269,8 @@
     // Check that SMS TPDU data exists by checking the last mandatory item
     if ( KSmsTpduByteUnknownOrReserved != iSmsTpdu.iDcs )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CREATESMSDELIVERREPORTL_2, "CSAT: CSatDataDownloadTsy::CreateSmsDeliverReportL, SMS TPDU OK");
+        TFLOGSTRING("CSAT: CSatDataDownloadTsy::CreateSmsDeliverReportL,\
+            SMS TPDU OK");
         reportData.Zero();
         reportData.Append( iSmsTpdu.iParameters );   // 1st byte -> parameters
         reportData.Append( KAllOptParamsPresent );   // TP-Parameter-Indicator
@@ -290,7 +289,8 @@
         // Cause must be inserted after the parameters
         if ( KErrNone != aResult )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CREATESMSDELIVERREPORTL_3, "CSAT: CSatDataDownloadTsy::CreateSmsDeliverReportL, Add TP Failure Cause: KDataDownloadError");
+            TFLOGSTRING("CSAT: CSatDataDownloadTsy::CreateSmsDeliverReportL,\
+                Add TP Failure Cause: KDataDownloadError");
             TBuf8<1> failureCause;
             failureCause.Zero();
             failureCause.Append( KDataDownloadError );
@@ -319,11 +319,12 @@
         const TDesC8& aSmsTpdu
         )
     {  
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CREATESMSPPDDLENVELOPEL_1,  "CSAT:CSatDataDownloadTsy::CreateSmsPpDdlEnvelopeL" );
+    TFLOGSTRING( "CSAT:CSatDataDownloadTsy::CreateSmsPpDdlEnvelopeL" );
     // Check that the data exists
     if ( aSmsScAddress.Length() && aSmsTpdu.Length() )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CREATESMSPPDDLENVELOPEL_2,  "CSAT:CSatDataDownloadTsy::CreateSmsPpDdlEnvelopeL, Data Ok" );
+        TFLOGSTRING( "CSAT:CSatDataDownloadTsy::CreateSmsPpDdlEnvelopeL,\
+            Data Ok" );
         TTlv envelope;
  
         envelope.Begin( KBerTlvSmsPpDownloadTag );
@@ -356,7 +357,7 @@
         void 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_COMPLETEREADCBMIDSL_1,  "CSAT: CSatDataDownloadTsy::CompleteReadCbmids" );
+    TFLOGSTRING( "CSAT: CSatDataDownloadTsy::CompleteReadCbmids" );
     // Convert constants and append to simFilePath
     TBuf8<KMaxFilePath> simFilePath;
     // Append data
@@ -389,7 +390,8 @@
         )
     {
     aDataPackage->UnPackData( iIsSmsPpDdlSupported );   
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_SETSMSPPDDLSTATUS_1, "CSAT: CSatNotifyMoSmControlRequest::SetActivationStatus, %d",iIsSmsPpDdlSupported );
+    TFLOGSTRING2("CSAT: CSatNotifyMoSmControlRequest::SetActivationStatus, %d",
+    	iIsSmsPpDdlSupported );     
     }  
     
 // -----------------------------------------------------------------------------
@@ -402,7 +404,7 @@
         const TDesC8& aSmsTpdu
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_PARSESMSTPDU_1, "CSAT: CSatDataDownloadTsy::ParseSmsTpdu");
+    TFLOGSTRING("CSAT: CSatDataDownloadTsy::ParseSmsTpdu");
     TInt ret( KErrCorrupt );
     
     // Initialize values
@@ -437,7 +439,8 @@
         // Just to be on the safe side, check that the offset is not too big
         if ( aSmsTpdu.Length() > ( offset + 1 + KSmsTpduSctsLength ) )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_PARSESMSTPDU_2,  "CSAT:CSatDataDownloadTsy::ParseSmsTpdu, SmsTpdu length Ok" );
+            TFLOGSTRING( "CSAT:CSatDataDownloadTsy::ParseSmsTpdu,\
+                SmsTpdu length Ok" );
             // Set protocol id and data coding shceme
             iSmsTpdu.iProtocolId = aSmsTpdu[offset];
             iSmsTpdu.iDcs = aSmsTpdu[++offset] ;
@@ -450,7 +453,8 @@
             if ( tpduUserDataLength )
                 {
                 iSmsTpdu.iUserData.Copy( aSmsTpdu.Mid( ++offset ) );
-                OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_PARSESMSTPDU_3,  "CSAT:CSatDataDownloadTsy::ParseSmsTpdu, iUserData length: %d", iSmsTpdu.iUserData.Length() );
+                TFLOGSTRING2( "CSAT:CSatDataDownloadTsy::ParseSmsTpdu,\
+                    iUserData length: %d", iSmsTpdu.iUserData.Length() );
                 }
 
             ret = KErrNone;

--- a/telephonyserverplugins/simatktsy/src/csateventdownloadtsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csateventdownloadtsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -19,17 +19,12 @@
 
 
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csateventdownloadtsyTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatDataPackage.h"        // Parameter packing 
 #include "CSatEventDownloadTsy.h"   // Class header
 #include "CSatTsy.h"                // Sat Tsy class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "CBerTlv.h"                // Ber Tlv
 #include "TTlv.h"					// TTlv class
 #include "MSatTsy_IPCDefs.h"        // Sat Tsy internal request types
@@ -45,14 +40,14 @@
         CSatTsy* aSatTsy  
         )
     { 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_NEWL_1,  "CSAT: CSatEventDownloadTsy::NewL" );
+    TFLOGSTRING( "CSAT: CSatEventDownloadTsy::NewL" );
     CSatEventDownloadTsy* const satEventDownloadTsy = 
         new ( ELeave ) CSatEventDownloadTsy();
     CleanupStack::PushL( satEventDownloadTsy );
     satEventDownloadTsy->iSatTsy = aSatTsy;
     satEventDownloadTsy->ConstructL();
     CleanupStack::Pop( satEventDownloadTsy );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_NEWL_2,  "CSAT: CSatEventDownloadTsy::NewL, end of method" );
+    TFLOGSTRING( "CSAT: CSatEventDownloadTsy::NewL, end of method" );
     return satEventDownloadTsy;
     }
 
@@ -66,7 +61,7 @@
         void   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_DTOR_1,  "CSAT: CSatEventDownloadTsy::~CSatEventDownloadTsy" );
+    TFLOGSTRING( "CSAT: CSatEventDownloadTsy::~CSatEventDownloadTsy" );
     // Unregister.
     iSatTsy->MessageManager()->RegisterTsyObject(
 		CMmMessageManagerBase::ESatEventDownloadTsyObjType, NULL );
@@ -82,7 +77,7 @@
         void
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CTOR_1,  "CSAT: CSatEventDownloadTsy::CSatEventDownloadTsy" );
+    TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CSatEventDownloadTsy" );
     }
 
 // -----------------------------------------------------------------------------
@@ -95,7 +90,7 @@
         void
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CONSTRUCTL_1,  "CSAT: CSatEventDownloadTsy::ConstructL" );
+    TFLOGSTRING( "CSAT: CSatEventDownloadTsy::ConstructL" );
     // Register .
     iSatTsy->MessageManager()->RegisterTsyObject(
 		CMmMessageManagerBase::ESatEventDownloadTsyObjType, this );
@@ -115,7 +110,8 @@
         const TDataPackage& aPackage 
         )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_DOEXTFUNCL_1,  "CSAT: CSatEventDownloadTsy::DoExtFuncL. Handle:%d", aTsyReqHandle );
+    TFLOGSTRING2( "CSAT: CSatEventDownloadTsy::DoExtFuncL\
+        . Handle:%d", aTsyReqHandle );
 
     TInt ret ( KErrNotSupported );
 
@@ -186,7 +182,7 @@
             default:
                 {
                 ret = KErrNotSupported;
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_DOEXTFUNCL_2,  "CSAT: CSatEventDownloadTsy::DoExtFuncL, not supported" );
+                TFLOGSTRING( "CSAT: CSatEventDownloadTsy::DoExtFuncL, not supported" );
                 break;
                 }
             } // End switch  
@@ -209,7 +205,7 @@
         TUint32 aEvents        // Bit mask of enabled events
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_SETUPEVENTLIST_1,  "CSAT: CSatEventDownloadTsy::SetUpEventList" );
+    TFLOGSTRING( "CSAT: CSatEventDownloadTsy::SetUpEventList" );
     iEventList.SetEventList( aEvents );
         
     // Force sending of envelope at least once, if location status event set
@@ -234,7 +230,7 @@
         const TBool aStatus // SetUpCall status
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_SETSETUPCALLSTATUS_1,  "CSAT: CSatEventDownloadTsy::SetSetUpCallStatus" );
+    TFLOGSTRING( "CSAT: CSatEventDownloadTsy::SetSetUpCallStatus" );
     iSetUpCallOngoing = aStatus;
     }
 
@@ -250,7 +246,7 @@
         const TTsyReqHandle /*aTsyReqHandle*/
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CANCELSERVICE_1,  "CSAT: CSatEventDownloadTsy::CancelService" );
+    TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CancelService" );
     // Since event download is served at once, there's anything to do here
     return KErrNone;
     }
@@ -266,7 +262,7 @@
         const CSatDataPackage* aDataPackage
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_1,  "CSAT: CSatEventDownloadTsy::CompleteMTCallL" );
+    TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteMTCallL" );    
     TInt ret( KErrNone );
 
     if ( iEventList.IsEnabled( RSat::KMTCall ) )
@@ -308,12 +304,14 @@
                 }
             else
             	{
-            	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_2,  "CSAT: CSatEventDownloadTsy::CompleteMTCallL, Dialling number missing" );
+            	TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteMTCallL,\
+            	    Dialling number missing" );
             	}
             }            
 		else
         	{	
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_3,  "CSAT: CSatEventDownloadTsy::CompleteMTCallL, TON and NPI missing" );
+        	TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteMTCallL,\
+            	TON and NPI missing" );
         	}
         	
         // If subaddress present
@@ -325,7 +323,8 @@
             }
         else
         	{
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_4,  "CSAT: CSatEventDownloadTsy::CompleteMTCallL, Subaddress missing" );
+        	TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteMTCallL,\
+            	Subaddress missing" );
         	}
 
         // Prepare data
@@ -339,7 +338,8 @@
         }
 	else
     	{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_5,  "CSAT: CSatEventDownloadTsy::CompleteMTCallL Event not enabled" );
+        TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteMTCallL\
+            Event not enabled" );
         }
 
     return ret;
@@ -355,7 +355,7 @@
         const CSatDataPackage* aDataPackage
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETECALLCONNECTEDL_1,  "CSAT: CSatEventDownloadTsy::CompleteCallConnectedL" );
+    TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteCallConnectedL" );    
     TInt ret = KErrNone;
     
     if ( iEventList.IsEnabled( RSat::KCallConnected ) )
@@ -364,7 +364,8 @@
 	    TBool nearEnd;
 	    aDataPackage->UnPackData( cmdNumber, nearEnd );
 	    
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETECALLCONNECTEDL_2,  "CSAT: CSatEventDownloadTsy::CompleteCallConnectedL ( cmdNumber=%d )", ( TInt )cmdNumber );
+	    TFLOGSTRING2( "CSAT: CSatEventDownloadTsy::CompleteCallConnectedL \
+	        ( cmdNumber=%d )", ( TInt )cmdNumber ); 
 	               
         // Create envelope
         TTlv envelope;
@@ -401,7 +402,8 @@
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETECALLCONNECTEDL_3,  "CSAT: CSatEventDownloadTsy::CompleteCallConnectedL, Event not enabled" );
+        TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteCallConnectedL,\
+            Event not enabled" );
         }
     return ret;
     }
@@ -416,7 +418,7 @@
         const CSatDataPackage* aDataPackage
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_1,  "CSAT: CSatEventDownloadTsy::CompleteCallDisconnectedL" );
+    TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteCallDisconnectedL" );
     TInt ret = KErrNone;
 
     if ( iEventList.IsEnabled( RSat::KCallDisconnected ) )
@@ -429,7 +431,8 @@
     	TBool nearEnd = callDisconnectedEnvelope->iNearEnd;
     	TBool causeGiven = callDisconnectedEnvelope->iCauseGiven;
     	const TDesC8& cause = callDisconnectedEnvelope->iCause; 
-    	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_2,  "CSAT: CSatEventDownloadTsy::CompleteCallDisconnectedL ( cmdNumber=%d )", ( TInt )cmdNumber );
+    	TFLOGSTRING2( "CSAT: CSatEventDownloadTsy::CompleteCallDisconnectedL \
+        	( cmdNumber=%d )", ( TInt )cmdNumber );    	       
         // Create envelope
         TTlv envelope;
         envelope.Begin  ( KBerTlvEventDownloadTag );
@@ -451,7 +454,8 @@
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_3,  "CSAT: CSatEventDownloadTsy::CompleteCallDisconnectedL, cause not given" );
+            TFLOGSTRING( "CSAT: CSatEventDownloadTsy::\
+                CompleteCallDisconnectedL, cause not given" );
             }
         // Prepare data
         TPtrC8 data = envelope.End();
@@ -464,7 +468,8 @@
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_4,  "CSAT: CSatEventDownloadTsy::CompleteCallDisconnectedL, Event not enabled" );
+        TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteCallDisconnectedL,\
+            Event not enabled" );
         }
     return ret;
     }
@@ -480,7 +485,7 @@
         const CSatDataPackage* aDataPackage
         )
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_1,  "CSAT: CSatEventDownloadTsy::CompleteLocationStatusL" );
+	TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteLocationStatusL" );	       	
     TInt ret( KErrNone );
 
     if ( iEventList.IsEnabled( RSat::KLocationStatus ) )
@@ -495,7 +500,8 @@
 	    TUint16 locationAreaCode = locationStatusEnvelope->iLocationAreaCode;
 	    TUint16 cellId = locationStatusEnvelope->iCellId;
 
-	    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_2,  "CSAT: CSatEventDownloadTsy::CompleteLocationStatusL ( locationStatus=%d )", ( TInt )locationStatus );
+	    TFLOGSTRING2( "CSAT: CSatEventDownloadTsy::CompleteLocationStatusL \
+	        ( locationStatus=%d )", ( TInt )locationStatus );
                 
         // Send location status envelope only if there
         // have been changes or we're sending first
@@ -506,7 +512,8 @@
              ( iCellId != cellId ) || 
              iForceLocationStatusEnvelope ) 
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_3,  "CSAT: CSatEventDownload::CompleteLocationStatusEnvelopeL, -- saving" );
+            TFLOGSTRING( "CSAT: CSatEventDownload::\
+                CompleteLocationStatusEnvelopeL, -- saving" );
 
             // Cache values
             iLocationStatus = locationStatus;
@@ -532,7 +539,8 @@
             // normal service
             if ( KLocationStatusNormalService == locationStatus )
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_4,  "CSAT: CSatEventDownload::CompleteLocationStatusEnvelopeL -- sending" );
+                TFLOGSTRING( "CSAT: CSatEventDownload::CompleteLocationStatusEnvelopeL\
+                    -- sending" );
                 envelope.AddTag ( KTlvLocationInformationTag );
                 envelope.AddData( operatorCode );        
                 // Mobile country & network codes
@@ -565,7 +573,8 @@
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_5,  "CSAT: CSatEventDownloadTsy::CompleteLocationStatusEnvelopeL, Event not enabled" );
+        TFLOGSTRING( "CSAT: CSatEventDownloadTsy::\
+            CompleteLocationStatusEnvelopeL, Event not enabled" );
         }             
 
     return ret;
@@ -581,7 +590,8 @@
 		const CSatDataPackage* aDataPackage
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETEACCESSTECHNOLOGYCHANGEL_1,  "CSAT: CSatEventDownloadTsy::CompleteAccessTechnologyChangeEnvelopeL" );
+    TFLOGSTRING( "CSAT: CSatEventDownloadTsy::\
+    		CompleteAccessTechnologyChangeEnvelopeL" );
     TInt ret( KErrNone );
 
     if ( iEventList.IsEnabled( RSat::KAccessTechnologyChange ) )
@@ -616,7 +626,8 @@
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETEACCESSTECHNOLOGYCHANGEL_2,  "CSAT: CSatEventDownloadTsy::CompleteAccessTechnologyChangeL, Event not enabled" );
+        TFLOGSTRING( "CSAT: CSatEventDownloadTsy::\
+            CompleteAccessTechnologyChangeL, Event not enabled" );
         }        
 
     return ret;
@@ -631,7 +642,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEUSERACTIVITYENVELOPEL_1,  "CSAT: CSatEventDownloadTsy::CreateUserActivityEnvelopeL" );
+    TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CreateUserActivityEnvelopeL" );
     TInt ret = KErrNone;
     if ( iEventList.IsEnabled( RSat::KUserActivity ) )
         {
@@ -659,7 +670,8 @@
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEUSERACTIVITYENVELOPEL_2,  "CSAT: CSatEventDownloadTsy::CreateUserActivityEnvelopeL, Event not enabled" );
+        TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CreateUserActivityEnvelopeL,\
+            Event not enabled" );
         }
     return ret;
     }
@@ -674,7 +686,8 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEIDLESCREENAVAILABLEENVELOPEL_1, "CSAT: CSatEventDownloadTsy::CreateIdleScreenAvailableEnvelopeL");
+    TFLOGSTRING("CSAT: CSatEventDownloadTsy::\
+        CreateIdleScreenAvailableEnvelopeL");
     TInt ret = KErrNone;
 
     if ( iEventList.IsEnabled( RSat::KIdleScreenAvailable ) )
@@ -705,12 +718,14 @@
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEIDLESCREENAVAILABLEENVELOPEL_2, "CSAT: CSatEventDownloadTsy::CreateIdleScreenAvailableEnvelopeL, Error in forwarding req.");
+            TFLOGSTRING("CSAT: CSatEventDownloadTsy::\
+                CreateIdleScreenAvailableEnvelopeL, Error in forwarding req.");
             }
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEIDLESCREENAVAILABLEENVELOPEL_3,  "CSAT: CSatEventDownloadTsy::CreateIdleScreenAvailableEnvelopeL, Event not enabled" );
+        TFLOGSTRING( "CSAT: CSatEventDownloadTsy::\
+            CreateIdleScreenAvailableEnvelopeL, Event not enabled" );
         }
     return ret;
     }
@@ -725,7 +740,8 @@
         const RSat::TBrowserTerminationCause aCause
         )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEBROWSERTERMINATIONENVELOPEL_1,  "CSAT: CSatEventDownloadTsy::CreateBrowserTerminationEnvelopeL, ( cause=%d )",( TInt )aCause );
+    TFLOGSTRING2( "CSAT: CSatEventDownloadTsy::\
+        CreateBrowserTerminationEnvelopeL, ( cause=%d )",( TInt )aCause );
 
     TInt ret = KErrNone;
 
@@ -757,7 +773,8 @@
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEBROWSERTERMINATIONENVELOPEL_2,  "CSAT: CSatEventDownloadTsy::CreateBrowserTerminationEnvelopeL, Event not enabled" );
+        TFLOGSTRING( "CSAT: CSatEventDownloadTsy::\
+            CreateBrowserTerminationEnvelopeL, Event not enabled" );
         }
 
     return ret;
@@ -774,7 +791,8 @@
         const TUint16 aLanguage
         )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATELANGUAGESELECTIONENVELOPEL_1,  "CSAT: CSatEventDownloadTsy::CreateLanguageSelectionEnvelopeL, (language=%d)", ( TInt )aLanguage );
+    TFLOGSTRING2( "CSAT: CSatEventDownloadTsy::\
+        CreateLanguageSelectionEnvelopeL, (language=%d)", ( TInt )aLanguage );
     
     TInt ret = KErrNone;
 
@@ -806,7 +824,8 @@
         }
     else
     	{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATELANGUAGESELECTIONENVELOPEL_2,  "CSAT: CSatEventDownloadTsy::CreateLanguageSelectionEnvelopeL, Event not enabled" );
+        TFLOGSTRING( "CSAT: CSatEventDownloadTsy::\
+            CreateLanguageSelectionEnvelopeL, Event not enabled" );	
     	}
     return ret;
     }
@@ -822,7 +841,7 @@
 		const TInt8 aLength    
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEDATAAVAILABLEENVELOPEL_1, "CSAT: CSatEventDownload::CreateDataAvailableEnvelopeL");
+    TFLOGSTRING("CSAT: CSatEventDownload::CreateDataAvailableEnvelopeL");
 
     TInt ret = KErrNone;
 
@@ -855,7 +874,8 @@
         }
     else
     	{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEDATAAVAILABLEENVELOPEL_2,  "CSAT: CSatEventDownloadTsy::CreateDataAvailableEnvelopeL Event not enabled" );
+        TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CreateDataAvailableEnvelopeL\
+            Event not enabled" );	
     	}
     return ret;
     }
@@ -870,7 +890,7 @@
         const RSat::TChannelStatus aStatus
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATECHANNELSTATUSENVELOPEL_1, "CSAT: CSatEventDownloadTsy::CreateChannelStatusEnvelopeL");
+    TFLOGSTRING("CSAT: CSatEventDownloadTsy::CreateChannelStatusEnvelopeL");
     
     TInt ret( KErrNone );
 
@@ -900,7 +920,8 @@
         }
     else
     	{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATECHANNELSTATUSENVELOPEL_2,  "CSAT: CSatEventDownloadTsy::CreateChannelStatusEnvelopeL Event not enabled" );
+        TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CreateChannelStatusEnvelopeL\
+            Event not enabled" );	
     	}        
 
     return ret;

--- a/telephonyserverplugins/simatktsy/src/csaticontsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csaticontsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -20,15 +20,10 @@
 
 
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csaticontsyTraces.h"
-#endif
-
 #include <satcs.h>					// ETel Ipcs
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
 //#include <TSatIconInfo.h>           // For icon color coding
+#include "TfLogger.h"              // For TFLOGSTRING
 
 #include "CSatDataPackage.h"        // Parameter packing 
 #include "CSatIconTsy.h"            // Class header
@@ -48,13 +43,13 @@
         CSatTsy* aSatTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_NEWL_1, "CSAT: CSatIconTsy::NewL");
+    TFLOGSTRING("CSAT: CSatIconTsy::NewL");
     CSatIconTsy* const satIconTsy = new ( ELeave ) CSatIconTsy();
     CleanupStack::PushL( satIconTsy );
     satIconTsy->iSatTsy = aSatTsy;
     satIconTsy->ConstructL();
     CleanupStack::Pop( satIconTsy );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_NEWL_2, "CSAT: CSatIconTsy::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatIconTsy::NewL, end of method");
     return satIconTsy;
     }
 
@@ -69,7 +64,7 @@
         void   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_DTOR_1, "CSAT: CSatIconTsy::~CSatIconTsy");
+    TFLOGSTRING("CSAT: CSatIconTsy::~CSatIconTsy");
     // Unregister.
     iSatTsy->MessageManager()->RegisterTsyObject(
 		CMmMessageManagerBase::ESatIconTsyObjType, NULL );
@@ -85,7 +80,7 @@
         void
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_CONSTRUCTL_1, "CSAT: CSatIconTsy::ConstructL\n" );
+    TFLOGSTRING("CSAT: CSatIconTsy::ConstructL\n" );
     iIconReqTypeOngoing = ERequestTypeUnknown;
     // Register.
     iSatTsy->MessageManager()->RegisterTsyObject(
@@ -122,7 +117,8 @@
         )
     {
 
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_DOEXTFUNCL_1, "CSAT: CSatIconTsy::DoExtFuncL.\n  \t\t\t IPC:%d\n  \t\t\t Handle:%d", aIpc, aTsyReqHandle);
+    TFLOGSTRING3("CSAT: CSatIconTsy::DoExtFuncL.\n  \t\t\t IPC:%d\n  \
+        \t\t\t Handle:%d", aIpc, aTsyReqHandle);
 
 	TInt ret( KErrNone );
 
@@ -153,7 +149,8 @@
             }
         default:
             {
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_DOEXTFUNCL_2, "CSAT: CSatIconTsy::DoExtFuncL unsupported IPC %d",aIpc);
+            TFLOGSTRING2("CSAT: CSatIconTsy::DoExtFuncL unsupported IPC %d",
+                 aIpc);
             break;
             }
         }
@@ -173,7 +170,7 @@
 		TInt aResult                   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETICON_1, "CSAT: CSatIconTsy::CompleteGetIcon");
+    TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetIcon");
     TPtrC8* icon = NULL;
     TInt iconLength = 0; 
 
@@ -190,24 +187,28 @@
         {
         if ( KErrNone == aResult && iconLength )
             {
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETICON_2, "CSAT: CSatIconTsy::CompleteGetIcon, Icon data length: %d", iconLength);
+            TFLOGSTRING2("CSAT: CSatIconTsy::CompleteGetIcon,\
+                Icon data length: %d", iconLength);
             // Check the size...
             if ( iIconData->MaxLength() >= iconLength )
                 {      
                 iIconData->Copy( icon->Ptr(), iconLength );
-                OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETICON_3, "CSAT: CSatIconTsy::CompleteGetIcon, iIconData length: %d", iIconData->Length() );
+                TFLOGSTRING2("CSAT: CSatIconTsy::CompleteGetIcon,\
+                    iIconData length: %d", iIconData->Length() );             
                 iRecordData.Copy( *iIconData );  
                 }
             else  // Data is too big for client's buffer
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETICON_4, "CSAT: CSatIconTsy::CompleteGetIcon, Icon data length exceeded");
+                TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetIcon,\
+                    Icon data length exceeded");
                 aResult = KErrOverflow;
                 iIconData->Zero();
                 }
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETICON_5, "CSAT: CSatIconTsy::CompleteGetIcon, Error occured in LSAT, or Icon length is 0");
+            TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetIcon,\
+                Error occured in LSAT, or Icon length is 0");
             // Reset the length
             iIconData->Zero();
             }
@@ -228,7 +229,7 @@
 		TInt aResult                   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETIMAGEINSTANCE_1, "CSAT: CSatIconTsy::CompleteGetImageInstance");
+    TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetImageInstance");
     TPtrC8* icon = NULL;
     TDes8* info;
 
@@ -249,7 +250,8 @@
             // Check the size....
             if ( iIconData->MaxLength() >= iconLength )
                 {
-                OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETIMAGEINSTANCE_2, "CSAT: CSatIconTsy::CompleteGetImageInstance, Icon length: %d", iconLength);
+                TFLOGSTRING2("CSAT: CSatIconTsy::CompleteGetImageInstance,\
+                    Icon length: %d", iconLength);
                 // Icon body
                 if( info->Length() == KIconInfoLength )
                     {
@@ -260,7 +262,8 @@
                     // between the color and b&w icons
                     if ( RSat::KBasic == colorCoding )
                         {
-                        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETIMAGEINSTANCE_3, "CSAT: CSatIconTsy::CompleteGetImageInstance,B&W");
+                        TFLOGSTRING("CSAT: CSatIconTsy::\
+                            CompleteGetImageInstance,B&W");
                         iIconData->Copy( ( *info ).Mid( 0, 2) );
                         }
                     else
@@ -278,14 +281,16 @@
                 }
             else // Data is too big for client's buffer
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETIMAGEINSTANCE_4, "CSAT: CSatIconTsy::CompleteGetImageInstance, Icon length exceeded");
+                TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetImageInstance,\
+                    Icon length exceeded");
                 aResult = KErrOverflow;
                 iIconData->Zero();
                 }
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETIMAGEINSTANCE_5, "CSAT: CSatIconTsy::CompleteGetImageInstance, Error occured in LSAT or Icon length is 0");
+            TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetImageInstance,\
+                Error occured in LSAT or Icon length is 0");
             // Reset the length
             iIconData->Zero();
             }
@@ -308,7 +313,7 @@
 		TInt aResult                   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETCLUT_1, "CSAT: CSatIconTsy::CompleteGetClut");
+    TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetClut");
     TPtrC8* clut = NULL;
 
 	// Unpack parameters 
@@ -330,14 +335,16 @@
                 }
             else // Data is too big for client's buffer
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETCLUT_2, "CSAT: CSatIconTsy::CompleteGetClut, Clut length exceeded");
+                TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetClut,\
+                    Clut length exceeded");
                 aResult = KErrOverflow;
                 iIconData->Zero();
                 }
             }
         else
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETCLUT_3, "CSAT: CSatIconTsy::CompleteGetClut, Error occured in LSAT or Icon length is 0");
+            TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetClut,\
+                Error occured in LSAT or Icon length is 0");
             // Reset the length
             iIconData->Zero();
             }
@@ -362,7 +369,7 @@
         RSat::TIcon* aIconEf              
         )   
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_GETICONL_1, "CSAT: CSatIconTsy::GetIconL");
+    TFLOGSTRING("CSAT: CSatIconTsy::GetIconL");
 	TInt ret = KErrNone;
 	
 	iImageInstanceNoInRecord = 0;
@@ -374,7 +381,7 @@
     // In case the request was ongoing, complete right away..
     if ( CSatTsy::ESatReqHandleUnknown != reqHandle )
     	{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_GETICONL_2, "CSAT: CSatIcon::GetIconL, KErrServerBusy");
+        TFLOGSTRING("CSAT: CSatIcon::GetIconL, KErrServerBusy");
     	iSatTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy);
         }
     else
@@ -441,7 +448,7 @@
         TDes8* aInstance                 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_GETIMAGEINSTANCEL_1, "CSAT: CSatIconTsy::GetImageInstanceL");
+    TFLOGSTRING("CSAT: CSatIconTsy::GetImageInstanceL");
     TInt ret = KErrNone;
 	
     // Get possibly existing request handle
@@ -451,7 +458,7 @@
     // In case the request was ongoing, complete right away..
     if ( CSatTsy::ESatReqHandleUnknown != reqHandle )
     	{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_GETIMAGEINSTANCEL_2, "CSAT: CSatIcon::GetImageInstanceL, KErrServerBusy");
+        TFLOGSTRING("CSAT: CSatIcon::GetImageInstanceL, KErrServerBusy");
     	iSatTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy);
         }
     else
@@ -527,7 +534,7 @@
         TDes8* aClut                        
         )   
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_GETCLUTL_1, "CSAT: CSatIconTsy::GetClutL");
+    TFLOGSTRING("CSAT: CSatIconTsy::GetClutL");
     TInt ret = KErrNone;
 	
     // Get possibly existing request handle
@@ -537,7 +544,7 @@
     // In case the request was ongoing, complete right away..
     if ( CSatTsy::ESatReqHandleUnknown != reqHandle )
     	{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_GETCLUTL_2, "CSAT: CSatIcon::GetClutL : KErrServerBusy");
+        TFLOGSTRING("CSAT: CSatIcon::GetClutL : KErrServerBusy");
     	iSatTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy);
         }
     else

--- a/telephonyserverplugins/simatktsy/src/csatmessagerouterproxy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csatmessagerouterproxy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -20,12 +20,6 @@
 
 
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csatmessagerouterproxyTraces.h"
-#endif
-
 #include <satcs.h>
 // Tsy module files
 #include "CSatDataPackage.h"
@@ -61,6 +55,7 @@
 #include "CSatEventDownloadTsy.h"
 #include "CSatDataDownloadTsy.h"
 // Utilities
+#include "tflogger.h"
 #include "msattsy_ipcdefs.h"
 #include "ctsydelegates.h"
 
@@ -99,7 +94,7 @@
 //
 CSatMessageRouterProxy* CSatMessageRouterProxy::NewL(CTsyDelegates& aTsyDelegates) 
     { 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_NEWL_1,  "CSAT: CSatMessageRouterProxy::NewL" );
+    TFLOGSTRING( "CSAT: CSatMessageRouterProxy::NewL" );
     
     CSatMessageRouterProxy* satMessageRouterProxy = 
         new ( ELeave ) CSatMessageRouterProxy(aTsyDelegates);
@@ -107,7 +102,7 @@
     satMessageRouterProxy->ConstructL();
     CleanupStack::Pop();
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_NEWL_2, "CSAT: CSatMessageRouterProxy::NewL, end of method");
+	TFLOGSTRING("CSAT: CSatMessageRouterProxy::NewL, end of method");
     return satMessageRouterProxy;
     }
 
@@ -121,7 +116,7 @@
         void
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_DTOR_1,  "CSAT: CSatMessageRouterProxy::~CSatMessageRouterProxy" );
+    TFLOGSTRING( "CSAT: CSatMessageRouterProxy::~CSatMessageRouterProxy" );
     }
 
 // -----------------------------------------------------------------------------
@@ -145,7 +140,7 @@
         void
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_CONSTRUCTL_1,  "CSAT: CSatMessageRouterProxy::ConstructL, noes nothing" );
+    TFLOGSTRING( "CSAT: CSatMessageRouterProxy::ConstructL, noes nothing" );
     }
     
 // -----------------------------------------------------------------------------
@@ -159,7 +154,7 @@
 		)
 	{
 	// Dummy implementation
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_ROUTEREQUEST_1,  "CSAT: CSatMessageRouterProxy::RouteRequest: DUMMY" );
+	TFLOGSTRING( "CSAT: CSatMessageRouterProxy::RouteRequest: DUMMY" );
 	return NULL;
 	}
 	
@@ -181,7 +176,8 @@
     
     if ( KErrNone != trapError )
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_ROUTECOMPLETION_1, "CSatMessageRouterProxy::RouteCompletion, trapError=%d", trapError);
+		TFLOGSTRING2("CSatMessageRouterProxy::RouteCompletion, trapError=%d", 
+			trapError);
 		}
     }
 	
@@ -198,7 +194,7 @@
         CSatDataPackage* /*aDataPackage*/
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_GETOBJECTFORCOMPLETION_1, "CSAT: CMmMessageRouterBase::GetObjectForCompletion");
+    TFLOGSTRING("CSAT: CMmMessageRouterBase::GetObjectForCompletion");
     CBase* satObject = NULL;
 
 	CMmMessageManagerBase::TTsyObjects tsyObject = 
@@ -220,7 +216,7 @@
         ) const
 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_GETTSYOBJECTFROMIPC_1,  "CSAT: CSatMessageRouterProxy::GetTsyObjectFromIpc" );
+    TFLOGSTRING( "CSAT: CSatMessageRouterProxy::GetTsyObjectFromIpc" );
     // A default value must be given as a initialization, however, nothing will
     // be done if the IPC does not mach as well in RouteCompletion
     CMmMessageManagerBase::TTsyObjects retObject = 
@@ -351,7 +347,7 @@
     CMmDataPackage* aData, 
     TInt aResult )
 	{
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_COMPLETE_1, "TSY: CMmMessageRouterProxy::Complete. IPC = %d, result: %d", aIpc, aResult);
+TFLOGSTRING3("TSY: CMmMessageRouterProxy::Complete. IPC = %d, result: %d", aIpc, aResult);
 	RouteCompletion( aIpc, static_cast<CSatDataPackage*>(aData), aResult ); 
 	}
 	
@@ -380,7 +376,8 @@
         TInt aResult
         )
     {
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_ROUTECOMPLETIONL_1, "CSAT: CSatMessageRouterProxy::RouteCompletion ipc=%d, error: %d", aIpc, aResult);
+	TFLOGSTRING3("CSAT: CSatMessageRouterProxy::RouteCompletion ipc=%d, \
+        error: %d", aIpc, aResult);
     CBase* object = GetObjectForCompletion( aIpc, aDataPackage );
 
     if ( NULL != object )
@@ -623,7 +620,7 @@
         }
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_ROUTECOMPLETIONL_2, "CSatMessageRouterProxy::RouteCompletion, IPC NOT HANDLED.!!!");
+		TFLOGSTRING("CSatMessageRouterProxy::RouteCompletion, IPC NOT HANDLED.!!!");
 		}
     }

--- a/telephonyserverplugins/simatktsy/src/csatnotificationstsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csatnotificationstsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -21,12 +21,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csatnotificationstsyTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatDataPackage.h"        // Parameter packing 
 #include "CSatTsy.h"                // Sat Tsy class
@@ -64,6 +58,7 @@
 #include "CSatNotifyReceiveData.h"  // Receive data notification  notify class
 #include "CSatNotifyMoreTime.h"		// More time notification  notify class
 #include "CSatTsyReqHandleStore.h"  // Request handle class
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "CBerTlv.h"                // Ber Tlv
 #include "TTlv.h"					// TTlv class
 #include "msattsy_ipcdefs.h"		// Sat Tsy specific request types
@@ -81,7 +76,7 @@
 		CSatTsyReqHandleStore* aSatReqHandleStore
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_NEWL_1, "CSAT: CSatNotificationsTsy::NewL");
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::NewL");
     CSatNotificationsTsy* const satNotificationsTsy = 
         new ( ELeave ) CSatNotificationsTsy( aSatTsy, aSatReqHandleStore );
 
@@ -89,7 +84,7 @@
     satNotificationsTsy->ConstructL();
     CleanupStack::Pop();
     
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_NEWL_2, "CSAT: CSatNotificationsTsy::NewL, end of method");
+	TFLOGSTRING("CSAT: CSatNotificationsTsy::NewL, end of method");
     return satNotificationsTsy;
     }
 
@@ -103,7 +98,7 @@
         void   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_DTOR_1, "CSAT: CSatNotificationsTsy::~CSatNotificationsTsy");
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::~CSatNotificationsTsy");
     
     delete iSatTimer;
 
@@ -141,7 +136,8 @@
     // Unregister.
     iSatTsy->MessageManager()->RegisterTsyObject(
 		CMmMessageManagerBase::ESatNotificationsTsyObjType, NULL );
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_DTOR_2, "CSAT: CSatNotificationsTsy::~CSatNotificationsTsy, end of method");
+	TFLOGSTRING("CSAT: CSatNotificationsTsy::~CSatNotificationsTsy, \
+		end of method");
     }
     
 // -----------------------------------------------------------------------------
@@ -169,7 +165,7 @@
         void
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_CONSTRUCTL_1, "CSAT: CSatNotificationsTsy::ConstructL\n" );
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::ConstructL\n" );
 
     // Register
     iSatTsy->MessageManager()->RegisterTsyObject(
@@ -328,7 +324,7 @@
     // Checks if MO-SMS control should be activated
     //unnecassary IPC request as this is already called in CSatNotifyMoSmControlRequest::ConstructL 
     //iSatTsy->MessageManager()->HandleRequestL( ESatTsyQueryMoSmsControlActivated );
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_CONSTRUCTL_2, "CSAT: CSatNotificationsTsy::ConstructL, end of method" );
+	TFLOGSTRING("CSAT: CSatNotificationsTsy::ConstructL, end of method" );
     }
 
 // -----------------------------------------------------------------------------
@@ -343,7 +339,8 @@
         const TDataPackage& aPackage      
         )
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_DOEXTFUNCL_1, "CSAT: CSatNotificationsTsy::DoExtFuncL\t IPC:%d,\t Handle:%d",aIpc, aTsyReqHandle);
+    TFLOGSTRING3("CSAT: CSatNotificationsTsy::DoExtFuncL\t IPC:%d,\t Handle:%d",
+               aIpc, aTsyReqHandle);
 
     TInt ret ( KErrNone );
 
@@ -505,7 +502,8 @@
         	} 
         default:
         	{
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_DOEXTFUNCL_2, "CSAT: CSatNotificationsTsy::DoExtFuncL, IPC not supported");
+        	TFLOGSTRING("CSAT: CSatNotificationsTsy::DoExtFuncL, \
+        		IPC not supported");
             ret = KErrNotSupported;
             break;
         	}
@@ -524,7 +522,8 @@
         const TTsyReqHandle aTsyReqHandle  
         )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_CANCELSERVICE_1, "CSAT: CSatNotificationsTsy::CancelService.\n\t\t\t Handle:%d\n\t\t\t", aTsyReqHandle );
+    TFLOGSTRING2("CSAT: CSatNotificationsTsy::CancelService.\
+    	\n\t\t\t Handle:%d\n\t\t\t", aTsyReqHandle );
 
     TInt ret ( KErrNotSupported );
     
@@ -692,7 +691,7 @@
         TInt aErrorCode
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_1, "CSAT: CSatNotificationsTsy::SetPollingResultL");
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::SetPollingResultL");
     TUint8 pCmdNumber;
     TUint8 interval;
     TBuf<RSat::KAdditionalInfoMaxSize> additionalInfo;
@@ -703,7 +702,8 @@
         {
         if ( iPollingOff )
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_2, "CSAT: CSatNotificationsTsy::SetPollingResultL, Polling Off");
+            TFLOGSTRING("CSAT: CSatNotificationsTsy::SetPollingResultL, \
+                Polling Off");
             additionalInfo.Zero();
             additionalInfo.Append( RSat::KNoAdditionalInfo );
             iNotifyPollingOff->CreateTerminalRespL( pCmdNumber,
@@ -718,7 +718,9 @@
     // NAA status not OK
 	else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_3, "CSAT: CSatNotificationsTsy::SetPollingResultL, NAA Status Not OK, means that value in request is out of range and default value is used.");
+        TFLOGSTRING("CSAT: CSatNotificationsTsy::SetPollingResultL, \
+        	NAA Status Not OK, means that value in request is out of range\
+        	and default value is used.");
         if ( iPollingOff )
             {
             iPollingOff = EFalse;
@@ -733,7 +735,8 @@
             // renew the request with legacy maximum.. 
             if ( iLongPollIntervalReq )
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_4, "CSAT: CSatNotificationsTsy::SetPollingResultL, Request set to legacy maximum (25 seconds)");
+                TFLOGSTRING("CSAT: CSatNotificationsTsy::SetPollingResultL, \
+        	        Request set to legacy maximum (25 seconds)");
                 SetPollingIntervalL( KMaxLegacyPollInterval );
                 iLongPollIntervalReq = EFalse;
                 }
@@ -761,7 +764,8 @@
         TUint8 aValue
         )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SETPOLLINGINTERVALL_1, "CSAT: CSatNotificationsTsy::SetPollingIntervalL, Value: %d",aValue);
+    TFLOGSTRING2("CSAT: CSatNotificationsTsy::SetPollingIntervalL, Value: %d",
+        aValue);
     
     if ( KMaxLegacyPollInterval < aValue )
         {
@@ -788,7 +792,7 @@
         TUint32 aTimerValue 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_TIMEREXPIRATIONL_1, "CSAT: CSatNotificationsTsy::TimerExpirationL");
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::TimerExpirationL");
     TUint8 time[3] = {0, 0, 0}; 
     TInt num[3];
     num[0] = aTimerValue / 3600;         // Hours
@@ -840,7 +844,7 @@
         // None 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_GETSATTIMER_1, "CSAT: CSatNotificationsTsy::GetSatTimer");
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::GetSatTimer");
     // Pointer to SAT timer
     return iSatTimer; 
     }
@@ -855,7 +859,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SATNOTIFYSETUPCALL_1, "CSAT: CSatNotificationsTsy::SatNotifySetUpCall");
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::SatNotifySetUpCall");
     // Pointer to NotifySetupCall
     return iNotifySetUpCall;
     }
@@ -871,7 +875,8 @@
 		TInt /*aResult*/             
         )
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SETPROACTIVECOMMANDONGOINGSTATUS_1, "CSAT: CSatNotificationsTsy::SetProactiveCommandOnGoingStatus");
+	TFLOGSTRING("CSAT: CSatNotificationsTsy::\
+		SetProactiveCommandOnGoingStatus");
     TBool ProactiveCommandOngoingStatus;
     aDataPackage->UnPackData( ProactiveCommandOngoingStatus );
     iSatTimer->SetProactiveCommandOnGoingStatus( 
@@ -890,7 +895,7 @@
         TInt aResult
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_COMPLETEPCMDL_1, "CSAT: CSatNotificationsTsy::CompletePCmdL");
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::CompletePCmdL");
 
     TPtrC8* data;
     aDataPackage->UnPackData( &data );
@@ -1041,7 +1046,8 @@
 			}
         default:
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_COMPLETEPCMDL_2, "CSAT: CSatNotificationsTsy::CompletePCmdL, Proactive command not supported" );
+            TFLOGSTRING("CSAT: CSatNotificationsTsy::CompletePCmdL, \
+            	Proactive command not supported" );
         	// If proactive command is not supported, terminal response
             // with "Command is beyond ME's capabilities" information 
             // will be send. 
@@ -1076,7 +1082,7 @@
 		void
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_ISMOSMCONTROLACTIVATED_1, "CSAT: CSatNotificationsTsy::IsMoSmControlActivated");
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::IsMoSmControlActivated");
     return iNotifyMoSmControlRequest->ActivationStatus();
     }
      
@@ -1090,7 +1096,8 @@
 		TBool aPollingOff 
 		)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SETPOLLINGOFFSTATUS_1, "CSAT: CSatNotificationsTsy::SetPollingOffStatus status: %d", aPollingOff);
+	TFLOGSTRING2("CSAT: CSatNotificationsTsy::SetPollingOffStatus \
+		status: %d", aPollingOff);
 	iPollingOff = aPollingOff;		
 	}
 
@@ -1104,7 +1111,7 @@
 		// None
 		)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_POLLINGOFFSTATUS_1, "CSAT: CSatNotificationsTsy::PollingOffStatus");
+	TFLOGSTRING("CSAT: CSatNotificationsTsy::PollingOffStatus");
 	return iPollingOff;		
 	}
 
@@ -1118,7 +1125,7 @@
         TTlv& aTlv 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_ADDLOCATIONINFORMATIONTOTLV_1, "CSAT: CSatNotificationsTsy::AddLocationInformationToTlv");
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::AddLocationInformationToTlv");
     
     // Get the current location data from CSatNotifyLocalInfo
     const TLocalInformation& locInfo = iNotifyLocalInfo->LocalInformation();
@@ -1146,7 +1153,7 @@
 	    RSat::TControlResult aResult 
 	    )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_NOTIFYCLIENTFORALPHAID_1, "CSAT: CSatNotificationsTsy::NotifyClientForAlphaId");
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::NotifyClientForAlphaId");
     iNotifyCallControlRequest->CompleteAlphaId( aAlphaId, aResult, KErrNone );
     }
     
@@ -1160,7 +1167,7 @@
 	    void
 	    )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_REQUESTHANDLESTORE_1, "CSAT: CSatNotificationsTsy::RequestHandleStore");
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::RequestHandleStore");
     return iSatReqHandleStore;
     }
     	       
@@ -1175,7 +1182,7 @@
 	    TUint8 aPCmdMsgType 
 	    )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_NOTIFYSATREADYFORNOTIFICATION_1, "CSAT: CSatNotificationsTsy::NotifySatReadyForNotification");
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::NotifySatReadyForNotification");
     TInt ret( KErrNone );
     // Pack parameter for DOS call
 	CSatDataPackage dataPackage;
@@ -1187,7 +1194,8 @@
 	if ( trapError )
 		{
 		ret = trapError;
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_NOTIFYSATREADYFORNOTIFICATION_2, "CSAT: CSatNotificationsTsy::NotifySatReadyForNotification Trap error: %d", trapError);
+		TFLOGSTRING2("CSAT: CSatNotificationsTsy::NotifySatReadyForNotification\
+			Trap error: %d", trapError);
 		}
 		
 	return ret;
@@ -1205,7 +1213,8 @@
             TTsyReqHandle   aTsyReqHandle   
             ) 
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_TERMINALRESPONSEL_1, "CSAT: CSatNotificationsTsy::TerminalResponseL.\n\t\t\t Handle:%d\n\t\t\t", aTsyReqHandle );
+    TFLOGSTRING2("CSAT: CSatNotificationsTsy::TerminalResponseL.\
+        \n\t\t\t Handle:%d\n\t\t\t", aTsyReqHandle );
 
     TInt ret( KErrNone );
 
@@ -1325,7 +1334,8 @@
         	}	         			                            
         default:
         	{
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_TERMINALRESPONSEL_2, "CSAT: CSatNotificationsTsy::TerminalResponseL. Proactive command unknown" );
+        	TFLOGSTRING("CSAT: CSatNotificationsTsy::TerminalResponseL.\
+        		Proactive command unknown" );
             ret =  KErrGeneral;
             break;
         	}
@@ -1348,7 +1358,8 @@
         TInt aErrorCode     // Error code
         )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_COMPLETETERMINALRESPONSE_1, "CSAT: CSatNotificationsTsy::CompleteTerminalResponse - Error:%d", aErrorCode);
+    TFLOGSTRING2("CSAT: CSatNotificationsTsy::CompleteTerminalResponse - \
+    	Error:%d", aErrorCode);
 
     TTsyReqHandle reqHandle = iSatTsy->GetSatReqHandleStore()->
         ResetTsyReqHandle( CSatTsy::ESatTerminalRspReqType );
@@ -1372,7 +1383,7 @@
         TUint8 aGeneralResult 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_COMMANDPERFORMEDSUCCESSFULLY_1, "CSAT: CSatNotificationsTsy::CommandPerformedSuccessfully");
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::CommandPerformedSuccessfully");
     TBool ret( EFalse );
 	switch ( aGeneralResult )
 	    { 
@@ -1391,7 +1402,8 @@
         	}
 	    default:
 	    	{	
-	    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_COMMANDPERFORMEDSUCCESSFULLY_2, "CSAT: CSatNotificationsTsy::CommandPerformedSuccessfully, EFalse");
+	    	TFLOGSTRING("CSAT: CSatNotificationsTsy:: \
+	    		CommandPerformedSuccessfully, EFalse");
 		    ret = EFalse;
 		    break;
 	    	}
@@ -1409,7 +1421,7 @@
         TTsyReqHandle   aTsyReqHandle 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_NOTIFYCBDOWNLOAD_1, "CSAT: CSatNotificationsTsy::NotifyCbDownload");
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::NotifyCbDownload");
     TInt ret( KErrNone );
     iSatTsy->ReqCompleted( aTsyReqHandle, ret );   
     return ret; 
@@ -1425,7 +1437,7 @@
         TTsyReqHandle   aTsyReqHandle
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_NOTIFYSMSPPDOWNLOAD_1, "CSAT: CSatNotificationsTsy::NotifySmsPpDownload");
+    TFLOGSTRING("CSAT: CSatNotificationsTsy::NotifySmsPpDownload");
     TInt ret( KErrNone );
     iSatTsy->ReqCompleted( aTsyReqHandle, ret );   
     return ret;

--- a/telephonyserverplugins/simatktsy/src/csattimer.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csattimer.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,13 +20,8 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csattimerTraces.h"
-#endif
-
 #include "CSatTimer.h"              // Class header
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "CSatNotificationsTsy.h"   // Sat Tsy class
 #include "CSatDataPackage.h"	        // For data packages
 
@@ -56,7 +51,7 @@
         )
     {
 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_CONSTRUCTL_1,  "CSAT: CSatTimer::ConstructL" );
+    TFLOGSTRING( "CSAT: CSatTimer::ConstructL" );
     iSatNotificationsTsy = aSatNotificationsTsy;
     iTimerTable = new ( ELeave ) RArray<TTimer>( KMaxNumberOfParallelTimers );  
     // Neutral priority, 0
@@ -85,7 +80,7 @@
         //None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_DTOR_1,  "CSAT: CSatTimer::~CSatTimer" );
+    TFLOGSTRING( "CSAT: CSatTimer::~CSatTimer" );
     if ( iTimer )
         {
         // Stop calling Beat...
@@ -111,7 +106,7 @@
         TUint32 aTimerValue // Timer value
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_START_1,  "CSAT: CSatTimer::Start" );
+    TFLOGSTRING( "CSAT: CSatTimer::Start" );
     TInt ret( KErrNone );
 
      // Check if the entry is already in the table 
@@ -151,7 +146,7 @@
         //None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_STOP_1,  "CSAT: CSatTimer::Stop" );
+    TFLOGSTRING( "CSAT: CSatTimer::Stop" );
     // Check if active 
     if ( iTimer->IsActive () ) 
         { 
@@ -193,7 +188,8 @@
                 if ( trapError )
 					{
 					ret = trapError;
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_BEAT_1, "CSAT: CSatTimer::Beat, Trap error: %d", trapError);
+					TFLOGSTRING2("CSAT: CSatTimer::Beat, Trap error: %d", 
+						trapError);
 					}
 					
                 // Remove timer from the table
@@ -221,7 +217,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_SYNCHRONIZE_1,  "CSAT: CSatTimer::Synchronize" );
+    TFLOGSTRING( "CSAT: CSatTimer::Synchronize" );
     iBeatCounter++;
     }
 
@@ -236,7 +232,7 @@
         )
     {
     
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_CHECKTIMERTABLE_1,  "CSAT: CSatTimer::CheckTimerTable" );
+    TFLOGSTRING( "CSAT: CSatTimer::CheckTimerTable" );
     TBool ret( EFalse );
 
     // Create the entry with meaningful values only
@@ -266,7 +262,7 @@
         )
     { 
     
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_DELETETIMERBYID_1,  "CSAT: CSatTimer::DeleteTimerById" );
+    TFLOGSTRING( "CSAT: CSatTimer::DeleteTimerById" );
     TInt ret( KErrNotFound );
 
     // Create the entry with meaningful values only
@@ -304,7 +300,7 @@
         TInt aTimerId // Timer identifier
         )
     { 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_CURRENTVALUEOFTIMERBYID_1,  "CSAT: CSatTimer::CurrentValueOfTimerById" );
+    TFLOGSTRING( "CSAT: CSatTimer::CurrentValueOfTimerById" );
     TInt ret( KErrNotFound );
 
     // Create the entry with meaningful values only
@@ -348,7 +344,7 @@
         TBool aStatus 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_SETPROACTIVECOMMANDONGOINGSTATUS_1,  "CSAT: CSatTimer::SetProactiveCommandOnGoingStatus" );
+    TFLOGSTRING( "CSAT: CSatTimer::SetProactiveCommandOnGoingStatus" );
     iIsProactiveCommandOnGoing = aStatus;
     }
 
@@ -365,7 +361,7 @@
         ): iTimerId( aTimerId ), iStartTime( aStartTime ), 
            iTimeStamp( aTimeStamp )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_TTIMER_1,  "CSAT: TTimer::TTimer" );
+    TFLOGSTRING( "CSAT: TTimer::TTimer" );
     }
 
 // -----------------------------------------------------------------------------
@@ -378,7 +374,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_TIMESTAMP_1,  "CSAT: TTimer::TimeStamp" );
+    TFLOGSTRING( "CSAT: TTimer::TimeStamp" );
     return iTimeStamp;
     }
 
@@ -392,7 +388,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_TIMERID_1,  "CSAT: TTimer::TimerId" );
+    TFLOGSTRING( "CSAT: TTimer::TimerId" );
     return iTimerId;
     }
 
@@ -406,7 +402,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_TIMERSTARTTIME_1,  "CSAT: TTimer::TimerStartTime" );
+    TFLOGSTRING( "CSAT: TTimer::TimerStartTime" );
     return iStartTime;
     }
 
@@ -421,7 +417,7 @@
         const CSatTimer::TTimer& aArg2 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_COMPAREENTRIES_1,  "CSAT: CSatTimer::TTimer::CompareEntries" );
+    TFLOGSTRING( "CSAT: CSatTimer::TTimer::CompareEntries" );
     TBool ret( EFalse ); 
 
     // We are interested only in the timer id
@@ -431,7 +427,7 @@
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_COMPAREENTRIES_2,  "CSAT: CSatTimer::TTimer::CompareEntries, Not equal" );
+        TFLOGSTRING( "CSAT: CSatTimer::TTimer::CompareEntries, Not equal" );
         }
     return ret;
     }
@@ -447,7 +443,7 @@
         const CSatTimer::TTimer& aArg2  
         ) 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_ORDERENTRIES_1,  "CSAT: CSatTimer::TTimer::OrderEntries" );
+    TFLOGSTRING( "CSAT: CSatTimer::TTimer::OrderEntries" );
     TInt ret( KFirstTimeStampSmaller );
 
     // We are interested only in the time stamp
@@ -461,7 +457,8 @@
         }
     else
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_ORDERENTRIES_2,  "CSAT: CSatTimer::TTimer::OrderEntries, KFirstTimeStampSmaller" );
+        TFLOGSTRING( "CSAT: CSatTimer::TTimer::OrderEntries, \
+            KFirstTimeStampSmaller" );
         }
 
     return ret;

--- a/telephonyserverplugins/simatktsy/src/csattsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csattsy.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -20,12 +20,6 @@
 
 
 //  INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csattsyTraces.h"
-#endif
-
 #include <etelsat.h>                // Etel SAT API
 #include <satcs.h>                  // Etel SAT API
 //#include "CMmPhoneTsy.h"			// Phone Tsy class
@@ -48,6 +42,7 @@
 #include "CSatDataDownloadTsy.h"    // SatDataDownload class
 
 #include "msattsy_ipcdefs.h"		// Sat Tsy specific request types
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"		    // Sat Tsy Utility class
 #include "TTlv.h"					// TTlv class
 #include "CSatTsyReqHandleStore.h"  // Request handle storage
@@ -65,7 +60,7 @@
 		MCtsySatService& aSatService
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_NEWL_1, "CSAT: CSatTsy::NewL");
+    TFLOGSTRING("CSAT: CSatTsy::NewL");
 
 	// Create subsession
     CSatTsy* subsession = new ( ELeave ) CSatTsy( aMmMessageRouter, aSatService );
@@ -74,7 +69,7 @@
     subsession->ConstructL();
     CleanupStack::Pop();
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_NEWL_2, "CSAT: CSatTsy::NewL, end of method");
+	TFLOGSTRING("CSAT: CSatTsy::NewL, end of method");
     return subsession;
     }
 
@@ -88,7 +83,7 @@
 		// None
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_DTOR_1, "CSAT: CSatTsy::~CSatTsy");
+    TFLOGSTRING("CSAT: CSatTsy::~CSatTsy");
 
     // Unregister.
     iMessageManager->RegisterTsyObject(
@@ -104,7 +99,7 @@
     delete iMessageManager;
     // Request handle store
     delete iSatReqHandleStore;
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_DTOR_2, "CSAT: CSatTsy::~CSatTsy, end of method");
+    TFLOGSTRING("CSAT: CSatTsy::~CSatTsy, end of method");
     }
 
 // -----------------------------------------------------------------------------
@@ -132,7 +127,7 @@
 		( 
         )
     { 
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_CONSTRUCTL_1, "CSAT: CSatTsy::ConstructL");
+    TFLOGSTRING("CSAT: CSatTsy::ConstructL");
     
     // Set pointer to the message router 
     iMessageManager = CMmMessageManagerBase::NewL(iMessageRouter);
@@ -187,7 +182,7 @@
 	// Get SMS Point to Point Data Download support status
     iMessageManager->HandleRequestL( ESatTsySmsPpDdlStatus );
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_CONSTRUCTL_2, "CSAT: CSatTsy::ConstructL, end of method");
+	TFLOGSTRING("CSAT: CSatTsy::ConstructL, end of method");
     }
     
 // -----------------------------------------------------------------------------
@@ -202,7 +197,8 @@
 		const TDataPackage& aPackage        
 		)
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_EXTFUNC_1, "CSAT: CSatTsy::ExtFunc ReqHandle=0x%08x IPC=%d", (TUint)aTsyReqHandle, aIpc);
+    TFLOGSTRING3("CSAT: CSatTsy::ExtFunc ReqHandle=%d IPC=%d", aTsyReqHandle, 
+        aIpc);
 	TInt ret( KErrNone );
 
     // Some SAT functions need trapping so we use two level function where 
@@ -219,12 +215,12 @@
 
     if ( KErrNone != trapError )
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_EXTFUNC_2, "CSAT: CSatTsy::ExtFunc, trapError: %d", trapError );
+        TFLOGSTRING2("CSAT: CSatTsy::ExtFunc, trapError: %d", trapError );
         ReqCompleted( aTsyReqHandle, trapError );
         }
 	else if ( KErrNone != ret )
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_EXTFUNC_3, "CSAT: CSatTsy::ExtFunc, ret: %d", ret);
+        TFLOGSTRING2("CSAT: CSatTsy::ExtFunc, ret: %d", ret);
         ReqCompleted( aTsyReqHandle, ret );
         }
     else										
@@ -247,7 +243,8 @@
         const TSatRequestTypes aSatRequestType
 		)
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SAVEREQHANDLE_1, "CSAT: CSatTsy::SaveReqHandle ReqHandle=0x%08x ReqHandleType=%d", (TUint)aTsyReqHandle, aSatRequestType);
+    TFLOGSTRING3("CSAT: CSatTsy::SaveReqHandle ReqHandle=%d ReqHandleType=%d", 
+        aTsyReqHandle, aSatRequestType);
     
     // Don't save the request handle if the type is unknown.
     if ( ESatReqHandleUnknown != aSatRequestType )
@@ -268,7 +265,7 @@
 		const TInt aIpc    
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_REQMODEL_1, "CSAT: CSatTsy::ReqModeL.");
+    TFLOGSTRING("CSAT: CSatTsy::ReqModeL.");
     CTelObject::TReqMode ret = 0;
 
     switch ( aIpc )
@@ -322,7 +319,7 @@
             }
         default:
             {
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_REQMODEL_2, "CSAT: CSatTsy::ReqModeL unsupported IPC %d", aIpc);
+            TFLOGSTRING2("CSAT: CSatTsy::ReqModeL unsupported IPC %d", aIpc);
             User::Leave( KErrNotSupported );
             break;
             }
@@ -341,7 +338,8 @@
 		const TTsyReqHandle aTsyReqHandle   
 		)
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_CANCELSERVICE_1, "CSAT: CSatTsy::CancelService ReqHandle=0x%08x IPC=%d", (TUint)aTsyReqHandle, aIpc);
+    TFLOGSTRING3("CSAT: CSatTsy::CancelService ReqHandle=%d IPC=%d", 
+        aTsyReqHandle, aIpc);
     TInt ret( KErrNotSupported );
 
 	// When the clients close their sub-sessions (eg. by calling RLine::Close), 
@@ -410,7 +408,7 @@
 
         default:
             {
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_CANCELSERVICE_2, "CSAT: CSatTsy::CancelService invalid IPC %d", aIpc);
+            TFLOGSTRING2("CSAT: CSatTsy::CancelService invalid IPC %d", aIpc);
             ret = KErrGeneral; 
             break;           	
             }
@@ -432,7 +430,7 @@
 		const TInt aIpc    // IPC number of request
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_REGISTERNOTIFICATION_1, "CSAT: CSatTsy::RegisterNotification.");
+    TFLOGSTRING("CSAT: CSatTsy::RegisterNotification.");
     // Initialize return value
     TInt ret( KErrNone );
 
@@ -472,7 +470,8 @@
         default:
             {
             // Unknown or invalid IPC
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_REGISTERNOTIFICATION_2, "CSAT: CSatTsy::RegisterNotification, Unsupported IPC %d", aIpc);
+            TFLOGSTRING2("CSAT: CSatTsy::RegisterNotification, \
+                Unsupported IPC %d", aIpc);
             ret = KErrNotSupported;
             break;
             }
@@ -494,7 +493,7 @@
 		const TInt aIpc    // IPC number of request
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_DEREGISTERNOTIFICATION_1, "CSAT: CSatTsy::DeregisterNotification.");
+    TFLOGSTRING("CSAT: CSatTsy::DeregisterNotification.");
     // Initialize return value
     TInt ret( KErrNone );
 
@@ -534,7 +533,8 @@
         default:
             {
             // Unknown or invalid IPC
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_DEREGISTERNOTIFICATION_2, "CSAT: CSatTsy::DeregisterNotification, Unsupported IPC %d", aIpc);
+            TFLOGSTRING2("CSAT: CSatTsy::DeregisterNotification, \
+                Unsupported IPC %d", aIpc);
             ret = KErrNotSupported;
             break;            	
             }
@@ -555,7 +555,7 @@
 		const TInt aIpc    // IPC number of request
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_NUMBEROFSLOTSL_1, "CSAT: CSatTsy::NumberOfSlotsL.");
+    TFLOGSTRING("CSAT: CSatTsy::NumberOfSlotsL.");
     TInt numberOfSlots( 1 );
 
     switch ( aIpc )
@@ -670,7 +670,8 @@
         default:
             {
             // Unknown or invalid IPC
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_NUMBEROFSLOTSL_2, "CSAT: CSatTsy::NumberOfSlotsL, Unsupported IPC %d", aIpc);
+            TFLOGSTRING2("CSAT: CSatTsy::NumberOfSlotsL, Unsupported IPC %d", 
+                aIpc);
             User::Leave( KErrNotSupported );
             break;
             }
@@ -689,7 +690,7 @@
         TInt aRet 
         )
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_REQCOMPLETED_1, "CSAT: CSatTsy::ReqCompleted, ReqHandle=%d ", aReqHandle);
+	TFLOGSTRING2("CSAT: CSatTsy::ReqCompleted, ReqHandle=%d ", aReqHandle);
 #ifdef USING_CTSY_DISPATCHER
 	CTelObject::ReqCompleted( aReqHandle, aRet );
 #else
@@ -707,7 +708,7 @@
         const TDesC8& aEnvelope
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_STORECALLCONNECTEDEVENT_1, "CSAT: CSatTsy::StoreCallConnectedEvent");
+    TFLOGSTRING("CSAT: CSatTsy::StoreCallConnectedEvent");
     iSatNotificationsTsy->SatNotifySetUpCall()->StoreCallConnectedEvent( 
         aEnvelope );
     }
@@ -722,7 +723,7 @@
         const TBool aStatus
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SETSETUPCALLSTATUS_1, "CSAT: CSatTsy::SetSetUpCallStatus");
+    TFLOGSTRING("CSAT: CSatTsy::SetSetUpCallStatus");
     iSatEventDownloadTsy->SetSetUpCallStatus( aStatus );
     }
 
@@ -736,7 +737,7 @@
         TUint32 aEvents     // events to be monitored
         ) 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SETUPEVENTLIST_1, "CSAT: CSatTsy::SetUpEventList");
+    TFLOGSTRING("CSAT: CSatTsy::SetUpEventList");
     iSatEventDownloadTsy->SetUpEventList( aEvents );
     }
 
@@ -750,7 +751,7 @@
         // none
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_MESSAGEMANAGER_1, "CSAT: CSatTsy::MessageManager");
+    TFLOGSTRING("CSAT: CSatTsy::MessageManager");
     return iMessageManager;
     }
 
@@ -764,7 +765,7 @@
         // none
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SATCCTSY_1, "CSAT: CSatTsy::SatCCTsy");
+    TFLOGSTRING("CSAT: CSatTsy::SatCCTsy");
     return iSatCCTsy;
     }  
 
@@ -778,7 +779,7 @@
 	    //none
 	    )
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_GETSATREQHANDLESTORE_1, "CSAT: CSatTsy::GetSatReqHandleStore");
+    TFLOGSTRING("CSAT: CSatTsy::GetSatReqHandleStore");
 	return iSatReqHandleStore;
 	}
 
@@ -792,7 +793,7 @@
 	    //none
 	    )
 	{
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_GETREQHANDLETYPE_1, "CSAT: CSatTsy::GetReqHandleType");
+    TFLOGSTRING("CSAT: CSatTsy::GetReqHandleType");
 	return &iReqHandleType;
 	}
 
@@ -806,7 +807,7 @@
         TInt aStatus 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_COMPLETESENDSMSMESSAGE_1, "CSAT: CSatTsy::CompleteSendSmsMessage");
+    TFLOGSTRING("CSAT: CSatTsy::CompleteSendSmsMessage");
     
     // Reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iSatNotificationsTsy->RequestHandleStore()->
@@ -831,7 +832,7 @@
 		void
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_ISMOSMCONTROLBYSIMACTIVATED_1, "CSAT: CSatTsy::IsMoSmControlBySimActivated");
+    TFLOGSTRING("CSAT: CSatTsy::IsMoSmControlBySimActivated");
     return iSatNotificationsTsy->IsMoSmControlActivated();
     }
 
@@ -848,7 +849,7 @@
 			const TDesC8& aAddress
 			)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_ISSIMORIGINATEDCALL_1, "CSAT: CSatTsy::IsSimOriginatedCall");
+	TFLOGSTRING("CSAT: CSatTsy::IsSimOriginatedCall");
 	TBool ret = EFalse;
 	if (iSatCCTsy)
 		{
@@ -870,7 +871,7 @@
         const TDesC8* aAddress 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_STOREPROACTIVEADDRESS_1, "CSAT: CSatTsy::StoreProactiveAddress");
+    TFLOGSTRING("CSAT: CSatTsy::StoreProactiveAddress");
     iSatCCTsy->StoreAddressForCC( *aAddress );
     }  
     
@@ -884,7 +885,7 @@
         const TUint8 aTonNpi 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SETTONNPI_1, "CSAT: CSatTsy::SetTonNpi");
+    TFLOGSTRING("CSAT: CSatTsy::SetTonNpi");
     iSatCCTsy->SetTonNpiForSS( aTonNpi );
     }  
     
@@ -900,7 +901,8 @@
 		const TDataPackage& aPackage	
 		)
     {
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_DOEXTFUNCL_1, "CSAT: CSatTsy::DoExtFuncL\t IPC:%d,\t Handle:%d",aIpc, aTsyReqHandle);
+    TFLOGSTRING3("CSAT: CSatTsy::DoExtFuncL\t IPC:%d,\t Handle:%d",
+           aIpc, aTsyReqHandle);
 	TInt ret( KErrNone );
 
 	// Add here ALL supported Sat request types, and call either the correct 
@@ -998,7 +1000,7 @@
 		// Complete with KErrNotSupported, function not supported
 		default:
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_DOEXTFUNCL_2, "CSAT: CSatTsy::DoExtFuncL unsupported IPC %d", aIpc);
+			TFLOGSTRING2("CSAT: CSatTsy::DoExtFuncL unsupported IPC %d", aIpc);
 			ReqCompleted( aTsyReqHandle, KErrNotSupported );
 			break;
 			}
@@ -1018,14 +1020,15 @@
 		RSat::TMenuSelectionV1Pckg* aSelection	
 		) 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_MENUSELECTIONL_1, "CSAT: CSatTsy::MenuSelection");
+    TFLOGSTRING("CSAT: CSatTsy::MenuSelection");
     TInt ret( KErrNone );
 
 	// It should not be possible that the request is asked more than once at 
 	// time, therefore we do not need to check whether it is already ongoing
 
 	RSat::TMenuSelectionV1& selectionV1 = ( *aSelection ) ();
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_MENUSELECTIONL_2, "CSAT:MenuSelection, iItemId %x, Help: %c", selectionV1.iItemId, selectionV1.iHelp );
+	TFLOGSTRING3("CSAT:MenuSelection, iItemId %x, Help: %c", 
+		selectionV1.iItemId, selectionV1.iHelp );
 
     TTlv tlvSpecificData;
     
@@ -1070,7 +1073,7 @@
         TTsyReqHandle   aTsyReqHandle   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SENDMESSAGENOLOGGING_1, "CSAT: CSatTsy::SendMessageNoLogging");
+    TFLOGSTRING("CSAT: CSatTsy::SendMessageNoLogging");
     TInt ret( KErrNone );
 	
 	// Save the request handle
@@ -1182,21 +1185,23 @@
         // Call SMS sending function from MMSMS
         ret = iSatService.SendSatMessage( *this, pdu, sca, &numberType, 
                 &numberPlan, EFalse, aTsyReqHandle );
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SENDMESSAGENOLOGGING_2, "CSAT: CSatTsy::SendMessageNoLogging, SendSmsMessage done, ret: %x", ret);
+        TFLOGSTRING2("CSAT: CSatTsy::SendMessageNoLogging, \
+                SendSmsMessage done, ret: %x", ret);
        
        
         }
     else // SCA missing
         {
         ret = KErrGeneral;
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SENDMESSAGENOLOGGING_3, "CSAT: CSatTsy::SendMessageNoLogging, SCA missing");
+        TFLOGSTRING("CSAT: CSatTsy::SendMessageNoLogging, SCA missing");
         }
 
     // Failure in sending of SAT SMS, call complete method
     if ( KErrNone != ret )
         {
         CompleteSendSmsMessage( ret ); 
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SENDMESSAGENOLOGGING_4, "CSAT: CSatTsy::SendMessageNoLogging, failure sending SAT SMS, complete");
+        TFLOGSTRING("CSAT: CSatTsy::SendMessageNoLogging, \
+            failure sending SAT SMS, complete");
         }
     
     return KErrNone;

--- a/telephonyserverplugins/simatktsy/src/csattsyfactory.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csattsyfactory.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"

--- a/telephonyserverplugins/simatktsy/tests/group/te_csat_component.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_providelocalinfo_individual.script"-"c:\testdata\scripts\te_csatcomponent_providelocalinfo_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_sendussd_individual.script"-"c:\testdata\scripts\te_csatcomponent_sendussd_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_frames_individual.script"-"c:\testdata\scripts\te_csatcomponent_frames_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_setupeventlist_individual.script"-"c:\testdata\scripts\te_csatcomponent_setupeventlist_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_refresh_individual.script"-"te_csatcomponent_refresh_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_setupmenu_individual.script"-"c:\testdata\scripts\te_csatcomponent_setupmenu_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_displaytext_individual.script"-"c:\testdata\scripts\te_csatcomponent_displaytext_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_getinput_individual.script"-"c:\testdata\scripts\te_csatcomponent_getinput_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_getinkey_individual.script"-"c:\testdata\scripts\te_csatcomponent_getinkey_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_sendsms_individual.script"-"c:\testdata\scripts\te_csatcomponent_sendsms_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_openchannel_individual.script"-"c:\testdata\scripts\te_csatcomponent_openchannel_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_setupcall_individual.script"-"c:\testdata\scripts\te_csatcomponent_setupcall_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_closechannel_individual.script"-"c:\testdata\scripts\te_csatcomponent_closechannel_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_multimediamsg_individual.script"-"c:\testdata\scripts\te_csatcomponent_multimediamsg_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_languagenotification_individual.script"-"c:\testdata\scripts\te_csatcomponent_languagenotification_individual.scriptt"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_selectitem_individual.script"-"c:\testdata\scripts\te_csatcomponent_selectitem_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_setupidlemodetext_individual.script"-"c:\testdata\scripts\te_csatcomponent_setupidlemodetext_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_sendss_individual.script"-"c:\testdata\scripts\te_csatcomponent_sendss_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_sendreceivedata_individual.script"-"c:\testdata\scripts\te_csatcomponent_sendreceivedata_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_senddtmf_individual.script"-"c:\testdata\scripts\te_csatcomponent_senddtmf_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_getchannelstatus_individual.script"-"c:\testdata\scripts\te_csatcomponent_getchannelstatus_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_playtone_individual.script"-"c:\testdata\scripts\te_csatcomponent_playtone_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_launchbrowser_individual.script"-"c:\testdata\scripts\te_csatcomponent_launchbrowser_individual.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simatktsy\tests\scripts\te_csatcomponent_individual.script"-"c:\testdata\scripts\te_csatcomponent_individual.script"
-

--- a/telephonyserverplugins/simatktsy/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyserverplugins/simatktsy/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,800 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEMANAGERBASE_HANDLEREQUESTL1_1=0x311
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEMANAGERBASE_HANDLEREQUESTL2_1=0x312
-[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEMANAGERBASE_HANDLEREQUESTL_1=0x310
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CHECKIFALPHAIDPRESENT_1=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CHECKIFALPHAIDPRESENT_2=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CHECKIFALPHAIDPRESENT_3=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CHECKIFALPHAIDPRESENT_4=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CHECKIFALPHAIDPRESENT_5=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_COMPLETEBEARERCAPABILITY_1=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_COMPLETECCEVENTL_1=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_COMPLETECCEVENTL_2=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CONSTRUCTL_1=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CREATECALLENVELOPEL_1=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CREATECALLENVELOPEL_2=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CREATEENVELOPEL_1=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CREATEENVELOPEL_2=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CREATESSENVELOPEL_1=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CREATEUSSDENVELOPEL_1=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_HASPROACTIVEORIGIN_1=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_HASPROACTIVEORIGIN_2=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_HASPROACTIVEORIGIN_3=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_HASPROACTIVEORIGIN_4=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_ISONLYDIGITSINUSSD_1=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_NEWL_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_NEWL_2=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_NEWL_3=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_SETTONNPIFORSS_1=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_SETUSSDSTATUS_1=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_STOREADDRESSFORCC_1=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_STOREADDRESSFORCC_2=0x15
-[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_STOREADDRESSFORCC_3=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_COMPLETECELLBROADCASTDDLL_1=0x24
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_COMPLETEREADCBMIDSL_1=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_COMPLETESMSPPDDLL_1=0x25
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_COMPLETESMSPPDDLL_2=0x26
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CONSTRUCTL_1=0x23
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CREATEENTRYFORSAVINGSMSL_1=0x27
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CREATEENTRYFORSAVINGSMSL_2=0x28
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CREATESMSDELIVERREPORTL_1=0x29
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CREATESMSDELIVERREPORTL_2=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CREATESMSDELIVERREPORTL_3=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CREATESMSPPDDLENVELOPEL_1=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CREATESMSPPDDLENVELOPEL_2=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_NEWL_1=0x20
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_NEWL_2=0x21
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_NEWL_3=0x22
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_PARSESMSTPDU_1=0x30
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_PARSESMSTPDU_2=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_PARSESMSTPDU_3=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_SETSMSPPDDLSTATUS_1=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CANCELSERVICE_1=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETEACCESSTECHNOLOGYCHANGEL_1=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETEACCESSTECHNOLOGYCHANGEL_2=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETECALLCONNECTEDL_1=0x42
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETECALLCONNECTEDL_2=0x43
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETECALLCONNECTEDL_3=0x44
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_1=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_2=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_3=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_4=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_1=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_2=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_3=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_4=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_5=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_1=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_2=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_3=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_4=0x40
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_5=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CONSTRUCTL_1=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEBROWSERTERMINATIONENVELOPEL_1=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEBROWSERTERMINATIONENVELOPEL_2=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATECHANNELSTATUSENVELOPEL_1=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATECHANNELSTATUSENVELOPEL_2=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEDATAAVAILABLEENVELOPEL_1=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEDATAAVAILABLEENVELOPEL_2=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEIDLESCREENAVAILABLEENVELOPEL_1=0x52
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEIDLESCREENAVAILABLEENVELOPEL_2=0x53
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEIDLESCREENAVAILABLEENVELOPEL_3=0x54
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATELANGUAGESELECTIONENVELOPEL_1=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATELANGUAGESELECTIONENVELOPEL_2=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEUSERACTIVITYENVELOPEL_1=0x50
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEUSERACTIVITYENVELOPEL_2=0x51
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_DOEXTFUNCL_1=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_DOEXTFUNCL_2=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_NEWL_1=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_NEWL_2=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_NEWL_3=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_NEWL_4=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_SETSETUPCALLSTATUS_1=0x3b
-[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_SETUPEVENTLIST_1=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETCLUT_1=0x6d
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETCLUT_2=0x6e
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETCLUT_3=0x6f
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETICON_1=0x63
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETICON_2=0x64
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETICON_3=0x65
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETICON_4=0x66
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETICON_5=0x67
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETIMAGEINSTANCE_1=0x68
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETIMAGEINSTANCE_2=0x69
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETIMAGEINSTANCE_3=0x6a
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETIMAGEINSTANCE_4=0x6b
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETIMAGEINSTANCE_5=0x6c
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_CONSTRUCTL_1=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_DOEXTFUNCL_1=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_DOEXTFUNCL_2=0x62
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_GETCLUTL_1=0x74
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_GETCLUTL_2=0x75
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_GETICONL_1=0x70
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_GETICONL_2=0x71
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_GETIMAGEINSTANCEL_1=0x72
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_GETIMAGEINSTANCEL_2=0x73
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_NEWL_1=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_NEWL_2=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_NEWL_3=0x5f
-[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_COMPLETE_1=0x31b
-[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_CONSTRUCTL_1=0x316
-[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_GETOBJECTFORCOMPLETION_1=0x319
-[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_GETOBJECTFORCOMPLETION_2=0x31a
-[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_NEWL_1=0x313
-[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_NEWL_2=0x314
-[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_NEWL_3=0x315
-[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_ROUTECOMPLETIONL_1=0x31c
-[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_ROUTECOMPLETIONL_2=0x31d
-[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_ROUTECOMPLETION_1=0x318
-[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_ROUTEREQUEST_1=0x317
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_ADDLOCATIONINFORMATIONTOTLV_1=0x8d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_CANCELSERVICE_1=0x7e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_COMMANDPERFORMEDSUCCESSFULLY_1=0x95
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_COMMANDPERFORMEDSUCCESSFULLY_2=0x96
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_COMPLETEPCMDL_1=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_COMPLETEPCMDL_2=0x89
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_COMPLETETERMINALRESPONSE_1=0x94
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_CONSTRUCTL_1=0x7a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_CONSTRUCTL_2=0x7b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_DOEXTFUNCL_1=0x7c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_DOEXTFUNCL_2=0x7d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_GETSATTIMER_1=0x85
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_ISMOSMCONTROLACTIVATED_1=0x8a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NEWL_1=0x76
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NEWL_2=0x77
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NEWL_3=0x78
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NEWL_4=0x79
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NOTIFYCBDOWNLOAD_1=0x97
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NOTIFYCLIENTFORALPHAID_1=0x8e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NOTIFYSATREADYFORNOTIFICATION_1=0x90
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NOTIFYSATREADYFORNOTIFICATION_2=0x91
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NOTIFYSMSPPDOWNLOAD_1=0x98
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_POLLINGOFFSTATUS_1=0x8c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_REQUESTHANDLESTORE_1=0x8f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SATNOTIFYSETUPCALL_1=0x86
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SETPOLLINGINTERVALL_1=0x83
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SETPOLLINGOFFSTATUS_1=0x8b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_1=0x7f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_2=0x80
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_3=0x81
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_4=0x82
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SETPROACTIVECOMMANDONGOINGSTATUS_1=0x87
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_TERMINALRESPONSEL_1=0x92
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_TERMINALRESPONSEL_2=0x93
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_TIMEREXPIRATIONL_1=0x84
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_TLOCALINFORMATION_1=0x141
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_CANCELNOTIFICATION_1=0x9e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_COMPLETEALPHAID_1=0xa0
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_COMPLETEALPHAID_2=0xa1
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_COMPLETEALPHAID_3=0xa2
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFYL_1=0x9f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_CONSTRUCTL_1=0x9c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_NEWL_1=0x99
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_NEWL_2=0x9a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_NEWL_3=0x9b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_NOTIFY_1=0x9d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_CANCELNOTIFICATION_1=0xa8
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_1=0xa9
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_2=0xaa
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_3=0xab
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_4=0xac
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_5=0xad
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_CONSTRUCTL_1=0xa6
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_CREATETERMINALRESPL_1=0xb2
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_CREATETERMINALRESPL_2=0xb3
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_NEWL_1=0xa3
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_NEWL_2=0xa4
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_NEWL_3=0xa5
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_NOTIFY_1=0xa7
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_1=0xae
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_2=0xaf
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_3=0xb0
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_4=0xb1
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_CANCELNOTIFICATION_1=0xb9
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_1=0xba
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_2=0xbb
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_3=0xbc
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_4=0xbd
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_5=0xbe
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_CONSTRUCTL_1=0xb7
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_CREATETERMINALRESPL_1=0xc2
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_DTOR_1=0xb6
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_NEWL_1=0xb4
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_NEWL_2=0xb5
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_NOTIFY_1=0xb8
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_TERMINALRESPONSEL_1=0xbf
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_TERMINALRESPONSEL_2=0xc0
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_TERMINALRESPONSEL_3=0xc1
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_CANCELNOTIFICATION_1=0xc8
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_COMPLETENOTIFYL_1=0xc9
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_COMPLETENOTIFYL_2=0xca
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_COMPLETENOTIFYL_3=0xcb
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_CONSTRUCTL_1=0xc6
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_CREATETERMINALRESPL_1=0xcf
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_CREATETERMINALRESPL_2=0xd0
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_NEWL_1=0xc3
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_NEWL_2=0xc4
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_NEWL_3=0xc5
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_NOTIFY_1=0xc7
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSEL_1=0xcc
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSEL_2=0xcd
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSEL_3=0xce
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_CANCELNOTIFICATION_1=0xd6
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_COMPLETENOTIFYL_1=0xd7
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_COMPLETENOTIFYL_2=0xd8
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_COMPLETENOTIFYL_3=0xd9
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_COMPLETENOTIFYL_4=0xda
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_CONSTRUCTL_1=0xd4
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_CREATETERMINALRESPL_1=0xe1
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_CREATETERMINALRESPL_2=0xe2
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_NEWL_1=0xd1
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_NEWL_2=0xd2
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_NEWL_3=0xd3
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_NOTIFY_1=0xd5
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_TERMINALRESPONSEL_1=0xdb
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_TERMINALRESPONSEL_2=0xdc
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_TERMINALRESPONSEL_3=0xdd
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_TERMINALRESPONSEL_4=0xde
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_TERMINALRESPONSEL_5=0xdf
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_TERMINALRESPONSEL_6=0xe0
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CANCELNOTIFICATION_1=0xe8
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_COMPLETENOTIFYL_1=0xe9
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_COMPLETENOTIFYL_2=0xea
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_COMPLETENOTIFYL_3=0xeb
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_COMPLETENOTIFYL_4=0xec
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_COMPLETENOTIFYL_5=0xed
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_COMPLETENOTIFYL_6=0xee
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_COMPLETENOTIFYL_7=0xef
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CONSTRUCTL_1=0xe6
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CREATETERMINALRESPL_1=0xf5
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CREATETERMINALRESPL_2=0xf6
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CREATETERMINALRESPL_3=0xf7
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CREATETERMINALRESPL_4=0xf8
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CREATETERMINALRESPL_5=0xf9
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CREATETERMINALRESPL_6=0xfa
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_NEWL_1=0xe3
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_NEWL_2=0xe4
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_NEWL_3=0xe5
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_NOTIFY_1=0xe7
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_TERMINALRESPONSEL_1=0xf0
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_TERMINALRESPONSEL_2=0xf1
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_TERMINALRESPONSEL_3=0xf2
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_TERMINALRESPONSEL_4=0xf3
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_TERMINALRESPONSEL_5=0xf4
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_CANCELNOTIFICATION_1=0x100
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_COMPLETENOTIFYL_1=0x101
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_COMPLETENOTIFYL_2=0x102
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_COMPLETENOTIFYL_3=0x103
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_CONSTRUCTL_1=0xfe
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_CREATETERMINALRESPL_1=0x105
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_NEWL_1=0xfb
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_NEWL_2=0xfc
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_NEWL_3=0xfd
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_NOTIFY_1=0xff
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_TERMINALRESPONSEL_1=0x104
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_CANCELNOTIFICATION_1=0x10b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_1=0x10c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_2=0x10d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_3=0x10e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_4=0x10f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_5=0x110
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_6=0x111
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_7=0x112
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_CONSTRUCTL_1=0x109
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_CREATETERMINALRESPL_1=0x123
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_NEWL_1=0x106
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_NEWL_2=0x107
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_NEWL_3=0x108
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_NOTIFY_1=0x10a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEBEARERLISTL_1=0x120
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEBEARERLISTL_2=0x121
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEBEARERLISTL_3=0x122
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEBROWSERIDL_1=0x118
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEBROWSERIDL_2=0x119
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEPROVISIONINGFILELISTL_1=0x11d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEPROVISIONINGFILELISTL_2=0x11e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEPROVISIONINGFILELISTL_3=0x11f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEURLL_1=0x11a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEURLL_2=0x11b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEURLL_3=0x11c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_SETSSSTATUS_1=0x117
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_1=0x113
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_2=0x114
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_3=0x115
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_4=0x116
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_CANCELNOTIFICATION_1=0x129
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_1=0x12a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_2=0x12b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_3=0x12c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_4=0x12d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_5=0x12e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_6=0x12f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_7=0x130
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_8=0x131
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_9=0x132
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETETERMINALRESPDATAL_1=0x13a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETEUPDATEACCTECH_1=0x13e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETEUPDATEIMEI_1=0x13f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETEUPDATELOCALINFO_1=0x13b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETEUPDATENETINFO_1=0x13c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETEUPDATETIMEZONE_1=0x140
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETEUPDATETIMINGADVANDMESTATUS_1=0x13d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_CONSTRUCTL_1=0x127
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_1=0x136
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_2=0x137
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_3=0x138
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_4=0x139
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_NEWL_1=0x124
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_NEWL_2=0x125
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_NEWL_3=0x126
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_NOTIFY_1=0x128
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_SETDATETIMETIMEZONE_1=0x142
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_SETINFORMATIONNMR_1=0x143
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_TERMINALRESPONSEL_1=0x133
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_TERMINALRESPONSEL_2=0x134
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_TERMINALRESPONSEL_3=0x135
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMORETIME_COMPLETENOTIFYL_1=0x161
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMORETIME_CONSTRUCTL_1=0x160
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMORETIME_CREATETERMINALRESPL_1=0x162
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMORETIME_NEWL_1=0x15d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMORETIME_NEWL_2=0x15e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMORETIME_NEWL_3=0x15f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_ACTIVATIONSTATUS_1=0x155
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_CANCELNOTIFICATION_1=0x14a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_CLEANADDRESSDATA_1=0x156
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_1=0x14b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_2=0x14c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_3=0x14d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_4=0x14e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_5=0x14f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_6=0x150
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_7=0x151
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_CONSTRUCTL_1=0x147
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_CONSTRUCTL_2=0x148
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_CREATEMOSMSCTRLENVELOPEL_1=0x152
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_CREATEMOSMSCTRLENVELOPEL_2=0x153
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_NEWL_1=0x144
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_NEWL_2=0x145
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_NEWL_3=0x146
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_NOTIFY_1=0x149
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_1=0x157
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_2=0x158
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_3=0x159
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_4=0x15a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_5=0x15b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_SETACTIVATIONSTATUS_1=0x154
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_VERIFYNOTIFICATIONDATA_1=0x15c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_CANCELNOTIFICATION_1=0x168
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_1=0x169
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_10=0x172
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_11=0x173
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_12=0x174
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_13=0x175
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_14=0x176
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_15=0x177
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_16=0x178
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_2=0x16a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_3=0x16b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_4=0x16c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_5=0x16d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_6=0x16e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_7=0x16f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_8=0x170
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_9=0x171
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_CONSTRUCTL_1=0x166
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_CREATETERMINALRESPL_1=0x17e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_CREATETERMINALRESPL_2=0x17f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_CREATETERMINALRESPL_3=0x180
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_NEWL_1=0x163
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_NEWL_2=0x164
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_NEWL_3=0x165
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_NOTIFY_1=0x167
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_1=0x179
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_2=0x17a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_3=0x17b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_4=0x17c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_5=0x17d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_CANCELNOTIFICATION_1=0x186
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_1=0x187
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_2=0x188
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_3=0x189
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_4=0x18a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_5=0x18b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_CONSTRUCTL_1=0x184
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_CREATETERMINALRESPL_1=0x190
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_NEWL_1=0x181
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_NEWL_2=0x182
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_NEWL_3=0x183
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_NOTIFY_1=0x185
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_1=0x18c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_2=0x18d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_3=0x18e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_4=0x18f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINGOFF_COMPLETENOTIFYL_1=0x19d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINGOFF_CONSTRUCTL_1=0x19c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINGOFF_CREATETERMINALRESPL_1=0x19e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINGOFF_CREATETERMINALRESPL_2=0x19f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINGOFF_NEWL_1=0x199
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINGOFF_NEWL_2=0x19a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINGOFF_NEWL_3=0x19b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_COMPLETENOTIFYL_1=0x195
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_COMPLETENOTIFYL_2=0x196
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_CONSTRUCTL_1=0x194
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_CREATETERMINALRESPL_1=0x197
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_CREATETERMINALRESPL_2=0x198
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_NEWL_1=0x191
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_NEWL_2=0x192
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_NEWL_3=0x193
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_CANCELNOTIFICATION_1=0x1a5
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_1=0x1a6
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_2=0x1a7
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_3=0x1a8
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_4=0x1a9
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_CONSTRUCTL_1=0x1a3
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_CREATETERMINALRESPL_1=0x1ad
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_NEWL_1=0x1a0
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_NEWL_2=0x1a1
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_NEWL_3=0x1a2
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_NOTIFY_1=0x1a4
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_TERMINALRESPONSEL_1=0x1aa
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_TERMINALRESPONSEL_2=0x1ab
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_TERMINALRESPONSEL_3=0x1ac
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_CANCELNOTIFICATION_1=0x1b4
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_CANCELREFRESHREQUIREDNOTIFICATION_1=0x1b5
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETEIMSICHANGE_1=0x1c6
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETEIMSICHANGE_2=0x1c7
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_1=0x1b6
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_10=0x1bf
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_11=0x1c0
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_12=0x1c1
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_13=0x1c2
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_14=0x1c3
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_2=0x1b7
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_3=0x1b8
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_4=0x1b9
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_5=0x1ba
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_6=0x1bb
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_7=0x1bc
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_8=0x1bd
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_9=0x1be
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETEREQUEST1_1=0x1ce
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETEREQUEST1_2=0x1cf
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETEREQUEST_1=0x1cc
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETEREQUEST_2=0x1cd
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETETERMINALRESPDATAL_1=0x1cb
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_CONSTRUCTL_1=0x1b1
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_CREATETERMINALRESPL_1=0x1c8
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_NEWL_1=0x1ae
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_NEWL_2=0x1af
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_NEWL_3=0x1b0
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_NOTIFYREFRESHREQUIRED_1=0x1b3
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_NOTIFY_1=0x1b2
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_REFRESHALLOWEDL_1=0x1c9
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_REFRESHALLOWEDL_2=0x1ca
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_TERMINALRESPONSEL_1=0x1c4
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_TERMINALRESPONSEL_2=0x1c5
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_CANCELNOTIFICATION_1=0x1d5
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_1=0x1d6
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_2=0x1d7
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_3=0x1d8
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_4=0x1d9
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_5=0x1da
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_6=0x1db
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_7=0x1dc
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_CONSTRUCTL_1=0x1d3
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_CREATETERMINALRESPL_1=0x1e4
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_HANDLEITEMSL_1=0x1e5
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_HANDLEITEMSL_2=0x1e6
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_HANDLEITEMSL_3=0x1e7
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_HANDLEITEMSL_4=0x1e8
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_HANDLEITEMSL_5=0x1e9
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_NEWL_1=0x1d0
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_NEWL_2=0x1d1
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_NEWL_3=0x1d2
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_NOTIFY_1=0x1d4
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_1=0x1dd
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_2=0x1de
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_3=0x1df
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_4=0x1e0
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_5=0x1e1
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_6=0x1e2
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_7=0x1e3
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_CANCELNOTIFICATION_1=0x1ef
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_COMPLETENOTIFYL_1=0x1f0
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_COMPLETENOTIFYL_2=0x1f1
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_COMPLETENOTIFYL_3=0x1f2
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_COMPLETENOTIFYL_4=0x1f3
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_COMPLETENOTIFYL_5=0x1f4
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_CONSTRUCTL_1=0x1ed
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_CREATETERMINALRESPL_1=0x1f8
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_CREATETERMINALRESPL_2=0x1f9
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_NEWL_1=0x1ea
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_NEWL_2=0x1eb
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_NEWL_3=0x1ec
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_NOTIFY_1=0x1ee
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_TERMINALRESPONSEL_1=0x1f5
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_TERMINALRESPONSEL_2=0x1f6
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_TERMINALRESPONSEL_3=0x1f7
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_CANCELNOTIFICATION_1=0x1ff
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_1=0x200
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_2=0x201
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_3=0x202
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_4=0x203
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_5=0x204
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_6=0x205
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_7=0x206
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_CONSTRUCTL_1=0x1fd
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_CREATETERMINALRESPL_1=0x20a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_NEWL_1=0x1fa
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_NEWL_2=0x1fb
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_NEWL_3=0x1fc
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_NOTIFY_1=0x1fe
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_TERMINALRESPONSEL_1=0x207
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_TERMINALRESPONSEL_2=0x208
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_TERMINALRESPONSEL_3=0x209
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CANCELNOTIFICATION_1=0x210
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CHECKTPDU_1=0x224
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CHECKTPDU_2=0x225
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CHECKTPDU_3=0x226
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CHECKTPDU_4=0x227
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CHECKTPDU_5=0x228
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_COMPLETENOTIFYL_1=0x211
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_COMPLETENOTIFYL_2=0x212
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_COMPLETENOTIFYL_3=0x213
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_COMPLETENOTIFYL_4=0x214
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_COMPLETENOTIFYL_5=0x215
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_COMPLETENOTIFYL_6=0x216
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CONSTRUCTL_1=0x20e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CREATETERMINALRESPL_1=0x21b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CREATETERMINALRESPL_2=0x21c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_GETTPDCS_1=0x22a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_GETTPUDL_1=0x229
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_NEWL_1=0x20b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_NEWL_2=0x20c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_NEWL_3=0x20d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_NOTIFY_1=0x20f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_PACKSMS_1=0x22b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_PACKSMS_2=0x22c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_PACKSMS_3=0x22d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_1=0x21d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_2=0x21e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_3=0x21f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_4=0x220
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_5=0x221
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_6=0x222
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_7=0x223
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_TERMINALRESPONSEL_1=0x217
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_TERMINALRESPONSEL_2=0x218
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_TERMINALRESPONSEL_3=0x219
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_TERMINALRESPONSEL_4=0x21a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CANCELNOTIFICATION_1=0x233
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CHECKCALLFORWARDING_1=0x23f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CHECKCALLFORWARDING_2=0x240
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_1=0x241
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_2=0x242
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_3=0x243
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_COMPLETENOTIFYL_1=0x234
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_COMPLETENOTIFYL_2=0x235
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_COMPLETENOTIFYL_3=0x236
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_COMPLETENOTIFYL_4=0x237
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_COMPLETENOTIFYL_5=0x238
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_COMPLETENOTIFYL_6=0x239
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_COMPLETENOTIFYL_7=0x23a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CONSTRUCTL_1=0x231
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CREATETERMINALRESPL_1=0x23e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_NEWL_1=0x22e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_NEWL_2=0x22f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_NEWL_3=0x230
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_NOTIFY_1=0x232
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_TERMINALRESPONSEL_1=0x23b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_TERMINALRESPONSEL_2=0x23c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_TERMINALRESPONSEL_3=0x23d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_CANCELNOTIFICATION_1=0x249
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_1=0x24a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_2=0x24b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_3=0x24c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_4=0x24d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_5=0x24e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_6=0x24f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_7=0x250
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_CONSTRUCTL_1=0x247
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_CREATETERMINALRESPL_1=0x255
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_CREATETERMINALRESPL_2=0x256
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_NEWL_1=0x244
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_NEWL_2=0x245
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_NEWL_3=0x246
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_NOTIFY_1=0x248
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_1=0x251
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_2=0x252
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_3=0x253
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_4=0x254
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_CANCELNOTIFICATION_1=0x25d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_1=0x25e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_10=0x267
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_11=0x268
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_12=0x269
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_13=0x26a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_14=0x26b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_15=0x26c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_16=0x26d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_17=0x26e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_2=0x25f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_3=0x260
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_4=0x261
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_5=0x262
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_6=0x263
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_7=0x264
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_8=0x265
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_9=0x266
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_CONSTRUCTL_1=0x25a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_CREATETERMINALRESPL_1=0x272
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_CREATETERMINALRESPL_2=0x273
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_NEWL_1=0x257
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_NEWL_2=0x258
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_NEWL_3=0x259
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_NOTIFY_1=0x25b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_NOTIFY_2=0x25c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_STORECALLCONNECTEDEVENT_1=0x274
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_TERMINALRESPONSEL_1=0x26f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_TERMINALRESPONSEL_2=0x270
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_TERMINALRESPONSEL_3=0x271
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_CANCELNOTIFICATION_1=0x27a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_1=0x27b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_2=0x27c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_3=0x27d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_4=0x27e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_5=0x27f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_CONSTRUCTL_1=0x278
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_CREATETERMINALRESPL_1=0x284
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_NEWL_1=0x275
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_NEWL_2=0x276
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_NEWL_3=0x277
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_NOTIFY_1=0x279
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_1=0x280
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_2=0x281
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_3=0x282
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_4=0x283
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_CANCELNOTIFICATION_1=0x28a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_COMPLETENOTIFYL_1=0x28b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_COMPLETENOTIFYL_2=0x28c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_COMPLETENOTIFYL_3=0x28d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_CONSTRUCTL_1=0x288
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_CREATETERMINALRESPL_1=0x291
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_NEWL_1=0x285
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_NEWL_2=0x286
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_NEWL_3=0x287
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_NOTIFY_1=0x289
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSEL_1=0x28e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSEL_2=0x28f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSEL_3=0x290
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_CANCELNOTIFICATION_1=0x297
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_1=0x298
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_10=0x2a1
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_11=0x2a2
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_12=0x2a3
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_13=0x2a4
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_14=0x2a5
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_15=0x2a6
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_16=0x2a7
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_17=0x2a8
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_18=0x2a9
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_2=0x299
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_3=0x29a
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_4=0x29b
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_5=0x29c
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_6=0x29d
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_7=0x29e
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_8=0x29f
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_9=0x2a0
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_CONSTRUCTL_1=0x295
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_CREATETERMINALRESPL_1=0x2ac
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_NEWL_1=0x292
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_NEWL_2=0x293
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_NEWL_3=0x294
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_NOTIFY_1=0x296
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_TERMINALRESPONSEL_1=0x2aa
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_TERMINALRESPONSEL_2=0x2ab
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_CANCELNOTIFICATION_1=0x2b2
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_COMPLETENOTIFYL_1=0x2b3
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_COMPLETENOTIFYL_2=0x2b4
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_CONSTRUCTL_1=0x2b0
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_NEWL_1=0x2ad
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_NEWL_2=0x2ae
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_NEWL_3=0x2af
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_NOTIFY_1=0x2b1
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_1=0x2b9
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_2=0x2ba
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_3=0x2bb
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_4=0x2bc
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_5=0x2bd
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_6=0x2be
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_7=0x2bf
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_CONSTRUCTL_1=0x2b8
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_CONVERTTOSECONDS_1=0x2c1
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_CREATETERMINALRESPL_1=0x2c0
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_NEWL_1=0x2b5
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_NEWL_2=0x2b6
-[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_NEWL_3=0x2b7
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_BEAT_1=0x2c6
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_CHECKTIMERTABLE_1=0x2c8
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_CONSTRUCTL_1=0x2c2
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_CTOR_1=0x2c3
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_CURRENTVALUEOFTIMERBYID_1=0x2ca
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_DELETETIMERBYID_1=0x2c9
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_SETPROACTIVECOMMANDONGOINGSTATUS_1=0x2cb
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_SETPROACTIVECOMMANDONGOINGSTATUS_2=0x2cc
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_START_1=0x2c4
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_STOP_1=0x2c5
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_SYNCHRONIZE_1=0x2c7
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_TTIMER1_1=0x2ce
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_TTIMER2_1=0x2cf
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_TTIMER3_1=0x2d0
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_TTIMER3_2=0x2d1
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_TTIMER4_1=0x2d2
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_TTIMER4_2=0x2d3
-[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_TTIMER_1=0x2cd
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_CONSTRUCTL_1=0x301
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_NEWL_1=0x2fd
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_NEWL_2=0x2fe
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_NEWL_3=0x2ff
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_NEWL_4=0x300
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_1=0x307
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_2=0x308
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_3=0x309
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_4=0x30a
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_SETTSYREQHANDLE_1=0x304
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_SETTSYREQHANDLE_2=0x305
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_SETTSYREQHANDLE_3=0x306
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_TSYREQHANDLE_1=0x302
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_TSYREQHANDLE_2=0x303
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_CANCELSERVICE_1=0x2e0
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_CANCELSERVICE_2=0x2e1
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_COMPLETESENDSMSMESSAGE_1=0x2f0
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_CONSTRUCTL_1=0x2d8
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_CONSTRUCTL_2=0x2d9
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_DEREGISTERNOTIFICATION_1=0x2e4
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_DEREGISTERNOTIFICATION_2=0x2e5
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_DOEXTFUNCL_1=0x2f5
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_DOEXTFUNCL_2=0x2f6
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_EXTFUNC_1=0x2da
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_EXTFUNC_2=0x2db
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_EXTFUNC_3=0x2dc
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_GETREQHANDLETYPE_1=0x2ef
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_GETSATREQHANDLESTORE_1=0x2ee
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_ISMOSMCONTROLBYSIMACTIVATED_1=0x2f1
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_ISSIMORIGINATEDCALL_1=0x2f2
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_MENUSELECTIONL_1=0x2f7
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_MENUSELECTIONL_2=0x2f8
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_MESSAGEMANAGER_1=0x2ec
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_NEWL_1=0x2d4
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_NEWL_2=0x2d5
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_NEWL_3=0x2d6
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_NEWL_4=0x2d7
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_NUMBEROFSLOTSL_1=0x2e6
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_NUMBEROFSLOTSL_2=0x2e7
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_REGISTERNOTIFICATION_1=0x2e2
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_REGISTERNOTIFICATION_2=0x2e3
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_REQCOMPLETED_1=0x2e8
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_REQMODEL_1=0x2de
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_REQMODEL_2=0x2df
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SATCCTSY_1=0x2ed
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SAVEREQHANDLE_1=0x2dd
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SENDMESSAGENOLOGGING_1=0x2f9
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SENDMESSAGENOLOGGING_2=0x2fa
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SENDMESSAGENOLOGGING_3=0x2fb
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SENDMESSAGENOLOGGING_4=0x2fc
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SETSETUPCALLSTATUS_1=0x2ea
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SETTONNPI_1=0x2f4
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SETUPEVENTLIST_1=0x2eb
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_STORECALLCONNECTEDEVENT_1=0x2e9
-[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_STOREPROACTIVEADDRESS_1=0x2f3
-[TRACE]TRACE_INTERNALS[0x88]_CTSYDELEGATES_DEREGISTERTSYOBJECT_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CTSYDELEGATES_GETTSYOBJECT_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CTSYDELEGATES_REGISTERTSYOBJECT_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_TSATEVENTLIST_ADDTOEVENTLIST_1=0x30e
-[TRACE]TRACE_INTERNALS[0x88]_TSATEVENTLIST_CTOR_1=0x31e
-[TRACE]TRACE_INTERNALS[0x88]_TSATEVENTLIST_ISENABLED_1=0x30b
-[TRACE]TRACE_INTERNALS[0x88]_TSATEVENTLIST_ISENABLED_2=0x30c
-[TRACE]TRACE_INTERNALS[0x88]_TSATEVENTLIST_REMOVEFROMEVENTLIST_1=0x30d
-[TRACE]TRACE_INTERNALS[0x88]_TSATEVENTLIST_SETEVENTLIST_1=0x30f

--- a/telephonyserverplugins/simatktsy/utility/src/cbertlv.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/utility/src/cbertlv.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -21,13 +21,8 @@
 
 
 //  Include Files  
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cbertlvTraces.h"
-#endif
-
 #include "CBerTlv.h"				// Header of this class
+#include "tflogger.h"				// For logging
 
 //  External Data Structures  
 //    none
@@ -81,7 +76,7 @@
         TInt itemNbr                // Item number
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CBERTLV_TLVBYTAGVALUE_1, "UTILITY: CBerTlv::TlvByTagValue");
+    TFLOGSTRING("UTILITY: CBerTlv::TlvByTagValue");
     TInt currentTlv( 0 );
     TInt tlvLength( 0 );
     TInt index( 0 );
@@ -151,7 +146,7 @@
         TUint8 aTlvTagValue         // Tag of TLV to find
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CBERTLV_TLVBYTAGVALUEMULTI_1, "UTILITY: CBerTlv::TlvByTagValueMulti");
+    TFLOGSTRING("UTILITY: CBerTlv::TlvByTagValueMulti");
     TInt currentTlv( 0 );
     TInt16 tlvLength( 0 );
     TInt indMulti( 0 );

--- a/telephonyserverplugins/simatktsy/utility/src/ctlv.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/utility/src/ctlv.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -21,12 +21,7 @@
 
 
 //  Include Files  
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ctlvTraces.h"
-#endif
-
+#include "tflogger.h"				// For logging
 #include "CTlv.h"				    // Header of this class
 #include "TSatUtility.h"			// Utility methods
 
@@ -53,7 +48,7 @@
         // None
         ) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_DATA_1, "UTILITY: CTlvBase::Data");
+    TFLOGSTRING("UTILITY: CTlvBase::Data");
     return iData;
     }
 
@@ -68,7 +63,7 @@
         TPtrC8 aData
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_SETDATA_1, "UTILITY: CTlvBase::SetData");
+    TFLOGSTRING("UTILITY: CTlvBase::SetData");
     iData.Set( aData );
     }
 
@@ -82,7 +77,7 @@
         // None
         ) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_GETSIZE_1, "UTILITY: CTlvBase::GetSize");
+    TFLOGSTRING("UTILITY: CTlvBase::GetSize");
     return iData.Length();
     }
 
@@ -96,7 +91,7 @@
         // None
         ) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_GETTAG_1, "UTILITY: CTlvBase::GetTag");
+    TFLOGSTRING("UTILITY: CTlvBase::GetTag");
     return TUint8(iData[0] & KTagValueMask);
     }
 
@@ -110,7 +105,7 @@
         // None
         ) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_GETCOMPREHENSIONREQUIRED_1, "UTILITY: CTlvBase::GetComprehensionRequired");
+    TFLOGSTRING("UTILITY: CTlvBase::GetComprehensionRequired");
     return (iData[0] & KTagCrMask) ? ETrue : EFalse;
     }
 
@@ -124,7 +119,7 @@
         // None
         ) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_GETLENGTH_1, "UTILITY: CTlvBase::GetLength");
+    TFLOGSTRING("UTILITY: CTlvBase::GetLength");
     return (KTwoByteLengthCoding == iData[KTlvLengthStartPosition]) ?
         iData[KTlvLengthStartPosition + 1] :
         iData[KTlvLengthStartPosition];
@@ -140,7 +135,7 @@
         // None
         ) const
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_GETVALUE_1, "UTILITY: CTlvBase::GetValue");
+    TFLOGSTRING("UTILITY: CTlvBase::GetValue");
     TInt offset = (KTwoByteLengthCoding == iData[1]) ? 1 : 0;
     return iData.Mid(2+offset, iData[1+offset]);
     }
@@ -168,7 +163,7 @@
         TTlvSpesificDataType aType // Info spesific data type
         )    
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETSHORTINFO_1, "UTILITY: CTlv::GetShortInfo, type: %d", aType);
+    TFLOGSTRING2("UTILITY: CTlv::GetShortInfo, type: %d", aType);
     // Information is generally at index 2.
     TInt ind ( KTlvDataAreaStartPosition ); 
     TUint8 offset( 0 );
@@ -272,7 +267,7 @@
             } 
         default:
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETSHORTINFO_2, "UTILITY: CTlv::GetShortInfo, Type unknown");
+            TFLOGSTRING("UTILITY: CTlv::GetShortInfo, Type unknown");
             break;	
             }                                                                                                                                                              	
         }
@@ -290,7 +285,7 @@
         TTlvSpesificDataType aType //Info spesific data type
         )    
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETDATA_1, "UTILITY: CTlv::GetData, Data length: %d", iData.Length());
+    TFLOGSTRING2("UTILITY: CTlv::GetData, Data length: %d", iData.Length());
     // Information is generally at index 2.
     TInt ind ( 2 ); 
     TUint8 offset( 0 );
@@ -384,19 +379,20 @@
                 }
             else
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETDATA_2, "UTILITY: CTlv::GetData, Data length 0");
+                TFLOGSTRING("UTILITY: CTlv::GetData, Data length 0");
                 return 0;
                 }            
             break;	
             }
         default:
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETDATA_3, "UTILITY: CTlv::GetData, Type unknown");
+            TFLOGSTRING("UTILITY: CTlv::GetData, Type unknown");
             break;	
             } 
         }
 
-    OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETDATA_4, "UTILITY: CTlv::GetData, length: %d, ind: %d", length, ind);
+    TFLOGSTRING3("UTILITY: CTlv::GetData, length: %d, ind: %d", 
+        length, ind);
     return iData.Mid( ind, length );
     }
 
@@ -410,7 +406,7 @@
         TTlvSpesificDataType aType // Info spesific data type
         )
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETLONGINFO_1, "UTILITY: CTlv::GetLongInfo, type: %d", aType);
+    TFLOGSTRING2("UTILITY: CTlv::GetLongInfo, type: %d", aType);
     TUint16 ret( 0x0000 );
 
     switch( aType )
@@ -454,7 +450,7 @@
             }   
         default:
             {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETLONGINFO_2, "UTILITY: CTlv::GetLongInfo, Type unknown");
+            TFLOGSTRING("UTILITY: CTlv::GetLongInfo, Type unknown");
             break;
             }
         }

--- a/telephonyserverplugins/simatktsy/utility/src/tsatutility.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/utility/src/tsatutility.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -20,13 +20,8 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tsatutilityTraces.h"
-#endif
-
 #include "tsatutility.h"        // Class header
+#include "tflogger.h"           // TFLOGSTRING
 #include <ctsy/serviceapi/cmmsmsutility.h>		// TON and NPI constants
 
 // -----------------------------------------------------------------------------
@@ -41,7 +36,7 @@
         RSat::TNumberingPlan* aNpi      
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_TONANDNPI_1,  "UTILITY: TSatUtility::TonAndNpi" );
+    TFLOGSTRING( "UTILITY: TSatUtility::TonAndNpi" );
     TInt ton( ( aTonAndNpi >> 4 ) & KTONMask ); // TON mask value 0x07
 
     switch ( ton )
@@ -157,7 +152,7 @@
         TDes8& aTarget    
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_PACKED7TO8UNPACKED_1,  "UTILITY: TSatUtility::Packed7to8Unpacked" );
+    TFLOGSTRING( "UTILITY: TSatUtility::Packed7to8Unpacked" );
     TInt ret( KErrNone );
     // The string is in packed GSM default alphabet format.
     // Converted to 8-bit format
@@ -203,7 +198,9 @@
     if ( length < sourceLength )
         {
         ret = KErrOverflow;
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_PACKED7TO8UNPACKED_2,  "UTILITY: TSatUtility::Packed7to8Unpacked,Input data too long. %d bytes could not be converted", ( sourceLength - length ) );
+        TFLOGSTRING2( "UTILITY: TSatUtility::Packed7to8Unpacked,\
+            Input data too long. %d bytes could not be converted", 
+            ( sourceLength - length ) );
         }
   
     return ret;
@@ -220,7 +217,7 @@
         TDes8& aOutput   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_UCSTOPACKED7_1,  "UTILITY: TSatUtility::UCSToPacked7" );
+    TFLOGSTRING( "UTILITY: TSatUtility::UCSToPacked7" );
     
     TBuf8<KMaxUssdStringLengthInBytes> string;
     
@@ -287,7 +284,7 @@
         TDes8& aOutput   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_BCDTOASCII_1,  "UTILITY: TSatUtility::BCDToAscii" );
+    TFLOGSTRING( "UTILITY: TSatUtility::BCDToAscii" );
     TInt ret( KErrNone );
     
     // Convert Abbreviated dialling numbers format back to ASCII format.
@@ -314,7 +311,8 @@
     if ( length < aInput.Length() )
         {
         ret = KErrOverflow;
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_BCDTOASCII_2,  "UTILITY: TSatUtility::BCDToAscii,Input data too long.%d bytes could not be converted", ( aInput.Length() - length ) );
+        TFLOGSTRING2( "UTILITY: TSatUtility::BCDToAscii,Input data too long.\
+            %d bytes could not be converted", ( aInput.Length() - length ) );
         }    
         
     return ret;
@@ -332,7 +330,7 @@
         TDes8& aOutput        
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_ASCIITOBCD_1,  "UTILITY: TSatUtility::AsciiToBCD" );
+    TFLOGSTRING( "UTILITY: TSatUtility::AsciiToBCD" );
     TInt ret( KErrNone );
     TInt i;
     TInt j;
@@ -375,7 +373,7 @@
             	}
             else
                 {
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_ASCIITOBCD_2,  "UTILITY: TSatUtility::AsciiToBCD, Overflow!" );
+                TFLOGSTRING( "UTILITY: TSatUtility::AsciiToBCD, Overflow!" );
                 ret = KErrOverflow;
                 }
                 
@@ -383,7 +381,8 @@
             }
         else
             {
-            OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_ASCIITOBCD_3, "UTILITY: TSatUtility::AsciiToBCD -- dropped character %d at i=%d", TInt( aInput[i] ), i );
+            TFLOGSTRING3("UTILITY: TSatUtility::AsciiToBCD -- dropped \
+                character %d at i=%d", TInt( aInput[i] ), i );
             }
             
         } // For
@@ -409,7 +408,7 @@
         TDes8& aOutput   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_REMOVEWILDANDEXPANSIONDIGIT_1,  "UTILITY: TSatUtility::RemoveWildAndExpansionDigit" );
+    TFLOGSTRING( "UTILITY: TSatUtility::RemoveWildAndExpansionDigit" );
     aOutput.Zero();    
     TUint8 i( 0 );
     TInt maxLength = aOutput.MaxLength();
@@ -437,7 +436,7 @@
         TDes& aAlphaId  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_SETALPHAID_1,  "UTILITY: TSatUtility::SetAlphaId" );
+    TFLOGSTRING( "UTILITY: TSatUtility::SetAlphaId" );
     if ( ( KUCS2ArabicCoding == aRawData[0] )
         || ( KUCS2GreekCoding == aRawData[0] )
         || ( KUCS2TurkishCoding == aRawData[0] ) )
@@ -464,7 +463,7 @@
         const TInt aTime  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_CONVERTTOSEMIOCTET_1,  "UTILITY: TSatUtility::ConvertToSemiOctet" );
+    TFLOGSTRING( "UTILITY: TSatUtility::ConvertToSemiOctet" );
     // Converting given time to meet the TP-Service-Centre-Time-Stamp format in
     // 3GPP TS 23.040.
 
@@ -485,7 +484,7 @@
         TDes16& aOutput  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_CONVERT7BITTOUNICODE16_1,  "UTILITY: TSatUtility::Convert7BitToUnicode16" );
+    TFLOGSTRING( "UTILITY: TSatUtility::Convert7BitToUnicode16" );
     TInt i( 0 );
     
     aOutput.Zero();
@@ -583,7 +582,7 @@
         TDes8& aOutput   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_CONVERTUNICODE16TO7BIT_1,  "UTILITY: TSatUtility::ConvertUnicode16To7Bit" );
+    TFLOGSTRING( "UTILITY: TSatUtility::ConvertUnicode16To7Bit" );
     TInt i( 0 );
     TInt j( 0 );
     TInt ret( KErrNone );
@@ -617,7 +616,9 @@
     if ( length < aInput.Length() )
         {
         ret = KErrOverflow;
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_CONVERTUNICODE16TO7BIT_2,  "UTILITY: TSatUtility::ConvertUnicode16To7Bit,Input data too long. %d bytes could not be converted", ( aInput.Length() - length ) );
+        TFLOGSTRING2( "UTILITY: TSatUtility::ConvertUnicode16To7Bit,\
+            Input data too long. %d bytes could not be converted", 
+            ( aInput.Length() - length ) );
         }
         
     return ret;
@@ -634,7 +635,7 @@
         RSat::TDuration& aTDuration   
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_FILLDURATIONSTRUCTURE_1,  "UTILITY: TSatUtility::FillDurationStructure" );
+    TFLOGSTRING( "UTILITY: TSatUtility::FillDurationStructure" );
     CTlv duration;
     aTDuration.iTimeUnit = RSat::ENoDurationAvailable;
     TInt returnValue( aBerTlv.TlvByTagValue( 
@@ -685,7 +686,7 @@
         const TInt aItemNmb            
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_FILLICONSTRUCTURE_1,  "UTILITY: TSatUtility::FillIconStructure" );
+    TFLOGSTRING( "UTILITY: TSatUtility::FillIconStructure" );
     CTlv iconId;
     aTIconId.iQualifier = RSat::ENoIconId;
     TInt returnValue( aBerTlv.TlvByTagValue( &iconId, KTlvIconIdentifierTag, 
@@ -718,7 +719,7 @@
         TDes& aUnicodeOutput   
         ) 
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_SETTEXT_1,  "UTILITY: TSatUtility::SetText" );
+    TFLOGSTRING( "UTILITY: TSatUtility::SetText" );
     if ( aTextTlv.GetLength() )
         {
         TPtrC8 sourceString;
@@ -779,7 +780,7 @@
         TDes& aTarget 
         )
     {   
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_CONVERTALPHAFIELDSTOUNICODE_1,  "UTILITY: TSatUtility::ConvertAlphaFieldsToUnicode" );
+    TFLOGSTRING( "UTILITY: TSatUtility::ConvertAlphaFieldsToUnicode" );
     // ArabicCoding, GreekCoding and TurkishCoding have different coding 
     // methods. There is a tag for each type of alphabet (resp. 80, 81 or 82) 
     // before the text, and there are base pointers used for expanding 1 byte 
@@ -882,14 +883,14 @@
         TDes8& aTarget            
         )
     {   
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPY16TO8LE_1,  "UTILITY: TSatUtility::Copy16to8LE" );
+    TFLOGSTRING( "UTILITY: TSatUtility::Copy16to8LE" );
     TInt ret( KErrNone );
     TInt length( 0 );
     
     // Checks that data length are acceblable
     if ( aSource.Size() > aTarget.MaxSize() )
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPY16TO8LE_2,  "UTILITY: TSatUtility::Copy16to8LE, Length exceeded!" );
+        TFLOGSTRING( "UTILITY: TSatUtility::Copy16to8LE, Length exceeded!" );
         ret = KErrOverflow;
         length = ( aTarget.MaxSize() / 2 );
         }
@@ -919,7 +920,7 @@
         TDes16& aTarget         
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPY8TO16LE_1,  "UTILITY: TSatUtility::Copy8to16LE" );
+    TFLOGSTRING( "UTILITY: TSatUtility::Copy8to16LE" );    
     TInt ret( KErrNone );
     // Check out which string is the shortest and use its length as a limit
     TInt length ( Min( ( ( aSource.Length() / 2 ) * 2 ), aTarget.MaxSize() ) );
@@ -934,7 +935,9 @@
     if ( length < aSource.Length() )
         {
         ret = KErrOverflow;
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPY8TO16LE_2,  "UTILITY: TSatUtility::ConvertUnicode16To7Bit,Input data too long. %d bytes could not be converted", ( aSource.Length() - length ) );
+        TFLOGSTRING2( "UTILITY: TSatUtility::ConvertUnicode16To7Bit,\
+            Input data too long. %d bytes could not be converted", 
+            ( aSource.Length() - length ) );
         }
         
     return ret;
@@ -952,7 +955,7 @@
     	const TUint8 aDcs 
     	)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_DECODECBSDCS_1, "UTILITY: TSatUtility::DecodeCbsDcs");
+    TFLOGSTRING("UTILITY: TSatUtility::DecodeCbsDcs");
     
     // Constant values are not defined in order to
     // avoid confusion with too many constants names.
@@ -1035,7 +1038,7 @@
         default:
             {
             // the DCS value is reserved.
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_DECODECBSDCS_2, "UTILITY: TSatUtility::DecodeCbsDcs, reserved value");
+            TFLOGSTRING("UTILITY: TSatUtility::DecodeCbsDcs, reserved value");
             break;
             }
         }
@@ -1055,7 +1058,7 @@
         const TInt aIndex         
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPYTWO8TOONE16LE_1, "UTILITY: TSatUtility::CopyTwo8toOne16LE");
+    TFLOGSTRING("UTILITY: TSatUtility::CopyTwo8toOne16LE");
     TInt ret( KErrNone );
     // Check first that we dont try to read data that is not there..
     if ( aSource.Length() > aIndex + 1 )
@@ -1066,7 +1069,8 @@
     else
         {
         ret = KErrOverflow;
-        OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPYTWO8TOONE16LE_2, "UTILITY: TSatUtility::CopyTwo8toOne16LE, Index too highIndex: %d, Source data length: %d", aIndex, aSource.Length() );
+        TFLOGSTRING3("UTILITY: TSatUtility::CopyTwo8toOne16LE, Index too high\
+            Index: %d, Source data length: %d", aIndex, aSource.Length() );
         }
         
     return ret;

--- a/telephonyserverplugins/simatktsy/utility/src/ttlv.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/utility/src/ttlv.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -21,13 +21,8 @@
 
 
 //  Include Files  
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ttlvTraces.h"
-#endif
-
 #include "TTlv.h"				    // Header of this class
+#include "tflogger.h"				// For logging
 
 //  External Data Structures  
 //    none
@@ -80,7 +75,7 @@
         TUint8 aTag 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_BEGIN_1, "UTILITY: TTlvBase::Begin");
+    TFLOGSTRING("UTILITY: TTlvBase::Begin"); 
     iData.Zero();
     iData.Append( aTag );
     iData.Append( 0 );
@@ -96,7 +91,7 @@
         TUint8 aTag 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_ADDTAG_1, "UTILITY: TTlvBase::AddTag");
+    TFLOGSTRING("UTILITY: TTlvBase::AddTag");
     iData.Append( aTag );           // tag
     iData.Append( 0 );              // length
     iLenIndex = iData.Length() - 1; // index to tag length
@@ -112,7 +107,7 @@
         TUint8 aValue  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_ADDBYTE_1, "UTILITY: TTlvBase::AddByte");
+    TFLOGSTRING("UTILITY: TTlvBase::AddByte");
     iData.Append( aValue );
     iData[iLenIndex]++;
     }
@@ -127,7 +122,7 @@
         const TDesC8& aValue 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_ADDDATA_1, "UTILITY: TTlvBase::AddData");
+    TFLOGSTRING("UTILITY: TTlvBase::AddData");
     iData.Append( aValue );
     iData[ iLenIndex ] = static_cast<TUint8>( iData[ iLenIndex ] + 
         aValue.Length() );
@@ -145,7 +140,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_END_1, "UTILITY: TTlvBase::End");
+    TFLOGSTRING("UTILITY: TTlvBase::End");
     _LIT8( KLenTag, "\x81" );
 
     TInt i( 3 ); // Index to tag length
@@ -186,7 +181,7 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_GETDATAWITHOUTTOPLEVELTAG_1, "UTILITY: TTlvBase::GetDataWithoutTopLevelTag");
+    TFLOGSTRING("UTILITY: TTlvBase::GetDataWithoutTopLevelTag");
     _LIT8( KLenTag, "\x81" );
 
     TInt i( 1 ); // Index to tag length

--- a/telephonyserverplugins/simtsy/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/group/bld.inf	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -19,14 +19,12 @@
  @file
 */
 
-
-#include "../testconfigfileparser/group/bld.inf"
-
-
 PRJ_EXPORTS
 
 ../inc/SimTsy.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(simtsy.h)
-
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../inc/Simlog.h /epoc32/include/simlog.h
+#endif
 ../group/simtsy.iby				/epoc32/rom/include/simtsy.iby
 
 ../SimTsyCPM/SimTsy.cmi				z:/private/101f7988/simtsy.cmi
@@ -110,5 +108,3 @@
 ../test/Te_SimSS/Te_SimSS.mmp
 ../test/Te_SimVoice/Te_SimVoice.mmp
 ../test/te_simeap/te_simeap.mmp
-
-

--- a/telephonyserverplugins/simtsy/group/simtsy.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/group/simtsy.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -26,6 +26,8 @@
 UID           0x10003D3C 0x100039c2
 VENDORID      0x70000001
 
+MACRO SIM_LOGGER
+
 SOURCEPATH  ../src
 SOURCE      CSimCall.cpp
 SOURCE      CSimDataCall.cpp
@@ -75,12 +77,12 @@
 SOURCE	    CSimMbmsPacketContext.cpp
 
 USERINCLUDE   	../inc
-USERINCLUDE 	../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY       efsrv.lib euser.lib etel.lib etelmm.lib 
-LIBRARY       testconfigfileparser.lib c32.lib etelpckt.lib
+LIBRARY       testconfigfileparser.lib c32.lib flogger.lib etelpckt.lib
+DEBUGLIBRARY  comsdbgutil.lib
 
 
 UNPAGED

--- a/telephonyserverplugins/simtsy/group/simtsy_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\test_config.txt"-"c:\testdata\configs\test_config.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimCed.cfg"-"c:\testdata\configs\Te_SimCed.cfg"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_Sim\Te_Sim_config1.txt"-"c:\testdata\configs\Te_Sim_config1.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_Sim\Te_Sim_config2.txt"-"c:\testdata\configs\Te_Sim_config2.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_Sim\Te_Sim_config3.txt"-"c:\testdata\configs\Te_Sim_config3.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_Sim\Te_Sim_config4.txt"-"c:\testdata\configs\Te_Sim_config4.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimData\Te_SimData_config.txt"-"c:\testdata\configs\Te_SimData_config.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\te_simeap\te_simeap_config.txt"-"c:\testdata\configs\te_simeap_config.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimMisc\Te_SimMisc_config.txt"-"c:\testdata\configs\Te_SimMisc_config.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimNetwork\Te_SimNetwork_config.txt"-"c:\testdata\configs\Te_SimNetwork_config.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimPacket\Te_SimPacket_config.txt"-"c:\testdata\configs\Te_SimPacket_config.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimPhBk\Te_SimPhBk_config.txt"-"c:\testdata\configs\Te_SimPhBk_config.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimSms\Te_SimSms_config.txt"-"c:\testdata\configs\Te_SimSms_config.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimSS\Te_SimSS_config.txt"-"c:\testdata\configs\Te_SimSS_config.txt"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimVoice\Te_SimVoice_config.txt"-"c:\testdata\configs\Te_SimVoice_config.txt"
-
-
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_Sim\Te_Sim.script"-"c:\testdata\scripts\Te_Sim.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimData\Te_SimData.script"-"c:\testdata\scripts\Te_SimData.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\te_simeap\te_simeap.script"-"c:\testdata\scripts\te_simeap.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimMisc\Te_SimMisc.script"-"c:\testdata\scripts\Te_SimMisc.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimNetwork\Te_SimNetwork.script"-"c:\testdata\scripts\Te_SimNetwork.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimPacket\Te_SimPacket.script"-"c:\testdata\scripts\Te_SimPacket.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimPhBk\Te_SimPhBk.script"-"c:\testdata\scripts\Te_SimPhBk.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimSms\Te_SimSms.script"-"c:\testdata\scripts\Te_SimSms.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimSS\Te_SimSS.script"-"c:\testdata\scripts\Te_SimSS.script"
-"\sf\os\cellularsrv\telephonyserverplugins\simtsy\test\Te_SimVoice\Te_SimVoice.script"-"c:\testdata\scripts\Te_SimVoice.script"
-
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/inc/Simlog.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,480 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef _SIMTSYLOG_H_
+#define _SIMTSYLOG_H_
+
+/**
+ *  @file
+ *
+ *  Logging macros for SimTSY. These use the Comms Debug Utility framework
+ *  (aka Flogger V2).
+ *
+ *  To enable logging create a file called "comsdbg.ini" in the Symbian OS
+ *  "C:\Logs\" directory which contains the following lines:
+ *
+ *    MEDIA FILE
+ *    LOG SIMTSY Common
+ *    LOG SIMTSY Config
+ *    LOG SIMTSY Phone
+ *    LOG SIMTSY Line
+ *    LOG SIMTSY Call
+ *    LOG SIMTSY Voice
+ *    LOG SIMTSY Data
+ *    LOG SIMTSY Network
+ *    LOG SIMTSY PhBk
+ *    LOG SIMTSY Misc
+ *    LOG SIMTSY Sms
+ *    LOG SIMTSY Packet
+ *    LOG SIMTSY Ss
+ *
+ *  Each line relates to a particular part of the SIMTSY, enabling you to
+ *  log only the parts of interest.
+ *
+ *  By default logging is only present on UDEB builds. To enable UREL logging
+ *  on a device, you will need to rebuild your ROM with UDEB SIMTSY components.
+ *
+ *  To enable logging on a device, place the "comsdbg.ini" file in the ROM
+ *  under the "Z:\Logs\" directory. The log file will be written in the
+ *  "C:\Logs\" directory on the device.
+ *
+ *  To enable logging to the serial port change the "MEDIA FILE" line to
+ *  "MEDIA SERIAL::1" or "MEDIA SERIAL::2". Note that this may no longer
+ *  work due to a defect in the Comms Debug Framework.
+ *
+ *  If you wish to have individual logs for each component, then use the
+ *  extractlog.pl utility found in the %EPOCROOT%\Epoc32\Tools\ directory. E.g.
+ *
+ *    extractlog.pl \EPOC32\WINSCW\C\LOGS\LOG.TXT
+ *
+ *  @internalComponent
+ */
+
+#include <comms-infras/commsdebugutility.h>
+#include <etelmm.h>
+#include "SimTsy.h"
+
+#ifdef _DEBUG
+#define _SIMTSY_LOGGING_ENABLED
+#endif
+
+
+#ifdef _SIMTSY_LOGGING_ENABLED
+
+#define SIMTSYFLOG1(N,A)                 { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC0(KSIMTSYSubSystem,(N),KLogString); \
+									  }
+#define SIMTSYFLOG2(N,A,B)               { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC1(KSIMTSYSubSystem,(N),KLogString,(B)); \
+									  }
+#define SIMTSYFLOG3(N,A,B,C)             { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC2(KSIMTSYSubSystem,(N),KLogString,(B),(C)); \
+									  }
+#define SIMTSYFLOG4(N,A,B,C,D)           { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC3(KSIMTSYSubSystem,(N),KLogString,(B),(C),(D)); \
+									  }
+#define SIMTSYFLOG5(N,A,B,C,D,E)         { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC4(KSIMTSYSubSystem,(N),KLogString,(B),(C),(D),(E)); \
+									  }
+#define SIMTSYFLOG6(N,A,B,C,D,E,F)       { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC5(KSIMTSYSubSystem,(N),KLogString,(B),(C),(D),(E),(F)); \
+									  }
+#define SIMTSYFLOG7(N,A,B,C,D,E,F,G)     { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC6(KSIMTSYSubSystem,(N),KLogString,(B),(C),(D),(E),(F),(G)); \
+									  }
+#define SIMTSYFLOG8(N,A,B,C,D,E,F,G,H)   { \
+									  _LIT8(KLogString, A); \
+									  __FLOG_STATIC7(KSIMTSYSubSystem,(N),KLogString,(B),(C),(D),(E),(F),(G),(H)); \
+									  }
+
+_LIT8(KSIMTSYCommon,	"Common");
+_LIT8(KSIMTSYConfig,	"Config");
+_LIT8(KSIMTSYPhone,		"Phone");
+_LIT8(KSIMTSYLine,		"Line");
+_LIT8(KSIMTSYCall,		"Call");
+_LIT8(KSIMTSYVoice,		"Voice");
+_LIT8(KSIMTSYData,		"Data");
+_LIT8(KSIMTSYNetwork,	"Network");
+_LIT8(KSIMTSYPhBk,		"PhBk");
+_LIT8(KSIMTSYMisc,		"Misc");
+_LIT8(KSIMTSYSms,		"Sms");
+_LIT8(KSIMTSYPacket,	"Packet");
+_LIT8(KSIMTSYSs,		"Ss");
+
+
+#define LOGSCOMMON1(A)                SIMTSYFLOG1(KSIMTSYCommon,A)
+#define LOGSCOMMON2(A,B)              SIMTSYFLOG2(KSIMTSYCommon,A,(B))
+#define LOGSCOMMON3(A,B,C)            SIMTSYFLOG3(KSIMTSYCommon,A,(B),(C))
+#define LOGSCOMMON4(A,B,C,D)          SIMTSYFLOG4(KSIMTSYCommon,A,(B),(C),(D))
+#define LOGSCOMMON5(A,B,C,D,E)        SIMTSYFLOG5(KSIMTSYCommon,A,(B),(C),(D),(E))
+#define LOGSCOMMON6(A,B,C,D,E,F)      SIMTSYFLOG6(KSIMTSYCommon,A,(B),(C),(D),(E),(F))
+#define LOGSCOMMON7(A,B,C,D,E,F,G)    SIMTSYFLOG7(KSIMTSYCommon,A,(B),(C),(D),(E),(F),(G))
+#define LOGSCOMMON8(A,B,C,D,E,F,G,H)  SIMTSYFLOG8(KSIMTSYCommon,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGSCOMMONTIMESTAMP()		  { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGSCOMMON5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+#define LOGCONFIG1(A)                 SIMTSYFLOG1(KSIMTSYConfig,A)
+#define LOGCONFIG2(A,B)               SIMTSYFLOG2(KSIMTSYConfig,A,(B))
+#define LOGCONFIG3(A,B,C)             SIMTSYFLOG3(KSIMTSYConfig,A,(B),(C))
+#define LOGCONFIG4(A,B,C,D)           SIMTSYFLOG4(KSIMTSYConfig,A,(B),(C),(D))
+#define LOGCONFIG5(A,B,C,D,E)         SIMTSYFLOG5(KSIMTSYConfig,A,(B),(C),(D),(E))
+#define LOGCONFIG6(A,B,C,D,E,F)       SIMTSYFLOG6(KSIMTSYConfig,A,(B),(C),(D),(E),(F))
+#define LOGCONFIG7(A,B,C,D,E,F,G)     SIMTSYFLOG7(KSIMTSYConfig,A,(B),(C),(D),(E),(F),(G))
+#define LOGCONFIG8(A,B,C,D,E,F,G,H)   SIMTSYFLOG8(KSIMTSYConfig,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGCONFIGTIMESTAMP()		  { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGCONFIG5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+#define LOGPARSERR(A,B,C,D)		  	  LOGCONFIG7("WARNING - CONFIGURATION FILE PARSING - %s at line: %d. Reading element no. %d (%s) from tag %S returned %d.",__FILE__,__LINE__,C,A,D,B)
+#define LOGPARSERREXP(A,B,C,D,E)	  LOGCONFIG8("WARNING - CONFIGURATION FILE PARSING - %s at line: %d. Reading element no. %d (%s) from tag %S returned %d, expected %d.",__FILE__,__LINE__,C,A,D,B,E)
+#define LOGPARSERRANGE(A,B,C,D,E)	  LOGCONFIG8("WARNING - CONFIGURATION FILE PARSING - %s at line: %d. Reading element no. %d (%s) from tag %S returned %d, expected %s.",__FILE__,__LINE__,C,A,D,B,E)
+
+#define LOGPHONE1(A)                  SIMTSYFLOG1(KSIMTSYPhone,A)
+#define LOGPHONE2(A,B)                SIMTSYFLOG2(KSIMTSYPhone,A,(B))
+#define LOGPHONE3(A,B,C)              SIMTSYFLOG3(KSIMTSYPhone,A,(B),(C))
+#define LOGPHONE4(A,B,C,D)            SIMTSYFLOG4(KSIMTSYPhone,A,(B),(C),(D))
+#define LOGPHONE5(A,B,C,D,E)          SIMTSYFLOG5(KSIMTSYPhone,A,(B),(C),(D),(E))
+#define LOGPHONE6(A,B,C,D,E,F)        SIMTSYFLOG6(KSIMTSYPhone,A,(B),(C),(D),(E),(F))
+#define LOGPHONE7(A,B,C,D,E,F,G)      SIMTSYFLOG7(KSIMTSYPhone,A,(B),(C),(D),(E),(F),(G))
+#define LOGPHONE8(A,B,C,D,E,F,G,H)    SIMTSYFLOG8(KSIMTSYPhone,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGPHONETIMESTAMP()		      { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGPHONE5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+
+#define LOGLINE1(A)       			  SIMTSYFLOG1(KSIMTSYLine,A)
+#define LOGLINE2(A,B)                 SIMTSYFLOG2(KSIMTSYLine,A,(B))
+#define LOGLINE3(A,B,C)               SIMTSYFLOG3(KSIMTSYLine,A,(B),(C))
+#define LOGLINE4(A,B,C,D)             SIMTSYFLOG4(KSIMTSYLine,A,(B),(C),(D))
+#define LOGLINE5(A,B,C,D,E)           SIMTSYFLOG5(KSIMTSYLine,A,(B),(C),(D),(E))
+#define LOGLINE6(A,B,C,D,E,F)         SIMTSYFLOG6(KSIMTSYLine,A,(B),(C),(D),(E),(F))
+#define LOGLINE7(A,B,C,D,E,F,G)       SIMTSYFLOG7(KSIMTSYLine,A,(B),(C),(D),(E),(F),(G))
+#define LOGLINE8(A,B,C,D,E,F,G,H)     SIMTSYFLOG8(KSIMTSYLine,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGLINETIMESTAMP()		      { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGLINE5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+#define LOGCALL1(A)                   SIMTSYFLOG1(KSIMTSYCall,A)
+#define LOGCALL2(A,B)                 SIMTSYFLOG2(KSIMTSYCall,A,(B))
+#define LOGCALL3(A,B,C)               SIMTSYFLOG3(KSIMTSYCall,A,(B),(C))
+#define LOGCALL4(A,B,C,D)             SIMTSYFLOG4(KSIMTSYCall,A,(B),(C),(D))
+#define LOGCALL5(A,B,C,D,E)           SIMTSYFLOG5(KSIMTSYCall,A,(B),(C),(D),(E))
+#define LOGCALL6(A,B,C,D,E,F)         SIMTSYFLOG6(KSIMTSYCall,A,(B),(C),(D),(E),(F))
+#define LOGCALL7(A,B,C,D,E,F,G)       SIMTSYFLOG7(KSIMTSYCall,A,(B),(C),(D),(E),(F),(G))
+#define LOGCALL8(A,B,C,D,E,F,G,H)     SIMTSYFLOG8(KSIMTSYCall,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGCALLTIMESTAMP()		  	  { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGCALL5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+#define LOGVOICE1(A)                  SIMTSYFLOG1(KSIMTSYVoice,A)
+#define LOGVOICE2(A,B)                SIMTSYFLOG2(KSIMTSYVoice,A,(B))
+#define LOGVOICE3(A,B,C)              SIMTSYFLOG3(KSIMTSYVoice,A,(B),(C))
+#define LOGVOICE4(A,B,C,D)            SIMTSYFLOG4(KSIMTSYVoice,A,(B),(C),(D))
+#define LOGVOICE5(A,B,C,D,E)          SIMTSYFLOG5(KSIMTSYVoice,A,(B),(C),(D),(E))
+#define LOGVOICE6(A,B,C,D,E,F)        SIMTSYFLOG6(KSIMTSYVoice,A,(B),(C),(D),(E),(F))
+#define LOGVOICE7(A,B,C,D,E,F,G)      SIMTSYFLOG7(KSIMTSYVoice,A,(B),(C),(D),(E),(F),(G))
+#define LOGVOICE8(A,B,C,D,E,F,G,H)    SIMTSYFLOG8(KSIMTSYVoice,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGVOICETIMESTAMP()			  { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGVOICE5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+#define LOGDATA1(A)      			  SIMTSYFLOG1(KSIMTSYData,A)
+#define LOGDATA2(A,B)                 SIMTSYFLOG2(KSIMTSYData,A,(B))
+#define LOGDATA3(A,B,C)               SIMTSYFLOG3(KSIMTSYData,A,(B),(C))
+#define LOGDATA4(A,B,C,D)             SIMTSYFLOG4(KSIMTSYData,A,(B),(C),(D))
+#define LOGDATA5(A,B,C,D,E)           SIMTSYFLOG5(KSIMTSYData,A,(B),(C),(D),(E))
+#define LOGDATA6(A,B,C,D,E,F)         SIMTSYFLOG6(KSIMTSYData,A,(B),(C),(D),(E),(F))
+#define LOGDATA7(A,B,C,D,E,F,G)       SIMTSYFLOG7(KSIMTSYData,A,(B),(C),(D),(E),(F),(G))
+#define LOGDATA8(A,B,C,D,E,F,G,H)     SIMTSYFLOG8(KSIMTSYData,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGDATATIMESTAMP()		  	  { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGDATA5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+#define LOGNETWORK1(A)                SIMTSYFLOG1(KSIMTSYNetwork,A)
+#define LOGNETWORK2(A,B)              SIMTSYFLOG2(KSIMTSYNetwork,A,(B))
+#define LOGNETWORK3(A,B,C)            SIMTSYFLOG3(KSIMTSYNetwork,A,(B),(C))
+#define LOGNETWORK4(A,B,C,D)          SIMTSYFLOG4(KSIMTSYNetwork,A,(B),(C),(D))
+#define LOGNETWORK5(A,B,C,D,E)        SIMTSYFLOG5(KSIMTSYNetwork,A,(B),(C),(D),(E))
+#define LOGNETWORK6(A,B,C,D,E,F)      SIMTSYFLOG6(KSIMTSYNetwork,A,(B),(C),(D),(E),(F))
+#define LOGNETWORK7(A,B,C,D,E,F,G)    SIMTSYFLOG7(KSIMTSYNetwork,A,(B),(C),(D),(E),(F),(G))
+#define LOGNETWORK8(A,B,C,D,E,F,G,H)  SIMTSYFLOG8(KSIMTSYNetwork,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGNETWORKTIMESTAMP()		  { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGNETWORK5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+#define LOGPHBK1(A)                   SIMTSYFLOG1(KSIMTSYPhBk,A)
+#define LOGPHBK2(A,B)                 SIMTSYFLOG2(KSIMTSYPhBk,A,(B))
+#define LOGPHBK3(A,B,C)               SIMTSYFLOG3(KSIMTSYPhBk,A,(B),(C))
+#define LOGPHBK4(A,B,C,D)             SIMTSYFLOG4(KSIMTSYPhBk,A,(B),(C),(D))
+#define LOGPHBK5(A,B,C,D,E)           SIMTSYFLOG5(KSIMTSYPhBk,A,(B),(C),(D),(E))
+#define LOGPHBK6(A,B,C,D,E,F)         SIMTSYFLOG6(KSIMTSYPhBk,A,(B),(C),(D),(E),(F))
+#define LOGPHBK7(A,B,C,D,E,F,G)       SIMTSYFLOG7(KSIMTSYPhBk,A,(B),(C),(D),(E),(F),(G))
+#define LOGPHBK8(A,B,C,D,E,F,G,H)     SIMTSYFLOG8(KSIMTSYPhBk,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGPHBKTIMESTAMP()		  	  { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGPHBK5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+#define LOGMISC1(A)                   SIMTSYFLOG1(KSIMTSYMisc,A)
+#define LOGMISC2(A,B)                 SIMTSYFLOG2(KSIMTSYMisc,A,(B))
+#define LOGMISC3(A,B,C)               SIMTSYFLOG3(KSIMTSYMisc,A,(B),(C))
+#define LOGMISC4(A,B,C,D)             SIMTSYFLOG4(KSIMTSYMisc,A,(B),(C),(D))
+#define LOGMISC5(A,B,C,D,E)           SIMTSYFLOG5(KSIMTSYMisc,A,(B),(C),(D),(E))
+#define LOGMISC6(A,B,C,D,E,F)         SIMTSYFLOG6(KSIMTSYMisc,A,(B),(C),(D),(E),(F))
+#define LOGMISC7(A,B,C,D,E,F,G)       SIMTSYFLOG7(KSIMTSYMisc,A,(B),(C),(D),(E),(F),(G))
+#define LOGMISC8(A,B,C,D,E,F,G,H)	  SIMTSYFLOG8(KSIMTSYMisc,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGMISCTIMESTAMP()		  	  { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGMISC5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+#define LOGSMS1(A)                 	  SIMTSYFLOG1(KSIMTSYSms,A)
+#define LOGSMS2(A,B)               	  SIMTSYFLOG2(KSIMTSYSms,A,(B))
+#define LOGSMS3(A,B,C)          	  SIMTSYFLOG3(KSIMTSYSms,A,(B),(C))
+#define LOGSMS4(A,B,C,D)          	  SIMTSYFLOG4(KSIMTSYSms,A,(B),(C),(D))
+#define LOGSMS5(A,B,C,D,E)         	  SIMTSYFLOG5(KSIMTSYSms,A,(B),(C),(D),(E))
+#define LOGSMS6(A,B,C,D,E,F)       	  SIMTSYFLOG6(KSIMTSYSms,A,(B),(C),(D),(E),(F))
+#define LOGSMS7(A,B,C,D,E,F,G)     	  SIMTSYFLOG7(KSIMTSYSms,A,(B),(C),(D),(E),(F),(G))
+#define LOGSMS8(A,B,C,D,E,F,G,H)   	  SIMTSYFLOG8(KSIMTSYSms,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGSMSTIMESTAMP()		  	  { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGSMS5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+#define LOGPACKET1(A)                 SIMTSYFLOG1(KSIMTSYPacket,A)
+#define LOGPACKET2(A,B)               SIMTSYFLOG2(KSIMTSYPacket,A,(B))
+#define LOGPACKET3(A,B,C)             SIMTSYFLOG3(KSIMTSYPacket,A,(B),(C))
+#define LOGPACKET4(A,B,C,D)           SIMTSYFLOG4(KSIMTSYPacket,A,(B),(C),(D))
+#define LOGPACKET5(A,B,C,D,E)         SIMTSYFLOG5(KSIMTSYPacket,A,(B),(C),(D),(E))
+#define LOGPACKET6(A,B,C,D,E,F)       SIMTSYFLOG6(KSIMTSYPacket,A,(B),(C),(D),(E),(F))
+#define LOGPACKET7(A,B,C,D,E,F,G)     SIMTSYFLOG7(KSIMTSYPacket,A,(B),(C),(D),(E),(F),(G))
+#define LOGPACKET8(A,B,C,D,E,F,G,H)   SIMTSYFLOG8(KSIMTSYPacket,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGPACKETTIMESTAMP()		  { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGPACKET5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+#define LOGSS1(A)               	  SIMTSYFLOG1(KSIMTSYSs,A)
+#define LOGSS2(A,B)             	  SIMTSYFLOG2(KSIMTSYSs,A,(B))
+#define LOGSS3(A,B,C)           	  SIMTSYFLOG3(KSIMTSYSs,A,(B),(C))
+#define LOGSS4(A,B,C,D)         	  SIMTSYFLOG4(KSIMTSYSs,A,(B),(C),(D))
+#define LOGSS5(A,B,C,D,E)       	  SIMTSYFLOG5(KSIMTSYSs,A,(B),(C),(D),(E))
+#define LOGSS6(A,B,C,D,E,F)     	  SIMTSYFLOG6(KSIMTSYSs,A,(B),(C),(D),(E),(F))
+#define LOGSS7(A,B,C,D,E,F,G)   	  SIMTSYFLOG7(KSIMTSYSs,A,(B),(C),(D),(E),(F),(G))
+#define LOGSS8(A,B,C,D,E,F,G,H) 	  SIMTSYFLOG8(KSIMTSYSs,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGSSTIMESTAMP()		  	  { \
+									  TTime  now; \
+									  now.UniversalTime(); \
+									  TDateTime dateTime(now.DateTime()); \
+									  LOGSS5("TimeStamp=%02d:%02d:%02d.%06d", \
+									  dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									  }
+
+
+
+#else  // _SIMTSY_LOGGING_ENABLED
+
+#define LOGSCOMMON1(A)
+#define LOGSCOMMON2(A,B)
+#define LOGSCOMMON3(A,B,C)
+#define LOGSCOMMON4(A,B,C,D)
+#define LOGSCOMMON5(A,B,C,D,E)
+#define LOGSCOMMON6(A,B,C,D,E,F)
+#define LOGSCOMMON7(A,B,C,D,E,F,G)
+#define LOGSCOMMON8(A,B,C,D,E,F,G,H)
+#define LOGSCOMMONTIMESTAMP()
+
+#define LOGCONFIG1(A)              
+#define LOGCONFIG2(A,B)            
+#define LOGCONFIG3(A,B,C)          
+#define LOGCONFIG4(A,B,C,D)        
+#define LOGCONFIG5(A,B,C,D,E)      
+#define LOGCONFIG6(A,B,C,D,E,F)    
+#define LOGCONFIG7(A,B,C,D,E,F,G)  
+#define LOGCONFIG8(A,B,C,D,E,F,G,H)
+#define LOGCONFIGTIMESTAMP()	
+
+#define LOGPARSERR(A,B,C,D)
+#define LOGPARSERREXP(A,B,C,D,E)
+#define LOGPARSERRANGE(A,B,C,D,E)
+								
+#define LOGPHONE1(A)                  
+#define LOGPHONE2(A,B)                
+#define LOGPHONE3(A,B,C)              
+#define LOGPHONE4(A,B,C,D)            
+#define LOGPHONE5(A,B,C,D,E)          
+#define LOGPHONE6(A,B,C,D,E,F)        
+#define LOGPHONE7(A,B,C,D,E,F,G)      
+#define LOGPHONE8(A,B,C,D,E,F,G,H)    
+#define LOGPHONETIMESTAMP()		      
+
+#define LOGLINE1(A)       			  
+#define LOGLINE2(A,B)                 
+#define LOGLINE3(A,B,C)               
+#define LOGLINE4(A,B,C,D)             
+#define LOGLINE5(A,B,C,D,E)           
+#define LOGLINE6(A,B,C,D,E,F)         
+#define LOGLINE7(A,B,C,D,E,F,G)       
+#define LOGLINE8(A,B,C,D,E,F,G,H)     
+#define LOGLINETIMESTAMP()		      
+
+#define LOGCALL1(A)                   
+#define LOGCALL2(A,B)                 
+#define LOGCALL3(A,B,C)               
+#define LOGCALL4(A,B,C,D)             
+#define LOGCALL5(A,B,C,D,E)           
+#define LOGCALL6(A,B,C,D,E,F)         
+#define LOGCALL7(A,B,C,D,E,F,G)       
+#define LOGCALL8(A,B,C,D,E,F,G,H)     
+#define LOGCALLTIMESTAMP()		  	  
+									  
+#define LOGVOICE1(A)               
+#define LOGVOICE2(A,B)             
+#define LOGVOICE3(A,B,C)           
+#define LOGVOICE4(A,B,C,D)         
+#define LOGVOICE5(A,B,C,D,E)       
+#define LOGVOICE6(A,B,C,D,E,F)     
+#define LOGVOICE7(A,B,C,D,E,F,G)   
+#define LOGVOICE8(A,B,C,D,E,F,G,H) 
+#define LOGVOICETIMESTAMP()		
+
+#define LOGDATA1(A)      		
+#define LOGDATA2(A,B)              
+#define LOGDATA3(A,B,C)            
+#define LOGDATA4(A,B,C,D)          
+#define LOGDATA5(A,B,C,D,E)        
+#define LOGDATA6(A,B,C,D,E,F)      
+#define LOGDATA7(A,B,C,D,E,F,G)    
+#define LOGDATA8(A,B,C,D,E,F,G,H)  
+#define LOGDATATIMESTAMP()		  
+								
+#define LOGNETWORK1(A)             
+#define LOGNETWORK2(A,B)           
+#define LOGNETWORK3(A,B,C)         
+#define LOGNETWORK4(A,B,C,D)       
+#define LOGNETWORK5(A,B,C,D,E)     
+#define LOGNETWORK6(A,B,C,D,E,F)   
+#define LOGNETWORK7(A,B,C,D,E,F,G) 
+#define LOGNETWORK8(A,B,C,D,E,F,G,H)
+#define LOGNETWORKTIMESTAMP()	
+
+#define LOGPHBK1(A)                
+#define LOGPHBK2(A,B)              
+#define LOGPHBK3(A,B,C)            
+#define LOGPHBK4(A,B,C,D)          
+#define LOGPHBK5(A,B,C,D,E)        
+#define LOGPHBK6(A,B,C,D,E,F)      
+#define LOGPHBK7(A,B,C,D,E,F,G)    
+#define LOGPHBK8(A,B,C,D,E,F,G,H)  
+#define LOGPHBKTIMESTAMP()		  
+								
+#define LOGMISC1(A)                
+#define LOGMISC2(A,B)              
+#define LOGMISC3(A,B,C)            
+#define LOGMISC4(A,B,C,D)          
+#define LOGMISC5(A,B,C,D,E)        
+#define LOGMISC6(A,B,C,D,E,F)      
+#define LOGMISC7(A,B,C,D,E,F,G)    
+#define LOGMISC8(A,B,C,D,E,F,G,H)
+#define LOGMISCTIMESTAMP()		  
+
+#define LOGSMS1(A)                 
+#define LOGSMS2(A,B)               
+#define LOGSMS3(A,B,C)             
+#define LOGSMS4(A,B,C,D)           
+#define LOGSMS5(A,B,C,D,E)         
+#define LOGSMS6(A,B,C,D,E,F)       
+#define LOGSMS7(A,B,C,D,E,F,G)     
+#define LOGSMS8(A,B,C,D,E,F,G,H)   
+#define LOGSMSTIMESTAMP()
+								
+#define LOGPACKET1(A)              
+#define LOGPACKET2(A,B)            
+#define LOGPACKET3(A,B,C)          
+#define LOGPACKET4(A,B,C,D)        
+#define LOGPACKET5(A,B,C,D,E)      
+#define LOGPACKET6(A,B,C,D,E,F)    
+#define LOGPACKET7(A,B,C,D,E,F,G)  
+#define LOGPACKET8(A,B,C,D,E,F,G,H)
+#define LOGPACKETTIMESTAMP()	
+
+#define LOGSS1(A)               
+#define LOGSS2(A,B)             
+#define LOGSS3(A,B,C)           
+#define LOGSS4(A,B,C,D)         
+#define LOGSS5(A,B,C,D,E)       
+#define LOGSS6(A,B,C,D,E,F)     
+#define LOGSS7(A,B,C,D,E,F,G)   
+#define LOGSS8(A,B,C,D,E,F,G,H) 
+#define LOGSSTIMESTAMP()		  
+
+
+
+#endif	// _SIMTSY_LOGGING_ENABLED
+
+#endif  // _SIMTSYLOG_H_
+
+

--- a/telephonyserverplugins/simtsy/src/CSimBatteryCharger.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimBatteryCharger.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -20,16 +20,10 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimBatteryChargerTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 #include "CSimBatteryCharger.h"
 #include "CSimPhone.h"
+#include "Simlog.h"
 
 const TInt KChargerGranularity=5;		// < Granularity for Battery Charger list array
 
@@ -74,7 +68,7 @@
 	iTimer=CSimTimer::NewL(iPhone);
 	iBatteryChargerInfo=new(ELeave) CArrayFixFlat<TBatteryChargerInfo>(KChargerGranularity);
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_CONSTRUCTL_1, "Starting to parse Battery Charger config parameters...");
+	LOGMISC1("Starting to parse Battery Charger config parameters...");
 	TInt count=CfgFile()->ItemCount(KBatteryCharger);
 	const CTestConfigItem* item=NULL;
 	TInt ret=KErrNone;
@@ -91,20 +85,20 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KBatteryCharger);
+			LOGPARSERR("duration",ret,0,&KBatteryCharger);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,status);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,1,KBatteryCharger);
+			LOGPARSERR("status",ret,1,&KBatteryCharger);
 			continue;
 			}
 		
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,level);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element LEVEL returned %d (element no. %d) from tag %s.",ret,2,KBatteryCharger);
+			LOGPARSERR("level",ret,2,&KBatteryCharger);
 			continue;
 			}
 
@@ -120,7 +114,7 @@
 		iBatteryChargerInfo->AppendL(chargerInfo);
 		}
 	
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_CONSTRUCTL_5, "Finished parsing Battery Charger config parameters...%d items found",count);
+	LOGMISC2("Finished parsing Battery Charger config parameters...%d items found",count);
 
 	if(iBatteryChargerInfo->Count()!=0)
 		{
@@ -194,7 +188,7 @@
  * @return TInt			Standard error value.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_GETBATTERYINFO_1, ">>CSimBatteryCharger::GetBatteryInfo");
+	LOGMISC1(">>CSimBatteryCharger::GetBatteryInfo");
 	TPckg<RMobilePhone::TMobilePhoneBatteryInfoV1>* batteryInfoPckg = (TPckg<RMobilePhone::TMobilePhoneBatteryInfoV1>*)aInfo;
 	RMobilePhone::TMobilePhoneBatteryInfoV1& batteryInfo = (*batteryInfoPckg)();
 
@@ -214,7 +208,7 @@
 
 	batteryInfo.iChargeLevel=iCurrentBatteryCharger;
 	batteryInfo.iStatus = iCurrentStatus;
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_GETBATTERYINFO_2, "<<CSimBatteryCharger::GetBatteryInfo with level=%d and status=%d",iCurrentBatteryCharger,iCurrentStatus);
+	LOGMISC3("<<CSimBatteryCharger::GetBatteryInfo with level=%d and status=%d",iCurrentBatteryCharger,iCurrentStatus);
 	iPhone->ReqCompleted(aReqHandle,iCurrentErr);
 	return KErrNone;
 	}
@@ -229,7 +223,7 @@
  * @return TInt			Standard error value.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_NOTIFYBATTERYINFOCHANGE_1, ">>CSimBatteryCharger::NotifyBatteryInfoChange");
+	LOGMISC1(">>CSimBatteryCharger::NotifyBatteryInfoChange");
 	TPckg<RMobilePhone::TMobilePhoneBatteryInfoV1>* batteryInfoPckg=(TPckg<RMobilePhone::TMobilePhoneBatteryInfoV1>*)aInfo;
 	RMobilePhone::TMobilePhoneBatteryInfoV1& batteryInfo=(*batteryInfoPckg)();
 
@@ -261,12 +255,12 @@
 	{
 	if(iBatteryChargerNotificationPending)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_NOTIFYBATTERYINFOCANCEL_1, "CSimBatteryCharger::NotifyBatteryInfoChange has been cancelled");
+		LOGMISC1("CSimBatteryCharger::NotifyBatteryInfoChange has been cancelled");
 		iBatteryChargerNotificationPending=EFalse;
 		iPhone->ReqCompleted(iBatteryChargerNotificationReqHandle,KErrCancel);
 		}
 	else
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_NOTIFYBATTERYINFOCANCEL_2, "CSimBatteryCharger::NotifyBatteryInfoChange was not outstanding and hasn't been cancelled");
+		LOGMISC1("CSimBatteryCharger::NotifyBatteryInfoChange was not outstanding and hasn't been cancelled");
 	}
 
 
@@ -300,7 +294,7 @@
 		iBatteryChargerNotificationPending=EFalse;
 		(*iBatteryChargerNofificationValue).iChargeLevel=iCurrentBatteryCharger;
 		(*iBatteryChargerNofificationValue).iStatus=iCurrentStatus;
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_TIMERCALLBACK_1, "<<CSimBatteryCharger::NotifyBatteryInfoChange with level=%d and status=%d",iCurrentBatteryCharger,iCurrentStatus);
+		LOGMISC3("<<CSimBatteryCharger::NotifyBatteryInfoChange with level=%d and status=%d",iCurrentBatteryCharger,iCurrentStatus);
 		iPhone->ReqCompleted(iBatteryChargerNotificationReqHandle,iCurrentErr);
 		}
 	iTimer->Start(iBatteryChargerInfo->At(iBatteryChargerIndex).iDuration,this);

--- a/telephonyserverplugins/simtsy/src/CSimCall.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimCall.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -21,14 +21,9 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimCallTraces.h"
-#endif
-
 #include "CSimCall.h"
 #include "CSimPhone.h"
+#include "Simlog.h"
 
 void CSimCall::CloseCall(TAny* aObj)
 /**
@@ -86,7 +81,7 @@
 	// in order to check the type of request it has
 
 	CTelObject::TReqMode reqMode=0;
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_REQMODEL_1, "CSimCall::ReqModeL called with IPC number %d",aIpc);
+	LOGCALL2("CSimCall::ReqModeL called with IPC number %d",aIpc);
 	switch (aIpc)
 		{
 	//
@@ -150,10 +145,10 @@
 	case EMobileCallNotifyMobileCallStatusChange:
 	case EMobileCallNotifyMobileCallCapsChange:
 	case EMobileCallNotifyRemotePartyInfoChange:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NUMBEROFSLOTSL_1, "CSimCall: Registered with default number of slots");
+		LOGCALL1("CSimCall: Registered with default number of slots");
 		return KDefaultNumberOfSlots;
 	default:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NUMBEROFSLOTSL_2, "CSimCall::NumberOfSlotsL: No match for IPC, defering to base function");
+		LOGCALL1("CSimCall::NumberOfSlotsL: No match for IPC, defering to base function");
 		break;
 		}
 	return CCallBase::NumberOfSlotsL(aIpc);
@@ -295,11 +290,11 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYHOOKCHANGE_1, ">>CSimCall::NotifyHookChange");
+	LOGCALL1(">>CSimCall::NotifyHookChange");
 	iNotifyHookChange.iNotifyPending = ETrue;
 	iNotifyHookChange.iNotifyHandle = aTsyReqHandle;
 	iNotifyHookChange.iNotifyData = aHookStatus;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYHOOKCHANGE_2, "<<CSimCall::NotifyHookChange");
+	LOGCALL1("<<CSimCall::NotifyHookChange");
 	return KErrNone;
 	}
 
@@ -311,13 +306,13 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYHOOKCHANGECANCEL_1, ">>CSimCall::NotifyHookChangeCancel");
+	LOGCALL1(">>CSimCall::NotifyHookChangeCancel");
 	if(iNotifyHookChange.iNotifyPending)
 		{
 		iNotifyHookChange.iNotifyPending=EFalse;
 		ReqCompleted(iNotifyHookChange.iNotifyHandle,KErrCancel);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYHOOKCHANGECANCEL_2, "<<CSimCall::NotifyHookChangeCancel");
+	LOGCALL1("<<CSimCall::NotifyHookChangeCancel");
 	return KErrNone;
 	}
 
@@ -333,13 +328,13 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGE_1, ">>CSimCall::NotifyMobileCallStatusChange");
+	LOGCALL1(">>CSimCall::NotifyMobileCallStatusChange");
 	__ASSERT_ALWAYS(!iMobileNotifyStatusChange.iNotifyPending,SimPanic(ENotificationAlreadyPending));
 
 	iMobileNotifyStatusChange.iNotifyPending = ETrue;
 	iMobileNotifyStatusChange.iNotifyHandle = aTsyReqHandle;
 	iMobileNotifyStatusChange.iNotifyData = aStatus;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGE_2, "<<CSimCall::NotifyMobileCallStatusChange");
+	LOGCALL1("<<CSimCall::NotifyMobileCallStatusChange");
 	return KErrNone;
 	}
 
@@ -352,13 +347,13 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGECANCEL_1, ">>CSimCall::NotifyMobileCallStatusChangeCancel");
+	LOGCALL1(">>CSimCall::NotifyMobileCallStatusChangeCancel");
 	if(iMobileNotifyStatusChange.iNotifyPending)
 		{
 		iMobileNotifyStatusChange.iNotifyPending=EFalse;
 		ReqCompleted(iMobileNotifyStatusChange.iNotifyHandle,KErrCancel);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGECANCEL_2, "<<CSimCall::NotifyMobileCallStatusChangeCancel");
+	LOGCALL1("<<CSimCall::NotifyMobileCallStatusChangeCancel");
 	return KErrNone;
 	}
 
@@ -375,13 +370,13 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYSTATUSCHANGE_1, ">>CSimCall::NotifyStatusChange");
+	LOGCALL1(">>CSimCall::NotifyStatusChange");
 	__ASSERT_ALWAYS(!iNotifyStatusChange.iNotifyPending,SimPanic(ENotificationAlreadyPending));
 
 	iNotifyStatusChange.iNotifyPending = ETrue;
 	iNotifyStatusChange.iNotifyHandle = aTsyReqHandle;
 	iNotifyStatusChange.iNotifyData = aStatus;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYSTATUSCHANGE_2, "<<CSimCall::NotifyStatusChange");
+	LOGCALL1("<<CSimCall::NotifyStatusChange");
 	return KErrNone;
 	}
 
@@ -394,13 +389,13 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYSTATUSCHANGECANCEL_1, ">>CSimCall::NotifyStatusChangeCancel");
+	LOGCALL1(">>CSimCall::NotifyStatusChangeCancel");
 	if(iNotifyStatusChange.iNotifyPending)
 		{
 		iNotifyStatusChange.iNotifyPending=EFalse;
 		ReqCompleted(iNotifyStatusChange.iNotifyHandle,KErrCancel);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYSTATUSCHANGECANCEL_2, "<<CSimCall::NotifyStatusChangeCancel");
+	LOGCALL1("<<CSimCall::NotifyStatusChangeCancel");
 	return KErrNone;
 	}
 
@@ -480,7 +475,7 @@
 	mobileCallInfo.iStatus=iState;
 	mobileCallInfo.iCallName.Copy(iName);
 	mobileCallInfo.iLineName.Copy(iLine->iLineName);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETMOBILECALLINFO_1, "CSimCall::GetMobileCallInfo request completed with %d",iState);
+	LOGCALL2("CSimCall::GetMobileCallInfo request completed with %d",iState);
 	ReqCompleted(aTsyReqHandle,KErrNone);
 	return KErrNone;
 	}
@@ -524,10 +519,10 @@
 * @return KErrNone
 */
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETSTATUS_1, ">>CSimCall::GetStatus");
+	LOGCALL1(">>CSimCall::GetStatus");
 	*aCallStatus=GetCoreCallStatus();
 	ReqCompleted(aTsyReqHandle,KErrNone);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETSTATUS_2, "<<CSimCall::GetStatus");
+	LOGCALL1("<<CSimCall::GetStatus");
 	return KErrNone;
     }
 
@@ -540,10 +535,10 @@
 * @return KErrNone
 */
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETMOBILECALLSTATUS_1, ">>CSimCall::GetMobileCallStatus");
+	LOGCALL1(">>CSimCall::GetMobileCallStatus");
 	*aCallStatus=iState;
 	ReqCompleted(aTsyReqHandle,KErrNone);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETMOBILECALLSTATUS_2, "<<CSimCall::GetMobileCallStatus");
+	LOGCALL1("<<CSimCall::GetMobileCallStatus");
 	return KErrNone;
     }
 
@@ -582,12 +577,12 @@
 * Not supported in this version of the Simulator TSY
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETCALLDURATION_1, ">>CSimCall::GetCallDuration");
+	LOGCALL1(">>CSimCall::GetCallDuration");
 	
 	iCallDurationHandler->GetDuration(aTime);
 	
 	ReqCompleted(aTsyReqHandle,KErrNone);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETCALLDURATION_2, "<<CSimCall::GetCallDuration");
+	LOGCALL1("<<CSimCall::GetCallDuration");
 	return KErrNone;
 	}
 
@@ -665,7 +660,7 @@
 * @return Error indication if change of state is successful or not
 */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_CHANGESTATEL_1, ">>CSimCall::ChangeState 0x%08x [newState=%d] entry", (TUint)this,aNewState);
+	LOGCALL3(">>CSimCall::ChangeState 0x%08x [newState=%d] entry", this,aNewState);
 	
 	if(!aNoPropagation)
 		{
@@ -739,7 +734,7 @@
 	if((aNewState == RMobileCall::EStatusConnected && !aSwap)|| aNewState == RMobileCall::EStatusDisconnecting)
 		iLine->UpdatePhoneNotifiers(this,aNewState);		
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_CHANGESTATEL_2, "<<CSimCall::ChangeState exit %d",iState);
+	LOGCALL2("<<CSimCall::ChangeState exit %d",iState);
 	return KErrNone;
 	}
 
@@ -749,7 +744,7 @@
 	Update notifiers of other voice call when it gets swapped
 */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_UPDATENOTIFIERS_1, ">>CSimCall::UpdateNotifiers 0x%08x entry", this);
+	LOGCALL2(">>CSimCall::UpdateNotifiers 0x%08x entry", this);
 	
 // Check for call duration change
 	if (!iCallDurationHandler)
@@ -810,7 +805,7 @@
 			}
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_UPDATENOTIFIERS_2, "<<CSimCall::UpdateNotifiers exit %d",iState);
+	LOGCALL2("<<CSimCall::UpdateNotifiers exit %d",iState);
 	}
 
 TInt CSimCall::ActionEvent(TCallEvent /*aEvent*/, TInt /*aStatus*/)
@@ -1011,7 +1006,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGE_1, ">>CSimCall::NotifyRemotePartyInfoChange");
+	LOGCALL1(">>CSimCall::NotifyRemotePartyInfoChange");
 	__ASSERT_ALWAYS(iNotifyRemotePartyInfoTimer, SimPanic(EOjectNotConstructed));
 	__ASSERT_ALWAYS(!iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyPending,SimPanic(ENotificationAlreadyPending));
 	
@@ -1032,7 +1027,7 @@
 	iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyPending = ETrue;
 	iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyHandle = aTsyReqHandle;
 	iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyData = &remoteparty;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGE_2, "<<CSimCall::NotifyRemotePartyInfoChange");
+	LOGCALL1("<<CSimCall::NotifyRemotePartyInfoChange");
 	return KErrNone;
 	}
 	
@@ -1044,12 +1039,12 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGECANCEL_1, ">>CSimCall::NotifyRemotePartyInfoChangeCancel");
+	LOGCALL1(">>CSimCall::NotifyRemotePartyInfoChangeCancel");
 	if(iNotifyRemotePartyInfoTimer && iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyPending)
 		{
 		iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyPending=EFalse;
 		ReqCompleted(iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyHandle,KErrCancel);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGECANCEL_2, "<<CSimCall::NotifyRemotePartyInfoChangeCancel");
+	LOGCALL1("<<CSimCall::NotifyRemotePartyInfoChangeCancel");
 	return KErrNone;
 	}

--- a/telephonyserverplugins/simtsy/src/CSimCallBarring.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimCallBarring.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -20,16 +20,10 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimCallBarringTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 #include "CSimCallBarring.h"
 #include "CSimPhone.h"
+#include "Simlog.h"
 
 // The Mobile Basic Service Groups used - originally were magic numbers from 1 to 6 incl;
 const TInt KMobServiceIndxStart = 1;
@@ -65,13 +59,13 @@
   	Retrieves all the Call Barring related tags from the config file
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_CONSTRUCTL_1, "Starting to parse Call Barring config parameters...");
+	LOGCALL1("Starting to parse Call Barring config parameters...");
 
 	iPassword.Copy(CfgFile()->ItemValue(KCBPassword,KCBDefaultPassword));
 
 	iGetCBStatus = new(ELeave) CArrayPtrFlat<CListReadAllAttempt>(1);
 	FindAndCreateCBListL();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_CONSTRUCTL_2, "...Finished parsing Call Barring config parameters...");
+	LOGCALL1("...Finished parsing Call Barring config parameters...");
 	}
 	
 void CSimCallBarring::FindAndCreateCBListL()
@@ -80,7 +74,7 @@
   	Retrieves all the Call barring tags that define the 
   	original status of Call barring from the config file
 */
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_FINDANDCREATECBLISTL_1, "CSimPhone::FindAndCreateCBListL");
+	LOGCALL1("CSimPhone::FindAndCreateCBListL");
 	RMobilePhone::TMobilePhoneCBInfoEntryV1 entry;
 
 	iCBList = CMobilePhoneCBList::NewL();
@@ -88,7 +82,7 @@
 	const CTestConfigItem* item=NULL;
 	TInt ret=KErrNone;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_FINDANDCREATECBLISTL_2, "Starting to Load and Parse CBList Config parameters");
+	LOGCALL1("Starting to Load and Parse CBList Config parameters");
 	TInt i;
 	for(i=0;i<count;i++)
 		{
@@ -100,20 +94,20 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,condition);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_FINDANDCREATECBLISTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CONDITION returned %d (element no. %d) from tag %s.",ret,0,KCBList);
+			LOGPARSERR("condition",ret,0,&KCBList);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,serviceGroup);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_FINDANDCREATECBLISTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SERVICEGROUP returned %d (element no. %d) from tag %s.",ret,1,KCBList);
+			LOGPARSERR("serviceGroup",ret,1,&KCBList);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,status);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_FINDANDCREATECBLISTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,2,KCBList);
+			LOGPARSERR("status",ret,2,&KCBList);
 			continue;
 			}
 		
@@ -200,7 +194,7 @@
 	iCBNotification.iCBChangeInfoNotificationPending=ETrue;
 	iCBNotification.iCBChangeInfoReqHandle=aReqHandle;
 	iCBNotification.iCurrentCBCondition=aCB;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_NOTIFYCALLBARRINGSTATUSCHANGE_1, "Finished CSimCallBarring::NotifyCallBarringStatusChange");
+	LOGCALL1("Finished CSimCallBarring::NotifyCallBarringStatusChange");
 	return KErrNone;
 	}
 
@@ -316,7 +310,7 @@
 	@param aReqData information about the request
 	@param aBufSize Size of the buffer the client has to allocate for the 2nd pahase
   	*/
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE1_1, "CSimPhone::GetCallBarringStatusPhase1");
+	LOGCALL1("CSimPhone::GetCallBarringStatusPhase1");
 	
 	TInt ret=KErrNone;
 	TInt leaveCode=KErrNone;
@@ -324,7 +318,7 @@
 	if (leaveCode != KErrNone)
 			iPhone->ReqCompleted(aTsyReqHandle,leaveCode);
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE1_2, "CSimPhone::GetCallBarringStatusPhase1");
+	LOGCALL1("CSimPhone::GetCallBarringStatusPhase1");
 	return ret;
 	}
 	
@@ -339,7 +333,7 @@
 	@param aReqData information about the request
 	@param aBufSize Size of the buffer the client has to allocate for the 2nd pahase
 	*/
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_PROCESSGETCALLBARRINGSTATUSPHASE1L_1, "CSimCallBarring::ProcessGetCallBarringStatusPhase1L");
+	LOGCALL1("CSimCallBarring::ProcessGetCallBarringStatusPhase1L");
 
 	CMobilePhoneCBList* list=CMobilePhoneCBList::NewL();
 	CleanupStack::PushL(list);
@@ -401,7 +395,7 @@
 	// Complete first phase of list retrieval
 	iPhone->ReqCompleted(aTsyReqHandle,KErrNone);
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_PROCESSGETCALLBARRINGSTATUSPHASE1L_2, "CSimCallBarring::ProcessGetCallBarringStatusPhase1L");
+	LOGCALL1("CSimCallBarring::ProcessGetCallBarringStatusPhase1L");
 	return KErrNone;
 	}
 
@@ -414,7 +408,7 @@
 	@param aClient Ponter to the client
 	@param aBuf Buffer containiong the call barring status list
 	*/
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE2_1, "CSimCallBarring::GetCallBarringStatusPhase2");
+	LOGCALL1("CSimCallBarring::GetCallBarringStatusPhase2");
 	CListReadAllAttempt* read=NULL;
 	// Find the get detected network attempt from this client
 	for (TInt i=0; i<iGetCBStatus->Count(); ++i)
@@ -433,7 +427,7 @@
 			}
 		}
 	// Should handle error case of not finding the matching client from read all phase 1
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE2_2, "CSimCallBarring::GetCallBarringStatusPhase2");
+	LOGCALL1("CSimCallBarring::GetCallBarringStatusPhase2");
 	return KErrNotFound;
 	}
 
@@ -443,7 +437,7 @@
 	Cancels a Request to retrieve the call barring status list
 	@param aReqHandle Handle to the request
 	*/
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSCANCEL_1, "CSimCallBarring::GetCallBarringStatusCancel");
+	LOGCALL1("CSimCallBarring::GetCallBarringStatusCancel");
 	iPhone->ReqCompleted(aTsyReqHandle,KErrNone);
 	// Remove the read all attempt from iGetCBStatus
 	CListReadAllAttempt* read=NULL;
@@ -458,7 +452,7 @@
 			}
 		}
 	iPhone->ReqCompleted(aTsyReqHandle,KErrCancel);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSCANCEL_2, "CSimCallBarring::GetCallBarringStatusCancel");
+	LOGCALL1("CSimCallBarring::GetCallBarringStatusCancel");
 	return KErrNone;
 	}

--- a/telephonyserverplugins/simtsy/src/CSimCallForwarding.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimCallForwarding.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -20,16 +20,10 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimCallForwardingTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 #include "CSimCallForwarding.h"
 #include "CSimPhone.h"
+#include "Simlog.h"
 
 const TInt KSettingListGranularity=5;	// < The granularity used for parameter list arrays.
 const TInt KInvalidTimeout = -1;        // Value used when timeout period does not matter
@@ -65,7 +59,7 @@
  	Retrieves all the Call forwarding and Identity services tags from the config file
 	*/
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_CONSTRUCTL_1, "Starting to parse Call Forwarding config parameters...");
+	LOGCALL1("Starting to parse Call Forwarding config parameters...");
 
 	iIdentityServiceStatus=new(ELeave) CArrayFixFlat<TIdentityServiceStatus>(KSettingListGranularity);
 	
@@ -86,13 +80,13 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,service);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SERVICE returned %d (element no. %d) from tag %s.",ret,0,KIdentityServiceStatus);
+			LOGPARSERR("service",ret,0,&KIdentityServiceStatus);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,status);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,1,KIdentityServiceStatus);
+			LOGPARSERR("status",ret,1,&KIdentityServiceStatus);
 			continue;
 			}
 			
@@ -102,7 +96,7 @@
 		iIdentityServiceStatus->AppendL(identityServiceStatus);
 		}
 		
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_CONSTRUCTL_4, "...Finished parsing Call Forwarding config parameters...");
+	LOGCALL1("...Finished parsing Call Forwarding config parameters...");
 	}
 
 CSimCallForwarding::~CSimCallForwarding()
@@ -185,7 +179,7 @@
 	/**
 	Creates the Call forwarding list from the config file
 	*/
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_1, "CSimPhone::FindAndCreateCFListL");
+	LOGCALL1("CSimPhone::FindAndCreateCFListL");
 	RMobilePhone::TMobilePhoneCFInfoEntryV1 entry;
 
 	if(iCFList)
@@ -197,7 +191,7 @@
 	const CTestConfigItem* item=NULL;
 	TInt ret=KErrNone;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_2, "Starting to Load and Parse CFList Config parameters");
+	LOGCALL1("Starting to Load and Parse CFList Config parameters");
 	
 	TInt i;
 	for(i=0;i<count;i++)
@@ -211,34 +205,34 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,condition);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CONDITION returned %d (element no. %d) from tag %s.",ret,0,KCFList);
+			LOGPARSERR("condition",ret,0,&KCFList);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,serviceGroup);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SERVICEGROUP returned %d (element no. %d) from tag %s.",ret,1,KCFList);
+			LOGPARSERR("serviceGroup",ret,1,&KCFList);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,status);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,2,KCFList);
+			LOGPARSERR("status",ret,2,&KCFList);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,timeout);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element TIMEOUT returned %d (element no. %d) from tag %s.",ret,3,KCFList);
+			LOGPARSERR("timeout",ret,3,&KCFList);
 			continue;
 			}
 		
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,number);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element NUMBER returned %d (element no. %d) from tag %s.",ret,4,KCFList);
+			LOGPARSERR("number",ret,4,&KCFList);
 			continue;
 			}
 		
@@ -360,7 +354,7 @@
 	iCFNotification.iCFChangeInfoNotificationPending=ETrue;
 	iCFNotification.iCFChangeInfoReqHandle=aReqHandle;
 	iCFNotification.iCurrentCFCondition=aCF;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_NOTIFYCALLFORWARDINGSTATUSCHANGE_1, "Finished CSimCallForwarding::NotifyCallForwardingStatusChange");
+	LOGCALL1("Finished CSimCallForwarding::NotifyCallForwardingStatusChange");
 	return KErrNone;
 	}
 	
@@ -401,7 +395,7 @@
 		}
 	
 	iPhone->ReqCompleted(aReqHandle,err);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_SETCALLFORWARDINGSTATUS_1, "Finished CSimCallForwarding::SetCallForwardingStatus");
+	LOGCALL1("Finished CSimCallForwarding::SetCallForwardingStatus");
 	return KErrNone;
 	}
 	
@@ -426,7 +420,7 @@
 	@param aReqData contains details of the request
 	@param aBufSize size of the buffer the client needs to allocate for phase 2
 	*/
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE1_1, "CSimPhone::GetCallForwardingStatusPhase1");
+	LOGCALL1("CSimPhone::GetCallForwardingStatusPhase1");
 	TInt ret=KErrNone;
 
     // for forwarding we cannot querry for all conditions;
@@ -445,7 +439,7 @@
 		if (leaveCode != KErrNone)
 			iPhone->ReqCompleted(aTsyReqHandle,leaveCode);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE1_2, "CSimPhone::GetCallForwardingStatusPhase1");
+	LOGCALL1("CSimPhone::GetCallForwardingStatusPhase1");
 	return ret;
 	}
 	
@@ -461,7 +455,7 @@
 	@param aBufSize Size of the buffer the client has to allocate for the 2nd pahase
 	*/
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_PROCESSGETCALLFORWARDINGSTATUSPHASE1L_1, "CSimPhone::ProcessGetCallForwardingStatusPhase1L");
+	LOGCALL1("CSimPhone::ProcessGetCallForwardingStatusPhase1L");
 
 	CMobilePhoneCFList* list=CMobilePhoneCFList::NewL();
 	CleanupStack::PushL(list);
@@ -509,7 +503,7 @@
 	
 	// Complete first phase of list retrieval
 	iPhone->ReqCompleted(aTsyReqHandle,KErrNone);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_PROCESSGETCALLFORWARDINGSTATUSPHASE1L_2, "CSimPhone::ProcessGetCallForwardingStatusPhase1L");
+	LOGCALL1("CSimPhone::ProcessGetCallForwardingStatusPhase1L");
 	return KErrNone;	
 	}
 
@@ -522,7 +516,7 @@
 	@param aBuf buffer that contains the call forwarding list
 	*/
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE2_1, "CSimPhone::GetCallForwardingStatusPhase2");
+	LOGCALL1("CSimPhone::GetCallForwardingStatusPhase2");
 	CListReadAllAttempt* read=NULL;
 	// Find the get detected network attempt from this client
 	for (TInt i=0; i<iGetCFStatus->Count(); ++i)
@@ -541,7 +535,7 @@
 			}
 		}
 	// Should handle error case of not finding the matching client from read all phase 1
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE2_2, "CSimPhone::GetCallForwardingStatusPhase2");
+	LOGCALL1("CSimPhone::GetCallForwardingStatusPhase2");
 	return KErrNotFound;
 	}
 
@@ -552,7 +546,7 @@
 	Cancel the request to retrieve the status of call forwarding
 	@param aTsyReqHandle handle to the request
 	*/
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSCANCEL_1, "CSimPhone::GetCallForwardingStatusCancel");
+	LOGCALL1("CSimPhone::GetCallForwardingStatusCancel");
 	iPhone->ReqCompleted(aTsyReqHandle,KErrNone);
 	// Remove the read all attempt from iGetCFStatus
 	CListReadAllAttempt* read=NULL;
@@ -567,7 +561,7 @@
 			}
 		}
 	iPhone->ReqCompleted(aTsyReqHandle,KErrCancel);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSCANCEL_2, "CSimPhone::GetCallForwardingStatusCancel");
+	LOGCALL1("CSimPhone::GetCallForwardingStatusCancel");
 	return KErrNone;
 	}

--- a/telephonyserverplugins/simtsy/src/CSimCallWaiting.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimCallWaiting.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -20,16 +20,11 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimCallWaitingTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 #include "CSimCallWaiting.h"
 #include "CSimPhone.h"
+#include "Simlog.h"
+
 const TInt KMobServiceIndxStart = 1;
 const TInt KMobServiceIndxEnd   = 5;
 
@@ -63,11 +58,11 @@
   	Retrieves all the Call waiting related tags from the config file
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_CONSTRUCTL_1, "Starting to parse Call waiting config parameters...");
+	LOGCALL1("Starting to parse Call waiting config parameters...");
 
 	iGetCWStatus = new(ELeave) CArrayPtrFlat<CListReadAllAttempt>(1);
 	FindAndCreateCWListL();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_CONSTRUCTL_2, "...Finished parsing Call waiting config parameters...");
+	LOGCALL1("...Finished parsing Call waiting config parameters...");
 	}
 	
 void CSimCallWaiting::FindAndCreateCWListL()
@@ -76,7 +71,7 @@
   	Retrieves all the Call waiting tags that define the 
   	original status of Call waiting from the config file
 */
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_FINDANDCREATECWLISTL_1, "CSimPhone::FindAndCreateCWListL");
+	LOGCALL1("CSimPhone::FindAndCreateCWListL");
 	RMobilePhone::TMobilePhoneCWInfoEntryV1 entry;
 
 	iCWList = CMobilePhoneCWList::NewL();
@@ -84,7 +79,7 @@
 	const CTestConfigItem* item=NULL;
 	TInt ret=KErrNone;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_FINDANDCREATECWLISTL_2, "Starting to Load and Parse CWList Config parameters");
+	LOGCALL1("Starting to Load and Parse CWList Config parameters");
 	TInt i;
 	for(i=0;i<count;i++)
 		{
@@ -97,14 +92,14 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,serviceGroup);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_FINDANDCREATECWLISTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element SERVICEGROUP returned %d (element no. %d) from tag %s.",ret,0,KCWList);
+			LOGPARSERR("serviceGroup",ret,0,&KCWList);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,status);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_FINDANDCREATECWLISTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,1,KCWList);
+			LOGPARSERR("status",ret,1,&KCWList);
 			continue;
 			}
 		
@@ -186,7 +181,7 @@
 	iCWNotification.iCWChangeInfoNotificationPending=ETrue;
 	iCWNotification.iCWChangeInfoReqHandle=aReqHandle;
 	iCWNotification.iCWInfo=aCW;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_NOTIFYCALLWAITINGSTATUSCHANGE_1, "Finished CSimCallWaiting::NotifyCallWaitingStatusChange");
+	LOGCALL1("Finished CSimCallWaiting::NotifyCallWaitingStatusChange");
 	return KErrNone;
 	}
 
@@ -287,7 +282,7 @@
 	@param aReqData information about the request
 	@param aBufSize Size of the buffer the client has to allocate for the 2nd pahase
   	*/
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE1_1, "CSimCallWaiting::GetCalWaitingStatusPhase1");
+	LOGCALL1("CSimCallWaiting::GetCalWaitingStatusPhase1");
 	
 	TInt ret=KErrNone;
 	TInt leaveCode=KErrNone;
@@ -295,7 +290,7 @@
 	if (leaveCode != KErrNone)
 			iPhone->ReqCompleted(aTsyReqHandle,leaveCode);
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE1_2, "CSimCallWaiting::GetCalWaitingStatusPhase1");
+	LOGCALL1("CSimCallWaiting::GetCalWaitingStatusPhase1");
 	return ret;
 	}
 	
@@ -310,7 +305,7 @@
 	@param aReqData information about the request
 	@param aBufSize Size of the buffer the client has to allocate for the 2nd pahase
 	*/
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_PROCESSGETCALLWAITINGSTATUSPHASE1L_1, "CSimCallWaiting::ProcessGetCallWaitingStatusPhase1L");
+	LOGCALL1("CSimCallWaiting::ProcessGetCallWaitingStatusPhase1L");
 
 	CMobilePhoneCWList* list=CMobilePhoneCWList::NewL();
 	CleanupStack::PushL(list);
@@ -361,7 +356,7 @@
 	// Complete first phase of list retrieval
 	iPhone->ReqCompleted(aTsyReqHandle,KErrNone);
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_PROCESSGETCALLWAITINGSTATUSPHASE1L_2, "CSimCallWaiting::ProcessGetCallWaitingStatusPhase1L");
+	LOGCALL1("CSimCallWaiting::ProcessGetCallWaitingStatusPhase1L");
 	return KErrNone;
 	}
 
@@ -374,7 +369,7 @@
 	@param aClient Ponter to the client
 	@param aBuf Buffer containiong the call waiting status list
 	*/
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE2_1, "CSimCallWaiting::GetCallWaitingStatusPhase2");
+	LOGCALL1("CSimCallWaiting::GetCallWaitingStatusPhase2");
 	CListReadAllAttempt* read=NULL;
 	// Find the get detected network attempt from this client
 	for (TInt i=0; i<iGetCWStatus->Count(); ++i)
@@ -393,7 +388,7 @@
 			}
 		}
 	// Should handle error case of not finding the matching client from read all phase 1
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE2_2, "CSimCallWaiting::GetCallWaitingStatusPhase2");
+	LOGCALL1("CSimCallWaiting::GetCallWaitingStatusPhase2");
 	return KErrNotFound;
 	}
 
@@ -403,7 +398,7 @@
 	Cancels a Request to retrieve the call waiting status list
 	@param aReqHandle Handle to the request
 	*/
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_GETCALLWAITINGSTATUSCANCEL_1, "CSimCallWaiting::GetCallWaitingStatusCancel");
+	LOGCALL1("CSimCallWaiting::GetCallWaitingStatusCancel");
 	iPhone->ReqCompleted(aTsyReqHandle,KErrNone);
 	// Remove the read all attempt from iGetCBStatus
 	CListReadAllAttempt* read=NULL;
@@ -418,7 +413,7 @@
 			}
 		}
 	iPhone->ReqCompleted(aTsyReqHandle,KErrCancel);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_GETCALLWAITINGSTATUSCANCEL_2, "CSimCallWaiting::GetCallWaitingStatusCancel");
+	LOGCALL1("CSimCallWaiting::GetCallWaitingStatusCancel");
 	return KErrNone;
 	}

--- a/telephonyserverplugins/simtsy/src/CSimContextHelper.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimContextHelper.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -14,16 +14,10 @@
 //
 
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimContextHelperTraces.h"
-#endif
-
 #include "CSimContextHelper.h"
 
 #include "CSimPacketContext.h"
+#include "Simlog.h"
 
                                                                                                                    //const RPacketContext::TContextConfigGPRS&  aContextConfigV1        
 void CSimContextHelper::SetTContextConfigParamFromTContextConfigGPRS( TContextConfigParam& aContextConfigToSet, const RPacketContext::TContextConfigGPRS&  aContextConfigV1 )
@@ -232,7 +226,7 @@
 		TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,protocolType);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::PROTOCOLTYPE returned %d (element no. %d) from tag %s.",ret,0,aTag);
+			LOGPARSERR("ContextConfigParams::protocolType",ret,0,&aTag);
 			continue;
 			}
 		else
@@ -245,7 +239,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,gsnAddress);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::GSNADDRESS returned %d (element no. %d) from tag %s.",ret,1,aTag);
+			LOGPARSERR("ContextConfigParams::gsnAddress",ret,1,&aTag);
 			continue;
 			}
 		else
@@ -258,7 +252,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,protocolAddress);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::PROTOCOLADDRESS returned %d (element no. %d) from tag %s.",ret,2,aTag);
+			LOGPARSERR("ContextConfigParams::protocolAddress",ret,2,&aTag);
 			continue;
 			}
 		else
@@ -274,7 +268,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,pdpCompression);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::PDPCOMPRESSION returned %d (element no. %d) from tag %s.",ret,3,aTag);
+				LOGPARSERR("ContextConfigParams::pdpCompression",ret,3,&aTag);
 				continue;
 				}
 			else
@@ -309,7 +303,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,12,pdpHeaderCompression);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::PDPHEADERCOMPRESSION returned %d (element no. %d) from tag %s.",ret,12,aTag);
+				LOGPARSERR("ContextConfigParams::pdpHeaderCompression",ret,12,&aTag);
 				continue;
 				}
 			else
@@ -321,7 +315,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,pdpDataCompression);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::PDPDATACOMPRESSION returned %d (element no. %d) from tag %s.",ret,13,aTag);
+				LOGPARSERR("ContextConfigParams::pdpDataCompression",ret,13,&aTag);
 				continue;
 				}
 			else
@@ -342,7 +336,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,anonymousAccess);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::ANONYMOUSACCESS returned %d (element no. %d) from tag %s.",ret,4,aTag);
+				LOGPARSERR("ContextConfigParams::anonymousAccess",ret,4,&aTag);
 				continue;
 				}
 			else
@@ -369,7 +363,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,useEdge);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::USEEDGE returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag);
+			LOGPARSERR("ContextConfigParams::useEdge",ret,delimiterField,&aTag);
 			continue;
 			}
 		else
@@ -391,7 +385,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,protocol);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::PROTOCOL returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag);
+			LOGPARSERR("ProtocolConfigOption::protocol",ret,delimiterField,&aTag);
 			}
 		else
 			{
@@ -412,7 +406,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,username);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::USERNAME returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag);
+			LOGPARSERR("ProtocolConfigOption::username",ret,delimiterField,&aTag);
 			}
 		else
 			{
@@ -433,7 +427,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,password);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::PASSWORD returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag);
+			LOGPARSERR("ProtocolConfigOption::password",ret,delimiterField,&aTag);
 			}
 		else
 			{
@@ -454,7 +448,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,challenge);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::CHALLENGE returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag);
+			LOGPARSERR("ProtocolConfigOption::challenge",ret,delimiterField,&aTag);
 			}
 		else
 			{
@@ -475,7 +469,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,response);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::RESPONSE returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag);
+			LOGPARSERR("ProtocolConfigOption::response",ret,delimiterField,&aTag);
 			}
 		else
 			{
@@ -496,7 +490,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,primaryDNS);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::PRIMARYDNS returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag);
+			LOGPARSERR("ProtocolConfigOption::primaryDNS",ret,delimiterField,&aTag);
 			}
 		else
 			{
@@ -517,7 +511,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,secondaryDNS);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::SECONDARYDNS returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag);
+			LOGPARSERR("ProtocolConfigOption::secondaryDNS",ret,delimiterField,&aTag);
 			}
 		else
 			{
@@ -538,7 +532,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,id);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::ID returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag);
+			LOGPARSERR("ProtocolConfigOption::id",ret,delimiterField,&aTag);
 			}
 		else
 			{
@@ -567,7 +561,7 @@
 	
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::NUMADDITIONALPARAMS returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag);
+			LOGPARSERR("ProtocolConfigOption::numAdditionalParams",ret,delimiterField,&aTag);
 			}
 		else
 			{
@@ -612,7 +606,7 @@
 				ret=CTestConfig::GetElement(item2->Value(),KStdDelimiter,0,additionalParamId);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMID returned %d (element no. %d) from tag %s.",ret,0,aTag);
+					LOGPARSERR("AdditionalParamItem::additionalParamId",ret,0,&aTag);
 					continue;
 					}
 				else
@@ -623,7 +617,7 @@
 						}
 					else
 						{
-						OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMID returned %d (element no. %d) from tag %s.",KErrArgument,0,aTag);
+						LOGPARSERR("AdditionalParamItem::additionalParamId",KErrArgument,0,&aTag);
 						continue;
 						}
 					}
@@ -635,14 +629,14 @@
 					{
 					// AdditionalParamDataFormat not been specified,
 					// default to plain ASCII
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",ret,2,aTag);
+					LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",ret,2,&aTag);
 					format = EConfigDataFormatAscii;
 					}
 				else
 					{
 					if (AsciiToNum(additionalParamDataFormat, format) != KErrNone)
 						{
-						OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,aTag);
+						LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&aTag);
 						format = EConfigDataFormatAscii;
 						}
 						
@@ -651,7 +645,7 @@
 					// default to ASCII if not.
 					if (format >= EMaxConfigDataFormat)
 						{
-						OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,aTag);
+						LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&aTag);
 						format = EConfigDataFormatAscii;
 						}
 					}
@@ -660,7 +654,7 @@
 				ret=CTestConfig::GetElement(item2->Value(),KStdDelimiter,1,additionalParamData);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMCONTENT returned %d (element no. %d) from tag %s.",ret,1,aTag);
+					LOGPARSERR("AdditionalParamItem::additionalParamContent",ret,1,&aTag);
 					continue;
 					}
 				else
@@ -677,7 +671,7 @@
 
 						if (ParseMixedBinaryAsciiDataL(additionalParamDataBuffer) != KErrNone)
 							{
-							OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMCONTENT returned %d (element no. %d) from tag %s.",KErrArgument,1,aTag);
+							LOGPARSERR("AdditionalParamItem::additionalParamContent",KErrArgument,1,&aTag);
 							SimPanic(EInvalidParameterFormatInConfigFile);							
 							}
 						TPtr8 additionalParamDataPtr(const_cast<TUint8*>(additionalParamDataBuffer.Ptr()),

--- a/telephonyserverplugins/simtsy/src/CSimDataCall.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimDataCall.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -21,16 +21,10 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimDataCallTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 #include "CSimDataCall.h"
 #include "CSimPhone.h"
+#include "Simlog.h"
 
 CSimDataCall* CSimDataCall::NewL(CSimLine* aLine,const TDesC& aName, CSimPhone* aPhone)
 /**
@@ -67,7 +61,7 @@
  * @param aName name of the data call to be constructed
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_1, "Starting to parse Data Call config parameters...");
+	LOGDATA1("Starting to parse Data Call config parameters...");
 
 	iDiallingPause=iLine->CfgFile()->ItemValue(KDiallingPauseDuration,KDefaultDiallingPauseDuration);
 	iConnectingPause=iLine->CfgFile()->ItemValue(KConnectingPauseDuration,KDefaultConnectingPauseDuration);
@@ -89,7 +83,7 @@
 		TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,speedCaps);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SPEEDCAPS returned %d (element no. %d) from tag %s.",ret,0,KDataCallCaps);
+			LOGPARSERR("speedCaps",ret,0,&KDataCallCaps);
 			}
 		else
 			if(AsciiToNum(speedCaps, digit)==KErrNone)
@@ -98,7 +92,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,protocolCaps);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCAPS returned %d (element no. %d) from tag %s.",ret,1,KDataCallCaps);
+			LOGPARSERR("protocolCaps",ret,1,&KDataCallCaps);
 			}
 		else
 			if(AsciiToNum(protocolCaps, digit)==KErrNone)
@@ -107,7 +101,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,serviceCaps);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SERVICECAPS returned %d (element no. %d) from tag %s.",ret,2,KDataCallCaps);
+			LOGPARSERR("serviceCaps",ret,2,&KDataCallCaps);
 			}
 		else
 			if(AsciiToNum(serviceCaps, digit)==KErrNone)
@@ -117,7 +111,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,qosCaps);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSCAPS returned %d (element no. %d) from tag %s.",ret,3,KDataCallCaps);
+			LOGPARSERR("qosCaps",ret,3,&KDataCallCaps);
 			}
 		else
 			if(AsciiToNum(qosCaps, digit)==KErrNone)
@@ -126,7 +120,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,hscsdSupport);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element HSCSDSUPPORT returned %d (element no. %d) from tag %s.",ret,4,KDataCallCaps);
+			LOGPARSERR("hscsdSupport",ret,4,&KDataCallCaps);
 			}
 		else
 			iMobileCallCaps.iHscsdSupport = hscsdSupport;
@@ -134,7 +128,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,mClass);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element MCLASS returned %d (element no. %d) from tag %s.",ret,5,KDataCallCaps);
+			LOGPARSERR("mClass",ret,5,&KDataCallCaps);
 			}
 		else
 			iMobileCallCaps.iMClass = mClass;
@@ -142,7 +136,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,MaxRxTimeslots);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element MAXRXTIMESLOTS returned %d (element no. %d) from tag %s.",ret,6,KDataCallCaps);
+			LOGPARSERR("MaxRxTimeslots",ret,6,&KDataCallCaps);
 			}
 		else
 			iMobileCallCaps.iMaxRxTimeSlots = MaxRxTimeslots;
@@ -150,7 +144,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,MaxTxTimeslots);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element MAXTXTIMESLOTS returned %d (element no. %d) from tag %s.",ret,7,KDataCallCaps);
+			LOGPARSERR("MaxTxTimeslots",ret,7,&KDataCallCaps);
 			}
 		else
 			iMobileCallCaps.iMaxTxTimeSlots = MaxTxTimeslots;
@@ -159,7 +153,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,totalRxTxTimeslots);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element TOTALRXTXTIMESLOTS returned %d (element no. %d) from tag %s.",ret,8,KDataCallCaps);
+			LOGPARSERR("totalRxTxTimeslots",ret,8,&KDataCallCaps);
 			}
 		else
 			iMobileCallCaps.iTotalRxTxTimeSlots = totalRxTxTimeslots;
@@ -168,7 +162,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,codingCaps);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element CODINGCAPS returned %d (element no. %d) from tag %s.",ret,9,KDataCallCaps);
+			LOGPARSERR("codingCaps",ret,9,&KDataCallCaps);
 			}
 		else
 			if(AsciiToNum(codingCaps, digit)==KErrNone)
@@ -177,7 +171,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,asymmetryCaps);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element ASYMMETRYCAPS returned %d (element no. %d) from tag %s.",ret,10,KDataCallCaps);
+			LOGPARSERR("asymmetryCaps",ret,10,&KDataCallCaps);
 			}
 		else
 			if(AsciiToNum(asymmetryCaps, digit)==KErrNone)
@@ -186,7 +180,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,11,userInitUpgrade);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element USERINITUPGRADE returned %d (element no. %d) from tag %s.",ret,11,KDataCallCaps);
+			LOGPARSERR("userInitUpgrade",ret,11,&KDataCallCaps);
 			}
 		else
 			iMobileCallCaps.iUserInitUpgrade = userInitUpgrade;
@@ -195,7 +189,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,rlpVersionCaps);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element RLPVERSIONCAPS returned %d (element no. %d) from tag %s.",ret,10,KDataCallCaps);
+			LOGPARSERR("rlpVersionCaps",ret,10,&KDataCallCaps);
 			}
 		else
 			if(AsciiToNum(rlpVersionCaps, digit)==KErrNone)
@@ -204,7 +198,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,v42bisCaps);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element V42BISCAPS returned %d (element no. %d) from tag %s.",ret,10,KDataCallCaps);
+			LOGPARSERR("v42bisCaps",ret,10,&KDataCallCaps);
 			}
 		else
 			if(AsciiToNum(v42bisCaps, digit)==KErrNone)
@@ -247,7 +241,7 @@
 			TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,iRlpVersion);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element IRLPVERSION returned %d (element no. %d) from tag %s.",ret,0,KDataRLPparams);
+				LOGPARSERR("iRlpVersion",ret,0,&KDataRLPparams);
 				}
 			else
 				iMobileCallRLPItem.iRlpVersion = iRlpVersion;
@@ -255,7 +249,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,iIWSMax);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element IIWSMAX returned %d (element no. %d) from tag %s.",ret,0,KDataRLPparams);
+				LOGPARSERR("iIWSMax",ret,0,&KDataRLPparams);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iIWSMax = iIWSMax;
@@ -263,7 +257,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,iIWSMin);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element IIWSMIN returned %d (element no. %d) from tag %s.",ret,1,KDataRLPparams);
+				LOGPARSERR("iIWSMin",ret,1,&KDataRLPparams);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iIWSMin = iIWSMin;
@@ -271,7 +265,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,iMWSMax);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element IMWSMAX returned %d (element no. %d) from tag %s.",ret,2,KDataRLPparams);
+				LOGPARSERR("iMWSMax",ret,2,&KDataRLPparams);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iMWSMax = iMWSMax;
@@ -280,7 +274,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,iMWSMin);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element IMWSMIN returned %d (element no. %d) from tag %s.",ret,3,KDataRLPparams);
+				LOGPARSERR("iMWSMin",ret,3,&KDataRLPparams);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iMWSMin = iMWSMin;
@@ -288,7 +282,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,iT1Max);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element IT1MAX returned %d (element no. %d) from tag %s.",ret,4,KDataRLPparams);
+				LOGPARSERR("iT1Max",ret,4,&KDataRLPparams);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iT1Max = iT1Max;
@@ -296,7 +290,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,iT1Min);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element IT1MIN returned %d (element no. %d) from tag %s.",ret,5,KDataRLPparams);
+				LOGPARSERR("iT1Min",ret,5,&KDataRLPparams);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iT1Min = iT1Min;
@@ -304,7 +298,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,iN2Max);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element IN2MAX returned %d (element no. %d) from tag %s.",ret,6,KDataRLPparams);
+				LOGPARSERR("iN2Max",ret,6,&KDataRLPparams);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iN2Max = iN2Max;
@@ -312,7 +306,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,iN2Min);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element IN2MIN returned %d (element no. %d) from tag %s.",ret,7,KDataRLPparams);
+				LOGPARSERR("iN2Min",ret,7,&KDataRLPparams);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iN2Min = iN2Min;
@@ -320,7 +314,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,iT4Max);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_25, "WARNING - CONFIGURATION FILE PARSING - Reading element IT4MAX returned %d (element no. %d) from tag %s.",ret,8,KDataRLPparams);
+				LOGPARSERR("iT4Max",ret,8,&KDataRLPparams);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iT4Max = iT4Max;
@@ -328,7 +322,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,iT4Min);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_26, "WARNING - CONFIGURATION FILE PARSING - Reading element IT4MIN returned %d (element no. %d) from tag %s.",ret,9,KDataRLPparams);
+				LOGPARSERR("iT4Min",ret,9,&KDataRLPparams);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iT4Min = iT4Min;
@@ -363,7 +357,7 @@
 		TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,iAiur);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_27, "WARNING - CONFIGURATION FILE PARSING - Reading element IAIUR returned %d (element no. %d) from tag %s.",ret,0,KDynamicHSCSDInfo);
+			LOGPARSERR("iAiur",ret,0,&KDynamicHSCSDInfo);
 			}
 		else
 			if(AsciiToNum(iAiur, digit)==KErrNone)
@@ -372,7 +366,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,iRxTimeSlots);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_28, "WARNING - CONFIGURATION FILE PARSING - Reading element IRXTIMESLOTS returned %d (element no. %d) from tag %s.",ret,1,KDynamicHSCSDInfo);
+			LOGPARSERR("iRxTimeSlots",ret,1,&KDynamicHSCSDInfo);
 			}
 		else
 			iHscsdInfo.iRxTimeSlots = iRxTimeSlots;
@@ -380,7 +374,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,iTxTimeSlots);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_29, "WARNING - CONFIGURATION FILE PARSING - Reading element ITXTIMESLOTS returned %d (element no. %d) from tag %s.",ret,2,KDynamicHSCSDInfo);
+			LOGPARSERR("iTxTimeSlots",ret,2,&KDynamicHSCSDInfo);
 			}
 		else
 			iHscsdInfo.iTxTimeSlots = iTxTimeSlots;
@@ -388,7 +382,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,iCodings);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_30, "WARNING - CONFIGURATION FILE PARSING - Reading element ICODINGS returned %d (element no. %d) from tag %s.",ret,3,KDynamicHSCSDInfo);
+			LOGPARSERR("iCodings",ret,3,&KDynamicHSCSDInfo);
 			}
 		else
 			if(AsciiToNum(iCodings, digit)==KErrNone)
@@ -409,7 +403,7 @@
 		TInt err=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,csyName);	// The 3rd parameter (0) represents the index of the variable on the config file line
 		if (err!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_31, "WARNING - CONFIGURATION FILE PARSING - Reading element CSYNAME returned %d (element no. %d) from tag %s.",err,0,KCommSetup);
+			LOGPARSERR("csyName",err,0,&KCommSetup);
 			iCsyName.Copy(KDefaultCsyName);
 			}
 		else
@@ -418,7 +412,7 @@
 		err=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,portName);		// The 3rd parameter (1) represents the index of the variable on the config file line
 		if (err!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_32, "WARNING - CONFIGURATION FILE PARSING - Reading element PORTNAME returned %d (element no. %d) from tag %s.",err,1,KCommSetup);
+			LOGPARSERR("portName",err,1,&KCommSetup);
 			iPortName.Copy(KDefaultPortName);
 			}
 		else
@@ -428,7 +422,7 @@
 		err=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,dataRate);		// The 3rd parameter (2) represents the index of the variable on the config file line
 		if (err!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_33, "WARNING - CONFIGURATION FILE PARSING - Reading element DATARATE returned %d (element no. %d) from tag %s.",err,2,KCommSetup);
+			LOGPARSERR("dataRate",err,2,&KCommSetup);
 			iConfig.iRate=KDefaultCommPortRate;
 			}
 		else
@@ -437,7 +431,7 @@
 		err=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,handshake);		// The 3rd parameter (3) represents the index of the variable on the config file line
 		if (err!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_34, "WARNING - CONFIGURATION FILE PARSING - Reading element HANDSHAKE returned %d (element no. %d) from tag %s.",err,3,KCommSetup);
+			LOGPARSERR("handshake",err,3,&KCommSetup);
 			iConfig.iHandshake=KDefaultHandshake;
 			}
 		else
@@ -459,7 +453,7 @@
 		TInt err=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,bearerCaps);	// The 3rd parameter (0) represents the index of the variable on the config file line
 		if (err!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_35, "WARNING - CONFIGURATION FILE PARSING - Reading element BEARERCAPS returned %d (element no. %d) from tag %s.",err,0,KBearerService);
+			LOGPARSERR("bearerCaps",err,0,&KBearerService);
 			iBearerService.iBearerCaps=KDefaultBearerCaps;
 			}
 		else
@@ -468,7 +462,7 @@
 		err=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,bearerSpeed);		// The 3rd parameter (1) represents the index of the variable on the config file line
 		if (err!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_36, "WARNING - CONFIGURATION FILE PARSING - Reading element BEARERSPEED returned %d (element no. %d) from tag %s.",err,1,KBearerService);
+			LOGPARSERR("bearerSpeed",err,1,&KBearerService);
 			iBearerService.iBearerSpeed=KDefaultBearerSpeed;
 			}
 		else
@@ -498,17 +492,17 @@
  		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,delay);
  		if(ret!=KErrNone)
  			{
- 			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_37, "WARNING - CONFIGURATION FILE PARSING - Reading element DELAY returned %d (element no. %d) from tag %s.",ret,0,KNotifyRemotePartyInfo);
+ 			LOGPARSERR("delay",ret,0,&KNotifyRemotePartyInfo);
  			}
  		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,callingname);
  		if(ret!=KErrNone)
  			{
- 			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_38, "WARNING - CONFIGURATION FILE PARSING - Reading element CALLINGNAME returned %d (element no. %d) from tag %s.",ret,1,KNotifyRemotePartyInfo);
+ 			LOGPARSERR("callingname",ret,1,&KNotifyRemotePartyInfo);
  			}
  		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,remotenumber);
  		if(ret!=KErrNone)
  			{
- 			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_39, "WARNING - CONFIGURATION FILE PARSING - Reading element REMOTENUMBER returned %d (element no. %d) from tag %s.",ret,2,KNotifyRemotePartyInfo);
+ 			LOGPARSERR("remotenumber",ret,2,&KNotifyRemotePartyInfo);
  			}
  		
  		iNotifyRemotePartyInfoTimer->iDelay = delay;
@@ -524,7 +518,7 @@
  		iNotifyRemotePartyInfoTimer->iRemotePartyInfoV1.iRemoteIdStatus = RMobileCall::ERemoteIdentityUnknown;
  		}
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_40, "...Finished parsing Data Call config parameters...");
+	LOGDATA1("...Finished parsing Data Call config parameters...");
 	}
 
 CSimDataCall::~CSimDataCall()
@@ -559,7 +553,7 @@
 	TAny* dataPtr=aPackage.Ptr1();
 	TAny* dataPtr2=aPackage.Ptr2();
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_EXTFUNC_1, "CSimDataCall::ExtFunc: IPC Number is %d",aIpc);
+	LOGDATA2("CSimDataCall::ExtFunc: IPC Number is %d",aIpc);
 	// The request data has to extracted from TDataPackage and the TAny* pointers have to
 	// be "cast" to the expected request data type
 
@@ -615,7 +609,7 @@
  		return NotifyRemotePartyInfoChange(aTsyReqHandle, aPackage.Des1n());
 
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_EXTFUNC_2, "CSimDataCall::ExtFunc: Unsupported IPC detected - number %d",aIpc);
+		LOGDATA2("CSimDataCall::ExtFunc: Unsupported IPC detected - number %d",aIpc);
 		break;
 		}
 
@@ -657,7 +651,7 @@
  		return NotifyRemotePartyInfoChangeCancel();
 
 	default:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CANCELSERVICE_1, "CSimDataCall::CancelService: No match for IPC, defering to base function");
+		LOGDATA1("CSimDataCall::CancelService: No match for IPC, defering to base function");
 		break;
 		}
 	return CCallBase::CancelService(aIpc,aTsyReqHandle);
@@ -673,7 +667,7 @@
  * @return KErrNone
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_DIAL_1, ">>CSimDataCall::Dial");
+	LOGDATA1(">>CSimDataCall::Dial");
 	iDialRequestHandle=aTsyReqHandle;
 	PopulateCallParams(aCallParams);
 
@@ -681,7 +675,7 @@
 	if(err!=KErrNone)
 		ReqCompleted(aTsyReqHandle,err);
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_DIAL_2, "<<CSimDataCall::Dial");
+	LOGDATA1("<<CSimDataCall::Dial");
 	return KErrNone;
 	}
 
@@ -693,7 +687,7 @@
 * @return KErrNone if successfully cancelled
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_DIALCANCEL_1, ">>CSimDataCall::DialCancel");
+	LOGDATA1(">>CSimDataCall::DialCancel");
 	switch(iState)
 		{
 	case RMobileCall::EStatusIdle:
@@ -719,10 +713,10 @@
 		break;
 
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_DIALCANCEL_2, "CSimDataCall::DialCancel: No action taken - state: %d",iState);
+		LOGDATA2("CSimDataCall::DialCancel: No action taken - state: %d",iState);
 		break;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_DIALCANCEL_3, "<<CSimDataCall::DialCancel");
+	LOGDATA1("<<CSimDataCall::DialCancel");
 	return KErrNone;
 	}
 
@@ -737,7 +731,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ANSWERINCOMINGCALL_1, ">>CSimDataCall::AnswerIncomingCall");
+	LOGDATA1(">>CSimDataCall::AnswerIncomingCall");
 	TInt err=iLine->SetAutoAnswerCallObject(this);
 	if(err!=KErrNone)
 		{
@@ -760,7 +754,7 @@
 			ret = ActionEvent(ECallEventAnswerIncoming,KErrNone);	
 			}
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ANSWERINCOMINGCALL_2, "<<CSimDataCall::AnswerIncomingCall");
+	LOGDATA1("<<CSimDataCall::AnswerIncomingCall");
 	return ret;
 	}
 
@@ -772,14 +766,14 @@
 * @return KErrNone if successfully cancelled
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ANSWERINCOMINGCALLCANCEL_1, ">>CSimDataCall::AnswerIncomingCallCancel");
+	LOGDATA1(">>CSimDataCall::AnswerIncomingCallCancel");
 	if(iAnswerIncomingCall.iNotifyPending)
 		{
 		iAnswerIncomingCall.iNotifyPending=EFalse;
 		iLine->ResetAutoAnswerCallObject(this);
 		ReqCompleted(iAnswerIncomingCall.iNotifyHandle,KErrCancel);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ANSWERINCOMINGCALLCANCEL_2, "<<CSimDataCall::AnswerIncomingCallCancel");
+	LOGDATA1("<<CSimDataCall::AnswerIncomingCallCancel");
 	return KErrNone;
 	}
 
@@ -803,12 +797,12 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_HANGUP_1, ">>CSimDataCall::HangUp");
+	LOGDATA1(">>CSimDataCall::HangUp");
 	iHangUpRequestHandle=aTsyReqHandle;
 	TInt err=ActionEvent(ECallEventHangUp,KErrNone);
 	if(err!=KErrNone)
 		ReqCompleted(aTsyReqHandle,err);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_HANGUP_2, "<<CSimDataCall::HangUp");
+	LOGDATA1("<<CSimDataCall::HangUp");
 	return KErrNone;
 	}
 
@@ -820,7 +814,7 @@
 * @return KErrNone if successfully cancelled
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_HANGUPCANCEL_1, ">>CSimDataCall::HangUpCancel");
+	LOGDATA1(">>CSimDataCall::HangUpCancel");
 	switch(iState)
 		{
 	case RMobileCall::EStatusIdle:
@@ -844,10 +838,10 @@
 		break;
 
 	default:
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_HANGUPCANCEL_2, "CSimDataCall::HangUpCancel: No action taken - state: %d",iState);
+		LOGDATA2("CSimDataCall::HangUpCancel: No action taken - state: %d",iState);
 		break;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_HANGUPCANCEL_3, "<<CSimDataCall::HangUpCancel");
+	LOGDATA1("<<CSimDataCall::HangUpCancel");
 	return KErrNone;
 	}
 
@@ -1007,7 +1001,7 @@
 	switch(aEvent)
 		{
 	case ECallEventDial:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_1, ">>CSimDataCall::ActionEvent = [ECallEventDial]");
+		LOGDATA1(">>CSimDataCall::ActionEvent = [ECallEventDial]");
 		if(iState==RMobileCall::EStatusIdle)
 			{
 			TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusDialling,EFalse,EFalse));
@@ -1020,7 +1014,7 @@
 
 	case ECallEventHangUp:
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_2, ">>CSimDataCall::ActionEvent = [ECallEventHangUp]");
+		LOGDATA1(">>CSimDataCall::ActionEvent = [ECallEventHangUp]");
 		switch(iState)
 			{
 		case RMobileCall::EStatusConnected:
@@ -1043,7 +1037,7 @@
 		break;
 
 	case ECallEventIncomingCall:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_3, ">>CSimDataCall::ActionEvent = [ECallEventIncomingCall]");
+		LOGDATA1(">>CSimDataCall::ActionEvent = [ECallEventIncomingCall]");
 		if(iState==RMobileCall::EStatusIdle)
 			{
 			if(iAnswerIncomingCall.iNotifyPending)
@@ -1062,7 +1056,7 @@
 		break;
 
 	case ECallEventAnswerIncoming:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_4, ">>CSimDataCall::ActionEvent = [ECallEventAnswerIncoming]");
+		LOGDATA1(">>CSimDataCall::ActionEvent = [ECallEventAnswerIncoming]");
 		if(iState==RMobileCall::EStatusRinging)
 			{
 			TRAP(ret, ret=ProcessAnswerIncomingCallL());
@@ -1072,7 +1066,7 @@
 		break;
 
 	case ECallEventRemoteHangup:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_5, ">>CSimDataCall::ActionEvent = [ECallEventRemoteHangup]");
+		LOGDATA1(">>CSimDataCall::ActionEvent = [ECallEventRemoteHangup]");
 		if(iState==RMobileCall::EStatusConnected)
 			{
 			TRAP(ret, ret=ProcessRemoteHangupL());
@@ -1083,18 +1077,18 @@
 
 	case ECallEventTimeOut:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_6, ">>CSimVoiceCall::ActionEvent = [ECallEventTimeOut]");
+			LOGDATA1(">>CSimVoiceCall::ActionEvent = [ECallEventTimeOut]");
 			switch(iState)
 				{
 			case RMobileCall::EStatusDialling:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_7, ">>CSimDataCall::State = [EStatusDialling]");
+				LOGDATA1(">>CSimDataCall::State = [EStatusDialling]");
 				TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnecting,EFalse,EFalse));
 				if(ret==KErrNone)
 					iTimer->Start(iConnectingPause,this);
 				return ret;
 
 			case RMobileCall::EStatusConnecting:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_8, ">>CSimDataCall::State = [EStatusConnecting]");
+				LOGDATA1(">>CSimDataCall::State = [EStatusConnecting]");
 // If the config file has not spec'ed a CSY, then fail the dial...
 				if(iCsyName.Length()==0)
 					{
@@ -1110,19 +1104,19 @@
 				return ret;
 
 			case RMobileCall::EStatusDisconnecting:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_9, ">>CSimDataCall::State = [EStatusDisconnecting]");
+				LOGDATA1(">>CSimDataCall::State = [EStatusDisconnecting]");
 				TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusIdle,EFalse,EFalse));
 				ReqCompleted(iHangUpRequestHandle,ret);
 				return ret;
 
 			case RMobileCall::EStatusAnswering:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_10, ">>CSimDataCall::State = [EStatusAnswering]");
+				LOGDATA1(">>CSimDataCall::State = [EStatusAnswering]");
 				TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnected,EFalse,EFalse));
 				ReqCompleted(iAnswerIncomingCall.iNotifyHandle,ret);
 				return ret;
 
 			default:
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_11, ">>CSimDataCall::State = [%d]",iState);
+				LOGDATA2(">>CSimDataCall::State = [%d]",iState);
 				break;
 				}
 			}
@@ -1158,10 +1152,10 @@
 * function for further processing.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_TIMERCALLBACK_1, ">>CSimDataCall::TimerCallBack");
+	LOGDATA1(">>CSimDataCall::TimerCallBack");
 	TInt err=ActionEvent(ECallEventTimeOut,KErrNone);
 	__ASSERT_ALWAYS(err==KErrNone,SimPanic(ETimeOutEventActionFailed));
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_TIMERCALLBACK_2, "<<CSimDataCall::TimerCallBack");
+	LOGDATA1("<<CSimDataCall::TimerCallBack");
 	}
 
 TInt CSimDataCall::ProcessAnswerIncomingCallL()
@@ -1172,14 +1166,14 @@
 * call object must be assigned to receive the details of the next incoming call.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_PROCESSANSWERINCOMINGCALLL_1, ">>CSimDataCall::ProcessAnswerIncomingCall");
+	LOGDATA1(">>CSimDataCall::ProcessAnswerIncomingCall");
 	TInt ret=ChangeStateL(RMobileCall::EStatusAnswering,EFalse,EFalse);
 	if(ret!=KErrNone)
 		return ret;
 	iTimer->Start(iAnswerIncomingPause,this);
 	iAnswerIncomingCall.iNotifyPending=EFalse;
 	iLine->ResetAutoAnswerCallObject(this);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_PROCESSANSWERINCOMINGCALLL_2, "<<CSimDataCall::ProcessAnswerIncomingCall");
+	LOGDATA1("<<CSimDataCall::ProcessAnswerIncomingCall");
 	return ret;
 	}
 
@@ -1191,13 +1185,13 @@
 * call object must be assigned to be the next remotely hung up call.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_PROCESSREMOTEHANGUPL_1, ">>CSimDataCall::ProcessRemoteHangupL");
+	LOGDATA1(">>CSimDataCall::ProcessRemoteHangupL");
 	TInt ret=ChangeStateL(RMobileCall::EStatusDisconnecting,EFalse,EFalse);
 	if(ret!=KErrNone)
 		return ret;
 	iTimer->Start(iRemoteHangupPause,this);
 	iLine->ResetRemoteHangupCallObject(this);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_PROCESSREMOTEHANGUPL_2, "<<CSimDataCall::ProcessRemoteHangupL");
+	LOGDATA1("<<CSimDataCall::ProcessRemoteHangupL");
 	return ret;
 	}

--- a/telephonyserverplugins/simtsy/src/CSimDataLine.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimDataLine.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -13,15 +13,9 @@
 // Description:
 //
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimDataLineTraces.h"
-#endif
-
 #include "CSimPhone.h"
 #include "CSimDataCall.h"
+#include "Simlog.h"
 #include "et_struct.h"
 
 _LIT(KCommonCallName,"DataCall%d");	// < Data call name template.
@@ -114,7 +108,7 @@
 * @leave			Leaves if name given does not match the required name
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATALINE_OPENNEWOBJECTBYNAMEL_1, ">>CSimDataLine::OpenNewObjectByNameL");
+	LOGDATA1(">>CSimDataLine::OpenNewObjectByNameL");
 	TInt i;
 	for(i=0;i<iCalls->Count();i++)
 		{
@@ -124,7 +118,7 @@
 			return iCalls->At(i);
 			}
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATALINE_OPENNEWOBJECTBYNAMEL_2, "<<CSimDataLine::OpenNewObjectByNameL");
+	LOGDATA1("<<CSimDataLine::OpenNewObjectByNameL");
 	User::Leave(KErrNotFound);
 	return NULL;
 	}
@@ -153,7 +147,7 @@
 		HandleNewCallAddedNotification(aNewName);
 		}
 	iNameOfLastCallAdded.Copy(aNewName);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATALINE_CREATENEWCALLL_1, ">>CSimDataLine::CreateNewCallL 0x%08x",newCall);
+	LOGDATA2(">>CSimDataLine::CreateNewCallL 0x%08x",newCall);
 	CleanupStack::Pop(newCall);
 	return newCall;
 	}
@@ -224,7 +218,7 @@
 		return NotifyMobileLineStatusChangeCancel(aTsyReqHandle);
 
 	default:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATALINE_CANCELSERVICE_1, "CSimDataLine::CancelService: No IPC match in SIM TSY, defering to core cancelservice function.");
+		LOGDATA1("CSimDataLine::CancelService: No IPC match in SIM TSY, defering to core cancelservice function.");
 		break;
 		}

--- a/telephonyserverplugins/simtsy/src/CSimDtmf.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimDtmf.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -19,17 +19,11 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimDtmfTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 #include "CSimDtmf.h"
 #include "CSimPhone.h"
 #include "CSimVoiceCall.h"
+#include "Simlog.h"
 
 const TInt KPauseDuration=2;		//< The duration of a "pause" DTMF character.
 const TInt KDtmfToneDuration=3;		//< The duration of a standard DTMF character (tone or "pause").
@@ -296,7 +290,7 @@
 	case EEventTimer:
 		__ASSERT_ALWAYS(iState==ETxTone,SimPanic(EIllegalDtmfEvent));
 		__ASSERT_ALWAYS(iDtmfString,SimPanic(EIllegalDtmfEvent));
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDTMF_ACTIONEVENT1_1, "Completed sending DTMF Tone");
+		LOGMISC1("Completed sending DTMF Tone");
 		iDtmfStringIndex++;
 		if(iDtmfStringIndex<iDtmfData->Length())
 			ret = ProcessTone((*iDtmfData)[iDtmfStringIndex],ETrue);
@@ -312,7 +306,7 @@
 			return KErrInUse;
 		if(iState!=ETxTone)			// If there's been no StartDtmfTone, then return an error.
 			return KErrUnknown;
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDTMF_ACTIONEVENT1_2, "Stopping DTMF Tone");
+		LOGMISC1("Stopping DTMF Tone");
 		iState=EIdle;
 		return KErrNone;
 
@@ -320,7 +314,7 @@
 		if(iState!=EStopped)
 			return KErrUnknown;
 		__ASSERT_ALWAYS(iDtmfString,SimPanic(EIllegalDtmfEvent));
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDTMF_ACTIONEVENT1_3, "Continuing Transmitting a DTMF string after a wait");
+		LOGMISC1("Continuing Transmitting a DTMF string after a wait");
 		iDtmfStringIndex++;
 		if(iDtmfStringIndex<iDtmfData->Length())
 			ret = ProcessTone((*iDtmfData)[iDtmfStringIndex],ETrue);
@@ -370,14 +364,14 @@
 
 	if(aTone==wait)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDTMF_PROCESSTONE_1, "Starting to perform a DTMF wait; character w");
+		LOGMISC1("Starting to perform a DTMF wait; character w");
 		iState=EStopped;
 		CheckNotification();
 		return KErrNone;
 		}
 	else if(aTone.IsDigit()||(aTone>='A')&&(aTone<='D'))
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDTMF_PROCESSTONE_2, "Starting to send DTMF Tone %u", TUint(aTone));
+		LOGMISC2("Starting to send DTMF Tone %c", TUint(aTone));
 		iState=ETxTone;
 		if(aStartTimer)
 			{
@@ -391,7 +385,7 @@
 			{
 			return KErrArgument;  // can't tx a single "pause" character
 			}
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDTMF_PROCESSTONE_3, "Starting to perform a DTMF pause; character p");
+		LOGMISC1("Starting to perform a DTMF pause; character p");
 		iState=ETxTone;
 		iTimer->Start(KPauseDuration,this);
 		return KErrNone;

--- a/telephonyserverplugins/simtsy/src/CSimIncomingContextManager.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimIncomingContextManager.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -13,18 +13,12 @@
 // Description:
 //
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimIncomingContextManagerTraces.h"
-#endif
-
 #include "CSimIncomingContextManager.h"
 
 #include <testconfigfileparser.h>
 
 #include "SimConstants.h"
+#include "Simlog.h"
 #include "SimTsy.h"
 #include "CSimPhone.h"
 #include "csimtimer.h"
@@ -83,7 +77,7 @@
 * @leave Leaves no memory or any data member does not construct for any reason.
 */
 	{	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_CONSTRUCTL_1, "CSimIncomingContextManager: Entered ConstructL()");
+	LOGPACKET1("CSimIncomingContextManager: Entered ConstructL()");
 	
 	iSimPacketService = aSimPacketService;
 		
@@ -132,7 +126,7 @@
 
 void CSimIncomingContextManager::LoadIncomingContextsL( TPtrC8 aTag )
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_1, "CSimIncomingContextManager: Entered LoadIncomingContextsL()");
+	LOGPACKET1("CSimIncomingContextManager: Entered LoadIncomingContextsL()");
 		
 	TDelayIncomingContext incomingContext;
 	TInt error=KErrNone;
@@ -145,43 +139,43 @@
 		if(!item)
 			{
 			error = KErrArgument;	
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element DELAYINCOMINGCONTEXT::NO PARAMETERS IN TAG returned %d (element no. %d) from tag %s.",error,0,aTag);
+			LOGPARSERR("DelayIncomingContext::No parameters in tag",error,0,&aTag);
 			break;
 			}
 		
 		GetConfigType( (*item), 0, incomingContext.iExtensionId, error );
 		if (error)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element DELAYINCOMINGCONTEXT::CONFIGTYPE returned %d (element no. %d) from tag %s.",error,0,aTag);
+			LOGPARSERR("DelayIncomingContext::ConfigType",error,0,&aTag);			
 			}
 		GetContextIndex( (*item), 1, incomingContext.iIndex, error );
 		if (error)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DELAYINCOMINGCONTEXT::INDEX returned %d (element no. %d) from tag %s.",error,0,aTag);
+			LOGPARSERR("DelayIncomingContext::Index",error,0,&aTag);			
 			}
 		GetDelay( (*item),  2, incomingContext.iDelay, error );
 		if (error)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element DELAYINCOMINGCONTEXT::DELAY returned %d (element no. %d) from tag %s.",error,0,aTag);
+			LOGPARSERR("DelayIncomingContext::Delay",error,0,&aTag);			
 			}
 			
 		iDelayIncomingContext->AppendL(incomingContext);
 						
 		}		
 	
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_6, "Finished parsing DelayIncomingContext config parameters...%d items found",count);
+	LOGMISC2("Finished parsing DelayIncomingContext config parameters...%d items found",count);
 	}
 
 
 void CSimIncomingContextManager::StartFirstIncomingEvent( )
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_STARTFIRSTINCOMINGEVENT_1, "CSimIncomingContextManager: Entered StartFirstIncomingEvent()" );
+	LOGPACKET1("CSimIncomingContextManager: Entered StartFirstIncomingEvent()" );
 				
 	if(iDelayIncomingContext->Count()!=0)
 		{
 		iCurrentDelayIndex = 0;				
 		const TDelayIncomingContext& delayIncomingContext = iDelayIncomingContext->At(0);
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_STARTFIRSTINCOMINGEVENT_2, "CSimIncomingContextManager: Entered StartFirstIncomingEvent() delay = %d", delayIncomingContext.iDelay);
+		LOGPACKET2("CSimIncomingContextManager: Entered StartFirstIncomingEvent() delay = %d", delayIncomingContext.iDelay);
 		iTimer->Start(delayIncomingContext.iDelay, iSimPacketService, ETimerIdContextActivationRequestedChange);
 		}	
 	}
@@ -191,17 +185,17 @@
 // And then sets the index	
 void CSimIncomingContextManager::NextIncomingEvent( TDes8* aPckg )
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_1, "CSimIncomingContextManager: Entered NextIncomingEvent()" );
+	LOGPACKET1("CSimIncomingContextManager: Entered NextIncomingEvent()" );
 	
 	if (iDelayIncomingContext->Count()==0)
 		{ // We have no incoming events. This is an error.
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_2, "CSimIncomingContextManager: Entered NextIncomingEvent() No events at all!" );
+		LOGPACKET1("CSimIncomingContextManager: Entered NextIncomingEvent() No events at all!" );
 		SimPanic(EGeneral);		
 		return;
 		}
 	if(iCurrentDelayIndex >= iDelayIncomingContext->Count())
 		{ // No more incoming contexts. .
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_3, "CSimIncomingContextManager: Entered NextIncomingEvent() No next event" );
+		LOGPACKET1("CSimIncomingContextManager: Entered NextIncomingEvent() No next event" );
 		return;		
 		}
 	// else we have an incoming context.
@@ -214,18 +208,18 @@
 		delayIncomingContext->iExtensionId, delayIncomingContext->iIndex );
 	if ( !context )
 		{ // Unable to find a valid pre allocated context that we can use.
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_4, "CSimIncomingContextManager: Entered NextIncomingEvent() failed unable to identify a valid context." );
+		LOGPACKET1("CSimIncomingContextManager: Entered NextIncomingEvent() failed unable to identify a valid context." );
 		SimPanic(EGeneral);		
 	  	return ;
 		}
 
 	if ( GetContextInCorrectFormatForEtel(context, aPckg) ) 
 		{ // Okay got data. This will be sent to ETEL to activate the context.
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_5, "CSimIncomingContextManager: Entered NextIncomingEventt() delay = %d", delayIncomingContext->iDelay);
+		LOGPACKET2("CSimIncomingContextManager: Entered NextIncomingEventt() delay = %d", delayIncomingContext->iDelay);
 		}
 	else
 		{ // Error. Unable to format the data.
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_6, "CSimIncomingContextManager: Entered NextIncomingEvent() failed unable format data for choosn context" );
+		LOGPACKET1("CSimIncomingContextManager: Entered NextIncomingEvent() failed unable format data for choosn context" );
 		SimPanic(EGeneral);		
 		return;
 		}
@@ -241,18 +235,18 @@
 	
 void CSimIncomingContextManager::Cancel( )
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_CANCEL_1, "CSimIncomingContextManager::Cancel called");
+	LOGPACKET1("CSimIncomingContextManager::Cancel called");
 	iTimer->Cancel();	
 	}
 	
 	
 void CSimIncomingContextManager::ForcedIncoming(TInt aIndex, TDes8* aPckg )
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_1, "CSimIncomingContextManager::ForcedIncoming called");
+	LOGPACKET1("CSimIncomingContextManager::ForcedIncoming called");
 
 	if(iDelayIncomingContext->Count()<=aIndex )
 		{ 
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_2, "CSimIncomingContextManager::ForcedIncoming invalid context");
+		LOGPACKET1("CSimIncomingContextManager::ForcedIncoming invalid context");
 		return;		
 		}
 	// else we have a valid incoming context.
@@ -268,7 +262,7 @@
 
 	if ( !context )
 		{ // Unable to find a valid pre allocated context that we can use.
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_3, "CSimIncomingContextManager::ForcedIncoming invalid type, index leading to invalid context");
+		LOGPACKET1("CSimIncomingContextManager::ForcedIncoming invalid type, index leading to invalid context");
 		SimPanic(EGeneral);
 	  	return ;
 		}
@@ -278,7 +272,7 @@
 		}
 	else
 		{ // Error. Unable to format the data.		
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_4, "CSimIncomingContextManager: Entered NextIncomingEvent() failed unable format data for choosn context" );
+		LOGPACKET1("CSimIncomingContextManager: Entered NextIncomingEvent() failed unable format data for choosn context" );
 		SimPanic(EGeneral);		
 		return;
 		}

--- a/telephonyserverplugins/simtsy/src/CSimIndicator.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimIndicator.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -20,16 +20,10 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimIndicatorTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 #include "CSimIndicator.h"
 #include "CSimPhone.h"
+#include "Simlog.h"
 
 
 const TInt KIndicatorsGranularity=5;		// < Granularity for indicators list array
@@ -73,7 +67,7 @@
 	{
 	iIndicatorsInfo=new(ELeave) CArrayFixFlat<TPhoneIndicatorsInfo>(KIndicatorsGranularity);
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_1, "Starting to parse Indicators config parameters...");
+	LOGPHONE1("Starting to parse Indicators config parameters...");
 	TInt count=CfgFile()->ItemCount(KIndicators);
 	const CTestConfigItem* item=NULL;
 	TInt ret=KErrNone;
@@ -90,13 +84,13 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,number);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element NUMBER returned %d (element no. %d) from tag %s.",ret,0,KIndicators);
+			LOGPARSERR("number",ret,0,&KIndicators);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,error);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element ERROR returned %d (element no. %d) from tag %s.",ret,1,KIndicators);
+			LOGPARSERR("error",ret,1,&KIndicators);
 			continue;
 			}
 		TPhoneIndicatorsInfo indicInfo;
@@ -104,14 +98,14 @@
 		indicInfo.iError=error;
 		iIndicatorsInfo->AppendL(indicInfo);
 		}
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_4, "Finished parsing Indicators config parameters...%d items found", count);
+	LOGPHONE2("Finished parsing Indicators config parameters...%d items found", count);
 
 	iIndicatorCheckPeriod = 1;
 	count = CfgFile()->ItemCount(KIndicatorCheckPeriod);
 	if (count > 1)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_5, "Warning: Error parsing IndicatorCheckPeriod in config file.");
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_6, "         More than one value found, using default value.");
+		LOGPHONE1("Warning: Error parsing IndicatorCheckPeriod in config file.");
+		LOGPHONE1("         More than one value found, using default value.");
 		}
 	else
 		{
@@ -123,8 +117,8 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,period);
 			if(ret!=KErrNone)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_7, "Warning: Error parsing IndicatorCheckPeriod in config file.");
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_8, "         No value for IndicatorCheckPeriod found.");
+				LOGPHONE1("Warning: Error parsing IndicatorCheckPeriod in config file.");
+				LOGPHONE1("         No value for IndicatorCheckPeriod found.");
 				}
 			else
 				{
@@ -191,7 +185,7 @@
  * @return TInt			Standard error value.
  */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_GETINDICATOR_1, "CSimIndicator::GetIndicator request made: returning %d",iCurrentIndicator);
+	LOGPHONE2("CSimIndicator::GetIndicator request made: returning %d",iCurrentIndicator);
 	TPckg<TUint32>* indicPckg=(TPckg<TUint32>*)aPckg1;
 	TUint32& indic=(*indicPckg)();
 	
@@ -210,7 +204,7 @@
  * @return TInt			Standard error value.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_NOTIFYINDICATORCHANGE_1, "CSimIndicator::NotifyIndicatorChange notification posted");
+	LOGPHONE1("CSimIndicator::NotifyIndicatorChange notification posted");
 	TPckg<TUint32>* indicPckg=(TPckg<TUint32>*)aPckg1;
 	TUint32& indic=(*indicPckg)();
 
@@ -230,7 +224,7 @@
 	{
 	if(iIndicatorsChangeNotificationPending)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_NOTIFYINDICATORCHANGECANCEL_1, "CSimIndicator::NotifyIndicatorChange notification cancelled");
+		LOGPHONE1("CSimIndicator::NotifyIndicatorChange notification cancelled");
 		iIndicatorsChangeNotificationPending=EFalse;
 		iPhone->ReqCompleted(iIndicatorsChangeNotificationReqHandle,KErrCancel);
 		}
@@ -268,7 +262,7 @@
 // Trigger notification with appropriate data and result codes
 			iIndicatorsChangeNotificationPending=EFalse;
 			*iIndicatorsChangeNofificationValue=iCurrentIndicator;
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CHECKNOTIFICATION_1, "CSimIndicator::NotifyIndicatorChange triggered: returned %d",iCurrentIndicator);
+			LOGPHONE2("CSimIndicator::NotifyIndicatorChange triggered: returned %d",iCurrentIndicator);
 			iPhone->ReqCompleted(iIndicatorsChangeNotificationReqHandle,ret);
 			}
 		}

--- a/telephonyserverplugins/simtsy/src/CSimLine.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimLine.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,5 +1,5 @@
 
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -21,17 +21,11 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimLineTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 #include "CSimLine.h"
 #include "CSimPhone.h"
 #include "CSimCall.h"
+#include "Simlog.h"
 #include "CSimPubSub.h"
 
 void CSimLine::CloseLine(TAny* aObj)
@@ -61,7 +55,7 @@
 * @param aName name of the Line to be created.
 */
 	{
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CONSTRUCTL_1, ">>CSimLine::ConstructL [aLineName=%S]", aName);
+	LOGLINE2(">>CSimLine::ConstructL [aLineName=%S]", &aName);
 	iLineName = aName;
 	iSimPubSubIC = CSimPubSub::NewL(this,iICProperty);
 	iSimPubSubIC->Start();
@@ -72,7 +66,7 @@
 	iNotifyIncomingCallPause=this->CfgFile()->ItemValue(KNotifyIncomingCallPauseDuration,KDefaultNotifyIncomingCallPauseDuration);
 	
 	iTimer = CSimTimer::NewL(iPhone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CONSTRUCTL_2, "<<CSimLine::ConstructL");
+		LOGLINE1("<<CSimLine::ConstructL");
 }
 
 CSimLine::~CSimLine()
@@ -156,11 +150,11 @@
 	switch (aIpc)
 		{
 	case EMobileLineNotifyMobileLineStatusChange:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NUMBEROFSLOTSL_1, "CLineMobile: Registered with the default number of slots");
+		LOGLINE1("CLineMobile: Registered with the default number of slots");
 		return KDefaultNumberOfSlots;
 
 	default:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NUMBEROFSLOTSL_2, "CSimLine::NumberOfSlotsL: No match for IPC, defering to base function");
+		LOGLINE1("CSimLine::NumberOfSlotsL: No match for IPC, defering to base function");
 		break;
 		}
 	return CLineBase::NumberOfSlotsL(aIpc);
@@ -204,11 +198,11 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYINCOMINGCALL_1, ">>CSimLine::NotifyIncomingCall");
+	LOGLINE1(">>CSimLine::NotifyIncomingCall");
 	iNotifyIncomingCall.iNotifyPending=ETrue;
 	iNotifyIncomingCall.iNotifyHandle=aTsyReqHandle;
 	iNotifyIncomingCall.iNotifyData=(TAny*)aName;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYINCOMINGCALL_2, "<<CSimLine::NotifyIncomingCall");
+	LOGLINE1("<<CSimLine::NotifyIncomingCall");
 	return KErrNone;
 	}
 
@@ -221,14 +215,14 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYINCOMINGCALLCANCEL_1, ">>CSimLine::NotifyIncomingCallCancel");
+	LOGLINE1(">>CSimLine::NotifyIncomingCallCancel");
 	if(iNotifyIncomingCall.iNotifyPending)
 		{
 		iTimer->Cancel();
 		iNotifyIncomingCall.iNotifyPending=EFalse;
 		ReqCompleted(iNotifyIncomingCall.iNotifyHandle, KErrCancel);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYINCOMINGCALLCANCEL_2, "<<CSimLine::NotifyIncomingCallCancel");
+	LOGLINE1("<<CSimLine::NotifyIncomingCallCancel");
 	return KErrNone;
 	}
 
@@ -242,11 +236,11 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYHOOKCHANGE_1, ">>CSimLine::NotifyHookChange");
+	LOGLINE1(">>CSimLine::NotifyHookChange");
 	iNotifyHookChange.iNotifyPending=ETrue;
 	iNotifyHookChange.iNotifyHandle=aTsyReqHandle;
 	iNotifyHookChange.iNotifyData=(TAny*)aHookStatus;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYHOOKCHANGE_2, "<<CSimLine::NotifyHookChange");
+	LOGLINE1("<<CSimLine::NotifyHookChange");
 	return KErrNone;
 	}
 
@@ -259,13 +253,13 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYHOOKCHANGECANCEL_1, ">>CSimLine::NotifyHookChangeCancel");
+	LOGLINE1(">>CSimLine::NotifyHookChangeCancel");
 	if(iNotifyHookChange.iNotifyPending)
 		{
 		iNotifyHookChange.iNotifyPending=EFalse;
 		ReqCompleted(iNotifyHookChange.iNotifyHandle,KErrCancel);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYHOOKCHANGECANCEL_2, "<<CSimLine::NotifyHookChangeCancel");
+	LOGLINE1("<<CSimLine::NotifyHookChangeCancel");
 	return KErrNone;
 	}
 
@@ -280,11 +274,11 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYMOBILELINESTATUSCHANGE_1, ">>CSimLine::NotifyMobileLineStatusChange");
+	LOGLINE1(">>CSimLine::NotifyMobileLineStatusChange");
 	iNotifyMobileStatusChange.iNotifyPending=ETrue;
 	iNotifyMobileStatusChange.iNotifyHandle=aTsyReqHandle;
 	iNotifyMobileStatusChange.iNotifyData=aStatus;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYMOBILELINESTATUSCHANGE_2, "<<CSimLine::NotifyMobileLineStatusChange");
+	LOGLINE1("<<CSimLine::NotifyMobileLineStatusChange");
 	return KErrNone;
 	}
 
@@ -297,13 +291,13 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYMOBILELINESTATUSCHANGECANCEL_1, ">>CSimLine::NotifyMobileLineStatusChangeCancel");
+	LOGLINE1(">>CSimLine::NotifyMobileLineStatusChangeCancel");
 	if(iNotifyMobileStatusChange.iNotifyPending)
 		{
 		iNotifyMobileStatusChange.iNotifyPending=EFalse;
 		ReqCompleted(iNotifyMobileStatusChange.iNotifyHandle,KErrCancel);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYMOBILELINESTATUSCHANGECANCEL_2, "<<CSimLine::NotifyMobileLineStatusChangeCancel");
+	LOGLINE1("<<CSimLine::NotifyMobileLineStatusChangeCancel");
 	return KErrNone;
 	}
 
@@ -317,11 +311,11 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYSTATUSCHANGE_1, ">>CSimLine::NotifyStatusChange");
+	LOGLINE1(">>CSimLine::NotifyStatusChange");
 	iNotifyStatusChange.iNotifyPending=ETrue;
 	iNotifyStatusChange.iNotifyHandle=aTsyReqHandle;
 	iNotifyStatusChange.iNotifyData=aStatus;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYSTATUSCHANGE_2, "<<CSimLine::NotifyStatusChange");
+	LOGLINE1("<<CSimLine::NotifyStatusChange");
 	return KErrNone;
 	}
 
@@ -334,13 +328,13 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYSTATUSCHANGECANCEL_1, ">>CSimLine::NotifyStatusChangeCancel");
+	LOGLINE1(">>CSimLine::NotifyStatusChangeCancel");
 	if(iNotifyStatusChange.iNotifyPending)
 		{
 		iNotifyStatusChange.iNotifyPending=EFalse;
 		ReqCompleted(iNotifyStatusChange.iNotifyHandle,KErrCancel);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYSTATUSCHANGECANCEL_2, "<<CSimLine::NotifyStatusChangeCancel");
+	LOGLINE1("<<CSimLine::NotifyStatusChangeCancel");
 	return KErrNone;
 	}
 
@@ -354,11 +348,11 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYCALLADDED_1, ">>CSimLine::NotifyCallAdded");
+	LOGLINE1(">>CSimLine::NotifyCallAdded");
 	iNotifyCallAdded.iNotifyPending=ETrue;
 	iNotifyCallAdded.iNotifyHandle=aTsyReqHandle;
 	iNotifyCallAdded.iNotifyData=(TAny*)aName;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYCALLADDED_2, "<<CSimLine::NotifyCallAdded");
+	LOGLINE1("<<CSimLine::NotifyCallAdded");
 	return KErrNone;
 	}
 
@@ -371,13 +365,13 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYCALLADDEDCANCEL_1, ">>CSimLine::NotifyCallAddedCancel");
+	LOGLINE1(">>CSimLine::NotifyCallAddedCancel");
 	if(iNotifyCallAdded.iNotifyPending)
 		{
 		iNotifyCallAdded.iNotifyPending=EFalse;
 		ReqCompleted(iNotifyCallAdded.iNotifyHandle,KErrCancel);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYCALLADDEDCANCEL_2, "<<CSimLine::NotifyCallAddedCancel");
+	LOGLINE1("<<CSimLine::NotifyCallAddedCancel");
 	return KErrNone;
 	}
 
@@ -387,7 +381,7 @@
 * Process a potential "New Call Added Notification" completion.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_HANDLENEWCALLADDEDNOTIFICATION_1, ">>CSimLine::HandleNewCallAddedNotification");
+	LOGLINE1(">>CSimLine::HandleNewCallAddedNotification");
 	iNameOfLastCallAdded.Copy(aNewName);
 	if(iNotifyCallAdded.iNotifyPending)
 		{
@@ -395,7 +389,7 @@
 		((TName*)iNotifyCallAdded.iNotifyData)->Copy(aNewName);
 		ReqCompleted(iNotifyCallAdded.iNotifyHandle,KErrNone);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_HANDLENEWCALLADDEDNOTIFICATION_2, "<<CSimLine::HandleNewCallAddedNotification");
+	LOGLINE1("<<CSimLine::HandleNewCallAddedNotification");
 	}
 
 TInt CSimLine::GetCaps(const TTsyReqHandle aTsyReqHandle, RLine::TCaps* aCaps)
@@ -455,7 +449,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETINFO_1, ">>CSimLine::GetInfo");
+	LOGLINE1(">>CSimLine::GetInfo");
 	aLineInfo->iHookStatus=iHookState;
 	aLineInfo->iStatus=(RCall::TStatus)iState;
 	aLineInfo->iNameOfLastCallAdded.Copy(iNameOfLastCallAdded);
@@ -465,7 +459,7 @@
 		aLineInfo->iNameOfCallForAnswering.Zero();
 
 	ReqCompleted(aTsyReqHandle,KErrNone);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETINFO_2, "<<CSimLine::GetInfo");
+	LOGLINE1("<<CSimLine::GetInfo");
 	return KErrNone;
 	}
 
@@ -510,10 +504,10 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETSTATUS_1, ">>CSimLine::GetStatus");
+	LOGLINE1(">>CSimLine::GetStatus");
 	*aLineStatus=GetCoreLineStatus();
 	ReqCompleted(aTsyReqHandle,KErrNone);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETSTATUS_2, "<<CSimLine::GetStatus");
+	LOGLINE1("<<CSimLine::GetStatus");
 	return KErrNone;
 	}
 
@@ -527,10 +521,10 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETMOBILELINESTATUS_1, ">>CSimLine::GetMobileLineStatus");
+	LOGLINE1(">>CSimLine::GetMobileLineStatus");
 	*aLineStatus=iState;
 	ReqCompleted(aTsyReqHandle,KErrNone);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETMOBILELINESTATUS_2, "<<CSimLine::GetMobileLineStatus");
+	LOGLINE1("<<CSimLine::GetMobileLineStatus");
 	return KErrNone;
 	}
 
@@ -544,10 +538,10 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETHOOKSTATUS_1, ">>CSimLine::GetHookStatus");
+	LOGLINE1(">>CSimLine::GetHookStatus");
 	*aHookStatus=iHookState;
 	ReqCompleted(aTsyReqHandle,KErrNone);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETHOOKSTATUS_2, "<<CSimLine::GetHookStatus");
+	LOGLINE1("<<CSimLine::GetHookStatus");
 	return KErrNone;
 	}
 
@@ -558,7 +552,7 @@
 * @return CTestConfig a pointer to the configuration file data section
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CFGFILE_1, ">>CSimLine::CfgFile");
+	LOGLINE1(">>CSimLine::CfgFile");
 	return iPhone->CfgFile();
 	}
 
@@ -579,7 +573,7 @@
 	TInt count=iCalls->Count();
 	for(i=0;i<count;i++)
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_1, ">>CSimLine::ChangeState0 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState);
+		LOGLINE3(">>CSimLine::ChangeState0 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState);
 		}
 	
 	TInt ret=KErrGeneral;
@@ -599,7 +593,7 @@
 	if(ret!=KErrNone && !(aSwap && iState==RMobileCall::EStatusConnected && aNewState==RMobileCall::EStatusConnected))
 		return ret;
  
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_2, ">>CSimLine::ChangeState 0x%08x",aOriginatingCall);
+	LOGLINE2(">>CSimLine::ChangeState 0x%08x",aOriginatingCall);
 	if(aNewState==RMobileCall::EStatusIdle)
 		{
 		if(iState==RMobileCall::EStatusIdle)
@@ -610,7 +604,7 @@
 			TInt count=iCalls->Count();
 			for(i=0;i<count;i++)
 				{
-				OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_3, ">>CSimLine::ChangeState1 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState);
+				LOGLINE3(">>CSimLine::ChangeState1 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState);
 	
 				if(aOriginatingCall!=iCalls->At(i) && iCalls->At(i)->iState != RMobileCall::EStatusIdle)
 					{
@@ -633,7 +627,7 @@
 		TInt count=iCalls->Count();
 		for(i=0;i<count;i++)
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_4, ">>CSimLine::ChangeState1 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState);
+			LOGLINE3(">>CSimLine::ChangeState1 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState);
 			if(iCalls->At(i) != aOriginatingCall && iCalls->At(i)->iState == RMobileCall::EStatusHold)
 				{
 				if(aSwap)
@@ -653,7 +647,7 @@
 		TInt count=iCalls->Count();
 		for(i=0;i<count;i++)
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_5, ">>CSimLine::ChangeState1 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState);
+			LOGLINE3(">>CSimLine::ChangeState1 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState);
 			if(iCalls->At(i) != aOriginatingCall)
 				{
 				if(iCalls->At(i)->iState == RMobileCall::EStatusConnected)
@@ -675,7 +669,7 @@
 		}
 
 	// Actually change the state.
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_6, ">>CSimLine::ChangeState [oldState=%d]  [newState=%d]", iState, aNewState);
+	LOGLINE3(">>CSimLine::ChangeState [oldState=%d]  [newState=%d]", iState, aNewState);
 	
 	if(iState != aNewState)
 		{
@@ -730,10 +724,10 @@
 
 	for(i=0;i<iCalls->Count();i++)
 		{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_7, ">>CSimLine::ChangeState5 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState);
+	LOGLINE3(">>CSimLine::ChangeState5 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState);
 		}
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_8, "<<CSimLine::ChangeState");
+	LOGLINE1("<<CSimLine::ChangeState");
 	return KErrNone;
 	}
 
@@ -744,12 +738,12 @@
 @param aProperty The property key representing the notification. 
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SIMPSEVENT_1, ">>CSimLine::SimPSEvent");
+	LOGLINE1(">>CSimLine::SimPSEvent");
 	if(aProperty==iICProperty) // check for this here still, start the timer for amount specified in config file.
 		ProcessIncomingCallEvent();
 	if(aProperty==iRHProperty)
 		ProcessRemoteHangupEvent();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SIMPSEVENT_2, "<<CSimLine::SimPSEvent");
+	LOGLINE1("<<CSimLine::SimPSEvent");
 	}
 
 TInt CSimLine::SetAutoAnswerCallObject(CSimCall* aCallObject)
@@ -762,7 +756,7 @@
 * @return KErrNone if successful
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SETAUTOANSWERCALLOBJECT_1, ">>CSimLine::SetAnswerCallObject");
+	LOGLINE1(">>CSimLine::SetAnswerCallObject");
 	if(iAnswerIncomingCallReqPending)			// Is there a request already outstanding?
 		return KErrEtelAnswerAlreadyOutstanding;
 
@@ -776,7 +770,7 @@
 		iAnswerNextIncomingCall=aCallObject;		// Set the "answer next call" object
 		iAnswerNextIncomingCall->Open();
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SETAUTOANSWERCALLOBJECT_2, "<<CSimLine::SetAnswerCallObject");
+	LOGLINE1("<<CSimLine::SetAnswerCallObject");
 	return KErrNone;
 	}
 
@@ -788,7 +782,7 @@
 * @param aCallObject pointer to the call object
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_RESETAUTOANSWERCALLOBJECT_1, ">>CSimLine::ResetAnswerCallObject");
+	LOGLINE1(">>CSimLine::ResetAnswerCallObject");
 	__ASSERT_ALWAYS(iAnswerNextIncomingCall==aCallObject,SimPanic(EIllegalAnswerNextIncomingCallInconsistancy));
 	iAnswerNextIncomingCall->Close();
 	iAnswerNextIncomingCall=iSpareCall;
@@ -800,7 +794,7 @@
 * Process an incoming call event.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSINCOMINGCALLEVENT_1, ">>CSimLine::ProcessIncomingCallEvent ");
+	LOGLINE1(">>CSimLine::ProcessIncomingCallEvent ");
 
 	if (iSpareCall == iAnswerNextIncomingCall)
 		{
@@ -817,7 +811,7 @@
 	iTimer->Start(iNotifyIncomingCallPause, this);
 	
 	__ASSERT_ALWAYS(iAnswerNextIncomingCall->ActionEvent(CSimCall::ECallEventIncomingCall,KErrNone) == KErrNone, SimPanic(EGeneral));
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSINCOMINGCALLEVENT_2, "<<CSimLine::ProcessIncomingCallEvent");
+	LOGLINE1("<<CSimLine::ProcessIncomingCallEvent");
 	}
 
 TInt CSimLine::SetRemoteHangupCallObject(CSimCall* aCallObject)
@@ -830,7 +824,7 @@
 * @return KErrNone if successful
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SETREMOTEHANGUPCALLOBJECT_1, ">>CSimLine::SetRemoteHangupCallObject");
+	LOGLINE1(">>CSimLine::SetRemoteHangupCallObject");
 	if(iRemoteHangupCallReqPending)			// Is there a request already outstanding?
 		return KErrEtelInitialisationFailure;
 
@@ -839,7 +833,7 @@
 		{
 		iRemoteHangupCall=aCallObject;		// Set the "remote hang up" object
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SETREMOTEHANGUPCALLOBJECT_2, "<<CSimLine::SetRemoteHangupCallObject");
+	LOGLINE1("<<CSimLine::SetRemoteHangupCallObject");
 	return KErrNone;
 	}
 
@@ -851,7 +845,7 @@
 * @param aCallObject pointer to the call object
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_RESETREMOTEHANGUPCALLOBJECT_1, ">>CSimLine::ResetRemoteHangupCallObject");
+	LOGLINE1(">>CSimLine::ResetRemoteHangupCallObject");
 	__ASSERT_ALWAYS(iRemoteHangupCall==aCallObject,SimPanic(EIllegalAnswerRemoteHangupCallInconsistency));
 	iRemoteHangupCallReqPending=EFalse;
 	}
@@ -861,7 +855,7 @@
 * Process a remote hangup event.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_1, ">>CSimLine::ProcessRemoteHangupEvent");
+	LOGLINE1(">>CSimLine::ProcessRemoteHangupEvent");
 
 	if (iRemoteHangupCall == NULL)
 		{
@@ -871,15 +865,15 @@
 			err = iRemoteHangupCall->ActionEvent(CSimCall::ECallEventRemoteHangup,KErrNone);
 			if(err != KErrNone)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_2, "ERROR: CSimLine::ProcessRemoteHangupEvent returned: %d", err);
+				LOGLINE2("ERROR: CSimLine::ProcessRemoteHangupEvent returned: %d", err);
 				}
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_3, "No outstanding call to hang up remotely");
+			LOGLINE1("No outstanding call to hang up remotely");
 			}
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_4, "<<CSimLine::ProcessRemoteHangupEvent");
+	LOGLINE1("<<CSimLine::ProcessRemoteHangupEvent");
 	}
 
 void CSimLine::CallDestructor(CSimCall* aCall)
@@ -921,13 +915,13 @@
 */
 void CSimLine::ProcessNotifyIncomingCallEvent()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSNOTIFYINCOMINGCALLEVENT_1, ">>CSimLine::ProcessNotifyIncomingCallEvent");
+	LOGLINE1(">>CSimLine::ProcessNotifyIncomingCallEvent");	
 	if(iNotifyIncomingCall.iNotifyPending)
 		{
 		iNotifyIncomingCall.iNotifyPending=EFalse;
 		((TName*)iNotifyIncomingCall.iNotifyData)->Copy(iAnswerNextIncomingCall->iName);
 		ReqCompleted(iNotifyIncomingCall.iNotifyHandle,KErrNone);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSNOTIFYINCOMINGCALLEVENT_2, "<<CSimLine::ProcessNotifyIncomingCallEvent");
+	LOGLINE1("<<CSimLine::ProcessNotifyIncomingCallEvent");	
 	}

--- a/telephonyserverplugins/simtsy/src/CSimMbmsPacketContext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimMbmsPacketContext.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -19,13 +19,7 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimMbmsPacketContextTraces.h"
-#endif
-
+#include "Simlog.h"
 #include "CSimPhone.h"
 #include "CSimMbmsPacketContext.h"
 #include "CSimPacketQoS.h"
@@ -61,7 +55,7 @@
 * @param aContextName name  for this packet context
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CTOR_1, "CSimMbmsPacketContext: Entered constructor");
+	LOGPACKET1("CSimMbmsPacketContext: Entered constructor");
 	iNotifyConfigMBMS.iNotifyPending = EFalse;
 	iNotifyStatusChange.iNotifyPending = EFalse;
 	}
@@ -74,7 +68,7 @@
 * @leave Leaves no memory or any data member does not construct for any reason.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CONSTRUCTL_1, "CSimMbmsPacketContext: Entered constructL function");
+	LOGPACKET1("CSimMbmsPacketContext: Entered constructL function");
 	CSimPacketContext::ConstructL();
 	
 	iMbmsSetConfigTimer = CSimTimer::NewL(iPhone);
@@ -205,7 +199,7 @@
 *
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DTOR_1, "CSimMbmsPacketContext: Entered destructor");
+	LOGPACKET1("CSimMbmsPacketContext: Entered destructor");
 
 	if (iMbmsSetConfigTimer != NULL)
 		{
@@ -263,7 +257,7 @@
  * @ return NULL.
  */
 	{	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_OPENNEWOBJECTBYNAMEL_1, "Unexpected call to CSimMbmsPacketContext: OpenNewObjectByName");
+	LOGPACKET1("Unexpected call to CSimMbmsPacketContext: OpenNewObjectByName");
 	User::Leave(KErrNotSupported);
 	return NULL;
 	}
@@ -278,7 +272,7 @@
  * @leave Leaves if out of memory.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_OPENNEWOBJECTL_1, "Unexpected call to CSimMbmsPacketContext: OpenNewObjectL");
+	LOGPACKET1("Unexpected call to CSimMbmsPacketContext: OpenNewObjectL");
 	User::Leave(KErrNotSupported);
 	return NULL;
 	}
@@ -293,7 +287,7 @@
 * @leave Leaves if not supported by this tsy 
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_REQMODEL_1, "CSimMbmsPacketContext: ReqModeL");
+	LOGPACKET1("CSimMbmsPacketContext: ReqModeL");
 	CTelObject::TReqMode ret=0;
 	switch (aIpc)
 		{
@@ -316,8 +310,8 @@
 			ret=KReqModeMultipleCompletionEnabled | KReqModeRePostImmediately;
 			break;
 		default:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_REQMODEL_2, "CSimMbmsPacketContext: ReqModeL error, unknown IPC");
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_REQMODEL_3, "CSimMbmsPacketContext: ReqModeL sending the request to CSimPacketContext");
+			LOGPACKET1("CSimMbmsPacketContext: ReqModeL error, unknown IPC");
+			LOGPACKET1("CSimMbmsPacketContext: ReqModeL sending the request to CSimPacketContext");
 			ret = CSimPacketContext::ReqModeL(aIpc);
 			break;
 		}
@@ -336,18 +330,18 @@
 * @return err KErrNone if fine
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_1, "CSimMbmsPacketContext: RegisterNotification called");
+	LOGPACKET1("CSimMbmsPacketContext: RegisterNotification called");
 	switch (aIpc)
 		{
 		case EPacketContextNotifyConfigChanged:
 		case EPacketContextNotifyStatusChange:
 		case EPacketContextNotifyDataTransferred:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_2, "CSimMbmsPacketContext: RegisterNotification");
+			LOGPACKET1("CSimMbmsPacketContext: RegisterNotification");
 			return KErrNone;
 		default:
 			// Unknown or invalid IPC
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_3, "CSimMbmsPacketContext: Register error, unknown IPC");
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_4, "CSimMbmsPacketContext: Register sending the request to CSimPacketContext");
+			LOGPACKET1("CSimMbmsPacketContext: Register error, unknown IPC");
+			LOGPACKET1("CSimMbmsPacketContext: Register sending the request to CSimPacketContext");
 			return CSimPacketContext::RegisterNotification(aIpc);
 		}
 	}
@@ -365,18 +359,18 @@
 * @return err KErrNone if fine
 */
 	{	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_1, "CSimMbmsPacketContext: DeregisterNotification called");
+	LOGPACKET1("CSimMbmsPacketContext: DeregisterNotification called");
 	switch (aIpc)
 		{
 		case EPacketContextNotifyConfigChanged:
 		case EPacketContextNotifyStatusChange:
 		case EPacketContextNotifyDataTransferred:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_2, "CSimMbmsPacketContext: DeregisterNotification");
+			LOGPACKET1("CSimMbmsPacketContext: DeregisterNotification");
 			return KErrNone;
 		default:
 			// Unknown or invalid IPC
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_3, "CSimMbmsPacketContext: Deregister error, unknown IPC");
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_4, "CSimMbmsPacketContext: Deregister sending the request to CSimPacketContext");
+			LOGPACKET1("CSimMbmsPacketContext: Deregister error, unknown IPC");
+			LOGPACKET1("CSimMbmsPacketContext: Deregister sending the request to CSimPacketContext");
 			return CSimPacketContext::DeregisterNotification(aIpc);
 		}
 	}
@@ -391,20 +385,20 @@
 * @return err KErrNone if fine
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_1, "CSimMbmsPacketContext: NumberOfSlotsL called");
+	LOGPACKET1("CSimMbmsPacketContext: NumberOfSlotsL called");
 	TInt numberOfSlots=1;
 	switch (aIpc)
 		{
 		case EPacketContextNotifyConfigChanged:
 		case EPacketContextNotifyStatusChange:
 		case EPacketContextNotifyDataTransferred:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_2, "CSimMbmsPacketContext: Registered with 5 slots");
+			LOGPACKET1("CSimMbmsPacketContext: Registered with 5 slots");
 			numberOfSlots=5;
 			break;
 		default:
 			// Unknown or invalid IPC
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_3, "CSimMbmsPacketContext: Number of Slots error, unknown IPC");
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_4, "CSimMbmsPacketContext: Number of Slots: sending the request to CSimPacketContext");
+			LOGPACKET1("CSimMbmsPacketContext: Number of Slots error, unknown IPC");
+			LOGPACKET1("CSimMbmsPacketContext: Number of Slots: sending the request to CSimPacketContext");
 			return CSimPacketContext::NumberOfSlotsL(aIpc);
 		}  
 	return numberOfSlots;
@@ -431,7 +425,7 @@
 		ReqCompleted(aTsyReqHandle,KErrNotReady);
 		return KErrNone;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_EXTFUNC_1, "CSimMbmsPacketContext: ExtFunc Called");
+	LOGPACKET1("CSimMbmsPacketContext: ExtFunc Called");
 	TAny* dataPtr=aPackage.Ptr1();
 	TAny* dataPtr2=aPackage.Ptr2();
 
@@ -450,7 +444,7 @@
 			//<permitted at any one time
 			if(iIsActive)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_EXTFUNC_2, "Trying to activate an already activated context");
+				LOGPACKET1("Trying to activate an already activated context");
 				ReqCompleted(aTsyReqHandle,KErrEtelCallAlreadyActive);
 				return KErrNone;
 				}
@@ -498,8 +492,8 @@
 			return GetMbmsSessionsPhase2(aTsyReqHandle, 
 			REINTERPRET_CAST(TClientId*, dataPtr), aPackage.Des2n());		
 		default:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_EXTFUNC_3, "CSimMbmsPacketContext: ExtFunc Unknown IPC");
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_EXTFUNC_4, "CSimMbmsPacketContext: sending the request to CSimPacketContext::ExtFunc Unknown IPC");
+			LOGPACKET1("CSimMbmsPacketContext: ExtFunc Unknown IPC");
+			LOGPACKET1("CSimMbmsPacketContext: sending the request to CSimPacketContext::ExtFunc Unknown IPC");
 			return CSimPacketContext::ExtFunc(aTsyReqHandle,aIpc,aPackage);
 		}
 	}
@@ -515,7 +509,7 @@
 * @return err KErrNone if request completes ok
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CANCELSERVICE_1, "CSimMbmsPacketContext: - CancelService called");
+	LOGPACKET1("CSimMbmsPacketContext: - CancelService called");
 
 	switch (aIpc)
 		{
@@ -539,8 +533,8 @@
 		case EPacketGetMbmsSessionListPhase2:
 			return GetMbmsSessionsCancel(aTsyReqHandle);
 		default:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CANCELSERVICE_2, "CSimMbmsPacketContext: - CancelService unknown IPC called");
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CANCELSERVICE_3, "CSimMbmsPacketContext: sending the request to CSimPacketContext::ExtFunc Unknown IPC");
+			LOGPACKET1("CSimMbmsPacketContext: - CancelService unknown IPC called");
+			LOGPACKET1("CSimMbmsPacketContext: sending the request to CSimPacketContext::ExtFunc Unknown IPC");
 			return CSimPacketContext::CancelService(aIpc,aTsyReqHandle);
 		}
 	}
@@ -552,11 +546,11 @@
 * param - aId indicates which Timer Event has occured.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_1, "CSimMbmsPacketContext: - TimerCallBack(TInt aId) called");
+	LOGPACKET1("CSimMbmsPacketContext: - TimerCallBack(TInt aId) called");
 	switch(aId)
 		{
 		case ETimerIdMbmsPcktContextSetConfig:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_2, "CSimMbmsPacketContext: - TimerCallBack SetConfig called");
+			LOGPACKET1("CSimMbmsPacketContext: - TimerCallBack SetConfig called");
 			if(iSetConfigValues.iErrorValue == KErrNone)
 				{
 				iMbmsContextConfigParamsIndex = iSetConfigValues.iIndex ;
@@ -564,7 +558,7 @@
 			ReqCompleted(iSetConfigRequestHandle,iSetConfigValues.iErrorValue);
 			break;
 		case ETimerIdMbmsUpdateSessionId:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_3, "CSimMbmsPacketContext: - TimerCallBack UpdateSessionID called");
+			LOGPACKET1("CSimMbmsPacketContext: - TimerCallBack UpdateSessionID called");
 			if(iUpdateSessionHandle != NULL)
 				{
 				ReqCompleted(iUpdateSessionHandle,KErrNone);
@@ -578,14 +572,14 @@
 			break;
 		default:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_4, ">>CSimMbmsPacketContext::TimerCallBack Default Case for Context Events");
+			LOGPACKET1(">>CSimMbmsPacketContext::TimerCallBack Default Case for Context Events");
 			switch(iCurrentEvent)
 				{
 				case EMbmsContextEventNone:
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_5, "TimerCallBack - iCurrentEvent = [EMbmsContextEventNone]");
+					LOGPACKET1("TimerCallBack - iCurrentEvent = [EMbmsContextEventNone]");
 					break;
 				case EMbmsContextEventActivate:
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_6, "TimerCallBack - iCurrentEvent = [EMbmsContextEventActivate]");
+					LOGPACKET1("TimerCallBack - iCurrentEvent = [EMbmsContextEventActivate]");
 					if(iState==RPacketContext::EStatusActivating)
 						{
 						TInt activateValue = iMbmsContextConfigParams->At(iMbmsContextConfigParamsIndex).iActivateCode;
@@ -621,11 +615,11 @@
 						}
 					else
 						{
-						OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_7, "Unexpected iState for iCurrentEvent[EMbmsContextEventActivate]");
+						LOGPACKET1("Unexpected iState for iCurrentEvent[EMbmsContextEventActivate]");
 						}
 					break;
 				case EMbmsContextEventDeactivate:
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_8, "TimerCallBack - iCurrentEvent = [EMbmsContextEventDeactivate]");
+					LOGPACKET1("TimerCallBack - iCurrentEvent = [EMbmsContextEventDeactivate]");
 					if(((iState == RPacketContext::EStatusInactive) || (iState == RPacketContext::EStatusDeactivating)) && 
 									(iCurrentEvent==EMbmsContextEventDeactivate))
 						{
@@ -636,11 +630,11 @@
 						}
 					else
 						{
-						OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_9, "Unexpected iState for iCurrentEvent[EMbmsContextEventActivate]");
+						LOGPACKET1("Unexpected iState for iCurrentEvent[EMbmsContextEventActivate]");
 						}
 					break;
 				case EMbmsContextEventDelete:
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_10, "TimerCallBack - iCurrentEvent = [EMbmsContextEventDelete]");
+					LOGPACKET1("TimerCallBack - iCurrentEvent = [EMbmsContextEventDelete]");
 					if(iState == RPacketContext::EStatusInactive && !iIsActive )
 						{
 						TInt ret = ChangeState(RPacketContext::EStatusDeleted);
@@ -655,8 +649,8 @@
 					break;
 				default:
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_11, "CSimMbmsPacketContext::TimerCallBack");
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_12, "<<Unexpected iCurrentEvent @ TimerCallBack");
+					LOGPACKET1("CSimMbmsPacketContext::TimerCallBack");
+					LOGPACKET1("<<Unexpected iCurrentEvent @ TimerCallBack");
 					break;
 					}
 				}
@@ -671,7 +665,7 @@
 * @return TName	Name of the MBMS context
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CONTEXTNAME_1, "CSimMbmsPacketContext::ContextName called");
+	LOGPACKET1("CSimMbmsPacketContext::ContextName called");
 	return iContextName; 
 	}
 
@@ -682,7 +676,7 @@
 * @return CTestConfigSection	pointer to the configuration file section
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CFGFILE_1, "CSimMbmsPacketContext::CfgFile called");
+	LOGPACKET1("CSimMbmsPacketContext::CfgFile called");
 	return iPacketService->CfgFile();
 	}
 
@@ -696,7 +690,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_SETCONFIG_1, "CSimMbmsPacketContext::SetConfig called");
+	LOGPACKET1("CSimMbmsPacketContext::SetConfig called");
 
 	TPckg<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)aConfig;
 	TPacketDataConfigBase& configBaseV1 = (*configBase)();
@@ -786,7 +780,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_GETCONFIG_1, "CSimMbmsPacketContext::GetConfig called");
+	LOGPACKET1("CSimMbmsPacketContext::GetConfig called");
 	TPckg<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)aConfig;
 	TPacketDataConfigBase& configBaseV1 = (*configBase)();
 	
@@ -822,7 +816,7 @@
 * @return err KErrNone 
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_GETCONFIGCANCEL_1, "CSimMbmsPacketContext::GetConfigCancel called");
+	LOGPACKET1("CSimMbmsPacketContext::GetConfigCancel called");
 	return KErrNone;
 	}
 
@@ -835,7 +829,7 @@
 * @return KerrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_GETSTATUS_1, "CSimMbmsPacketContext::GetStatus called");
+	LOGPACKET1("CSimMbmsPacketContext::GetStatus called");
 	*aContextStatus = iState;
 	ReqCompleted(aTsyReqHandle,KErrNone);
 	return KErrNone;
@@ -869,7 +863,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_ACTIVATECANCEL_1, "CSimMbmsPacketContext::ActivateCancel called");
+	LOGPACKET1("CSimMbmsPacketContext::ActivateCancel called");
 	iMbmsContextTimer->Cancel();
 	if(((iState == RPacketContext::EStatusInactive) || (iState == RPacketContext::EStatusActivating)) && 
 					(iCurrentEvent==EMbmsContextEventActivate))
@@ -908,7 +902,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DEACTIVATE_1, "CSimMbmsPacketContext::Deactivate called");
+	LOGPACKET1("CSimMbmsPacketContext::Deactivate called");
 	iDeactivateRequestHandle = aTsyReqHandle;
 	TInt ret = ActionEvent(EMbmsContextEventDeactivate);
 	return ret;
@@ -925,7 +919,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DEACTIVATECANCEL_1, "CSimMbmsPacketContext::DeactivateCancel called");
+	LOGPACKET1("CSimMbmsPacketContext::DeactivateCancel called");
 	iMbmsContextTimer->Cancel();
 	if(((iState == RPacketContext::EStatusInactive) || (iState == RPacketContext::EStatusDeactivating)) && 
 					(iCurrentEvent==EMbmsContextEventDeactivate))
@@ -999,7 +993,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DELETE_1, "CSimMbmsPacketContext::Delete called");
+	LOGPACKET1("CSimMbmsPacketContext::Delete called");
 	iDeleteRequestHandle = aTsyReqHandle;
 	TInt ret = ActionEvent(EMbmsContextEventDelete);
 	return ret;
@@ -1015,7 +1009,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DELETECANCEL_1, "CSimMbmsPacketContext::DeleteCancel called");
+	LOGPACKET1("CSimMbmsPacketContext::DeleteCancel called");
 	iMbmsContextTimer->Cancel();
 	if((iState == RPacketContext::EStatusInactive) && (iCurrentEvent==EMbmsContextEventDelete))
 		{
@@ -1034,7 +1028,7 @@
 * @return KerrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_GETLASTERRORCAUSE_1, "CSimMbmsPacketContext::GetLastErrorCause called");
+	LOGPACKET1("CSimMbmsPacketContext::GetLastErrorCause called");
 	
 	ReqCompleted(aTsyReqHandle,iLastError);
 	return KErrNone;
@@ -1050,7 +1044,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NOTIFYCONFIGCHANGED_1, "CSimMbmsPacketContext::NotifyConfigChanged called");
+	LOGPACKET1("CSimMbmsPacketContext::NotifyConfigChanged called");
 	TPckg<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)aConfig;
 	TPacketDataConfigBase& configBaseV1 = (*configBase)();
 	
@@ -1064,7 +1058,7 @@
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NOTIFYCONFIGCHANGED_2, "CSimMbmsPacketContext::NotifyConfigChanged Unexpected config for MBMS context");
+		LOGPACKET1("CSimMbmsPacketContext::NotifyConfigChanged Unexpected config for MBMS context");
 		}
 
 	return KErrNone;
@@ -1079,7 +1073,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NOTIFYCONFIGCHANGEDCANCEL_1, "CSimMbmsPacketContext::NotifyConfigChangedCancel called");
+	LOGPACKET1("CSimMbmsPacketContext::NotifyConfigChangedCancel called");
 	if(iNotifyConfigMBMS.iNotifyPending &&
 		iNotifyConfigMBMS.iNotifyHandle == aTsyReqHandle)
 		{
@@ -1106,7 +1100,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NOTIFYSTATUSCHANGE_1, "CSimMbmsPacketContext::NotifyStatusChange called");
+	LOGPACKET1("CSimMbmsPacketContext::NotifyStatusChange called");
 	__ASSERT_ALWAYS(!iNotifyStatusChange.iNotifyPending,SimPanic(ENotificationAlreadyPending));
 	iNotifyStatusChange.iNotifyPending = ETrue;
 	iNotifyStatusChange.iNotifyHandle = aTsyReqHandle;
@@ -1123,7 +1117,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NOTIFYSTATUSCHANGECANCEL_1, "CSimMbmsPacketContext::NotifyStatusChangeCancel called");
+	LOGPACKET1("CSimMbmsPacketContext::NotifyStatusChangeCancel called");
 	if(iNotifyStatusChange.iNotifyPending)
 		{
 		iNotifyStatusChange.iNotifyPending=EFalse;
@@ -1147,7 +1141,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLIST_1, "CSimMbmsPacketContext::UpdateMbmsSessionList called");
+	LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionList called");
 
 	TInt error=KErrNone;
 	iUpdateSessionHandle = aTsyReqHandle;
@@ -1157,7 +1151,7 @@
 	switch(*aAction)
 		{
 		case SIMTSY_PACKET_MBMS_ADD_ENTRIES:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLIST_2, "CSimMbmsPacketContext::UpdateMbmsSessionList Action: ADD ");
+			LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionList Action: ADD ");
 			
 			// TRAP can contain multiple statments
 			TRAP(error,iSessionIdList->AppendL(*aSessionId);
@@ -1174,7 +1168,7 @@
 			break;
 
 		case SIMTSY_PACKET_MBMS_REM_ENTRIES:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLIST_3, "CSimMbmsPacketContext::UpdateMbmsSessionList Action: REMOVE ");
+			LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionList Action: REMOVE ");
 			iSessionIdList->Find(*aSessionId,key,position);
 			if(position != -1)
 				{
@@ -1195,7 +1189,7 @@
 			break;
 
 		case SIMTSY_PACKET_MBMS_REM_ALL_ENTRIES:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLIST_4, "CSimMbmsPacketContext::UpdateMbmsSessionList Action: REMOVE_ALL ");
+			LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionList Action: REMOVE_ALL ");
 			iNumOfSessionId=0;
 			//iSessionIdList->At(0) = iNumOfSessionId;
 			TRAP(error, iSessionIdList->InsertL(0,iNumOfSessionId));
@@ -1208,7 +1202,7 @@
 			break;
 
 		default:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLIST_5, "CSimMbmsPacketContext::UpdateMbmsSessionList Action: Default ");
+			LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionList Action: Default ");
 			ReqCompleted(aTsyReqHandle,KErrNotFound);
 			break;
 		}
@@ -1223,7 +1217,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLISTCANCEL_1, "CSimMbmsPacketContext::UpdateMbmsSessionListCancel called");
+	LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionListCancel called");
 	iMbmsUpdateSessionTimer->Cancel();
 	if( iUpdateSessionHandle == aTsyReqHandle )
 		{
@@ -1306,7 +1300,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_GETMBMSSESSIONSPHASE1_1, "CSimMbmsPacketContext::GetMbmsSessionsPhase1 called");
+	LOGPACKET1("CSimMbmsPacketContext::GetMbmsSessionsPhase1 called");
 	iGetMbmsSessionHandle = aTsyReqHandle;
 	TInt ret=KErrNone;
 	TInt leaveCode=KErrNone;
@@ -1332,7 +1326,7 @@
 	{
 	// Retrieve MBMS session list,
 	// Store the sessions and then return the size of the buffer to the client
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_PROCESSGETMBMSSESSIONSPHASE1L_1, "CSimMbmsPacketContext::ProcessGetMbmsSessionsPhase1L called");
+	LOGPACKET1("CSimMbmsPacketContext::ProcessGetMbmsSessionsPhase1L called");
 	RPacketMbmsContext::CMbmsSession* mbmsSession=RPacketMbmsContext::CMbmsSession::NewL();
 	CleanupStack::PushL(mbmsSession);
 
@@ -1381,7 +1375,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_GETMBMSSESSIONSPHASE2_1, "CSimMbmsPacketContext::GetMbmsSessionsPhase2 called");
+	LOGPACKET1("CSimMbmsPacketContext::GetMbmsSessionsPhase2 called");
 	CPcktListReadAllAttempt* read=NULL;
 	// Find the get Mbms monitored services from this client
 	for (TInt i=0; i<iMbmsSessionList->Count(); ++i)
@@ -1412,7 +1406,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_GETMBMSSESSIONSCANCEL_1, "CSimMbmsPacketContext::GetMbmsSessionsCancel called");
+	LOGPACKET1("CSimMbmsPacketContext::GetMbmsSessionsCancel called");
 	// Remove the MBMS sessions from iMbmsSessionList
 	
 	CPcktListReadAllAttempt* read=NULL;
@@ -1440,7 +1434,7 @@
 * @return Error indication if change of state is successful or not
 */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CHANGESTATE_1, "CSimMbmsPacketContext::ChangeState [newState=%d]", aNewState);
+	LOGPACKET2("CSimMbmsPacketContext::ChangeState [newState=%d]", aNewState);
 	__ASSERT_ALWAYS(aNewState!=RPacketContext::EStatusUnknown,SimPanic(ECallStatusUnknownIllegal));
 
 	if(iState==aNewState)
@@ -1489,7 +1483,7 @@
 		ReqCompleted(iNotifyStatusChange.iNotifyHandle,KErrNone);
 		}
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CHANGESTATE_2, "<<CSimMbmsPacketContext::ChangeState Completed");
+	LOGPACKET1("<<CSimMbmsPacketContext::ChangeState Completed");
 	return KErrNone;
 	}
 
@@ -1504,14 +1498,14 @@
 * @return value represents the error state caused by the attempted state machine jump.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_ACTIONEVENT_1, "<<CSimMbmsPacketContext::ActionEvent Completed");
+	LOGPACKET1("<<CSimMbmsPacketContext::ActionEvent Completed");
 	TInt ret=KErrNone;
 	__ASSERT_ALWAYS(iState!=RPacketContext::EStatusUnknown,SimPanic(ECallStatusUnknownIllegal));
 
 	switch(aEvent)
 		{
 		case EMbmsContextEventActivate:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_ACTIONEVENT_2, "CSimMbmsPacketContext::ActionEvent = [EMbmsContextEventActivate]");
+			LOGPACKET1("CSimMbmsPacketContext::ActionEvent = [EMbmsContextEventActivate]");
 			if(iState==RPacketContext::EStatusInactive)
 				{
 				iCurrentEvent=EMbmsContextEventActivate;
@@ -1525,7 +1519,7 @@
 			break;
 
 		case EMbmsContextEventDeactivate:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_ACTIONEVENT_3, "CSimMbmsPacketContext::ActionEvent = [EMbmsContextEventDeactivate]");
+			LOGPACKET1("CSimMbmsPacketContext::ActionEvent = [EMbmsContextEventDeactivate]");
 			if(iState==RPacketContext::EStatusActive || iState==RPacketContext::EStatusActivating)
 				{
 				iCurrentEvent=EMbmsContextEventDeactivate;
@@ -1539,7 +1533,7 @@
 			break;
 
 		case EMbmsContextEventDelete:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_ACTIONEVENT_4, "CSimMbmsPacketContext::ActionEvent = [EMbmsContextEventDelete]");
+			LOGPACKET1("CSimMbmsPacketContext::ActionEvent = [EMbmsContextEventDelete]");
 			iDeleted = ETrue;
 			if(iState==RPacketContext::EStatusInactive)
 				{
@@ -1550,7 +1544,7 @@
 				ReqCompleted(iDeleteRequestHandle, KErrInUse);
 			break;
 		default:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_ACTIONEVENT_5, "CSimMbmsPacketContext::ActionEvent = [Default Case]");
+			LOGPACKET1("CSimMbmsPacketContext::ActionEvent = [Default Case]");
 			break;
 		}
 	return ret;
@@ -1565,7 +1559,7 @@
 * @return RPacketService::TStatus The packet service status conversion
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CONVERTTOPACKETSERVICESTATUS_1, "CSimMbmsPacketContext::ConvertToPacketServiceStatus called");
+	LOGPACKET1("CSimMbmsPacketContext::ConvertToPacketServiceStatus called");
 	RPacketService::TStatus serviceStatus;
 	switch (aNewState)
 		{
@@ -1595,7 +1589,7 @@
  * synchronous call scenario 
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_RANDTIME_1, "CSimMbmsPacketContext::RandTime called");
+	LOGPACKET1("CSimMbmsPacketContext::RandTime called");
 	TInt ranT= Math::Random()%4; 
 	return(ranT);
 	}

--- a/telephonyserverplugins/simtsy/src/CSimNetworkStatus.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimNetworkStatus.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -20,18 +20,12 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimNetworkStatusTraces.h"
-#endif
-
 #include <e32property.h>
 #include <testconfigfileparser.h>
 #include <sacls.h>
 #include "CSimNetworkStatus.h"
 #include "CSimPhone.h"
+#include "Simlog.h"
 #include "CSimPubSubChange.h"
 #include "CSimTsyMode.h"
 #include "etelmmerr.h"
@@ -113,7 +107,7 @@
  * A number of these tags may be included to create a Cell Information Profile.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_1, "Starting to parse Network Status config parameters...");
+	LOGNETWORK1("Starting to parse Network Status config parameters...");
 	iRegStatTimer=CSimTimer::NewL(iPhone);
 	iNitzTimer=CSimTimer::NewL(iPhone);
 	iRadioModeTimer=CSimTimer::NewL(iPhone);
@@ -144,37 +138,37 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,countryCode);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNTRYCODE returned %d (element no. %d) from tag %s.",ret,0,KNetworkInfo);
+			LOGPARSERR("countryCode",ret,0,&KNetworkInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,networkIdentify);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element NETWORKIDENTIFY returned %d (element no. %d) from tag %S.",ret,1,KNetworkInfo);
+			LOGPARSERR("networkIdentify",ret,1,&KNetworkInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,displayTag);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DISPLAYTAG returned %d (element no. %d) from tag %s.",ret,2,KNetworkInfo);
+			LOGPARSERR("displayTag",ret,2,&KNetworkInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,shortName);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element SHORTNAME returned %d (element no. %d) from tag %s.",ret,3,KNetworkInfo);
+			LOGPARSERR("shortName",ret,3,&KNetworkInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,longName);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element LONGNAME returned %d (element no. %d) from tag %s.",ret,4,KNetworkInfo);
+			LOGPARSERR("longName",ret,4,&KNetworkInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,status);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,5,KNetworkInfo);
+			LOGPARSERR("status",ret,5,&KNetworkInfo);
 			continue;
 			}
 		RMobilePhone::TMobilePhoneNetworkInfoV2 networkInfo;
@@ -239,13 +233,13 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KRegStatus);
+			LOGPARSERR("duration",ret,0,&KRegStatus);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,regStat);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element REGSTAT returned %d (element no. %d) from tag %s.",ret,1,KRegStatus);
+			LOGPARSERR("regStat",ret,1,&KRegStatus);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,networkIndex);
@@ -272,13 +266,13 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KRadioMode);
+				LOGPARSERR("duration",ret,0,&KRadioMode);
 				continue;
 				}
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,radioStatus);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element RADIOSTATUS returned %d (element no. %d) from tag %s.",ret,1,KRadioMode);
+				LOGPARSERR("radioStatus",ret,1,&KRadioMode);
 				continue;
 				}
 			
@@ -302,61 +296,61 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KNitzInfo);
+			LOGPARSERR("duration",ret,0,&KNitzInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,year);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element YEAR returned %d (element no. %d) from tag %s.",ret,1,KNitzInfo);
+			LOGPARSERR("year",ret,1,&KNitzInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,month);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element MONTH returned %d (element no. %d) from tag %s.",ret,2,KNitzInfo);
+			LOGPARSERR("month",ret,2,&KNitzInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,day);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element DAY returned %d (element no. %d) from tag %s.",ret,3,KNitzInfo);
+			LOGPARSERR("day",ret,3,&KNitzInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,hour);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element HOUR returned %d (element no. %d) from tag %s.",ret,4,KNitzInfo);
+			LOGPARSERR("hour",ret,4,&KNitzInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,min);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element MIN returned %d (element no. %d) from tag %s.",ret,5,KNitzInfo);
+			LOGPARSERR("min",ret,5,&KNitzInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,sec);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element SEC returned %d (element no. %d) from tag %s.",ret,6,KNitzInfo);
+			LOGPARSERR("sec",ret,6,&KNitzInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,microsec);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element MICROSEC returned %d (element no. %d) from tag %s.",ret,7,KNitzInfo);
+			LOGPARSERR("microsec",ret,7,&KNitzInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,tz);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element TZ returned %d (element no. %d) from tag %s.",ret,8,KNitzInfo);
+			LOGPARSERR("tz",ret,8,&KNitzInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,dst);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element DST returned %d (element no. %d) from tag %s.",ret,9,KNitzInfo);
+			LOGPARSERR("dst",ret,9,&KNitzInfo);
 			continue;
 			}
 
@@ -386,31 +380,31 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KCellInfo);
+				LOGPARSERR("duration",ret,0,&KCellInfo);
 				continue;
 				}
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,mode);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element MODE returned %d (element no. %d) from tag %s.",ret,1,KCellInfo);
+				LOGPARSERR("mode",ret,1,&KCellInfo);
 				continue;
 				}
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,cellId);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element CELLID returned %d (element no. %d) from tag %s.",ret,2,KCellInfo);
+				LOGPARSERR("cellId",ret,2,&KCellInfo);
 				continue;
 				}
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,timingAdvance);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_25, "WARNING - CONFIGURATION FILE PARSING - Reading element TIMINGADVANCE returned %d (element no. %d) from tag %s.",ret,3,KCellInfo);
+				LOGPARSERR("timingAdvance",ret,3,&KCellInfo);
 				continue;
 				}
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,cellInfoStatus);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_26, "WARNING - CONFIGURATION FILE PARSING - Reading element CELLINFOSTATUS returned %d (element no. %d) from tag %s.",ret,3,KCellInfo);
+				LOGPARSERR("cellInfoStatus",ret,3,&KCellInfo);
 				continue;
 				}
 			
@@ -457,7 +451,7 @@
 				locationArea.iCellId= cellId;
 				iLocationArea->AppendL(locationArea);
 				}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_27, "...Finished parsing Network Status config parameters...");
+	LOGNETWORK1("...Finished parsing Network Status config parameters...");
 
 // If present load the first registration status settings and start the registration
 // status timer.
@@ -466,7 +460,7 @@
 		iRegStatIndex=0;
 		iCurrentRegStatus=iRegStatusInfo->At(0).iRegStatus;
 		iCurrentNetworkIndex=iRegStatusInfo->At(0).iNetworkInfoIndex;
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_28, "Starting ETimerIdNtwkStatRegStat for duration:%d", iRegStatusInfo->At(0).iDuration);
+		LOGNETWORK2("Starting ETimerIdNtwkStatRegStat for duration:%d", iRegStatusInfo->At(0).iDuration);
 		iRegStatTimer->Start(iRegStatusInfo->At(0).iDuration,this,ETimerIdNtwkStatRegStat);
 		}
 
@@ -493,14 +487,14 @@
 		if(iRadioMode.iRadioOn==EFalse)
 			{
 			RProperty::Set(KUidSystemCategory, KUidPhonePwrValue, ESAPhoneOff);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_29, "Radio Mode = OFF (from config)");
+			LOGNETWORK1("Radio Mode = OFF (from config)");
 			}
 		else
 			{
 			RProperty::Set(KUidSystemCategory, KUidPhonePwrValue, ESAPhoneOn);			
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_30, "Radio Mode = ON (from config)");
+				LOGNETWORK1("Radio Mode = ON (from config)");
 			}
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_31, "Radio Mode duration = %d (from config)", iRadioModeInfo->At(0).iDuration);
+		LOGNETWORK2("Radio Mode duration = %d (from config)", iRadioModeInfo->At(0).iDuration);
 
  		iRadioModeTimer->Start(iRadioModeInfo->At(0).iDuration,this,ETimerIdNtwkStatRadioMode);
 		}
@@ -508,7 +502,7 @@
 		{
 		//default to on
 		RProperty::Set(KUidSystemCategory, KUidPhonePwrValue, ESAPhoneOn);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_32, "Radio Mode = ON (no config)");
+		LOGNETWORK1("Radio Mode = ON (no config)");
 		}
 
 //If present read in Service Provider settings
@@ -520,17 +514,17 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,displayreq);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_33, "WARNING - CONFIGURATION FILE PARSING - Reading element DISPLAYREQ returned %d (element no. %d) from tag %s.",ret,0,KServiceProviderName);
+			LOGPARSERR("displayreq",ret,0,&KServiceProviderName);
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,spname);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_34, "WARNING - CONFIGURATION FILE PARSING - Reading element SPNAME returned %d (element no. %d) from tag %s.",ret,1,KServiceProviderName);
+			LOGPARSERR("spname",ret,1,&KServiceProviderName);
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,plmnfield);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_35, "WARNING - CONFIGURATION FILE PARSING - Reading element PLMNFIELD returned %d (element no. %d) from tag %s.",ret,2,KServiceProviderName);
+			LOGPARSERR("plmnfield",ret,2,&KServiceProviderName);
 			}
 		iServiceProvider.iDisplayReq = static_cast<RMobilePhone::TDisplayRequirements>(displayreq);
 		
@@ -583,7 +577,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,getTimer);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_FINDROAMSTATSETTINGS_1, "WARNING: CSimNetworkStatus::FindRoamStatSettings found ERROR with Config");
+			LOGNETWORK1("WARNING: CSimNetworkStatus::FindRoamStatSettings found ERROR with Config");
 			}
 		iRoamStatGetTimeout = getTimer;
 		}
@@ -1443,7 +1437,7 @@
 		TimerCallBackCellInfo();
 		break;
 	default:
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACK_1, "CSimNetworkStatus::TimerCallBack(%d), OOR [%d]",aId, ETimerIdNtwkStatRegStat);
+		LOGNETWORK3("CSimNetworkStatus::TimerCallBack(%d), OOR [%d]",aId, ETimerIdNtwkStatRegStat);
 		SimPanic(EIllegalCallBackId);
 		break;
 		}
@@ -1493,7 +1487,7 @@
 			}
 		if(iCurrNetChangeV1NotificationPending)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_1, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV1");
+			LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV1");
 			iCurrNetChangeV1NotificationPending = EFalse;
 			RMobilePhone::TMobilePhoneNetworkInfoV1* changeNetInfoV1 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV1*>(iCurrNetChangeV1NotificationNetInfo);
 
@@ -1503,7 +1497,7 @@
 			
 		if(iCurrNetChangeV2NotificationPending)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_2, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV2");
+			LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV2");
 			iCurrNetChangeV2NotificationPending = EFalse;
 			RMobilePhone::TMobilePhoneNetworkInfoV2* changeNetInfoV2 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV2*>(iCurrNetChangeV2NotificationNetInfo);
 			PopulateNetworkInfoV1(iCurrentNetworkIndex,*changeNetInfoV2);
@@ -1514,7 +1508,7 @@
 		
 		if(iCurrNetChangeV5NotificationPending)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_3, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV5");
+			LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV5");
 			iCurrNetChangeV5NotificationPending = EFalse;
 			RMobilePhone::TMobilePhoneNetworkInfoV5* changeNetInfoV5 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV5*>(iCurrNetChangeV5NotificationNetInfo);
 			PopulateNetworkInfoV1(iCurrentNetworkIndex,*changeNetInfoV5);
@@ -1527,7 +1521,7 @@
 			
 		if(iCurrNetChangeV8NotificationPending)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_4, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV8");
+			LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV8");
 			iCurrNetChangeV8NotificationPending = EFalse;
 			RMobilePhone::TMobilePhoneNetworkInfoV8* changeNetInfoV8 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV8*>(iCurrNetChangeV8NotificationNetInfo);
 			PopulateNetworkInfoV1(iCurrentNetworkIndex,*changeNetInfoV8);
@@ -1541,7 +1535,7 @@
 					
 		if(iCurrNetChangeEtelIsvNotificationPending)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_5, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TEtel3rdPartyMobileNetworkInfoV1");
+			LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TEtel3rdPartyMobileNetworkInfoV1");
 			iCurrNetChangeEtelIsvNotificationPending = EFalse;
 			RMobilePhone::TEtel3rdPartyMobileNetworkInfoV1* changeNetInfoEtelIsv = reinterpret_cast<RMobilePhone::TEtel3rdPartyMobileNetworkInfoV1*>(iCurrNetChangeEtelIsvNotificationNetInfo);
 
@@ -1550,7 +1544,7 @@
 			}
 		if(iCurrNetChangeNoLocV1NotificationPending)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_6, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV1 (No Location)");
+			LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV1 (No Location)");
 			iCurrNetChangeNoLocV1NotificationPending = EFalse;
 			RMobilePhone::TMobilePhoneNetworkInfoV1* changeNetInfoV1 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV1*>(iCurrNetChangeNoLocV1NotificationNetInfo);
 
@@ -1560,7 +1554,7 @@
 			
 		if(iCurrNetChangeNoLocV2NotificationPending)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_7, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV2 (No Location)");
+			LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV2 (No Location)");
 			iCurrNetChangeNoLocV2NotificationPending = EFalse;
 			RMobilePhone::TMobilePhoneNetworkInfoV2* changeNetInfoV2 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV2*>(iCurrNetChangeNoLocV2NotificationNetInfo);
 
@@ -1572,7 +1566,7 @@
 			
 		if(iCurrNetChangeNoLocV5NotificationPending)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_8, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV5 (No Location)");
+			LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV5 (No Location)");
 			iCurrNetChangeNoLocV5NotificationPending = EFalse;
 			RMobilePhone::TMobilePhoneNetworkInfoV5* changeNetInfoV5 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV5*>(iCurrNetChangeNoLocV5NotificationNetInfo);
 
@@ -1586,7 +1580,7 @@
 			
 		if(iCurrNetChangeNoLocV8NotificationPending)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_9, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV8 (No Location)");
+			LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV8 (No Location)");
 			iCurrNetChangeNoLocV8NotificationPending = EFalse;
 			RMobilePhone::TMobilePhoneNetworkInfoV8* changeNetInfoV8 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV8*>(iCurrNetChangeNoLocV8NotificationNetInfo);
 
@@ -1635,11 +1629,11 @@
  * completes.  
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_1, "CSimNetworkStatus::TimerCallBackRadioModeL");
+	LOGNETWORK1("CSimNetworkStatus::TimerCallBackRadioModeL");
 	iRadioModeIndex++;
 	if(iRadioModeInfo->Count()<=iRadioModeIndex)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_2, "CSimNetworkStatus::TimerCallBackRadioModeL returning, no more config");
+		LOGNETWORK1("CSimNetworkStatus::TimerCallBackRadioModeL returning, no more config");
 		return;
 		}
 
@@ -1647,15 +1641,15 @@
 	if(iRadioMode.iRadioOn==EFalse)
 		{
 		RProperty::Set(KUidSystemCategory, KUidPhonePwrValue, ESAPhoneOff);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_3, "Radio Mode = OFF (config duration passed)");
+		LOGNETWORK1("Radio Mode = OFF (config duration passed)");
 		}
 	else
 		{
 		RProperty::Set(KUidSystemCategory, KUidPhonePwrValue, ESAPhoneOn);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_4, "Radio Mode = ON (config duration passed)");
+		LOGNETWORK1("Radio Mode = ON (config duration passed)");
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_5, "Next radio Mode duration = %d (from config)", iRadioModeInfo->At(iRadioModeIndex).iDuration);
+	LOGNETWORK2("Next radio Mode duration = %d (from config)", iRadioModeInfo->At(iRadioModeIndex).iDuration);
 	iRadioModeTimer->Start(iRadioModeInfo->At(iRadioModeIndex).iDuration,this,ETimerIdNtwkStatRadioMode);
 	}

--- a/telephonyserverplugins/simtsy/src/CSimNtRas.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimNtRas.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -19,14 +19,8 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimNtRasTraces.h"
-#endif
-
 #include "CSimNtras.h"
+#include "Simlog.h"
 
 _LIT8(KNtRasWriteText,"CLIENT");			// < Solicitation text, send to start the NTRas server
 _LIT8(KNtRasReceiveText,"SERVER");			// < NTRas server response, indicating the PPP session can commence.
@@ -93,7 +87,7 @@
  * @return TInt		Standard error value.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_CONNECT_1, "Starting to attempt a NT RAS Connection");
+	LOGDATA1("Starting to attempt a NT RAS Connection");
 	iReadBuf.Zero();
 	iInputBuf.Zero();
 
@@ -137,7 +131,7 @@
  * Transmit "CLIENT" and attempt a connection
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_ATTEMPTCONNECT_1, "NTRAS Writing CLIENT...");
+	LOGDATA1("NTRAS Writing CLIENT...");
 	iAttemptCnt++;
 	// Send the soliciting message, and await the NT Ras server's response.
 	CommWrite(KNtRasWriteText);
@@ -175,7 +169,7 @@
  * @param aStatus	Standard error value, indicating the result of the read request.
  */
 	{
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_COMMREADCOMPLETE_1, "NTRAS Rx Completion: %s",iInputBuf);
+	LOGDATA2("NTRAS Rx Completion: %S",&iInputBuf);
 	if(aStatus!=KErrNone)
 		{
 		iTimer->Cancel();
@@ -196,7 +190,7 @@
 		{
 		iTimer->Cancel();
 		iCallback->NTRasCallBack(KErrNone);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_COMMREADCOMPLETE_2, "NTRAS Received SERVER!");
+		LOGDATA1("NTRAS Received SERVER!");
 		return;
 		}
 
@@ -209,7 +203,7 @@
  * has occurred.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_COMMWRITECOMPLETE_1, "NTRAS Write Completion");
+	LOGDATA1("NTRAS Write Completion");
 	if(aStatus!=KErrNone)
 		{
 		iTimer->Cancel();
@@ -222,7 +216,7 @@
  * Timer expired callback.  Give up the attempted connection with a time-out error.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_TIMERCALLBACK_1, "NTRAS Timeout Occurred");
+	LOGDATA1("NTRAS Timeout Occurred");
 	CommWriteCancel();
 	if(iAttemptCnt<KTxMaxRetries)
 		AttemptConnect();

--- a/telephonyserverplugins/simtsy/src/CSimONStore.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimONStore.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -19,15 +19,9 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimONStoreTraces.h"
-#endif
-
 #include "CSimONStore.h"
 #include "CSimPhone.h"
+#include "Simlog.h"
 #include <testconfigfileparser.h>
 
 //
@@ -76,7 +70,7 @@
  * @param aMaxTextLen	The maximum length of an alpha tag.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_CONSTRUCTL_1, "Starting to parse Own Number store additional config parameters...");
+	LOGPHBK1("Starting to parse Own Number store additional config parameters...");
 	__ASSERT_ALWAYS(aMaxNumLen<=KONMaxTelNumSize,SimPanic(EOwnNumberNameOrNumberTooLarge));
 	__ASSERT_ALWAYS(aMaxTextLen<=KONMaxTextSize,SimPanic(EOwnNumberNameOrNumberTooLarge));
 
@@ -97,7 +91,7 @@
 		if(ret!=KErrNone)
 			{
 			iONStoreCaps=KDefaultONPhoneStoreCaps;
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element VALUE returned %d (element no. %d) from tag %s.",ret,0,KONPhoneStoreCaps);
+			LOGPARSERR("value",ret,0,&KONPhoneStoreCaps);
 			}	
 		else
 			{
@@ -113,7 +107,7 @@
 		iONStoreCaps=KDefaultONPhoneStoreCaps;
 
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_CONSTRUCTL_3, "...Finished parsing Own Number store additional config parameters...");
+	LOGPHBK1("...Finished parsing Own Number store additional config parameters...");
 	}
 
 void CSimONStore::PopulateStoreFromConfigFileL()
@@ -126,7 +120,7 @@
  * "PhBkStoreEntry = <store name>, <slot number>, <telephone number>, <alphatag>"
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_POPULATESTOREFROMCONFIGFILEL_1, "Starting to read Own Number store entries...");
+	LOGPHBK1("Starting to read Own Number store entries...");
 	iONIndividualPause=CfgFile()->ItemValue(KONStoreIndividualReqPause,KDefaultONStoreIndividualReqPause);
 
 	TInt count=CfgFile()->ItemCount(KONStoreEntry);
@@ -149,7 +143,7 @@
 		ret=GetONEntry(item,0,index,telNum,name,typeOfNumber,service,mode,numberPlan);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_POPULATESTOREFROMCONFIGFILEL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element OWN NUMBER ENTRY returned %d (element no. %d) from tag %s.",ret,index,KONStoreEntry);
+			LOGPARSERR("Own Number Entry",ret,index,&KONStoreEntry);
 			continue;
 			}
 
@@ -161,7 +155,7 @@
 		iONStoreEntries[index].iNumberPlan=numberPlan;
 		}
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_POPULATESTOREFROMCONFIGFILEL_3, "...Finished reading Own Number store entries...");
+	LOGPHBK1("...Finished reading Own Number store entries...");
 
 	}
 
@@ -550,6 +544,6 @@
 * @return CTestConfigSection a pointer to the configuration file data section
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_CFGFILE_1, ">>CSimONStore::CfgFile");
+	LOGPHBK1(">>CSimONStore::CfgFile");
 	return iPhone->CfgFile();
 	}

--- a/telephonyserverplugins/simtsy/src/CSimPacketContext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPacketContext.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-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"
@@ -19,13 +19,7 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimPacketContextTraces.h"
-#endif
-
+#include "Simlog.h"
 #include "CSimPhone.h"
 #include "CSimPacketContext.h"
 #include "CSimPacketService.h"
@@ -128,7 +122,7 @@
 * @leave Leaves no memory or any data member does not construct for any reason.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_1, "CSimPacketContext: Entered constructor");
+	LOGPACKET1("CSimPacketContext: Entered constructor");
 
 	iSetConfigData = new (ELeave) CArrayFixFlat<TSetConfigData>(1);
 	iNotifyContextConfigChangeArray = new (ELeave) CArrayFixFlat<TNotifyContextConfigChangeData>(1);
@@ -145,7 +139,7 @@
 	iNotifyContextConfigChangeTimer= CSimTimer::NewL(iPhone);
 	iContextStatusChange = CSimPubSubChange::NewL(this, CSimPubSub::TPubSubProperty(KUidPSSimTsyCategory, KPSSimtsyPacketContextStatusChange, KPSSimtsyPacketContextStatusChangeKeyType));
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_2, "Starting to Load and Parse Packet Context the Config File");
+	LOGPACKET1("Starting to Load and Parse Packet Context the Config File");
 
 	GetCommSetupSettingsL();
 	GetContextConfigParamSettingsL(KSetContextConfigGPRS());
@@ -183,7 +177,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CTFTMEDIAAUTHORIZATIONV3::AUTHORIZATIONTOKEN returned %d (element no. %d) from tag %s.",ret,0,KAuthorizationToken);
+			LOGPARSERR("CTFTMediaAuthorizationV3::authorizationToken",ret,0,&KAuthorizationToken);
             CleanupStack::PopAndDestroy(mediaAuthorization);			
 			continue;
 			}
@@ -197,7 +191,7 @@
 
 		if(ret!=KErrNone || desiredResponse > 0)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DESIREDRESPONSE returned %d (element no. %d) from tag %s.",ret,1,KAuthorizationToken);
+			LOGPARSERR("desiredResponse",ret,1,&KAuthorizationToken);
 	        CleanupStack::PopAndDestroy(mediaAuthorization);
 			continue;
 			}
@@ -225,7 +219,7 @@
 
 			if(ret!=KErrNone || mediaComponentNumber < 0)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element CTFTMEDIAAUTHORIZATIONV3::MEDIACOMPONENTNUMBER returned %d (element no. %d) from tag %s.",ret,0,KFlowIdentifier);
+				LOGPARSERR("CTFTMediaAuthorizationV3::mediaComponentNumber",ret,0,&KFlowIdentifier);
 				continue;
 				}
 			else
@@ -237,7 +231,7 @@
 
 			if(ret!=KErrNone || IPFlowNumber < 0)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element CTFTMEDIAAUTHORIZATIONV3::IPFLOWNUMBER returned %d (element no. %d) from tag %s.",ret,1,KFlowIdentifier);
+				LOGPARSERR("CTFTMediaAuthorizationV3::IPFlowNumber",ret,1,&KFlowIdentifier);
 				continue;
 				}
 			else
@@ -252,7 +246,7 @@
         CleanupStack::Pop(mediaAuthorization);		
 		}
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_7, "...Finished parsing Packet Context config parameters...");
+	LOGPACKET1("...Finished parsing Packet Context config parameters...");
 	}	
 
 void CSimPacketContext::GetCommSetupSettingsL()
@@ -289,7 +283,7 @@
 			TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,csyName);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::CSYNAME returned %d (element no. %d) from tag %s.",ret,0,KCommSetup);
+				LOGPARSERR("CommSetUp::csyName",ret,0,&KCommSetup);
 				comm.iCsyName.Copy(KDefaultCsyName);
 				}
 			else
@@ -298,7 +292,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,portName);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::PORTNAME returned %d (element no. %d) from tag %s.",ret,1,KCommSetup);
+				LOGPARSERR("CommSetUp::portName",ret,1,&KCommSetup);
 				comm.iPortName.Copy(KDefaultPortName);
 				}
 			else
@@ -308,7 +302,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,dataRate);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::DATARATE returned %d (element no. %d) from tag %s.",ret,2,KCommSetup);
+				LOGPARSERR("CommSetUp::dataRate",ret,2,&KCommSetup);
 				comm.iConfig.iRate=KDefaultCommPortRate;
 				}
 			else
@@ -317,7 +311,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,handshake);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::HANDSHAKE returned %d (element no. %d) from tag %s.",ret,3,KCommSetup);
+				LOGPARSERR("CommSetUp::handShake",ret,3,&KCommSetup);
 				comm.iConfig.iHandshake=KDefaultHandshake;
 				}
 			else
@@ -327,7 +321,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,contextName);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,4,KCommSetup);
+				LOGPARSERR("CommSetUp::contextName",ret,4,&KCommSetup);
 				comm.iContextName=KDefaultSetting;
 				}
 			else
@@ -336,7 +330,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,commReset);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::COMMRESET returned %d (element no. %d) from tag %s.",ret,5,KCommSetup);
+				LOGPARSERR("CommSetUp::commReset",ret,5,&KCommSetup);
 				comm.iCommReset=EFalse;
 				}
 			else
@@ -428,7 +422,7 @@
 
 		if(ret != KErrNone || delay < 0)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGDELAY returned %d (element no. %d) from tag %s.",ret,0,KSetConfigDelay);
+			LOGPARSERR("SetConfigDelay",ret,0,&KSetConfigDelay);
 			}
 		else
 			{
@@ -445,7 +439,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KSetConfigFail);
+			LOGPARSERR("SetConfigFail::contextName",ret,0,&KSetConfigFail);
 			}
 		else
 			{
@@ -455,7 +449,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,numberOfTimes);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::NUMBEROFTIMES returned %d (element no. %d) from tag %s.",ret,1,KSetConfigFail);
+			LOGPARSERR("SetConfigFail::numberOfTimes",ret,1,&KSetConfigFail);
 			}
 		else
 			{
@@ -466,7 +460,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,failErrorCode);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::FAILERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KSetConfigFail);
+			LOGPARSERR("SetConfigFail::failErrorCode",ret,2,&KSetConfigFail);
 			}
 		else
 			{
@@ -497,7 +491,7 @@
 					configChangeData.iDelay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGCHANGESETTINGSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element NOTIFYCONTEXTCONFIGCHANGE::DELAY returned %d (element no. %d) from tag %s.",ret,0,KNotifyContextConfigChange);
+			LOGPARSERR("NotifyContextConfigChange::delay",ret,0,&KNotifyContextConfigChange);
 			continue;
 			}
 			
@@ -506,7 +500,8 @@
 					configChangeData.iNewContextConfigIndex);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGCHANGESETTINGSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element NOTIFYCONTEXTCONFIGCHANGE::NEWCONTEXTCONFIGINDEX returned %d (element no. %d) from tag %s.",ret,0,KNotifyContextConfigChange);
+			LOGPARSERR("NotifyContextConfigChange::NewContextConfigIndex",
+						ret,0,&KNotifyContextConfigChange);
 			continue;		
 			}
 	
@@ -526,7 +521,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KDeleteTftFail);
+			LOGPARSERR("SetConfigFail::contextName",ret,0,&KDeleteTftFail);
 			}
 		else
 			{
@@ -536,7 +531,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,numberOfTimes);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::NUMBEROFTIMES returned %d (element no. %d) from tag %s.",ret,1,KDeleteTftFail);
+			LOGPARSERR("SetConfigFail::numberOfTimes",ret,1,&KDeleteTftFail);
 			}
 		else
 		{
@@ -547,7 +542,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,failErrorCode);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::FAILERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KDeleteTftFail);
+			LOGPARSERR("SetConfigFail::failErrorCode",ret,2,&KDeleteTftFail);
 			}
 		else
 			{
@@ -565,7 +560,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,contextName);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KCreateTftConfig);
+			LOGPARSERR("SetConfigFail::contextName",ret,0,&KCreateTftConfig);
 			}
 		else
 			{
@@ -575,7 +570,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,numberOfTimes);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_5, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::NUMBEROFTIMES returned %d (element no. %d) from tag %s.",ret,1,KCreateTftConfig);
+			LOGPARSERR("SetConfigFail::numberOfTimes",ret,1,&KCreateTftConfig);
 			}
 		else
 			{
@@ -586,7 +581,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,failErrorCode);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_6, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::FAILERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KCreateTftConfig);
+			LOGPARSERR("SetConfigFail::failErrorCode",ret,2,&KCreateTftConfig);
 			}
 		else
 			{
@@ -597,7 +592,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,delay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_7, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::FAILERRORCODE returned %d (element no. %d) from tag %s.",ret,3,KCreateTftConfig);
+			LOGPARSERR("SetConfigFail::failErrorCode",ret,3,&KCreateTftConfig);
 			}
 		else
 			{
@@ -614,7 +609,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_8, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KAddPacketFilter);
+			LOGPARSERR("SetConfigFail::contextName",ret,0,&KAddPacketFilter);
 			}
 		else
 			{
@@ -624,7 +619,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,numberOfTimes);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_9, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::NUMBEROFTIMES returned %d (element no. %d) from tag %s.",ret,1,KAddPacketFilter);
+			LOGPARSERR("SetConfigFail::numberOfTimes",ret,1,&KAddPacketFilter);
 			}
 		else
 			{
@@ -635,7 +630,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,failErrorCode);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_10, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::FAILERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KAddPacketFilter);
+			LOGPARSERR("SetConfigFail::failErrorCode",ret,2,&KAddPacketFilter);
 			}
 		else
 			{
@@ -667,7 +662,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KContextConfigRel99);
+			LOGPARSERR("ContextConfigRel99::contextName",ret,0,KContextConfigRel99);
 			}
 		else
 			{
@@ -677,7 +672,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,activatePause);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::ACTIVATEPAUSE returned %d (element no. %d) from tag %s.",ret,1,KContextConfigRel99);
+			LOGPARSERR("ContextConfigRel99::activatePause",ret,1,&KContextConfigRel99);
 			continue;
 			}
 		else
@@ -686,7 +681,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,activateErrorCode);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::ACTIVATEERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KContextConfigRel99);
+			LOGPARSERR("ContextConfigRel99::activateErrorCode",ret,2,&KContextConfigRel99);
 			continue;
 			}
 		else
@@ -695,7 +690,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,aDeactivatePause);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::DEACTIVATEPAUSE returned %d (element no. %d) from tag %s.",ret,3,KContextConfigRel99);
+			LOGPARSERR("ContextConfigRel99::deactivatePause",ret,3,&KContextConfigRel99);
 			continue;
 			}
 		else
@@ -704,7 +699,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,deactivateErrorCode);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::DEACTIVATEERRORCODE returned %d (element no. %d) from tag %s.",ret,4,KContextConfigRel99);
+			LOGPARSERR("ContextConfigRel99::deactivateErrorCode",ret,4,&KContextConfigRel99);
 			continue;
 			}
 		else
@@ -713,7 +708,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,deletionPause);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::DELETETIONPAUSE returned %d (element no. %d) from tag %s.",ret,5,KContextConfigRel99);
+			LOGPARSERR("ContextConfigRel99::deletetionPause",ret,5,&KContextConfigRel99);
 			continue;
 			}
 		else
@@ -722,7 +717,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6, deletionErrorCode);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::DELETIONERRORCODE returned %d (element no. %d) from tag %s.",ret,6,KContextConfigRel99);
+			LOGPARSERR("ContextConfigRel99::deletionErrorCode",ret,6,&KContextConfigRel99);
 			continue;
 			}
 		else
@@ -813,7 +808,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTSTATUSCHANGESETTINGSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element NOTIFYCONTEXTSTATUSCHANGE::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KNotifyContextStatusChange);
+			LOGPARSERR("NotifyContextStatusChange::contextName",ret,0,&KNotifyContextStatusChange);
 			continue;
 			}
 		else
@@ -824,7 +819,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,duration);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTSTATUSCHANGESETTINGSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element NOTIFYCONTEXTSTATUSCHANGE::DURATION returned %d (element no. %d) from tag %s.",ret,1,KNotifyContextStatusChange);
+			LOGPARSERR("NotifyContextStatusChange::duration",ret,1,&KNotifyContextStatusChange);
 			continue;
 			}
 		else
@@ -833,7 +828,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,contextStatus);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTSTATUSCHANGESETTINGSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element NOTIFYCONTEXTSTATUSCHANGE::DURATION returned %d (element no. %d) from tag %s.",ret,2,KNotifyContextStatusChange);
+			LOGPARSERR("NotifyContextStatusChange::duration",ret,2,&KNotifyContextStatusChange);
 			continue;
 			}
 		else
@@ -884,7 +879,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::ID returned %d (element no. %d) from tag %s.",ret,0,KPacketFilterInfo);
+			LOGPARSERR("PacketFilterInfo::id",ret,0,&KPacketFilterInfo);
 			continue;	
 			}
 		else
@@ -896,7 +891,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::EVALUATIONPRECEDENCEINDEX returned %d (element no. %d) from tag %s.",ret,1,KPacketFilterInfo);
+			LOGPARSERR("PacketFilterInfo::evaluationPrecedenceIndex",ret,1,&KPacketFilterInfo);
 			continue;	
 			}
 		else
@@ -908,7 +903,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::SRCADDR returned %d (element no. %d) from tag %s.",ret,2,KPacketFilterInfo);
+			LOGPARSERR("PacketFilterInfo::srcAddr",ret,2,&KPacketFilterInfo);
 			continue;
 			}
 		else
@@ -1019,7 +1014,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::SRCADDRSUBNETMASK returned %d (element no. %d) from tag %s.",ret,3,KPacketFilterInfo);
+			LOGPARSERR("PacketFilterInfo::srcAddrSubnetMask",ret,3,&KPacketFilterInfo);
 			continue;
 			}
 		else
@@ -1129,7 +1124,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::PROTOCOLNUMBERORNEXTNUMBER returned %d (element no. %d) from tag %s.",ret,4,KPacketFilterInfo);
+			LOGPARSERR("PacketFilterInfo::protocolNumberOrNextNumber",ret,4,&KPacketFilterInfo);
 			packetFilter.iProtocolNumberOrNextHeader = KUnsetInteger;				
 			}
 		else
@@ -1141,7 +1136,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::SRCPORTMIN returned %d (element no. %d) from tag %s.",ret,5,KPacketFilterInfo);
+			LOGPARSERR("PacketFilterInfo::srcPortMin",ret,5,&KPacketFilterInfo);
 			packetFilter.iSrcPortMin = KUnsetInteger;
 			}
 		else
@@ -1153,7 +1148,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::SRCPORTMAX returned %d (element no. %d) from tag %s.",ret,6,KPacketFilterInfo);
+			LOGPARSERR("PacketFilterInfo::srcPortMax",ret,6,&KPacketFilterInfo);
 			packetFilter.iSrcPortMax = KUnsetInteger;
 			}
 		else
@@ -1165,7 +1160,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::DESTPORTMIN returned %d (element no. %d) from tag %s.",ret,7,KPacketFilterInfo);
+			LOGPARSERR("PacketFilterInfo::destPortMin",ret,7,&KPacketFilterInfo);
 			packetFilter.iDestPortMin = KUnsetInteger;
 			}
 		else
@@ -1177,7 +1172,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::SRCPORTMAX returned %d (element no. %d) from tag %s.",ret,8,KPacketFilterInfo);
+			LOGPARSERR("PacketFilterInfo::srcPortMax",ret,8,&KPacketFilterInfo);
 			packetFilter.iDestPortMax = KUnsetInteger;
 			}
 		else
@@ -1189,7 +1184,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::IPSECSPI returned %d (element no. %d) from tag %s.",ret,9,KPacketFilterInfo);
+			LOGPARSERR("PacketFilterInfo::ipSecSPI",ret,9,&KPacketFilterInfo);
 			packetFilter.iIPSecSPI = KUnsetInteger;
 			}
 		else
@@ -1201,7 +1196,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::TOSORTRAFFICCLASS returned %d (element no. %d) from tag %s.",ret,10,KPacketFilterInfo);
+			LOGPARSERR("PacketFilterInfo::toSorTrafficClass",ret,10,&KPacketFilterInfo);
 			continue;
 			}
 		else
@@ -1213,7 +1208,7 @@
 
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::FLOWLABEL returned %d (element no. %d) from tag %s.",ret,11,KPacketFilterInfo);
+			LOGPARSERR("PacketFilterInfo::flowLabel",ret,11,&KPacketFilterInfo);
 			packetFilter.iFlowLabel = KUnsetInteger;
 			}
 		else
@@ -1227,12 +1222,12 @@
 			{
 			if(ret == KErrNotFound)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_13, "CONFIGURATION FILE PARSING - PacketFilterInfo::TPacketFilterV2 info encountered");
+				LOGCONFIG1("CONFIGURATION FILE PARSING - PacketFilterInfo::TPacketFilterV2 info encountered");
 				packetFilter.iFilterType = RPacketContext::EPacketFilterTypeUnknown;
 				}
 			else
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::FILTERTYPE returned %d (element no. %d) from tag %s.",ret,12,KPacketFilterInfo);
+				LOGPARSERR("PacketFilterInfo::filterType",ret,12,&KPacketFilterInfo);
 				continue;	
 				}
 			}
@@ -1253,7 +1248,7 @@
 *
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DTOR_1, "CSimPacketContext: Entered destructor");
+	LOGPACKET1("CSimPacketContext: Entered destructor");
 	
 	if (iContextConfigParams != NULL)
 	{
@@ -1456,7 +1451,7 @@
 			return KErrNone;
 		default:
 			// Unknown or invalid IPC
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_REGISTERNOTIFICATION_1, "CSimPacketContext: Register error, unknown IPC");
+			LOGPACKET1("CSimPacketContext: Register error, unknown IPC");
 			return KErrNotSupported;
 		}
 	}
@@ -1479,11 +1474,11 @@
 		case EPacketContextNotifyConfigChanged:
 		case EPacketContextNotifyStatusChange:
 		case EPacketContextNotifyDataTransferred:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DEREGISTERNOTIFICATION_1, "CSimPacketContext: DeregisterNotification");
+			LOGPACKET1("CSimPacketContext: DeregisterNotification");
 			return KErrNone;
 		default:
 			// Unknown or invalid IPC
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DEREGISTERNOTIFICATION_2, "CSimPacketContext: Deregister error, unknown IPC");
+			LOGPACKET1("CSimPacketContext: Deregister error, unknown IPC");
 			return KErrNotSupported;
 		}
 	}
@@ -1504,12 +1499,12 @@
 		case EPacketContextNotifyConfigChanged:
 		case EPacketContextNotifyStatusChange:
 		case EPacketContextNotifyDataTransferred:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NUMBEROFSLOTSL_1, "CGprsDGprsTsy: Registered with 5 slots");
+			LOGPACKET1("CGprsDGprsTsy: Registered with 5 slots");
 			numberOfSlots=5;
 			break;
 		default:
 			// Unknown or invalid IPC
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NUMBEROFSLOTSL_2, "CSimPacketContext: Number of Slots error, unknown IPC");
+			LOGPACKET1("CSimPacketContext: Number of Slots error, unknown IPC");
 			User::Leave(KErrNotSupported);
 			break;
 		}  
@@ -1558,7 +1553,7 @@
 					TRAPD(ret, iSetConfigData->AppendL(setConfigData) );
 					if (ret != KErrNone)
                 		{
-                		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_EXTFUNC_1, "CSimPacketContext::ExtFunc AppendL call fail");
+                		LOGPACKET1("CSimPacketContext::ExtFunc AppendL call fail");
                 		return ret;
                 		}
                 		
@@ -1708,7 +1703,7 @@
 * @return err KErrNone if request completes ok
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CANCELSERVICE_1, "CSimPacketContext: - CancelService called");
+	LOGPACKET1("CSimPacketContext: - CancelService called");
 	switch (aIpc)
 		{
 		case EPacketContextSetConfig:
@@ -1782,7 +1777,7 @@
 
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_SETCONFIG_1, "CSimPacketContext::SetConfig called");
+	LOGPACKET1("CSimPacketContext::SetConfig called");
 
 	TPckg<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)aConfig;
 	TPacketDataConfigBase& configBaseV1 = (*configBase)();
@@ -1902,7 +1897,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONFIG_1, "CSimPacketContext::GetConfig called");
+	LOGPACKET1("CSimPacketContext::GetConfig called");
 	TPckg<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)aConfig;
 	TPacketDataConfigBase& configBaseV1 = (*configBase)();
 	
@@ -2007,7 +2002,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NOTIFYCONFIGCHANGEDCANCEL_1, "CSimPacketContext::NotifyConfigChangedCancel called");
+	LOGPACKET1("CSimPacketContext::NotifyConfigChangedCancel called");
 	if(iNotifyConfigGPRS.iNotifyPending &&
 		iNotifyConfigGPRS.iNotifyHandle == aTsyReqHandle)
 		{
@@ -2114,7 +2109,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DEACTIVATE_1, "CSimPacketContext::Deactivate called");
+	LOGPACKET1("CSimPacketContext::Deactivate called");
 	iDeactivateRequestHandle = aTsyReqHandle;
 	TInt ret;
 	ret = ActionEvent(EContextEventDeactivate,KErrNone);
@@ -2131,7 +2126,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DEACTIVATECANCEL_1, "CSimPacketContext::DeactivateCancel called");
+	LOGPACKET1("CSimPacketContext::DeactivateCancel called");
 	if(((iState == RPacketContext::EStatusInactive) || (iState == RPacketContext::EStatusDeactivating)) && 
 					(iCurrentEvent==EContextEventDeactivate))
 		{
@@ -2231,7 +2226,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_ACTIVATECANCEL_1, "CSimPacketContext::ActivateCancel called");
+	LOGPACKET1("CSimPacketContext::ActivateCancel called");
 	if(((iState == RPacketContext::EStatusInactive) || (iState == RPacketContext::EStatusActivating)) && 
 					(iCurrentEvent==EContextEventActivate))
 		{
@@ -2282,7 +2277,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DELETE_1, "CSimPacketContext::Delete called");
+	LOGPACKET1("CSimPacketContext::Delete called");
 	iDeleteRequestHandle = aTsyReqHandle;
 	TInt ret;
 	ret = ActionEvent(EContextEventDelete,KErrNone);
@@ -2299,7 +2294,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DELETECANCEL_1, "CSimPacketContext::DeleteCancel called");
+	LOGPACKET1("CSimPacketContext::DeleteCancel called");
 	if((iState == RPacketContext::EStatusInactive) && (iCurrentEvent==EContextEventDelete))
 		{
 		iTimer->Cancel();
@@ -2318,7 +2313,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_LOANCOMMPORT_1, "CSimPacketContext::LoanCommPort called");
+	LOGPACKET1("CSimPacketContext::LoanCommPort called");
 
 	if(iState != RPacketContext::EStatusActive)
 		{
@@ -2348,7 +2343,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_LOANCOMMPORTCANCEL_1, "CSimPacketContext::LoanCommPortCancel called");
+	LOGPACKET1("CSimPacketContext::LoanCommPortCancel called");
 	return KErrNone;
 	}
 
@@ -2360,7 +2355,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_RECOVERCOMMPORT_1, "CSimPacketContext::RecoverCommPort called");
+	LOGPACKET1("CSimPacketContext::RecoverCommPort called");
 	if (!iCommPortLoaned)
 		{
 		ReqCompleted(aTsyReqHandle, KErrEtelPortNotLoanedToClient);
@@ -2380,7 +2375,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_RECOVERCOMMPORTCANCEL_1, "CSimPacketContext::RecoverCommPortCancel called");
+	LOGPACKET1("CSimPacketContext::RecoverCommPortCancel called");
 	return KErrNone;
 	}
 
@@ -2393,7 +2388,7 @@
 * @return KerrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETSTATUS_1, "CSimPacketContext::GetStatus called");
+	LOGPACKET1("CSimPacketContext::GetStatus called");
 	*aContextStatus = iState;
 	ReqCompleted(aTsyReqHandle,KErrNone);
 	return KErrNone;
@@ -2411,7 +2406,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NOTIFYSTATUSCHANGE_1, "CSimPacketContext::NotifyStatusChange called");
+	LOGPACKET1("CSimPacketContext::NotifyStatusChange called");
 	__ASSERT_ALWAYS(!iNotifyStatusChange.iNotifyPending,SimPanic(ENotificationAlreadyPending));
 	iNotifyStatusChange.iNotifyPending = ETrue;
 	iNotifyStatusChange.iNotifyHandle = aTsyReqHandle;
@@ -2430,7 +2425,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NOTIFYSTATUSCHANGECANCEL_1, "CSimPacketContext::NotifyStatusChangeCancel called");
+	LOGPACKET1("CSimPacketContext::NotifyStatusChangeCancel called");
 	if(iNotifyStatusChange.iNotifyPending)
 		{
 		iNotifyStatusChange.iNotifyPending=EFalse;
@@ -2449,7 +2444,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETDATAVOLUMETRANSFERRED_1, "CSimPacketContext::GetDataVolumeTransferred called");
+	LOGPACKET1("CSimPacketContext::GetDataVolumeTransferred called");
 	ReqCompleted(aTsyReqHandle,KErrNotSupported);
 	return KErrNone;
 	}
@@ -2477,7 +2472,7 @@
 * @return KerrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NOTIFYDATATRANSFERREDCANCEL_1, "CSimPacketContext::NotifyDataTransferredCancel called");
+	LOGPACKET1("CSimPacketContext::NotifyDataTransferredCancel called");
 	return KErrNone;
 	}
 
@@ -2490,7 +2485,7 @@
 * @return KerrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETLASTERRORCAUSE_1, "CSimPacketContext::GetLastErrorCause called");
+	LOGPACKET1("CSimPacketContext::GetLastErrorCause called");
 	*aError = iLastError;
 	ReqCompleted(aTsyReqHandle,iErrorCodeForGetLastErrorCause);
 	iErrorCodeForGetLastErrorCause = KErrNone;
@@ -2552,7 +2547,7 @@
 
 			else
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_TIMERCALLBACK_1, ">>CSimPacketContext.cpp: Invalid new context config param index");
+				LOGMISC1(">>CSimPacketContext.cpp: Invalid new context config param index");
 				}
 				
 			//Delete the current NotifyContextConfigChange item and set the next one if possible
@@ -2573,10 +2568,10 @@
 			break;
 		default:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_TIMERCALLBACK_2, ">>CSimPacketContext::TimerCallBack");
+			LOGPACKET1(">>CSimPacketContext::TimerCallBack");
 			TInt ret=ActionEvent(EContextEventTimeOut,KErrNone);
 			__ASSERT_ALWAYS(ret==KErrNone,SimPanic(ETimeOutEventActionFailed));	// Note: this is very crude error handling and should be replaced by something rather more elegant.
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_TIMERCALLBACK_3, "<<CSimPacketContext::TimerCallBack");
+			LOGPACKET1("<<CSimPacketContext::TimerCallBack");
 			iTFTChangeBool = EFalse;
 			break;
 			}		
@@ -2685,7 +2680,7 @@
 * @return Error indication if change of state is successful or not
 */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CHANGESTATE_1, ">>CSimPacketContext::ChangeState [newState=%d]", aNewState);
+	LOGPACKET2(">>CSimPacketContext::ChangeState [newState=%d]", aNewState);
 	__ASSERT_ALWAYS(aNewState!=RPacketContext::EStatusUnknown,SimPanic(ECallStatusUnknownIllegal));
 
 	if(iState==aNewState)
@@ -2723,7 +2718,7 @@
 		}
 
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CHANGESTATE_2, "<<CSimPacketContext::ChangeState");
+	LOGPACKET1("<<CSimPacketContext::ChangeState");
 	return KErrNone;
 	}
 
@@ -2756,7 +2751,7 @@
 	switch(aEvent)
 		{
 		case EContextEventActivate:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_ACTIONEVENT_1, ">>CSimPacketContext::ActionEvent = [EContextEventActivate]");
+			LOGPACKET1(">>CSimPacketContext::ActionEvent = [EContextEventActivate]");
 			if(iState==RPacketContext::EStatusInactive)
 				{
 				iCurrentEvent=EContextEventActivate;
@@ -2776,7 +2771,7 @@
 			break;
 
 		case EContextEventDeactivate:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_ACTIONEVENT_2, ">>CSimPacketContext::ActionEvent = [EContextEventDeactivate]");
+			LOGPACKET1(">>CSimPacketContext::ActionEvent = [EContextEventDeactivate]");
 			if(iState==RPacketContext::EStatusActive)
 				{
 				iCurrentEvent=EContextEventDeactivate;
@@ -2796,7 +2791,7 @@
 			break;
 
 		case EContextEventDelete:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_ACTIONEVENT_3, ">>CSimPacketContext::ActionEvent = [EContextEventDelete]");
+			LOGPACKET1(">>CSimPacketContext::ActionEvent = [EContextEventDelete]");
 			if(iState==RPacketContext::EStatusInactive)
 				{
 				iCurrentEvent=EContextEventDelete;
@@ -2832,7 +2827,7 @@
 			break;
 
 		case EContextEventTimeOut:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_ACTIONEVENT_4, ">>CSimPacketContext::ActionEvent = [EContextEventTimeOut]");
+			LOGPACKET1(">>CSimPacketContext::ActionEvent = [EContextEventTimeOut]");
 			switch(iCurrentEvent)
 				{
 			case EContextEventNone:
@@ -3603,7 +3598,7 @@
 	TRAPD(ret, mediaAuthV3 = RPacketContext::CTFTMediaAuthorizationV3::NewL());
 	if (ret != KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETADDMEDIAAUTHORIZATION_1, "CSimPacketContext::GetAddMediaAuthorization NewL call fail");
+		LOGPACKET1("CSimPacketContext::GetAddMediaAuthorization NewL call fail");
 		return ret;
 		}		
 
@@ -3611,7 +3606,7 @@
 	if (ret != KErrNone)
 		{
 		delete mediaAuthV3;
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETADDMEDIAAUTHORIZATION_2, "CSimPacketContext::GetAddMediaAuthorization InternalizeL call fail");
+		LOGPACKET1("CSimPacketContext::GetAddMediaAuthorization InternalizeL call fail");
 		return ret;
 		}

--- a/telephonyserverplugins/simtsy/src/CSimPacketQoS.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPacketQoS.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -13,17 +13,11 @@
 // Description:
 //
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimPacketQoSTraces.h"
-#endif
-
 #include "CSimPacketQoS.h"
 #include "CSimPhone.h"
 #include <pcktcs.h>
 #include "CSimPacketContext.h"
+#include "Simlog.h"
 #include "utils.h"
 #include "CSimPubSubChange.h"
 
@@ -243,7 +237,7 @@
 * @leave Leaves no memory or any data member does not construct for any reason.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_CONSTRUCTL_1, "CSimPacketQoS: Entered constructor");
+	LOGPACKET1("CSimPacketQoS: Entered constructor");
 	iQosNetworkNotificationCount = 0;
 	iQosR5NetworkNotificationCount = 0;
 
@@ -252,7 +246,7 @@
  	iSetQoSTimer = CSimTimer::NewL(iPhone);
 	iSimQoSChange = CSimPubSubChange::NewL(this, CSimPubSub::TPubSubProperty(KUidPSSimTsyCategory, KPSSimTsyNetworkQoSChange, KPSSimTsyNetworkQoSChangeKeyType));
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_CONSTRUCTL_2, "Starting to Load and Parse Packet Qos Config File");
+	LOGPACKET1("Starting to Load and Parse Packet Qos Config File");
 
 	GetGPRSReqProfilesL();
 	GetGPRSNegProfilesL();
@@ -268,7 +262,7 @@
 	GetProfileFailSettings();
 	GetSetQoSSettings();
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_CONSTRUCTL_3, "...Finished parsing Packet qos config parameters...");
+	LOGPACKET1("...Finished parsing Packet qos config parameters...");
 	}
 
 void CSimPacketQoS::GetGPRSReqProfilesL()
@@ -293,7 +287,7 @@
 		TInt ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,0,minPrecedence);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::MINPRECEDENCE returned %d (element no. %d) from tag %s.",ret,0,KQosProfileReqGPRS);
+			LOGPARSERR("QosProfileReqGPRS::minPrecedence",ret,0,&KQosProfileReqGPRS);
 			continue;
 			}
 		else
@@ -305,7 +299,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,reqPrecedence);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::REQPRECEDENCE returned %d (element no. %d) from tag %s.",ret,1,KQosProfileReqGPRS);
+			LOGPARSERR("QosProfileReqGPRS::reqPrecedence",ret,1,&KQosProfileReqGPRS);
 			continue;
 			}
 		else
@@ -317,7 +311,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,minDelay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::MINDELAY returned %d (element no. %d) from tag %s.",ret,2,KQosProfileReqGPRS);
+			LOGPARSERR("QosProfileReqGPRS::minDelay",ret,2,&KQosProfileReqGPRS);
 			continue;
 			}
 		else
@@ -329,7 +323,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,reqDelay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::REQDELAY returned %d (element no. %d) from tag %s.",ret,3,KQosProfileReqGPRS);
+			LOGPARSERR("QosProfileReqGPRS::reqDelay",ret,3,&KQosProfileReqGPRS);
 			continue;
 			}
 		else
@@ -341,7 +335,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,minReliability);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::MINRELIABILITY returned %d (element no. %d) from tag %s.",ret,4,KQosProfileReqGPRS);
+			LOGPARSERR("QosProfileReqGPRS::minReliability",ret,4,&KQosProfileReqGPRS);
 			continue;
 			}
 		else
@@ -353,7 +347,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,reqReliability);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::REQRELIABILITY returned %d (element no. %d) from tag %s.",ret,5,KQosProfileReqGPRS);
+			LOGPARSERR("QosProfileReqGPRS::reqReliability",ret,5,&KQosProfileReqGPRS);
 			continue;
 			}
 		else
@@ -365,7 +359,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,minPeek);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::MINPEEK returned %d (element no. %d) from tag %s.",ret,6,KQosProfileReqGPRS);
+			LOGPARSERR("QosProfileReqGPRS::minPeek",ret,6,&KQosProfileReqGPRS);
 			continue;
 			}
 		else
@@ -377,7 +371,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,reqPeek);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::REQPEEK returned %d (element no. %d) from tag %s.",ret,7,KQosProfileReqGPRS);
+			LOGPARSERR("QosProfileReqGPRS::reqPeek",ret,7,&KQosProfileReqGPRS);
 			continue;
 			}
 		else
@@ -389,7 +383,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,minMean);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::MINMEAN returned %d (element no. %d) from tag %s.",ret,8,KQosProfileReqGPRS);
+			LOGPARSERR("QosProfileReqGPRS::minMean",ret,8,&KQosProfileReqGPRS);
 			continue;
 			}
 		else
@@ -401,7 +395,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,reqMean);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::REQMEAN returned %d (element no. %d) from tag %s.",ret,9,KQosProfileReqGPRS);
+			LOGPARSERR("QosProfileReqGPRS::reqMean",ret,9,&KQosProfileReqGPRS);
 			continue;
 			}
 		else
@@ -435,7 +429,7 @@
 		TInt ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,0,negPrecedence);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSNEGPROFILESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::NEGPRECEDENCE returned %d (element no. %d) from tag %s.",ret,0,KQosProfileNegGPRS);
+			LOGPARSERR("QosProfileReqGPRS::negPrecedence",ret,0,&KQosProfileNegGPRS);
 			continue;
 			}
 		else
@@ -445,7 +439,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,negDelay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSNEGPROFILESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::NEGDELAY returned %d (element no. %d) from tag %s.",ret,1,KQosProfileNegGPRS);
+			LOGPARSERR("QosProfileReqGPRS::negDelay",ret,1,&KQosProfileNegGPRS);
 			continue;
 			}
 		else
@@ -455,7 +449,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,negReliability);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSNEGPROFILESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::NEGRELIABILITY returned %d (element no. %d) from tag %s.",ret,2,KQosProfileNegGPRS);
+			LOGPARSERR("QosProfileReqGPRS::negReliability",ret,2,&KQosProfileNegGPRS);
 			continue;
 			}
 		else
@@ -465,7 +459,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,negPeek);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSNEGPROFILESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::NEGPEEK returned %d (element no. %d) from tag %s.",ret,3,KQosProfileNegGPRS);
+			LOGPARSERR("QosProfileReqGPRS::negPeek",ret,3,&KQosProfileNegGPRS);
 			continue;
 			}
 		else
@@ -475,7 +469,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,negMean);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSNEGPROFILESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::NEGMEAN returned %d (element no. %d) from tag %s.",ret,4,KQosProfileNegGPRS);
+			LOGPARSERR("QosProfileReqGPRS::negMean",ret,4,&KQosProfileNegGPRS);
 			continue;
 			}
 		else
@@ -516,7 +510,7 @@
 		TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,contextName);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::contextName",ret,0,KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -524,7 +518,7 @@
 			profileReq99.iContextName.Copy(contextName);
 			if (profileReq99.iContextName.Match(iPacketContext->ContextName())==KErrNotFound)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::CONTEXTNAME returned %d (element no. %d) from tag %s.",KErrArgument,0,KQosProfileReqR99);
+				LOGPARSERR("QosProfileReqR99::contextName",KErrArgument,0,&KQosProfileReqR99);
 				continue;
 				}
 			}
@@ -532,7 +526,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,reqTraffic);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQTRAFFIC returned %d (element no. %d) from tag %s.",ret,1,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::reqTraffic",ret,1,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -546,7 +540,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,minTraffic);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINTRAFFIC returned %d (element no. %d) from tag %s.",ret,2,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::minTraffic",ret,2,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -560,7 +554,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,reqDeliveryOrder);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,3,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::reqDeliveryOrder",ret,3,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -574,7 +568,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,minDeliveryOrder);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,4,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::minDeliveryOrder",ret,4,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -588,7 +582,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,reqErroneousSDU);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQERRONEOUSSDU returned %d (element no. %d) from tag %s.",ret,5,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::reqErroneousSDU",ret,5,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -602,7 +596,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,minErroneousSDU);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINERRONEOUSSDU returned %d (element no. %d) from tag %s.",ret,6,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::minErroneousSDU",ret,6,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -616,7 +610,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,maxSDUSize);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MAXSDUSIZE returned %d (element no. %d) from tag %s.",ret,7,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::maxSDUSize",ret,7,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -627,7 +621,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,minSDUSize);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINSDUSIZE returned %d (element no. %d) from tag %s.",ret,8,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::minSDUSize",ret,8,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -638,7 +632,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,reqUpLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,9,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::reqUpLinkBitRate",ret,9,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -649,7 +643,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,reqDownLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,10,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::reqDownLinkBitRate",ret,10,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -660,7 +654,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,11,minUpLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,11,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::minUpLinkBitRate",ret,11,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -681,7 +675,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,reqBitErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,13,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::reqBitErrorRatio",ret,13,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -695,7 +689,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,14,minBitErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,14,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::minBitErrorRatio",ret,14,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -709,7 +703,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,15,reqSDUErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element - QOSPROFILEREQR99::REQSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,15,KQosProfileReqR99);
+			LOGPARSERR("- QosProfileReqR99::reqSDUErrorRatio",ret,15,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -723,7 +717,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,16,minSDUErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element - QOSPROFILEREQR99::MINSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,16,KQosProfileReqR99);
+			LOGPARSERR("- QosProfileReqR99::minSDUErrorRatio",ret,16,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -737,7 +731,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,17,reqTrafficHandlingPriority);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,17,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::reqTrafficHandlingPriority",ret,17,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -751,7 +745,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,18,minTrafficHandlingPriority);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,18,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::minTrafficHandlingPriority",ret,18,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -765,7 +759,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,19,reqTransferDelay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,19,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::reqTransferDelay",ret,19,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -776,7 +770,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,20,minTransferDelay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,20,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::minTransferDelay",ret,20,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -787,7 +781,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,21,reqGuaranteedUpLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,21,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::reqGuaranteedUpLinkBitRate",ret,21,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -798,7 +792,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,22,reqGuaranteedDownLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,22,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::reqGuaranteedDownLinkBitRate",ret,22,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -809,7 +803,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,23,minGuaranteedUpLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,23,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::minGuaranteedUpLinkBitRate",ret,23,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -820,7 +814,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,24,minGuaranteedDownLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_25, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,24,KQosProfileReqR99);
+			LOGPARSERR("QosProfileReqR99::minGuaranteedDownLinkBitRate",ret,24,&KQosProfileReqR99);
 			continue;
 			}
 		else 
@@ -855,7 +849,7 @@
 		TInt ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,0,contextName);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KQosProfileNegR99);
+			LOGPARSERR("QosProfileNegR99::contextName",ret,0,&KQosProfileNegR99);
 			continue;
 			}
 		else
@@ -863,7 +857,7 @@
 			profileNeg99.iContextName.Copy(contextName);
 			if (profileNeg99.iContextName.Match(iPacketContext->ContextName())==KErrNotFound)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::CONTEXTNAME returned %d (element no. %d) from tag %s.",KErrArgument,0,KQosProfileNegR99);
+				LOGPARSERR("QosProfileNegR99::contextName",KErrArgument,0,&KQosProfileNegR99);
 				continue;
 				}
 			}
@@ -871,7 +865,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,duration);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::DURATION returned %d (element no. %d) from tag %s.",ret,1,KQosProfileNegR99);
+			LOGPARSERR("QosProfileNegR99::duration",ret,1,&KQosProfileNegR99);
 			continue;
 			}
 		else
@@ -883,7 +877,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,negTraffic);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGTRAFFIC returned %d (element no. %d) from tag %s.",ret,2,KQosProfileNegR99);
+			LOGPARSERR("QosProfileNegR99::negTraffic",ret,2,&KQosProfileNegR99);
 			continue;
 			}
 		else
@@ -895,7 +889,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,negDeliveryOrder);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,3,KQosProfileNegR99);
+			LOGPARSERR("QosProfileNegR99::negDeliveryOrder",ret,3,&KQosProfileNegR99);
 			continue;
 			}
 		else
@@ -907,7 +901,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,negErroneousSDUDelivery);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGERRONEOUSSDUDELIVERY returned %d (element no. %d) from tag %s.",ret,4,KQosProfileNegR99);
+			LOGPARSERR("QosProfileNegR99::negErroneousSDUDelivery",ret,4,&KQosProfileNegR99);
 			continue;
 			}
 		else
@@ -919,7 +913,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,negMaxSDUSize);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGMAXSDUSIZE returned %d (element no. %d) from tag %s.",ret,5,KQosProfileNegR99);
+			LOGPARSERR("QosProfileNegR99::negMaxSDUSize",ret,5,&KQosProfileNegR99);
 			continue;
 			}
 		else
@@ -930,7 +924,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,negBitErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,6,KQosProfileNegR99);
+			LOGPARSERR("QosProfileNegR99::negBitErrorRatio",ret,6,&KQosProfileNegR99);
 			continue;
 			}
 		else
@@ -943,7 +937,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,negSDUErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,7,KQosProfileNegR99);
+			LOGPARSERR("QosProfileNegR99::negSDUErrorRatio",ret,7,&KQosProfileNegR99);
 			continue;
 			}
 		else
@@ -955,7 +949,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,negTrafficHandlingPriority);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,8,KQosProfileNegR99);
+			LOGPARSERR("QosProfileNegR99::negTrafficHandlingPriority",ret,8,&KQosProfileNegR99);
 			continue;
 			}
 		else
@@ -967,7 +961,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,negTransferDelay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,9,KQosProfileNegR99);
+			LOGPARSERR("QosProfileNegR99::negTransferDelay",ret,9,&KQosProfileNegR99);
 			continue;
 			}
 		else
@@ -978,7 +972,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,negGuaranteedUpLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,10,KQosProfileNegR99);
+			LOGPARSERR("QosProfileNegR99::negGuaranteedUpLinkBitRate",ret,10,&KQosProfileNegR99);
 			continue;
 			}
 		else
@@ -989,7 +983,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,11,negGuaranteedDownLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,11,KQosProfileNegR99);
+			LOGPARSERR("QosProfileNegR99::negGuaranteedDownLinkBitRate",ret,11,&KQosProfileNegR99);
 			continue;
 			}
 		else
@@ -1000,7 +994,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,12,negMaxUpLinkRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGMAXUPLINKRATE returned %d (element no. %d) from tag %s.",ret,12,KQosProfileNegR99);
+			LOGPARSERR("QosProfileNegR99::negMaxUpLinkRate",ret,12,&KQosProfileNegR99);
 			continue;
 			}
 		else
@@ -1011,7 +1005,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,negMaxDownLinkRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGMAXDOWNLINKRATE returned %d (element no. %d) from tag %s.",ret,13,KQosProfileNegR99);
+			LOGPARSERR("QosProfileNegR99::negMaxDownLinkRate",ret,13,&KQosProfileNegR99);
 			continue;
 			}
 		else
@@ -1059,7 +1053,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,contextName);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KQosNetworkNotificationType);
+			LOGPARSERR("QosNetworkNotification::contextName",ret,0,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -1070,7 +1064,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,duration);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::DURATION returned %d (element no. %d) from tag %s.",ret,1,KQosNetworkNotificationType);
+			LOGPARSERR("QosNetworkNotification::duration",ret,1,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -1082,7 +1076,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,negTraffic);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGTRAFFIC returned %d (element no. %d) from tag %s.",ret,2,KQosNetworkNotificationType);
+			LOGPARSERR("QosNetworkNotification::negTraffic",ret,2,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -1094,7 +1088,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,negDeliveryOrder);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,3,KQosNetworkNotificationType);
+			LOGPARSERR("QosNetworkNotification::negDeliveryOrder",ret,3,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -1106,7 +1100,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,negErroneousSDUDelivery);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGERRONEOUSSDUDELIVERY returned %d (element no. %d) from tag %s.",ret,4,KQosNetworkNotificationType);
+			LOGPARSERR("QosNetworkNotification::negErroneousSDUDelivery",ret,4,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -1118,7 +1112,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,negMaxSDUSize);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGMAXSDUSIZE returned %d (element no. %d) from tag %s.",ret,5,KQosNetworkNotificationType);
+			LOGPARSERR("QosNetworkNotification::negMaxSDUSize",ret,5,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -1129,7 +1123,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,negBitErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,6,KQosNetworkNotificationType);
+			LOGPARSERR("QosNetworkNotification::negBitErrorRatio",ret,6,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -1141,7 +1135,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,negSDUErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,7,KQosNetworkNotificationType);
+			LOGPARSERR("QosNetworkNotification::negSDUErrorRatio",ret,7,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -1153,7 +1147,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,negTrafficHandlingPriority);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,8,KQosNetworkNotificationType);
+			LOGPARSERR("QosNetworkNotification::negTrafficHandlingPriority",ret,8,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -1165,7 +1159,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,negTransferDelay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,9,KQosNetworkNotificationType);
+			LOGPARSERR("QosNetworkNotification::negTransferDelay",ret,9,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -1176,7 +1170,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,negGuaranteedUpLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,10,KQosNetworkNotificationType);
+			LOGPARSERR("QosNetworkNotification::negGuaranteedUpLinkBitRate",ret,10,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -1187,7 +1181,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,11,negGuaranteedDownLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,11,KQosNetworkNotificationType);
+			LOGPARSERR("QosNetworkNotification::negGuaranteedDownLinkBitRate",ret,11,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -1198,7 +1192,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,12,negMaxUpLinkRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGMAXUPLINKRATE returned %d (element no. %d) from tag %s.",ret,12,KQosNetworkNotificationType);
+			LOGPARSERR("QosNetworkNotification::negMaxUpLinkRate",ret,12,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -1209,7 +1203,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,negMaxDownLinkRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGMAXDOWNLINKRATE returned %d (element no. %d) from tag %s.",ret,13,KQosNetworkNotificationType);
+			LOGPARSERR("QosNetworkNotification::negMaxDownLinkRate",ret,13,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -1238,7 +1232,7 @@
 		TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,trafficCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99QOSPROFILECAPS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR99::TRAFFICCAP returned %d (element no. %d) from tag %s.",ret,0,KQosProfileCapsR99);
+			LOGPARSERR("QosProfileCapsR99::trafficCap",ret,0,&KQosProfileCapsR99);
 			}
 		else
 			if(AsciiToNum(trafficCap, digit)==KErrNone)
@@ -1247,7 +1241,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,deliveryOrderReqCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99QOSPROFILECAPS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR99::DELIVERYORDERREQCAP returned %d (element no. %d) from tag %s.",ret,1,KQosProfileCapsR99);
+			LOGPARSERR("QosProfileCapsR99::deliveryOrderReqCap",ret,1,&KQosProfileCapsR99);
 			}
 		else
 			if(AsciiToNum(deliveryOrderReqCap, digit)==KErrNone)
@@ -1256,7 +1250,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,deliverErroneousSDUCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99QOSPROFILECAPS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR99::DELIVERERRONEOUSSDUCAP returned %d (element no. %d) from tag %s.",ret,2,KQosProfileCapsR99);
+			LOGPARSERR("QosProfileCapsR99::deliverErroneousSDUCap",ret,2,&KQosProfileCapsR99);
 			}
 		else
 			if(AsciiToNum(deliverErroneousSDUCap, digit)==KErrNone)
@@ -1265,7 +1259,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,BERCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99QOSPROFILECAPS_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR99::BERCAP returned %d (element no. %d) from tag %s.",ret,3,KQosProfileCapsR99);
+			LOGPARSERR("QosProfileCapsR99::BERCap",ret,3,&KQosProfileCapsR99);
 			}
 		else
 			if(AsciiToNum(BERCap, digit)==KErrNone)
@@ -1274,7 +1268,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,SDUErrorRatioCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99QOSPROFILECAPS_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR99::SDUERRORRATIOCAP returned %d (element no. %d) from tag %s.",ret,4,KQosProfileCapsR99);
+			LOGPARSERR("QosProfileCapsR99::SDUErrorRatioCap",ret,4,&KQosProfileCapsR99);
 			}
 		else
 			if(AsciiToNum(SDUErrorRatioCap, digit)==KErrNone)
@@ -1284,7 +1278,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,trafficHandlingPriorityCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99QOSPROFILECAPS_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR99::TRAFFICHANDLINGPRIORITYCAP returned %d (element no. %d) from tag %s.",ret,5,KQosProfileCapsR99);
+			LOGPARSERR("QosProfileCapsR99::trafficHandlingPriorityCap",ret,5,&KQosProfileCapsR99);
 			}
 		else
 			if(AsciiToNum(trafficHandlingPriorityCap, digit)==KErrNone)
@@ -1308,7 +1302,7 @@
 		TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,trafficCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::TRAFFICCAP returned %d (element no. %d) from tag %s.",ret,0,KQosProfileCapsR5);
+			LOGPARSERR("QosProfileCapsR5::trafficCap",ret,0,&KQosProfileCapsR5);
 			}
 		else
 			if(AsciiToNum(trafficCap, digit)==KErrNone)
@@ -1317,7 +1311,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,deliveryOrderReqCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::DELIVERYORDERREQCAP returned %d (element no. %d) from tag %s.",ret,1,KQosProfileCapsR5);
+			LOGPARSERR("QosProfileCapsR5::deliveryOrderReqCap",ret,1,&KQosProfileCapsR5);
 			}
 		else
 			if(AsciiToNum(deliveryOrderReqCap, digit)==KErrNone)
@@ -1326,7 +1320,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,deliverErroneousSDUCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::DELIVERERRONEOUSSDUCAP returned %d (element no. %d) from tag %s.",ret,2,KQosProfileCapsR5);
+			LOGPARSERR("QosProfileCapsR5::deliverErroneousSDUCap",ret,2,&KQosProfileCapsR5);
 			}
 		else
 			if(AsciiToNum(deliverErroneousSDUCap, digit)==KErrNone)
@@ -1335,7 +1329,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,BERCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::BERCAP returned %d (element no. %d) from tag %s.",ret,3,KQosProfileCapsR5);
+			LOGPARSERR("QosProfileCapsR5::BERCap",ret,3,&KQosProfileCapsR5);
 			}
 		else
 			if(AsciiToNum(BERCap, digit)==KErrNone)
@@ -1344,7 +1338,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,SDUErrorRatioCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::SDUERRORRATIOCAP returned %d (element no. %d) from tag %s.",ret,4,KQosProfileCapsR5);
+			LOGPARSERR("QosProfileCapsR5::SDUErrorRatioCap",ret,4,&KQosProfileCapsR5);
 			}
 		else
 			if(AsciiToNum(SDUErrorRatioCap, digit)==KErrNone)
@@ -1353,7 +1347,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,trafficHandlingPriorityCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::TRAFFICHANDLINGPRIORITYCAP returned %d (element no. %d) from tag %s.",ret,5,KQosProfileCapsR5);
+			LOGPARSERR("QosProfileCapsR5::trafficHandlingPriorityCap",ret,5,&KQosProfileCapsR5);
 			}
 		else
 			if(AsciiToNum(trafficHandlingPriorityCap, digit)==KErrNone)
@@ -1362,7 +1356,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,signallingIndication);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::SIGNALLINGINDICATION returned %d (element no. %d) from tag %s.",ret,6,KQosProfileCapsR5);
+			LOGPARSERR("QosProfileCapsR5::signallingIndication",ret,6,&KQosProfileCapsR5);
 			}
 		else
 			if(AsciiToNum(signallingIndication, digit)==KErrNone)
@@ -1371,7 +1365,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,sourceStatisticsDescriptor);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::SOURCESTATISTICSDESCRIPTOR returned %d (element no. %d) from tag %s.",ret,7,KQosProfileCapsR5);
+			LOGPARSERR("QosProfileCapsR5::sourceStatisticsDescriptor",ret,7,&KQosProfileCapsR5);
 			}
 		else
 			if(AsciiToNum(sourceStatisticsDescriptor, digit)==KErrNone)
@@ -1395,7 +1389,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,numberOfTimes);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETPROFILEFAILSETTINGS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element SETPROFILEFAIL::NUMBEROFTIMES returned %d (element no. %d) from tag %s.",ret,1,KSetProfileFail);
+				LOGPARSERR("SetProfileFail::numberOfTimes",ret,1,&KSetProfileFail);
 				}
 			else
 				{
@@ -1406,7 +1400,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,errorCode);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETPROFILEFAILSETTINGS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SETPROFILEFAIL::ERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KSetProfileFail);
+				LOGPARSERR("SetProfileFail::errorCode",ret,2,&KSetProfileFail);
 				}
 			else
 				{
@@ -1434,7 +1428,7 @@
 		TInt ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,0,negPrecedenceCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSGPRS::NEGPRECEDENCECAP returned %d (element no. %d) from tag %s.",ret,0,KQosProfileCapsGPRS);
+			LOGPARSERR("QosProfileCapsGPRS::negPrecedenceCap",ret,0,&KQosProfileCapsGPRS);
 			}
 		else
 			if(AsciiToNum(negPrecedenceCap, digit)==KErrNone)
@@ -1443,7 +1437,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,negDelayCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSGPRS::NEGDELAYCAP returned %d (element no. %d) from tag %s.",ret,1,KQosProfileCapsGPRS);
+			LOGPARSERR("QosProfileCapsGPRS::negDelayCap",ret,1,&KQosProfileCapsGPRS);
 			}
 		else
 			if(AsciiToNum(negDelayCap, digit)==KErrNone)
@@ -1452,7 +1446,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,negReliabilityCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSGPRS::NEGRELIABILITYCAP returned %d (element no. %d) from tag %s.",ret,2,KQosProfileCapsGPRS);
+			LOGPARSERR("QosProfileCapsGPRS::negReliabilityCap",ret,2,&KQosProfileCapsGPRS);
 			}
 		else
 			if(AsciiToNum(negReliabilityCap, digit)==KErrNone)
@@ -1461,7 +1455,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,negPeekCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSGPRS::NEGPEEKCAP returned %d (element no. %d) from tag %s.",ret,3,KQosProfileCapsGPRS);
+			LOGPARSERR("QosProfileCapsGPRS::negPeekCap",ret,3,&KQosProfileCapsGPRS);
 			}
 		else
 			if(AsciiToNum(negPeekCap, digit)==KErrNone)
@@ -1470,7 +1464,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,negMeanCap);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSGPRS::NEGMEANCAP returned %d (element no. %d) from tag %s.",ret,4,KQosProfileCapsGPRS);
+			LOGPARSERR("QosProfileCapsGPRS::negMeanCap",ret,4,&KQosProfileCapsGPRS);
 			}
 		else
 			if(AsciiToNum(negMeanCap, digit)==KErrNone)
@@ -1511,7 +1505,7 @@
 		TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,contextName);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::contextName",ret,0,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1519,7 +1513,7 @@
 			profileReq5.iContextName.Copy(contextName);
 			if (profileReq5.iContextName.Match(iPacketContext->ContextName())==KErrNotFound)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::CONTEXTNAME returned %d (element no. %d) from tag %s.",KErrArgument,0,KQosProfileReqR5);
+				LOGPARSERR("QosProfileReqR5::contextName",KErrArgument,0,&KQosProfileReqR5);
 				continue;
 				}
 			}
@@ -1527,7 +1521,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,reqTraffic);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQTRAFFIC returned %d (element no. %d) from tag %s.",ret,1,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::reqTraffic",ret,1,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1541,7 +1535,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,minTraffic);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINTRAFFIC returned %d (element no. %d) from tag %s.",ret,2,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::minTraffic",ret,2,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1555,7 +1549,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,reqDeliveryOrder);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,3,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::reqDeliveryOrder",ret,3,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1569,7 +1563,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,minDeliveryOrder);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,4,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::minDeliveryOrder",ret,4,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1583,7 +1577,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,reqErroneousSDU);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQERRONEOUSSDU returned %d (element no. %d) from tag %s.",ret,5,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::reqErroneousSDU",ret,5,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1597,7 +1591,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,minErroneousSDU);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINERRONEOUSSDU returned %d (element no. %d) from tag %s.",ret,6,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::minErroneousSDU",ret,6,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1611,7 +1605,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,maxSDUSize);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MAXSDUSIZE returned %d (element no. %d) from tag %s.",ret,7,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::maxSDUSize",ret,7,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1622,7 +1616,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,minSDUSize);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINSDUSIZE returned %d (element no. %d) from tag %s.",ret,8,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::minSDUSize",ret,8,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1633,7 +1627,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,reqUpLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,9,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::reqUpLinkBitRate",ret,9,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1644,7 +1638,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,reqDownLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,10,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::reqDownLinkBitRate",ret,10,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1655,7 +1649,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,11,minUpLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,11,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::minUpLinkBitRate",ret,11,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1676,7 +1670,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,reqBitErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,13,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::reqBitErrorRatio",ret,13,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1690,7 +1684,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,14,minBitErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,14,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::minBitErrorRatio",ret,14,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1704,7 +1698,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,15,reqSDUErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element - QOSPROFILEREQR5::REQSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,15,KQosProfileReqR5);
+			LOGPARSERR("- QosProfileReqR5::reqSDUErrorRatio",ret,15,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1718,7 +1712,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,16,minSDUErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element - QOSPROFILEREQR5::MINSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,16,KQosProfileReqR5);
+			LOGPARSERR("- QosProfileReqR5::minSDUErrorRatio",ret,16,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1732,7 +1726,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,17,reqTrafficHandlingPriority);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,17,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::reqTrafficHandlingPriority",ret,17,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1746,7 +1740,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,18,minTrafficHandlingPriority);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,18,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::minTrafficHandlingPriority",ret,18,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1760,7 +1754,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,19,reqTransferDelay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,19,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::reqTransferDelay",ret,19,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1771,7 +1765,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,20,minTransferDelay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,20,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::minTransferDelay",ret,20,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1782,7 +1776,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,21,reqGuaranteedUpLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,21,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::reqGuaranteedUpLinkBitRate",ret,21,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1793,7 +1787,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,22,reqGuaranteedDownLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,22,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::reqGuaranteedDownLinkBitRate",ret,22,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1804,7 +1798,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,23,minGuaranteedUpLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,23,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::minGuaranteedUpLinkBitRate",ret,23,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1815,7 +1809,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,24,minGuaranteedDownLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_25, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,24,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::minGuaranteedDownLinkBitRate",ret,24,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1826,7 +1820,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,25,signallingIndication);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_26, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::SIGNALLINGINDICATION returned %d (element no. %d) from tag %s.",ret,25,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::signallingIndication",ret,25,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1837,7 +1831,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,26,reqTSourceStatisticsDescriptor);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_27, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQTSOURCESTATISTICSDESCRIPTOR returned %d (element no. %d) from tag %s.",ret,26,KQosProfileReqR5);
+			LOGPARSERR("QosProfileReqR5::reqTSourceStatisticsDescriptor",ret,26,&KQosProfileReqR5);
 			continue;
 			}
 		else 
@@ -1877,7 +1871,7 @@
 		TInt ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,0,contextName);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::contextName",ret,0,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -1885,7 +1879,7 @@
 			profileNeg5.iContextName.Copy(contextName);
 			if (profileNeg5.iContextName.Match(iPacketContext->ContextName())==KErrNotFound)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::CONTEXTNAME returned %d (element no. %d) from tag %s.",KErrArgument,0,KQosProfileNegR5);
+				LOGPARSERR("QosProfileNegR5::contextName",KErrArgument,0,&KQosProfileNegR5);
 				continue;
 				}
 			}
@@ -1893,7 +1887,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,duration);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::DURATION returned %d (element no. %d) from tag %s.",ret,1,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::duration",ret,1,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -1905,7 +1899,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,negTraffic);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGTRAFFIC returned %d (element no. %d) from tag %s.",ret,2,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::negTraffic",ret,2,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -1917,7 +1911,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,negDeliveryOrder);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,3,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::negDeliveryOrder",ret,3,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -1929,7 +1923,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,negErroneousSDUDelivery);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGERRONEOUSSDUDELIVERY returned %d (element no. %d) from tag %s.",ret,4,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::negErroneousSDUDelivery",ret,4,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -1941,7 +1935,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,negMaxSDUSize);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGMAXSDUSIZE returned %d (element no. %d) from tag %s.",ret,5,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::negMaxSDUSize",ret,5,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -1952,7 +1946,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,negBitErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,6,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::negBitErrorRatio",ret,6,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -1965,7 +1959,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,negSDUErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,7,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::negSDUErrorRatio",ret,7,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -1977,7 +1971,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,negTrafficHandlingPriority);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,8,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::negTrafficHandlingPriority",ret,8,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -1989,7 +1983,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,negTransferDelay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,9,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::negTransferDelay",ret,9,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -2000,7 +1994,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,negGuaranteedUpLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,10,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::negGuaranteedUpLinkBitRate",ret,10,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -2011,7 +2005,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,11,negGuaranteedDownLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,11,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::negGuaranteedDownLinkBitRate",ret,11,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -2022,7 +2016,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,12,negMaxUpLinkRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGMAXUPLINKRATE returned %d (element no. %d) from tag %s.",ret,12,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::negMaxUpLinkRate",ret,12,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -2033,7 +2027,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,negMaxDownLinkRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGMAXDOWNLINKRATE returned %d (element no. %d) from tag %s.",ret,13,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::negMaxDownLinkRate",ret,13,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -2044,7 +2038,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,14,signallingIndication);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::SIGNALLINGINDICATION returned %d (element no. %d) from tag %s.",ret,14,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::signallingIndication",ret,14,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -2055,7 +2049,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,15,reqTSourceStatisticsDescriptor);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::REQTSOURCESTATISTICSDESCRIPTOR returned %d (element no. %d) from tag %s.",ret,15,KQosProfileNegR5);
+			LOGPARSERR("QosProfileNegR5::reqTSourceStatisticsDescriptor",ret,15,&KQosProfileNegR5);
 			continue;
 			}
 		else
@@ -2107,7 +2101,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,contextName);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::contextName",ret,0,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2118,7 +2112,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,duration);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::DURATION returned %d (element no. %d) from tag %s.",ret,1,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::duration",ret,1,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2130,7 +2124,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,negTraffic);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGTRAFFIC returned %d (element no. %d) from tag %s.",ret,2,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::negTraffic",ret,2,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2142,7 +2136,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,negDeliveryOrder);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,3,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::negDeliveryOrder",ret,3,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2154,7 +2148,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,negErroneousSDUDelivery);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGERRONEOUSSDUDELIVERY returned %d (element no. %d) from tag %s.",ret,4,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::negErroneousSDUDelivery",ret,4,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2166,7 +2160,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,negMaxSDUSize);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGMAXSDUSIZE returned %d (element no. %d) from tag %s.",ret,5,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::negMaxSDUSize",ret,5,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2177,7 +2171,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,negBitErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,6,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::negBitErrorRatio",ret,6,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2189,7 +2183,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,negSDUErrorRatio);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,7,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::negSDUErrorRatio",ret,7,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2201,7 +2195,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,negTrafficHandlingPriority);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,8,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::negTrafficHandlingPriority",ret,8,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2213,7 +2207,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,negTransferDelay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,9,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::negTransferDelay",ret,9,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2224,7 +2218,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,negGuaranteedUpLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,10,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::negGuaranteedUpLinkBitRate",ret,10,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2235,7 +2229,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,11,negGuaranteedDownLinkBitRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,11,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::negGuaranteedDownLinkBitRate",ret,11,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2246,7 +2240,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,12,negMaxUpLinkRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGMAXUPLINKRATE returned %d (element no. %d) from tag %s.",ret,12,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::negMaxUpLinkRate",ret,12,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2257,7 +2251,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,negMaxDownLinkRate);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGMAXDOWNLINKRATE returned %d (element no. %d) from tag %s.",ret,13,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::negMaxDownLinkRate",ret,13,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2268,7 +2262,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,14,signallingIndication);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::SIGNALLINGINDICATION returned %d (element no. %d) from tag %s.",ret,14,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::signallingIndication",ret,14,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2279,7 +2273,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,15,reqTSourceStatisticsDescriptor);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::REQTSOURCESTATISTICSDESCRIPTOR returned %d (element no. %d) from tag %s.",ret,15,KQosNetworkNotificationType);
+			LOGPARSERR("qosR5NetworkNotification::reqTSourceStatisticsDescriptor",ret,15,&KQosNetworkNotificationType);
 			continue;
 			}
 		else
@@ -2309,7 +2303,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,delay);
 		if(ret!=KErrNone || delay < 0)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETSETQOSSETTINGS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element SETQOSDELAY::DELAY returned %d (element no. %d) from tag %s.",ret,0,KSetQoSDelay);
+			LOGPARSERR("SetQoSDelay::delay",ret,0,&KSetQoSDelay);
 			}
 		else
 			{
@@ -2320,7 +2314,7 @@
 		ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,1,at);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETSETQOSSETTINGS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SETQOSDELAY::AT returned %d (element no. %d) from tag %s.",ret,1,KSetQoSDelay);
+			LOGPARSERR("SetQoSDelay::at",ret,1,&KSetQoSDelay);
 			}
 		else
 			{
@@ -2337,7 +2331,7 @@
 *
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_DTOR_1, "CSimPacketQoS: Entered destructor");
+	LOGPACKET1("CSimPacketQoS: Entered destructor");
 
 	if (iProfiles != NULL)
 	{
@@ -2468,11 +2462,11 @@
 	switch (aIpc)
 		{
 		case EPacketQoSNotifyProfileChanged:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_REGISTERNOTIFICATION_1, "CSimPacketQoS: RegisterNotification - Profile Changed");
+			LOGPACKET1("CSimPacketQoS: RegisterNotification - Profile Changed");
 			return KErrNone;
 		default:
 			// Unknown or invalid IPC
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_REGISTERNOTIFICATION_2, "CSimPacketQoS: Register error, unknown IPC");
+			LOGPACKET1("CSimPacketQoS: Register error, unknown IPC");
 			return KErrNotSupported;
 		}
 	}
@@ -2493,11 +2487,11 @@
 	switch (aIpc)
 		{
 		case EPacketQoSNotifyProfileChanged:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_DEREGISTERNOTIFICATION_1, "CSimPacketQoS: DeregisterNotification - Profile Changed");
+			LOGPACKET1("CSimPacketQoS: DeregisterNotification - Profile Changed");
 			return KErrNone;
 		default:
 			// Unknown or invalid IPC
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_DEREGISTERNOTIFICATION_2, "CSimPacketQoS: Deregister error, unknown IPC");
+			LOGPACKET1("CSimPacketQoS: Deregister error, unknown IPC");
 			return KErrNotSupported;
 		}
 	}
@@ -2516,12 +2510,12 @@
 	switch (aIpc)
 		{
 		case EPacketQoSNotifyProfileChanged:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_NUMBEROFSLOTSL_1, "CGprsDGprsTsy: Registered with 5 slots");
+			LOGPACKET1("CGprsDGprsTsy: Registered with 5 slots");
 			numberOfSlots=5;
 			break;
 		default:
 			// Unknown or invalid IPC
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_NUMBEROFSLOTSL_2, "CSimPacketQoS: Number of Slots error, unknown IPC");
+			LOGPACKET1("CSimPacketQoS: Number of Slots error, unknown IPC");
 			User::Leave(KErrNotSupported);
 			break;
 		}  
@@ -2563,7 +2557,7 @@
  				TRAPD(ret, iSetQoSData->AppendL(setQoSData) );
  				if (ret != KErrNone)
                  	{
-                 	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_EXTFUNC_1, "CSimPacketQoS::ExtFunc AppendL call fail");
+                 	LOGPACKET1("CSimPacketQoS::ExtFunc AppendL call fail");
                  	return ret;
                  	}
                  	
@@ -2618,7 +2612,7 @@
 * @return err KErrNone if request completes ok
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_CANCELSERVICE_1, "CSimPacketQoS: - CancelService called");
+	LOGPACKET1("CSimPacketQoS: - CancelService called");
 	switch (aIpc)
 		{
 		case EPacketQoSSetProfileParams:
@@ -2646,7 +2640,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_1, "CSimPacketQoS::SetProfile called");
+	LOGPACKET1("CSimPacketQoS::SetProfile called");
 	TPckg<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)aConfig;
 	TPacketDataConfigBase& configBaseV1 = (*configBase)();
 
@@ -2709,34 +2703,34 @@
 
 				if (MatchContext(profile)==KErrNone)
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_2, "====REQ QOS===");
+					LOGPACKET1("====REQ QOS===");
 	
 					
 					
 				//	LOGPACKET3("Req Traffic [%d] [%d]", qosConfigV1.iReqTrafficClass, profile.iReqTraffic);
 				//	LOGCOMMON3("Min Traffic [%d] [%d]", qosConfigV1.iMinTrafficClass, profile.iMinTraffic);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_3, "Req Del order [%d] [%d]",qosConfigV1.iReqDeliveryOrderReqd, profile.iReqDeliveryOrder);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_4, "Min Del order [%d] [%d]",qosConfigV1.iMinDeliveryOrderReqd , profile.iMinDeliveryOrder);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_5, "Req Del err SDU [%d] [%d]",qosConfigV1.iReqDeliverErroneousSDU , profile.iReqErroneousSDU);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_6, "Min Del err SDU [%d] [%d]",qosConfigV1.iMinDeliverErroneousSDU , profile.iMinErroneousSDU);
- 					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_7, "Max Sdu Size [%d] [%d]",qosConfigV1.iReqMaxSDUSize , profile.iMaxSDUSize);
- 					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_8, "Min Sdu Size [%d] [%d]",qosConfigV1.iMinAcceptableMaxSDUSize , profile.iMinSDUSize);
-  					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_9, "Req Down [%d] [%d]",qosConfigV1.iReqMaxRate.iDownlinkRate , profile.iReqDownLinkTBitRate);
-  					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_10, "Req Up [%d] [%d]", qosConfigV1.iReqMaxRate.iUplinkRate , profile.iReqUpLinkTBitRate);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_11, "Min Guar Down[%d] [%d]",qosConfigV1.iMinGuaranteedRate.iDownlinkRate , profile.iMinGuaranteedDownLinkTBitRate);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_12, "Min Guar Up [%d] [%d]",qosConfigV1.iMinGuaranteedRate.iUplinkRate , profile.iMinGuaranteedUpLinkTBitRate);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_13, "Req BER [%d] [%d]",qosConfigV1.iReqBER , profile.iReqTBitErrorRatio);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_14, "Max BER [%d] [%d]",qosConfigV1.iMaxBER , profile.iMinTBitErrorRatio);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_15, "Req SDU err ratio [%d] [%d]",qosConfigV1.iReqSDUErrorRatio , profile.iReqTSDUErrorRatio);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_16, "Max SDU err ration [%d] [%d]",qosConfigV1.iMaxSDUErrorRatio , profile.iMinTSDUErrorRatio);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_17, "Req Traffic Handling priority [%d] [%d]",qosConfigV1.iReqTrafficHandlingPriority , profile.iReqTTrafficHandlingPriority);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_18, "Min Traffic Handling priority [%d] [%d]",qosConfigV1.iMinTrafficHandlingPriority , profile.iMinTTrafficHandlingPriority);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_19, "Req Transfer Delay [%d] [%d]",qosConfigV1.iReqTransferDelay , profile.iReqTransferDelay);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_20, "Max Transfer Delay [%d] [%d]",qosConfigV1.iMaxTransferDelay , profile.iMinTransferDelay);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_21, "Req Guar downlink bitrate [%d] [%d]",qosConfigV1.iReqGuaranteedRate.iDownlinkRate , profile.iReqGuaranteedDownLinkTBitRate);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_22, "Req Guar uplink bitrate [%d] [%d]",qosConfigV1.iReqGuaranteedRate.iUplinkRate , profile.iReqGuaranteedUpLinkTBitRate);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_23, "Min Guar downlink [%d] [%d]",qosConfigV1.iMinGuaranteedRate.iDownlinkRate , profile.iMinGuaranteedDownLinkTBitRate);
-					OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_24, "Min Guar uplink  [%d] [%d]",qosConfigV1.iMinGuaranteedRate.iUplinkRate , profile.iMinGuaranteedUpLinkTBitRate);
+					LOGPACKET3("Req Del order [%d] [%d]",qosConfigV1.iReqDeliveryOrderReqd, profile.iReqDeliveryOrder);
+					LOGPACKET3("Min Del order [%d] [%d]",qosConfigV1.iMinDeliveryOrderReqd , profile.iMinDeliveryOrder);
+					LOGPACKET3("Req Del err SDU [%d] [%d]",qosConfigV1.iReqDeliverErroneousSDU , profile.iReqErroneousSDU);
+					LOGPACKET3("Min Del err SDU [%d] [%d]",qosConfigV1.iMinDeliverErroneousSDU , profile.iMinErroneousSDU);
+ 					LOGPACKET3("Max Sdu Size [%d] [%d]",qosConfigV1.iReqMaxSDUSize , profile.iMaxSDUSize);
+ 					LOGPACKET3("Min Sdu Size [%d] [%d]",qosConfigV1.iMinAcceptableMaxSDUSize , profile.iMinSDUSize);
+  					LOGPACKET3("Req Down [%d] [%d]",qosConfigV1.iReqMaxRate.iDownlinkRate , profile.iReqDownLinkTBitRate);
+  					LOGPACKET3("Req Up [%d] [%d]", qosConfigV1.iReqMaxRate.iUplinkRate , profile.iReqUpLinkTBitRate);
+					LOGPACKET3("Min Guar Down[%d] [%d]",qosConfigV1.iMinGuaranteedRate.iDownlinkRate , profile.iMinGuaranteedDownLinkTBitRate);
+					LOGPACKET3("Min Guar Up [%d] [%d]",qosConfigV1.iMinGuaranteedRate.iUplinkRate , profile.iMinGuaranteedUpLinkTBitRate);
+					LOGPACKET3("Req BER [%d] [%d]",qosConfigV1.iReqBER , profile.iReqTBitErrorRatio);
+					LOGPACKET3("Max BER [%d] [%d]",qosConfigV1.iMaxBER , profile.iMinTBitErrorRatio);
+					LOGPACKET3("Req SDU err ratio [%d] [%d]",qosConfigV1.iReqSDUErrorRatio , profile.iReqTSDUErrorRatio);
+					LOGPACKET3("Max SDU err ration [%d] [%d]",qosConfigV1.iMaxSDUErrorRatio , profile.iMinTSDUErrorRatio);
+					LOGPACKET3("Req Traffic Handling priority [%d] [%d]",qosConfigV1.iReqTrafficHandlingPriority , profile.iReqTTrafficHandlingPriority);
+					LOGPACKET3("Min Traffic Handling priority [%d] [%d]",qosConfigV1.iMinTrafficHandlingPriority , profile.iMinTTrafficHandlingPriority);
+					LOGPACKET3("Req Transfer Delay [%d] [%d]",qosConfigV1.iReqTransferDelay , profile.iReqTransferDelay);
+					LOGPACKET3("Max Transfer Delay [%d] [%d]",qosConfigV1.iMaxTransferDelay , profile.iMinTransferDelay);
+					LOGPACKET3("Req Guar downlink bitrate [%d] [%d]",qosConfigV1.iReqGuaranteedRate.iDownlinkRate , profile.iReqGuaranteedDownLinkTBitRate);
+					LOGPACKET3("Req Guar uplink bitrate [%d] [%d]",qosConfigV1.iReqGuaranteedRate.iUplinkRate , profile.iReqGuaranteedUpLinkTBitRate);
+					LOGPACKET3("Min Guar downlink [%d] [%d]",qosConfigV1.iMinGuaranteedRate.iDownlinkRate , profile.iMinGuaranteedDownLinkTBitRate);
+					LOGPACKET3("Min Guar uplink  [%d] [%d]",qosConfigV1.iMinGuaranteedRate.iUplinkRate , profile.iMinGuaranteedUpLinkTBitRate);
 						
 					
 					
@@ -2867,7 +2861,7 @@
 * @param aTsyReqHandle Tsy Request handle for the client request
 * @return err KErrNone 
 */
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILECANCEL_1, "CSimPacketQoS::SetProfileCancel called");
+	LOGPACKET1("CSimPacketQoS::SetProfileCancel called");
 	
 	TInt index  = 0;
 	if (TSetQoSData::Find(iSetQoSData, aTsyReqHandle, index) == KErrNone)
@@ -2897,7 +2891,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETPROFILE_1, "CSimPacketQoS::GetProfile called");
+	LOGPACKET1("CSimPacketQoS::GetProfile called");
 	TPckg<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)aConfig;
 	TPacketDataConfigBase& configBaseV1 = (*configBase)();
 	
@@ -3130,7 +3124,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETPROFILECANCEL_1, "CSimPacketQoS::GetProfileCancel called");
+	LOGPACKET1("CSimPacketQoS::GetProfileCancel called");
 	return KErrNone;
 	}
 
@@ -3146,7 +3140,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETPROFILECAPS_1, "CSimPacketQoS::GetProfileCaps called");
+	LOGPACKET1("CSimPacketQoS::GetProfileCaps called");
 	TPckg<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)aConfig;
 	TPacketDataConfigBase& configBaseV1 = (*configBase)();
 
@@ -3205,7 +3199,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETPROFILECAPSCANCEL_1, "CSimPacketQoS::GetProfileCapsCancel called");
+	LOGPACKET1("CSimPacketQoS::GetProfileCapsCancel called");
 	return KErrNone;
 	}
 
@@ -3308,7 +3302,7 @@
 * @return KErrNone
 */
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_NOTIFYPROFILECHANGEDCANCEL_1, "CSimPacketQoS::NotifyProfileChangedCancel called");
+	LOGPACKET1("CSimPacketQoS::NotifyProfileChangedCancel called");
 	if(iNotifyProfileGPRS.iNotifyPending &&	iNotifyProfileGPRS.iNotifyHandle == aTsyReqHandle)
 		{
 		iNotifyProfileGPRS.iNotifyPending=EFalse;

--- a/telephonyserverplugins/simtsy/src/CSimPacketService.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPacketService.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -22,14 +22,8 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimPacketServiceTraces.h"
-#endif
-
 #include "CSimPacketService.h"
+#include "Simlog.h"
 #include <pcktcs.h>
 #include "CSimPhone.h"
 #include "utils.h"
@@ -114,7 +108,7 @@
 * @panic Panics with SIMTSY EInvalidParameterFormatInConfigFile if an additional param data item is in an invalid format
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_1, "CSimPacketService: Entered ConstructL()");
+	LOGPACKET1("CSimPacketService: Entered ConstructL()");
 	
 	iTimer = CSimTimer::NewL(iPhone);
 	iPcktRegTimer = CSimTimer::NewL(iPhone);
@@ -122,7 +116,7 @@
 	iReleaseModeTimer = CSimTimer::NewL(iPhone);
 	iDynamicCapsTimer = CSimTimer::NewL(iPhone);
 	iMbmsPcktTimer = CSimTimer::NewL(iPhone);
-	User::LeaveIfError(iMutex.CreateGlobal(KNullDesC, EOwnerProcess));
+	iMutex.CreateGlobal(KNullDesC, EOwnerProcess);
 	
 	iNtwkRegStatusInfo = new(ELeave) CArrayFixFlat<TNtwkRegStatus>(KGranularity);
 	iPcktRegStatusInfo=new(ELeave) CArrayFixFlat<TPacketRegStatus>(KGranularity);
@@ -386,14 +380,14 @@
 						{
 						// AdditionalParamDataFormat not been specified,
 						// default to plain ASCII
-						OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",ret,2,KDefaultGPRSAdditionalParamItem);
+						LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",ret,2,&KDefaultGPRSAdditionalParamItem);
 						format = EConfigDataFormatAscii;
 						}
 					else
 						{
 						if (AsciiToNum(additionalParamDataFormat, format) != KErrNone)
 							{
-							OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,KDefaultGPRSAdditionalParamItem);
+							LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&KDefaultGPRSAdditionalParamItem);
 							format = EConfigDataFormatAscii;
 							}
 
@@ -402,7 +396,7 @@
 						// default to ASCII if not.
 						if (format >= EMaxConfigDataFormat)
 							{
-							OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,KDefaultGPRSAdditionalParamItem);
+							LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&KDefaultGPRSAdditionalParamItem);
 							format = EConfigDataFormatAscii;
 							}
 						}
@@ -423,7 +417,7 @@
 
 							if (ParseMixedBinaryAsciiDataL(additionalParamDataBuffer) != KErrNone)
 								{
-								OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMCONTENT returned %d (element no. %d) from tag %s.",KErrArgument,1,KDefaultGPRSAdditionalParamItem);
+								LOGPARSERR("AdditionalParamItem::additionalParamContent",KErrArgument,1,&KDefaultGPRSAdditionalParamItem);
 								SimPanic(EInvalidParameterFormatInConfigFile);
 								}
 
@@ -451,7 +445,7 @@
 			}
 		else
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::NUMADDITIONALPARAMS returned %d (element no. %d) from tag %s.",ret,14,KDefaultContextparamGPRS);
+			LOGPARSERR("ProtocolConfigOption::numAdditionalParams",ret,14,&KDefaultContextparamGPRS);	
 			} 
 		} 
 
@@ -558,14 +552,14 @@
 						{
 						// AdditionalParamDataFormat not been specified,
 						// default to plain ASCII
-						OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element NO ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",ret,2,KDefaultAdditionalParamItemRel99);
+						LOGPARSERR("No AdditionalParamItem::additionalParamDataFormat",ret,2,&KDefaultAdditionalParamItemRel99);
 						format = EConfigDataFormatAscii;
 						}
 					else
 						{
 						if (AsciiToNum(additionalParamDataFormat, format) != KErrNone)
 							{
-							OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,KDefaultAdditionalParamItemRel99);
+							LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&KDefaultAdditionalParamItemRel99);
 							format = EConfigDataFormatAscii;
 							}
 
@@ -574,7 +568,7 @@
 						// default to ASCII if not.
 						if (format >= EMaxConfigDataFormat)
 							{
-							OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,KDefaultAdditionalParamItemRel99);
+							LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&KDefaultAdditionalParamItemRel99);
 							format = EConfigDataFormatAscii;
 							}
 						}
@@ -594,7 +588,7 @@
 
 							if (ParseMixedBinaryAsciiDataL(additionalParamDataBuffer) != KErrNone)
 								{
-								OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMCONTENT returned %d (element no. %d) from tag %s.",KErrArgument,1,KDefaultAdditionalParamItemRel99);
+								LOGPARSERR("AdditionalParamItem::additionalParamContent",KErrArgument,1,&KDefaultAdditionalParamItemRel99);
 								SimPanic(EInvalidParameterFormatInConfigFile);
 								}
 
@@ -621,7 +615,7 @@
 			}
 		else
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::NUMADDITIONALPARAMS returned %d (element no. %d) from tag %s.",ret,12,KDefaultContextparamRel99);
+			LOGPARSERR("ProtocolConfigOption::numAdditionalParams",ret,12,&KDefaultContextparamRel99);	
 			} 		
 
 		}
@@ -781,14 +775,14 @@
 						{
 						// AdditionalParamDataFormat not been specified,
 						// default to plain ASCII
-						OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element NO ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",ret,2,KDefaultAdditionalParamItem);
+						LOGPARSERR("No AdditionalParamItem::additionalParamDataFormat",ret,2,&KDefaultAdditionalParamItem);
 						format = EConfigDataFormatAscii;
 						}
 					else
 						{
 						if (AsciiToNum(additionalParamDataFormat, format) != KErrNone)
 							{
-							OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,KDefaultAdditionalParamItem);
+							LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&KDefaultAdditionalParamItem);
 							format = EConfigDataFormatAscii;
 							}
 
@@ -797,7 +791,7 @@
 						// default to ASCII if not.
 						if (format >= EMaxConfigDataFormat)
 							{
-							OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,KDefaultAdditionalParamItem);
+							LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&KDefaultAdditionalParamItem);
 							format = EConfigDataFormatAscii;
 							}
 						}
@@ -817,7 +811,7 @@
 
 								if (ParseMixedBinaryAsciiDataL(additionalParamDataBuffer) != KErrNone)
 									{
-									OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMCONTENT returned %d (element no. %d) from tag %s.",KErrArgument,1,KDefaultAdditionalParamItem);
+									LOGPARSERR("AdditionalParamItem::additionalParamContent",KErrArgument,1,&KDefaultAdditionalParamItem);
 									SimPanic(EInvalidParameterFormatInConfigFile);
 									}
 
@@ -1008,7 +1002,7 @@
 *
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_DTOR_1, "CSimPacketService: Entered destructor");
+	LOGPACKET1("CSimPacketService: Entered destructor");
 		
 	delete iIncomingContextManager;
 	
@@ -1444,11 +1438,11 @@
 		case EPacketNotifyAttachModeChange:
 		case EPacketNotifyMbmsNetworkServiceStatusChange:
 		case EPacketNotifyMbmsServiceAvailabilityChange:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_REGISTERNOTIFICATION_1, "CSimPacketService: RegisterNotification");
+			LOGPACKET1("CSimPacketService: RegisterNotification");
 			return KErrNone;
 		default:
 			// Unknown or invalid IPC
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_REGISTERNOTIFICATION_2, "CSimPacketService: Register error, unknown IPC");
+			LOGPACKET1("CSimPacketService: Register error, unknown IPC");
 			return KErrNotSupported;
 		}
 	}
@@ -1478,11 +1472,11 @@
 		case EPacketNotifyAttachModeChange:
 		case EPacketNotifyMbmsNetworkServiceStatusChange:
 		case EPacketNotifyMbmsServiceAvailabilityChange:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_DEREGISTERNOTIFICATION_1, "CSimPacketService: DeregisterNotification");
+			LOGPACKET1("CSimPacketService: DeregisterNotification");
 			return KErrNone;
 		default:
 			// Unknown or invalid IPC
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_DEREGISTERNOTIFICATION_2, "CSimPacketService: Deregister error, unknown IPC");
+			LOGPACKET1("CSimPacketService: Deregister error, unknown IPC");
 			return KErrNotSupported;
 		}
 	}
@@ -1503,7 +1497,7 @@
 		case EPacketNotifyStatusChange:
 		case EPacketNotifyDynamicCapsChange:
 		case EPacketNotifyMbmsNetworkServiceStatusChange:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NUMBEROFSLOTSL_1, "CSimPacketService: Registered with 10 slots");
+			LOGPACKET1("CSimPacketService: Registered with 10 slots");
 			numberOfSlots=10;
 			break;
 		case EPacketNotifyContextAdded:
@@ -1513,12 +1507,12 @@
 		case EPacketNotifyReleaseModeChange:
 		case EPacketNotifyAttachModeChange:
 		case EPacketNotifyMbmsServiceAvailabilityChange:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NUMBEROFSLOTSL_2, "CSimPacketService: Registered with 2 slots");
+			LOGPACKET1("CSimPacketService: Registered with 2 slots");
 			numberOfSlots=2;
 			break;
 		default:
 			// Unknown or invalid IPC
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NUMBEROFSLOTSL_3, "CSimPacketService: Number of Slots error, unknown IPC");
+			LOGPACKET1("CSimPacketService: Number of Slots error, unknown IPC");
 			User::Leave(KErrNotSupported);
 			break;
 		}  
@@ -1685,7 +1679,7 @@
 * @return err KErrNone if request completes ok
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CANCELSERVICE_1, "CSimPacketService: - CancelService called");
+	LOGPACKET1("CSimPacketService: - CancelService called");
 	switch (aIpc)
 		{
 		case EPacketNotifyContextAdded:
@@ -1778,7 +1772,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYCONTEXTADDEDCANCEL_1, "CSimPacketService::NotifyContextAddedCancel called");
+	LOGPACKET1("CSimPacketService::NotifyContextAddedCancel called");
 	if(iNotifyContextAdded.iNotifyPending)
 		{
 		iNotifyContextAdded.iNotifyPending=EFalse;
@@ -1797,7 +1791,7 @@
 * @return TInt KErrnone if request completes ok
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ATTACH_1, "CSimPacketService::Attach called");
+	LOGPACKET1("CSimPacketService::Attach called");
 	iAttachRequestHandle=aTsyReqHandle;
 	return ActionEvent(EPacketEventAttach);
 	}
@@ -1811,7 +1805,7 @@
 * @return TInt KErrnone if request completes ok
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ATTACHCANCEL_1, "CSimPacketService::AttachCancel called");
+	LOGPACKET1("CSimPacketService::AttachCancel called");
 	if((iState == RPacketService::EStatusUnattached) && (iCurrentEvent==EPacketEventAttach))
 		{
 		iTimer->Cancel();
@@ -1879,7 +1873,7 @@
 * @return TInt KErrnone if request completes ok
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_DETACH_1, "CSimPacketService::Detach called");
+	LOGPACKET1("CSimPacketService::Detach called");
 	iDetachRequestHandle=aTsyReqHandle;
 	return ActionEvent(EPacketEventDetach);
 	}
@@ -1894,7 +1888,7 @@
 * @return TInt KErrnone if request completes ok
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_DETACHCANCEL_1, "CSimPacketService::DetachCancel called");
+	LOGPACKET1("CSimPacketService::DetachCancel called");
 	if((iState == RPacketService::EStatusAttached) && (iCurrentEvent==EPacketEventDetach))
 			{
 			iTimer->Cancel();
@@ -1913,7 +1907,7 @@
 * @return TInt err KErrNone if ok
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETSTATUS_1, "CSimPacketService::GetStatus called");
+	LOGPACKET1("CSimPacketService::GetStatus called");
 	*aStatus = iState;
 	ReqCompleted(aTsyReqHandle,KErrNone);
 	return KErrNone;
@@ -1948,7 +1942,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYSTATUSCHANGECANCEL_1, "CSimPacketService::NotifyStatusChangeCancel called");
+	LOGPACKET1("CSimPacketService::NotifyStatusChangeCancel called");
 	if(iNotifyStatusChange.iNotifyPending)
 		{
 		iNotifyStatusChange.iNotifyPending=EFalse;
@@ -1973,7 +1967,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYCONTEXTACTIVATIONREQUESTED_1, "CSimPacketService::NotifyContextActivationRequested called");
+	LOGPACKET1("CSimPacketService::NotifyContextActivationRequested called");
 	
 	iConfigData.iTsyReqHandle = aTsyReqHandle;
 	iConfigData.iData = aContextParameters;
@@ -2000,7 +1994,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYCONTEXTACTIVATIONREQUESTEDCANCEL_1, "CSimPacketService::NotifyContextActivationRequestedCancel called");
+	LOGPACKET1("CSimPacketService::NotifyContextActivationRequestedCancel called");
 
 	iIncomingContextManager->Cancel();	
 	iIncomingContextManager->SetUseTimerOff();	
@@ -2047,7 +2041,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ENUMERATECONTEXTS_1, "CSimPacketService::EnumerateContexts called");
+	LOGPACKET1("CSimPacketService::EnumerateContexts called");
 	// this should enumerate all primary and secondary contexts
 	*aCount = iPrimaryContextNameInc + iSecondaryContextNameInc;
 	*aMaxAllowed = KMaxContextPoolSize;
@@ -2064,7 +2058,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ENUMERATECONTEXTSCANCEL_1, "CSimPacketService::Enumerate Context Cancel called");
+	LOGPACKET1("CSimPacketService::Enumerate Context Cancel called");
 	return KErrNone;
 	}
 
@@ -2078,7 +2072,7 @@
 * @return KErrNone if context is found in the list of contexts 
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETCONTEXTINFO_1, "CSimPacketService::GetContextInfo called");
+	LOGPACKET1("CSimPacketService::GetContextInfo called");
 	CSimPacketContext*  packetContext;
 
 	if((*aIndex >= iContextCount) || (*aIndex < 0))
@@ -2131,7 +2125,7 @@
 * @return KErrNone 
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETNTWKREGSTATUS_1, "CSimPacketService::GetNtwkRegStatus called");
+	LOGPACKET1("CSimPacketService::GetNtwkRegStatus called");
 	*aRegistrationStatus = (RPacketService::TRegistrationStatus)iCurrentRegStatus;
 	ReqCompleted(aTsyReqHandle,KErrNone);
 	return KErrNone;
@@ -2171,7 +2165,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYCHANGEOFNTWKREGSTATUSCANCEL_1, "CSimPacketService::NotifyChangeOfNtwkRegStatusCancel called");
+	LOGPACKET1("CSimPacketService::NotifyChangeOfNtwkRegStatusCancel called");
 	if(iNotifyChangeOfNtwk.iNotifyPending)
 		{
 		iNotifyChangeOfNtwk.iNotifyPending=EFalse;
@@ -2277,7 +2271,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETSTATICCAPS_1, "CSimPacketService::GetStaticCaps called");
+	LOGPACKET1("CSimPacketService::GetStaticCaps called");
 	*aCaps = KPacketServiceCaps;
 	*aPdpType = RPacketContext::EPdpTypePPP;
 	ReqCompleted(aTsyReqHandle,KErrNone);
@@ -2293,7 +2287,7 @@
 */
 TInt CSimPacketService::GetDynamicCaps(const TTsyReqHandle aTsyReqHandle, RPacketService::TDynamicCapsFlags* aCaps)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETDYNAMICCAPS_1, "CSimPacketService::GetDynamicCaps called");
+	LOGPACKET1("CSimPacketService::GetDynamicCaps called");
 	
 	if (iDynamicCapsArray->Count() == 0)
 		{
@@ -2314,7 +2308,7 @@
 */
 TInt CSimPacketService::NotifyDynamicCapsChange(const TTsyReqHandle aTsyReqHandle, RPacketService::TDynamicCapsFlags* aCaps)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYDYNAMICCAPSCHANGE_1, "CSimPacketService::NotifyDynamicCapsChange called");
+	LOGPACKET1("CSimPacketService::NotifyDynamicCapsChange called");
 	__ASSERT_ALWAYS(!iNotifyDynamicCapsChange.iNotifyPending,SimPanic(ENotificationAlreadyPending));
  
 	if (iDynamicCapsArray->Count() == 0)
@@ -2337,7 +2331,7 @@
 */
 TInt CSimPacketService::NotifyDynamicCapsChangeCancel(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYDYNAMICCAPSCHANGECANCEL_1, "CSimPacketService::NotifyDynamicCapsChangeCancel called");
+	LOGPACKET1("CSimPacketService::NotifyDynamicCapsChangeCancel called");
 	if( (iNotifyDynamicCapsChange.iNotifyPending) && (aTsyReqHandle == iNotifyDynamicCapsChange.iNotifyHandle))
 		{
 		iNotifyDynamicCapsChange.iNotifyPending=EFalse;
@@ -2376,7 +2370,7 @@
 * @return KErrNone 
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_SETATTACHMODE_1, "CSimPacketService::SetAttachMode called");
+	LOGPACKET1("CSimPacketService::SetAttachMode called");
 	if(*aMode != RPacketService::EAttachWhenNeeded)
 		{
 		ReqCompleted(aTsyReqHandle, KErrNotSupported);
@@ -2405,7 +2399,7 @@
 * @return KErrNone 
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETATTACHMODE_1, "CSimPacketService::GetAttachMode called");
+	LOGPACKET1("CSimPacketService::GetAttachMode called");
 	*aMode = iAttachMode;
 	ReqCompleted(aTsyReqHandle,KErrNone);
 	return KErrNone;
@@ -2420,7 +2414,7 @@
 * @return KErrNone 
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYATTACHMODECHANGE_1, "CSimPacketService::NotifyAttachModeChange called");
+	LOGPACKET1("CSimPacketService::NotifyAttachModeChange called");
 	
 	__ASSERT_ALWAYS(!iNotifyChangeOfAttachMode.iNotifyPending,SimPanic(ENotificationAlreadyPending));
 	
@@ -2440,7 +2434,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_SETDEFAULTCONTEXTPARAMS_1, "CSimPacketService::SetDefaultContextParams called");
+	LOGPACKET1("CSimPacketService::SetDefaultContextParams called");
 	
 	TPckg<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)aPckg;
 	TPacketDataConfigBase& configBaseV1 = (*configBase)();
@@ -2622,7 +2616,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETGPRSDEFAULTCONTEXTPARAMS_1, "CSimPacketService::GetDefaultContextParams called");
+	LOGPACKET1("CSimPacketService::GetDefaultContextParams called");
 
 	TPckg<RPacketContext::TContextConfigGPRS>* contextConfigGPRSPckg = (TPckg<RPacketContext::TContextConfigGPRS>*)aPckg;
 	RPacketContext::TContextConfigGPRS& contextConfigV1 = (*contextConfigGPRSPckg)();
@@ -2655,7 +2649,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETDEFAULTCONTEXTPARAMS_1, "CSimPacketService::GetDefaultContextParams called");
+	LOGPACKET1("CSimPacketService::GetDefaultContextParams called");
 	TPckg<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)aPckg;
 	TPacketDataConfigBase& configBaseV1 = (*configBase)();
 
@@ -2752,7 +2746,7 @@
 * @param aId an id identifying which timer callback is being called
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_TIMERCALLBACK_1, ">>CSimPacketService::TimerCallBack");
+	LOGPACKET1(">>CSimPacketService::TimerCallBack");
 
 	if(aId == ETimerIdPcktServPacket)
 		{
@@ -2825,7 +2819,7 @@
 		TInt ret = ActionEvent(EPacketEventTimeOut);
 		__ASSERT_ALWAYS(ret==KErrNone,SimPanic(ETimeOutEventActionFailed));	// Note: this is very crude error handling and should be replaced by something rather more elegant.
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_TIMERCALLBACK_2, "<<CSimPacketService::TimerCallBack");
+	LOGPACKET1("<<CSimPacketService::TimerCallBack");
 	}
 
 void CSimPacketService::TimerCallBackDeactivate()
@@ -2924,7 +2918,7 @@
 		}
 	else
 		{  // Error. Some sort of stange request. Hopefully impossible.
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_SIMPSEVENT_1, "CSimPacketService::SimPSEvent property mismatch.");
+		LOGPACKET1("CSimPacketService::SimPSEvent property mismatch.");
 		SimPanic(EFailedToSetProperty);
 		}
 	
@@ -3020,7 +3014,7 @@
 * @return Error indication if change of state is successful or not
 */
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CHANGESTATE_1, ">>CSimPacketService::ChangeState [newState=%d]", aNewState);
+	LOGPACKET2(">>CSimPacketService::ChangeState [newState=%d]", aNewState);
 	if(iState == aNewState)
 		return KErrNone;
 
@@ -3074,7 +3068,7 @@
 		ReqCompleted(iNotifyStatusChange.iNotifyHandle,KErrNone);
 		}
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CHANGESTATE_2, "<<CSimPacketService::ChangeState");
+	LOGPACKET1("<<CSimPacketService::ChangeState");
 	return KErrNone;
 	}
 
@@ -3094,7 +3088,7 @@
 	switch(aEvent)
 		{
 	case EPacketEventAttach:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ACTIONEVENT_1, ">>CSimPacketService::ActionEvent = [EPacketEventAttach]");
+		LOGPACKET1(">>CSimPacketService::ActionEvent = [EPacketEventAttach]");
 		if(iState==RPacketService::EStatusUnattached)
 			{
 			iCurrentEvent=EPacketEventAttach;
@@ -3105,7 +3099,7 @@
 		break;
 
 	case EPacketEventDetach:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ACTIONEVENT_2, ">>CSimPacketService::ActionEvent = [EPacketEventDetach]");
+		LOGPACKET1(">>CSimPacketService::ActionEvent = [EPacketEventDetach]");
 		if(iState !=RPacketService::EStatusUnattached)
 			{
 			iCurrentEvent=EPacketEventDetach;
@@ -3212,7 +3206,7 @@
 TInt CSimPacketService::GetCurrentReleaseMode(const TTsyReqHandle aTsyReqHandle,RPacketService::TPacketReleaseMode* aReleaseMode)
 // return current release mode
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETCURRENTRELEASEMODE_1, "CSimPacketService::GetCurrentReleaseMode called");
+	LOGPACKET1("CSimPacketService::GetCurrentReleaseMode called");
 	*aReleaseMode = (RPacketService::TPacketReleaseMode)iCurrentPacketReleaseMode;
 	ReqCompleted(aTsyReqHandle, KErrNone);
 	return KErrNone;
@@ -3354,7 +3348,7 @@
 */
 TInt CSimPacketService::NotifyReleaseModeChangeCancel(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYRELEASEMODECHANGECANCEL_1, "CSimPacketService::NotifyChangeOfNtwkRegStatusCancel called");
+	LOGPACKET1("CSimPacketService::NotifyChangeOfNtwkRegStatusCancel called");
 	if(iNotifyChangeOfReleaseMode.iNotifyPending)
 		{
 		iNotifyChangeOfReleaseMode.iNotifyPending=EFalse;
@@ -3400,7 +3394,7 @@
 */
 TInt CSimPacketService::NotifyAttachModeChangeCancel(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYATTACHMODECHANGECANCEL_1, "CSimPacketService::NotifyAttachModeChangeCancel called");
+	LOGPACKET1("CSimPacketService::NotifyAttachModeChangeCancel called");
 	if(iNotifyChangeOfAttachMode.iNotifyPending)
 		{
 		iNotifyChangeOfAttachMode.iNotifyPending=EFalse;
@@ -3418,7 +3412,7 @@
 * @return TInt err KErrNone if ok
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETMBMSNETWORKSERVICESTATUS_1, "CSimPacketService::GetMbmsNetworkServiceStatus called");
+	LOGPACKET1("CSimPacketService::GetMbmsNetworkServiceStatus called");
 	*aStatus = (iMbmsBroadcastParamsArray->At(iCurrentMbmsParamsIndex).iMbmsNetworkStatus);
 	if(aAttemptAttach)
 		{
@@ -3466,7 +3460,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYMBMSNETWORKSERVICESTATUSCHANGE_1, "CSimPacketService::NotifyMbmsNetworkServiceStatusChange called");
+	LOGPACKET1("CSimPacketService::NotifyMbmsNetworkServiceStatusChange called");
  	__ASSERT_ALWAYS(!iNotifyMbmsNetworkStatusChange.iNotifyPending,SimPanic(ENotificationAlreadyPending));
 
  	iNotifyMbmsNetworkStatusChange.iNotifyPending = ETrue;
@@ -3484,7 +3478,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYMBMSNETWORKSERVICESTATUSCHANGECANCEL_1, "CSimPacketService::NotifyMbmsNetworkServiceStatusChangeCancel called");
+	LOGPACKET1("CSimPacketService::NotifyMbmsNetworkServiceStatusChangeCancel called");
 	if(iNotifyMbmsNetworkStatusChange.iNotifyPending)
 		{
 		iNotifyMbmsNetworkStatusChange.iNotifyPending=EFalse;
@@ -3504,7 +3498,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYMBMSSERVICEAVAILABILITYCHANGE_1, "CSimPacketService::NotifyMbmsServiceAvailabilityChange called");
+	LOGPACKET1("CSimPacketService::NotifyMbmsServiceAvailabilityChange called");
  	__ASSERT_ALWAYS(!iNotifyMbmsNetworkStatusChange.iNotifyPending,SimPanic(ENotificationAlreadyPending));
 
  	iNotifyMbmsServAvailChange.iNotifyPending = ETrue;
@@ -3522,7 +3516,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYMBMSSERVICEAVAILABILITYCHANGECANCEL_1, "CSimPacketService::NotifyMbmsServiceAvailabilityChangeCancel called");
+	LOGPACKET1("CSimPacketService::NotifyMbmsServiceAvailabilityChangeCancel called");
 	if(iNotifyMbmsServAvailChange.iNotifyPending)
 		{
 		iNotifyMbmsServAvailChange.iNotifyPending=EFalse;
@@ -3543,7 +3537,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_1, "CSimPacketService::UpdateMbmsMonitorServiceListL called");
+	LOGPACKET1("CSimPacketService::UpdateMbmsMonitorServiceListL called");
 	CPcktMbmsMonitoredServiceList* monServList = CPcktMbmsMonitoredServiceList::NewL();
 	CleanupStack::PushL(monServList); 
 
@@ -3558,7 +3552,7 @@
 	switch(*aAction)
 		{
 		case SIMTSY_PACKET_MBMS_ADD_ENTRIES:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_2, "CSimPacketService::UpdateMbmsMonitorServiceListL Action: ADD ");
+			LOGPACKET1("CSimPacketService::UpdateMbmsMonitorServiceListL Action: ADD ");
 			monServList->RestoreL(*aBuffer);
 			countAdd = monServList->Enumerate();
 			if(countAdd != SIMTSY_PACKET_MBMS_ADD_ENTRIES_COUNT)
@@ -3612,7 +3606,7 @@
 			break;
 
 		case SIMTSY_PACKET_MBMS_REM_ENTRIES:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_3, "CSimPacketService::UpdateMbmsMonitorServiceListL Action: REMOVE ");
+			LOGPACKET1("CSimPacketService::UpdateMbmsMonitorServiceListL Action: REMOVE ");
 			monServList->RestoreL(*aBuffer);
 			countRem = monServList->Enumerate();
 			if(countRem != SIMTSY_PACKET_MBMS_REM_ENTRIES_COUNT)
@@ -3678,14 +3672,14 @@
 		case SIMTSY_PACKET_MBMS_REM_ALL_ENTRIES:
 			iMbmsMonitorListCount = 0;
 			iMbmsMonitorListParamsArray->Delete(0,iMbmsMonitorListParamsArray->Count());
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_4, "CSimPacketService::UpdateMbmsMonitorServiceListL Action: REMOVE_ALL ");
+			LOGPACKET1("CSimPacketService::UpdateMbmsMonitorServiceListL Action: REMOVE_ALL ");
 			iUpdateMbmsServiceError = KErrNone;
 			iUpdateMbmsServiceReqHandle = aTsyReqHandle;
 			CleanupStack::PopAndDestroy(); // monServList
 			break;
 			
 		default:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_5, "CSimPacketService::UpdateMbmsMonitorServiceListL Action: Default ");
+			LOGPACKET1("CSimPacketService::UpdateMbmsMonitorServiceListL Action: Default ");
 			ReqCompleted(aTsyReqHandle,KErrNotFound);
 			CleanupStack::PopAndDestroy(); // monServList
 			break;
@@ -3701,7 +3695,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTCANCEL_1, "CSimPacketService::UpdateMbmsMonitorServiceListCancel Called ");
+	LOGPACKET1("CSimPacketService::UpdateMbmsMonitorServiceListCancel Called ");
 	ReqCompleted(aTsyReqHandle,KErrCancel);
 	return KErrNone;
 	}
@@ -3719,7 +3713,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETMBMSMONITOREDSERVICESLISTPHASE1_1, "CSimPacketService::GetMbmsMonitoredServicesListPhase1 called");
+	LOGPACKET1("CSimPacketService::GetMbmsMonitoredServicesListPhase1 called");
 	TInt ret=KErrNone;
 	TInt leaveCode=KErrNone;
 	TRAP(leaveCode, ret=ProcessGetMbmsMonitoredServicesListPhase1L(aTsyReqHandle, aClient, aBufSize););
@@ -3743,7 +3737,7 @@
 */
 	{
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_PROCESSGETMBMSMONITOREDSERVICESLISTPHASE1L_1, "CSimPacketService::ProcessGetMbmsMonitoredServicesListPhase1L called");
+	LOGPACKET1("CSimPacketService::ProcessGetMbmsMonitoredServicesListPhase1L called");
 	CPcktMbmsMonitoredServiceList* list=CPcktMbmsMonitoredServiceList::NewL();
 	CleanupStack::PushL(list);
 
@@ -3758,7 +3752,7 @@
 			entry.iTmgi.SetMNC(iMbmsMonitorListParamsArray->At(i).iMNC);
 			entry.iTmgi.SetServiceId(iMbmsMonitorListParamsArray->At(i).iServiceId);
 			// Add the entry into the list, at the next empty location
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_PROCESSGETMBMSMONITOREDSERVICESLISTPHASE1L_2, "Adding the Entry no. %d to the List",i+1);
+			LOGPACKET2("Adding the Entry no. %d to the List",i+1);
 			list->AddEntryL(entry);
 		}
 	
@@ -3793,7 +3787,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETMBMSMONITOREDSERVICESLISTPHASE2_1, "CSimPacketService::GetMbmsMonitoredServicesListPhase2 called");
+	LOGPACKET1("CSimPacketService::GetMbmsMonitoredServicesListPhase2 called");
 	CPcktListReadAllAttempt* read=NULL;
 	// Find the get MBMS Monitor Service List from this client
 	for (TInt i=0; i<iMbmsServicesList->Count(); ++i)
@@ -3824,7 +3818,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETMBMSMONITOREDSERVICESLISTCANCEL_1, "CSimPacketService::GetMbmsMonitoredServicesListCancel called");
+	LOGPACKET1("CSimPacketService::GetMbmsMonitoredServicesListCancel called");
 	// Remove the read all attempt from iGetMbmsMonitoredServices
 
 	CPcktListReadAllAttempt* read=NULL;
@@ -3852,7 +3846,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ENUMERATEMBMSMONITORSERVICELIST_1, "CSimPacketService::EnumerateMbmsMonitorServiceList called");
+	LOGPACKET1("CSimPacketService::EnumerateMbmsMonitorServiceList called");
 	*aCount = iMbmsMonitorListCount;
 	*aMaxAllowed = KMaxMbmsMonitorContexts;
 	iEnumerateMonitorListReqHandle = aTsyReqHandle;
@@ -3889,7 +3883,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ENUMERATEMBMSACTIVESERVICELIST_1, "CSimPacketService::EnumerateMbmsActiveServiceList called");
+	LOGPACKET1("CSimPacketService::EnumerateMbmsActiveServiceList called");
 	*aCount = iMbmsNifWrappers.Count(); // The NifWrapper contains the list of mbmsContexts that are activated.
 	*aMaxAllowed = KMaxMbmsActiveContexts;
 	iEnumerateActiveListReqHandle = aTsyReqHandle;

--- a/telephonyserverplugins/simtsy/src/CSimPhBkStore.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhBkStore.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -19,15 +19,9 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimPhBkStoreTraces.h"
-#endif
-
 #include "CSimPhBkStore.h"
 #include "CSimPhone.h"
+#include "Simlog.h"
 #include <testconfigfileparser.h>
 
 const TUint16 KNpiTonInternational=145;		// < The Number Plan Identifier and Type of Number for an international telephone number.
@@ -80,7 +74,7 @@
  * @param aMaxTextLen	The maximum length of an alpha tag.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_CONSTRUCTL_1, "Starting to parse Phonebook store additional config parameters...");
+	LOGPHBK1("Starting to parse Phonebook store additional config parameters...");
 	__ASSERT_ALWAYS(aMaxNumLen<=KPhBkMaxTelNumSize,SimPanic(EPhonebookNameOrNumberTooLarge));
 	__ASSERT_ALWAYS(aMaxTextLen<=KPhBkMaxAlphaTagSize,SimPanic(EPhonebookNameOrNumberTooLarge));
 
@@ -106,7 +100,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,ipc);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element IPC returned %d (element no. %d) from tag %s.",ret,0,KTriggerEventIPC);
+			LOGPARSERR("ipc",ret,0,&KTriggerEventIPC);
 			}
 		else
 			iTriggerEventIPC.iIPC=ipc;
@@ -114,7 +108,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,cnt);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CNT returned %d (element no. %d) from tag %s.",ret,1,KTriggerEventIPC);
+			LOGPARSERR("cnt",ret,1,&KTriggerEventIPC);
 			}
 		else
 			iTriggerEventIPC.iIPCCnt=cnt;
@@ -122,7 +116,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,event);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element EVENT returned %d (element no. %d) from tag %s.",ret,2,KTriggerEventIPC);
+			LOGPARSERR("event",ret,2,&KTriggerEventIPC);
 			}
 		else
 			iTriggerEventIPC.iEvent=RMobilePhone::TMobilePhoneSecurityEvent(event);
@@ -139,7 +133,7 @@
 		if(ret0!=KErrNone)
 			{
 			iPhBkStoreCaps=KDefaultPhBkPhoneStoreCaps;
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element VALUE0 returned %d (element no. %d) from tag %s.",ret0,0,KPhBkPhoneStoreCaps);
+			LOGPARSERR("value0",ret0,0,&KPhBkPhoneStoreCaps);
 			}	
 		else
 			{
@@ -155,7 +149,7 @@
 		iPhBkStoreCaps=KDefaultPhBkPhoneStoreCaps;
 
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_CONSTRUCTL_6, "...Finished parsing Phonebook store additional config parameters...");
+	LOGPHBK1("...Finished parsing Phonebook store additional config parameters...");
 	}
 
 void CSimPhBkStore::PopulateStoreFromConfigFileL()
@@ -168,7 +162,7 @@
  * "PhBkStoreEntry = <store name>, <slot number>, <telephone number>, <alphatag>"
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_1, "Starting to read Phonebook store entries...");
+	LOGPHBK1("Starting to read Phonebook store entries...");
 	iPhBkIndividualPause=CfgFile()->ItemValue(KPhBkStoreIndividualReqPause,KDefaultPhBkStoreIndividualReqPause);
 	iPhBkBatchPause=CfgFile()->ItemValue(KPhBkStoreBatchReqPause,KDefaultPhBkStoreBatchReqPause);
 
@@ -189,7 +183,7 @@
 		ret=GetPhBkEntry(item,0,phonebookName,index,telNum,alphaTag,npiTon);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOK ENTRY returned %d (element no. %d) from tag %s.",ret,index,KPhBkStoreEntry);
+			LOGPARSERR("Phonebook Entry",ret,index,&KPhBkStoreEntry);
 			continue;
 			}
 		if(phonebookName.MatchF(iPhBkStoreName)!=0)// Not this phonebook
@@ -215,25 +209,25 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,count);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNT returned %d (element no. %d) from tag %s.",ret,0,KPhBkError);
+			LOGPARSERR("count",ret,0,&KPhBkError);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,error);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element ERROR returned %d (element no. %d) from tag %s.",ret,1,KPhBkError);
+			LOGPARSERR("error",ret,1,&KPhBkError);
 			continue;
 			}	
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,phonebookName);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKNAME returned %d (element no. %d) from tag %s.",ret,2,KPhBkError);
+			LOGPARSERR("phonebookName",ret,2,&KPhBkError);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,phonebookStore);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKSTORE returned %d (element no. %d) from tag %s.",ret,3,KPhBkError);
+			LOGPARSERR("phonebookStore",ret,3,&KPhBkError);
 			}
 		else  //not for the global phonebook
 			continue;
@@ -249,7 +243,7 @@
 		}
 	PopulateOOBWrite();
 	PopulateOOBDelete();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_7, "...Finished reading Phonebook store entries...");
+	LOGPHBK1("...Finished reading Phonebook store entries...");
 
 	if(iPhBkOOBWriteDuration!=-1)
 		iOOBWriteTimer->Start(iPhBkOOBWriteDuration,this,ETimerIdPhBkStorOOBWrite);
@@ -274,7 +268,7 @@
 	TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,count);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATEOOBWRITE_1, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNT returned %d (element no. %d) from tag %s.",ret,0,KOOBPhBkWrite);
+		LOGPARSERR("count",ret,0,&KOOBPhBkWrite);
 		return;
 		}
 
@@ -284,7 +278,7 @@
 	ret=GetPhBkEntry(item,1,phonebookName,index,telNum,alphaTag,npiTon);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATEOOBWRITE_2, "WARNING - CONFIGURATION FILE PARSING - Reading element NPITON returned %d (element no. %d) from tag %s.",ret,index,KOOBPhBkWrite);
+		LOGPARSERR("npiTon",ret,index,&KOOBPhBkWrite);
 		return;
 		}
 	if(phonebookName.MatchF(iPhBkStoreName)!=0)
@@ -314,7 +308,7 @@
 	TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,count);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATEOOBDELETE_1, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNT returned %d (element no. %d) from tag %s.",ret,0,KOOBPhBkDelete);
+		LOGPARSERR("count",ret,0,&KOOBPhBkDelete);
 		return;
 		}
 
@@ -322,7 +316,7 @@
 	ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,phonebookName);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATEOOBDELETE_2, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKNAME returned %d (element no. %d) from tag %s.",ret,1,KOOBPhBkDelete);
+		LOGPARSERR("phonebookName",ret,1,&KOOBPhBkDelete);
 		return;
 		}
 	if(phonebookName.MatchF(iPhBkStoreName)!=0)
@@ -332,7 +326,7 @@
 	ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,index);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATEOOBDELETE_3, "WARNING - CONFIGURATION FILE PARSING - Reading element INDEX returned %d (element no. %d) from tag %s.",ret,2,KOOBPhBkDelete);
+		LOGPARSERR("index",ret,2,&KOOBPhBkDelete);
 		return;
 		}
 
@@ -985,10 +979,10 @@
 		return KErrNone;
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_WRITE_1, "alphaTag Length = (%d)",alphaTag.Length());
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_WRITE_2, "Phonebook Max Text Length = (%d)",iPhBkMaxTextLen);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_WRITE_3, "TelNum Length = (%d)",telNum.Length());
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_WRITE_4, "TelNum Max Length = (%d)",iPhBkMaxTelNumLen);
+	LOGPHBK2("alphaTag Length = (%d)",alphaTag.Length());
+	LOGPHBK2("Phonebook Max Text Length = (%d)",iPhBkMaxTextLen);
+	LOGPHBK2("TelNum Length = (%d)",telNum.Length());
+	LOGPHBK2("TelNum Max Length = (%d)",iPhBkMaxTelNumLen);
 
 	if(alphaTag.Length()>iPhBkMaxTextLen)
 		{
@@ -1296,6 +1290,6 @@
 * @return CTestConfigSection a pointer to the configuration file data section
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_CFGFILE_1, ">>CSimPhBkStore::CfgFile");
+	LOGPHBK1(">>CSimPhBkStore::CfgFile");
 	return iPhone->CfgFile();
 	}

--- a/telephonyserverplugins/simtsy/src/CSimPhBkUsimStore.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhBkUsimStore.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -19,15 +19,9 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimPhBkUsimStoreTraces.h"
-#endif
-
 #include "CSimPhBkUsimStore.h"
 #include "CSimPhone.h"
+#include "Simlog.h"
 #include <testconfigfileparser.h>
 
 const TUint16 KNpiTonInternational=145;		// < The Number Plan Identifier and Type of Number for an international telephone number.
@@ -95,7 +89,7 @@
  * @param aMaxAdditionalTextLen		The maximum length of the alpha tag in an additional telephone number.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_1, "Starting to parse Phonebook store additional config parameters...");
+	LOGPHBK1("Starting to parse Phonebook store additional config parameters...");
 	__ASSERT_ALWAYS(aMaxNumLen<=KPhBkMaxTelNumSize,SimPanic(EPhonebookNameOrNumberTooLarge));
 	__ASSERT_ALWAYS(aMaxTextLen<=KPhBkMaxAlphaTagSize,SimPanic(EPhonebookNameOrNumberTooLarge));
 
@@ -141,7 +135,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,ipc);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element IPC returned %d (element no. %d) from tag %s.",ret,0,KTriggerEventIPC);
+			LOGPARSERR("ipc",ret,0,&KTriggerEventIPC);
 			}
 		else
 			iTriggerEventIPC.iIPC=ipc;
@@ -149,7 +143,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,cnt);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CNT returned %d (element no. %d) from tag %s.",ret,1,KTriggerEventIPC);
+			LOGPARSERR("cnt",ret,1,&KTriggerEventIPC);
 			}
 		else
 			iTriggerEventIPC.iIPCCnt=cnt;
@@ -157,7 +151,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,event);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element EVENT returned %d (element no. %d) from tag %s.",ret,2,KTriggerEventIPC);
+			LOGPARSERR("event",ret,2,&KTriggerEventIPC);
 			}
 		else
 			iTriggerEventIPC.iEvent=RMobilePhone::TMobilePhoneSecurityEvent(event);
@@ -185,7 +179,7 @@
 				if(ret0!=KErrNone)
 					{
 					iPhBkStoreCaps=KDefaultPhBkPhoneStoreCaps;
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element CAPS:PHONEBOOKSTORE returned %d (element no. %d) from tag %s.",ret,0,KPhBkPhoneUSimStoreCaps);
+					LOGPARSERR("Caps:PhonebookStore",ret,0,&KPhBkPhoneUSimStoreCaps);
 					}	
 
 				if(phonebookStore.MatchF(iPhBkStore)!=0)// Not this PhBkStore type
@@ -195,7 +189,7 @@
 				if(ret0!=KErrNone)
 					{
 					iPhBkStoreCaps=KDefaultPhBkPhoneStoreCaps;
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKNAME returned %d (element no. %d) from tag %s.",ret,1,KPhBkPhoneUSimStoreCaps);
+					LOGPARSERR("phonebookName",ret,1,&KPhBkPhoneUSimStoreCaps);
 					}	
 				
 				if(phonebookName.MatchF(iPhBkStoreName)!=0)// Not this PhBkStoreName type
@@ -205,7 +199,7 @@
 				if(ret0!=KErrNone)
 					{
 					iPhBkStoreCaps=KDefaultPhBkPhoneStoreCaps;
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element CAPS returned %d (element no. %d) from tag %s.",ret,2,KPhBkPhoneUSimStoreCaps);
+					LOGPARSERR("caps",ret,2,&KPhBkPhoneUSimStoreCaps);
 					}	
 				else
 					{
@@ -223,7 +217,7 @@
 				}
 			}
 	}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_8, "...Finished parsing Phonebook store additional config parameters...");
+	LOGPHBK1("...Finished parsing Phonebook store additional config parameters...");
 	}
 
 void CSimPhBkUSimStore::PopulateStoreFromConfigFileL()
@@ -237,7 +231,7 @@
  * "PhBkStoreEntry = <store name>, <slot number>, <telephone number>, <alphatag>"
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_1, "Starting to read Phonebook store entries...");
+	LOGPHBK1("Starting to read Phonebook store entries...");
 	iPhBkIndividualPause=CfgFile()->ItemValue(KPhBkStoreIndividualReqPause,KDefaultPhBkStoreIndividualReqPause);
 	iPhBkBatchPause=CfgFile()->ItemValue(KPhBkStoreBatchReqPause,KDefaultPhBkStoreBatchReqPause);
 
@@ -262,7 +256,7 @@
 		ret=GetPhBkUSimEntry(item,parseIndex,phonebookStore,phonebookName,aid,index,telNum,alphaTag,npiTon,alphaTag2);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOK ENTRY returned %d (element no. %d) from tag %s.",ret,index,KPhBkUSimStoreEntry);
+			LOGPARSERR("Phonebook Entry",ret,index,&KPhBkUSimStoreEntry);
 			continue;
 			}
 
@@ -306,7 +300,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,additional);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONAL returned %d (element no. %d) from tag %s.",ret,parseIndex,KPhBkUSimStoreEntry);
+			LOGPARSERR("additional",ret,parseIndex,&KPhBkUSimStoreEntry);
 			}
 		else
 			{	
@@ -333,7 +327,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,emails);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element EMAILS returned %d (element no. %d) from tag %s.",ret,parseIndex,KPhBkUSimStoreEntry);
+			LOGPARSERR("emails",ret,parseIndex,&KPhBkUSimStoreEntry);
 			}
 		else
 		{	
@@ -354,7 +348,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,groups);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element GROUPS returned %d (element no. %d) from tag %s.",ret,parseIndex,KPhBkUSimStoreEntry);
+			LOGPARSERR("groups",ret,parseIndex,&KPhBkUSimStoreEntry);
 			}
 		else
 		{	
@@ -378,7 +372,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,hidden);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element EMAILS returned %d (element no. %d) from tag %s.",ret,parseIndex,KPhBkUSimStoreEntry);
+			LOGPARSERR("emails",ret,parseIndex,&KPhBkUSimStoreEntry);
 			}
 		else
 			iPhBkUSimStoreEntries[index].iHiddenEntry=hidden;
@@ -400,26 +394,26 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,count);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNT returned %d (element no. %d) from tag %s.",ret,0,KPhBkError);
+			LOGPARSERR("count",ret,0,&KPhBkError);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,error);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element ERROR returned %d (element no. %d) from tag %s.",ret,1,KPhBkError);
+			LOGPARSERR("error",ret,1,&KPhBkError);
 			continue;
 			}
 		
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,phonebookName);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKNAME returned %d (element no. %d) from tag %s.",ret,2,KPhBkError);
+			LOGPARSERR("phonebookName",ret,2,&KPhBkError);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,phonebookStore);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKSTORE returned %d (element no. %d) from tag %s.",ret,3,KPhBkError);
+			LOGPARSERR("phonebookStore",ret,3,&KPhBkError);
 			//global phonebook error
 			continue;
 			}
@@ -436,7 +430,7 @@
 		}
 	PopulateOOBWrite();
 	PopulateOOBDelete();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_11, "...Finished reading Phonebook store entries...");
+	LOGPHBK1("...Finished reading Phonebook store entries...");
 
 	if(iPhBkOOBWriteDuration!=-1)
 		iOOBWriteTimer->Start(iPhBkOOBWriteDuration,this,ETimerIdPhBkUSimStorOOBWrite);
@@ -462,7 +456,7 @@
 	TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,count);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_1, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNT returned %d (element no. %d) from tag %s.",ret,parseIndex,KOOBPhBkUSimWrite);
+		LOGPARSERR("count",ret,parseIndex,&KOOBPhBkUSimWrite);
 		return;
 		}
 
@@ -472,7 +466,7 @@
 	ret=GetPhBkUSimEntry(item,parseIndex,phonebookStore,phonebookName,aid,index,telNum,alphaTag,npiTon,alphaTag2);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_2, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOK ENTRY returned %d (element no. %d) from tag %s.",ret,parseIndex,KOOBPhBkUSimWrite);
+		LOGPARSERR("Phonebook Entry",ret,parseIndex,&KOOBPhBkUSimWrite);
 		return;
 		}
 
@@ -491,7 +485,7 @@
 	ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,additional);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_3, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONAL returned %d (element no. %d) from tag %s.",ret,parseIndex,KOOBPhBkUSimWrite);
+		LOGPARSERR("additional",ret,parseIndex,&KOOBPhBkUSimWrite);
 		}
 	else
 	{	
@@ -518,7 +512,7 @@
 	ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,groups);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_4, "WARNING - CONFIGURATION FILE PARSING - Reading element GROUPS returned %d (element no. %d) from tag %s.",ret,parseIndex,KOOBPhBkUSimWrite);
+		LOGPARSERR("groups",ret,parseIndex,&KOOBPhBkUSimWrite);
 		}
 	else
 	{	
@@ -541,7 +535,7 @@
 	ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,emails);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_5, "WARNING - CONFIGURATION FILE PARSING - Reading element EMAILS returned %d (element no. %d) from tag %s.",ret,parseIndex,KOOBPhBkUSimWrite);
+		LOGPARSERR("emails",ret,parseIndex,&KOOBPhBkUSimWrite);
 		}
 	else
 	{	
@@ -581,7 +575,7 @@
 	TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,count);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_1, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNT returned %d (element no. %d) from tag %s.",ret,0,KOOBPhBkUSimDelete);
+		LOGPARSERR("count",ret,0,&KOOBPhBkUSimDelete);
 		return;
 		}
 
@@ -590,14 +584,14 @@
 	ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,phonebookStore);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_2, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKSTORE returned %d (element no. %d) from tag %s.",ret,1,KOOBPhBkUSimDelete);
+		LOGPARSERR("phonebookStore",ret,1,&KOOBPhBkUSimDelete);
 		return;
 		}
 
 	ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,phonebookName);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_3, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKNAME returned %d (element no. %d) from tag %s.",ret,2,KOOBPhBkUSimDelete);
+		LOGPARSERR("phonebookName",ret,2,&KOOBPhBkUSimDelete);
 		return;
 		}
 
@@ -610,7 +604,7 @@
 	ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,index);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_4, "WARNING - CONFIGURATION FILE PARSING - Reading element INDEX returned %d (element no. %d) from tag %s.",ret,3,KOOBPhBkUSimDelete);
+		LOGPARSERR("index",ret,3,&KOOBPhBkUSimDelete);
 		return;
 		}
 
@@ -1550,8 +1544,8 @@
 		case RMobilePhoneBookStore::ETagPBText:
 			ret=iPhBkRwBuffer->GetValue(alphaTag);
 
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_1, "alphaTag (ETagPBText) Length = (%d)",alphaTag.Length());
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_2, "Phonebook Max Text Length = (%d)",iPhBkMaxTextLen);
+			LOGPHBK2("alphaTag (ETagPBText) Length = (%d)",alphaTag.Length());
+			LOGPHBK2("Phonebook Max Text Length = (%d)",iPhBkMaxTextLen);
 
 			if(!additional && ret==KErrNone && (alphaTag.Length()<=iPhBkMaxTextLen))
 				iPhBkUSimStoreEntries[index].iAlphaTag.Copy(alphaTag);
@@ -1567,8 +1561,8 @@
 		case RMobilePhoneBookStore::ETagPBSecondName:
 			ret=iPhBkRwBuffer->GetValue(alphaTag2);
 
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_3, "alphaTag2 (ETagPBSecondName) Length = (%d)",alphaTag2.Length());
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_4, "Phonebook Max Text Length = (%d)",iPhBkMaxTextLen);
+			LOGPHBK2("alphaTag2 (ETagPBSecondName) Length = (%d)",alphaTag2.Length());
+			LOGPHBK2("Phonebook Max Text Length = (%d)",iPhBkMaxTextLen);
 
 			if(ret==KErrNone && (alphaTag2.Length()<=iPhBkMaxTextLen))
 				iPhBkUSimStoreEntries[index].iAlphaTag2.Copy(alphaTag2);
@@ -1579,8 +1573,8 @@
 		case RMobilePhoneBookStore::ETagPBNumber:
 			ret=iPhBkRwBuffer->GetValue(telNum);
 
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_5, "telNum (ETagPBNumber) Length = (%d)",telNum.Length());
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_6, "Phonebook Max Text Length = (%d)",iPhBkMaxTelNumLen);
+			LOGPHBK2("telNum (ETagPBNumber) Length = (%d)",telNum.Length());
+			LOGPHBK2("Phonebook Max Text Length = (%d)",iPhBkMaxTelNumLen);
 
 			if(!additional && ret==KErrNone && (telNum.Length()<=iPhBkMaxTelNumLen))
 				iPhBkUSimStoreEntries[index].iTelNum.Copy(telNum);
@@ -1619,8 +1613,8 @@
 		case RMobilePhoneBookStore::ETagPBGroupName:
 			ret=iPhBkRwBuffer->GetValue(bufPtr);
 
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_7, "bufPtr (ETagPBGroupName) Length = (%d)",bufPtr.Length());
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_8, "Phonebook Max Text Length = (%d)",iPhBkMaxTextLen);
+			LOGPHBK2("bufPtr (ETagPBGroupName) Length = (%d)",bufPtr.Length());
+			LOGPHBK2("Phonebook Max Text Length = (%d)",iPhBkMaxTextLen);
 
 			if(ret==KErrNone && (bufPtr.Length()<=iPhBkMaxTextLen)
 				&& (iPhBkUSimStoreEntries[index].iGroups->Count() < KMaxGroups))
@@ -1634,8 +1628,8 @@
 		case RMobilePhoneBookStore::ETagPBEmailAddress:
 			ret=iPhBkRwBuffer->GetValue(bufPtr);
 
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_9, "bufPtr (ETagPBEmailAddress) Length = (%d)",bufPtr.Length());
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_10, "Phonebook Max Text Length = (%d)",iPhBkMaxTextLen);
+			LOGPHBK2("bufPtr (ETagPBEmailAddress) Length = (%d)",bufPtr.Length());
+			LOGPHBK2("Phonebook Max Text Length = (%d)",iPhBkMaxTextLen);
 
 			if(ret==KErrNone && (bufPtr.Length()<=iPhBkMaxTextLen)
 				&& (iPhBkUSimStoreEntries[index].iEmails->Count() < iPhBkMaxEmail))
@@ -2072,7 +2066,7 @@
 		TRAPD(err,iPhBkUSimStoreEntries[iPhBkOOBWriteIndex].iAdditional=new(ELeave) CArrayFixFlat<TPhBkStoreEntry>(iPhBkAdditional+1));
 		if (err!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_TIMERCALLBACK_1, "CSimPhBkUSimStore::TimerCallBack - Memory Allocation Failure");
+			LOGPHBK1("CSimPhBkUSimStore::TimerCallBack - Memory Allocation Failure");
 			return;
 			}
 
@@ -2086,7 +2080,7 @@
 		TRAP(err,iPhBkUSimStoreEntries[iPhBkOOBWriteIndex].iGroups=new(ELeave) CArrayFixFlat<TPhBkUSimGroup>(KMaxGroups));
 		if (err!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_TIMERCALLBACK_2, "CSimPhBkUSimStore::TimerCallBack - Memory Allocation Failure");
+			LOGPHBK1("CSimPhBkUSimStore::TimerCallBack - Memory Allocation Failure");
 			return;
 			}
 
@@ -2100,7 +2094,7 @@
 		TRAP(err,iPhBkUSimStoreEntries[iPhBkOOBWriteIndex].iEmails=new(ELeave) CArrayFixFlat<TPhBkUSimEmail>(iPhBkMaxEmail+1));	
 		if (err!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_TIMERCALLBACK_3, "CSimPhBkUSimStore::TimerCallBack - Memory Allocation Failure");
+			LOGPHBK1("CSimPhBkUSimStore::TimerCallBack - Memory Allocation Failure");
 			return;
 			}
 
@@ -2298,6 +2292,6 @@
 * @return CTestConfigSection a pointer to the configuration file data section
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CFGFILE_1, ">>CSimPhBkUSimStore::CfgFile");
+	LOGPHBK1(">>CSimPhBkUSimStore::CfgFile");
 	return iPhone->CfgFile();
 	}

--- a/telephonyserverplugins/simtsy/src/CSimPhone.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhone.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -19,13 +19,6 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimPhoneTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 #include "CSimPhone.h"
 #include "CSimCall.h"
@@ -38,6 +31,7 @@
 #include "CSimDtmf.h"
 #include "CSimIndicator.h"
 #include "utils.h"
+#include "Simlog.h"
 #include "CSimPacketService.h"
 #include "CSimSat.h"
 #include "CSimBatteryCharger.h"
@@ -62,7 +56,7 @@
 
 GLDEF_C void SimPanic(TSimPanic aPanicNumber, TInt aLineNumber)
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, SIMPANIC_1, "SMS.TSY Panic %d Line %d", aPanicNumber, aLineNumber);
+	LOGPHONE3("SMS.TSY Panic %d Line %d", aPanicNumber, aLineNumber);
 	(void) aLineNumber;
 	_LIT(panicText,"SIM.TSY");
 	User::Panic(panicText,aPanicNumber);
@@ -148,13 +142,13 @@
 				}
 			}
 			*aTable = pTable;	
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_POPULATESERVICETABLEL_1, "Successfully populated %s table in simtsy", aLookup);
+			LOGPHONE2("Successfully populated %s table in simtsy", &aLookup);	
 		}
 	else	
 		{
 		delete(pTable);
 		pTable = NULL;
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_POPULATESERVICETABLEL_2, "Failed to populat %s table in simtsy", aLookup);
+		LOGPHONE2("Failed to populat %s table in simtsy", &aLookup);			
 		}
 	}
 
@@ -194,13 +188,13 @@
  				}
  			}
  			*aTableV8 = pTable;	
- 			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_POPULATESERVICETABLEV8L_1, "Successfully populated %s table in simtsy", aLookup);
+ 			LOGPHONE2("Successfully populated %s table in simtsy", &aLookup);	
  		}
  	else	
  		{
  		delete(pTable);
  		pTable = NULL;
- 		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_POPULATESERVICETABLEV8L_2, "Failed to populate %s table in simtsy", aLookup);
+ 		LOGPHONE2("Failed to populate %s table in simtsy", &aLookup);			
  		}
  	}
 
@@ -222,7 +216,7 @@
          }
     else
         {
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_SETTESTNUMBERANDREADCONFIGURATIONFILE_1, "Section for requested test number (%d) not found in the Config File",testNumber);
+        LOGPHONE2("Section for requested test number (%d) not found in the Config File",testNumber);
         delete iConfigFile;
         iConfigFile = NULL;
 
@@ -247,7 +241,7 @@
 	r=User::LoadLogicalDevice(LDD_NAME);
 #endif
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CONSTRUCTL_1, "Starting to Load and Parse the Config File");
+	LOGPHONE1("Starting to Load and Parse the Config File");
 	
 	User::LeaveIfError(iFs.Connect());
 	
@@ -320,7 +314,7 @@
         TInt ret=CTestConfig::GetElement(itemSubscriberId->Value(),KStdDelimiter,0,IMSI);
         if( ret != KErrNone )
 			{
-            OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element IMSI returned %d (element no. %d) from tag %s.",ret,0,KSubscriberId);
+            LOGPARSERR("IMSI",ret,0,&KSubscriberId);
 			}
         // coverity[check_return]
         CTestConfig::GetElement(itemSubscriberId->Value(),KStdDelimiter,1,iSubscriberId.iError);
@@ -335,9 +329,9 @@
 	//get phone id from config file
 	GetPhoneIdAndCaps();
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CONSTRUCTL_3, "Loading the version configuration");
+	LOGPHONE1("Loading the version configuration");
 	iSimTsyVersion = CfgFile()->ItemValue(KTsyVersionNumber,KSimTsyDefaultVersion);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CONSTRUCTL_4, "Simulated SIMTSY version: %d", iSimTsyVersion);
+	LOGPHONE2("Simulated SIMTSY version: %d", iSimTsyVersion);
 	
 	iPacketService = CSimPacketService::NewL(this);
 	iBatteryCharger = CSimBatteryCharger::NewL(this);
@@ -415,7 +409,7 @@
 	// end of network mode simulation setup
 	iTestNumberObserver = CSimTestNumberObserver::NewL(*this);
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CONSTRUCTL_5, "Completed Loading and Parsing the Config File");
+	LOGPHONE1("Completed Loading and Parsing the Config File");
 	}
 
 CSimReduceTimers* CSimPhone::GetReduceTimersSubject()
@@ -432,12 +426,12 @@
 
 	if (ret == KErrNone  &&  aTestNumber >= 0)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_GETTESTNUMBER_1, "Got system property KUidPSSimTsyCategory/KPSSimTsyTestNumber. testNumber=%d", aTestNumber);
+		LOGPHONE2("Got system property KUidPSSimTsyCategory/KPSSimTsyTestNumber. testNumber=%d", aTestNumber);
 		}
 	else
 		{
 		aTestNumber = KDefaultTestNumber;
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_GETTESTNUMBER_2, "Using the default test number. testNumber=%d", aTestNumber);
+		LOGPHONE2("Using the default test number. testNumber=%d", aTestNumber);
 		}
 
 	return KErrNone;
@@ -453,7 +447,7 @@
 
 	if (ret == KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_SETTESTNUMBERINUSE_1, "Set system property KUidPSSimTsyCategory/KPSSimTsyTestNumberInUse. testNumber=%d", aTestNumber);
+		LOGPHONE2("Set system property KUidPSSimTsyCategory/KPSSimTsyTestNumberInUse. testNumber=%d", aTestNumber);
 		}
 
 	return ret;
@@ -566,7 +560,7 @@
 	delete iTestNumberObserver;
 	
 	CSimTsyMode::FreeMode();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_DTOR_1, "CSimPhone Destroyed");
+	LOGPHONE1("CSimPhone Destroyed");
 	}
 
 void CSimPhone::InitPhoneStatus()
@@ -574,7 +568,7 @@
 	const CTestConfigItem* item = NULL;
 	TInt ret = KErrNone;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_INITPHONESTATUS_1, "Starting to Load and Parse Phone Config parameters");
+	LOGPHONE1("Starting to Load and Parse Phone Config parameters");
 
 	item = CfgFile()->Item(KPhoneStatus);
 	if(!item)
@@ -599,7 +593,7 @@
 	const CTestConfigItem* item=NULL;
 	TInt ret=KErrNone;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_1, "Starting to Load and Parse PhoneBookStore Config parameters");
+	LOGPHONE1("Starting to Load and Parse PhoneBookStore Config parameters");
 	TInt i;
 	for(i=0;i<count;i++)
 		{
@@ -612,27 +606,27 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,phonebookName);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKNAME returned %d (element no. %d) from tag %s.",ret,0,KPhBkStore);
+			LOGPARSERR("phonebookName",ret,0,&KPhBkStore);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,maxNumSlots);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element MAXNUMSLOTS returned %d (element no. %d) from tag %s.",ret,1,KPhBkStore);
+			LOGPARSERR("maxNumSlots",ret,1,&KPhBkStore);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,telNumMaxLen);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element TELNUMMAXLEN returned %d (element no. %d) from tag %s.",ret,2,KPhBkStore);
+			LOGPARSERR("telNumMaxLen",ret,2,&KPhBkStore);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,alphaTagMaxLen);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element ALPHATAGMAXLEN returned %d (element no. %d) from tag %s.",ret,3,KPhBkStore);
+			LOGPARSERR("alphaTagMaxLen",ret,3,&KPhBkStore);
 			continue;
 			}
 
@@ -647,7 +641,7 @@
 
 	count=CfgFile()->ItemCount(KPhBkUSimStore);
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_6, "Starting to Load and Parse USim PhoneBookStore Config parameters");
+	LOGPHONE1("Starting to Load and Parse USim PhoneBookStore Config parameters");
 
 	for(i=0;i<count;i++)
 		{
@@ -662,63 +656,63 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,phonebookStore);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKSTORE returned %d (element no. %d) from tag %s.",ret,0,KPhBkUSimStore);
+			LOGPARSERR("phonebookStore",ret,0,&KPhBkUSimStore);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,phonebookName);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKNAME returned %d (element no. %d) from tag %s.",ret,1,KPhBkUSimStore);
+			LOGPARSERR("phonebookName",ret,1,&KPhBkUSimStore);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,maxNumSlots);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element MAXNUMSLOTS returned %d (element no. %d) from tag %s.",ret,2,KPhBkUSimStore);
+			LOGPARSERR("maxNumSlots",ret,2,&KPhBkUSimStore);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,telNumMaxLen);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element TELNUMMAXLEN returned %d (element no. %d) from tag %s.",ret,3,KPhBkUSimStore);
+			LOGPARSERR("telNumMaxLen",ret,3,&KPhBkUSimStore);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,alphaTagMaxLen);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element ALPHATAGMAXLEN returned %d (element no. %d) from tag %s.",ret,4,KPhBkUSimStore);
+			LOGPARSERR("alphaTagMaxLen",ret,4,&KPhBkUSimStore);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,additional);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONAL returned %d (element no. %d) from tag %s.",ret,5,KPhBkUSimStore);
+			LOGPARSERR("additional",ret,5,&KPhBkUSimStore);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,maxEmail);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element MAXEMAIL returned %d (element no. %d) from tag %s.",ret,6,KPhBkUSimStore);
+			LOGPARSERR("maxEmail",ret,6,&KPhBkUSimStore);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,maxAdditionalTelNumLen);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_14, "WARNING maxAdditionalTelNumLen missing, defaulting to telNumMaxLen");
+			LOGPHONE1("WARNING maxAdditionalTelNumLen missing, defaulting to telNumMaxLen");
 			maxAdditionalTelNumLen = telNumMaxLen;
 			}
 	
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,maxAdditionalTextLen);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_15, "WARNING maxAdditionalTextLen missing, defaulting to alphaTagMaxLen");
+			LOGPHONE1("WARNING maxAdditionalTextLen missing, defaulting to alphaTagMaxLen");
 			maxAdditionalTextLen = alphaTagMaxLen;
 			}
 
@@ -741,7 +735,7 @@
 			}
 			if(foundShort) //warn but not fail!
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_16, "WARNING! PhBkUSimStore and PhBkStore duplicate phonebook configuration");
+				LOGPHONE1("WARNING! PhBkUSimStore and PhBkStore duplicate phonebook configuration");
 				}
 		}
 		for(TInt j=0; j < countStores; j++)
@@ -776,7 +770,7 @@
 		{
 		iPhBkUSimStores->At(i)->PopulateStoreFromConfigFileL();
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_17, "Finished parsing PhBkStores config parameters");
+	LOGPHONE1("Finished parsing PhBkStores config parameters");
 	}
 
 void CSimPhone::CreateONStoreL()
@@ -784,7 +778,7 @@
 	const CTestConfigItem* item=NULL;
 	TInt ret=KErrNone;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CREATEONSTOREL_1, "Starting to Load and Parse Own Number Config parameters");
+	LOGPHONE1("Starting to Load and Parse Own Number Config parameters");
 
 	TInt i=0;
 	item=CfgFile()->Item(KONStore,i);
@@ -795,21 +789,21 @@
 	ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,maxNumSlots);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CREATEONSTOREL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element MAXNUMSLOTS returned %d (element no. %d) from tag %s.",ret,1,KONStore);
+		LOGPARSERR("maxNumSlots",ret,1,&KONStore);
 		return;
 		}
 
 	ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,telNumMaxLen);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CREATEONSTOREL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element TELNUMMAXLEN returned %d (element no. %d) from tag %s.",ret,2,KONStore);
+		LOGPARSERR("telNumMaxLen",ret,2,&KONStore);
 		return;
 		}
 
 	ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,alphaTagMaxLen);
 	if(ret!=KErrNone)
 		{
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CREATEONSTOREL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element ALPHATAGMAXLEN returned %d (element no. %d) from tag %s.",ret,3,KONStore);
+		LOGPARSERR("alphaTagMaxLen",ret,3,&KONStore);
 		return;
 		}
 
@@ -818,7 +812,7 @@
 // Populate the Own Number Store 
 	iONStore->PopulateStoreFromConfigFileL();
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CREATEONSTOREL_5, "Finished parsing Own Number Store config parameters");
+	LOGPHONE1("Finished parsing Own Number Store config parameters");
 	}
 
 TInt CSimPhone::ExtFunc(const TTsyReqHandle aReqHandle, const TInt aIpc, const TDataPackage& aPckg)
@@ -1474,7 +1468,7 @@
 * @leave Leaves if incorrect phone name
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_OPENNEWOBJECTBYNAMEL_1, ">>CSimPhone::OpenNewObjectByNameL");
+	LOGPHONE1(">>CSimPhone::OpenNewObjectByNameL");
 
 // Is it a voice line?
 	if (aName.CompareF(KVoiceLineName) == 0)
@@ -1544,18 +1538,18 @@
 
 		if (phoneScEap == NULL)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_OPENNEWOBJECTBYNAMEL_2, "ERROR CSimSmartCardEap object not created, returning KErrGeneral");
+			LOGPHONE1("ERROR CSimSmartCardEap object not created, returning KErrGeneral");
 			User::Leave(KErrGeneral);
 			}
 
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_OPENNEWOBJECTBYNAMEL_3, "CSimPhone::OpenNewObjectByNameL CSimSmartCardEap object created [0x%08x]", phoneScEap);
+		LOGPHONE2("CSimPhone::OpenNewObjectByNameL CSimSmartCardEap object created [0x%08x]", phoneScEap);
 		return phoneScEap;
 		} // End of opening Smart Card EAP sub-session
 	else if (aName.CompareF(KETelOwnNumberStore) == 0)
 		{
 		if(iONStore==NULL)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_OPENNEWOBJECTBYNAMEL_4, "ERROR CSimONStore object not found. Please check config file.");
+			LOGPHONE1("ERROR CSimONStore object not found. Please check config file.");
 			User::Leave(KErrNotFound);
 			}
 		else
@@ -2259,7 +2253,7 @@
 
 // If there is no active line defined, then any state changes are fine.  However,
 // we need to watch for a shift to an "active" status.
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_VALIDATECHANGESTATE_1, ">>CSimPhone::ValidateChangeState");
+	LOGPHONE1(">>CSimPhone::ValidateChangeState");
 	if(!iActiveLine)
 		{
 		iMode=ConvertStateToMode(aState);
@@ -2290,7 +2284,7 @@
 	   (aState==RMobileCall::EStatusIdle))
 		return KErrNone;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_VALIDATECHANGESTATE_2, "<<CSimPhone::ValidateChangeState");
+	LOGPHONE1("<<CSimPhone::ValidateChangeState");
 	return KErrGeneral;
 	}
 
@@ -2316,7 +2310,7 @@
 * @return Error indicates whether the change of state is successful or not
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_VALIDATECHANGESTATE1_1, ">>CSimPhone::ValidateChangeState packet");
+	LOGPHONE1(">>CSimPhone::ValidateChangeState packet");
 	__ASSERT_ALWAYS(iMode!=RPhone::EModeUnknown,SimPanic(EPhoneModeUnknownIllegal));
 	__ASSERT_ALWAYS(iNtwkMode!=RMobilePhone::ENetworkModeUnknown,SimPanic(ENetworkModeUnknownIllegal));
 	__ASSERT_ALWAYS(iPacketService->MSClass()!=RPacketService::EMSClassUnknown,SimPanic(EPacketMSClassUnKnown));
@@ -2419,16 +2413,16 @@
 		{
 		TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,manufacturer);
 		if(ret!=KErrNone)
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_GETPHONEIDANDCAPS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element MANUFACTURER returned %d (element no. %d) from tag %s.",ret,0,KPhoneId);
+			LOGPARSERR("manufacturer",ret,0,&KPhoneId);
 		ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,1,model);
 		if(ret!=KErrNone)
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_GETPHONEIDANDCAPS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element MODEL returned %d (element no. %d) from tag %s.",ret,1,KPhoneId);
+			LOGPARSERR("model",ret,1,&KPhoneId);
 		ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,2,revision);
 		if(ret!=KErrNone)
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_GETPHONEIDANDCAPS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element REVISION returned %d (element no. %d) from tag %s.",ret,2,KPhoneId);
+			LOGPARSERR("revision",ret,2,&KPhoneId);
 		ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,3,imei);
 		if(ret!=KErrNone)
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_GETPHONEIDANDCAPS_4, "WARNING - CONFIGURATION FILE PARSING - Reading element IMEI returned %d (element no. %d) from tag %s.",ret,3,KPhoneId);
+			LOGPARSERR("imei",ret,3,&KPhoneId);
 		ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,4,iPhoneId.iError);
 
 		iPhoneId.iManufacturerId.Copy(manufacturer);
@@ -3061,13 +3055,13 @@
 */
 void CSimPhone::CNetworkModeTimerCallBack::TimerCallBack(TInt /*aId*/)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CNETWORKMODETIMERCALLBACK_TIMERCALLBACK_1, ">>CSimPhone::CNetworkModeTimerCallBack::TimerCallBack");
+	LOGPACKET1(">>CSimPhone::CNetworkModeTimerCallBack::TimerCallBack");
 	iPhone->TimerCallBackNetworkMode();
 	}
 
 TInt CSimPhone::NotifyModeChange(const TTsyReqHandle aTsyReqHandle, RMobilePhone::TMobilePhoneNetworkMode* aCaps)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_NOTIFYMODECHANGE_1, "CSimPhone::NotifyModeChange called");
+	LOGPACKET1("CSimPhone::NotifyModeChange called");
 	__ASSERT_ALWAYS(!iNotifyNetworkModeChange.iNotifyPending,SimPanic(ENotificationAlreadyPending));
  
 	if (iNetworkModeArray->Count() == 0)
@@ -3090,7 +3084,7 @@
 */
 TInt CSimPhone::NotifyModeChangeCancel(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_NOTIFYMODECHANGECANCEL_1, "CSimPhone::NotifyModeChangeCancel called");
+	LOGPACKET1("CSimPhone::NotifyModeChangeCancel called");
 	if( (iNotifyNetworkModeChange.iNotifyPending) && (aTsyReqHandle == iNotifyNetworkModeChange.iNotifyHandle))
 		{
 		iNotifyNetworkModeChange.iNotifyPending=EFalse;
@@ -3336,21 +3330,21 @@
 
 void CSimPhone::CSimTestNumberObserver::ConstructL()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CSIMTESTNUMBEROBSERVER_CONSTRUCTL_1, "CSimPhone::CSimPhoneObserver::ConstructL");
+    LOGPHONE1("CSimPhone::CSimPhoneObserver::ConstructL");
     User::LeaveIfError(iProperty.Attach(KUidPSSimTsyCategory, KPSSimTsyTestNumber));
     Start();
     }
 
 void CSimPhone::CSimTestNumberObserver::Start()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CSIMTESTNUMBEROBSERVER_START_1, "CSimPhone::CSimPhoneObserver::Start");
+    LOGPHONE1("CSimPhone::CSimPhoneObserver::Start");
     iProperty.Subscribe(iStatus);
     SetActive();
     }
 
 void CSimPhone::CSimTestNumberObserver::RunL()
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CSIMTESTNUMBEROBSERVER_RUNL_1, "CSimPhone::CSimPhoneObserver::RunL [iStatus=%d]", iStatus.Int());
+    LOGPHONE2("CSimPhone::CSimPhoneObserver::RunL [iStatus=%d]", iStatus.Int());
     TInt err = iSimPhone.CheckConfigFile();
     if( err == KErrNone )
         {
@@ -3362,7 +3356,7 @@
 
 void CSimPhone::CSimTestNumberObserver::DoCancel()
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CSIMTESTNUMBEROBSERVER_DOCANCEL_1, "CSimPhone::CSimPhoneObserver::DoCancel");
+    LOGPHONE1("CSimPhone::CSimPhoneObserver::DoCancel");
     iProperty.Cancel();
     }

--- a/telephonyserverplugins/simtsy/src/CSimPhoneIMSAuth.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhoneIMSAuth.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -19,16 +19,10 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimPhoneIMSAuthTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 #include <etelmmerr.h>
 #include "CSimPhone.h"
+#include "Simlog.h"
 
 //
 // CSimPhoneIMSAuth
@@ -66,10 +60,10 @@
 	{
 	iTimer=CSimTimer::NewL(iPhone);
 	iGetAuthorizationData = new CArrayPtrFlat<CListReadAllAttempt>(1);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_CONSTRUCTL_1, "Starting to parse Phone IMS Authorization/Authentication config params...");
+	LOGPHONE1("Starting to parse Phone IMS Authorization/Authentication config params...");
 	ParseAuthorizationInfoL();
 	ParseAuthenticationInfoL();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_CONSTRUCTL_2, "Finished parsing Phone IMS Authorization/Authentication config params...");
+	LOGPHONE1("Finished parsing Phone IMS Authorization/Authentication config params...");
 	}
 
 
@@ -107,7 +101,7 @@
 * @return CTestConfigSection a pointer to the configuration file data section
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_CFGFILE_1, ">>CSimPhoneIMSAuth::CfgFile");
+	LOGPHONE1(">>CSimPhoneIMSAuth::CfgFile");
 	return iPhone->CfgFile();
 	}
 
@@ -140,7 +134,7 @@
 	TInt IMPUCount, authorizationDataSource, infoChangeDelay;
 	TAuthorizationInfo authorizationInfo;
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_1, "Starting to Parse IMS Authorization Info");
+	LOGPHONE1("Starting to Parse IMS Authorization Info");
 	TInt count = CfgFile()->ItemCount(KAuthorizationInfo);
 	
 	TInt index;
@@ -157,7 +151,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,IMPI);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_2, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG");
 			continue;
 			}
 		else
@@ -170,7 +164,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,IMPUCount);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_3, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG");
 			continue;
 			}
 		else
@@ -186,7 +180,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,IMPUValue);
 				if(ret!=KErrNone)
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_4, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG");
+					LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG");
 					IMPUError = ETrue;
 					break;
 					}
@@ -199,7 +193,7 @@
 			
 			if(IMPUError)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_5, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG");
+				LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG");
 				continue;
 				}
 			else
@@ -212,7 +206,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,HNDN);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_6, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG");
 			continue;
 			}
 		else
@@ -225,7 +219,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,authorizationDataSource);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_7, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG");
 			continue;
 			}
 		else
@@ -240,7 +234,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,infoChangeDelay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_8, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG");
 			continue;
 			}
 		else
@@ -265,7 +259,7 @@
 	TInt authErr;
 	TAuthenticationInfo authenticationInfo;
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_1, "Starting to Parse IMS Authentication Info");
+	LOGPHONE1("Starting to Parse IMS Authentication Info");
 	TInt count = CfgFile()->ItemCount(KAuthenticationInfo);
 	
 	TInt index;
@@ -281,7 +275,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,AUTN);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_2, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG");
 			continue;
 			}
 		else
@@ -293,7 +287,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,RAND);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_3, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG");
 			continue;
 			}
 		else
@@ -305,7 +299,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,RES);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_4, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG");
 			continue;
 			}
 		else
@@ -317,7 +311,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,IK);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_5, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG");
 			continue;
 			}
 		else
@@ -329,7 +323,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,CK);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_6, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG");
 			continue;
 			}
 		else
@@ -341,7 +335,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,AUTS);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_7, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG");
 			continue;
 			}
 		else
@@ -353,7 +347,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,authErr);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_8, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG");
 			continue;
 			}
 		else
@@ -368,7 +362,7 @@
 TInt CSimPhoneIMSAuth::GetAuthorizationInfoPhase1(const TTsyReqHandle aTsyReqHandle, 
 			RMobilePhone::TClientId* aClientId,TInt* aBufSize)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_GETAUTHORIZATIONINFOPHASE1_1, "CSimPhoneIMSAuth::GetAuthorizationInfoPhase1 called");
+	LOGPHONE1("CSimPhoneIMSAuth::GetAuthorizationInfoPhase1 called");
 	TInt ret(KErrNone);
 	TInt leaveCode(KErrNone);
 	TRAP(leaveCode, ret=ProcessGetAuthorizationInfoPhase1L(aTsyReqHandle, aClientId, aBufSize););
@@ -384,7 +378,7 @@
 TInt CSimPhoneIMSAuth::ProcessGetAuthorizationInfoPhase1L(const TTsyReqHandle aTsyReqHandle,
 			RMobilePhone::TClientId* aClientId, TInt* aBufSize)
 	{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PROCESSGETAUTHORIZATIONINFOPHASE1L_1, "CSimPhoneIMSAuth::GetAuthorizationInfoPhase1 called");
+		LOGPHONE1("CSimPhoneIMSAuth::GetAuthorizationInfoPhase1 called");	
 
 	// Store the streamed list and the client ID
 	CListReadAllAttempt* read=CListReadAllAttempt::NewL(*aClientId,aTsyReqHandle);
@@ -445,7 +439,7 @@
 TInt CSimPhoneIMSAuth::GetAuthorizationInfoPhase2(const TTsyReqHandle aTsyReqHandle,
 			RMobilePhone::TClientId* aClientId, TDes8* aBuffer)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_GETAUTHORIZATIONINFOPHASE2_1, "CSimPhoneIMSAuth::GetAuthorizationInfoPhase2 called");
+	LOGPHONE1("CSimPhoneIMSAuth::GetAuthorizationInfoPhase2 called");	
 	CListReadAllAttempt* read=NULL;
 
 	// Find the get Authorization Info attempt from this client
@@ -472,7 +466,7 @@
 
 TInt CSimPhoneIMSAuth::GetAuthorizationInfoCancel(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_GETAUTHORIZATIONINFOCANCEL_1, "CSimPhoneIMSAuth::GetAuthorizationInfoCancel called");
+	LOGPHONE1("CSimPhoneIMSAuth::GetAuthorizationInfoCancel called");
 
 	// Remove the read all attempt from iGetAuthorizationData
 	CListReadAllAttempt* read=NULL;
@@ -495,7 +489,7 @@
 
 TInt CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChanged(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_NOTIFYIMSAUTHORIZATIONINFOCHANGED_1, "CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChanged called");
+	LOGPHONE1("CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChanged called");
 	__ASSERT_ALWAYS(!iAuthInfoChangeNotifyPending,SimPanic(ENotificationReqAlreadyOutstanding));
 
 	TInt count=iAuthorizationInfoList.Count();
@@ -514,7 +508,7 @@
 
 TInt CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChangedCancel(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_NOTIFYIMSAUTHORIZATIONINFOCHANGEDCANCEL_1, "CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChangedCancel called");
+	LOGPHONE1("CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChangedCancel called");
 	if(iAuthInfoChangeNotifyPending)
 		{
 		if(iTimerStarted)
@@ -532,7 +526,7 @@
 
 TInt CSimPhoneIMSAuth::GetAuthenticationData(const TTsyReqHandle aTsyReqHandle,TDes8* aAuthenticationData)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_GETAUTHENTICATIONDATA_1, "CSimPhoneIMSAuth::AuthentificationData called");
+	LOGPHONE1("CSimPhoneIMSAuth::AuthentificationData called");
 
 	RMobilePhone::TImsAuthenticateDataV5Pckg* authenticateDataPckgd =
 			(RMobilePhone::TImsAuthenticateDataV5Pckg*)aAuthenticationData;
@@ -580,7 +574,7 @@
 
 TInt CSimPhoneIMSAuth::GetAuthenticationDataCancel(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_GETAUTHENTICATIONDATACANCEL_1, "CSimPhoneIMSAuth::AuthentificationDatCancel called");
+	LOGPHONE1("CSimPhoneIMSAuth::AuthentificationDatCancel called");	
 	iPhone->ReqCompleted(aTsyReqHandle, KErrCancel);
 	return KErrNone;
 	}

--- a/telephonyserverplugins/simtsy/src/CSimPhoneInitialise.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhoneInitialise.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,6 +20,7 @@
  @file
 */
 
+#include "Simlog.h"
 #include "utils.h"
 #include "CSimPhone.h"
 #include <testconfigfileparser.h>

--- a/telephonyserverplugins/simtsy/src/CSimPhoneSecurity.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhoneSecurity.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-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"
@@ -19,14 +19,8 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimPhoneSecurityTraces.h"
-#endif
-
 #include "CSimPhone.h"
+#include "Simlog.h"
 #include "utils.h"
 #include "CSimPhoneSecurity.h"
 #include <testconfigfileparser.h>
@@ -72,7 +66,7 @@
  * delays from the configuration file.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_1, "Starting to parse PhoneSecurity additional config parameters...");
+	LOGPHONE1("Starting to parse PhoneSecurity additional config parameters...");
 	
 	iNotifySettingsTimer = CIccTimer::NewL();
 	iNotifySecurityEventsTimer = CIccTimer::NewL();
@@ -92,14 +86,14 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,0,KSecurityCodes);
+			LOGPARSERR("temp",ret,0,&KSecurityCodes);
 			}
 		else
 			iSecCodes.iPin1.Copy(temp);
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,1,KSecurityCodes);
+			LOGPARSERR("temp",ret,1,&KSecurityCodes);
 			}
 		else
 			iSecCodes.iPin2.Copy(temp);
@@ -107,7 +101,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,2,KSecurityCodes);
+			LOGPARSERR("temp",ret,2,&KSecurityCodes);
 			}
 		else
 			iSecCodes.iPuk1.Copy(temp);
@@ -115,7 +109,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,3,KSecurityCodes);
+			LOGPARSERR("temp",ret,3,&KSecurityCodes);
 			}
 		else
 			iSecCodes.iPuk2.Copy(temp);
@@ -123,7 +117,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,4,KSecurityCodes);
+			LOGPARSERR("temp",ret,4,&KSecurityCodes);
 			}
 		else
 			iSecCodes.iPhonePassword.Copy(temp);
@@ -131,7 +125,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,5,KSecurityCodes);
+			LOGPARSERR("temp",ret,5,&KSecurityCodes);
 			}
 		else
 			iSecCodes.iSPC.Copy(temp);
@@ -139,7 +133,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,6,KSecurityCodes);
+			LOGPARSERR("temp",ret,6,&KSecurityCodes);
 			}
 		else
 			iSecCodes.iPhBkHiddenKey.Copy(temp);
@@ -147,7 +141,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,7,KSecurityCodes);
+			LOGPARSERR("temp",ret,7,&KSecurityCodes);
 			}
 		else
 			iSecCodes.iUSimAppPin.Copy(temp);
@@ -155,7 +149,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,8,KSecurityCodes);
+			LOGPARSERR("temp",ret,8,&KSecurityCodes);
 			}
 		else
 			iSecCodes.iSecondUSimAppPin.Copy(temp);
@@ -163,7 +157,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,9,KSecurityCodes);
+			LOGPARSERR("temp",ret,9,&KSecurityCodes);
 			}
 		else
 			iSecCodes.iUniversalPin.Copy(temp);
@@ -178,13 +172,14 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element SECURITYCODEATTEMPTS returned %d (element no. %d) from tag %s." ,ret,0,KSecurityCodeAttempts);
+			LOGPARSERR(&KSecurityCodeAttempts,ret,0,&KSecurityCodeAttempts);
 			}
 		else
 			{
 			if (temp <= 0)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_13, "Using default value...");
+				LOGPARSERRANGE(&KSecurityCodeAttempts,temp,"> 0",0,&KSecurityCodeAttempts);
+				LOGCONFIG1("Using default value...");
 				temp = KDefaultPinEntryAttempts;
 				}
 			iSecurityCodeRemainigAttempts.iPin1=temp;
@@ -193,14 +188,14 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element SECURITYCODEATTEMPTS returned %d (element no. %d) from tag %s." ,ret,1,KSecurityCodeAttempts);
+			LOGPARSERR(&KSecurityCodeAttempts,ret,1,&KSecurityCodeAttempts);
 			}
 		else
 			{
 			if (temp <= 0)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_15, "Reading element SECURITYCODEATTEMPTS returned %d (element no. %d) from tag %s expected > 0" ,temp,1,KSecurityCodeAttempts);
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_16, "Using default value...");
+				LOGPARSERRANGE(&KSecurityCodeAttempts,temp,"> 0",1,&KSecurityCodeAttempts);
+				LOGCONFIG1("Using default value...");
 				temp = KDefaultPinEntryAttempts;
 				}
 			iSecurityCodeRemainigAttempts.iPin2=temp;
@@ -209,14 +204,14 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element SECURITYCODEATTEMPTS returned %d (element no. %d) from tag %s." ,ret,2,KSecurityCodeAttempts);
+			LOGPARSERR(&KSecurityCodeAttempts,ret,2,&KSecurityCodeAttempts);
 			}
 		else
 			{
 			if (temp <= 0)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_18, "Reading element SECURITYCODEATTEMPTS returned %d (element no. %d) from tag %s expected > 0" ,temp,2,KSecurityCodeAttempts);
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_19, "Using default value...");
+				LOGPARSERRANGE(&KSecurityCodeAttempts,temp,"> 0",2,&KSecurityCodeAttempts);
+				LOGCONFIG1("Using default value...");
 				temp = KDefaultPukEntryAttempts;
 				}
 			iSecurityCodeRemainigAttempts.iPuk1=temp;
@@ -225,14 +220,14 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element SECURITYCODEATTEMPTS returned %d (element no. %d) from tag %s."  ,ret,3,KSecurityCodeAttempts);
+			LOGPARSERR(&KSecurityCodeAttempts,ret,3,&KSecurityCodeAttempts);
 			}
 		else
 			{
 			if (temp <= 0)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_21, "Reading element SECURITYCODEATTEMPTS returned %d (element no. %d) from tag %s expected > 0" ,temp,3,KSecurityCodeAttempts);
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_22, "Using default value...");
+				LOGPARSERRANGE(&KSecurityCodeAttempts,temp,"> 0",3,&KSecurityCodeAttempts);
+				LOGCONFIG1("Using default value...");
 				temp = KDefaultPukEntryAttempts;
 				}
 			iSecurityCodeRemainigAttempts.iPuk2=temp;
@@ -241,7 +236,7 @@
 		}
 	else
 		{
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_23, "NOTE tag %s not defined, using default values",KSecurityCodeAttempts);
+		LOGPHONE2("NOTE tag %S not defined, using default values",&KSecurityCodeAttempts);
 		iSecurityCodeDefaultRemainigAttempts.iPin1= KDefaultPinEntryAttempts;
 		iSecurityCodeRemainigAttempts.iPin1= iSecurityCodeDefaultRemainigAttempts.iPin1;
 		iSecurityCodeDefaultRemainigAttempts.iPin2= KDefaultPinEntryAttempts;
@@ -260,7 +255,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,0,KICCLockedAtStart);
+			LOGPARSERR("temp",ret,0,&KICCLockedAtStart);
 			}
 		else
 			{
@@ -270,7 +265,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_25, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,1,KICCLockedAtStart);
+			LOGPARSERR("temp",ret,1,&KICCLockedAtStart);
 			}
 		else
 			{
@@ -280,7 +275,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_26, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,2,KICCLockedAtStart);
+			LOGPARSERR("temp",ret,2,&KICCLockedAtStart);
 			}
 		else
 			{
@@ -290,7 +285,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_27, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,3,KICCLockedAtStart);
+			LOGPARSERR("temp",ret,3,&KICCLockedAtStart);
 			}
 		else
 			{
@@ -300,7 +295,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_28, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,4,KICCLockedAtStart);
+			LOGPARSERR("temp",ret,4,&KICCLockedAtStart);
 			}
 		else
 			{
@@ -310,7 +305,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_29, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,5,KICCLockedAtStart);
+			LOGPARSERR("temp",ret,5,&KICCLockedAtStart);
 			}
 		else
 			iSecStatus.iSPC=(RMobilePhone::TMobilePhoneLockStatus) temp;
@@ -318,7 +313,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_30, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,6,KICCLockedAtStart);
+			LOGPARSERR("temp",ret,6,&KICCLockedAtStart);
 			}
 		else
 			{
@@ -328,7 +323,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_31, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,7,KICCLockedAtStart);
+			LOGPARSERR("temp",ret,7,&KICCLockedAtStart);
 			}
 		else
 			{
@@ -338,7 +333,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_32, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,8,KICCLockedAtStart);
+			LOGPARSERR("temp",ret,8,&KICCLockedAtStart);
 			}
 		else
 			{
@@ -348,7 +343,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,temp);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_33, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,9,KICCLockedAtStart);
+			LOGPARSERR("temp",ret,9,&KICCLockedAtStart);
 			}
 		else
 			{
@@ -369,14 +364,14 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_34, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KICCStatus);
+				LOGPARSERR("duration",ret,0,&KICCStatus);
 				continue;
 				}
 			
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,ICCStatus);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_35, "WARNING - CONFIGURATION FILE PARSING - Reading element ICCSTATUS returned %d (element no. %d) from tag %s.",ret,1,KICCStatus);
+				LOGPARSERR("ICCStatus",ret,1,&KICCStatus);
 				continue;
 				}
 			
@@ -400,28 +395,28 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_36, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KICCSetting);
+				LOGPARSERR("duration",ret,0,&KICCSetting);
 				continue;
 				}
 				
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,lock);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_37, "WARNING - CONFIGURATION FILE PARSING - Reading element LOCK returned %d (element no. %d) from tag %s.",ret,1,KICCSetting);
+				LOGPARSERR("lock",ret,1,&KICCSetting);
 				continue;
 				}
 			
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,lockSetting);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_38, "WARNING - CONFIGURATION FILE PARSING - Reading element LOCKSETTING returned %d (element no. %d) from tag %s.",ret,2,KICCSetting);
+				LOGPARSERR("lockSetting",ret,2,&KICCSetting);
 				continue;
 				}
 			
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,lockStatus);
 			if(ret!=KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_39, "WARNING - CONFIGURATION FILE PARSING - Reading element LOCKSTATUS returned %d (element no. %d) from tag %s.",ret,3,KICCSetting);
+				LOGPARSERR("lockStatus",ret,3,&KICCSetting);
 				continue;
 				}
 			
@@ -642,7 +637,7 @@
 		return KDefaultNumberOfSlots;
 
 	default:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_NUMBEROFSLOTSL_1, "CSimPhoneSecurity: Number of Slots error, unknown IPC");
+		LOGPHONE1("CSimPhoneSecurity: Number of Slots error, unknown IPC");
 		User::Leave(KErrNotSupported);
 		break;
 		}
@@ -699,7 +694,7 @@
 * @return CTestConfigSection a pointer to the configuration file data section
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CFGFILE_1, ">>CSimPhoneSecurity::CfgFile");
+	LOGPHONE1(">>CSimPhoneSecurity::CfgFile");
 	return iPhone->CfgFile();
 	}
 
@@ -1423,7 +1418,8 @@
 		case RMobilePhone::ESPCChanged:
 			//  FALLTHRU
 		default:
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_SECURITYEVENT_1, "CSimPhoneSecurity::SecurityEvent %d OOR [%d,%d]",aEvent, RMobilePhone::ENoICCFound, RMobilePhone::ESPCChanged);
+			LOGPHONE4("CSimPhoneSecurity::SecurityEvent %d OOR [%d,%d]",
+					aEvent, RMobilePhone::ENoICCFound, RMobilePhone::ESPCChanged);
 			return;
 		}

--- a/telephonyserverplugins/simtsy/src/CSimPhoneSmartCardApp.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhoneSmartCardApp.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-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"
@@ -19,16 +19,10 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimPhoneSmartCardAppTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 #include <etelmmerr.h>
 #include "CSimPhone.h"
+#include "Simlog.h"
 
 //
 // CSimPhoneSmartCardApp
@@ -67,11 +61,11 @@
 * @leave Leaves due to not enough memory or if any data member does not construct for any reason.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_CONSTRUCTL_1, "Starting to parse Phone Smart Card applications additional config parameters...");
+	LOGPHONE1("Starting to parse Phone Smart Card applications additional config parameters...");
 	ParseSmartCardApplicationInfoL();
 	ParseSmartCardFileInfoL();
 	MapUSimAppsL();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_CONSTRUCTL_2, "Finished parsing Phone Smart Card applications additional config parameters...");
+	LOGPHONE1("Finished parsing Phone Smart Card applications additional config parameters...");
 	}
 
 
@@ -301,7 +295,7 @@
 		numberOfSlots = KDefaultNumberOfSlots;
 		break;
 	default:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_NUMBEROFSLOTSL_1, "CSimPhoneSmartCardApp: Number of Slots error, unknown IPC");
+		LOGPHONE1("CSimPhoneSmartCardApp: Number of Slots error, unknown IPC");
 		User::Leave(KErrNotSupported);
 		break;
 		}
@@ -379,7 +373,7 @@
 * @return CTestConfigSection a pointer to the configuration file data section
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_CFGFILE_1, ">>CSimPhoneSmartCardApp::CfgFile");
+	LOGPHONE1(">>CSimPhoneSmartCardApp::CfgFile");
 	return iPhone->CfgFile();
 	}
 
@@ -492,7 +486,7 @@
 	//check that the client has specified a valid start offset
 	else if(aFilePathOffsets.iStartOffset < 1 || aFilePathOffsets.iStartOffset > iNumberRecords)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TCYCLICSMARTCARDFILE_READFILE_1, "ERROR: File start offset information invalid.");
+		LOGPHONE1("ERROR: File start offset information invalid.");
 		return KErrMMEtelScRecordNotFound;	
 		}
 		
@@ -591,7 +585,7 @@
 	//check that the client has specified a valid start offset
 	else if(aFilePathOffsets.iStartOffset < 1 || aFilePathOffsets.iStartOffset > iNumberRecords)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TLINEARSMARTCARDFILE_READFILE_1, "ERROR: File start offset information invalid.");
+		LOGPHONE1("ERROR: File start offset information invalid.");
 		return KErrMMEtelScRecordNotFound;	
 		}
 	else
@@ -632,7 +626,7 @@
 	//check that the client has specified a valid start offset
 	else if(aFilePathOffsets.iStartOffset < 1 || aFilePathOffsets.iStartOffset > iNumberRecords)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TLINEARSMARTCARDFILE_UPDATEFILE_1, "ERROR: File start offset information invalid.");
+		LOGPHONE1("ERROR: File start offset information invalid.");
 		return KErrMMEtelScRecordNotFound;	
 		}
 	else
@@ -671,7 +665,7 @@
 	//check that the client has specified a valid start offset
 	else if(aFilePathOffsets.iStartOffset >= (TUint)iTotalLength)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_READFILE_1, "ERROR: File start offset information invalid.");
+		LOGPHONE1("ERROR: File start offset information invalid.");
 		return KErrMMEtelScReferencedDataNotFound;	
 		}
 	
@@ -679,7 +673,7 @@
 	//off the end of the file
 	else if((bytesToRead + filePointer) > iTotalLength)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_READFILE_2, "ERROR: Path offset information results in reading off the end of the file");
+		LOGPHONE1("ERROR: Path offset information results in reading off the end of the file");
 		return KErrMMEtelScEofReached;
 		}
 	else
@@ -723,7 +717,7 @@
 	//check that the client has specified a valid start offset
 	else if(aFilePathOffsets.iStartOffset >= (TUint)iTotalLength)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_UPDATEFILE_1, "ERROR: File start offset information invalid.");
+		LOGPHONE1("ERROR: File start offset information invalid.");
 		return KErrMMEtelScReferencedDataNotFound;	
 		}
 	
@@ -731,7 +725,7 @@
 	//off the end of the file
 	else if((bytesToWrite + filePointer) > iTotalLength)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_UPDATEFILE_2, "ERROR: Path offset information results in reading off the end of the file");
+		LOGPHONE1("ERROR: Path offset information results in reading off the end of the file");
 		return KErrMMEtelScEofReached;
 		}
 	else
@@ -1360,7 +1354,7 @@
 */
 	{
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_GETSCFILEINFO_1, "CSimPhoneSmartCardApp::GetScFileInfo called");
+	LOGPHONE1("CSimPhoneSmartCardApp::GetScFileInfo called");
 
 	RMobilePhone::TScFileInfoV5Pckg *scFileInfoPckg = reinterpret_cast<RMobilePhone::TScFileInfoV5Pckg*>(aInfo);
 	RMobilePhone::TScFileInfoV5 &scFileInfo = (*scFileInfoPckg)();
@@ -1403,7 +1397,7 @@
 *
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_GETSCFILEINFOCANCEL_1, "CSimPhoneSmartCardApp::GetScFileInfoCancel called");
+	LOGPHONE1("CSimPhoneSmartCardApp::GetScFileInfoCancel called");
 
 	iPhone->ReqCompleted(aTsyReqHandle, KErrNone);
 	return KErrNone;
@@ -1438,7 +1432,7 @@
 *
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_READSCFILECANCEL_1, "CSimPhoneSmartCardApp::ReadScFileInfoCancel called");
+	LOGPHONE1("CSimPhoneSmartCardApp::ReadScFileInfoCancel called");
 
 	iPhone->ReqCompleted(aTsyReqHandle, KErrNone);
 	return KErrNone;
@@ -1473,7 +1467,7 @@
 *
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_UPDATESCFILECANCEL_1, "CSimPhoneSmartCardApp::UpdateScFileInfoCancel called");
+	LOGPHONE1("CSimPhoneSmartCardApp::UpdateScFileInfoCancel called");
 
 	iPhone->ReqCompleted(aTsyReqHandle, KErrNone);
 	return KErrNone;
@@ -1497,22 +1491,22 @@
 	TRAP_IGNORE(iTimer=CSimTimer::NewL(iPhone));
 	
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_1, "Starting to Parse MaxActiveSmartCardApp Info");
+	LOGPHONE1("Starting to Parse MaxActiveSmartCardApp Info");
 	iMaxActiveSmartCardApps = CfgFile()->ItemValue(KMaxActiveSmartCardApps ,KDefaultMaxActiveSmartCardApps);
 
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_2, "Starting to Parse ActiveUSIMApp Info");
+	LOGPHONE1("Starting to Parse ActiveUSIMApp Info");
 	activeUSimApp.Set(CfgFile()->ItemValue(KActiveUSIMApp, KEmptyString));
 	if(activeUSimApp.Length() == 0)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_3, "ERROR IN CONFIGURATION FILE PARSING: ACTIVE USIM APP NOT SPECIFIED!");
+		LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: ACTIVE USIM APP NOT SPECIFIED!");
 		}
 
 
 	TInt count = CfgFile()->ItemCount(KSmartCardAppInfo);
 	iSmartCardAppList=new(ELeave) CArrayFixFlat<TSmartCardApplication>(count+1);
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_4, "Starting to Load and Parse Smart Card Application Info");
+	LOGPHONE1("Starting to Load and Parse Smart Card Application Info");
 	for(index=0;index<count;index++)
 		{
 		item=CfgFile()->Item(KSmartCardAppInfo,index);
@@ -1524,7 +1518,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,aid);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_5, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG");
 			continue;
 			}
 		else
@@ -1535,7 +1529,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,label);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_6, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG");
 			continue;
 			}
 		else 
@@ -1546,7 +1540,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,type);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_7, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG");
 			continue;
 			}
 		else
@@ -1569,7 +1563,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 3, eap);
 		if (ret != KErrNone)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_8, "CONFIGURATION FILE PARSING: BAD OR NO (OPTIONAL) EAP LIST @ SMARTCARD APP INFO TAG [%d]", index);
+			LOGPHONE2("CONFIGURATION FILE PARSING: BAD OR NO (OPTIONAL) EAP LIST @ SMARTCARD APP INFO TAG [%d]", index);
 			_LIT8(emptyEapList, "");
 			eap.Set(emptyEapList);
 			}
@@ -1582,7 +1576,7 @@
 		
 	if(iActiveUSimApp.Length() == 0)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_9, "ERROR IN CONFIGURATION FILE PARSING: AID FOR ACTIVE USIM APP NOT FOUND!");
+		LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: AID FOR ACTIVE USIM APP NOT FOUND!");
 		}
 		
 
@@ -1591,7 +1585,7 @@
 	TSmartCardAppEvent appEvent;
 	TInt duration, action;
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_10, "Starting to Load and Parse Smart Card Application Event Info");
+	LOGPHONE1("Starting to Load and Parse Smart Card Application Event Info");
 
 	for(index=0;index<count;index++)
 		{
@@ -1604,7 +1598,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0, duration);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_11, "ERROR IN CONFIGURATION FILE PARSING: BAD SMART CARD APP EVENT TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMART CARD APP EVENT TAG");
 			continue;
 			}
 		else
@@ -1615,7 +1609,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1, aid);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_12, "ERROR IN CONFIGURATION FILE PARSING; BAD SMART CARD APP EVENT TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING; BAD SMART CARD APP EVENT TAG");
 			continue;
 			}
 		else 
@@ -1626,7 +1620,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2, action);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_13, "ERROR IN CONFIGURATION FILE PARSING; BAD SMART CARD APP EVENT TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING; BAD SMART CARD APP EVENT TAG");
 			continue;
 			}
 		else
@@ -1651,7 +1645,7 @@
 	TInt aidIndex, fileType, fileLength, recordLength, numRecords, index;
 	TSmartCardFile* file = NULL;
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_1, "Starting to Parse Smart Card File Info");
+	LOGPHONE1("Starting to Parse Smart Card File Info");
 	TInt count = CfgFile()->ItemCount(KSmartCardFile);
 	iSmartCardFileList = new(ELeave) CArrayPtrFlat<TSmartCardFile>(count+1);
 
@@ -1667,7 +1661,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,fileType);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_2, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			continue;
 			}
 		else
@@ -1684,8 +1678,8 @@
 				file = new(ELeave) TTransparentSmartCardFile;
 				break;
 			default:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_3, "ERROR IN CONFIGURATION FILE PARSING:");
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_4, "ENCOUNTERED UNKNOWN SMART CARD FILE TYPE.");
+				LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING:");
+				LOGPHONE1("ENCOUNTERED UNKNOWN SMART CARD FILE TYPE.");
 				continue;				
 				}
 			file->iType = (RMobilePhone::TScFileType)fileType;
@@ -1695,14 +1689,14 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,fileId);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_5, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			delete file;
 			continue;
 			}
 		//check that the FID is precisely 4 bytes long	
 		else if(fileId.Length() != KMaxHexFIDLen)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_6, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE FID");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE FID");
 			delete file;
 			continue;
 			}
@@ -1717,7 +1711,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,aidIndex);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_7, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			delete file;
 			continue;
 			}
@@ -1730,7 +1724,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,filePath);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_8, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			delete file;
 			continue;
 			}
@@ -1743,7 +1737,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,fileLength);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_9, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			delete file;
 			continue;
 			}
@@ -1756,7 +1750,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,recordLength);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_10, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			delete file;
 			continue;
 			}
@@ -1769,7 +1763,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,numRecords);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_11, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			delete file;
 			continue;
 			}
@@ -1782,8 +1776,8 @@
 		//Check that record Length * number of records = Total length of file
 		if((fileType != RMobilePhone::ETransparent) && ((recordLength*numRecords) != fileLength))
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_12, "ERROR IN CONFIGURATION FILE PARSING:...");
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_13, "...Record Length * Number of Records != File Length");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING:...");
+			LOGPHONE1("...Record Length * Number of Records != File Length");
 			delete file;
 			continue;
 			}
@@ -1792,13 +1786,13 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,fileData);
 		if(ret!=KErrNone)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_14, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG");
 			delete file;
 			continue;
 			}
 		else if((fileData.Length() % 2 ) != 0)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_15, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE DATA");
+			LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE DATA");
 			continue;
 			}
 		else
@@ -1807,7 +1801,7 @@
 			TextToBin(fileData, fileDataBuffer);
 			if(fileDataBuffer.Length() != fileLength)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_16, "ERROR IN CONFIGURATION FILE PARSING:INCONSISTANT DATA FILE LENGTH");
+				LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING:INCONSISTANT DATA FILE LENGTH");
 				delete file;
 				continue;		
 				}
@@ -1946,13 +1940,13 @@
 				{
 				if(smartCardApp->iAppStatus == CSimPhoneSmartCardApp::EActive)
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_ACTIVATESMARTCARDAPP_1, "REACTIVATING AN ALREADY ACTIVE APPLICATION");
+					LOGPHONE1("REACTIVATING AN ALREADY ACTIVE APPLICATION");
 					return KErrNone;
 					}
 				else
 					{
 					//iMaxActiveSmartCardApps will be exceeded
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_ACTIVATESMARTCARDAPP_2, "WARNING: CANNOT PROCESS ACTIVATING APPLICATION");
+					LOGPHONE1("WARNING: CANNOT PROCESS ACTIVATING APPLICATION");
 					return KErrMMEtelScMaxApplicationsActive;
 					}
 				}
@@ -1960,7 +1954,7 @@
 			}
 		}//end for loop
 		
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_ACTIVATESMARTCARDAPP_3, "WARNING: AID NOT FOUND. CANNOT PROCESS EVENT");
+		LOGPHONE1("WARNING: AID NOT FOUND. CANNOT PROCESS EVENT");
 		return KErrNotFound;
 	}
 
@@ -1994,13 +1988,13 @@
 				}
 			else
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TERMINATESMARTCARDAPP_1, "ATTEMPTED TO TERMINATE NON-ACTIVE APPLICATION");
+				LOGPHONE1("ATTEMPTED TO TERMINATE NON-ACTIVE APPLICATION");
 				return KErrMMEtelScApplicationNotActive;
 				}
 			}
 	
 		}//end for loop
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TERMINATESMARTCARDAPP_2, "WARNING: AID NOT FOUND. CANNOT PROCESS EVENT");
+	LOGPHONE1("WARNING: AID NOT FOUND. CANNOT PROCESS EVENT");
 	return KErrNotFound;
 	}

--- a/telephonyserverplugins/simtsy/src/CSimPhoneUSimApp.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhoneUSimApp.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-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"
@@ -19,14 +19,8 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimPhoneUSimAppTraces.h"
-#endif
-
 #include "CSimPhone.h"
+#include "Simlog.h"
 #include <testconfigfileparser.h>
 
 /**
@@ -71,7 +65,7 @@
 */
 void CSimPhoneUSimApp::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CONSTRUCTL_1, "Starting to parse PhoneUSim applications additional config parameters...");
+	LOGPHONE1("Starting to parse PhoneUSim applications additional config parameters...");
 	
 	const CTestConfigItem* item=NULL;
 	TInt ret=KErrNone;
@@ -83,7 +77,7 @@
 	iUSimAppInfo=new(ELeave) CArrayFixFlat<RMobilePhone::TUSimApplicationInfoV2>(KMaxUSimApps+1);
 	TInt count=CfgFile()->ItemCount(KUSIMAppInfo);
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CONSTRUCTL_2, "Starting to Load and Parse USim Application Info");
+	LOGPHONE1("Starting to Load and Parse USim Application Info");
 
 	for(i=0;i<count;i++)
 		{
@@ -94,7 +88,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0, aid);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element AID returned %d (element no. %d) from tag %s.",ret,0,KUSIMAppInfo);
+			LOGPARSERR("aid",ret,0,&KUSIMAppInfo);
 			continue;
 			}
 		else
@@ -106,7 +100,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1, label);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element LABEL returned %d (element no. %d) from tag %s.",ret,1,KUSIMAppInfo);
+			LOGPARSERR("label",ret,1,&KUSIMAppInfo);
 			continue;
 			}
 		else 
@@ -122,7 +116,7 @@
 
 	count=CfgFile()->ItemCount(KUSIMAppSwitching);
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CONSTRUCTL_5, "Starting to Load and Parse USim Application Info");
+	LOGPHONE1("Starting to Load and Parse USim Application Info");
 
 	for(i=0;i<count;i++)
 		{
@@ -133,7 +127,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0, duration);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KUSIMAppSwitching);
+			LOGPARSERR("duration",ret,0,&KUSIMAppSwitching);
 			continue;
 			}
 		else
@@ -142,7 +136,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1, aid);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CONSTRUCTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element AID returned %d (element no. %d) from tag %s.",ret,1,KUSIMAppSwitching);
+			LOGPARSERR("aid",ret,1,&KUSIMAppSwitching);
 			continue;
 			}
 		else 
@@ -312,7 +306,7 @@
 		return KDefaultNumberOfSlots;
 
 	default:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_NUMBEROFSLOTSL_1, "CSimPhoneUSimApp: Number of Slots error, unknown IPC");
+		LOGPHONE1("CSimPhoneUSimApp: Number of Slots error, unknown IPC");
 		User::Leave(KErrNotSupported);
 		break;
 		}
@@ -361,7 +355,7 @@
 */
 const CTestConfigSection* CSimPhoneUSimApp::CfgFile()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CFGFILE_1, ">>CSimPhoneUSimApp::CfgFile");
+	LOGPHONE1(">>CSimPhoneUSimApp::CfgFile");
 	return iPhone->CfgFile();
 	}

--- a/telephonyserverplugins/simtsy/src/CSimPubSub.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPubSub.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -15,14 +15,8 @@
 // 
 //
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimPubSubTraces.h"
-#endif
-
 #include "CSimPubSub.h"
+#include "Simlog.h"
 
 
 /**
@@ -33,12 +27,12 @@
 */
 CSimPubSub* CSimPubSub::NewL(MPSSimObserver* aPSSimObserver, const CSimPubSub::TPubSubProperty aProperty)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPUBSUB_NEWL_1, ">>CSimPubSub::NewL");
+	LOGSCOMMON1(">>CSimPubSub::NewL");
 	CSimPubSub* pubsub=new(ELeave) CSimPubSub(aPSSimObserver,aProperty);
 	CleanupStack::PushL(pubsub);
 	pubsub->ConstructL();
 	CleanupStack::Pop();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPUBSUB_NEWL_2, "<<CSimPubSub::NewL");
+	LOGSCOMMON1("<<CSimPubSub::NewL");
 	return pubsub;
 	}

--- a/telephonyserverplugins/simtsy/src/CSimReduceTimers.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimReduceTimers.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -21,13 +21,7 @@
 */
 
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimReduceTimersTraces.h"
-#endif
-
+#include "Simlog.h"
 #include "CSimReduceTimers.h"
 
 
@@ -90,26 +84,26 @@
 	if (aProperty == iPSProperty && // Condition for correct property
 		(aStatus == ETimerIdAllTimers)) // and correct value for signal
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_SIMPSEVENT_1, ">>CSimReduceTimers.cpp: Reduce Timer event fired for all timers");
+		LOGMISC1(">>CSimReduceTimers.cpp: Reduce Timer event fired for all timers");
 		Notify();
 		}
 	else if(aProperty == iPSProperty && aStatus > 0)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_SIMPSEVENT_2, ">>CSimReduceTimers.cpp: Reduce Timer event fired for event ID %d", aStatus);
+		LOGMISC2(">>CSimReduceTimers.cpp: Reduce Timer event fired for event ID %d", aStatus);
 		Notify(aStatus);
 		}
 	}
 
 void CSimReduceTimers::AttachL(MSimTimerUpdateObserver* aObserver)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_ATTACHL_1, "CSimReduceTimers::AttachL");
+	LOGMISC1("CSimReduceTimers::AttachL");
 	User::LeaveIfError(iObservers.Append(aObserver));
 	}
 
 void CSimReduceTimers::DetachL(MSimTimerUpdateObserver* aObserver)
 	{
 	TInt pos = iObservers.Find(aObserver);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_DETACHL_1, "CSimReduceTimers::DetachL, from position %d", pos);
+	LOGMISC2("CSimReduceTimers::DetachL, from position %d", pos);
 	User::LeaveIfError(pos);
 	iObservers.Remove(pos);
 	}
@@ -117,10 +111,10 @@
 void CSimReduceTimers::Notify()
 	{
 	TInt totalItems = iObservers.Count();
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY_1, "CSimReduceTimers::Notify, %d observers registered", totalItems);
+	LOGMISC2("CSimReduceTimers::Notify, %d observers registered", totalItems);
 	if (totalItems <= 0)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY_2, "CSimReduceTimers::Notify, No timers to reduce.");
+		LOGMISC1("CSimReduceTimers::Notify, No timers to reduce.");
 		return;
 		}
 
@@ -129,7 +123,7 @@
 	for (num = 0; num < totalItems; num++)
 		{
 		TInt temp = iObservers[num]->GetRemainingSeconds();
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY_3, "CSimReduceTimers::Notify, iObservers[%d] remaining time = %d", num, temp);
+		LOGMISC3("CSimReduceTimers::Notify, iObservers[%d] remaining time = %d", num, temp);
 
 		// Ensure no error is returned and check if the current itteration gives a lower time remaining.
 		if (temp > 0 && temp < minTimeReduce)
@@ -140,16 +134,16 @@
 
 	if (minTimeReduce == KMaxTInt)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY_4, "CSimReduceTimers::Notify, No running timers.");
+		LOGMISC1("CSimReduceTimers::Notify, No running timers.");
 		return;
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY_5, "CSimReduceTimers::Notify, Min time to reduce all timers: %d", minTimeReduce);
+	LOGMISC2("CSimReduceTimers::Notify, Min time to reduce all timers: %d", minTimeReduce);
 	// Ensure that reducing timers by minTimeReduce does not reduce any timer to less than KTimerDelayOnReduceTimeSignal.
 	minTimeReduce -= KTimerDelayOnReduceTimeSignal;
 	if (minTimeReduce <= 0)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY_6, "CSimReduceTimers::Notify, Min time to reduce <= KTimerDelayOnReduceTimeSignal, no change to timers.");
+		LOGMISC1("CSimReduceTimers::Notify, Min time to reduce <= KTimerDelayOnReduceTimeSignal, no change to timers.");
 		return;
 		}
 
@@ -162,10 +156,10 @@
 void CSimReduceTimers::Notify(TInt aTimerEventId)
 	{
 	TInt totalItems = iObservers.Count();
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY1_1, "CSimReduceTimers::Notify, %d observers registered", totalItems);
+	LOGMISC2("CSimReduceTimers::Notify, %d observers registered", totalItems);
 	if (totalItems <= 0)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY1_2, "CSimReduceTimers::Notify, No timers to reduce.");
+		LOGMISC1("CSimReduceTimers::Notify, No timers to reduce.");
 		return;
 		}
 	
@@ -188,7 +182,8 @@
 		
 	if(indexOfLowest == KErrNotFound)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY1_3, ">>CSimReduceTimers::Notify, No observers with event ID %d found", aTimerEventId);
+		LOGMISC2(">>CSimReduceTimers::Notify, No observers with event ID %d found", 
+					aTimerEventId);
 		return;
 		}
 
@@ -196,11 +191,13 @@
 	TInt reduceBy = lowestTime - KTimerDelayOnReduceTimeSignal;
 	if(reduceBy >= lowestTime)
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY1_4, "CSimReduceTimers::Notify, Lowest timer for event ID %d already less than %d sec. No timer reduced.",KTimerDelayOnReduceTimeSignal, aTimerEventId);
+		LOGMISC3("CSimReduceTimers::Notify, Lowest timer for event ID %d already less than %d sec. No timer reduced.",
+				KTimerDelayOnReduceTimeSignal, aTimerEventId);
 		}
 	else
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY1_5, ">>CSimReduceTimers::Notify, Timer for observer with event ID %d, reduced by %d sec", aTimerEventId, reduceBy);
+		LOGMISC3(">>CSimReduceTimers::Notify, Timer for observer with event ID %d, reduced by %d sec", 
+					aTimerEventId, reduceBy);
 		iObservers[indexOfLowest]->Update(reduceBy);
 		}
 	}

--- a/telephonyserverplugins/simtsy/src/CSimSat.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimSat.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -20,14 +20,8 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimSatTraces.h"
-#endif
-
 #include "CSimSat.h" 
+#include "Simlog.h"
 #include "CSimPhone.h"
 #include "utils.h"
 #include <satcs.h>
@@ -76,13 +70,13 @@
 */
 	{
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONSTRUCTL_1, "CSimSat: Entered ConstructL()");
+	LOGMISC1("CSimSat: Entered ConstructL()");
 	
 	iSatInfo	=new(ELeave) CArrayFixFlat<TSatInfo>(KSatGranularity);
 
 	iTimer = CSimTimer::NewL(iPhone);
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONSTRUCTL_2, "Starting to parse Sat config parameters...");
+	LOGMISC1("Starting to parse Sat config parameters...");
 	
 	TInt count		=CfgFile()->ItemCount(KSatRefresh);
 	const CTestConfigItem* item=NULL;
@@ -101,19 +95,19 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KSatRefresh);
+			LOGPARSERR("duration",ret,0,&KSatRefresh);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,type);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element TYPE returned %d (element no. %d) from tag %s.",ret,1,KSatRefresh);
+			LOGPARSERR("type",ret,1,&KSatRefresh);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,fileList);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element FILELIST returned %d (element no. %d) from tag %s.",ret,2,KSatRefresh);
+			LOGPARSERR("fileList",ret,2,&KSatRefresh);
 			continue;
 			}
 
@@ -128,7 +122,7 @@
 		iSatInfo->AppendL(satInfo);
 		}
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONSTRUCTL_6, "...Finished parsing Sat config parameters...");
+	LOGMISC1("...Finished parsing Sat config parameters...");
 	
 	if(iSatInfo->Count()!=0)
 		{
@@ -144,7 +138,7 @@
 *
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_DTOR_1, "CSimSat: Entered destructor");
+	LOGMISC1("CSimSat: Entered destructor");
 	delete iTimer;
 	if(iSatInfo)
 		{
@@ -336,7 +330,7 @@
 		case ESatNotifyGetInkeyPCmd:
 		case ESatNotifySendSsPCmd:
 		case ESatNotifyLaunchBrowserPCmd:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_REQMODEL_1, "CSimSat: ReqModeL");
+			LOGMISC1("CSimSat: ReqModeL");
 			ret=KReqModeMultipleCompletionEnabled | KReqModeRePostImmediately;
 			break;
 		case ESatRefreshAllowed:
@@ -388,11 +382,11 @@
 		case ESatNotifyGetInkeyPCmd:
 		case ESatNotifySendSsPCmd:
 		case ESatNotifyLaunchBrowserPCmd:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_REGISTERNOTIFICATION_1, "CSimSat: RegisterNotification");
+			LOGMISC1("CSimSat: RegisterNotification");
 			return KErrNone;
 		default:
 			// Unknown or invalid IPC
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_REGISTERNOTIFICATION_2, "CSimSat: Register error, unknown IPC");
+			LOGMISC1("CSimSat: Register error, unknown IPC");
 			return KErrNotSupported;
 		}
 	}
@@ -431,11 +425,11 @@
 		case ESatNotifyGetInkeyPCmd:
 		case ESatNotifySendSsPCmd:
 		case ESatNotifyLaunchBrowserPCmd:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_DEREGISTERNOTIFICATION_1, "CSimSat: DeregisterNotification");
+			LOGMISC1("CSimSat: DeregisterNotification");
 			return KErrNone;
 		default:
 			// Unknown or invalid IPC
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_DEREGISTERNOTIFICATION_2, "CSimSat: Deregister error, unknown IPC");
+			LOGMISC1("CSimSat: Deregister error, unknown IPC");
 			return KErrNotSupported;
 		}
 	}
@@ -470,12 +464,12 @@
 		case ESatNotifyGetInkeyPCmd:
 		case ESatNotifySendSsPCmd:
 		case ESatNotifyLaunchBrowserPCmd:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_NUMBEROFSLOTSL_1, "CSimSat: Registered with 2 slot");
+			LOGMISC1("CSimSat: Registered with 2 slot");
 			numberOfSlots=2;
 			break;
 		default:
 			// Unknown or invalid IPC
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_NUMBEROFSLOTSL_2, "CSimSat: Number of Slots error, unknown IPC");
+			LOGMISC1("CSimSat: Number of Slots error, unknown IPC");
 			User::Leave(KErrNotSupported);
 			break;
 		}  
@@ -568,7 +562,7 @@
 * @return err KErrNone if request completes ok
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CANCELSERVICE_1, "CSimSat: - CancelService called");
+	LOGMISC1("CSimSat: - CancelService called");
 	switch (aIpc)
 		{
 		case ESatNotifyRefreshPCmd:
@@ -738,7 +732,7 @@
 	RSat::TRefreshRspV1Pckg* aRspPckg = (RSat::TRefreshRspV1Pckg*)aRefreshAllowedRsp;
 	RSat::TRefreshRspV1& rspV1 = (*aRspPckg)();
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_REFRESHALLOWED_1, "RefreshAllowed: - aRefreshAllowedResult %d",rspV1.iGeneralResult);
+	LOGMISC2("RefreshAllowed: - aRefreshAllowedResult %d",rspV1.iGeneralResult);
 
 	/* Set simtsy status to reflect clients status */
 	RSat::TPCmdResult refreshAllowedResult = rspV1.iGeneralResult;
@@ -1671,7 +1665,7 @@
 	
 TInt CSimSat::TerminalRsp(const TTsyReqHandle aTsyReqHandle, RSat::TPCmd* aPCmd, TDes8* aRsp)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_TERMINALRSP_1, ">>CSimSat::TerminalRsp");
+	LOGMISC1(">>CSimSat::TerminalRsp");
 	iPendingTerRsp = ETrue;
 	
 	switch (*aPCmd)
@@ -1732,7 +1726,7 @@
 * @param aId an id identifying which timer callback is being called
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_TIMERCALLBACK_1, ">>CSimSat::TimerCallBack");
+	LOGMISC1(">>CSimSat::TimerCallBack");
 		
 	//
 	// Convert the SIM TSY text version into the RSat binary version...
@@ -2083,7 +2077,7 @@
 		iTimer->Start(randTime(),this);
 		}
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_TIMERCALLBACK_2, "<<CSimSat::TimerCallBack");
+	LOGMISC1("<<CSimSat::TimerCallBack");
 	}
 
 
@@ -3381,7 +3375,7 @@
 
 TInt CSimSat::ConfigL(unsigned int aCmd)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_1, "CSimSat: Entered ConfigL()");
+	LOGMISC1("CSimSat: Entered ConfigL()");
 
 	TInt dcs,terRsp,src,UICCRsp,lastEnv,duration,type,frameId,frmLayout,defFrmLayout,frameSeparator;
 	TInt immRsp,dispPrio,clrScr,utranQlfr,infoType,brType,location,destn,alphaIDSts;
@@ -3444,7 +3438,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,destn);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,0,KMMRetrieve);
+					LOGPARSERR("destination",ret,0,&KMMRetrieve);
 					continue;
 					}
 				tMMRetrieve.iDestn = destn;
@@ -3452,7 +3446,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,alphaIDSts);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element ALPHAIDSTATUS returned %d (element no. %d) from tag %s.",ret,1,KMMRetrieve);
+					LOGPARSERR("alphaIDStatus",ret,1,&KMMRetrieve);
 					continue;
 					}
 				tMMRetrieve.iAlphaStatus=alphaIDSts;
@@ -3460,7 +3454,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,alphaIDBuf);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element ALPHAIDBUF returned %d (element no. %d) from tag %s.",ret,2,KMMRetrieve);
+					LOGPARSERR("alphaIDBuf",ret,2,&KMMRetrieve);
 					continue;
 					}
 				location = alphaIDBuf.Locate('\n');
@@ -3476,7 +3470,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,iconid);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element ICONID IDENTIFIER returned %d (element no. %d) from tag %s.",ret,3,KMMRetrieve);
+					LOGPARSERR("IconID Identifier",ret,3,&KMMRetrieve);
 					continue;
 					}
 				tMMRetrieve.iIconID = iconid;
@@ -3484,7 +3478,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,iconidqlfr);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element ICONID QUALIFIER returned %d (element no. %d) from tag %s.",ret,4,KMMRetrieve);
+					LOGPARSERR("IconID qualifier",ret,4,&KMMRetrieve);
 					continue;
 					}
 				tMMRetrieve.iIconIDBuf = iconidqlfr;
@@ -3492,7 +3486,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,msgRef);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element MESSAGE REFERENCE returned %d (element no. %d) from tag %s.",ret,5,KMMRetrieve);
+					LOGPARSERR("Message Reference",ret,5,&KMMRetrieve);
 					continue;
 					}
 				location = msgRef.Locate('\n');
@@ -3508,7 +3502,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,rcpFile);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element RECEPTION FILE returned %d (element no. %d) from tag %s.",ret,6,KMMRetrieve);
+					LOGPARSERR("Reception File",ret,6,&KMMRetrieve);
 					continue;
 					}
 				location = rcpFile.Locate('\n');
@@ -3524,7 +3518,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,conId);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTENT IDENTIFIER returned %d (element no. %d) from tag %s.",ret,7,KMMRetrieve);
+					LOGPARSERR("Content Identifier",ret,7,&KMMRetrieve);
 					continue;
 					}
 				location = conId.Locate('\n');
@@ -3540,7 +3534,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,msgId);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element MESSAGE IDENTIFIER returned %d (element no. %d) from tag %s.",ret,8,KMMRetrieve);
+					LOGPARSERR("Message Identifier",ret,8,&KMMRetrieve);
 					continue;
 					}
 				location = msgId.Locate('\n');
@@ -3556,7 +3550,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,textStatus);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTRIBUTE STATUS returned %d (element no. %d) from tag %s.",ret,9,KMMRetrieve);
+					LOGPARSERR("Text Attribute Status",ret,9,&KMMRetrieve);
 					continue;
 					}
 				tMMRetrieve.iTextAttStatus = textStatus;
@@ -3564,7 +3558,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,txtAttr);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTRIBUTE returned %d (element no. %d) from tag %s.",ret,10,KMMRetrieve);
+					LOGPARSERR("Text Attribute",ret,10,&KMMRetrieve);
 					continue;
 					}
 				location = txtAttr.Locate('\n');
@@ -3596,7 +3590,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,destn);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,0,KMMSubmit);
+					LOGPARSERR("destination",ret,0,&KMMSubmit);
 					continue;
 					}
 				tMMSubmit.iDestn = destn;
@@ -3604,7 +3598,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,alphaIDSts);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element ALPHAIDSTATUS returned %d (element no. %d) from tag %s.",ret,1,KMMSubmit);
+					LOGPARSERR("alphaIDStatus",ret,1,&KMMSubmit);
 					continue;
 					}
 				tMMSubmit.iAlphaStatus=alphaIDSts;
@@ -3612,7 +3606,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,alphaIDBuf);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element ALPHAIDBUF returned %d (element no. %d) from tag %s.",ret,2,KMMSubmit);
+					LOGPARSERR("alphaIDBuf",ret,2,&KMMSubmit);
 					continue;
 					}
 				location = alphaIDBuf.Locate('\n');
@@ -3624,7 +3618,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,iconid);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element ICONID IDENTIFIER returned %d (element no. %d) from tag %s.",ret,3,KMMSubmit);
+					LOGPARSERR("IconID Identifier",ret,3,&KMMSubmit);
 					continue;
 					}
 				tMMSubmit.iIconID = iconid;
@@ -3632,7 +3626,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,iconidqlfr);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element ICONID QUALIFIER returned %d (element no. %d) from tag %s.",ret,4,KMMSubmit);
+					LOGPARSERR("IconID qualifier",ret,4,&KMMSubmit);
 					continue;
 					}
 				tMMSubmit.iIconIDBuf = iconidqlfr;
@@ -3641,7 +3635,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,subFile);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element SUBMISSION FILE returned %d (element no. %d) from tag %s.",ret,5,KMMSubmit);
+					LOGPARSERR("Submission File",ret,5,&KMMSubmit);
 					continue;
 					}
 				location = subFile.Locate('\n');
@@ -3653,7 +3647,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,msgId);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element MESSAGE IDENTIFIER returned %d (element no. %d) from tag %s.",ret,6,KMMSubmit);
+					LOGPARSERR("Message Identifier",ret,6,&KMMSubmit);
 					continue;
 					}
 				location = msgId.Locate('\n');
@@ -3665,7 +3659,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,textStatus);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTRIBUTE STATUS returned %d (element no. %d) from tag %s.",ret,7,KMMSubmit);
+					LOGPARSERR("Text Attribute Status",ret,7,&KMMSubmit);
 					continue;
 					}
 				tMMSubmit.iTextAttStatus = textStatus;
@@ -3673,7 +3667,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,txtAttr);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTRIBUTE returned %d (element no. %d) from tag %s.",ret,8,KMMSubmit);
+					LOGPARSERR("Text Attribute",ret,8,&KMMSubmit);
 					continue;
 					}
 				location = txtAttr.Locate('\n');
@@ -3702,7 +3696,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,destn);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,0,KMMDisplay);
+					LOGPARSERR("destination",ret,0,&KMMDisplay);
 					continue;
 					}
 				tMMDisplay.iDestn = destn;
@@ -3710,7 +3704,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,dispPrio);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element DISPLAY PRIORITY returned %d (element no. %d) from tag %s.",ret,1,KMMDisplay);
+					LOGPARSERR("Display Priority",ret,1,&KMMDisplay);
 					continue;
 					}
 				tMMDisplay.iDispPri = dispPrio;
@@ -3718,7 +3712,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,clrScr);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element CLEARSCREEN returned %d (element no. %d) from tag %s.",ret,2,KMMDisplay);
+					LOGPARSERR("ClearScreen",ret,2,&KMMDisplay);
 					continue;
 					}
 				tMMDisplay.iClrScr = clrScr;
@@ -3726,7 +3720,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,dispFile);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_25, "WARNING - CONFIGURATION FILE PARSING - Reading element SUBMISSION FILE returned %d (element no. %d) from tag %s.",ret,3,KMMDisplay);
+					LOGPARSERR("Submission File",ret,3,&KMMDisplay);
 					continue;
 					}
 				location = dispFile.Locate('\n');
@@ -3738,7 +3732,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,msgId);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_26, "WARNING - CONFIGURATION FILE PARSING - Reading element MESSAGE IDENTIFIER returned %d (element no. %d) from tag %s.",ret,4,KMMSubmit);
+					LOGPARSERR("Message Identifier",ret,4,&KMMSubmit);
 					continue;
 					}
 				location = msgId.Locate('\n');
@@ -3750,7 +3744,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,immRsp);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_27, "WARNING - CONFIGURATION FILE PARSING - Reading element IMMEDIATE RESPONSE returned %d (element no. %d) from tag %s.",ret,5,KMMDisplay);
+					LOGPARSERR("Immediate Response",ret,5,&KMMDisplay);
 					continue;
 					}
 				tMMDisplay.iImmRsp = immRsp;
@@ -3775,7 +3769,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,destn);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_28, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,0,KSetFrames);
+					LOGPARSERR("destination",ret,0,&KSetFrames);
 					continue;
 					}
 				tSetFrms.iDestn = destn;
@@ -3783,21 +3777,21 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,frameId);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_29, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAME IDENTIFIER returned %d (element no. %d) from tag %s.",ret,1,KSetFrames);
+					LOGPARSERR("Frame Identifier",ret,1,&KSetFrames);
 					}
 				tSetFrms.iFrmId = frameId;
 				
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,frmLayout);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_30, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAME LAYOUT returned %d (element no. %d) from tag %s.",ret,2,KSetFrames);
+					LOGPARSERR("Frame Layout",ret,2,&KSetFrames);
 					}
 				tSetFrms.iFrmLayout = frmLayout;
 				
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,frmLayoutBuf);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_31, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAME LAYOUT BUFFER returned %d (element no. %d) from tag %s.",ret,3,KSetFrames);
+					LOGPARSERR("Frame Layout buffer",ret,3,&KSetFrames);
 					}
 				location = frmLayoutBuf.Locate('\n');
 				if(location > 0)
@@ -3808,14 +3802,14 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,defFrmLayout);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_32, "WARNING - CONFIGURATION FILE PARSING - Reading element DEFAULT FRAME LAYOUT returned %d (element no. %d) from tag %s.",ret,4,KSetFrames);
+					LOGPARSERR("Default Frame Layout",ret,4,&KSetFrames);
 					}
 				tSetFrms.iDefFrmId = defFrmLayout;
 						
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,frameSeparator);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_33, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAME SEPARATOR returned %d (element no. %d) from tag %s.",ret,5,KSetFrames);
+					LOGPARSERR("Frame Separator",ret,5,&KSetFrames);
 					}
 				tSetFrms.iFrmSeparator = frameSeparator;
 				
@@ -3838,7 +3832,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,destn);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_34, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,0,KGetFramesStatus);
+					LOGPARSERR("destination",ret,0,&KGetFramesStatus);
 					continue;
 					}
 				tGetFrmsSts.iDestn = destn;
@@ -3846,7 +3840,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,frameId);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_35, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAME ID returned %d (element no. %d) from tag %s.",ret,1,KGetFramesStatus);
+					LOGPARSERR("Frame Id",ret,1,&KGetFramesStatus);
 					continue;
 					}
 				tGetFrmsSts.iFrmId = frameId;
@@ -3854,7 +3848,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,frmLayoutBuf);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_36, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAMELAYOUT BUFFER returned %d (element no. %d) from tag %s.",ret,1,KGetFramesStatus);
+					LOGPARSERR("FrameLayout Buffer",ret,1,&KGetFramesStatus);
 					continue;
 					}
 				location = frmLayoutBuf.Locate('\n');
@@ -3882,7 +3876,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,destn);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_37, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,0,KLocalInfo);
+					LOGPARSERR("Destination",ret,0,&KLocalInfo);
 					continue;
 					}
 				tLocalInfo.iDeviceId = destn;
@@ -3890,7 +3884,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,infoType);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_38, "WARNING - CONFIGURATION FILE PARSING - Reading element INFORMATION TYPE returned %d (element no. %d) from tag %s.",ret,1,KLocalInfo);
+					LOGPARSERR("Information Type",ret,1,&KLocalInfo);
 					continue;
 					}
 				tLocalInfo.iLocalInfoType = infoType;
@@ -3898,7 +3892,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,utranQlfr);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_39, "WARNING - CONFIGURATION FILE PARSING - Reading element UTRAN QLFR returned %d (element no. %d) from tag %s.",ret,2,KLocalInfo);
+					LOGPARSERR("UTRAN Qlfr",ret,2,&KLocalInfo);
 					continue;
 					}
 				tLocalInfo.iUTRANQlfr = utranQlfr;
@@ -3922,7 +3916,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,brType);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_40, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,0,KOpenChnl);
+					LOGPARSERR("Destination",ret,0,&KOpenChnl);
 					continue;
 					}
 				tOpenChn.iBearerType = brType;
@@ -3930,7 +3924,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,frameId);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_41, "WARNING - CONFIGURATION FILE PARSING - Reading element INFORMATION TYPE returned %d (element no. %d) from tag %s.",ret,1,KOpenChnl);
+					LOGPARSERR("Information Type",ret,1,&KOpenChnl);
 					continue;
 					}
 				tOpenChn.iFrameId = frameId;
@@ -3956,7 +3950,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,frameId);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_42, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAMEID returned %d (element no. %d) from tag %s.",ret,0,KMiscCmd);
+					LOGPARSERR("FrameId",ret,0,&KMiscCmd);
 					continue;
 					}
 				tMiscCmd.iFrameId = frameId;
@@ -3983,19 +3977,19 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_43, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KRefresh2);
+					LOGPARSERR("duration",ret,0,&KRefresh2);
 					continue;
 					}
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,type);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_44, "WARNING - CONFIGURATION FILE PARSING - Reading element REFRESH TYPE returned %d (element no. %d) from tag %s.",ret,1,KRefresh2);
+					LOGPARSERR("Refresh Type",ret,1,&KRefresh2);
 					continue;
 					}
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,applId);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_45, "WARNING - CONFIGURATION FILE PARSING - Reading element APPLICATION ID returned %d (element no. %d) from tag %s.",ret,2,KRefresh2);
+					LOGPARSERR("Application Id",ret,2,&KRefresh2);
 					continue;
 					}
 
@@ -4028,7 +4022,7 @@
 				ret= CTestConfig::GetElement(item->Value(),KStdDelimiter,0,textStatus);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_46, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTRIBUTE STATUS returned %d (element no. %d) from tag %s.",ret,0,KSendUssd);
+					LOGPARSERR("Text Attribute Status",ret,0,&KSendUssd);
 					continue;
 					}
 				tSendUssd.iTextAttStatus = textStatus;
@@ -4036,7 +4030,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,txtAttr);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_47, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTRIBUTE BUFFER returned %d (element no. %d) from tag %s.",ret,1,KSendUssd);
+					LOGPARSERR("Text Attribute Buffer",ret,1,&KSendUssd);
 					continue;
 					}
 				TInt location = txtAttr.Locate('\n');
@@ -4064,7 +4058,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,frameId);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_48, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAMEID returned %d (element no. %d) from tag %s.",ret,0,KLaunchBrowser);
+					LOGPARSERR("FrameId",ret,0,&KLaunchBrowser);
 					continue;
 					}
 				tLnchBrwsr.iFrameId = frameId;
@@ -4072,7 +4066,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,terRsp);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_49, "WARNING - CONFIGURATION FILE PARSING - Reading element TERMINAL RESPONSE returned %d (element no. %d) from tag %s.",ret,1,KLaunchBrowser);
+					LOGPARSERR("Terminal Response",ret,1,&KLaunchBrowser);
 					continue;
 					}
 				tLnchBrwsr.iTerRsp = terRsp;
@@ -4097,7 +4091,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,src);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_50, "WARNING - CONFIGURATION FILE PARSING - Reading element SOURCE returned %d (element no. %d) from tag %s.",ret,0,KUssdDataDownload);
+					LOGPARSERR("Source",ret,0,&KUssdDataDownload);
 					continue;
 					}
 				tUssdData.iSrc = src;
@@ -4105,7 +4099,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,destn);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_51, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,1,KUssdDataDownload);
+					LOGPARSERR("Destination",ret,1,&KUssdDataDownload);
 					continue;
 					}
 				tUssdData.iDestn = destn;
@@ -4113,7 +4107,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,dcs);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_52, "WARNING - CONFIGURATION FILE PARSING - Reading element DATA CODING SCHEME returned %d (element no. %d) from tag %s.",ret,2,KUssdDataDownload);
+					LOGPARSERR("Data Coding Scheme",ret,2,&KUssdDataDownload);
 					continue;
 					}
 					tUssdData.iDcs = dcs;
@@ -4121,7 +4115,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,ussdStr);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_53, "WARNING - CONFIGURATION FILE PARSING - Reading element USSD STRING returned %d (element no. %d) from tag %s.",ret,3,KUssdDataDownload);
+					LOGPARSERR("USSD String",ret,3,&KUssdDataDownload);
 					continue;
 					}
 				else
@@ -4135,7 +4129,7 @@
 						}
 					else
 						{
-						OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_54, "WARNING - CONFIGURATION FILE PARSING - Reading element USSDDATADOWNLOAD::USSD STRING returned %d (element no. %d) from tag %s.",KErrArgument,0,KUssdDataDownload);
+						LOGPARSERR("UssdDataDownload::USSD String",KErrArgument,0,&KUssdDataDownload);
 						continue;
 						}
 					}
@@ -4143,7 +4137,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,UICCRsp);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_55, "WARNING - CONFIGURATION FILE PARSING - Reading element UICC RESPONSE returned %d (element no. %d) from tag %s.",ret,4,KUssdDataDownload);
+					LOGPARSERR("UICC Response",ret,4,&KUssdDataDownload);
 					continue;
 					}
 					tUssdData.iUICCRsp = UICCRsp;
@@ -4168,7 +4162,7 @@
 				ret= CTestConfig::GetElement(item->Value(),KStdDelimiter,0,infoType);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_56, "WARNING - CONFIGURATION FILE PARSING - Reading element INFORMATION TYPE returned %d (element no. %d) from tag %s.",ret,0,KEventDnld);
+					LOGPARSERR("Information Type",ret,0,&KEventDnld);
 					continue;
 					}
 				tEventDnld.iVar = infoType;
@@ -4176,7 +4170,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,framesList);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_57, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAMES LIST returned %d (element no. %d) from tag %s.",ret,1,KEventDnld);
+					LOGPARSERR("Frames List",ret,1,&KEventDnld);
 					continue;
 					}
 				TInt location = framesList.Locate('\n');
@@ -4205,7 +4199,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,textStatus);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_58, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTR STATUS returned %d (element no. %d) from tag %s.",ret,0,KSendSs);
+					LOGPARSERR("Text Attr Status",ret,0,&KSendSs);
 					continue;
 					}
 					
@@ -4214,7 +4208,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,txtAttr);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_59, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTRIBUTE returned %d (element no. %d) from tag %s.",ret,1,KSendSs);
+					LOGPARSERR("Text Attribute",ret,1,&KSendSs);
 					continue;
 					}
 				
@@ -4245,19 +4239,19 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_60, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KElemFiles);
+					LOGPARSERR("duration",ret,0,&KElemFiles);
 					continue;
 					}
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,type);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_61, "WARNING - CONFIGURATION FILE PARSING - Reading element REFRESH TYPE returned %d (element no. %d) from tag %s.",ret,1,KElemFiles);
+					LOGPARSERR("Refresh Type",ret,1,&KElemFiles);
 					continue;
 					}
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,FileList);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_62, "WARNING - CONFIGURATION FILE PARSING - Reading element APPLICATION ID returned %d (element no. %d) from tag %s.",ret,2,KElemFiles);
+					LOGPARSERR("Application Id",ret,2,&KElemFiles);
 					continue;
 					}
 
@@ -4290,7 +4284,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,src);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_63, "WARNING - CONFIGURATION FILE PARSING - Reading element SOURCE returned %d (element no. %d) from tag %s.",ret,0,KMmsNotificationDownload);
+					LOGPARSERR("Source",ret,0,&KMmsNotificationDownload);
 					continue;
 					}
 				tMmsNotificationDownload.iSrc = src;
@@ -4298,7 +4292,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,destn);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_64, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,1,KMmsNotificationDownload);
+					LOGPARSERR("Destination",ret,1,&KMmsNotificationDownload);
 					continue;
 					}
 				tMmsNotificationDownload.iDestn = destn;
@@ -4306,7 +4300,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,mmsNotfn);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_65, "WARNING - CONFIGURATION FILE PARSING - Reading element MMS NOTIFICATION returned %d (element no. %d) from tag %s.",ret,2,KMmsNotificationDownload);
+					LOGPARSERR("MMS notification",ret,2,&KMmsNotificationDownload);
 					continue;
 					}
 				location = mmsNotfn.Locate('\n');
@@ -4319,7 +4313,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,lastEnv);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_66, "WARNING - CONFIGURATION FILE PARSING - Reading element LAST ENVELOPE returned %d (element no. %d) from tag %s.",ret,3,KMmsNotificationDownload);
+					LOGPARSERR("Last envelope",ret,3,&KMmsNotificationDownload);
 					continue;
 					}
 				tMmsNotificationDownload.iLastEnv = lastEnv;
@@ -4327,7 +4321,7 @@
 				ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,UICCRsp);
 				if(ret!=KErrNone)
 					{
-					OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_67, "WARNING - CONFIGURATION FILE PARSING - Reading element UICC RESPONSE returned %d (element no. %d) from tag %s.",ret,4,KMmsNotificationDownload);
+					LOGPARSERR("UICC Response",ret,4,&KMmsNotificationDownload);
 					continue;
 					}
 				tMmsNotificationDownload.iUICCRsp = UICCRsp;
@@ -4336,7 +4330,7 @@
 				}
 			break;
 		default:
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_68, "Unknown command to process");
+			LOGMISC1("Unknown command to process");
 			return KErrNotSupported;
 
 		}

--- a/telephonyserverplugins/simtsy/src/CSimSerComm.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimSerComm.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -19,15 +19,9 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimSerCommTraces.h"
-#endif
-
 #include "CSimSerComm.h"
 #include "CSimPhone.h"
+#include "Simlog.h"
 
 MComm::MComm()
 /**
@@ -118,7 +112,7 @@
  * @return TInt		Standard error value.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, MCOMM_COMMOPEN1_1, "Attempting to Open Serial Port");
+	LOGDATA1("Attempting to Open Serial Port");
 	TInt err;
 	if (err = iCommServer.Connect(), err!=KErrNone)
 		return err;
@@ -138,7 +132,7 @@
 			return err;
 			}
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, MCOMM_COMMOPEN1_2, "Sucessfully Opened Serial Port");
+	LOGDATA1("Sucessfully Opened Serial Port");
 	return KErrNone;
 	}

--- a/telephonyserverplugins/simtsy/src/CSimSignalStrength.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimSignalStrength.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -20,16 +20,10 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimSignalStrengthTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 #include "CSimSignalStrength.h"
 #include "CSimPhone.h"
+#include "Simlog.h"
 #include "simtsyglobalproperties.h"
 
 const TInt KSignalStrengthGranularity=5;		// < Granularity for signal strength list array
@@ -73,7 +67,7 @@
 	iTimer=CSimTimer::NewL(iPhone);
 	iSignalStrengthInfo=new(ELeave) CArrayFixFlat<TSignalStrengthInfo>(KSignalStrengthGranularity);
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_CONSTRUCTL_1, "Starting to parse Signal Strength config parameters...");
+	LOGSS1("Starting to parse Signal Strength config parameters...");
 	
 	const CTestConfigItem* item=NULL;
 	TInt ret=KErrNone;
@@ -110,19 +104,19 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KSSLevel);
+			LOGPARSERR("duration",ret,0,&KSSLevel);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,ss);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element SS returned %d (element no. %d) from tag %s.",ret,1,KSSLevel);
+			LOGPARSERR("ss",ret,1,&KSSLevel);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,ssb);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SSB returned %d (element no. %d) from tag %s.",ret,2,KSSLevel);
+			LOGPARSERR("ssb",ret,2,&KSSLevel);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,err);
@@ -132,7 +126,7 @@
 			}
 		else
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_CONSTRUCTL_5, "Reading element SSB returned %d (element no. %d) from tag %s expected 0 or -1" ,ret,3,KSSLevel);
+			LOGPARSERRANGE("ssb",ret,3,&KSSLevel,"0 or -1");
 			}
 
 		TSignalStrengthInfo ssInfo;
@@ -143,7 +137,7 @@
 		iSignalStrengthInfo->AppendL(ssInfo);
 		}
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_CONSTRUCTL_6, "...Finished parsing Signal Strength config parameters...");
+	LOGSS1("...Finished parsing Signal Strength config parameters...");
 
 	if(iSignalStrengthInfo->Count()!=0)
 		{
@@ -222,7 +216,7 @@
  * @return TInt			Standard error value.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_GETSIGNALSTRENGTH_1, ">>CSimSignalStrength::GetSignalStrength");
+	LOGSS1(">>CSimSignalStrength::GetSignalStrength");
 	TPckg<TInt32>* ssPckg=(TPckg<TInt32>*)aPckg1;
 	TInt32& ss=(*ssPckg)();
 	TPckg<TInt8>* ssbPckg=(TPckg<TInt8>*)aPckg2;
@@ -236,7 +230,7 @@
 
 	ss=iCurrentLevel;
 	ssb=iCurrentBar;
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_GETSIGNALSTRENGTH_2, "<<CSimSignalStrength::GetSignalStrength with level=%d dB and bar=%d",(TInt)iCurrentLevel,(TInt)iCurrentBar);
+	LOGSS3("<<CSimSignalStrength::GetSignalStrength with level=%d dB and bar=%d",iCurrentLevel,iCurrentBar);
 	iPhone->ReqCompleted(aReqHandle,iCurrentError);
 	return KErrNone;
 	}
@@ -254,7 +248,7 @@
  * @return TInt			Standard error value.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_NOTIFYSIGNALSTRENGTHCHANGE_1, ">>CSimSignalStrength::NotifySignalStrengthChange");
+	LOGSS1(">>CSimSignalStrength::NotifySignalStrengthChange");
 	TPckg<TInt32>* ssPckg=(TPckg<TInt32>*)aPckg1;
 	TInt32& ss=(*ssPckg)();
 	TPckg<TInt8>* ssbPckg=(TPckg<TInt8>*)aPckg2;
@@ -281,12 +275,12 @@
 	{
 	if(iSSChangeNotificationPending)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_NOTIFYSIGNALSTRENGTHCHANGECANCEL_1, "CSimSignalStrength::NotifySignalStrengthChange has been cancelled");
+		LOGSS1("CSimSignalStrength::NotifySignalStrengthChange has been cancelled");
 		iSSChangeNotificationPending=EFalse;
 		iPhone->ReqCompleted(iSSChangeNotificationReqHandle,KErrCancel);
 		}
 	else 
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_NOTIFYSIGNALSTRENGTHCHANGECANCEL_2, "CSimSignalStrength::NotifySignalStrengthChange was not outstanding and hasn't been cancelled");
+		LOGSS1("CSimSignalStrength::NotifySignalStrengthChange was not outstanding and hasn't been cancelled");
 	}
 
 void CSimSignalStrength::TimerCallBack(TInt /*aId*/)
@@ -314,7 +308,7 @@
 		iSSChangeNotificationPending=EFalse;
 		*iSSChangeNotificationSSLevel=iCurrentLevel;
 		*iSSChangeNotificationSSBarLevel=iCurrentBar;
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_TIMERCALLBACK_1, "<<CSimSignalStrength::NotifySignalStrengthChange with level=%d dB and bar=%d",(TInt)iCurrentLevel,(TInt)iCurrentBar);
+		LOGSS3("<<CSimSignalStrength::NotifySignalStrengthChange with level=%d dB and bar=%d",iCurrentLevel,iCurrentBar);
 		iPhone->ReqCompleted(iSSChangeNotificationReqHandle,iCurrentError);
 		}
 	iTimer->Start(iSignalStrengthInfo->At(iSSIndex).iDuration,this);
@@ -337,7 +331,7 @@
  */
 void CSimSignalStrength::PubSubCallback(TInt aNewVal)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_PUBSUBCALLBACK_1, "CSimSignalStrength::SignalStrengthChangeCallBack newVal=%d", aNewVal);
+	LOGSS2("CSimSignalStrength::SignalStrengthChangeCallBack newVal=%d", aNewVal);
 	if (iCurrentBar == aNewVal)
 		{
 		return;
@@ -348,7 +342,7 @@
 		iSSChangeNotificationPending=EFalse;
 		*iSSChangeNotificationSSLevel=iCurrentLevel;
 		*iSSChangeNotificationSSBarLevel=iCurrentBar;
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_PUBSUBCALLBACK_2, "<<CSimSignalStrength::NotifySignalStrengthChange with level=%d dB and bar=%d",(TInt)iCurrentLevel,(TInt)iCurrentBar);
+		LOGSS3("<<CSimSignalStrength::NotifySignalStrengthChange with level=%d dB and bar=%d",iCurrentLevel,iCurrentBar);
 		iPhone->ReqCompleted(iSSChangeNotificationReqHandle,iCurrentError);
 		}
 	}

--- a/telephonyserverplugins/simtsy/src/CSimSmsStore.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimSmsStore.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2003-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"
@@ -19,18 +19,12 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimSmsStoreTraces.h"
-#endif
-
 #include <mmlist.h>
 #include <mmretrieve.h>
 #include <testconfigfileparser.h>
 #include "CSimSmsStore.h"
 #include "csimsmsmess.h"
+#include "Simlog.h"
 #include "CSimTsyMode.h"
 
 const TInt KSmsStoreGranularity=2;
@@ -132,7 +126,7 @@
 	iSmsMaxNumSlots=aMaxNumSlots;
 	iSmsStoreName.Copy(aName);
 	iSmsReadAll=new(ELeave) CArrayPtrFlat<CListReadAllAttempt>(KSmsStoreGranularity);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_CONSTRUCTL_1, "Starting to parse SMS Store config parameters...");
+	LOGSMS1("Starting to parse SMS Store config parameters...");
 	iSmsIndividualPause=CfgFileSection()->ItemValue(KSmsStoreIndividualReqPause,KDefaultSmsStoreIndividualReqPause);
 	iSmsBatchPause=CfgFileSection()->ItemValue(KSmsStoreBatchReqPause,KDefaultSmsStoreBatchReqPause);
 	
@@ -144,7 +138,7 @@
 		TInt ret0=CTestConfig::GetElement(item0->Value(),KStdDelimiter,0,value0);
 		if(ret0!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element VALUE0 returned %d (element no. %d) from tag %s.",ret0,0,KSmsPhoneStoreCaps);
+			LOGPARSERR("value0",ret0,0,&KSmsPhoneStoreCaps);
 			iSmsStoreCaps=KDefaultSmsPhoneStoreCaps+KDefaultSmsOnlySmsCaps;
 			}
 		else
@@ -161,7 +155,7 @@
 		iSmsStoreCaps=KDefaultSmsPhoneStoreCaps+KDefaultSmsOnlySmsCaps;
 
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_CONSTRUCTL_3, "...Finished parsing SMS Store config parameters");
+	LOGSMS1("...Finished parsing SMS Store config parameters");
 	iTimer=CSimTimer::NewL(iSmsMessaging->iPhone);
 	iIncomingTimer=CSimTimer::NewL(iSmsMessaging->iPhone);
 	}
@@ -176,7 +170,7 @@
  * "SmsStoreEntry = <store name>, <slot number>, <entry status>, <pdu>"
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_1, "Starting reading SMS Store entries...");
+	LOGSMS1("Starting reading SMS Store entries...");
 	TInt count=CfgFileSection()->ItemCount(KSmsStoreEntry);
 	const CTestConfigItem* item=NULL;
 	TInt ret=KErrNone;
@@ -191,7 +185,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,storeName);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_2, "WARNING - CONFIGURATION FILE PARSING - Reading element STORENAME returned %d (element no. %d) from tag %s.",ret,0,KSmsStoreEntry);
+			LOGPARSERR("storeName",ret,0,&KSmsStoreEntry);
 			continue;
 			}
 		if(storeName.MatchF(iSmsStoreName)!=0)
@@ -202,21 +196,21 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,index);
 		if((ret!=KErrNone)||(index>=iSmsMaxNumSlots))
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_3, "WARNING - CONFIGURATION FILE PARSING - Reading element INDEX returned %d (element no. %d) from tag %s.",ret,1,KSmsStoreEntry);
+			LOGPARSERR("index",ret,1,&KSmsStoreEntry);
 			continue;
 			}
 	
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,stat);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_4, "WARNING - CONFIGURATION FILE PARSING - Reading element STAT returned %d (element no. %d) from tag %s",ret,2,KSmsStoreEntry);
+			LOGPARSERR("stat",ret,2,&KSmsStoreEntry);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,pdu);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_5, "WARNING - CONFIGURATION FILE PARSING - Reading element PDU returned %d (element no. %d) from tag %s.",ret,3,KSmsStoreEntry);
+			LOGPARSERR("pdu",ret,3,&KSmsStoreEntry);
 			continue;
 			}
 
@@ -224,7 +218,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,sca);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_6, "WARNING - CONFIGURATION FILE PARSING - Reading element SCA returned %d (element no. %d) from tag %s.",ret,4,KSmsStoreEntry);
+			LOGPARSERR("sca",ret,4,&KSmsStoreEntry);
 			continue;
 			}
 		iGsmSmsStoreEntries[index].iIndex=index;
@@ -233,7 +227,7 @@
 		RecordSca(sca, index);
 		}
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_7, "...Finished reading SMS Store entries");
+	LOGSMS1("...Finished reading SMS Store entries");
 	}
 
 
@@ -274,7 +268,7 @@
 	delete iIncomingTimer;
 	}
 
-#ifdef OST_TRACE_COMPILER_IN_USE
+#ifdef _DEBUG
 void CSimSmsStore::LogRequest(TBool aEntering, TInt aIpc, TInt aError)
 #else
 void CSimSmsStore::LogRequest(TBool aEntering, TInt aIpc, TInt /*aError*/)
@@ -330,11 +324,11 @@
 
 	if (aEntering!=EFalse)
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_LOGREQUEST_1, ">>%d,CSimSmsStore::%s",aIpc, ipcBuf );
+		LOGSMS3(">>%d,CSimSmsStore::%S",aIpc, &ipcBuf );
 		}
 	else
-		{	
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_LOGREQUEST_2, "<<%d,CSimSmsStore::%s with error %d",aIpc, ipcBuf, aError);	
+		{
+		LOGSMS4("<<%d,CSimSmsStore::%S with error %d",aIpc, &ipcBuf, aError);
 		}
 	}
 
@@ -1183,7 +1177,7 @@
 * @return CTestConfigSection a pointer to the configuration file data section
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_CFGFILESECTION_1, ">>CSimSmsStore::CfgFileSection");
+	LOGSMS1(">>CSimSmsStore::CfgFileSection");
 	return iSmsMessaging->CfgFileSection();
 	}

--- a/telephonyserverplugins/simtsy/src/CSimUsimR6.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimUsimR6.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -19,18 +19,12 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimUsimR6Traces.h"
-#endif
-
 #include <e32property.h>
 #include <testconfigfileparser.h>
 #include <sacls.h>
 #include <e32math.h>
 #include "CSimPhone.h"
+#include "Simlog.h"
 #include "CSimPubSubChange.h"
 #include "CSimTsyMode.h"
 #include <etelmmerr.h>
@@ -83,7 +77,7 @@
  * 
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_1, "CSimUsimR6: Entered ConstructL()");
+	LOGMISC1("CSimUsimR6: Entered ConstructL()");
 	iVoiceMailIds=new(ELeave) CArrayFixFlat<RMobilePhone::TMobilePhoneVoicemailIdsV8>(KUsimGranularity);
 	iMessageWaiting=new(ELeave) CArrayFixFlat<RMobilePhone::TMobilePhoneMessageWaitingV8>(KUsimGranularity);
 	
@@ -133,31 +127,31 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,voice);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element VOICE returned %d (element no. %d) from tag %s.",ret,0,KUsimMailBoxIdInfo);
+			LOGPARSERR("voice",ret,0,&KUsimMailBoxIdInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,data);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element DATA returned %d (element no. %d) from tag %s.",ret,1,KUsimMailBoxIdInfo);
+			LOGPARSERR("data",ret,1,&KUsimMailBoxIdInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,fax);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element FAX returned %d (element no. %d) from tag %s.",ret,2,KUsimMailBoxIdInfo);
+			LOGPARSERR("fax",ret,2,&KUsimMailBoxIdInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,other);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element OTHER returned %d (element no. %d) from tag %s.",ret,3,KUsimMailBoxIdInfo);
+			LOGPARSERR("other",ret,3,&KUsimMailBoxIdInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,video);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element VIDEO returned %d (element no. %d) from tag %s.",ret,4,KUsimMailBoxIdInfo);
+			LOGPARSERR("video",ret,4,&KUsimMailBoxIdInfo);
 			continue;
 			}
 		RMobilePhone::TMobilePhoneVoicemailIdsV8 mailboxIdInfo;
@@ -181,49 +175,49 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,displayStatus);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element DISPLAYSTATUS returned %d (element no. %d) from tag %s.",ret,0,KUsimMessageWaitingIdInfo);
+			LOGPARSERR("displayStatus",ret,0,&KUsimMessageWaitingIdInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,voiceMsgs);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element VOICEMSGS returned %d (element no. %d) from tag %s.",ret,1,KUsimMessageWaitingIdInfo);
+			LOGPARSERR("voiceMsgs",ret,1,&KUsimMessageWaitingIdInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,auxVoiceMsgs);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element AUXVOICEMSGS returned %d (element no. %d) from tag %s.",ret,2,KUsimMessageWaitingIdInfo);
+			LOGPARSERR("auxVoiceMsgs",ret,2,&KUsimMessageWaitingIdInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,dataMsgs);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element DATAMSGS returned %d (element no. %d) from tag %s.",ret,3,KUsimMessageWaitingIdInfo);
+			LOGPARSERR("dataMsgs",ret,3,&KUsimMessageWaitingIdInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,faxMsgs);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element FAXMSGS returned %d (element no. %d) from tag %s.",ret,4,KUsimMessageWaitingIdInfo);
+			LOGPARSERR("faxMsgs",ret,4,&KUsimMessageWaitingIdInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,emailMsgs);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element EMAILMSGS returned %d (element no. %d) from tag %s.",ret,5,KUsimMessageWaitingIdInfo);
+			LOGPARSERR("emailMsgs",ret,5,&KUsimMessageWaitingIdInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,otherMsgs);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element OTHERMSGS returned %d (element no. %d) from tag %s.",ret,6,KUsimMessageWaitingIdInfo);
+			LOGPARSERR("otherMsgs",ret,6,&KUsimMessageWaitingIdInfo);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,videoMsgs);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element LONGNAME returned %d (element no. %d) from tag %s.",ret,7,KUsimMessageWaitingIdInfo);
+			LOGPARSERR("longName",ret,7,&KUsimMessageWaitingIdInfo);
 			continue;
 			}
 		RMobilePhone::TMobilePhoneMessageWaitingV8 messageWaiting;
@@ -252,7 +246,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,FieldsUsed);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element FIELDS USED returned %d (element no. %d) from tag %s.",ret,0,KUsimWlanDataInfo);
+			LOGPARSERR("Fields Used",ret,0,&KUsimWlanDataInfo);
 			continue;
 			}
 		else 
@@ -265,7 +259,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,Pseudonym);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element PSEUDONYM returned %d (element no. %d) from tag %s.",ret,1,KUsimWlanDataInfo);
+			LOGPARSERR("Pseudonym",ret,1,&KUsimWlanDataInfo);
 			continue;
 			}
 		else
@@ -275,7 +269,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,ReauthenticationId);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element REAUTHENTICATIONID returned %d (element no. %d) from tag %s.",ret,2,KUsimWlanDataInfo);
+			LOGPARSERR("ReauthenticationId",ret,2,&KUsimWlanDataInfo);
 			continue;
 			}
 		else
@@ -285,7 +279,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,MasterKey);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element MASTERKEY returned %d (element no. %d) from tag %s.",ret,3,KUsimWlanDataInfo);
+			LOGPARSERR("MasterKey",ret,3,&KUsimWlanDataInfo);
 			continue;
 			}
 		else
@@ -295,7 +289,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,Counter);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNTER returned %d (element no. %d) from tag %s.",ret,4,KUsimWlanDataInfo);
+			LOGPARSERR("Counter",ret,4,&KUsimWlanDataInfo);
 			continue;
 			}
 		else
@@ -319,7 +313,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,wlanSidBuf);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element WLAN SID BUFFER returned %d (element no. %d) from tag %s.",ret,0,KUsimWlanSidInfo);
+			LOGPARSERR("Wlan Sid Buffer",ret,0,&KUsimWlanSidInfo);
 			continue;
 			}
 		else 
@@ -329,7 +323,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,userDef);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element USER DEFINED returned %d (element no. %d) from tag %s.",ret,1,KUsimWlanSidInfo);
+			LOGPARSERR("User Defined",ret,1,&KUsimWlanSidInfo);
 			continue;
 			}
 		else
@@ -353,7 +347,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,accessId);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element ACCESS ID returned %d (element no. %d) from tag %s.",ret,0,KUsimPreferredNetworksInfo);
+			LOGPARSERR("Access Id",ret,0,&KUsimPreferredNetworksInfo);
 			continue;
 			}
 		else 
@@ -366,7 +360,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,userDef);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element USER DEFINED returned %d (element no. %d) from tag %s.",ret,1,KUsimPreferredNetworksInfo);
+			LOGPARSERR("User Defined",ret,1,&KUsimPreferredNetworksInfo);
 			continue;
 			}
 		else
@@ -376,7 +370,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,countryCode);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNTRY CODE returned %d (element no. %d) from tag %s.",ret,1,KUsimPreferredNetworksInfo);
+			LOGPARSERR("Country Code",ret,1,&KUsimPreferredNetworksInfo);
 			continue;
 			}
 		else
@@ -386,7 +380,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,networkId);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_25, "WARNING - CONFIGURATION FILE PARSING - Reading element NETWORK ID returned %d (element no. %d) from tag %s.",ret,1,KUsimPreferredNetworksInfo);
+			LOGPARSERR("Network Id",ret,1,&KUsimPreferredNetworksInfo);
 			continue;
 			}
 		else
@@ -396,7 +390,7 @@
 		
 		iPreferredNetworks->AppendL(networkEntry);
 		}	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_26, "Starting to Parse GBA Authentication Info");
+	LOGPHONE1("Starting to Parse GBA Authentication Info");
 	count = CfgFile()->ItemCount(KGBAAuthInfo);
 	TGBAAuthInfo authInfo;
 
@@ -417,7 +411,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, AUTN);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_27, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTN returned %d (element no. %d) from tag %s.",ret,0,KGBAAuthInfo);
+			LOGPARSERR("AUTN",ret,0,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -428,7 +422,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, RAND);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_28, "WARNING - CONFIGURATION FILE PARSING - Reading element RAND returned %d (element no. %d) from tag %s.",ret,1,KGBAAuthInfo);
+			LOGPARSERR("RAND",ret,1,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -439,7 +433,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 2, appId);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_29, "WARNING - CONFIGURATION FILE PARSING - Reading element APPID returned %d (element no. %d) from tag %s.",ret,2,KGBAAuthInfo);
+			LOGPARSERR("APPID",ret,2,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -450,7 +444,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 3, RES);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_30, "WARNING - CONFIGURATION FILE PARSING - Reading element RES returned %d (element no. %d) from tag %s.",ret,3,KGBAAuthInfo);
+			LOGPARSERR("RES",ret,3,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -461,7 +455,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 4, AUTS);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_31, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTS returned %d (element no. %d) from tag %s.",ret,4,KGBAAuthInfo);
+			LOGPARSERR("AUTS",ret,4,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -472,7 +466,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 5, NAFID);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_32, "WARNING - CONFIGURATION FILE PARSING - Reading element NAFID returned %d (element no. %d) from tag %s.",ret,5,KGBAAuthInfo);
+			LOGPARSERR("NAFID",ret,5,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -483,7 +477,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 6, IMPI);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_33, "WARNING - CONFIGURATION FILE PARSING - Reading element IMPI returned %d (element no. %d) from tag %s.",ret,6,KGBAAuthInfo);
+			LOGPARSERR("IMPI",ret,6,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -494,7 +488,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 7, KSExtNaf);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_34, "WARNING - CONFIGURATION FILE PARSING - Reading element KSEXTNAF returned %d (element no. %d) from tag %s.",ret,7,KGBAAuthInfo);
+			LOGPARSERR("KSExtNaf",ret,7,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -505,7 +499,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 8, BtID);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_35, "WARNING - CONFIGURATION FILE PARSING - Reading element BTID returned %d (element no. %d) from tag %s.",ret,8,KGBAAuthInfo);
+			LOGPARSERR("BtID",ret,8,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -516,7 +510,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 9, KeyLifeTime);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_36, "WARNING - CONFIGURATION FILE PARSING - Reading element KEYLIFETIME returned %d (element no. %d) from tag %s.",ret,9,KGBAAuthInfo);
+			LOGPARSERR("KeyLifeTime",ret,9,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -527,7 +521,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 10, OtherApplnBusy);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_37, "WARNING - CONFIGURATION FILE PARSING - Reading element OTHERAPPLNBUSY returned %d (element no. %d) from tag %s.",ret,10,KGBAAuthInfo);
+			LOGPARSERR("OtherApplnBusy",ret,10,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -538,7 +532,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 11, applnActive);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_38, "WARNING - CONFIGURATION FILE PARSING - Reading element APPLNACTIVE returned %d (element no. %d) from tag %s.",ret,11,KGBAAuthInfo);
+			LOGPARSERR("applnActive",ret,11,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -549,7 +543,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 12, authErr);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_39, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTHERR returned %d (element no. %d) from tag %s.",ret,12,KGBAAuthInfo);
+			LOGPARSERR("authErr",ret,12,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -559,7 +553,7 @@
 		iGBAAuthInfoList->AppendL(authInfo);
 		CleanupStack::Pop(item);
 		} // end FOR Loop
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_40, "Starting to Parse GBA 2 Phase Retrieval list information");
+	LOGPHONE1("Starting to Parse GBA 2 Phase Retrieval list information");
 	count = CfgFile()->ItemCount(KGBAListInfo);
 	RMobilePhone::TGbaNafEntryV8 entry;
 	for(index = 0; index < count; index++)
@@ -577,7 +571,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, NafId);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_41, "WARNING - CONFIGURATION FILE PARSING - Reading element NAFID returned %d (element no. %d) from tag %s.",ret,0,KGBAListInfo);
+			LOGPARSERR("NafID",ret,0,&KGBAListInfo);
 			continue;
 			}
 		else
@@ -589,7 +583,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, Btid);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_42, "WARNING - CONFIGURATION FILE PARSING - Reading element BTID returned %d (element no. %d) from tag %s.",ret,1,KGBAListInfo);
+			LOGPARSERR("BTID",ret,1,&KGBAListInfo);
 			continue;
 			}
 		else
@@ -600,7 +594,7 @@
 		iGbaNafList->AddEntryL(entry);
 		CleanupStack::Pop(item);
 		}	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_43, "Starting to Parse MBMS related config information");
+	LOGPHONE1("Starting to Parse MBMS related config information");
 	count = CfgFile()->ItemCount(KMBMSInfo);
 	TMBMSInfo tMbmsInfo;
 	for(index = 0; index < count; index++)
@@ -622,7 +616,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, iMikey);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_44, "WARNING - CONFIGURATION FILE PARSING - Reading element IMIKEY returned %d (element no. %d) from tag %s.",ret,0,KMBMSInfo);
+			LOGPARSERR("iMikey",ret,0,&KMBMSInfo);
 			continue;
 			}
 		else
@@ -634,7 +628,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, oMikey);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_45, "WARNING - CONFIGURATION FILE PARSING - Reading element OMIKEY returned %d (element no. %d) from tag %s.",ret,1,KMBMSInfo);
+			LOGPARSERR("oMikey",ret,1,&KMBMSInfo);
 			continue;
 			}
 		else
@@ -646,7 +640,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 2, mtk);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_46, "WARNING - CONFIGURATION FILE PARSING - Reading element MTK returned %d (element no. %d) from tag %s.",ret,2,KMBMSInfo);
+			LOGPARSERR("MTK",ret,2,&KMBMSInfo);
 			continue;
 			}
 		else
@@ -658,7 +652,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 3, saltKey);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_47, "WARNING - CONFIGURATION FILE PARSING - Reading element SALTKEY returned %d (element no. %d) from tag %s.",ret,3,KMBMSInfo);
+			LOGPARSERR("saltKey",ret,3,&KMBMSInfo);
 			continue;
 			}
 		else
@@ -670,7 +664,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 4, keyDmn );
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_48, "WARNING - CONFIGURATION FILE PARSING - Reading element KEYDMN  returned %d (element no. %d) from tag %s.",ret,4,KMBMSInfo);
+			LOGPARSERR("keyDmn ",ret,4,&KMBMSInfo);
 			continue;
 			}
 		else
@@ -682,7 +676,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 5, MskIdgrp);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_49, "WARNING - CONFIGURATION FILE PARSING - Reading element MSKIDGRP returned %d (element no. %d) from tag %s.",ret,5,KMBMSInfo);
+			LOGPARSERR("MskIdgrp",ret,5,&KMBMSInfo);
 			continue;
 			}
 		else
@@ -694,7 +688,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 6, MukId );
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_50, "WARNING - CONFIGURATION FILE PARSING - Reading element IMUKIDTLV  returned %d (element no. %d) from tag %s.",ret,6,KMBMSInfo);
+			LOGPARSERR("iMukIdTlv ",ret,6,&KMBMSInfo);
 			continue;
 			}
 		else
@@ -706,7 +700,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 7, MukIdi);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_51, "WARNING - CONFIGURATION FILE PARSING - Reading element MUKIDI returned %d (element no. %d) from tag %s.",ret,7,KMBMSInfo);
+			LOGPARSERR("MukIdi",ret,7,&KMBMSInfo);
 			continue;
 			}
 		else
@@ -718,7 +712,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 8, MukIdr );
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_52, "WARNING - CONFIGURATION FILE PARSING - Reading element MUKIDR  returned %d (element no. %d) from tag %s.",ret,8,KMBMSInfo);
+			LOGPARSERR("MukIdr ",ret,8,&KMBMSInfo);
 			continue;
 			}
 		else
@@ -730,7 +724,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 9, MukTimeStamp );
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_53, "WARNING - CONFIGURATION FILE PARSING - Reading element IMIKEY returned %d (element no. %d) from tag %s.",ret,9,KMBMSInfo);
+			LOGPARSERR("iMikey",ret,9,&KMBMSInfo);
 			continue;
 			}
 		else
@@ -742,7 +736,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 10, appId);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_54, "WARNING - CONFIGURATION FILE PARSING - Reading element APPID returned %d (element no. %d) from tag %s.", ret, 10, KMBMSInfo);
+			LOGPARSERR ("APPID", ret, 10, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -754,7 +748,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 11,KSIntNaf);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_55, "WARNING - CONFIGURATION FILE PARSING - Reading element KSINTNAF returned %d (element no. %d) from tag %s.", ret, 11, KMBMSInfo);
+			LOGPARSERR ("KSIntNaf", ret, 11, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -766,7 +760,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 12,applnActive);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_56, "WARNING - CONFIGURATION FILE PARSING - Reading element APPLNACTIVE returned %d (element no. %d) from tag %s.", ret, 12, KMBMSInfo);
+			LOGPARSERR ("applnActive", ret, 12, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -778,7 +772,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 13,authErr);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_57, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTHERR returned %d (element no. %d) from tag %s.", ret, 13, KMBMSInfo);
+			LOGPARSERR ("authErr", ret, 13, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -790,7 +784,7 @@
 		CleanupStack::Pop(item);
 		}
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_58, "Starting to Parse MBMS 2 Phase Retrieval list information");
+	LOGPHONE1("Starting to Parse MBMS 2 Phase Retrieval list information");
 	count = CfgFile()->ItemCount(KMBMSListInfo);
 	RMobilePhone::TMskEntryV8 mskEntry;
 	for(index = 0; index < count; index++)
@@ -808,7 +802,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, MskId);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_59, "WARNING - CONFIGURATION FILE PARSING - Reading element MSKID returned %d (element no. %d) from tag %s.",ret,0,KMBMSListInfo);
+			LOGPARSERR("MskId",ret,0,&KMBMSListInfo);
 			continue;
 			}
 		else
@@ -820,7 +814,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, KeyDomain);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_60, "WARNING - CONFIGURATION FILE PARSING - Reading element KEYDOMAIN returned %d (element no. %d) from tag %s.",ret,1,KMBMSListInfo);
+			LOGPARSERR("KeyDomain",ret,1,&KMBMSListInfo);
 			continue;
 			}
 		else
@@ -833,7 +827,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 2, TimeStamp);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_61, "WARNING - CONFIGURATION FILE PARSING - Reading element TIMESTAMPCOUNTER returned %d (element no. %d) from tag %s.",ret,2,KMBMSListInfo);
+			LOGPARSERR("TimeStampCounter",ret,2,&KMBMSListInfo);
 			continue;
 			}
 		else
@@ -860,7 +854,7 @@
 *
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_DTOR_1, "CSimUsimR6: Entered destructor");
+	LOGMISC1("CSimUsimR6: Entered destructor");
 	if(iTimer)
 		{
 		delete iTimer;
@@ -931,7 +925,7 @@
 		{
 		delete iMbmsMskList;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_DTOR_2, "CSimUsimR6: Leaving destructor");
+	LOGMISC1("CSimUsimR6: Leaving destructor");
 	}
 
 const CTestConfigSection* CSimUsimR6::CfgFile()
@@ -1163,7 +1157,7 @@
 			iGetAuthParams.iNotifyPending = EFalse;
 			}
 		iTimer->Start (RandTime (), this);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_TIMERCALLBACK_1, "<<CSimUsimR6::TimerCallBack - Exited ");
+		LOGMISC1("<<CSimUsimR6::TimerCallBack - Exited ");
 		}
 	}
 			
@@ -1824,7 +1818,7 @@
 * @param aTsyReqHandle handle to the request
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_GETPREFERREDWLANSIDSCANCEL_1, "CSimPhone::GetPreferredNetworksCancel");
+	LOGCALL1("CSimPhone::GetPreferredNetworksCancel");
 	iPhone->ReqCompleted(aTsyReqHandle,KErrNone);
 	// Remove the read all attempt from iGetWlanSIDsData
 	CListReadAllAttempt* read=NULL;
@@ -1839,7 +1833,7 @@
 			}
 		}
 	iPhone->ReqCompleted(aTsyReqHandle,KErrCancel);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_GETPREFERREDWLANSIDSCANCEL_2, "CSimPhone::GetPreferredWlanSIDsCancel");
+	LOGCALL1("CSimPhone::GetPreferredWlanSIDsCancel");
 	return KErrNone;
 	}
 	
@@ -1964,7 +1958,7 @@
 * @param aTsyReqHandle handle to the request
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_GETPREFERREDNETWORKSCANCEL_1, "CSimPhone::GetPreferredNetworksCancel");
+	LOGCALL1("CSimPhone::GetPreferredNetworksCancel");
 	iPhone->ReqCompleted(aTsyReqHandle,KErrNone);
 	CListReadAllAttempt* read=NULL;
 	for (TInt i=0; i<iGetPreferredNetworks->Count(); ++i)
@@ -1978,7 +1972,7 @@
 			}
 		}
 	iPhone->ReqCompleted(aTsyReqHandle,KErrCancel);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_GETPREFERREDNETWORKSCANCEL_2, "CSimPhone::GetPreferredNetworksCancel");
+	LOGCALL1("CSimPhone::GetPreferredNetworksCancel");
 	return KErrNone;
 	}

--- a/telephonyserverplugins/simtsy/src/CSimVoiceCall.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimVoiceCall.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -21,18 +21,12 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimVoiceCallTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 
 #include "CSimVoiceCall.h"
 #include "CSimPhone.h"
 #include "CSimDtmf.h"
+#include "Simlog.h"
 #include "CSimTsyMode.h"
 
 CSimVoiceCall* CSimVoiceCall::NewL(CSimLine* aLine,const TDesC& aName, CSimPhone* aPhone)
@@ -69,7 +63,7 @@
 * @param aName name of the voice call to be constructed
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_CONSTRUCTL_1, "Starting to parse Voice Call config parameters...");
+	LOGVOICE1("Starting to parse Voice Call config parameters...");
 	iCaps=Caps();
 	iDiallingPause=iLine->CfgFile()->ItemValue(KDiallingPauseDuration,KDefaultDiallingPauseDuration);
 	iConnectingPause=iLine->CfgFile()->ItemValue(KConnectingPauseDuration,KDefaultConnectingPauseDuration);
@@ -91,17 +85,17 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,delay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element DELAY returned %d (element no. %d) from tag %s.",ret,0,KNotifyRemotePartyInfo);
+			LOGPARSERR("delay",ret,0,&KNotifyRemotePartyInfo);
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,callingname);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CALLINGNAME returned %d (element no. %d) from tag %s.",ret,1,KNotifyRemotePartyInfo);
+			LOGPARSERR("callingname",ret,1,&KNotifyRemotePartyInfo);
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,remotenumber);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element REMOTENUMBER returned %d (element no. %d) from tag %s.",ret,2,KNotifyRemotePartyInfo);
+			LOGPARSERR("remotenumber",ret,2,&KNotifyRemotePartyInfo);
 			}
 		
 		iNotifyRemotePartyInfoTimer->iDelay = delay;
@@ -117,7 +111,7 @@
 		iNotifyRemotePartyInfoTimer->iRemotePartyInfoV1.iRemoteIdStatus = RMobileCall::ERemoteIdentityUnknown;
 		}
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_CONSTRUCTL_5, "...Finished parsing Voice Call config parameters...");
+	LOGVOICE1("...Finished parsing Voice Call config parameters...");
 	}
 
 CSimVoiceCall::~CSimVoiceCall()
@@ -286,7 +280,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIAL_1, ">>CSimVoiceCall::Dial");
+	LOGVOICE1(">>CSimVoiceCall::Dial");
 	// Note: The telephone number and call parameters should be validated against config file
 	//       values here.
 	
@@ -298,14 +292,14 @@
 		
 		if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIAL_2, "<<CSimVoiceCall::Dial request from Etel 3rd Party client.");
+			LOGVOICE1("<<CSimVoiceCall::Dial request from Etel 3rd Party client.");
 			}
 		}
 
 	iDialRequestHandle=aTsyReqHandle;
 	TInt ret;
 	ret = ActionEvent(ECallEventDial,KErrNone);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIAL_3, "<<CSimVoiceCall::Dial");
+	LOGVOICE1("<<CSimVoiceCall::Dial");
 	return ret;
 	}
 	
@@ -317,7 +311,7 @@
 * @return KErrNone if successfully cancelled
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALCANCEL_1, ">>CSimVoiceCall::DialCancel");
+	LOGVOICE1(">>CSimVoiceCall::DialCancel");
 	switch(iState)
 		{
 	case RMobileCall::EStatusIdle:
@@ -348,7 +342,7 @@
 	default:
 		break;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALCANCEL_2, "<<CSimVoiceCall::DialCancel");
+	LOGVOICE1("<<CSimVoiceCall::DialCancel");
 	return KErrNone;
 	}
 
@@ -362,7 +356,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISV_1, ">>CSimVoiceCall::DialISV");
+	LOGVOICE1(">>CSimVoiceCall::DialISV");
 	// Note: The telephone number and call parameters should be validated against config file
 	//       values here.
 	
@@ -374,14 +368,14 @@
 		
 		if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISV_2, "<<CSimVoiceCall::Dial request from Etel 3rd Party client.");
+			LOGVOICE1("<<CSimVoiceCall::Dial request from Etel 3rd Party client.");
 			}
 		}
 
 	iDialRequestHandle=aTsyReqHandle;
 	TInt ret;
 	ret = ActionEvent(ECallEventDial,KErrNone);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISV_3, "<<CSimVoiceCall::DialISV");
+	LOGVOICE1("<<CSimVoiceCall::DialISV");
 	return ret;
 	}
 
@@ -393,7 +387,7 @@
 * @return KErrNone if successfully cancelled
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISVCANCEL_1, ">>CSimVoiceCall::DialISVCancel");
+	LOGVOICE1(">>CSimVoiceCall::DialISVCancel");
 	switch(iState)
 		{
 	case RMobileCall::EStatusIdle:
@@ -424,7 +418,7 @@
 	default:
 		break;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISVCANCEL_2, "<<CSimVoiceCall::DialISVCancel");
+	LOGVOICE1("<<CSimVoiceCall::DialISVCancel");
 	return KErrNone;
 	}
 
@@ -439,7 +433,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALL_1, ">>CSimVoiceCall::AnswerIncomingCall  0x%08x, state %d entry ",(TUint)this,iState);
+	LOGVOICE3(">>CSimVoiceCall::AnswerIncomingCall  0x%08x, state %d entry ",this,iState);
 	
 	//see where the answer request has orignated from
 	if(aCallParams)
@@ -449,7 +443,7 @@
 		
 		if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALL_2, "<<CSimVoiceCall::AnswerIncomingCall request from Etel 3rd Party client.");
+			LOGVOICE1("<<CSimVoiceCall::AnswerIncomingCall request from Etel 3rd Party client.");
 			}
 		}
 	
@@ -476,7 +470,7 @@
 		if(ret==KErrNone)
 			ret = ActionEvent(ECallEventAnswerIncoming,KErrNone);		
 		}
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALL_3, "<<CSimVoiceCall::AnswerIncomingCall  0x%08x, state %d exit",(TUint)this,iState);
+	LOGVOICE3("<<CSimVoiceCall::AnswerIncomingCall  0x%08x, state %d exit",this,iState);
 	return ret;
 	}
 
@@ -488,14 +482,14 @@
 * @return KErrNone if successfully cancelled
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLCANCEL_1, ">>CSimVoiceCall::AnswerIncomingCallCancel");
+	LOGVOICE1(">>CSimVoiceCall::AnswerIncomingCallCancel");
 	if(iAnswerIncomingCall.iNotifyPending)
 		{
 		iAnswerIncomingCall.iNotifyPending=EFalse;
 		iLine->ResetAutoAnswerCallObject(this);
 		ReqCompleted(iAnswerIncomingCall.iNotifyHandle,KErrCancel);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLCANCEL_2, "<<CSimVoiceCall::AnswerIncomingCallCancel");
+	LOGVOICE1("<<CSimVoiceCall::AnswerIncomingCallCancel");
 	return KErrNone;
 	}
 
@@ -510,7 +504,7 @@
 * @return KErrNone
 */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVL_1, ">>CSimVoiceCall::AnswerIncomingCallISV  0x%08x, state %d entry ",(TUint)this,iState);
+	LOGVOICE3(">>CSimVoiceCall::AnswerIncomingCallISV  0x%08x, state %d entry ",this,iState);
 	
 	//see where the answer request has orignated from
 	if(aCallParams)
@@ -520,7 +514,7 @@
 		
 		if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVL_2, "<<CSimVoiceCall::AnswerIncomingCallISV request from Etel 3rd Party client.");
+			LOGVOICE1("<<CSimVoiceCall::AnswerIncomingCallISV request from Etel 3rd Party client.");
 			}
 		}
 	
@@ -549,7 +543,7 @@
 				ret = ActionEvent(ECallEventAnswerIncoming,KErrNone);		
 	 		    }		
 		}
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVL_3, "<<CSimVoiceCall::AnswerIncomingCallISV  0x%08x, state %d exit",(TUint)this,iState);
+	LOGVOICE3("<<CSimVoiceCall::AnswerIncomingCallISV  0x%08x, state %d exit",this,iState);
 	return ret;
 	}
 
@@ -561,14 +555,14 @@
 * @return KErrNone if successfully cancelled
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVCANCEL_1, ">>CSimVoiceCall::AnswerIncomingCallISVCancel");
+	LOGVOICE1(">>CSimVoiceCall::AnswerIncomingCallISVCancel");
 	if(iAnswerIncomingCall.iNotifyPending)
 		{
 		iAnswerIncomingCall.iNotifyPending=EFalse;
 		iLine->ResetAutoAnswerCallObject(this);
 		ReqCompleted(iAnswerIncomingCall.iNotifyHandle,KErrCancel);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVCANCEL_2, "<<CSimVoiceCall::AnswerIncomingCallISVCancel");
+	LOGVOICE1("<<CSimVoiceCall::AnswerIncomingCallISVCancel");
 	return KErrNone;
 	}
 
@@ -592,12 +586,12 @@
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_HANGUP_1, ">>CSimVoiceCall::HangUp");
+	LOGVOICE1(">>CSimVoiceCall::HangUp");
 	iHangUpRequestHandle=aTsyReqHandle;
 	TInt ret=ActionEvent(ECallEventHangUp,KErrNone);
 	if(ret!=KErrNone)
 		ReqCompleted(aTsyReqHandle,ret);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_HANGUP_2, "<<CSimVoiceCall::HangUp");
+	LOGVOICE1("<<CSimVoiceCall::HangUp");
 	return KErrNone;
 	}
 
@@ -609,7 +603,7 @@
 * @return KErrNone if successfully cancelled
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_HANGUPCANCEL_1, ">>CSimVoiceCall::HangUpCancel");
+	LOGVOICE1(">>CSimVoiceCall::HangUpCancel");
 	switch(iState)
 		{
 	case RMobileCall::EStatusIdle:
@@ -635,7 +629,7 @@
 	default:
 		break;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_HANGUPCANCEL_2, "<<CSimVoiceCall::HangUpCancel");
+	LOGVOICE1("<<CSimVoiceCall::HangUpCancel");
 	return KErrNone;
 	}
 
@@ -861,12 +855,12 @@
 	TInt ret=KErrNone;
 	__ASSERT_ALWAYS(iState!=RMobileCall::EStatusUnknown,SimPanic(ECallStatusUnknownIllegal));
 	__ASSERT_ALWAYS(aEvent!=ECallEventNtRasConnected,SimPanic(ECallEventIllegal));
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_1, ">>CSimVoiceCall::ActionEvent 0x%08x %d",(TUint)this,iState);
+	LOGVOICE3(">>CSimVoiceCall::ActionEvent 0x%08x %d",this,iState);
 
 	switch(aEvent)
 		{
 	case ECallEventDial:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_2, ">>CSimVoiceCall::ActionEvent = [ECallEventDial]");
+		LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventDial]");
 		if(iState==RMobileCall::EStatusIdle)
 			{			
 			TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusDialling,EFalse,EFalse));
@@ -879,7 +873,7 @@
 
 	case ECallEventHangUp:
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_3, ">>CSimVoiceCall::ActionEvent = [ECallEventHangUp]");
+		LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventHangUp]");
 		switch(iState)
 			{
 		case RMobileCall::EStatusDialling:
@@ -904,7 +898,7 @@
 		break;
 
 	case ECallEventIncomingCall:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_4, ">>CSimVoiceCall::ActionEvent = [ECallEventIncomingCall]");
+		LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventIncomingCall]");
 		if(iState==RMobileCall::EStatusIdle)
 			{
 			if(iAnswerIncomingCall.iNotifyPending)
@@ -923,7 +917,7 @@
 		break;
 
 	case ECallEventAnswerIncoming:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_5, ">>CSimVoiceCall::ActionEvent = [ECallEventAnswerIncoming]");
+		LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventAnswerIncoming]");
 		if(iState==RMobileCall::EStatusRinging)
 			{
 			TRAP(ret, ret=ProcessAnswerIncomingCallL());
@@ -937,7 +931,7 @@
 		break;
 
 	case ECallEventRemoteHangup:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_6, ">>CSimVoiceCall::ActionEvent = [ECallEventRemoteHangup]");
+		LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventRemoteHangup]");
 		if(iState==RMobileCall::EStatusConnected)
 			{
 			TRAP(ret, ret=ProcessRemoteHangupL());
@@ -952,31 +946,31 @@
 
 	case ECallEventTimeOut:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_7, ">>CSimVoiceCall::ActionEvent = [ECallEventTimeOut]");
+			LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventTimeOut]");
 			switch(iState)
 				{
 			case RMobileCall::EStatusDialling:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_8, ">>CSimVoiceCall::State = [EStatusDialling]");
+				LOGVOICE1(">>CSimVoiceCall::State = [EStatusDialling]");
 				TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnecting,EFalse,EFalse));
 				if(ret==KErrNone)
 					iTimer->Start(iConnectingPause,this);
 				return ret;
 			
 			case RMobileCall::EStatusConnecting:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_9, ">>CSimVoiceCall::State = [EStatusConnecting]");
+				LOGVOICE1(">>CSimVoiceCall::State = [EStatusConnecting]");
 				TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnected,EFalse,EFalse));
 				UpdateRemotePartyInfoDirection(RMobileCall::EStatusConnecting);
 				ReqCompleted(iDialRequestHandle,ret);
 				return ret;
 				
 			case RMobileCall::EStatusDisconnecting:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_10, ">>CSimVoiceCall::State = [EStatusDisconnecting]");
+				LOGVOICE1(">>CSimVoiceCall::State = [EStatusDisconnecting]");
 				TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusIdle,EFalse,EFalse));
 				ReqCompleted(iHangUpRequestHandle,ret);
 				return ret;
 				
 			case RMobileCall::EStatusAnswering:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_11, ">>CSimVoiceCall::State = [EStatusAnswering]");
+				LOGVOICE1(">>CSimVoiceCall::State = [EStatusAnswering]");
 				TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnected,EFalse,EFalse));
 				UpdateRemotePartyInfoDirection(RMobileCall::EStatusAnswering);
 				ReqCompleted(iAnswerIncomingCall.iNotifyHandle,ret);
@@ -988,7 +982,7 @@
 			}
 		break;
 	case ECallEventHold:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_12, ">>CSimVoiceCall::ActionEvent = [ECallEventHold]");
+		LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventHold]");
 		__ASSERT_ALWAYS(iState==RMobileCall::EStatusConnected,SimPanic(EIllegalStateInconsistancy));
 		TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusHold,aOtherArgument == ECallEventSwap,EFalse));
 		if (ret == KErrNone)
@@ -996,7 +990,7 @@
 		break;
 
 	case ECallEventResume:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_13, ">>CSimVoiceCall::ActionEvent = [ECallEventResume]");
+		LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventResume]");
 		__ASSERT_ALWAYS(iState==RMobileCall::EStatusHold,SimPanic(EIllegalStateInconsistancy));
 		TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnected,aOtherArgument == ECallEventSwap,EFalse));
 		if (ret == KErrNone)
@@ -1021,10 +1015,10 @@
 * function for further processing.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_TIMERCALLBACK_1, ">>CSimVoiceCall::TimerCallBack");
+	LOGVOICE1(">>CSimVoiceCall::TimerCallBack");
 	TInt ret=ActionEvent(ECallEventTimeOut,KErrNone);
 	__ASSERT_ALWAYS(ret==KErrNone,SimPanic(ETimeOutEventActionFailed));
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_TIMERCALLBACK_2, "<<CSimVoiceCall::TimerCallBack");
+	LOGVOICE1("<<CSimVoiceCall::TimerCallBack");
 	}
 
 TInt CSimVoiceCall::ProcessAnswerIncomingCallL()
@@ -1035,14 +1029,14 @@
 * call object must be assigned to receive the details of the next incoming call.
 */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_PROCESSANSWERINCOMINGCALLL_1, ">>CSimVoiceCall::ProcessAnswerIncomingCall %d , 0x%08x",iState,(TUint)this);
+	LOGVOICE3(">>CSimVoiceCall::ProcessAnswerIncomingCall %d",iState,this);
 	TInt ret=ChangeStateL(RMobileCall::EStatusAnswering,EFalse,EFalse);
 	if(ret!=KErrNone)
 		return ret;
 	iTimer->Start(iAnswerIncomingPause,this);
 	iAnswerIncomingCall.iNotifyPending=EFalse;
 	iLine->ResetAutoAnswerCallObject(this);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_PROCESSANSWERINCOMINGCALLL_2, "<<CSimVoiceCall::ProcessAnswerIncomingCall");
+	LOGVOICE1("<<CSimVoiceCall::ProcessAnswerIncomingCall");
 	return ret;
 	}
 
@@ -1054,13 +1048,13 @@
 * call object must be assigned to receive the next remote hangup request.
 */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_PROCESSREMOTEHANGUPL_1, ">>CSimVoiceCall::ProcessRemoteHangupL %d, 0x%08x",iState,(TUint)this);
+	LOGVOICE3(">>CSimVoiceCall::ProcessRemoteHangupL %d",iState,this);
 	TInt ret=ChangeStateL(RMobileCall::EStatusDisconnecting,EFalse,EFalse);
 	if(ret!=KErrNone)
 		return ret;
 	iTimer->Start(iRemoteHangupPause,this);
 	iLine->ResetRemoteHangupCallObject(this);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_PROCESSREMOTEHANGUPL_2, "<<CSimVoiceCall::ProcessRemoteHangupL");
+	LOGVOICE1("<<CSimVoiceCall::ProcessRemoteHangupL");
 	return ret;
 	}

--- a/telephonyserverplugins/simtsy/src/CSimVoiceLine.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimVoiceLine.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -13,15 +13,9 @@
 // Description:
 //
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimVoiceLineTraces.h"
-#endif
-
 #include "CSimPhone.h"
 #include "CSimVoiceCall.h"
+#include "Simlog.h"
 #include "et_struct.h"
 
 _LIT(KCommonCallName,"VoiceCall%d");	// < Voice call name template.
@@ -114,13 +108,13 @@
 * @leave Leaves if name given does not match the required name
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICELINE_OPENNEWOBJECTBYNAMEL_1, ">>CSimVoiceLine::OpenNewObjectByNameL");
+	LOGVOICE1(">>CSimVoiceLine::OpenNewObjectByNameL");
 	TInt i;
 	TInt count=iCalls->Count();
 
 	for(i=0;i<count;i++)
 		{
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICELINE_OPENNEWOBJECTBYNAMEL_2, ">>CSimVoiceLine::OpenNewObjectByNameL %S", iCalls->At(i)->iName);
+		LOGVOICE2(">>CSimVoiceLine::OpenNewObjectByNameL %s",&(iCalls->At(i)->iName));
 		if(iCalls->At(i)->iName.MatchF(aName)==0)
 			{
 			iCalls->At(i)->Open();			
@@ -128,7 +122,7 @@
 			}
 		}
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICELINE_OPENNEWOBJECTBYNAMEL_3, "<<CSimVoiceLine::OpenNewObjectByNameL");
+	LOGVOICE1("<<CSimVoiceLine::OpenNewObjectByNameL");
 	User::Leave(KErrNotFound);
 	return NULL;
 	}
@@ -156,7 +150,7 @@
 		{
 		HandleNewCallAddedNotification(aNewName);
 		}
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICELINE_CREATENEWCALLL_1, ">>CSimVoiceLine::CreateNewCallL 0x%08x",newCall);
+	LOGVOICE2(">>CSimVoiceLine::CreateNewCallL 0x%08x",newCall);
 	CleanupStack::Pop(newCall);
 	return newCall;
 	}

--- a/telephonyserverplugins/simtsy/src/csimsmartcardauth.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/csimsmartcardauth.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -17,15 +17,9 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csimsmartcardauthTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 #include "CSimPhone.h"
+#include "Simlog.h"
 #include "csimsmartcardauth.h"
 #include "utils.h"
 
@@ -50,7 +44,7 @@
 	ParseAuthInfoL();
 	ParseGBAAuthInfoL();
 	ParseMBMSAuthInfoL();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_CONSTRUCTL_1, "CSimSmartCardAuth created");
+	LOGPHONE1("CSimSmartCardAuth created");
 	}
 
 CSimSmartCardAuth::~CSimSmartCardAuth()
@@ -66,13 +60,13 @@
 		iMBMSInfoList->Delete(0,iMBMSInfoList->Count());
 		delete iMBMSInfoList;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_DTOR_1, "CSimSmartCardAuth destroyed");
+	LOGPHONE1("CSimSmartCardAuth destroyed");
 	}
 
 TInt CSimSmartCardAuth::GetScAuthenticationData(const TTsyReqHandle aTsyReqHandle, TDes8* aPckg1, const RMobilePhone::TAID* aAID)
 	{
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_GETSCAUTHENTICATIONDATA_1, "CSimSmartCardAuth::GetScAuthenticationData called");
+	LOGPHONE1("CSimSmartCardAuth::GetScAuthenticationData called");
 
 	RMobilePhone::TSmartCardAuthenticateDataV6Pckg
 			* authenticateDataPckgd =reinterpret_cast<RMobilePhone::TSmartCardAuthenticateDataV6Pckg*>(aPckg1);
@@ -446,7 +440,7 @@
 
 TInt CSimSmartCardAuth::GetScAuthenticationDataCancel(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_GETSCAUTHENTICATIONDATACANCEL_1, "CSimSmartCardAuth::GetScAuthenticationDataCancel called");
+	LOGPHONE1("CSimSmartCardAuth::GetScAuthenticationDataCancel called");
 	iPhone->ReqCompleted(aTsyReqHandle, KErrCancel);
 	return KErrNone;
 	}
@@ -461,11 +455,11 @@
 */
 void CSimSmartCardAuth::ParseAuthInfoL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_1, "CSimSmartCardAuth::ParseAuthInfoL called");
+	LOGPHONE1("CSimSmartCardAuth::ParseAuthInfoL called");
 
 	CTestConfigItem* item = NULL;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_2, "Starting to Parse Smart Card Authentication Info");
+	LOGPHONE1("Starting to Parse Smart Card Authentication Info");
 	TInt count = CfgFile()->ItemCount(KScAuthInfo);
 
 	TInt index;
@@ -487,7 +481,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 8, appId);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element APPID returned %d (element no. %d) from tag %s.",ret,8,KScAuthInfo);
+			LOGPARSERR("appId",ret,8,&KScAuthInfo);
 			_LIT8(emptyAID, "");
 			appId.Set(emptyAID);
 			}
@@ -496,11 +490,11 @@
 			ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 9, dataFrmt);
 			if(ret != KErrNone)
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DATAFRMT returned %d (element no. %d) from tag %s.",ret,9,KScAuthInfo);
+				LOGPARSERR("dataFrmt",ret,9,&KScAuthInfo);
 				}
 			else if (dataFrmt >= EMaxConfigDataFormat)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_5, "WARNING IN CONFIGURATION FILE PARSING - Invalid format for SC Authenticate tag");
+				LOGPHONE1("WARNING IN CONFIGURATION FILE PARSING - Invalid format for SC Authenticate tag");
 				dataFrmt = EConfigDataFormatAscii;
 				}
 
@@ -520,7 +514,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, AUTN);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTN returned %d (element no. %d) from tag %s.",ret,0,KScAuthInfo);
+			LOGPARSERR("AUTN",ret,0,&KScAuthInfo);
 			continue;
 			}
 		else
@@ -541,7 +535,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, RAND);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element RAND returned %d (element no. %d) from tag %s.",ret,1,KScAuthInfo);
+			LOGPARSERR("RAND",ret,1,&KScAuthInfo);
 			continue;
 			}
 		else
@@ -562,7 +556,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 2, RES);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element RES returned %d (element no. %d) from tag %s.",ret,2,KScAuthInfo);
+			LOGPARSERR("RES",ret,2,&KScAuthInfo);
 			continue;
 			}
 		else
@@ -583,7 +577,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 3, IK);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element IK returned %d (element no. %d) from tag %s.",ret,3,KScAuthInfo);
+			LOGPARSERR("IK",ret,3,&KScAuthInfo);
 			continue;
 			}
 		else
@@ -604,7 +598,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 4, CK);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element CK returned %d (element no. %d) from tag %s.",ret,4,KScAuthInfo);
+			LOGPARSERR("CK",ret,4,&KScAuthInfo);
 			continue;
 			}
 		else
@@ -625,7 +619,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 5, Kc);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element KC returned %d (element no. %d) from tag %s.",ret,5,KScAuthInfo);
+			LOGPARSERR("Kc",ret,5,&KScAuthInfo);
 			continue;
 			}
 		else
@@ -646,7 +640,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 6, AUTS);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTS returned %d (element no. %d) from tag %s.",ret,6,KScAuthInfo);
+			LOGPARSERR("AUTS",ret,6,&KScAuthInfo);
 			continue;
 			}
 		else
@@ -667,7 +661,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 7, authErr);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTHERR returned %d (element no. %d) from tag %s.",ret,7,KScAuthInfo);
+			LOGPARSERR("authErr",ret,7,&KScAuthInfo);
 			continue;
 			}
 		else
@@ -685,11 +679,11 @@
 */
 void CSimSmartCardAuth::ParseGBAAuthInfoL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_1, "CSimSmartCardAuth::ParseGBAAuthInfoL called");
+	LOGPHONE1("CSimSmartCardAuth::ParseGBAAuthInfoL called");
 
 	CTestConfigItem* item = NULL;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_2, "Starting to Parse GBA Authentication Info");
+	LOGPHONE1("Starting to Parse GBA Authentication Info");
 	TInt count = CfgFile()->ItemCount(KGBAAuthInfo);
 
 	TInt index;
@@ -712,7 +706,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, AUTN);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTN returned %d (element no. %d) from tag %s.",ret,0,KGBAAuthInfo);
+			LOGPARSERR("AUTN",ret,0,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -724,7 +718,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, RAND);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element RAND returned %d (element no. %d) from tag %s.",ret,1,KGBAAuthInfo);
+			LOGPARSERR("RAND",ret,1,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -736,7 +730,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 2, appId);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element APPID returned %d (element no. %d) from tag %s.",ret,2,KGBAAuthInfo);
+			LOGPARSERR("APPID",ret,2,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -748,7 +742,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 3, RES);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element RES returned %d (element no. %d) from tag %s.",ret,3,KGBAAuthInfo);
+			LOGPARSERR("RES",ret,3,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -760,7 +754,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 4, AUTS);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTS returned %d (element no. %d) from tag %s.",ret,4,KGBAAuthInfo);
+			LOGPARSERR("AUTS",ret,4,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -772,7 +766,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 5, NAFID);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element NAFID returned %d (element no. %d) from tag %s.",ret,5,KGBAAuthInfo);
+			LOGPARSERR("NAFID",ret,5,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -784,7 +778,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 6, IMPI);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element IMPI returned %d (element no. %d) from tag %s.",ret,6,KGBAAuthInfo);
+			LOGPARSERR("IMPI",ret,6,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -796,7 +790,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 7, KSExtNaf);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element KSEXTNAF returned %d (element no. %d) from tag %s.",ret,7,KGBAAuthInfo);
+			LOGPARSERR("KSExtNaf",ret,7,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -808,7 +802,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 8, BtID);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element BTID returned %d (element no. %d) from tag %s.",ret,8,KGBAAuthInfo);
+			LOGPARSERR("BtID",ret,8,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -820,7 +814,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 9, KeyLifeTime);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element KEYLIFETIME returned %d (element no. %d) from tag %s.",ret,9,KGBAAuthInfo);
+			LOGPARSERR("KeyLifeTime",ret,9,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -832,7 +826,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 10, OtherApplnBusy);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element OTHERAPPLNBUSY returned %d (element no. %d) from tag %s.",ret,10,KGBAAuthInfo);
+			LOGPARSERR("OtherApplnBusy",ret,10,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -844,7 +838,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 11, applnActive);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element APPLNACTIVE returned %d (element no. %d) from tag %s.",ret,11,KGBAAuthInfo);
+			LOGPARSERR("applnActive",ret,11,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -856,7 +850,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 12, authErr);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTHERR returned %d (element no. %d) from tag %s.",ret,12,KGBAAuthInfo);
+			LOGPARSERR("authErr",ret,12,&KGBAAuthInfo);
 			continue;
 			}
 		else
@@ -874,11 +868,11 @@
 */
 void CSimSmartCardAuth::ParseMBMSAuthInfoL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_1, "CSimSmartCardAuth::ParseMBMSAuthInfoL called");
+	LOGPHONE1 ("CSimSmartCardAuth::ParseMBMSAuthInfoL called");
 
 	CTestConfigItem* item = NULL;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_2, "Starting to Parse MBMS Authentication Info");
+	LOGPHONE1 ("Starting to Parse MBMS Authentication Info");
 
 	TInt count = CfgFile()->ItemCount (KMBMSInfo);
 	TMBMSInfo tMbmsInfo;
@@ -902,7 +896,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 0, iMikey);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element IMIKEY returned %d (element no. %d) from tag %s.", ret, 0, KMBMSInfo);
+			LOGPARSERR ("iMikey", ret, 0, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -914,7 +908,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 1, oMikey);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element OMIKEY returned %d (element no. %d) from tag %s.", ret, 1, KMBMSInfo);
+			LOGPARSERR ("oMikey", ret, 1, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -926,7 +920,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 2, mtk);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element MTK returned %d (element no. %d) from tag %s.", ret, 2, KMBMSInfo);
+			LOGPARSERR ("MTK", ret, 2, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -939,7 +933,7 @@
 				saltKey);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element SALTKEY returned %d (element no. %d) from tag %s.", ret, 3, KMBMSInfo);
+			LOGPARSERR ("saltKey", ret, 3, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -951,7 +945,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 4, keyDmn);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element KEYDMN  returned %d (element no. %d) from tag %s.", ret, 4, KMBMSInfo);
+			LOGPARSERR ("keyDmn ", ret, 4, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -964,7 +958,7 @@
 				MskIdgrp);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element MSKIDGRP returned %d (element no. %d) from tag %s.", ret, 5, KMBMSInfo);
+			LOGPARSERR ("MskIdgrp", ret, 5, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -976,7 +970,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 6, MukId);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element MUKID  returned %d (element no. %d) from tag %s.", ret, 6, KMBMSInfo);
+			LOGPARSERR ("MukId ", ret, 6, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -988,7 +982,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 7, MukIdi);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element MUKIDI returned %d (element no. %d) from tag %s.", ret, 7, KMBMSInfo);
+			LOGPARSERR ("MukIdi", ret, 7, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -1000,7 +994,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 8, MukIdr);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element MUKIDR  returned %d (element no. %d) from tag %s.", ret, 8, KMBMSInfo);
+			LOGPARSERR ("MukIdr ", ret, 8, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -1012,7 +1006,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 9,MukTimeStamp);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element IMIKEY returned %d (element no. %d) from tag %s.", ret, 9, KMBMSInfo);
+			LOGPARSERR ("iMikey", ret, 9, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -1024,7 +1018,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 10, appId);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element APPID returned %d (element no. %d) from tag %s.", ret, 10, KMBMSInfo);
+			LOGPARSERR ("APPID", ret, 10, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -1036,7 +1030,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 11,KSIntNaf);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element KSINTNAF returned %d (element no. %d) from tag %s.", ret, 11, KMBMSInfo);
+			LOGPARSERR ("KSIntNaf", ret, 11, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -1048,7 +1042,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 12,applnActive);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element APPLNACTIVE returned %d (element no. %d) from tag %s.", ret, 12, KMBMSInfo);
+			LOGPARSERR ("applnActive", ret, 12, &KMBMSInfo);
 			continue;
 			}
 		else
@@ -1060,7 +1054,7 @@
 		ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 13,authErr);
 		if ( ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTHERR returned %d (element no. %d) from tag %s.", ret, 13, KMBMSInfo);
+			LOGPARSERR ("authErr", ret, 13, &KMBMSInfo);
 			continue;
 			}
 		else

--- a/telephonyserverplugins/simtsy/src/csimsmartcardeap.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/csimsmartcardeap.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -19,15 +19,9 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csimsmartcardeapTraces.h"
-#endif
-
 #include <testconfigfileparser.h>
 #include "csimsmartcardeap.h"
+#include "Simlog.h"
 #include "etelext.h"
 
 // CSimSmartCardEapManager implementation; related to CSimSmartCardEap //
@@ -74,11 +68,11 @@
 */
 void CSimSmartCardEapManager::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_CONSTRUCTL_1, "CSimSmartCardEapManager second phase construction created");
+	LOGPHONE1("CSimSmartCardEapManager second phase construction created");
 
 	ParseEapInfoL();
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_CONSTRUCTL_2, "CSimSmartCardEapManager second phase construction completed");
+	LOGPHONE1("CSimSmartCardEapManager second phase construction completed");
 	}
 
 /**
@@ -86,7 +80,7 @@
 */
 CSimSmartCardEapManager::~CSimSmartCardEapManager()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_DTOR_1, "CSimSmartCardEapManager destructing");
+	LOGPHONE1("CSimSmartCardEapManager destructing");
 
 	for (TInt jj = iSubSessionObjs.Count()-1; jj >= 0; jj--)
 		{
@@ -97,7 +91,7 @@
 
 	ClearParsedData();
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_DTOR_2, "CSimSmartCardEapManager destructed");
+	LOGPHONE1("CSimSmartCardEapManager destructed");
 	}
 
 void CSimSmartCardEapManager::ClearParsedData()
@@ -142,11 +136,11 @@
 */
 void CSimSmartCardEapManager::ParseEapInfoL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_1, "CSimSmartCardEapManager::ParseEapInfoL called");
+	LOGPHONE1("CSimSmartCardEapManager::ParseEapInfoL called");
 
 	CTestConfigItem* item = NULL;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_2, "Starting to Parse Smart Card EAP Info");
+	LOGPHONE1("Starting to Parse Smart Card EAP Info");
 	TInt count = CfgFile()->ItemCount(KScEapProcedures);
 
 	// Used in parsing to keep track of the nested items
@@ -169,7 +163,7 @@
 		item = const_cast<CTestConfigItem*>(CfgFile()->Item(KScEapProcedures, index));
 		if(item == NULL)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_3, "WARNING CONFIGURATION FILE PARSING: SC EAP PROC INFO tag not read [%d]", index);
+			LOGPHONE2("WARNING CONFIGURATION FILE PARSING: SC EAP PROC INFO tag not read [%d]", index);
 			continue;
 			}
 
@@ -185,7 +179,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, appId);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element APPID returned %d (element no. %d) from tag %s.", ret,0,KScEapProcedures);
+			LOGPARSERR("appId", ret,0,&KScEapProcedures);
 			continue;
 			}
 		else
@@ -200,7 +194,7 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, eapType);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element EAPTYPE returned %d (element no. %d) from tag %s.", ret,1,KScEapProcedures);
+			LOGPARSERR("eapType", ret,1,&KScEapProcedures);
 			continue;
 			}
 		else
@@ -213,17 +207,17 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 2, numChallenges);
 		if(ret != KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element NUMCHALLENGES returned %d (element no. %d) from tag %s.", ret,2,KScEapProcedures);
+			LOGPARSERR("numChallenges", ret,2,&KScEapProcedures);
 			continue;
 			}
 		else if (numChallenges > (countChl - nestedChlTag))
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_7, "ERROR CONFIGURATION FILE PARSING: error SC EAP PROC INFO specifies more challenges than available [%d]", index);
+			LOGPHONE2("ERROR CONFIGURATION FILE PARSING: error SC EAP PROC INFO specifies more challenges than available [%d]", index);
 			continue;
 			}
 		else if (numChallenges < 0)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_8, "ERROR CONFIGURATION FILE PARSING: error SC EAP PROC INFO specifies -ve challenge number [%d]", index);
+			LOGPHONE2("ERROR CONFIGURATION FILE PARSING: error SC EAP PROC INFO specifies -ve challenge number [%d]", index);
 			continue;
 			}
 
@@ -231,11 +225,11 @@
 		ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 3, dataFrmt);
 		if(ret != KErrNone)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_9, "CONFIGURATION FILE PARSING: SC EAP PROC INFO tag with no data format [%d]", index);
+			LOGPHONE2("CONFIGURATION FILE PARSING: SC EAP PROC INFO tag with no data format [%d]", index);
 			}
 		else if (dataFrmt >= EMaxConfigDataFormat)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_10, "WARNING IN CONFIGURATION FILE PARSING - error wrong data format value SC EAP PROC INFO tag [%d] (ASCII format will be used)", index);
+			LOGPHONE2("WARNING IN CONFIGURATION FILE PARSING - error wrong data format value SC EAP PROC INFO tag [%d] (ASCII format will be used)", index);
 			dataFrmt = EConfigDataFormatAscii;
 			}
 
@@ -251,21 +245,21 @@
 			// parse delay and key
 			if (item == NULL)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_11, "WARNING CONFIGURATION FILE PARSING: could not read EAP Key tag [%d]", nestedKeyTag-1);
+				LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP Key tag [%d]", nestedKeyTag-1);
 				}
 			else
 				{
 				ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, ptr);
 				if (ret != KErrNone)
 					{
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_12, "WARNING CONFIGURATION FILE PARSING: could not read EAP Key tag's data [%d]", nestedKeyTag-1);
+					LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP Key tag's data [%d]", nestedKeyTag-1);
 					}
 				else
 					{
 					TRAPD(kAllocErr, startData = ptr.AllocL());
 					if (kAllocErr != KErrNone)
 						{
-						OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_13, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Key data [%d]", nestedKeyTag-1);
+						LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Key data [%d]", nestedKeyTag-1);
 						}
 					else
 						{
@@ -282,7 +276,7 @@
 						TRAP(kAllocErr, procInfo.iEapKey = tempPtr.AllocL());
 						if (kAllocErr != KErrNone)
 							{
-							OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_14, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Key data copy [%d]", nestedKeyTag-1);
+							LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Key data copy [%d]", nestedKeyTag-1);
 							}
 						delete startData;
 						startData = NULL;
@@ -292,7 +286,7 @@
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_15, "ERROR CONFIGURATION FILE PARSING: NO SC EAP KEY INFO TAG");
+			LOGPHONE1("ERROR CONFIGURATION FILE PARSING: NO SC EAP KEY INFO TAG");
 			}
 
 		// Get EMSK
@@ -303,21 +297,21 @@
 			// parse key
 			if (item == NULL)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_16, "WARNING CONFIGURATION FILE PARSING: could not read EAP Ext Key tag [%d]", nestedExtKeyTag-1);
+				LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP Ext Key tag [%d]", nestedExtKeyTag-1);
 				}
 			else
 				{
 				ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, ptr);
 				if (ret != KErrNone)
 					{
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_17, "WARNING CONFIGURATION FILE PARSING: could not read EAP Ext Key tag's data [%d]", nestedExtKeyTag-1);
+					LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP Ext Key tag's data [%d]", nestedExtKeyTag-1);
 					}
 				else
 					{
 					TRAPD(kAllocErr, startData = ptr.AllocL());
 					if (kAllocErr != KErrNone)
 						{
-						OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_18, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Ext Key data [%d]", nestedExtKeyTag-1);
+						LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Ext Key data [%d]", nestedExtKeyTag-1);
 						}
 					else
 						{
@@ -334,7 +328,7 @@
 						TRAP(kAllocErr, procInfo.iEapExtKey = tempPtr.AllocL());
 						if (kAllocErr != KErrNone)
 							{
-							OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_19, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Ext Key data copy [%d]", nestedExtKeyTag-1);
+							LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Ext Key data copy [%d]", nestedExtKeyTag-1);
 							}
 						delete startData;
 						startData = NULL;
@@ -344,7 +338,7 @@
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_20, "ERROR CONFIGURATION FILE PARSING: NO SC EAP EXT KEY INFO TAG");
+			LOGPHONE1("ERROR CONFIGURATION FILE PARSING: NO SC EAP EXT KEY INFO TAG");
 			}
 
 		// Get Permanent Identity
@@ -355,21 +349,21 @@
 			// parse id
 			if (item == NULL)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_21, "WARNING CONFIGURATION FILE PARSING: could not read EAP id tag [%d]", nestedIdTag-1);
+				LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP id tag [%d]", nestedIdTag-1);
 				}
 			else
 				{
 				ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, ptr);
 				if (ret != KErrNone)
 					{
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_22, "WARNING CONFIGURATION FILE PARSING: could not read EAP Id tag's data [%d]", nestedIdTag-1);
+					LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP Id tag's data [%d]", nestedIdTag-1);
 					}
 				else
 					{
 					TRAPD(idAllocErr, startData = ptr.AllocL());
 					if (idAllocErr != KErrNone)
 						{
-						OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_23, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Id data [%d]", nestedIdTag-1);
+						LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Id data [%d]", nestedIdTag-1);
 						}
 					else
 						{
@@ -387,7 +381,7 @@
 						TRAP(idAllocErr, procInfo.iEapId = tempPtr.AllocL());
 						if (idAllocErr != KErrNone)
 							{
-							OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_24, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Id data copy [%d]", nestedIdTag-1);
+							LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Id data copy [%d]", nestedIdTag-1);
 							}
 						delete startData;
 						startData = NULL;
@@ -397,7 +391,7 @@
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_25, "WARNING CONFIGURATION FILE PARSING: NO SC EAP ID INFO TAG");
+			LOGPHONE1("WARNING CONFIGURATION FILE PARSING: NO SC EAP ID INFO TAG");
 			}
 
 		// Get Pseudonym Identity
@@ -408,21 +402,21 @@
 			// parse id
 			if (item == NULL)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_26, "WARNING CONFIGURATION FILE PARSING: could not read EAP Pseudonym id tag [%d]", nestedPsIdTag-1);
+				LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP Pseudonym id tag [%d]", nestedPsIdTag-1);
 				}
 			else
 				{
 				ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, ptr);
 				if (ret != KErrNone)
 					{
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_27, "WARNING CONFIGURATION FILE PARSING: could not read EAP Pseudonym Id tag's data [%d]", nestedPsIdTag-1);
+					LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP Pseudonym Id tag's data [%d]", nestedPsIdTag-1);
 					}
 				else
 					{
 					TRAPD(idAllocErr, startData = ptr.AllocL());
 					if (idAllocErr != KErrNone)
 						{
-						OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_28, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Pseudonym Id data [%d]", nestedPsIdTag-1);
+						LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Pseudonym Id data [%d]", nestedPsIdTag-1);
 						}
 					else
 						{
@@ -440,7 +434,7 @@
 						TRAP(idAllocErr, procInfo.iEapPsId = tempPtr.AllocL());
 						if (idAllocErr != KErrNone)
 							{
-							OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_29, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Pseudonym Id data copy [%d]", nestedPsIdTag-1);
+							LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Pseudonym Id data copy [%d]", nestedPsIdTag-1);
 							}
 						delete startData;
 						startData = NULL;
@@ -450,7 +444,7 @@
 			}
 		else
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_30, "WARNING CONFIGURATION FILE PARSING: NO SC EAP PS ID INFO TAG");
+			LOGPHONE1("WARNING CONFIGURATION FILE PARSING: NO SC EAP PS ID INFO TAG");
 			}
 
 		// Get challenges
@@ -463,7 +457,7 @@
 			{
 			if (nestedChlTag >= countChl)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_31, "WARNING CONFIGURATION FILE PARSING: NO MORE SC EAP Challenge INFO TAG");
+				LOGPHONE1("WARNING CONFIGURATION FILE PARSING: NO MORE SC EAP Challenge INFO TAG");
 				break;
 				}
 
@@ -473,7 +467,7 @@
 			// parse delay and challenge/response and auth status
 			if (item == NULL)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_32, "WARNING CONFIGURATION FILE PARSING: could not read EAP challenge tag [%d]", nestedChlTag-1);
+				LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP challenge tag [%d]", nestedChlTag-1);
 				continue;
 				}
 
@@ -481,14 +475,14 @@
 			ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, ptr);
 			if (ret != KErrNone)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_33, "WARNING CONFIGURATION FILE PARSING: could not read EAP challenge data [%d]", nestedChlTag-1);
+				LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP challenge data [%d]", nestedChlTag-1);
 				continue;
 				}
 
 			TRAPD(leaveErr, startData = ptr.AllocL());
 			if (leaveErr != KErrNone)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_34, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP challenge data [%d]", nestedChlTag-1);
+				LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP challenge data [%d]", nestedChlTag-1);
 				continue;
 				}
 			tempPtr.Set(startData->Des());
@@ -504,7 +498,7 @@
 			TRAP(leaveErr, newChRespData.iChallenge = tempPtr.AllocL());
 			if (leaveErr != KErrNone)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_35, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP challenge data copy [%d]", nestedKeyTag-1);
+				LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP challenge data copy [%d]", nestedKeyTag-1);
 				}
 			delete startData;
 			startData = NULL;
@@ -513,14 +507,14 @@
 			ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, ptr);
 			if (ret != KErrNone)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_36, "WARNING CONFIGURATION FILE PARSING: could not read EAP response data [%d]", nestedChlTag-1);
+				LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP response data [%d]", nestedChlTag-1);
 				continue;
 				}
 
 			TRAP(leaveErr, startData = ptr.AllocL());
 			if (leaveErr != KErrNone)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_37, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP response data [%d]", nestedChlTag-1);
+				LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP response data [%d]", nestedChlTag-1);
 				continue;
 				}
 			tempPtr.Set(startData->Des());
@@ -535,7 +529,7 @@
 			TRAP(leaveErr, newChRespData.iResp = tempPtr.AllocL());
 			if (leaveErr != KErrNone)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_38, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP response data copy [%d]", nestedKeyTag-1);
+				LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP response data copy [%d]", nestedKeyTag-1);
 				}
 			delete startData;
 			startData = NULL;
@@ -545,7 +539,7 @@
 			ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 2, stat);
 			if (ret != KErrNone)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_39, "WARNING CONFIGURATION FILE PARSING: could not read EAP auth status [%d]", nestedChlTag-1);
+				LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP auth status [%d]", nestedChlTag-1);
 				continue;
 				}
 
@@ -554,14 +548,14 @@
 			leaveErr = procInfo.iChResp.Append(newChRespData);
 			if (leaveErr != KErrNone)
 				{
-				OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_40, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP challenge/resp data [%d] [err=%d]", nestedChlTag-1, leaveErr);
+				LOGPHONE3("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP challenge/resp data [%d] [err=%d]", nestedChlTag-1, leaveErr);
 				}
 			} // end while
 
 		TInt errAppend = iEapProcData.Append(procInfo);
 		if (errAppend != KErrNone)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_41, "ERROR CONFIGURATION FILE PARSING: Could not store parsed EAP procedure data [err=%d]", errAppend);
+			LOGPHONE2("ERROR CONFIGURATION FILE PARSING: Could not store parsed EAP procedure data [err=%d]", errAppend);
 			}
 		else
 			{
@@ -569,7 +563,7 @@
 			}
 		} // end for; parsing EAP procedures from config.txt
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_42, "CSimSmartCardEapManager::ParseEapInfoL completed");
+	LOGPHONE1("CSimSmartCardEapManager::ParseEapInfoL completed");
 	}
 
 /**
@@ -599,7 +593,7 @@
 
 CTelObject* CSimSmartCardEapManager::CreateScEapSubSessionL(RMobilePhone::TAID& aAID, RMobileSmartCardEap::TEapType& aEapType)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_CREATESCEAPSUBSESSIONL_1, "CSimSmartCardEapManager::CreateScEapSubSessionL called");
+	LOGPHONE1("CSimSmartCardEapManager::CreateScEapSubSessionL called");
 	// If no config exists for this eapAID,eapType pair, then this will leave
 	AID_EapType_ExistsInConfigL(aAID, aEapType);
 
@@ -612,7 +606,7 @@
 
 	if (err != KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_CREATESCEAPSUBSESSIONL_2, "ERROR could not create CSimSmartCardEap object [err=%d]", err);
+		LOGPHONE2("ERROR could not create CSimSmartCardEap object [err=%d]", err);
 		User::Leave(err);
 		}
 
@@ -721,13 +715,13 @@
 
 void CSimSmartCardEap::ConstructL(CSimSmartCardEapManager* aEapMan)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_CONSTRUCTL_1, "CSimSmartCardEap: starting second phase construction");
+	LOGPHONE1("CSimSmartCardEap: starting second phase construction");
 
 	iSemaphr.CreateGlobal(KNullDesC, EOwnerThread);
 	aEapMan->RegisterSubSessionL(this);
 	iEapMan = aEapMan;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_CONSTRUCTL_2, "CSimSmartCardEap created");
+	LOGPHONE1("CSimSmartCardEap created");
 	}
 
 CSimSmartCardEap::~CSimSmartCardEap()
@@ -747,7 +741,7 @@
 		}
 
 	TInt err = iEapMan->DeRegisterSubSession(this);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_DTOR_1, "CSimSmartCardEap destroyed, deregistering returned %d", err);
+	LOGPHONE2("CSimSmartCardEap destroyed, deregistering returned %d", err);
 
 	iEapMan = NULL;
 	}
@@ -953,7 +947,7 @@
 
 TInt CSimSmartCardEap::SimInitialiseEapMethod(const TTsyReqHandle aTsyReqHandle, TThreadId* aThreadId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHOD_1, "CSimSmartCardEap::SimInitialiseEapMethod called");
+	LOGPHONE1("CSimSmartCardEap::SimInitialiseEapMethod called");
 	// This can only be called through RMobileSmartCardEap for one instance
 
 	if (iSSInitialised)
@@ -968,7 +962,7 @@
 		TRAPD(err, iCliTerminationListener = CThreadTerminationListener::NewL(this, *aThreadId));
 		if (err != KErrNone)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHOD_2, "ERROR could not create a client termination listener [err=%d] (not initialised)", err);
+			LOGPHONE2("ERROR could not create a client termination listener [err=%d] (not initialised)", err);
 			ReqCompleted(aTsyReqHandle, err);
 			}
 		else
@@ -976,7 +970,7 @@
 			iProcedureData = iEapMan->ProcData(iAID, iEapType);
 			if (iProcedureData == NULL)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHOD_3, "ERROR could not find sub-session's procedure");
+				LOGPHONE1("ERROR could not find sub-session's procedure");
 				ReqCompleted(aTsyReqHandle, KErrNotFound);
 				return KErrNone;
 				}
@@ -994,7 +988,7 @@
 
 TInt CSimSmartCardEap::SimInitialiseEapMethodCancel(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHODCANCEL_1, "CSimSmartCardEap::SimInitialiseEapMethodCancel called");
+	LOGPHONE1("CSimSmartCardEap::SimInitialiseEapMethodCancel called");
 	iProcedureData = NULL;
 	iSSInitialised = EFalse;
 	iAccessStatus = RMobileSmartCardEap::EEapMethodAvailable;
@@ -1005,7 +999,7 @@
 
 TInt CSimSmartCardEap::SimGetUserIdentity(const TTsyReqHandle aTsyReqHandle, RMobileSmartCardEap::TEapUserIdType* aEapIdType, TDes8* aUserId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_1, "CSimSmartCardEap::SimGetUserIdentity called");
+	LOGPHONE1("CSimSmartCardEap::SimGetUserIdentity called");
 
 	RMobileSmartCardEap::TEapUserIdentityV6Pckg *userIdPckg = reinterpret_cast<RMobileSmartCardEap::TEapUserIdentityV6Pckg*>(aUserId);
 	RMobileSmartCardEap::TEapUserIdentityV6 &userId = (*userIdPckg)();
@@ -1023,7 +1017,7 @@
 		if (iProcedureData->iEapId == NULL)
 			{
 			ReqCompleted(aTsyReqHandle, KErrNotFound);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_2, "ERROR EAP sub-session does not contain EPermanentIdentity");
+			LOGPHONE1("ERROR EAP sub-session does not contain EPermanentIdentity");
 			return KErrNone;
 			}
 
@@ -1034,7 +1028,7 @@
 		if (iProcedureData->iEapPsId == NULL)
 			{
 			ReqCompleted(aTsyReqHandle, KErrNotFound);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_3, "ERROR EAP sub-session does not contain EPseudonymIdentity");
+			LOGPHONE1("ERROR EAP sub-session does not contain EPseudonymIdentity");
 			return KErrNone;
 			}
 
@@ -1043,7 +1037,7 @@
 	else
 		{
 		ReqCompleted(aTsyReqHandle, KErrArgument);
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_4, "ERROR invalid EAP id type requested [tag=%d]", *aEapIdType);
+		LOGPHONE2("ERROR invalid EAP id type requested [tag=%d]", *aEapIdType);
 		return KErrNone;
 		}
 
@@ -1053,14 +1047,14 @@
 
 TInt CSimSmartCardEap::SimGetUserIdentityCancel(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETUSERIDENTITYCANCEL_1, "CSimSmartCardEap::SimGetUserIdentityCancel called");
+	LOGPHONE1("CSimSmartCardEap::SimGetUserIdentityCancel called");
 	ReqCompleted(aTsyReqHandle, KErrCancel);
 	return KErrNone;
 	}
 	
 TInt CSimSmartCardEap::SimGetAuthenticationStatus(const TTsyReqHandle aTsyReqHandle, RMobileSmartCardEap::TEapAuthStatus* aAuthStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETAUTHENTICATIONSTATUS_1, "CSimSmartCardEap::SimGetAuthenticationStatus called");
+	LOGPHONE1("CSimSmartCardEap::SimGetAuthenticationStatus called");
 
 	(*aAuthStatus) = iAuthStatus;
 
@@ -1070,14 +1064,14 @@
 	
 TInt CSimSmartCardEap::SimGetAuthenticationStatusCancel(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETAUTHENTICATIONSTATUSCANCEL_1, "CSimSmartCardEap::SimGetAuthenticationStatusCancel called");
+	LOGPHONE1("CSimSmartCardEap::SimGetAuthenticationStatusCancel called");
 	ReqCompleted(aTsyReqHandle, KErrCancel);
 	return KErrNone;
 	}
 
 TInt CSimSmartCardEap::SimGetEapKey(const TTsyReqHandle aTsyReqHandle, RMobileSmartCardEap::TEapKeyTag* aEapKeyTag, TDes8* aKey)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETEAPKEY_1, "CSimSmartCardEap::SimGetEapKey called");
+	LOGPHONE1("CSimSmartCardEap::SimGetEapKey called");
 
 	RMobileSmartCardEap::TEapKeyV6Pckg *keyPckg = reinterpret_cast<RMobileSmartCardEap::TEapKeyV6Pckg*>(aKey);
 	RMobileSmartCardEap::TEapKeyV6 &key = (*keyPckg)();
@@ -1095,7 +1089,7 @@
 		if (iProcedureData->iEapKey == NULL)
 			{
 			ReqCompleted(aTsyReqHandle, KErrNotFound);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETEAPKEY_2, "ERROR EAP sub-session does not contain EEapKeyMSK");
+			LOGPHONE1("ERROR EAP sub-session does not contain EEapKeyMSK");
 			return KErrNone;
 			}
 
@@ -1106,7 +1100,7 @@
 		if (iProcedureData->iEapExtKey == NULL)
 			{
 			ReqCompleted(aTsyReqHandle, KErrNotFound);
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETEAPKEY_3, "ERROR EAP sub-session does not contain EEapKeyEMSK");
+			LOGPHONE1("ERROR EAP sub-session does not contain EEapKeyEMSK");
 			return KErrNone;
 			}
 
@@ -1115,7 +1109,7 @@
 	else
 		{
 		ReqCompleted(aTsyReqHandle, KErrArgument);
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETEAPKEY_4, "ERROR invalid EAP key tag requested [tag=%d]", *aEapKeyTag);
+		LOGPHONE2("ERROR invalid EAP key tag requested [tag=%d]", *aEapKeyTag);
 		return KErrNone;
 		}
 
@@ -1125,14 +1119,14 @@
 
 TInt CSimSmartCardEap::SimGetEapKeyCancel(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETEAPKEYCANCEL_1, "CSimSmartCardEap::SimGetEapKeyCancel called");
+	LOGPHONE1("CSimSmartCardEap::SimGetEapKeyCancel called");
 	ReqCompleted(aTsyReqHandle, KErrCancel);
 	return KErrNone;
 	}
 
 TInt CSimSmartCardEap::SimSetAuthenticateDataForPhase1(const TTsyReqHandle aTsyReqHandle, TDes8* aEapAuthData, TInt* aPhase1Size)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_1, "CSimSmartCardEap::SimSetAuthenticateDataForPhase1 called");
+	LOGPHONE1("CSimSmartCardEap::SimSetAuthenticateDataForPhase1 called");
 
 	if (iCurrentChallenge >= iProcedureData->iChResp.Count())
 		{
@@ -1144,7 +1138,7 @@
 	TRAPD(err, authReq = RMobileSmartCardEap::CEapAuthenticateRequestDataV6::NewL());
 	if (err != KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_2, "ERR Could not allocate memory for challenge request object [err=%d]", err);
+		LOGPHONE2("ERR Could not allocate memory for challenge request object [err=%d]", err);
 		ReqCompleted(aTsyReqHandle, err);
 		return KErrNone;
 		}
@@ -1152,7 +1146,7 @@
 	TRAP(err, authReq->InternalizeL(*aEapAuthData));
 	if (err != KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_3, "ERR Could not allocate memory for challenge request [err=%d]", err);
+		LOGPHONE2("ERR Could not allocate memory for challenge request [err=%d]", err);
 		ReqCompleted(aTsyReqHandle, err);
 		return KErrNone;
 		}
@@ -1164,7 +1158,7 @@
 
 	if (reqPacket != tempPtr)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_4, "ERR challenge request does not match config [currentChallenge=%d]", iCurrentChallenge);
+		LOGPHONE2("ERR challenge request does not match config [currentChallenge=%d]", iCurrentChallenge);
 		ReqCompleted(aTsyReqHandle, KErrCorrupt);
 		return KErrNone;
 		}
@@ -1177,7 +1171,7 @@
 
 TInt CSimSmartCardEap::SimGetAuthenticateDataForPhase2(const TTsyReqHandle aTsyReqHandle, TDes8* /*aEapAuthData*/, TDes8* aPhase2Resp)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETAUTHENTICATEDATAFORPHASE2_1, "CSimSmartCardEap::SimSetAuthenticateDataForPhase2 called");
+	LOGPHONE1("CSimSmartCardEap::SimSetAuthenticateDataForPhase2 called");
 
 	if (iCurrentChallenge >= iProcedureData->iChResp.Count())
 		{
@@ -1198,14 +1192,14 @@
 
 TInt CSimSmartCardEap::SimSmartCardEapAuthenticationCancel(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMSMARTCARDEAPAUTHENTICATIONCANCEL_1, "CSimSmartCardEap::SimSmartCardEapAuthenticationCancel called");
+	LOGPHONE1("CSimSmartCardEap::SimSmartCardEapAuthenticationCancel called");
 	ReqCompleted(aTsyReqHandle, KErrCancel);
 	return KErrNone;
 	}
 
 TInt CSimSmartCardEap::SimReleaseEapMethod(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMRELEASEEAPMETHOD_1, "CSimSmartCardEap::SimReleaseEapMethod called");
+	LOGPHONE1("CSimSmartCardEap::SimReleaseEapMethod called");
 	iSSInitialised = EFalse;
 	iAccessStatus = RMobileSmartCardEap::EEapMethodAvailable;
 	ReqCompleted(aTsyReqHandle, KErrNone);
@@ -1221,7 +1215,7 @@
 
 TInt CSimSmartCardEap::SimGetEapMethodAccessStatus(const TTsyReqHandle aTsyReqHandle, RMobileSmartCardEap::TEapMethodAccessStatus* aEapState)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETEAPMETHODACCESSSTATUS_1, "CSimSmartCardEap::SimGetEapMethodAccessStatus called");
+	LOGPHONE1("CSimSmartCardEap::SimGetEapMethodAccessStatus called");
 	*aEapState = iAccessStatus;
 	ReqCompleted(aTsyReqHandle, KErrNone);
 	return KErrNone;
@@ -1229,7 +1223,7 @@
 
 TInt CSimSmartCardEap::SimNotifyEapMethodAccessStatusChange(const TTsyReqHandle aTsyReqHandle, RMobileSmartCardEap::TEapMethodAccessStatus* aEapState)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMNOTIFYEAPMETHODACCESSSTATUSCHANGE_1, "CSimSmartCardEap::SimNotifyEapMethodAccessStatusChange called");
+	LOGPHONE1("CSimSmartCardEap::SimNotifyEapMethodAccessStatusChange called");
 	__ASSERT_ALWAYS(!iEapAccessNotifyData.iNotifyPending, PanicClient(EEtelPanicRequestAsyncTwice));
 
 	iEapAccessNotifyData.iNotifyPending = ETrue;
@@ -1241,7 +1235,7 @@
 
 TInt CSimSmartCardEap::SimNotifyEapMethodAccessStatusChangeCancel(const TTsyReqHandle aTsyReqHandle)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMNOTIFYEAPMETHODACCESSSTATUSCHANGECANCEL_1, "CSimSmartCardEap::SimNotifyEapMethodAccessStatusChangeCancel called");
+	LOGPHONE1("CSimSmartCardEap::SimNotifyEapMethodAccessStatusChangeCancel called");
 	if(iEapAccessNotifyData.iNotifyPending)
 		{
 		iEapAccessNotifyData.iNotifyPending = EFalse;
@@ -1255,7 +1249,7 @@
 
 void CSimSmartCardEap::SimCompleteNotifyEapMethodAccessStatusChange()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMCOMPLETENOTIFYEAPMETHODACCESSSTATUSCHANGE_1, "CSimSmartCardEap::SimCompleteNotifyEapMethodAccessStatusChange called");
+	LOGPHONE1("CSimSmartCardEap::SimCompleteNotifyEapMethodAccessStatusChange called");
 
 	if(iEapAccessNotifyData.iNotifyPending)
 		{

--- a/telephonyserverplugins/simtsy/src/csimsmsmess.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/csimsmsmess.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
@@ -17,15 +17,9 @@
  @file
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "csimsmsmessTraces.h"
-#endif
-
 #include "csimsmsmess.h"
 #include <testconfigfileparser.h>
+#include "Simlog.h"
 #include <etelmm.h>
 #include "CSimTsyMode.h"
 
@@ -80,7 +74,7 @@
 
 void CSimSmsMessaging::InitializeL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_INITIALIZEL_1, "Starting to Load and Parse Sms Messaging Config ");
+	LOGSMS1("Starting to Load and Parse Sms Messaging Config ");
 	iRxTimer=CSimTimer::NewL(iPhone);
 	iTxTimer=CSimTimer::NewL(iPhone);
 	iSmspTimer=CSimTimer::NewL(iPhone);
@@ -102,7 +96,7 @@
 	// NOTE - no need to start iRxTimer; this will be started once a EMobileSmsMessagingReceiveMessage
 	// request is received and/or Send Sms contrainst satisfied (see CompleteTxPendingReq)
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_INITIALIZEL_2, "Finished parsing SMS Messaging config parameters");
+	LOGSMS1("Finished parsing SMS Messaging config parameters");
 	}
 
 
@@ -184,7 +178,7 @@
 	TInt i;
 	TSmsRxParametersGsm smsRxParameterGsm;
 	
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_1, "CSimSmsMessaging::FindAndCreateRxAttributesL IN [count=%d]", count);
+	LOGSMS2("CSimSmsMessaging::FindAndCreateRxAttributesL IN [count=%d]", count);
 
 	// Need to do this *before* entering the loop (so that we know 
 	// whether or not to read a delivery report pdu off the config file).
@@ -200,7 +194,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,smsPdu);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SMSPDU returned %d (element no. %d) from tag %s.",ret,0,KSmsRx);
+			LOGPARSERR("smsPdu",ret,0,&KSmsRx);
 			continue;
 			}
 		else
@@ -212,7 +206,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,sca);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element SCA returned %d (element no. %d) from tag %s.",ret,1,KSmsRx);
+			LOGPARSERR("sca",ret,1,&KSmsRx);
 			continue;
 			}
 		else
@@ -228,7 +222,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,deliveryReportPdu);
 			if( (ret!=KErrNone) && (ret!=KErrGeneral) )
 				{
-				OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DELIVERYREPORTPDU returned %d (element no. %d) from tag %s.",ret,2,KSmsRx);
+				LOGPARSERR("deliveryReportPdu",ret,2,&KSmsRx);
 				}
 			else
 				{
@@ -252,9 +246,9 @@
 	if (iSmsControlCaps & RMobileSmsMessaging::KCapsReceiveUnstoredClientAck)
 		iSmsReceiveMode=RMobileSmsMessaging::EReceiveUnstoredClientAck;
 	else iSmsReceiveMode=RMobileSmsMessaging::EReceiveModeUnspecified;
-	OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_5, "iSmsRxPeriod =%d, iAckNackCompletePause=%d, iResumeCompletePause=%d, iSmsControlCaps=%d",iSmsRxPeriod, iAckNackCompletePause, iResumeCompletePause, iSmsControlCaps);
-	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_6, "iSmsModeCaps =%d, iSmsRxStartDelay = %d, iSmsReceiveMode = %d",iSmsModeCaps , iSmsRxStartDelay, iSmsReceiveMode);
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_7, "CSimSmsMessaging::FindAndCreateRxAttributesL OUT [count=%d]", iSmsRxParameterListGsm->Count());
+	LOGSMS5("iSmsRxPeriod =%d, iAckNackCompletePause=%d, iResumeCompletePause=%d, iSmsControlCaps=%d",iSmsRxPeriod, iAckNackCompletePause, iResumeCompletePause, iSmsControlCaps); 
+	LOGSMS4("iSmsModeCaps =%d, iSmsRxStartDelay = %d, iSmsReceiveMode = %d",iSmsModeCaps , iSmsRxStartDelay, iSmsReceiveMode);	
+	LOGSMS2("CSimSmsMessaging::FindAndCreateRxAttributesL OUT [count=%d]", iSmsRxParameterListGsm->Count());	
 	}
 
 void CSimSmsMessaging::FindAndCreateTxAttributesL()
@@ -281,7 +275,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,smsTx);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element SMSTX returned %d (element no. %d) from tag %s.",ret,0,KSmsTx);
+			LOGPARSERR("smsTx",ret,0,&KSmsTx);
 			continue;
 			}
 		else
@@ -295,7 +289,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,sca);
 		if (ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SCA returned %d (element no. %d) from tag %s.",ret,1,KSmsTx);
+			LOGPARSERR("sca",ret,1,&KSmsTx);
 			continue;
 			}
 		else
@@ -308,7 +302,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,reference);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element REFERENCE returned %d (element no. %d) from tag %s.",ret,2,KSmsTx);
+			LOGPARSERR("reference",ret,2,&KSmsTx);
 			smsTxParametersGsm.iRef=KNoMessageReferenceInCofigurationFile;	
 			}
 		else
@@ -321,7 +315,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,submitReportPdu);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SUBMITREPORTPDU returned %d (element no. %d) from tag %s.",ret,3,KSmsTx);
+			LOGPARSERR("submitReportPdu",ret,3,&KSmsTx);
 			continue;
 			}
 		else
@@ -335,7 +329,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,errorCode);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element ERRORCODE returned %d (element no. %d) from tag %s.",ret,4,KSmsTx);
+			LOGPARSERR("errorCode",ret,4,&KSmsTx);
 			continue;
 			}
 		else
@@ -371,7 +365,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,ipc);//only :SendMessage() is supported
 		if(ret!=KErrNone || ipc!=4207)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATECONSTRAINTS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element IPC returned %d (element no. %d) from tag %s.",ret,0,KSmsStartRxDelay);
+			LOGPARSERR("ipc",ret,0,&KSmsStartRxDelay);
 			continue;
 			}
 
@@ -380,7 +374,7 @@
 			constraint.iIpcCnt=noBefore;
 		else
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATECONSTRAINTS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element NOBEFORE returned %d (element no. %d) from tag %s.",ret,1,KSmsStartRxDelay);
+			LOGPARSERR("noBefore",ret,1,&KSmsStartRxDelay);
 			continue;
 			}
 
@@ -389,7 +383,7 @@
 			constraint.iRxCnt=noAfter;
 		else
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATECONSTRAINTS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element NOAFTER returned %d (element no. %d) from tag %s.",ret,2,KSmsStartRxDelay);
+			LOGPARSERR("noAfter",ret,2,&KSmsStartRxDelay);
 			continue;
 			}
 		
@@ -419,14 +413,14 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,storeName);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSSTORESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element STORENAME returned %d (element no. %d) from tag %s.",ret,0,KSmsStore);
+			LOGPARSERR("storeName",ret,0,&KSmsStore);
 			continue;
 			}
 
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,maxNumSlots);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSSTORESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element MAXNUMSLOTS returned %d (element no. %d) from tag %s.",ret,1,KSmsStore);
+			LOGPARSERR("maxNumSlots",ret,1,&KSmsStore);
 			continue;
 			}
 
@@ -478,7 +472,7 @@
 			entry.iIndex=index;
 		else
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element INDEX returned %d (element no. %d) from tag %s.",ret,0,KSmsParamEntry);
+			LOGPARSERR("index",ret,0,&KSmsParamEntry);
 			continue;
 			}
 
@@ -487,7 +481,7 @@
 			entry.iText.Copy(smspName);
 		else
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SMSPNAME returned %d (element no. %d) from tag %s.",ret,1,KSmsParamEntry);
+			LOGPARSERR("smspName",ret,1,&KSmsParamEntry);
 			continue;
 			}
 
@@ -499,7 +493,7 @@
 			}
 		else
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element PID returned %d (element no. %d) from tag %s.",ret,2,KSmsParamEntry);
+			LOGPARSERR("pid",ret,2,&KSmsParamEntry);
 			continue;
 			}
 
@@ -511,7 +505,7 @@
 			}
 		else
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DCS returned %d (element no. %d) from tag %s.",ret,3,KSmsParamEntry);
+			LOGPARSERR("dcs",ret,3,&KSmsParamEntry);
 			continue;
 			}
 
@@ -523,7 +517,7 @@
 			}
 		else
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element VALIDITYPERIOD returned %d (element no. %d) from tag %s.",ret,4,KSmsParamEntry);
+			LOGPARSERR("validityPeriod",ret,4,&KSmsParamEntry);
 			continue;
 			}
 
@@ -534,7 +528,7 @@
 			}
 		else
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTADDRESS returned %d (element no. %d) from tag %s.",ret,5,KSmsParamEntry);
+			LOGPARSERR("destAddress",ret,5,&KSmsParamEntry);
 			continue;
 			}
 
@@ -545,7 +539,7 @@
 			}
 		else
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element SCA returned %d (element no. %d) from tag %s.",ret,6,KSmsParamEntry);
+			LOGPARSERR("sca",ret,6,&KSmsParamEntry);
 			continue;
 			}
 
@@ -587,7 +581,7 @@
 		}	
 	}
 
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)	// to stop the UREL build warnings
+#ifdef _DEBUG	// to stop the UREL build warnings
 void CSimSmsMessaging::LogRequest(const TBool aEntering, TInt aIpc, TInt aError)
 #else
 void CSimSmsMessaging::LogRequest(const TBool aEntering, TInt aIpc, TInt /*aError*/)
@@ -717,13 +711,11 @@
 
 	if (aEntering!=EFalse)
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGREQUEST1_1, ">>%d,CSimSmsMessaging::%s",aIpc, ipcBuf );
+		LOGSMS3(">>%d,CSimSmsMessaging::%S",aIpc, &ipcBuf );
 		}
 	else
 		{
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)    // to stop the UREL build warnings	
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGREQUEST1_2, "<<%d, CSimSmsMessaging::%s with error %d",aIpc, ipcBuf, aError);
-#endif		
+		LOGSMS4("<<%d, CSimSmsMessaging::%S with error %d",aIpc, &ipcBuf, aError);
 		}
 	}
 
@@ -857,12 +849,12 @@
 		if(iSmsTxCnt==(iConstraints[i].iIpcCnt))
 			{
 			iCurrentConstraint=i;
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_IPCMATCH_1, "New Constraint : %d", iCurrentConstraint);
+			LOGSMS2("New Constraint : %d", iCurrentConstraint);
 			if(i!=0)
 				{
 				if( !constraintEllapsed )
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_IPCMATCH_2, "Panic The constraints are overlapping...Compare test code and config file");
+					LOGSMS1("Panic The constraints are overlapping...Compare test code and config file");
 					}
 				__ASSERT_ALWAYS(constraintEllapsed!=EFalse,SimPanic(EConstraintsOverlapping));
 				}
@@ -877,7 +869,7 @@
  *
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_OPENNEWOBJECTBYNAMEL_1, ">>CSimSmsMessaging::OpenNewObjectByNameL");
+	LOGSMS1(">>CSimSmsMessaging::OpenNewObjectByNameL");
 	TBuf8<KMaxName> name;
 	name.Copy(aName);		// Do simple 16 bit to 8 bit conversion
 	for(TInt i=0;i<iSmsStores->Count();i++)
@@ -1039,7 +1031,7 @@
  *  
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDCLIENTACK_1, ">>CSimSmsMessaging::ActionRxEventUnstoredClientAck [iRxState=%d aRxEvent=%d]", iRxState, aRxEvent);
+	LOGSMS3(">>CSimSmsMessaging::ActionRxEventUnstoredClientAck [iRxState=%d aRxEvent=%d]", iRxState, aRxEvent);
 	switch(iRxState)
 		{
 	case ESmsRxStateIdle:
@@ -1074,7 +1066,7 @@
 			iRxState=ESmsRxStateWaitingForNetworkAckNackResponse;
 			if (!iRxTimer->IsActive() && !iRxTimer->Running())
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDCLIENTACK_2, ">>CSimSmsMessaging::ActionRxEventUnstoredClientAck Starting Rx Timer");
+				LOGSMS1(">>CSimSmsMessaging::ActionRxEventUnstoredClientAck Starting Rx Timer");
 				iRxTimer->Start(iAckNackCompletePause,this, ETimerIdSmsMessRx);
 				}
 
@@ -1136,7 +1128,7 @@
  *  
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDPHONEACK_1, ">> ActionRxEventUnstoredPhoneAck Enter function. Event=%d, State=%d",aRxEvent,iRxState);
+	LOGSMS3(">> ActionRxEventUnstoredPhoneAck Enter function. Event=%d, State=%d",aRxEvent,iRxState);
 	
 	TInt ret = KErrGeneral;
 	
@@ -1177,7 +1169,7 @@
  *  
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTSTORED_1, ">> ActionRxEventStored Enter function. Event=%d, State=%d",aRxEvent,iRxState);
+	LOGSMS3(">> ActionRxEventStored Enter function. Event=%d, State=%d",aRxEvent,iRxState);
 	TInt ret = KErrGeneral;
 	
 	switch(iRxState)
@@ -1246,7 +1238,7 @@
 
 	iSmsRxAttrib=&attrib;
 	iSmsRxReqOutstanding=ETrue;
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_RECEIVEMESSAGEL_1, ">>ReceiveMessageL. aSmsPdu&=0x%x, aParam2&=0x%x",(TUint)aSmsPdu,(TUint)iSmsRxAttrib);
+	LOGSMS3(">>ReceiveMessageL. aSmsPdu&=%x, aParam2&=%x",aSmsPdu,iSmsRxAttrib);
 	
 	//  Print received PDU to simTSY log.
 	__ASSERT_ALWAYS(iSmsReceiveMode!=RMobileSmsMessaging::EReceiveModeUnspecified,SimPanic(EMobileSmsMessagingPhoneNotSetToAReceiveMode));
@@ -1430,7 +1422,7 @@
  *
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONTXEVENT_1, ">>ActionTxEvent ");
+	LOGSMS1(">>ActionTxEvent ");
 	switch(iTxState)
 	{
 	case ESmsTxStateIdle:
@@ -1479,7 +1471,7 @@
 		}
 		
 	iSmsTxAttrib=&attrib;
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#ifdef _DEBUG
 		LogTMobileSmsAttributesV1(*iSmsTxAttrib);
 #endif // _DEBUG
 		
@@ -1548,7 +1540,7 @@
  * update the constraint count
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ATTEMPTSMSRXCOMPLETE_1, ">>AttemptSmsRxComplete ");
+	LOGSMS1(">>AttemptSmsRxComplete ");
 
 	if (CSimTsyMode::GetMode() != CSimTsyMode::ECdmaV1)
 		{
@@ -1560,7 +1552,7 @@
 		{
 		if (iSmsReceiveMode==RMobileSmsMessaging::EReceiveStored)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ATTEMPTSMSRXCOMPLETE_2, ">>Populating SMS Structures. iSmsRxPdu&=0x%x, iSmsRxAttrib&=0x%x, iSmsRxCnt=%d.",(TUint)iSmsRxPdu,(TUint)iSmsRxAttrib,iSmsRxCnt);
+			LOGSMS4(">>Populating SMS Structures. iSmsRxPdu&=%x, iSmsRxAttrib&=%x, iSmsRxCnt=%d.",iSmsRxPdu,iSmsRxAttrib,iSmsRxCnt);
 			RMobileSmsStore::TMobileGsmSmsEntryV1 sms;
 
 			*iSmsRxPdu=iSmsRxParameterListGsm->At(iSmsRxCnt).iPdu;
@@ -1601,7 +1593,7 @@
  *
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_COMPLETETXPENDINGREQ_1, ">>CompleteTxPendingReq ");
+	LOGSMS1(">>CompleteTxPendingReq ");
 	iSmsTxCnt++;
 	if(IpcMatch())
 		{
@@ -1631,7 +1623,7 @@
 			{
 			// No pending client receive request - need to wait for it before
 			// simulating received SMS from network.
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_COMPLETETXPENDINGREQ_2, " - no pending receive req from client - do not start Rx timer");
+			LOGSMS1(" - no pending receive req from client - do not start Rx timer");
 			}
 		}
 	ReqCompleted(iSmsTxReqHandle, aError);
@@ -1639,7 +1631,7 @@
 
 void CSimSmsMessaging::StartSmsMtTimer()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STARTSMSMTTIMER_1, ">>StartSmsMtTimer ");
+	LOGSMS1(">>StartSmsMtTimer ");
 	TInt count = 0;
 	count = iSmsRxCnt<iSmsRxParameterListGsm->Count();
 			
@@ -1647,9 +1639,9 @@
 			{
 			if((iConstraints.Count()==0) ||	(iConstraintRxCnt<iConstraints[iCurrentConstraint].iRxCnt))	// If there are no constraints, or there are constraints and they're not exhausted.
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STARTSMSMTTIMER_2, ">>StartSmsMtTimer Starting");
+				LOGSMS1(">>StartSmsMtTimer Starting");
 				iRxTimer->Start(iSmsRxPeriod,this, ETimerIdSmsMessRx);
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STARTSMSMTTIMER_3, ">>StartSmsMtTimer Started");
+				LOGSMS1(">>StartSmsMtTimer Started");
 				}
 			}
 	}
@@ -1662,7 +1654,7 @@
  * accordingly.  The address can then be copied into the iTelNumber structure.
  */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_POPULATESMSRXATTRIB_1, ">>PopulateSmsRxAttrib, ");
+	LOGSMS1(">>PopulateSmsRxAttrib, ");
 	aAttrib->iOriginator.iTelNumber.SetLength(0);
 	
 	switch (iSmsReceiveMode)
@@ -2033,11 +2025,11 @@
 			return leaveCode;
 		iSmspReqHandle=aTsyReqHandle;
 		iSmspTimer->Start(iSmspBatchPause,this, ETimerIdSmsMessSmsp);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STORESMSPLIST_1, "<<StoreSmsList,Exit function");
+		LOGSMS1("<<StoreSmsList,Exit function");
 		return KErrNone;
 		}
 	else
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STORESMSPLIST_2, "<<StoreSmsList,Exit function");
+		LOGSMS1("<<StoreSmsList,Exit function");
 		return KErrInUse;
 	
 	}
@@ -2077,7 +2069,7 @@
  * 
  */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_1, ">>CSimSmsMesaging::TimerCallBack IN [aId=%d iSmsReceiveMode=%d]", aId, iSmsReceiveMode);
+	LOGSMS3(">>CSimSmsMesaging::TimerCallBack IN [aId=%d iSmsReceiveMode=%d]", aId, iSmsReceiveMode);
 	switch(aId)
 		{
 		case ETimerIdSmsMessTx:
@@ -2105,7 +2097,7 @@
 				ret=ActionRxEventUnstoredPhoneAck(ESmsEventRxTimer);
 				break;
 			case RMobileSmsMessaging::EReceiveStored:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_2, "Recieve Stored SMS Rx Event.");
+				LOGSMS1("Recieve Stored SMS Rx Event.");
 				ret=ActionRxEventStored(ESmsEventRxTimer);
 				break;
 			default://other receive modes cannot be set
@@ -2114,7 +2106,7 @@
 
 			if (ret != KErrNone)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_3, "ERROR: Unexpected ret code %d", ret);
+				LOGSMS2("ERROR: Unexpected ret code %d", ret);
 				__ASSERT_ALWAYS(ret==KErrNone,SimPanic(EIllegalSmsRxEvent, __LINE__));	// There should be no error from this action, but to check...
 				}
 
@@ -2139,7 +2131,7 @@
 		default:
 			break;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_4, ">>CSimSmsMesaging::TimerCallBack OUT");
+	LOGSMS1(">>CSimSmsMesaging::TimerCallBack OUT");
 	}
 
 const CTestConfigSection* CSimSmsMessaging::CfgFileSection()
@@ -2149,7 +2141,7 @@
 * @return CTestConfigSection a pointer to the configuration file data section
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_CFGFILESECTION_1, ">>CSimSmsMessaging::CfgFileSection");
+	LOGSMS1(">>CSimSmsMessaging::CfgFileSection");
 	return iPhone->CfgFile();
 	}
 
@@ -2204,7 +2196,7 @@
 	return hexBuf;
 	}
 
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) // to prevent UREL build warnings
+#ifdef _DEBUG // to prevent UREL build warnings
 void CSimSmsMessaging::DumpPdu(const TDesC8& aText, TDesC8& aSmsPdu, HBufC8* aPduInAscii)
 #else
 void CSimSmsMessaging::DumpPdu(const TDesC8& /*aText*/, TDesC8& aSmsPdu, HBufC8* aPduInAscii)
@@ -2216,9 +2208,7 @@
 @param aPduInAscii - aSmsPdu in ASCII format (default NULL).
 */
     {
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)    // to stop the UREL build warnings    
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_DUMPPDU1_1, "%s pdu length=%d", aText, aSmsPdu.Length());
-#endif	
+	LOGSMS3("%S pdu length=%d", &aText, aSmsPdu.Length());
 
     if( !aSmsPdu.Length() )
         return;
@@ -2234,14 +2224,14 @@
 	    {
 		TInt len = Min(100, hexBuf->Mid(i).Length());
         TPtrC8 pduChunk(hexBuf->Mid(i).Left(len).Ptr(), len);
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_DUMPPDU1_2, "PDU Chunk: %s:", pduChunk);
+		LOGSMS2("PDU Chunk: %S:", &pduChunk);
 		}
 
 	if (0 == aPduInAscii)
 	  delete hexBuf;
     }
 
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#ifdef _DEBUG
 
 /**
 Appends Type of number and Numbering plan identification to TBuf8 buffer.
@@ -2367,30 +2357,30 @@
 
 	TBuf8<KTextWidth> buffer;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_1, "Send Sms Attributes:");
+	LOGSMS1("Send Sms Attributes:");
 	
 	buffer.Zero();
 	buffer.Copy(KFLAGS);
 	buffer.Append(_L8("0x"));
 	buffer.AppendFormat(_L8("%08X") , ((TInt)(aSmsAttributesV1.iFlags)));
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_2, "Buffer: %s", buffer);
+	LOGSMS2("Buffer: %S", &buffer);
 
 	if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KGsmServiceCentre)
 		{
 		buffer.Zero();
 		buffer.Copy(KSCADDR);
 		buffer.Append(aSmsAttributesV1.iGsmServiceCentre.iTelNumber);
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_3, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 
 		buffer.Zero();
 		buffer.Copy(KSCADDRTON);
 		AppendTonToBuffer(buffer,(aSmsAttributesV1.iGsmServiceCentre.iTypeOfNumber));
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_4, "Buffer: %s", buffer);;
+		LOGSMS2("buffer: %S", &buffer);
 
 		buffer.Zero();
 		buffer.Copy(KSCADDRNPI);
 		AppendNpiToBuffer(buffer,(aSmsAttributesV1.iGsmServiceCentre.iNumberPlan));		   
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_5, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 		}
 	if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KSmsDataFormat)
 		{
@@ -2404,7 +2394,7 @@
 			{
 			buffer.Append(_L("EFormatGsmTpdu"));
 			}		
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_6, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 		}
 	if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KRemotePartyInfo)
 		{
@@ -2413,17 +2403,17 @@
 		buffer.Zero();
 		buffer.Copy(KDEADDR);
 		buffer.Append(smsSendAttributesV1.iDestination.iTelNumber);
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_7, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 
 		buffer.Zero();
 		buffer.Copy(KDEADDRTON);
 		AppendTonToBuffer(buffer,(smsSendAttributesV1.iDestination.iTypeOfNumber));
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_8, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 
 		buffer.Zero();
 		buffer.Copy(KDEADDRNPI);
 		AppendNpiToBuffer(buffer,(smsSendAttributesV1.iDestination.iNumberPlan)); 
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_9, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 		}
 	if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KMoreToSend)
 		{
@@ -2440,7 +2430,7 @@
 			{
 			buffer.Append(_L8("EFalse"));
 			}
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_10, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 		}
 	if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KMessageReference)
 		{
@@ -2450,7 +2440,7 @@
 		buffer.Copy(KMSGREF);
 		buffer.Append(_L("0x"));
 		buffer.AppendFormat(_L8("%08X") , smsSendAttributesV1.iMsgRef);
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_11, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 		}
 
 	if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KGsmSubmitReport)
@@ -2476,7 +2466,7 @@
 				buffer.AppendFormat(_L8("%X") , smsSendAttributesV1.iSubmitReport[j]);
 				j++;
 				}
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_12, "Buffer: %s", buffer);
+			LOGSMS2("buffer: %S", &buffer);
 			buffer.Zero();
 			i=0;
 			l+=KTextWidth;

--- a/telephonyserverplugins/simtsy/test/Te_Sim/Te_SimTestStepBase.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/test/Te_Sim/Te_SimTestStepBase.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -36,6 +36,7 @@
 #include "SimTsy.h"
 #include <satcs.h>
 #include "Te_SimConstants.h"
+#include "Simlog.h"
 
 
 class CTestConfig;

--- a/telephonyserverplugins/simtsy/test/Te_Sim/Te_SimUSimRel6Test.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simtsy/test/Te_Sim/Te_SimUSimRel6Test.h	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -19,6 +19,7 @@
 #include "Te_SimTestStepBase.h"
 #include "Te_SimConstants.h"
 #include "SimTsy.h"
+#include "Simlog.h"
 #include <f32file.h>
 
 class CTestConfig;

--- a/telephonyserverplugins/simtsy/testconfigfileparser/bmarm/TESTCONFIGFILEPARSERU.DEF	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-EXPORTS
-	__eq__C11CTestConfigRC11CTestConfig @ 1 NONAME R3UNUSED ; CTestConfig::operator==(CTestConfig const &) const
-	CopyLC__C18CTestConfigSection @ 2 NONAME R3UNUSED ; CTestConfigSection::CopyLC(void) const
-	CountElements__11CTestConfigRC6TDesC8G5TChar @ 3 NONAME R3UNUSED ; CTestConfig::CountElements(TDesC8 const &, TChar)
-	DeleteItemsL__18CTestConfigSectionRC6TDesC8 @ 4 NONAME R3UNUSED ; CTestConfigSection::DeleteItemsL(TDesC8 const &)
-	GetElement__11CTestConfigRC6TDesC8G5TChariR6TPtrC8i @ 5 NONAME ; CTestConfig::GetElement(TDesC8 const &, TChar, int, TPtrC8 &, int)
-	GetElement__11CTestConfigRC6TDesC8G5TChariRi @ 6 NONAME ; CTestConfig::GetElement(TDesC8 const &, TChar, int, int &)
-	ItemCount__C18CTestConfigSectionRC6TDesC8 @ 7 NONAME R3UNUSED ; CTestConfigSection::ItemCount(TDesC8 const &) const
-	ItemValue__C11CTestConfigRC6TDesC8N21 @ 8 NONAME ; CTestConfig::ItemValue(TDesC8 const &, TDesC8 const &, TDesC8 const &) const
-	ItemValue__C11CTestConfigRC6TDesC8T1i @ 9 NONAME ; CTestConfig::ItemValue(TDesC8 const &, TDesC8 const &, int) const
-	ItemValue__C18CTestConfigSectionRC6TDesC8T1 @ 10 NONAME R3UNUSED ; CTestConfigSection::ItemValue(TDesC8 const &, TDesC8 const &) const
-	ItemValue__C18CTestConfigSectionRC6TDesC8i @ 11 NONAME R3UNUSED ; CTestConfigSection::ItemValue(TDesC8 const &, int) const
-	Item__C18CTestConfigSectionRC6TDesC8 @ 12 NONAME R3UNUSED ; CTestConfigSection::Item(TDesC8 const &) const
-	Item__C18CTestConfigSectionRC6TDesC8i @ 13 NONAME R3UNUSED ; CTestConfigSection::Item(TDesC8 const &, int) const
-	NewLC__11CTestConfigR3RFsRC7TDesC16 @ 14 NONAME R3UNUSED ; CTestConfig::NewLC(RFs &, TDesC16 const &)
-	NewLC__11CTestConfigR3RFsRC7TDesC16T2 @ 15 NONAME R3UNUSED ; CTestConfig::NewLC(RFs &, TDesC16 const &, TDesC16 const &)
-	NewLC__15CTestConfigItemR18CTestConfigSectionRC6TDesC8T2 @ 16 NONAME R3UNUSED ; CTestConfigItem::NewLC(CTestConfigSection &, TDesC8 const &, TDesC8 const &)
-	NewLC__18CTestConfigSectionRC6TDesC8 @ 17 NONAME R3UNUSED ; CTestConfigSection::NewLC(TDesC8 const &)
-	NewLC__18CTestConfigSectionRC6TDesC8R18CTestConfigSection @ 18 NONAME R3UNUSED ; CTestConfigSection::NewLC(TDesC8 const &, CTestConfigSection &)
-	ReadScriptL__11CTestConfigRC7TDesC16 @ 19 NONAME R3UNUSED ; CTestConfig::ReadScriptL(TDesC16 const &)
-	ReplaceLC__11CTestConfigRC6TDesC8N21 @ 20 NONAME R3UNUSED ; CTestConfig::ReplaceLC(TDesC8 const &, TDesC8 const &, TDesC8 const &)
-	ResolveFile__11CTestConfigR3RFsRC7TDesC16T2R6TParse @ 21 NONAME ; CTestConfig::ResolveFile(RFs &, TDesC16 const &, TDesC16 const &, TParse &)
-	Section__C11CTestConfigRC6TDesC8 @ 22 NONAME R3UNUSED ; CTestConfig::Section(TDesC8 const &) const
-	WriteFileL__11CTestConfigRC7TDesC16 @ 23 NONAME R3UNUSED ; CTestConfig::WriteFileL(TDesC16 const &)
-	"_._11CTestConfig" @ 24 NONAME R3UNUSED ; CTestConfig::~CTestConfig(void)
-	"_._15CTestConfigItem" @ 25 NONAME R3UNUSED ; CTestConfigItem::~CTestConfigItem(void)
-	"_._18CTestConfigSection" @ 26 NONAME R3UNUSED ; CTestConfigSection::~CTestConfigSection(void)
-	AddItemL__18CTestConfigSectionRC6TDesC8T1 @ 27 NONAME R3UNUSED ; CTestConfigSection::AddItemL(TDesC8 const &, TDesC8 const &)
-	TrimLeft__11CTestConfigRC6TDesC8 @ 28 NONAME R3UNUSED ; CTestConfig::TrimLeft(TDesC8 const &)
-	TrimRight__11CTestConfigRC6TDesC8 @ 29 NONAME R3UNUSED ; CTestConfig::TrimRight(TDesC8 const &)
-	Trim__11CTestConfigRC6TDesC8 @ 30 NONAME R3UNUSED ; CTestConfig::Trim(TDesC8 const &)
-	Item__18CTestConfigSectionRC6TDesC8 @ 31 NONAME R3UNUSED ; CTestConfigSection::Item(TDesC8 const &)
-	Item__18CTestConfigSectionRC6TDesC8i @ 32 NONAME R3UNUSED ; CTestConfigSection::Item(TDesC8 const &, int)
-	ItemsL__18CTestConfigSectionRt13RPointerArray1Z15CTestConfigItemRC6TDesC8 @ 33 NONAME R3UNUSED ; CTestConfigSection::ItemsL(RPointerArray<CTestConfigItem> &, TDesC8 const &)
-	Section__11CTestConfigRC6TDesC8 @ 34 NONAME R3UNUSED ; CTestConfig::Section(TDesC8 const &)
-	ItemsL__C18CTestConfigSectionRt13RPointerArray1ZC15CTestConfigItemRC6TDesC8 @ 35 NONAME R3UNUSED ; CTestConfigSection::ItemsL(RPointerArray<CTestConfigItem const> &, TDesC8 const &) const
-

--- a/telephonyserverplugins/simtsy/testconfigfileparser/bwins/TESTCONFIGFILEPARSERU.DEF	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-EXPORTS
-	??1CTestConfig@@UAE@XZ @ 1 NONAME ; public: virtual __thiscall CTestConfig::~CTestConfig(void)
-	??1CTestConfigItem@@UAE@XZ @ 2 NONAME ; public: virtual __thiscall CTestConfigItem::~CTestConfigItem(void)
-	??1CTestConfigSection@@UAE@XZ @ 3 NONAME ; public: virtual __thiscall CTestConfigSection::~CTestConfigSection(void)
-	??8CTestConfig@@QBEHABV0@@Z @ 4 NONAME ; public: int __thiscall CTestConfig::operator==(class CTestConfig const &)const 
-	?AddItemL@CTestConfigSection@@QAEAAVCTestConfigItem@@ABVTDesC8@@0@Z @ 5 NONAME ; public: class CTestConfigItem & __thiscall CTestConfigSection::AddItemL(class TDesC8 const &,class TDesC8 const &)
-	?CopyLC@CTestConfigSection@@QBEPAV1@XZ @ 6 NONAME ; public: class CTestConfigSection * __thiscall CTestConfigSection::CopyLC(void)const 
-	?CountElements@CTestConfig@@SAHABVTDesC8@@VTChar@@@Z @ 7 NONAME ; public: static int __cdecl CTestConfig::CountElements(class TDesC8 const &,class TChar)
-	?DeleteItemsL@CTestConfigSection@@QAEXABVTDesC8@@@Z @ 8 NONAME ; public: void __thiscall CTestConfigSection::DeleteItemsL(class TDesC8 const &)
-	?GetElement@CTestConfig@@SAHABVTDesC8@@VTChar@@HAAH@Z @ 9 NONAME ; public: static int __cdecl CTestConfig::GetElement(class TDesC8 const &,class TChar,int,int &)
-	?GetElement@CTestConfig@@SAHABVTDesC8@@VTChar@@HAAVTPtrC8@@H@Z @ 10 NONAME ; public: static int __cdecl CTestConfig::GetElement(class TDesC8 const &,class TChar,int,class TPtrC8 &,int)
-	?Item@CTestConfigSection@@QBEPBVCTestConfigItem@@ABVTDesC8@@@Z @ 11 NONAME ; public: class CTestConfigItem const * __thiscall CTestConfigSection::Item(class TDesC8 const &)const 
-	?Item@CTestConfigSection@@QBEPBVCTestConfigItem@@ABVTDesC8@@H@Z @ 12 NONAME ; public: class CTestConfigItem const * __thiscall CTestConfigSection::Item(class TDesC8 const &,int)const 
-	?ItemCount@CTestConfigSection@@QBEHABVTDesC8@@@Z @ 13 NONAME ; public: int __thiscall CTestConfigSection::ItemCount(class TDesC8 const &)const 
-	?ItemValue@CTestConfig@@QBEABVTDesC8@@ABV2@00@Z @ 14 NONAME ; public: class TDesC8 const & __thiscall CTestConfig::ItemValue(class TDesC8 const &,class TDesC8 const &,class TDesC8 const &)const 
-	?ItemValue@CTestConfig@@QBEHABVTDesC8@@0H@Z @ 15 NONAME ; public: int __thiscall CTestConfig::ItemValue(class TDesC8 const &,class TDesC8 const &,int)const 
-	?ItemValue@CTestConfigSection@@QBEABVTDesC8@@ABV2@0@Z @ 16 NONAME ; public: class TDesC8 const & __thiscall CTestConfigSection::ItemValue(class TDesC8 const &,class TDesC8 const &)const 
-	?ItemValue@CTestConfigSection@@QBEHABVTDesC8@@H@Z @ 17 NONAME ; public: int __thiscall CTestConfigSection::ItemValue(class TDesC8 const &,int)const 
-	?NewLC@CTestConfig@@SAPAV1@AAVRFs@@ABVTDesC16@@1@Z @ 18 NONAME ; public: static class CTestConfig * __cdecl CTestConfig::NewLC(class RFs &,class TDesC16 const &,class TDesC16 const &)
-	?NewLC@CTestConfig@@SAPAV1@AAVRFs@@ABVTDesC16@@@Z @ 19 NONAME ; public: static class CTestConfig * __cdecl CTestConfig::NewLC(class RFs &,class TDesC16 const &)
-	?NewLC@CTestConfigItem@@SAPAV1@AAVCTestConfigSection@@ABVTDesC8@@1@Z @ 20 NONAME ; public: static class CTestConfigItem * __cdecl CTestConfigItem::NewLC(class CTestConfigSection &,class TDesC8 const &,class TDesC8 const &)
-	?NewLC@CTestConfigSection@@SAPAV1@ABVTDesC8@@@Z @ 21 NONAME ; public: static class CTestConfigSection * __cdecl CTestConfigSection::NewLC(class TDesC8 const &)
-	?NewLC@CTestConfigSection@@SAPAV1@ABVTDesC8@@AAV1@@Z @ 22 NONAME ; public: static class CTestConfigSection * __cdecl CTestConfigSection::NewLC(class TDesC8 const &,class CTestConfigSection &)
-	?ReadScriptL@CTestConfig@@QAEXABVTDesC16@@@Z @ 23 NONAME ; public: void __thiscall CTestConfig::ReadScriptL(class TDesC16 const &)
-	?ReplaceLC@CTestConfig@@SAPAVHBufC8@@ABVTDesC8@@00@Z @ 24 NONAME ; public: static class HBufC8 * __cdecl CTestConfig::ReplaceLC(class TDesC8 const &,class TDesC8 const &,class TDesC8 const &)
-	?ResolveFile@CTestConfig@@SAHAAVRFs@@ABVTDesC16@@1AAVTParse@@@Z @ 25 NONAME ; public: static int __cdecl CTestConfig::ResolveFile(class RFs &,class TDesC16 const &,class TDesC16 const &,class TParse &)
-	?Section@CTestConfig@@QBEPBVCTestConfigSection@@ABVTDesC8@@@Z @ 26 NONAME ; public: class CTestConfigSection const * __thiscall CTestConfig::Section(class TDesC8 const &)const 
-	?Trim@CTestConfig@@SA?AVTPtrC8@@ABVTDesC8@@@Z @ 27 NONAME ; public: static class TPtrC8  __cdecl CTestConfig::Trim(class TDesC8 const &)
-	?WriteFileL@CTestConfig@@QAEXABVTDesC16@@@Z @ 28 NONAME ; public: void __thiscall CTestConfig::WriteFileL(class TDesC16 const &)
-	?TrimLeft@CTestConfig@@SA?AVTPtrC8@@ABVTDesC8@@@Z @ 29 NONAME ; public: static class TPtrC8  __cdecl CTestConfig::TrimLeft(class TDesC8 const &)
-	?TrimRight@CTestConfig@@SA?AVTPtrC8@@ABVTDesC8@@@Z @ 30 NONAME ; public: static class TPtrC8  __cdecl CTestConfig::TrimRight(class TDesC8 const &)
-	?Item@CTestConfigSection@@QAEPAVCTestConfigItem@@ABVTDesC8@@@Z @ 31 NONAME ; public: class CTestConfigItem * __thiscall CTestConfigSection::Item(class TDesC8 const &)
-	?Item@CTestConfigSection@@QAEPAVCTestConfigItem@@ABVTDesC8@@H@Z @ 32 NONAME ; public: class CTestConfigItem * __thiscall CTestConfigSection::Item(class TDesC8 const &,int)
-	?ItemsL@CTestConfigSection@@QAEXAAV?$RPointerArray@VCTestConfigItem@@@@ABVTDesC8@@@Z @ 33 NONAME ; public: void __thiscall CTestConfigSection::ItemsL(class RPointerArray<class CTestConfigItem> &,class TDesC8 const &)
-	?Section@CTestConfig@@QAEPAVCTestConfigSection@@ABVTDesC8@@@Z @ 34 NONAME ; public: class CTestConfigSection * __thiscall CTestConfig::Section(class TDesC8 const &)
-	?ItemsL@CTestConfigSection@@QBEXAAV?$RPointerArray@$$CBVCTestConfigItem@@@@ABVTDesC8@@@Z @ 35 NONAME ; public: void __thiscall CTestConfigSection::ItemsL(class RPointerArray<class CTestConfigItem const > &,class TDesC8 const &)const 
-

--- a/telephonyserverplugins/simtsy/testconfigfileparser/eabi/testconfigfileparserU.def	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-EXPORTS
-	_ZN11CTestConfig10GetElementERK6TDesC85TChariR6TPtrC8i @ 1 NONAME
-	_ZN11CTestConfig10GetElementERK6TDesC85TChariRi @ 2 NONAME
-	_ZN11CTestConfig10WriteFileLERK7TDesC16 @ 3 NONAME
-	_ZN11CTestConfig11ReadScriptLERK7TDesC16 @ 4 NONAME
-	_ZN11CTestConfig11ResolveFileER3RFsRK7TDesC16S4_R6TParse @ 5 NONAME
-	_ZN11CTestConfig13CountElementsERK6TDesC85TChar @ 6 NONAME
-	_ZN11CTestConfig4TrimERK6TDesC8 @ 7 NONAME
-	_ZN11CTestConfig5NewLCER3RFsRK7TDesC16 @ 8 NONAME
-	_ZN11CTestConfig5NewLCER3RFsRK7TDesC16S4_ @ 9 NONAME
-	_ZN11CTestConfig7SectionERK6TDesC8 @ 10 NONAME
-	_ZN11CTestConfig8TrimLeftERK6TDesC8 @ 11 NONAME
-	_ZN11CTestConfig9ReplaceLCERK6TDesC8S2_S2_ @ 12 NONAME
-	_ZN11CTestConfig9TrimRightERK6TDesC8 @ 13 NONAME
-	_ZN11CTestConfigD0Ev @ 14 NONAME
-	_ZN11CTestConfigD1Ev @ 15 NONAME
-	_ZN11CTestConfigD2Ev @ 16 NONAME
-	_ZN15CTestConfigItem5NewLCER18CTestConfigSectionRK6TDesC8S4_ @ 17 NONAME
-	_ZN15CTestConfigItemD0Ev @ 18 NONAME
-	_ZN15CTestConfigItemD1Ev @ 19 NONAME
-	_ZN15CTestConfigItemD2Ev @ 20 NONAME
-	_ZN18CTestConfigSection12DeleteItemsLERK6TDesC8 @ 21 NONAME
-	_ZN18CTestConfigSection4ItemERK6TDesC8 @ 22 NONAME
-	_ZN18CTestConfigSection4ItemERK6TDesC8i @ 23 NONAME
-	_ZN18CTestConfigSection5NewLCERK6TDesC8 @ 24 NONAME
-	_ZN18CTestConfigSection5NewLCERK6TDesC8RS_ @ 25 NONAME
-	_ZN18CTestConfigSection6ItemsLER13RPointerArrayI15CTestConfigItemERK6TDesC8 @ 26 NONAME
-	_ZN18CTestConfigSection8AddItemLERK6TDesC8S2_ @ 27 NONAME
-	_ZN18CTestConfigSectionD0Ev @ 28 NONAME
-	_ZN18CTestConfigSectionD1Ev @ 29 NONAME
-	_ZN18CTestConfigSectionD2Ev @ 30 NONAME
-	_ZNK11CTestConfig7SectionERK6TDesC8 @ 31 NONAME
-	_ZNK11CTestConfig9ItemValueERK6TDesC8S2_S2_ @ 32 NONAME
-	_ZNK11CTestConfig9ItemValueERK6TDesC8S2_i @ 33 NONAME
-	_ZNK11CTestConfigeqERKS_ @ 34 NONAME
-	_ZNK18CTestConfigSection4ItemERK6TDesC8 @ 35 NONAME
-	_ZNK18CTestConfigSection4ItemERK6TDesC8i @ 36 NONAME
-	_ZNK18CTestConfigSection6CopyLCEv @ 37 NONAME
-	_ZNK18CTestConfigSection6ItemsLER13RPointerArrayIK15CTestConfigItemERK6TDesC8 @ 38 NONAME
-	_ZNK18CTestConfigSection9ItemCountERK6TDesC8 @ 39 NONAME
-	_ZNK18CTestConfigSection9ItemValueERK6TDesC8S2_ @ 40 NONAME
-	_ZNK18CTestConfigSection9ItemValueERK6TDesC8i @ 41 NONAME
-	_ZTI11CTestConfig @ 42 NONAME ; #<TI>#
-	_ZTI15CTestConfigItem @ 43 NONAME ; #<TI>#
-	_ZTI18CTestConfigSection @ 44 NONAME ; #<TI>#
-	_ZTV11CTestConfig @ 45 NONAME ; #<VT>#
-	_ZTV15CTestConfigItem @ 46 NONAME ; #<VT>#
-	_ZTV18CTestConfigSection @ 47 NONAME ; #<VT>#
-

--- a/telephonyserverplugins/simtsy/testconfigfileparser/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-PRJ_PLATFORMS
-
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/testconfigfileparser.h   SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(testconfigfileparser.h)
-../inc/testconfigfileparser.inl SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(testconfigfileparser.inl)
-
-../group/testconfigfileparser.iby	/epoc32/rom/include/testconfigfileparser.iby
-
-PRJ_MMPFILES
-
-../group/testconfigfileparser.mmp
-
-PRJ_TESTMMPFILES
-
-//../test/t_testconfigfileparser.mmp
-
-PRJ_TESTEXPORTS
-
-../test/t_testconfigfileparser.txt /epoc32/wins/c/testscripts/t_testconfigfileparser.txt
-../test/t_testconfigfileparser2.txt /epoc32/wins/c/testscripts/t_testconfigfileparser2.txt
\ No newline at end of file

--- a/telephonyserverplugins/simtsy/testconfigfileparser/group/testconfigfileparser.iby	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/*
-* 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: 
-*
-*/
-
-#ifndef __TEST_CONFIG_FILE_PARSER_IBY__
-#define __TEST_CONFIG_FILE_PARSER_IBY__
-
-REM For components that use the Autotest framework
-
-file=ABI_DIR\BUILD_DIR\testconfigfileparser.dll   System\Libs\testconfigfileparser.dll
-
-#endif
\ No newline at end of file

--- a/telephonyserverplugins/simtsy/testconfigfileparser/group/testconfigfileparser.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2001-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:
-// Top-level project file for DLL that parses config files for test harnesses
-// 
-//
-
-/**
- @file testconfigfileparser.mmp
-*/
-
-TARGET        testconfigfileparser.dll
-CAPABILITY All -Tcb
-TARGETTYPE    dll
-
-SOURCEPATH    ../src
-SOURCE        testconfigfile.cpp
-SOURCE        testconfigsection.cpp 
-SOURCE        testconfigitem.cpp
-
-#ifdef EABI
-DEFFILE       testconfigfileparser.def
-#else
-DEFFILE       TESTCONFIGFILEPARSER.DEF
-#endif
-
-USERINCLUDE   ../inc
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY       euser.lib efsrv.lib
-
-VENDORID 0x70000001

--- a/telephonyserverplugins/simtsy/testconfigfileparser/group/tools_testconfigfileparser.history.xml	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<relnotes name="TESTCONFIGFILEPARSER">
-  <purpose>
-  </purpose>
-</relnotes>

--- a/telephonyserverplugins/simtsy/testconfigfileparser/group/tools_testconfigfileparser.mrp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#
-# 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: 
-#
-
-component	tools_testconfigfileparser
-source	\sf\os\cellularsrv\telephonyserverplugins\simtsy\testconfigfileparser
-binary	\sf\os\cellularsrv\telephonyserverplugins\simtsy\testconfigfileparser\group	all
-exports	\sf\os\cellularsrv\telephonyserverplugins\simtsy\testconfigfileparser\group
-notes_source	\component_defs\release.src
-
-
-ipr T 
-

--- a/telephonyserverplugins/simtsy/testconfigfileparser/inc/testconfigfileparser.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,260 +0,0 @@
-/*
-* 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: 
-*
-*/
-/**
- * @file testscripts.h Defines classes for reading a configuration file
- *
- * @note Configuration File Format:
- * 
- * [Defaults]
- * defaults= another_config_file.txt
- *
- * [SectionName]
- * variable= value
- * variable2= value2
- * variable= value3
- *
- * [SectionName2]
- * variable= value
- *
- * endscript
- *
- * 
- * @note Explanation:
- *
- * A configuration file is made up of a number of "sections", each of which can contain a number of "items" (name, value combination).
- * 
- * "Sections" must have a name and be surrounded by square backets, e.g.:
- *
- *      [SectionName]
- *
- *
- * Each "item" consists of consists of a name, followed by an equals sign, followed by blank space, followed by the value to assign to that variable.
- * 
- * The value can be of any length, contain whitespace and span multiple lines. The value ends when the next item or section is found. E.g:
- * 
- * Simple Item:
- *
- *      variable= value
- *
- * Two items on one line:
- *
- *      variable= value variable2= value2
- *
- * Multi-line item:
- *
- *      variable= This variable
- *      spans multiple
- *      lines
- *
- * 
- * @note Parsing stops at End-Of-File or if the tag "endscript" (without the quotes) appears in the file.
- *
- * @note A section may take some default values from another section or config file
- *
- * To specify default values for all sections, add a section at the start of the config file called [Defaults], e.g.:
- *
- *      [Defaults]
- *      sc= +447785016005
- *
- * To read default values from another config file, add an item with name "defaults" and value is the name of the file. E.g.:
- *
- *      defaults= another_config_file.txt
-
- */
-
-
-#ifndef __TEST_CONFIG_FILE_PARSER_H__
-#define __TEST_CONFIG_FILE_PARSER_H__
-
-#include <e32std.h>
-#include <e32base.h>
-
-class CTestConfigSection;
-class CTestConfigItem;
-class RFs;
-class TParse;
-class RFile;
-
-_LIT(KScriptPanic, "TEST-SCRIPT");
-_LIT(KScriptPathSep,"\\");
-_LIT8(KScriptSectionStart, "[");
-_LIT8(KScriptSectionEnd, "]");
-_LIT8(KScriptCRLF, "\r\n");
-_LIT8(KScriptCRLF8, "\r\n");
-_LIT8(KScriptLF, "\n");
-_LIT8(KScriptCR, "\r");
-_LIT8(KScriptItemEnd, "=");
-_LIT8(KScriptItemEnd8, "=");
-_LIT8(KScriptSpace8, " ");
-_LIT8(KScriptDefaults, "Defaults");
-_LIT8(KScriptDefault1, "Def");
-_LIT8(KScriptDefault2, "Default");
-_LIT8(KScriptCommentStart, "#");
-const TInt KScriptLFChar = '\n';
-const TInt KScriptCRChar = '\r';
-
-class CTestConfig : public CBase
-/**
- * @internalComponent
- * @deprecated
- */
-	{
-	public:
-		IMPORT_C static CTestConfig* NewLC(RFs& aFs, const TDesC& aComponent, const TDesC& aScriptFile);
-		IMPORT_C static CTestConfig* NewLC(RFs& aFs, const TDesC& aComponent);
-		IMPORT_C ~CTestConfig();
-
-		IMPORT_C const TDesC8& ItemValue(const TDesC8& aSection, const TDesC8& aItem, const TDesC8& aDefault) const;
-		IMPORT_C TInt ItemValue(const TDesC8& aSection, const TDesC8& aItem, const TInt aDefault) const;
-		
-		IMPORT_C void ReadScriptL(const TDesC& aScript);
-
-		inline const RPointerArray<CTestConfigSection>& Sections() const;
-		inline RPointerArray<CTestConfigSection>& Sections();
-
-		IMPORT_C const CTestConfigSection* Section(const TDesC8& aSectionName) const; //return NULL if section not found
-		IMPORT_C CTestConfigSection* Section(const TDesC8& aSectionName); //return NULL if section not found
-		inline const CTestConfigSection& operator[](TInt aIndex) const {return *iSections[aIndex];}
-		inline CTestConfigSection& operator[](TInt aIndex) {return *iSections[aIndex];}
-
-		IMPORT_C static TInt CountElements(const TDesC8& aInput, TChar aDelimiter);
-		IMPORT_C static TInt GetElement(const TDesC8& aInput, TChar aDelimiter, TInt aIndex, TInt& aOutput);
-		IMPORT_C static TInt GetElement(const TDesC8& aInput, TChar aDelimiter, TInt aIndex, TPtrC8& aOutput, TBool aTrimOutput = ETrue);
-		IMPORT_C static TPtrC8 Trim(const TDesC8& aInput);
-		IMPORT_C static TPtrC8 TrimLeft(const TDesC8& aInput);
-		IMPORT_C static TPtrC8 TrimRight(const TDesC8& aInput);
-
-		IMPORT_C static HBufC8* ReplaceLC(const TDesC8& aOld, const TDesC8& aNew, const TDesC8& aOldString);
-		IMPORT_C static TInt ResolveFile(RFs& aFs, const TDesC& aComponent, const TDesC& aFileName, TParse& aParseOut);
-
-		IMPORT_C void WriteFileL(const TDesC& aFileName);
-		IMPORT_C TBool operator==(const CTestConfig& aFile) const;
-
-		IMPORT_C void AddSectionL(CTestConfigSection& aSection);
-
-	protected:
-
-		CTestConfig(RFs& aFs);
-		void ConstructL(const TDesC& aComponent);
-
-		TPtrC8 ParseValue(const TDesC8& aText, const TLex8& aInput, TInt aCurrentItemStart) const;
-		void ParseAndSetItemValueL(const TDesC8& aText, const TLex8& aInput, TInt aCurrentItemStart, CTestConfigItem*& arCurrentItem);
-		void CopyInDefaultsL(CTestConfigSection& aSection, const TDesC& aDefaultFile);
-
-		HBufC8* ReadFileL(const TDesC& aFile) const;
-
-		TBool IsDefaultSection(const TDesC8& aSectionName) const;
-		static TInt GetNextElement(TLex8& aInput, TChar aDelimiter, TPtrC8& aOutput);
-		TBool IsNewSection(const TDesC8& aSource, const TLex8& aInput) const;
-		TBool IsNewItem(const TDesC8& aSource, const TLex8& aLex, TPtrC8& aItem, TInt& aStartOfValue) const;
-		TBool IsNewComment(const TDesC8& aSource, const TLex8& aLex) const;
-		TBool IsAtStartOfNewLine(const TDesC8& aSource, const TLex8& aLex, TBool aIgnoreSpaces) const;
-		void SkipToNextLine(TLex8& aInput) const;
-
-
-	protected:
-
-		RFs& iFs;
-		HBufC* iComponent;
-		RPointerArray<CTestConfigSection> iSections;
-	};
-
-class CTestConfigSection : public CBase
-/**
- * @internalComponent
- * @deprecated
- */
-	{
-	friend class CTestConfig;
-
-	public:
-		IMPORT_C static CTestConfigSection* NewLC(const TDesC8& aSectionName);
-		IMPORT_C static CTestConfigSection* NewLC(const TDesC8& aSectionName, CTestConfigSection& aDefaults);
-		IMPORT_C ~CTestConfigSection();
-		
-		inline const TDesC8& SectionName() const;
-
-		IMPORT_C const CTestConfigItem* Item(const TDesC8& aItemTag) const; //return NULL if the item does not exist
-		IMPORT_C CTestConfigItem* Item(const TDesC8& aItemTag); //return NULL if the item does not exist
-		IMPORT_C const CTestConfigItem* Item(const TDesC8& aItemTag,TInt aIndex) const; //return NULL if the item does not exist
-		IMPORT_C CTestConfigItem* Item(const TDesC8& aItemTag,TInt aIndex); //return NULL if the item does not exist
-
-		IMPORT_C const TDesC8& ItemValue(const TDesC8& aItemTag, const TDesC8& aDefault) const;
-		IMPORT_C TInt ItemValue(const TDesC8& aItemTag, TInt aDefault) const;
-
-		IMPORT_C CTestConfigItem& AddItemL(const TDesC8& aItemTag, const TDesC8& aValue);
-		IMPORT_C void DeleteItemsL(const TDesC8& aItem);
-
-		inline const RPointerArray<CTestConfigItem>& Items() const {return iItems;}
-		inline RPointerArray<CTestConfigItem>& Items() {return iItems;}
-
-		IMPORT_C TInt ItemCount(const TDesC8& aItemTag) const;
-		IMPORT_C void ItemsL(RPointerArray<CTestConfigItem>& aArray, const TDesC8& aItemTag);
-		IMPORT_C void ItemsL(RPointerArray<const CTestConfigItem>& aArray, const TDesC8& aItemTag) const;
-
-		inline const CTestConfigItem& operator[](TInt aIndex) const  {return *iItems[aIndex];}
-
-		inline void SetDefaultsL(const CTestConfigSection& aDefaults);
-		inline CTestConfigSection* Defaults() const {return iDefaults;}
-
-		IMPORT_C CTestConfigSection* CopyLC() const;
-
-		void WriteL(RFile& aFile) const;
-		TBool operator==(const CTestConfigSection& aFile) const;
-
-	private:
-		void ConstructL(const TDesC8& aSectionName);
-		CTestConfigSection();
-		RPointerArray<CTestConfigItem> iItems;
-		HBufC8* iSectionName;
-		CTestConfigSection* iDefaults;
-	};
-
-class CTestConfigItem : public CBase
-/**
- * @internalComponent
- * @deprecated
- */
-	{
-	friend class CTestConfigSection;
-	friend class CTestConfig;
-
-	public:
-		IMPORT_C static CTestConfigItem* NewLC(CTestConfigSection& aParent, const TDesC8& aItem, const TDesC8& aValue);
-		inline CTestConfigItem* CopyLC() const;
-
-		IMPORT_C ~CTestConfigItem();
-		inline const TDesC8& Item() const;
-		inline const TDesC8& Value() const;
-
-		void WriteL(RFile& aFile) const;
-		TBool operator==(const CTestConfigItem& aItem) const {return Item() == aItem.Item() && Value() == aItem.Value();}
-
-	public:
-
-		CTestConfigSection& iParent;
-		
-	private:
-		CTestConfigItem(CTestConfigSection& aParent);
-		void ConstructL(const TDesC8& aItem, const TDesC8& aValue);
-		HBufC8* iItem;
-		HBufC8* iValue;
-	};
-
-#include "testconfigfileparser.inl"
-
-#endif

--- a/telephonyserverplugins/simtsy/testconfigfileparser/inc/testconfigfileparser.inl	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
-* 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: 
-*
-*/
-
-#ifndef TEST_SCRIPTS_INL_
-#define TEST_SCRIPTS_INL_
-
-inline const RPointerArray<CTestConfigSection>& CTestConfig::Sections() const
-	{
-	return iSections;
-	}
-
-inline RPointerArray<CTestConfigSection>& CTestConfig::Sections()
-	{
-	return iSections;
-	}
-
-inline const TDesC8& CTestConfigSection::SectionName() const
-	{
-	return *iSectionName;
-	}
-
-inline const TDesC8& CTestConfigItem::Item() const
-	{
-	return *iItem;
-	}
-
-inline void CTestConfigSection::SetDefaultsL(const CTestConfigSection& aDefaults)
-	{
-	CTestConfigSection* def = aDefaults.CopyLC();
-	CleanupStack::Pop(def);
-	delete iDefaults;
-	iDefaults = NULL;
-	iDefaults = def;
-	}
-
-
-inline const TDesC8& CTestConfigItem::Value() const
-	{
-	return *iValue;
-	}
-
-
-inline CTestConfigItem* CTestConfigItem::CopyLC() const
-	{
-	return NewLC(iParent, *iItem, *iValue);
-	}
-
-
-
-#endif

--- a/telephonyserverplugins/simtsy/testconfigfileparser/src/testconfigfile.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,610 +0,0 @@
-/*
-* 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: 
-*
-*/
-#include "testconfigfileparser.h"
-#include <f32file.h>
-
-
-
-#ifndef EKA2
-GLDEF_C TInt E32Dll(TDllReason/* aReason*/)	
-//
-// DLL entry point
-//
-	{
-	return (KErrNone);
-	}
-#endif
-
-
-EXPORT_C CTestConfig* CTestConfig::NewLC(RFs& aFs, const TDesC& aComponent, const TDesC& aScript)
-	{
-	CTestConfig* self = NewLC(aFs, aComponent);
-	self->ReadScriptL(aScript);
-	return self;
-	}
-
-EXPORT_C CTestConfig* CTestConfig::NewLC(RFs& aFs, const TDesC& aComponent)
-	{
-	CTestConfig* self = new (ELeave) CTestConfig(aFs);
-	CleanupStack::PushL(self);
-	self->ConstructL(aComponent);
-	return self;
-	}
-
-void CTestConfig::ConstructL(const TDesC& aComponent)
-	{
-	iComponent = aComponent.AllocL();
-	}
-
-CTestConfig::CTestConfig(RFs& aFs)
-: iFs(aFs)
-	{
-	}
-
-EXPORT_C CTestConfig::~CTestConfig()
-	{
-	iSections.ResetAndDestroy();
-	iSections.Close();
-	delete iComponent;
-	}
-
-EXPORT_C const CTestConfigSection* CTestConfig::Section(const TDesC8& aSectionName) const
-	{
-	const CTestConfigSection* section = NULL;
-	const TInt count = iSections.Count();
-		
-	for (TInt i = 0; i < count; i++) //order important
-		{
-		if (iSections[i]->SectionName().CompareF(aSectionName) == 0)
-			{
-			section = iSections[i];
-			break;
-			}
-		}
-
-	return section;
-	}
-
-EXPORT_C CTestConfigSection* CTestConfig::Section(const TDesC8& aSectionName)
-	{
-	CTestConfigSection* section = NULL;
-	const TInt count = iSections.Count();
-		
-	for (TInt i = 0; i < count; i++) //order important
-		{
-		if (iSections[i]->SectionName().CompareF(aSectionName) == 0)
-			{
-			section = iSections[i];
-			break;
-			}
-		}
-
-	return section;
-	}
-
-EXPORT_C const TDesC8& CTestConfig::ItemValue(const TDesC8& aSection, const TDesC8& aItem, const TDesC8& aDefault) const
-	{
-	const CTestConfigSection* section = Section(aSection);
-
-	if (section != NULL)
-		return section->ItemValue(aItem, aDefault);
-
-	return aDefault;
-	}
-
-EXPORT_C TInt CTestConfig::ItemValue(const TDesC8& aSection, const TDesC8& aItem, const TInt aDefault) const
-	{
-	TInt output = aDefault;
-	const CTestConfigSection* section = Section(aSection);
-
-	if (section != NULL)
-		{
-		output = section->ItemValue(aItem, aDefault);
-		}
-
-	return output;
-	}
-
-
-
-
-HBufC8* CTestConfig::ReadFileL(const TDesC& aFile) const
-	{
-	//Returns a HBufC8 with the contents of aFile
-	RFile file;
-	const TInt err = file.Open(iFs, aFile, EFileShareAny | EFileRead);
-
-	if (err != KErrNone)
-		{
-		TParse fileOut;
-		User::LeaveIfError(ResolveFile(iFs, *iComponent, aFile, fileOut));
-		User::LeaveIfError(file.Open(iFs, fileOut.FullName(), EFileShareAny | EFileRead));
-		}
-
-	CleanupClosePushL(file);
-
-	TInt size = 0;
-	User::LeaveIfError(file.Size(size));
-
-	HBufC8* contents = HBufC8::NewLC(size + 4);
-	TPtr8 contentsPtr(contents->Des());
-	User::LeaveIfError(file.Read(0, contentsPtr));
-
-	CleanupStack::Pop(contents);
-	CleanupStack::PopAndDestroy(&file);
-	return contents;
-	}
-
-EXPORT_C TInt CTestConfig::ResolveFile(RFs& aFs, const TDesC& aComponent, const TDesC& aFileName, TParse& aParseOut)
-	{
-	TFileName* savedPath = new TFileName;
-	TFileName* fileName = new TFileName;
-	if ((savedPath == NULL) || (fileName == NULL))
-		{
-		delete savedPath;
-		delete fileName;
-		return KErrNoMemory;
-		}
-
-	fileName->Append(KScriptPathSep);
-//	fileName->Append(KSmsTestFileInputBase);
-//	fileName->Append(KScriptPathSep);
-	fileName->Append(aComponent);
-	fileName->Append(KScriptPathSep);
-	fileName->Append(aFileName);
-	
-	// file finder will look in the session drive first, then Y->A,Z
-	// so set session drive to Y (save old and restore it afterwards)
-	aFs.SessionPath(*savedPath);
-	_LIT(KTopDrive,"Y:\\");
-	aFs.SetSessionPath(KTopDrive);
-    TFindFile file_finder(aFs);
-    TInt err = file_finder.FindByDir(*fileName,KNullDesC);
-	if(err==KErrNone)
-		aParseOut.Set(file_finder.File(),NULL,NULL);
-	aFs.SetSessionPath(*savedPath);
-	delete savedPath;
-	delete fileName;
-	return(err);
-	}
-
-EXPORT_C void CTestConfig::ReadScriptL(const TDesC& aScript)
-	{
-	iSections.ResetAndDestroy();
-
-	CTestConfigSection* section = NULL;
-	CTestConfigItem* currentItem = NULL;
-	TInt currentItemStart = 0;
-	CTestConfigSection* sectionDefaults = NULL;
-
-	HBufC8* scriptContents = ReadFileL(aScript);
-	CleanupStack::PushL(scriptContents);
-
-	TLex8 input(*scriptContents);
-
-	while (!input.Eos())
-		{
-		input.SkipSpaceAndMark();
-		input.SkipCharacters();
-
-		if ( input.TokenLength() == 0)    // if valid potential token
-			{
-			//end of the script file found
-			break;
-			}
-
-		const TPtrC8 token(input.MarkedToken());
-
-		if (token.CompareF(_L8("endscript")) == 0)
-			{
-			//end of the script file found
-			break;
-			}
-		else if (IsNewSection(*scriptContents, input))
-			{
-			ParseAndSetItemValueL(*scriptContents, input, currentItemStart, currentItem);
-
-			TInt mid = 1;
-			TInt len = token.Length() - 2;
-
-			const TPtrC8 sectionName(token.Mid(mid, len));
-
-			if (sectionDefaults != NULL)
-				section = CTestConfigSection::NewLC(sectionName, *sectionDefaults);
-			else
-				section = CTestConfigSection::NewLC(sectionName);
-
-			if (sectionDefaults == NULL && IsDefaultSection(section->SectionName()))
-				sectionDefaults = section;
-
-			User::LeaveIfError(iSections.Append(section));
-			CleanupStack::Pop(section);
-			}
-		else if (section != NULL)
-			{
-			TInt valueOffset;
-			TPtrC8 newItem;
-
-			if (IsNewComment(*scriptContents, input))
-				{
-				ParseAndSetItemValueL(*scriptContents, input, currentItemStart, currentItem);
-				__ASSERT_DEBUG(currentItem == NULL, User::Invariant());
-				SkipToNextLine(input);
-				}
-			else if (IsNewItem(*scriptContents, input, newItem, valueOffset))
-				{
-				ParseAndSetItemValueL(*scriptContents, input, currentItemStart, currentItem);
-				currentItemStart = input.MarkedOffset() + valueOffset;
-				currentItem = &section->AddItemL(newItem, KNullDesC8);
-				}
-			}
-		}
-
-	ParseAndSetItemValueL(*scriptContents, input, currentItemStart, currentItem);
-	CleanupStack::PopAndDestroy(scriptContents);
-	}
-
-TBool CTestConfig::IsNewSection(const TDesC8& aSource, const TLex8& aInput) const
-/**
- * Checks whether the current marked token in aInput starts with a '[' and ends with a ']',
- * and checks that this token is at the start of a line.
- *
- * @returns Whether this is a new section in the script file
- */
-	{
-	const TPtrC8 token(aInput.MarkedToken());
-	const TInt offset(aInput.MarkedOffset());
-
-	TBool ret = token.Length() > 2 && token.Find(KScriptSectionStart) == 0;
-	ret = ret && token.Find(KScriptSectionEnd) != KErrNotFound;
-
-	if (ret && offset > 0)
-		{
-		const TPtrC8 lastChar(aSource.Mid(offset-1, 1));
-		ret = ret && (lastChar == KScriptLF || lastChar == KScriptCR);
-		}
-
-	return ret;
-	}
-
-void CTestConfig::SkipToNextLine(TLex8& aInput) const
-	{
-	const TChar cr('\n');
-
-	while (!aInput.Eos() && aInput.Peek() != cr)
-		{
-		aInput.Inc();
-		}
-	}
-
-TBool CTestConfig::IsNewItem(const TDesC8& aSource, const TLex8& aLex, TPtrC8& aItem, TInt& aStartOfVal) const
-	{
-	TBool ret(EFalse);
-
-	if (IsAtStartOfNewLine(aSource, aLex, ETrue))
-		{
-		const TPtrC8 itemEnd(KScriptItemEnd);
-		const TInt itemEndLen(itemEnd.Length());
-
-		TPtrC8 token(aLex.MarkedToken());
-
-		//First check to see if this token contains '='
-		const TInt find = token.Find(itemEnd);
-		if (find > 0)
-			{
-			aStartOfVal = find + itemEndLen;
-			aItem.Set(token.Left(find));
-			ret = ETrue;
-			}
-		else
-			{
-			aItem.Set(token);
-			aStartOfVal = token.Length();
-
-			const TPtrC8 remain(aLex.Remainder());
-			TLex8 lex(remain);
-			//Check that the next token starts with and '='
-			lex.SkipSpaceAndMark();
-			lex.SkipCharacters();
-			token.Set(lex.MarkedToken());
-
-			if (token.Find(itemEnd) == 0)
-				{
-				aStartOfVal += lex.MarkedOffset() + itemEndLen;
-				ret = ETrue;
-				}
-			}
-		}
-
-	return ret;
-	}
-
-TBool CTestConfig::IsNewComment(const TDesC8& aSource, const TLex8& aLex) const
-	{
-	TBool ret(EFalse);
-
-	const TPtrC8 token(aLex.MarkedToken());
-	const TPtrC8 commentStart(KScriptCommentStart);
-	const TInt commentStartLen(commentStart.Length());
-	const TInt tokenLen(token.Length());
-
-	if (commentStartLen <= tokenLen && token.Left(commentStartLen).Compare(commentStart) == 0)
-		{
-		ret = IsAtStartOfNewLine(aSource, aLex, ETrue);
-		}
-
-	return ret;
-	}
-
-TBool CTestConfig::IsAtStartOfNewLine(const TDesC8& aSource, const TLex8& aLex, TBool aIgnoreSpaces) const
-	{
-	TInt offset(aLex.MarkedOffset());
-	__ASSERT_ALWAYS(offset != 0, User::Invariant());
-
-	TChar ch = NULL;
-
-	if (aIgnoreSpaces)
-		{
-		while (offset--)
-			{
-			ch = aSource[offset];
-			if (ch == KScriptLFChar || ch == KScriptCRChar || !ch.IsSpace())
-				break;
-			}
-		}
-	else
-		ch = aSource[offset-1];
-
-	TBool ret(EFalse);
-
-	if (offset <= 0)
-		ret = ETrue;
-	else
-		ret = (ch == KScriptLFChar || ch == KScriptCRChar);
-
-	return ret;
-	}
-
-TBool CTestConfig::IsDefaultSection(const TDesC8& aSectionName) const
-	{
-	TBool retVal = (aSectionName.CompareF(KScriptDefaults) == 0);
-	retVal = retVal || (aSectionName.CompareF(KScriptDefault1) == 0);
-	return retVal;
-	}
-
-TPtrC8 CTestConfig::ParseValue(const TDesC8& aText, const TLex8& aInput, TInt aCurrentItemStart) const
-	{
-	const TInt mid = aCurrentItemStart;
-	const TInt len = aInput.MarkedOffset() - mid;
-	TPtrC8 ret(KNullDesC8);
-
-	if (len > 0)
-		ret.Set(aText.Mid(mid, len));
-
-	return ret;
-	}
-
-void CTestConfig::ParseAndSetItemValueL(const TDesC8& aText, const TLex8& aInput, TInt aCurrentItemStart, CTestConfigItem*& arCurrentItem)
-	{
-	if (arCurrentItem)
-		{
-		delete arCurrentItem->iValue;
-		arCurrentItem->iValue = NULL;
-
-		TPtrC8 val(ParseValue(aText, aInput, aCurrentItemStart));
-		arCurrentItem->iValue = ReplaceLC(KScriptCRLF, KScriptLF, val);
-		arCurrentItem->iValue->Des().Trim();
-		CleanupStack::Pop(arCurrentItem->iValue);
-
-		if (arCurrentItem->Item().CompareF(KScriptDefaults) == 0)
-			{
-			TName filename;
-			filename.Copy(arCurrentItem->Value());
-			CopyInDefaultsL(arCurrentItem->iParent, filename);
-			}
-		}
-
-	arCurrentItem = NULL;
-	}
-
-void CTestConfig::CopyInDefaultsL(CTestConfigSection& aSection, const TDesC& aDefaultFile)
-	{
-	CTestConfig* file = CTestConfig::NewLC(iFs, aDefaultFile);
-
-	TInt count = file->Sections().Count();
-
-	if (count > 0)
-		{
-		const CTestConfigSection& def = (*file)[0];
-		aSection.SetDefaultsL(def);
-		}
-
-	CleanupStack::PopAndDestroy(file);
-	}
-
-EXPORT_C TInt CTestConfig::CountElements(const TDesC8& aInput, TChar aDelimiter)
-	{
-	TInt pos = aInput.Length();
-	TInt count = 1;
-
-	while (pos--)
-		{
-		if (TChar(aInput[pos]) == aDelimiter)
-			count++;
-		}
-
-	return count;
-	}
-
-EXPORT_C TInt CTestConfig::GetElement(const TDesC8& aInput, TChar aDelimiter, TInt aIndex, TInt& aOutput)
-	{
-	aOutput = 0;
-	TPtrC8 string;
-	TInt err = GetElement(aInput, aDelimiter, aIndex, string, ETrue);
-
-	if (err == KErrNone)
-		{
-		TLex8 number(string);
-		err = number.Val(aOutput);
-		}
-
-	return err;
-	}
-
-EXPORT_C TInt CTestConfig::GetElement(const TDesC8& aInput, TChar aDelimiter, TInt aIndex, TPtrC8& aOutput, TBool aTrimOutput)
-	{
-	TLex8 input(aInput);
-	TInt err = KErrNone;
-	TPtrC8 ptr;
-
-	for (TInt i = 0; i <= aIndex && err == KErrNone; i++)
-		{
-		err = GetNextElement(input, aDelimiter, ptr);
-		}
-
-	if (err == KErrNone)
-		{
-		if (aTrimOutput)
-			aOutput.Set(Trim(ptr));
-		else
-			aOutput.Set(ptr);
-		}
-	else 
-		{
-		const TInt count = CountElements(aInput, aDelimiter);
-		const TInt len = aInput.Length();
-
-		if (len != 0 && count - 1 == aIndex && TChar(aInput[len-1]) == aDelimiter)
-			{
-			aOutput.Set(KNullDesC8);
-			err = KErrNone;
-			}
-		}
-
-	return err;
-	}
-
-EXPORT_C TPtrC8 CTestConfig::Trim(const TDesC8& aInput)
-	{
-	const TPtrC8 ptr(TrimLeft(aInput));
-	return TrimRight(ptr);
-	}
-
-EXPORT_C TPtrC8 CTestConfig::TrimRight(const TDesC8& aInput)
-	{
-	const TText8* first = aInput.Ptr();					// pointer to first char
-	const TText8* last = first + aInput.Length() - 1;		// pointer to last char
-	while (last >= first && TChar(*last).IsSpace()) last--;	// trim the right
-	return TPtrC8(first, last + 1 - first);				// return the result
-	}
-
-EXPORT_C TPtrC8 CTestConfig::TrimLeft(const TDesC8& aInput)
-	{
-	const TText8* first = aInput.Ptr();					// pointer to first char
-	const TText8* last = first + aInput.Length() - 1;		// pointer to last char
-	while (first < last && TChar(*first).IsSpace()) first++;	// trim the left
-	return TPtrC8(first, last + 1 - first);				// return the result
-	}
-
-
-TInt CTestConfig::GetNextElement(TLex8& aInput, TChar aDelimiter, TPtrC8& aOutput)
-	{
-	if (aInput.Eos())
-		return KErrNotFound;
-
-	//Get to the start of the descriptor
-	while (!aInput.Eos() && aInput.Peek() != aDelimiter)
-		aInput.Inc();
-
-	aOutput.Set(aInput.MarkedToken());
-	if (!aInput.Eos())
-		aInput.SkipAndMark(1);
-
-	return KErrNone;
-	}
-
-/*EXPORT_C void CTestConfig::ReplaceL(const TDesC8& aOld, const TDesC8& aNew, HBufC*& rString)
-	{
-	HBufC* repl = ReplaceLC(aOld, aNew, *rString);
-	CleanupStack::Pop(repl);
-	rString = repl;
-	}*/
-
-EXPORT_C HBufC8* CTestConfig::ReplaceLC(const TDesC8& aOld, const TDesC8& aNew, const TDesC8& aOldString)
-	{
-	HBufC8* rString = aOldString.AllocLC();
-	TInt oldLen = aOld.Length();
-	TInt newLen = aNew.Length();
-
-	if (!oldLen)
-		return rString;
-
-	for (TInt pos = 0; pos < rString->Length(); pos += newLen)
-		{
-		TPtrC8 ptrC = rString->Mid(pos);
-		TInt find = ptrC.Find(aOld);
-
-		if (find == KErrNotFound)
-			return rString;
-	
-		pos += find;
-
-		if (newLen > oldLen)
-			{
-			rString = rString->ReAllocL(rString->Length() + newLen - oldLen);
-			CleanupStack::Pop();
-			CleanupStack::PushL(rString);
-			}
-
-		TPtr8 ptr(rString->Des());
-		ptr.Replace(pos, oldLen, aNew);
-		}
-
-	return rString;
-	}
-
-
-EXPORT_C void CTestConfig::WriteFileL(const TDesC& aFileName)
-	{
-	RFile file;
-	User::LeaveIfError(file.Replace(iFs, aFileName, EFileShareAny | EFileWrite));
-	CleanupClosePushL(file);
-
-	const TInt count = iSections.Count();
-	
-	for (TInt i=0; i < count; i++)
-		iSections[i]->WriteL(file);
-
-	User::LeaveIfError(file.Flush());
-	CleanupStack::PopAndDestroy();  //file
-	}
-
-EXPORT_C TBool CTestConfig::operator==(const CTestConfig& aFile) const
-	{
-	TInt count = iSections.Count();
-	if (count != aFile.Sections().Count())
-		return EFalse;
-
-	TBool retVal = ETrue;
-
-	while (count-- && retVal)
-		{
-		retVal = retVal && (*iSections[count] == aFile[count]);
-		}
-
-	return retVal;
-	}

--- a/telephonyserverplugins/simtsy/testconfigfileparser/src/testconfigitem.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* 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: 
-*
-*/
-#include "testconfigfileparser.h"
-#include <f32file.h>
-
-CTestConfigItem::CTestConfigItem(CTestConfigSection& aParent)
-: iParent(aParent)
-	{
-	}
-
-void CTestConfigItem::ConstructL(const TDesC8& aItem, const TDesC8& aValue)
-	{
-	iItem = aItem.AllocL();
-	iValue = aValue.AllocL();
-	}
-
-EXPORT_C CTestConfigItem::~CTestConfigItem()
-	{
-	delete iItem;
-	delete iValue;
-	}
-
-EXPORT_C CTestConfigItem* CTestConfigItem::NewLC(CTestConfigSection& aParent, const TDesC8& aItem, const TDesC8& aValue)
-	{
-	CTestConfigItem* self = new (ELeave) CTestConfigItem(aParent);
-	CleanupStack::PushL(self);
-	self->ConstructL(aItem, aValue);
-	return self;
-	}
-
-void CTestConfigItem::WriteL(RFile& aFile) const
-	{
-		//Write the section name
-	HBufC8* buf = HBufC8::NewLC(iItem->Length());
-	TPtr8 ptr(buf->Des());
-
-	ptr.Copy(*iItem);
-	User::LeaveIfError(aFile.Write(*buf));
-	User::LeaveIfError(aFile.Write(KScriptItemEnd8));
-	User::LeaveIfError(aFile.Write(KScriptSpace8));
-	CleanupStack::PopAndDestroy(buf);
-
-	HBufC8* val = CTestConfig::ReplaceLC(KScriptLF, KScriptCRLF, *iValue);
-
-	buf = HBufC8::NewLC(val->Length());
-	ptr.Set(buf->Des());
-	ptr.Copy(*val);
-
-	User::LeaveIfError(aFile.Write(*buf));
-	User::LeaveIfError(aFile.Write(KScriptCRLF8));
-
-	CleanupStack::PopAndDestroy(buf);
-	CleanupStack::PopAndDestroy(val);
-	}

--- a/telephonyserverplugins/simtsy/testconfigfileparser/src/testconfigsection.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,312 +0,0 @@
-/*
-* 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: 
-*
-*/
-#include "testconfigfileparser.h"
-#include <f32file.h>
-
-
-//
-// CTestConfigSection
-//
-
-CTestConfigSection::CTestConfigSection()
-	: CBase()
-	{
-	}
-
-EXPORT_C CTestConfigSection* CTestConfigSection::NewLC(const TDesC8& aSectionName, CTestConfigSection& aDefaults)
-	{
-	CTestConfigSection* self = new (ELeave) CTestConfigSection();
-	CleanupStack::PushL(self);
-	self->iDefaults = aDefaults.CopyLC();
-	CleanupStack::Pop(self->iDefaults);
-	self->ConstructL(aSectionName);
-	return self;
-	}
-
-EXPORT_C CTestConfigSection* CTestConfigSection::NewLC(const TDesC8& aSectionName)
-	{
-	CTestConfigSection* self = new (ELeave) CTestConfigSection();
-	CleanupStack::PushL(self);
-	self->ConstructL(aSectionName);
-	return self;
-	}
-
-void CTestConfigSection::ConstructL(const TDesC8& aSectionName)
-	{
-	iSectionName = aSectionName.AllocL();
-	}
-
-EXPORT_C const TDesC8& CTestConfigSection::ItemValue(const TDesC8& aItem, const TDesC8& aDefault) const
-	{
-	const CTestConfigItem* sectionItem = Item(aItem);
-
-	if (sectionItem != NULL)
-		{
-		const TPtrC8 value(sectionItem->Value());
-
-		if (iDefaults != NULL && (value.CompareF(KScriptDefault1) == 0 || value.CompareF(KScriptDefault2) == 0))
-			{
-			return iDefaults->ItemValue(aItem, aDefault);
-			}
-		else
-			{
-			return sectionItem->Value();
-			}
-		}
-	else if (iDefaults != NULL)
-		{
-		return iDefaults->ItemValue(aItem, aDefault);
-		}
-	else
-		{
-		return aDefault;
-		}
-	}
-
-
-EXPORT_C TInt CTestConfigSection::ItemValue(const TDesC8& aItem, const TInt aDefault) const
-	{
-	const TDesC8& value = ItemValue(aItem, KNullDesC8);
-
-	if (value.Length() == 0)
-		{
-		if (iDefaults != NULL)
-			return iDefaults->ItemValue(aItem, aDefault);
-		else
-			return aDefault;
-		}
-
-	TLex8 input(value);
-	TInt ret = aDefault;
-	TInt err = input.Val(ret);
-	
-	if (err)
-		{
-		if (iDefaults != NULL)
-			return iDefaults->ItemValue(aItem, aDefault);
-		else
-			return aDefault;
-		}
-
-	return ret;
-	}
-
-EXPORT_C CTestConfigItem& CTestConfigSection::AddItemL(const TDesC8& aItem, const TDesC8& aValue)
-	{
-	CTestConfigItem* sectionItem = CTestConfigItem::NewLC(*this, aItem, aValue);
-	User::LeaveIfError(iItems.Append(sectionItem));
-	CleanupStack::Pop(sectionItem);
-	return *sectionItem;
-	}
-
-EXPORT_C void CTestConfigSection::DeleteItemsL(const TDesC8& aItem)
-	{
-	TInt count = iItems.Count();
-
-	//Remove existing CTestConfigItems that have the same item name
-	while (count--)
-		{
-		CTestConfigItem* sectionItem = iItems[count];
-
-		if (sectionItem->Item().CompareF(aItem) == 0)
-			{
-			delete sectionItem;
-			iItems.Remove(count);
-			}
-		}	
-	}
-
-
-EXPORT_C CTestConfigSection::~CTestConfigSection()
-	{
-	iItems.ResetAndDestroy();
-	iItems.Close();
-
-	delete iSectionName;
-	delete iDefaults;
-	}
-
-EXPORT_C CTestConfigSection* CTestConfigSection::CopyLC() const
-	{
-	TInt count = iItems.Count();
-	CTestConfigSection* copy = NULL;
-
-	if (iDefaults != NULL)
-		copy = CTestConfigSection::NewLC(SectionName(), *iDefaults);
-	else
-		copy = CTestConfigSection::NewLC(SectionName());
-		
-	while (count--)
-		{
-		CTestConfigItem* item = iItems[count]->CopyLC();
-		User::LeaveIfError(copy->iItems.Append(item));
-		CleanupStack::Pop(item);
-		}
-
-	return copy;
-	}
-
-void CTestConfigSection::WriteL(RFile& aFile) const
-	{
-	//Write the section name
-	HBufC8* buf = HBufC8::NewLC(iSectionName->Length());
-	buf->Des().Copy(*iSectionName);
-
-	User::LeaveIfError(aFile.Write(KScriptSectionStart));
-	User::LeaveIfError(aFile.Write(*buf));
-	User::LeaveIfError(aFile.Write(KScriptSectionEnd));
-	User::LeaveIfError(aFile.Write(KScriptCRLF8));
-
-	CleanupStack::PopAndDestroy(buf);
-	const TInt count = iItems.Count();
-
-	//Write the items
-	for (TInt i = 0; i < count; i++)
-		iItems[i]->WriteL(aFile);
-
-	User::LeaveIfError(aFile.Write(KScriptCRLF8));
-	}
-
-TBool CTestConfigSection::operator==(const CTestConfigSection& aSection) const
-	{
-	TInt count = iItems.Count();
-
-	if (count != aSection.Items().Count())
-		return EFalse;
-
-	TBool retVal = (*iSectionName == aSection.SectionName());
-
-	while (count-- && retVal)
-		{
-		retVal = retVal && (*iItems[count] == aSection[count]);
-		}
-
-	return retVal;
-	}
-
-EXPORT_C const CTestConfigItem* CTestConfigSection::Item(const TDesC8& aItem) const
-	{
-	const CTestConfigItem* sectionItem = NULL;
-	const TInt count = iItems.Count();
-	for (TInt i = 0; i < count; i++)
-		{
-		if (iItems[i]->Item().CompareF(aItem) == 0)
-			{
-			sectionItem = iItems[i];
-			break;
-			}
-		}
-	return sectionItem;
-	}
-
-EXPORT_C CTestConfigItem* CTestConfigSection::Item(const TDesC8& aItem)
-	{
-	CTestConfigItem* sectionItem = NULL;
-	const TInt count = iItems.Count();
-	for (TInt i = 0; i < count; i++)
-		{
-		if (iItems[i]->Item().CompareF(aItem) == 0)
-			{
-			sectionItem = iItems[i];
-			break;
-			}
-		}
-	return sectionItem;
-	}
-
-EXPORT_C const CTestConfigItem* CTestConfigSection::Item(const TDesC8& aItem,TInt aIndex) const
-	{
-	const CTestConfigItem* sectionItem = NULL;
-	const TInt count = iItems.Count();
-	TInt foundItemCnt=0;
-	for (TInt i = 0; i < count; i++)
-		{
-		if (iItems[i]->Item().CompareF(aItem) == 0)
-			{
-			if(foundItemCnt++==aIndex)
-				{
-				sectionItem = iItems[i];
-				break;
-				}
-			}
-		}
-	return sectionItem;
-	}
-
-EXPORT_C CTestConfigItem* CTestConfigSection::Item(const TDesC8& aItem,TInt aIndex)
-	{
-	CTestConfigItem* sectionItem = NULL;
-	const TInt count = iItems.Count();
-	TInt foundItemCnt=0;
-	for (TInt i = 0; i < count; i++)
-		{
-		if (iItems[i]->Item().CompareF(aItem) == 0)
-			{
-			if(foundItemCnt++==aIndex)
-				{
-				sectionItem = iItems[i];
-				break;
-				}
-			}
-		}
-	return sectionItem;
-	}
-
-EXPORT_C void CTestConfigSection::ItemsL(RPointerArray<CTestConfigItem>& aArray, const TDesC8& aItemTag)
-	{
-	aArray.Reset();
-	const TInt count = iItems.Count();
-
-	for (TInt i = 0; i < count; i++) //< Order important
-		{
-		CTestConfigItem& item = *iItems[i];
-
-		if (item.Item().CompareF(aItemTag) == 0)
-			{
-			User::LeaveIfError(aArray.Append(&item));
-			}
-		}
-	}
-
-EXPORT_C void CTestConfigSection::ItemsL(RPointerArray<const CTestConfigItem>& aArray, const TDesC8& aItemTag) const
-	{
-	aArray.Reset();
-	const TInt count = iItems.Count();
-
-	for (TInt i = 0; i < count; i++) //< Order important
-		{
-		const CTestConfigItem& item = *iItems[i];
-
-		if (item.Item().CompareF(aItemTag) == 0)
-			{
-			User::LeaveIfError(aArray.Append(&item));
-			}
-		}
-	}
-
-
-EXPORT_C TInt CTestConfigSection::ItemCount(const TDesC8& aItem) const
-	{
-	const TInt count = iItems.Count();
-	TInt foundItemCnt=0;
-	for (TInt i = 0; i < count; i++)
-		{
-		if (iItems[i]->Item().CompareF(aItem) == 0)
-			foundItemCnt++;
-		}
-	return foundItemCnt;
-	}

--- a/telephonyserverplugins/simtsy/testconfigfileparser/test/t_testconfigfileparser.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,261 +0,0 @@
-// Copyright (c) 2001-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:
-// Tests classes defined in testconfigfileparser.h
-// 
-//
-
-/**
- @file t_testconfigfileparser.cpp
- @since Hurricane
- @copyright Copyright (c) 2001 Symbian Ltd.  All rights reserved.
-*/
-
-#include <autotest.h>
-#include <e32base.h>
-#include <e32test.h>		//< for RTest
-#include "testconfigfileparser.h"
-#include <f32file.h>
-
-
-_LIT(KTestScriptFile, "t_testconfigfileparser.txt");
-_LIT(KTestScriptComponent, "testscripts");
-_LIT(KTestScriptComponentFull, "\\testscripts\\");
-_LIT(KTestScriptOutput, "c:\\output.txt");
-
-CAutoTest* gAutoTest;
-RTest gTest(_L("Test Config File Test"));
-
-void TestGetElementL(TInt aTestCase, const TDesC8& aInput, TChar aDel, TInt aIndex, const TDesC8& aExpected, TBool aTrimOutput=ETrue)
-	{
-	TPtrC8 item(KNullDesC8);
-	const TInt err = CTestConfig::GetElement(aInput, aDel, aIndex, item, aTrimOutput);
-
-	const TInt KPrintfMaxLen = 200;
-	TBuf<KPrintfMaxLen> temp;
-
-	if (aInput.Length() <= KPrintfMaxLen)
-		{
-		temp.Copy(aInput);
-		gTest.Printf(_L("aInput=\"%S\" "), &temp);
-		}
-	else
-		gTest.Printf(_L("aInput=TOO LONG "));
-
-	gTest.Printf(_L("aIndex=%d "), aIndex);
-	gTest.Printf(_L("aTimeOutput=%d "), aTrimOutput);
-
-	if (aExpected.Length() <= KPrintfMaxLen)
-		{
-		temp.Copy(aExpected);
-		gTest.Printf(_L("aExpected=\"%S\" "), &temp);
-		}
-	else
-		gTest.Printf(_L("aExpected=TOO LONG "));
-
-	if (item.Length() <= KPrintfMaxLen)
-		{
-		temp.Copy(item);
-		gTest.Printf(_L("Get=\"%S\" "), &temp);
-		}
-	else
-		gTest.Printf(_L("Get=TOO LONG "));
-
-	gTest.Printf(_L("Err=%d\n"), err);
-
-	GLOBAL_CHECKPOINT_COMPARE(err, KErrNone, _L("Error getting element"));
-
-	temp.Format(_L("Element not expected [test=%d"), aTestCase);
-	GLOBAL_CHECKPOINT_COMPARE(!(item == aExpected), EFalse, temp);
-	}
-
-void TestGetElementL(const CTestConfig& aFile)
-	{
-	TInt sectionCount = aFile.Sections().Count();
-
-	while (sectionCount--)
-		{
-		const CTestConfigSection& section = aFile[sectionCount];
-
-		TInt itemCount = section.Items().Count();
-
-		while (itemCount--)
-			{
-			const CTestConfigItem& item = section[itemCount];
-			TPtrC8 output(KNullDesC8);
-			aFile.GetElement(item.Value(), ',', 0, output);
-			}
-		}
-	}
-
-void TestParseFileL()
-	{
-	RFs fs;
-	User::LeaveIfError(fs.Connect());
-	CleanupClosePushL(fs);
-
-	TFindFile findFile(fs);
-	_LIT(KWild, "*.txt");
-
-	CDir* dirs=NULL;
-	User::LeaveIfError(findFile.FindWildByDir(KWild, KTestScriptComponentFull, dirs));
-
-	TInt count = dirs->Count();
-
-	while (count--)
-		{
-		const TFileName fileName((*dirs)[count].iName);
-
-		CTestConfig* file = CTestConfig::NewLC(fs, KTestScriptComponent, fileName); 
-
-		file->WriteFileL(KTestScriptOutput);
-
-		CTestConfig* output = CTestConfig::NewLC(fs, KTestScriptComponent, KTestScriptOutput); 
-
-		TBool test = (*output == *file);
-
-		GLOBAL_CHECKPOINT_COMPARE(!test, EFalse, _L("Output != File"));
-
-		TestGetElementL(*file);
-
-		CleanupStack::PopAndDestroy(output);
-		CleanupStack::PopAndDestroy(file);
-		}
-
-	CleanupStack::PopAndDestroy(&fs);
-	}
-
-const TInt del = ';';
-_LIT8(KFirst, "First");
-_LIT8(KMiddle, "Middle");
-_LIT8(KLast, "Last");
-_LIT8(KElem1, "First;Middle;Last");
-_LIT8(KElem2, "    First;           ;Last");
-_LIT8(KElem3, ";   Middle       ;Last");
-_LIT8(KElem4, "First;Middle;     ");
-_LIT8(KElem5, ";;");
-
-void TestGetElementL()
-	{
-	TInt testCase = 0;
-
-	TestGetElementL(++testCase, KElem1, del, 0, KFirst);
-	TestGetElementL(++testCase, KElem1, del, 1, KMiddle);
-	TestGetElementL(++testCase, KElem1, del, 2, KLast);
-
-	TestGetElementL(++testCase, KElem2, del, 0, KFirst);
-	TestGetElementL(++testCase, KElem2, del, 1, KNullDesC8);
-	TestGetElementL(++testCase, KElem2, del, 2, KLast);
-
-	TestGetElementL(++testCase, KElem3, del, 0, KNullDesC8);
-	TestGetElementL(++testCase, KElem3, del, 1, KMiddle);
-	TestGetElementL(++testCase, KElem3, del, 2, KLast);
-
-	TestGetElementL(++testCase, KElem4, del, 0, KFirst);
-	TestGetElementL(++testCase, KElem4, del, 1, KMiddle);
-	TestGetElementL(++testCase, KElem4, del, 2, KNullDesC8);
-
-	TestGetElementL(++testCase, KElem5, del, 0, KNullDesC8);
-	TestGetElementL(++testCase, KElem5, del, 1, KNullDesC8);
-	TestGetElementL(++testCase, KElem5, del, 2, KNullDesC8);
-	}
-
-void PrepareBuf(TDes8& aOutput, TInt aLeadingSpaces, const TDesC8& aInput, TInt aTrailingSpaces)
-	{
-	const TInt KSpace = ' ';
-	aOutput.Zero();
-	aOutput.AppendFill(KSpace, aLeadingSpaces);
-	aOutput.Append(aInput);
-	aOutput.AppendFill(KSpace, aTrailingSpaces);
-	}
-
-void TestGetElementWithoutTrimL()
-	{
-	TInt testCase = 0;
-	TBuf8<32> temp;
-
-	TestGetElementL(++testCase, KElem1, del, 0, KFirst, EFalse);
-	TestGetElementL(++testCase, KElem1, del, 1, KMiddle, EFalse);
-	TestGetElementL(++testCase, KElem1, del, 2, KLast, EFalse);
-
-	PrepareBuf(temp, 4, KFirst, 0);
-	TestGetElementL(++testCase, KElem2, del, 0, temp, EFalse);
-	PrepareBuf(temp, 11, KNullDesC8, 0);
-	TestGetElementL(++testCase, KElem2, del, 1, temp, EFalse);
-	TestGetElementL(++testCase, KElem2, del, 2, KLast, EFalse);
-
-	TestGetElementL(++testCase, KElem3, del, 0, KNullDesC8, EFalse);
-	PrepareBuf(temp, 3, KMiddle, 7);
-	TestGetElementL(++testCase, KElem3, del, 1, temp, EFalse);
-	TestGetElementL(++testCase, KElem3, del, 2, KLast, EFalse);
-
-	TestGetElementL(++testCase, KElem4, del, 0, KFirst, EFalse);
-	TestGetElementL(++testCase, KElem4, del, 1, KMiddle, EFalse);
-	PrepareBuf(temp, 5, KNullDesC8, 0);
-	TestGetElementL(++testCase, KElem4, del, 2, temp, EFalse);
-
-	TestGetElementL(++testCase, KElem5, del, 0, KNullDesC8, EFalse);
-	TestGetElementL(++testCase, KElem5, del, 1, KNullDesC8, EFalse);
-	TestGetElementL(++testCase, KElem5, del, 2, KNullDesC8, EFalse);
-
-	TPtrC8 output;
-	const TInt err = CTestConfig::GetElement(KNullDesC8, 0, 0, output);
-	GLOBAL_CHECKPOINT(err != KErrNone);
-	}
-
-
-// Set up the array of test functions, which make the API calls
-LOCAL_C const TAutoTestCase Cases[] =
-	{
-	{TestParseFileL,_S("Parse File")},
-	{TestGetElementL,_S("Get Element")},
-	{TestGetElementWithoutTrimL,_S("Get Element Without Trim")}
-	};
-
-void AutoTestExecuteL()
-	{
-	_LIT(KDummyTests,"TestConfigFileParser_testreport.txt");
-	_LIT8(KComponentInfo,"TestConfigFileParser");
-	// Library defined macro
-	// Uses a global pointer instance of CAutoTest
-	GLOBAL_AUTOTEST_EXECUTE(Cases, KDummyTests, KComponentInfo, gTest);
-	}
-
-TInt E32Main()
-/**
- * Main
- */
-	{
-	CTrapCleanup* cleanup = CTrapCleanup::New();
-
-	__UHEAP_MARK;
-
-	gTest.SetLogged(ETrue);
-	gTest.Title();
-	gTest.Start(_L("Starting tests..."));
-
-	TRAPD(err, AutoTestExecuteL());
-
-	if (err!=KErrNone)
-		gTest.Printf(_L("ERROR: Leave %d\n"),err);
-
-	gTest.Printf(_L("Test Complete. Press any key ...\n"));
-	gTest.Getch();
-	gTest.End();
-	gTest.Close();
-
-	__UHEAP_MARKEND;
-
-	delete cleanup;
-	return KErrNone;
-	}

--- a/telephonyserverplugins/simtsy/testconfigfileparser/test/t_testconfigfileparser.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Test harness for testscripts
-// 
-//
-
-/**
- @file t_testconfigfileparser.mmp
- @since Hurricane
-*/
-
-
-TARGET        t_testconfigfileparser.exe
-TARGETTYPE    exe
-
-USERINCLUDE	..\inc
-SOURCE		t_testconfigfileparser.cpp
-
-
-SYSTEMINCLUDE \epoc32\include
-LIBRARY       euser.lib efsrv.lib testconfigfileparser.lib autotest.lib
-
-
-
-VENDORID 0x70000001

--- a/telephonyserverplugins/simtsy/testconfigfileparser/test/t_testconfigfileparser.txt	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-[Defaults]
-
-#This is a comment
-
-Item1=This is item 1
-Item2 = This is item 2
-Item3= Thisitem3
-       Item4= Thisitem4
-       Item5=Thisitem5
-       Item6 =Thisitem6
-       Item7 = Thisitem7
-Item8          =          Thisitem8
-           	Item9          =          Thisitem9
-Item10=Thisitem10=9348092384
-Item11=Thisitem11=9348092384
-Item12=Thisitem12 = 9348092384=lksdjflskjf = 9348092384 = lksdjflskjf
-
-Test=Blah
-Test =Blah
-Test= Blah
-Test = Blah
-
-#This is my first comment
-
-[Section1]
-Section11= Section11Item
-Section12= Section12Item
-#This is my second comment
-Section122= Section12Item Hello
-
-[Section3]
-Section21= Section21Item Section22= blah blah blah Section23= tu tu tu
-Section24= Multi
-Line
-#This is my third comment
-Section Item < Note: this will be ignored
-#This is my fourth comment
-
-[Section4]
-RepeatItem= 1
-RepeatItem= 2
-RepeatItem= 3
-RepeatItem= 4
-RepeatItem= 5
-RepeatItem= 6
-RepeatItem= 7
-RepeatItem= 8
-
-endscript
-
-#This is my fifth comment
-
-[Section4]
-NotExpected= Nothing

--- a/telephonyserverplugins/simtsy/testconfigfileparser/test/t_testconfigfileparser2.txt	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-[SendAndReceiveDifferentClasses0]
-#Messages
-Message= 1, SendAndReceiveDifferentClasses class is _
-#Classes
-SmsClass1= 0
-SmsClass2= 1
-SmsClass3= 2
-SmsClass4= 3
-
-
-[SendAndReceiveIndicatorMsgs0]
-#Messages
-Message= 1, VoicemailMessageWaiting WaitingIndication7Bit IndicationActive
-Message= 2, VoicemailMessageWaiting WaitingIndication7Bit IndicationInactive
-Message= 3, VoicemailMessageWaiting WaitingIndicationUCS2 IndicationActive
-Message= 4, FaxMessageWaiting WaitingIndication7Bit IndicationInactive
-Message= 5, ElectronicMailMessageWaiting WaitingIndication7Bit IndicationInactive
-Message= 6, FaxOtherMessageWaiting WaitingIndication7Bit IndicationActive
-Message= 7, VoicemailMessageWaiting WaitingIndicationDiscardMessage IndicationActive
-
-#IndicationTypes
-IndicationType1= 0 #ESmsVoicemailMessageWaiting
-IndicationType2= 0 
-IndicationType3= 0 
-IndicationType4= 1 #ESmsFaxMessageWaiting
-IndicationType5= 2 #ESmsElectronicMailMessageWaiting
-IndicationType6= 3 #ESmsFaxOtherMessageWaiting
-IndicationType7= 0 
-
-#DCSBits7To4s
-DCSBits7To41= 208 #0xD0 ESmsDCSMessageWaitingIndication7Bit
-DCSBits7To42= 208
-DCSBits7To43= 224 #0xE0 ESmsDCSMessageWaitingIndicationUCS2
-DCSBits7To44= 208
-DCSBits7To45= 208
-DCSBits7To46= 208
-DCSBits7To47= 192 #0xC0 ESmsDCSMessageWaitingIndicationDiscardMessage
-
-#IndicationStates
-IndicationState1= 8 #0x08 ESmsIndicationActive
-IndicationState2= 0 #0x00 ESmsIndicationInactive
-IndicationState3= 8
-IndicationState4= 0
-IndicationState5= 0
-IndicationState6= 8
-IndicationState7= 8
-
-
-[SendMsgsWithDifferentVP0]
-Message= 1, Message with validity period in minutes _
-
-#ValidityPeriods
-ValidityPeriod1= 60
-ValidityPeriod2= 120
-ValidityPeriod3= 240
-ValidityPeriod4= 480
-
-
-[CommandMessages0]
-Message= 1, test message length 22
-
-
-[SendAndRecvMsgsWithDifferentTON0]
-#Messages
-Message= 1, Test message.
-
-#Alphabets
-Alphabet1= 0 # ESmsAlphabet7Bit=0x00
-
-#TypeOfNumbers
-TypeOfNumber1= 0  #EGsmSmsTONUnknown=0x00
-TypeOfNumber2= 16 #EGsmSmsTONInternationalNumber=0x10
-TypeOfNumber3= 32 #EGsmSmsTONNationalNumber=0x20
-TypeOfNumber4= 48 #EGsmSmsTONNetworkSpecificNumber=0x30
-TypeOfNumber5= 96 #EGsmSmsTONAbbreviatedNumber=0x60
-TypeOfNumber6= 64 #EGsmSmsTONSubscriberNumber=0x40
-
-
-[SmartMessaging0]
-#Pdus
-PDU= 021B504A20543A5585510540D19082956108CD0549D06090045500008500
-
-#Messages
-Message= 1, BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR
-Message= 2, BEGIN:VCARD\nVERSION:2.1\nN:Kukkonen;Sami\nTEL;PREF:+358503878682\nEND:VCARD
-Message= 3, 024A3A51D195CDD004001B20550590610560558550548540820849900000
-
-#IEIDatas
-ieiData11= 35  #0x23 Destination port 0x23F5
-ieiData12= 245 #0xF5
-ieiData13= 0   #0x00 Originator port 0x0000
-ieiData14= 0   #0x00
-ieiData21= 35  #0x23 Destination port 0x23F4
-ieiData22= 244 #0xF4
-ieiData23= 0   #0x00 Originator port 0x0000
-ieiData24= 0   #0x00
-ieiData31= 21  #0x15 Destination port 0x1581
-ieiData32= 129 #0x81
-ieiData33= 0   #0x00 Originator port 0x0000
-ieiData34= 0   #0x00
-
-#InformationElements
-InformationElement1= 5  #ESmsIEIApplicationPortAddressing16Bit
-InformationElement2= 4  #ESmsIEIApplicationPortAddressing8Bit
-InformationElement3= 5
-
-#Alphabets
-Alphabet1= 0 # ESmsAlphabet7Bit=0x00
-Alphabet2= 0
-Alphabet3= 4 # ESmsAlphabet8Bit=0x04
-
-
-[SendSMS2Port00000]
-Message= 1, //SCKL0000
-Message= 2, //SCKL23F4 \nBEGIN:VCARD\nVERSION:2.1\nNAME:HOWE\nTEL:+447747065825\nEND:VCARD
-
-
-# Used values:
-#
-# 	enum TSmsClass
-# 		{
-# 		ESmsClass0=0x00,
-# 		ESmsClass1=0x01,
-# 		ESmsClass2=0x02,
-# 		ESmsClass3=0x03,
-# 		};
-# 
-# 	enum TSmsIndicationType
-# 		{
-# 		ESmsVoicemailMessageWaiting=0x00,
-# 		ESmsFaxMessageWaiting=0x01,
-# 		ESmsElectronicMailMessageWaiting=0x02,
-# 		ESmsFaxOtherMessageWaiting=0x03,
-# 		};
-# 	enum TSmsDCSBits7To4
-# 		{
-# 		ESmsDCSTextUncompressedWithNoClassInfo=0x00,
-# 		ESmsDCSTextUncompressedWithClassInfo=0x10,
-# 		ESmsDCSTextCompressedWithNoClassInfo=0x20,
-# 		ESmsDCSTextCompressedWithClassInfo=0x30,
-# 		ESmsDCSMessageWaitingIndicationDiscardMessage=0xC0,
-# 		ESmsDCSMessageWaitingIndication7Bit=0xD0,  //  7 bit User data 
-# 		ESmsDCSMessageWaitingIndicationUCS2=0xE0,  //  unicode User data 
-# 		ESmsDCSTextUncompressed7BitOr8Bit=0xF0,
-# 		ESmsDCSBits7To4Mask=0xF0
-# 		};
-# 	enum TSmsIndicationState
-# 		{
-# 		ESmsIndicationInactive=0x00,
-# 		ESmsIndicationActive=0x08,
-# 		};
-# 	enum TGsmSmsTypeOfNumber
-# 		{
-# 		EGsmSmsTONUnknown=0x00,
-# 		EGsmSmsTONInternationalNumber=0x10,
-# 		EGsmSmsTONNationalNumber=0x20,
-# 		EGsmSmsTONNetworkSpecificNumber=0x30,
-# 		EGsmSmsTONSubscriberNumber=0x40,
-# 		EGsmSmsTONAlphaNumeric=0x50,
-# 		EGsmSmsTONAbbreviatedNumber=0x60,
-# 		EGsmSmsTONReserverved=0x70,
-# 		};
-
-
-
-
-

--- a/telephonyserverplugins/simtsy/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyserverplugins/simtsy/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1487 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_SIMPANIC_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_CONSTRUCTL_1=0x5a4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_CONSTRUCTL_2=0x5a5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_CONSTRUCTL_3=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_CONSTRUCTL_4=0x5a6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_CONSTRUCTL_5=0x5a7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_GETBATTERYINFO_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_GETBATTERYINFO_2=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_NOTIFYBATTERYINFOCANCEL_1=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_NOTIFYBATTERYINFOCANCEL_2=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_NOTIFYBATTERYINFOCHANGE_1=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_TIMERCALLBACK_1=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_CONSTRUCTL_1=0x29
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_CONSTRUCTL_2=0x2a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_FINDANDCREATECBLISTL_1=0x2b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_FINDANDCREATECBLISTL_2=0x2c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_FINDANDCREATECBLISTL_3=0x2d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_FINDANDCREATECBLISTL_4=0x2e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_FINDANDCREATECBLISTL_5=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_GETCALLBARRINGSTATUSCANCEL_1=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_GETCALLBARRINGSTATUSCANCEL_2=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE1_1=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE1_2=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE2_1=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE2_2=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_NOTIFYCALLBARRINGSTATUSCHANGE_1=0x30
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_PROCESSGETCALLBARRINGSTATUSPHASE1L_1=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_PROCESSGETCALLBARRINGSTATUSPHASE1L_2=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_CONSTRUCTL_1=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_CONSTRUCTL_2=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_CONSTRUCTL_3=0x3b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_CONSTRUCTL_4=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_FINDANDCREATECFLISTL_1=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_FINDANDCREATECFLISTL_2=0x3e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_FINDANDCREATECFLISTL_3=0x3f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_FINDANDCREATECFLISTL_4=0x40
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_FINDANDCREATECFLISTL_5=0x41
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_FINDANDCREATECFLISTL_6=0x42
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_FINDANDCREATECFLISTL_7=0x43
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSCANCEL_1=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSCANCEL_2=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE1_1=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE1_2=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE2_1=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE2_2=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_NOTIFYCALLFORWARDINGSTATUSCHANGE_1=0x44
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_PROCESSGETCALLFORWARDINGSTATUSPHASE1L_1=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_PROCESSGETCALLFORWARDINGSTATUSPHASE1L_2=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_SETCALLFORWARDINGSTATUS_1=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_CONSTRUCTL_1=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_CONSTRUCTL_2=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_FINDANDCREATECWLISTL_1=0x50
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_FINDANDCREATECWLISTL_2=0x51
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_FINDANDCREATECWLISTL_3=0x52
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_FINDANDCREATECWLISTL_4=0x53
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_GETCALLWAITINGSTATUSCANCEL_1=0x5b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_GETCALLWAITINGSTATUSCANCEL_2=0x5c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE1_1=0x55
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE1_2=0x56
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE2_1=0x59
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE2_2=0x5a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_NOTIFYCALLWAITINGSTATUSCHANGE_1=0x54
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_PROCESSGETCALLWAITINGSTATUSPHASE1L_1=0x57
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_PROCESSGETCALLWAITINGSTATUSPHASE1L_2=0x58
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_CHANGESTATEL_1=0x21
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_CHANGESTATEL_2=0x22
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_GETCALLDURATION_1=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_GETCALLDURATION_2=0x20
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_GETMOBILECALLINFO_1=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_GETMOBILECALLSTATUS_1=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_GETMOBILECALLSTATUS_2=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_GETSTATUS_1=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_GETSTATUS_2=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYHOOKCHANGECANCEL_1=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYHOOKCHANGECANCEL_2=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYHOOKCHANGE_1=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYHOOKCHANGE_2=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGECANCEL_1=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGECANCEL_2=0x15
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGE_1=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGE_2=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGECANCEL_1=0x27
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGECANCEL_2=0x28
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGE_1=0x25
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGE_2=0x26
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYSTATUSCHANGECANCEL_1=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYSTATUSCHANGECANCEL_2=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYSTATUSCHANGE_1=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYSTATUSCHANGE_2=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NUMBEROFSLOTSL_1=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NUMBEROFSLOTSL_2=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_REQMODEL_1=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_UPDATENOTIFIERS_1=0x23
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_UPDATENOTIFIERS_2=0x24
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_1=0x5d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_10=0x66
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_11=0x67
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_12=0x68
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_13=0x69
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_14=0x6a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_15=0x6b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_16=0x6c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_17=0x6d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_18=0x6e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_19=0x6f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_2=0x5e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_20=0x70
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_21=0x71
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_22=0x72
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_23=0x73
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_24=0x74
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_3=0x5f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_4=0x60
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_5=0x61
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_6=0x62
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_7=0x63
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_8=0x64
-[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_9=0x65
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_1=0xad
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_10=0xb6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_11=0xb7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_2=0xae
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_3=0xaf
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_4=0xb0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_5=0xb1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_6=0xb2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_7=0xb3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_8=0xb4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_9=0xb5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ANSWERINCOMINGCALLCANCEL_1=0xa6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ANSWERINCOMINGCALLCANCEL_2=0xa7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ANSWERINCOMINGCALL_1=0xa4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ANSWERINCOMINGCALL_2=0xa5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CANCELSERVICE_1=0x9e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_1=0x5a8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_10=0x7e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_11=0x7f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_12=0x80
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_13=0x81
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_14=0x82
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_15=0x83
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_16=0x84
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_17=0x85
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_18=0x86
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_19=0x87
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_2=0x5a9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_20=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_21=0x89
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_22=0x8a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_23=0x8b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_24=0x8c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_25=0x8d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_26=0x8e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_27=0x8f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_28=0x90
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_29=0x91
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_3=0x77
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_30=0x92
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_31=0x93
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_32=0x94
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_33=0x95
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_34=0x96
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_35=0x97
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_36=0x98
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_37=0x99
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_38=0x9a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_39=0x5aa
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_4=0x78
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_40=0x5ab
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_5=0x79
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_6=0x7a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_7=0x7b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_8=0x7c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_9=0x7d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_DIALCANCEL_1=0xa1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_DIALCANCEL_2=0xa2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_DIALCANCEL_3=0xa3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_DIAL_1=0x9f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_DIAL_2=0xa0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_EXTFUNC_1=0x9c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_EXTFUNC_2=0x9d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_HANGUPCANCEL_1=0xaa
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_HANGUPCANCEL_2=0xab
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_HANGUPCANCEL_3=0xac
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_HANGUP_1=0xa8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_HANGUP_2=0xa9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_PROCESSANSWERINCOMINGCALLL_1=0xba
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_PROCESSANSWERINCOMINGCALLL_2=0xbb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_PROCESSREMOTEHANGUPL_1=0xbc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_PROCESSREMOTEHANGUPL_2=0xbd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_TIMERCALLBACK_1=0xb8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_TIMERCALLBACK_2=0xb9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATALINE_CANCELSERVICE_1=0xc1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATALINE_CREATENEWCALLL_1=0xc0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATALINE_OPENNEWOBJECTBYNAMEL_1=0xbe
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDATALINE_OPENNEWOBJECTBYNAMEL_2=0xbf
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDTMF_ACTIONEVENT1_1=0xc2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDTMF_ACTIONEVENT1_2=0xc3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDTMF_ACTIONEVENT1_3=0xc4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDTMF_PROCESSTONE_1=0xc5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDTMF_PROCESSTONE_2=0x5ac
-[TRACE]TRACE_INTERNALS[0x88]_CSIMDTMF_PROCESSTONE_3=0xc6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_CANCEL_1=0xd5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_CONSTRUCTL_1=0xc7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_1=0xd6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_2=0xd7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_3=0xd8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_4=0xd9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_1=0x5ad
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_2=0xc9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_3=0xca
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_4=0xcb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_5=0x5ae
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_6=0x5af
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_1=0xcf
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_2=0xd0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_3=0xd1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_4=0xd2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_5=0xd3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_6=0xd4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_STARTFIRSTINCOMINGEVENT_1=0xcd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_STARTFIRSTINCOMINGEVENT_2=0xce
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CHECKNOTIFICATION_1=0xe3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_1=0x5b0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_2=0x5b1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_3=0xdc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_4=0xdd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_5=0xde
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_6=0xdf
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_7=0x5b2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_8=0x5b3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_GETINDICATOR_1=0xe0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_NOTIFYINDICATORCHANGECANCEL_1=0xe2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_NOTIFYINDICATORCHANGE_1=0xe1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CFGFILE_1=0x106
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_1=0x107
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_2=0x108
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_3=0x109
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_4=0x10a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_5=0x10b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_6=0x10c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_7=0x10d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_8=0x10e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CONSTRUCTL_1=0xe4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CONSTRUCTL_2=0xe5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETHOOKSTATUS_1=0x104
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETHOOKSTATUS_2=0x105
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETINFO_1=0xfe
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETINFO_2=0xff
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETMOBILELINESTATUS_1=0x102
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETMOBILELINESTATUS_2=0x103
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETSTATUS_1=0x100
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETSTATUS_2=0x101
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_HANDLENEWCALLADDEDNOTIFICATION_1=0xfc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_HANDLENEWCALLADDEDNOTIFICATION_2=0xfd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYCALLADDEDCANCEL_1=0xfa
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYCALLADDEDCANCEL_2=0xfb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYCALLADDED_1=0xf8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYCALLADDED_2=0xf9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYHOOKCHANGECANCEL_1=0xee
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYHOOKCHANGECANCEL_2=0xef
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYHOOKCHANGE_1=0xec
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYHOOKCHANGE_2=0xed
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYINCOMINGCALLCANCEL_1=0xea
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYINCOMINGCALLCANCEL_2=0xeb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYINCOMINGCALL_1=0xe8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYINCOMINGCALL_2=0xe9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYMOBILELINESTATUSCHANGECANCEL_1=0xf2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYMOBILELINESTATUSCHANGECANCEL_2=0xf3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYMOBILELINESTATUSCHANGE_1=0xf0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYMOBILELINESTATUSCHANGE_2=0xf1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYSTATUSCHANGECANCEL_1=0xf6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYSTATUSCHANGECANCEL_2=0xf7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYSTATUSCHANGE_1=0xf4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYSTATUSCHANGE_2=0xf5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NUMBEROFSLOTSL_1=0xe6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NUMBEROFSLOTSL_2=0xe7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSINCOMINGCALLEVENT_1=0x114
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSINCOMINGCALLEVENT_2=0x115
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSNOTIFYINCOMINGCALLEVENT_1=0x11d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSNOTIFYINCOMINGCALLEVENT_2=0x11e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSREMOTEHANGUPEVENT_1=0x119
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSREMOTEHANGUPEVENT_2=0x11a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSREMOTEHANGUPEVENT_3=0x11b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSREMOTEHANGUPEVENT_4=0x11c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_RESETAUTOANSWERCALLOBJECT_1=0x113
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_RESETREMOTEHANGUPCALLOBJECT_1=0x118
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_SETAUTOANSWERCALLOBJECT_1=0x111
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_SETAUTOANSWERCALLOBJECT_2=0x112
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_SETREMOTEHANGUPCALLOBJECT_1=0x116
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_SETREMOTEHANGUPCALLOBJECT_2=0x117
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_SIMPSEVENT_1=0x10f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_SIMPSEVENT_2=0x110
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_ACTIONEVENT_1=0x163
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_ACTIONEVENT_2=0x164
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_ACTIONEVENT_3=0x165
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_ACTIONEVENT_4=0x166
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_ACTIONEVENT_5=0x167
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_ACTIVATECANCEL_1=0x14c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CANCELSERVICE_1=0x137
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CANCELSERVICE_2=0x138
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CANCELSERVICE_3=0x139
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CFGFILE_1=0x147
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CHANGESTATE_1=0x161
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CHANGESTATE_2=0x162
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CONSTRUCTL_1=0x120
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CONTEXTNAME_1=0x146
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CONVERTTOPACKETSERVICESTATUS_1=0x168
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CTOR_1=0x11f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DEACTIVATECANCEL_1=0x14e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DEACTIVATE_1=0x14d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DELETECANCEL_1=0x150
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DELETE_1=0x14f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_1=0x12b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_2=0x12c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_3=0x12d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_4=0x12e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DTOR_1=0x121
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_EXTFUNC_1=0x133
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_EXTFUNC_2=0x134
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_EXTFUNC_3=0x135
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_EXTFUNC_4=0x136
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_GETCONFIGCANCEL_1=0x14a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_GETCONFIG_1=0x149
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_GETLASTERRORCAUSE_1=0x151
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_GETMBMSSESSIONSCANCEL_1=0x160
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_GETMBMSSESSIONSPHASE1_1=0x15d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_GETMBMSSESSIONSPHASE2_1=0x15f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_GETSTATUS_1=0x14b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NOTIFYCONFIGCHANGEDCANCEL_1=0x154
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NOTIFYCONFIGCHANGED_1=0x152
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NOTIFYCONFIGCHANGED_2=0x153
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NOTIFYSTATUSCHANGECANCEL_1=0x156
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NOTIFYSTATUSCHANGE_1=0x155
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_1=0x12f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_2=0x130
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_3=0x131
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_4=0x132
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_OPENNEWOBJECTBYNAMEL_1=0x122
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_OPENNEWOBJECTL_1=0x123
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_PROCESSGETMBMSSESSIONSPHASE1L_1=0x15e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_RANDTIME_1=0x169
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_1=0x127
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_2=0x128
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_3=0x129
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_4=0x12a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_REQMODEL_1=0x124
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_REQMODEL_2=0x125
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_REQMODEL_3=0x126
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_SETCONFIG_1=0x148
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_1=0x13a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_10=0x143
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_11=0x144
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_12=0x145
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_2=0x13b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_3=0x13c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_4=0x13d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_5=0x13e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_6=0x13f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_7=0x140
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_8=0x141
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_9=0x142
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLISTCANCEL_1=0x15c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLISTL_1=0x157
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLISTL_2=0x158
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLISTL_3=0x159
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLISTL_4=0x15a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLISTL_5=0x15b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_1=0x5b4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_10=0x173
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_11=0x174
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_12=0x175
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_13=0x176
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_14=0x177
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_15=0x178
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_16=0x179
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_17=0x17a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_18=0x17b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_19=0x17c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_2=0x5b5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_20=0x17d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_21=0x17e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_22=0x17f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_23=0x180
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_24=0x181
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_25=0x182
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_26=0x189
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_27=0x18a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_28=0x18b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_29=0x5bb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_3=0x5b6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_30=0x5bc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_31=0x5bd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_32=0x5be
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_33=0x5bf
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_34=0x5c0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_35=0x5c1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_4=0x5b7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_5=0x5b8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_6=0x5b9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_7=0x64d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_8=0x171
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_9=0x172
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_FINDROAMSTATSETTINGS_1=0x18c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_1=0x197
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_2=0x198
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_3=0x199
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_4=0x19a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_5=0x19b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_1=0x18e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_2=0x18f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_3=0x190
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_4=0x191
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_5=0x192
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_6=0x193
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_7=0x194
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_8=0x195
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_9=0x196
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACK_1=0x18d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNTRAS_ATTEMPTCONNECT_1=0x19d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNTRAS_COMMREADCOMPLETE_1=0x19e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNTRAS_COMMREADCOMPLETE_2=0x19f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNTRAS_COMMWRITECOMPLETE_1=0x1a0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNTRAS_CONNECT_1=0x19c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMNTRAS_TIMERCALLBACK_1=0x1a1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMONSTORE_CFGFILE_1=0x1a6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMONSTORE_CONSTRUCTL_1=0x5c2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMONSTORE_CONSTRUCTL_2=0x1a3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMONSTORE_CONSTRUCTL_3=0x5c3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMONSTORE_POPULATESTOREFROMCONFIGFILEL_1=0x643
-[TRACE]TRACE_INTERNALS[0x88]_CSIMONSTORE_POPULATESTOREFROMCONFIGFILEL_2=0x1a5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMONSTORE_POPULATESTOREFROMCONFIGFILEL_3=0x644
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_ACTIONEVENT_1=0x1fa
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_ACTIONEVENT_2=0x1fb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_ACTIONEVENT_3=0x1fc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_ACTIONEVENT_4=0x1fd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_ACTIVATECANCEL_1=0x1e9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CANCELSERVICE_1=0x1e3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CHANGESTATE_1=0x1f8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CHANGESTATE_2=0x1f9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTL_1=0x5c4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTL_2=0x5c5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTL_3=0x5c6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTL_4=0x1ac
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTL_5=0x5c7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTL_6=0x5c8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTL_7=0x5c9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_1=0x5ca
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_10=0x1d7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_11=0x1d8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_12=0x1d9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_13=0x1db
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_14=0x5cb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_2=0x1cf
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_3=0x1d0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_4=0x1d1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_5=0x1d2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_6=0x1d3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_7=0x1d4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_8=0x1d5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_9=0x1d6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_DEACTIVATECANCEL_1=0x1e8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_DEACTIVATE_1=0x1e7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_DELETECANCEL_1=0x1eb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_DELETE_1=0x1ea
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_DEREGISTERNOTIFICATION_1=0x1de
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_DEREGISTERNOTIFICATION_2=0x1df
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_DTOR_1=0x1dc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_EXTFUNC_1=0x1e2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETADDMEDIAAUTHORIZATION_1=0x1fe
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETADDMEDIAAUTHORIZATION_2=0x1ff
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_1=0x1ae
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_2=0x1af
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_3=0x1b0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_4=0x1b1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_5=0x1b2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_6=0x1b3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONFIG_1=0x1e5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGCHANGESETTINGSL_1=0x1b8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGCHANGESETTINGSL_2=0x1b9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_1=0x1c4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_2=0x1c5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_3=0x1c6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_4=0x1c7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_5=0x1c8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_6=0x1c9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_7=0x1ca
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTSTATUSCHANGESETTINGSL_1=0x1cb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTSTATUSCHANGESETTINGSL_2=0x1cc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTSTATUSCHANGESETTINGSL_3=0x1cd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETDATAVOLUMETRANSFERRED_1=0x1f3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETLASTERRORCAUSE_1=0x1f5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_1=0x1ba
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_10=0x1c3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_2=0x64f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_3=0x1bc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_4=0x1bd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_5=0x1be
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_6=0x1bf
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_7=0x1c0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_8=0x1c1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_9=0x1c2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_1=0x1b4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_2=0x1b5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_3=0x1b6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_4=0x1b7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETSTATUS_1=0x1f0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_LOANCOMMPORTCANCEL_1=0x1ed
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_LOANCOMMPORT_1=0x1ec
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_NOTIFYCONFIGCHANGEDCANCEL_1=0x1e6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_NOTIFYDATATRANSFERREDCANCEL_1=0x1f4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_NOTIFYSTATUSCHANGECANCEL_1=0x1f2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_NOTIFYSTATUSCHANGE_1=0x1f1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_NUMBEROFSLOTSL_1=0x1e0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_NUMBEROFSLOTSL_2=0x1e1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_RECOVERCOMMPORTCANCEL_1=0x1ef
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_RECOVERCOMMPORT_1=0x1ee
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_REGISTERNOTIFICATION_1=0x1dd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_SETCONFIG_1=0x1e4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_TIMERCALLBACK_1=0x5cc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_TIMERCALLBACK_2=0x1f7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_TIMERCALLBACK_3=0x5cd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_CANCELSERVICE_1=0x2a3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_CONSTRUCTL_1=0x200
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_CONSTRUCTL_2=0x201
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_CONSTRUCTL_3=0x202
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_DEREGISTERNOTIFICATION_1=0x29e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_DEREGISTERNOTIFICATION_2=0x29f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_DTOR_1=0x29b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_EXTFUNC_1=0x2a2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSNEGPROFILESL_1=0x20d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSNEGPROFILESL_2=0x20e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSNEGPROFILESL_3=0x20f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSNEGPROFILESL_4=0x210
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSNEGPROFILESL_5=0x211
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_1=0x258
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_2=0x259
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_3=0x25a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_4=0x25b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_5=0x25c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_1=0x203
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_10=0x20c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_2=0x204
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_3=0x205
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_4=0x206
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_5=0x207
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_6=0x208
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_7=0x209
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_8=0x20a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_9=0x20b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETPROFILECANCEL_1=0x2be
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETPROFILECAPSCANCEL_1=0x2c0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETPROFILECAPS_1=0x2bf
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETPROFILEFAILSETTINGS_1=0x256
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETPROFILEFAILSETTINGS_2=0x257
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETPROFILE_1=0x2bd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_1=0x278
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_10=0x281
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_11=0x282
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_12=0x283
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_13=0x284
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_14=0x285
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_15=0x286
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_16=0x287
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_17=0x288
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_2=0x279
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_3=0x27a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_4=0x27b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_5=0x27c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_6=0x27d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_7=0x27e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_8=0x27f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_9=0x280
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_1=0x289
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_10=0x292
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_11=0x293
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_12=0x294
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_13=0x295
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_14=0x296
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_15=0x297
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_16=0x298
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_2=0x28a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_3=0x28b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_4=0x28c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_5=0x28d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_6=0x28e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_7=0x28f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_8=0x290
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_9=0x291
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_1=0x24e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_2=0x24f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_3=0x250
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_4=0x251
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_5=0x252
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_6=0x253
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_7=0x254
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_8=0x255
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_1=0x25d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_10=0x266
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_11=0x267
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_12=0x268
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_13=0x269
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_14=0x26a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_15=0x26b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_16=0x26c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_17=0x26d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_18=0x26e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_19=0x26f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_2=0x25e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_20=0x270
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_21=0x271
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_22=0x272
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_23=0x273
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_24=0x274
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_25=0x275
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_26=0x276
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_27=0x277
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_3=0x25f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_4=0x260
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_5=0x261
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_6=0x262
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_7=0x263
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_8=0x264
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_9=0x265
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_1=0x22b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_10=0x234
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_11=0x235
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_12=0x236
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_13=0x237
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_14=0x238
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_15=0x239
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_2=0x22c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_3=0x22d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_4=0x22e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_5=0x22f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_6=0x230
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_7=0x231
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_8=0x232
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_9=0x233
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_1=0x23a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_10=0x243
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_11=0x244
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_12=0x245
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_13=0x246
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_14=0x247
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_2=0x23b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_3=0x23c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_4=0x23d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_5=0x23e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_6=0x23f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_7=0x240
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_8=0x241
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_9=0x242
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99QOSPROFILECAPS_1=0x248
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99QOSPROFILECAPS_2=0x249
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99QOSPROFILECAPS_3=0x24a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99QOSPROFILECAPS_4=0x24b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99QOSPROFILECAPS_5=0x24c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99QOSPROFILECAPS_6=0x24d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_1=0x212
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_10=0x21b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_11=0x21c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_12=0x21d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_13=0x21e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_14=0x21f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_15=0x220
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_16=0x221
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_17=0x222
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_18=0x223
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_19=0x224
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_2=0x213
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_20=0x225
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_21=0x226
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_22=0x227
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_23=0x228
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_24=0x229
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_25=0x22a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_3=0x214
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_4=0x215
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_5=0x216
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_6=0x217
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_7=0x218
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_8=0x219
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_9=0x21a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETSETQOSSETTINGS_1=0x299
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETSETQOSSETTINGS_2=0x29a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_NOTIFYPROFILECHANGEDCANCEL_1=0x2c1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_NUMBEROFSLOTSL_1=0x2a0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_NUMBEROFSLOTSL_2=0x2a1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_REGISTERNOTIFICATION_1=0x29c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_REGISTERNOTIFICATION_2=0x29d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILECANCEL_1=0x2bc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_1=0x2a4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_10=0x2ad
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_11=0x2ae
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_12=0x2af
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_13=0x2b0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_14=0x2b1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_15=0x2b2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_16=0x2b3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_17=0x2b4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_18=0x2b5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_19=0x2b6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_2=0x2a5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_20=0x2b7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_21=0x2b8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_22=0x2b9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_23=0x2ba
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_24=0x2bb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_3=0x2a6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_4=0x2a7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_5=0x2a8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_6=0x2a9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_7=0x2aa
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_8=0x2ab
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_9=0x2ac
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ACTIONEVENT_1=0x2f6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ACTIONEVENT_2=0x2f7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ATTACHCANCEL_1=0x2db
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ATTACH_1=0x2da
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CANCELSERVICE_1=0x2d8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CHANGESTATE_1=0x2f4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CHANGESTATE_2=0x2f5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_1=0x5ce
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_10=0x2cb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_11=0x2cc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_12=0x2cd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_13=0x2ce
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_14=0x2cf
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_15=0x5cf
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_2=0x2c3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_3=0x2c4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_4=0x2c5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_5=0x2c6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_6=0x2c7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_7=0x2c8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_8=0x2c9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_9=0x2ca
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_DEREGISTERNOTIFICATION_1=0x2d3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_DEREGISTERNOTIFICATION_2=0x2d4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_DETACHCANCEL_1=0x2dd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_DETACH_1=0x2dc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_DTOR_1=0x2d0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ENUMERATECONTEXTSCANCEL_1=0x2e3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ENUMERATECONTEXTS_1=0x2e2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ENUMERATEMBMSACTIVESERVICELIST_1=0x30c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ENUMERATEMBMSMONITORSERVICELIST_1=0x30b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETATTACHMODE_1=0x2ec
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETCONTEXTINFO_1=0x2e4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETCURRENTRELEASEMODE_1=0x2f8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETDEFAULTCONTEXTPARAMS_1=0x2f0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETDYNAMICCAPS_1=0x2e8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETGPRSDEFAULTCONTEXTPARAMS_1=0x2ef
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETMBMSMONITOREDSERVICESLISTCANCEL_1=0x30a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETMBMSMONITOREDSERVICESLISTPHASE1_1=0x306
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETMBMSMONITOREDSERVICESLISTPHASE2_1=0x309
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETMBMSNETWORKSERVICESTATUS_1=0x2fb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETNTWKREGSTATUS_1=0x2e5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETSTATICCAPS_1=0x2e7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETSTATUS_1=0x2de
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYATTACHMODECHANGECANCEL_1=0x2fa
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYATTACHMODECHANGE_1=0x2ed
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYCHANGEOFNTWKREGSTATUSCANCEL_1=0x2e6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYCONTEXTACTIVATIONREQUESTEDCANCEL_1=0x2e1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYCONTEXTACTIVATIONREQUESTED_1=0x2e0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYCONTEXTADDEDCANCEL_1=0x2d9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYDYNAMICCAPSCHANGECANCEL_1=0x2ea
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYDYNAMICCAPSCHANGE_1=0x2e9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYMBMSNETWORKSERVICESTATUSCHANGECANCEL_1=0x2fd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYMBMSNETWORKSERVICESTATUSCHANGE_1=0x2fc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYMBMSSERVICEAVAILABILITYCHANGECANCEL_1=0x2ff
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYMBMSSERVICEAVAILABILITYCHANGE_1=0x2fe
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYRELEASEMODECHANGECANCEL_1=0x2f9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYSTATUSCHANGECANCEL_1=0x2df
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NUMBEROFSLOTSL_1=0x2d5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NUMBEROFSLOTSL_2=0x2d6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NUMBEROFSLOTSL_3=0x2d7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_PROCESSGETMBMSMONITOREDSERVICESLISTPHASE1L_1=0x307
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_PROCESSGETMBMSMONITOREDSERVICESLISTPHASE1L_2=0x308
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_REGISTERNOTIFICATION_1=0x2d1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_REGISTERNOTIFICATION_2=0x2d2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_SETATTACHMODE_1=0x2eb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_SETDEFAULTCONTEXTPARAMS_1=0x2ee
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_SIMPSEVENT_1=0x2f3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_TIMERCALLBACK_1=0x2f1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_TIMERCALLBACK_2=0x2f2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTCANCEL_1=0x305
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_1=0x300
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_2=0x301
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_3=0x302
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_4=0x303
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_5=0x304
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_CFGFILE_1=0x321
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_CONSTRUCTL_1=0x5d0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_CONSTRUCTL_2=0x64c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_CONSTRUCTL_3=0x30f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_CONSTRUCTL_4=0x310
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_CONSTRUCTL_5=0x5d2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_CONSTRUCTL_6=0x5d3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATEOOBDELETE_1=0x31a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATEOOBDELETE_2=0x31b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATEOOBDELETE_3=0x31c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATEOOBWRITE_1=0x318
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATEOOBWRITE_2=0x319
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_1=0x5d4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_2=0x5d5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_3=0x314
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_4=0x315
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_5=0x316
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_6=0x5d6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_7=0x5d7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_WRITE_1=0x31d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_WRITE_2=0x31e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_WRITE_3=0x31f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_WRITE_4=0x320
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CFGFILE_1=0x349
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_1=0x5d8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_2=0x5d9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_3=0x324
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_4=0x325
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_5=0x326
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_6=0x327
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_7=0x5da
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_8=0x5db
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_1=0x338
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_2=0x339
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_3=0x33a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_4=0x33b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_1=0x333
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_2=0x334
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_3=0x335
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_4=0x336
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_5=0x337
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_1=0x5dc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_10=0x5de
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_11=0x5df
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_2=0x5dd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_3=0x32b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_4=0x32c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_5=0x32d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_6=0x32e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_7=0x32f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_8=0x330
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_9=0x331
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_TIMERCALLBACK_1=0x346
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_TIMERCALLBACK_2=0x347
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_TIMERCALLBACK_3=0x348
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_1=0x33c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_10=0x345
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_2=0x33d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_3=0x33e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_4=0x33f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_5=0x340
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_6=0x341
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_7=0x342
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_8=0x343
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_9=0x344
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_CFGFILE_1=0x380
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_CONSTRUCTL_1=0x37e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_CONSTRUCTL_2=0x37f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_GETAUTHENTICATIONDATACANCEL_1=0x398
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_GETAUTHENTICATIONDATA_1=0x397
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_GETAUTHORIZATIONINFOCANCEL_1=0x394
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_GETAUTHORIZATIONINFOPHASE1_1=0x391
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_GETAUTHORIZATIONINFOPHASE2_1=0x393
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_NOTIFYIMSAUTHORIZATIONINFOCHANGEDCANCEL_1=0x396
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_NOTIFYIMSAUTHORIZATIONINFOCHANGED_1=0x395
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_1=0x389
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_2=0x38a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_3=0x38b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_4=0x38c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_5=0x38d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_6=0x38e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_7=0x38f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_8=0x390
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_1=0x381
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_2=0x382
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_3=0x383
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_4=0x384
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_5=0x385
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_6=0x386
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_7=0x387
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_8=0x388
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PROCESSGETAUTHORIZATIONINFOPHASE1L_1=0x392
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CFGFILE_1=0x3b9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_1=0x5f2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_10=0x3a2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_11=0x5f6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_12=0x5f7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_13=0x5f8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_14=0x5f9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_15=0x646
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_16=0x3a9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_17=0x3aa
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_18=0x3ab
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_19=0x3ac
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_2=0x5f3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_20=0x3ad
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_21=0x650
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_22=0x3af
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_23=0x3b0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_24=0x3b1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_25=0x3b2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_26=0x3b3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_27=0x3b4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_28=0x3b5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_29=0x3b6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_3=0x5f4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_30=0x3b7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_31=0x5fa
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_32=0x5fb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_33=0x5fc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_34=0x5fd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_35=0x5fe
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_36=0x5ff
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_37=0x647
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_38=0x648
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_39=0x649
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_4=0x5f5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_5=0x39d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_6=0x39e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_7=0x39f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_8=0x3a0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_9=0x3a1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_NUMBEROFSLOTSL_1=0x3b8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_SECURITYEVENT_1=0x3ba
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_ACTIVATESMARTCARDAPP_1=0x3e7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_ACTIVATESMARTCARDAPP_2=0x3e8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_ACTIVATESMARTCARDAPP_3=0x3e9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_CFGFILE_1=0x3be
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_CONSTRUCTL_1=0x3bb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_CONSTRUCTL_2=0x3bc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_GETSCFILEINFOCANCEL_1=0x3c7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_GETSCFILEINFO_1=0x3c6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_NUMBEROFSLOTSL_1=0x3bd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_1=0x3ca
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_10=0x3d3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_11=0x3d4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_12=0x3d5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_13=0x3d6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_2=0x3cb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_3=0x3cc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_4=0x3cd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_5=0x3ce
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_6=0x3cf
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_7=0x3d0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_8=0x3d1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_9=0x3d2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_1=0x3d7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_10=0x3e0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_11=0x3e1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_12=0x3e2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_13=0x3e3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_14=0x3e4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_15=0x3e5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_16=0x3e6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_2=0x3d8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_3=0x3d9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_4=0x3da
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_5=0x3db
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_6=0x3dc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_7=0x3dd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_8=0x3de
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_9=0x3df
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_READSCFILECANCEL_1=0x3c8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TCYCLICSMARTCARDFILE_READFILE_1=0x659
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TERMINATESMARTCARDAPP_1=0x3ea
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TERMINATESMARTCARDAPP_2=0x3eb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TLINEARSMARTCARDFILE_READFILE_1=0x65a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TLINEARSMARTCARDFILE_UPDATEFILE_1=0x65b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_READFILE_1=0x65c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_READFILE_2=0x65d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_UPDATEFILE_1=0x65e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_UPDATEFILE_2=0x65f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_UPDATESCFILECANCEL_1=0x3c9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CFGFILE_1=0x3f3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CONSTRUCTL_1=0x600
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CONSTRUCTL_2=0x601
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CONSTRUCTL_3=0x602
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CONSTRUCTL_4=0x3f1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CONSTRUCTL_5=0x603
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CONSTRUCTL_6=0x604
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CONSTRUCTL_7=0x605
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_NUMBEROFSLOTSL_1=0x3f2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CNETWORKMODETIMERCALLBACK_TIMERCALLBACK_1=0x654
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CONSTRUCTL_1=0x5e0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CONSTRUCTL_2=0x350
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CONSTRUCTL_3=0x351
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CONSTRUCTL_4=0x352
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CONSTRUCTL_5=0x5e1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CREATEONSTOREL_1=0x5ee
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CREATEONSTOREL_2=0x5ef
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CREATEONSTOREL_3=0x36a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CREATEONSTOREL_4=0x5f0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CREATEONSTOREL_5=0x5f1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CSIMTESTNUMBEROBSERVER_CONSTRUCTL_1=0x655
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CSIMTESTNUMBEROBSERVER_DOCANCEL_1=0x658
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CSIMTESTNUMBEROBSERVER_RUNL_1=0x657
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CSIMTESTNUMBEROBSERVER_START_1=0x656
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_DTOR_1=0x356
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_1=0x5e2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_10=0x362
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_11=0x363
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_12=0x5e8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_13=0x5e9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_14=0x5ea
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_15=0x5eb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_16=0x5ec
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_17=0x5ed
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_2=0x5e3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_3=0x5e4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_4=0x5e5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_5=0x5e6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_6=0x5e7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_7=0x35f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_8=0x360
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_9=0x361
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_GETPHONEIDANDCAPS_1=0x373
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_GETPHONEIDANDCAPS_2=0x374
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_GETPHONEIDANDCAPS_3=0x375
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_GETPHONEIDANDCAPS_4=0x376
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_GETTESTNUMBER_1=0x353
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_GETTESTNUMBER_2=0x354
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_INITPHONESTATUS_1=0x357
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_NOTIFYMODECHANGECANCEL_1=0x379
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_NOTIFYMODECHANGE_1=0x378
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_OPENNEWOBJECTBYNAMEL_1=0x36c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_OPENNEWOBJECTBYNAMEL_2=0x36d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_OPENNEWOBJECTBYNAMEL_3=0x36e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_OPENNEWOBJECTBYNAMEL_4=0x36f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_POPULATESERVICETABLEL_1=0x34a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_POPULATESERVICETABLEL_2=0x34b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_POPULATESERVICETABLEV8L_1=0x651
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_POPULATESERVICETABLEV8L_2=0x652
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_SETTESTNUMBERANDREADCONFIGURATIONFILE_1=0x653
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_SETTESTNUMBERINUSE_1=0x355
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_VALIDATECHANGESTATE1_1=0x372
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_VALIDATECHANGESTATE_1=0x370
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_VALIDATECHANGESTATE_2=0x371
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPUBSUB_NEWL_1=0x3f4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMPUBSUB_NEWL_2=0x3f5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_ATTACHL_1=0x3f8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_DETACHL_1=0x3f9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY1_1=0x400
-[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY1_2=0x401
-[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY1_3=0x402
-[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY1_4=0x403
-[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY1_5=0x404
-[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY_1=0x3fa
-[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY_2=0x3fb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY_3=0x3fc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY_4=0x3fd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY_5=0x3fe
-[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY_6=0x3ff
-[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_SIMPSEVENT_1=0x3f6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_SIMPSEVENT_2=0x3f7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CANCELSERVICE_1=0x412
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_1=0x60c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_10=0x420
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_11=0x421
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_12=0x422
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_13=0x423
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_14=0x424
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_15=0x425
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_16=0x426
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_17=0x427
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_18=0x428
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_19=0x429
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_2=0x60d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_20=0x42a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_21=0x42b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_22=0x42c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_23=0x42d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_24=0x42e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_25=0x42f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_26=0x430
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_27=0x431
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_28=0x432
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_29=0x433
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_3=0x419
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_30=0x434
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_31=0x435
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_32=0x436
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_33=0x437
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_34=0x438
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_35=0x439
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_36=0x43a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_37=0x43b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_38=0x43c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_39=0x43d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_4=0x41a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_40=0x43e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_41=0x43f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_42=0x440
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_43=0x441
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_44=0x442
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_45=0x443
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_46=0x444
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_47=0x445
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_48=0x446
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_49=0x447
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_5=0x41b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_50=0x448
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_51=0x449
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_52=0x44a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_53=0x44b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_54=0x44c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_55=0x44d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_56=0x44e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_57=0x44f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_58=0x450
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_59=0x451
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_6=0x41c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_60=0x452
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_61=0x453
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_62=0x454
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_63=0x455
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_64=0x456
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_65=0x457
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_66=0x458
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_67=0x60e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_68=0x60f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_7=0x41d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_8=0x41e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_9=0x41f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONSTRUCTL_1=0x606
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONSTRUCTL_2=0x607
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONSTRUCTL_3=0x608
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONSTRUCTL_4=0x609
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONSTRUCTL_5=0x60a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONSTRUCTL_6=0x60b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_DEREGISTERNOTIFICATION_1=0x40e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_DEREGISTERNOTIFICATION_2=0x40f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_DTOR_1=0x40a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_NUMBEROFSLOTSL_1=0x410
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_NUMBEROFSLOTSL_2=0x411
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_REFRESHALLOWED_1=0x413
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_REGISTERNOTIFICATION_1=0x40c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_REGISTERNOTIFICATION_2=0x40d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_REQMODEL_1=0x40b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_TERMINALRSP_1=0x414
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_TIMERCALLBACK_1=0x415
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_TIMERCALLBACK_2=0x416
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_CONSTRUCTL_1=0x610
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_CONSTRUCTL_2=0x611
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_CONSTRUCTL_3=0x45d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_CONSTRUCTL_4=0x612
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_CONSTRUCTL_5=0x613
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_CONSTRUCTL_6=0x64a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_GETSIGNALSTRENGTH_1=0x45f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_GETSIGNALSTRENGTH_2=0x64e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_NOTIFYSIGNALSTRENGTHCHANGECANCEL_1=0x462
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_NOTIFYSIGNALSTRENGTHCHANGECANCEL_2=0x463
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_NOTIFYSIGNALSTRENGTHCHANGE_1=0x461
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_PUBSUBCALLBACK_1=0x465
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_PUBSUBCALLBACK_2=0x466
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_TIMERCALLBACK_1=0x464
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_CONSTRUCTL_1=0x4e6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_DTOR_1=0x4e7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_GETSCAUTHENTICATIONDATACANCEL_1=0x4e9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_GETSCAUTHENTICATIONDATA_1=0x4e8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_1=0x629
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_10=0x4f5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_11=0x62c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_12=0x62d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_13=0x62e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_2=0x62a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_3=0x62b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_4=0x4ef
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_5=0x4f0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_6=0x4f1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_7=0x4f2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_8=0x4f3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_9=0x4f4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_1=0x62f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_10=0x501
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_11=0x502
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_12=0x503
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_13=0x504
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_14=0x631
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_15=0x632
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_2=0x630
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_3=0x4fa
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_4=0x4fb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_5=0x4fc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_6=0x4fd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_7=0x4fe
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_8=0x4ff
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_9=0x500
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_1=0x633
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_10=0x510
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_11=0x511
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_12=0x512
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_13=0x513
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_14=0x514
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_15=0x635
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_16=0x636
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_2=0x634
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_3=0x509
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_4=0x50a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_5=0x50b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_6=0x50c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_7=0x50d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_8=0x50e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_9=0x50f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_CONSTRUCTL_1=0x515
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_CONSTRUCTL_2=0x516
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_CREATESCEAPSUBSESSIONL_1=0x543
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_CREATESCEAPSUBSESSIONL_2=0x544
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_DTOR_1=0x517
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_DTOR_2=0x518
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_1=0x637
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_10=0x525
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_11=0x526
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_12=0x527
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_13=0x528
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_14=0x529
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_15=0x52a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_16=0x52b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_17=0x52c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_18=0x52d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_19=0x52e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_2=0x638
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_20=0x52f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_21=0x530
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_22=0x531
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_23=0x532
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_24=0x533
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_25=0x534
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_26=0x535
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_27=0x536
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_28=0x537
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_29=0x538
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_3=0x639
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_30=0x539
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_31=0x53a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_32=0x53b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_33=0x53c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_34=0x53d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_35=0x53e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_36=0x53f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_37=0x540
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_38=0x541
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_39=0x542
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_4=0x51f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_40=0x63a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_41=0x63b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_42=0x63c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_5=0x520
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_6=0x521
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_7=0x522
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_8=0x523
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_9=0x524
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_CONSTRUCTL_1=0x545
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_CONSTRUCTL_2=0x546
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_DTOR_1=0x547
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMCOMPLETENOTIFYEAPMETHODACCESSSTATUSCHANGE_1=0x562
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETAUTHENTICATEDATAFORPHASE2_1=0x55c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETAUTHENTICATIONSTATUSCANCEL_1=0x552
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETAUTHENTICATIONSTATUS_1=0x551
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETEAPKEYCANCEL_1=0x557
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETEAPKEY_1=0x553
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETEAPKEY_2=0x554
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETEAPKEY_3=0x555
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETEAPKEY_4=0x556
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETEAPMETHODACCESSSTATUS_1=0x55f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETUSERIDENTITYCANCEL_1=0x550
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_1=0x54c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_2=0x54d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_3=0x54e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_4=0x54f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHODCANCEL_1=0x54b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHOD_1=0x548
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHOD_2=0x549
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHOD_3=0x54a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMNOTIFYEAPMETHODACCESSSTATUSCHANGECANCEL_1=0x561
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMNOTIFYEAPMETHODACCESSSTATUSCHANGE_1=0x560
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMRELEASEEAPMETHOD_1=0x55e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_1=0x558
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_2=0x559
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_3=0x55a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_4=0x55b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMSMARTCARDEAPAUTHENTICATIONCANCEL_1=0x55d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_ACTIONRXEVENTSTORED_1=0x584
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDCLIENTACK_1=0x581
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDCLIENTACK_2=0x582
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDPHONEACK_1=0x583
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_ACTIONTXEVENT_1=0x586
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_ATTEMPTSMSRXCOMPLETE_1=0x587
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_ATTEMPTSMSRXCOMPLETE_2=0x588
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_CFGFILESECTION_1=0x595
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_COMPLETETXPENDINGREQ_1=0x589
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_COMPLETETXPENDINGREQ_2=0x58a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_DUMPPDU1_1=0x596
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_DUMPPDU1_2=0x597
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATECONSTRAINTS_1=0x570
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATECONSTRAINTS_2=0x571
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATECONSTRAINTS_3=0x572
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_1=0x63d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_2=0x63e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_3=0x63f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_4=0x56a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_5=0x640
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_6=0x641
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_7=0x642
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_1=0x575
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_2=0x576
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_3=0x577
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_4=0x578
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_5=0x579
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_6=0x57a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_7=0x57b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSSTORESL_1=0x573
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSSTORESL_2=0x574
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_1=0x56b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_2=0x64b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_3=0x56d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_4=0x56e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_5=0x56f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_INITIALIZEL_1=0x563
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_INITIALIZEL_2=0x564
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_IPCMATCH_1=0x57e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_IPCMATCH_2=0x57f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGREQUEST1_1=0x57c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGREQUEST1_2=0x57d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_1=0x598
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_10=0x5a1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_11=0x5a2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_12=0x5a3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_2=0x599
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_3=0x59a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_4=0x59b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_5=0x59c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_6=0x59d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_7=0x59e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_8=0x59f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_9=0x5a0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_OPENNEWOBJECTBYNAMEL_1=0x580
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_POPULATESMSRXATTRIB_1=0x58e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_RECEIVEMESSAGEL_1=0x585
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_STARTSMSMTTIMER_1=0x58b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_STARTSMSMTTIMER_2=0x58c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_STARTSMSMTTIMER_3=0x58d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_STORESMSPLIST_1=0x58f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_STORESMSPLIST_2=0x590
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_TIMERCALLBACK_1=0x591
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_TIMERCALLBACK_2=0x592
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_TIMERCALLBACK_3=0x593
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_TIMERCALLBACK_4=0x594
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_CFGFILESECTION_1=0x471
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_CONSTRUCTL_1=0x614
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_CONSTRUCTL_2=0x468
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_CONSTRUCTL_3=0x615
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_LOGREQUEST_1=0x660
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_LOGREQUEST_2=0x661
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_1=0x616
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_2=0x617
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_3=0x46b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_4=0x46c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_5=0x46d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_6=0x618
-[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_7=0x619
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_1=0x61a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_10=0x47b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_11=0x47c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_12=0x47d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_13=0x47e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_14=0x47f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_15=0x480
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_16=0x481
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_17=0x482
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_18=0x483
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_19=0x484
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_2=0x61b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_20=0x485
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_21=0x486
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_22=0x487
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_23=0x488
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_24=0x489
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_25=0x48b
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_26=0x48c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_27=0x48d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_28=0x48e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_29=0x48f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_3=0x61c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_30=0x490
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_31=0x491
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_32=0x492
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_33=0x493
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_34=0x494
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_35=0x645
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_36=0x496
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_37=0x497
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_38=0x499
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_39=0x49a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_4=0x61d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_40=0x49c
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_41=0x49d
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_42=0x49e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_43=0x49f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_44=0x4a0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_45=0x4a1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_46=0x4a2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_47=0x4a3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_48=0x4a4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_49=0x4a5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_5=0x476
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_50=0x4a6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_51=0x4a7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_52=0x4a8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_53=0x4a9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_54=0x4ab
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_55=0x4ac
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_56=0x4ad
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_57=0x61e
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_58=0x61f
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_59=0x620
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_6=0x477
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_60=0x621
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_61=0x622
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_7=0x478
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_8=0x479
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_9=0x47a
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_DTOR_1=0x4ae
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_DTOR_2=0x4af
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_GETPREFERREDNETWORKSCANCEL_1=0x4b3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_GETPREFERREDNETWORKSCANCEL_2=0x4b4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_GETPREFERREDWLANSIDSCANCEL_1=0x4b1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_GETPREFERREDWLANSIDSCANCEL_2=0x4b2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_TIMERCALLBACK_1=0x4b0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_1=0x4d1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_10=0x4da
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_11=0x4db
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_12=0x4dc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_13=0x4dd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_2=0x4d2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_3=0x4d3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_4=0x4d4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_5=0x4d5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_6=0x4d6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_7=0x4d7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_8=0x4d8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_9=0x4d9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALLCANCEL_1=0x4c6
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALLCANCEL_2=0x4c7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALLISVCANCEL_1=0x4cb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALLISVCANCEL_2=0x4cc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALLISVL_1=0x4c8
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALLISVL_2=0x4c9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALLISVL_3=0x4ca
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALL_1=0x4c3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALL_2=0x4c4
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALL_3=0x4c5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_CONSTRUCTL_1=0x623
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_CONSTRUCTL_2=0x624
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_CONSTRUCTL_3=0x4b7
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_CONSTRUCTL_4=0x625
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_CONSTRUCTL_5=0x626
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIALCANCEL_1=0x4bc
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIALCANCEL_2=0x4bd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIALISVCANCEL_1=0x4c1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIALISVCANCEL_2=0x4c2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIALISV_1=0x4be
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIALISV_2=0x4bf
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIALISV_3=0x4c0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIAL_1=0x4b9
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIAL_2=0x4ba
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIAL_3=0x4bb
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_HANGUPCANCEL_1=0x4cf
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_HANGUPCANCEL_2=0x4d0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_HANGUP_1=0x4cd
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_HANGUP_2=0x4ce
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_PROCESSANSWERINCOMINGCALLL_1=0x627
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_PROCESSANSWERINCOMINGCALLL_2=0x4e0
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_PROCESSREMOTEHANGUPL_1=0x628
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_PROCESSREMOTEHANGUPL_2=0x4e1
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_TIMERCALLBACK_1=0x4de
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_TIMERCALLBACK_2=0x4df
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICELINE_CREATENEWCALLL_1=0x4e5
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICELINE_OPENNEWOBJECTBYNAMEL_1=0x4e2
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICELINE_OPENNEWOBJECTBYNAMEL_2=0x4e3
-[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICELINE_OPENNEWOBJECTBYNAMEL_3=0x4e4
-[TRACE]TRACE_INTERNALS[0x88]_MCOMM_COMMOPEN1_1=0x459
-[TRACE]TRACE_INTERNALS[0x88]_MCOMM_COMMOPEN1_2=0x45a

--- a/telephonyutils/dial/group/dial_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-"\sf\os\cellularsrv\telephonyutils\dial\Test\TE_Dial\TE_Dial.script"-"c:\testdata\scripts\TE_Dial.script"
-

--- a/telephonyutils/etel3rdpartyapi/Group/etelisv_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelIsv\TE_EtelIsv.ini"-"c:\testdata\configs\TE_EtelIsv.ini"
-"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelIsv\TE_EtelIsv.cfg"-"c:\testdata\configs\TE_EtelIsv.cfg"
-"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelIsv\TE_EtelIsv_config.txt"-"c:\testdata\configs\TE_EtelIsv_config.txt"
-
-"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelIsv\TE_EtelIsv.script"-"c:\testdata\scripts\TE_EtelIsv.script"
-

--- a/telephonyutils/etel3rdpartyapi/Test/te_etelisvcaps/group/tetelisvcaps_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelisvcaps\testdata\te_etelisvcaps.ini"-"c:\testdata\configs\te_etelisvcaps.ini"
-"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelisvcaps\testdata\te_etelisvcaps_comms.cfg"-"c:\testdata\configs\te_etelisvcaps_comms.cfg"
-"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelisvcaps\testdata\te_etelisvcaps_simtsy.cfg"-"c:\testdata\configs\te_etelisvcaps_simtsy.cfg"
-
-"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelisvcaps\scripts\te_etelisvcaps.script"-"c:\testdata\scripts\te_etelisvcaps.script"
-"\sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Test\te_etelisvcaps\scripts\te_etelisvcaps_teststeps.script"-"c:\testdata\scripts\te_etelisvcaps_teststeps.script"
-

--- a/telephonyutils/etel3rdpartyapi/src/TelephonyFuncCall.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyutils/etel3rdpartyapi/src/TelephonyFuncCall.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -437,7 +437,6 @@
 		aTelCallStatus=CTelephony::EStatusReconnectPending;
 		break;
 	case RMobileCall::EStatusDisconnecting:
-	case RMobileCall::EStatusDisconnectingWithInband:
 		aTelCallStatus=CTelephony::EStatusDisconnecting;
 		break;
 	case RMobileCall::EStatusHold:

--- a/telephonyutils/telephonywatchers/Test/TE_TelWatchers/TE_TelWatchersUnit.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyutils/telephonywatchers/Test/TE_TelWatchers/TE_TelWatchersUnit.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -39,7 +39,6 @@
 USERINCLUDE    ../../inc 
 USERINCLUDE    .
 USERINCLUDE    ..
-USERINCLUDE    ../traces
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN 
@@ -51,6 +50,6 @@
 LIBRARY        testexecutelogclient.lib
 LIBRARY        testexecuteutils.lib
 LIBRARY        commsdat.lib
-
+DEBUGLIBRARY   comsdbgutil.lib
 
 SMPSAFE

--- a/telephonyutils/telephonywatchers/Test/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-// Copyright (c) 2000-2010 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:
-// Telephony watcher plugins
-// 
-//
-
-/**
- @file
-*/
-
-PRJ_TESTMMPFILES
-../TE_TelWatchers/TE_TelWatchersInt.mmp
-../TE_TelWatchers/TE_TelWatchersUnit.mmp
-
-PRJ_TESTEXPORTS
-../TE_TelWatchers/TE_TelWatchers.iby           /epoc32/rom/include/te_telwatchers.iby
-
-../TE_TelWatchers/TE_TelWatchers.script        /epoc32/release/wins/udeb/z/testdata/scripts/te_telwatchers.script
-../TE_TelWatchers/TE_TelWatchers.script        /epoc32/release/wins/urel/z/testdata/scripts/te_telwatchers.script
-../TE_TelWatchers/TE_TelWatchers.script        /epoc32/release/winscw/udeb/z/testdata/scripts/te_telwatchers.script
-../TE_TelWatchers/TE_TelWatchers.script        /epoc32/release/winscw/urel/z/testdata/scripts/te_telwatchers.script
-
-../TE_TelWatchers/TE_TelWatchers_setup.script  /epoc32/release/wins/udeb/z/testdata/scripts/te_telwatchers_setup.script
-../TE_TelWatchers/TE_TelWatchers_setup.script  /epoc32/release/wins/urel/z/testdata/scripts/te_telwatchers_setup.script
-../TE_TelWatchers/TE_TelWatchers_setup.script  /epoc32/release/winscw/udeb/z/testdata/scripts/te_telwatchers_setup.script
-../TE_TelWatchers/TE_TelWatchers_setup.script  /epoc32/release/winscw/urel/z/testdata/scripts/te_telwatchers_setup.script
-
-../TE_TelWatchers/TE_TelWatchers_config.txt    /epoc32/release/wins/udeb/z/testdata/configs/te_telwatchers_config.txt
-../TE_TelWatchers/TE_TelWatchers_config.txt    /epoc32/release/wins/urel/z/testdata/configs/te_telwatchers_config.txt
-../TE_TelWatchers/TE_TelWatchers_config.txt    /epoc32/release/winscw/udeb/z/testdata/configs/te_telwatchers_config.txt
-../TE_TelWatchers/TE_TelWatchers_config.txt    /epoc32/release/winscw/urel/z/testdata/configs/te_telwatchers_config.txt
-
-../TE_TelWatchers/TE_TelWatchers.cfg           /epoc32/release/wins/udeb/z/testdata/configs/te_telwatchers.cfg
-../TE_TelWatchers/TE_TelWatchers.cfg           /epoc32/release/wins/urel/z/testdata/configs/te_telwatchers.cfg
-../TE_TelWatchers/TE_TelWatchers.cfg           /epoc32/release/winscw/udeb/z/testdata/configs/te_telwatchers.cfg
-../TE_TelWatchers/TE_TelWatchers.cfg           /epoc32/release/winscw/urel/z/testdata/configs/te_telwatchers.cfg

--- a/telephonyutils/telephonywatchers/Test/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyutils/telephonywatchers/Test/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_CONSTRUCTL_1=0x2
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_CTOR_1=0x1
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_REQUESTNEXTSTATE_1=0x6
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNERROR_1=0x10
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNERROR_2=0x11
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_1=0x9
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_2=0xa
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_3=0xb
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_4=0xc
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_5=0xd
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_6=0xe
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_7=0xf
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_SETDISABLED_1=0x4
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_SETDISABLED_2=0x5
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_SUSPENDFOR_1=0x3
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_WAITFORPHONETOPOWERUPL_1=0x7
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_WAITFORPHONETOPOWERUPL_2=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CINDICATORWATCHER_HANDLEINDICATORUPDATEL_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CINDICATORWATCHER_HANDLEINDICATORUPDATEL_2=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CINDICATORWATCHER_HANDLEINDICATORUPDATEL_3=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CINDICATORWATCHER_HANDLEINDICATORUPDATEL_4=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CINDICATORWATCHER_HANDLEINDICATORUPDATEL_5=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CINDICATORWATCHER_HANDLEPHONESTATEEVENTL_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOETELSERVER_1=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_1=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_2=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_3=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_4=0x15
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_5=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_6=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_7=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_8=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_9=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_LOADPHONEMODULE_1=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_LOADPHONEMODULE_2=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_RETRIEVETSYNAME_1=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CSIGNALSTRENGTHWATCHER_HANDLEPHONESTATEEVENTL_1=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_1=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_2=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_3=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_4=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_5=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_6=0xd

--- a/telephonyutils/telephonywatchers/group/BLD.INF	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyutils/telephonywatchers/group/BLD.INF	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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"
@@ -28,4 +28,29 @@
 signalstrengthwatcher.mmp
 indicatorwatcher.mmp
 
-#include "../Test/group/bld.inf"
\ No newline at end of file
+PRJ_TESTMMPFILES
+../Test/TE_TelWatchers/TE_TelWatchersInt.mmp
+../Test/TE_TelWatchers/TE_TelWatchersUnit.mmp
+
+PRJ_TESTEXPORTS
+../Test/TE_TelWatchers/TE_TelWatchers.iby           /epoc32/rom/include/te_telwatchers.iby
+
+../Test/TE_TelWatchers/TE_TelWatchers.script        /epoc32/release/wins/udeb/z/testdata/scripts/te_telwatchers.script
+../Test/TE_TelWatchers/TE_TelWatchers.script        /epoc32/release/wins/urel/z/testdata/scripts/te_telwatchers.script
+../Test/TE_TelWatchers/TE_TelWatchers.script        /epoc32/release/winscw/udeb/z/testdata/scripts/te_telwatchers.script
+../Test/TE_TelWatchers/TE_TelWatchers.script        /epoc32/release/winscw/urel/z/testdata/scripts/te_telwatchers.script
+
+../Test/TE_TelWatchers/TE_TelWatchers_setup.script  /epoc32/release/wins/udeb/z/testdata/scripts/te_telwatchers_setup.script
+../Test/TE_TelWatchers/TE_TelWatchers_setup.script  /epoc32/release/wins/urel/z/testdata/scripts/te_telwatchers_setup.script
+../Test/TE_TelWatchers/TE_TelWatchers_setup.script  /epoc32/release/winscw/udeb/z/testdata/scripts/te_telwatchers_setup.script
+../Test/TE_TelWatchers/TE_TelWatchers_setup.script  /epoc32/release/winscw/urel/z/testdata/scripts/te_telwatchers_setup.script
+
+../Test/TE_TelWatchers/TE_TelWatchers_config.txt    /epoc32/release/wins/udeb/z/testdata/configs/te_telwatchers_config.txt
+../Test/TE_TelWatchers/TE_TelWatchers_config.txt    /epoc32/release/wins/urel/z/testdata/configs/te_telwatchers_config.txt
+../Test/TE_TelWatchers/TE_TelWatchers_config.txt    /epoc32/release/winscw/udeb/z/testdata/configs/te_telwatchers_config.txt
+../Test/TE_TelWatchers/TE_TelWatchers_config.txt    /epoc32/release/winscw/urel/z/testdata/configs/te_telwatchers_config.txt
+
+../Test/TE_TelWatchers/TE_TelWatchers.cfg           /epoc32/release/wins/udeb/z/testdata/configs/te_telwatchers.cfg
+../Test/TE_TelWatchers/TE_TelWatchers.cfg           /epoc32/release/wins/urel/z/testdata/configs/te_telwatchers.cfg
+../Test/TE_TelWatchers/TE_TelWatchers.cfg           /epoc32/release/winscw/udeb/z/testdata/configs/te_telwatchers.cfg
+../Test/TE_TelWatchers/TE_TelWatchers.cfg           /epoc32/release/winscw/urel/z/testdata/configs/te_telwatchers.cfg

--- a/telephonyutils/telephonywatchers/group/TelWatcher.iby	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyutils/telephonywatchers/group/TelWatcher.iby	Wed Sep 01 12:40:21 2010 +0100
@@ -18,6 +18,7 @@
 #ifndef __TELWATCHER_IBY__
 #define __TELWATCHER_IBY__
 
+#include <watcher.iby>
 #include <etel.iby>
 
 REM Telephony Watchers...

--- a/telephonyutils/telephonywatchers/group/indicatorwatcher.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyutils/telephonywatchers/group/indicatorwatcher.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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"
@@ -40,7 +40,7 @@
 SOURCE			../src/indicatorwatcher.cpp
 SOURCE			../src/IndicatorWatcherImplementationTable.cpp
 USERINCLUDE		../inc
-USERINCLUDE 	../traces
 LIBRARY			euser.lib etel.lib etelmm.lib telwatcherbase.lib
+DEBUGLIBRARY	comsdbgutil.lib
 
 SMPSAFE

--- a/telephonyutils/telephonywatchers/group/signalstrengthwatcher.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyutils/telephonywatchers/group/signalstrengthwatcher.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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"
@@ -39,7 +39,8 @@
 SOURCE			../src/signalstrengthwatcher.cpp
 SOURCE			../src/SignalstrengthWatcherImplementationTable.cpp
 USERINCLUDE		../inc
-USERINCLUDE 	../traces
 LIBRARY			euser.lib etel.lib etelmm.lib telwatcherbase.lib
+DEBUGLIBRARY	comsdbgutil.lib
+
 
 SMPSAFE

--- a/telephonyutils/telephonywatchers/group/telwatcher_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-"\sf\os\cellularsrv\telephonyutils\telephonywatchers\Test\TE_TelWatchers\TE_TelWatchers.cfg"-"c:\testdata\configs\TE_TelWatchers.cfg"
-"\sf\os\cellularsrv\telephonyutils\telephonywatchers\Test\TE_TelWatchers\TE_TelWatchers_config.txt"-"c:\testdata\configs\TE_TelWatchers_config.txt"
-
-"\sf\os\cellularsrv\telephonyutils\telephonywatchers\Test\TE_TelWatchers\TE_TelWatchers.script"-"c:\testdata\scripts\TE_TelWatchers.script"
-
-

--- a/telephonyutils/telephonywatchers/group/telwatcherbase.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyutils/telephonywatchers/group/telwatcherbase.mmp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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"
@@ -32,11 +32,12 @@
 SOURCE			../src/ModemChangeObserver.cpp
 
 USERINCLUDE		../inc
-USERINCLUDE 	../traces
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY			euser.lib etel.lib etelmm.lib
 
 LIBRARY			commsdat.lib
+DEBUGLIBRARY	comsdbgutil.lib
+
 
 SMPSAFE

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyutils/telephonywatchers/inc/watcherlog.h	Wed Sep 01 12:40:21 2010 +0100
@@ -0,0 +1,188 @@
+// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __WATCHERLOG_H__
+#define __WATCHERLOG_H__
+
+/**
+ *  @file
+ *
+ *  Logging macros for the Telephony Watchers. These use the Comms Debug
+ *  Utility framework (aka Flogger V2).
+ *
+ *  To enable logging create a file called "comsdbg.ini" in the Symbian OS
+ *  "C:\Logs\" directory which contains the following lines:
+ *
+ *    MEDIA FILE
+ *    LOG TelWatchers Common
+ *    LOG TelWatchers Indicator
+ *    LOG TelWatchers Signal
+ *
+ *  Each line relates to a particular part of the Telephony Watchers,
+ *  enabling you to log only the interesting bits.
+ *
+ *  By default logging is only present on UDEB builds. To enable UREL logging
+ *  on a device, you will need to rebuild your ROM with UDEB components.
+ *
+ *  To enable logging on a device, place the "comsdbg.ini" file in the ROM
+ *  under the "Z:\Logs\" directory. The log file will be written in the
+ *  "C:\Logs\" directory on the device.
+ *
+ *  To enable logging to the serial port change the "MEDIA FILE" line to
+ *  "MEDIA SERIAL::1" or "MEDIA SERIAL::2". Note that this may no longer
+ *  work due to a change of feature implementation in the Comms Debug
+ *  Framework.
+ *
+ *  If you wish to have individual logs for each component, then use the
+ *  extractlog.pl utility found in the %EPOCROOT%\Epoc32\Tools\ directory. E.g.
+ *
+ *    extractlog.pl \EPOC32\WINSCW\C\LOGS\LOG.TXT
+ *
+ *  @internalComponent
+ */
+
+#include <comms-infras/commsdebugutility.h>
+
+#ifdef _DEBUG
+#define _WATCHER_LOGGING_ENABLED
+#endif
+
+
+#ifdef _WATCHER_LOGGING_ENABLED
+
+_LIT8(KTelWatcherSubSystem, "TelWatchers");
+
+#define WATCHERFLOG1(N,A)                { \
+									     _LIT8(KLogString, A); \
+									     __FLOG_STATIC0(KTelWatcherSubSystem,(N),KLogString); \
+									     }
+#define WATCHERFLOG2(N,A,B)              { \
+									     _LIT8(KLogString, A); \
+									     __FLOG_STATIC1(KTelWatcherSubSystem,(N),KLogString,(B)); \
+									     }
+#define WATCHERFLOG3(N,A,B,C)            { \
+									     _LIT8(KLogString, A); \
+									     __FLOG_STATIC2(KTelWatcherSubSystem,(N),KLogString,(B),(C)); \
+									     }
+#define WATCHERFLOG4(N,A,B,C,D)          { \
+									     _LIT8(KLogString, A); \
+									     __FLOG_STATIC3(KTelWatcherSubSystem,(N),KLogString,(B),(C),(D)); \
+									     }
+#define WATCHERFLOG5(N,A,B,C,D,E)        { \
+									     _LIT8(KLogString, A); \
+									     __FLOG_STATIC4(KTelWatcherSubSystem,(N),KLogString,(B),(C),(D),(E)); \
+									     }
+#define WATCHERFLOG6(N,A,B,C,D,E,F)      { \
+									     _LIT8(KLogString, A); \
+									     __FLOG_STATIC5(KTelWatcherSubSystem,(N),KLogString,(B),(C),(D),(E),(F)); \
+									     }
+#define WATCHERFLOG7(N,A,B,C,D,E,F,G)    { \
+									     _LIT8(KLogString, A); \
+									     __FLOG_STATIC6(KTelWatcherSubSystem,(N),KLogString,(B),(C),(D),(E),(F),(G)); \
+									     }
+#define WATCHERFLOG8(N,A,B,C,D,E,F,G,H)  { \
+									     _LIT8(KLogString, A); \
+									     __FLOG_STATIC7(KTelWatcherSubSystem,(N),KLogString,(B),(C),(D),(E),(F),(G),(H)); \
+									     }
+
+_LIT8(KTelWatcherCommon, "Common");
+_LIT8(KTelWatcherIndicator, "Indicator");
+_LIT8(KTelWatcherSignal, "Signal");
+
+
+#define LOGCOMMON1(A)                      WATCHERFLOG1(KTelWatcherCommon,A)
+#define LOGCOMMON2(A,B)                    WATCHERFLOG2(KTelWatcherCommon,A,(B))
+#define LOGCOMMON3(A,B,C)                  WATCHERFLOG3(KTelWatcherCommon,A,(B),(C))
+#define LOGCOMMON4(A,B,C,D)                WATCHERFLOG4(KTelWatcherCommon,A,(B),(C),(D))
+#define LOGCOMMON5(A,B,C,D,E)              WATCHERFLOG5(KTelWatcherCommon,A,(B),(C),(D),(E))
+#define LOGCOMMON6(A,B,C,D,E,F)            WATCHERFLOG6(KTelWatcherCommon,A,(B),(C),(D),(E),(F))
+#define LOGCOMMON7(A,B,C,D,E,F,G)          WATCHERFLOG7(KTelWatcherCommon,A,(B),(C),(D),(E),(F),(G))
+#define LOGCOMMON8(A,B,C,D,E,F,G,H)        WATCHERFLOG8(KTelWatcherCommon,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGCOMMONTIMESTAMP()		       { \
+									       TTime  now; \
+									       now.UniversalTime(); \
+									       TDateTime dateTime(now.DateTime()); \
+									       LOGCOMMON5("TimeStamp=%02d:%02d:%02d.%06d", \
+									       dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									       }
+
+#define LOGINDICATOR1(A)                   WATCHERFLOG1(KTelWatcherIndicator,A)
+#define LOGINDICATOR2(A,B)                 WATCHERFLOG2(KTelWatcherIndicator,A,(B))
+#define LOGINDICATOR3(A,B,C)               WATCHERFLOG3(KTelWatcherIndicator,A,(B),(C))
+#define LOGINDICATOR4(A,B,C,D)             WATCHERFLOG4(KTelWatcherIndicator,A,(B),(C),(D))
+#define LOGINDICATOR5(A,B,C,D,E)           WATCHERFLOG5(KTelWatcherIndicator,A,(B),(C),(D),(E))
+#define LOGINDICATOR6(A,B,C,D,E,F)         WATCHERFLOG6(KTelWatcherIndicator,A,(B),(C),(D),(E),(F))
+#define LOGINDICATOR7(A,B,C,D,E,F,G)       WATCHERFLOG7(KTelWatcherIndicator,A,(B),(C),(D),(E),(F),(G))
+#define LOGINDICATOR8(A,B,C,D,E,F,G,H)     WATCHERFLOG8(KTelWatcherIndicator,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGINDICATORTIMESTAMP()	           { \
+									       TTime  now; \
+									       now.UniversalTime(); \
+									       TDateTime dateTime(now.DateTime()); \
+									       LOGINDICATOR5("TimeStamp=%02d:%02d:%02d.%06d", \
+									       dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									       }
+
+#define LOGSIGNAL1(A)                      WATCHERFLOG1(KTelWatcherSignal,A)
+#define LOGSIGNAL2(A,B)                    WATCHERFLOG2(KTelWatcherSignal,A,(B))
+#define LOGSIGNAL3(A,B,C)                  WATCHERFLOG3(KTelWatcherSignal,A,(B),(C))
+#define LOGSIGNAL4(A,B,C,D)                WATCHERFLOG4(KTelWatcherSignal,A,(B),(C),(D))
+#define LOGSIGNAL5(A,B,C,D,E)              WATCHERFLOG5(KTelWatcherSignal,A,(B),(C),(D),(E))
+#define LOGSIGNAL6(A,B,C,D,E,F)            WATCHERFLOG6(KTelWatcherSignal,A,(B),(C),(D),(E),(F))
+#define LOGSIGNAL7(A,B,C,D,E,F,G)          WATCHERFLOG7(KTelWatcherSignal,A,(B),(C),(D),(E),(F),(G))
+#define LOGSIGNAL8(A,B,C,D,E,F,G,H)        WATCHERFLOG8(KTelWatcherSignal,A,(B),(C),(D),(E),(F),(G),(H))
+#define LOGSIGNALTIMESTAMP()		       { \
+									       TTime  now; \
+									       now.UniversalTime(); \
+									       TDateTime dateTime(now.DateTime()); \
+									       LOGSIGNAL5("TimeStamp=%02d:%02d:%02d.%06d", \
+									       dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
+									       }
+
+#else  // _WATCHER_LOGGING_ENABLED
+
+#define LOGCOMMON1(A)
+#define LOGCOMMON2(A,B)
+#define LOGCOMMON3(A,B,C)
+#define LOGCOMMON4(A,B,C,D)
+#define LOGCOMMON5(A,B,C,D,E)
+#define LOGCOMMON6(A,B,C,D,E,F)
+#define LOGCOMMON7(A,B,C,D,E,F,G)
+#define LOGCOMMON8(A,B,C,D,E,F,G,H)
+#define LOGCOMMONTIMESTAMP()
+
+#define LOGINDICATOR1(A)
+#define LOGINDICATOR2(A,B)
+#define LOGINDICATOR3(A,B,C)
+#define LOGINDICATOR4(A,B,C,D)
+#define LOGINDICATOR5(A,B,C,D,E)
+#define LOGINDICATOR6(A,B,C,D,E,F)
+#define LOGINDICATOR7(A,B,C,D,E,F,G)
+#define LOGINDICATOR8(A,B,C,D,E,F,G,H)
+#define LOGINDICATORTIMESTAMP()
+
+#define LOGSIGNAL1(A)
+#define LOGSIGNAL2(A,B)
+#define LOGSIGNAL3(A,B,C)
+#define LOGSIGNAL4(A,B,C,D)
+#define LOGSIGNAL5(A,B,C,D,E)
+#define LOGSIGNAL6(A,B,C,D,E,F)
+#define LOGSIGNAL7(A,B,C,D,E,F,G)
+#define LOGSIGNAL8(A,B,C,D,E,F,G,H)
+#define LOGSIGNALTIMESTAMP()
+
+#endif	// _WATCHER_LOGGING_ENABLED
+
+#endif // __WATCHERLOG_H__
+

--- a/telephonyutils/telephonywatchers/src/indicatorwatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyutils/telephonywatchers/src/indicatorwatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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"
@@ -14,13 +14,7 @@
 //
 
 // User includes
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "indicatorwatcherTraces.h"
-#endif
-
+#include "watcherlog.h"
 #include "indicatorwatcher.h"
 
 // System includes
@@ -81,7 +75,7 @@
 		{
 	case EIndicatorNotYetInitialised:
 	case EIndicatorRequestInitialIndicator:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEPHONESTATEEVENTL_1, "IndicatorWatcher : Requesting initial indicator values");
+		LOGINDICATOR1("IndicatorWatcher : Requesting initial indicator values");
 		Phone().GetIndicator(iStatus, iIndicatorInfo);
 		IndicatorState() = EIndicatorWaitingForInitialIndicator;
 		SetActive();
@@ -136,8 +130,8 @@
 
 void CIndicatorWatcher::HandleIndicatorUpdateL(TInt aCompletionCode)
 	{
-#ifdef OST_TRACE_COMPILER_IN_USE
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEINDICATORUPDATEL_1, "IndicatorWatcher : Handling phone state change with request result (%d)", aCompletionCode);
+#ifdef _DEBUG
+	LOGINDICATOR2("IndicatorWatcher : Handling phone state change with request result (%d)", aCompletionCode);
 #else
 	(void) aCompletionCode;
 #endif
@@ -216,7 +210,7 @@
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEINDICATORUPDATEL_2, "IndicatorWatcher : Processing successful indicator event");
+		LOGINDICATOR1("IndicatorWatcher : Processing successful indicator event");
 	
 		// Update charger status if there has been a change
 		{
@@ -232,7 +226,7 @@
 	
 		if (newChargerState!=chargerState)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEINDICATORUPDATEL_3, "IndicatorWatcher : New Charger State %d", newChargerState);
+			LOGINDICATOR2("IndicatorWatcher : New Charger State %d", newChargerState);
 			User::LeaveIfError(iChargerStatusProperty.Set(newChargerState));
 			}
 		}
@@ -250,7 +244,7 @@
 	
 		if (newNetworkState!=networkState)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEINDICATORUPDATEL_4, "IndicatorWatcher : New Network State %d", newNetworkState);
+			LOGINDICATOR2("IndicatorWatcher : New Network State %d", newNetworkState);
 			User::LeaveIfError(iNetworkStatusProperty.Set(newNetworkState));		
 			}
 		}
@@ -274,7 +268,7 @@
 	
 		if (newCallState!=callState)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEINDICATORUPDATEL_5, "IndicatorWatcher : New Call State %d", newCallState);
+			LOGINDICATOR2("IndicatorWatcher : New Call State %d", newCallState);
 			User::LeaveIfError(iCurrentCallProperty.Set(newCallState));
 			}
 		}

--- a/telephonyutils/telephonywatchers/src/signalstrengthwatcher.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyutils/telephonywatchers/src/signalstrengthwatcher.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-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"
@@ -16,13 +16,7 @@
 //
 
 // User includes
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "signalstrengthwatcherTraces.h"
-#endif
-
+#include "watcherlog.h"
 #include "signalstrengthwatcher.h"
 
 // System includes
@@ -85,7 +79,7 @@
 		{
 	case ESignalStrengthNotYetInitialised:
 	case ESignalStrengthStateRequestInitialSignalStrength:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIGNALSTRENGTHWATCHER_HANDLEPHONESTATEEVENTL_1, "SignalStrengthWatcher : Requesting initial signal strength");
+		LOGSIGNAL1("SignalStrengthWatcher : Requesting initial signal strength");
 		Phone().GetSignalStrength(iStatus, iSignalStrength, iSignalBars);
 		SignalStrengthState() = ESignalStrengthWaitingForInitialSignalStrength;
 		SetActive();
@@ -136,10 +130,10 @@
 
 void CSignalStrengthWatcher::HandleSignalStrengthUpdateL(TInt aCompletionCode)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_1, "SignalStrengthNotifier : Handling signal strength update");
+	LOGSIGNAL1("SignalStrengthNotifier : Handling signal strength update");
 	if	(aCompletionCode < KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_2, "SignalStrengthNotifier : Handling request error (%d)", aCompletionCode);
+		LOGSIGNAL2("SignalStrengthNotifier : Handling request error (%d)", aCompletionCode);
 
 		// Indicate we don't know what the signal strength is
 		TInt ret = iNetworkStrengthProperty.Set(ESANetworkStrengthUnknown);
@@ -183,8 +177,8 @@
 		}
 	else
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_3, "SignalStrengthNotifier : Signal strength is: %d", (TInt) iSignalStrength);
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_4, "SignalStrengthNotifier : Signal bars is: %d", iSignalBars);
+		LOGSIGNAL2("SignalStrengthNotifier : Signal strength is: %d", (TInt) iSignalStrength);
+		LOGSIGNAL2("SignalStrengthNotifier : Signal bars is: %d", iSignalBars);
 
 		// What is the signal strength now?
 		TInt newState = ESANetworkStrengthUnknown;
@@ -199,12 +193,12 @@
 			newState = ESANetworkStrengthHigh;
 
 		// Update properties
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_5, "SignalStrengthNotifier : Informing properties of signal strength change");
+		LOGSIGNAL1("SignalStrengthNotifier : Informing properties of signal strength change");
 		TInt ret = iNetworkStrengthProperty.Set(newState);
 		if (!(ret == KErrNone || ret == KErrNotFound))
 			User::Leave(ret);
 				
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_6, "SignalStrengthNotifier : Requesting signal strength change notification");
+		LOGSIGNAL1("SignalStrengthNotifier : Requesting signal strength change notification");
 		Phone().NotifySignalStrengthChange(iStatus, iSignalStrength, iSignalBars);
 		SetActive();
 		}

--- a/telephonyutils/telephonywatchers/src/watcherbase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyutils/telephonywatchers/src/watcherbase.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -13,21 +13,8 @@
 // Description:
 //
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "watcherbaseTraces.h"
-#endif
-
-#undef TCOM_ARG
-#ifdef OST_TRACE_COMPILER_IN_USE
-#define TCOM_ARG(x) x
-#else
-#define TCOM_ARG(x)
-#endif
-
 #include "watcherbase.h"
+#include "watcherlog.h"
 
 // System includes
  #include <commsdattypesv1_1.h>
@@ -66,7 +53,7 @@
 	TheSeed = now.Int64();
 
     //-- define properties for test purposes
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_CTOR_1, "CTelWatcherBase : defining properties for testing");
+    LOGCOMMON1("CTelWatcherBase : defining properties for testing");
    
     //-- For debugging purposes only, used by TE_TelWatchers(Unit).
 
@@ -96,7 +83,7 @@
 
 EXPORT_C void CWatcherBase::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_CONSTRUCTL_1, "WatcherBase : Creating timer");
+	LOGCOMMON1("WatcherBase : Creating timer");
 	User::LeaveIfError(iTimer.CreateLocal());
 
 	User::LeaveIfError(iPhonePowerProperty.Attach(KUidSystemCategory, KUidPhonePwr.iUid));    
@@ -111,23 +98,30 @@
 
 EXPORT_C void CWatcherBase::SuspendFor(TInt aTimeInSeconds)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_SUSPENDFOR_1, "WatcherBase : Pausing after error");
+	LOGCOMMON1("WatcherBase : Pausing after error");
 	TTimeIntervalMicroSeconds32 timeToSuspendFor = aTimeInSeconds * KOneSecond;
 	iTimer.After(iStatus, timeToSuspendFor);
 	State() = EBaseStateSuspending;
 	SetActive();
 	}
 
-EXPORT_C void CWatcherBase::SetDisabled(const TDesC& TCOM_ARG(aLogEntry), TInt TCOM_ARG(aError))
+EXPORT_C void CWatcherBase::SetDisabled(const TDesC& aLogEntry, TInt aError)
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_SETDISABLED_1, "Log Entry \"%S\" error %d", aLogEntry, aError);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_SETDISABLED_2, "WatcherBase : Watcher is now disabled");
+#ifdef _WATCHER_LOGGING_ENABLED
+	TBuf8<256>  tmpBuf;
+	tmpBuf.Copy(aLogEntry);
+	LOGCOMMON3("Log Entry \"%S\" error %d", &tmpBuf, aError);
+#else
+	(void) aLogEntry;
+	(void) aError;
+#endif
+	LOGCOMMON1("WatcherBase : Watcher is now disabled");
 	State() = EBaseStateDisabled;
 	}
 
 EXPORT_C void CWatcherBase::RequestNextState()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_REQUESTNEXTSTATE_1, "WatcherBase : Requesting State Change");
+	LOGCOMMON1("WatcherBase : Requesting State Change");
 
 	if	(State() != EBaseStateDisabled)
 		{
@@ -145,7 +139,7 @@
 	{
 	TInt val;	
 	
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_WAITFORPHONETOPOWERUPL_1, "WatcherBase : Waiting for phone to be turned on");
+	LOGCOMMON1("WatcherBase : Waiting for phone to be turned on");
 	__ASSERT_DEBUG(!IsActive(), WatcherBasePanic(EUnexpectedActiveState));
 	Cancel();
 
@@ -163,7 +157,7 @@
 	if (val != ESAPhoneOff)
 		{//-- phone is already ON, complete request so that we go to RunL without waiting
 		iPhonePowerProperty.Cancel();        
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_WAITFORPHONETOPOWERUPL_2, "CTelWatcherBase::WaitForPhoneToPowerUpL ??? phone is already turned ON");
+		LOGCOMMON1("CTelWatcherBase::WaitForPhoneToPowerUpL ??? phone is already turned ON");
 		}
 	}
 
@@ -173,12 +167,12 @@
 
 EXPORT_C void CWatcherBase::RunL()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNL_1, "WatcherBase : RunL(%d)", iStatus.Int());
+	LOGCOMMON2("WatcherBase : RunL(%d)", iStatus.Int());
 
 	switch(State())
 		{
 	case EBaseStateConnectingToPropertyNotifier:		
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNL_2, "WatcherBase : Attaching to Property");
+		LOGCOMMON1("WatcherBase : Attaching to Property");
 
 		// Virtual function call back, for any subclasses that need to implement
 		// any special stuff.
@@ -192,7 +186,7 @@
 	case EBaseStateWaitingForPhoneToPowerUp:
 		// We were waiting for the phone to become available again. We now must restart
 		// this watcher from scratch.
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNL_3, "WatcherBase : Phone available again. Restarting watcher framework");
+		LOGCOMMON1("WatcherBase : Phone available again. Restarting watcher framework");
 		
         //--  phone power state has changed (it must be turned ON)
         //--  retrieve its state and check.
@@ -202,19 +196,19 @@
 
         if (val == ESAPhoneOn)
         {   //-- everything OK, the phone has been turned ON, restart this watcher from scratch.
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNL_4, "CTelWatcherBase : Phone has been turned ON. Restarting watcher framework");
+		    LOGCOMMON1("CTelWatcherBase : Phone has been turned ON. Restarting watcher framework");
             State() = EBaseStateConnectingToPropertyNotifier;
             RequestNextState();
         }
         else
         {   //-- strange situation, we were waiting for phone On and it now Off, try to wait again
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNL_5, "CTelWatcherBase : ??? Phone has been turned OFF. Continue waiting...");
+            LOGCOMMON1("CTelWatcherBase : ??? Phone has been turned OFF. Continue waiting...");
             WaitForPhoneToPowerUpL();
         } 		
 		break;
 
 	case EBaseStateSuspending:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNL_6, "WatcherBase : Completed suspension. Resuming passive state");
+		LOGCOMMON1("WatcherBase : Completed suspension. Resuming passive state");
 		
 		State() = EBaseStatePassive; // Fall through
 
@@ -224,7 +218,7 @@
 	
 	default:
 	case EBaseStateDisabled:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNL_7, "WatcherBase : RunL called in Disabled state. Ooops");
+		LOGCOMMON1("WatcherBase : RunL called in Disabled state. Ooops");
 		__ASSERT_DEBUG(0, WatcherBasePanic(EUnexpectedState));
 		}
 	}
@@ -253,13 +247,17 @@
 	// Let other sub classes cancel their requests
 	HandleCancel();
 	}
- 
-EXPORT_C TInt CWatcherBase::RunError(TInt TCOM_ARG(aError))
+
+EXPORT_C TInt CWatcherBase::RunError(TInt aError)
 //
 //	Called when RunL (or a sub-function there-of) leaves.
 //
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNERROR_1, "WatcherBase : RunError called with error of %d", aError);
+#ifdef _WATCHER_LOGGING_ENABLED
+	LOGCOMMON2("WatcherBase : RunError called with error of %d", aError);
+#else
+	(void) aError;
+#endif
 
 	// Should never be called from outside the framework
 	__ASSERT_DEBUG(!IsActive(), WatcherBasePanic(EUnexpectedActiveState));
@@ -286,7 +284,7 @@
 	else
 		{
 		// Put us in the start up state again
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNERROR_2, "WatcherBase : Phone available again. Restarting watcher framework");
+		LOGCOMMON1("WatcherBase : Phone available again. Restarting watcher framework");
 		State() = EBaseStateConnectingToPropertyNotifier;
 		RequestNextState();
 		}
@@ -409,28 +407,32 @@
 
 TInt CPhoneWatcher::RetrieveTSYName()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_RETRIEVETSYNAME_1, "PhoneWatcher : RetrieveTSYName()");
+	LOGCOMMON1("PhoneWatcher : RetrieveTSYName()");
 	TRAPD(error, DoRetrieveTSYNameL());
 	return error;
 	}
 
 TInt CPhoneWatcher::ConnectToETelServer()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOETELSERVER_1, "PhoneWatcher : ConnectToETelServer()");
+	LOGCOMMON1("PhoneWatcher : ConnectToETelServer()");
 	return ETel().Connect();
 	}
 
 TInt CPhoneWatcher::LoadPhoneModule()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_LOADPHONEMODULE_1, "PhoneWatcher : LoadPhoneModule()");
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_LOADPHONEMODULE_2, "TSY Name to load is %S",iTSYName);
+#ifdef _WATCHER_LOGGING_ENABLED
+	TBuf8<256>  tmpBuf;
+	tmpBuf.Copy(iTSYName);
+	LOGCOMMON1("PhoneWatcher : LoadPhoneModule()");
+	LOGCOMMON2("TSY Name to load is %S",&tmpBuf);
+#endif
 
 	return ETel().LoadPhoneModule(iTSYName);
 	}
 
 TInt CPhoneWatcher::ConnectToPhone()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_1, "PhoneWatcher : ConnectToPhone()");
+	LOGCOMMON1("PhoneWatcher : ConnectToPhone()");
 	TInt error;
 
 	RTelServer::TPhoneInfo phoneInfo;
@@ -440,11 +442,11 @@
 	error = ETel().EnumeratePhones(phoneCount);
 	if	(error < KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_2, "PhoneWatcher : Failed to enumerate phones (%d)", error);
+		LOGCOMMON2("PhoneWatcher : Failed to enumerate phones (%d)", error);
 		return error;
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_3, "PhoneWatcher : Counted %d 'phones'", phoneCount);
+	LOGCOMMON2("PhoneWatcher : Counted %d 'phones'", phoneCount);
 
 	// Iterate through all the phones
 	for(TInt i=0; i<phoneCount; i++)
@@ -455,22 +457,29 @@
 		error = ETel().GetTsyName(i, matchTsyName);
 		if	(error < KErrNone)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_4, "PhoneWatcher : Getting TSY name failed (%d)", error);
+			LOGCOMMON2("PhoneWatcher : Getting TSY name failed (%d)", error);
 			return error;
 			}
 
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_5, "PhoneWatcher : TSY for phone %d is '%S'", i, matchTsyName);
-
+#ifdef _WATCHER_LOGGING_ENABLED
+		TBuf8<256>  tmpMatchTsyName;
+		tmpMatchTsyName.Copy(matchTsyName);
+		LOGCOMMON3("PhoneWatcher : TSY for phone %d is '%S'", i, &tmpMatchTsyName);
+#endif
 
 		// See if the phone belongs to the TSY
 		if	(matchTsyName.CompareF(iTSYName) == 0)
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_6, "PhoneWatcher : %S is a match for CommDb TSY: %S", matchTsyName, iTSYName);
+#ifdef _WATCHER_LOGGING_ENABLED
+			TBuf8<256>  tsyNameBuf;
+			tsyNameBuf.Copy(iTSYName);
+			LOGCOMMON3("PhoneWatcher : %S is a match for CommDb TSY: %S", &tmpMatchTsyName, &tsyNameBuf);
+#endif
 
 			error = ETel().GetPhoneInfo(i, phoneInfo);
 			if	(error < KErrNone)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_7, "PhoneWatcher : Getting phone info failed (%d)", error);
+				LOGCOMMON2("PhoneWatcher : Getting phone info failed (%d)", error);
 				return error;
 				}
 			break;
@@ -481,11 +490,19 @@
 	error = Phone().Open(ETel(), phoneInfo.iName);
 	if	(error < KErrNone)
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_8, "PhoneWatcher : Open phone %S failed (%d)", phoneInfo.iName, error);
+#ifdef _WATCHER_LOGGING_ENABLED
+		TBuf8<256>  tmpBuf;
+		tmpBuf.Copy(phoneInfo.iName);
+		LOGCOMMON3("PhoneWatcher : Open phone %S failed (%d)", &tmpBuf, error);
+#endif
 		return error;
 		}
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_9, "PhoneWatcher : Opened 'phone' %S", phoneInfo.iName);
 
+#ifdef _WATCHER_LOGGING_ENABLED
+	TBuf8<256>  tmpBuf;
+	tmpBuf.Copy(phoneInfo.iName);
+	LOGCOMMON2("PhoneWatcher : Opened 'phone' %S", &tmpBuf);
+#endif
 
 	// Indicate we're connected and to move to next state.
 	return error;

--- a/telephonyutils/telephonywatchers/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/telephonyutils/telephonywatchers/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_BORDER=0x84
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_CONSTRUCTL_1=0x2
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_CTOR_1=0x1
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_REQUESTNEXTSTATE_1=0x6
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNERROR_1=0x10
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNERROR_2=0x11
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_1=0x9
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_2=0xa
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_3=0xb
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_4=0xc
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_5=0xd
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_6=0xe
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_7=0xf
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_SETDISABLED_1=0x4
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_SETDISABLED_2=0x5
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_SUSPENDFOR_1=0x3
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_WAITFORPHONETOPOWERUPL_1=0x7
-[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_WAITFORPHONETOPOWERUPL_2=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOETELSERVER_1=0x2
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_1=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_2=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_3=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_4=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_5=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_6=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_7=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_8=0xc
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_9=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_LOADPHONEMODULE_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_LOADPHONEMODULE_2=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_RETRIEVETSYNAME_1=0x1

--- a/wapstack/wapmessageapi/bmarm/WAPMSGCLIU.DEF	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-EXPORTS
-	__28CWapFullySpecDatagramService @ 1 NONAME R3UNUSED ; CWapFullySpecDatagramService::CWapFullySpecDatagramService(void)
-	ConstructL__24CWapBoundDatagramService @ 2 NONAME R3UNUSED ; CWapBoundDatagramService::ConstructL(void)
-	ConstructL__26CWapFullySpecCLPushService @ 3 NONAME R3UNUSED ; CWapFullySpecCLPushService::ConstructL(void)
-	ConstructL__28CWapFullySpecDatagramService @ 4 NONAME R3UNUSED ; CWapFullySpecDatagramService::ConstructL(void)
-	GetLocalAddressesL__16CWapMessageUtilsRt6RArray1ZQ23Wap12TAddressInfo @ 5 NONAME R3UNUSED ; CWapMessageUtils::GetLocalAddressesL(RArray<Wap::TAddressInfo> &)
-	NewL__22CWapBoundCLPushService @ 6 NONAME R3UNUSED ; CWapBoundCLPushService::NewL(void)
-	NewL__24CWapBoundDatagramService @ 7 NONAME R3UNUSED ; CWapBoundDatagramService::NewL(void)
-	NewL__26CWapFullySpecCLPushService @ 8 NONAME R3UNUSED ; CWapFullySpecCLPushService::NewL(void)
-	NewL__28CWapFullySpecDatagramService @ 9 NONAME R3UNUSED ; CWapFullySpecDatagramService::NewL(void)
-	"_._22CWapBoundCLPushService" @ 10 NONAME R3UNUSED ; CWapBoundCLPushService::~CWapBoundCLPushService(void)
-	"_._24CWapBoundDatagramService" @ 11 NONAME R3UNUSED ; CWapBoundDatagramService::~CWapBoundDatagramService(void)
-	"_._26CWapFullySpecCLPushService" @ 12 NONAME R3UNUSED ; CWapFullySpecCLPushService::~CWapFullySpecCLPushService(void)
-	"_._28CWapFullySpecDatagramService" @ 13 NONAME R3UNUSED ; CWapFullySpecDatagramService::~CWapFullySpecDatagramService(void)
-	__22CWapBoundCLPushService @ 14 NONAME R3UNUSED ; CWapBoundCLPushService::CWapBoundCLPushService(void)
-	__24CWapBoundDatagramService @ 15 NONAME R3UNUSED ; CWapBoundDatagramService::CWapBoundDatagramService(void)
-	__26CWapFullySpecCLPushService @ 16 NONAME R3UNUSED ; CWapFullySpecCLPushService::CWapFullySpecCLPushService(void)
-	ConstructL__22CWapBoundCLPushService @ 17 NONAME R3UNUSED ; CWapBoundCLPushService::ConstructL(void)
-	ConstructL__25CWapFullySpecCLWSPService @ 18 NONAME R3UNUSED ; CWapFullySpecCLWSPService::ConstructL(void)
-	NewL__21CWapBoundCLWSPService @ 19 NONAME R3UNUSED ; CWapBoundCLWSPService::NewL(void)
-	NewL__21CWapBoundCLWSPServiceRC4TUid @ 20 NONAME R3UNUSED ; CWapBoundCLWSPService::NewL(TUid const &)
-	NewL__22CWapBoundCLPushServiceRC4TUid @ 21 NONAME R3UNUSED ; CWapBoundCLPushService::NewL(TUid const &)
-	NewL__24CWapBoundDatagramServiceRC4TUid @ 22 NONAME R3UNUSED ; CWapBoundDatagramService::NewL(TUid const &)
-	NewL__25CWapFullySpecCLWSPService @ 23 NONAME R3UNUSED ; CWapFullySpecCLWSPService::NewL(void)
-	NewL__25CWapFullySpecCLWSPServiceRC4TUid @ 24 NONAME R3UNUSED ; CWapFullySpecCLWSPService::NewL(TUid const &)
-	NewL__26CWapFullySpecCLPushServiceRC4TUid @ 25 NONAME R3UNUSED ; CWapFullySpecCLPushService::NewL(TUid const &)
-	NewL__28CWapFullySpecDatagramServiceRC4TUid @ 26 NONAME R3UNUSED ; CWapFullySpecDatagramService::NewL(TUid const &)
-	"_._21CWapBoundCLWSPService" @ 27 NONAME R3UNUSED ; CWapBoundCLWSPService::~CWapBoundCLWSPService(void)
-	"_._25CWapFullySpecCLWSPService" @ 28 NONAME R3UNUSED ; CWapFullySpecCLWSPService::~CWapFullySpecCLWSPService(void)
-	__21CWapBoundCLWSPService @ 29 NONAME R3UNUSED ; CWapBoundCLWSPService::CWapBoundCLWSPService(void)
-	__25CWapFullySpecCLWSPService @ 30 NONAME R3UNUSED ; CWapFullySpecCLWSPService::CWapFullySpecCLWSPService(void)
-	ConstructL__21CWapBoundCLWSPService @ 31 NONAME R3UNUSED ; CWapBoundCLWSPService::ConstructL(void)
-

--- a/wapstack/wapmessageapi/bwins/WAPMSGCLIU.DEF	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-EXPORTS
-	??0CWapBoundCLPushService@@IAE@XZ @ 1 NONAME ; protected: __thiscall CWapBoundCLPushService::CWapBoundCLPushService(void)
-	??0CWapBoundDatagramService@@IAE@XZ @ 2 NONAME ; protected: __thiscall CWapBoundDatagramService::CWapBoundDatagramService(void)
-	??0CWapFullySpecCLPushService@@IAE@XZ @ 3 NONAME ; protected: __thiscall CWapFullySpecCLPushService::CWapFullySpecCLPushService(void)
-	??0CWapFullySpecDatagramService@@IAE@XZ @ 4 NONAME ; protected: __thiscall CWapFullySpecDatagramService::CWapFullySpecDatagramService(void)
-	??1CWapBoundCLPushService@@UAE@XZ @ 5 NONAME ; public: virtual __thiscall CWapBoundCLPushService::~CWapBoundCLPushService(void)
-	??1CWapBoundDatagramService@@UAE@XZ @ 6 NONAME ; public: virtual __thiscall CWapBoundDatagramService::~CWapBoundDatagramService(void)
-	??1CWapFullySpecCLPushService@@UAE@XZ @ 7 NONAME ; public: virtual __thiscall CWapFullySpecCLPushService::~CWapFullySpecCLPushService(void)
-	??1CWapFullySpecDatagramService@@UAE@XZ @ 8 NONAME ; public: virtual __thiscall CWapFullySpecDatagramService::~CWapFullySpecDatagramService(void)
-	?ConstructL@CWapBoundCLPushService@@IAEXXZ @ 9 NONAME ; protected: void __thiscall CWapBoundCLPushService::ConstructL(void)
-	?ConstructL@CWapBoundDatagramService@@IAEXXZ @ 10 NONAME ; protected: void __thiscall CWapBoundDatagramService::ConstructL(void)
-	?ConstructL@CWapFullySpecCLPushService@@IAEXXZ @ 11 NONAME ; protected: void __thiscall CWapFullySpecCLPushService::ConstructL(void)
-	?ConstructL@CWapFullySpecDatagramService@@IAEXXZ @ 12 NONAME ; protected: void __thiscall CWapFullySpecDatagramService::ConstructL(void)
-	?GetLocalAddressesL@CWapMessageUtils@@SAHAAV?$RArray@VTAddressInfo@Wap@@@@@Z @ 13 NONAME ; public: static int __cdecl CWapMessageUtils::GetLocalAddressesL(class RArray<class Wap::TAddressInfo> &)
-	?NewL@CWapBoundCLPushService@@SAPAV1@XZ @ 14 NONAME ; public: static class CWapBoundCLPushService * __cdecl CWapBoundCLPushService::NewL(void)
-	?NewL@CWapBoundDatagramService@@SAPAV1@XZ @ 15 NONAME ; public: static class CWapBoundDatagramService * __cdecl CWapBoundDatagramService::NewL(void)
-	?NewL@CWapFullySpecCLPushService@@SAPAV1@XZ @ 16 NONAME ; public: static class CWapFullySpecCLPushService * __cdecl CWapFullySpecCLPushService::NewL(void)
-	?NewL@CWapFullySpecDatagramService@@SAPAV1@XZ @ 17 NONAME ; public: static class CWapFullySpecDatagramService * __cdecl CWapFullySpecDatagramService::NewL(void)
-	??0CWapBoundCLWSPService@@IAE@XZ @ 18 NONAME ; protected: __thiscall CWapBoundCLWSPService::CWapBoundCLWSPService(void)
-	??0CWapFullySpecCLWSPService@@IAE@XZ @ 19 NONAME ; protected: __thiscall CWapFullySpecCLWSPService::CWapFullySpecCLWSPService(void)
-	??1CWapBoundCLWSPService@@UAE@XZ @ 20 NONAME ; public: virtual __thiscall CWapBoundCLWSPService::~CWapBoundCLWSPService(void)
-	??1CWapFullySpecCLWSPService@@UAE@XZ @ 21 NONAME ; public: virtual __thiscall CWapFullySpecCLWSPService::~CWapFullySpecCLWSPService(void)
-	?ConstructL@CWapBoundCLWSPService@@IAEXXZ @ 22 NONAME ; protected: void __thiscall CWapBoundCLWSPService::ConstructL(void)
-	?ConstructL@CWapFullySpecCLWSPService@@IAEXXZ @ 23 NONAME ; protected: void __thiscall CWapFullySpecCLWSPService::ConstructL(void)
-	?NewL@CWapBoundCLPushService@@SAPAV1@ABVTUid@@@Z @ 24 NONAME ; public: static class CWapBoundCLPushService * __cdecl CWapBoundCLPushService::NewL(class TUid const &)
-	?NewL@CWapBoundCLWSPService@@SAPAV1@ABVTUid@@@Z @ 25 NONAME ; public: static class CWapBoundCLWSPService * __cdecl CWapBoundCLWSPService::NewL(class TUid const &)
-	?NewL@CWapBoundCLWSPService@@SAPAV1@XZ @ 26 NONAME ; public: static class CWapBoundCLWSPService * __cdecl CWapBoundCLWSPService::NewL(void)
-	?NewL@CWapBoundDatagramService@@SAPAV1@ABVTUid@@@Z @ 27 NONAME ; public: static class CWapBoundDatagramService * __cdecl CWapBoundDatagramService::NewL(class TUid const &)
-	?NewL@CWapFullySpecCLPushService@@SAPAV1@ABVTUid@@@Z @ 28 NONAME ; public: static class CWapFullySpecCLPushService * __cdecl CWapFullySpecCLPushService::NewL(class TUid const &)
-	?NewL@CWapFullySpecCLWSPService@@SAPAV1@ABVTUid@@@Z @ 29 NONAME ; public: static class CWapFullySpecCLWSPService * __cdecl CWapFullySpecCLWSPService::NewL(class TUid const &)
-	?NewL@CWapFullySpecCLWSPService@@SAPAV1@XZ @ 30 NONAME ; public: static class CWapFullySpecCLWSPService * __cdecl CWapFullySpecCLWSPService::NewL(void)
-	?NewL@CWapFullySpecDatagramService@@SAPAV1@ABVTUid@@@Z @ 31 NONAME ; public: static class CWapFullySpecDatagramService * __cdecl CWapFullySpecDatagramService::NewL(class TUid const &)
-

--- a/wapstack/wapmessageapi/client/wapmessage.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,509 +0,0 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-#include <wapmessage.h>
-#include <in_iface.h>
-#include <ecom/ecom.h>
-
-/** The WAP Messaging API.  Four interfaces are defined that provide bound and fully-specified versions of WDP and Connectionless Push.
-	An instantiation of each may be obtained using the CreateImplementationL() function, and must be released using Release() when no
-	longer required.  Release() causes the instantiation to be deleted.
-*/
-
-// Use SWS as default WAP stack
-//  If undefined th3em NWSS stack will be used as default
-#define WAPUSE_SWS // since 8.0
-
-#ifndef WAPUSE_SWS
-// Symbian OS 7.0
-_LIT8(KDefBoundWdpCue, "wdp/bound");
-_LIT8(KDefFullSpecWdpCue, "wdp/fullyspec");
-_LIT8(KDefBoundCLPushCue, "clpush/bound");
-_LIT8(KDefFullSpecCLPushCue, "clpush/fullyspec");
-
-_LIT8(KAltBoundWdpCue, "swswdp/bound");
-_LIT8(KAltFullSpecWdpCue, "swswdp/fullyspec");
-_LIT8(KAltBoundCLPushCue, "swsclpush/bound");
-_LIT8(KAltFullSpecCLPushCue, "swsclpush/fullyspec");
-
-#else
-// Symbian OS 8.0
-_LIT8(KAltBoundWdpCue, "wdp/bound");
-_LIT8(KAltFullSpecWdpCue, "wdp/fullyspec");
-_LIT8(KAltBoundCLPushCue, "clpush/bound");
-_LIT8(KAltFullSpecCLPushCue, "clpush/fullyspec");
-
-_LIT8(KDefBoundWdpCue, "swswdp/bound");
-_LIT8(KDefFullSpecWdpCue, "swswdp/fullyspec");
-_LIT8(KDefBoundCLPushCue, "swsclpush/bound");
-_LIT8(KDefFullSpecCLPushCue, "swsclpush/fullyspec");
-#endif
-
-_LIT8(KBoundCLWSPCue, "swsclwsp/bound");
-_LIT8(KFullSpecCLWSPCue, "swsclwsp/fullyspec");
-
-/** Bound WDP
-*/
-
-EXPORT_C 
-CWapBoundDatagramService* CWapBoundDatagramService::NewL()
-	/** Allocates and creates a new CWapBoundDatagramService object. 
-	* 
-	* @return	A new CWapBoundDatagramService object.
-	* @leave	System wide error codes
-	*/
-	{
-	// CWapBoundDatagramService ECOM Interface UID = 101F4471
-	const TUid KUidBoundWDPInterface = {0x101F4471};
-
-	// Set resolving parameters
-	TEComResolverParams resolverParams;
-	resolverParams.SetDataType(KDefBoundWdpCue);
-	resolverParams.SetWildcardMatch(ETrue);
-
-	// Get the instantiation
-	TInt trapValue(0); 
-	TAny* ptr = NULL;
-	TRAP(trapValue, ptr = REComSession::CreateImplementationL(KUidBoundWDPInterface,
-								 _FOFF(CWapBoundDatagramService, iDtor_ID_Key),
-								 resolverParams));
-	if(trapValue)
-	{
-		resolverParams.SetDataType(KAltBoundWdpCue);
-		// Trying to load old wapmessage plug-in
-		ptr = REComSession::CreateImplementationL(KUidBoundWDPInterface,
-								 _FOFF(CWapBoundDatagramService, iDtor_ID_Key),
-								 resolverParams);
-	}
-
-	return REINTERPRET_CAST(CWapBoundDatagramService*, ptr);
-	}
-
-EXPORT_C 
-CWapBoundDatagramService* CWapBoundDatagramService::NewL(const TUid& aImplementation)
-	/** Allocates and creates a new CWapBoundDatagramService object. 
-	* 
-	* @param aImplementation
-	* @return					A new CWapBoundDatagramService object.
-	* @leave					System wide error codes
-	*/
-	{
-		TAny* ptr = REComSession::CreateImplementationL(aImplementation,
-								 _FOFF(CWapBoundDatagramService, iDtor_ID_Key));
-
-	return	REINTERPRET_CAST(CWapBoundDatagramService*, ptr);
-	}
-
-EXPORT_C 
-CWapBoundDatagramService::~CWapBoundDatagramService()
-	/** Destructor */
-	{
-	REComSession::DestroyedImplementation(iDtor_ID_Key);
-	}
-
-EXPORT_C 
-CWapBoundDatagramService::CWapBoundDatagramService()
-	{
-	}
-
-EXPORT_C 
-void CWapBoundDatagramService::ConstructL()
-	{
-	}
-	
-/** Fully-specified WDP
-*/
-
-EXPORT_C 
-CWapFullySpecDatagramService* CWapFullySpecDatagramService::NewL()
-	/** Allocates and creates a new CWapFullySpecDatagramService object. 
-	* 
-	* @return	A new CWapFullySpecDatagramService object.
-	* @leave	System wide error codes.
-	*/
-	{
-	// MWapFullySpecDatagramService ECOM Interface UID = 101F4473
-	const TUid KUidFullySpecDatagramInterface = {0x101F4473};
-
-	// Set resolving parameters
-	TEComResolverParams resolverParams;
-	resolverParams.SetDataType(KDefFullSpecWdpCue);
-	resolverParams.SetWildcardMatch(ETrue);
-
-	// Get the instantiation
-	TInt trapValue(0); 
-	TAny* ptr = NULL;
-	TRAP(trapValue, ptr = REComSession::CreateImplementationL(KUidFullySpecDatagramInterface,
-								 _FOFF(CWapFullySpecDatagramService, iDtor_ID_Key),
-								 resolverParams));
-	if(trapValue)
-	{
-		// Trying to load old wapmessage plug-in
-		resolverParams.SetDataType(KAltFullSpecWdpCue);
-		ptr = REComSession::CreateImplementationL(KUidFullySpecDatagramInterface,
-								 _FOFF(CWapFullySpecDatagramService, iDtor_ID_Key),
-								 resolverParams);
-	}
-
-	return REINTERPRET_CAST(CWapFullySpecDatagramService*, ptr);
-	}
-
-EXPORT_C 
-CWapFullySpecDatagramService* CWapFullySpecDatagramService::NewL(const TUid& aImplementation)
-	/** Allocates and creates a new CWapFullySpecDatagramService object. 
-	* 
-	* @param aImplementation	
-	* @return					A new CWapFullySpecDatagramService object.
-	* @leave					System wide error codes.
-	*/
-	{
-		TAny* ptr = REComSession::CreateImplementationL(aImplementation,
-								 _FOFF(CWapFullySpecDatagramService, iDtor_ID_Key));
-
-	return	REINTERPRET_CAST(CWapFullySpecDatagramService*, ptr);
-	}
-
-EXPORT_C 
-CWapFullySpecDatagramService::~CWapFullySpecDatagramService()
-	/** Destructor */
-	{
-	REComSession::DestroyedImplementation(iDtor_ID_Key);
-	}
-
-EXPORT_C 
-CWapFullySpecDatagramService::CWapFullySpecDatagramService()
-	{
-	}
-
-EXPORT_C 
-void CWapFullySpecDatagramService::ConstructL()
-	{
-	}
-
-/** Bound Connection-less Push
-*/
-
-EXPORT_C 
-CWapBoundCLPushService* CWapBoundCLPushService::NewL()
-	/** Allocates and creates a new CWapBoundCLPushService object. 
-	*
-	* @return	A new <code>CWapBoundCLPushService</code> object.
-	* @leave	System wide error codes.
-	*/
-	{
-	// MWapBoundCLPushService ECOM Interface UID = 101F4475
-	const TUid KUidBoundCLPushInterface = {0x101F4475};
-
-	// Set resolving parameters
-	TEComResolverParams resolverParams;
-	resolverParams.SetDataType(KDefBoundCLPushCue);
-	resolverParams.SetWildcardMatch(ETrue);
-
-	// Get the instantiation
-	TInt trapValue(0); 
-	TAny* ptr = NULL;
-	TRAP(trapValue, ptr = REComSession::CreateImplementationL(KUidBoundCLPushInterface,
-								 _FOFF(CWapBoundCLPushService, iDtor_ID_Key),
-								 resolverParams));
-	if(trapValue)
-	{
-		// Trying to load old wapmessage plug-in
-		resolverParams.SetDataType(KAltBoundCLPushCue);
-		ptr = REComSession::CreateImplementationL(KUidBoundCLPushInterface,
-								 _FOFF(CWapBoundCLPushService, iDtor_ID_Key),
-								 resolverParams);
-	}
-	return REINTERPRET_CAST(CWapBoundCLPushService*, ptr);
-	}
-
-EXPORT_C 
-CWapBoundCLPushService* CWapBoundCLPushService::NewL(const TUid& aImplementation)
-	/** Allocates and creates a new CWapBoundCLPushService object. 
-	*
-	* @param aImplementation	
-	* @return					A new CWapBoundCLPushService object.
-	* @leave					System wide error codes.
-	*/
-	{
-		TAny* ptr = REComSession::CreateImplementationL(aImplementation,
-								 _FOFF(CWapBoundCLPushService, iDtor_ID_Key));
-
-	return	REINTERPRET_CAST(CWapBoundCLPushService*, ptr);
-	}
-
-EXPORT_C 
-CWapBoundCLPushService::~CWapBoundCLPushService()
-	/** Destructor */
-	{
-	REComSession::DestroyedImplementation(iDtor_ID_Key);
-	}
-
-EXPORT_C 
-CWapBoundCLPushService::CWapBoundCLPushService()
-	{
-	}
-
-EXPORT_C 
-void CWapBoundCLPushService::ConstructL()
-	{
-	}
-
-/** Fully-specified Connection-less Push
-*/
-
-EXPORT_C 
-CWapFullySpecCLPushService* CWapFullySpecCLPushService::NewL()
-	/** Allocates and creates a new CWapFullySpecCLPushService object. 
-	*
-	* @return	A new CWapFullySpecCLPushService object.
-	* @leave	System wide error codes.
-	*/
-	{
-	// MWapFullySpecCLPushService ECOM Interface UID = 101F4477
-	const TUid KUidFullySpecCLPushInterface = {0x101F4477};
-
-	// Set resolving parameters
-	TEComResolverParams resolverParams;
-	resolverParams.SetDataType(KDefFullSpecCLPushCue);
-	resolverParams.SetWildcardMatch(ETrue);
-
-	// Get the instantiation
-	TInt trapValue(0); 
-	TAny* ptr = NULL;
-	TRAP(trapValue, ptr = REComSession::CreateImplementationL(KUidFullySpecCLPushInterface,
-								 _FOFF(CWapFullySpecCLPushService, iDtor_ID_Key),
-								 resolverParams));
-	if(trapValue)
-	{
-		// Trying to load old wapmessage plug-in
-		resolverParams.SetDataType(KAltFullSpecCLPushCue);
-		ptr = REComSession::CreateImplementationL(KUidFullySpecCLPushInterface,
-								 _FOFF(CWapFullySpecCLPushService, iDtor_ID_Key),
-								 resolverParams);
-	}
-
-	return REINTERPRET_CAST(CWapFullySpecCLPushService*, ptr);
-	}
-
-EXPORT_C 
-CWapFullySpecCLPushService* CWapFullySpecCLPushService::NewL(const TUid& aImplementation)
-	/** Allocates and creates a new CWapFullySpecCLPushService object. 
-	*
-	* @param aImplementation
-	* @return					A new CWapFullySpecCLPushService object.
-	* @leave					System wide error codes.
-	*/
-	{
-		TAny* ptr = REComSession::CreateImplementationL(aImplementation,
-								 _FOFF(CWapFullySpecCLPushService, iDtor_ID_Key));
-
-	return	REINTERPRET_CAST(CWapFullySpecCLPushService*, ptr);
-	}
-
-EXPORT_C 
-CWapFullySpecCLPushService::~CWapFullySpecCLPushService()
-	/** Destructor */
-	{
-	REComSession::DestroyedImplementation(iDtor_ID_Key);
-	}
-
-EXPORT_C 
-CWapFullySpecCLPushService::CWapFullySpecCLPushService()
-	{
-	}
-
-EXPORT_C 
-void CWapFullySpecCLPushService::ConstructL()
-	{
-	}
-
-/** Bound WSP
-	New interface and implementation
-*/
-
-EXPORT_C 
-CWapBoundCLWSPService* CWapBoundCLWSPService::NewL()
-	/** Allocates and creates a new CWapBoundCLWSPService object. 
-	*
-	* @return					A new CWapBoundCLWSPService object.
-	* @leave					System wide error codes.
-	*/
-	{
-	// CWapBoundWSPService ECOM Interface UID = 101FBB3B
-	const TUid KUidBoundCLWSPInterface = {0x101FBB3B};
-
-	// Set resolving parameters
-	TEComResolverParams resolverParams;
-	resolverParams.SetDataType(KBoundCLWSPCue);
-	resolverParams.SetWildcardMatch(ETrue);
-
-	// Get the instantiation
-	TAny* ptr = REComSession::CreateImplementationL(KUidBoundCLWSPInterface,
-								 _FOFF(CWapBoundCLWSPService, iDtor_ID_Key),
-								 resolverParams);
-
-	return REINTERPRET_CAST(CWapBoundCLWSPService*, ptr);
-	}
-
-EXPORT_C 
-CWapBoundCLWSPService* CWapBoundCLWSPService::NewL(const TUid& aImplementation)
-	/** Allocates and creates a new CWapBoundCLWSPService object. 
-	*
-	* @param aImplementation
-	* @return					A new CWapBoundCLWSPService object.
-	* @leave					System wide error codes.
-	*/
-	{
-		TAny* ptr = REComSession::CreateImplementationL(aImplementation,
-								 _FOFF(CWapBoundCLWSPService, iDtor_ID_Key));
-
-	return	REINTERPRET_CAST(CWapBoundCLWSPService*, ptr);
-	}
-
-EXPORT_C 
-CWapBoundCLWSPService::~CWapBoundCLWSPService()
-	/** Destructor */
-	{
-	REComSession::DestroyedImplementation(iDtor_ID_Key);
-	}
-
-EXPORT_C 
-CWapBoundCLWSPService::CWapBoundCLWSPService()
-	{
-	}
-
-EXPORT_C 
-void CWapBoundCLWSPService::ConstructL()
-	{
-	}
-
-/** Fully-specified Connection-less WSP
-	New interface and implementation
-*/
-
-EXPORT_C 
-CWapFullySpecCLWSPService* CWapFullySpecCLWSPService::NewL()
-	/** Allocates and creates a new CWapFullySpecCLWSPService object. 
-	*
-	* @return					A new CWapFullySpecCLWSPService object.
-	* @leave					System wide error codes.
-	*/
-	{
-	// CWapFullySpecCLWSPService ECOM Interface UID = 101FBB3D
-	const TUid KUidFullySpecCLWSPInterface = {0x101FBB3D};
-
-	// Set resolving parameters
-	TEComResolverParams resolverParams;
-	resolverParams.SetDataType(KFullSpecCLWSPCue);
-	resolverParams.SetWildcardMatch(ETrue);
-
-	// Get the instantiation
-	TAny* ptr = REComSession::CreateImplementationL(KUidFullySpecCLWSPInterface,
-								 _FOFF(CWapFullySpecCLWSPService, iDtor_ID_Key),
-								 resolverParams);
-
-	return REINTERPRET_CAST(CWapFullySpecCLWSPService*, ptr);
-	}
-
-EXPORT_C 
-CWapFullySpecCLWSPService* CWapFullySpecCLWSPService::NewL(const TUid& aImplementation)
-	/** Allocates and creates a new CWapFullySpecCLWSPService object. 
-	*
-	* @param aImplementation
-	* @return					A new CWapFullySpecCLWSPService object.
-	* @leave					System wide error codes.
-	*/
-	{
-		TAny* ptr = REComSession::CreateImplementationL(aImplementation,
-								 _FOFF(CWapFullySpecCLWSPService, iDtor_ID_Key));
-
-	return	REINTERPRET_CAST(CWapFullySpecCLWSPService*, ptr);
-	}
-
-EXPORT_C 
-CWapFullySpecCLWSPService::~CWapFullySpecCLWSPService()
-	/** Destructor */
-	{
-	REComSession::DestroyedImplementation(iDtor_ID_Key);
-	}
-
-EXPORT_C 
-CWapFullySpecCLWSPService::CWapFullySpecCLWSPService()
-	{
-	}
-
-EXPORT_C 
-void CWapFullySpecCLWSPService::ConstructL()
-	{
-	}
-
-   
-EXPORT_C TInt CWapMessageUtils::GetLocalAddressesL(RArray<Wap::TAddressInfo>& aAddressInfo)
-	/** Gets a list of all the available network interface addresses.
-	*
-	* @param aAddressInfo	On return, an array of the available network interface addresses.
-	* @return				KErrNone if successful, KErrNotFound if there are no addresses available. */
-	{
-	Wap::TAddressInfo addrInfo;
-
-	// Check if the esock ini file has been parsed
-//	User::LeaveIfError(Nifman::CheckIniConfig());
-
-	// The list of interfaces is available from a RSocket.GetOpt
-	TAutoClose<RSocketServ> sockServer;
-	User::LeaveIfError(sockServer.iObj.Connect());
-	sockServer.PushL();
-
-	TAutoClose<RSocket> sock;
-	User::LeaveIfError(sock.iObj.Open(sockServer.iObj, _L("udp")));
-	sock.PushL();
-
-	User::LeaveIfError(sock.iObj.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl));
-
-	TPckgBuf<TSoInetInterfaceInfo> info, next;
-
-	TInt res=sock.iObj.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info);
-	if(res!=KErrNone)
-		User::Leave(res);
-
-	TInt validAddr = KErrNotFound;
-
-	while(res==KErrNone)
-		{
-		res=sock.iObj.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, next);
-
-		// Only consider the address is its up, and is point to point.
-		// (TODO-would it be right to include pending state addresses too????)
-		if ( (info().iState == EIfUp) &&
-			 (info().iFeatures & KIfIsPointToPoint) )
-			{
-			// Just want the interface name
-			// = info().iName;
-			// and the address
-			// = info().iAddress;
-			validAddr = KErrNone;	   
-			
-			addrInfo.iAddress = info().iAddress;
-			addrInfo.iName = info().iName;
-			aAddressInfo.Append(addrInfo);
-			}
-		}
-
-	sock.Pop();
-	sockServer.Pop();
-
-	return validAddr;
-	}

--- a/wapstack/wapmessageapi/client/wapmsgclisource.mmpi	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-/*
-* 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: 
-*
-*/
-// Contains just source of wapmsg, not including file that defines the dll entry point
-
-SOURCE			wapmessage.cpp

--- a/wapstack/wapmessageapi/eabi/wapmsgcliU.DEF	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-EXPORTS
-	_ZN16CWapMessageUtils18GetLocalAddressesLER6RArrayIN3Wap12TAddressInfoEE @ 1 NONAME
-	_ZN21CWapBoundCLWSPService10ConstructLEv @ 2 NONAME
-	_ZN21CWapBoundCLWSPService4NewLERK4TUid @ 3 NONAME
-	_ZN21CWapBoundCLWSPService4NewLEv @ 4 NONAME
-	_ZTV28CWapFullySpecDatagramService @5 NONAME ; #<VT>#
-	_ZN21CWapBoundCLWSPServiceC2Ev @ 6 NONAME
-	_ZN21CWapBoundCLWSPServiceD0Ev @ 7 NONAME
-	_ZN21CWapBoundCLWSPServiceD1Ev @ 8 NONAME
-	_ZN21CWapBoundCLWSPServiceD2Ev @ 9 NONAME
-	_ZN22CWapBoundCLPushService10ConstructLEv @ 10 NONAME
-	_ZN22CWapBoundCLPushService4NewLERK4TUid @ 11 NONAME
-	_ZN22CWapBoundCLPushService4NewLEv @ 12 NONAME
-	_ZTV26CWapFullySpecCLPushService @13 NONAME ; #<VT>#
-	_ZN22CWapBoundCLPushServiceC2Ev @ 14 NONAME
-	_ZN22CWapBoundCLPushServiceD0Ev @ 15 NONAME
-	_ZN22CWapBoundCLPushServiceD1Ev @ 16 NONAME
-	_ZN22CWapBoundCLPushServiceD2Ev @ 17 NONAME
-	_ZN24CWapBoundDatagramService10ConstructLEv @ 18 NONAME
-	_ZN24CWapBoundDatagramService4NewLERK4TUid @ 19 NONAME
-	_ZN24CWapBoundDatagramService4NewLEv @ 20 NONAME
-	_ZTV25CWapFullySpecCLWSPService @21 NONAME ; #<VT>#
-	_ZN24CWapBoundDatagramServiceC2Ev @ 22 NONAME
-	_ZN24CWapBoundDatagramServiceD0Ev @ 23 NONAME
-	_ZN24CWapBoundDatagramServiceD1Ev @ 24 NONAME
-	_ZN24CWapBoundDatagramServiceD2Ev @ 25 NONAME
-	_ZN25CWapFullySpecCLWSPService10ConstructLEv @ 26 NONAME
-	_ZN25CWapFullySpecCLWSPService4NewLERK4TUid @ 27 NONAME
-	_ZN25CWapFullySpecCLWSPService4NewLEv @ 28 NONAME
-	_ZTV24CWapBoundDatagramService @29 NONAME ; #<VT>#
-	_ZN25CWapFullySpecCLWSPServiceC2Ev @ 30 NONAME
-	_ZN25CWapFullySpecCLWSPServiceD0Ev @ 31 NONAME
-	_ZN25CWapFullySpecCLWSPServiceD1Ev @ 32 NONAME
-	_ZN25CWapFullySpecCLWSPServiceD2Ev @ 33 NONAME
-	_ZN26CWapFullySpecCLPushService10ConstructLEv @ 34 NONAME
-	_ZN26CWapFullySpecCLPushService4NewLERK4TUid @ 35 NONAME
-	_ZN26CWapFullySpecCLPushService4NewLEv @ 36 NONAME
-	_ZTV22CWapBoundCLPushService @37 NONAME ; #<VT>#
-	_ZN26CWapFullySpecCLPushServiceC2Ev @ 38 NONAME
-	_ZN26CWapFullySpecCLPushServiceD0Ev @ 39 NONAME
-	_ZN26CWapFullySpecCLPushServiceD1Ev @ 40 NONAME
-	_ZN26CWapFullySpecCLPushServiceD2Ev @ 41 NONAME
-	_ZN28CWapFullySpecDatagramService10ConstructLEv @ 42 NONAME
-	_ZN28CWapFullySpecDatagramService4NewLERK4TUid @ 43 NONAME
-	_ZN28CWapFullySpecDatagramService4NewLEv @ 44 NONAME
-	_ZTV21CWapBoundCLWSPService @45 NONAME ; #<VT>#
-	_ZN28CWapFullySpecDatagramServiceC2Ev @ 46 NONAME
-	_ZN28CWapFullySpecDatagramServiceD0Ev @ 47 NONAME
-	_ZN28CWapFullySpecDatagramServiceD1Ev @ 48 NONAME
-	_ZN28CWapFullySpecDatagramServiceD2Ev @ 49 NONAME
-	_ZTI21CWapBoundCLWSPService @ 50 NONAME ; #<TI>#
-	_ZTI22CWapBoundCLPushService @ 51 NONAME ; #<TI>#
-	_ZTI24CWapBoundDatagramService @ 52 NONAME ; #<TI>#
-	_ZTI25CWapFullySpecCLWSPService @ 53 NONAME ; #<TI>#
-	_ZTI26CWapFullySpecCLPushService @ 54 NONAME ; #<TI>#
-	_ZTI28CWapFullySpecDatagramService @ 55 NONAME ; #<TI>#

--- a/wapstack/wapmessageapi/group/bld.inf	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-/*
-* Copyright (c) 2003-2010 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
-
-@SYMPurpose WAP messaging
-*/
-
-PRJ_EXPORTS
-// specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// If there's no destination then the source file will be copied
-// to the same name in \epoc32\include
-
-../inc/wapmessage.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(wapmessage.h)
-../inc/wapmsgerr.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(wapmsgerr.h)
-
-wapmessage.iby /epoc32/rom/include/wapmessage.iby
-
-// Following file is identical to wapstacksuite_config.ini. The
-// hw one is used by iby file to configure wap-stack to use CdmaWapProt
-hwWapStackConfig.ini  z:/system/data/hwwapstackconfig.ini
-
-PRJ_TESTEXPORTS
-// Shortened WAP stack test IBY
-../te_wapstack/group/WapStackSuite.iby   	/epoc32/rom/include/wapstacksuite.iby
-
-
-// .script and .ini files for the test suite
-../te_wapstack/scripts/Te_WapStackSuite.script	/epoc32/release/wins/udeb/z/testdata/scripts/te_wapstacksuite.script
-../te_wapstack/scripts/Te_WapStackSuite.script	/epoc32/release/wins/urel/z/testdata/scripts/te_wapstacksuite.script
-../te_wapstack/scripts/Te_WapStackSuite.script	/epoc32/release/winscw/udeb/z/testdata/scripts/te_wapstacksuite.script
-../te_wapstack/scripts/Te_WapStackSuite.script	/epoc32/release/winscw/urel/z/testdata/scripts/te_wapstacksuite.script
-../te_wapstack/scripts/WapBoundWDP.script	/epoc32/release/wins/udeb/z/testdata/scripts/wapboundwdp.script
-../te_wapstack/scripts/WapBoundWDP.script	/epoc32/release/wins/urel/z/testdata/scripts/wapboundwdp.script
-../te_wapstack/scripts/WapBoundWDP.script	/epoc32/release/winscw/udeb/z/testdata/scripts/wapboundwdp.script
-../te_wapstack/scripts/WapBoundWDP.script	/epoc32/release/winscw/urel/z/testdata/scripts/wapboundwdp.script
-
-../te_wapstack/scripts/WapBoundPush.script	/epoc32/release/wins/udeb/z/testdata/scripts/wapboundpush.script
-../te_wapstack/scripts/WapBoundPush.script	/epoc32/release/wins/urel/z/testdata/scripts/wapboundpush.script
-../te_wapstack/scripts/WapBoundPush.script	/epoc32/release/winscw/udeb/z/testdata/scripts/wapboundpush.script
-../te_wapstack/scripts/WapBoundPush.script	/epoc32/release/winscw/urel/z/testdata/scripts/wapboundpush.script
-
-../te_wapstack/scripts/WapBoundWSP.script	/epoc32/release/wins/udeb/z/testdata/scripts/wapboundwsp.script
-../te_wapstack/scripts/WapBoundWSP.script	/epoc32/release/wins/urel/z/testdata/scripts/wapboundwsp.script
-../te_wapstack/scripts/WapBoundWSP.script	/epoc32/release/winscw/udeb/z/testdata/scripts/wapboundwsp.script
-../te_wapstack/scripts/WapBoundWSP.script	/epoc32/release/winscw/urel/z/testdata/scripts/wapboundwsp.script
-
-../te_wapstack/scripts/WapFullySpecWDP.script	/epoc32/release/wins/udeb/z/testdata/scripts/wapfullyspecwdp.script
-../te_wapstack/scripts/WapFullySpecWDP.script	/epoc32/release/wins/urel/z/testdata/scripts/wapfullyspecwdp.script
-../te_wapstack/scripts/WapFullySpecWDP.script	/epoc32/release/winscw/udeb/z/testdata/scripts/wapfullyspecwdp.script
-../te_wapstack/scripts/WapFullySpecWDP.script	/epoc32/release/winscw/urel/z/testdata/scripts/wapfullyspecwdp.script
-
-../te_wapstack/scripts/WapFullySpecPush.script	/epoc32/release/wins/udeb/z/testdata/scripts/wapfullyspecpush.script
-../te_wapstack/scripts/WapFullySpecPush.script	/epoc32/release/wins/urel/z/testdata/scripts/wapfullyspecpush.script
-../te_wapstack/scripts/WapFullySpecPush.script	/epoc32/release/winscw/udeb/z/testdata/scripts/wapfullyspecpush.script
-../te_wapstack/scripts/WapFullySpecPush.script	/epoc32/release/winscw/urel/z/testdata/scripts/wapfullyspecpush.script
-
-../te_wapstack/scripts/WapFullySpecWSP.script	/epoc32/release/wins/udeb/z/testdata/scripts/wapfullyspecwsp.script
-../te_wapstack/scripts/WapFullySpecWSP.script	/epoc32/release/wins/urel/z/testdata/scripts/wapfullyspecwsp.script
-../te_wapstack/scripts/WapFullySpecWSP.script	/epoc32/release/winscw/udeb/z/testdata/scripts/wapfullyspecwsp.script
-../te_wapstack/scripts/WapFullySpecWSP.script	/epoc32/release/winscw/urel/z/testdata/scripts/wapfullyspecwsp.script
-
-../te_wapstack/scripts/UDPPush.script		/epoc32/release/wins/udeb/z/testdata/scripts/udppush.script
-../te_wapstack/scripts/UDPPush.script		/epoc32/release/wins/urel/z/testdata/scripts/udppush.script
-../te_wapstack/scripts/UDPPush.script		/epoc32/release/winscw/udeb/z/testdata/scripts/udppush.script
-../te_wapstack/scripts/UDPPush.script		/epoc32/release/winscw/urel/z/testdata/scripts/udppush.script
-
-../te_wapstack/testdata/WapStackSuite.ini	/epoc32/release/wins/udeb/z/testdata/configs/wapstacksuite.ini
-../te_wapstack/testdata/WapStackSuite.ini	/epoc32/release/wins/urel/z/testdata/configs/wapstacksuite.ini
-../te_wapstack/testdata/WapStackSuite.ini	/epoc32/release/winscw/udeb/z/testdata/configs/wapstacksuite.ini
-../te_wapstack/testdata/WapStackSuite.ini	/epoc32/release/winscw/urel/z/testdata/configs/wapstacksuite.ini
-
-../te_wapstack/testdata/UDPPush.ini		/epoc32/release/wins/udeb/z/testdata/configs/udppush.ini
-../te_wapstack/testdata/UDPPush.ini		/epoc32/release/wins/urel/z/testdata/configs/udppush.ini
-../te_wapstack/testdata/UDPPush.ini		/epoc32/release/winscw/udeb/z/testdata/configs/udppush.ini
-../te_wapstack/testdata/UDPPush.ini		/epoc32/release/winscw/urel/z/testdata/configs/udppush.ini
-
-../te_wapstack/testdata/pushpdu.bin		/epoc32/release/wins/udeb/z/testdata/configs/pushpdu.bin
-../te_wapstack/testdata/pushpdu.bin		/epoc32/release/wins/urel/z/testdata/configs/pushpdu.bin
-../te_wapstack/testdata/pushpdu.bin		/epoc32/release/winscw/udeb/z/testdata/configs/pushpdu.bin
-../te_wapstack/testdata/pushpdu.bin		/epoc32/release/winscw/urel/z/testdata/configs/pushpdu.bin
-
-../te_wapstack/testdata/WapStackSuite.xml	/epoc32/release/wins/udeb/z/testdata/configs/wapstacksuite.xml
-../te_wapstack/testdata/WapStackSuite.xml	/epoc32/release/wins/urel/z/testdata/configs/wapstacksuite.xml
-../te_wapstack/testdata/WapStackSuite.xml	/epoc32/release/winscw/udeb/z/testdata/configs/wapstacksuite.xml
-../te_wapstack/testdata/WapStackSuite.xml	/epoc32/release/winscw/urel/z/testdata/configs/wapstacksuite.xml
-
-../te_wapstack/testdata/WapSIMTSY.txt		/epoc32/release/wins/udeb/z/testdata/configs/wapsimtsy.txt
-../te_wapstack/testdata/WapSIMTSY.txt		/epoc32/release/wins/urel/z/testdata/configs/wapsimtsy.txt
-../te_wapstack/testdata/WapSIMTSY.txt		/epoc32/release/winscw/udeb/z/testdata/configs/wapsimtsy.txt
-../te_wapstack/testdata/WapSIMTSY.txt		/epoc32/release/winscw/urel/z/testdata/configs/wapsimtsy.txt
-
-../te_wapstack/testdata/WapStackSuite_Config.ini	/epoc32/release/wins/udeb/z/testdata/configs/wapstacksuite_config.ini
-../te_wapstack/testdata/WapStackSuite_Config.ini	/epoc32/release/wins/urel/z/testdata/configs/wapstacksuite_config.ini
-../te_wapstack/testdata/WapStackSuite_Config.ini	/epoc32/release/winscw/udeb/z/testdata/configs/wapstacksuite_config.ini
-../te_wapstack/testdata/WapStackSuite_Config.ini	/epoc32/release/winscw/urel/z/testdata/configs/wapstacksuite_config.ini
-
-PRJ_MMPFILES
-// Client API implementation
-../group/wapmsgcli.mmp
-// Shortened WAP stack
-../group/swapmsg.mmp
-
-PRJ_TESTMMPFILES
-// Shortened WAP stack tests
-../te_wapstack/group/WapStackSuite.mmp

--- a/wapstack/wapmessageapi/group/hwWapStackConfig.ini	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-RadioBearer= CDMA
\ No newline at end of file

--- a/wapstack/wapmessageapi/group/releasenote.txt	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-TEXT OF RELEASE NOTE  for Wap Messaging API:
-
-Release 4:
-19/12/2001
-Pending  Changelist number: 139990
-
-Releasenote.txt created and backdated using changelist information.
-Fixed defects:
- BEU-55DJG3 "4 test harnesses panic with KWapMsgPanicDescriptor "
- BEU-55DKCJ "Under mem leak testing: ALL the  test harnesses commit an Access Violation"
- BEU-55HNAZ "T_WDPFullySpec has got 3 resources leaked under OOM testing"
- BEU-55HG9S "Bad Handle panic  running T_WDPFullySpec OOM  test "
-
-Release 3:
-10/12/2001
-Changelist number: 137374
-
-Changes made after code review of component.
-
-Placed error codes in Wap namespace, and made more unique.
-Removed non relevant comments.
-Replaced empty _LIT's with KNullDesC8
-Added a panic if non-null pointer is passed in to GetLocalAddress
-
-
-Release 2:
-28/11/2001
-Change list number: 133670
-Second release of Wap Messaging API.
-All functions now implemented, and test code submitted as well.
-
-
-Release 1:
-09/11/2001
-Change list number: 128473
-
-Early release of new Hurricane WAP Messaging API.
-This is being released into the mainline now so clients can start to implement code changes against this incomplete, but frozen API, release.
-
-This is a new replacement API for part of the wapstack, but the existing APIs still remain at present, and so no clients will be effected by this components early release.
-
-The new component has been added to the gt.txt file to be build as part of the mainline.
-
-
-END OF RELEASE NOTE TEXT
-

--- a/wapstack/wapmessageapi/group/swapmsg.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-// Copyright (c) 2003-2010 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:
-// WAP message API ECOM plug-in
-// swswapmsg.dll Supports connectionless WDP, WSP, Push.
-// 
-//
-
-/**
- @file 
-*/
-
-OPTION CW   -w off
-target swswapmsg.dll
-targettype plugin
-
-UID	0x10009D8D 	0x101fbb36
-VENDORID 0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-USERINCLUDE		 ../. ../inc
-USERINCLUDE 	 ../traces
-
-SOURCEPATH ../sws
-
-SOURCE			swswapmsg.cpp 
-#include "../sws/swswapmsgsource.mmpi"
-
-
-start resource 101fbb36.rss
-target swswapmsg.rsc
-end
-
-// Get GDB symbols included?
-SRCDBG
-
-LIBRARY	euser.lib wapmsgcli.lib insock.lib esock.lib efsrv.lib
-
-
-
-CAPABILITY ALL -Tcb
-
-SMPSAFE

--- a/wapstack/wapmessageapi/group/wap-stack_wapmessage.history.xml	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<relnotes name="WAP Message API">
-  <purpose>
-    WAP Push, connectionless WSP, and WDP datagram APIs.
-  </purpose>
-
-  <defect number="PDEF105298" title="Cannot recreate watcher plugin thread if Wap Watcher in ROM and watchers panic" revision="001"></defect>
-  <defect number="PDEF118743" title="No checks for null in CWapMessageApiAgent::~CWapMessageApiAgent()" revision="002"></defect>
-    
-  
-</relnotes>

--- a/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#
-# Copyright (c) 2003-2010 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: 
-#
-
-component	wap-stack_wapmessage
-source	\sf\os\cellularsrv\wapstack\wapmessageapi
-binary	\sf\os\cellularsrv\wapstack\wapmessageapi\group	all
-exports	\sf\os\cellularsrv\wapstack\wapmessageapi\group
-notes_source	\component_defs\release.src
-
-
-ipr E 
-ipr T \sf\os\cellularsrv\wapstack\wapmessageapi\te_wapstack
-

--- a/wapstack/wapmessageapi/group/wapmessage.iby	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* 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: 
-*
-*/
-
-#ifndef __WAPMESSAGE_IBY__
-#define __WAPMESSAGE_IBY__
-
-file=ABI_DIR\DEBUG_DIR\wapmsgcli.dll	System\Libs\wapmsgcli.dll
-ECOM_PLUGIN(swswapmsg.dll,101fbb36.rsc)
-
-    #ifdef CDMA
-    data=ZSYSTEM\Data\hwWapstackConfig.ini System\Data\wapstackconfig.ini
-    #endif
-
-#endif

--- a/wapstack/wapmessageapi/group/wapmessage_test.pkg	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-// Copyright (c) 2007-2010 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:
-//
-
-
-"\sf\os\cellularsrv\wapstack\te_wapstack\testdata\WapStackSuite_Config.ini"-"c:\testdata\configs\WapStackSuite_Config.ini"
-"\sf\os\cellularsrv\wapstack\te_wapstack\testdata\WapStackSuite.ini"-"c:\testdata\configs\WapStackSuite.ini"
-"\sf\os\cellularsrv\wapstack\te_wapstack\scripts\Te_WapStackSuite.script"-"c:\testdata\scripts\Te_WapStackSuite.script"
-
-
-

--- a/wapstack/wapmessageapi/group/wapmsgcli.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2003-2010 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
-
-@SYMPurpose wapmsgcli.dll Wap messaging Ecom plug-in
-*/
-
-OPTION CW   -w off
-TARGET		wapmsgcli.dll
-TARGETTYPE	DLL
-
-UID	0x1000008D 	0x101f447A
-VENDORID 0x70000001
-	
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-USERINCLUDE		 ../. ../inc
-
-SOURCEPATH ../client
-
-#include "../client/wapmsgclisource.mmpi"
-
-// Get GDB symbols included?
-//SRCDBG
-
-LIBRARY	euser.lib ecom.lib esock.lib insock.lib
-
-CAPABILITY ALL -Tcb
-
-SMPSAFE

--- a/wapstack/wapmessageapi/inc/wapmessage.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,900 +0,0 @@
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __WAPMESSAGE_H__
-#define __WAPMESSAGE_H__
-
-
-#include <e32base.h>
-#include <e32std.h>
-#include <in_sock.h>
-
-/** 
-* @file
-*
-* The WAP Messaging API.  
-*
-* Four interfaces are defined that provide bound and fully-specified versions of WDP and Connectionless Push.
-* An instantiation of each may be obtained using the CreateImplementationL() function, and must be released 
-* using Release() when no longer required.  Release() causes the instantiation to be deleted.
-*
-* For error codes returned by methods in this API, see <wapmsgerr.h>.  Most methods can return a set of general 
-* errors, with some returning additional specific errors.
-*
-* @publishedAll
-* @released since v7.0
-*/
-
-/** 
-* Defines WAP-related types and error codes. 
-*/
-namespace Wap
-	{
-	// Bearer type definition
-	typedef enum
-	/** Type definition for an enum defining WAP bearer types. */
-		{
-		/** All bearers. */
-		EAll,
-		/** Internet Protocol. */
-		EIP,
-		/** 7-bit SMS. */
-		ESMS7,
-		/** 8-bit SMS. */
-		ESMS,
-		/** 7-bit SMS. The bearers WAPSMS and WAPSMS7 are intended for WAP browsing where 
-		delivery reports are not required and the validity period is much shorter (5 minutes). */
-		EWAPSMS7,
-		/** 8-bit SMS. */
-		EWAPSMS
-		} TBearer;
-
-	// Port number definition
-	/** A port number. */
-	typedef TUint16 TPort;
- 
-	class TAddressInfo
-	/** Encapsulates an interface name and address. */
-		{
-	public:
-		/** Interface name. */
-		TName iName;
-		/** Interface IP address. */
-		TInetAddr iAddress;
-		};
-	}
-
-
-/**
-* The WSP status type definition.
-* @internalComponent
-*/
-typedef TUint8 TWSPStatus;
-	
-/** Bound WDP */
-class CWapBoundDatagramService : public CBase
-/** 
-* Sends and receives datagrams over WDP using a specified local port.
-*
-* The class is an ECom plug-in interface. Clients use NewL() to request an implementation 
-* of the interface, and then call the interface's virtual functions to access 
-* the implementation's services. 
-*
-* The use of the plug-in architecture allows different implementations to use 
-* different underlying WAP stacks.
-*
-* Functions can return system wide error codes, and also API-specific errors 
-* as defined in wapmsgerr.h. 
-* 
-*/
-	{
-public: // creation/deletion
-	IMPORT_C static CWapBoundDatagramService* NewL();
-	IMPORT_C static CWapBoundDatagramService* NewL(const TUid& aImplementation);
-	IMPORT_C virtual ~CWapBoundDatagramService();
-
-public: // API methods
-
-	/** 
-	* Connects to the WAP stack, opening an endpoint that can be used to listen for 
-	* subsequent incoming datagrams.
-	*
-	* This overload of Connect() allows an IP address associated with a network 
-	* interface to be specified. In multihomed systems, this can be used to specify 
-	* the network interface to which the endpoint should be bound.
-	* 
-	* All CWapBoundDatagramService implementations must automatically close this 
-	* endpoint upon destruction.
-	* 
-	* @param aBearer	The bearer to listen on. Use EAll to specify all bearers.
-	* @param aPort		The port to listen on. If set to 0, a local port will be chosen 
-	* 					for the client's first SendTo()
-	* @param aInetAddr	The IP address of the network interface that should be used 
-	*					in a multihomed system.
-	* @return			KErrNone on successful completion, or one of the system error codes 
-	* 					on failure.
-	*/
-	virtual TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort,TInetAddr aInetAddr)=0;
-
-	/** 
-	* Connects to the WAP stack, opening an endpoint that can be used to listen for 
-	* subsequent incoming datagrams.
-	* 
-	* All CWapBoundDatagramService implementations must automatically close this 
-	* endpoint upon destruction. 
-	* 
-	* @param aBearer	The bearer to listen on. Use EAll to specify all bearers.
-	* @param aPort		The port to listen on. If set to 0, a local port will be chosen 
-	* 					for the client's first SendTo()
-	* @return			KErrNone on successful completion, or one of the system error codes 
-	* 					on failure.
-	*/
-	virtual TInt Connect(Wap::TBearer aBearer,Wap::TPort aPort)=0;
-
-	/** Sends data to a remote endpoint. 
-	* 
-	* @param aRemoteHost	The address of the remote host to which to send the data. 
-	* 						The format of the address is bearer-specific.
-	* @param aRemotePort	The port on the remote host to which the data will be sent
-	* @param aBuffer		The data buffer to be sent
-	* @param aBearer		The bearer to be used, if the bound connection was opened with EAll
-	* @return				KErrNone on successful completion, or one of the system error codes 
-	* 						on failure.
-	*/
-virtual TInt SendTo(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, const TDesC8& aBuffer, Wap::TBearer aBearer)=0;
-
-	/** 
-	* Waits for a datagram to be received, and discovers the size of buffer required 
-	* to retrieve it.
-	* 
-	* This asynchronous method waits for a datagram to be received and will then 
-	* complete allowing the client to discover how large a buffer is needed to retrieve 
-	* the entire datagram that has been received. A later call to RecvFrom() with 
-	* a buffer of sufficient size will then allow the client to retrieve the datagram 
-	* fully. 
-	* 
-	* @param aDataSizePckg	On completion, the size of data received, in bytes
-	* @param aReqStatus		Asynchonrous status word, used to signal when a data size is known
-	* @return				KErrNone on successful completion, or one of the system error codes 
-	* 						on failure.
-	*/
-	virtual TInt AwaitRecvDataSize(TPckg<TUint16>& aDataSizePckg, TRequestStatus& aReqStatus)=0;
-
-	/** 
-	* Receives data on a bound port. 
-	* 
-	* An asynchronous notification is sent to the client when data arrives. 
-	* 
-	* @param aRemoteHost	On completion, the bearer-dependent address of the remote 
-	* 						host from which the data was received
-	* @param aRemotePort	On completion, the port on the remote host from which the 
-	* 						data was received
-	* @param aBuffer		A client-allocated data buffer that on completion is filled 
-	* 						with data received. Data that overflows the buffer is discarded.
-	* @param aTruncated		On completion, indicates whether the received datagram was 
-	* 						truncated to fit in the client's supplied buffer
-	* @param aReqStatus		Asynchronous status word, used to notify the client that 
-	* 						a datagram was received
-	* @param aTimeout		An optional millisecond time-out which allows a timed read 
-	* 						to be made. If no data is received within the timeout period, the request 
-	* 						completes with KErrTimedOut. If a value of 0 is supplied, the timeout is infinite.
-	* @return				KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt RecvFrom(TDes8& aRemoteHost, Wap::TPort& aRemotePort, TDes8& aBuffer, TBool& aTruncated, 
-							TRequestStatus& aReqStatus, TUint32 aTimeout)=0;
- 
-	/** 
-	* Cancels a previously asynchronous RecvFrom() or AwaitRecvDataSize() request. 
-	*
-	* If a datagram arrives at the local host, it will be discarded. 
-	* 
-	*/
-	virtual void CancelRecv()=0;
-
-	/** 
-	* Gets the local port of this endpoint.
-	* 
-	* This is useful if the port was chosen automatically.
-	* 
-	* @param aPort	On return, the port number
-	* @return		KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt GetLocalPort(Wap::TPort& aPort)=0;
-
-	/** 
-	* Gets the local address of this endpoint. 
-	* 
-	* @param aLocalHost	On return, the address of the local host. Clients must pass 
-	* 					in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 
-	* 					buffer to hold the address, and passes ownership of the buffer to the client.
-	* @return			KErrNone on successful completion, or one of the system error codes on failure.
-	*/
-	virtual TInt GetLocalAddress(HBufC8*& aLocalHost)=0;
-
-	/** 
-	* Gets the bearer on which a received datagram arrived. 
-	* 
-	* This is useful when EAll was specified as the bearer in Connect().
-	* 
-	* @param aBearer	On return, the bearer
-	* @return			KErrNone on successful completion, or one of the system error codes on failure.	
-	*/
-	virtual TInt GetBearer(Wap::TBearer& aBearer)=0;
-
-	/** 
-	* Queries the WDP bearer for its maximum datagram size and its nominal datagram size.
-	*
-	* The nominal size is the size within which a datagram won't have to be split 
-	* into smaller individual messages and then re-assembled at the other end. 
-	* 
-	* The function will fail for a stream connection.
-	*
-	* @param aMaxSize		On return, the maximum datagram size
-	* @param aNominalSize	On return, the nominal datagram size
-	* @return				KErrNone on successful completion, or one of the system error codes 
-	*						on failure.
-	*/	
-	virtual TInt GetDatagramSizes(TUint16& aMaxSize, TUint16& aNominalSize)=0;
-	
-protected: // methods
-	IMPORT_C CWapBoundDatagramService();
-	IMPORT_C void ConstructL();
-
-private: // attributes
-	// D'tor Key identification required for ECOM
-	TUid iDtor_ID_Key;
-	};
-
-/** Fully-Specified WDP
-*/
-class CWapFullySpecDatagramService : public CBase
-/** 
-* Sends and receives datagrams over WDP using a specified local port and a single, 
-* named remote host.
-* 
-* The class is an ECom plug-in interface. Clients use NewL() to request an implementation 
-* of the interface, and then call the interface's virtual functions to access 
-* the implementation's services. 
-* 
-* The use of the plug-in architecture allows different implementations to use 
-* different underlying WAP stacks.
-* 
-* Functions can return system wide error codes, and also API-specific errors 
-* as defined in wapmsgerr.h. 
-*/
-	{
-public: // creation/deletion
-	IMPORT_C static CWapFullySpecDatagramService* NewL();
-	IMPORT_C static CWapFullySpecDatagramService* NewL(const TUid& aImplementation);
-	IMPORT_C virtual ~CWapFullySpecDatagramService();
-
-public: // API methods
-
-	// Connect to the wapstack, opening an endpoint which is to be used only with a single, named remote host.
-	/** 
-	* Connects to the WAP stack, opening an endpoint that can be used to listen for 
-	* subsequent incoming datagrams.
-	*	
-	* This overload of Connect() allows an IP address associated with a network 
-	* interface to be specified. In multihomed systems, this can be used to specify 
-	* the network interface to which the endpoint should be bound.
-	* 
-	* All CWapFullySpecDatagramService implementations must automatically close 
-	* this endpoint upon destruction.
-	* 
-	* @param aRemoteHost	The bearer-dependent address of the remote host with which 
-	* 						the data will be exchanged
-	* @param aRemotePort	The port on the remote host to which data will be sent
-	* @param aBearer		The bearer to use. EAll cannot be used.
-	* @param aInetAddr		The IP address of the network interface that should be used 
-	* 						in a multihomed system.
-	* @return				KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TInetAddr aInetAddr)=0;
-
-	// Connect to the wapstack, opening an endpoint which is to be used only with a single, named remote host.
-	/** 
-	* Connects to the WAP stack, opening an endpoint that can be used to listen for 
-	* subsequent incoming datagrams.
-	* 
-	* All CWapFullySpecDatagramService implementations must automatically close 
-	* this endpoint upon destruction.
-	* 
-	* @param aRemoteHost	The bearer-dependent address of the remote host with which 
-	* 						the data will be exchanged
-	* @param aRemotePort	The port on the remote host to which data will be sent
-	* @param aBearer		The bearer to use. EAll cannot be used.
-	* @return 				KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer)=0;
-
-	/** 
-	* Sends data on a fully-specified connection.
-	* 
-	* @param aBuffer	The data buffer to be written over the connection
-	* @return			KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt Send(const TDesC8& aBuffer)=0;
-
-	/** 
-	* Waits for a datagram to be received, and discover how large a buffer is required 
-	* to retrieve it.
-	* 
-	* This asynchronous request waits for a datagram to be received and will then 
-	* complete allowing the client to discover how large a buffer is needed to retrieve 
-	* the entire datagram that has been received. A later call to Recv() with a 
-	* buffer of sufficent size will then allow the client to retrieve the datagram 
-	* fully. 
-	* 
-	* @param aDataSizePckg	On completion, the size of data received, in bytes
-	* @param aReqStatus		Asynchonrous status word, used to signal when a data size is known
-	* @return				KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt AwaitRecvDataSize(TPckg<TUint16>& aDataSizePckg, TRequestStatus& aReqStatus)=0;
-
-	/** 
-	* Receives data on a bound port. 
-	* 
-	* An asynchronous notification is sent to the client when data arrives. 
-	* 
-	* @param aBuffer	A client-allocated data buffer that, on completion, is filled 
-	* 					with data received. Data that overflows the buffer is discarded.
-	* @param aTruncated	On completion, indicates whether the received datagram was 
-	* 					truncated to fit in the client's supplied buffer
-	* @param aReqStatus	Asynchronous status word, used to notify the client that 
-	* 					a datagram was received
-	* @param aTimeout	An optional millisecond time-out which allows a timed read 
-	* 					to be made. If no data is received within the timeout period, the request 
-	* 					completes with KErrTimedOut. If a value of 0 is supplied, the timeout is infinite.
-	* @return			KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt Recv(TDes8& aBuffer, TBool& aTruncated, TRequestStatus& aReqStatus, TUint32 aTimeout)=0;
-
-	/** 
-	* Cancels a previously asynchronous Recv() or AwaitRecvDataSize() request. 
-	* 
-	* If a datagram arrives at the local host, it will be discarded. 
-	* 
-	*/
-	virtual void CancelRecv()=0;
-
-	/** 
-	* Gets the local port of this endpoint.
-	* 
-	* This is useful if the port was chosen automatically.
-	* 
-	* @param aPort	On return, the port number
-	* @return		KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt GetLocalPort(Wap::TPort& aPort)=0;
-
-	/** 
-	* Gets the local address of this endpoint. 
-	* 
-	* @param aLocalHost	On return, the address of the local host. Clients must pass 
-	* 					in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 
-	* 					buffer to hold the address, and passes ownership of the buffer to the client.
-	* @return			KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt GetLocalAddress(HBufC8*& aLocalHost)=0;
-
-	/** 
-	* Queries the WDP bearer for its maximum datagram size and its nominal datagram size.
-	* 
-	* The nominal size is the size within which a datagram won't have to be split 
-	* into smaller individual messages and then re-assembled at the other end. 
-	* 
-	* @param aMaxSize		On return, the maximum datagram size
-	* @param aNominalSize	On return, the nominal datagram size
-	* @return				KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt GetDatagramSizes(TUint16& aMaxSize, TUint16& aNominalSize)=0;
-	
-protected: // methods
-	IMPORT_C CWapFullySpecDatagramService();
-	IMPORT_C void ConstructL();
-
-private: // ECOM
-	// D'tor Key identification required for ECOM
-	TUid iDtor_ID_Key;
-	};
-
-/** Bound Connectionless Push
-*/
-class CWapBoundCLPushService : public CBase
-/** 
-* Listens for WAP Push messages from any sender.
-* 
-* The class is an ECom plug-in interface. Clients use NewL() to request an implementation 
-* of the interface, and then call the interface's virtual functions to access 
-* the implementation's services. 
-* 
-* The use of the plug-in architecture allows different implementations to use 
-* different underlying WAP stacks.
-* 
-* Functions can return system wide error codes, and also API-specific errors 
-* as defined in wapmsgerr.h. 
-* 
-*/
-{
-public: // creation/deletion
-	IMPORT_C static CWapBoundCLPushService* NewL();
-	IMPORT_C static CWapBoundCLPushService* NewL(const TUid& aImplementation);
-	IMPORT_C virtual ~CWapBoundCLPushService();
-
-public: // API methods
-
-	
-	// Opens a socket which is to be used to listen for subsequent incoming Push messages from any sender;
-	// i.e. it has only been 'bound' to the local address	 
-	/** 
-	* Connects to the WAP stack, opening an endpoint that can be used to listen for 
-	* Push messages from any sender.
-	* 
-	* This overload of Connect() allows an IP address associated with a network 
-	* interface to be specified. In multihomed systems, this can be used to specify 
-	* the network interface to which the endpoint should be bound.
-	* 
-	* All CWapBoundCLPushService implementations must automatically close this endpoint 
-	* upon destruction.
-	* 
-	* @param aBearer	The bearer to listen on. Use EAll to specify all bearers.
-	* @param aPort		The port to listen on. If set to 0, a local port will be chosen 
-	* 					for the client's first SendTo()
-	* @param aSecure	Security flag to indicate whether WTLS should be used or not
-	* @param aInetAddr	The address of the adapter to use
-	* @return			KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure, TInetAddr aInetAddr)=0;
-
-	
-	// Opens a socket which is to be used to listen for subsequent incoming Push messages from any sender;
-	// i.e. it has only been 'bound' to the local address
-	/** 
-	* Connects to the WAP stack, opening an endpoint that can be used to listen for 
-	* Push messages from any sender.
-	* 
-	* All CWapBoundCLPushService implementations must automatically close this endpoint 
-	* upon destruction.
-	* 
-	* @param aBearer	The bearer to listen on. Use EAll to specify all bearers.
-	* @param aPort		The port to listen on. If set to 0, a local port will be chosen 
-	* 					for the client's first SendTo()
-	* @param aSecure	Security flag to indicate whether WTLS should be used or not
-	* @return			KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure)=0;
-
-	/** 
-	* Requests an asynchronous notification upon arrival of the next push message 
-	* on the listening connection.
-	* 
-	* The request completes upon receipt of the message, filling the buffers with 
-	* as much received data as possible. A return code indicates whether further 
-	* data remains. The call must be re-issued for subsequent messages or to receive 
-	* remaining data from a previous push message.
-	* 
-	* @param aPushHeaders	A client-allocated buffer that, on completion, is filled 
-	* 						with the push message's header data
-	* @param aPushBody		A client-allocated buffer that, on completion, is filled with 
-	* 						the push message's body data
-	* @param aPushIdPckg	On completion, an integer ID that uniquely specifies the 
-	* 						push message
-	* @param aReqStatus		Asynchonrous status word, used by the service provider to 
-	* 						notify the client when a push message has arrived. 
-	*						EMoreData is returned if more pushed data is available.
-	* @return				KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt AwaitPush(TDes8& aPushHeaders, TDes8& aPushBody, TPckgBuf<TUint8>& aPushIdPckg, TRequestStatus& aReqStatus)=0;
-
-	/** 
-	* Cancels a previous push message request.
-	* 
-	* If a push message arrives, the client will not be notified. 
-	*
-	*/
-	virtual void CancelAwaitPush()=0;
-
-	/** 
-	* Gets the local port of this endpoint.
-	* 
-	* This is useful if the port was chosen automatically. 
-	* 
-	* @param aPort	On return, the port number
-	* @return		KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt GetLocalPort(Wap::TPort& aPort)=0;
-
-	/** 
-	* Gets the local address of this endpoint. 
-	* 
-	* @param aLocalHost	On return, the address of the local host. Clients must pass 
-	* 					in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 
-	* 					buffer to hold the address, and passes ownership of the buffer to the client.
-	* @return			KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt GetLocalAddress(HBufC8*& aLocalHost)=0;
-
-	/** 
-	* Gets the bearer on which a received datagram arrived. 
-	* 
-	* This is useful when EAll was specified as the bearer in Connect().
-	* 
-	* @param aBearer	On return, the bearer
-	* @return			KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt GetBearer(Wap::TBearer& aBearer)=0;
-
-	/**
-	 * Gets the address of the remote server.
-	 *
-	 * This function cannot be called when there is an outstanding AwaitPush().
-	 *
-	 * @param aRemoteHost	On return, the address of the remote host. Clients must pass 
-	 * 						in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 
-	 * 						buffer to hold the address, and passes ownership of the buffer to the client.
-	 * @return				KErrNone on successful completion, KErrNotSupported if not implemented,
-	 * 						or one of the system error codes on failure.
-	 */
-	virtual TInt GetServerAddress(HBufC8*& aRemoteHost)=0;
-	
-protected: // methods
-	IMPORT_C CWapBoundCLPushService();
-	IMPORT_C void ConstructL();
-
-private: // ECOM
-	// D'tor Key identification required for ECOM
-	TUid iDtor_ID_Key;
-};
-
-/** Fully-Specified Connectionless Push
-*/
-class CWapFullySpecCLPushService : public CBase
-/** 
-* Listens for WAP Push messages from a single, named remote host.
-* 
-* The class is an ECom plug-in interface. Clients use NewL() to request an implementation 
-* of the interface, and then call the interface's virtual functions to access 
-* the implementation's services. 
-* 
-* The use of the plug-in architecture allows different implementations to use 
-* different underlying WAP stacks.
-* 
-* Functions can return system wide error codes, and also API-specific errors 
-* as defined in wapmsgerr.h. 
-*/
-{
-public: // creation/deletion
-	IMPORT_C static CWapFullySpecCLPushService* NewL();
-	IMPORT_C static CWapFullySpecCLPushService* NewL(const TUid& aImplementation);
-	IMPORT_C virtual ~CWapFullySpecCLPushService();
-
-public: // API methods
-
- 	// Opens a socket which is to be used only with a single, named remote host.
-	/** 
-	* Connects to the WAP stack, opening an endpoint that can be used to listen for 
-	* Push messages from a specified remote host.
-	* 
-	* This overload of Connect() allows an IP address associated with a network 
-	* interface to be specified. In multihomed systems, this can be used to specify 
-	* the network interface to which the endpoint should be bound.
-	* 
-	* All CWapFullySpecCLPushService implementations must automatically close this 
-	* endpoint upon destruction.
-	* 
-	* @param aRemoteHost	The bearer-dependent address of the remote host with which 
-	* 						the data will be exchanged
-	* @param aRemotePort	The port on the remote host to which data will be sent
-	* @param aBearer		The bearer to listen on. You cannot use EAll.
-	* @param aSecure		Security flag to indicate whether WTLS should be used or not
-	* @param aInetAddr		The address of the adapter to use
-	* @return				KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure, TInetAddr aInetAddr)=0;
-
-	// Opens a socket which is to be used only with a single, named remote host.
-	/** 
-	* Connects to the WAP stack, opening an endpoint that can be used to listen for 
-	* Push messages from a specified remote host.
-	* 
-	* All CWapFullySpecCLPushService implementations must automatically close this 
-	* endpoint upon destruction.
-	* 
-	* @param aRemoteHost	The bearer-dependent address of the remote host with which 
-	* 						the data will be exchanged
-	* @param aRemotePort	The port on the remote host to which data will be sent
-	* @param aBearer		The bearer to listen on. You cannot use EAll.
-	* @param aSecure		Security flag to indicate whether WTLS should be used or not
-	* @return				KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure)=0;
-
-	/** 
-	* Requests an asynchronous notification upon arrival of the next push message 
-	* on the listening connection.
-	* 
-	* The request completes upon receipt of the message, filling the buffers with 
-	* as much received data as possible. A return code indicates whether further 
-	* data remains. The call must be re-issued for subsequent messages or to receive 
-	* remaining data from a previous push message.
-	* 
-	* @param aPushHeaders	A client-allocated buffer that, on completion, is filled 
-	* 						with the push message's header data
-	* @param aPushBody		A client-allocated buffer that, on completion, is filled with 
-	* 						the push message's body data
-	* @param aPushIdPckg	On completion, an integer ID that uniquely specifies the 
-	* 						push message
-	* @param aReqStatus		Asynchronous status word, used by the service provider to 
-	* 						notify the client when a push message has arrived.  
-	* 						EMoreData is returned if more pushed data is available.
-	* @return				KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt AwaitPush(TDes8& aPushHeaders, TDes8& aPushBody, TPckgBuf<TUint8>& aPushIdPckg, TRequestStatus& aReqStatus)=0;
-
-	/** 
-	* Cancels a previous push message request.
-	* 
-	* If a push message arrives, the client will not be notified. 
-	*
-	*/
-	virtual void CancelAwaitPush()=0;
-
-
-	/** 
-	* Gets the local port of this endpoint.
-	* 
-	* This is useful if the port was chosen automatically. 
-	* 
-	* @param aPort	On return, the port number
-	* @return		KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt GetLocalPort(Wap::TPort& aPort)=0;	// // (out) the port number
-
-
-	/** 
-	* Gets the local address of this endpoint. 
-	* 
-	* @param aLocalHost	On return, the address of the local host. Clients must pass 
-	* 					in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 
-	* 					buffer to hold the address, and passes ownership of the buffer to the client.
-	* @return			KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt GetLocalAddress(HBufC8*& aLocalHost)=0;	// // (out) the address of the local host
-
-protected: // methods
-	IMPORT_C CWapFullySpecCLPushService();
-	IMPORT_C void ConstructL();
-
-private: // ECOM
-	// D'tor Key identification required for ECOM
-	TUid iDtor_ID_Key;
-};
-
-/** Bound Connectionless WSP
-*  @released since v8.0
-*/
-class CWapBoundCLWSPService : public CBase
-{
-public: // creation/deletion
-	IMPORT_C static CWapBoundCLWSPService* NewL();
-	IMPORT_C static CWapBoundCLWSPService* NewL(const TUid& aImplementation);
-	IMPORT_C virtual ~CWapBoundCLWSPService();
-
-public: // API methods
-
-	/** 
-	 * Connects to the WAP stack, opening an endpoint that can be used for S-Unit-MethodInvoke and 
-	 * S-Unit-MethodResult primitives.
-	 *
-	 * @param aBearer	The bearer to listen on (use EAll for all bearers)
-	 * @param aPort		The port to listen on. If set to 0, a local port will be chosen for the 
-	 *					client's first MethodInvoke()
-	 * @return			KErrNone on successful completion, or one of the system error codes on failure.
-	 */
-	virtual TInt Connect(Wap::TBearer aBearer,Wap::TPort aPort, TBool aSecure)=0;
-
-	/**
-	 * Sends a request to a remote endpoint.
-	 *
-	 * @param aBearer			The bearer to be used, if the bound connection was opened with EAll
-	 * @param aRemoteHost		The address of the remote host to which to send the request. 
-	 * 							The format of the address is bearer-specific.
-	 * @param aRemotePort		The port on the remote host to which the request will be sent
-	 * @param aMethod
-	 * @param aURI
-	 * @param aReqHeaders
-	 * @param aReqBody
-	 * @param aTransactionId
-	 * @return					KErrNone on successful completion, or one of the system error codes on failure.
-	 */ 
-	virtual TInt MethodInvoke(Wap::TBearer aBearer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort, TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, const TUint8 aTransactionId)=0;
-
-	/**
-	 * Waits for a datagram to be received.
-	 *
-	 * @param aReqHeaders
-	 * @param aReqBody
-	 * @param aTransactionIdPckg
-	 * @param aWspStatus
-	 * @param aReqStatus			Asynchonrous status word, used to signal when a data size is known
-	 * @param aTimeout
-	 * @return 						KErrNone on successful completion, or one of the system error codes on failure.
-	 */
-	virtual TInt MethodResult(TDes8& aReqHeaders, TDes8& aReqBody, TPckgBuf<TUint8>& aTransactionIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout)=0;
-
-	/**
-	 * Cancels a previously requested asynchronous MethodResult() notification.
-	 * 
-	 * If a datagram arrives at the local host, it will be discarded.
-	 * 
-	 */	
-	virtual void CancelReq()=0;
-
-
-	/** 
-	 * Gets the local port of this endpoint.
-	 *
-	 * This is useful if the port was chosen automatically.
- 	 * 
- 	 * @param aPort	On return, the port number
-	 * @return		KErrNone on successful completion, or one of the system error codes on failure.
-	 */
-	virtual TInt GetLocalPort(Wap::TPort& aPort)=0;	// // (out) the port number
-
-	/**
-	 * Gets the local address of this endpoint.
-	 * 
-	 * @param aLocalHost	On return, the address of the local host. Clients must pass 
-	 * 						in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 
-	 * 						buffer to hold the address, and passes ownership of the buffer to the client.
-	 * @return				KErrNone on successful completion, or one of the system error codes on failure.
-	 */
-	virtual TInt GetLocalAddress(HBufC8*& aLocalHost)=0;	// // (out) the address of the local host
-
-	/**
-	 * Gets the bearer on which a received datagram arrived.
-	 *
-	 * Useful when EAll was specified in Connect()
-	 *
-	 * @param aBearer	On return, the bearer
-	 * @return			KErrNone on successful completion, or one of the system error codes on failure.
-	 */
-	virtual TInt GetBearer(Wap::TBearer& /*aBearer*/)=0;
-	
-	/**
-	 * Gets the remote server address.
-	 * 
-	 * @param aServerAddress	On return, the address of the remote server. Clients must pass 
-	 * 							in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 
-	 * 							buffer to hold the address, and passes ownership of the buffer to the client.
-	 * @return					KErrNone on successful completion, or one of the system error codes on failure.
-	 */
-	virtual TInt GetServerAddress(HBufC8*& aServerAddress)=0;	// // (out) the address of the remote server
-	
-protected: // methods
-	IMPORT_C CWapBoundCLWSPService();
-	IMPORT_C void ConstructL();
-
-private: // ECOM
-	// D'tor Key identification required for ECOM
-	TUid iDtor_ID_Key;
-};
-
-/** 
-* Fully-Specified Connectionless WSP
-*  @released since v8.0
-*/
-class CWapFullySpecCLWSPService : public CBase
-{
-public: // creation/deletion
-	IMPORT_C static CWapFullySpecCLWSPService* NewL();
-	IMPORT_C static CWapFullySpecCLWSPService* NewL(const TUid& aImplementation);
-	IMPORT_C virtual ~CWapFullySpecCLWSPService();
-
-public: // API methods
-
-	// Opens a socket which is to be used only with a single, named remote host.
-	/** 
-	* Connects to the WAP stack, opening an endpoint that can be used to listen for 
-	* Push messages from a specified remote host.
-	* 
-	* All CWapFullySpecCLWSPService implementations must automatically close this 
-	* endpoint upon destruction.
-	* 
-	* @param aRemoteHost	The bearer-dependent address of the remote host with which 
-	*						the data will be exchanged
-	* @param aRemotePort	The port on the remote host to which data will be sent
-	* @param aBearer		The bearer to listen on. You cannot use EAll.
-	* @param aSecure		Security flag to indicate whether WTLS should be used or not
-	* @return				KErrNone on successful completion, or one of the system error codes on failure. 
-	*/
-	virtual TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure)=0;
-
-	/**
-	 * Sends a request to a remote endpoint.
-	 * 
-	 * @param aMethod
-	 * @param aURI
-	 * @param aReqHeaders
-	 * @param aReqBody
-	 * @param aTransactionId
-	 * @return					KErrNone on successful completion, or one of the system error codes on failure.
-	 */ 
-	virtual TInt MethodInvoke(TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, TUint8 aTransactionId)=0;
-
-	/**
-	 * Waits for a datagram to be received
-	 * 
-	 * @param aReqHeaders
-	 * @param aReqBody
-	 * @param aTransactionIdPckg
-	 * @param aWspStatus
-	 * @param aReqStatus			Asynchonrous status word, used to signal when a data size is known
-	 * @param aTimeout
-	 * @return						KErrNone on successful completion, or one of the system error codes on failure.
-	 */
-	virtual TInt MethodResult(TDes8& aReqHeaders, TDes8& aReqBody, TPckgBuf<TUint8>& aTransactionIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout)=0;
-
-
-	/**
-	 * Cancels a previously-requested MethodResult() notification. 
-	 *
-	 * If a message arrives the client will not be notified.
-	 * 
-	 */ 
-	virtual void CancelReq()=0;
-
-	/** 
-	 * Gets the local port of this endpoint.
-	 *
-	 * This is useful if the port was chosen automatically.
- 	 * 
- 	 * @param aPort	On return, the port number
-	 * @return		KErrNone on successful completion, or one of the system error codes on failure.
-	 */
-	virtual TInt GetLocalPort(Wap::TPort& aPort)=0;	// // (out) the port number
-
-	/**
-	 * Gets the local address of this endpoint.
-	 *
-	 * @param aLocalHost	On return, the address of the local host. Clients must pass 
-	 * 						in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 
-	 * 						buffer to hold the address, and passes ownership of the buffer to the client.
-	 * @return				KErrNone on successful completion, or one of the system error codes on failure.
-	 */
-	virtual TInt GetLocalAddress(HBufC8*& aLocalHost)=0;	// // (out) the address of the local host
-	
-protected: // methods
-	IMPORT_C CWapFullySpecCLWSPService();
-	IMPORT_C void ConstructL();
-
-private: // ECOM
-	// D'tor Key identification required for ECOM
-	TUid iDtor_ID_Key;
-};
-
-
-// Utility class for client/implementation use.
-class CWapMessageUtils : public CBase
-/** Utility functions for use with WAP Messaging. */
-	{
-public:
-	// // Return a list of all the addresses that are available
-	IMPORT_C static TInt GetLocalAddressesL(RArray<Wap::TAddressInfo>& aAddressInfo); 
-	};
-
-	
-#endif // __WAPMESSAGE_H__

--- a/wapstack/wapmessageapi/inc/wapmsgerr.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,249 +0,0 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __WAPMSGERR_H__
-#define __WAPMSGERR_H__
-
-#include <e32base.h>
-
-namespace Wap
-/** 
-* Defines WAP-related types and error codes. 
-*/
-	{
-	_LIT(KWapMsgPanicDescriptor, "WAPMESSAGE");
-
-/** Defines start values for categories of WAP-related error codes. */
-enum 
-	{
-	/** Base value for all error codes. */
-	ERetCodeBase      = -5500,
-	/** Base value for connection-orientated WSP error codes. */
-	EWSPCORetCodeBase = ERetCodeBase + 25,
-	/** Base value for connectionless WSP error codes. */
-	EWSPCLRetCodeBase = ERetCodeBase + 50,
-	/** Base value for WTP error codes. */
-	EWTPRetCodeBase   = ERetCodeBase + 75,
-	/** Base value for WDP error codes. */
-	EWDPRetCodeBase   = ERetCodeBase + 100,
-	/** Base value for WTLS error codes. */
-	EWTLSRetCodeBase  = ERetCodeBase + 125,
-	/** Maximum value for WAP-related error codes. */
-	ERetCodeTop       = ERetCodeBase + 200
-	};
-	
-/** General WAP error codes. */
-enum TGeneralReturnCodes
-	{  
-	/** There is more data to be read. */
-	EMoreData           = ERetCodeBase + 0,
-	/** One of: no bearer set; unknown bearer; a connection exists with different bearer; 
-	* unable to get a local host name from bearer. */
-	EBearerError        = ERetCodeBase + 1,
-	/** The port is already used in another bound connection. */
-	EPortAlreadyBound   = ERetCodeBase + 2,
-	/** Local port cannot be opened. */
-	ECannotOpenPort     = ERetCodeBase + 3,
-	/** There are too many existing connections. */
-	ETooManyConnections = ERetCodeBase + 4,
-	/** Connection handle is invalid. */
-	EBadConnection      = ERetCodeBase + 5,
-	/** Passed buffer is too small. */
-	EBufferTooSmall     = ERetCodeBase + 6
-	};
-
-/** WTLS-related error codes. */
-enum TWtlsReturnCodes
-	{
-	/** Out of memory. */
-	EWtlsOutOfMemory            = EWTLSRetCodeBase + 0,
-	/** Socket error. */
-	EWtlsSocketError            = EWTLSRetCodeBase + 1,
-	/** Invalid parameter used. */
-	EWtlsBadParameters          = EWTLSRetCodeBase + 2,
-	/** Socket error. */
-	EWtlsSocketError2           = EWTLSRetCodeBase + 3,
-	/** Resume ID not found. */
-	EWtlsResumeIDNotFound       = EWTLSRetCodeBase + 4,
-	/** Resume error. */
-	EWtlsResumeError            = EWTLSRetCodeBase + 5,
-	/** Renegotiation request error. */
-	EWtlsRenegotiationRequest   = EWTLSRetCodeBase + 6,
-	/** Illegal call. */
-	EWtlsIllegalCall            = EWTLSRetCodeBase + 7,
-	/** Connection close notify error. */
-	EWtlsConnectionCloseNotify  = EWTLSRetCodeBase + 8,
-	/** Close notify error. */
-	EWtlsSessionCloseNotify     = EWTLSRetCodeBase + 9,
-	/** No connection. */
-	EWtlsNoConnection           = EWTLSRetCodeBase + 10,
-	/** Unexpected message. */
-	EWtlsUnexpectedMessage      = EWTLSRetCodeBase + 11,
-	/** Bad MAC record. */
-	EWtlsBadRecordMac           = EWTLSRetCodeBase + 12,
-	/** Decryption failed. */
-	EWtlsDecryptionFailed       = EWTLSRetCodeBase + 13,
-	/** Record overflow. */
-	EWtlsRecordOverflow         = EWTLSRetCodeBase + 14,
-	/** Handshake failure. */
-	EWtlsHandshakeFailure       = EWTLSRetCodeBase + 15,
-	/** Decompression failure. */
-	EWtlsDecompressionFailure   = EWTLSRetCodeBase + 16,
-	/** Bad certificate. */
-	EWtlsBadCertificate         = EWTLSRetCodeBase + 17,
-	/** Unsupported certificate. */
-	EWtlsUnsupportedCertificate = EWTLSRetCodeBase + 18,
-	/** Certificate revoked. */
-	EWtlsCertificateRevoked     = EWTLSRetCodeBase + 19,
-	/** Certificate expired. */
-	EWtlsCertificateExpired     = EWTLSRetCodeBase + 20,
-	/** Certificate unknown. */
-	EWtlsCertificateUnknown     = EWTLSRetCodeBase + 21,
-	/** Illegal parameter. */
-	EWtlsIllegalParameter       = EWTLSRetCodeBase + 22,
-	/** Unknown certificate authority. */
-	EWtlsUnknownCA              = EWTLSRetCodeBase + 23,
-	/** Access denied. */
-	EWtlsAccessDenied           = EWTLSRetCodeBase + 24,
-	/** Decoding error. */
-	EWtlsDecodeError            = EWTLSRetCodeBase + 25,
-	/** Decryption error. */
-	EWtlsDecryptError           = EWTLSRetCodeBase + 26,
-	/** Unknown key ID. */
-	EWtlsUnknownKeyId           = EWTLSRetCodeBase + 27,
-	/** Disabled key ID. */
-	EWtlsDisableKeyId           = EWTLSRetCodeBase + 28,
-	/** Key exchange disabled. */
-	EWtlsKeyExchangeDisabled    = EWTLSRetCodeBase + 29,
-	/** Session not ready. */
-	EWtlsSessionNotReady        = EWTLSRetCodeBase + 30,
-	/** Unknown parameter index. */
-	EWtlsUnknownParameterIndex  = EWTLSRetCodeBase + 31,
-	/** Duplicate finished Recv() call. */
-	EWtlsDuplicateFinishedRecv  = EWTLSRetCodeBase + 32,
-	/** Export restriction error. */
-	EWtlsExportRestriction      = EWTLSRetCodeBase + 33,
-	/** Protocol version error. */
-	EWtlsProtocolVersion        = EWTLSRetCodeBase + 34,
-	/** Insufficient security. */
-	EWtlsInsufficientSecurity   = EWTLSRetCodeBase + 35,
-	/** Internal error. */
-	EWtlsInternalError          = EWTLSRetCodeBase + 36,
-	/** User cancelled operation. */
-	EWtlsUserCanceled           = EWTLSRetCodeBase + 37,
-	/** No renegotiation. */
-	EWtlsNoRenegotiation        = EWTLSRetCodeBase + 38,
-
-	/** General error. */
-	EWtlsErrGeneral             = EWTLSRetCodeBase + 39,
-	/** Bulk algorithm error. */
-	EWtlsErrBulk                = EWTLSRetCodeBase + 40,
-	/** MAC algorithm error. */
-	EWtlsErrMac                 = EWTLSRetCodeBase + 41,
-	/** Sequence number mode error. */
-	EWtlsErrSequenceNumberMode  = EWTLSRetCodeBase + 42,
-	/** Key refresh rate error. */
-	EWtlsErrKeyRefreshRate      = EWTLSRetCodeBase + 43,
-
-	};
-
-/** Connection-orientated WSP error codes. */
-enum TWspCoReturnCodes
-	{
-	/** Given buffer is too small. */
-	EWspCoBufferTooSmall      = EWSPCORetCodeBase + 0,
-	/** Session handle is not valid. */
-	EWspCoInvalidSession      = EWSPCORetCodeBase + 1,
-	/** Invalid transaction. */
-	EWspCoInvalidTransaction  = EWSPCORetCodeBase + 2,
-	/** Given parameter is invalid. */
-	EWspCoParameterError      = EWSPCORetCodeBase + 3,
-	/** Session is not connected. */
-	EWspCoSessionNotConnected = EWSPCORetCodeBase + 4,
-	/** Functionality is not supported in this session. */
-	EWspCoNotSupported        = EWSPCORetCodeBase + 5,
-	/** Function is not applicable in this state of an object. */
-	EWspCoInvalidState        = EWSPCORetCodeBase + 6,
-	/** Session has been closed. */
-	EWspCoSessionClosed       = EWSPCORetCodeBase + 7,
-	/** Server MRU exceeded. */
-	EWspCoMRUExceeded         = EWSPCORetCodeBase + 8,
-	/** Invalid buffer size. */
-	EWspCoInvalidBufferSize   = EWSPCORetCodeBase + 9,
-	/** Data not available. */
-	EWspCoDataNotAvailable    = EWSPCORetCodeBase + 10,
-	/** Timeout error. */
-	EWspCoErrorTimeout        = EWSPCORetCodeBase + 11
-	};
-	
-
-/** Connectionless WSP error codes. */
-enum TWspClReturnCodes
-	{			
-	/** Given buffer is too small. */
-	EWspClBufferTooSmall      = EWSPCLRetCodeBase + 0,
-	/** Session handle is not valid. */
-	EWspClInvalidSession      = EWSPCLRetCodeBase + 1,
-	/** Given parameter is invalid. */
-	EWspClParameterError      = EWSPCLRetCodeBase + 2,
-	/** Session is not connected. */
-	EWspClSessionNotConnected = EWSPCLRetCodeBase + 3,
-	/** Functionality is not supported in this session. */
-	EWspClNotSupported        = EWSPCLRetCodeBase + 4,
-	/** Function is not applicable in this state of an object. */
-	EWspClInvalidState        = EWSPCLRetCodeBase + 5,
-	/** Session has been closed. */
-	EWspClSessionClosed       = EWSPCLRetCodeBase + 6,
-	/** Server MRU exceeded. */
-	EWspClMRUExceeded		 = EWSPCLRetCodeBase + 7,	
-	/** Invalid buffer size. */
-	EWspClInvalidBufferSize   = EWSPCLRetCodeBase + 8,
-	/** Data not available. */
-	EWspClDataNotAvailable    = EWSPCLRetCodeBase + 9,
-	/** Timeout error. */
-	EWspClErrorTimeout        = EWSPCLRetCodeBase + 10
-	};
-
-/** WTP-related error codes. */
-enum TWtpReturnCodes
-	{
-	/** Out of memory. */
-	EWtpNoMemory                 = EWTPRetCodeBase + 0,
-	/** Invalid argument. */
-	EWtpBadArgument              = EWTPRetCodeBase + 1,
-	/** Provider aborted. */
-	EWtpProviderProtoErr         = EWTPRetCodeBase + 2,
-	/** Provider aborted. */
-	EWtpProviderAbortInvalidTID  = EWTPRetCodeBase + 3,
-	/** Provider aborted. */
-	EWtpProviderAbortNoClass2    = EWTPRetCodeBase + 4,
-	/** Provider aborted. */
-	EWtpProviderAbortNoSAR       = EWTPRetCodeBase + 5,
-	/** Provider aborted. */
-	EWtpProviderAbortNoUACK      = EWTPRetCodeBase + 6,
-	/** Provider aborted. */
-	EWtpProviderAbortVers1       = EWTPRetCodeBase + 7,
-	/** Provider aborted. */
-	EWtpProviderAbortNoResponse  = EWTPRetCodeBase + 8,
-	/** Provider aborted. */
-	EWtpProviderAbortMsgTooLarge = EWTPRetCodeBase + 9,
-	/** Provider aborted. */
-	EWtpProviderAbortGeneral     = EWTPRetCodeBase + 10,
-	/** Service has shutdown. */
-	EWtpShutdownError            = EWTPRetCodeBase + 11
-	};
-}
-
-#endif // __WAPMSGERR_H__

--- a/wapstack/wapmessageapi/sws/101fbb36.rss	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-// 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:
-// Registry file for WAP Messaging API, 8.0 WAP Stack bindings DLL
-// Interfaces : MWapBoundDatagramService, MWapFullySpecDatagramService,
-// MWapBoundCLPushService, MWapFullySpecCLPushService,
-// MWapBoundCLWSPService, MWapFullySpecCLWSPService,
-// 
-//
-
-#include <ecom/registryinfo.rh>
-
-RESOURCE REGISTRY_INFO theInfo
-	{
-	// KUidWapMsg
-	dll_uid = 0x101FBB36;
-	interfaces = 
-		{
-		INTERFACE_INFO
-			{
-			// KUidBoundWDPInterface - MWapBoundDatagramService UID
-			interface_uid = 0x101F4471;
-			implementations = 
-				{
-				IMPLEMENTATION_INFO
-					{
-					// KUidSWSBoundWDPService - CSWSWapBoundWDPService UID
-					implementation_uid = 0x101FBB37;
-					version_no = 1;
-					display_name = "CSSWapBoundWDPService";
-					default_data = "swswdp/bound";
-					opaque_data = "";
-					}
-				};
-			},
-		INTERFACE_INFO
-			{
-			// KUidFullySpecWDPInterface - MWapFullySpecDatagramService UID
-			interface_uid = 0x101F4473;
-			implementations = 
-				{
-				IMPLEMENTATION_INFO
-					{
-					// KUidSWSFullySpecWDPService - CSWSWapFullySpecWDPService UID
-					implementation_uid = 0x101FBB38;
-					version_no = 1;
-					display_name = "CSWSWapFullySpecWDPService";
-					default_data = "swswdp/fullyspec";
-					opaque_data = "";
-					}
-				};
-			},
-		INTERFACE_INFO
-			{
-			// KUidBoundCLPushInterface - MWapBoundCLPushService UID
-			interface_uid = 0x101F4475;
-			implementations = 
-				{
-				IMPLEMENTATION_INFO
-					{
-					// KUidSWSBoundCLPushService - CSWSWapBoundCLPushService UID
-					implementation_uid = 0x101FBB39;
-					version_no = 1;
-					display_name = "CSWSWapBoundCLPushService";
-					default_data = "swsclpush/bound";
-					opaque_data = "";
-					}
-				};
-			},
-		INTERFACE_INFO
-			{
-			// KUidFullySpecCLPushInterface - MWapFullySpecCLPushService UID
-			interface_uid = 0x101F4477;
-			implementations = 
-				{
-				IMPLEMENTATION_INFO
-					{
-					// KUidSWSFullySpecCLPushService - CSWSWapFullySpecCLPushService UID
-					implementation_uid = 0x101FBB3A;
-					version_no = 1;
-					display_name = "CSWSWapFullySpecCLPushService";
-					default_data = "swsclpush/fullyspec";
-					opaque_data = "";
-					}
-				};
-			},
-		INTERFACE_INFO
-			{
-			// KUidBoundCLWSPInterface - MWapBoundCLWSPService UID
-			interface_uid = 0x101FBB3B;
-			implementations = 
-				{
-				IMPLEMENTATION_INFO
-					{
-					// KUidSWSBoundCLWSPService - CSWSWapBoundCLService UID
-					implementation_uid = 0x101FBB3C;
-					version_no = 1;
-					display_name = "CSWSWapBoundCLWSPService";
-					default_data = "swsclwsp/bound";
-					opaque_data = "";
-					}
-				};
-			},
-		INTERFACE_INFO
-			{
-			// KUidFullySpecCLWSPInterface - MWapFullySpecCLWSPService UID
-			interface_uid = 0x101FBB3D;
-			implementations = 
-				{
-				IMPLEMENTATION_INFO
-					{
-					// KUidSWSFullySpecCLWSPService - CSWSWapFullySpecCLWSPService UID
-					implementation_uid = 0x101FBB3E;
-					version_no = 1;
-					display_name = "CSWSWapFullySpecCLWSPService";
-					default_data = "swsclwsp/fullyspec";
-					opaque_data = "";
-					}
-				};
-			}
-		};
-	}
-

--- a/wapstack/wapmessageapi/sws/ActiveSocket.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1129 +0,0 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ActiveSocketTraces.h"
-#endif
-
-#include "ActiveSocket.h"
-#include <es_wsms.h>
-#include "CLWSPPduHandler.h"
-#include "wapmsgerr.h"
-#include <wap_sock.h>
-#include "WapMessageApiAgent.h"
-#include "WapMsgUtils.h"
-
-using namespace Wap;
-
-void CActiveSocket::NewL(RSocketServ& aSocketServ, RPointerArray<CActiveSocket>& aActiveSockets, Wap::TBearer aBearer, TWapMessageType aType, MProgressNotify* aNotify, Wap::TPort aLocalPort, RConnection* aConnection)
-/**
-The static new function instanciates corresponding Bearers in terms of the input bearer type.
-This function is used by Bound Wap APIs which listen the incoming packet to a specific port. 
-@internalComponent
-@released
-@since v8.0
-@param aSocketServ the shared RSocketServ instance used in the Wap messaging API which owns this bearer
-@param aActiveSockets the bearer array used in the Wap messaging API which owns the bearer
-@param aBearer  the bearer to listen on (use EAll for all bearers)
-@param aType  the type of the wap message that will received
-@param aNotify  the instance to be notified when a wap message is received
-@param aLocalPort  the port to listen on
-@param aConnection the shared connection from Wap messaging API client
-*/
-	{
-	//Instanciate the corresponding
-	switch(aBearer)
-		{
-		case Wap::ESMS7:
-		case Wap::ESMS:
-		case Wap::EWAPSMS7:
-		case Wap::EWAPSMS:
-			{
-			CActiveSocket* me = new(ELeave) CActiveSocketSMS(aSocketServ, aNotify, aBearer, aLocalPort);
-			CleanupStack::PushL(me);
-			me->ConstructL(aType);
-			aActiveSockets.AppendL(me);
-			CleanupStack::Pop(me);
-			break;
-			}
-		case Wap::EIP:
-			{
-			CActiveSocket* me = new(ELeave) CActiveSocketUDP(aSocketServ, aNotify, aBearer, aLocalPort, aConnection);
-			CleanupStack::PushL(me);
-			me->ConstructL(aType);
-			aActiveSockets.AppendL(me);
-			CleanupStack::Pop(me);
-			break;
-			}
-		case Wap::EAll:
-			{
-			CActiveSocket* me = new(ELeave) CActiveSocketUDP(aSocketServ, aNotify, Wap::EIP, aLocalPort, aConnection);
-			CleanupStack::PushL(me);
-			me->ConstructL(aType);          
-			CActiveSocket* me1 = new(ELeave) CActiveSocketSMS(aSocketServ, aNotify, Wap::ESMS, aLocalPort);
-			CleanupStack::PushL(me1);
-			me1->ConstructL(aType);
-			aActiveSockets.ReserveL(2); // pre-allocate the memory                                           
-			aActiveSockets.AppendL(me1);
-			CleanupStack::Pop(me1);
-			aActiveSockets.AppendL(me);
-			CleanupStack::Pop(me);
-			break;
-			}
-		default:
-		    {
-            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKET_NEWL_1, "CActiveSocket::NewL Unknown Bearer Type");
-			User::Leave(Wap::EBearerError);
-		    }
-		}
-	}
-
-void CActiveSocket::NewL(RSocketServ& aSocketServ, RPointerArray<CActiveSocket>& aActiveSockets, Wap::TBearer aBearer, TWapMessageType aType, MProgressNotify* aNotify, const TSockAddr& aRemoteAddr, RConnection* aConnection)
-/**
-The static new function instanciates corresponding Bearers in terms of the input bearer type.
-This function is used by Fully specified Wap APIs which will open a socket with a single, named remote host. 
-@internalComponent
-@released
-@since v8.0
-@param aSocketServ the shared RSocketServ instance used in the Wap messaging API which owns this bearer
-@param aActiveSockets the bearer array used in the Wap messaging API which owns the bearer
-@param aBearer the bearer to listen on (use EAll for all bearers)
-@param aType the type of the wap message that will received
-@param aNotify the instance to be notified when a wap message is received
-@param aRemoteAddr the remote host to be communicate with
-@param aConnection the shared connection from Wap messaging API client
-*/
-	{
-	//Instanciate the corresponding
-	switch(aBearer)
-		{
-		case Wap::ESMS7:
-		case Wap::ESMS:
-		case Wap::EWAPSMS7:
-		case Wap::EWAPSMS:
-			{
-			CActiveSocket* me = new(ELeave) CActiveSocketSMS(aSocketServ, aNotify, aBearer, aRemoteAddr);
-			CleanupStack::PushL(me);
-			me->ConstructL(aType);
-            aActiveSockets.AppendL(me);
-			CleanupStack::Pop(me);
-			break;
-			}
-		case Wap::EIP:
-			{
-			CActiveSocket* me = new(ELeave) CActiveSocketUDP(aSocketServ, aNotify, aBearer, aRemoteAddr, aConnection);
-			CleanupStack::PushL(me);
-			me->ConstructL(aType);
-            aActiveSockets.AppendL(me);
-			CleanupStack::Pop(me);
-			break;
-			}
-		case Wap::EAll:
-			{
-			CActiveSocket* me = new(ELeave) CActiveSocketUDP(aSocketServ, aNotify, aBearer, aRemoteAddr, aConnection);
-			CleanupStack::PushL(me);
-			me->ConstructL(aType);
-			CActiveSocket* me1 = new(ELeave) CActiveSocketSMS(aSocketServ, aNotify, aBearer, aRemoteAddr);
-			CleanupStack::PushL(me1);
-			me1->ConstructL(aType);
-            aActiveSockets.ReserveL(2); // pre-allocate the memory    
-			aActiveSockets.AppendL(me1);
-            CleanupStack::Pop(me1);
-            aActiveSockets.AppendL(me);
-            CleanupStack::Pop(me);
-			break;
-			}
-		default:
-		    {
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKET_NEWL_1_1, "CActiveSocket::NewL Unknown Bearer Type");
-			User::Leave(Wap::EBearerError);
-		    }
-		}
-	}
-
-CActiveSocket::CActiveSocket(RSocketServ& aSocketServ, Wap::TBearer aBearerType, MProgressNotify* aNotify, Wap::TPort aLocalPort)
-:CActive(EPriorityStandard), iLocalAddr(0), iSocketServ(aSocketServ), iBearerType(aBearerType), iLocalPort(aLocalPort), iSocketState(ESocketIdle),iNotify(aNotify), iBuf(0,0), iRxlength(0), iBufCon(0,0)
-/**
-Constructor of bearer base class for Bound Wap APIs
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	CActiveScheduler::Add(this);
-	}
-
-CActiveSocket::CActiveSocket(RSocketServ& aSocketServ, Wap::TBearer aBearerType, MProgressNotify* aNotify, const TSockAddr& aRemoteAddr, Wap::TPort aLocalPort): CActive(EPriorityStandard), 
-iRemoteAddr(aRemoteAddr), iLocalAddr(0), iSocketServ(aSocketServ), iBearerType(aBearerType), iLocalPort(aLocalPort), iSocketState(ESocketIdle), iNotify(aNotify), iBuf(0,0), iRxlength(0), iBufCon(0,0)
-/**
-Constructor of bearer base class for fully specified Wap APIs
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	CActiveScheduler::Add(this);
-	}
-
-CActiveSocket::~CActiveSocket()
-/**
-Destructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	Cancel();
-	iSocket.Close();
-	if (iMessageRecord) 
-		{
-		delete iMessageRecord;
-		}
-	}
-
-void CActiveSocket::ConstructL(TWapMessageType aType)
-/**
-Second Phase Constructor
-@internalComponent
-@released
-@param aType the type of Wap message which is received. 
-@since v8.0
-*/
-	{
-	iMessageRecord=CWapMessageRecord::NewL(aType);
-	}
-
-RSocket& CActiveSocket::Socket()
-/**
-To get the RSocket instance ownd by this bearer
-@internalComponent
-@released
-@since v8.0
-@returns the reference of the RSocket instance.
-*/
-	{
-	return iSocket;
-	}
-
-Wap::TBearer CActiveSocket::GetBearerType()
-/**
-To get the bearer type of this bearer
-@internalComponent
-@released
-@since v8.0
-@returns the bearer type
-*/
-	{
-	return iBearerType;
-	}
-
-TSockAddr& CActiveSocket::GetLocalAddress()
-/**
-To get the local address of this bearer
-@internalComponent
-@released
-@since v8.0
-@returns the lcoal address instance
-*/
-	{
-	iSocket.LocalName(iLocalAddr);
-	return iLocalAddr;
-	}
-
-TSockAddr& CActiveSocket::GetRemoteAddress()
-/**
-To get the remote address of the last received packet
-@internalComponent
-@released
-@since v8.0
-@returns the remote address instance
-*/
-	{
-	return iRemoteAddr;
-	}
-
-TInt CActiveSocket::GetRemoteAddress(HBufC8*& aAddr)
-/**
-To get the remote address of the last received packet
-@internalComponent
-@released
-@since v8.0
-@param aAddr the remote host name
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TRAPD(err, aAddr=iRemoteAddr.AllocL())
-	if (err==KErrNone)
-		{
-		Wap::TPort port;
-		TPtr8 des=aAddr->Des();
-		TRAP(err, CSWSWapMsgUtils::AnalyseAddrL(iRemoteAddr, iBearerType, des, port))
-		}
-	else
-		{
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKET_GETREMOTEADDRESS_1, "CActiveSocket::GetRemoteAddress: Alloc Memory Err=%d", err);
-		}
-	return err;
-	}
-
-TInt CActiveSocket::GetLocalPort(Wap::TPort& aLocalPort)
-/**
-To get the lcoal port of this bearer
-@internalComponent
-@released
-@since v8.0
-@param aLocalPort the local port of this bearer
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	GetLocalAddress();
-	aLocalPort=Wap::TPort(iLocalAddr.Port());
-	return KErrNone;
-	}
-
-TUint32 CActiveSocket::GetPduSize()
-/**
-To get the received Wdp Pdu length
-@internalComponent
-@released
-@since v8.0
-@returns the length of the received Wdp pdu.
-*/
-	{
-	return iMessageRecord->GetPduSize();
-	}
-
-TWapMessageState CActiveSocket::GetDataState()
-/**
-To get the state of the data that is being received
-@internalComponent
-@released
-@since v8.0
-@returns the state of the data that is being received
-*/
-	{
-	return iMessageRecord->GetDataState();
-	}
-
-void CActiveSocket::SetDataState(TWapMessageState aState)
-/**
-To set the state of the data that is being received
-@internalComponent
-@released
-@since v8.0
-@param aState the state of the data that is being received
-*/
-	{
-	iMessageRecord->SetDataState(aState);
-	}
-
-TInt CActiveSocket::GetPduData(TDes8& aBuffer, TBool& aTruncated)
-/**
-To get the received Wdp pdu.
-@internalComponent
-@released
-@since v8.0
-@param aBuffer the buffer to read the received WDP pdu
-@param aTruncated the flag to represent if the data has be truncated or not
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iMessageRecord->GetPduData(aBuffer, aTruncated);
-	}
-
-TInt CActiveSocket::GetWspData(TDes8& aWspHeader, TDes8& aWspBody, TUint8& aTransactionId, TWSPStatus& aStatus)
-/**
-To get the received Wsp header, body, tranaction ID and Wsp status.
-@internalComponent
-@released
-@since v8.0
-@param aWspHeader the buffer to read the received Wsp header
-@param aWspBody the buffer to read the received Wsp body
-@param aTransactionId the transaction ID of the received Wsp Message
-@param aStatus the Wsp status of  the received Wsp Message
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iMessageRecord->GetWspData(aWspHeader, aWspBody, aTransactionId, aStatus);
-	}
-void CActiveSocket::UnpackPduToWspDataL()
-/**
-To extract the Wsp header, body, transaction ID and status from the received WDP pdu
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	iMessageRecord->UnpackPduToWspDataL();
-	}
-
-void CActiveSocket::CleanUpData()
-	{
-	TPtr8 zero(0,0);
-	iBuf.Set(zero);
-	iBufCon.Set(zero);
-	iMessageRecord->CleanUpData();
-	}
-
-/** SMS active socket
-*/
-CActiveSocketSMS::CActiveSocketSMS(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, Wap::TPort aLocalPort)
-:CActiveSocket(aSocketServ, aBearer, aNotify, aLocalPort)
-/**
-Constructor of SMS bearer for Bound Wap APIs
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-
-CActiveSocketSMS::CActiveSocketSMS(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, const TSockAddr& aRemoteAddr)
-:CActiveSocket(aSocketServ, aBearer, aNotify, aRemoteAddr, (Wap::TPort)EWapPortUnspecified)
-/**
-Constructor of SMS bearer for fully specified Wap APIs
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-
-CActiveSocketSMS::~CActiveSocketSMS() 
-/**
-Destructor of SMS bearer for fully specified Wap APIs
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-
-void CActiveSocketSMS::ConstructL(TWapMessageType aType)
-/**
-Second Phase Constructor
-@internalComponent
-@released
-@param aType the type of Wap message which is received.
-@since v8.0
-*/
-	{
-	CActiveSocket::ConstructL(aType);
-	User::LeaveIfError(iSocket.Open(iSocketServ, KWAPSMSAddrFamily, KSockDatagram, KWAPSMSDatagramProtocol));
-	User::LeaveIfError(iSocket.SetOpt(KWapSmsOptionNewStyleClient,KWapSmsOptionLevel, 0));
-	TWapAddr wapAddr;
-	wapAddr.SetWapPort(TWapPortNumber(iLocalPort));
-	TInt err=iSocket.Bind(wapAddr);
-	if (err==KErrInUse)
-		{
-		User::Leave(Wap::EPortAlreadyBound);
-		}
-	}
-
-TInt CActiveSocketSMS::AwaitRecvDataSize()
-/**
-Read the received Wdp pdu length.
-@internalComponent
-@released
-@since v8.0
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TPckgBuf<TUint32>* length=iMessageRecord->GetPduSizeRef();
-	iSocket.Ioctl(KSOGetLength, iStatus, length, KSolWapProv);
-	iMessageRecord->SetDataState(ERequestingLength);
-	iSocketState=ESocketWaitingForLength;
-	SetActive();
-	return KErrNone;
-	}
-
-TInt CActiveSocketSMS::Receive()
-/**
-Read the received Wdp pdu.
-@internalComponent
-@released
-@since v8.0
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TInt err=KErrNone;
-	TRAP(err, iMessageRecord->CreatePduBufferL(EFalse))
-	if (err!=KErrNone)
-		{
-		return err;
-		}
-	HBufC8*& pdu=iMessageRecord->GetPduPtr();
-	iBuf.Set(pdu->Des());
-	iSocket.RecvFrom(iBuf, iRemoteAddr, 0, iStatus);
-	iMessageRecord->SetDataState(ERequestingData);
-	iSocketState=ESocketWaitingForData;
-	SetActive();
-	return KErrNone;
-	}
-
-void CActiveSocketSMS::RunL() 
-/**
-Overload the CActive virtual methods
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	switch (iSocketState)
-		{
-	case ESocketWaitingForLength:
-			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETSMS_RUNL_1, "CActiveSocketSMS::RunL() ESocketWaitingForLength");
-			iMessageRecord->SetDataState(EPendingLength);
-			iSocketState=ESocketIdle;
-			TWapNotificationInfo info(iBearerType, iStatus.Int());
-			TWapNotificationInfoBuf infoBuf(info);
-			iNotify->Notification(EPduLengthReceived, infoBuf);
-			break;
-			}
-	case ESocketWaitingForData:
-			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETSMS_RUNL_2, "CActiveSocketSMS::RunL() ESocketWaitingForData");
-			iMessageRecord->SetDataState(EPendingData);
-			iSocketState=ESocketIdle;
-			TWapNotificationInfo info(iBearerType, iStatus.Int());
-			TWapNotificationInfoBuf infoBuf(info);
-			iNotify->Notification(EPduReceived, infoBuf);
-			iSocket.SetOpt(KWapSmsOptionOKToDeleteMessage,KWapSmsOptionLevel, 0);
-			break;
-			}
-	default:
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETSMS_RUNL_3, "CActiveSocketSMS::RunL() Unknown State");
-		}
-	}
-void CActiveSocketSMS::DoCancel() 
-/**
-Overload the CActive virtual methods
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	switch (iSocketState)
-		{
-	case ESocketWaitingForLength:
-			{
-			iSocket.CancelIoctl();
-			break;
-			}
-	case ESocketWaitingForData:
-			{
-			iSocket.CancelRecv();
-			break;
-			}
-	default:
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETSMS_DOCANCEL_1, "CActiveSocketSMS::DoCancel() Unknown State");	
-		}
-	}
-
-//
-// UDP active socket
-//
-CActiveSocketUDP::CActiveSocketUDP(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, Wap::TPort aLocalPort, RConnection* aConnection)
-:CActiveSocket(aSocketServ, aBearer, aNotify, aLocalPort),iConnection(aConnection)
-/**
-Constructor for Bound Wap APIs
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-	
-CActiveSocketUDP::CActiveSocketUDP(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, const TSockAddr& aRemoteAddr, RConnection* aConnection)
-:CActiveSocket(aSocketServ, aBearer, aNotify, aRemoteAddr,0), iConnection(aConnection)
-/**
-Constructor for FullySpec Wap APIs
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-
-void CActiveSocketUDP::ConstructL(TWapMessageType aType)
-/**
-Second Phase constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	CActiveSocket::ConstructL(aType);
-	if (!iConnection)
-		{
-		User::LeaveIfError(iSocket.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp));
-		}
-	else
-		{
-		User::LeaveIfError(iSocket.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp, *iConnection));
-		}
-	TInetAddr inetAddr(iLocalPort);
-	TInt err=iSocket.Bind(inetAddr);
-	if (err==KErrInUse)
-		{
-		User::Leave(Wap::EPortAlreadyBound);
-		}
-	}
-
-CActiveSocketUDP::~CActiveSocketUDP() 
-/**
-Destructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-
-TInt CActiveSocketUDP::AwaitRecvDataSize()
-/**
-Wait for Pdu data size
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	iRxlength=0;
-	TRAPD(err, iMessageRecord->CreatePduBufferL(ETrue))
-	if (err!=KErrNone)
-		{
-		return err;
-		}
-	HBufC8*& pdu=iMessageRecord->GetPduPtr();
-	iBuf.Set(pdu->Des());
-	iSocket.RecvFrom(iBuf, iRemoteAddr, 0, iStatus, iRxlength);
-	iMessageRecord->SetDataState(ERequestingLength);
-	iSocketState=ESocketWaitingForLength;
-	SetActive();
-	return KErrNone;	
-	}
-
-TInt CActiveSocketUDP::Receive()
-/**
-Receive the pdu
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	if(iMessageRecord->GetDataState()==EContinuous)
-		{
-		TRAPD(err, iMessageRecord->CreatePduBufferL(ETrue))
-		if (err!=KErrNone)
-			{
-			return err;
-			}
-		HBufC8*& pdu=iMessageRecord->GetPduPtr();
-		iBuf.Set(pdu->Des());
-		iBuf.SetLength(iBuf.Length()+1);
-		iBufCon.Set(&iBuf[iBuf.Length()-1],0,iBuf.MaxLength()-iBuf.Length());
-		iBuf.SetLength(iBuf.Length()+iRxlength()-1);
-		iSocket.RecvFrom(iBufCon, iRemoteAddr, KSockReadContinuation, iStatus,iRxlength);
-		iMessageRecord->SetDataState(ERequestingData);
-		iSocketState=ESocketWaitingForData;
-		SetActive();	
-		}
-	else
-		{
-		iMessageRecord->SetDataState(ERequestingData);
-		iSocketState=ESocketWaitingForData;
-		iStatus = KRequestPending;
-		SetActive();
-		TRequestStatus* reqStatus=&iStatus;
-		User::RequestComplete(reqStatus, KErrNone);
-		}
-	return KErrNone;
-	}
-
-void CActiveSocketUDP::RunL()
-/**
-RunL()
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	switch (iSocketState)
-		{
-	case ESocketWaitingForLength:
-			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETUDP_RUNL_1, "CActiveSocketUDP::RunL() ESocketWaitingForLength");        
-			iMessageRecord->SetPduSize(iBuf.Length()+ iRxlength());
-			if(iRxlength() > 0)
-				{
-				iMessageRecord->SetDataState(EContinuous);
-				}
-			else 
-				{
-				iMessageRecord->SetDataState(EPendingLength);
-				}
-			iSocketState=ESocketIdle;
-			TWapNotificationInfo info(iBearerType, iStatus.Int());
-			TWapNotificationInfoBuf infoBuf(info);
-			iNotify->Notification(EPduLengthReceived, infoBuf);
-			break;
-			}
-	case ESocketWaitingForData:
-			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETUDP_RUNL_2, "CActiveSocketUDP::RunL() ESocketWaitingForData");
-			iMessageRecord->SetDataState(EPendingData);
-			iSocketState=ESocketIdle;
-			TWapNotificationInfo info(iBearerType, iStatus.Int());
-			TWapNotificationInfoBuf infoBuf(info);
-			iNotify->Notification(EPduReceived, infoBuf);
-			break;
-			}
-	default:
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETUDP_RUNL_3, "CActiveSocketUDP::RunL() Unknown State");
-		break;
-		}
-	}
-
-void CActiveSocketUDP::DoCancel()
-/**
-Cancel the outstanding request on UDP bearer
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	switch (iSocketState)
-		{
-	case ESocketWaitingForLength:
-			{
-			iSocket.CancelRecv();
-			break;
-			}
-	case ESocketWaitingForData:
-			{
-			break;
-			}
-	default:
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CACTIVESOCKETUDP_DOCANCEL_1, "CActiveSocketUDP::DoCancel() Unknown State");	
-		}
-	}
-
-//
-//CWapMessageRecord
-//
-CWapMessageRecord* CWapMessageRecord::NewL(TWapMessageType aType)
-/**
-The static funtion to instanciate the Pdu data record
-@internalComponent
-@released
-@since v8.0
-@param aType the type of Wap message which is received.
-@returns the data record instance.
-*/
-	{
-	CWapMessageRecord* me;
-	if (aType==EWapWsp)
-		{
-		me = new(ELeave) CWspMessageRecord();
-		}
-	else
-		{
-		me = new(ELeave) CWdpMessageRecord();
-		}
-	return me;
-	}
-
-CWapMessageRecord::CWapMessageRecord()
-/**
-Constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-
-CWapMessageRecord::~CWapMessageRecord()
-/**
-Destructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	if (iPdu)
-		{
-		delete iPdu;
-		}
-	}
-
-TWapMessageState CWapMessageRecord::GetDataState()
-/**
-To get the state of the data that is being received
-@internalComponent
-@released
-@since v8.0
-returns the state of the data that is being received
-*/
-	{
-	return iState;
-	}
-
-void CWapMessageRecord::SetDataState(TWapMessageState aState)
-/**
-To set the state of the data that is being received
-@internalComponent
-@released
-@since v8.0
-@param the state of the data that is being received
-*/
-	{
-	iState=aState;
-	}
-
-TPckgBuf<TUint32>* CWapMessageRecord::GetPduSizeRef()
-/**
-To get the buffer which is used to contain the received data length
-@internalComponent
-@released
-@since v8.0
-@returns the pointer to the buffer length
-*/
-	{
-	return &iDataLength;
-	}
-
-void CWapMessageRecord::SetPduSize(TUint32 aLength)
-	{
-	iDataLength=aLength;
-	}
-
-TUint32 CWapMessageRecord::GetPduSize()
-/**
-To get the received wdp pdu length
-@internalComponent
-@released
-@since v8.0
-@returns the received wdp pdu length
-*/
-	{
-	iState=EGotLength;
-	return iDataLength();
-	}
-
-HBufC8*& CWapMessageRecord::GetPduPtr()
-/**
-To get the received wdp pdu.
-@internalComponent
-@released
-@since v8.0
-@returns the pointer the received wdp buffer
-*/
-	{
-	return iPdu;
-	}
-
-void CWapMessageRecord::CreatePduBufferL(TBool aFixLengthFlag)
-/**
-create the wdp pdu buffer according to the length
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	if (iState==EContinuous)
-		{
-		iPdu = iPdu->ReAllocL(iDataLength());
-		}
-	else if (!aFixLengthFlag)
-		{
-		iPdu=HBufC8::NewL(iDataLength());
-		}
-	else
-		{
-		iPdu=HBufC8::NewL(KMaxUdpBearerDataBufferLength);
-		}
-	}
-
-void CWapMessageRecord::CleanUpData()
-/**
-clean up the receive buffer.
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	if (iPdu)
-		{
-		delete iPdu;
-		iPdu=NULL;
-		}
-	iDataLength.FillZ();
-	iState=EIdle;
-	}
-
-//
-//CWspMessageRecord methods
-//
-CWspMessageRecord::CWspMessageRecord()
-/**
-Constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-
-CWspMessageRecord::~CWspMessageRecord()
-/**
-Destructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	if (iWspHeader)
-		{
-		delete iWspHeader;
-		}
-	if (iWspBody)
-		{
-		delete iWspBody;
-		}
-	}
-
-void CWspMessageRecord::UnpackPduToWspDataL()
-/**
-To unpack the received wdp pdu to wsp message.
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	TWSPPduType type;
-	CCLWSPPduHandler::UnpackWSPPduL(iPdu, type, iWspHeader, iWspBody, iTransactionId, iWspStatus);
-	}
-
-TInt CWspMessageRecord::GetWspData(TDes8& aWspHeader, TDes8& aWspBody, TUint8& aTransactionId, TWSPStatus& aWspStatus)
-/**
-To read the wsp message from the buffer
-@internalComponent
-@released
-@since v8.0
-@param aWspHeader the buffer to contain the wsp header
-@param aWspBody the buffer to contain the wsp body
-@param iTransactionId the received transaction ID
-@param aWspStatus the received wsp status
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if (!iWspHeader && !iWspBody)
-		{
-		// if no data, should not be here at all
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGERECORD_GETWSPDATA_1, "CWspMessageRecord::GetWspData() No Data Available");
-		CleanUpData();
-		return KErrBadDescriptor;
-		}
-	TInt ret=KErrNone;
-	//Copy the transaction ID
-	aTransactionId=iTransactionId;
-	aWspStatus=iWspStatus;
-	//Copy the header
-	TInt bufferLength;
-	if (iWspHeader)
-		{
-		bufferLength=aWspHeader.MaxLength();
-		TPtrC8 remainHeader=iWspHeader->Mid(iHeaderOffset);
-		//Client Header buffer is not long enough
-		if (bufferLength<remainHeader.Length())
-			{
-			aWspHeader.Copy(remainHeader.Ptr(), bufferLength);
-			iHeaderOffset+=bufferLength;
-			iState=EReading;
-			ret=Wap::EMoreData;
-			}
-		else
-			{
-			aWspHeader.Copy(remainHeader);
-			iHeaderOffset=0;
-			delete iWspHeader;
-			iWspHeader=NULL;
-			}
-		}
-	if (iWspBody)
-		{
-		//Copy the Body
-		bufferLength=aWspBody.MaxLength();
-		TPtrC8 remainBody=iWspBody->Mid(iBodyOffset);
-
-		//Client Header buffer is not long enough
-		if (bufferLength<remainBody.Length())
-			{
-			aWspBody.Copy(remainBody.Ptr(), bufferLength);
-			iBodyOffset+=bufferLength;
-			iState=EReading;
-			ret=Wap::EMoreData;
-			}
-		else
-			{
-			aWspBody.Copy(remainBody);
-			iBodyOffset=0;
-			delete iWspBody;
-			iWspBody=NULL;
-			}
-		}
-	//All Wsp Data has been read.
-	if (ret==KErrNone)
-		{
-		delete iPdu;
-		iPdu=NULL;
-		iDataLength.FillZ();
-		iState=EIdle;
-		}
-	return ret;
-	}
-
-TInt CWspMessageRecord::GetPduData(TDes8& /*aBuffer*/, TBool& /*aTruncated*/)
-/**
-Not supported
-@internalComponent
-@released
-@since v8.0
-*/
-	{//Should not be used
-	return KErrNotSupported;
-	}
-
-void CWspMessageRecord::CleanUpData()
-/**
-To clean up the wsp related data
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	CWapMessageRecord::CleanUpData();
-	if (iWspHeader)
-		{
-		delete iWspHeader;
-		iWspHeader=NULL;
-		}
-	if (iWspBody)
-		{
-		delete iWspBody;
-		iWspBody=NULL;
-		}
-	iTransactionId=0;
-	iHeaderOffset=0;
-	iBodyOffset=0;
-	}
-//
-//CWspMessageRecord method
-//
-CWdpMessageRecord::CWdpMessageRecord()
-/**
-Constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-
-CWdpMessageRecord::~CWdpMessageRecord()
-/**
-Destructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-
-TInt CWdpMessageRecord::GetPduData(TDes8& aBuffer, TBool& aTruncated)
-/**
-To read the received Wdp pdu
-@internalComponent
-@released
-@since v8.0
-@param aBuffer the buffer to contain the received wdp pdu
-@param aTruncated the flag to represent if the data is truncated or not
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if (!iPdu)
-		{
-		//Should not be here at all
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGERECORD_GETPDUDATA_1, "CWdpMessageRecord::GetPduData No Data Available");
-		CleanUpData();
-		return KErrBadDescriptor;
-		}
-	TInt ret=KErrNone;
-	TInt bufLength=aBuffer.MaxLength();
-	TPtrC8 remainPdu=iPdu->Mid(iPduOffset);
-	if (bufLength<remainPdu.Length())
-		{
-		aBuffer.Copy(remainPdu.Ptr(), bufLength);
-		iPduOffset+=bufLength;
-		iState=EReading;
-		aTruncated=ETrue;
-		ret=Wap::EMoreData;
-		}
-	else
-		{
-		aBuffer.Copy(remainPdu);
-		aTruncated=EFalse;
-		CleanUpData();
-		}
-	return ret;
-	}
-
-void CWdpMessageRecord::UnpackPduToWspDataL()
-/**
-Not supported
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	//Should not be used
-	User::Leave(KErrNotSupported);
-	}
-
-TInt CWdpMessageRecord::GetWspData(TDes8& /*aWspHeader*/, TDes8& /*aWspBody*/, TUint8& /*aTransactionId*/, TWSPStatus& /*aWspStatus*/)
-/**
-Not supported
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	//Should not be used
-	return KErrNotSupported;
-	}
-
-void CWdpMessageRecord::CleanUpData()
-/**
-To clean up the wdp related data
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	CWapMessageRecord::CleanUpData();
-	iPduOffset=0;
-	}

--- a/wapstack/wapmessageapi/sws/ActiveSocket.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,385 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __ACTIVESOCKET_H__
-#define __ACTIVESOCKET_H__
-
-#include <e32std.h>
-#include <wapmessage.h>
-#include "WapSwsTimeOut.h"
-
-
-class CActiveSocketSMS;
-class CActiveSocketUDP;
-class MProgressNotify;
-
-enum TWapMessageState
-	{
-	/**
-	The state that is no outstanding request.
-	*/
-	EIdle,
-	/**
-	The state that the messaging API client is requesting data length
-	*/
-	ERequestingLength,
-	/**
-	The state the the messaging API client is requesting data
-	*/
-	ERequestingData,
-	/**
-	The state that the data size is ready to be read
-	*/
-	EPendingLength,
-	/**
-	The state that the messaging API client got the data length
-	*/
-	EGotLength,
-	/**
-	The state that the received data is ready to be read
-	*/
-	EPendingData,
-	/**
-	The state the data is being reading, but not finished
-	*/
-	EReading,
-	/**
-	The state that there are more data to be received from ESock (PRT 1.5)
-	*/
-	EContinuous
-	};
-enum TWapMessageType
-	{
-	/**
-	Wsp message
-	*/
-	EWapWsp,
-	/**
-	Wdp message
-	*/
-	EWapWdp
-	};
-enum TWapActiveSocketState
-	{
-	/**
-	No outstanding request state
-	*/
-	ESocketIdle,
-	/**
-	Waiting for the PDU length state
-	*/
-	ESocketWaitingForLength,
-	/**
-	Waiting for the PDU data state
-	*/
-	ESocketWaitingForData
-	};
-enum TWapNotificationEvent
-	{
-	/**
-	The event that PDU length is ready.
-	*/
-	EPduLengthReceived,
-	/**
-	The event thst PDU us ready
-	*/
-	EPduReceived
-	};
-
-class TWapNotificationInfo
-	{
-public:
-	inline TWapNotificationInfo(Wap::TBearer aBearer, TInt aError);
-	Wap::TBearer iBearer;
-	TInt iError;
-	};
-
-inline TWapNotificationInfo::TWapNotificationInfo(Wap::TBearer aBearer, TInt aError):
-iBearer(aBearer), iError(aError)
-	{
-	}
-
-typedef TPckgBuf<TWapNotificationInfo> TWapNotificationInfoBuf;
-
-const TUint KMaxUdpBearerDataBufferLength=1024;
-
-class CWapMessageRecord: public CBase
-/** 
-The Base class to represent the received WSP and WDP PDU
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-public:
-	static CWapMessageRecord* NewL(TWapMessageType aType);
-	virtual ~CWapMessageRecord();
-	TWapMessageState GetDataState();
-	void SetDataState(TWapMessageState aStatus);
-	void CreatePduBufferL(TBool aFixLengthFlag);
-	TPckgBuf<TUint32>* GetPduSizeRef();
-	void SetPduSize(TUint32 aLength);
-	TUint32 GetPduSize();
-	HBufC8*& GetPduPtr();
-	/**
-	To read the received Wdp pdu
-	@internalComponent
-	@released
-	@since v8.0
-	@param aBuffer(out) the buffer to contain the received wdp pdu
-	@param aTruncated(out) the flag to represent if the data is truncated or not
-	@returns KErrNone on successful completion, or one of the system error codes on failure.
-	*/
-	virtual TInt GetPduData(TDes8& aBuffer, TBool& aTruncated)=0;
-	/**
-	To unpack the received wdp pdu to wsp message.
-	@internalComponent
-	@released
-	@since v8.0
-	*/
-	virtual void UnpackPduToWspDataL()=0;
-	/**
-	To read the wsp message from the buffer
-	@internalComponent
-	@released
-	@since v8.0
-	@param aWspHeader(out) the buffer to contain the wsp header
-	@param aWspBody(out) the buffer to contain the wsp body
-	@param iTransactionId(out) the received transaction ID
-	@param aWspStatus(out) the received wsp status
-	@returns KErrNone on successful completion, or one of the system error codes on failure.
-	*/
-	virtual TInt GetWspData(TDes8& aWspHeader, TDes8& aWspBody, TUint8& aTransactionId, TWSPStatus& aWspStatus)=0;
-	virtual void CleanUpData();
-public:
-	/**The received WDP PDU Data buffer
-	*/
-	HBufC8* iPdu;
-	/**The received WDP PDU length buffer
-	*/
-	TPckgBuf<TUint32> iDataLength;
-
-protected:
-	CWapMessageRecord();
-	/**The state of the received the WSP or WDP data
-	*/
-	TWapMessageState iState;
-	};
-
-class CWspMessageRecord: public CWapMessageRecord
-/** 
-The class to represent the received WSP PDU
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-public: 
-	CWspMessageRecord();
-	~CWspMessageRecord();
-	void UnpackPduToWspDataL();
-	TInt GetWspData(TDes8& aWspHeader, TDes8& aWspBody, TUint8& aTransactionId, TWSPStatus& aWspStatus);
-	TInt GetPduData(TDes8& aBuffer, TBool& aTruncated);
-	void CleanUpData();
-private:
-	/**
-	The buffer for received Wsp header.
-	*/
-	HBufC8* iWspHeader;
-	/**
-	The buffer for received Wsp body.
-	*/
-	HBufC8* iWspBody;
-	/**
-	The received the transaction Id.
-	*/
-	TUint8 iTransactionId;
-	/**
-	The received WSP layer status
-	*/
-	TWSPStatus iWspStatus;
-	/**
-	The offset of the header for next reading
-	*/
-	TInt iHeaderOffset;
-	/**
-	The offset of the body for next reading
-	*/
-	TInt iBodyOffset;
-	};
-
-class CWdpMessageRecord: public CWapMessageRecord
-/** 
-The class to represent the received WDP PDU
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-public:
-	CWdpMessageRecord();
-	~CWdpMessageRecord();
-	void UnpackPduToWspDataL();
-	TInt GetWspData(TDes8& aWspHeader, TDes8& aWspBody, TUint8& aTransactionId, TWSPStatus& aWspStatus);
-	TInt GetPduData(TDes8& aBuffer, TBool& aTruncated);
-	void CleanUpData();
-private:
-	/**
-	The offset of the pdu for next reading
-	*/
-	TUint32 iPduOffset;
-	};
-
-class CActiveSocket: public CActive
-/** 
-The base class for the different bearer classes.
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-public:
-	static void NewL(RSocketServ& aSocketServ, RPointerArray<CActiveSocket>& aActiveSockets, Wap::TBearer aBearer, TWapMessageType aType, MProgressNotify* aNotify, Wap::TPort aLocalPort, RConnection* aConnection=NULL);
-	static void NewL(RSocketServ& aSocketServ, RPointerArray<CActiveSocket>& aActiveSockets, Wap::TBearer aBearer, TWapMessageType aType, MProgressNotify* aNotify, const TSockAddr& aRemoteAddr, RConnection* aConnection=NULL);
-	virtual ~CActiveSocket();
-	virtual void ConstructL(TWapMessageType aType);
-	/**
-	Read the received Wdp pdu length.
-	@internalComponent
-	@released
-	@since v8.0
-	@returns KErrNone on successful completion, or one of the system error codes on failure.
-	*/
-	virtual TInt AwaitRecvDataSize() = 0;
-	/**
-	Read the received Wdp pdu.
-	@internalComponent
-	@released
-	@since v8.0
-	@returns KErrNone on successful completion, or one of the system error codes on failure.
-	*/
-	virtual TInt Receive() = 0;
-	TSockAddr& GetLocalAddress();
-	TInt GetLocalPort(Wap::TPort& aLocalPort);
-	TInt GetRemoteAddress(HBufC8*& aAddr);
-	TSockAddr& GetRemoteAddress();
-
-	TWapMessageState GetDataState();
-	void SetDataState(TWapMessageState aState);
-	TUint32 GetPduSize();
-	TInt GetPduData(TDes8& aBuffer, TBool& aTruncated);
-	TInt GetWspData(TDes8& aWspHeader, TDes8& aWspBody, TUint8& aTransactionId, TWSPStatus& aStatus);	
-	void UnpackPduToWspDataL();
-	Wap::TBearer GetBearerType();
-	RSocket& Socket();
-	void CleanUpData();
-
-public:
-	/**The RSocket instance to send and receive WDP PDU.
-	*/
-	RSocket iSocket;
-	/**The remote address for the last received message
-	*/
-	TSockAddr iRemoteAddr;
-	/**The local address for the last received message
-	*/
-	TSockAddr iLocalAddr;
-
-protected:
-	CActiveSocket(RSocketServ& aSocketServ, Wap::TBearer aBearerType, MProgressNotify* aNotify, Wap::TPort aLocalPort);
-	CActiveSocket(RSocketServ& aSocketServ, Wap::TBearer aBearerType, MProgressNotify* aNotify, const TSockAddr& aRemoteAddr, Wap::TPort aLocalPort);
-
-protected:
-	/**The data buffer to receive WDP or WSP message
-	*/
-	CWapMessageRecord* iMessageRecord;
-	/**The RSocketServ reference from WAP message API
-	*/
-	RSocketServ& iSocketServ;
-	/**The Bearer type
-	*/
-	Wap::TBearer iBearerType;
-	/**The port number for the last received message
-	*/
-	Wap::TPort iLocalPort;
-	/**The state of the bearer
-	*/
-	TWapActiveSocketState iSocketState;
-	/**
-	The instance that to be notified when data is received
-	*/
-	MProgressNotify* iNotify;
-	/**
-	Buffer for the first read from ESock
-	*/
-	TPtr8 iBuf;
-	/**
-	Reported remaining length for PRT 1.5 
-	*/
-	TSockXfrLength iRxlength;
-	/**
-	Buffer for continious read from ESock
-	*/
-	TPtr8 iBufCon;
-	};
-
-class CActiveSocketSMS : public CActiveSocket
-/** 
-The class represent the SMS bearer. It will open a RSocket over WapSMS protocol, send and 
-receive WDP PDU.
-@internalComponent
-@released
-@since v8.0
-*/
-{
-public:
-	CActiveSocketSMS(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, Wap::TPort aLocalPort);
-	CActiveSocketSMS(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, const TSockAddr& aRemoteAddr);
-	virtual ~CActiveSocketSMS();
-	TInt AwaitRecvDataSize();
-	TInt Receive();
-	void ConstructL(TWapMessageType aType);
-private:
-	void RunL();
-	void DoCancel();
-};
-
-class CActiveSocketUDP : public CActiveSocket
-/** 
-The class represent the UDP bearer. It will open a RSocket over UDP protocol, send and 
-receive WDP PDU. It is not supported in released v8.0.
-@internalComponent
-@released
-@since v8.0
-*/
-{
-public:
-	CActiveSocketUDP(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, Wap::TPort aLocalPort, RConnection* aConnection);
-	CActiveSocketUDP(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, const TSockAddr& aRemoteAddr, RConnection* aConnection);
-	virtual ~CActiveSocketUDP();
-	TInt AwaitRecvDataSize();
-	TInt Receive();
-	void ConstructL(TWapMessageType aType);
-private:
-	void RunL();
-	void DoCancel();
-	/**
-	The RConnection shared with the WAP message API client.
-	*/
-	RConnection* iConnection;
-};
-
-#endif // __ACTIVESOCKET_H__
-

--- a/wapstack/wapmessageapi/sws/CLWSPPduHandler.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,350 +0,0 @@
-// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CLWSPPduHandlerTraces.h"
-#endif
-
-#include "CLWSPPduHandler.h"
-#include "wapmsgerr.h"
-
-void CCLWSPPduHandler::UnpackWSPPduL(HBufC8* aWSPPdu, TWSPPduType& aType, HBufC8*& aWSPHeader, HBufC8*& aBody, TUint8& aId, TWSPStatus& aStatus)
-/** 
-Unpack the received WSP PDU from remote peer to several data structure expected by the client.
-@internalComponent
-@released 
-@since v8.0 
-@param aWSPPdu the received WSP PDU from the remote peer. 
-@param aType the type of the received WSP PDU.
-@param aWSPHeader the WSP header of the received WSP PDU.
-@param aBody the data body of the received WSP PDU.
-@param aId the transaction ID or Push ID of the received WSP PDU.
-@param aStatus the WSP status of the received WSP PDU.
-@returns TInt KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TPtr8 des=aWSPPdu->Des();
-	if(des.Length() < KPDUTransactionIDAndPDUTypeLength)
-	{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLWSPPDUHANDLER_UNPACKWSPPDUL_1, "CCLWSPPduHandler::UnpackWSPPduL() Corrupted InComing Wsp PDU");
-        User::Leave(KErrCorrupt);
-	}
-	aId=des[KPDUHeaderTransactionIDOffSet];
-	aType=TWSPPduType(des[KPDUHeaderWSPPDUTypeOffSet]);
-	switch (aType)
-		{
-	case EReply:
-		UnpackReplyPduL(aWSPPdu, aWSPHeader, aBody, aStatus);
-		break;
-	case EPush:
-		UnpackPushPduL(aWSPPdu, aWSPHeader, aBody);
-		break;
-	default:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLWSPPDUHANDLER_UNPACKWSPPDUL_2, "CCLWSPPduHandler::UnpackWSPPduL() Unknown InComing Wsp PDU Type");
-		User::Leave(KErrCorrupt);
-		}
-	}
-
-void CCLWSPPduHandler::PackWSPPduL(HBufC8*& aWSPPdu, TWSPPduType aType, const TDesC& aURI, const TDesC8& aWSPHeader, const TDesC8& aBody, const TUint8 aId)
-/** 
-Pack the information to be sent into WSP PDU.
-@internalComponent
-@released 
-@since v8.0 
-@param aWSPPdu the WSP PDU that is to sent 
-@param aType the WSP PDU type(the method is to be invoked) 
-@param aURI  the URI where the WSP PDU goes
-@param aWSPHeader the WSP header
-@param aBody the data body
-@param aId the transaction ID
-@returns TInt KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	switch (aType)
-		{
-	case EGet:
-	case EGetOptions:
-	case EGetHead:
-	case EGetDelete:
-	case EGetTrace:
-		PackGetPduL(aWSPPdu, aType, aURI, aWSPHeader, aId);
-		break;
-	
-	case EPost:
-	case EPostPut:
-		PackPostPduL(aWSPPdu, aType, aURI, aWSPHeader, aBody, aId);
-		break;
-
-	default:
-	    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLWSPPDUHANDLER_PACKWSPPDUL_1, "CCLWSPPduHandler::PackWSPPduL() Unknown Method Invoke Wsp PDU Type");
-	    User::Leave(Wap::EWspClParameterError);
-		}
-	}
-
-void CCLWSPPduHandler::UnpackPushPduL(HBufC8* aWSPPdu, HBufC8*& aWSPHeader, HBufC8*& aBody)
-/**
-Unpack the WSP PUSH PDU.
-@internalComponent
-@released 
-@since v8.0 
-@param aWSPPdu the received WSP PDU from the remote peer. 
-@param aWSPHeader the WSP header of the received WSP PDU.
-@param aBody the data body of the received WSP PDU.
-@returns TInt KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TPtrC8 pduBuffer(*aWSPPdu);
-	TUint32 pduLength=pduBuffer.Length();
-	TUint32 headerLength(0);
-	TInt uintvarLength(0);
-
-	// if uintvarLength less than KErrNone, then it is a error code.
-	if ((uintvarLength=UintVar(headerLength, pduBuffer, KPDUTransactionIDAndPDUTypeLength))<KErrNone)
-		{
-		User::Leave(uintvarLength);
-		}
- 	TInt32 bodyLength= pduLength-KPDUTransactionIDAndPDUTypeLength-uintvarLength-headerLength;
-	if (bodyLength<0)
-		{
-		User::Leave(KErrCorrupt);
-		}
-	// Extract the WSP Header.
-	aWSPHeader=HBufC8::NewL(headerLength);
-	TPtr8 headerDes=aWSPHeader->Des();
-	headerDes.Copy(pduBuffer.Mid(KPDUTransactionIDAndPDUTypeLength+uintvarLength, headerLength));
-	// Extract the WSP data body.
-	aBody=HBufC8::NewL(bodyLength);
-	TPtr8 bodyDes=aBody->Des();
-	bodyDes.Copy(pduBuffer.Mid(KPDUTransactionIDAndPDUTypeLength+uintvarLength+headerLength));
-	}
-
-void CCLWSPPduHandler::UnpackReplyPduL(HBufC8* aWSPPdu, HBufC8*& aWSPHeader, HBufC8*& aBody, TWSPStatus& aStatus)
-/**
-Unpack the WSP Reply PDU.
-@internalComponent
-@released 
-@since v8.0 
-@param aWSPPdu the received WSP PDU from the remote peer. 
-@param aWSPHeader the WSP header of the received WSP PDU.
-@param aBody the data body of the received WSP PDU.
-@param aStatus the WSP status of the received WSP PDU.  
-@returns TInt KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TPtrC8 pduBuffer(*aWSPPdu);
-	TUint32 pduLength=pduBuffer.Length();
-
-	//Extract the WSP status
-	aStatus=pduBuffer[KPDUTransactionIDAndPDUTypeLength];
-
-	TUint32 headerLength(0);
-	TInt uintvarLength(0);
-	// if uintvarLength less than KErrNone, then it is a error code.
-	if ((uintvarLength=UintVar(headerLength, pduBuffer, KPDUTransactionIDAndPDUTypeLength+KWSPStatusLength))<KErrNone)
-		{
-		User::Leave(uintvarLength);
-		}
-		
-	TInt32 bodyLength= pduLength-KPDUTransactionIDAndPDUTypeLength-KWSPStatusLength-uintvarLength-headerLength;
-	if (bodyLength<0)
-		{
-		User::Leave(KErrCorrupt);
-		}
-		
-	// Extract the WSP Header.
-	aWSPHeader=HBufC8::NewL(headerLength);
-	TPtr8 headerDes=aWSPHeader->Des();
-	headerDes.Copy(pduBuffer.Mid(KPDUTransactionIDAndPDUTypeLength+KWSPStatusLength+uintvarLength, headerLength));
-
-	// Extract the WSP data body.
-	aBody=HBufC8::NewL(bodyLength);
-	TPtr8 bodyDes=aBody->Des();
-	bodyDes.Copy(pduBuffer.Mid(KPDUTransactionIDAndPDUTypeLength+KWSPStatusLength+uintvarLength+headerLength));
-	}
-
-void CCLWSPPduHandler::PackPostPduL(HBufC8*& aWSPPdu, TWSPPduType aType, const TDesC& aURI, const TDesC8& aWSPHeader, const TDesC8& aBody, const TUint8 aId)
-/** 
-Pack the WSP Post PDU.
-@internalComponent
-@released 
-@since v8.0 
-@param aWSPPdu the WSP PDU that is to sent 
-@param aType the WSP PDU type(the method is to be invoked) 
-@param aURI the URI where the WSP PDU goes
-@param aWSPHeader the WSP header
-@param aBody the data body
-@param aId the transaction ID
-@returns TInt KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	//Convert the URI length to Varible length unsigned integer
-	TUint32 uriLength=aURI.Length();
-	HBufC8* uriLengthDes=UintVarL(uriLength);
-
-	//Convert the URI length to Varible length unsigned integer
-	TUint32 headerLength=aWSPHeader.Length();
-	HBufC8* headerLengthDes=UintVarL(headerLength);
-
-	// Calculate the pdu length
-	TUint32 pduLength = KPDUTransactionIDAndPDUTypeLength+
-						uriLengthDes->Length()+
-						headerLengthDes->Length()+
-						uriLength+
-						headerLength+
-						aBody.Length();
-
-	//Build the PDU.
-	aWSPPdu = HBufC8::NewL(pduLength);
-	TPtr8 pduPtr(aWSPPdu->Des());
-	pduPtr.Append(aId);
-	pduPtr.Append(aType);
-	pduPtr.Append(*uriLengthDes);
-	pduPtr.Append(*headerLengthDes);
-	pduPtr.Append(aURI);
-	pduPtr.Append(aWSPHeader);
-	pduPtr.Append(aBody);
-
-	// delete the temporary buffers
-	delete uriLengthDes;
-	delete headerLengthDes;
-	}
-void CCLWSPPduHandler::PackGetPduL(HBufC8*& aWSPPdu, TWSPPduType aType, const TDesC& aURI, const TDesC8& aWSPHeader, const TUint8 aId)
-/** 
-Pack the WSP Get PDU.
-@internalComponent
-@released 
-@since v8.0 
-@param aWSPPdu the WSP PDU that is to sent 
-@param aType the WSP PDU type(the method is to be invoked) 
-@param aURI the URI where the WSP PDU goes
-@param aWSPHeader the WSP header
-@param aId the transaction ID
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-
-	//Convert the URI length to Varible length unsigned integer
-	TUint32 uriLength=aURI.Length();
-	HBufC8* uriLengthDes=UintVarL(uriLength);
-
-	// Calculate the pdu length
-	TUint32 pduLength =	KPDUTransactionIDAndPDUTypeLength+
-						uriLengthDes->Length()+
-						uriLength+
-						aWSPHeader.Length();
-
-	// Build the PDU.
-	aWSPPdu = HBufC8::NewL(pduLength);
-	TPtr8 pduPtr(aWSPPdu->Des());
-	pduPtr.Append(aId);
-	pduPtr.Append(aType);
-	pduPtr.Append(*uriLengthDes);
-	pduPtr.Append(aURI);
-	pduPtr.Append(aWSPHeader);
-	
-	//Delete the temporary buffer
-	delete uriLengthDes;
-	}
-TInt CCLWSPPduHandler::UintVar(TUint32& aVal, TPtrC8& aBuffer, TUint aOffset)
-/** 
-Decode the variable length Unsigned integer to TUint32
-@internalComponent
-@released 
-@since v8.0 
-@param aVal the value of the variable length Unsigned integer
-@param aBuffer the descriptor that contains the variable length Unsigned integer
-@param aOffset the offset of the variable length Unsigned integer
-@returns one of the system error codes on failure, or the size of variable length Unsigned integer.
-*/
-	{
-	// have we run out of buffer?
-	if (aOffset >= (TUint)aBuffer.Length())
-		{
-		return KErrCorrupt;
-		}
-		
-	// maximum length for a uintvar is 5
-	TInt lenLeft = Min(aBuffer.Mid(aOffset).Length(), KMaxUintVarLength);
-
-	// get the first octet
-	TUint8 byte = aBuffer[aOffset++];
-	TInt numBytes = 1;
-	--lenLeft;
-
-	// Check if any of the top 3 bits, ignoring the very top 'continue' bit, are set.  
-	// Later if we see that this is a 5 byte number - we'll know it is corrupt.  
-	// Encoding uses 7 bits/number 7x5=35 and we only support a maxiumum number 
-	// of 32 bits.
-	TBool topThreeBitsSet = byte & KTop3BitSet; 
-
-	// copy over data from the byte into our return value (the top bit is a carry bit)
-	aVal = byte & KWapQuote;
-
-	// while the 'continue' bit is set and we have more data
-	while ((byte & KCarryBitMask) && (lenLeft > 0))
-		{
-		// shift our last value up
-		aVal <<= KUIntVarOctetShift;
-		// get the next byte
-		byte = aBuffer[aOffset++];
-		// copy it over to the lowest byte
-		aVal |= byte & KWapQuote;
-		--lenLeft;
-		++numBytes;
-		} 
-
-	// last octet has continue bit set ... NOT allowed Or
-	// this was encoded wrong - can't have a number bigger than 32 bits
-	if ((byte & KCarryBitMask) || (numBytes == 5 && topThreeBitsSet))
-		{
-		return KErrCorrupt;
-		}
-	// number of bytes read
-	return numBytes;
-
-	}
-
-HBufC8* CCLWSPPduHandler::UintVarL(const TUint32 aInt)
-/** 
-Encode the TUint32 to the variable length Unsigned integer
-@internalComponent
-@released 
-@since v8.0 
-@param aInt the length of the data
-@returns the descriptor that contains the variable length Unsigned integer
-*/
-	{
-	TUint8 size = 0; // maximum value is 5 with a 32bit integer
-	TUint32 value=aInt;
-	do {
-		++size;
-		value >>=KUIntVarOctetShift; ; // shift by 7 bits.
-		} while (value>0);
-
-	HBufC8* output = HBufC8::NewL(size);
-	TPtr8 outPtr(output->Des());
-
-	TInt ii = size; 
-	while (--ii > 0)
-		{
-		outPtr.Append( (TUint8)(aInt>>(KUIntVarOctetShift*(ii))  & KWapQuote) | KCarryBitMask); 
-		} 
-
-	// Finally the first 7 bits, last octet, do not set first bit.
-	outPtr.Append( (TUint8)(aInt & KWapQuote) ); // Add even if 0 value.
-
-	return output;
-	}

--- a/wapstack/wapmessageapi/sws/CLWSPPduHandler.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __CLWSPPDUHANDLER_H__
-#define __CLWSPPDUHANDLER_H__
-#include <e32std.h>
-#include <wapmessage.h>
-
-
-/** 
-The connectionless WSP PDU type definition.
-@internalComponent
-*/
-enum TWSPPduType
-	{
-	/** the Reply PDU type assignment 
-	*/
-	EReply			=0x04,
-	/** the Push PDU type assignment 
-	*/
-	EPush			=0x06,
-	/** the Get PDU type assignment 
-	*/
-	EGet			=0x40,
-	/** the GetOption PDU type assignment 
-	*/
-	EGetOptions		=0x41,
-	/** the Gethead PDU type assignment 
-	*/
-	EGetHead		=0x42,
-	/** the GetDelete PDU type assignment 
-	*/
-	EGetDelete		=0x43,
-	/** the GetTrace PDU type assignment 
-	*/
-	EGetTrace		=0x44,
-	/** the Post PDU type assignment 
-	*/
-	EPost			=0x60,
-	/** the PostPut PDU type assignment 
-	*/
-	EPostPut		=0x61
-	};
-
-
-	/** 
-	The offset of the transactionID field in WSP PDU.
-	@internalComponent
-	 */
-	const TUint KPDUHeaderTransactionIDOffSet	=0;
-	/** 
-	The offset of the WSP PDU type field in WSP PDU.
-	@internalComponent
-	 */
-	const TUint KPDUHeaderWSPPDUTypeOffSet		=1;
-	/** 
-	The offset of WSP field.
-	@internalComponent
-	*/
-	const TUint KPDUFieldOffset					=2;
-
-	/** 
-	The length of transactionID+PDUType
-	@internalComponent
-	*/
-	const TUint8 KPDUTransactionIDAndPDUTypeLength	=2;
-	/** 
-	The length of WSP status
-	@internalComponent
-	*/
-	const TUint8 KWSPStatusLength					=1;
-
-	/**
-	The mask of top 3 bits in varible length Unsigned integer
-	@internalComponent
-	*/
-	const TUint8 KTop3BitSet		= 0x70;
-
-	/**
-	The mask to valide each byte in varible length Unsigned integer
-	@internalComponent
-	*/
-	const TUint8 KWapQuote			= 0x7F;
-
-	/**
-	The mask of carry bit in each byte in varible length Unsigned integer
-	@internalComponent
-	*/
-	const TUint8 KCarryBitMask		= 0x80;
-
-	/**
-	Maximum length for varible length Unsigned integer
-	@internalComponent
-	*/
-	const TUint8 KMaxUintVarLength	= 5;
-
-	/**
-	shift 7 bits for each byte in Uint32
-	@internalComponent
-	*/
-	const TUint8 KUIntVarOctetShift	= 7;
-
-
-
-class CCLWSPPduHandler
-/** 
-The Connectionless WSP PDU Handler. This class provides a set of static interfaces 
-for WAP message APIs to pack and unpack the WSP PDU.   
-For error codes returned by methods in this class, see <wapmsgerr.h>.  Most methods can 
-return a set of general errors, with some returning additional specific errors.
-*/
-	{
-public: 
-
-
-
-public: // Public Interfaces
-	static void UnpackWSPPduL(HBufC8* aWSPPdu, TWSPPduType& aType, HBufC8*& aWSPHeader, HBufC8*& aBody, TUint8& aId, TWSPStatus& aStatus);
-	static void PackWSPPduL(HBufC8*& aWSPPdu, TWSPPduType aType, const TDesC& aURI, const TDesC8& aWSPHeader, const TDesC8& aBody, const TUint8 aId);
-
-private: // private methods
-	static void UnpackPushPduL(HBufC8* aWSPPdu, HBufC8*& aWSPHeader, HBufC8*& aBody);
-	static void UnpackReplyPduL(HBufC8* aWSPPdu, HBufC8*& aWSPHeader, HBufC8*& aBody, TWSPStatus& aStatus);
-	static void PackPostPduL(HBufC8*& aWSPPdu, TWSPPduType aType, const TDesC& aURI, const TDesC8& aWSPHeader, const TDesC8& aBody, const TUint8 aId);
-	static void PackGetPduL(HBufC8*& aWSPPdu, TWSPPduType aType, const TDesC& aURI, const TDesC8& aWSPHeader, const TUint8 aId);
-	static TInt UintVar(TUint32& aVal, TPtrC8& aBuffer, TUint aOffset);
-	static HBufC8* UintVarL(const TUint32 aInt);
-	};
-#endif // __CLWSPPDUHANDLER_H__

--- a/wapstack/wapmessageapi/sws/WapBoundCLPush.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include "WapBoundCLPush.h"
-#include "WapMsgUtils.h"
-#include <wapmsgerr.h>
-
-CSWSWapBoundCLPushService* CSWSWapBoundCLPushService::NewL()
-/**
-Static new function
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	CSWSWapBoundCLPushService* me = new(ELeave)CSWSWapBoundCLPushService();
-	CleanupStack::PushL(me);
-	me->ConstructL();
-	CleanupStack::Pop(me);
-	return me;
-	}
-
-CSWSWapBoundCLPushService::~CSWSWapBoundCLPushService()
-/**
-Destructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	delete iAgent;
-	}
-
-CSWSWapBoundCLPushService::CSWSWapBoundCLPushService()
-/**
-Constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-
-void CSWSWapBoundCLPushService::ConstructL()
-/**
-Second Phase Constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	// Parent class construction
-	CWapBoundCLPushService::ConstructL();
-	iAgent=CWspMessageApiAgent::NewL();
-	}
-
-TInt CSWSWapBoundCLPushService::Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure, TInetAddr /*aInetAddr*/)
-/**
-Opens a Wsp EndPoint which is to be used to listen for subsequent incoming Push messages from any sender;
-@internalComponent
-@released
-@since v8.0
-@param aBearer (in) the bearer to listen on (use EAll for all bearers)
-@param aPort (in) the port to listen on. If set to 0, a local port will be chosen for the client's first SendTo
-@param aSecure (in) security flag indicates whether WTLS will be used or not
-@param aInetAddr (in) the address of the adapter to use
-@returns TInt KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if(aSecure) 
-		{
-		return KErrNotSupported;
-		}
-	return iAgent->Connect(aBearer, aPort, aSecure);
-	}
-
-TInt CSWSWapBoundCLPushService::Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure)
-/**
-Opens a socket which is to be used to listen for subsequent incoming Push messages from any sender;
-@internalComponent
-@released
-@since v8.0
-@param aBearer (in) the bearer to listen on (use EAll for all bearers)
-@param aPort (in) the port to listen on. If set to 0, a local port will be chosen for the client's first SendTo
-@param aSecure (in) security flag indicates whether WTLS will be used or not
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TInetAddr inetAddr( KInetAddrAny, 0);
-	return( Connect(aBearer, aPort, aSecure, inetAddr) );
-	}
-
-TInt CSWSWapBoundCLPushService::AwaitPush(TDes8& aPushHeaders, TDes8& aPushBody, TPckgBuf<TUint8>& aPushIdPckg, TRequestStatus& aReqStatus)
-/**
-Request an asynchronous notification upon arrival of the next push messages on the listening connection.
-The request completes upon receipt of the message, filling the buffers with as much received data as possible.
-A return code will indicate whether further data remains.  The call must be re-issued for subsequent messages
-or to receive remaining data from a previous push message.
-@internalComponent
-@released
-@since v8.0
-@param aPushHeaders (out) (client-allocated) - when a push message arrives the header data is written here
-@param aPushBody (out) (client-allocated) - when a push message arrives the body data is written here
-@param aPushIdPckg (out) when a push message arrives an integer ID that uniquely specifies the message is written here
-@param aReqStatus (inout) used by the service provider to notify the client when a push has arrived.
-EMoreData is returned if more pushed data is available
-@retval KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TInt err = iAgent->ReceiveWspMessage(aPushHeaders, aPushBody, aPushIdPckg, iWspStatus, aReqStatus, 0);
-	if(err == Wap::EMoreData)
-	{
-		return KErrNone;
-	}
-	return err;
-	}
-
-void CSWSWapBoundCLPushService::CancelAwaitPush()
-/**
-Cancel a previously-requested push message notification. If a push message arrives the client will not be notified.
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	iAgent->CancelRequest();
-	}
-
-TInt CSWSWapBoundCLPushService::GetLocalPort(Wap::TPort& aPort)
-/**
-Get the local address of this endpoint.
-@internalComponent
-@released
-@since v8.0
-@param aPort (out) the port of the local host
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetLocalPort(aPort);
-	}
-
-TInt CSWSWapBoundCLPushService::GetLocalAddress(HBufC8*& aLocalHost)
-/**
-Get the local address of this endpoint.
-@internalComponent
-@released
-@since v8.0
-@param aLocalHost (inout) the address of the local host. A reference to a HBufC8 pointer should
-be passed in. This pointer MUST be null! A HBufC8 will be allocated to hold the address, ownership
-of this buffer will be passed over to the client.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetLocalAddress(aLocalHost);
-	}
-
-TInt CSWSWapBoundCLPushService::GetBearer(Wap::TBearer& aBearer)
-/**
-Get the bearer on which the push message arrived.
-Useful when EAll was specified in Connect()
-@internalComponent
-@released
-@since v8.0
-@param aBearer (out) the bearer
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetBearer(aBearer);
-	}
-
-TInt CSWSWapBoundCLPushService::GetServerAddress(HBufC8*& aRemoteHost)
-/**
-Get the address of the remote server
-@internalComponent
-@released
-@since v8.0
-Cannot be called when there is an outstanding AwaitPush().
-@param aRemoteHost the address of the remote server.
-A reference to a HBufC8 pointer should be passed in. An HBufC8 will be allocated
-to hold the address ,ownership of this buffer will be passed over to the client.
-@returns KErrNone on successful completion, KErrNotSupported if not implemented or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetServerAddress(aRemoteHost);
-	}
-

--- a/wapstack/wapmessageapi/sws/WapBoundCLPush.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __CSWSWAPBOUNDCLPUSHSERVICE_H__
-#define __CSWSWAPBOUNDCLPUSHSERVICE_H__
-
-// Include definitions of ECOM interfaces for the WAP Messaging API
-#include <wapmessage.h>
-#include "WapMessageApiAgent.h"
-
-
-
-class CSWSWapBoundCLPushService : public CWapBoundCLPushService
-/** 
-The WAP Messaging API, SWS WAP Stack binding.  Implementation of the bound CLPush API.
-@internalComponent
-@released
-@since v8.0
-*/ 
-{
-public:
-	static CSWSWapBoundCLPushService* NewL();
-	virtual ~CSWSWapBoundCLPushService();
-
-public:
-	virtual TInt Connect(Wap::TBearer aBearer,
-					  Wap::TPort aPort,
-					  TBool aSecure,
-					  TInetAddr aInetAddr);
-	virtual TInt Connect(Wap::TBearer aBearer,
-					  Wap::TPort aPort,
-					  TBool aSecure);
-	virtual TInt AwaitPush(TDes8& aPushHeaders,
-						  TDes8& aPushBody,
-						  TPckgBuf<TUint8>& aPushIdPckg,
-						  TRequestStatus& aReqStatus);
-	virtual void CancelAwaitPush();
-	virtual TInt GetLocalPort(Wap::TPort& aPort);
-	virtual TInt GetLocalAddress(HBufC8*& aLocalHost);
-	virtual TInt GetBearer(Wap::TBearer& aBearer);
-	virtual TInt GetServerAddress(HBufC8*& aRemoteHost);
-
-private:
-	CSWSWapBoundCLPushService();
-	void ConstructL();
-
-private:
-	/**
-	the agent instance which actually handles wsp PDU.
-	*/
-	CWspMessageApiAgent* iAgent;
-	/**
-	the wsp status in received wsp PDU. Not used in push.
-	*/
-	TWSPStatus iWspStatus;
-};
-
-#endif // __CSWSWAPBOUNDCLPUSHSERVICE_H__

--- a/wapstack/wapmessageapi/sws/WapBoundCLWSP.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include "WapBoundCLWSP.h"
-#include "WapMsgUtils.h"
-#include "CLWSPPduHandler.h"
-
-
-
-CSWSWapBoundCLWSPService* CSWSWapBoundCLWSPService::NewL()
-/**
-Static new function
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	CSWSWapBoundCLWSPService* me = new(ELeave)CSWSWapBoundCLWSPService();
-	CleanupStack::PushL(me);
-	me->ConstructL();
-	CleanupStack::Pop(me);
-	return me;
-	}
-
-CSWSWapBoundCLWSPService::CSWSWapBoundCLWSPService()
-	: CWapBoundCLWSPService()
-/**
-Constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-
-CSWSWapBoundCLWSPService::~CSWSWapBoundCLWSPService()
-/**
-Destructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	delete iAgent;
-	}
-
-void CSWSWapBoundCLWSPService::ConstructL()
-/**
-Second phase constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	// Parent class construction
-	CWapBoundCLWSPService::ConstructL();
-	iAgent=CWspMessageApiAgent::NewL();
-	}
-
-TInt CSWSWapBoundCLWSPService::Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure)
-/**
-Opens a End-point which is to be used to listen for the incoming method result messages from any sender;
-@internalComponent
-@released
-@since v8.0
-@param aBearer (in) the bearer to listen on (use EAll for all bearers)
-@param aPort (in) the port to listen on. If set to 0, a local port will be chosen for the client's first SendTo
-@param aSecure (in) security flag indicates whether WTLS will be used or not
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if(aSecure) 
-		{
-		return KErrNotSupported;
-		}
-	return iAgent->Connect(aBearer, aPort, aSecure);
-	}
-
-TInt CSWSWapBoundCLWSPService::MethodInvoke(Wap::TBearer aBearer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort, TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, const TUint8 aTransactionId)
-/**
-A synchronous call to send a method invoke method to the remote host.
-@internalComponent
-@released
-@since v8.0
-@param aBearer (in) the bearer that will be used
-@param aRemoteHost (in) the remotehost to be sent message to
-@param aRemotePort (in) the remoteport to be sent message to
-@param aMethod (in) the method that will be invoked on server
-@param aURI (in) the uri to build wsp message
-@param aReqHeaders (in) the wsp header to be used to build method invoke message
-@param aReqBody (in) the wsp body to be used to build method invoke message
-@param aTransactionId (in) the transaction Id of the method invoke message
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->SendWspMessage(aBearer, aRemoteHost, aRemotePort, TWSPPduType(aMethod), aURI, aReqHeaders, aReqBody, aTransactionId);
-	}
-
-TInt CSWSWapBoundCLWSPService::MethodResult(TDes8& aReqHeaders, TDes8& aReqBody, TPckgBuf<TUint8>& aTransactionIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout)
-/**
-Request an asynchronous notification upon arrival of the method result messages on the listening connection.
-The request completes upon receipt of the message, filling the buffers with as much received data as possible.
-A return code will indicate whether further data remains.  The call must be re-issued for subsequent messages
-or to receive remaining data from a previous method result message.
-@internalComponent
-@released
-@since v8.0
-@param aReqHeaders (out) (client-allocated) - when a method result message arrives the header data is written here
-@param aReqBody (out) (client-allocated) - when a method result message arrives the body data is written here
-@param aTransactionIdPckg (out) when a method result message arrives an integer ID that uniquely specifies the message is written here
-@param aWspStatus (out) when a method result message arrives, the wsp status is written here.
-@param aReqStatus (inout) used by the service provider to notify the client when a method result has arrived
-@param aTimeout (in) an optional millisecond time-out which allows a timed read to be made.  If no data is received 
-within the timeout period the request completes with KErrTimedOut. If a value of 0 is supplied the timeout is infinite.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->ReceiveWspMessage(aReqHeaders, aReqBody, aTransactionIdPckg, aWspStatus, aReqStatus, aTimeout);
-	}
-
-void CSWSWapBoundCLWSPService::CancelReq()
-/**
-Cancel a previously-requested method result notification. If a method result message arrives the client will not be notified.
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	iAgent->CancelRequest();
-	}
-
-TInt CSWSWapBoundCLWSPService::GetLocalPort(Wap::TPort& aPort)
-/**
-Get the local address of this endpoint.
-@internalComponent
-@released
-@since v8.0
-@param aPort (out) the port of the local host
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetLocalPort(aPort);
-	}
-
-TInt CSWSWapBoundCLWSPService::GetLocalAddress(HBufC8*& aLocalHost)
-/**
-Get the local address of this endpoint.
-@internalComponent
-@released
-@since v8.0
-@param aLocalHost (inout) the address of the local host. A reference to a HBufC8 pointer should
-be passed in. This pointer MUST be null! A HBufC8 will be allocated to hold the address, ownership
-of this buffer will be passed over to the client.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetLocalAddress(aLocalHost);
-	}
-
-TInt CSWSWapBoundCLWSPService::GetBearer(Wap::TBearer& aBearer)
-/**
-Get the bearer on which the method result message arrived.
-Useful when EAll was specified in Connect()
-@internalComponent
-@released
-@since v8.0
-@param aBearer (out) the bearer
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetBearer(aBearer);
-	}
-
-TInt CSWSWapBoundCLWSPService::GetServerAddress(HBufC8*& aServerAddress)
-/**
-Get the remote address of the last wsp method result message
-@internalComponent
-@released
-@since v8.0
-Cannot be called when there is an outstanding MethodResult().
-@param aServerAddress the address of the remote server.
-A reference to a HBufC8 pointer should be passed in. An HBufC8 will be allocated
-to hold the address ,ownership of this buffer will be passed over to the client.
-@returns KErrNone on successful completion, KErrNotSupported if not implemented or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetServerAddress(aServerAddress);
-	}
-

--- a/wapstack/wapmessageapi/sws/WapBoundCLWSP.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __CSWSWAPBOUNDCLWSPSERVICE_H__
-#define __CSWSWAPBOUNDCLWSPSERVICE_H__
-
-// Include definitions of ECOM interfaces for the WAP Messaging API
-#include <wapmessage.h>
-#include "ActiveSocket.h"
-#include "WapMessageApiAgent.h"
-
-class CSWSWapBoundCLWSPService : public CWapBoundCLWSPService
-/** 
-The WAP Messaging API, SWS WAP Stack binding. Implementation of the bound Connectionless WSP API.
-@internalComponent
-@released
-@since v8.0
-*/
-{
-public:
-	static CSWSWapBoundCLWSPService* NewL();
-	virtual ~CSWSWapBoundCLWSPService();
-
-public:
-
-	virtual TInt Connect(Wap::TBearer aBearer,Wap::TPort aPort, TBool aSecure);
-	virtual TInt MethodInvoke(Wap::TBearer aBearer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort, TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, const TUint8 aTransactionId);
-	virtual TInt MethodResult(TDes8& aReqHeaders, TDes8& aReqBody, TPckgBuf<TUint8>& aTransactionIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout);
-	virtual void CancelReq();
-	virtual TInt GetLocalPort(Wap::TPort& aPort);
-	virtual TInt GetLocalAddress(HBufC8*& aLocalHost);
-	virtual TInt GetBearer(Wap::TBearer& aBearer);
-	virtual TInt GetServerAddress(HBufC8*& aServerAddress);
-private:
-	CSWSWapBoundCLWSPService();
-	void ConstructL();
-
-
-private:
-	/**
-	the agent instance which actually handles wsp PDU.
-	*/
-	CWspMessageApiAgent* iAgent;
-
-};
-
-#endif // __CSWSWAPBOUNDCLWSPSERVICE_H__

--- a/wapstack/wapmessageapi/sws/WapBoundWDP.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,227 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include "WapBoundWDP.h"
-#include "WapMsgUtils.h"
-
-
-CSWSWapBoundWDPService* CSWSWapBoundWDPService::NewL()
-/**
-Static new function
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	CSWSWapBoundWDPService* me = new(ELeave)CSWSWapBoundWDPService();
-	CleanupStack::PushL(me);
-	me->ConstructL();
-	CleanupStack::Pop(me);
-	return me;
-	}
-
-CSWSWapBoundWDPService::CSWSWapBoundWDPService()
-	: CWapBoundDatagramService()
-/**
-Constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-
-CSWSWapBoundWDPService::~CSWSWapBoundWDPService()
-/**
-Destructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	delete iAgent;	
-	}
-
-void CSWSWapBoundWDPService::ConstructL()
-/**
-Second Phase Constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	// Parent class construction
-	CWapBoundDatagramService::ConstructL();
-	iAgent=CWdpMessageApiAgent::NewL();	
-	}
-
-TInt CSWSWapBoundWDPService::Connect(Wap::TBearer aBearer, Wap::TPort aPort, TInetAddr /*aInetAddr*/)
-/** 
-Connect to the SWS, opening an endpoint that can be used to listen for subsequent incoming datagrams.
-@internalComponent
-@released
-@since v8.0
-@param aBearer the bearer to listen on (use EAll for all bearers)
-@param aPort the port to listen on. If set to 0, a local port will be chosen for the client's first SendTo
-@param aInetAddr the ip address of the network interface that should be used in a multihomed system.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->Connect(aBearer, aPort, EFalse);
-	}
-
-TInt CSWSWapBoundWDPService::Connect(Wap::TBearer aBearer, Wap::TPort aPort)
-/**
-Connect to the SWS, opening an endpoint that can be used to listen for subsequent incoming datagrams.
-@internalComponent
-@released
-@since v8.0
-@param aBearer the bearer to listen on (use EAll for all bearers)
-@param aPort the port to listen on. If set to 0, a local port will be chosen for the client's first SendTo
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TInetAddr inetAddr( KInetAddrAny, 0);
-	return (Connect(aBearer, aPort, inetAddr));
-	}
-
-TInt CSWSWapBoundWDPService::SendTo(const TDesC8& aRemoteHost, Wap::TPort aRemotePort,
-									 const TDesC8& aBuffer, Wap::TBearer aBearer)
-/**
-Send data to a remote endpoint.
-@internalComponent
-@released
-@since v8.0
-@param aRemoteHost the bearer-dependent address of the remote host to which the data will be sent
-@param aRemotePort the port on the remote host to which the data will be sent
-@param aBuffer the data buffer to be written over the connection
-@param aBearer the bearer to be used, if the bound connection was opened with 'all'
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->SendWdpMessage(aBuffer, aRemoteHost, aRemotePort, aBearer);
-	}
-
-TInt CSWSWapBoundWDPService::AwaitRecvDataSize(TPckg<TUint16>& aDataSizePckg, TRequestStatus& aReqStatus)
-/**
-Wait for a datagram to be received, and discover how large a buffer is required to retrieve it.
-This asyncronous method waits for a datagram to be received and will then complete allowing the client to discover how large a buffer
-is needed to retrieve the entire datagram that has been received.
-A subsiquent call to RecvFrom with a buffer of sufficent size will then allow the client to retrieve the datagram fully.
-@internalComponent
-@released
-@since v8.0
-@param aDataSizePckg the size of data subsequently received, in bytes
-@param aReqStatus used to signal when a data size is known
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->AwaitRecvDataSize(aDataSizePckg, aReqStatus);
-	}
-
-TInt CSWSWapBoundWDPService::RecvFrom(TDes8& aRemoteHost, Wap::TPort& aRemotePort, TDes8& aBuffer,
-									  TBool& aTruncated, TRequestStatus& aReqStatus, TUint32 aTimeout)
-/**
-receive data on a bound port.
-An asynchronous notification is sent to the client when data arrives.
-@internalComponent
-@released
-@since v8.0
-@param aRemoteHost the bearer-dependent address of the remote host from which the data was received
-@param aRemotePort the port on the remote host from which the data was received
-@param aBuffer a client-allocated data buffer to be filled with data received. Data that overflows the buffer is discarded.
-@param aTruncated indicates whether the received datagram was truncated to fit in the client's supplied buffer
-@param aReqStatus used to notify the client that a datagram was received
-@param aTimeout an optional millisecond time-out which allows a timed read to be made.  If no data is received 
-within the timeout period the request completes with KErrTimedOut. If a value of 0 is supplied the timeout is infinite.
-@retval TInt KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->ReceiveWdpMessage(aRemoteHost, aRemotePort, aBuffer, aTruncated, aReqStatus, aTimeout);
-	}
-
-void CSWSWapBoundWDPService::CancelRecv()
-/**
-Cancel a previously requested asynchronous RecvFrom or AwaitRecvDataSize notification. 
-If a datagram arrives at the local host, it will be discarded.
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	iAgent->CancelRequest();
-	}
-
-TInt CSWSWapBoundWDPService::GetLocalPort(Wap::TPort& aPort)
-/** 
-Get the local port of this endpoint.Useful if one was chosen automatically.
-@internalComponent
-@released
-@since v8.0
-@param aPort the port number
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetLocalPort(aPort);
-	}
-
-TInt CSWSWapBoundWDPService::GetLocalAddress(HBufC8*& aLocalHost)
-/**
-Get the local address of this endpoint.
-@internalComponent
-@released
-@since v8.0
-@param aLocalHost the address of the local host. A reference to a HBufC8 pointer should 
-be passed in. This pointer MUST be null! A HBufC8 will be allocated to hold the address, ownership 
-of this buffer will be passed over to the client.
-@returns TInt KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetLocalAddress(aLocalHost);
-	}
-
-TInt CSWSWapBoundWDPService::GetBearer(Wap::TBearer& aBearer)
-/**
-Get the bearer on which a received datagram arrived.
-Useful when EAll was specified in Connect()
-@internalComponent
-@released
-@since v8.0
-@param aBearer the bearer
-@returns TInt KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetBearer(aBearer);
-	}
-
-TInt CSWSWapBoundWDPService::GetDatagramSizes(TUint16& aMaxSize, TUint16& aNominalSize)
-/**
-Query the WDP bearer for its maximum datagram size and its nominal datagram size.
-@internalComponent
-@released
-@since v8.0
-@param aMaxSize the maximum datagram size
-@param aNominalSize the nominal datagram size (nominal = size within which a datagram won't
-have to be split into smaller individual messages and then re-assembled at the other end).
-This will fail for a stream connection
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	// Can only retrieve this info from the capcodec when its a connection, not datagram!
-	aMaxSize = KWapStackMaxDatagramSize;
-	aNominalSize = KWapStackNorminalDatagramSize;
-	return KErrNone;
-	}
-

--- a/wapstack/wapmessageapi/sws/WapBoundWDP.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __CSWSWAPBOUNDWDPSERVICE_H__
-#define __CSWSWAPBOUNDWDPSERVICE_H__
-
-// Include definitions of ECOM interfaces for the WAP Messaging API
-#include <wapmessage.h>
-#include "WapMessageApiAgent.h"
-
-class CSWSWapBoundWDPService : public CWapBoundDatagramService
-/** 
-The WAP Messaging API, SWS WAP Stack binding. Implementation of the bound WDP API.
-@internalComponent
-@released
-@since v8.0
-*/
-{
-public:
-	static CSWSWapBoundWDPService* NewL();	
-	virtual ~CSWSWapBoundWDPService();
-
-public:
-	virtual TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort, TInetAddr aInetAddr);
-	virtual TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort);
-	virtual TInt SendTo(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, const TDesC8& aBuffer,Wap::TBearer aBearer);
-	virtual TInt AwaitRecvDataSize(TPckg<TUint16>& aDataSizePckg, TRequestStatus& aReqStatus);
-	virtual TInt RecvFrom(TDes8& aRemoteHost, Wap::TPort& aRemotePort, TDes8& aBuffer, TBool& aTruncated, TRequestStatus& aReqStatus, TUint32 aTimeout);
-	virtual void CancelRecv();
-	virtual TInt GetLocalPort(Wap::TPort& aPort);
-	virtual TInt GetLocalAddress(HBufC8*& aLocalHost);
-	virtual TInt GetBearer(Wap::TBearer& aBearer);
-	virtual TInt GetDatagramSizes(TUint16& aMaxSize, TUint16& aNominalSize);
-
-private:
-	CSWSWapBoundWDPService();
-	void ConstructL();
-
-private:
-	/**
-	the agent instance which actually handles wdp PDU.
-	*/
-	CWdpMessageApiAgent* iAgent;
-};
-
-
-#endif // __CSWSWAPBOUNDWDPSERVICE_H__

--- a/wapstack/wapmessageapi/sws/WapFullySpecCLPush.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include "WapFullySpecCLPush.h"
-#include "WapMsgUtils.h"
-#include <wapmsgerr.h>
-
-CSWSWapFullySpecCLPushService* CSWSWapFullySpecCLPushService::NewL()
-/**
-Static new function
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	CSWSWapFullySpecCLPushService* me = new(ELeave)CSWSWapFullySpecCLPushService();
-	CleanupStack::PushL(me);
-	me->ConstructL();
-	CleanupStack::Pop(me);
-	return me;
-	}
-
-CSWSWapFullySpecCLPushService::~CSWSWapFullySpecCLPushService()
-/**
-Destructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	delete iAgent;
-	}
-
-CSWSWapFullySpecCLPushService::CSWSWapFullySpecCLPushService()
-/**
-Constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-
-void CSWSWapFullySpecCLPushService::ConstructL()
-/**
-Second Phase Constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	// Parent class construction
-	CWapFullySpecCLPushService::ConstructL();
-	iAgent=CWspMessageApiAgent::NewL();
-	}
-
-TInt CSWSWapFullySpecCLPushService::Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure, TInetAddr /*aInetAddr*/)
-/**
-Opens a socket which is to be used only with a single, named remote host.
-@internalComponent
-@released
-@since v8.0
-@param aRemoteHost the bearer-dependent address of the remote host with which the data will be exchanged
-@param aRemotePort the port on the remote host to which data will be sent
-@param aBearer the bearer to use (not EAll)
-@param aSecure security flag indicates whether WTLS will be used or not
-@param aInetAddr the address of the adapter to use
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if(aSecure) 
-		{
-		return KErrNotSupported;
-		}
-	return iAgent->Connect(aRemoteHost, aRemotePort, aBearer, aSecure);
-	}
-
-TInt CSWSWapFullySpecCLPushService::Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure)
-/**
-Opens a socket which is to be used only with a single, named remote host.
-@internalComponent
-@released
-@since v8.0
-@param aRemoteHost (in) the bearer-dependent address of the remote host with which the data will be exchanged
-@param aRemotePort (in) the port on the remote host to which data will be sent
-@param aBearer (in) the bearer to use (not EAll)
-@param aSecure (in) security flag indicates whether WTLS will be used or not
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TInetAddr inetAddr( KInetAddrAny, 0);
-	return( Connect(aRemoteHost, aRemotePort, aBearer, aSecure, inetAddr) );
-	}
-
-TInt CSWSWapFullySpecCLPushService::AwaitPush(TDes8& aPushHeaders, TDes8& aPushBody, TPckgBuf<TUint8>& aPushIdPckg, TRequestStatus& aReqStatus)
-/**
-Request an asynchronous notification upon arrival of the next push messages on the listening connection.
-The request completes upon receipt of the message, filling the buffers with as much received data as possible.
-A return code will indicate whether further data remains.  The call must be re-issued for subsequent messages
-or to receive remaining data from a previous push message.
-@internalComponent
-@released
-@since v8.0
-@param aPushHeaders (out) (client-allocated) - when a push message arrives the header data is written here
-@param aPushBody (out) (client-allocated) - when a push message arrives the body data is written here
-@param aPushIdPckg (out) when a push message arrives an integer ID that uniquely specifies the message is written here
-@param aReqStatus (inout) used by the service provider to notify the client when a push has arrived
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TInt err = iAgent->ReceiveWspMessage(aPushHeaders, aPushBody, aPushIdPckg, iWspStatus, aReqStatus, 0);
-	if(err == Wap::EMoreData)
-	{
-		return KErrNone;
-	}
-	return err;
-	}
-
-void CSWSWapFullySpecCLPushService::CancelAwaitPush()
-/**
-Cancel a previously-requested push message notification.  If a push message arrives the client will not be notified.
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	iAgent->CancelRequest();
-	}
-
-TInt CSWSWapFullySpecCLPushService::GetLocalPort(Wap::TPort& aPort)
-/**
-Get the local port of this endpoint.Useful if one was chosen automatically.
-@internalComponent
-@released
-@since v8.0
-@param aPort (out) the port number
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetLocalPort(aPort);
-	}
-
-TInt CSWSWapFullySpecCLPushService::GetLocalAddress(HBufC8*& aLocalHost)
-/**
-Get the local address of this endpoint.
-@internalComponent
-@released
-@since v8.0
-@param aLocalHost (inout) the address of the local host. A reference to a HBufC8 pointer should 
-be passed in. This pointer MUST be null! A HBufC8 will be allocated to hold the address, ownership 
-of this buffer will be passed over to the client.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetLocalAddress(aLocalHost);
-	}
-

--- a/wapstack/wapmessageapi/sws/WapFullySpecCLPush.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __CSWSWAPFULLYSPECCLPUSHSERVICE_H__
-#define __CSWSWAPFULLYSPECCLPUSHSERVICE_H__
-
-// Include definitions of ECOM interfaces for the WAP Messaging API
-#include <wapmessage.h>
-#include "WapMessageApiAgent.h"
-
-class CSWSWapFullySpecCLPushService : public CWapFullySpecCLPushService
-/** 
-The WAP Messaging API, SWS WAP Stack binding. Implementation of the fully-specified connectionless push API.
-@internalComponent
-@released
-@since v8.0
-*/
-{
-public:
-	static CSWSWapFullySpecCLPushService* NewL();
-	virtual ~CSWSWapFullySpecCLPushService();
-
-public:
-	virtual TInt Connect(const TDesC8& aRemoteHost,
-					  Wap::TPort aRemotePort,
-					  Wap::TBearer aBearer,
-					  TBool aSecure,
-					  TInetAddr aInetAddr);
-	virtual TInt Connect(const TDesC8& aRemoteHost,
-					  Wap::TPort aRemotePort,
-					  Wap::TBearer aBearer,
-					  TBool aSecure);
-	virtual TInt AwaitPush(TDes8& aPushHeaders,
-						  TDes8& aPushBody,
-						  TPckgBuf<TUint8>& aPushIdPckg,
-						  TRequestStatus& aReqStatus);
-	virtual void CancelAwaitPush();
-	virtual TInt GetLocalPort(Wap::TPort& aPort);
-	virtual TInt GetLocalAddress(HBufC8*& aLocalHost);
-
-private:
-	CSWSWapFullySpecCLPushService();
-	void ConstructL();
-
-private:
-	/**
-	the agent instance which actually handles wsp PDU.
-	*/
-	CWspMessageApiAgent* iAgent;
-	/**
-	the wsp status in received wsp PDU.
-	*/
-	TWSPStatus iWspStatus;
-};
-
-
-#endif // __CSWSWAPFULLYSPECCLPUSHSERVICE_H__

--- a/wapstack/wapmessageapi/sws/WapFullySpecCLWSP.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include "WapFullySpecCLWSP.h"
-#include "WapMsgUtils.h"
-#include "CLWSPPduHandler.h"
-
-CSWSWapFullySpecCLWSPService* CSWSWapFullySpecCLWSPService::NewL()
-/**
-Static new function
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	CSWSWapFullySpecCLWSPService* me = new(ELeave)CSWSWapFullySpecCLWSPService();
-	CleanupStack::PushL(me);
-	me->ConstructL();
-	CleanupStack::Pop(me);
-	return me;
-	}
-
-CSWSWapFullySpecCLWSPService::CSWSWapFullySpecCLWSPService()
-	: CWapFullySpecCLWSPService()
-/**
-Constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-
-CSWSWapFullySpecCLWSPService::~CSWSWapFullySpecCLWSPService()
-/**
-Destructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	delete iAgent;
-	}
-
-void CSWSWapFullySpecCLWSPService::ConstructL()
-/**
-Second phase constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	// Parent class construction
-	CWapFullySpecCLWSPService::ConstructL();
-	iAgent=CWspMessageApiAgent::NewL();
-	}
-
-TInt CSWSWapFullySpecCLWSPService::Connect(const TDesC8& aRemoteHost, Wap::TPort aPort, Wap::TBearer aBearer, TBool aSecure)
-/**
-Opens a end-point which is to be used only with a single, named remote host.
-@internalComponent
-@released
-@since v8.0
-@param aRemoteHost the bearer-dependent address of the remote host with which the data will be exchanged
-@param aPort the port on the remote host to which data will be sent
-@param aBearer the bearer to use (not EAll)
-@param aSecure security flag indicates whether WTLS will be used or not
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if(aSecure) 
-		{
-		return KErrNotSupported;
-		}
-	return iAgent->Connect(aRemoteHost, aPort, aBearer, aSecure);
-	}
-
-TInt CSWSWapFullySpecCLWSPService::MethodInvoke(TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, const TUint8 aTransactionId)
-/**
-A synchronous call to send a method invoke method to the remote host.
-@internalComponent
-@released
-@since v8.0
-@param aMethod (in) the method that will be invoked on server
-@param aURI (in) the uri to build wsp message
-@param aReqHeaders (in) the wsp header to be used to build method invoke message
-@param aReqBody (in) the wsp body to be used to build method invoke message
-@param aTransactionId (in) the transaction Id of the method invoke message
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->SendWspMessage(TWSPPduType(aMethod), aURI, aReqHeaders, aReqBody, aTransactionId);
-	}
-
-TInt CSWSWapFullySpecCLWSPService::MethodResult(TDes8& aReqHeaders, TDes8& aReqBody, TPckgBuf<TUint8>& aTransactionIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout)
-/**
-Request an asynchronous notification upon arrival of the method result messages on the listening connection.
-The request completes upon receipt of the message, filling the buffers with as much received data as possible.
-A return code will indicate whether further data remains.  The call must be re-issued for subsequent messages
-or to receive remaining data from a previous method result message.
-@internalComponent
-@released
-@since v8.0
-@param aReqHeaders (out) (client-allocated) - when a method result message arrives the header data is written here
-@param aReqBody (out) (client-allocated) - when a method result message arrives the body data is written here
-@param aTransactionIdPckg (out) when a method result message arrives an integer ID that uniquely specifies the message is written here
-@param aWspStatus (out) when a method result message arrives, the wsp status is written here.
-@param aReqStatus (inout) used by the service provider to notify the client when a method result has arrived
-@param aTimeout (in) an optional millisecond time-out which allows a timed read to be made.  If no data is received 
-within the timeout period the request completes with KErrTimedOut. If a value of 0 is supplied the timeout is infinite.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->ReceiveWspMessage(aReqHeaders, aReqBody, aTransactionIdPckg, aWspStatus, aReqStatus, aTimeout);
-	}
-
-void CSWSWapFullySpecCLWSPService::CancelReq()
-/**
-Cancel a previously-requested method result notification.  If a method result message arrives the client will not be notified.
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	iAgent->CancelRequest();
-	}
-
-TInt CSWSWapFullySpecCLWSPService::GetLocalPort(Wap::TPort& aPort)
-/**
-Get the local port of this endpoint.Useful if one was chosen automatically.
-@internalComponent
-@released
-@since v8.0
-@param aPort (out) the port number
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetLocalPort(aPort);
-	}
-
-TInt CSWSWapFullySpecCLWSPService::GetLocalAddress(HBufC8*& aLocalHost)
-/**
-Get the local address of this endpoint.
-@internalComponent
-@released
-@since v8.0
-@param aLocalHost (inout) the address of the local host. A reference to a HBufC8 pointer should 
-be passed in. This pointer MUST be null! A HBufC8 will be allocated to hold the address, ownership 
-of this buffer will be passed over to the client.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetLocalAddress(aLocalHost);
-	}

--- a/wapstack/wapmessageapi/sws/WapFullySpecCLWSP.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __CSWSWAPFULLYSPECCLWSPSERVICE_H__
-#define __CSWSWAPFULLYSPECCLWSPSERVICE_H__
-
-// Include definitions of ECOM interfaces for the WAP Messaging API
-#include <wapmessage.h>
-#include "WapMessageApiAgent.h"
-
-class CSWSWapFullySpecCLWSPService : public CWapFullySpecCLWSPService
-/** 
-The WAP Messaging API, SWS WAP Stack binding. Implementation of Fully-Specified Connectionless WSP API
-@internalComponent
-@released
-@since v8.0
-*/
-{
-public:
-	static CSWSWapFullySpecCLWSPService* NewL();
-	virtual ~CSWSWapFullySpecCLWSPService();
-public:
-	virtual TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure);
-	virtual TInt MethodInvoke(TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, TUint8 aTransactionId);
-	virtual TInt MethodResult(TDes8& aReqHeaders, TDes8& aReqBody, TPckgBuf<TUint8>& aTransactionIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout);
-	virtual void CancelReq();
-	virtual TInt GetLocalPort(Wap::TPort& aPort);
-	virtual TInt GetLocalAddress(HBufC8*& aLocalHost);
-protected:
-	CSWSWapFullySpecCLWSPService();
-	void ConstructL();
-private:
-	/**
-	the agent instance which actually handles wsp PDU.
-	*/
-	CWspMessageApiAgent* iAgent;
-};
-
-#endif //__CSWSWAPFULLYSPECCLWSPSERVICE_H__

--- a/wapstack/wapmessageapi/sws/WapFullySpecWDP.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include "WapFullySpecWDP.h"
-#include "WapMsgUtils.h"
-
-CSWSWapFullySpecWDPService* CSWSWapFullySpecWDPService::NewL()
-/**
-Static new function
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	CSWSWapFullySpecWDPService* me = new(ELeave)CSWSWapFullySpecWDPService();
-	CleanupStack::PushL(me);
-	me->ConstructL();
-	CleanupStack::Pop(me);
-	return me;
-	}
-
-CSWSWapFullySpecWDPService::CSWSWapFullySpecWDPService()
-	: CWapFullySpecDatagramService()
-/**
-Constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	}
-
-CSWSWapFullySpecWDPService::~CSWSWapFullySpecWDPService()
-/**
-Destructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	delete iAgent;
-	}
-
-void CSWSWapFullySpecWDPService::ConstructL()
-/**
-Second Phase Constructor
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	// Parent class construction
-	CWapFullySpecDatagramService::ConstructL();
-	iAgent=CWdpMessageApiAgent::NewL();
-	}
-
-TInt CSWSWapFullySpecWDPService::Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TInetAddr /*aInetAddr*/)
-/**
-Connect to the SWS, opening an endpoint which is to be used only with a single, named remote host.All CWapFullySpecDatagramService implementaions must automatically close this endpoint upon destruction.
-@internalComponent
-@released
-@since v8.0
-@param aRemoteHost (in) the bearer-dependent address of the remote host with which the data will be exchanged
-@param aRemotePort (in) the port on the remote host to which data will be sent
-@param aBearer (in) the bearer to use (not EAll)
-@param aInetAddr (in) the ip address of the network interface that should be used in a multihomed system.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->Connect(aRemoteHost, aRemotePort, aBearer, EFalse);
-	}
-
-TInt CSWSWapFullySpecWDPService::Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer)
-/**
-Connect to the wapstack, opening an endpoint which is to be used only with a single, named remote host.
-@internalComponent
-@released
-@since v8.0
-@param aRemoteHost (in) the bearer-dependent address of the remote host with which the data will be exchange
-@param aRemotePort (in) the port on the remote host to which data will be sent
-@param aBearer (in) the bearer to use (not EAll)
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TInetAddr inetAddr( KInetAddrAny, 0);
-	return(Connect(aRemoteHost, aRemotePort, aBearer, inetAddr));
-	}
-
-TInt CSWSWapFullySpecWDPService::Send(const TDesC8& aBuffer)
-/**
-Send data on a fully-specified connection.
-@internalComponent
-@released
-@since v8.0
-@param aBuffer (in) the data buffer to be written over the connection
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->SendWdpMessage(aBuffer);
-	}
-
-TInt CSWSWapFullySpecWDPService::AwaitRecvDataSize(TPckg<TUint16>& aDataSizePckg, TRequestStatus& aReqStatus)
-/**
-receive data on a bound port.
-@internalComponent
-@released
-@since v8.0
-An asynchronous notification is sent to the client when data arrives.
-@param aDataSizePckg size of data received
-@param aReqStatus (inout) used to notify the client that a datagram was received
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->AwaitRecvDataSize(aDataSizePckg, aReqStatus);
-	}
-
-TInt CSWSWapFullySpecWDPService::Recv(TDes8& aBuffer, TBool& aTruncated, TRequestStatus& aReqStatus, TUint32 aTimeout)
-/**
-receive data on a bound port.
-An asynchronous notification is sent to the client when data arrives.
-@internalComponent
-@released
-@since v8.0
-@param aBuffer (out) a client-allocated data buffer to be filled with data received. Data that overflows the buffer is discarded.
-@param aTruncated (out) indicates whether the received datagram was truncated to fit in the client's supplied buffer
-@param aReqStatus (inout) used to notify the client that a datagram was received
-@param aTimeout (in) an optional millisecond time-out which allows a timed read to be made.  If no data is received
-within the timeout period the request completes with KErrTimedOut. If a value of 0 is supplied the timeout is infinite.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->ReceiveWdpMessage(iHostName, iPort, aBuffer, aTruncated, aReqStatus, aTimeout);
-	}
-
-void CSWSWapFullySpecWDPService::CancelRecv()
-/**
-Cancel a previously requested asynchronous Recv or AwaitRecvDataSize notification.
-If a datagram arrives at the local host, it will be discarded.
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	iAgent->CancelRequest();
-	}
-
-TInt CSWSWapFullySpecWDPService::GetLocalPort(Wap::TPort& aPort)
-/**
-Get the local port of this endpoint.Useful if one was chosen automatically.
-@internalComponent
-@released
-@since v8.0
-@param aPort (out) the port number
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-
-	{
-	return iAgent->GetLocalPort(aPort);
-	}
-
-TInt CSWSWapFullySpecWDPService::GetLocalAddress(HBufC8*& aLocalHost)
-/**
-Get the local address of this endpoint.
-@internalComponent
-@released
-@since v8.0
-@param aLocalHost (inout) the address of the local host. A reference to a HBufC8 pointer should
-be passed in. This pointer MUST be null! A HBufC8 will be allocated to hold the address, ownership
-of this buffer will be passed over to the client.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	return iAgent->GetLocalAddress(aLocalHost);
-	}
-
-TInt CSWSWapFullySpecWDPService::GetDatagramSizes(TUint16& aMaxSize, TUint16& aNominalSize)
-/**
-Query the WDP bearer for its maximum datagram size and its nominal datagram size.
-@internalComponent
-@released
-@since v8.0
-@param aMaxSize (out) the maximum datagram size
-@param aNominalSize (out) the nominal datagram size (nominal = size within which a datagram won't
-have to be split into smaller individual messages and then re-assembled at the other end).
-This will fail for a stream connection
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	// Can only retrieve this info from the capcodec when its a connection, not datagram!
-	aMaxSize = KWapStackMaxDatagramSize;
-	aNominalSize = KWapStackNorminalDatagramSize;
-	return KErrNone;
-	}
-

--- a/wapstack/wapmessageapi/sws/WapFullySpecWDP.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __CSWSWAPFULLYSPECWDPSERVICE_H__
-#define __CSWSWAPFULLYSPECWDPSERVICE_H__
-
-// Include definitions of ECOM interfaces for the WAP Messaging API
-#include <wapmessage.h>
-#include "WapMessageApiAgent.h"
-
-class CSWSWapFullySpecWDPService : public CWapFullySpecDatagramService
-/** 
-The WAP Messaging API, SWS WAP Stack binding.  Implementation of the Fully-Specified WDP API.
-@internalComponent
-@released
-@since v8.0
-*/
-{
-public:
-	static CSWSWapFullySpecWDPService* NewL();
-	virtual ~CSWSWapFullySpecWDPService();
-
-public:
-	virtual TInt Connect(const TDesC8& aRemoteHost,
-						 Wap::TPort aRemotePort,
-						 Wap::TBearer aBearer,
-						 TInetAddr aInetAddr);
-	virtual TInt Connect(const TDesC8& aRemoteHost,
-						 Wap::TPort aRemotePort,
-						 Wap::TBearer aBearer);
-	virtual TInt Send(const TDesC8& aBuffer);
-	virtual TInt AwaitRecvDataSize(TPckg<TUint16>& aDataSizePckg, TRequestStatus& aReqStatus);
-	virtual TInt Recv(TDes8& aBuffer,
-					  TBool& aTruncated,
-					  TRequestStatus& aReqStatus,
-					  TUint32 aTimeout);
-	virtual void CancelRecv();
-	virtual TInt GetLocalPort(Wap::TPort& aPort);
-	virtual TInt GetLocalAddress(HBufC8*& aLocalHost);
-	virtual TInt GetDatagramSizes(TUint16& aMaxSize, TUint16& aNominalSize);
-
-private:
-	CSWSWapFullySpecWDPService();
-	void ConstructL();
-
-private:
-	/**
-	the agent instance which actually handles wdp PDU.
-	*/
-	CWdpMessageApiAgent* iAgent;
-	/**
-	the remote host name.
-	*/
-	TBuf8<KMaxSockAddrSize> iHostName;
-	/**
-	the remote port
-	*/
-	Wap::TPort iPort;
-};
-
-#endif // __CSWSWAPFULLYSPECWDPSERVICE_H__

--- a/wapstack/wapmessageapi/sws/WapMessageApiAgent.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1187 +0,0 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "WapMessageApiAgentTraces.h"
-#endif
-
-#include "WapMessageApiAgent.h"
-#include "WapMsgUtils.h"
-#include "CLWSPPduHandler.h"
-#include <es_wsms.h>
-#include <wapmsgerr.h>
-
-CWapAsyncCallBack::CWapAsyncCallBack( const TCallBack& aCallBack, TInt aPriority )
-:   CActive( aPriority ), iCallBack( aCallBack )
-	{
-	CActiveScheduler::Add( this );
-	}
-
-CWapAsyncCallBack::~CWapAsyncCallBack()
-	{
-	Cancel();
-	}
-
-void CWapAsyncCallBack::CallBack()
-	{
-	if  ( !IsActive() )
-		{
-		TRequestStatus* status = &iStatus;
-		User::RequestComplete( status, KErrNone );
-		SetActive();
-		}
-	}
-
-void CWapAsyncCallBack::RunL()
-	{
-	iCallBack.CallBack();
-	}
-
-void CWapAsyncCallBack::DoCancel()
-	{
-	// Empty - request already completed in CallBack()
-	}
-
-//
-//CWapMessageApiAgent class Method
-//
-CWapMessageApiAgent::CWapMessageApiAgent(TWapMessageType aMessageType):iMessageType(aMessageType)
-/**
-Constuctor.
-@internalComponent
-@released since v8.0
-@param aMessageType the message type that handled by this agent
-*/
-	{
-	}
-
-CWapMessageApiAgent::~CWapMessageApiAgent()
-/**
-Destrutor
-@internalComponent.
-@released since v8.0
-*/
-	{
-	TInt count=iBearers.Count();
-	for (TInt i=0; i<count; i++)
-		{
-		iBearers[i]->Cancel();
-		iBearers[i]->CleanUpData();
-		}
-	iBearers.ResetAndDestroy();
-	iSocketServ.Close();
-	if (iTimeoutTimer)
-		{
-		iTimeoutTimer->Cancel();		
-		delete iTimeoutTimer;
-		}
-	if (iAsyncReadCompletion)
-		{
-		delete iAsyncReadCompletion;
-		}
-	}
-
-TInt CWapMessageApiAgent::CompleteReading(TAny* aAgent)
-	{
-	CWapMessageApiAgent* agent = reinterpret_cast<CWapMessageApiAgent*>(aAgent);
-	return agent->DoCompleteReading();
-	}
-
-TInt CWapMessageApiAgent::DoCompleteReading()
-	{
-	iRequestActive=EFalse;
-	User::RequestComplete(iRequestStatus, iLastReadingError);
-	return KErrNone;
-	}
-void CWapMessageApiAgent::ConstructL()
-/**
-Second Phase Constructor
-@internalComponent.
-@released since v8.0
-*/
-	{
-	iTimeoutTimer = CTimeOutTimer::NewL(*this);
-	TCallBack callback = TCallBack(CompleteReading, this);
-	iAsyncReadCompletion = new (ELeave) CWapAsyncCallBack(callback, CActive::EPriorityHigh);
-	User::LeaveIfError(iSocketServ.Connect());
- 	}
-
-CActiveSocket* CWapMessageApiAgent::GetActiveSocketByBearer(Wap::TBearer aBearer)
-/**
-To Get the CActiveSocket from the Array by Bearer type. 
-@internalComponent.
-@released since v8.0
-@param aBearer (in)the bearer type of the CActiveSocket
-@returns the pointer of CAtiveSocket
-*/
-	{
-	TInt count=iBearers.Count();
-	for (TInt i=0; i<count; i++)
-		{
-		Wap::TBearer bearer=iBearers[i]->GetBearerType();
-		if (bearer==aBearer)
-			{
-			return iBearers[i];
-			}
-		else
-			{
-			if ((aBearer>=Wap::ESMS7 && aBearer<=Wap::EWAPSMS) && (bearer>=Wap::ESMS7 && bearer<=Wap::EWAPSMS))
-				{
-				return iBearers[i];
-				}
-			}
-		}
-	return NULL;
-	}
-
-CActiveSocket* CWapMessageApiAgent::GetActiveSocketByStatus(TWapMessageState aState)
-/**
-To Get the CActiveSocket from the Array by Data State. 
-@internalComponent.
-@released since v8.0
-@param aState (in)the Data state of the CActiveSocket
-@returns the pointer of CAtiveSocket
-*/
-	{
-	TInt count=iBearers.Count();
-	for (TInt i=0; i<count; i++)
-		{
-		if (iBearers[i]->GetDataState()==aState)
-			{
-			return iBearers[i];
-			}
-		}
-	return NULL;
-	}
-
-void CWapMessageApiAgent::TimerExpired()
-/**
-To handle the receive time out.
-@internalComponent.
-@released since v8.0
-*/
-	{
-	TInt count=iBearers.Count();
-	for (TInt i=0; i<count; i++)
-		{
-		iBearers[i]->Cancel();
-		iBearers[i]->CleanUpData();
-		}
-	iRequestActive=EFalse;
-	User::RequestComplete(iRequestStatus, KErrTimedOut);
-	}
-
-TInt CWapMessageApiAgent::GetLocalPort(Wap::TPort& aLocalPort)
-/**
-To Get local port of the last received packet
-@internalComponent.
-@released since v8.0
-@param aLocalPort (out)the reference of the localPort.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if (!iIsOpen)
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETLOCALPORT_1, "CWapMessageApiAgent::GetLocalPort: Trying to GetLocalPort on unconnected API.");
-        return KErrNotReady;
-		}
-	CActiveSocket* sock=GetActiveSocketByBearer(iLastPduBearer);
-	if (!sock)
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETLOCALPORT_2, "CWapMessageApiAgent::GetLocalPort: Can not find Last Bearer.");
-        return Wap::EBearerError;
-		}
-	sock->GetLocalPort(aLocalPort);
-	return KErrNone;
-	}
-
-TInt CWapMessageApiAgent::GetLocalAddress(HBufC8*& aLocalHost)
-/**
-To Get local Address of the last received Packet
-@internalComponent.
-@released since v8.0
-@param aLocalHost (out)the reference of the localHost.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if (!iIsOpen)
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETLOCALADDRESS_1, "CWapMessageApiAgent::GetLocalAddress: Trying to GetLocalAddress on unconnected API.");
-		return KErrNotReady;
-		}
-	CActiveSocket* sock=GetActiveSocketByBearer(iLastPduBearer);
-	if (!sock)
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETLOCALADDRESS_2, "CWapMessageApiAgent::GetLocalAddress: Can not find Last Bearer");
-		return Wap::EBearerError;
-		}
-	TSockAddr& localHost=sock->GetLocalAddress();
-	TInt err=KErrNone;
-	TRAP(err, aLocalHost=localHost.AllocL())
-	if (err)
-		{
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETLOCALADDRESS_3, "CWapMessageApiAgent::GetLocalAddress: Alloc Memory Err=%d", err);
-		}
-	return err;
-	}
-
-TInt CWapMessageApiAgent::GetBearer(Wap::TBearer& aBearer)
-/**
-To Get Bearer of the last received packet
-@internalComponent.
-@released since v8.0
-@param aBearer (out)the reference of the Bearer.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if (!iIsOpen)
-		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETBEARER_1, "CWapMessageApiAgent::GetBearer: Trying to GetBearer on unconnected API.");
-		return KErrNotReady;
-		}
-	aBearer=iLastPduBearer;
-	return KErrNone;
-	}
-
-TInt CWapMessageApiAgent::GetServerAddress(HBufC8*& aServerHost)
-/**
-To Get Server Host of the last received packet
-@internalComponent.
-@released since v8.0
-@param aServerHost (out)the reference of the Server Host.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if (!iIsOpen)
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETSERVERADDRESS_1, "CWapMessageApiAgent::GetServerAddress: Trying to GetServerAddress on unconnected API.");
-		return KErrNotReady;
-		}
-	CActiveSocket* sock=GetActiveSocketByBearer(iLastPduBearer);
-	if (!sock)
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_GETSERVERADDRESS_2, "CWapMessageApiAgent::GetServerAddress: Can not find last error.");
-		return Wap::EBearerError;
-		}
-	return sock->GetRemoteAddress(aServerHost);
-	}
-
-void CWapMessageApiAgent::CancelRequest()
-/**
-To Cancel the client's request
-@internalComponent.
-@released since v8.0
-*/
-	{
-	if (iIsOpen)
-		{
-		TInt count=iBearers.Count();
-		for (TInt i=0; i<count; i++)
-			{
-			iBearers[i]->Cancel();
-			iBearers[i]->CleanUpData();
-			}
-		iTimeoutTimer->Cancel();
-		if (iRequestActive)
-			{
-			iRequestActive=EFalse;
-			iAsyncReadCompletion->Cancel();
-			User::RequestComplete(iRequestStatus, KErrCancel);
-			}
-		}
-	}
-
-TInt CWapMessageApiAgent::Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure)
-/**
-Opening an endpoint that can be used to listen for subsequent incoming datagrams.
-@internalComponent.
-@released since v8.0
-@param aBearer (In) the bearer to listen on
-@param aPort (In) the port to listen on.
-@param aSecure (In) security flag indicates whether WTLS will be used or not (Not Supported)
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TInetAddr inetAddr( KInetAddrAny, 0);
-	return (Connect(aBearer, aPort, aSecure, inetAddr));
-	}
-
-TInt CWapMessageApiAgent::Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool /*aSecure*/, TInetAddr /*aInetAddr*/)
-/**
-Opening an endpoint that can be used to listen for subsequent incoming datagrams.
-@internalComponent.
-@released since v8.0
-@param aBearer (In) the bearer to listen on
-@param aPort (In) the port to listen on.
-@param aSecure (In) security flag indicates whether WTLS will be used or not (Not Supported)
-@param aInetAddr (In) Not In Use.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TInt ret=KErrNone;
-	if (!iIsOpen)
-		{
-		TRAP(ret, CActiveSocket::NewL(iSocketServ, iBearers, aBearer, iMessageType, this, aPort))
-		if (ret!=KErrNone)
-			{
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_1, "CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d.",ret);
-			return ret;
-			}
-		iIsOpen=ETrue;
-		}
-	else
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_2, "CWapMessageApiAgent::Connect:Trying Connect twice to the API.");
-		ret=KErrInUse;
-		}
-	return ret;
-	}
-
-TInt CWapMessageApiAgent::Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool /*aSecure*/, TInt aSocketServHandle, RConnection* aConnection)
-/**
-Opening an endpoint that can be used to listen for subsequent incoming datagrams.
-@internalComponent.
-@released since v8.0
-@param aBearer (In) the bearer to listen on
-@param aPort (In) the port to listen on.
-@param aSecure (In) security flag indicates whether WTLS will be used or not (Not Supported)
-@param aSocketServHandle (In) The Socket Server ID.
-@param aConnection (In) The RConnection that shared with the client.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if (aSocketServHandle==0 || !aConnection)
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_1_1, "CWapMessageApiAgent::Connect:Parameter Error");
-		return KErrArgument;
-		}
-	TInt ret=KErrNone;
-	if (!iIsOpen)
-		{
-		iSocketServ.SetHandle(aSocketServHandle);
-		TRAP(ret, CActiveSocket::NewL(iSocketServ, iBearers, aBearer, iMessageType, this, aPort, aConnection))
-		if (ret!=KErrNone)
-			{
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_1_2, "CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d.", ret);
-			return ret;
-			}
-		iIsOpen=ETrue;
-		}
-	else
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_1_3, "CWapMessageApiAgent::Connect:Trying to Connect twice to the API.");
-		ret=KErrInUse;
-		}
-	return ret;
-	}
-
-TInt CWapMessageApiAgent::Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool /*aSecure*/, TInetAddr /*aInetAddr*/)
-/**
-Opens a socket which is to be used only with a single, named remote host.
-@internalComponent.
-@released since v8.0
-@param aRemoteHost (In) the name of the remote host to connect.
-@param aRemotePort (In) the port of the remote host to connect.
-@param aBearer (In) the bearer to be used
-@param aSecure (In) security flag indicates whether WTLS will be used or not (Not Supported)
-@param aInetAddr (In) Not In Use
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if (aBearer==Wap::EAll)
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_2_1, "CWapMessageApiAgent::SendWspMessage:Connect to EAll Error");
-		return Wap::EBearerError;
-		}
-	TInt ret=KErrNone;
-	if (!iIsOpen)
-		{
-		TSockAddr remoteAddr;
-		TRAP(ret, CSWSWapMsgUtils::BuildAddrL(remoteAddr, aBearer, aRemoteHost, aRemotePort))
-		if (ret!=KErrNone)
-			{
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_2_2, "CWapMessageApiAgent::Connect: BuildAddress err=%d.", ret);
-			return ret;
-			}
-		TRAP(ret, CActiveSocket::NewL(iSocketServ, iBearers, aBearer, iMessageType, this, remoteAddr))
-		if (ret!=KErrNone)
-			{
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_2_3, "CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d.", ret);
-			return ret;
-			}
-		iIsOpen=ETrue;
-		}
-	else
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_2_4, "CWapMessageApiAgent::Connect:Trying to Connect twice to the API.");
-		ret=KErrInUse;
-		}
-	return ret;
-	}
-
-TInt CWapMessageApiAgent::Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure)
-/**
-Opens a socket which is to be used only with a single, named remote host.
-@internalComponent.
-@released since v8.0
-@param aRemoteHost (In) the name of the remote host to connect.
-@param aRemotePort (In) the port of the remote host to connect.
-@param aBearer (In) the bearer to be used
-@param aSecure (In) security flag indicates whether WTLS will be used or not (Not Supported)
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TInetAddr inetAddr( KInetAddrAny, 0);
-	return (Connect(aRemoteHost, aRemotePort, aBearer, aSecure, inetAddr));
-	}
-
-TInt CWapMessageApiAgent::Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool /*aSecure*/, TInt aSocketServHandle, RConnection* aConnection)
-/**
-Opens a socket which is to be used only with a single, named remote host.
-@internalComponent.
-@released since v8.0
-@param aRemoteHost (In) the name of the remote host to connect.
-@param aRemotePort (In) the port of the remote host to connect.
-@param aBearer (In) the bearer to be used
-@param aSecure (In) security flag indicates whether WTLS will be used or not (Not Supported)
-@param aSocketServHandle (In) The Socket Server ID.
-@param aConnection (In) The RConnection that shared with the client.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if (aBearer==Wap::EAll)
-		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_3_1, "CWapMessageApiAgent::SendWspMessage:Connect to EAll Error");
-		return Wap::EBearerError;
-		}
-	if (aSocketServHandle==0 || !aConnection)
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_3_2, "CWapMessageApiAgent::Connect:Parameter Error");		
-		return KErrArgument;
-		}
-	TInt ret=KErrNone;
-	if (!iIsOpen)
-		{
-		iSocketServ.SetHandle(aSocketServHandle);
-		TSockAddr remoteAddr;
-		TRAP(ret, CSWSWapMsgUtils::BuildAddrL(remoteAddr, aBearer, aRemoteHost, aRemotePort))
-		if (ret!=KErrNone)
-			{
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_3_3, "CWapMessageApiAgent::Connect: BuildAddress err=%d.",ret);
-			return ret;
-			}
-		TRAP(ret, CActiveSocket::NewL(iSocketServ, iBearers, aBearer, iMessageType, this, remoteAddr, aConnection))
-		if (ret!=KErrNone)
-			{
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_3_4, "CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d.",ret);
-			return ret;
-			}
-		iIsOpen=ETrue;
-		}
-	else
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPMESSAGEAPIAGENT_CONNECT_3_5, "CWapMessageApiAgent::Connect:Connect to a connected API.");
-		ret=KErrInUse;
-		}
-	return ret;
-	}
-//
-//CWspMessageApiAgent class Methods
-//
-CWspMessageApiAgent* CWspMessageApiAgent::NewL()
-/**
-Static NEWL()
-@internalComponent
-@released since v8.0
-@returns CWspMessageApiAgent instance.
-*/
-	{
-	CWspMessageApiAgent* me = new(ELeave) CWspMessageApiAgent();
-	CleanupStack::PushL(me);
-	me->ConstructL();
-	CleanupStack::Pop(me);
-	return me;
-	}
-
-CWspMessageApiAgent::CWspMessageApiAgent():CWapMessageApiAgent(EWapWsp)
-/**
-Constructor
-@internalComponent
-@released since v8.0
-*/
-	{
-	}
-
-CWspMessageApiAgent::~CWspMessageApiAgent()
-/**
-Destructor
-@internalComponent
-@released since v8.0
-*/
-	{
-	}
-
-void CWspMessageApiAgent::ConstructL()
-/**
-Second Phase Constructor
-@internalComponent
-@released since v8.0
-*/
-	{
-	CWapMessageApiAgent::ConstructL();
-	}
-
-TInt CWspMessageApiAgent::SendWspMessage(Wap::TBearer aBearer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort, TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, TUint8 aTransactionId)
-/**
-Send Wsp Message to a remote host
-@internalComponent
-@released since v8.0
-@param aBearer (in) the bearer to be used
-@param aRemoteHost (in) The remote host to be sent.
-@param aRemotePort (in) The remote port to be sent.
-@param aMethod (in) The method to be invoked.
-@param aURI (in) The destination URI.
-@param aReqHeaders (in) The Wsp header of WSP message.
-@param aReqBody (in) The Wsp body of WSP message.
-@param aTransactionId (in) The transaction ID of WSP message.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if (!iIsOpen)
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1, "CWapMessageApiAgent::SendWspMessage:Tryig to send to unconnected API");
-		return KErrNotReady;
-		}
-	if (aBearer==Wap::EAll)
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_2, "CWapMessageApiAgent::SendWspMessage:Send to EAll Error");
-		return Wap::EBearerError;
-		}
-	HBufC8* sendBuf=NULL;
-	TInt err=KErrNone;
-	TSockAddr remoteAddr;
-	TRAP(err, CSWSWapMsgUtils::BuildAddrL(remoteAddr, aBearer, aRemoteHost, aRemotePort))
-	if (err!=KErrNone)
-		{
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_3, "CWapMessageApiAgent::SendWspMessage: BuildAddress err=%d.", err);
-		return err;
-		}
-	TRAP(err, CCLWSPPduHandler::PackWSPPduL(sendBuf, TWSPPduType(aMethod), aURI, aReqHeaders, aReqBody, aTransactionId))
-	if (err!=KErrNone)
-		{
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_4, "CWapMessageApiAgent::SendWspMessage:Pack Wsp Packet Error=%d", err);
-		return err;
-		}
-	CActiveSocket* sendSock=GetActiveSocketByBearer(aBearer);
-	if (sendSock)
-		{
-		if (aBearer==Wap::ESMS||aBearer==Wap::EWAPSMS)
-			{
-			TWapSmsDataCodingScheme codingScheme = EWapSms8BitDCS;
-			sendSock->Socket().SetOpt(KWapSmsOptionNameDCS,KWapSmsOptionLevel,codingScheme);
-			}
-		TRequestStatus status;
-		sendSock->Socket().SendTo(*sendBuf, remoteAddr, 0, status);
-		User::WaitForRequest(status);
-		err=status.Int();
-		}
-	else
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_5, "CWapMessageApiAgent::SendWspMessage: Can not find Bearer");
-		err=Wap::EBearerError;
-		}
-	delete sendBuf;
-	return err;
-	}
-
-TInt CWspMessageApiAgent::SendWspMessage(TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, TUint8 aTransactionId)
-/**
-Send Wsp Message to a remote host for fulluSpecified Interface
-@internalComponent
-@released since v8.0
-@param aMethod (in) The method to be invoked.
-@param aURI (in) The destination URI.
-@param aReqHeaders (in) The Wsp header of WSP message.
-@param aReqBody (in) The Wsp body of WSP message.
-@param aTransactionId (in) The transaction ID of WSP message.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if (!iIsOpen)
-		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1_1, "CWapMessageApiAgent::SendWspMessage:Tryig to send to unconnected API");
-		return KErrNotReady;
-		}
-	if (!iBearers[0])
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1_2, "CWapMessageApiAgent::SendWspMessage:No Bearer");
-		return Wap::EBearerError;
-		}
-	HBufC8* sendBuf=NULL;
-	TInt err=KErrNone;
-	TRAP(err, CCLWSPPduHandler::PackWSPPduL(sendBuf, TWSPPduType(aMethod), aURI, aReqHeaders, aReqBody, aTransactionId))
-	if (err!=KErrNone)
-		{
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1_3, "CWapMessageApiAgent::SendWspMessage:Pack Wsp Packet Error=%d",err);
-		return err;
-		}
-	Wap::TBearer bearer=iBearers[0]->GetBearerType();
-	if (bearer==Wap::ESMS||bearer==Wap::EWAPSMS)
-		{
-		TWapSmsDataCodingScheme codingScheme = EWapSms8BitDCS;
-		iBearers[0]->Socket().SetOpt(KWapSmsOptionNameDCS,KWapSmsOptionLevel,codingScheme);
-		}
-	TSockAddr& remoteAddr=iBearers[0]->GetRemoteAddress();
-	TRequestStatus status;
-	iBearers[0]->Socket().SendTo(*sendBuf, remoteAddr, 0, status);
-	User::WaitForRequest(status);
-	delete sendBuf;
-	return status.Int();
-	}
-
-TInt CWspMessageApiAgent::ReceiveWspMessage(TDes8& aWspHeaders, TDes8& aWspBody, TPckgBuf<TUint8>& aTransactionIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout)
-/**
-Receive the Wsp Message to a remote host for fulluSpecified Interface
-@internalComponent
-@released since v8.0
-@param aWspHeaders (out) The Wsp header to be received
-@param aWspBody (out) The Wsp body to be received.
-@param aTransactionIdPckg (out) The received transaction ID buffer
-@param aWspStatus (out) The Wsp status for Method Result.
-@param aReqStatus (out) The request status of the WAP message API
-@param aTimeout (in) The timer out value.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TRequestStatus* reqStatus=NULL;
-	if (!iIsOpen)
-		{
-		reqStatus=&aReqStatus;
-		User::RequestComplete(reqStatus, KErrNotReady);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_RECEIVEWSPMESSAGE_1, "CWspMessageApiAgent::ReceiveWspMessage: Trying to recevive from unconnected API");
-		return KErrNotReady;
-		}
-	if (iRequestActive)
-		{
-		reqStatus=&aReqStatus;
-		User::RequestComplete(reqStatus, KErrInUse);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_RECEIVEWSPMESSAGE_2, "CWspMessageApiAgent::ReceiveWspMessage:Outstanding Receive exist");
-		return KErrInUse;
-		}
-	//Record the client buffer
-	iClientReqHeaders=&aWspHeaders;
-	iClientReqBody=&aWspBody;
-	iClientTransactionId=(TUint8*)aTransactionIdPckg.Ptr();
-	iClientWspStatus=&aWspStatus;
-	//if there are data are being reading
-	CActiveSocket* readingSock=GetActiveSocketByStatus(EReading);
-	if (readingSock)
-		{
-		iRequestStatus=&aReqStatus;
-		*iRequestStatus = KRequestPending;
-		iRequestActive=ETrue;
-		iLastReadingError=readingSock->GetWspData(*iClientReqHeaders, *iClientReqBody, *iClientTransactionId, *iClientWspStatus);
-		if (iLastReadingError==KErrNone)
-			{
-			iLastPduBearer=readingSock->GetBearerType();
-			}
-		iAsyncReadCompletion->CallBack();
-		return iLastReadingError;
-		}
-	//if there are pending data.
-	CActiveSocket* pendingSock=GetActiveSocketByStatus(EPendingData);
-	if (pendingSock)
-		{
-		iRequestStatus=&aReqStatus;
-		*iRequestStatus = KRequestPending;
-		iRequestActive=ETrue;
-		iLastReadingError=pendingSock->GetWspData(*iClientReqHeaders, *iClientReqBody, *iClientTransactionId, *iClientWspStatus);
-		if (iLastReadingError==KErrNone)
-			{
-			iLastPduBearer=pendingSock->GetBearerType();
-			}
-		iAsyncReadCompletion->CallBack();
-		return iLastReadingError;
-		}
-	// Issue request in Idle socket
-	CActiveSocket* sock=GetActiveSocketByStatus(EIdle);
-	if (sock)
-		{
-		iRequestStatus=&aReqStatus;
-		*iRequestStatus = KRequestPending;
-		iRequestActive=ETrue;
-		for (TInt i=0; i<iBearers.Count(); i++)
-			{
-			if (iBearers[i]->GetDataState()==EIdle)
-				{
-				iBearers[i]->AwaitRecvDataSize();
-				}
-			}
-		if (aTimeout>0)
-			{
-			iTimeoutTimer->After(aTimeout);
-			}
-		}
-	return KErrNone;
-	}
-
-void CWspMessageApiAgent::Notification(TInt aMessage, const TDesC8& aData)
-/**
-Notification of PDU size or PDU data
-@internalComponent
-@released since v8.0
-@param aMessage (in) The Event Type received by the ActiveSocket
-@param aData (in)The Event received by the ActiveSocket.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_NOTIFICATION_1, "CWspMessageApiAgent::Notification is called");
-	TWapNotificationInfo& info=*(reinterpret_cast<TWapNotificationInfo*>(const_cast<TUint8*>(aData.Ptr())));
-	Wap::TBearer bearer=info.iBearer;
-	CActiveSocket* currentSocket=GetActiveSocketByBearer(bearer);
-	ASSERT(currentSocket!=NULL);
-	if (!currentSocket)
-		{
-		return;
-		}
-	TInt err=info.iError;		
-	switch (TWapNotificationEvent(aMessage))
-		{
-	case EPduLengthReceived:
-			{
-			if (err!=KErrNone)
-				{
-                OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_NOTIFICATION_2, "CWspMessageApiAgent::Notification PDU length err status:%d", err);
-				currentSocket->CleanUpData();
-				if (iRequestActive)
-					{
-					iTimeoutTimer->Cancel();
-					User::RequestComplete(iRequestStatus, err);
-					iRequestActive=EFalse;
-					}
-				}
-			else
-				{
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_NOTIFICATION_3, "CWspMessageApiAgent::Notification PDU length is received");
-				if ((err=currentSocket->Receive())!=KErrNone)
-					{
-					currentSocket->CleanUpData();
-					if (iRequestActive)
-						{
-						iTimeoutTimer->Cancel();
-						User::RequestComplete(iRequestStatus, err);
-						iRequestActive=EFalse;
-						}
-					}
-				}
-			break;
-			}
-	case EPduReceived:
-			{
-			CActiveSocket* sock=GetActiveSocketByStatus(EReading);
-			if (err!=KErrNone)
-				{
-                OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_NOTIFICATION_4, "CWspMessageApiAgent::Notification PDU data is received with Err status:%d", err);
-				currentSocket->CleanUpData();
-				if (iRequestActive && !sock)
-					{
-					iTimeoutTimer->Cancel();
-					User::RequestComplete(iRequestStatus, err);
-					iRequestActive=EFalse;
-					}
-				}
-			else
-				{
-                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_NOTIFICATION_5, "CWspMessageApiAgent::Notification PDU data is received");
-				if (!sock && iRequestActive)
-					{
-					iTimeoutTimer->Cancel();
-					iRequestActive=EFalse;
-					TRAP(err, currentSocket->UnpackPduToWspDataL())
-					if (err)
-						{
-						currentSocket->CleanUpData();
-						User::RequestComplete(iRequestStatus, err);
-						return;
-						}
-					err=currentSocket->GetWspData(*iClientReqHeaders, *iClientReqBody, *iClientTransactionId, *iClientWspStatus);
-					if (err==KErrNone)
-						iLastPduBearer=bearer;
-					User::RequestComplete(iRequestStatus, err);
-					}
-				}
-			break;
-			}
-	default:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWSPMESSAGEAPIAGENT_NOTIFICATION_6, "CWspMessageApiAgent::Notification() Unknown Event From Bearer");
-		;	
-		}
-	}
-
-//
-//CWdpMessageApiAgent class Method
-//
-CWdpMessageApiAgent* CWdpMessageApiAgent::NewL()
-/**
-The static funtion to new a wdp message API agent
-@internalComponent
-@released since v8.0
-@returns the CWdpMessageApiAgent instance
-*/
-	{
-	CWdpMessageApiAgent* me = new(ELeave) CWdpMessageApiAgent();
-	CleanupStack::PushL(me);
-	me->ConstructL();
-	CleanupStack::Pop(me);
-	return me;
-	}
-
-CWdpMessageApiAgent::CWdpMessageApiAgent():CWapMessageApiAgent(EWapWdp)
-/**
-Constructor
-@internalComponent
-@released since v8.0
-*/
-	{
-	}
-
-CWdpMessageApiAgent::~CWdpMessageApiAgent()
-/**
-Destructor
-@internalComponent
-@released since v8.0
-*/
-	{
-	}
-
-void CWdpMessageApiAgent::ConstructL()
-/**
-Second Phase Constructor
-@internalComponent
-@released since v8.0
-*/
-	{
-	CWapMessageApiAgent::ConstructL();
-	}
-
-TInt CWdpMessageApiAgent::ReceiveWdpMessage(TDes8& aRemoteHost, Wap::TPort& aRemotePort, TDes8& aBuffer, TBool& aTruncated, TRequestStatus& aReqStatus, TUint32 aTimeout)
-/**
-Receive WDP message from a remote host
-@internalComponent
-@released since v8.0
-@param aRemoteHost (out) the remote host from which the WDP is sent
-@param aRemotePort (out) the remote port from which the WDP is sent
-@param aBuffer (out) the buffer to contain the received the WDP pdu
-@param aTruncated (out) the flag to show if the WDP PDU is trucated ot not
-@param aReqStatus (out) the client request status.
-@param aTimeOut (in) the time out value
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TRequestStatus* reqStatus=NULL;
-	TInt err=KErrNone;
-	if (!iIsOpen)
-		{
-		reqStatus=&aReqStatus;
-		User::RequestComplete(reqStatus, KErrNotReady);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_RECEIVEWDPMESSAGE_1, "CWdpMessageApiAgent::ReceiveWdpMessage: Recv From unconnected API");
-		return KErrNotReady;
-		}
-	//if the length has been read
-	CActiveSocket* sock=GetActiveSocketByStatus(EGotLength);
-	CActiveSocket* sock1=GetActiveSocketByStatus(EReading);
-	if (iRequestActive || (!sock && !sock1))
-		{
-		reqStatus=&aReqStatus;
-		User::RequestComplete(reqStatus, KErrInUse);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_RECEIVEWDPMESSAGE_2, "CWdpMessageApiAgent::ReceiveWdpMessage:in wrong state");
-		return KErrInUse;
-		}
-	if (sock1)
-		{
-		Wap::TBearer bearer=sock1->GetBearerType();
-		TSockAddr& remoteAddr=sock1->GetRemoteAddress();
-		TRAP(err, CSWSWapMsgUtils::AnalyseAddrL(remoteAddr, bearer, *iClientRemoteHost, *iClientRemotePort))
-		if (err)
-			{
-			reqStatus=&aReqStatus;
-			User::RequestComplete(reqStatus, err);
-			return err;
-			}
-		iRequestStatus=&aReqStatus;
-		*iRequestStatus = KRequestPending;
-		iRequestActive=ETrue;
-		iLastReadingError=sock1->GetPduData(*iClientPduBuffer, *iClientTruncated);
-		if (!iLastReadingError)
-			{
-			iLastPduBearer=bearer;
-			}
-		iAsyncReadCompletion->CallBack();
-		return iLastReadingError;
-		}
-	if (sock)
-		{
-		if ((err=sock->Receive())==KErrNone)
-			{
-			iClientPduBuffer=&aBuffer;
-			iClientRemoteHost=&aRemoteHost;
-			iClientRemotePort=&aRemotePort;
-			iClientTruncated=&aTruncated;
-			iRequestStatus=&aReqStatus;
-			*iRequestStatus = KRequestPending;
-			iRequestActive=ETrue;		
-			if (aTimeout)
-				{
-				iTimeoutTimer->After(aTimeout);
-				}
-			}
-		else
-			{
-			reqStatus=&aReqStatus;
-			User::RequestComplete(reqStatus, err);
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_RECEIVEWDPMESSAGE_3, "CWdpMessageApiAgent::ReceiveWdpMessage:err=%d",err);
-			return err;
-			}
-		}
-	return KErrNone;
-	}
-
-TInt CWdpMessageApiAgent::AwaitRecvDataSize(TPckg<TUint16>& aDataSizePckg, TRequestStatus& aReqStatus)
-/**
-Receive WDP message PDU length from a remote host
-@internalComponent
-@released since v8.0
-@param aDataSizePckg (out) the length of the PDU
-@param aReqStatus (out) the client request status.
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TRequestStatus* reqStatus=NULL;
-	if (!iIsOpen)
-		{
-		reqStatus=&aReqStatus;
-		User::RequestComplete(reqStatus, KErrNotReady);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_AWAITRECVDATASIZE_1, "CWdpMessageApiAgent::AwaitRecvDataSize:Wait For Data length From unconnected API");
-		return KErrNotReady;
-		}
-	//if the length has been read or there is some data pending, then error completion
-	CActiveSocket* sock=GetActiveSocketByStatus(EGotLength);
-	CActiveSocket* sock1=GetActiveSocketByStatus(ERequestingData);
-	CActiveSocket* sock2=GetActiveSocketByStatus(EReading);
-	if (iRequestActive||sock||sock1||sock2)
-		{
-		reqStatus=&aReqStatus;
-		User::RequestComplete(reqStatus, KErrInUse);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_AWAITRECVDATASIZE_2, "CWdpMessageApiAgent::AwaitRecvDataSize:in wrong state");
-		return KErrInUse;
-		}
-	//if there is a pending length, then get it
-	sock=GetActiveSocketByStatus(EPendingLength);
-	if (sock)
-		{
-		iClientDataSize=&aDataSizePckg;
-		iRequestStatus=&aReqStatus;
-		*iRequestStatus = KRequestPending;
-		iRequestActive=ETrue;
-		TUint16 length=(TUint16)sock->GetPduSize();
-		TPckg<TUint16> des(length);
-		iClientDataSize->Copy(des);
-		iLastReadingError=KErrNone;
-		iAsyncReadCompletion->CallBack();
-		return KErrNone;
-		}
-	//if there is some idle socket, then wait for length
-	sock=GetActiveSocketByStatus(EIdle);
-	if (sock)
-		{
-		iRequestActive=ETrue;
-		iClientDataSize=&aDataSizePckg;
-		iRequestStatus=&aReqStatus;
-		*iRequestStatus = KRequestPending;
-		//Wait for length on the idle socket
-		for (TInt i=0; i<iBearers.Count(); i++)
-			{
-			if (iBearers[i]->GetDataState()==EIdle)
-				{
-				iBearers[i]->AwaitRecvDataSize();
-				}
-			}
-		}
-	return KErrNone;
-	}
-
-TInt CWdpMessageApiAgent::SendWdpMessage(const TDesC8& aBuffer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer)
-/**
-Send WDP message to a remote host
-@internalComponent
-@released since v8.0
-@param aBuffer (in) the data to be sent
-@param aRemoteHost (in) the remote host to be sent
-@param aRemotePort (in) the remote port to be sent
-@param aBearer (in) the Bearer to be used
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if (!iIsOpen)
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_1, "CWdpMessageApiAgent::SendWdpMessage:Send WDP to unconnected API");
-		return KErrNotReady;
-		}
-	if (aBearer==Wap::EAll)
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_2, "CWdpMessageApiAgent::SendWdpMessage:Wrong Bearer");
-		return Wap::EBearerError;
-		}
-	TSockAddr remoteAddr;
-	TInt err=KErrNone;
-	TRAP(err, CSWSWapMsgUtils::BuildAddrL(remoteAddr, aBearer, aRemoteHost, aRemotePort))
-	if (err)
-		{
-        OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_3, "CWdpMessageApiAgent::SendWdpMessage:BuildAddrL Err=%d", err);
-		return err;
-		}
-	CActiveSocket* sendSock=GetActiveSocketByBearer(aBearer);
-	if (sendSock)
-		{
-		if (aBearer==Wap::ESMS||aBearer==Wap::EWAPSMS)
-			{
-			TWapSmsDataCodingScheme codingScheme = EWapSms8BitDCS;
-			sendSock->Socket().SetOpt(KWapSmsOptionNameDCS,KWapSmsOptionLevel,codingScheme);
-			}
-		TRequestStatus status;
-		sendSock->Socket().SendTo(aBuffer, remoteAddr, 0, status);
-		User::WaitForRequest(status);
-		err=status.Int();
-		}
-	else
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_4, "CWdpMessageApiAgent::SendWdpMessage:No Bearer");
-		err=Wap::EBearerError;
-		}
-	return err;
-	}
-
-TInt CWdpMessageApiAgent::SendWdpMessage(const TDesC8& aBuffer)
-/**
-Send WDP message to a remote host
-@internalComponent
-@released since v8.0
-@param aBuffer (in) the data to be sent
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	if (!iIsOpen)
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_1_1, "CWdpMessageApiAgent::SendWdpMessage:Send WDP to unconnected API");
-		return KErrNotReady;
-		}
-	if (!iBearers[0])
-		{
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_1_2, "CWdpMessageApiAgent::SendWdpMessage:No Bearer");
-		return Wap::EBearerError;
-		}
-	Wap::TBearer bearer=iBearers[0]->GetBearerType();
-	if (bearer==Wap::ESMS||bearer==Wap::EWAPSMS)
-		{
-		TWapSmsDataCodingScheme codingScheme = EWapSms8BitDCS;
-		iBearers[0]->Socket().SetOpt(KWapSmsOptionNameDCS,KWapSmsOptionLevel,codingScheme);
-		}
-	TSockAddr& remoteAddr=iBearers[0]->GetRemoteAddress();
-	TRequestStatus status;
-	iBearers[0]->Socket().SendTo(aBuffer, remoteAddr, 0, status);
-	User::WaitForRequest(status);
-	return status.Int();
-	}
-
-void CWdpMessageApiAgent::Notification(TInt aMessage, const TDesC8& aData)
-/**
-Notification from the ActiveSocket
-@internalComponent
-@released since v8.0
-@param aMessage (in) the Event Type
-@param aData (in) the Event
-@returns KErrNone on successful completion, or one of the system error codes on failure.
-*/
-	{
-	TWapNotificationInfo& info=*(reinterpret_cast<TWapNotificationInfo*>(const_cast<TUint8*>(aData.Ptr())));
-	Wap::TBearer bearer=info.iBearer;
-	CActiveSocket* currentSocket=GetActiveSocketByBearer(bearer);
-	ASSERT(currentSocket!=NULL);
-	if (!currentSocket)
-		{
-		return;
-		}
-	TInt err=info.iError;		
-	switch (TWapNotificationEvent(aMessage))
-		{
-	case EPduLengthReceived:
-			{
-			CActiveSocket* sock1=GetActiveSocketByStatus(ERequestingData);
-			CActiveSocket* sock2=GetActiveSocketByStatus(EGotLength);
-			CActiveSocket* sock3=GetActiveSocketByStatus(EReading);
-			if (!sock1 && !sock2 && !sock3 && iRequestActive)
-				// Read pdu length from this socket
-				{
-				iRequestActive=EFalse;
-				if (err==KErrNone)
-					{
-					TUint16 length=(TUint16)currentSocket->GetPduSize();
-					TPckg<TUint16> des(length);
-					iClientDataSize->Copy(des);	
-					}
-				else
-					{
-					currentSocket->CleanUpData();
-					}
-				User::RequestComplete(iRequestStatus, err);
-				}
-			break;
-			}
-	case EPduReceived:
-			{
-			ASSERT(iRequestActive);
-			if (iRequestActive)
-				{
-				// Read pdu from this socket
-				iRequestActive=EFalse;
-				iTimeoutTimer->Cancel();
-				if (err==KErrNone)
-					{
-					TSockAddr& remoteAddr=currentSocket->GetRemoteAddress();
-					TRAP(err, CSWSWapMsgUtils::AnalyseAddrL(remoteAddr, bearer, *iClientRemoteHost, *iClientRemotePort))
-					if (!err)
-						{
-						err=currentSocket->GetPduData(*iClientPduBuffer, *iClientTruncated);
-						if (!err)
-							iLastPduBearer=bearer;
-						}
-					else
-						{
-						currentSocket->SetDataState(EReading);
-						}
-					}
-				else
-					{
-					currentSocket->CleanUpData();
-					}
-				User::RequestComplete(iRequestStatus, err);
-				}
-			}
-		break;
-	default:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWDPMESSAGEAPIAGENT_NOTIFICATION_1, "CWdpMessageApiAgent::Notification() Unknown Event From Bearer");
-		;
-		}
-	}

--- a/wapstack/wapmessageapi/sws/WapMessageApiAgent.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __MSGAPIAGENT_H__
-#define __MSGAPIAGENT_H__
-#include "ActiveSocket.h"
-#include "WapSwsTimeOut.h"
-
-class MProgressNotify
-/** 
-Interface from the ActiveSocket to MessageApiAgent
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	public:
-	/**
-	The interface that will be called when WDP pdu length and data are received by CActiveSocket.
-	@internalComponent
-	@param aMessage the message type received from CActiveSocket
-	@param aData the data received from CActiveSocket
-	*/
-	virtual void Notification(TInt aMessage, const TDesC8& aData) = 0;	
-	};
-
-class CWapAsyncCallBack : public CActive
-	{
-public:
-	CWapAsyncCallBack( const TCallBack& aCallBack, TInt aPriority );
-	~CWapAsyncCallBack();
-
-public: // API
-	void CallBack();
-
-private:
-	void RunL();
-	void DoCancel();
-
-private:
-	TCallBack iCallBack;
-	};
-
-class CWapMessageApiAgent : public CBase, public MTimeOutNotify, public MProgressNotify
-/** 
-The base class of CWspMessageApiAgent and CWdpMessageApiAgent, which handle Wsp and Wdp
-for SWS message APIs
-@internalComponent
-@released
-@since v8.0
-*/
-{
-public:
-	virtual ~CWapMessageApiAgent();
-	void ConstructL();
-	CActiveSocket* GetActiveSocketByBearer(Wap::TBearer aBearer);
-	CActiveSocket* GetActiveSocketByStatus(TWapMessageState aState);
-	TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure);
-	TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure, TInetAddr aInetAddr);
-	TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure, TInt aSocketServHandle, RConnection* aConnection);
-	TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure, TInetAddr aInetAddr);
-	TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure);
-	TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure, TInt aSocketServHandle, RConnection* aConnection);
-	TInt GetLocalPort(Wap::TPort& aPort);
-	TInt GetLocalAddress(HBufC8*& aLocalHost);
-	TInt GetBearer(Wap::TBearer& aBearer);
-	TInt GetServerAddress(HBufC8*& aRemoteHost);
-	virtual void TimerExpired();
-	void CancelRequest();
-	static TInt CompleteReading(TAny* aAgent);
-protected:
-	CWapMessageApiAgent(TWapMessageType aMessageType);
-	/**
-	RSocketServ instance used by all the bearers.
-	*/
-	RSocketServ iSocketServ;
-	/**
-	The array to contain all the bearers
-	*/
-	RPointerArray<CActiveSocket> iBearers;
-	/**
-	The Wdp and Wsp receiving timer.
-	*/
-	CTimeOutTimer* iTimeoutTimer;
-	/**
-	Flag the show if there is outstanding request.
-	*/
-	TBool iRequestActive;
-	/**
-	The pointer to Wap message client's request status
-	*/
-	TRequestStatus* iRequestStatus;
-	/**
-	The last error code of active socket in reading state
-	*/
-	TInt iLastReadingError;
-	/**
-	The asynchronous completion of reading
-	*/
-	CWapAsyncCallBack* iAsyncReadCompletion;
-	/**
-	The bearer that receives that last PDU
-	*/
-	Wap::TBearer iLastPduBearer;
-	/**
-	Flag to show if the API has been connected or not
-	*/
-	TBool iIsOpen;
-	/**
-	The type of the Wap message handled by this API agent.
-	*/
-	TWapMessageType iMessageType;
-private:
-	TInt DoCompleteReading();
-};
-
-class CWspMessageApiAgent : public CWapMessageApiAgent
-/** 
-The class to handle Wsp PDU for SWS message APIs
-@internalComponent
-@released
-@since v8.0
-*/
-{
-public:
-	static CWspMessageApiAgent* NewL();
-	CWspMessageApiAgent();
-	virtual ~CWspMessageApiAgent();
-	void ConstructL();
-	TInt SendWspMessage(Wap::TBearer aBearer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort, TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, TUint8 aTransactionId);
-	TInt SendWspMessage(TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, TUint8 aTransactionId);
-	TInt ReceiveWspMessage(TDes8& aWspHeaders, TDes8& aWspBody, TPckgBuf<TUint8>& aPushIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout);
-	virtual void Notification(TInt aMessage, const TDesC8& aData);
-private:
-	/**
-	The pointer to the WSP message client's requested header buffer
-	*/
-	TDes8* iClientReqHeaders;
-	/**
-	The pointer to the WSP message client's requested body buffer
-	*/
-	TDes8* iClientReqBody;
-	/**
-	The pointer to the WSP message client's requested transaction ID.
-	*/
-	TUint8*	iClientTransactionId;
-	/**
-	The pointer to the WSP message client's requested WSP status.
-	*/
-	TWSPStatus* iClientWspStatus;
-};
-
-class CWdpMessageApiAgent : public CWapMessageApiAgent
-/** 
-The class to handle Wdp PDU for SWS message APIs
-@internalComponent
-@released
-@since v8.0
-*/
-{
-public:
-	static CWdpMessageApiAgent* NewL();
-	CWdpMessageApiAgent();
-	virtual ~CWdpMessageApiAgent();
-	void ConstructL();
-	TInt ReceiveWdpMessage(TDes8& aRemoteHost, Wap::TPort& aRemotePort, TDes8& aBuffer, TBool& aTruncated, TRequestStatus& aReqStatus, TUint32 aTimeout);
-	TInt AwaitRecvDataSize(TPckg<TUint16>& aDataSizePckg, TRequestStatus& aReqStatus);
-	TInt SendWdpMessage(const TDesC8& aBuffer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer);
-	TInt SendWdpMessage(const TDesC8& aBuffer);
-	virtual void Notification(TInt aMessage, const TDesC8& aData);
-private:
-	/**
-	The pointer to Wdp message client's requested data buffer
-	*/
-	TDes8*	iClientPduBuffer;
-	/**
-	The pointer to Wdp message client's request data size
-	*/
-	TPckg<TUint16>* iClientDataSize;
-	/**
-	The pointer to client's requested remote host buffer
-	*/
-	TDes8* iClientRemoteHost;
-	/**
-	The pointer to client's requested remote port buffer
-	*/
-	Wap::TPort* iClientRemotePort;
-	/**
-	The pointer to client's requested flag.
-	*/
-	TBool* iClientTruncated;
-};
-#endif //__MSGAPIAGENT_H__

--- a/wapstack/wapmessageapi/sws/WapMsgUtils.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include "WapMsgUtils.h"
-#include <wapmessage.h>
-#include <wapmsgerr.h>
-#include <es_wsms.h>
-#include <f32file.h>
-
-TInt CSWSWapMsgUtils::GetLocalAddress(HBufC8*& aLocalHost)
-/**
-Not supported
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-	// Panic client if the buffer isn't null
-	__ASSERT_ALWAYS(aLocalHost==NULL, User::Panic(Wap::KWapMsgPanicDescriptor, KErrArgument));
-
-	RArray<Wap::TAddressInfo> myArray;
-
-	TInt ret(0);
-	TRAPD(err, ret=CWapMessageUtils::GetLocalAddressesL(myArray))
-	if (err)
-		{
-		return err;
-		}
-	// GetLocalAddressesL can return KErrNotFound if there is no network interface up
-	if (ret)
-		{
-		return ret;
-		}
-
-	TBuf16<256>tempBuf16;
-	TBuf8<256>tempBuf8;				  
-	TInetAddr* info = &myArray[0].iAddress;
-	// Output the address to a descriptor
-	info->Output(tempBuf16);
-	// Need to convert the buffer to 8 bit;
-	tempBuf8.Copy(tempBuf16);
-	// Note: Ownership of the allocated buffer is passed to the client
-	aLocalHost = HBufC8::New( tempBuf16.Length() );
-	if (!aLocalHost)
-		{
-		return KErrNoMemory;
-		}
-	// Now copy the 8 bit version of the address
-	*aLocalHost = tempBuf8;
-
-	return KErrNone;
-	}
-			 
-void CSWSWapMsgUtils::BuildAddrL(TSockAddr& aAddr, Wap::TBearer aBearer, const TDesC8& aHost, Wap::TPort aPort)
-/**
-Build a socket address according to the given parameters.
-@internalComponent
-@released
-@since v8.0
-@param aAddr the socket address which is built from given parameters
-@param aBearer the underlie bearer type
-@param aHost the host name
-@param aHost the port number
-*/
-	{
-    if (aBearer==Wap::EIP)
-        {
-        TInetAddr addr(aPort);
-        HBufC16* addr16=HBufC16::NewL(aHost.Length());
-        TPtr16 addr16Des=addr16->Des();
-        addr16Des.Copy(aHost);
-        // coverity[check_return]
-        addr.Input(addr16Des);
-        aAddr=addr;
-        delete addr16;
-        }
-	else
-		{
-		TWapAddr addr;
-		addr.SetWapPort(TWapPortNumber(aPort));
-		addr.SetWapAddress(aHost);
-		aAddr=addr;
-		}
-	}
-void CSWSWapMsgUtils::AnalyseAddrL(TSockAddr& aAddr, Wap::TBearer aBearer, TDes8& aHost, Wap::TPort& aPort)
-/**
-Analyse a socket address, and generate host name and port
-@internalComponent
-@released
-@since v8.0
-@param aAddr the socket address to be analysed
-@param aBearer the underlie bearer type
-@param aHost the host name
-@param aHost the port number
-*/
-	{
-	aPort=static_cast<Wap::TPort>(aAddr.Port());
-	if (aBearer==Wap::EIP)
-		{
-		TInetAddr addr(aAddr);
-		// If the family is KAfInet6, the output buffer must be at least 
-		// 39 characters. 
-		// If less, the buffer is filled with '*' characters.
-		HBufC16* addr16=HBufC16::NewL(40);
-		TPtr16 addr16Des=addr16->Des();
-		addr.Output(addr16Des);
-		aHost.Copy(addr16Des);
-		delete addr16;
-		}
-	else
-		{
-		TWapAddr& wapAddr = *(reinterpret_cast<TWapAddr*>(&aAddr));
-		TPtrC8 addr=wapAddr.WapAddress();
-		aHost.Copy(addr);
-		}
-	}
-

--- a/wapstack/wapmessageapi/sws/WapMsgUtils.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-// Copyright (c) 2003-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:
-// Utilities 
-// 
-//
-
-#ifndef __CSWSWAPMSGUTILS_H__ 
-#define __CSWSWAPMSGUTILS_H__
-
-#include <e32base.h>
-#include <e32std.h>
-#include <es_sock.h>
-#include <wapmessage.h>
-
-const TInt KWapStackMaxDatagramSize = 4000;
-const TInt KWapStackNorminalDatagramSize = 4000;
-
-
-
-class CSWSWapMsgUtils : public CBase
-/** 
-Provide a set of static function which to be used by SWS. Contains the functions to build a
-specific socket address from given parameters, analyse a specific socket address, and to
-determine the SMS bearer type, GSM.
-@internalComponent
-@released
-@since v8.0
-*/
-	{
-public:
-	// Returns the current local address, a null pointer must be passed in, buffer ownership is given to the client
-	static TInt GetLocalAddress(HBufC8*& aLocalHost);
-	static void BuildAddrL(TSockAddr& aAddr, Wap::TBearer aBearer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort);
-	static void AnalyseAddrL(TSockAddr& aAddr, Wap::TBearer aBearer, TDes8& aRemoteHost, Wap::TPort& aRemotePort);
-
-	};
-
-#endif //__CSWSWAPMSGUTILS_H__
-

--- a/wapstack/wapmessageapi/sws/WapSwsTimeOut.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __TIMEOUT_H__
-#define __TIMEOUT_H__
-
-// Class definitions to support the recive with timeout methods
-
-#include <e32base.h>
-
-// MTimeOutNotify: used in conjunction with CTimeOutTimer class
-class MTimeOutNotify
-	{
-public:
-	virtual void TimerExpired() = 0;
-	};
-
-// CTimeOutTimer: timer for comms time-outs
-class CTimeOutTimer: public CTimer
-	{
-public:
-	static CTimeOutTimer* NewL(MTimeOutNotify& aTimeOutNotify);
-	~CTimeOutTimer();
-
-protected:
-    CTimeOutTimer(MTimeOutNotify& aTimeOutNotify);
-	void ConstructL();
-    virtual void RunL();
-
-private:
-	MTimeOutNotify& iNotify;
-	};
-
-#endif // __TIMEOUT_H__

--- a/wapstack/wapmessageapi/sws/WapSwsTimeout.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// Copyright (c) 2001-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:
-// Timeout.cpp
-// 
-//
-
-#include "WapSwsTimeOut.h"
-
-//
-// CTimeOutTimer: timer for comms time-outs
-//
-CTimeOutTimer::CTimeOutTimer(MTimeOutNotify& aTimeOutNotify)
-: CTimer(EPriorityStandard), iNotify(aTimeOutNotify)
-    {
-    }
-
-CTimeOutTimer::~CTimeOutTimer()
-    {
-	Cancel();
-    }
-
-CTimeOutTimer* CTimeOutTimer::NewL(MTimeOutNotify& aTimeOutNotify)
-    {
-    CTimeOutTimer *p = new (ELeave) CTimeOutTimer(aTimeOutNotify);
-    CleanupStack::PushL(p);
-	p->ConstructL();
-	CleanupStack::Pop(p);
-    return p;
-    }
-
-void CTimeOutTimer::ConstructL()
-    {
-	CTimer::ConstructL();
-	CActiveScheduler::Add(this);
-    }
-
-void CTimeOutTimer::RunL()
-    {
-	// Timer request has completed, so notify the timer's owner
-	iNotify.TimerExpired();
-	}

--- a/wapstack/wapmessageapi/sws/swswapmsg.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// 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:
-//
-
-#include <e32std.h>
-#include <ecom/implementationproxy.h>
-#include "WapBoundWDP.h"
-#include "WapFullySpecWDP.h"
-#include "WapBoundCLPush.h"
-#include "WapFullySpecCLPush.h"
-#include "WapBoundCLWSP.h"
-#include "WapFullySpecCLWSP.h"
-
-// Exported proxy for instantiation method resolution
-// Define the interface UIDs
-const TImplementationProxy ImplementationTable[] = 
-	{
-		IMPLEMENTATION_PROXY_ENTRY(0x101FBB37,	CSWSWapBoundWDPService::NewL),
-		IMPLEMENTATION_PROXY_ENTRY(0x101FBB38,	CSWSWapFullySpecWDPService::NewL),
-		IMPLEMENTATION_PROXY_ENTRY(0x101FBB39,	CSWSWapBoundCLPushService::NewL),
-		IMPLEMENTATION_PROXY_ENTRY(0x101FBB3A,	CSWSWapFullySpecCLPushService::NewL),
-		IMPLEMENTATION_PROXY_ENTRY(0x101FBB3C,	CSWSWapBoundCLWSPService::NewL),
-		IMPLEMENTATION_PROXY_ENTRY(0x101FBB3E,	CSWSWapFullySpecCLWSPService::NewL)
-	};
-
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-	{
-	aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-	return ImplementationTable;
-	}
-

--- a/wapstack/wapmessageapi/sws/swswapmsgsource.mmpi	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-* Copyright (c) 2010 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: 
-*
-*/
-// Contains just source of swswapmsg, not including file that defines the dll entry point
-
-SOURCE			WapBoundWDP.cpp WapFullySpecWDP.cpp
-SOURCE			WapBoundCLPush.cpp WapFullySpecCLPush.cpp
-SOURCE			WapBoundCLWSP.cpp WapFullySpecCLWSP.cpp
-SOURCE			WapMsgUtils.cpp WapSwsTimeout.cpp ActiveSocket.cpp
-SOURCE			CLWSPPduHandler.cpp WapMessageApiAgent.cpp
\ No newline at end of file

--- a/wapstack/wapmessageapi/te_wapstack/bmarm/wapstacksuiteu.def	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	NewServer__Fv @ 1 NONAME R3UNUSED ; NewServer(void)
-

--- a/wapstack/wapmessageapi/te_wapstack/bwins/wapstacksuiteu.def	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NewServer@@YAHXZ @ 1 NONAME ; int __cdecl NewServer(void)
-

--- a/wapstack/wapmessageapi/te_wapstack/group/CdmaWapStackSuite.iby	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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: 
-*
-*/
-
-#ifndef __CDMAWAPSTACKTEST_SUITE_IBY__
-#define __CDMAWAPSTACKTEST_SUITE_IBY__
-
-#include <testexecute.iby>
-#include <wapmessage.iby>
-#include <cdmasmsstack.iby>
-#include <simtsy.iby>
-#include <telephony.iby>
-#include <esock.iby>
-
-file=ABI_DIR\DEBUG_DIR\WapStackSuite.exe		System\libs\WapStackSuite.exe
-
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\WapStackSuite.ini		testdata\configs\WapStackSuite.ini
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\UDPPush.ini		testdata\configs\UDPPush.ini
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\wapstacksuite_config.ini	testdata\configs\wapstacksuite_config.ini
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\WapStackSuite.xml		testdata\configs\WapStackSuite.xml
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\CdmaWapSIMTSY.txt		testdata\configs\CdmaWapSIMTSY.txt
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\PushPDU.bin		testdata\configs\PushPDU.bin
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\Te_CdmaWapStackSuite.script testdata\scripts\Te_CdmaWapStackSuite.Script
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapBoundWDP.script 	testdata\scripts\WapBoundWDP.script
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapFullySpecWDP.script 	testdata\scripts\WapFullySpecWDP.script 
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapBoundPush.script 	testdata\scripts\WapBoundPush.script    
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapFullySpecPush.script 	testdata\scripts\WapFullySpecPush.script
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapBoundWSP.script 	testdata\scripts\WapBoundWSP.script     
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapFullySpecWSP.script	testdata\scripts\WapFullySpecWSP.script 
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\UDPPush.script		testdata\scripts\UDPPush.script 
-
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\Te_WapStackSuite.script 	testdata\scripts\Te_WapStackSuite.Script
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\WapSIMTSY.txt		testdata\configs\WapSIMTSY.txt
-#endif

--- a/wapstack/wapmessageapi/te_wapstack/group/WapStackSuite.iby	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* 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: 
-*
-*/
-
-#ifndef __WAPSTACKTEST_SUITE_IBY__
-#define __WAPSTACKTEST_SUITE_IBY__
-
-#include <testexecute.iby>
-
-file=ABI_DIR\DEBUG_DIR\WapStackSuite.exe		System\libs\WapStackSuite.exe
-
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\WapStackSuite.ini		testdata\configs\WapStackSuite.ini
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\UDPPush.ini		testdata\configs\UDPPush.ini
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\WapStackSuite.xml		testdata\configs\WapStackSuite.xml
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\WapSIMTSY.txt		testdata\configs\WapSIMTSY.txt
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\PushPDU.bin		testdata\configs\PushPDU.bin
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\Te_WapStackSuite.script 	testdata\scripts\Te_WapStackSuite.Script
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapBoundWDP.script 	testdata\scripts\WapBoundWDP.script
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapFullySpecWDP.script 	testdata\scripts\WapFullySpecWDP.script 
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapBoundPush.script 	testdata\scripts\WapBoundPush.script    
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapFullySpecPush.script 	testdata\scripts\WapFullySpecPush.script
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapBoundWSP.script 	testdata\scripts\WapBoundWSP.script     
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapFullySpecWSP.script	testdata\scripts\WapFullySpecWSP.script 
-data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\UDPPush.script	testdata\scripts\UDPPush.script 
-
-#endif

--- a/wapstack/wapmessageapi/te_wapstack/group/WapStackSuite.mmp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-TARGET		wapstacksuite.exe
-TARGETTYPE 	exe
-	UID             0x1000008d 0x10282B37
-
-
-SOURCEPATH  ../src
-SOURCE		WapStackSuiteServer.cpp
-SOURCE		WapStackSuiteStepBase.cpp
-SOURCE		WapBoundWDPSteps.cpp	
-SOURCE		WapBoundCLPushSteps.cpp
-SOURCE		WapBoundWSPSteps.cpp	
-SOURCE		WapFullySpecWDPSteps.cpp
-SOURCE		WapFullySpecCLPushSteps.cpp	
-SOURCE		WapFullySpecWSPSteps.cpp	
-
-USERINCLUDE   ../src
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY		euser.lib
-LIBRARY		etel.lib
-LIBRARY		testexecuteutils.lib 
-LIBRARY		insock.lib
-LIBRARY		wapmsgcli.lib
-LIBRARY		testexecutelogclient.lib
-LIBRARY		c32root.lib
-LIBRARY 	esock.lib 
-LIBRARY 	efsrv.lib 
-LIBRARY 	ecom.lib 
-
-//CAPABILITY ALL -Tcb
-//  set capabilities the same as wapmsgcli.dll, which this test loads, to avoid capabilities conflict
-CAPABILITY ReadDeviceData WriteDeviceData LocalServices NetworkServices ReadUserData WriteUserData NetworkControl
-
-VENDORID 0x70000001
-
-SMPSAFE

--- a/wapstack/wapmessageapi/te_wapstack/scripts/Te_WapStackSuite.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-// Copyright (c) 2001-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:
-// WAP stack test main script file
-// 
-//
-
-PRINT GT167-WAP stack tests
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-ced -i z:\testdata\configs\WapStackSuite.xml WapStackSuite.log
-run_script z:\TestData\scripts\te_esock_test_loadesock.script
-
-//delete any existing config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-RUN_UTILS copyfile c:\config.txt c:\config.old
-RUN_UTILS  DeleteFile c:\config.txt
-
-//copy our config file
-run_utils copyfile z:\testdata\configs\WapSIMTSY.txt c:\Config.txt
-RUN_UTILS  MakeReadWrite c:\config.txt
-
-//Delete any previous wapstackconfig file
-RUN_UTILS MakeReadWrite c:\system\data\wapstackconfig.old
-RUN_UTILS copyfile c:\system\data\wapstackconfig.ini c:\system\data\wapstackconfig.old
-RUN_UTILS MakeReadWrite c:\system\data\wapstackconfig.ini
-RUN_UTILS DeleteFile c:\system\data\wapstackconfig.ini
-
-RUN_SCRIPT z:\testdata\scripts\WapBoundWDP.script
-RUN_SCRIPT z:\testdata\scripts\WapFullySpecWDP.script
-RUN_SCRIPT z:\testdata\scripts\WapBoundPush.script
-RUN_SCRIPT z:\testdata\scripts\WapFullySpecPush.script
-RUN_SCRIPT z:\testdata\scripts\WapBoundWSP.script
-RUN_SCRIPT z:\testdata\scripts\WapFullySpecWSP.script
-RUN_SCRIPT z:\testdata\scripts\UDPPush.script
-
-START_TESTCASE			WAP-WAPMESSAGE-0110
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0110
-LOAD_SUITE WapStackSuite
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_OutOfMemory
-END_TESTCASE			WAP-WAPMESSAGE-0110
-
-//Delete our config file
-run_utils delete c:\Config.txt
-//put back the old config.txt 
-RUN_UTILS copyfile c:\config.old c:\config.txt
-run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script
-
-//put back any previous wapstackconfig.ini file
-RUN_UTILS MakeReadWrite c:\system\data\wapstackconfig.ini
-RUN_UTILS copyfile c:\system\data\wapstackconfig.old c:\system\data\wapstackconfig.ini
-
-PRINT GT167-WAP stack tests finished
-
-

--- a/wapstack/wapmessageapi/te_wapstack/scripts/UDPPush.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-// Copyright (c) 2001-2010 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:
-// WAP stack BoundPush test script file
-// 
-//
-
-PRINT GT167-WAP stack BOUND-PUSH-UDP test
-
-//ced -i z:\testdata\configs\WapStackSuiteRAS.cfg
-
-LOAD_SUITE WapStackSuite
-
-START_TESTCASE			WAP-WAPMESSAGE-0101
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0101
-
-CONCURRENT
-
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_4 z:\testdata\configs\UDPPush.ini Test_1
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_9 z:\testdata\configs\UDPPush.ini Test_2
-
-CONSECUTIVE
-
-CONCURRENT
-
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_4 z:\testdata\configs\UDPPush.ini Test_3
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_9 z:\testdata\configs\UDPPush.ini Test_4
-
-END_TESTCASE			WAP-WAPMESSAGE-0101
-
-
-

--- a/wapstack/wapmessageapi/te_wapstack/scripts/WSP.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-//
-// 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: 
-//
-//
-PRINT Run all WAP stack Suite Tests
-
-ced -i z:\WapStackSuite\WapStackSuiteRAS.xml
-
-LOAD_SUITE WapStackSuite
-
-// --------------------------------------------------
-// TEST(4)
-// 
-START_TESTCASE			WAP-WAPMESSAGE-0801
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0801
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.1
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.2
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.3
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.4
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.5
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.6
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.7
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.8
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.9
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.10
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.11
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.12
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.13
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.14
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.14.2
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.14.1
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.15
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.16
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.17
-END_TESTCASE			WAP-WAPMESSAGE-0801
-
-
-
-
-
-

--- a/wapstack/wapmessageapi/te_wapstack/scripts/WapBoundPush.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-// Copyright (c) 2001-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:
-// WAP stack BoundPush test script file
-// 
-//
-
-PRINT GT167-WAP stack BOUND-PUSH test
-
-LOAD_SUITE WapStackSuite
-
-// ---------------------------------------------------------------------------------
-// TEST(1) Load implementation
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0201
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0201
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_1 z:\testdata\configs\WapStackSuite.ini COMMON
-END_TESTCASE			WAP-WAPMESSAGE-0201
-
-// ---------------------------------------------------------------------------------
-// TEST(2) Connect using different bearers (tests 1.7, 1.8, 1.1.10 must fail)
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0202
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0202
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.1
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.2
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.3
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.4
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.5
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.6
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.7
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.8
-// Reconnect
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.10
-
-CONCURRENT
-// Connect to the same port (second test should fail)
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.1
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.1
-
-// Connect to the different ports at the same time
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.2
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.3
-
-CONSECUTIVE
-END_TESTCASE			WAP-WAPMESSAGE-0202
-
-// ---------------------------------------------------------------------------------
-// TEST(3) Unconnected
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0203
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0203
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_3 z:\testdata\configs\WapStackSuite.ini Test_3
-END_TESTCASE			WAP-WAPMESSAGE-0203
-
-// ---------------------------------------------------------------------------------
-// TEST(4) Normal condition/Multiple receive
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0204
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0204
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.3.1
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.3.2
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.3.3
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.3.4
-END_TESTCASE			WAP-WAPMESSAGE-0204
-
-// ---------------------------------------------------------------------------------
-// TEST(5) Cancel
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0205
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0205
-//RUN_TEST_STEP 100 WapStackSuite BoundCLPush_5 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0205
-
-// ---------------------------------------------------------------------------------
-// TEST(6) Timeout
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0206
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0206
-//RUN_TEST_STEP 100 WapStackSuite BoundCLPush_6 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0206
-
-// ---------------------------------------------------------------------------------
-// TEST(7) Wrong sequence
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0207
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0207
-RUN_TEST_STEP 100 WapStackSuite BoundCLPush_7 z:\testdata\configs\WapStackSuite.ini Test_7.1
-END_TESTCASE			WAP-WAPMESSAGE-0207
-
-// ---------------------------------------------------------------------------------
-// TEST(8) API low/high in parameter
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0208
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0208
-//RUN_TEST_STEP 100 WapStackSuite BoundCLPush_8 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0208
-
-// ---------------------------------------------------------------------------------
-// TEST(9)
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0209
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0209
-//RUN_TEST_STEP 100 WapStackSuite BoundCLPush_9 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0209
-
-PRINT GT167-WAP stack BOUND-PUSH test finished
-
-

--- a/wapstack/wapmessageapi/te_wapstack/scripts/WapBoundWDP.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-// Copyright (c) 2001-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:
-// WAP stack WapBoundWDP test script file
-// 
-//
-
-PRINT GT167-WAP stack BOUND-WDP tests
-
-LOAD_SUITE WapStackSuite
-
-// ---------------------------------------------------------------------------------
-// TEST(1) Load implementation
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0301
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0301
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_1 z:\testdata\configs\WapStackSuite.ini COMMON
-END_TESTCASE			WAP-WAPMESSAGE-0301
-
-// ---------------------------------------------------------------------------------
-// TEST(2) Connect using different bearers (tests 1.7, 1.10 must fail)
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0302
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0302
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.2
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.3
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.4
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.5
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.6
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.7
-// Reconnect
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.10
-
-CONCURRENT
-
-// Connect to the same port (second test should fail)
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.1
-// Connect to the different ports at the same time
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.2
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.3
-
-CONSECUTIVE
-END_TESTCASE			WAP-WAPMESSAGE-0302
-
-// ---------------------------------------------------------------------------------
-// TEST(3) Unconnected
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0303
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0303
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_3 z:\testdata\configs\WapStackSuite.ini Test_3
-END_TESTCASE			WAP-WAPMESSAGE-0303
-
-// ---------------------------------------------------------------------------------
-// TEST(4) Normal condition/Multiple receive
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0304
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0304
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.1
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.2
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.3
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.4
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.5
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.5.1
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.5.2
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.5.3
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.5.4
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.6
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.7
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.8
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.9
-END_TESTCASE			WAP-WAPMESSAGE-0304
-
-// ---------------------------------------------------------------------------------
-// TEST(5) Cancel
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0305
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0305
-//RUN_TEST_STEP 100 WapStackSuite BoundWDP_5 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0305
-
-// ---------------------------------------------------------------------------------
-// TEST(6) Timeout
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0306
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0306
-//RUN_TEST_STEP 100 WapStackSuite BoundWDP_6 z:\testdata\configs\WapStackSuite.ini
-
-// ---------------------------------------------------------------------------------
-// TEST(7) Wrong sequence
-// ---------------------------------------------------------------------------------
-RUN_TEST_STEP 100 WapStackSuite BoundWDP_7 z:\testdata\configs\WapStackSuite.ini Test_7.1
-END_TESTCASE			WAP-WAPMESSAGE-0306
-
-
-// ---------------------------------------------------------------------------------
-// TEST(8) API low/high in parameter
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0307
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0307
-//RUN_TEST_STEP 100 WapStackSuite BoundWDP_8 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0307
-
-
-// ---------------------------------------------------------------------------------
-// TEST(9) Reserved
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0308
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0308
-//RUN_TEST_STEP 100 WapStackSuite BoundWDP_9 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0308
-
-
-PRINT GT167-WAP stack BOUND-WDP test finished
-
-
-
-

--- a/wapstack/wapmessageapi/te_wapstack/scripts/WapBoundWSP.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-// Copyright (c) 2001-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:
-// WAP stack WapBoundWSP test script file
-// 
-//
-
-PRINT GT167-WAP stack BOUND-WSP test
-
-LOAD_SUITE WapStackSuite
-
-// ---------------------------------------------------------------------------------
-// TEST(1) Load implementation
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0401
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0401
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_1 z:\testdata\configs\WapStackSuite.ini COMMON
-END_TESTCASE			WAP-WAPMESSAGE-0401
-
-// ---------------------------------------------------------------------------------
-// TEST(2) Connect using different bearers (tests 1.7, 1.8, 1.10 must fail)
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0402
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0402
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.2
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.3
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.4
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.5
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.6
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.7
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.8
-// Reconnect
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.10
-
-CONCURRENT
-// Connect to the same port (second test should fail)
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.1
-
-// Connect to the different ports at the same time
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.2
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.3
-
-CONSECUTIVE
-END_TESTCASE			WAP-WAPMESSAGE-0402
-
-// ---------------------------------------------------------------------------------
-// TEST(3) Unconnected
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0403
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0403
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_3 z:\testdata\configs\WapStackSuite.ini Test_3
-END_TESTCASE			WAP-WAPMESSAGE-0403
-
-// ---------------------------------------------------------------------------------
-// TEST(4) Normal condition/Multiple receive
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0404
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0404
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0404
-
-// ---------------------------------------------------------------------------------
-// TEST(5) Cancel
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0405
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0405
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_5 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0405
-
-// ---------------------------------------------------------------------------------
-// TEST(6) Timeout
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0406
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0406
-RUN_TEST_STEP 100 WapStackSuite BoundWSP_6 z:\testdata\configs\WapStackSuite.ini Test_6.1
-END_TESTCASE			WAP-WAPMESSAGE-0406
-
-// ---------------------------------------------------------------------------------
-// TEST(7) Wrong sequence
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0407
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0407
-RUN_TEST_STEP 100 WapStackSuite  BoundWSP_7 z:\testdata\configs\WapStackSuite.ini Test_7.1
-END_TESTCASE			WAP-WAPMESSAGE-0407
-
-// ---------------------------------------------------------------------------------
-// TEST(8) API low/high in parameter
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0408
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0408
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_8 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0408
-
-// ---------------------------------------------------------------------------------
-// TEST(9)
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0409
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0409
-//RUN_TEST_STEP 100 WapStackSuite BoundWSP_9 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0409
-
-PRINT GT167-WAP stack BOUN-WSP test finished
-
-
-
-

--- a/wapstack/wapmessageapi/te_wapstack/scripts/WapFullySpecPush.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-// Copyright (c) 2001-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:
-// WAP stack WapFullySpecPush test script file
-// 
-//
-
-PRINT GT167-WAP stack FULLY_SPECIFIED-PUSH test
-
-LOAD_SUITE WapStackSuite
-
-// ---------------------------------------------------------------------------------
-// TEST(1) Load implementation
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0501
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0501
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_1 z:\testdata\configs\WapStackSuite.ini COMMON
-END_TESTCASE			WAP-WAPMESSAGE-0501
-
-// ---------------------------------------------------------------------------------
-// TEST(2) Connect using different bearers (tests 1.7, 1.8, 1.9, 1.10 must fail)
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0502
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0502
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.1
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.2
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.3
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.4
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.5
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.7
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.8
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.9
-// Reconnect
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.10
-END_TESTCASE			WAP-WAPMESSAGE-0502
-
-// ---------------------------------------------------------------------------------
-// TEST(3) Unconnected
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0503
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0503
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_3 z:\testdata\configs\WapStackSuite.ini Test_3
-END_TESTCASE			WAP-WAPMESSAGE-0503
-
-// ---------------------------------------------------------------------------------
-// TEST(4) Normal condition/Multiple receive
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0504
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0504
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.4.1
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.4.2
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.4.3
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.4.4
-END_TESTCASE			WAP-WAPMESSAGE-0504
-
-// ---------------------------------------------------------------------------------
-// TEST(5) Cancel
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0505
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0505
-//RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_5 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0505
-
-// ---------------------------------------------------------------------------------
-// TEST(6) Timeout
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0506
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0506
-//RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_6 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0506
-
-// ---------------------------------------------------------------------------------
-// TEST(7) Wrong sequence
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0507
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0507
-RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_7 z:\testdata\configs\WapStackSuite.ini Test_7.1
-END_TESTCASE			WAP-WAPMESSAGE-0507
-
-// ---------------------------------------------------------------------------------
-// TEST(8) API low/high in parameter
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0508
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0508
-//RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_8 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0508
-
-// ---------------------------------------------------------------------------------
-// TEST(9)
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0509
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0509
-//RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_9 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0509
-
-PRINT GT167-WAP stack FULLY_SPECIFIED-PUSH test finished
-
-

--- a/wapstack/wapmessageapi/te_wapstack/scripts/WapFullySpecWDP.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-// Copyright (c) 2001-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:
-// WAP stack WapFullySpecWDP test script file
-// 
-//
-
-PRINT GT167-WAP stack FULLY_SPECIFIED-WDP test
-
-LOAD_SUITE WapStackSuite
-
-// ---------------------------------------------------------------------------------
-// TEST(1) Load implementation
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0601
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0601
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_1 z:\testdata\configs\WapStackSuite.ini COMMON
-END_TESTCASE			WAP-WAPMESSAGE-0601
-
-// ---------------------------------------------------------------------------------
-// TEST(2) Connect using different bearers (tests 1.7, 1.9, 1.10 must fail)
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0602
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0602
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.2
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.3
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.4
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.5
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.7
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.9
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.10
-END_TESTCASE			WAP-WAPMESSAGE-0602
-
-// ---------------------------------------------------------------------------------
-// TEST(3) Unconnected
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0603
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0603
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_3 z:\testdata\configs\WapStackSuite.ini Test_3
-END_TESTCASE			WAP-WAPMESSAGE-0603
-
-// ---------------------------------------------------------------------------------
-// TEST(4) Normal condition/Multiple receive
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0604
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0604
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.1
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.2
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.3
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.4
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.5
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.6
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.7
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.8
-END_TESTCASE			WAP-WAPMESSAGE-0604
-
-// ---------------------------------------------------------------------------------
-// TEST(5) Cancel
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0605
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0605
-//RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_5 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0605
-
-// ---------------------------------------------------------------------------------
-// TEST(6) Timeout
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0606
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0606
-//RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_6 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0606
-
-// ---------------------------------------------------------------------------------
-// TEST(7) Wrong sequence
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0607
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0607
-RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_7 z:\testdata\configs\WapStackSuite.ini Test_7.1
-END_TESTCASE			WAP-WAPMESSAGE-0607
-
-// ---------------------------------------------------------------------------------
-// TEST(8) API low/high in parameter
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0608
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0608
-//RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_8 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0608
-
-// ---------------------------------------------------------------------------------
-// TEST(9)
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0609
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0609
-//RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_9 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0609
-
-PRINT GT167-WAP stack FULLY_SPECIFIED-WDP test finished
-
-

--- a/wapstack/wapmessageapi/te_wapstack/scripts/WapFullySpecWSP.script	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-// Copyright (c) 2001-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:
-// WAP stack FullySpecWSP test script file
-// 
-//
-
-PRINT GT167-WAP stack FULLY-SPECIFIED-WSP test
-
-LOAD_SUITE WapStackSuite
-
-// ---------------------------------------------------------------------------------
-// TEST(1) Load implementation
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0701
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0701
-RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_1 z:\testdata\configs\WapStackSuite.ini COMMON
-END_TESTCASE			WAP-WAPMESSAGE-0701
-
-// ---------------------------------------------------------------------------------
-// TEST(2) Connect using different bearers (tests 1.7, 1.8, 1.9, 1.10 must fail)
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0702
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0702
-RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1
-RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.2
-RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.3
-RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.4
-RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.5
-RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.7
-RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.8
-RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.9
-// Reconnect
-RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.10
-END_TESTCASE			WAP-WAPMESSAGE-0702
-
-// ---------------------------------------------------------------------------------
-// TEST(3) Unconnected
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0703
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0703
-RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_3 z:\testdata\configs\WapStackSuite.ini Test_3
-END_TESTCASE			WAP-WAPMESSAGE-0703
-
-// ---------------------------------------------------------------------------------
-// TEST(4) Normal condition/Multiple receive
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0704
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0704
-//RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_4 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0704
-
-// ---------------------------------------------------------------------------------
-// TEST(5) Cancel
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0705
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0705
-//RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_5 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0705
-
-// ---------------------------------------------------------------------------------
-// TEST(6) Timeout
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0706
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0706
-RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_6 z:\testdata\configs\WapStackSuite.ini Test_6.1
-END_TESTCASE			WAP-WAPMESSAGE-0706
-
-// ---------------------------------------------------------------------------------
-// TEST(7) Wrong sequence
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0707
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0707
-RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_7 z:\testdata\configs\WapStackSuite.ini Test_7.1
-END_TESTCASE			WAP-WAPMESSAGE-0707
-
-// ---------------------------------------------------------------------------------
-// TEST(8) API low/high in parameter
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0708
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0708
-//RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_8 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0708
-
-// ---------------------------------------------------------------------------------
-// TEST(9)
-// ---------------------------------------------------------------------------------
-START_TESTCASE			WAP-WAPMESSAGE-0709
-//! @SYMTestCaseID		WAP-WAPMESSAGE-0709
-//RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_9 z:\testdata\configs\WapStackSuite.ini
-END_TESTCASE			WAP-WAPMESSAGE-0709
-
-PRINT GT167-WAP stack FULLY-SPECIFIED-WSP test finished
-
-

--- a/wapstack/wapmessageapi/te_wapstack/src/WapBoundCLPushSteps.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,917 +0,0 @@
-// Copyright (c) 2002-2010 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:
-// CBoundCLPushStep_xyz derived implementations
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include "WapBoundCLPushSteps.h"
-#include "WapStackSuiteDefs.h"
-#include <simtsy.h>
-#include <wapmsgerr.h>
-#include <ecom/ecom.h>
-
-
-CBoundCLPushStepBase::CBoundCLPushStepBase()
-/**
-* Constructor
-*/
-	{
-	}
-
-CBoundCLPushStepBase::~CBoundCLPushStepBase()
-/**
-* Destructor
-*/
-	{
-	if(iImp) 
-		{
-		UnloadInterface();
-		}
-	}
-
-// Load CWapBoundCLPushService Interface 
-CWapBoundCLPushService* CBoundCLPushStepBase::LoadInterface()
-	{
-	TInt trapValue;
-	CWapBoundCLPushService* implementation = NULL;
-	// UID {0x101FBB39} - SWS implementation
-	TUid KInterfaceUid = {0x101FBB39}; 	
-	INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), KInterfaceUid);
-	TRAP(trapValue, implementation = CWapBoundCLPushService::NewL(KInterfaceUid));
-	if(!trapValue)
-		{
-		INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), implementation);
-		return implementation;
-		}
-	else return NULL;
-	}
-
-void CBoundCLPushStepBase::UnloadInterface()
-	{
-	INFO_PRINTF2(_L("Interface at implementation.addr = 0x%08x is deleted"), iImp);
-	delete iImp;
-	iImp = NULL;
-	REComSession::FinalClose();
-	}
-
-CBoundCLPushStep_1::~CBoundCLPushStep_1()
-/**
-* Destructor
-*/
-	{
-	}
-
-CBoundCLPushStep_1::CBoundCLPushStep_1()
-/**
-* Constructor
-*/
-	{
-	}
-
-TVerdict CBoundCLPushStep_1::doTestStepL()
-/**
-* @return - TVerdict code
-* Override of base class pure virtual
-* Our implementation only gets called if the base class doTestStepPreambleL() did
-* not leave. That being the case, the current test result value will be EPass.
-*/
-	{
-	//
-	// CWapBoundCLPushService
-	// 
-	INFO_PRINTF1(_L("CreateImplementation - CWapBoundCLPushService"));
-	INFO_PRINTF1(_L("Calling old NewL() method"));
-	
-	TInt trapValue; 
-	
-	SetTestStepResult(EFail);
-	TRAP(trapValue, iImp = CWapBoundCLPushService::NewL());
-	if(!trapValue)
-		{
-		INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), iImp);
-		UnloadInterface();
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			INFO_PRINTF1(_L("CreateImplementation - OK"));
-			SetTestStepResult(EPass);
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-CBoundCLPushStep_2::CBoundCLPushStep_2()
-/**
-* Constructor
-*/
-	{
-	}
-
-CBoundCLPushStep_2::~CBoundCLPushStep_2() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CBoundCLPushStep_2::doTestStepL()
-/** 
-* Test Connect methoths 
-* @return - TVerdict code
-* 
-*/
-	{
-	INFO_PRINTF1(_L("BOUNDCL-PUSH: Testing Connect"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			TInt bearer, port;
-			TInt error	= KErrNone;
-			TBool secure= EFalse;
-			TBool reconnect= EFalse;
-			SetLastError(KErrNone);
-			TBool delay = EFalse;
-			
-			if(GetIntFromConfig(ConfigSection(), KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer;
-			if(GetIntFromConfig(ConfigSection(), KWapLocalPort, port)) iLocalPort = (Wap::TPort)port;
-			if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error);
-			if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure;
-			if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect;
-			if(GetBoolFromConfig(ConfigSection(),KWapDelayPortClosure, delay)) iDelayPortClosure = delay;
-
-			if(UseSimTsy())
-				{
-				GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState);
-				User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState));
-				}
-			User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn));
-
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-
-			StartScheduler();
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CBoundCLPushStep_2::CallStateMachine()
-	{
-	TInt err = KErrNone;
-	INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State());
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iBearer, (Wap::TPort)iLocalPort, iSecure);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-				if(iReconnect)
-					{ 
-					INFO_PRINTF1(_L("Second connect"));
-					iControl->ReStart();
-					break;
-					}
-				}
-			SetState(EFinish);
-			SetLastError(err);
-			iControl->ReStart();
-			break;
-			
-		case EFinish:
-			// it's necessary to delay port closure, let the other concurrent test step
-			// can fail opening the same port with expected error EPortAlreadyBound (-5498)
-			if (iDelayPortClosure)
-				User::After(5000000);
-
-			INFO_PRINTF1(_L("EFinish"));
-			if(GetLastError() == GetExpectedError()) 
-				SetTestStepResult(EPass);
-			else 
-				SetTestStepResult(EFail);
-			SetState(EIdle); 
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(EFail);
-			StopScheduler();
-			break;
-		}
-	return (0);
-	}
-
-CBoundCLPushStep_3::CBoundCLPushStep_3()
-/**
-* Constructor
-*/
-	{
-	}
-
-CBoundCLPushStep_3::~CBoundCLPushStep_3() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CBoundCLPushStep_3::doTestStepL()
-/*
-* Test the BoundCLPush APIs in unconnected state.
-*/
-	{
-	INFO_PRINTF1(_L("BoundCLPush. Requests without connection"));
-	// check preamble result
-	TVerdict verdict = TestStepResult();
-	if (verdict==EPass)
-		{
-		TInt err, ret;
-		iImp = LoadInterface();
-		if (!iImp)
-			{
-			ERR_PRINTF1(_L("Unable to load BoundCLPush Interface"));
-			verdict = EFail;
-			}
-		else
-			{
-			GetIntFromConfig(ConfigSection(),KWapExError,(TInt&)iExError);
-			ShowConnectionInfo();
-			TRequestStatus reqStatus;
-			iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, reqStatus);
-			TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("AwaitPush Fails not as expected")))
-				if (ret) 
-					verdict = EFail;
-				else
-					{
-					Wap::TPort port;
-					err=iImp->GetLocalPort(port);
-					TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalPort Fails not as expected")))
-						if (ret)
-							verdict = EFail;
-						else
-							{
-							HBufC8* localHost;					
-							err=iImp->GetLocalAddress(localHost);
-							TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalAddress Fails not as expected")))
-								if (ret) 
-									verdict = EFail;
-								else
-									{
-									err=iImp->GetBearer(iBearer);
-									TRAP(ret, TEST_CHECKL(err, iExError, _L("GetBearer Fails not as expected")))
-										if (ret) 
-											verdict = EFail;
-										else
-											{
-											HBufC8* host;
-											err=iImp->GetServerAddress(host);
-											TRAP(ret, TEST_CHECKL(err, iExError, _L("GetServerAddress Fails not as expected")))
-												if (ret) 
-													verdict = EFail;
-											}
-									}
-							}
-					}
-				UnloadInterface();
-			}
-		}
-	if (verdict==EPass)
-		{
-		INFO_PRINTF1(_L("BoundCLPush. Requests Fail as expected"));
-		}
-	SetTestStepResult(verdict);
-	return TestStepResult();
-	}
-
-TInt CBoundCLPushStep_3::CallStateMachine()
-	{
-	return (0);
-	}
-
-
-CBoundCLPushStep_4::CBoundCLPushStep_4()
-/**
-* Constructor
-*/
-	{
-	}
-
-CBoundCLPushStep_4::~CBoundCLPushStep_4() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CBoundCLPushStep_4::doTestStepL()
-/** 
-* Test receiving PDU data over UDP
-* The test is run concurently with CBoundCLPushStep_9 test. CBoundCLPushStep_4 waits for push message whilst 
-* CBoundCLPushStep_9 sends a push message over UDP using loopback. 
-* The test pair is used to test two cases (dependent on configuration read for CBoundCLPushStep_9):
-* - sending PDU data that is smaller than the allocated buffer on the receiving side (<=1024)
-* - sending PDU data that is larger than the allocated buffer on the receiving side and needs reallocation (>1024)
-* @return - TVerdict code
-* 
-*/
-	{
-	INFO_PRINTF1(_L("BOUND-CLPUSH: Connect-AwaitPush"));
-	INFO_PRINTF1(_L("Receiving PDU over UDP from a concurrent test... "));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			SetLastError(KErrNone);
-			
-			TInt bearer, port;
-			TInt error = KErrNone;
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer))
-				{
-				iBearer = static_cast<Wap::TBearer>(bearer);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) 
-				{
-				iLocalPort = static_cast<Wap::TPort>(port);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapExError, error))
-				{
-				SetExpectedError(error);
-				}
-			GetBoolFromConfig(ConfigSection(), KMiddleCancel, iMiddleCancel);
-			GetBoolFromConfig(ConfigSection(), KMultiReadCancel, iMultiReadCancel);
-			TInt headerLength, bufLength; 
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength))
-				{
-				iHeaderRecvBufLength=static_cast<TUint16>(headerLength);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength))
-				{
-				iBodyRecvBufLength=static_cast<TUint16>(bufLength);
-				}
-			iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength);
-			iRecvBody = HBufC8::NewL(iBodyRecvBufLength);
-
-			User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn));
-			
-
-			if(UseSimTsy())
-				{
-				GetIntFromConfig(ConfigSection(),KWapSIMTSYState, iSimTsyState);
-				User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState));
-				}
-
-						
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-
-			StartScheduler();
-			delete iRecvBody;
-			iRecvBody=NULL;
-			delete iRecvHeaders;
-			iRecvHeaders=NULL;
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CBoundCLPushStep_4::CallStateMachine()
-	{
-	TVerdict verdict = EFail;
-	TInt err = KErrNone;
-	TInt activate = 0;
-	
-	INFO_PRINTF2(_L("CallStateMachine:  state [%d]"), State());
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iBearer, iLocalPort, EFalse);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-				if(iBearer != Wap::EIP)
-					{
-					TRAP(err, WaitForInitializeL());
-					}
-				iRecvHeadersBuf.Set(iRecvHeaders->Des());
-				iRecvBodyBuf.Set(iRecvBody->Des());
-				iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, *iStatus);
-				INFO_PRINTF1(_L("Start AwaitingPush....."));
-				activate = 1;
-				if (!iMiddleCancel)
-					{
-					SetState(EAwaitPush);
-					}
-				else
-					{
-					INFO_PRINTF1(_L("Cancel AwaitPush"));
-					iImp->CancelAwaitPush();
-					SetState(EFinish);
-					}
-				}
-			else 
-				{
-				SetState(EFinish);
-				iControl->ReStart();
-				}
-			SetLastError(err);
-			break;
-			
-		case EAwaitPush:
-			
-			INFO_PRINTF1(_L("EAwaitPush"));
-			if(iStatus->Int() != KErrNone && iStatus->Int()!=Wap::EMoreData) 
-				// AwaitPush failed
-				{
-				INFO_PRINTF1(_L("AwaitPush failed"));
-				SetLastError(iStatus->Int());
-				SetState(EFinish);
-				iControl->ReStart();
-				}
-			else
-				{
-				iMaxWspHeaderRecvBuffer.Append(iRecvHeadersBuf);
-				iMaxWspDataRecvBuffer.Append(iRecvBodyBuf);
-				if (iStatus->Int()==Wap::EMoreData)
-					{
-					iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, *iStatus);
-					activate = 1;
-					if (!iMultiReadCancel)
-						{
-						SetState(EAwaitPush);
-						}
-					else
-						{
-						INFO_PRINTF1(_L("Cancel Receive in EMutipleReceive state"));
-						iImp->CancelAwaitPush();
-						SetState(EFinish);
-						}					
-					}
-				else
-					{
-					SetLastError(iStatus->Int());
-					iControl->ReStart();
-					SetState(EFinish);
-					}
-				}
-			break;
-			
-		case EFinish:
-			
-			INFO_PRINTF1(_L("EFinish"));
-			if(iStatus->Int() != KErrNone) 
-				{
-				SetLastError(iStatus->Int());
-				}
-			verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-			if (verdict==EPass && !iMiddleCancel && !iMultiReadCancel)
-				{
-				iImp->CancelAwaitPush();
-				INFO_PRINTF1(_L("Headers:"));
-				DumpBuf(iMaxWspHeaderRecvBuffer);
-				INFO_PRINTF1(_L("Body"));
-				DumpBuf(iMaxWspDataRecvBuffer);
-				if (verdict==EPass)
-					{
-					HBufC8* buf;
-					iImp->GetServerAddress(buf);
-					verdict = (buf->Match(iRemoteHost)!=KErrNotFound)?EPass:EFail;
-					delete buf;
-					}
-				if (verdict==EPass)
-					{
-					Wap::TPort port;
-					iImp->GetLocalPort(port);
-					verdict = (port == iLocalPort)?EPass:EFail;
-					}
-				if (verdict==EPass)
-					{
-					Wap::TBearer bearer;
-					iImp->GetBearer(bearer);
-					verdict = (bearer == iBearer)?EPass:EFail;
-					}
-				if (verdict==EPass)
-					{
-					//This test can not perform.
-					HBufC8* buf;
-					iImp->GetLocalAddress(buf);
-					delete buf;
-					}
-				}
-			SetTestStepResult(verdict);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(verdict);
-			StopScheduler();
-			
-			break;
-		}
-		return (activate);
-}
-
-CBoundCLPushStep_5::CBoundCLPushStep_5()
-/**
-* Constructor
-*/
-	{
-	}
-
-CBoundCLPushStep_5::~CBoundCLPushStep_5() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CBoundCLPushStep_5::doTestStepL()
-/** 
-* Test Cancel 
-* @return - TVerdict code
-* 
-*/
-	{
-	INFO_PRINTF1(_L("BOUNDCL-PUSH: Testing Cancel"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			TInt bearer, port;
-			TInt error	= KErrNone;
-			TBool secure= EFalse;
-			TBool reconnect= EFalse;
-			SetLastError(KErrNone);
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer;
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) iLocalPort = (Wap::TPort)port;
-			if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error);
-			if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure;
-			if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect;
-			
-			ShowConnectionInfo();
-			error = iImp->Connect(iBearer, iLocalPort, iSecure);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), error);
-			if( error == KErrNone)
-				{
-				TBuf8<100> header, body;
-				TPckgBuf<TUint8> pushIdPckg;
-				TRequestStatus reqStatus;
-				iImp->AwaitPush(header, body, pushIdPckg, reqStatus);
-				SetState(EAwaitPush);
-				StartScheduler();
-				iControl->ReStart();
-				if(reqStatus==KErrCancel)
-					{
-					SetTestStepResult(EPass);
-					}
-				}
-			
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CBoundCLPushStep_5::CallStateMachine()
-	{
-	INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State());
-	switch(iState)
-		{
-		case EAwaitPush:
-			INFO_PRINTF1(_L("EAwaitPush"));
-			iImp->CancelAwaitPush();
-			SetState(EFinish);
-			iControl->ReStart();
-			break;
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			SetState(EIdle);
-			StopScheduler();
-			break;
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(EFail);
-			StopScheduler();
-			break;
-		}
-	return (0);
-	}
-
-
-CBoundCLPushStep_6::CBoundCLPushStep_6() 
-	{
-	}
-CBoundCLPushStep_6::~CBoundCLPushStep_6() 
-	{
-	}
-TVerdict CBoundCLPushStep_6::doTestStepL()
-	{
-	return TestStepResult();
-	}
-TInt CBoundCLPushStep_6::CallStateMachine()
-	{
-	return (0);
-	}
-
-CBoundCLPushStep_7::CBoundCLPushStep_7() 
-	{
-	}
-CBoundCLPushStep_7::~CBoundCLPushStep_7() 
-	{
-	}
-TVerdict CBoundCLPushStep_7::doTestStepL()
-	{
-	INFO_PRINTF1(_L("BOUND-CLPUSH: Connect-AwaitPush-AwaitPush"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			SetLastError(KErrNone);
-			
-			TInt bearer, port;
-			TInt error = KErrNone;
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) 
-				{
-				iBearer = static_cast<Wap::TBearer>(bearer);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) 
-				{
-				iLocalPort = static_cast<Wap::TPort>(port);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapExError, error)) 
-				{
-				SetExpectedError(error);
-				}
-			TInt headerLength, bufLength; 
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength))
-				{
-				iHeaderRecvBufLength=static_cast<TUint16>(headerLength);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength))
-				{
-				iBodyRecvBufLength=static_cast<TUint16>(bufLength);
-				}
-			iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength);
-			iRecvBody = HBufC8::NewL(iBodyRecvBufLength);
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-
-			StartScheduler();
-			delete iRecvBody;
-			iRecvBody=NULL;
-			delete iRecvHeaders;
-			iRecvHeaders=NULL;
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-TInt CBoundCLPushStep_7::CallStateMachine()
-	{
-	TVerdict verdict = EFail;
-	TInt err = KErrNone;
-	TInt activate = 0;
-	
-	INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State());
-	switch(iState)
-		{
-		case EConnect:
-			
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iBearer, iLocalPort, EFalse);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-				iRecvHeadersBuf.Set(iRecvHeaders->Des());
-				iRecvBodyBuf.Set(iRecvBody->Des());
-				TRequestStatus reqStatus;
-				iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, reqStatus);
-				iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, *iStatus);
-				INFO_PRINTF1(_L("AwaitPush"));
-				activate = 1;
-				}
-			else
-				{
-				iControl->ReStart();
-				}
-			SetLastError(err);
-			SetState(EFinish);
-			break;
-			
-		case EFinish:
-			
-			INFO_PRINTF1(_L("EFinish"));
-			iImp->CancelAwaitPush();
-			if(iStatus->Int() != KErrNone) 
-				{
-				SetLastError(iStatus->Int());
-				}
-			verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-			SetTestStepResult(verdict);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state [%d]"), State());
-			SetTestStepResult(verdict);
-			StopScheduler();
-			break;
-		}
-	return (activate);
-	}
-
-CBoundCLPushStep_8::CBoundCLPushStep_8() 
-	{
-	}
-CBoundCLPushStep_8::~CBoundCLPushStep_8() 
-	{
-	}
-TVerdict CBoundCLPushStep_8::doTestStepL()
-/**
-*	@return - TVerdict code
-*	Wrong parameter values for Bound CL Push API:
-*	- Wrong TUid on construction
-*	- Connect to wrong bearer (already implemented in test 2)
-*/
-	{
-	INFO_PRINTF1(_L("CreateImplementation with wrong Uid- CWapBoundCLPushService"));
-	if(TestStepResult() == EPass )
-		{
-		TInt error;
-		if(GetIntFromConfig(ConfigSection(),KWapExError2, error))
-			{
-			iExError2=error;
-			}
-		TInt trapValue;
-		
-		TUid invalidInterfaceUid = {0x00000000}; 
-		
-		INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), invalidInterfaceUid);
-		TRAP(trapValue, iImp = CWapBoundCLPushService::NewL(invalidInterfaceUid));
-		TVerdict verdict = (trapValue == iExError2)?EPass:EFail;
-		if (verdict==EPass)
-			{
-			INFO_PRINTF2(_L("CreateImplementation with wrong Uid- Failed as expected with error %d"),trapValue);
-			}
-		SetTestStepResult(verdict);
-		}
-	return TestStepResult();
-	}
-TInt CBoundCLPushStep_8::CallStateMachine()
-	{
-	return (0);
-	}
-
-CBoundCLPushStep_9::CBoundCLPushStep_9() 
-	{
-	}
-CBoundCLPushStep_9::~CBoundCLPushStep_9() 
-	{
-	}
-TVerdict CBoundCLPushStep_9::doTestStepL()
-/** 
-* Test sending PDU data over UDP
-* Test should be run concurently with CBoundCLPushStep_4 test. CBoundCLPushStep_4 waits for push message whilst 
-* CBoundCLPushStep_9 sends a push message over UDP using loopback. 
-* The test pair is used to test two cases (dependent on configuration read for CBoundCLPushStep_9):
-* - sending PDU data that is smaller than the allocated buffer on the receiving side (<=1024)
-* - sending PDU data that is larger than the allocated buffer on the receiving side and needs reallocation (>1024)
-* @return - TVerdict code
-*/
-	{
-	INFO_PRINTF1(_L("BOUND-CLPUSH: Sending Push Message"));
-	
-	if(TestStepResult() == EPass )
-		{
-		User::After(20000000);
-		SetTestStepResult(EFail);
-		SetLastError(KErrNone);
-		TInt error = KErrNone;
-		/**
-		Getting information from config file
-		Local port
-		Remote port
-		Local address
-		Remote address
-		Size of data to be sent
-		*/
-		GetIntFromConfig(ConfigSection(),KLocalPort, iLclPort);
-		GetIntFromConfig(ConfigSection(),KRemotePort, iRmtPort);
-		TPtrC temp;
-		if(GetStringFromConfig(ConfigSection(),KWapLocalHost, temp))
-			{
-			error = iLocalAddr.Input(temp);
-			if(error)
-				{
-				User::Leave(error);
-				}
-			}
-		if(GetStringFromConfig(ConfigSection(),KWapRemoteHost, temp ))
-			{
-			error = iRemoteAddr.Input(temp);
-			if(error)
-				{
-				User::Leave(error);
-				}
-			}
-//		error = GetStringFromConfig(ConfigSection(),KWapData, temp);
-
-		RFs fS;
-		RFile file;
-		User::LeaveIfError(fS.Connect());
-		_LIT(KPduFilename,"z:\\testdata\\configs\\pushpdu.bin");
-		_LIT(KPDUDataSize,"Data_Size");
-		
-		User::LeaveIfError(file.Open(fS, KPduFilename , EFileStream | EFileRead));
-		/* Read PDU from the file */
-
-		TInt dataSize(1024);        
-		GetIntFromConfig(ConfigSection(),KPDUDataSize, dataSize);
-		iSendBuffPtr = HBufC8::NewL(dataSize);
-		TPtr8 tmpbuf = iSendBuffPtr->Des();
-		User::LeaveIfError(file.Read(tmpbuf));
-
-		file.Close();
-		fS.Close();
-		/**
-		Settings
-		*/
-		iLocalAddr.SetPort(iLclPort);
-		iRemoteAddr.SetPort(iRmtPort);
-//		iSendBuffPtr = HBufC8::NewL(temp.Length());
-//		TPtr8 tmp = iSendBuffPtr->Des();
-//		tmp.Copy(temp);
-		INFO_PRINTF2(_L("Sending PDU of size %d over UDP to a concurrent test... "), dataSize);
-		/**
-		socket server 
-		*/
-		RSocketServ socketServer;
-	    User::LeaveIfError(socketServer.Connect());
-		CleanupClosePushL(socketServer);
-		RSocket sock;
-		User::LeaveIfError(sock.Open(socketServer, KAfInet, KSockDatagram, KProtocolInetUdp));
-		CleanupClosePushL(sock);
-		TRequestStatus status;
-		sock.SendTo(iSendBuffPtr->Des(),iRemoteAddr , 0, status);
-		User::WaitForRequest(status);
-		INFO_PRINTF2(_L("Send Push Message - status = %d"), status.Int());
-		User::LeaveIfError(status.Int());
-		sock.Close();
-		socketServer.Close();
-		CleanupStack::PopAndDestroy(&sock);
-		CleanupStack::Pop(&socketServer);
-		TVerdict verdict = (status.Int() == KErrNone)?EPass:EFail;
-		SetTestStepResult(verdict);
-		}
-	return TestStepResult();
-	}
-TInt CBoundCLPushStep_9::CallStateMachine()
-	{
-			return (0);
-	}
-
-
-
-

--- a/wapstack/wapmessageapi/te_wapstack/src/WapBoundCLPushSteps.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-/**
-* Copyright (c) 2002-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 WapBoundCLPushSteps.h
-*/
-#if (!defined __BOUNDCLPUSH_STEP_H__)
-#define __BOUNDCLPUSH_STEP_H__
-#include <test/testexecutestepbase.h>
-#include <in_sock.h>
-#include <es_sock.h>
-#include <wapmessage.h>
-#include "WapStackSuiteStepBase.h"
-
-_LIT(KBoundCLPushStep_1,"BoundCLPush_1");
-_LIT(KBoundCLPushStep_2,"BoundCLPush_2");
-_LIT(KBoundCLPushStep_3,"BoundCLPush_3");
-_LIT(KBoundCLPushStep_4,"BoundCLPush_4");
-_LIT(KBoundCLPushStep_5,"BoundCLPush_5");
-_LIT(KBoundCLPushStep_6,"BoundCLPush_6");
-_LIT(KBoundCLPushStep_7,"BoundCLPush_7");
-_LIT(KBoundCLPushStep_8,"BoundCLPush_8");
-_LIT(KBoundCLPushStep_9,"BoundCLPush_9");
-
-
-class CBoundCLPushStepBase : public CWapStackSuiteStepBase
-{
-public:
-	CBoundCLPushStepBase();
-	~CBoundCLPushStepBase();
-	CWapBoundCLPushService* LoadInterface();
-	void UnloadInterface();
-protected:
-	CWapBoundCLPushService* iImp;
-};
-
-class CBoundCLPushStep_1 : public CBoundCLPushStepBase
-	{
-public:
-	CBoundCLPushStep_1();
-	~CBoundCLPushStep_1();
-	virtual TVerdict doTestStepL();
-private:
-	};
-
-class CBoundCLPushStep_2 : public CBoundCLPushStepBase
-	{
-public:
-	CBoundCLPushStep_2();
-	~CBoundCLPushStep_2();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CBoundCLPushStep_3 : public CBoundCLPushStepBase
-	{
-public:
-	CBoundCLPushStep_3();
-	~CBoundCLPushStep_3();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CBoundCLPushStep_4 : public CBoundCLPushStepBase
-	{
-public:
-	CBoundCLPushStep_4();
-	~CBoundCLPushStep_4();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CBoundCLPushStep_5 : public CBoundCLPushStepBase
-	{
-public:
-	CBoundCLPushStep_5();
-	~CBoundCLPushStep_5();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CBoundCLPushStep_6 : public CBoundCLPushStepBase
-	{
-public:
-	CBoundCLPushStep_6();
-	~CBoundCLPushStep_6();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CBoundCLPushStep_7 : public CBoundCLPushStepBase
-	{
-public:
-	CBoundCLPushStep_7();
-	~CBoundCLPushStep_7();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CBoundCLPushStep_8 : public CBoundCLPushStepBase
-	{
-public:
-	CBoundCLPushStep_8();
-	~CBoundCLPushStep_8();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CBoundCLPushStep_9 : public CBoundCLPushStepBase
-	{
-public:
-	CBoundCLPushStep_9();
-	~CBoundCLPushStep_9();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-
-#endif

--- a/wapstack/wapmessageapi/te_wapstack/src/WapBoundWDPSteps.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1014 +0,0 @@
-// Copyright (c) 2002-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:
-// CStepOne derived implementation
-// 
-//
-
-/**
- @file
- @internalComponent 
-*/
-
-#include <e32base.h>
-#include <sacls.h>
-
-#include "WapBoundWDPSteps.h"
-#include "WapStackSuiteDefs.h"
-#include <etel.h>
-#include <es_wsms.h>
-#include <simtsy.h>
-#include <wapmsgerr.h>
-#include <ecom/ecom.h>
-
-CBoundWDPStepBase::CBoundWDPStepBase()
-/**
-* Constructor
-*/
-	{
-	}
-
-CBoundWDPStepBase::~CBoundWDPStepBase()
-/**
-* Destructor
-*/
-	{
-	if(iImp) 
-		{
-		UnloadInterface();
-		}
-	}
-
-// Load CWapBoundDatagramService Interface 
-CWapBoundDatagramService* CBoundWDPStepBase::LoadInterface()
-	{
-	TInt trapValue;
-	CWapBoundDatagramService* implementation = NULL;
-	// UID {0x101FBB37} - SWS implementation
-	TUid KInterfaceUid = {0x101FBB37}; 	
-	INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), KInterfaceUid);
-	TRAP(trapValue, implementation = CWapBoundDatagramService::NewL(KInterfaceUid));
-	if(!trapValue)
-		{
-		INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), implementation);
-		return implementation;
-		}
-	else return NULL;
-	}
-
-void CBoundWDPStepBase::UnloadInterface()
-	{
-	INFO_PRINTF2(_L("Interface at implementation.addr = 0x%08x is deleted"), iImp);
-	delete iImp;
-	iImp = NULL;
-	REComSession::FinalClose();	
-	}
-
-CBoundWDPStep_1::CBoundWDPStep_1()
-/**
-* Constructor
-*/
-	{
-	}
-
-CBoundWDPStep_1::~CBoundWDPStep_1() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CBoundWDPStep_1::doTestStepL()
-/** 
-* Load and destroy BoundDatagtamService interface implementation
-* Two different methods are used NewL() and NewL(TUid InterfaceUid)
-* @return - TVerdict code
-*/
-	{
-	// CWapBoundDatagramService
-	INFO_PRINTF1(_L("CreateImplementation - CWapBoundDatagramService"));
-	INFO_PRINTF1(_L("Calling old NewL() method"));
-	
-	SetTestStepResult(EFail);
-
-	TInt trapValue(0); 
-	TRAP(trapValue, iImp = CWapBoundDatagramService::NewL());
-	if(!trapValue)
-		{
-		INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), iImp);
-		UnloadInterface();
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			INFO_PRINTF1(_L("CreateImplementation - OK"));
-			SetTestStepResult(EPass);
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-CBoundWDPStep_2::CBoundWDPStep_2()
-/**
-* Constructor
-*/
-	{
-	}
-
-CBoundWDPStep_2::~CBoundWDPStep_2()
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CBoundWDPStep_2::doTestStepL()
-/**
-* Test Connect methoths
-* @return - TVerdict code
-*
-*/
-	{
-	INFO_PRINTF1(_L("BOUND-WDP: Connect"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			TInt bearer, port;
-			TInt error = KErrNone;
-			TBool reconnect = EFalse;
-			TBool delay = EFalse;
-
-			SetLastError(KErrNone);
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer;
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) iLocalPort = (Wap::TPort)port;
-			if(GetIntFromConfig(ConfigSection(),KWapExError, error)) SetExpectedError(error);
-			if(GetBoolFromConfig(ConfigSection(),KWapReconnect, reconnect)) iReconnect = reconnect;
-			if(GetBoolFromConfig(ConfigSection(),KWapDelayPortClosure, delay)) iDelayPortClosure = delay;
-			
-			TInt checkValue = 0;
-			if(UseSimTsy())
-				{
-				GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState);
-				User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState));
-				// double check that base did set it since this is the first place we try setting it in the harness
-				RProperty::Get(KUidPSSimTsyCategory, KPSSimTsyTestNumber, checkValue);
-				__ASSERT_ALWAYS(checkValue == iSimTsyState,User::Panic(KWapStackSuitePanic, EDataCorrupt));
-				} 
-			
-			User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn));
-			// double check
-			RProperty::Get(KUidSystemCategory, KUidPhonePwr.iUid, checkValue);
-			__ASSERT_ALWAYS(checkValue == ESAPhoneOn,User::Panic(KWapStackSuitePanic, EDataCorrupt));
-
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-			// Start state machine
-			StartScheduler();
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CBoundWDPStep_2::CallStateMachine()
-	{
-	TInt err = KErrNone;
-	INFO_PRINTF2(_L("CallStateMachine: step [%d]"), State());
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iBearer, iLocalPort);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-				if(iReconnect)
-					{
-					INFO_PRINTF1(_L("Second connect"));
-					iControl->ReStart();
-					break;
-					}
-				}
-			SetState(EFinish);
-			SetLastError(err);
-			iControl->ReStart();
-			break;
-
-		case EFinish:
-			// it's necessary to delay port closure, let the other concurrent test step
-			// can fail opening the same port with expected error EPortAlreadyBound (-5498)
-			if (iDelayPortClosure)
-				User::After(5000000);
-
-			INFO_PRINTF1(_L("EFinish"));
-			if(GetLastError() == GetExpectedError()) SetTestStepResult(EPass);
-			else SetTestStepResult(EFail);
-			SetState(EIdle);
-			// End of state machine
-			StopScheduler();
-			break;
-
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: bad state EIdle or unknown [%d]"), State());
-			SetTestStepResult(EFail);
-			// End of state machine
-			StopScheduler();
-			break;
-		}
-	return (0);
-	}
-
-
-CBoundWDPStep_3::CBoundWDPStep_3() 
-/**
-* Constructor
-*/
-	{
-	}
-
-CBoundWDPStep_3::~CBoundWDPStep_3() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CBoundWDPStep_3::doTestStepL()
-/*
-* Test the CBoundWDP APIs in unconnected state.
-*/
-	{
-	INFO_PRINTF1(_L("BoundWDP. Requests without connection"));
-	// check preamble result
-	TVerdict verdict = TestStepResult();
-	if (verdict==EPass)
-		{
-		TInt err, ret;
-		iImp = LoadInterface();
-		if (!iImp)
-			{
-			ERR_PRINTF1(_L("Unable to load BoundWDP Interface"));
-			verdict = EFail;
-			}
-		else
-			{
-			GetIntFromConfig(ConfigSection(),KWapExError,(TInt&)iExError);
-			ShowConnectionInfo();
-			TBuf8<100> buf;
-			err = iImp->SendTo(iRemoteHost, iRemotePort, buf, iBearer);
-			TRAP(ret, TEST_CHECKL(err, iExError, _L("SendTo Fails not as expected")))
-			if (ret) 
-				{
-				verdict = EFail;
-				}
-			else
-				{
-				TPckg<TUint16> aDataSizePckg(0);
-				TRequestStatus reqStatus;
-				iImp->AwaitRecvDataSize(aDataSizePckg, reqStatus);
-				User::WaitForRequest(reqStatus);
-				TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("AwaitRecvDataSize Fails not as expected")))
-				if (ret) 
-					{
-					verdict = EFail;
-					}
-				else
-					{
-					TBuf8<100> buf;
-					TBool truncated;
-					TUint32 timeout=0;
-					iImp->RecvFrom(iRecvRemoteHost, iRecvRemotePort, buf, truncated, reqStatus, timeout);
-					User::WaitForRequest(reqStatus);
-					TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("RecvFrom Fails not as expected")))
-					if (ret) 
-						{
-						verdict = EFail;
-						}
-					else
-						{
-						Wap::TPort aPort;
-						err=iImp->GetLocalPort(aPort);
-						TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalPort Fails not as expected")))
-						if (ret) 
-							{
-							verdict = EFail;
-							}
-						else
-							{
-							HBufC8* localHost;
-							err=iImp->GetLocalAddress(localHost);
-							TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalAddress Fails not as expected")))
-							if (ret) 
-								{
-								verdict = EFail;
-								}
-							else
-								{
-								TUint16 maxSize, nominalSize;
-								err=iImp->GetDatagramSizes(maxSize, nominalSize);
-								if (err)
-									{
-									verdict = EFail;
-									}
-								else
-									{
-									err=iImp->GetBearer(iBearer);
-									TRAP(ret, TEST_CHECKL(err, iExError, _L("GetBearer Fails not as expected")))
-									if (ret)
-										{
-										verdict = EFail;
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			UnloadInterface();
-			}
-		}
-	if (verdict==EPass)
-		{
-		INFO_PRINTF1(_L("BoundWDP. Requests Fail as expected"));
-		}
-	SetTestStepResult(verdict);
-	return TestStepResult();
-	}
-
-TInt CBoundWDPStep_3::CallStateMachine()
-	{
-	return (0);
-	}
-
-
-CBoundWDPStep_4::CBoundWDPStep_4() 
-/**
-* Constructor
-*/
-	{
-	}
-
-CBoundWDPStep_4::~CBoundWDPStep_4() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CBoundWDPStep_4::doTestStepL()
-/** 
-*/
-	{
-	INFO_PRINTF1(_L("BOUND-WDP: Connect-Send-Await-Receive"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			SetLastError(KErrNone);
-
-			TInt bearer, port, bufLen;
-			TInt error = KErrNone;
-			TPtrC data, remote_host;
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer))
-				{
-				iBearer = static_cast<Wap::TBearer>(bearer);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port))
-				{
-				iLocalPort = static_cast<Wap::TPort>(port);
-				}
-			if(GetStringFromConfig(ConfigSection(), KWapRemoteHost, remote_host))
-				{
-				iRemoteHost.Copy(remote_host);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapRemotePort, port))
-				{
-				iRemotePort = static_cast<Wap::TPort>(port);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapExError, error))
-				{
-				SetExpectedError(error);
-				}
-			GetIntFromConfig(ConfigSection(), KWapExError2, iExError2);
-			GetBoolFromConfig(ConfigSection(), KAwaitLengthCancel, iAwaitLengthCancel);
-			GetBoolFromConfig(ConfigSection(), KMiddleCancel, iMiddleCancel);
-			GetBoolFromConfig(ConfigSection(), KMultiReadCancel, iMultiReadCancel);
-			GetBoolFromConfig(ConfigSection(), KAwaitLengthTwice, iAwaitLengthTwice);
-			if(GetIntFromConfig(ConfigSection(),KWapWdpBufLength, bufLen))
-				{
-				iWdpRecvBufLength=static_cast<TUint16>(bufLen);
-				iRecvBuffPtr = HBufC8::NewL(iWdpRecvBufLength);
-				}
-			error = GetStringFromConfig(ConfigSection(),KWapData, data);
-			if(!error)
-				{
-				User::Leave(error);
-				}
-			iSendBuffPtr = HBufC8::NewL(data.Length());
-			TPtr8 tmp = iSendBuffPtr->Des();
-			tmp.Copy(data);
-			
-			if(UseSimTsy())
-				{
-				GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState);
-				User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState));
-				}
-			User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn));
-					
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-			// Start state machine
-			StartScheduler(); 
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CBoundWDPStep_4::CallStateMachine()
-	{
-	TVerdict verdict = EFail;
-	TInt err = KErrNone;
-	TInt activate = 0;
-	
-	INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State());
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iBearer, iLocalPort);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-					if(iBearer != Wap::EIP)
-						{
-						TRAP(err, WaitForInitializeL());
-						}
-					if(iSendBuffPtr->Length())
-						{
-						INFO_PRINTF1(_L("Data to send"));
-						DumpBuf(iSendBuffPtr->Des());
-						}
-				err = iImp->SendTo(iRemoteHost, iRemotePort, iSendBuffPtr->Des(), iBearer);
-				INFO_PRINTF2(_L("SendTo completed with code = %d"), err);
-				if(err == KErrNone) 
-					{	
-					SetState(EAwaitSize);
-					}
-				else 
-					{	
-					SetState(EFinish);
-					}
-				}
-			else 
-				{
-				SetState(EFinish);
-				}
-			SetLastError(err);
-			iControl->ReStart();
-			break;
-			
-		case EAwaitSize:
-			INFO_PRINTF1(_L("EAwaitSize"));
-			iImp->AwaitRecvDataSize(iLength, *iStatus);
-			activate = 1;
-			if (!iAwaitLengthCancel)
-				{
-				SetState(EReceive);
-				}
-			else
-				{
-				INFO_PRINTF1(_L("Cancel Receive in AwaitSize state"));
-				iImp->CancelRecv();
-				SetState(EFinish);
-				}
-			break;
-			
-		case EReceive:
-			INFO_PRINTF1(_L("EReceive"));
-			if(iStatus->Int()!=KErrNone) 
-				// AwaitSize failed
-				{
-				INFO_PRINTF1(_L("AwaitSize failed"));
-				SetLastError(iStatus->Int());
-				iControl->ReStart();
-				SetState(EFinish);
-				}
-			else
-				{	
-				INFO_PRINTF2(_L("AwaitSize returned - %d"),iLength());
-				if (!iAwaitLengthTwice)
-					{
-					if (iRecvBuffPtr==NULL)
-						{
-						TInt len=iLength();
-						TRAP(err, iRecvBuffPtr = HBufC8::NewL(len))
-							if (err!=KErrNone)
-								{
-								SetLastError(err);
-								iControl->ReStart();
-								SetState(EFinish);
-								break;
-								}
-						}
-					iRecvBuf.Set(iRecvBuffPtr->Des());
-					iImp->RecvFrom(iRecvRemoteHost, iRecvRemotePort, iRecvBuf, iTruncated, *iStatus, 0);
-					activate = 1;
-					if (!iMiddleCancel)
-						{
-						SetState(EMutipleReceive);
-						}
-					else
-						{
-						INFO_PRINTF1(_L("Cancel Receive in Receive state"));
-						iImp->CancelRecv();
-						SetState(EFinish);
-						}
-					}
-				else
-					{
-					iImp->AwaitRecvDataSize(iLength, *iStatus);
-					activate = 1;
-					SetState(EFinish);
-					}
-				}
-			break;
-			
-		case EMutipleReceive:
-			INFO_PRINTF1(_L("EMultipleReceive"));
-			if (iStatus->Int()!=KErrNone && iStatus->Int()!=Wap::EMoreData)
-				{
-				INFO_PRINTF1(_L("Receive failed"));
-				SetLastError(iStatus->Int());
-				iControl->ReStart();
-				SetState(EFinish);
-				}
-			else
-				{
-				iMaxWdpRecvBuffer.Append(iRecvBuf);
-				if (iTruncated)
-					{
-					iImp->RecvFrom(iRecvRemoteHost, iRecvRemotePort, iRecvBuf, iTruncated, *iStatus, 0);
-					activate = 1;
-					if (!iMultiReadCancel)
-						{
-						SetState(EMutipleReceive);
-						}
-					else
-						{
-						INFO_PRINTF1(_L("Cancel Receive in EMutipleReceive state"));
-						iImp->CancelRecv();
-						SetState(EFinish);
-						}					
-					}
-				else
-					{
-					SetLastError(iStatus->Int());
-					iControl->ReStart();
-					SetState(EFinish);
-					}
-				}	
-			break;
-			
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			if(iStatus->Int() != KErrNone) 
-				{
-				SetLastError(iStatus->Int());
-				}
-			if(iMaxWdpRecvBuffer.Length())
-				{
-				INFO_PRINTF1(_L("Data received:"));
-				DumpBuf(iMaxWdpRecvBuffer);
-				}
-			verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-			if (verdict==EPass && !iMiddleCancel && !iMultiReadCancel && !iAwaitLengthCancel && !iAwaitLengthTwice)
-				{
-				iImp->CancelRecv();
-				if (verdict==EPass)
-					{
-					verdict = (iSendBuffPtr->Match(iMaxWdpRecvBuffer)!=KErrNotFound)?EPass:EFail;
-					}
-				if (verdict==EPass)
-					{
-					verdict = (iRemoteHost.Match(iRecvRemoteHost)!=KErrNotFound)?EPass:EFail;
-					}
-				if (verdict==EPass)
-					{
-					Wap::TPort port;
-					iImp->GetLocalPort(port);
-					verdict = (port == iLocalPort)?EPass:EFail;
-					}
-				if (verdict==EPass)
-					{
-					Wap::TBearer bearer;
-					iImp->GetBearer(bearer);
-					verdict = (bearer == iBearer)?EPass:EFail;
-					}
-				if (verdict==EPass)
-					{
-					//This test can not perform in SIMTSY.
-					HBufC8* buf;
-					iImp->GetLocalAddress(buf);
-					delete buf;
-					}
-				}
-			SetTestStepResult(verdict);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF1(_L("EIdle or unknown"));
-			INFO_PRINTF2(_L("Error: bad state %d, State = %d"), State());
-			SetTestStepResult(verdict);
-			StopScheduler();
-			
-			break;
-		}
-		return (activate);
-	}
-	
-CBoundWDPStep_5::CBoundWDPStep_5() 
-/**
-* Constructor
-*/
-	{
-	}
-	
-CBoundWDPStep_5::~CBoundWDPStep_5() 
-/**
-* Destructor
-*/
-	{
-	}
-	
-TVerdict CBoundWDPStep_5::doTestStepL()
-/** 
-*	Test Cancel
-*/
-	{
-	INFO_PRINTF1(_L("BOUND-WDP: Testing Cancel"));
-	
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{	
-			TInt bearer, port;
-			TInt error	= KErrNone;
-			TBool secure= EFalse;
-			TBool reconnect= EFalse;
-			SetLastError(KErrNone);
-				
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer;
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) iLocalPort = (Wap::TPort)port;
-			if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error);
-			if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure;
-			if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect;
-				
-			error = iImp->Connect(iBearer, (Wap::TPort)iLocalPort, iSecure);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), error);
-			if( error == KErrNone)
-				{
-				TPckg<TUint16> aDataSizePckg(0);
-				TRequestStatus reqStatus;
-				iImp->AwaitRecvDataSize(aDataSizePckg, reqStatus);
-				SetState(EAwaitSize);
-				ShowConnectionInfo();
-
-				StartScheduler();
-				iControl->ReStart();
-				if(reqStatus==KErrCancel)
-					{
-					SetTestStepResult(EPass);
-					}
-				}
-			}
-		}
-	return TestStepResult();
-	}
-	
-TInt CBoundWDPStep_5::CallStateMachine()
-	{
-
-	INFO_PRINTF2(_L("CallStateMachine: step [%d]"), State());
-	switch(iState)
-		{
-		case EAwaitSize:
-			INFO_PRINTF1(_L("EAwaitSize"));
-			iImp->CancelRecv();
-			SetState(EFinish);
-			iControl->ReStart();
-			break;
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			SetState(EIdle);
-			StopScheduler();
-			break;
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(EFail);
-			StopScheduler();
-			break;
-		}
-	return 0;
-	}
-	
-CBoundWDPStep_6::CBoundWDPStep_6()
-	{
-	}
-	
-CBoundWDPStep_6::~CBoundWDPStep_6() 
-	{
-	}
-
-TVerdict CBoundWDPStep_6::doTestStepL()
-//
-//Test the CBoundWDP APIs Time out.
-//
-	{
-	//Not in use
-	return TestStepResult();
-	}
-	
-TInt CBoundWDPStep_6::CallStateMachine()
-	{
-	return (0);
-	}
-	
-CBoundWDPStep_7::CBoundWDPStep_7()
-	{
-	}
-
-CBoundWDPStep_7::~CBoundWDPStep_7()
-	{
-	}
-
-TVerdict CBoundWDPStep_7::doTestStepL()
-//
-// Test wrong sequenece
-//
-	{
-	INFO_PRINTF1(_L("BOUND-WDP: Connect-Receive-Await-Await"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			SetLastError(KErrNone);
-			TInt bearer, port, bufLen;
-			TInt error = KErrNone;
-				
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer))
-				{
-				iBearer = static_cast<Wap::TBearer>(bearer);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port))
-				{	
-				iLocalPort = static_cast<Wap::TPort>(port);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapExError, error))
-				{
-				SetExpectedError(error);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapWdpBufLength, bufLen))
-				{
-				iWdpRecvBufLength=static_cast<TUint16>(bufLen);
-				}
-			iRecvBuffPtr = HBufC8::NewL(iWdpRecvBufLength);
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-			// Start state machine
-			StartScheduler();
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-	
-TInt CBoundWDPStep_7::CallStateMachine()
-	{
-	TVerdict verdict = EFail;
-	TInt err = KErrNone;
-	TInt activate = 0;
-		
-	INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State());
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iBearer, iLocalPort);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-//				WaitForInitializeL();
-				if(iRecvBuffPtr == NULL)
-					{
-					err=KErrNoMemory;
-					}
-				else
-					{
-					iRecvBuf.Set(iRecvBuffPtr->Des());
-					iImp->RecvFrom(iRecvRemoteHost, iRecvRemotePort, iRecvBuf, iTruncated, *iStatus, iTimeout);
-					SetState(EReceive);
-					activate = 1;
-					}
-				}
-			SetLastError(err);
-			if (err!=KErrNone)
-				{
-				SetState(EFinish);
-				iControl->ReStart();
-				}
-			break;
-				
-		case EReceive:
-			INFO_PRINTF1(_L("EReceive"));
-			SetLastError(iStatus->Int());
-			if(iStatus->Int() != KErrNone) 
-			// Receiving fails as expect
-				{
-				verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-				if (verdict==EPass)
-					{
-					INFO_PRINTF1(_L("Receiving failed as expect"));
-					TRequestStatus reqStatus;
-					iImp->AwaitRecvDataSize(iLength, reqStatus);
-					iImp->AwaitRecvDataSize(iLength, *iStatus);
-					activate = 1;
-					SetState(EAwaitSize);
-					}
-				else
-					{
-					INFO_PRINTF1(_L("Receiving failed not as expect"));
-					iControl->ReStart();
-					SetState(EFinish);
-					}
-				}
-			else
-				{	
-				INFO_PRINTF1(_L("Receiving succeed not as expect"));
-				iControl->ReStart();
-				SetState(EFinish);
-				}
-			break;
-				
-		case EAwaitSize:
-			INFO_PRINTF1(_L("EAwaitSize"));
-			SetLastError(iStatus->Int());
-			iImp->CancelRecv();
-			SetState(EFinish);
-			iControl->ReStart();
-			break;
-				
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			if(iStatus->Int() != KErrNone) 
-				{
-				SetLastError(iStatus->Int());
-				}
-			verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-			SetTestStepResult(verdict);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-				
-		case EIdle:
-		default:
-			INFO_PRINTF1(_L("EIdle or unknown"));
-			INFO_PRINTF2(_L("Error: bad state %d, State = %d"), State());
-			SetTestStepResult(verdict);
-			StopScheduler();
-			break;
-		}
-	return (activate);
-	}
-	
-CBoundWDPStep_8::CBoundWDPStep_8() 
-	{
-	}
-
-CBoundWDPStep_8::~CBoundWDPStep_8() 
-	{
-	}
-
-TVerdict CBoundWDPStep_8::doTestStepL()
-/*
-*	Using invalid values for API parameters:
-*	- Invalid TUid on construction
-*	- Setting invalid timeout for RecvFrom
-*	Note: wrong bearer value has already been implemented as part of test 2
-*/
-	{
-	INFO_PRINTF1(_L("BOUND-WDP: Wrong parameter values"));
-	if(TestStepResult() == EPass )
-		{
-		TInt error;
-		if(GetIntFromConfig(ConfigSection(),KWapExError2, error))
-			{
-			iExError2=error;
-			}
-		TInt trapValue;
-		TUid invalidInterfaceUid = {0x00000000}; 	
-		INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), invalidInterfaceUid);
-		TRAP(trapValue, iImp = CWapBoundDatagramService::NewL(invalidInterfaceUid));
-		TVerdict verdict = (trapValue == iExError2)?EPass:EFail;	
-		if (verdict==EPass)
-			{
-			INFO_PRINTF2(_L("CreateImplementation with wrong Uid- Failed as expected with error %d"),trapValue);
-			}
-		SetTestStepResult(verdict);
-		}
-	return TestStepResult();
-	}
-	
-TInt CBoundWDPStep_8::CallStateMachine()
-	{
-	return 0;
-	}
-	
-CBoundWDPStep_9::CBoundWDPStep_9() 
-	{
-	}
-
-CBoundWDPStep_9::~CBoundWDPStep_9() 
-	{
-	}
-
-TVerdict CBoundWDPStep_9::doTestStepL()
-	{
-	return TestStepResult();
-	}
-	
-TInt CBoundWDPStep_9::CallStateMachine()
-	{
-	return 0;
-	}
-	
-CBoundWDPStep_OutOfMemory::CBoundWDPStep_OutOfMemory() 
-	{
-	}
-
-CBoundWDPStep_OutOfMemory::~CBoundWDPStep_OutOfMemory() 
-	{
-	}
-
-TVerdict CBoundWDPStep_OutOfMemory::doTestStepL()
-	{
-	// to test fix for DEF117706: Memory leak in CWapBoundDatagramService::Connect under OOM
-	__UHEAP_MARK;
-
-	for(TInt i=1;; i++)
-		{
-		__UHEAP_FAILNEXT(i);
-
-		CWapBoundDatagramService* datServ = NULL;
-		TRAP_IGNORE(datServ = CWapBoundDatagramService::NewL());
-		if(datServ)
-			{
-			datServ->Connect(Wap::EAll, 7576);
-			delete datServ;
-			}		 
-		REComSession::FinalClose();
-
-		TInt* marker = new TInt(0);
-		if (!marker)
-			{
-			break;		
-			}
-		delete marker;
-		}
-
-	__UHEAP_MARKEND;	
-	return TestStepResult();
-	}
-	
-TInt CBoundWDPStep_OutOfMemory::CallStateMachine()
-	{
-	return 0;
-	}

--- a/wapstack/wapmessageapi/te_wapstack/src/WapBoundWDPSteps.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +0,0 @@
-/**
-* Copyright (c) 2002-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 WapBoundWDPSteps.h
-*/
-#if (!defined __BOUNDWDP_STEP_H__)
-#define __BOUNDWDP_STEP_H__
-#include <test/testexecutestepbase.h>
-#include <in_sock.h>
-#include <es_sock.h>
-#include <wapmessage.h>
-#include "WapStackSuiteStepBase.h"
-
-_LIT(KBoundWDPStep_1,"BoundWDP_1");
-_LIT(KBoundWDPStep_2,"BoundWDP_2");
-_LIT(KBoundWDPStep_3,"BoundWDP_3");
-_LIT(KBoundWDPStep_4,"BoundWDP_4");
-_LIT(KBoundWDPStep_5,"BoundWDP_5");
-_LIT(KBoundWDPStep_6,"BoundWDP_6");
-_LIT(KBoundWDPStep_7,"BoundWDP_7");
-_LIT(KBoundWDPStep_8,"BoundWDP_8");
-_LIT(KBoundWDPStep_9,"BoundWDP_9");
-_LIT(KBoundWDPStep_OutOfMemory,"BoundWDP_OutOfMemory");
-
-class CBoundWDPStepBase : public CWapStackSuiteStepBase
-{
-public:
-	CBoundWDPStepBase();
-	~CBoundWDPStepBase();
-	CWapBoundDatagramService* LoadInterface();
-	void UnloadInterface();
-protected:
-	CWapBoundDatagramService* iImp;
-};
-
-
-class CBoundWDPStep_1 : public CBoundWDPStepBase
-	{
-public:
-	CBoundWDPStep_1();
-	~CBoundWDPStep_1();
-	virtual TVerdict doTestStepL();
-private:
-	};
-
-class CBoundWDPStep_2 : public CBoundWDPStepBase
-	{
-public:
-	CBoundWDPStep_2();
-	~CBoundWDPStep_2();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-	};
-
-class CBoundWDPStep_3 : public CBoundWDPStepBase
-	{
-public:
-	CBoundWDPStep_3();
-	~CBoundWDPStep_3();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-public:
-	};
-
-class CBoundWDPStep_4 : public CBoundWDPStepBase
-	{
-public:
-	CBoundWDPStep_4();
-	~CBoundWDPStep_4();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-protected:
-private:
-	};
-
-class CBoundWDPStep_5 : public CBoundWDPStepBase
-	{
-public:
-	CBoundWDPStep_5();
-	~CBoundWDPStep_5();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CBoundWDPStep_6 : public CBoundWDPStepBase
-	{
-public:
-	CBoundWDPStep_6();
-	~CBoundWDPStep_6();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-class CBoundWDPStep_7 : public CBoundWDPStepBase
-	{
-public:
-	CBoundWDPStep_7();
-	~CBoundWDPStep_7();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-class CBoundWDPStep_8 : public CBoundWDPStepBase
-	{
-public:
-	CBoundWDPStep_8();
-	~CBoundWDPStep_8();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-class CBoundWDPStep_9 : public CBoundWDPStepBase
-	{
-public:
-	CBoundWDPStep_9();
-	~CBoundWDPStep_9();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-class CBoundWDPStep_OutOfMemory : public CBoundWDPStepBase
-	{
-public:
-	CBoundWDPStep_OutOfMemory();
-	~CBoundWDPStep_OutOfMemory();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};	
-
-
-#endif

--- a/wapstack/wapmessageapi/te_wapstack/src/WapBoundWSPSteps.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1005 +0,0 @@
-// Copyright (c) 2003-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:
-// CStepOne derived implementation
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include "WapBoundWSPSteps.h"
-#include "WapStackSuiteDefs.h"
-#include <simtsy.h>
-#include <ecom/ecom.h>
-
-CBoundWSPStepBase::CBoundWSPStepBase()
-/**
-* Constructor
-*/
-	{
-	}
-
-CBoundWSPStepBase::~CBoundWSPStepBase()
-/**
-* Destructor
-*/
-	{
-	if(iImp) 
-		{
-		UnloadInterface();
-		}
-	}
-
-CWapBoundCLWSPService* CBoundWSPStepBase::LoadInterface()
-	{
-	TInt trapValue;
-	CWapBoundCLWSPService* implementation = NULL;
-	// UID {0x101FBB3C} - SWS implementation
-	TUid KInterfaceUid = {0x101FBB3C}; 	
-	INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), KInterfaceUid);
-	TRAP(trapValue, implementation = CWapBoundCLWSPService::NewL(KInterfaceUid));
-	if(!trapValue)
-		{
-		INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), implementation);
-		return implementation;
-		}
-	else return NULL;
-	}
-
-void CBoundWSPStepBase::UnloadInterface()
-	{
-	INFO_PRINTF2(_L("Interface at implementation.addr = 0x%08x is deleted"), iImp);
-	delete iImp;
-	iImp = NULL;
-	REComSession::FinalClose();	
-	}
-
-CBoundWSPStep_1::~CBoundWSPStep_1()
-/**
-* Destructor
-*/
-	{
-	}
-
-CBoundWSPStep_1::CBoundWSPStep_1()
-/**
-* Constructor
-*/
-	{
-	}
-
-TVerdict CBoundWSPStep_1::doTestStepL()
-/**
-* @return - TVerdict code
-* Override of base class pure virtual
-* Our implementation only gets called if the base class doTestStepPreambleL() did
-* not leave. That being the case, the current test result value will be EPass.
-*/
-	{
-	//
-	// CWapBoundCLWSPService
-	// 
-	INFO_PRINTF1(_L("CreateImplementation - CWapBoundCLWSPService"));
-	INFO_PRINTF1(_L("Calling old NewL() method"));
-	
-	TInt trapValue; 
-	
-	SetTestStepResult(EFail);
-	TRAP(trapValue, iImp = CWapBoundCLWSPService::NewL());
-	if(!trapValue)
-		{
-		// interface is loaded
-		INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), iImp);
-		UnloadInterface();
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			INFO_PRINTF1(_L("CreateImplementation - OK"));
-			SetTestStepResult(EPass);
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-CBoundWSPStep_2::CBoundWSPStep_2()
-/**
-* Constructor
-*/
-	{
-	}
-
-CBoundWSPStep_2::~CBoundWSPStep_2() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CBoundWSPStep_2::doTestStepL()
-/** 
-* Test Connect methoths 
-* @return - TVerdict code
-* 
-*/
-	{
-	INFO_PRINTF1(_L("BOUND-WSP: Testing Connect"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			TInt bearer, port;
-			TInt error	= KErrNone;
-			TBool secure= EFalse;
-			TBool reconnect= EFalse;
-			TBool delay = EFalse;
-			SetLastError(KErrNone);
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer;
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) iLocalPort = (Wap::TPort)port;
-			if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error);
-			if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure;
-			if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect;
-			if(GetBoolFromConfig(ConfigSection(),KWapDelayPortClosure, delay)) iDelayPortClosure = delay;
-			
-			if(UseSimTsy())
-				{
-				GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState);
-				User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState));
-				}
-			User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn));
-
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-			StartScheduler();
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CBoundWSPStep_2::CallStateMachine()
-	{
-	TInt err = KErrNone;
-	INFO_PRINTF2(_L("CallStateMachine: state %d"), State());
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iBearer, iLocalPort, iSecure);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-				if(iReconnect)
-					{ 
-					INFO_PRINTF1(_L("Reconnection"));
-					iControl->ReStart();
-					break;
-					}
-				}
-			SetState(EFinish);
-			SetLastError(err);
-			iControl->ReStart();
-			break;
-			
-		case EFinish:
-			// it's necessary to delay port closure, let the other concurrent test step
-			// can fail opening the same port with expected error EPortAlreadyBound (-5498)
-			if (iDelayPortClosure)
-				User::After(5000000);
-
-			INFO_PRINTF1(_L("EFinish"));
-			if(GetLastError() == GetExpectedError()) SetTestStepResult(EPass);
-			else SetTestStepResult(EFail);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(EFail);
-			StopScheduler();
-			break;
-		}
-	return (0);
-	}
-
-CBoundWSPStep_3::CBoundWSPStep_3()
-/**
-* Constructor
-*/
-	{
-	}
-
-CBoundWSPStep_3::~CBoundWSPStep_3() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CBoundWSPStep_3::doTestStepL()
-/*
-* Test the BoundWSP APIs in unconnected state.
-*/
-	{
-	INFO_PRINTF1(_L("BoundCLPush. Requests without connection"));
-	// check preamble result
-	TVerdict verdict = TestStepResult();
-	if (verdict==EPass)
-		{
-		TInt err, ret;
-		iImp = LoadInterface();
-		if (!iImp)
-			{
-			ERR_PRINTF1(_L("Unable to load BoundWSP Interface"));
-			verdict = EFail;
-			}
-		else
-			{
-			GetIntFromConfig(ConfigSection(),KWapExError,(TInt&)iExError);
-			ShowConnectionInfo();
-			TBuf8<100> header, body;
-			TPckgBuf<TUint8> idPckg;
-			TWSPStatus wspStatus;
-			TRequestStatus reqStatus;
-			TUint32 timeout = 0;
-			iImp->MethodResult(header, body, idPckg, wspStatus, reqStatus, timeout);
-			TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("MethodResult Fails not as expected")))
-				if (ret) 
-					verdict = EFail;
-				else
-					{
-					Wap::TPort port;
-					err=iImp->GetLocalPort(port);
-					TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalPort Fails not as expected")))
-						if (ret)
-							verdict = EFail;
-						else
-							{
-							HBufC8* localHost;					
-							err=iImp->GetLocalAddress(localHost);
-							TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalAddress Fails not as expected")))
-								if (ret) 
-									verdict = EFail;
-								else
-									{
-									err=iImp->GetBearer(iBearer);
-									TRAP(ret, TEST_CHECKL(err, iExError, _L("GetBearer Fails not as expected")))
-										if (ret) 
-											verdict = EFail;
-										else
-											{
-											HBufC8* host;
-											err=iImp->GetServerAddress(host);
-											TRAP(ret, TEST_CHECKL(err, iExError, _L("GetServerAddress Fails not as expected")))
-												if (ret) 
-													verdict = EFail;
-												else
-													{
-													TBuf<100> uri;
-													TUint8 id = 0;
-													err=iImp->MethodInvoke(iBearer, iRemoteHost, iRemotePort, 0x40, uri, header, body, id);
-													TRAP(ret, TEST_CHECKL(err, iExError, _L("MethodInvoke Fails not as expected")))
-														if (ret) 
-															verdict = EFail;
-													}
-											}
-									}
-							}
-					}
-				UnloadInterface();
-			}
-		}
-	if (verdict==EPass)
-		{
-		INFO_PRINTF1(_L("BoundWSP. Requests Fail as expected"));
-		}
-	SetTestStepResult(verdict);
-	return TestStepResult();
-	}
-
-TInt CBoundWSPStep_3::CallStateMachine()
-	{
-	return (0);
-	}
-
-
-CBoundWSPStep_4::CBoundWSPStep_4()
-/**
-* Constructor
-*/
-	{
-	}
-
-CBoundWSPStep_4::~CBoundWSPStep_4() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CBoundWSPStep_4::doTestStepL()
-/** 
-* Test Connect methoths 
-* @return - TVerdict code
-* 
-*/
-	{
-	INFO_PRINTF1(_L("BOUND-WSP: UnitInvoke-UnitResult"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			SetLastError(KErrNone);
-			
-			TInt bearer, port, repeat, method;
-			TInt error = KErrNone;
-			TPtrC headers;
-			TPtrC body;
-			TPtrC uri;
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer;
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) iLocalPort = (Wap::TPort)port;
-			if(GetIntFromConfig(ConfigSection(),KWapExError, error)) SetExpectedError(error);
-			if(GetIntFromConfig(ConfigSection(),KWapWSPMethod, method)) iMethod = method;
-			if(GetIntFromConfig(ConfigSection(), KWapRepeat, repeat)) iRepeat = repeat;
-
-			if(!GetStringFromConfig(ConfigSection(),KWapURI, uri)) 
-				{
-				User::Leave(KErrNoMemory);
-				}
-			
-			GetStringFromConfig(ConfigSection(),KWapWSPHeaders, headers);
-			GetStringFromConfig(ConfigSection(),KWapWSPBody, body);
-
-			User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn));
-			
-			if(UseSimTsy())
-				{
-				User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, 41));
-				}
-			
-			
-			iURI = HBufC16::NewL(uri.Length());
-			
-			iSendHeaders = HBufC8::NewL(headers.Length());
-			
-			iSendBody = HBufC8::NewL(body.Length());
-			
-			iRecvHeaders = HBufC8::NewL(KMaxWapWspHeaderBufferLength);
-			iRecvBody = HBufC8::NewL(KMaxWapWspDataBufferLength);
-
-			TPtr16 tmp16 = iURI->Des();
-			tmp16.Copy(uri);
-			TPtr8 tmp1 = iSendHeaders->Des();
-			tmp1.Copy(headers);
-			TPtr8 tmp2 = iSendBody->Des();
-			tmp2.Copy(body);
-
-			iRecvHeadersBuf.Set(iRecvHeaders->Des());
-			iRecvHeadersBuf.Zero();
-			iRecvBodyBuf.Set(iRecvBody->Des());
-			iRecvBodyBuf.Zero();
-			
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-
-			StartScheduler();
-
-			delete iRecvBody;
-			iRecvBody=NULL;
-			delete iRecvHeaders;
-			iRecvHeaders=NULL;
-
-			delete iSendBody;
-			iSendBody=NULL;
-			delete iSendHeaders;
-			iSendHeaders=NULL;
-			delete iURI;
-			iURI=NULL;
-
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CBoundWSPStep_4::CallStateMachine()
-	{
-	TVerdict verdict = EFail;
-	TInt err = KErrNone;
-	TInt activate = 0;
-	static TUint total_headers = 0;		
-	static TUint total_body = 0;		
-	static TUint repeat = 0;		
-	
-	INFO_PRINTF2(_L("CallStateMachine [state %d]"), State());
-
-	switch(iState)
-		{
-		case EConnect:
-			total_headers = 0;
-			total_body = 0;
-			err = iImp->Connect(iBearer, iLocalPort, EFalse);
-			if( err == KErrNone)
-				{
-				SetState(EUnitInvoke);
-				}
-			else
-				{
-				SetState(EFinish);
-				}
-			SetLastError(err);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			iControl->ReStart();
-			break;
-
-		case EUnitInvoke:
-			INFO_PRINTF2(_L("EUnitInvoke: Method - 0x%02x"), iMethod);
-			if(iBearer != Wap::EIP)
-			{
-				TRAP(err, WaitForInitializeL());
-			}
-			if(iSendHeaders->Length() !=0 )
-				{
-				INFO_PRINTF1(_L("Headers to send:"));
-				DumpBuf(iSendHeaders->Des());
-				}	
-			if(iSendBody->Length() !=0 )
-				{
-				INFO_PRINTF1(_L("Data to send:"));
-				DumpBuf(iSendBody->Des());
-				}
-			err = iImp->MethodInvoke(iBearer, iRemoteHost, iRemotePort, iMethod, iURI->Des(), iSendHeaders->Des(), iSendBody->Des(), iTransactionId);
-			INFO_PRINTF3(_L("MethodInvoke() retcode: - dec: %d hex: 0x%08x"), err, err);
-			if(err == KErrNone) 
-				{	
-				SetState(EUnitResult);
-				}
-			else 
-				{
-				SetState(EFinish);
-				}
-			SetLastError(err);
-			iControl->ReStart();
-			break;
-
-		case EUnitResult:
-
-			iRecvHeadersBuf.Set(iRecvHeaders->Des());
-			iRecvHeadersBuf.Zero();
-			iRecvBodyBuf.Set(iRecvBody->Des());
-			iRecvBodyBuf.Zero();
-			iImp->MethodResult(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, iWspStatus, *iStatus, iTimeout);
-			INFO_PRINTF2(_L("EUnitResult: status 0x%08x"), iStatus->Int());
-			activate = 1;
-			SetLastError(err);
-			SetState(EFinish);
-			break;
-			
-		case EFinish:
-			
-			INFO_PRINTF4(_L("EFinish: Status: %d, WSP status: %d (0x%02x)"), iStatus->Int(), iWspStatus, iWspStatus);
-
-			if(iRecvHeadersBuf.Length() != 0)
-				{
-				INFO_PRINTF1(_L("Headers"));
-				total_headers += iRecvHeadersBuf.Length();
-				DumpBuf(iRecvHeadersBuf);
-				}
-
-			if(iRecvBodyBuf.Length() != 0)
-				{
-				INFO_PRINTF1(_L("Body"));
-				total_body += iRecvBodyBuf.Length();
-				DumpBuf(iRecvBodyBuf);
-				}
-
-			if(iStatus->Int() != KErrNone) 
-				{
-				SetLastError(iStatus->Int());
-				if(iStatus->Int() == Wap::EMoreData)
-					{
-					INFO_PRINTF1(_L("NOTE: More data... calling MethodResult()"));
-					SetState(EUnitResult);
-					iControl->ReStart();
-					break;
-					}
-				}
-
-			INFO_PRINTF3(_L("Data received: headers - %d bytes, body - %d bytes"), total_headers, total_body);
-			total_headers = 0;
-			total_body = 0;
-			if((--iRepeat != 0) && (iStatus->Int() == KErrNone))
-				{
-				++repeat;
-				INFO_PRINTF2(_L("REPEAT TEST - %d"), repeat);
-				if(err == KErrNone) 
-					{	
-					SetState(EUnitInvoke);
-					iControl->ReStart();
-					break;
-					}
-				}
-
-			verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-			SetTestStepResult(verdict);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(verdict);
-			StopScheduler();
-			break;
-		}
-	return (activate);
-	}
-
-CBoundWSPStep_5::CBoundWSPStep_5()
-/**
-* Constructor
-*/
-	{
-	}
-
-CBoundWSPStep_5::~CBoundWSPStep_5() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CBoundWSPStep_5::doTestStepL()
-/** 
-* Test Cancel Request 
-* @return - TVerdict code
-* 
-*/
-	{
-	INFO_PRINTF1(_L("BoundCLPush. Testing Cancel Request"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			TInt bearer, port;
-			TInt err = KErrNone;
-			TBool secure= EFalse;
-			TBool reconnect= EFalse;
-			SetLastError(KErrNone);
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer;
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) iLocalPort = (Wap::TPort)port;
-			if(GetIntFromConfig(ConfigSection(), KWapExError, err)) SetExpectedError(err);
-			if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure;
-			if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect;
-
-			ShowConnectionInfo();
-			err = iImp->Connect(iBearer, iLocalPort, iSecure);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-				TBuf8<100> header, body;
-				TPckgBuf<TUint8> idPckg;
-				TWSPStatus wspStatus;
-				TRequestStatus reqStatus;
-				TUint32 timeout=0;
-				iImp->MethodResult(header, body, idPckg, wspStatus, reqStatus, timeout);
-				SetState(EUnitResult);
-				StartScheduler();
-				iControl->ReStart();
-				if(reqStatus==KErrCancel)
-					{
-					SetTestStepResult(EPass);
-					}
-				
-				}
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CBoundWSPStep_5::CallStateMachine()
-	{
-	INFO_PRINTF2(_L("CallStateMachine: step %d"), State());
-	switch(iState)
-		{
-		case EUnitResult:
-			INFO_PRINTF1(_L("EUnitResult"));
-			iImp->CancelReq();
-			SetState(EFinish);
-			iControl->ReStart();
-			break;
-			
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(EFail);
-			StopScheduler();
-			break;
-		}
-	return (0);
-	}
-
-CBoundWSPStep_6::CBoundWSPStep_6() 
-	{
-	}
-CBoundWSPStep_6::~CBoundWSPStep_6()  
-	{
-	}
-
-TVerdict CBoundWSPStep_6::doTestStepL()
-/*
-* Test receive time out
-*/
-	{
-	INFO_PRINTF1(_L("BOUND-WSP: Connect-UnitResult-TimeOut"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			SetLastError(KErrNone);
-			TInt bearer, port;
-			TInt error = KErrNone;
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer))
-				{
-				iBearer = static_cast<Wap::TBearer>(bearer);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port))
-				{
-				iLocalPort = static_cast<Wap::TPort>(port);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapExError, error))
-				{
-				SetExpectedError(error);
-				}
-			TInt headerLength, bufLength, timeOut; 
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength))
-				{
-				iHeaderRecvBufLength=static_cast<TUint16>(headerLength);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength))
-				{
-				iBodyRecvBufLength=static_cast<TUint16>(bufLength);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapTimeOut, timeOut))
-				{
-				iTimeout=timeOut;
-				}
-			iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength);
-			iRecvBody = HBufC8::NewL(iBodyRecvBufLength);
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-			StartScheduler();
-			delete iRecvBody;
-			iRecvBody=NULL;
-			delete iRecvHeaders;
-			iRecvHeaders=NULL;
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CBoundWSPStep_6::CallStateMachine()
-/*
-* Test receive time out
-*/
-	{
-	TVerdict verdict = EFail;
-	TInt err = KErrNone;
-	TInt activate = 0;
-	
-	INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State());
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iBearer, iLocalPort, EFalse);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-//				WaitForInitializeL();
-				iRecvHeadersBuf.Set(iRecvHeaders->Des());
-				iRecvBodyBuf.Set(iRecvBody->Des());
-				iImp->MethodResult(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, iWspStatus, *iStatus, iTimeout);
-				INFO_PRINTF1(_L("MethodResult"));
-				activate = 1;
-				}
-			else
-				{
-				iControl->ReStart();
-				}
-			SetLastError(err);
-			SetState(EFinish);
-			break;
-			
-		case EFinish:
-			
-			INFO_PRINTF1(_L("EFinish"));
-			if(iStatus->Int() != KErrNone) 
-				{
-				SetLastError(iStatus->Int());
-				}
-			verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-			SetTestStepResult(verdict);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(verdict);
-			StopScheduler();
-			
-			break;
-		}
-	return (activate);
-	}
-
-CBoundWSPStep_7::CBoundWSPStep_7() 
-	{
-	}
-CBoundWSPStep_7::~CBoundWSPStep_7()
-	{
-	}
-
-TVerdict CBoundWSPStep_7::doTestStepL()
-//
-//Wrong sequence
-//
-	{
-	INFO_PRINTF1(_L("BOUND-WSP: Connect-UnitResult-UnitResult"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			SetLastError(KErrNone);
-			TInt bearer, port;
-			TInt error = KErrNone;
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer))
-				{
-				iBearer = static_cast<Wap::TBearer>(bearer);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port))
-				{
-				iLocalPort = static_cast<Wap::TPort>(port);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapExError, error))
-				{
-				SetExpectedError(error);
-				}
-			TInt headerLength, bufLength; 
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength))
-				{
-				iHeaderRecvBufLength=static_cast<TUint16>(headerLength);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength))
-				{
-				iBodyRecvBufLength=static_cast<TUint16>(bufLength);
-				}
-			iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength);
-			iRecvBody = HBufC8::NewL(iBodyRecvBufLength);
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-			// Start state machine
-			StartScheduler();
-			delete iRecvBody;
-			iRecvBody=NULL;
-			delete iRecvHeaders;
-			iRecvHeaders=NULL;
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CBoundWSPStep_7::CallStateMachine()
-	{
-	TVerdict verdict = EFail;
-	TInt err = KErrNone;
-	TInt activate = 0;
-	
-	INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State());
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iBearer, iLocalPort, EFalse);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-//				WaitForInitializeL();
-				TRequestStatus reqStatus;
-				iRecvHeadersBuf.Set(iRecvHeaders->Des());
-				iRecvBodyBuf.Set(iRecvBody->Des());
-				iImp->MethodResult(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, iWspStatus, reqStatus, iTimeout);
-				iImp->MethodResult(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, iWspStatus, *iStatus, iTimeout);
-				INFO_PRINTF1(_L("MethodResult"));
-				activate = 1;
-				}
-			else
-				{
-				iControl->ReStart();
-				}
-			SetLastError(err);
-			SetState(EFinish);
-			break;
-			
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			iImp->CancelReq();
-			if(iStatus->Int() != KErrNone) 
-				{
-				SetLastError(iStatus->Int());
-				}
-			verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-			SetTestStepResult(verdict);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d, State = %d"), State());
-			SetTestStepResult(verdict);
-			StopScheduler();
-			
-			break;
-		}
-	return (activate);
-	}
-
-CBoundWSPStep_8::CBoundWSPStep_8() 
-	{
-	}
-CBoundWSPStep_8::~CBoundWSPStep_8()  
-	{
-	}
-TVerdict CBoundWSPStep_8::doTestStepL()
-/*
-*	Using invalid values for API parameters:
-*	- Invalid TUid on construction
-*	- Invalid method for MethodInvoke
-*	- Invalid timeout for MethodResult
-*	Note: wrong bearer value has already been implemented as part of test 2
-*/
-	{
-	INFO_PRINTF1(_L("BOUND-WSP: Wrong parameters testing"));
-	if(TestStepResult() == EPass )
-		{
-		TInt error;
-		if(GetIntFromConfig(ConfigSection(),KWapExError2, error))
-			{
-			iExError2=error;
-			}
-		TInt trapValue;
-		TUid invalidInterfaceUid = {0x00000000}; /*{0x101FBB3C};*/
-		INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), invalidInterfaceUid);
-		TRAP(trapValue, iImp = CWapBoundCLWSPService::NewL(invalidInterfaceUid));
-		TVerdict verdict = (trapValue == iExError2)?EPass:EFail;
-		if (verdict==EFail)
-			{
-			SetTestStepResult(EFail);
-			return TestStepResult();
-			}
-		else
-			{
-			INFO_PRINTF2(_L("CreateImplementation with wrong Uid- Failed as expected with error %d"),trapValue);
-			// Now use the correct Uid
-			iImp = LoadInterface();
-			if(iImp)
-				{
-				SetLastError(KErrNone);
-				TInt method;
-				TInt error = KErrNone;
-				TPtrC headers;
-				TPtrC body;
-				TPtrC uri;
-				
-				if(GetIntFromConfig(ConfigSection(), KWapExError, error))
-					{
-					SetExpectedError(error);
-					}
-				if (GetIntFromConfig(ConfigSection(),KWapWSPMethod, method))
-					{
-					iMethod=method;
-					}
-				
-				if(!GetStringFromConfig(ConfigSection(),KWapURI, uri) || \
-					!GetStringFromConfig(ConfigSection(),KWapWSPHeaders, headers) || \
-					!GetStringFromConfig(ConfigSection(),KWapWSPBody, body))
-					{
-					User::Leave(KErrNoMemory);
-					}
-				
-				iURI = HBufC16::NewL(uri.Length());
-				
-				iSendHeaders = HBufC8::NewL(headers.Length());
-				
-				iSendBody = HBufC8::NewL(body.Length());
-				
-				TPtr16 tmp16 = iURI->Des();
-				tmp16.Copy(uri);
-				TPtr8 tmp = iSendHeaders->Des();
-				tmp.Copy(headers);
-				TPtr8 tmp1 = iSendBody->Des();
-				tmp1.Copy(body);
-
-				ShowConnectionInfo();
-				error = iImp->Connect(iBearer, iLocalPort, EFalse);
-				INFO_PRINTF2(_L("Connection completed with code = %d"), error);
-				if( error == KErrNone)
-					{
-					error = iImp->MethodInvoke(iBearer, iRemoteHost, iRemotePort, iMethod, iURI->Des(), iSendHeaders->Des(), iSendBody->Des(), iTransactionId);
-					}
-				TVerdict verdict = (error == GetExpectedError())?EPass:EFail;
-				SetTestStepResult(verdict);
-				
-				delete iSendBody;
-				iSendBody=NULL;
-				delete iSendHeaders;
-				iSendHeaders=NULL;
-				delete iURI;
-				iURI=NULL;
-				UnloadInterface();
-				}
-			}
-		}
-	return TestStepResult();
-	}
-TInt CBoundWSPStep_8::CallStateMachine()
-	{
-	return (0);
-	}
-
-CBoundWSPStep_9::CBoundWSPStep_9() {}
-CBoundWSPStep_9::~CBoundWSPStep_9()  {}
-
-TVerdict CBoundWSPStep_9::doTestStepL()
-	{
-	return TestStepResult();
-	}
-
-TInt CBoundWSPStep_9::CallStateMachine()
-	{
-	return (0);
-	}

--- a/wapstack/wapmessageapi/te_wapstack/src/WapBoundWSPSteps.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/**
-* Copyright (c) 2002-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 WapBoundWSPSteps.h
-*/
-#if (!defined __BOUNDWSP_STEP_H__)
-#define __BOUNDWSP_STEP_H__
-#include <test/testexecutestepbase.h>
-#include <in_sock.h>
-#include <es_sock.h>
-#include <wapmessage.h>
-#include "WapStackSuiteStepBase.h"
-
-// steps names
-_LIT(KBoundWSPStep_1,"BoundWSP_1");
-_LIT(KBoundWSPStep_2,"BoundWSP_2");
-_LIT(KBoundWSPStep_3,"BoundWSP_3");
-_LIT(KBoundWSPStep_4,"BoundWSP_4");
-_LIT(KBoundWSPStep_5,"BoundWSP_5");
-_LIT(KBoundWSPStep_6,"BoundWSP_6");
-_LIT(KBoundWSPStep_7,"BoundWSP_7");
-_LIT(KBoundWSPStep_8,"BoundWSP_8");
-_LIT(KBoundWSPStep_9,"BoundWSP_9");
-
-class CBoundWSPStepBase : public CWapStackSuiteStepBase
-{
-public:
-	CBoundWSPStepBase();
-	~CBoundWSPStepBase();
-	CWapBoundCLWSPService* LoadInterface();
-	void UnloadInterface();
-protected:
-	CWapBoundCLWSPService* iImp;
-};
-
-class CBoundWSPStep_1 : public CBoundWSPStepBase
-	{
-public:
-	CBoundWSPStep_1();
-	~CBoundWSPStep_1();
-	virtual TVerdict doTestStepL();
-private:
-	};
-
-class CBoundWSPStep_2 : public CBoundWSPStepBase
-	{
-public:
-	CBoundWSPStep_2();
-	~CBoundWSPStep_2();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CBoundWSPStep_3 : public CBoundWSPStepBase
-	{
-public:
-	CBoundWSPStep_3();
-	~CBoundWSPStep_3();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CBoundWSPStep_4 : public CBoundWSPStepBase
-	{
-public:
-	CBoundWSPStep_4();
-	~CBoundWSPStep_4();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CBoundWSPStep_5 : public CBoundWSPStepBase
-	{
-public:
-	CBoundWSPStep_5();
-	~CBoundWSPStep_5();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CBoundWSPStep_6 : public CBoundWSPStepBase
-	{
-public:
-	CBoundWSPStep_6();
-	~CBoundWSPStep_6();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-class CBoundWSPStep_7 : public CBoundWSPStepBase
-	{
-public:
-	CBoundWSPStep_7();
-	~CBoundWSPStep_7();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-class CBoundWSPStep_8 : public CBoundWSPStepBase
-	{
-public:
-	CBoundWSPStep_8();
-	~CBoundWSPStep_8();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-class CBoundWSPStep_9 : public CBoundWSPStepBase
-	{
-public:
-	CBoundWSPStep_9();
-	~CBoundWSPStep_9();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-#endif

--- a/wapstack/wapmessageapi/te_wapstack/src/WapFullySpecCLPushSteps.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,776 +0,0 @@
-// Copyright (c) 2002-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
-*/
-
-#include "WapFullySpecCLPushSteps.h"
-#include "WapStackSuiteDefs.h"
-#include <simtsy.h>
-#include <wapmsgerr.h>
-#include <ecom/ecom.h>
-
-
-CFullySpecCLPushBase::CFullySpecCLPushBase()
-/**
-* Constructor
-*/
-	{
-	}
-
-CFullySpecCLPushBase::~CFullySpecCLPushBase()
-/**
-* Destructor
-*/
-	{
-	if(iImp) 
-		{
-		UnloadInterface();
-		}
-	}
-
-CWapFullySpecCLPushService* CFullySpecCLPushBase::LoadInterface()
-	{
-	TInt trapValue;
-	CWapFullySpecCLPushService* implementation = NULL;
-	// UID {0x101FBB3A} - SWS implementation
-	TUid KInterfaceUid = {0x101FBB3A}; 	
-	INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), KInterfaceUid);
-	TRAP(trapValue, implementation = CWapFullySpecCLPushService::NewL(KInterfaceUid));
-	if(!trapValue)
-		{
-		INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), implementation);
-		return implementation;
-		}
-	else return NULL;
-	}
-
-void CFullySpecCLPushBase::UnloadInterface()
-	{
-	INFO_PRINTF2(_L("Interface at implementation.addr = 0x%08x is deleted"), iImp);
-	delete iImp;
-	iImp = NULL;
-	REComSession::FinalClose();	
-	}
-
-CFullySpecCLPushStep_1::CFullySpecCLPushStep_1()
-/**
-* Constructor
-*/
-	{
-	}
-
-CFullySpecCLPushStep_1::~CFullySpecCLPushStep_1()
-/**
-* Destructor
-*/
-	{
-	}
-
-
-TVerdict CFullySpecCLPushStep_1::doTestStepL()
-/**
-* @return - TVerdict code
-* Override of base class pure virtual
-* Our implementation only gets called if the base class doTestStepPreambleL() did
-* not leave. That being the case, the current test result value will be EPass.
-*/
-	{
-	//
-	// CWapFullySpecCLPushService
-	// 
-	INFO_PRINTF1(_L("CreateImplementation - CWapFullySpecCLPushService"));
-	INFO_PRINTF1(_L("Calling old NewL() method"));
-	
-	TInt trapValue; 
-	
-	SetTestStepResult(EFail);
-	TRAP(trapValue, iImp = CWapFullySpecCLPushService::NewL());
-	if(!trapValue)
-		{
-		// interface is loaded
-		INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), iImp);
-		UnloadInterface();
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			INFO_PRINTF1(_L("CreateImplementation - OK"));
-			SetTestStepResult(EPass);
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-CFullySpecCLPushStep_2::CFullySpecCLPushStep_2()
-/**
-* Constructor
-*/
-	{
-	}
-
-CFullySpecCLPushStep_2::~CFullySpecCLPushStep_2() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CFullySpecCLPushStep_2::doTestStepL()
-/** 
-* Test Connect methoths 
-* @return - TVerdict code
-* 
-*/
-	{
-	INFO_PRINTF1(_L("FULLYSPEC-PUSH: Testing Connect"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			TInt bearer;
-			TInt error	= KErrNone;
-			TBool secure= EFalse;
-			TBool reconnect = EFalse;
-			SetLastError(KErrNone);
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer;
-			if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error);
-			if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure;
-			if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect;
-			
-			if(UseSimTsy())
-				{
-				GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState);
-				User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState));
-				}
-			User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn));
-			
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-
-			StartScheduler();
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CFullySpecCLPushStep_2::CallStateMachine()
-	{
-	TInt err = KErrNone;
-	INFO_PRINTF2(_L("CallStateMachine: step [%d]"), State());
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, iSecure);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-				if(iReconnect)
-					{ 
-					INFO_PRINTF1(_L("Reconnection"));
-					iControl->ReStart();
-					break;
-					}
-				}
-			SetState(EFinish);
-			SetLastError(err);
-			iControl->ReStart();
-			break;
-			
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			if(GetLastError() == GetExpectedError()) SetTestStepResult(EPass);
-			else SetTestStepResult(EFail);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(EFail);
-			StopScheduler();
-			break;
-		}
-	return (0);
-	}
-
-CFullySpecCLPushStep_3::CFullySpecCLPushStep_3()
-/**
-* Constructor
-*/
-	{
-	}
-
-CFullySpecCLPushStep_3::~CFullySpecCLPushStep_3() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CFullySpecCLPushStep_3::doTestStepL()
-/** 
-* Test Connect methoths 
-* @return - TVerdict code
-* 
-*/
-	{
-	INFO_PRINTF1(_L("FullySpecWSPPush. Requests without connection"));
-	// check preamble result
-	TVerdict verdict = TestStepResult();
-	if (verdict==EPass)
-		{
-		TInt err, ret;
-		iImp = LoadInterface();
-		if (!iImp)
-			{
-			ERR_PRINTF1(_L("Unable to load FullySpecWSPPush Interface"));
-			verdict = EFail;
-			}
-		else
-			{
-			GetIntFromConfig(ConfigSection(),KWapExError,(TInt&)iExError);
-			ShowConnectionInfo();
-			TRequestStatus reqStatus;
-			iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, reqStatus);
-			TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("AwaitPush Fails not as expected")))
-				if (ret) 
-					verdict = EFail;
-				else
-					{
-					Wap::TPort port;
-					err=iImp->GetLocalPort(port);
-					TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalPort Fails not as expected")))
-						if (ret)
-							verdict = EFail;
-						else
-							{
-							HBufC8* localHost;					
-							err=iImp->GetLocalAddress(localHost);
-							TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalAddress Fails not as expected")))
-								if (ret) 
-									verdict = EFail;
-							}
-					}
-				UnloadInterface();
-			}
-		}
-	if (verdict==EPass)
-		{
-		INFO_PRINTF1(_L("FullySpecCLPush. Requests Fail as expected"));
-		}
-	SetTestStepResult(verdict);
-	return TestStepResult();
-	}
-
-TInt CFullySpecCLPushStep_3::CallStateMachine()
-	{
-	return (0);
-	}
-
-CFullySpecCLPushStep_4::CFullySpecCLPushStep_4()
-/**
-* Constructor
-*/
-	{
-	}
-
-CFullySpecCLPushStep_4::~CFullySpecCLPushStep_4() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CFullySpecCLPushStep_4::doTestStepL()
-/** 
-* Test Connect methoths 
-* @return - TVerdict code
-* 
-*/
-	{
-	INFO_PRINTF1(_L("FULLYSPEC-CLPUSH: Connect-AwaitPush"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			SetLastError(KErrNone);
-			
-			TInt bearer, port;
-			TInt error = KErrNone;
-			TPtrC16 remote_host;
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer))
-				{
-				iBearer = static_cast<Wap::TBearer>(bearer);
-				}
-			if(GetStringFromConfig(ConfigSection(), KWapRemoteHost, remote_host))
-				{
-				iRemoteHost.Copy(remote_host);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) 
-				{
-				iLocalPort = static_cast<Wap::TPort>(port);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapRemotePort, port)) 
-				{
-				iRemotePort = static_cast<Wap::TPort>(port);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapExError, error))
-				{
-				SetExpectedError(error);
-				}
-			GetBoolFromConfig(ConfigSection(), KMiddleCancel, iMiddleCancel);
-			GetBoolFromConfig(ConfigSection(), KMultiReadCancel, iMultiReadCancel);
-			TInt headerLength, bufLength; 
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength))
-				{
-				iHeaderRecvBufLength=static_cast<TUint16>(headerLength);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength))
-				{
-				iBodyRecvBufLength=static_cast<TUint16>(bufLength);
-				}
-			
-			iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength);
-			iRecvBody = HBufC8::NewL(iBodyRecvBufLength);
-			
-			User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn));
-			
-			if(UseSimTsy())
-				{
-				GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState);
-				User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState));
-				}
-				
-				
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-			//	Start state machine
-			StartScheduler();
-			delete iRecvBody;
-			iRecvBody=NULL;
-			delete iRecvHeaders;
-			iRecvHeaders=NULL;
-			UnloadInterface();
-			} 
-		
-		}
-	return TestStepResult();
-	}
-
-TInt CFullySpecCLPushStep_4::CallStateMachine()
-	{
-	TVerdict verdict = EFail;
-	TInt err = KErrNone;
-	TInt activate = 0;
-
-	INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State());	
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, EFalse);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-				TRAP(err, WaitForInitializeL());
-				iRecvHeadersBuf.Set(iRecvHeaders->Des());
-				iRecvBodyBuf.Set(iRecvBody->Des());
-				iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, *iStatus);
-				INFO_PRINTF1(_L("Start AwaitingPush....."));
-				activate = 1;
-				if (!iMiddleCancel)
-					{
-					SetState(EAwaitPush);
-					}
-				else
-					{
-					INFO_PRINTF1(_L("Cancel AwaitPush"));
-					iImp->CancelAwaitPush();
-					SetState(EFinish);
-					}
-				}
-			else 
-				{
-				SetState(EFinish);
-				iControl->ReStart();
-				}
-			SetLastError(err);
-			break;
-			
-		case EAwaitPush:
-			INFO_PRINTF1(_L("EAwaitPush"));
-			if(iStatus->Int() != KErrNone && iStatus->Int()!=Wap::EMoreData) 
-				// AwaitPush failed
-				{
-				INFO_PRINTF1(_L("AwaitPush failed"));
-				SetLastError(iStatus->Int());
-				SetState(EFinish);
-				iControl->ReStart();
-				}
-			else
-				{
-				iMaxWspHeaderRecvBuffer.Append(iRecvHeadersBuf);
-				iMaxWspDataRecvBuffer.Append(iRecvBodyBuf);
-				if (iStatus->Int()==Wap::EMoreData)
-					{
-					iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, *iStatus);
-					activate = 1;
-					if (!iMultiReadCancel)
-						{
-						SetState(EAwaitPush);
-						}
-					else
-						{
-						INFO_PRINTF1(_L("Cancel Receive in EMutipleReceive state"));
-						iImp->CancelAwaitPush();
-						SetState(EFinish);
-						}					
-					
-					}
-				else
-					{
-					SetLastError(iStatus->Int());
-					iControl->ReStart();
-					SetState(EFinish);
-					}
-				}
-			break;
-			
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			if(iStatus->Int() != KErrNone) 
-				{
-				SetLastError(iStatus->Int());
-				}
-			verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-			if (verdict==EPass && !iMiddleCancel && !iMultiReadCancel)
-				{
-				iImp->CancelAwaitPush();
-				INFO_PRINTF1(_L("Headers"));
-				DumpBuf(iMaxWspHeaderRecvBuffer);
-				INFO_PRINTF1(_L("Body"));
-				DumpBuf(iMaxWspDataRecvBuffer);
-				if (verdict==EPass)
-					{
-					Wap::TPort port;
-					iImp->GetLocalPort(port);
-					verdict = (port == iLocalPort)?EPass:EFail;
-					}
-				if (verdict==EPass)
-					{
-					//This test can not perform.
-					HBufC8* buf;
-					iImp->GetLocalAddress(buf);
-					delete buf;
-					}
-				}
-			SetTestStepResult(verdict);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(verdict);
-			StopScheduler();
-			break;
-		}
-		return (activate);
-}
-
-CFullySpecCLPushStep_5::CFullySpecCLPushStep_5()
-/**
-* Constructor
-*/
-	{
-	}
-
-CFullySpecCLPushStep_5::~CFullySpecCLPushStep_5() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CFullySpecCLPushStep_5::doTestStepL()
-/** 
-* Test Cancel await push 
-* @return - TVerdict code
-* 
-*/
-	{
-	INFO_PRINTF1(_L("FullySpecified-PUSH: Testing Cancel"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			TInt bearer;
-			TInt error	= KErrNone;
-			TBool secure= EFalse;
-			TBool reconnect = EFalse;
-			SetLastError(KErrNone);
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer;
-			if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error);
-			if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure;
-			if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect;
-			
-			ShowConnectionInfo();
-			error = iImp->Connect(iRemoteHost, iRemotePort, iBearer, iSecure);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), error);
-			if( error == KErrNone)
-				{
-				TBuf8<100> header, body;
-				TPckgBuf<TUint8> pushIdPckg;
-				TRequestStatus reqStatus;
-				iImp->AwaitPush(header, body, pushIdPckg, reqStatus);
-				SetState(EAwaitPush);
-				StartScheduler();
-				iControl->ReStart();
-				if(reqStatus==KErrCancel)
-					{
-					SetTestStepResult(EPass);
-					}
-				}
-			
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CFullySpecCLPushStep_5::CallStateMachine()
-	{
-	INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State());	
-	switch(iState)
-		{
-		case EAwaitPush:
-			INFO_PRINTF1(_L("EAwaitPush"));
-			iImp->CancelAwaitPush();
-			SetState(EFinish);
-			iControl->ReStart();
-			break;
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			SetState(EIdle);
-			StopScheduler();
-			break;
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(EFail);
-			StopScheduler();
-			break;
-		}
-	return (0);
-	}
-
-CFullySpecCLPushStep_6::CFullySpecCLPushStep_6() 
-	{
-	}
-CFullySpecCLPushStep_6::~CFullySpecCLPushStep_6() 
-	{
-	}
-TVerdict CFullySpecCLPushStep_6::doTestStepL()
-	{
-	//Not in use
-	return TestStepResult();
-	}
-
-TInt CFullySpecCLPushStep_6::CallStateMachine()
-	{
-	return (0);
-	}
-
-CFullySpecCLPushStep_7::CFullySpecCLPushStep_7() 
-	{
-	}
-CFullySpecCLPushStep_7::~CFullySpecCLPushStep_7() 
-	{
-	}
-TVerdict CFullySpecCLPushStep_7::doTestStepL()
-	{
-	INFO_PRINTF1(_L("FULLYSPEC-CLPUSH: Connect-AwaitPush-AwaitPush"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			SetLastError(KErrNone);
-			
-			TInt bearer;
-			TInt error = KErrNone;
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) 
-				{
-				iBearer = static_cast<Wap::TBearer>(bearer);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapExError, error)) 
-				{
-				SetExpectedError(error);
-				}
-			TInt headerLength, bufLength; 
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength))
-				{
-				iHeaderRecvBufLength=static_cast<TUint16>(headerLength);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength))
-				{
-				iBodyRecvBufLength=static_cast<TUint16>(bufLength);
-				}
-			iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength);
-			iRecvBody = HBufC8::NewL(iBodyRecvBufLength);
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-			// Start state machine
-			StartScheduler();
-			delete iRecvBody;
-			iRecvBody=NULL;
-			delete iRecvHeaders;
-			iRecvHeaders=NULL;
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CFullySpecCLPushStep_7::CallStateMachine()
-	{
-	TVerdict verdict = EFail;
-	TInt err = KErrNone;
-	TInt activate = 0;
-	
-	INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State());	
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, EFalse);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-//				WaitForInitializeL();
-				TRequestStatus reqStatus;
-				iRecvHeadersBuf.Set(iRecvHeaders->Des());
-				iRecvBodyBuf.Set(iRecvBody->Des());
-				iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, reqStatus);
-				iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, *iStatus);
-				INFO_PRINTF1(_L("AwaitPush"));
-				activate = 1;
-				}
-			else
-				{
-				iControl->ReStart();
-				}
-			SetLastError(err);
-			SetState(EFinish);
-			break;
-			
-		case EFinish:
-			
-			INFO_PRINTF1(_L("EFinish"));
-			iImp->CancelAwaitPush();
-			if(iStatus->Int() != KErrNone) 
-				{
-				SetLastError(iStatus->Int());
-				}
-			verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-			SetTestStepResult(verdict);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(verdict);
-			StopScheduler();
-			
-			break;
-		}
-	return (activate);
-	}
-
-CFullySpecCLPushStep_8::CFullySpecCLPushStep_8() 
-	{
-	}
-CFullySpecCLPushStep_8::~CFullySpecCLPushStep_8() 
-	{
-	}
-TVerdict CFullySpecCLPushStep_8::doTestStepL()
-/**
-*	@return - TVerdict code
-*	Wrong parameter values for FullySpecified CL Push API:
-*	- Wrong TUid on construction
-*	- Connect to wrong bearer (already implemented in test 2)
-*/
-	{
-	INFO_PRINTF1(_L("CreateImplementation with wrong Uid- CWapFullySpecCLPushService"));
-	if(TestStepResult() == EPass )
-		{
-		TInt error;
-		if(GetIntFromConfig(ConfigSection(),KWapExError2, error))
-			{
-			iExError2=error;
-			}
-		TInt trapValue;
-		TUid invalidInterfaceUid = {0x00000000}; 
-		INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), invalidInterfaceUid);
-		TRAP(trapValue, iImp = CWapFullySpecCLPushService::NewL(invalidInterfaceUid));
-		TVerdict verdict = (trapValue == iExError2)?EPass:EFail;
-		if (verdict==EPass)
-			{
-			INFO_PRINTF2(_L("CreateImplementation with wrong Uid- Failed as expected with error %d"),trapValue);
-			}
-		SetTestStepResult(verdict);
-		}
-	return TestStepResult();
-	}
-
-TInt CFullySpecCLPushStep_8::CallStateMachine()
-	{
-	return (0);
-	}
-
-CFullySpecCLPushStep_9::CFullySpecCLPushStep_9() {}
-CFullySpecCLPushStep_9::~CFullySpecCLPushStep_9() {}
-TVerdict CFullySpecCLPushStep_9::doTestStepL()
-	{
-	return TestStepResult();
-	}
-
-TInt CFullySpecCLPushStep_9::CallStateMachine()
-	{
-	return (0);
-	}
-

--- a/wapstack/wapmessageapi/te_wapstack/src/WapFullySpecCLPushSteps.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-/**
-* Copyright (c) 2002-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 WapFullySpecCLPush.h
-*/
-#if (!defined __FULLYSPECCLPUSH_STEP_H__)
-#define __FULLYSPECCLPUSH_STEP_H__
-#include <test/testexecutestepbase.h>
-#include <in_sock.h>
-#include <es_sock.h>
-#include <wapmessage.h>
-#include "WapStackSuiteStepBase.h"
-
-_LIT(KFullySpecCLPushStep_1,"FullySpecCLPush_1");
-_LIT(KFullySpecCLPushStep_2,"FullySpecCLPush_2");
-_LIT(KFullySpecCLPushStep_3,"FullySpecCLPush_3");
-_LIT(KFullySpecCLPushStep_4,"FullySpecCLPush_4");
-_LIT(KFullySpecCLPushStep_5,"FullySpecCLPush_5");
-_LIT(KFullySpecCLPushStep_6,"FullySpecCLPush_6");
-_LIT(KFullySpecCLPushStep_7,"FullySpecCLPush_7");
-_LIT(KFullySpecCLPushStep_8,"FullySpecCLPush_8");
-_LIT(KFullySpecCLPushStep_9,"FullySpecCLPush_9");
-
-class CFullySpecCLPushBase : public CWapStackSuiteStepBase
-{
-public:
-	CFullySpecCLPushBase();
-	~CFullySpecCLPushBase();
-	CWapFullySpecCLPushService* LoadInterface();
-	void UnloadInterface();
-protected:
-	CWapFullySpecCLPushService* iImp;
-};
-
-class CFullySpecCLPushStep_1 : public CFullySpecCLPushBase
-	{
-public:
-	CFullySpecCLPushStep_1();
-	~CFullySpecCLPushStep_1();
-	virtual TVerdict doTestStepL();
-private:
-	};
-
-class CFullySpecCLPushStep_2 : public CFullySpecCLPushBase
-	{
-public:
-	CFullySpecCLPushStep_2();
-	~CFullySpecCLPushStep_2();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CFullySpecCLPushStep_3 : public CFullySpecCLPushBase
-	{
-public:
-	CFullySpecCLPushStep_3();
-	~CFullySpecCLPushStep_3();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CFullySpecCLPushStep_4 : public CFullySpecCLPushBase
-	{
-public:
-	CFullySpecCLPushStep_4();
-	~CFullySpecCLPushStep_4();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CFullySpecCLPushStep_5 : public CFullySpecCLPushBase
-	{
-public:
-	CFullySpecCLPushStep_5();
-	~CFullySpecCLPushStep_5();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CFullySpecCLPushStep_6 : public CFullySpecCLPushBase
-	{
-public:
-	CFullySpecCLPushStep_6();
-	~CFullySpecCLPushStep_6();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-class CFullySpecCLPushStep_7 : public CFullySpecCLPushBase
-	{
-public:
-	CFullySpecCLPushStep_7();
-	~CFullySpecCLPushStep_7();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-class CFullySpecCLPushStep_8 : public CFullySpecCLPushBase
-	{
-public:
-	CFullySpecCLPushStep_8();
-	~CFullySpecCLPushStep_8();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-class CFullySpecCLPushStep_9 : public CFullySpecCLPushBase
-	{
-public:
-	CFullySpecCLPushStep_9();
-	~CFullySpecCLPushStep_9();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-#endif

--- a/wapstack/wapmessageapi/te_wapstack/src/WapFullySpecWDPSteps.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,885 +0,0 @@
-// Copyright (c) 2002-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
-*/
-
-#include "WapFullySpecWDPSteps.h"
-#include "WapStackSuiteDefs.h"
-#include <wapmsgerr.h>
-#include <simtsy.h>
-#include <ecom/ecom.h>
-
-CFullySpecWDPStepBase::CFullySpecWDPStepBase()
-/*
-* Constructor
-*/
-	{
-	}
-CFullySpecWDPStepBase::~CFullySpecWDPStepBase()
-/*
-* Destructor
-*/
-	{
-	if(iImp) 
-		{
-		UnloadInterface();
-		}
-	}
-
-CWapFullySpecDatagramService* CFullySpecWDPStepBase::LoadInterface()
-/*
-* Load CWapFullySpecifiedDatagramService Interface with Interface ID
-*/
-	{
-	CWapFullySpecDatagramService* implementation = NULL;
-	TUid KInterfaceUid = {0x101FBB38};
-	INFO_PRINTF2(_L("Calling new NewL(%08X) method"), KInterfaceUid);
-	TRAPD(trapValue, implementation = CWapFullySpecDatagramService::NewL(KInterfaceUid));
-	if(!trapValue)	
-		{
-		INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), implementation);
-		return implementation;
-		}
-	else 
-		return NULL;
-	}
-
-void CFullySpecWDPStepBase::UnloadInterface()
-	{
-	INFO_PRINTF2(_L("Interface at implementation.addr = 0x%08x is deleted"), iImp);
-	delete iImp;
-	iImp = NULL;
-	REComSession::FinalClose();	
-	}
-
-CFullySpecWDPStep_1::CFullySpecWDPStep_1()
-/**
-* Constructor
-*/
-	{
-	}
-
-CFullySpecWDPStep_1::~CFullySpecWDPStep_1()
-/**
-* Destructor
-*/
-	{
-	}
-TVerdict CFullySpecWDPStep_1::doTestStepL()
-/** 
-* Load and destroy FullySpecifiedDatagtamService interface implementation
-* Two different methods are used NewL() and NewL(TUid InterfaceUid)
-* @return - TVerdict code
-*/
-	{
-	// CWapFullySpecDatagramService
-	INFO_PRINTF1(_L("CreateImplementation - CWapFullySpecDatagramService"));
-	INFO_PRINTF1(_L("Calling old NewL() method"));
-	
-	TInt trapValue; 
-	
-	SetTestStepResult(EFail);
-	TRAP(trapValue, iImp = CWapFullySpecDatagramService::NewL());
-	if(!trapValue)
-		{
-		// interface is loaded
-		INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), iImp);
-		UnloadInterface();
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			INFO_PRINTF1(_L("CreateImplementation - OK"));
-			SetTestStepResult(EPass);
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-CFullySpecWDPStep_2::CFullySpecWDPStep_2()
-/**
-* Constructor
-*/
-	{
-	}
-
-CFullySpecWDPStep_2::~CFullySpecWDPStep_2() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CFullySpecWDPStep_2::doTestStepL()
-/** 
-* Test Connect methoths 
-* @return - TVerdict code
-* 
-*/
-	{
-	INFO_PRINTF1(_L("FULLYSPEC-WDP: Testing Connect"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			TInt bearer	= 0;
-			TInt error	= KErrNone;
-			TBool secure= EFalse;
-			TBool reconnect = EFalse;
-			SetLastError(KErrNone);
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer;
-			if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error);
-			if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure;
-			if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect;
-			
-			if(UseSimTsy())
-				{
-				GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState);
-				User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState));
-				}
-			User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn));
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-			StartScheduler();
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CFullySpecWDPStep_2::CallStateMachine()
-	{
-	TInt err = KErrNone;
-	INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State());
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, iSecure);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-				if(iReconnect)
-					{ 
-					INFO_PRINTF1(_L("Reconnection"));
-					iControl->ReStart();
-					break;
-					}
-				}
-			SetState(EFinish);
-			SetLastError(err);
-			iControl->ReStart();
-			break;
-			
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			if(GetLastError() == GetExpectedError()) SetTestStepResult(EPass);
-			else SetTestStepResult(EFail);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(EFail);
-			StopScheduler();
-			break;
-		}
-	return (0);
-	}
-
-CFullySpecWDPStep_3::CFullySpecWDPStep_3()
-/**
-* Constructor
-*/
-	{
-	SetTestStepName(KWapWDPStackSuiteLogFile);
-	}
-CFullySpecWDPStep_3::~CFullySpecWDPStep_3()
-/**
-* Destructor
-*/
-	{
-	}
-TVerdict CFullySpecWDPStep_3::doTestStepL()
-/*
-* Test the FullySpecWDP APIs in unconnected state.
-*/
-	{
-	INFO_PRINTF1(_L("FULLYSPECIFIEDWDP. Requests without connection"));
-	// check preamble result
-	TVerdict verdict = TestStepResult();
-	if (verdict==EPass)
-		{
-		TInt err, ret;
-		iImp = LoadInterface();
-		if (!iImp)
-			verdict = EFail;
-		else
-			{
-			GetIntFromConfig(ConfigSection(),KWapExError,(TInt&)iExError);
-			ShowConnectionInfo();
-			TBuf8<100> buf;
-			err = iImp->Send(buf);
-			TRAP(ret, TEST_CHECKL(err, iExError, _L("Connect Fails as expected")))
-				if (ret) 
-					verdict = EFail;
-				else
-					{
-					TPckg<TUint16> aDataSizePckg(0);
-					TRequestStatus reqStatus;
-					iImp->AwaitRecvDataSize(aDataSizePckg, reqStatus);
-					User::WaitForRequest(reqStatus);
-					TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("Connect Fails as expected")))
-						if (ret) 
-							verdict = EFail;
-						else
-							{
-							TBuf8<100> buf;
-							TBool truncated;
-							TUint32 timeout=0;
-							iImp->Recv(buf, truncated,reqStatus,timeout);
-							User::WaitForRequest(reqStatus);
-							TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("Connect Fails as expected")))
-								if (ret) 
-									verdict = EFail;
-								else
-									{
-									Wap::TPort aPort;
-									err=iImp->GetLocalPort(aPort);
-									TRAP(ret, TEST_CHECKL(err, iExError, _L("Connect Fails as expected")))
-										if (ret) 
-											verdict = EFail;
-										else
-											{
-											HBufC8* localHost;
-											err=iImp->GetLocalAddress(localHost);
-											TRAP(ret, TEST_CHECKL(err, iExError, _L("Connect Fails as expected")))
-												if (ret) 
-													verdict = EFail;
-												else
-													{
-													TUint16 maxSize, nominalSize;
-													err=iImp->GetDatagramSizes(maxSize, nominalSize);
-													if (err)
-														verdict = EFail;
-													}
-											}
-									}
-							}
-					}
-				UnloadInterface();
-			}
-		}
-	if (verdict==EPass)
-		{
-		INFO_PRINTF1(_L("FullySpecWDP. Requests Fail as expected"));
-		}
-	SetTestStepResult(verdict);
-	return TestStepResult();
-	}
-
-TInt CFullySpecWDPStep_3::CallStateMachine()
-	{
-	return KErrNone;
-	}
-
-CFullySpecWDPStep_4::~CFullySpecWDPStep_4()
-/**
-* Destructor
-*/
-	{
-	}
-
-CFullySpecWDPStep_4::CFullySpecWDPStep_4()
-/**
-* Constructor
-*/
-	{
-	}
-
-TVerdict CFullySpecWDPStep_4::doTestStepL()
-	{
-	INFO_PRINTF1(_L("FULLYSPEC-WDP: Connect-Send-Await-Receive"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			SetLastError(KErrNone);
-			
-			TInt bearer, port, bufLen;
-			TInt error = KErrNone;
-			TPtrC data;
-			TPtrC16 remote_host;
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer))
-				{
-				iBearer = static_cast<Wap::TBearer>(bearer);
-				}
-			if(GetStringFromConfig(ConfigSection(), KWapRemoteHost, remote_host))
-				{
-				iRemoteHost.Copy(remote_host);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapRemotePort, port))
-				{
-				iRemotePort = static_cast<Wap::TPort>(port);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port))
-				{
-				iLocalPort = static_cast<Wap::TPort>(port);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapExError, error))
-				{
-				SetExpectedError(error);
-				}
-			GetIntFromConfig(ConfigSection(), KWapExError2, iExError2);
-			GetBoolFromConfig(ConfigSection(), KAwaitLengthTwice, iAwaitLengthTwice);
-			GetBoolFromConfig(ConfigSection(), KAwaitLengthCancel, iAwaitLengthCancel);
-			GetBoolFromConfig(ConfigSection(), KMiddleCancel, iMiddleCancel);
-			GetBoolFromConfig(ConfigSection(), KMultiReadCancel, iMultiReadCancel);
-			if(GetIntFromConfig(ConfigSection(),KWapWdpBufLength, bufLen))
-				{
-				iWdpRecvBufLength=static_cast<TUint16>(bufLen);
-				iRecvBuffPtr = HBufC8::NewL(iWdpRecvBufLength);
-				}
-			error = GetStringFromConfig(ConfigSection(),KWapData, data);
-			if(!error)
-				{
-				User::Leave(error);
-				}
-			iSendBuffPtr = HBufC8::NewL(data.Length());
-			TPtr8 tmp = iSendBuffPtr->Des();
-			tmp.Copy(data);
-			
-			if(UseSimTsy())
-				{
-				GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState);
-				User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState));
-				}
-			User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn));
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-			// Start state machine
-			StartScheduler(); 
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CFullySpecWDPStep_4::CallStateMachine()
-	{
-	TVerdict verdict = EFail;
-	TInt err = KErrNone;
-	TInt activate = 0;
-	TInt leaveError = KErrNone;
-	
-	INFO_PRINTF2(_L("CallStateMachine: state  [%d]"), State());
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iRemoteHost, iRemotePort, iBearer);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-				TRAP(leaveError, WaitForInitializeL());
-				err = iImp->Send(iSendBuffPtr->Des());
-				if(err == KErrNone && leaveError == KErrNone) 
-					{	
-					INFO_PRINTF2(_L("Send completetd with code = %d"), err);
-					SetState(EAwaitSize);
-					}
-				else 
-					{	
-					SetState(EFinish);
-					}
-				}
-			else 
-				{
-				SetState(EFinish);
-				}
-			SetLastError(err);
-			iControl->ReStart();
-			break;
-			
-		case EAwaitSize:
-			INFO_PRINTF1(_L("EAwaitSize"));
-			iImp->AwaitRecvDataSize(iLength, *iStatus);
-			activate = 1;
-			if (!iAwaitLengthCancel)
-				{
-				SetState(EReceive);
-				}
-			else
-				{
-				INFO_PRINTF1(_L("Cancel Receive in AwaitSize state"));
-				iImp->CancelRecv();
-				SetState(EFinish);
-				}
-			
-			break;
-			
-		case EReceive:
-			INFO_PRINTF1(_L("EReceive"));
-			if(iStatus->Int()!=KErrNone) 
-				// AwaitSize failed
-				{
-				INFO_PRINTF1(_L("AwaitSize failed"));
-				SetLastError(iStatus->Int());
-				iControl->ReStart();
-				SetState(EFinish);
-				}
-			else
-				{	
-				INFO_PRINTF2(_L("AwaitSize returned - %d"),iLength());
-				if (!iAwaitLengthTwice)
-					{
-					if (iRecvBuffPtr==NULL)
-						{
-						TInt len=iLength();
-						TRAP(err, iRecvBuffPtr = HBufC8::NewL(len))
-							if (err!=KErrNone)
-								{
-								SetLastError(err);
-								iControl->ReStart();
-								SetState(EFinish);
-								break;
-								}
-						}
-					iRecvBuf.Set(iRecvBuffPtr->Des());
-					iImp->Recv(iRecvBuf, iTruncated, *iStatus, 0);
-					activate = 1;
-					if (!iMiddleCancel)
-						{
-						SetState(EMutipleReceive);
-						}
-					else
-						{
-						INFO_PRINTF1(_L("Cancel Receive in Receive state"));
-						iImp->CancelRecv();
-						SetState(EFinish);
-						}
-					}
-				else
-					{
-					iImp->AwaitRecvDataSize(iLength, *iStatus);
-					activate = 1;
-					SetState(EFinish);
-					}
-				}
-			break;
-			
-		case EMutipleReceive:
-			INFO_PRINTF1(_L("EMultipleReceive"));
-			if (iStatus->Int()!=KErrNone && iStatus->Int()!=Wap::EMoreData)
-				{
-				INFO_PRINTF1(_L("Receive failed"));
-				SetLastError(iStatus->Int());
-				iControl->ReStart();
-				SetState(EFinish);
-				}
-			else
-				{
-				iMaxWdpRecvBuffer.Append(iRecvBuf);
-				if (iTruncated)
-					{
-					iImp->Recv(iRecvBuf, iTruncated, *iStatus, 0);
-					activate = 1;
-					if (!iMultiReadCancel)
-						{
-						SetState(EMutipleReceive);
-						}
-					else
-						{
-						INFO_PRINTF1(_L("Cancel Receive in EMutipleReceive state"));
-						iImp->CancelRecv();
-						SetState(EFinish);
-						}					
-					}
-				else
-					{
-					SetLastError(iStatus->Int());
-					iControl->ReStart();
-					SetState(EFinish);
-					}
-				}	
-			break;
-			
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			if(iStatus->Int() != KErrNone) 
-				{
-				SetLastError(iStatus->Int());
-				}
-			verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-			if (verdict==EPass && !iAwaitLengthTwice && !iMiddleCancel && !iMultiReadCancel && !iAwaitLengthCancel)
-				{
-				iImp->CancelRecv();
-				INFO_PRINTF1(_L("Data received"));
-				DumpBuf(iMaxWdpRecvBuffer);
-				if (verdict==EPass)
-					{
-					verdict = (iSendBuffPtr->Match(iMaxWdpRecvBuffer)!=KErrNotFound)?EPass:EFail;
-					}
-				if (verdict==EPass)
-					{
-					Wap::TPort port;
-					iImp->GetLocalPort(port);
-					verdict = (port == iLocalPort)?EPass:EFail;
-					}
-				if (verdict==EPass)
-					{
-					//This test can not perform to get own telnumber
-					HBufC8* buf;
-					iImp->GetLocalAddress(buf);
-					delete buf;
-					}
-				}
-			SetTestStepResult(verdict);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(verdict);
-			StopScheduler();
-			
-			break;
-		}
-		return (activate);
-	}
-	
-	CFullySpecWDPStep_5::~CFullySpecWDPStep_5()
-	/**
-	* Destructor
-	*/
-		{
-		}
-	
-	CFullySpecWDPStep_5::CFullySpecWDPStep_5()
-	/**
-	* Constructor
-	*/
-		{
-		}
-	
-	TVerdict CFullySpecWDPStep_5::doTestStepL()
-	/** 
-	*	Test Cancel
-	*/
-		{
-		INFO_PRINTF1(_L("Fully Specified-WDP: Testing Cancel"));
-		
-		if(TestStepResult() == EPass )
-			{
-			SetTestStepResult(EFail);
-			iImp = LoadInterface();
-			if(iImp)
-				{	
-				TInt bearer	= 0;
-				TInt error	= KErrNone;
-				TBool secure= EFalse;
-				TBool reconnect = EFalse;
-				SetLastError(KErrNone);
-				
-				if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer;
-				if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error);
-				if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure;
-				if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect;
-
-				ShowConnectionInfo();				
-
-				error = iImp->Connect(iRemoteHost, iRemotePort, iBearer, iSecure);
-				INFO_PRINTF2(_L("Connection completed with code = %d"), error);
-				if( error == KErrNone)
-					{
-					TPckg<TUint16> aDataSizePckg(0);
-					TRequestStatus reqStatus;
-					iImp->AwaitRecvDataSize(aDataSizePckg, reqStatus);
-					SetState(EAwaitSize);
-					StartScheduler();
-					iControl->ReStart();
-					if(reqStatus==KErrCancel)
-						{
-						SetTestStepResult(EPass);
-						}
-					}
-				}
-			}
-		return TestStepResult();
-		}
-
-TInt CFullySpecWDPStep_5::CallStateMachine()
-	{
-	INFO_PRINTF2(_L("CallStateMachine: step [%d]"), State());
-	switch(iState)
-		{
-		case EAwaitSize:
-			INFO_PRINTF1(_L("EAwaitSize"));
-			iImp->CancelRecv();
-			SetState(EFinish);
-			iControl->ReStart();
-			break;
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			SetState(EIdle);
-			StopScheduler();
-			break;
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknow state %d"), State());
-			SetTestStepResult(EFail);
-			StopScheduler();
-			break;
-		}
-	return 0;
-	}
-	
-CFullySpecWDPStep_6::~CFullySpecWDPStep_6() 
-	{
-	}
-
-CFullySpecWDPStep_6::CFullySpecWDPStep_6()
-	{
-	}
-
-TVerdict CFullySpecWDPStep_6::doTestStepL()
-	{
-	//Test timeout (Not in use)
-	return TestStepResult();
-	}
-
-TInt CFullySpecWDPStep_6::CallStateMachine()
-	{
-	return KErrNone;
-	}
-
-CFullySpecWDPStep_7::~CFullySpecWDPStep_7()
-	{
-	}
-
-CFullySpecWDPStep_7::CFullySpecWDPStep_7()
-	{
-	}
-
-TVerdict CFullySpecWDPStep_7::doTestStepL()
-	//
-	//Test wrong sequenece
-	//
-	{
-	INFO_PRINTF1(_L("FULLYSPEC-WDP: Connect-Receive-Await-Await"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			SetLastError(KErrNone);
-			
-			TInt bearer, port, bufLen;
-			TInt error = KErrNone;
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer))
-				{
-				iBearer = static_cast<Wap::TBearer>(bearer);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port))
-				{	
-				iLocalPort = static_cast<Wap::TPort>(port);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapExError, error))
-				{
-				SetExpectedError(error);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapWdpBufLength, bufLen))
-				{
-				iWdpRecvBufLength=static_cast<TUint16>(bufLen);
-				}
-			iRecvBuffPtr = HBufC8::NewL(iWdpRecvBufLength);
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-
-			StartScheduler();
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CFullySpecWDPStep_7::CallStateMachine()
-	{
-	TVerdict verdict = EFail;
-	TInt err = KErrNone;
-	TInt activate = 0;
-	
-	INFO_PRINTF2(_L("CallStateMachine: state  [%d]"), State());
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iRemoteHost, iRemotePort, iBearer);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-//				WaitForInitializeL();
-				if(iRecvBuffPtr == NULL)
-					{
-					err=KErrNoMemory;
-					}
-				else
-					{
-					iRecvBuf.Set(iRecvBuffPtr->Des());
-					iImp->Recv(iRecvBuf, iTruncated, *iStatus, iTimeout);
-					SetState(EReceive);
-					activate = 1;
-					}
-				}
-			SetLastError(err);
-			if (err!=KErrNone)
-				{
-				SetState(EFinish);
-				iControl->ReStart();
-				}
-			break;
-			
-		case EReceive:
-			INFO_PRINTF1(_L("EReceive"));
-			SetLastError(iStatus->Int());
-			if(iStatus->Int() != KErrNone) 
-				// Receiving fails as expect
-				{
-				verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-				if (verdict==EPass)
-					{
-					INFO_PRINTF1(_L("Receiving failed as expect"));
-					TRequestStatus reqStatus;
-					iImp->AwaitRecvDataSize(iLength, reqStatus);
-					iImp->AwaitRecvDataSize(iLength, *iStatus);
-					activate = 1;
-					SetState(EAwaitSize);
-					}
-				else
-					{
-					INFO_PRINTF1(_L("Receiving failed not as expect"));
-					iControl->ReStart();
-					SetState(EFinish);
-					}
-				}
-			else
-				{	
-				INFO_PRINTF1(_L("Receiving succeed not as expect"));
-				iControl->ReStart();
-				SetState(EFinish);
-				}
-			break;
-			
-		case EAwaitSize:
-			INFO_PRINTF1(_L("EAwaitSize"));
-			SetLastError(iStatus->Int());
-			iImp->CancelRecv();
-			SetState(EFinish);
-			iControl->ReStart();
-			break;
-			
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			if(iStatus->Int() != KErrNone) 
-				{
-				SetLastError(iStatus->Int());
-				}
-			verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-			SetTestStepResult(verdict);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(verdict);
-			StopScheduler();
-			break;
-		}
-	return (activate);
-}
-
-CFullySpecWDPStep_8::~CFullySpecWDPStep_8()
-	{
-	}
-CFullySpecWDPStep_8::CFullySpecWDPStep_8() 
-	{
-	}
-
-TVerdict CFullySpecWDPStep_8::doTestStepL()
-/*
-*	Using invalid values for API parameters:
-*	- Invalid TUid on construction
-*	- Setting invalid timeout for Recv
-*	Note: wrong bearer value has already been implemented as part of test 2
-*/
-	{
-	INFO_PRINTF1(_L("FullySpec-WDP: Wrong parameter values"));
-	if(TestStepResult() == EPass )
-		{
-		TInt error;
-		if(GetIntFromConfig(ConfigSection(),KWapExError2, error))
-			{
-			iExError2=error;
-			}
-		TInt trapValue;
-		TUid invalidInterfaceUid = {0x00000000}; 	
-		INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), invalidInterfaceUid);
-		TRAP(trapValue, iImp = CWapFullySpecDatagramService::NewL(invalidInterfaceUid));
-		TVerdict verdict = (trapValue == iExError2)?EPass:EFail;
-		if (verdict==EPass)
-			{
-			INFO_PRINTF2(_L("CreateImplementation with wrong Uid- Failed as expected with error %d"),trapValue);
-			}
-		SetTestStepResult(verdict);
-		}
-	return TestStepResult();
-	}
-
-TInt CFullySpecWDPStep_8::CallStateMachine()
-	{
-	return KErrNone;
-	}
-
-CFullySpecWDPStep_9::~CFullySpecWDPStep_9() {}
-CFullySpecWDPStep_9::CFullySpecWDPStep_9() {}
-TVerdict CFullySpecWDPStep_9::doTestStepL()
-	{
-	return TestStepResult();
-	}
-TInt CFullySpecWDPStep_9::CallStateMachine()
-	{
-	return KErrNone;
-	}
-

--- a/wapstack/wapmessageapi/te_wapstack/src/WapFullySpecWDPSteps.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-/**
-* Copyright (c) 2002-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 WapFullySpecWDPSteps.h
-*/
-#if (!defined __FULLYSPECWDP_STEP_H__)
-#define __FULLYSPECWDP_STEP_H__
-#include <test/testexecutestepbase.h>
-#include <in_sock.h>
-#include <es_sock.h>
-#include <wapmessage.h>
-
-#include "WapStackSuiteStepBase.h"
-
-_LIT(KFullySpecWDPStep_1,"FullySpecWDP_1");
-_LIT(KFullySpecWDPStep_2,"FullySpecWDP_2");
-_LIT(KFullySpecWDPStep_3,"FullySpecWDP_3");
-_LIT(KFullySpecWDPStep_4,"FullySpecWDP_4");
-_LIT(KFullySpecWDPStep_5,"FullySpecWDP_5");
-_LIT(KFullySpecWDPStep_6,"FullySpecWDP_6");
-_LIT(KFullySpecWDPStep_7,"FullySpecWDP_7");
-_LIT(KFullySpecWDPStep_8,"FullySpecWDP_8");
-_LIT(KFullySpecWDPStep_9,"FullySpecWDP_9");
-
-class CFullySpecWDPStepBase : public CWapStackSuiteStepBase
-{
-public:
-	~CFullySpecWDPStepBase();
-	void UnloadInterface();
-protected:
-	CFullySpecWDPStepBase();
-	CWapFullySpecDatagramService* LoadInterface();
-	CWapFullySpecDatagramService* iImp;
-};
-
-class CFullySpecWDPStep_1 : public CFullySpecWDPStepBase
-	{
-public:
-	CFullySpecWDPStep_1();
-	~CFullySpecWDPStep_1();
-	virtual TVerdict doTestStepL();
-private:
-	};
-
-class CFullySpecWDPStep_2 : public CFullySpecWDPStepBase
-	{
-public:
-	CFullySpecWDPStep_2();
-	~CFullySpecWDPStep_2();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CFullySpecWDPStep_3 : public CFullySpecWDPStepBase
-	{
-public:
-	CFullySpecWDPStep_3();
-	~CFullySpecWDPStep_3();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CFullySpecWDPStep_4 : public CFullySpecWDPStepBase
-	{
-public:
-	CFullySpecWDPStep_4();
-	~CFullySpecWDPStep_4();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CFullySpecWDPStep_5: public CFullySpecWDPStepBase
-	{
-public:
-	CFullySpecWDPStep_5();
-	~CFullySpecWDPStep_5();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CFullySpecWDPStep_6: public CFullySpecWDPStepBase
-	{
-public:
-	CFullySpecWDPStep_6();
-	~CFullySpecWDPStep_6();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CFullySpecWDPStep_7: public CFullySpecWDPStepBase
-	{
-public:
-	CFullySpecWDPStep_7();
-	~CFullySpecWDPStep_7();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CFullySpecWDPStep_8: public CFullySpecWDPStepBase
-	{
-public:
-	CFullySpecWDPStep_8();
-	~CFullySpecWDPStep_8();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CFullySpecWDPStep_9: public CFullySpecWDPStepBase
-	{
-public:
-	CFullySpecWDPStep_9();
-	~CFullySpecWDPStep_9();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-#endif

--- a/wapstack/wapmessageapi/te_wapstack/src/WapFullySpecWSPSteps.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,983 +0,0 @@
-// Copyright (c) 2002-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
-*/
-
-#include "WapFullySpecWSPSteps.h"
-#include "WapStackSuiteDefs.h"
-#include <simtsy.h>
-#include <ecom/ecom.h>
-
-CFullySpecWSPStepBase::CFullySpecWSPStepBase()
-/**
-* Constructor
-*/
-	{
-	}
-
-CFullySpecWSPStepBase::~CFullySpecWSPStepBase()
-/**
-* Destructor
-*/
-	{
-	if(iImp) 
-		{
-		UnloadInterface();
-		}
-	}
-
-// Load CWapBoundDatagramService Interface 
-CWapFullySpecCLWSPService* CFullySpecWSPStepBase::LoadInterface()
-	{
-	TInt trapValue;
-	CWapFullySpecCLWSPService* implementation = NULL;
-	// UID {0x101FBB3E} - SWS implementation
-	TUid KInterfaceUid = {0x101FBB3E}; 	
-	INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), KInterfaceUid);
-	TRAP(trapValue, implementation = CWapFullySpecCLWSPService::NewL(KInterfaceUid));
-	if(!trapValue)
-		{
-		INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), implementation);
-		return implementation;
-		}
-	else return NULL;
-	}
-
-void CFullySpecWSPStepBase::UnloadInterface()
-	{
-	INFO_PRINTF2(_L("Interface at implementation.addr = 0x%08x is deleted"), iImp);
-	delete iImp;
-	iImp = NULL;
-	REComSession::FinalClose();	
-	}
-
-CFullySpecWSPStep_1::~CFullySpecWSPStep_1()
-/**
-* Destructor
-*/
-	{
-	}
-
-CFullySpecWSPStep_1::CFullySpecWSPStep_1()
-/**
-* Constructor
-*/
-	{
-	}
-
-TVerdict CFullySpecWSPStep_1::doTestStepL()
-/**
-* @return - TVerdict code
-* Override of base class pure virtual
-* Our implementation only gets called if the base class doTestStepPreambleL() did
-* not leave. That being the case, the current test result value will be EPass.
-*/
-	{
-	//
-	// CWapFullySpecCLWSPService
-	// 
-	INFO_PRINTF1(_L("CreateImplementation - CWapFullySpecCLWSPService"));
-	INFO_PRINTF1(_L("Calling old NewL() method"));
-	
-	TInt trapValue; 
-	
-	SetTestStepResult(EFail);
-	TRAP(trapValue, iImp = CWapFullySpecCLWSPService::NewL());
-	if(!trapValue)
-		{
-		// interface is loaded
-		INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), iImp);
-		UnloadInterface();
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			INFO_PRINTF1(_L("CreateImplementation - OK"));
-			SetTestStepResult(EPass);
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-CFullySpecWSPStep_2::CFullySpecWSPStep_2()
-/**
-* Constructor
-*/
-	{
-	}
-
-CFullySpecWSPStep_2::~CFullySpecWSPStep_2() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CFullySpecWSPStep_2::doTestStepL()
-/** 
-* Test Connect methoths 
-* @return - TVerdict code
-* 
-*/
-	{
-	INFO_PRINTF1(_L("FULLYSPEC-WSP: Testing Connect"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			TInt bearer	= 0;
-			TInt error	= KErrNone;
-			TBool secure= EFalse;
-			TBool reconnect= EFalse;
-			SetLastError(KErrNone);
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer;
-			if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error);
-			if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure;
-			if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect;
-			
-			if(UseSimTsy())
-				{
-				GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState);
-				User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState));
-				}
-			User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn));
-
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-			// Start state machine
-			StartScheduler();
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CFullySpecWSPStep_2::CallStateMachine()
-	{
-	TInt err = KErrNone;
-	INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State());
-	switch(State())
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, iSecure);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-				if(iReconnect)
-					{ 
-					INFO_PRINTF1(_L("Reconnection"));
-					iControl->ReStart();
-					break;
-					}
-				}
-			SetState(EFinish);
-			SetLastError(err);
-			iControl->ReStart();
-			break;
-			
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			if(GetLastError() == GetExpectedError()) 
-				{
-				SetTestStepResult(EPass);
-				}
-			else
-				{
-				SetTestStepResult(EFail);
-				}
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(EFail);
-			StopScheduler();
-			break;
-		}
-	return (0);
-	}
-
-CFullySpecWSPStep_3::CFullySpecWSPStep_3()
-/**
-* Constructor
-*/
-	{
-	}
-
-CFullySpecWSPStep_3::~CFullySpecWSPStep_3() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CFullySpecWSPStep_3::doTestStepL()
-/** 
-* Test Connect methoths 
-* @return - TVerdict code
-* 
-*/
-	{
-	INFO_PRINTF1(_L("FullySpecWSP. Requests without connection"));
-	// check preamble result
-	TVerdict verdict = TestStepResult();
-	if (verdict==EPass)
-		{
-		TInt err, ret;
-		iImp = LoadInterface();
-		if (!iImp)
-			{
-			ERR_PRINTF1(_L("Unable to load FullySpecWSP Interface"));
-			verdict = EFail;
-			}
-		else
-			{
-			GetIntFromConfig(ConfigSection(),KWapExError,(TInt&)iExError);
-			ShowConnectionInfo();
-			TBuf8<100> header, body;
-			TPckgBuf<TUint8> idPckg;
-			TWSPStatus wspStatus;
-			TRequestStatus reqStatus;
-			TUint32 timeout = 0;
-			ShowConnectionInfo();
-			iImp->MethodResult(header, body, idPckg, wspStatus, reqStatus, timeout);
-			TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("MethodResult Fails not as expected")))
-				if (ret) 
-					verdict = EFail;
-				else
-					{
-					Wap::TPort port;
-					err=iImp->GetLocalPort(port);
-					TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalPort Fails not as expected")))
-						if (ret)
-							verdict = EFail;
-						else
-							{
-							HBufC8* localHost;					
-							err=iImp->GetLocalAddress(localHost);
-							TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalAddress Fails not as expected")))
-								if (ret) 
-									verdict = EFail;
-								else
-									{
-									TBuf<100> uri;
-									TUint8 id = 0;
-									err=iImp->MethodInvoke(0x40, uri, header, body, id);
-									TRAP(ret, TEST_CHECKL(err, iExError, _L("MethodInvoke Fails not as expected")))
-										if (ret) 
-											verdict = EFail;
-									}
-							}
-					}
-				UnloadInterface();
-			}
-		}
-	if (verdict==EPass)
-		{
-		INFO_PRINTF1(_L("FullySpecWSP. Requests Fail as expected"));
-		}
-	SetTestStepResult(verdict);
-	return TestStepResult();
-	}
-
-TInt CFullySpecWSPStep_3::CallStateMachine()
-	{
-	return (0);
-	}
-
-CFullySpecWSPStep_4::CFullySpecWSPStep_4()
-/**
-* Constructor
-*/
-	{
-	}
-
-CFullySpecWSPStep_4::~CFullySpecWSPStep_4() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CFullySpecWSPStep_4::doTestStepL()
-/** 
-* Test Connect methoths 
-* @return - TVerdict code
-* 
-*/
-	{
-	INFO_PRINTF1(_L("FULLYSPEC-WSP: UnitInvoke-UnitResult"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			SetLastError(KErrNone);
-			
-			TInt bearer, port, repeat, method;
-			TInt error = KErrNone;
-			TPtrC headers;
-			TPtrC body;
-			TPtrC uri;
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer;
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) iLocalPort = (Wap::TPort)port;
-			if(GetIntFromConfig(ConfigSection(),KWapExError, error)) SetExpectedError(error);
-			if(GetIntFromConfig(ConfigSection(),KWapWSPMethod, method)) iMethod = method;
-			if(GetIntFromConfig(ConfigSection(), KWapRepeat, repeat)) iRepeat = repeat;
-			
-			if(!GetStringFromConfig(ConfigSection(),KWapURI, uri)) 
-				{
-				User::Leave(KErrNoMemory);
-				}
-			GetStringFromConfig(ConfigSection(),KWapWSPHeaders, headers);
-			GetStringFromConfig(ConfigSection(),KWapWSPBody, body);
-			
-			User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn));
-			
-			if(UseSimTsy())
-				{
-				User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, 41));
-				}
-				
-			
-			iURI = HBufC16::NewL(uri.Length());
-			
-			iSendHeaders = HBufC8::NewL(headers.Length());
-			
-			iSendBody = HBufC8::NewL(body.Length());
-			
-			iRecvHeaders = HBufC8::NewL(KMaxWapWspHeaderBufferLength);
-			iRecvBody = HBufC8::NewL(KMaxWapWspDataBufferLength);
-
-			TPtr16 tmp16 = iURI->Des();
-			tmp16.Copy(uri);
-			TPtr8 tmp1 = iSendHeaders->Des();
-			tmp1.Copy(headers);
-			TPtr8 tmp2 = iSendBody->Des();
-			tmp2.Copy(body);
-
-			iRecvHeadersBuf.Set(iRecvHeaders->Des());
-			iRecvHeadersBuf.Zero();
-			iRecvBodyBuf.Set(iRecvBody->Des());
-			iRecvBodyBuf.Zero();
-			
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();
-
-			StartScheduler();
-			
-			delete iRecvBody;
-			iRecvBody=NULL;
-			delete iRecvHeaders;
-			iRecvHeaders=NULL;
-
-			delete iSendBody;
-			iSendBody=NULL;
-			delete iSendHeaders;
-			iSendHeaders=NULL;
-			delete iURI;
-			iURI=NULL;
-
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CFullySpecWSPStep_4::CallStateMachine()
-	{
-	TVerdict verdict = EFail;
-	TInt err = KErrNone;
-	TInt activate = 0;
-	TPtr8 tmp = iSendBody->Des();
-		
-	static TUint total_headers = 0;		
-	static TUint total_body = 0;		
-	static TUint repeat = 0;		
-	
-	INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State());
-
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			total_headers = 0;
-			total_body = 0;
-			err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, EFalse);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-				SetState(EUnitInvoke);
-				}
-			else
-				{
-				SetState(EFinish);
-				}
-			SetLastError(err);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			iControl->ReStart();
-			break;
-
-		case EUnitInvoke:
-			INFO_PRINTF2(_L("EUnitInvoke: Method - 0x%02x"), iMethod);
-			if(iBearer != Wap::EIP)
-			{
-				TRAP(err, WaitForInitializeL());
-			}
-			if(tmp.Length() != 0)
-				{
-				INFO_PRINTF1(_L("Data to send:"));
-				DumpBuf(tmp);
-				}
-			err = iImp->MethodInvoke(iMethod, iURI->Des(), iSendHeaders->Des(), iSendBody->Des(), iTransactionId);
-			INFO_PRINTF3(_L("MethodInvoke() retcode: - dec: %d hex: 0x%08x"), err, err);
-			if(err == KErrNone) 
-				{	
-				SetState(EUnitResult);
-				}
-			else 
-				{
-				SetState(EFinish);
-				}
-			SetLastError(err);
-			iControl->ReStart();
-			break;
-
-		case EUnitResult:
-
-			iRecvHeadersBuf.Set(iRecvHeaders->Des());
-			iRecvHeadersBuf.Zero();
-			iRecvBodyBuf.Set(iRecvBody->Des());
-			iRecvBodyBuf.Zero();
-			iImp->MethodResult(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, iWspStatus, *iStatus, iTimeout);
-			INFO_PRINTF2(_L("EUnitResult: status 0x%08x"), iStatus->Int());
-			activate = 1;
-			SetLastError(err);
-			SetState(EFinish);
-			break;
-			
-		case EFinish:
-			
-			INFO_PRINTF4(_L("EFinish: Status: %d, WSP status: %d (0x%02x)"), iStatus->Int(), iWspStatus, iWspStatus);
-
-			if(iRecvHeadersBuf.Length() != 0)
-				{
-				INFO_PRINTF1(_L("Headers"));
-				total_headers += iRecvHeadersBuf.Length();
-				DumpBuf(iRecvHeadersBuf);
-				}
-
-			if(iRecvBodyBuf.Length() != 0)
-				{
-				INFO_PRINTF1(_L("Body"));
-				total_body += iRecvBodyBuf.Length();
-				DumpBuf(iRecvBodyBuf);
-				}
-
-			if(iStatus->Int() != KErrNone) 
-				{
-				SetLastError(iStatus->Int());
-				if(iStatus->Int() == Wap::EMoreData)
-					{
-					INFO_PRINTF1(_L("NOTE: More data... calling MethodResult()"));
-					SetState(EUnitResult);
-					iControl->ReStart();
-					break;
-					}
-				}
-
-			INFO_PRINTF3(_L("Data received: headers - %d bytes, body - %d bytes"), total_headers, total_body);
-			total_headers = 0;
-			total_body = 0;
-			if((--iRepeat != 0) && (iStatus->Int() == KErrNone))
-				{
-				++repeat;
-				INFO_PRINTF2(_L("REPEAT TEST - %d"), repeat);
-				if(err == KErrNone) 
-					{	
-					SetState(EUnitInvoke);
-					iControl->ReStart();
-					break;
-					}
-				}
-
-			verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-			SetTestStepResult(verdict);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(verdict);
-			StopScheduler();
-			break;
-		}
-	return (activate);
-	}
-
-
-CFullySpecWSPStep_5::CFullySpecWSPStep_5()
-/**
-* Constructor
-*/
-	{
-	}
-
-CFullySpecWSPStep_5::~CFullySpecWSPStep_5() 
-/**
-* Destructor
-*/
-	{
-	}
-
-TVerdict CFullySpecWSPStep_5::doTestStepL()
-/** 
-* Test Cancel Request 
-* @return - TVerdict code
-* 
-*/
-	{
-	INFO_PRINTF1(_L("BoundCLPush. Testing Cancel Request"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			TInt bearer	= 0;
-			TInt error	= KErrNone;
-			TBool secure= EFalse;
-			TBool reconnect= EFalse;
-			SetLastError(KErrNone);
-			
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer;
-			if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error);
-			if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure;
-			if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect;
-			
-			ShowConnectionInfo();			
-
-			error = iImp->Connect(iRemoteHost, iRemotePort, iBearer, iSecure);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), error);
-			if( error == KErrNone)
-				{
-				TBuf8<100> header, body;
-				TPckgBuf<TUint8> idPckg;
-				TWSPStatus wspStatus;
-				TRequestStatus reqStatus;
-				TUint32 timeout=0;
-				iImp->MethodResult(header, body, idPckg, wspStatus, reqStatus, timeout);
-				SetState(EUnitResult);
-				StartScheduler();
-				iControl->ReStart();
-				if(reqStatus==KErrCancel)
-					{
-					SetTestStepResult(EPass);
-					}
-				
-				}
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CFullySpecWSPStep_5::CallStateMachine()
-	{
-	INFO_PRINTF2(_L("CallStateMachine: step [%d]"), State());
-	switch(iState)
-		{
-		case EUnitResult:
-			INFO_PRINTF1(_L("EUnitResult"));
-			iImp->CancelReq();
-			SetState(EFinish);
-			iControl->ReStart();
-			break;
-			
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(EFail);
-			StopScheduler();
-			break;
-		}
-	return (0);
-	}
-
-
-CFullySpecWSPStep_6::CFullySpecWSPStep_6() 
-	{
-	}
-
-CFullySpecWSPStep_6::~CFullySpecWSPStep_6()
-	{
-	}
-
-TVerdict CFullySpecWSPStep_6::doTestStepL()
-/*
-* Test receive time out
-*/
-	{
-	INFO_PRINTF1(_L("BOUND-WSP: Connect-UnitResult-TimeOut"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			SetLastError(KErrNone);
-			TInt bearer, port;
-			TInt error = KErrNone;
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer))
-				{
-				iBearer = static_cast<Wap::TBearer>(bearer);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port))
-				{
-				iLocalPort = static_cast<Wap::TPort>(port);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapExError, error))
-				{
-				SetExpectedError(error);
-				}
-			TInt headerLength, bufLength, timeOut; 
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength))
-				{
-				iHeaderRecvBufLength=static_cast<TUint16>(headerLength);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength))
-				{
-				iBodyRecvBufLength=static_cast<TUint16>(bufLength);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapTimeOut, timeOut))
-				{
-				iTimeout=timeOut;
-				}
-			iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength);
-			iRecvBody = HBufC8::NewL(iBodyRecvBufLength);
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();						
-			// Start state machine
-			StartScheduler();
-			delete iRecvBody;
-			iRecvBody=NULL;
-			delete iRecvHeaders;
-			iRecvHeaders=NULL;
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CFullySpecWSPStep_6::CallStateMachine()
-	{
-	TVerdict verdict = EFail;
-	TInt err = KErrNone;
-	TInt activate = 0;
-	
-	INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State());
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, EFalse);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-				//				WaitForInitializeL();
-				iRecvHeadersBuf.Set(iRecvHeaders->Des());
-				iRecvBodyBuf.Set(iRecvBody->Des());
-				iImp->MethodResult(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, iWspStatus, *iStatus, iTimeout);
-				INFO_PRINTF1(_L("MethodResult"));
-				activate = 1;
-				}
-			else
-				{
-				iControl->ReStart();
-				}
-			SetLastError(err);
-			SetState(EFinish);
-			break;
-			
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			if(iStatus->Int() != KErrNone) 
-				{
-				SetLastError(iStatus->Int());
-				}
-			verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-			SetTestStepResult(verdict);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(verdict);
-			StopScheduler();
-			break;
-		}
-	return (activate);
-	}
-
-CFullySpecWSPStep_7::CFullySpecWSPStep_7() 
-	{
-	}
-CFullySpecWSPStep_7::~CFullySpecWSPStep_7()  
-	{
-	}
-TVerdict CFullySpecWSPStep_7::doTestStepL()
-	{
-	INFO_PRINTF1(_L("FULLYSPEC-WSP: Connect-UnitResult-TimeOut"));
-	if(TestStepResult() == EPass )
-		{
-		SetTestStepResult(EFail);
-		iImp = LoadInterface();
-		if(iImp)
-			{
-			SetLastError(KErrNone);
-			TInt bearer, port;
-			TInt error = KErrNone;
-			if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer))
-				{
-				iBearer = static_cast<Wap::TBearer>(bearer);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port))
-				{
-				iLocalPort = static_cast<Wap::TPort>(port);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapExError, error))
-				{
-				SetExpectedError(error);
-				}
-			TInt headerLength, bufLength; 
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength))
-				{
-				iHeaderRecvBufLength=static_cast<TUint16>(headerLength);
-				}
-			if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength))
-				{
-				iBodyRecvBufLength=static_cast<TUint16>(bufLength);
-				}
-			iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength);
-			iRecvBody = HBufC8::NewL(iBodyRecvBufLength);
-			SetState(EConnect);
-			iControl->ReStart();
-			ShowConnectionInfo();						
-
-			StartScheduler();
-			delete iRecvBody;
-			iRecvBody=NULL;
-			delete iRecvHeaders;
-			iRecvHeaders=NULL;
-			UnloadInterface();
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CFullySpecWSPStep_7::CallStateMachine()
-	{
-	TVerdict verdict = EFail;
-	TInt err = KErrNone;
-	TInt activate = 0;
-	TDes8 headers = iRecvHeaders->Des();
-	TDes8 body = iRecvBody->Des();
-	
-	INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State());
-	switch(iState)
-		{
-		case EConnect:
-			INFO_PRINTF1(_L("EConnect"));
-			err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, EFalse);
-			INFO_PRINTF2(_L("Connection completed with code = %d"), err);
-			if( err == KErrNone)
-				{
-//				WaitForInitializeL();
-				TRequestStatus reqStatus;
-				iImp->MethodResult(headers, body, iTransactionIdPckg, iWspStatus, reqStatus, iTimeout);
-				iImp->MethodResult(headers, body, iTransactionIdPckg, iWspStatus, *iStatus, iTimeout);
-				INFO_PRINTF1(_L("MethodResult"));
-				activate = 1;
-				}
-			else
-				{
-				iControl->ReStart();
-				}
-			SetLastError(err);
-			SetState(EFinish);
-			break;
-			
-		case EFinish:
-			INFO_PRINTF1(_L("EFinish"));
-			if(iStatus->Int() != KErrNone) 
-				{
-				SetLastError(iStatus->Int());
-				}
-			verdict = (GetLastError() == GetExpectedError())?EPass:EFail;
-			SetTestStepResult(verdict);
-			SetState(EIdle);
-			StopScheduler();
-			break;
-			
-		case EIdle:
-		default:
-			INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State());
-			SetTestStepResult(verdict);
-			StopScheduler();
-			
-			break;
-		}
-	return (activate);
-	}
-
-CFullySpecWSPStep_8::CFullySpecWSPStep_8() 
-	{
-	}
-CFullySpecWSPStep_8::~CFullySpecWSPStep_8()  
-	{
-	}
-TVerdict CFullySpecWSPStep_8::doTestStepL()
-/*
-*	Using invalid values for API parameters:
-*	- Invalid TUid on construction
-*	- Invalid method for MethodInvoke
-*	- Invalid timeout for MethodResult
-*	Note: wrong bearer value has already been implemented as part of test 2
-*/
-	{
-	INFO_PRINTF1(_L("FullySpec-WSP: Wrong parameters testing"));
-	if(TestStepResult() == EPass )
-		{
-		TInt error;
-		if(GetIntFromConfig(ConfigSection(),KWapExError2, error))
-			{
-			iExError2=error;
-			}
-		TInt trapValue;
-		TUid invalidInterfaceUid = {0x00000000}; 	
-		INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), invalidInterfaceUid);
-		TRAP(trapValue, iImp = CWapFullySpecCLWSPService::NewL(invalidInterfaceUid));
-		TVerdict verdict = (trapValue == iExError2)?EPass:EFail;
-		if (verdict==EFail)
-			{
-			SetTestStepResult(EFail);
-			return TestStepResult();
-			}
-		else
-			{
-			INFO_PRINTF2(_L("CreateImplementation with wrong Uid- Failed as expected with error %d"),trapValue);
-			
-			// Now use the correct Uid
-			iImp = LoadInterface();
-			if(iImp)
-				{
-				SetLastError(KErrNone);
-				TInt error = KErrNone;
-				TInt method;
-				TPtrC headers;
-				TPtrC body;
-				TPtrC uri;
-				
-				if (GetIntFromConfig(ConfigSection(),KWapWSPMethod, method))
-					{
-					iMethod=method;
-					}
-				
-				if(GetIntFromConfig(ConfigSection(), KWapExError, error))
-					{
-					SetExpectedError(error);
-					}
-				
-				if(!GetStringFromConfig(ConfigSection(),KWapURI, uri) || \
-					!GetStringFromConfig(ConfigSection(),KWapWSPHeaders, headers) || \
-					!GetStringFromConfig(ConfigSection(),KWapWSPBody, body))
-					{
-					User::Leave(KErrNoMemory);
-					}
-				
-				iURI = HBufC16::NewL(uri.Length());
-				
-				iSendHeaders = HBufC8::NewL(headers.Length());
-				
-				iSendBody = HBufC8::NewL(body.Length());
-				
-				TPtr16 tmp16 = iURI->Des();
-				tmp16.Copy(uri);
-				TPtr8 tmp = iSendHeaders->Des();
-				tmp.Copy(headers);
-				TPtr8 tmp1 = iSendBody->Des();
-				tmp1.Copy(body);
-				
-				ShowConnectionInfo();						
-				error = iImp->Connect(iRemoteHost, iRemotePort, iBearer, EFalse);
-				INFO_PRINTF2(_L("Connection completed with code = %d"), error);
-				if( error == KErrNone)
-					{
-					error =iImp->MethodInvoke(iMethod, iURI->Des(), iSendHeaders->Des(), iSendBody->Des(), iTransactionId); 
-					}
-				TVerdict verdict = (error == GetExpectedError())?EPass:EFail;
-				SetTestStepResult(verdict);
-				delete iSendBody;
-				iSendBody=NULL;
-				delete iSendHeaders;
-				iSendHeaders=NULL;
-				delete iURI;
-				iURI=NULL;
-				UnloadInterface();
-				}
-			}
-		}
-	return TestStepResult();
-	}
-
-TInt CFullySpecWSPStep_8::CallStateMachine()
-	{
-	return (0);
-	}
-
-CFullySpecWSPStep_9::CFullySpecWSPStep_9() {}
-CFullySpecWSPStep_9::~CFullySpecWSPStep_9()  {}
-TVerdict CFullySpecWSPStep_9::doTestStepL()
-	{
-	return TestStepResult();
-	}
-
-TInt CFullySpecWSPStep_9::CallStateMachine()
-	{
-	return (0);
-	}

--- a/wapstack/wapmessageapi/te_wapstack/src/WapFullySpecWSPSteps.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/**
-* Copyright (c) 2002-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 WapFullySpecWSPSteps.h
-*/
-#if (!defined __FULLYSPECWSP_STEP_H__)
-#define __FULLYSPECWSP_STEP_H__
-#include <test/testexecutestepbase.h>
-#include <in_sock.h>
-#include <es_sock.h>
-#include <wapmessage.h>
-#include "WapStackSuiteStepBase.h"
-
-_LIT(KFullySpecWSPStep_1,"FullySpecWSP_1");
-_LIT(KFullySpecWSPStep_2,"FullySpecWSP_2");
-_LIT(KFullySpecWSPStep_3,"FullySpecWSP_3");
-_LIT(KFullySpecWSPStep_4,"FullySpecWSP_4");
-_LIT(KFullySpecWSPStep_5,"FullySpecWSP_5");
-_LIT(KFullySpecWSPStep_6,"FullySpecWSP_6");
-_LIT(KFullySpecWSPStep_7,"FullySpecWSP_7");
-_LIT(KFullySpecWSPStep_8,"FullySpecWSP_8");
-_LIT(KFullySpecWSPStep_9,"FullySpecWSP_9");
-
-class CFullySpecWSPStepBase : public CWapStackSuiteStepBase
-{
-public:
-	CFullySpecWSPStepBase();
-	~CFullySpecWSPStepBase();
-	CWapFullySpecCLWSPService* LoadInterface();
-	void UnloadInterface();
-protected:
-	CWapFullySpecCLWSPService* iImp;
-};
-
-
-class CFullySpecWSPStep_1 : public CFullySpecWSPStepBase
-	{
-public:
-	CFullySpecWSPStep_1();
-	~CFullySpecWSPStep_1();
-	virtual TVerdict doTestStepL();
-private:
-	};
-
-class CFullySpecWSPStep_2 : public CFullySpecWSPStepBase
-	{
-public:
-	CFullySpecWSPStep_2();
-	~CFullySpecWSPStep_2();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CFullySpecWSPStep_3: public CFullySpecWSPStepBase
-	{
-public:
-	CFullySpecWSPStep_3();
-	~CFullySpecWSPStep_3();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CFullySpecWSPStep_4: public CFullySpecWSPStepBase
-	{
-public:
-	CFullySpecWSPStep_4();
-	~CFullySpecWSPStep_4();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CFullySpecWSPStep_5: public CFullySpecWSPStepBase
-	{
-public:
-	CFullySpecWSPStep_5();
-	~CFullySpecWSPStep_5();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-class CFullySpecWSPStep_6: public CFullySpecWSPStepBase
-	{
-public:
-	CFullySpecWSPStep_6();
-	~CFullySpecWSPStep_6();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-class CFullySpecWSPStep_7: public CFullySpecWSPStepBase
-	{
-public:
-	CFullySpecWSPStep_7();
-	~CFullySpecWSPStep_7();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-class CFullySpecWSPStep_8: public CFullySpecWSPStepBase
-	{
-public:
-	CFullySpecWSPStep_8();
-	~CFullySpecWSPStep_8();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-class CFullySpecWSPStep_9: public CFullySpecWSPStepBase
-	{
-public:
-	CFullySpecWSPStep_9();
-	~CFullySpecWSPStep_9();
-	virtual TVerdict doTestStepL();
-	virtual TInt CallStateMachine();
-private:
-	};
-
-#endif

--- a/wapstack/wapmessageapi/te_wapstack/src/WapStackSuiteDefs.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-/**
-* Copyright (c) 2002-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 WapStackSuiteDefs.h
-*/
-
-#include <es_wsms.h>
-#include <wapmsgerr.h>
-
-// Although Publish and Subscribe replaces System Agent, 
-// the UIDs we need are still defined by System Agent
-#include <sacls.h>
-
-_LIT(KWapCommonSec, "COMMON");
-
-_LIT(KWapBearer,"Bearer");
-_LIT(KWapRemoteHost,"Remote_Host");
-_LIT(KWapRemotePort,"Remote_Port");
-_LIT(KWapLocalHost,"Local_Host");
-_LIT(KWapLocalPort,"Local_Port");
-_LIT(KLocalPort,"LocalPort");
-_LIT(KRemotePort,"RemotePort");
-_LIT(KWapExError, "ExError");
-_LIT(KWapExError2, "ExError2");
-_LIT(KWapReconnect, "Reconnect");
-_LIT(KWapSecure, "Secure");
-_LIT(KWapRepeat, "Repeat");
-_LIT(KWapData, "Data");
-_LIT(KWapDataType, "Type");
-_LIT(KWapUseSIMTSY, "SimTsy");
-_LIT(KWapDetailedLogging, "DetailedLogging");
-_LIT(KWapDelayPortClosure, "DelayPortClosure");
-_LIT(KWapSIMTSYState, "TsyState");
-_LIT(KWapTimeOut, "TimeOut");
-_LIT(KWapWdpBufLength, "WDPBufLength");
-_LIT(KAwaitLengthCancel, "AwaitLengthCancel");
-_LIT(KMiddleCancel, "MiddleCancel");
-_LIT(KMultiReadCancel, "MultiReadCancel");
-_LIT(KAwaitLengthTwice, "AwaitLengthTwice");
-// WSP 
-_LIT(KWapWSPMethod, "WSPMethod");
-_LIT(KWapWSPHeaders, "WSPHeaders");
-_LIT(KWapWSPBody, "WSPBody");
-_LIT(KWapURI, "WSPURI");
-_LIT(KWapWSPRecvHeaderLength, "WSPHeaderLength");
-_LIT(KWapWSPRecvBodyLength, "WSPBodyLength");
-
-_LIT(KWapWDPStackSuiteLogFile,"WapWDPLog");
-_LIT(KWapPushStackSuiteLogFile,"WapPushLog");
-_LIT(KWapWSPStackSuiteLogFile,"WapWSPLog");
-
-
-_LIT(KWapStartC32,"StartC32");
-
-// For test step panics
-_LIT(KWapStackSuitePanic,"WapStackSuite");
-enum TWapSuitePanicCodes{EDataCorrupt = 1};
-
-// Port for the echo server
-// Could be read from the ini file
-const TInt KEchoPort = 7;
-
-//////////////////////////////////////////////////////////////////////////////
-// Wap Address / Port Settings
-//////////////////////////////////////////////////////////////////////////////
-/*
-	EWapPortUnspecified = -1,  // Unspecified
-	EWapPortWsp         = 9200,  // Connectionless session protocol
-	EWapPortWspWtp      = 9201,  // Connection oriented session protocol
-	EWapPortWspWtls     = 9202,  // Secure connectionless session protocol
-	EWapPortWspWtpWtls  = 9203,  // Secure connection oriented session protocol
-	EWapPortVCard       = 9204,  // vCard
-	EWapPortVCardWtls   = 9206,  // Secure vCard
-	EWapPortVCal        = 9205,  // vCal
-	EWapPortVCalWtls    = 9207   // Secure vCal
-	};
-*/
-
-

--- a/wapstack/wapmessageapi/te_wapstack/src/WapStackSuiteServer.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,236 +0,0 @@
-// Copyright (c) 2002-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:
-// WAP stack test suite server
-// 
-//
-
-/**
- @file
- @internalComponent
-*/
-
-// Include your own server header file and step header file(s) here
-#include "WapStackSuiteServer.h"
-
-#include "WapBoundWDPSteps.h"
-#include "WapBoundCLPushSteps.h"
-#include "WapBoundWSPSteps.h"
-#include "WapFullySpecCLPushSteps.h"
-#include "WapFullySpecWDPSteps.h"
-#include "WapFullySpecWSPSteps.h"
-#include <ecom/ecom.h>
-
-_LIT(KServerName,"WapStackSuite");
-CWapStackSuite* CWapStackSuite::NewL()
-/**
- * @return - Instance of the test server
- * Same code for Secure and non-secure variants
- * Called inside the MainL() function to create and start the
- * CTestServer derived server.
- */
-	{
-	CWapStackSuite * server = new (ELeave) CWapStackSuite();
-	CleanupStack::PushL(server);
-	// CServer base class call
-	server->StartL(KServerName);
-	CleanupStack::Pop(server);
-	return server;
-	}
-
-
-
-LOCAL_C void MainL()
-	{
-#if (defined __DATA_CAGING__)
-	RProcess().DataCaging(RProcess::EDataCagingOn);
-	RProcess().SecureApi(RProcess::ESecureApiOn);
-#endif
-	CActiveScheduler* sched=NULL;
-	sched=new(ELeave) CActiveScheduler;
-	CActiveScheduler::Install(sched);
-	CWapStackSuite* server = NULL;
-	// Create the CTestServer derived server
-	TRAPD(err,server = CWapStackSuite::NewL());
-	if(!err)
-		{
-		// Sync with the client and enter the active scheduler
-		RProcess::Rendezvous(KErrNone);
-		sched->Start();
-		}
-	delete server;
-	delete sched;
-	}
-
-
-
-GLDEF_C TInt E32Main()
-/**
- * @return - Standard Epoc error code on process exit
- * Secure variant only
- * Process entry point. Called by client using RProcess API
- */
-	{
-	__UHEAP_MARK;
-	CTrapCleanup* cleanup = CTrapCleanup::New();
-	if(cleanup == NULL)
-		{
-		return KErrNoMemory;
-		}
-	TRAPD(err,MainL());
-	delete cleanup;
-	__UHEAP_MARKEND;
-	return err;
-    }
-
-CTestStep* CWapStackSuite::CreateTestStep(const TDesC& aStepName)
-/**
- * @return - A CTestStep derived instance
- * Secure and non-secure variants
- * Implementation of CTestServer pure virtual
- */
-	{
-	CTestStep* testStep = NULL;
-	// Creating your own test steps here
-	//*************************************
-	// BOUND connection tests
-	//*************************************
-
-	// Bound WDP steps [1 - 9]
-	if(aStepName == KBoundWDPStep_1) 
-		testStep = new CBoundWDPStep_1();
-	else if(aStepName == KBoundWDPStep_2) 
-		testStep = new CBoundWDPStep_2();
-	else if(aStepName == KBoundWDPStep_3) 
-		testStep = new CBoundWDPStep_3();
-	else if(aStepName == KBoundWDPStep_4) 
-		testStep = new CBoundWDPStep_4();
-	else if(aStepName == KBoundWDPStep_5) 
-		testStep = new CBoundWDPStep_5();
-	else if(aStepName == KBoundWDPStep_6) 
-		testStep = new CBoundWDPStep_6();
-	else if(aStepName == KBoundWDPStep_7) 
-		testStep = new CBoundWDPStep_7();
-	else if(aStepName == KBoundWDPStep_8) 
-		testStep = new CBoundWDPStep_8();
-	else if(aStepName == KBoundWDPStep_9) 
-		testStep = new CBoundWDPStep_9();
-	else if(aStepName == KBoundWDPStep_OutOfMemory) 
-		testStep = new CBoundWDPStep_OutOfMemory();
-
-	// Bound Push tests [1 - 9]
-	else if(aStepName == KBoundCLPushStep_1) 
-		testStep = new CBoundCLPushStep_1();
-	else if(aStepName == KBoundCLPushStep_2) 
-		testStep = new CBoundCLPushStep_2();
-	else if(aStepName == KBoundCLPushStep_3) 
-		testStep = new CBoundCLPushStep_3();
-	else if(aStepName == KBoundCLPushStep_4) 
-		testStep = new CBoundCLPushStep_4();
-	else if(aStepName == KBoundCLPushStep_5) 
-		testStep = new CBoundCLPushStep_5();
-	else if(aStepName == KBoundCLPushStep_6) 
-		testStep = new CBoundCLPushStep_6();
-	else if(aStepName == KBoundCLPushStep_7) 
-		testStep = new CBoundCLPushStep_7();
-	else if(aStepName == KBoundCLPushStep_8) 
-		testStep = new CBoundCLPushStep_8();
-	else if(aStepName == KBoundCLPushStep_9) 
-		testStep = new CBoundCLPushStep_9();
-	
-	// Bound WSP tests [1 - 9]
-	else if(aStepName == KBoundWSPStep_1) 
-		testStep = new CBoundWSPStep_1();
-	else if(aStepName == KBoundWSPStep_2) 
-		testStep = new CBoundWSPStep_2();
-	else if(aStepName == KBoundWSPStep_3) 
-		testStep = new CBoundWSPStep_3();
-	else if(aStepName == KBoundWSPStep_4) 
-		testStep = new CBoundWSPStep_4();
-	else if(aStepName == KBoundWSPStep_5) 
-		testStep = new CBoundWSPStep_5();
-	else if(aStepName == KBoundWSPStep_6) 
-		testStep = new CBoundWSPStep_6();
-	else if(aStepName == KBoundWSPStep_7) 
-		testStep = new CBoundWSPStep_7();
-	else if(aStepName == KBoundWSPStep_8) 
-		testStep = new CBoundWSPStep_8();
-	else if(aStepName == KBoundWSPStep_9) 
-		testStep = new CBoundWSPStep_9();
-
-	//*************************************
-	// FULLY SPECIFIED connection tests
-	//*************************************
-
-	// Fully spec. WDP [1 - 9
-	else if(aStepName == KFullySpecWDPStep_1) 
-		testStep = new CFullySpecWDPStep_1();
-	else if(aStepName == KFullySpecWDPStep_2) 
-		testStep = new CFullySpecWDPStep_2();
-	else if(aStepName == KFullySpecWDPStep_3) 
-		testStep = new CFullySpecWDPStep_3();
-	else if(aStepName == KFullySpecWDPStep_4) 
-		testStep = new CFullySpecWDPStep_4();
-	else if(aStepName == KFullySpecWDPStep_5) 
-		testStep = new CFullySpecWDPStep_5();
-	else if(aStepName == KFullySpecWDPStep_6) 
-		testStep = new CFullySpecWDPStep_6();
-	else if(aStepName == KFullySpecWDPStep_7) 
-		testStep = new CFullySpecWDPStep_7();
-	else if(aStepName == KFullySpecWDPStep_8) 
-		testStep = new CFullySpecWDPStep_8();
-	else if(aStepName == KFullySpecWDPStep_9) 
-		testStep = new CFullySpecWDPStep_9();
-	
-	// Fully spec. Push [1 - 9]
-	else if(aStepName == KFullySpecCLPushStep_1) 
-		testStep = new CFullySpecCLPushStep_1();
-	else if(aStepName == KFullySpecCLPushStep_2) 
-		testStep = new CFullySpecCLPushStep_2();
-	else if(aStepName == KFullySpecCLPushStep_3) 
-		testStep = new CFullySpecCLPushStep_3();
-	else if(aStepName == KFullySpecCLPushStep_4) 
-		testStep = new CFullySpecCLPushStep_4();
-	else if(aStepName == KFullySpecCLPushStep_5) 
-		testStep = new CFullySpecCLPushStep_5();
-	else if(aStepName == KFullySpecCLPushStep_6) 
-		testStep = new CFullySpecCLPushStep_6();
-	else if(aStepName == KFullySpecCLPushStep_7) 
-		testStep = new CFullySpecCLPushStep_7();
-	else if(aStepName == KFullySpecCLPushStep_8) 
-		testStep = new CFullySpecCLPushStep_8();
-	else if(aStepName == KFullySpecCLPushStep_9) 
-		testStep = new CFullySpecCLPushStep_9();
-
-	// Fully spec. WSP [1 - 9]
-	else if(aStepName == KFullySpecWSPStep_1) 
-		testStep = new CFullySpecWSPStep_1();
-	else if(aStepName == KFullySpecWSPStep_2) 
-		testStep = new CFullySpecWSPStep_2();
-	else if(aStepName == KFullySpecWSPStep_3) 
-		testStep = new CFullySpecWSPStep_3();
-	else if(aStepName == KFullySpecWSPStep_4) 
-		testStep = new CFullySpecWSPStep_4();
-	else if(aStepName == KFullySpecWSPStep_5) 
-		testStep = new CFullySpecWSPStep_5();
-	else if(aStepName == KFullySpecWSPStep_6) 
-		testStep = new CFullySpecWSPStep_6();
-	else if(aStepName == KFullySpecWSPStep_7)
-		testStep = new CFullySpecWSPStep_7();
-	else if(aStepName == KFullySpecWSPStep_8) 
-		testStep = new CFullySpecWSPStep_8();
-	else if(aStepName == KFullySpecWSPStep_9) 
-		testStep = new CFullySpecWSPStep_9();
-
-	return testStep;
-	}

--- a/wapstack/wapmessageapi/te_wapstack/src/WapStackSuiteServer.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/**
-* Copyright (c) 2002-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 WapStackSuiteServer.h
-*/
-
-#if (!defined __WAPSTACK_SUITE_SERVER_H__)
-#define __WAPSTACK_SUITE_SERVER_H__
-#include <test/testexecuteserverbase.h>
-
-class CWapStackSuite : public CTestServer
-	{
-public:
-	IMPORT_C TInt NewServer();
-	static CWapStackSuite* NewL();
-	// Base class pure virtual override
-	virtual CTestStep* CreateTestStep(const TDesC& aStepName);
-private:
-	};
-
-#endif

--- a/wapstack/wapmessageapi/te_wapstack/src/WapStackSuiteStepBase.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,410 +0,0 @@
-// Copyright (c) 2002-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
-*/
-
-#include <c32comm.h>
-#include <etel.h>
-#include <wapmessage.h>
-#include <simtsy.h>
-#include "WapStackSuiteDefs.h"
-#include "WapStackSuiteStepBase.h"
-
-CWapStackSuiteStepBase::CWapStackSuiteStepBase() : iLenBuffer(0), iLength(iLenBuffer), iRecvBuf(0,0), iRecvHeadersBuf(0,0), iRecvBodyBuf(0,0)
-	{
-	SetTestStepName(KWapWDPStackSuiteLogFile);
-	iSendBuffPtr = NULL;
-	iRecvBuffPtr = NULL;
-	iRecvHeaders = NULL; 
-	iRecvBody = NULL;
-	iURI = NULL;
-	iSendHeaders = NULL;
-	iSendBody = NULL;
-	}
-
-CWapStackSuiteStepBase::~CWapStackSuiteStepBase()
-	{
-	if(iSendBuffPtr) delete iSendBuffPtr;
-	if(iRecvBuffPtr) delete iRecvBuffPtr;
-	if(iRecvHeaders) delete iRecvHeaders;
-	if(iRecvBody) delete iRecvBody;
-	if(iURI) delete iURI;
-	if(iSendHeaders) delete iSendHeaders;
-	if(iSendBody) delete iSendBody;
-	}
-
-TVerdict CWapStackSuiteStepBase::doTestStepPreambleL()
-/**
-* @return - TVerdict
-* Implementation of CTestStep base class virtual
-* Load serial drivers
-* Do all initialisation common to derived classes in here.
-*/
-	{
-	__UHEAP_MARK;
-	TInt err = KErrNone;
-	CActiveScheduler* sheduler;
-	sheduler = new(ELeave) CActiveScheduler;
-	CActiveScheduler::Install(sheduler);
-	SetScheduler(sheduler);
-
-	iControl = CActiveControl::NewL(this);
-	sheduler->Add(iControl);
-	iStatus = iControl->Status();
-
-
-	err=User::LoadPhysicalDevice(PDD_NAME);
-    if (err!=KErrNone && err!=KErrAlreadyExists) User::Leave(err);
-
-    err=User::LoadLogicalDevice(LDD_NAME );
-    if (err!=KErrNone && err!=KErrAlreadyExists) User::Leave(err);
-
-	TBool startC32 = ETrue;
-	GetBoolFromConfig(ConfigSection(),KWapStartC32, startC32);
-	if(startC32)
-	{
-		_LIT(KPhbkSyncCMI, "phbsync.cmi");
-		err = StartC32WithCMISuppressions(KPhbkSyncCMI);
-		ERR_PRINTF2(TRefByValue<const TDesC>(_L("Start Comms Process Status = %d\n")), err);
-		if(err!=KErrNone && err!=KErrAlreadyExists)
-		    {
-		    User::Leave(err);
-			}
-	    }
-
-	LoadConfig();
-
-    SetTestStepResult(EPass);
-	return TestStepResult();
-	}
-
-TVerdict CWapStackSuiteStepBase::doTestStepPostambleL()
-	{
-
-	delete iControl;
-	iControl = NULL;
-	delete Scheduler();
-	if(iSendBuffPtr) delete iSendBuffPtr;
-	iSendBuffPtr = NULL;
-	if(iRecvBuffPtr) delete iRecvBuffPtr;
-	iRecvBuffPtr = NULL;
-	__UHEAP_MARKEND;
-	return TestStepResult();
-	}
-
-void CWapStackSuiteStepBase::LoadConfig()
-	{
-	TPtrC16 remote_host, local_host;
-
-	GetIntFromConfig(KWapCommonSec, KWapBearer, (TInt&)iBearer);
-	if(GetStringFromConfig(KWapCommonSec, KWapRemoteHost, remote_host))
-		{
-		iRemoteHost.Copy(remote_host);
-		}
-	if(GetStringFromConfig(KWapCommonSec, KWapLocalHost, local_host))
-		{
-		iLocalHost.Copy(local_host);
-		}
-	TInt remote, local, timeOut;
-	if(GetIntFromConfig(KWapCommonSec, KWapRemotePort, remote))
-		{
-		iRemotePort = static_cast<Wap::TPort>(remote);
-		}
-	if(GetIntFromConfig(KWapCommonSec, KWapLocalPort, local))
-		{
-		iLocalPort = static_cast<Wap::TPort>(local);
-		}
-	if(GetIntFromConfig(KWapCommonSec,KWapTimeOut, timeOut))
-		{
-		iTimeout=timeOut;
-		}
-	TInt headerLength, bufLength, bufLen, method; 
-	if(GetIntFromConfig(KWapCommonSec,KWapWSPRecvHeaderLength, headerLength))
-		{
-		iHeaderRecvBufLength=static_cast<TUint16>(headerLength);
-		}
-	if(GetIntFromConfig(KWapCommonSec,KWapWSPRecvBodyLength, bufLength))
-		{
-		iBodyRecvBufLength=static_cast<TUint16>(bufLength);
-		}
-	if(GetIntFromConfig(KWapCommonSec,KWapWdpBufLength, bufLen))
-		{
-		iWdpRecvBufLength=static_cast<TUint16>(bufLen);
-		}
-	if(GetIntFromConfig(KWapCommonSec,KWapWSPMethod, method))
-		{
-		iMethod = static_cast<TUint16>(method);
-		}
-	else
-		{
-		iMethod = 64; // default method GET
-		}
-	GetIntFromConfig(KWapCommonSec, KWapExError, iExError);
-	if(!GetIntFromConfig(KWapCommonSec, KWapRepeat, iRepeat))
-		{
-		iRepeat = 1;
-		};
-
-	GetIntFromConfig(KWapCommonSec, KWapExError2, iExError2);
-	GetBoolFromConfig(KWapCommonSec, KWapUseSIMTSY, iUseSIMTSY);
-	GetBoolFromConfig(KWapCommonSec, KWapDetailedLogging, iDetailedLogging);
-	GetBoolFromConfig(KWapCommonSec, KAwaitLengthCancel, iAwaitLengthCancel);
-	GetBoolFromConfig(KWapCommonSec, KMiddleCancel, iMiddleCancel);
-	GetBoolFromConfig(KWapCommonSec, KMultiReadCancel, iMultiReadCancel);
-	GetBoolFromConfig(KWapCommonSec, KAwaitLengthTwice, iAwaitLengthTwice);
-	GetBoolFromConfig(KWapCommonSec, KWapDelayPortClosure, iDelayPortClosure);
-	GetIntFromConfig(KWapCommonSec,KWapSIMTSYState, iSimTsyState);
-	
-	TInt result;
-	// if using SIMTSY, we need to define the test number property
-	// since we set the test number before loading SIMTSY
-	if (iUseSIMTSY)
-		{
-		result = RProperty::Define(KUidPSSimTsyCategory, KPSSimTsyTestNumber, RProperty::EInt);
-		__ASSERT_ALWAYS(result == KErrNone || result == KErrAlreadyExists,User::Panic(KWapStackSuitePanic, EDataCorrupt));
-		}
-
-	// Phone power property, normally defined by UIKON, is not defined by any
-	// startup code in console builds - we're on our own with this one.
-	result = RProperty::Define(KUidSystemCategory, KUidPhonePwr.iUid, RProperty::EInt);
-	__ASSERT_ALWAYS(result == KErrNone || result == KErrAlreadyExists,User::Panic(KWapStackSuitePanic, EDataCorrupt));
-
-	}
-
-TInt CWapStackSuiteStepBase::CallStateMachine()
-	{
-	return (0);
-	}
-
-void CWapStackSuiteStepBase::StartScheduler()
-	{
-	INFO_PRINTF1(_L("Star Scheduler"));
-	CActiveScheduler::Start();
-	}
-
-void CWapStackSuiteStepBase::StopScheduler()
-	{
-	INFO_PRINTF1(_L("Stop Scheduler"));
-	CActiveScheduler::Stop();
-	}
-
-void CWapStackSuiteStepBase::WaitForInitializeL()
-	{
-	_LIT(KMMTSY,"MM");
-	_LIT(KSIMTSY,"SIM");
-
-	TName tsy;
-	
-	if(UseSimTsy())
-		{
-		tsy=KSIMTSY;
-		}
-	else
-		{
-		tsy = KMMTSY;
-		}
-
-	RTelServer serverT;
-	User::LeaveIfError(serverT.Connect());
-	CleanupClosePushL(serverT);
-	User::LeaveIfError(serverT.LoadPhoneModule(tsy));
-	INFO_PRINTF2(_L("%S TSY loaded"), &tsy);
-
-	// Find the phone corresponding to this TSY and open a number of handles on it
-	TInt numPhones;
-	User::LeaveIfError(serverT.EnumeratePhones(numPhones));
-	RPhone phone;
-	while (numPhones--)
-		{
-		TName phoneTsy;
-		User::LeaveIfError(serverT.GetTsyName(numPhones,phoneTsy));
-		if (phoneTsy.CompareF(tsy)==KErrNone)
-			{
-			RTelServer::TPhoneInfo info;
-			User::LeaveIfError(serverT.GetPhoneInfo(numPhones,info));
-			User::LeaveIfError(phone.Open(serverT,info.iName));
-			CleanupClosePushL(phone);
-			const TInt err = phone.Initialise();
-			User::LeaveIfError(err);
-			CleanupStack::PopAndDestroy(&phone);
-			break;
-			}
-		}
-	CleanupStack::PopAndDestroy(&serverT);
-	}
-
-void CWapStackSuiteStepBase::DumpBuf(const TDesC8& aBuf)
-	{
-	if(!DetailedLogging()) return;
-	TBuf16<100> dumpbuf;
-	TInt totLen = aBuf.Length();
-
-	INFO_PRINTF1(_L("-------------------------------------------------------------------------"));
-	INFO_PRINTF2(_L("Buffer: %d bytes"), totLen);
-	INFO_PRINTF1(_L("-------------------------------------------------------------------------"));
-
-	for (TInt i = 0; i < totLen; i += 16)
-		{
-		dumpbuf.FillZ(100);
-		dumpbuf.Zero();
-		dumpbuf.AppendFormat(_L("%04x  "),i);
-		TInt j = 0;
-		TInt thisRow = Min(16,totLen - j - i);
-		for (j = 0; j < 16; j++)
-			{
-			if (j < thisRow)
-				{
-				TText8 chr = aBuf[i + j];
-				dumpbuf.AppendFormat(_L("%02x "),chr);
-				}
-			else
-				dumpbuf.AppendFormat(_L("   "));
-			}
-		dumpbuf.AppendFormat(_L("   "));
-		for (j = 0; j < thisRow; j++)
-			{
-			TText8 chr = aBuf[i + j];
-			TChar c(chr);
-			if (!c.IsPrint())
-				{
-					chr='.';
-				}
-			// NOTE: "<" & ">" are HTML tags (change to "[" & "]")
-			if((chr == '<') || (chr == '>'))
-				{ 
-				chr+=31;
-				}
-				dumpbuf.AppendFormat(_L("%c"),chr);
-			}
-		INFO_PRINTF2(_L("%s"), dumpbuf.Ptr());
-		}
-	INFO_PRINTF1(_L("-------------------------------------------------------------------------"));
-	}
-
-void CWapStackSuiteStepBase::ShowConnectionInfo()
-{
-	if(!DetailedLogging()) return;
-
-	TBuf16<WAP_MAX_HOST_NAME> host;
-	TBuf16<100> infostr;
-
-	INFO_PRINTF1(_L("-------------------------------------------------------------------------"));
-	INFO_PRINTF1(_L("Connection Info:"));
-	INFO_PRINTF1(_L("-------------------------------------------------------------------------"));
-
-	infostr.FillZ(100);
-	switch(iBearer)
-	{
-	case Wap::EAll: infostr.Copy(_L("EAll"));
-		break;
-	case Wap::EIP: infostr.Copy(_L("EIP"));
-		break;
-	case Wap::ESMS7: infostr.Copy(_L("ESMS7"));
-		break;
-	case Wap::ESMS: infostr.Copy(_L("ESMS"));
-		break;
-	case Wap::EWAPSMS7: infostr.Copy(_L("EWAPSMS7"));
-		break;
-	case Wap::EWAPSMS: infostr.Copy(_L("EWAPSMS"));
-		break;
-	default:
-		break;
-	}
-
-	INFO_PRINTF2(_L("Bearer      : %s"), infostr.Ptr());
-	host.FillZ(WAP_MAX_HOST_NAME);
-	host.Copy(iRemoteHost);
-	INFO_PRINTF2(_L("Remote Host : %s"), host.Ptr());
-	INFO_PRINTF2(_L("Remote Port : %d"),iRemotePort);
-	host.FillZ(100);
-	host.Copy(iLocalHost);
-	INFO_PRINTF2(_L("Local Host  : %s"), host.Ptr());
-	INFO_PRINTF2(_L("Local Port  : %d"), iLocalPort);
-	infostr.FillZ(100);
-	switch(iSecure)
-	{
-	case ETrue: infostr.Copy(_L("TRUE"));
-		break;
-	case EFalse: infostr.Copy(_L("FALSE"));
-		break;
-	default:
-		break;
-	}
-	INFO_PRINTF2(_L("Secure      : %s"), infostr.Ptr());
-	infostr.FillZ(100);
-	switch(iReconnect)
-	{
-	case ETrue: infostr.Copy(_L("TRUE"));
-		break;
-	case EFalse: infostr.Copy(_L("FALSE"));
-		break;
-	default:
-		break;
-	}
-	INFO_PRINTF2(_L("Timeout     : %d"), iTimeout);
-	INFO_PRINTF2(_L("Reconnect   : %s"), infostr.Ptr());
-	INFO_PRINTF2(_L("ExitCode    : %d"), iExError);
-	INFO_PRINTF2(_L("Repeat      : %d"), iRepeat);
-
-	INFO_PRINTF1(_L("-------------------------------------------------------------------------"));
-}
-
-/**
-	Active controller
-*/
-CActiveControl* CActiveControl::NewL(MControlNotify* aControl)
-	{
-	CActiveControl* self = new(ELeave) CActiveControl(aControl);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop();
-	return self;
-	}
-
-void CActiveControl::ConstructL()
-	{
-	}
-
-CActiveControl::CActiveControl(MControlNotify* aControl)
-: CActive(EPriorityStandard)
-	{
-	iControl = aControl;
-	}
-
-CActiveControl::~CActiveControl()
-	{
-	}
-
-void CActiveControl::ReStart()
-	{
-	TRequestStatus* status = &iStatus;
-	SetActive();
-	User::RequestComplete(status, KErrNone);
-	}
-
-void CActiveControl::RunL()
-	{
-	if(iControl->CallStateMachine())
-		{
-			SetActive();
-		}
-	}
-
-void CActiveControl::DoCancel()
-	{
-	}

--- a/wapstack/wapmessageapi/te_wapstack/src/WapStackSuiteStepBase.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-/**
-* Copyright (c) 2002-2010 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 WapStackSuiteStepBase.h
-*/
-
-#if (!defined __WAPSTACK_SUITE_STEP_BASE__)
-#define __WAPSTACK_SUITE_STEP_BASE__
-#include <test/testexecutestepbase.h>
-#include <es_wsms.h>
-
-#define WAP_MAX_HOST_NAME 128
-
-#if defined (__WINS__)
-#define PDD_NAME _L("ECDRV")
-#define PDD_NAME2 _L("ECDRV")
-#define LDD_NAME _L("ECOMM")
-#else
-#define PDD_NAME _L("EUART1")
-#define LDD_NAME _L("ECOMM")
-#endif
-
-typedef enum
-	{
-	EIdle,
-	EConnect,
-	ESend,
-	EAwaitSize,
-	EReceive,
-	EMutipleReceive,
-	EAwaitPush,
-	EUnitInvoke,
-	EUnitResult,
-	EFinish,
-	EAbortTest
-	} TWapStep;
-const TUint KMaxWapWdpPduBufferLength=1080;
-const TUint KMaxWapWspHeaderBufferLength=256;
-const TUint KMaxWapWspDataBufferLength=1080;
-class MControlNotify
-{
-public:
-	virtual TInt CallStateMachine() = 0;
-};
-
-class CActiveControl : public CActive
-{
-public:
-	static CActiveControl* NewL(MControlNotify* aControl);
-	CActiveControl(MControlNotify* aControl);
-	~CActiveControl();
-	void ConstructL();
-	virtual void RunL();
-	virtual void DoCancel();
-	virtual void ReStart();
-	inline TRequestStatus* Status() {return &iStatus;}
-public:
-	MControlNotify* iControl;
-};
-
-class CWapStackSuiteStepBase : public CTestStep, public MControlNotify
-	{
-public:
-	CWapStackSuiteStepBase();
-	virtual ~CWapStackSuiteStepBase();
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepPostambleL();
-	virtual TInt CallStateMachine();
-	void StartScheduler();
-	void StopScheduler();
-	void WaitForInitializeL();
-	inline void SetScheduler(CActiveScheduler* aScheduler) {iScheduler = aScheduler;}
-	inline CActiveScheduler* Scheduler() {return iScheduler;}
-	inline void SetState(TWapStep aState) { iState = aState; }
-	inline TWapStep State() { return iState; }
-	inline void SetLastError(TInt aError) { iLastError = aError; }
-	inline TInt GetLastError() { return iLastError; }
-	inline void SetExpectedError(TInt aError) {iExError = aError; }
-	inline TInt GetExpectedError() { return iExError; }
-	inline TBool UseSimTsy() { return iUseSIMTSY; }
-	inline TBool DetailedLogging() { return iDetailedLogging; }
-	void LoadConfig();
-	void DumpBuf(const TDesC8& aBuf);
-	void ShowConnectionInfo();
-protected:
-	CActiveControl* iControl;
-	TWapStep iState;
-	TRequestStatus* iStatus;
-
-	//Predefined value in .ini file
-	TInt iExError;
-	TInt iExError2;
-	TInt iRepeat;
-	TUint32 iTimeout;
-	TBool iSecure;
-	TBool iReconnect;
-	TBool iUseSIMTSY;
-	TBool iAwaitLengthCancel;
-	TBool iMiddleCancel;
-	TBool iMultiReadCancel;
-	TBool iAwaitLengthTwice;
-	TBool iDetailedLogging;
-	TBool iDelayPortClosure;
-	TInt iSimTsyState;
-	TUint16 iWdpRecvBufLength;
-	TUint16 iHeaderRecvBufLength;
-	TUint16 iBodyRecvBufLength;
-	Wap::TBearer iBearer;
-	Wap::TPort iLocalPort;
-	Wap::TPort iRemotePort;
-	TBuf8<WAP_MAX_HOST_NAME> iRemoteHost;
-	TBuf8<WAP_MAX_HOST_NAME> iLocalHost;
-	TInetAddr iRemoteAddr;
-	TInetAddr iLocalAddr;
-	TInt iRmtPort;
-	TInt iLclPort;	
-	//For WDP sending and receiving
-	HBufC8* iSendBuffPtr;
-	HBufC8* iRecvBuffPtr;
-	TUint16 iLenBuffer;
-	TPckg<TUint16> iLength;
-	TPtr8 iRecvBuf;
-	TBool iTruncated;
-	Wap::TPort iRecvRemotePort;
-	TBuf8<WAP_MAX_HOST_NAME> iRecvRemoteHost;
-	TBuf8<KMaxWapWdpPduBufferLength> iMaxWdpRecvBuffer;
-
-
-	//For both WSP Sending;
-	TUint8 iTransactionId;
-	TUint iMethod;
-	HBufC16* iURI;
-	HBufC8* iSendHeaders;
-	HBufC8* iSendBody;
-
-	//For WSP Receiving and Push
-	TPckgBuf<TUint8> iTransactionIdPckg;
-	TWSPStatus iWspStatus;
-	HBufC8* iRecvHeaders;
-	HBufC8* iRecvBody;
-	TPtr8 iRecvHeadersBuf;
-	TPtr8 iRecvBodyBuf;
-	TBuf8<KMaxWapWspHeaderBufferLength> iMaxWspHeaderRecvBuffer;
-	TBuf8<KMaxWapWspDataBufferLength> iMaxWspDataRecvBuffer;
-private:
-	CActiveScheduler* iScheduler;
-	TInt iLastError;
-	};
-
-#endif

--- a/wapstack/wapmessageapi/te_wapstack/testdata/UDPPush.ini	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-[COMMON]
-Bearer=3
-Remote_Host=127.0.0.1
-Local_Host= 127.0.0.1
-Remote_Port=2948
-Local_Port=2948
-TimeOut=0
-ExError=0
-ExError2=0
-SimTsy=false
-TsyState=411
-WSPHeaderLength=50
-WSPBodyLength=50
-WDPBufLength=30
-AwaitLengthCancel=false
-MiddleCancel=false
-MultiReadCancel=false
-AwaitLengthTwice=false
-DetailedLogging=true
-Secure=0
-WSPMethod=1
-WSPHeaders=GET:
-WSPBody=EMPTY-001-002-003-004-005-006-007-END
-WSPURI=http://wap.wapgateway.com
-
-
-[Test_1]
-Bearer=1
-Remote_Port=2949
-Local_Port=2948
-Remote_Host=127.0.0.1
-Local_Host= 127.0.0.1
-StartC32=true
-
-[Test_2]
-Bearer=2
-RemotePort=2948
-LocalPort=2949
-Remote_Host=127.0.0.1
-Local_Host= 127.0.0.1
-StartC32=false
-//a size of PDU to be sent that fits into the allocated buffer on the receiving end
-Data_Size=80
-
-
-[Test_3]
-Bearer=1
-Remote_Port=2949
-Local_Port=2948
-Remote_Host=127.0.0.1
-Local_Host= 127.0.0.1
-StartC32=true
-
-[Test_4]
-Bearer=2
-RemotePort=2948
-LocalPort=2949
-Remote_Host=127.0.0.1
-Local_Host= 127.0.0.1
-StartC32=false
-//a size of PDU to be sent that doesn't fit into the allocated buffer on the receiving end - needs reallocation
-Data_Size=1080
-
-//Remote_Host=10.32.194.36
-//Local_Host=10.32.194.36
-//Remote_Host=127.0.0.1
-//Local_Host= 127.0.0.1
-//Remote_Host=10.32.194.75
-//Local_Host=10.32.194.75

--- a/wapstack/wapmessageapi/te_wapstack/testdata/WSP.ini	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-[COMMON]
-Bearer=1
-Remote_Host=10.32.194.45
-//Remote_Host=10.32.194.45
-//Remote_Host=192.168.20.11
-Local_Host=10.32.194.45
-Remote_Port=9200
-Local_Port=9200
-Secure=0
-Repeat=1
-TimeOut=0
-ExError=0
-ExError2=0
-SimTsy=false
-TsyState=411
-AwaitLengthCancel=false
-MiddleCancel=false
-MultiReadCancel=false
-AwaitLengthTwice=false
-WSPHeaderLength=50
-WSPBodyLength=50
-WDPBufLength=30
-WSPMethod=64
-
-[Test_9.1]
-Repeat=2
-WSPURI=http://10.35.2.4/wap/wstiot/welcome.wml
-//WSPHeaders=Accept-Language: English
-
-[Test_9.2]
-WSPURI=http://10.35.2.4/wap/wstiot/welcome.wml
-WSPHeaders=my1:125, my2:abcdefghijklmnopqrstuvxuz, m:y
-
-[Test_9.3]
-WSPURI=http://10.35.2.4:80/wap/wstiot/size1k.txt
-WSPHeaders=125:125
-
-[Test_9.4]
-WSPURI=http://10.35.2.4:80/wap/wstiot/small.wml
-WSPHeaders=Cat sat on the mat:125
-
-[Test_9.5]
-WSPURI=http://10.35.2.4/wap/wstiot/large.wml
-WSPHeaders=A=10:125
-
-[Test_9.6]
-WSPURI=http://10.35.2.4:80/wap/wstiot/large.wml
-WSPHeaders=Accept-Language:
-
-[Test_9.7]
-WSPURI=http://10.35.2.4:80/wap/wstiot/large.wml
-WSPHeaders=WAP:125
-
-[Test_9.8]
-WSPURI=http://10.35.2.4/wap/wstiot/large.wml
-WSPHeaders=::;
-
-[Test_9.9]
-WSPURI=http://10.35.2.4/wap/wstiot/welcome.wml
-WSPHeaders=Test-Case:CLIENT
-
-[Test_9.10]
-WSPURI=http://10.35.2.4/wap/wstiot/welcome.wml
-WSPHeaders=http://10.35.2.4/wap/wstiot/welcome.wml
-
-[Test_9.11]
-WSPMethod=66
-WSPURI=http://10.35.2.4/wap/wstiot/
-WSPHeaders=Accept-Language: English
-
-[Test_9.12]
-WSPURI=http://10.35.2.4:80/wap/wstiot/large.wml
-WSPHeaders=User-Agent:symbianAgentNameLongStringOne1234567890qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNMLongStringTwo1234567890qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNMLongStringThree1234567890qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM
-
-[Test_9.13]
-WSPMethod=96
-WSPURI=http://10.35.2.4/perl/dumpform.pl
-WSPHeaders=Accept-Language: English
-WSPBody=WSPTESTWSPTEST
-
-[Test_9.14]
-WSPMethod=97
-WSPURI=http://10.35.2.4/upload/tao.txt
-WSPHeaders=Accept-Language: English
-WSPBody=Tao Te Ching: An English-Language Interpolation 1. The Way The Way that can be experienced is not true; The world that can be constructed is not real. The Way manifests all that happens and may happen; The world represents all that exists and may exist. To experience without abstraction is to sense the world; To experience with abstraction is to know the world. These two experiences are indistinguishable; Their construction differs but their effect is the same. Beyond the gate of experience flows the Way, Which is ever greater and more subtle than the world. 2. Abstraction When beauty is abstracted Then ugliness has been implied; When good is abstracted Then evil has been implied. So alive and dead are abstracted from nature, Difficult and easy abstracted from progress, Long and short abstracted from contrast, High and low abstracted from depth, Song and speech abstracted from melody, After and before abstracted from sequence. The sage experiences without abstraction, And accomplishes without action; He accepts the ebb and flow of things, Nurtures them, but does not own them, And lives, but does not dwell. 3. Without Action Not praising the worthy prevents contention, Not esteeming the valuable prevents theft, Not displaying the beautiful prevents desire. In this manner the sage governs people: Emptying their minds, Filling their bellies, Weakening their ambitions, And strengthening their bones. If people lack knowledge and desire Then they can not act; If no action is taken Harmony remains. 4. Limitless The Way is a limitless vessel; Used by the self, it is not filled by the world; It cannot be cut, knotted, dimmed or stilled; Its depths are hidden, ubiquitous and eternal; I don't know where it comes from; It comes before nature. 5. Nature Nature is not kind; It treats all things impartially. The Sage is not kind, And treats all people impartially. Nature is like a bellows, Empty, yet never ceasing its supply. The more it moves, the more it yields; So the sage draws upon experience And cannot be exhausted. 6. Experience Experience is a riverbed,  Its source hidden, forever flowing: Its entrance, the root of the world, The Way moves within it: Draw upon it; it will not run dry. 7. Complete Nature is complete because it does not serve itself. The sage places himself after and finds himself before, Ignores his desire and finds himself content. He is complete because he does not serve himself. 8. Water The best of man is like water, Which benefits all things, and does not contend with them, Which flows in places that others disdain, Where it is in harmony with the Way. So the sage: Lives within nature, Thinks within the deep, Gives within impartiality, Speaks within trust, Governs within order, Crafts within ability, Acts within opportunity. He does not contend, and none contend against him. 9. Retire Fill a cup to its brim and it is easily spilled; Temper a sword to its hardest and it is easily broken; Amass the greatest treasure and it is easily stolen; Claim credit and honour and you easily fall; Retire once your purpose is achieved - this is natural. 10. Harmony Embracing the Way, you become embraced; Breathing gently, you become newborn; Clearing your mind, you become clear; Nurturing your children, you become impartial; Opening your heart, you become accepted; Accepting the world, you embrace the Way. Bearing and nurturing, Creating but not owning, Giving without demanding, This is harmony. 11. Tools Thirty spokes meet at a nave; because of the hole we may use the wheel. Clay is moulded into a vessel; Because of the hollow we may use the cup. Walls are built around a hearth; Because of the doors we may use the house. Thus tools come from what exists, But use from what does not. 12. Substance Too much colour blinds the eye, Too much music deafens the ear, Too much taste dulls the palate, Too much play maddens the mind, Too much desire tears the heart. In this manner the sage cares for people: He provides for the belly, not for the senses; He ignores abstraction and holds fast to substance. 13. Self Both praise and blame cause concern, For they bring people hope and fear. The object of hope and fear is the self - For, without self, to whom may fortune and disaster occur? Therefore, Who distinguishes himself from the world may be given the world, But who regards himself as the world may accept the world. 14. Mystery Looked at but cannot be seen - it is beneath form; Listened to but cannot be heard - it is beneath sound; Held but cannot be touched - it is beneath feeling; These depthless things evade definition, And blend into a single mystery. In its rising there is no light, In its falling there is no darkness, A continuous thread beyond description, Lining what does not exist; Its form formless, Its image nothing, Its name silence; Follow it, it has no back, et it, it has no face. Attend the present to deal with the past; Thus you grasp the continuity of the Way, Which is its essence. 15. Enlightenment The enlightened possess understanding So profound they can not be understood. Because they cannot be understood I can only describe their appearance: Cautious as one crossing thin ice, Undecided as one surrounded by danger, Modest as one who is a guest, Unbounded as melting ice, Genuine as unshaped wood, Broad as a valley, Seamless as muddy water. Who stills the water that the mud may settle, Who seeks to stop that he may travel on, Who desires less than what may transpire, Decays, but will not renew. 16. Decay and Renewal Empty the self completely; Embrace perfect peace. The world will rise and move; Watch it return to rest. All the flourishing things Will return to their source. This return is peaceful; It is the flow of nature, An eternal decay and renewal. Accepting this brings enlightenment, Ignoring this brings misery. Who accepts nature's flow becomes all-cherishing; Being all-cherishing he becomes impartial; Being impartial he becomes magnanimous; Being magnanimous he becomes natural; Being natural he becomes one with the Way; Being one with the Way he becomes immortal: Though his body will decay, the Way will not. 17. Rulers The best rulers are scarcely known by their subjects; The next best are loved and praised; The next are feared; The next despised: They have no faith in their people, And their people become unfaithful to them. When the best rulers achieve their purpose Their subjects claim the achievement as their own. 18. Hypocrisy When the Way is forgotten Duty and justice appear; Then knowledge and wisdom are born Along with hypocrisy. When harmonious relationships dissolve Then respect and devotion arise; When a nation falls to chaos Then loyalty and patriotism are born. 19. Simplify If we could discard knowledge and wisdom Then people would profit a hundredfold; If we could discard duty and justice Then harmonious relationships would form; If we could discard artifice and profit Then waste and theft would disappear. Yet such remedies treat only symptoms And so they are inadequate. People need personal remedies: Reveal your naked self and embrace your original nature; Bind your self-interest and control your ambition; Forget your habits and simplify your affairs. 20. Wandering What is the difference between assent and denial? What is the difference between beautiful and ugly? What is the difference between fearsome and afraid? The people are merry as if at a magnificent party Or playing in the park at springtime, But I am tranquil and wandering, Like a newborn before it learns to smile, Alone, with no true home. The people have enough and to spare, Where I have nothing, And my heart is foolish, Muddled and cloudy. The people are bright and certain, Where I am dim and confused; The people are clever and wise, Where I am dull and ignorant; Aimless as a wave drifting over the sea, Attached to nothing. The people are busy with purpose, Where I am ipractical and rough; I do not share the peoples' cares But I am fed at nature's breast. 21. Accept Harmony is only in following the Way. The Way is without form or quality, But expresses all forms and qualities; The Way is hidden and implicate, But expresses all of nature; The Way is unchanging, But expresses all motion. Beneath sensation and memory The Way is the source of all the world. How can I understand the source of the world? By accepting. 22. Home Accept and you become whole, Bend and you straighten, Empty and you fill, Decay and you renew, Want and you acquire, Fulfill and you become confused. The sage accepts the world As the world accepts the Way; He does not display himself, so is clearly seen, Does not justify himself, so is recognized, Does not boast, so is credited, Does not pride himself, so endures, Does not contend, so none contend against him. The ancients said, "Accept and you become whole", Once whole, the world is as your home. 23. Words Nature says only a few words: High wind does not last long, Nor does heavy rain. If nature's words do not last Why should those of man? Who accepts harmony, becomes harmonious. Who accepts loss, becomes lost. For who accepts harmony, the Way harmonizes with him, And who accepts loss, the Way cannot find. 24. Indulgence Straighten yourself and you will not stand steady; Display yourself and you will not be clearly seen; Justify yourself and you will not be respected; Promote yourself and you will not be believed; Pride yourself and you will not endure. These behaviours are wasteful, indulgent, And so they attract disfavour; Harmony avoids them. 25. Beneath Abstraction There is a mystery, Beneath abstraction, Silent, depthless, Alone, unchanging, Ubiquitous and liquid, The mother of nature. It has no name, but I call it "the Way"; It has no limit, but I call it "limitless". Being limitless, it flows away forever; Flowing away forever, it returns to my self: The Way is limitless, So nature is limitless, So the world is limitless, And so I am limitless. For I am abstracted from the world, The world from nature, Nature from the Way, And the Way from what is beneath abstraction. 26. Calm Gravity is the source of lightness, Calm, the master of haste. A lone traveller will journey all day, watching over his belongings; Only safe in his own bed may he lose them in sleep. So the captain of a great vessel should not act lightly or hastily. Acting lightly, he loses sight of the world, Acting hastily, he loses control of himself. The captain can not treat his great ship as a small boat; Rather than glitter like jade He must stand like stone. 27. Perfection The perfect traveller leaves no trail to be followed; The perfect speaker leaves no question to be answered; The perfect accountant leaves no working to be completed; The perfect container leaves no lock to be closed; The perfect knot leaves no end to be ravelled. So the sage nurtures all men And abandons no one. He accepts everything And rejects nothing. He attends to the smallest details. For the strong must guide the weak; The weak are raw material to the strong. If the guide is not respected, Or the material is not cared for, Confusion will result, no matter how clever one is. This is the secret of perfection: When raw wood is carved, it becomes a tool; When a man is employed, he becomes a tool; The perfect carpenter leaves no wood to be carved. 28. Becoming Using the male, being female, Being the entrance of the world, You embrace harmony And become as a newborn. Using strength, being weak, Being the root of the world, You complete harmony And become as unshaped wood. Using the light, being dark, Being the world, You perfect harmony And return to the Way. 29. Ambition Those who wish to change the world According with their desire Cannot succeed. The world is shaped by the Way; It cannot be shaped by the self. Trying to change it, you damage it; Trying to possess it, you lose it. So some will lead, while others follow. Some will be warm, others cold Some will be strong, others weak. Some will get where they are going While others fall by the side of the road. So the sage will be neither extravagant nor violent. 30. Violence Powerful men are well advised not to use violence, For violence has a habit of returning; Thorns and weeds grow wherever an army goes, And lean years follow a great war. A general is well advised To achieve nothing more than his orders: Not to take advantage of his victory. Nor to glory, boast or pride himself; To do what is dictated by necessity, Not by choice. For even the strongest force will weaken with time, And then its violence will return, and kill it. 31. Armies Armies are tools of violence; They cause men to hate and fear. The sage will not join them. His purpose is creation; Their purpose is destruction. Weapons are tools of violence, Not of the sage; He uses them only when there is no choice, And then calmly, and with tact, For he finds no beauty in them. Whoever finds beauty in weapons Delights in the slaughter of men; And who delights in slaughter Cannot content himself with peace. So slaughters must be mourned And conquest celebrated with a funeral. 32. Shapes The Way has no true shape, And therefore none can control it. If a ruler could control the Way All things would follow In harmony with his desire, And sweet rain would fall, Effortlessly slaking every thirst. The Way is shaped by use, But then the shape is lost. Do not hold fast to shapes But let sensation flow into the world As a river courses down to the sea. 33. Virtues Who understands the world is learned; Who understands the self is enlightened. Who conquers the world has strength; Who conquers the self has harmony; Who is determined has purpose. Who is contented has wealth; Who defends his home may long endure; Who surrenders his home may long survive it. 34. Control The Way flows and ebbs, creating and destroying, Implementing all the world, attending to the tiniest details, Claiming nothing in return. It nurtures all things, Though it does not control them; It has no intention, So it seems inconsequential. It is the substance of all things; Though it does not control them; It has no exception, So it seems all-important. The sage would not control the world;  He is in harmony with the world. 35. Peace If you offer music and food Strangers may stop with you; But if you accord with the Way All the people of the world will keep you In safety, health, community, and peace. The Way lacks art and flavour; It can neither be seen  or heard, But its benefit cannot be exhausted.  36. Opposition To reduce someone's influence, first expand it; To reduce someone's force, first increase it; To overthrow someone, first exalt them; To take from someone, first give to them. This is the subtlety by which the weak overcome the strong: Fish should not leave their depths, And swords should not leave their scabbards. 37. Tranquillity The Way takes no action, but leaves nothing undone. When you accept this The world will flourish, In harmony with nature. Nature does not possess desire; Without desire, the heart becomes quiet; In this manner the whole world is made tranquil. Tao Te Ching: An English-Language Interpolation 1. The Way The Way that can be experienced is not true; The world that can be constructed is not real. The Way manifests all that happens and may happen; The world represents all that exists and may exist. To experience without abstraction is to sense the world; To experience with abstraction is to know the world. These two experiences are indistinguishable; Their construction differs but their effect is the same. Beyond the gate of experience flows the Way, Which is ever greater and more subtle than the world. 2. Abstraction When beauty is abstracted Then ugliness has been implied; When good is abstracted Then evil has been implied. So alive and dead are abstracted from nature, Difficult and easy abstracted from progress, Long and short abstracted from contrast, High and low abstracted from depth, Song and speech abstracted from melody, After and before abstracted from sequence. The sage experiences without abstraction, And accomplishes without action; He accepts the ebb and flow of things, Nurtures them, but does not own them, And lives, but does not dwell. 3. Without Action Not praising the worthy prevents contention, Not esteeming the valuable prevents theft, Not displaying the beautiful prevents desire. In this manner the sage governs people: Emptying their minds, Filling their bellies, Weakening their ambitions, And strengthening their bones. If people lack knowledge and desire Then they can not act; If no action is taken Harmony remains. 4. Limitless The Way is a limitless vessel; Used by the self, it is not filled by the world; It cannot be cut, knotted, dimmed or stilled; Its depths are hidden, ubiquitous and eternal; I don't know where it comes from; It comes before nature. 5. Nature Nature is not kind; It treats all things impartially. The Sage is not kind, And treats all people impartially. Nature is like a bellows, Empty, yet never ceasing its supply. The more it moves, the more it yields; So the sage draws upon experience And cannot be exhausted. 6. Experience Experience is a riverbed,  Its source hidden, forever flowing: Its entrance, the root of the world, The Way moves within it: Draw upon it; it will not run dry. 7. Complete Nature is complete because it does not serve itself. The sage places himself after and finds himself before, Ignores his desire and finds himself content. He is complete because he does not serve himself. 8. Water The best of man is like water, Which benefits all things, and does not contend with them, Which flows in places that others disdain, Where it is in harmony with the Way. So the sage: Lives within nature, Thinks within the deep, Gives within impartiality, Speaks within trust, Governs within order, Crafts within ability, Acts within opportunity. He does not contend, and none contend against him. 9. Retire Fill a cup to its brim and it is easily spilled; Temper a sword to its hardest and it is easily broken; Amass the greatest treasure and it is easily stolen; Claim credit and honour and you easily fall; Retire once your purpose is achieved - this is natural. 10. Harmony Embracing the Way, you become embraced; Breathing gently, you become newborn; Clearing your mind, you become clear; Nurturing your children, you become impartial; Opening your heart, you become accepted; Accepting the world, you embrace the Way. Bearing and nurturing, Creating but not owning, Giving without demanding, This is harmony. 11. Tools Thirty spokes meet at a nave; because of the hole we may use the wheel. Clay is moulded into a vessel; Because of the hollow we may use the cup. Walls are built around a hearth; Because of the doors we may use the house. Thus tools come from what exists, But use from what does not. 12. Substance Too much colour blinds the eye, Too much music deafens the ear, Too much taste dulls the palate, Too much play maddens the mind, Too much desire tears the heart. In this manner the sage cares for people: He provides for the belly, not for the senses; He ignores abstraction and holds fast to substance. 13. Self Both praise and blame cause concern, For they bring people hope and fear. The object of hope and fear is the self - For, without self, to whom may fortune and disaster occur? Therefore, Who distinguishes himself from the world may be given the world, But who regards himself as the world may accept the world. 14. Mystery Looked at but cannot be seen - it is beneath form; Listened to but cannot be heard - it is beneath sound; Held but cannot be touched - it is beneath feeling; These depthless things evade definition, And blend into a single mystery. In its rising there is no light, In its falling there is no darkness, A continuous thread beyond description, Lining what does not exist; Its form formless, Its image nothing, Its name silence; Follow it, it has no back, et it, it has no face. Attend the present to deal with the past; Thus you grasp the continuity of the Way, Which is its essence. 15. Enlightenment The enlightened possess understanding So profound they can not be understood. Because they cannot be understood I can only describe their appearance: Cautious as one crossing thin ice, Undecided as one surrounded by danger, Modest as one who is a guest, Unbounded as melting ice, Genuine as unshaped wood, Broad as a valley, Seamless as muddy water. Who stills the water that the mud may settle, Who seeks to stop that he may travel on, Who desires less than what may transpire, Decays, but will not renew. 16. Decay and Renewal Empty the self completely; Embrace perfect peace. The world will rise and move; Watch it return to rest. All the flourishing things Will return to their source. This return is peaceful; It is the flow of nature, An eternal decay and renewal. Accepting this brings enlightenment, Ignoring this brings misery. Who accepts nature's flow becomes all-cherishing; Being all-cherishing he becomes impartial; Being impartial he becomes magnanimous; Being magnanimous he becomes natural; Being natural he becomes one with the Way; Being one with the Way he becomes immortal: Though his body will decay, the Way will not. 17. Rulers The best rulers are scarcely known by their subjects; The next best are loved and praised; The next are feared; The next despised: They have no faith in their people, And their people become unfaithful to them. When the best rulers achieve their purpose Their subjects claim the achievement as their own. 18. Hypocrisy When the Way is forgotten Duty and justice appear; Then knowledge and wisdom are born Along with hypocrisy. When harmonious relationships dissolve Then respect and devotion arise; When a nation falls to chaos Then loyalty and patriotism are born. 19. Simplify If we could discard knowledge and wisdom Then people would profit a hundredfold; If we could discard duty and justice Then harmonious relationships would form; If we could discard artifice and profit Then waste and theft would disappear. Yet such remedies treat only symptoms And so they are inadequate. People need personal remedies: Reveal your naked self and embrace your original nature; Bind your self-interest and control your ambition; Forget your habits and simplify your affairs. 20. Wandering What is the difference between assent and denial? What is the difference between beautiful and ugly? What is the difference between fearsome and afraid? The people are merry as if at a magnificent party Or playing in the park at springtime, But I am tranquil and wandering, Like a newborn before it learns to smile, Alone, with no true home. The people have enough and to spare, Where I have nothing, And my heart is foolish, Muddled and cloudy. The people are bright and certain, Where I am dim and confused; The people are clever and wise, Where I am dull and ignorant; Aimless as a wave drifting over the sea, Attached to nothing. The people are busy with purpose, Where I am ipractical and rough; I do not share the peoples' cares But I am fed at nature's breast. 21. Accept Harmony is only in following the Way. The Way is without form or quality, But expresses all forms and qualities; The Way is hidden and implicate, But expresses all of nature; The Way is unchanging, But expresses all motion. Beneath sensation and memory The Way is the source of all the world. How can I understand the source of the world? By accepting. 22. Home Accept and you become whole, Bend and you straighten, Empty and you fill, Decay and you renew, Want and you acquire, Fulfill and you become confused. The sage accepts the world As the world accepts the Way; He does not display himself, so is clearly seen, Does not justify himself, so is recognized, Does not boast, so is credited, Does not pride himself, so endures, Does not contend, so none contend against him. The ancients said, "Accept and you become whole", Once whole, the world is as your home. 23. Words Nature says only a few words: High wind does not last long, Nor does heavy rain. If nature's words do not last Why should those of man? Who accepts harmony, becomes harmonious. Who accepts loss, becomes lost. For who accepts harmony, the Way harmonizes with him, And who accepts loss, the Way cannot find. 24. Indulgence Straighten yourself and you will not stand steady; Display yourself and you will not be clearly seen; Justify yourself and you will not be respected; Promote yourself and you will not be believed; Pride yourself and you will not endure. These behaviours are wasteful, indulgent, And so they attract disfavour; Harmony avoids them. 25. Beneath Abstraction There is a mystery, Beneath abstraction, Silent, depthless, Alone, unchanging, Ubiquitous and liquid, The mother of nature. It has no name, but I call it "the Way"; It has no limit, but I call it "limitless". Being limitless, it flows away forever; Flowing away forever, it returns to my self: The Way is limitless, So nature is limitless, So the world is limitless, And so I am limitless. For I am abstracted from the world, The world from nature, Nature from the Way, And the Way from what is beneath abstraction. 26. Calm Gravity is the source of lightness, Calm, the master of haste. A lone traveller will journey all day, watching over his belongings; Only safe in his own bed may he lose them in sleep. So the captain of a great vessel should not act lightly or hastily. Acting lightly, he loses sight of the world, Acting hastily, he loses control of himself. The captain can not treat his great ship as a small boat; Rather than glitter like jade He must stand like stone. 27. Perfection The perfect traveller leaves no trail to be followed; The perfect speaker leaves no question to be answered; The perfect accountant leaves no working to be completed; The perfect container leaves no lock to be closed; The perfect knot leaves no end to be ravelled. So the sage nurtures all men And abandons no one. He accepts everything And rejects nothing. He attends to the smallest details. For the strong must guide the weak; The weak are raw material to the strong. If the guide is not respected, Or the material is not cared for, Confusion will result, no matter how clever one is. This is the secret of perfection: When raw wood is carved, it becomes a tool; When a man is employed, he becomes a tool; The perfect carpenter leaves no wood to be carved. 28. Becoming Using the male, being female, Being the entrance of the world, You embrace harmony And become as a newborn. Using strength, being weak, Being the root of the world, You complete harmony And become as unshaped wood. Using the light, being dark, Being the world, You perfect harmony And return to the Way. 29. Ambition Those who wish to change the world According with their desire Cannot succeed. The world is shaped by the Way; It cannot be shaped by the self. Trying to change it, you damage it; Trying to possess it, you lose it. So some will lead, while others follow. Some will be warm, others cold Some will be strong, others weak. Some will get where they are going While others fall by the side of the road. So the sage will be neither extravagant nor violent. 30. Violence Powerful men are well advised not to use violence, For violence has a habit of returning; Thorns and weeds grow wherever an army goes, And lean years follow a great war. A general is well advised To achieve nothing more than his orders: Not to take advantage of his victory. Nor to glory, boast or pride himself; To do what is dictated by necessity, Not by choice. For even the strongest force will weaken with time, And then its violence will return, and kill it. 31. Armies Armies are tools of violence; They cause men to hate and fear. The sage will not join them. His purpose is creation; Their purpose is destruction. Weapons are tools of violence, Not of the sage; He uses them only when there is no choice, And then calmly, and with tact, For he finds no beauty in them. Whoever finds beauty in weapons Delights in the slaughter of men; And who delights in slaughter Cannot content himself with peace. So slaughters must be mourned And conquest celebrated with a funeral. 32. Shapes The Way has no true shape, And therefore none can control it. If a ruler could control the Way All things would follow In harmony with his desire, And sweet rain would fall, Effortlessly slaking every thirst. The Way is shaped by use, But then the shape is lost. Do not hold fast to shapes But let sensation flow into the world As a river courses down to the sea. 33. Virtues Who understands the world is learned; Who understands the self is enlightened. Who conquers the world has strength; Who conquers the self has harmony; Who is determined has purpose. Who is contented has wealth; Who defends his home may long endure; Who surrenders his home may long survive it. 34. Control The Way flows and ebbs, creating and destroying, Implementing all the world, attending to the tiniest details, Claiming nothing in return. It nurtures all things, Though it does not control them; It has no intention, So it seems inconsequential. It is the substance of all things; Though it does not control them; It has no exception, So it seems all-important. The sage would not control the world;  He is in harmony with the world. 35. Peace If you offer music and food Strangers may stop with you; But if you accord with the Way All the people of the world will keep you In safety, health, community, and peace. The Way lacks art and flavour; It can neither be seen  or heard, But its benefit cannot be exhausted.  36. Opposition To reduce someone's influence, first expand it; To reduce someone's force, first increase it; To overthrow someone, first exalt them; To take from someone, first give to them. This is the subtlety by which the weak overcome the strong: Fish should not leave their depths, And swords should not leave their scabbards.
-
-[Test_9.14.1]
-//Repeat=2
-WSPURI=http://192.168.20.11/upload/tao.txt
-//WSPURI=http://10.32.194.45/upload/tao.txt
-//WSPURI=http://10.35.2.4/upload/tao.txt
-
-[Test_9.14.2]
-WSPMethod=97
-WSPURI=http://192.168.20.11/upload/tao.txt
-//WSPURI=http://10.32.194.45/upload/tao.txt
-//WSPURI=http://10.35.2.4/upload/tao.txt
-WSPHeaders=Accept-Language: English
-WSPBody=Tao Te Ching: An English-Language Interpolation 1. The Way The Way that can be experienced is not true; The world that can be constructed is not real. The Way manifests all that happens and may happen; The world represents all that exists and may exist. To experience without abstraction is to sense the world; To experience with abstraction is to know the world. These two experiences are indistinguishable; Their construction differs but their effect is the same. Beyond the gate of experience flows the Way, Which is ever greater and more subtle than the world. 2. Abstraction When beauty is abstracted Then ugliness has been implied; When good is abstracted Then evil has been implied. So alive and dead are abstracted from nature, Difficult and easy abstracted from progress, Long and short abstracted from contrast, High and low abstracted from depth, Song and speech abstracted from melody, After and before abstracted from sequence. The sage experiences without abstraction, And accomplishes without action; He accepts the ebb and flow of things, Nurtures them, but does not own them, And lives, but does not dwell. 3. Without Action Not praising the worthy prevents contention, Not esteeming the valuable prevents theft, Not displaying the beautiful prevents desire. In this manner the sage governs people: Emptying their minds, Filling their bellies, Weakening their ambitions, And strengthening their bones. If people lack knowledge and desire Then they can not act; If no action is taken Harmony remains. 4. Limitless The Way is a limitless vessel; Used by the self, it is not filled by the world; It cannot be cut, knotted, dimmed or stilled; Its depths are hidden, ubiquitous and eternal; I don't know where it comes from; It comes before nature. 5. Nature Nature is not kind; It treats all things impartially. The Sage is not kind, And treats all people impartially. Nature is like a bellows, Empty, yet never ceasing its supply. The more it moves, the more it yields; So the sage draws upon experience And cannot be exhausted. 6. Experience Experience is a riverbed,  Its source hidden, forever flowing: Its entrance, the root of the world, The Way moves within it: Draw upon it; it will not run dry. 7. Complete Nature is complete because it does not serve itself. The sage places himself after and finds himself before, Ignores his desire and finds himself content. He is complete because he does not serve himself. 8. Water The best of man is like water, Which benefits all things, and does not contend with them, Which flows in places that others disdain, Where it is in harmony with the Way. So the sage: Lives within nature, Thinks within the deep, Gives within impartiality, Speaks within trust, Governs within order, Crafts within ability, Acts within opportunity. He does not contend, and none contend against him. 9. Retire Fill a cup to its brim and it is easily spilled; Temper a sword to its hardest and it is easily broken; Amass the greatest treasure and it is easily stolen; Claim credit and honour and you easily fall; Retire once your purpose is achieved - this is natural. 10. Harmony Embracing the Way, you become embraced; Breathing gently, you become newborn; Clearing your mind, you become clear; Nurturing your children, you become impartial; Opening your heart, you become accepted; Accepting the world, you embrace the Way. Bearing and nurturing, Creating but not owning, Giving without demanding, This is harmony. 11. Tools Thirty spokes meet at a nave; because of the hole we may use the wheel. Clay is moulded into a vessel; Because of the hollow we may use the cup. Walls are built around a hearth; Because of the doors we may use the house. Thus tools come from what exists, But use from what does not. 12. Substance Too much colour blinds the eye, Too much music deafens the ear, Too much taste dulls the palate, Too much play maddens the mind, Too much desire tears the heart. In this manner the sage cares for people: He provides for the belly, not for the senses; He ignores abstraction and holds fast to substance. 13. Self Both praise and blame cause concern, For they bring people hope and fear. The object of hope and fear is the self - For, without self, to whom may fortune and disaster occur? Therefore, Who distinguishes himself from the world may be given the world, But who regards himself as the world may accept the world. 14. Mystery Looked at but cannot be seen - it is beneath form; Listened to but cannot be heard - it is beneath sound; Held but cannot be touched - it is beneath feeling; These depthless things evade definition, And blend into a single mystery. In its rising there is no light, In its falling there is no darkness, A continuous thread beyond description, Lining what does not exist; Its form formless, Its image nothing, Its name silence; Follow it, it has no back, et it, it has no face. Attend the present to deal with the past; Thus you grasp the continuity of the Way, Which is its essence. 15. Enlightenment The enlightened possess understanding So profound they can not be understood. Because they cannot be understood I can only describe their appearance: Cautious as one crossing thin ice, Undecided as one surrounded by danger, Modest as one who is a guest, Unbounded as melting ice, Genuine as unshaped wood, Broad as a valley, Seamless as muddy water. Who stills the water that the mud may settle, Who seeks to stop that he may travel on, Who desires less than what may transpire, Decays, but will not renew. 16. Decay and Renewal Empty the self completely; Embrace perfect peace. The world will rise and move; Watch it return to rest. All the flourishing things Will return to their source. This return is peaceful; It is the flow of nature, An eternal decay and renewal. Accepting this brings enlightenment, Ignoring this brings misery. Who accepts nature's flow becomes all-cherishing; Being all-cherishing he becomes impartial; Being impartial he becomes magnanimous; Being magnanimous he becomes natural; Being natural he becomes one with the Way; Being one with the Way he becomes immortal: Though his body will decay, the Way will not. 17. Rulers The best rulers are scarcely known by their subjects; The next best are loved and praised; The next are feared; The next despised: They have no faith in their people, And their people become unfaithful to them. When the best rulers achieve their purpose Their subjects claim the achievement as their own. 18. Hypocrisy When the Way is forgotten Duty and justice appear; Then knowledge and wisdom are born Along with hypocrisy. When harmonious relationships dissolve Then respect and devotion arise; When a nation falls to chaos Then loyalty and patriotism are born. 19. Simplify If we could discard knowledge and wisdom Then people would profit a hundredfold; If we could discard duty and justice Then harmonious relationships would form; If we could discard artifice and profit Then waste and theft would disappear. Yet such remedies treat only symptoms And so they are inadequate. People need personal remedies: Reveal your naked self and embrace your original nature; Bind your self-interest and control your ambition; Forget your habits and simplify your affairs. 20. Wandering What is the difference between assent and denial? What is the difference between beautiful and ugly? What is the difference between fearsome and afraid? The people are merry as if at a magnificent party Or playing in the park at springtime, But I am tranquil and wandering, Like a newborn before it learns to smile, Alone, with no true home. The people have enough and to spare, Where I have nothing, And my heart is foolish, Muddled and cloudy. The people are bright and certain, Where I am dim and confused; The people are clever and wise, Where I am dull and ignorant; Aimless as a wave drifting over the sea, Attached to nothing. The people are busy with purpose, Where I am ipractical and rough; I do not share the peoples' cares But I am fed at nature's breast. 21. Accept Harmony is only in following the Way. The Way is without form or quality, But expresses all forms and qualities; The Way is hidden and implicate, But expresses all of nature; The Way is unchanging, But expresses all motion. Beneath sensation and memory The Way is the source of all the world. How can I understand the source of the world? By accepting. 22. Home Accept and you become whole, Bend and you straighten, Empty and you fill, Decay and you renew, Want and you acquire, Fulfill and you become confused. The sage accepts the world As the world accepts the Way; He does not display himself, so is clearly seen, Does not justify himself, so is recognized, Does not boast, so is credited, Does not pride himself, so endures, Does not contend, so none contend against him. The ancients said, "Accept and you become whole", Once whole, the world is as your home. 23. Words Nature says only a few words: High wind does not last long, Nor does heavy rain. If nature's words do not last Why should those of man? Who accepts harmony, becomes harmonious. Who accepts loss, becomes lost. For who accepts harmony, the Way harmonizes with him, And who accepts loss, the Way cannot find. 24. Indulgence Straighten yourself and you will not stand steady; Display yourself and you will not be clearly seen; Justify yourself and you will not be respected; Promote yourself and you will not be believed; Pride yourself and you will not endure. These behaviours are wasteful, indulgent, And so they attract disfavour; Harmony avoids them. 25. Beneath Abstraction There is a mystery, Beneath abstraction, Silent, depthless, Alone, unchanging, Ubiquitous and liquid, The mother of nature. It has no name, but I call it "the Way"; It has no limit, but I call it "limitless". Being limitless, it flows away forever; Flowing away forever, it returns to my self: The Way is limitless, So nature is limitless, So the world is limitless, And so I am limitless. For I am abstracted from the world, The world from nature, Nature from the Way, And the Way from what is beneath abstraction. 26. Calm Gravity is the source of lightness, Calm, the master of haste. A lone traveller will journey all day, watching over his belongings; Only safe in his own bed may he lose them in sleep. So the captain of a great vessel should not act lightly or hastily. Acting lightly, he loses sight of the world, Acting hastily, he loses control of himself. The captain can not treat his great ship as a small boat; Rather than glitter like jade He must stand like stone. 27. Perfection The perfect traveller leaves no trail to be followed; The perfect speaker leaves no question to be answered; The perfect accountant leaves no working to be completed; The perfect container leaves no lock to be closed; The perfect knot leaves no end to be ravelled. So the sage nurtures all men And abandons no one. He accepts everything And rejects nothing. He attends to the smallest details. For the strong must guide the weak; The weak are raw material to the strong. If the guide is not respected, Or the material is not cared for, Confusion will result, no matter how clever one is. This is the secret of perfection: When raw wood is carved, it becomes a tool; When a man is employed, he becomes a tool; The perfect carpenter leaves no wood to be carved. 28. Becoming Using the male, being female, Being the entrance of the world, You embrace harmony And become as a newborn. Using strength, being weak, Being the root of the world, You complete harmony And become as unshaped wood. Using the light, being dark, Being the world, You perfect harmony And return to the Way. 29. Ambition Those who wish to change the world According with their desire Cannot succeed. The world is shaped by the Way; It cannot be shaped by the self. Trying to change it, you damage it; Trying to possess it, you lose it. So some will lead, while others follow. Some will be warm, others cold Some will be strong, others weak. Some will get where they are going While others fall by the side of the road. So the sage will be neither extravagant nor violent. 30. Violence Powerful men are well advised not to use violence, For violence has a habit of returning; Thorns and weeds grow wherever an army goes, And lean years follow a great war. A general is well advised To achieve nothing more than his orders: Not to take advantage of his victory. Nor to glory, boast or pride himself; To do what is dictated by necessity, Not by choice. For even the strongest force will weaken with time, And then its violence will return, and kill it. 31. Armies Armies are tools of violence; They cause men to hate and fear. The sage will not join them. His purpose is creation; Their purpose is destruction. Weapons are tools of violence, Not of the sage; He uses them only when there is no choice, And then calmly, and with tact, For he finds no beauty in them. Whoever finds beauty in weapons Delights in the slaughter of men; And who delights in slaughter Cannot content himself with peace. So slaughters must be mourned And conquest celebrated with a funeral. 32. Shapes The Way has no true shape, And therefore none can control it. If a ruler could control the Way All things would follow In harmony with his desire, And sweet rain would fall, Effortlessly slaking every thirst. The Way is shaped by use, But then the shape is lost. Do not hold fast to shapes But let sensation flow into the world As a river courses down to the sea. 33. Virtues Who understands the world is learned; Who understands the self is enlightened. Who conquers the world has strength; Who conquers the self has harmony; Who is determined has purpose. Who is contented has wealth; Who defends his home may long endure; Who surrenders his home may long survive it. 34. Control The Way flows and ebbs, creating and destroying, Implementing all the world, attending to the tiniest details, Claiming nothing in return. It nurtures all things, Though it does not control them; It has no intention, So it seems inconsequential. It is the substance of all things; Though it does not control them; It has no exception, So it seems all-important. The sage would not control the world;  He is in harmony with the world. 35. Peace If you offer music and food Strangers may stop with you; But if you accord with the Way All the people of the world will keep you In safety, health, community, and peace. The Way lacks art and flavour; It can neither be seen  or heard, But its benefit cannot be exhausted.  36. Opposition To reduce someone's influence, first expand it; To reduce someone's force, first increase it; To overthrow someone, first exalt them; To take from someone, first give to them. This is the subtlety by which the weak overcome the strong: Fish should not leave their depths, And swords should not leave their scabbards. 37. Tranquillity The Way takes no action, but leaves nothing undone. When you accept this The world will flourish, In harmony with nature. Nature does not possess desire; Without desire, the heart becomes quiet; In this manner the whole world is made tranquil. Tao Te Ching: An English-Language Interpolation 1. The Way The Way that can be experienced is not true; The world that can be constructed is not real. The Way manifests all that happens and may happen; The world represents all that exists and may exist. To experience without abstraction is to sense the world; To experience with abstraction is to know the world. These two experiences are indistinguishable; Their construction differs but their effect is the same. Beyond the gate of experience flows the Way, Which is ever greater and more subtle than the world. 2. Abstraction When beauty is abstracted Then ugliness has been implied; When good is abstracted Then evil has been implied. So alive and dead are abstracted from nature, Difficult and easy abstracted from progress, Long and short abstracted from contrast, High and low abstracted from depth, Song and speech abstracted from melody, After and before abstracted from sequence. The sage experiences without abstraction, And accomplishes without action; He accepts the ebb and flow of things, Nurtures them, but does not own them, And lives, but does not dwell. 3. Without Action Not praising the worthy prevents contention, Not esteeming the valuable prevents theft, Not displaying the beautiful prevents desire. In this manner the sage governs people: Emptying their minds, Filling their bellies, Weakening their ambitions, And strengthening their bones. If people lack knowledge and desire Then they can not act; If no action is taken Harmony remains. 4. Limitless The Way is a limitless vessel; Used by the self, it is not filled by the world; It cannot be cut, knotted, dimmed or stilled; Its depths are hidden, ubiquitous and eternal; I don't know where it comes from; It comes before nature. 5. Nature Nature is not kind; It treats all things impartially. The Sage is not kind, And treats all people impartially. Nature is like a bellows, Empty, yet never ceasing its supply. The more it moves, the more it yields; So the sage draws upon experience And cannot be exhausted. 6. Experience Experience is a riverbed,  Its source hidden, forever flowing: Its entrance, the root of the world, The Way moves within it: Draw upon it; it will not run dry. 7. Complete Nature is complete because it does not serve itself. The sage places himself after and finds himself before, Ignores his desire and finds himself content. He is complete because he does not serve himself. 8. Water The best of man is like water, Which benefits all things, and does not contend with them, Which flows in places that others disdain, Where it is in harmony with the Way. So the sage: Lives within nature, Thinks within the deep, Gives within impartiality, Speaks within trust, Governs within order, Crafts within ability, Acts within opportunity. He does not contend, and none contend against him. 9. Retire Fill a cup to its brim and it is easily spilled; Temper a sword to its hardest and it is easily broken; Amass the greatest treasure and it is easily stolen; Claim credit and honour and you easily fall; Retire once your purpose is achieved - this is natural. 10. Harmony Embracing the Way, you become embraced; Breathing gently, you become newborn; Clearing your mind, you become clear; Nurturing your children, you become impartial; Opening your heart, you become accepted; Accepting the world, you embrace the Way. Bearing and nurturing, Creating but not owning, Giving without demanding, This is harmony. 11. Tools Thirty spokes meet at a nave; because of the hole we may use the wheel. Clay is moulded into a vessel; Because of the hollow we may use the cup. Walls are built around a hearth; Because of the doors we may use the house. Thus tools come from what exists, But use from what does not. 12. Substance Too much colour blinds the eye, Too much music deafens the ear, Too much taste dulls the palate, Too much play maddens the mind, Too much desire tears the heart. In this manner the sage cares for people: He provides for the belly, not for the senses; He ignores abstraction and holds fast to substance. 13. Self Both praise and blame cause concern, For they bring people hope and fear. The object of hope and fear is the self - For, without self, to whom may fortune and disaster occur? Therefore, Who distinguishes himself from the world may be given the world, But who regards himself as the world may accept the world. 14. Mystery Looked at but cannot be seen - it is beneath form; Listened to but cannot be heard - it is beneath sound; Held but cannot be touched - it is beneath feeling; These depthless things evade definition, And blend into a single mystery. In its rising there is no light, In its falling there is no darkness, A continuous thread beyond description, Lining what does not exist; Its form formless, Its image nothing, Its name silence; Follow it, it has no back, et it, it has no face. Attend the present to deal with the past; Thus you grasp the continuity of the Way, Which is its essence. 15. Enlightenment The enlightened possess understanding So profound they can not be understood. Because they cannot be understood I can only describe their appearance: Cautious as one crossing thin ice, Undecided as one surrounded by danger, Modest as one who is a guest, Unbounded as melting ice, Genuine as unshaped wood, Broad as a valley, Seamless as muddy water. Who stills the water that the mud may settle, Who seeks to stop that he may travel on, Who desires less than what may transpire, Decays, but will not renew. 16. Decay and Renewal Empty the self completely; Embrace perfect peace. The world will rise and move; Watch it return to rest. All the flourishing things Will return to their source. This return is peaceful; It is the flow of nature, An eternal decay and renewal. Accepting this brings enlightenment, Ignoring this brings misery. Who accepts nature's flow becomes all-cherishing; Being all-cherishing he becomes impartial; Being impartial he becomes magnanimous; Being magnanimous he becomes natural; Being natural he becomes one with the Way; Being one with the Way he becomes immortal: Though his body will decay, the Way will not. 17. Rulers The best rulers are scarcely known by their subjects; The next best are loved and praised; The next are feared; The next despised: They have no faith in their people, And their people become unfaithful to them. When the best rulers achieve their purpose Their subjects claim the achievement as their own. 18. Hypocrisy When the Way is forgotten Duty and justice appear; Then knowledge and wisdom are born Along with hypocrisy. When harmonious relationships dissolve Then respect and devotion arise; When a nation falls to chaos Then loyalty and patriotism are born. 19. Simplify If we could discard knowledge and wisdom Then people would profit a hundredfold; If we could discard duty and justice Then harmonious relationships would form; If we could discard artifice and profit Then waste and theft would disappear. Yet such remedies treat only symptoms And so they are inadequate. People need personal remedies: Reveal your naked self and embrace your original nature; Bind your self-interest and control your ambition; Forget your habits and simplify your affairs. 20. Wandering What is the difference between assent and denial? What is the difference between beautiful and ugly? What is the difference between fearsome and afraid? The people are merry as if at a magnificent party Or playing in the park at springtime, But I am tranquil and wandering, Like a newborn before it learns to smile, Alone, with no true home. The people have enough and to spare, Where I have nothing, And my heart is foolish, Muddled and cloudy. The people are bright and certain, Where I am dim and confused; The people are clever and wise, Where I am dull and ignorant; Aimless as a wave drifting over the sea, Attached to nothing. The people are busy with purpose, Where I am ipractical and rough; I do not share the peoples' cares But I am fed at nature's breast. 21. Accept Harmony is only in following the Way. The Way is without form or quality, But expresses all forms and qualities; The Way is hidden and implicate, But expresses all of nature; The Way is unchanging, But expresses all motion. Beneath sensation and memory The Way is the source of all the world. How can I understand the source of the world? By accepting. 22. Home Accept and you become whole, Bend and you straighten, Empty and you fill, Decay and you renew, Want and you acquire, Fulfill and you become confused. The sage accepts the world As the world accepts the Way; He does not display himself, so is clearly seen, Does not justify himself, so is recognized, Does not boast, so is credited, Does not pride himself, so endures, Does not contend, so none contend against him. The ancients said, "Accept and you become whole", Once whole, the world is as your home. 23. Words Nature says only a few words: High wind does not last long, Nor does heavy rain. If nature's words do not last Why should those of man? Who accepts harmony, becomes harmonious. Who accepts loss, becomes lost. For who accepts harmony, the Way harmonizes with him, And who accepts loss, the Way cannot find. 24. Indulgence Straighten yourself and you will not stand steady; Display yourself and you will not be clearly seen; Justify yourself and you will not be respected; Promote yourself and you will not be believed; Pride yourself and you will not endure. These behaviours are wasteful, indulgent, And so they attract disfavour; Harmony avoids them. 25. Beneath Abstraction There is a mystery, Beneath abstraction, Silent, depthless, Alone, unchanging, Ubiquitous and liquid, The mother of nature. It has no name, but I call it "the Way"; It has no limit, but I call it "limitless". Being limitless, it flows away forever; Flowing away forever, it returns to my self: The Way is limitless, So nature is limitless, So the world is limitless, And so I am limitless. For I am abstracted from the world, The world from nature, Nature from the Way, And the Way from what is beneath abstraction. 26. Calm Gravity is the source of lightness, Calm, the master of haste. A lone traveller will journey all day, watching over his belongings; Only safe in his own bed may he lose them in sleep. So the captain of a great vessel should not act lightly or hastily. Acting lightly, he loses sight of the world, Acting hastily, he loses control of himself. The captain can not treat his great ship as a small boat; Rather than glitter like jade He must stand like stone. 27. Perfection The perfect traveller leaves no trail to be followed; The perfect speaker leaves no question to be answered; The perfect accountant leaves no working to be completed; The perfect container leaves no lock to be closed; The perfect knot leaves no end to be ravelled. So the sage nurtures all men And abandons no one. He accepts everything And rejects nothing. He attends to the smallest details. For the strong must guide the weak; The weak are raw material to the strong. If the guide is not respected, Or the material is not cared for, Confusion will result, no matter how clever one is. This is the secret of perfection: When raw wood is carved, it becomes a tool; When a man is employed, he becomes a tool; The perfect carpenter leaves no wood to be carved. 28. Becoming Using the male, being female, Being the entrance of the world, You embrace harmony And become as a newborn. Using strength, being weak, Being the root of the world, You complete harmony And become as unshaped wood. Using the light, being dark, Being the world, You perfect harmony And return to the Way. 29. Ambition Those who wish to change the world According with their desire Cannot succeed. The world is shaped by the Way; It cannot be shaped by the self. Trying to change it, you damage it; Trying to possess it, you lose it. So some will lead, while others follow. Some will be warm, others cold Some will be strong, others weak. Some will get where they are going While others fall by the side of the road. So the sage will be neither extravagant nor violent. 30. Violence Powerful men are well advised not to use violence, For violence has a habit of returning; Thorns and weeds grow wherever an army goes, And lean years follow a great war. A general is well advised To achieve nothing more than his orders: Not to take advantage of his victory. Nor to glory, boast or pride himself; To do what is dictated by necessity, Not by choice. For even the strongest force will weaken with time, And then its violence will return, and kill it. 31. Armies Armies are tools of violence; They cause men to hate and fear. The sage will not join them. His purpose is creation; Their purpose is destruction. Weapons are tools of violence, Not of the sage; He uses them only when there is no choice, And then calmly, and with tact, For he finds no beauty in them. Whoever finds beauty in weapons Delights in the slaughter of men; And who delights in slaughter Cannot content himself with peace. So slaughters must be mourned And conquest celebrated with a funeral. 32. Shapes The Way has no true shape, And therefore none can control it. If a ruler could control the Way All things would follow In harmony with his desire, And sweet rain would fall, Effortlessly slaking every thirst. The Way is shaped by use, But then the shape is lost. Do not hold fast to shapes But let sensation flow into the world As a river courses down to the sea. 33. Virtues Who understands the world is learned; Who understands the self is enlightened. Who conquers the world has strength; Who conquers the self has harmony; Who is determined has purpose. Who is contented has wealth; Who defends his home may long endure; Who surrenders his home may long survive it. 34. Control The Way flows and ebbs, creating and destroying, Implementing all the world, attending to the tiniest details, Claiming nothing in return. It nurtures all things, Though it does not control them; It has no intention, So it seems inconsequential. It is the substance of all things; Though it does not control them; It has no exception, So it seems all-important. The sage would not control the world;  He is in harmony with the world. 35. Peace If you offer music and food Strangers may stop with you; But if you accord with the Way All the people of the world will keep you In safety, health, community, and peace. The Way lacks art and flavour; It can neither be seen  or heard, But its benefit cannot be exhausted.  36. Opposition To reduce someone's influence, first expand it; To reduce someone's force, first increase it; To overthrow someone, first exalt them; To take from someone, first give to them. This is the subtlety by which the weak overcome the strong: Fish should not leave their depths, And swords should not leave their scabbards.
-
-[Test_9.15]
-WSPMethod=67
-WSPURI=http://10.32.194.45/upload/tao.txt
-//WSPURI=http://10.35.2.4/upload/tao.txt
-//WSPHeaders=Accept-Language: English
-
-[Test_9.16]
-WSPMethod=68
-WSPURI=http://10.35.2.4/wap/wstiot/
-WSPHeaders=Accept-Language: English
-
-[Test_9.17]
-WSPMethod=65
-WSPURI=http://10.35.2.4/*
-WSPHeaders=Accept-Language: English
-

--- a/wapstack/wapmessageapi/te_wapstack/testdata/WapSIMTSY.txt	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,271 +0,0 @@
-[test411]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsTxPause= 2
-SmsTx=55000C9144775622322100F5A77B040402E2E2424547494E3A56434152445C725C6E56455253494F4E3A322E315C725C6E464E3A4A616C5C725C6E4E3A4A616C5C725C6E4F52473A50616E536F6674776172655C725C6E5449544C453A4469726563746F725C725C6E4C4142454C3A49736C696E67746F6E5C725C6E454E443A56434152445C725C6E,447765222312,12, 01A0, 0
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=440C9144775622322100F5308010118590407B040402E2E2424547494E3A56434152445C725C6E56455253494F4E3A322E315C725C6E464E3A4A616C5C725C6E4E3A4A616C5C725C6E4F52473A50616E536F6674776172655C725C6E5449544C453A4469726563746F725C725C6E4C4142454C3A49736C696E67746F6E5C725C6E454E443A56434152445C725C6E, 447765222312
-SmsStartRxDelay= 4207, 1, 1
-
-[test413]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsTxPause= 2
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=  440C914477562232210000307003615225409F0500030402015EAFE97059A4156930184C068B8184C563D2A9B30E83CCA29318946E5E6E6B513A4D3E9DBA980BB679B985C563D2A9B316AD452775F3720F83D4E2F1294D16A7BA66B1484D3A8F9B977B4A0D52AB531DB5E8A406A9496B71F37213A9536A504AD5C960B0188C068B5161B3190C06D36E5E6E22B5E824EA6430580C4683C5A830DA0C06836901, 447765222312        
-SmsRx=440C9144775622322100003070036152754016050003040202362FF7B4DA6C06A5595DB33C9F03, 447765222312   
-SmsRx=040C9144775622322100003070036162504094AFD774B82CD28A34180C2683C940E173DA7D0635CB657ADA7DDEBCDCC4E274284D42A9C9A7532794A7E9EE721E14769341CAFA9C9E7683E86F90BC6C4F97EF2077F95E9ED34170F91BFE9E87D9A076985E96A7C3ECCDCB3D6406A7531D549AB406A9C5CDCB5D741275D6A2B5E8A46E5EEEA293A8B30E83CCA29318946E5EF2CDCB0D, 447765222312
-SmsStartRxDelay= 4207, 1, 3
-
-[test415]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsTxPause= 2
-SmsTx=15000C914477562232210000A78EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203,447765222312,12, 01A0, 0     
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=  040C914477562232210000308010219024408EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203, 447765222312
-SmsStartRxDelay= 4207, 1, 1
-
-[test421]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsTxPause= 2
-SmsTx=55000C9144775622322100F5A77B0404020101424547494E3A56434152445C725C6E56455253494F4E3A322E315C725C6E464E3A4A616C5C725C6E4E3A4A616C5C725C6E4F52473A50616E536F6674776172655C725C6E5449544C453A4469726563746F725C725C6E4C4142454C3A49736C696E67746F6E5C725C6E454E443A56434152445C725C6E,447765222315,12, 01A0, 0
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=  440C9144775622322100F5307003513340407B0404020101424547494E3A56434152445C725C6E56455253494F4E3A322E315C725C6E464E3A4A616C5C725C6E4E3A4A616C5C725C6E4F52473A50616E536F6674776172655C725C6E5449544C453A4469726563746F725C725C6E4C4142454C3A49736C696E67746F6E5C725C6E454E443A56434152445C725C6E, 447765222315
-SmsStartRxDelay= 4207, 1, 1
-
-[test423]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsTxPause= 2
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=  440C914477562232210000307013017510409F0500030002015EAFE970098BC16230184C068B8184C563D2A9B30E83CCA29318946E5E6E6B513A4D3E9DBA980BB679B985C563D2A9B316AD452775F3720F83D4E2F1294D16A7BA66B1484D3A8F9B977B4A0D52AB531DB5E8A406A9496B71F37213A9536A504AD5C960B0188C068B5161B3190C06D36E5E6E22B5E824EA6430580C4683C5A830DA0C06836901, 447765222312        
-SmsRx=440C9144775622322100003070130175114016050003000202362FF7B4DA6C06A5595DB33C9F03, 447765222312       
-SmsRx=040C9144775622322100003070130175024094AFD774B884C56031180C2683C940E173DA7D0635CB657ADA7DDEBCDCC4E274284D42A9C9A7532794A7E9EE721E14769341CAFA9C9E7683E86F90BC6C4F97EF2077F95E9ED34170F91BFE9E87D9A076985E96A7C3ECCDCB3D6406A7531D549AB406A9C5CDCB5D741275D6A2B5E8A46E5EEEA293A8B30E83CCA29318946E5EF2CDCB0D, 447765222312
-SmsStartRxDelay= 4207, 1, 3
-
-[test425]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsTxPause= 2
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=  440C9144775622322100F5307013514502408C09040201010003050301424547494E3A5643414C454E4441525C6E56455253494F4E3A312E305C6E424547494E3A564556454E545C6E43415445474F524945533A4D454554494E475C6E5354415455533A54454E5441544956455C6E445453544152543A3230303130343031543033333030305A5C6E4454454E443A3230303130343031543034333030305A, 447765222312        
-SmsRx=440C9144775622322100F5307013514562408C090402010100030503025C6E53554D4D4152593A4D6573736167696E67204D656574696E675C6E4445534352495054494F4E3A427269746E657920616E64204A757374696E20746F20726576696577206E65776573742070726F706F73616C206D6174657269616C5C6E434C4153533A505249564154455C6E454E443A564556454E545C6E454E443A564341, 447765222312       
-SmsRx=440C9144775622322100F53070135145134014090402010100030503034C454E4441525C725C6E, 447765222312
-SmsStartRxDelay= 4207, 1, 3
-
-[test426]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsTxPause= 2
-SmsTx=55000C9144775622322100F5A77D0605041581158130323441334135393331424442444239393545343034303034344438463531313431363631353631333631313632344432353434353835393835353834443835313835353235353835353834353834443834353835353834353834443839333443353131363234433330444230443330423338303030,447765222312,12, 01A0, 0
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=440C9144775622322100F5309030710491407D0605041581158130323441334135393331424442444239393545343034303034344438463531313431363631353631333631313632344432353434353835393835353834443835313835353235353835353834353834443834353835353834353834443839333443353131363234433330444230443330423338303030, 447765222312        
-SmsStartRxDelay= 4207, 1, 1
-
-[test427]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsTxPause= 2
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx= 440C9144775622322100F5309030810000408C0B050415881588000303030131206E657720656D61696C206D6573736167655C6E2046726F6D3A204B616D72616E204E6F62617269203C4B616D72616E2E4E6F626172694053796D6269616E2E636F6D3E5C6E205375626A6563743A2074657374206F6E6C792C20706C656173652069676E6F72655C6E2073697A653A2034324B425C6E206174743A315C6E, 447765222312        
-SmsRx= 440C9144775622322100F5309030810060408C0B050415881588000303030220546F3A20536F6D656F6E65203C736F6D656F6E65406E6F77686572652E636F6D3E5C6E20446174653A20332053657074656D6265722032303033202B303030305C6E2073656E6465723A4B616D72616E2E4E6F626172694073796D6269616E2E636F6D5C6E207265706C792D746F3A20736F6D656F6E652E656C7365405379, 447765222312       
-SmsRx= 440C9144775622322100F530903081002140490B05041588158800030303036D6269616E2E636F6D5C6E20666C64723A20757365722E736D6172746D652E746869732E666F6C6465722E69732E666F722E6A756E6B2E6D61696C5C6E, 447765222312
-SmsStartRxDelay= 4207, 1, 3
-
-[test428]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsTxPause= 2
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx= 440C9144775622322100F5309030815001408C0B0504157F157F000304020157656C636F6D65215C6E20496E616D653A2044656D6F6E5C6E20497569643A207073696F6E385C6E20497077643A207365637265745C6E204974656C3A202B3132333435363738393031323334355C6E204969703A203132332E3132332E3132332E3132335C6E2049646E73313A203132332E3132332E3132332E3132335C6E, 447765222312        
-SmsRx= 440C9144775622322100F530903081505140230B0504157F157F00030402022049646E73323A203132332E3132332E3132332E313234, 447765222312       
-SmsStartRxDelay= 4207, 1, 2
-
-[test429]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsTxPause= 2
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsTx=00, 447765222312,12, 01A0, 0
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx= 440C9144775622322100F5309050014521408C0B050415821582000305020133303432463435303A30413030343830453A30313030303030303A30303030303030303A30303030303030303A30303030303030303A30303030303031453A30303030303030303A30323030303030303A32313030303030313A30303032303030303A30303231303030303A30313030303230303A30303030323133433A3733, 447765222312        
-SmsRx= 440C9144775622322100F5309050014571403F0B05041582158200030502023339394343323A30373145373032313A32323841303532323A38323038413238383A32313232464133443A3232383230384132, 447765222312       
-SmsStartRxDelay= 4207, 1, 2
-
-[test431]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=
-440C9144775622322100F530600351120340580605040B840B8459060A03AE81EAAF828DC4B48401056A0045C60D0373796D6269616E2E636F6D00110353492F34393534372F323738000AC3072003061613205310C3072003063013205807010320414C45525420000101, 447765222315
-SmsStartRxDelay= 0, 0, 1
-
-[test441]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=
-440C9144775622322100F53080103112444056040402010159060A03AE81EAAF828DC4B48401056A0045C60D0373796D6269616E2E636F6D00110353492F34393534372F323738000AC3072003061613205310C3072003063013205807010320414C45525420000101, 447765222315
-SmsStartRxDelay= 0, 0, 1
-
-
-[test2]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsTxPause= 2
-SmsTx=55000C914477562232510000A79F0500030002015EAFE97059A4156930184C068B8184C563D2A9B30E83CCA29318946E5E6E6B513A4D3E9DBA980BB679B985C563D2A9B316AD452775F3720F83D4E2F1294D16A7BA66B1484D3A8F9B977B4A0D52AB531DB5E8A406A9496B71F37213A9536A504AD5C960B0188C068B5161B3190C06D36E5E6E22B5E824EA6430580C4683C5A830DA0C06836901, 447765222315,12, 01A0, 0
-SmsTx=55000C914477562232510000A716050003000202362FF7B4DA6C06A5595DB33C9F03, 447765222315,12, 01A0, 0
-SmsTx=15000C914477562232510000A794AFD774B82CD28A34180C2683C940E173DA7D0635CB657ADA7DDEBCDCC4E274284D42A9C9A7532794A7E9EE721E14769341CAFA9C9E7683E86F90BC6C4F97EF2077F95E9ED34170F91BFE9E87D9A076985E96A7C3ECCDCB3D6406A7531D549AB406A9C5CDCB5D741275D6A2B5E8A46E5EEEA293A8B30E83CCA29318946E5EF2CDCB0D, 447765222315,12, 01A0, 0
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=  440C914477562232510000306062516261409F0500030F02015EAFE97059A4156930184C068B8184C563D2A9B30E83CCA29318946E5E6E6B513A4D3E9DBA980BB679B985C563D2A9B316AD452775F3720F83D4E2F1294D16A7BA66B1484D3A8F9B977B4A0D52AB531DB5E8A406A9496B71F37213A9536A504AD5C960B0188C068B5161B3190C06D36E5E6E22B5E824EA6430580C4683C5A830DA0C06836901, 447765222315
-SmsRx=440C91447756223251000030606251620240160500030F0202362FF7B4DA6C06A5595DB33C9F03, 447765222315
-SmsRx=040C9144775622325100003060626191124094AFD774B82CD28A34180C2683C940E173DA7D0635CB657ADA7DDEBCDCC4E274284D42A9C9A7532794A7E9EE721E14769341CAFA9C9E7683E86F90BC6C4F97EF2077F95E9ED34170F91BFE9E87D9A076985E96A7C3ECCDCB3D6406A7531D549AB406A9C5CDCB5D741275D6A2B5E8A46E5EEEA293A8B30E83CCA29318946E5EF2CDCB0D, 447765222315
-SmsStartRxDelay= 4207, 1, 3
-
-[test3]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsTxPause= 2
-SmsTx=15000C914477562232510000A795AFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95B86DBF2B07BF3926F5E6EA76E196E8BDFE474D8BD79C9372FF7537AD42DC36D79D83D7D9BE9F7B0BCBC79C9372F373549651675C3E273F3926F5E6E66505864EA927376DA7DA6BFDD9B977CF372179D449D75189412372FF9E6E506, 447765222315,12, 01A0, 0
-SmsTx=15000C914477562232510000A78EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203, 447765222315,12, 01A0, 0
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=040C9144775622325100003060724135804095AFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95B86DBF2B07BF3926F5E6EA76E196E8BDFE474D8BD79C9372FF7537AD42DC36D79D83D7D9BE9F7B0BCBC79C9372F373549651675C3E273F3926F5E6E66505864EA927376DA7DA6BFDD9B977CF372179D449D75189412372FF9E6E506, 447765222315
-SmsRx=040C914477562232510000306062113084408EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203, 447765222315
-SmsStartRxDelay= 4207, 1, 2
-
-[test123]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsTxPause= 2
-SmsTx= 15000C914477562232510000A78EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203, 447765222315,12, 01A0, 0
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=  040C914477562232510000306062113084408EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203, 447765222315
-SmsStartRxDelay= 4207, 1, 1
-
-[test5]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=  440C9144775622325100F530600351120340580605040B840B8459060A03AE81EAAF828DC4B48401056A0045C60D0373796D6269616E2E636F6D00110353492F34393534372F323738000AC3072003061613205310C3072003063013205807010320414C45525420000101, 447765222315
-SmsStartRxDelay= 0, 0, 3
-
-[test6]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsTxPause= 2
-SmsTx= 15000C914477562232510000A78EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203, 447765222315,12, 01A0, 0
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=  040C914477562232510000306062113084408EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203, 447765222315
-SmsStartRxDelay= 4207, 1, 1
-
-[test7]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=
-440C9144775622325100F530600351120340580605040B840B8459060A03AE81EAAF828DC4B48401056A0045C60D0373796D6269616E2E636F6D00110353492F34393534372F323738000AC3072003061613205310C3072003063013205807010320414C45525420000101, 447765222315
-SmsStartRxDelay= 0, 0, 1
-
-[test8]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=  440C9144775622325100F530600351120340580605040B840B8459060A03AE81EAAF828DC4B48401056A0045C60D0373796D6269616E2E636F6D00110353492F34393534372F323738000AC3072003061613205310C3072003063013205807010320414C45525420000101, 447765222315
-SmsRx=  440C9144775622325100F530600351120340580605040B840B8459060A03AE81EAAF828DC4B48401056A0045C60D0373796D6269616E2E636F6D00110353492F34393534372F323738000AC3072003061613205310C3072003063013205807010320414C45525420000101, 447765222315
-SmsStartRxDelay= 0, 0, 2
-
-[test9]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx=
-440C9144775622325100F530600351120340580605040B840B8459060A03AE81EAAF828DC4B48401056A0045C60D0373796D6269616E2E636F6D00110353492F34393534372F323738000AC3072003061613205310C3072003063013205807010320414C45525420000101, 447765222315
-SmsStartRxDelay= 0, 0, 1
-
-[test10]
-DiallingPauseDuration= 3
-ConnectingPauseDuration= 1
-DisconnectingPauseDuration= 5
-AnswerIncomingPauseDuration= 5
-SmsTxPause= 2
-SmsTx= 15000C914477562232510000A791AFD774B864C284381A48583C269D3AEB3028256E5EF2CDCB6D2D4AA7C9A7532773C5362FF9E6E5363A75CA307BF3926F5E6EA74E19666F5EF2CDCBFD941E75D0B07BFA36D3EF617979F3926F5E6E6A92CA2CEA886979794C7FCB372FF9E6E566068545A62E3967A7DD67FADBBD79C9372F77D149D45987412971F3926F5E6E, 447765222315,12,01A0, 0
-SmsAckNackPause= 1
-SmsRxPeriod= 2
-SmsRx= 040C9144775622325100003070700103634091AFD774B864C284381A48583C269D3AEB3028256E5EF2CDCB6D2D4AA7C9A7532773C5362FF9E6E5363A75CA307BF3926F5E6EA74E19666F5EF2CDCBFD941E75D0B07BFA36D3EF617979F3926F5E6E6A92CA2CEA886979794C7FCB372FF9E6E566068545A62E3967A7DD67FADBBD79C9372F77D149D45987412971F3926F5E6E,447765222315
-SmsStartRxDelay= 4207, 1, 1

--- a/wapstack/wapmessageapi/te_wapstack/testdata/WapStackSuite.ini	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,404 +0,0 @@
-[COMMON]
-Bearer=3
-Remote_Host=+447765222312
-Local_Host=+447765222312
-Remote_Port=226
-Local_Port=226
-TimeOut=0
-ExError=0
-ExError2=0
-SimTsy=true
-TsyState=411
-WSPHeaderLength=50
-WSPBodyLength=50
-WDPBufLength=30
-AwaitLengthCancel=false
-MiddleCancel=false
-MultiReadCancel=false
-AwaitLengthTwice=false
-DetailedLogging=true
-Secure=0
-WSPMethod=1
-WSPHeaders=GET:
-WSPBody=EMPTY-001-002-003-004-005-006-007-END
-WSPURI=http://wap.wapgateway.com
-
-
-[Test_2.1]
-Bearer=2
-DelayPortClosure=true
-
-[Test_2.1.1]
-Bearer=2
-ExError=-5498
-
-[Test_2.1.2]
-Bearer=2
-Local_Port=5501
-
-[Test_2.1.3]
-Bearer=2
-Local_Port=5502
-
-[Test_2.2]
-Bearer=3
-
-[Test_2.3]
-Bearer=4
-
-[Test_2.4]
-Bearer=5
-
-[Test_2.5]
-Bearer=1
-
-[Test_2.6]
-Bearer=0
-
-[Test_2.7]
-Bearer=-1
-ExError=-5499
-
-[Test_2.8]
-Bearer=3
-Secure=true
-ExError=-5
-
-[Test_2.9]
-Bearer=0
-ExError=-5499
-
-[Test_2.10]
-Bearer=3
-Reconnect=true
-ExError=-14
-
-// API Request without connect 
-[Test_3]
-ExError=-18
-
-// Send and receive VCARD For Bound WDP (single read)
-[Test_4.1.1]
-Bearer=3
-Local_Port=226
-Remote_Port=226
-Type=VCARD
-TsyState=411
-WDPBufLength=118
-Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n
-
-// Send and receive VCARD For Bound WDP(Multi read)
-[Test_4.1.2]
-Bearer=3
-Local_Port=226
-Remote_Port=226
-Type=VCARD
-TsyState=411
-WDPBufLength=30
-Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n
-
-// Send and receive VCALENDAR For Bound WDP(single read)
-[Test_4.1.3]
-Bearer=2
-Local_Port=228
-Remote_Port=228
-TsyState=413
-Type=VCALENDAR
-WDPBufLength=512
-Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n
-
-// Send and receive VCALENDAR For Bound WDP(single read)
-[Test_4.1.4]
-Bearer=2
-Local_Port=228
-Remote_Port=228
-TsyState=413
-Type=VCALENDAR
-WDPBufLength=80
-Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n
-
-// Send and receive VCARD For Bound WDP (single read)
-[Test_4.1.5]
-Bearer=2
-Local_Port=226
-Remote_Port=226
-Type=VCARD
-TsyState=415
-WDPBufLength=118
-Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n
-
-// Send and receive Ring Tone for Bound WDP
-[Test_4.1.5.1]
-Bearer=3
-Local_Port=5505
-Remote_Port= 5505
-Type= RINGTONE
-TsyState=426
-Data=024A3A5931BDBDB995E4040044D8F511416615613611624D2544585985584D85185525585584584D84585584584D8934C511624C30DB0D30B38000
-
-// Send and receive Email notification for Bound WDP
-[Test_4.1.5.2]
-Bearer=3
-Local_Port=5512
-Remote_Port= 5512
-Type= EMAILNOTIFICATION
-TsyState=427
-Data=1 new email message\n From: Kamran Nobari <Kamran.Nobari@Symbian.com>\n Subject: test only, please ignore\n size: 42KB\n att:1\n To: Someone <someone@nowhere.com>\n Date: 3 September 2003 +0000\n sender:Kamran.Nobari@symbian.com\n reply-to: someone.else@Symbian.com\n fldr: user.smartme.this.folder.is.for.junk.mail\n
-
-// Send and receive Internet Access configuration for Bound WDP
-[Test_4.1.5.3]
-Bearer=3
-Local_Port=5503
-Remote_Port= 5503
-Type= IACONFIG
-TsyState=428
-Data= Welcome!\n Iname: Demon\n Iuid: psion8\n Ipwd: secret\n Itel: +123456789012345\n Iip: 123.123.123.123\n Idns1: 123.123.123.123\n Idns2: 123.123.123.124
-
-// Send and receive operator logo for Bound WDP
-[Test_4.1.5.4]
-Bearer=3
-Local_Port=5506
-Remote_Port= 5506
-Type=OprtrLogo
-TsyState=429
-Data=3042F450:0A00480E:01000000:00000000:00000000:00000000:0000001E:00000000:02000000:21000001:00020000:00210000:01000200:0000213C:73399CC2:071E7021:228A0522:8208A288:2122FA3D:228208A2
-
-// Cancel For Bound WDP
-[Test_4.1.6]
-Bearer=3
-Local_Port=226
-Remote_Port=226
-Type=VCARD
-TsyState=411
-WDPBufLength=30
-AwaitLengthCancel=true
-ExError=-3
-Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n
-
-// Cancel For Bound WDP
-[Test_4.1.7]
-Bearer=3
-Local_Port=226
-Remote_Port=226
-Type=VCARD
-TsyState=411
-WDPBufLength=30
-MiddleCancel=true
-ExError=-3
-Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n
-
-// Cancel For Bound WDP
-[Test_4.1.8]
-Bearer=3
-Local_Port=226
-Remote_Port=226
-Type=VCARD
-TsyState=411
-WDPBufLength=30
-MultiReadCancel=true
-ExError=-3
-Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n
-
-// AwaitDataSize twice
-[Test_4.1.9]
-Bearer=3
-Local_Port=226
-Remote_Port=226
-Type=VCARD
-TsyState=411
-WDPBufLength=30
-AwaitLengthTwice=true
-ExError=-14
-Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n
-
-// Send and receive VCALENDAR For FullySpec WDP(single read)
-[Test_4.2.1]
-Bearer=3
-Local_Port=1
-Remote_Port=1
-Type=VCALENDAR
-TsyState=421
-WDPBufLength=118
-Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n
-
-// Send and receive VCALENDAR For FullySpec WDP(multi read)
-[Test_4.2.2]
-Bearer=3
-Local_Port=1
-Remote_Port=1
-Type=VCALENDAR
-TsyState=421
-WDPBufLength=30
-Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n
-
-// Send and receive VCALENDAR For FullySpec WDP(single read)
-[Test_4.2.3]
-Bearer=2
-Local_Port=1
-Remote_Port=1
-Type=VCALENDAR
-TsyState=423
-WDPBufLength=512
-Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n
-
-// Send and receive VCALENDAR For FullySpec WDP(Multi read)
-[Test_4.2.4]
-Bearer=2
-Local_Port=1
-Remote_Port=1
-Type=VCALENDAR
-TsyState=423
-WDPBufLength=30
-Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n
-
-// Send and receive VCALENDAR For FullySpec WDP(Multi read)
-[Test_4.2.5]
-Bearer=3
-Local_Port=1
-Remote_Port=1
-Type=VCALENDAR
-TsyState=425
-WDPBufLength=30
-Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n
-
-// Cancell receiving VCALENDAR For FullySpec WDP
-[Test_4.2.6]
-Bearer=3
-Local_Port=1
-Remote_Port=1
-Type=VCALENDAR
-TsyState=425
-WDPBufLength=30
-AwaitLengthCancel=true
-ExError=-3
-Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n
-
-// Cancell receiving VCALENDAR For FullySpec WDP
-[Test_4.2.7]
-Bearer=3
-Local_Port=1
-Remote_Port=1
-Type=VCALENDAR
-TsyState=425
-WDPBufLength=30
-MiddleCancel=true
-ExError=-3
-Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n
-
-// Cancell receiving VCALENDAR For FullySpec WDP
-[Test_4.2.8]
-Bearer=3
-Local_Port=1
-Remote_Port=1
-Type=VCALENDAR
-TsyState=425
-ExError=-3
-WDPBufLength=30
-MultiReadCancel=true
-Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n
-
-[Test_4.2.9]
-Bearer=3
-Local_Port=1
-Remote_Port=1
-Type=VCALENDAR
-TsyState=425
-WDPBufLength=30
-AwaitLengthTwice=true
-ExError=-14
-Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n
-
-
-//AwaitPush For Bound API
-[Test_4.3.1]
-Bearer=3
-Local_Port=2948
-Remote_Port=2948
-TsyState=431
-
-//AwaitPush For Bound API
-[Test_4.3.2]
-Bearer=3
-Local_Port=2948
-Remote_Port=2948
-TsyState=431
-WSPHeaderLength=512
-WSPBodyLength=512
-
-[Test_4.3.3]
-Bearer=3
-Local_Port=2948
-Remote_Port=2948
-TsyState=431
-MiddleCancel=true
-ExError=-3
-
-[Test_4.3.4]
-Bearer=3
-Local_Port=2948
-Remote_Port=2948
-TsyState=431
-MultiReadCancel=true
-ExError=-3
-
-//AwaitPush For FullySpec API
-[Test_4.4.1]
-Bearer=3
-Local_Port=1
-Remote_Port=1
-TsyState=441
-
-//AwaitPush For FullySpec API
-[Test_4.4.2]
-Bearer=3
-Local_Port=1
-Remote_Port=1
-TsyState=441
-WSPHeaderLength=512
-WSPBodyLength=512
-
-//AwaitPush For FullySpec API
-[Test_4.4.3]
-Bearer=3
-Local_Port=1
-Remote_Port=1
-TsyState=441
-MiddleCancel=true
-ExError=-3
-
-//AwaitPush For FullySpec API
-[Test_4.4.4]
-Bearer=3
-Local_Port=1
-Remote_Port=1
-TsyState=441
-MultiReadCancel=true
-ExError=-3
-
-
-//TimeOut
-[Test_6.1]
-Local_Port=2948
-Remote_Port=2948
-WSPHeaderLength=10
-WSPBodyLength=10
-TimeOut=100000
-ExError=-33
-
-//Wrong Sequence
-[Test_7.1]
-WDPBufLength=10
-WSPHeaderLength=10
-WSPBodyLength=10
-TsyState=411
-ExError=-14
-
-//Invalid parameter
-[Test_8]
-WSPMethod=0x30
-WSPHeaders=GET:
-WSPBody=EMPTY-001-002-003-004-005-006-007-END
-WSPURI=http://wap.wapgateway.com
-ExError=-5448
-ExError2=-6
-

--- a/wapstack/wapmessageapi/te_wapstack/testdata/WapStackSuite.xml	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,859 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2003-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:
- CommDB Settings File
- All Rights Reserved
-
--->
-
-
-
-<CommDB:Config xmlns="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:CommDB="SymbianOS.Generic.Comms-Infras.CommDB"
-               xmlns:xlink="http://www.w3.org/1999/xlink"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="SymbianOS.Generic.Comms-Infras.CommDB CommDB.xsd">
-
-<InformationTable>
-</InformationTable>
-
-<NetworkTable>
-    <Network operation="add">
-        <Name>Intranet</Name>
-    </Network>
-</NetworkTable>
-
-<IAPTable>
-    <IAP operation="add">
-        <Name>Pipex CSD IR</Name>
-        <IAPService>DialOutISP.TEST Network </IAPService>
-        <IAPBearer>ModemBearer.GSM Mobile Phone via Serial</IAPBearer>
-        <IAPNetwork>Network.Intranet</IAPNetwork>
-        <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Office Direct Dial</LocationRef>
-    </IAP>
-</IAPTable>
-
-<ModemBearerTable>
-    <ModemBearer operation="template">
-        <Name>Default Modem</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>SIM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>0</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>0</XonChar>
-        <XoffChar>0</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>AT</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+44123456789</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>30</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-    </ModemBearer>
-    <ModemBearer operation="add">
-        <Name>GSM Mobile Phone via Serial 01</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>SIM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>196</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+447785016005</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>30</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-    </ModemBearer>    
-    <ModemBearer operation="add">
-        <Name>GSM Mobile Phone via Serial</Name>
-        <Agent>CSD.agt</Agent>
-        <IfName>PPP</IfName>
-        <PortName>COMM::0</PortName>
-        <TSYName>SIM</TSYName>
-        <CSYName>ECUART</CSYName>
-        <DataBits>8</DataBits>
-        <StopBits>1</StopBits>
-        <Parity>NONE</Parity>
-        <Rate>115200</Rate>
-        <Handshaking>196</Handshaking>
-        <SpecialRate>0</SpecialRate>
-        <XonChar>17</XonChar>
-        <XoffChar>19</XoffChar>
-        <FaxClassPref>AUTO</FaxClassPref>
-        <SpeakerPref>NEVER</SpeakerPref>
-        <SpeakerVolPref>QUIET</SpeakerVolPref>
-        <ModemInitString>ATZ</ModemInitString>
-        <DataInitString>AT</DataInitString>
-        <FaxInitString>AT</FaxInitString>
-        <DialPauseLength>S8=</DialPauseLength>
-        <SpeakerVolContorlLow>L0</SpeakerVolContorlLow>
-        <SpeakerVolControlMedium>L1</SpeakerVolControlMedium>
-        <SpeakerVolControlHigh>L2</SpeakerVolControlHigh>
-        <SpeakerAlwaysOff>M0</SpeakerAlwaysOff>
-        <SpeakerOnUntilCarrier>M1</SpeakerOnUntilCarrier>
-        <SpeakerAlwaysOn>M2</SpeakerAlwaysOn>
-        <SpeakerOnAfterUntilCarrier>M3</SpeakerOnAfterUntilCarrier>
-        <DialToneWaitModifier>W</DialToneWaitModifier>
-        <CallProgress1>X1</CallProgress1>
-        <CallProgress2>X2</CallProgress2>
-        <CallProgress3>X3</CallProgress3>
-        <CallProgress4>X4</CallProgress4>
-        <EchoOff>E0</EchoOff>
-        <VerboseText>V1</VerboseText>
-        <QuietOff>Q0</QuietOff>
-        <QuietOn>Q1</QuietOn>
-        <DialCommandStateModifier>;</DialCommandStateModifier>
-        <OnLine>O</OnLine>
-        <ResetConfiguration>Z</ResetConfiguration>
-        <ReturnToFactoryDefs>&amp;F</ReturnToFactoryDefs>
-        <DCDOnDuringLink>&amp;C1</DCDOnDuringLink>
-        <DTRHangUp>&amp;D2</DTRHangUp>
-        <DSRAlwaysOn>&amp;S0</DSRAlwaysOn>
-        <RTSCTSHandshake>&amp;K3</RTSCTSHandshake>
-        <XonXoffHandshake>&amp;K4</XonXoffHandshake>
-        <EscapeCharacter>+</EscapeCharacter>
-        <EscapeGuardPeriod>S12</EscapeGuardPeriod>
-        <NoDialTone>NO DIAL TONE</NoDialTone>
-        <Busy>BUSY</Busy>
-        <NoAnswer>NO ANSWER</NoAnswer>
-        <Carrier>CARRIER</Carrier>
-        <Connect>CONNECT</Connect>
-        <CompressionClass5>COMPRESSION:CLASS 5</CompressionClass5>
-        <CompressionV42bis>COMPRESSION:V.42 bis</CompressionV42bis>
-        <CompressionNone>COMPRESSION:NONE</CompressionNone>
-        <ProtocolLAPD>PROTOCOL:LAPD</ProtocolLAPD>
-        <ProtocolALT>PROTOCOL:ALT</ProtocolALT>
-        <ProtocolALTCELLULAR>PROTOCOL:ALT-CELLULAR</ProtocolALTCELLULAR>
-        <ProtocolNone>PROTOCOL:NONE</ProtocolNone>
-        <MessageCentreNumber>+447785016005</MessageCentreNumber>
-        <MessageValidityPeriod>1440</MessageValidityPeriod>
-        <MessageDeliveryReport>FALSE</MessageDeliveryReport>
-        <MinimumSignalLevel>9905</MinimumSignalLevel>
-        <LastSocketActivityTimeout>30</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>180</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>30</LastSocketClosedTimeout>
-    </ModemBearer>
-</ModemBearerTable>
-
-<LANBearerTable>
-    <LANBearer operation="add">
-        <Name>Assabet on-board Ethernet</Name>
-        <Agent>nullagent.agt</Agent>
-        <IfName>ethint</IfName>
-        <LDDName>not used</LDDName>
-        <PDDName>not used</PDDName>
-        <LastSocketActivityTimeout>-1</LastSocketActivityTimeout>
-        <LastSessionClosedTimeout>-1</LastSessionClosedTimeout>
-        <LastSocketClosedTimeout>-1</LastSocketClosedTimeout>
-    </LANBearer>
-</LANBearerTable>
-
-<LANServiceTable>
-    <LANService operation="add">
-        <Name>Ethernet</Name>
-        <IfNetworks>ip,ip6</IfNetworks>
-        <IpNetMask>255.255.255.0</IpNetMask>
-        <IpGateway>194.72.6.1</IpGateway>
-        <IpAddr>192.168.0.100</IpAddr>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <IpNameServer1>194.72.6.51</IpNameServer1>
-        <IpNameServer2>194.72.6.52</IpNameServer2>
-    </LANService>
-</LANServiceTable>
-
-<DialInISPTable>
-    <DialInISP operation="template">
-        <Name>Default Dial In ISP</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-    <DialInISP operation="add">
-        <Name>Dial In ISP01</Name>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <UseEdge>FALSE</UseEdge>
-    </DialInISP>
-</DialInISPTable>
-
-<DialOutISPTable>
-    <DialOutISP operation="template">
-        <Name>Default Dial Out ISP</Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>TRUE</PromptForLogin>
-        <IfPromptForAuth>TRUE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-    <DialOutISP operation="add">
-        <Name>TEST0 Network </Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>dial in test network </Description>
-        <Type>INTERNETANDWAP</Type>
-        <DefaultTelNum>02075632200</DefaultTelNum>
-        <LoginName>wapusr</LoginName>
-        <LoginPass>train</LoginPass>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>wapusr</IfAuthName>
-        <IfAuthPass>train</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>    
-    <DialOutISP operation="add">
-        <Name>TEST Network </Name>
-        <DialResolution>TRUE</DialResolution>
-        <UseLoginScript>FALSE</UseLoginScript>
-        <PromptForLogin>FALSE</PromptForLogin>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <Description>dial in test network </Description>
-        <Type>INTERNETANDWAP</Type>
-        <DefaultTelNum>02075632200</DefaultTelNum>
-        <LoginName>wapusr</LoginName>
-        <LoginPass>train</LoginPass>
-        <DisplayPCT>FALSE</DisplayPCT>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>wapusr</IfAuthName>
-        <IfAuthPass>train</IfAuthPass>
-        <AuthRetries>0</AuthRetries>
-        <IfCallbackEnabled>FALSE</IfCallbackEnabled>
-        <CallbackTimeout>0</CallbackTimeout>
-        <IpNameServer1>158.43.128.1</IpNameServer1>
-        <IpNameServer2>158.43.192.1</IpNameServer2>
-        <EnableIPHeaderComp>FALSE</EnableIPHeaderComp>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <EnableSWComp>FALSE</EnableSWComp>
-        <BearerService>0</BearerService>
-        <BearerName>ASYNCHRONOUS</BearerName>
-        <BearerSpeed>UNSPECIFIED</BearerSpeed>
-        <BearerCE>UNSPECIFIED</BearerCE>
-        <BearerType>CSD</BearerType>
-        <ChannelCoding>UNSPECIFIED</ChannelCoding>
-        <AIUR>UNSPECIFIED</AIUR>
-        <RequestedTimeSlots>0</RequestedTimeSlots>
-        <MaximumTimeSlots>0</MaximumTimeSlots>
-        <BearerProtocol>0</BearerProtocol>
-        <RlpVersion>0</RlpVersion>
-        <IwfToMs>0</IwfToMs>
-        <MsToIwf>0</MsToIwf>
-        <AckTimer>0</AckTimer>
-        <RetransmissionAttempts>0</RetransmissionAttempts>
-        <ResequencePeriod>0</ResequencePeriod>
-        <V42Compression>0</V42Compression>
-        <V42Codewords>0</V42Codewords>
-        <V42MaxLength>0</V42MaxLength>
-        <Asymmetry>0</Asymmetry>
-        <UserInitUpgrade>FALSE</UserInitUpgrade>
-        <UseEdge>FALSE</UseEdge>
-    </DialOutISP>
-</DialOutISPTable>
-
-<AgentLookupTable>
-</AgentLookupTable>
-
-<CDMA2000PacketServiceTable>
-    <CDMA2000PacketService operation="add">
-        <Name>test name cdma2000</Name>
-        <IwfName>Test2000</IwfName>
-        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
-        <PdpType>IPV4</PdpType>
-        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
-        <ReqRevPriority>PRIORITY04</ReqRevPriority>
-        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
-        <ReqRevBitrate>32KBPS</ReqRevBitrate>
-        <ReqFwdLoss>LOSS1</ReqFwdLoss>
-        <ReqRevLoss>LOSS1</ReqRevLoss>
-        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
-        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
-        <MinFwdBitrate>32KBPS</MinFwdBitrate>
-        <MinRevBitrate>32KBPS</MinRevBitrate>
-        <AccptFwdLoss>LOSS2</AccptFwdLoss>
-        <AccptRevLoss>LOSS2</AccptRevLoss>
-        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
-        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <AuthRetries>1</AuthRetries>
-        <IpNetMask>0.255.255.255</IpNetMask>
-        <IpGateway>10.0.0.1</IpGateway>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <EnableLCPExtension>TRUE</EnableLCPExtension>
-        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
-        <ApType>2</ApType>
-        <QosWarningTimeout>1000000</QosWarningTimeout>
-        <RlpMode>TRANSPARENT</RlpMode>
-        <CDMAMobileIP>FALSE</CDMAMobileIP>
-        <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
-    </CDMA2000PacketService>
-</CDMA2000PacketServiceTable>
-
-<DefaultCDMA2000Table>
-</DefaultCDMA2000Table>
-
-<ChargecardTable>
-    <Chargecard operation="add">
-        <Name>Dummy BT Chargecard</Name>
-        <AccountNumber>144,12345678</AccountNumber>
-        <Pin>0000</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>HFG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-    <Chargecard operation="add">
-        <Name>Dummy Mercury Chargecard</Name>
-        <AccountNumber>0500800800,,12345678</AccountNumber>
-        <Pin>****</Pin>
-        <LocalRule>HG</LocalRule>
-        <NatRule>J,K,0FG</NatRule>
-        <IntlRule>HEFG</IntlRule>
-    </Chargecard>
-</ChargecardTable>
-
-<ConnectionPreferencesTable>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable1</Name>
-        <Ranking>1</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>DONOTPROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Pipex CSD IR</IAPRef>
-    </ConnectionPreferences>
-    <ConnectionPreferences operation="add">
-        <Name>ConnectionPreferencesTable2</Name>
-        <Ranking>2</Ranking>
-        <Direction>OUTGOING</Direction>
-        <DialogPref>DONOTPROMPT</DialogPref>
-        <BearerSet>CSD</BearerSet>
-        <IAPRef>IAP.Pipex CSD IR</IAPRef>
-    </ConnectionPreferences>
-</ConnectionPreferencesTable>
-
-<GlobalSettingsTable>
-    <GlobalSettings operation="add">
-        <Name>GlobalSettingsTable1</Name>
-        <WAPAccess>WAPAccessPoint.Default Dial In ISP</WAPAccess>
-        <RedialAttempts>3</RedialAttempts>
-        <SmsBearer>WAPSMSBearer.WAPSMSBearerTable1</SmsBearer>
-        <SmsReceiveMode>2</SmsReceiveMode>
-        <GPRSAttachMode>1</GPRSAttachMode>
-        <AcceptIncomingGprs>1</AcceptIncomingGprs>
-        <ConnectionAttempts>2</ConnectionAttempts>
-        <ModemForDataAndFax>2</ModemForDataAndFax>
-        <ModemForPhoneServicesAndSMS>2</ModemForPhoneServicesAndSMS>
-        <LocationForDataAndFax>Location.Office</LocationForDataAndFax>
-        <LocationForPhoneServicesAndSMS>Location.Office</LocationForPhoneServicesAndSMS>
-        <GPRSClassCBearer>GSM</GPRSClassCBearer>
-        <DefaultNetwork>Network.Intranet</DefaultNetwork>
-        <BearerAvailabilityCheckTSY>mm</BearerAvailabilityCheckTSY>
-    </GlobalSettings>
-</GlobalSettingsTable>
-
-<IncomingGPRSTable>
-    <IncomingGPRS operation="add">
-        <Name>Incoming GPRS Settings PlaceHolder</Name>
-        <APN>Test</APN>
-        <PDPType>IPV4</PDPType>
-        <PDPAddress>0.0.0.0</PDPAddress>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-        <ReqPrecedence>1</ReqPrecedence>
-        <ReqDelay>1</ReqDelay>
-        <ReqReliability>1</ReqReliability>
-        <ReqPeakThroughput>1</ReqPeakThroughput>
-        <ReqMeanThroughput>1</ReqMeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <IfAuthName>RasUser</IfAuthName>
-        <IfAuthPass>pass</IfAuthPass>
-        <AuthRetries>1</AuthRetries>
-        <IpNameServer1>0.0.0.0</IpNameServer1>
-        <IpNameServer2>0.0.0.0</IpNameServer2>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-    </IncomingGPRS>
-</IncomingGPRSTable>
-
-<OutgoingGPRSTable>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS01</Name>
-        <APN>gprs01APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS02</Name>
-        <APN>gprs02APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-    <OutgoingGPRS operation="add">
-        <Name>GPRS03</Name>
-        <APN>gprs03APNPlaceHolder</APN>
-        <PDPType>IPV4</PDPType>
-        <IfPromptForAuth>FALSE</IfPromptForAuth>
-        <IpAddrFromServer>TRUE</IpAddrFromServer>
-        <IpDNSAddrFromServer>FALSE</IpDNSAddrFromServer>
-        <ReqPrecedence>0</ReqPrecedence>
-        <ReqDelay>0</ReqDelay>
-        <ReqReliability>0</ReqReliability>
-        <ReqPeakThroughput>0</ReqPeakThroughput>
-        <ReqMeanThroughput>0</ReqMeanThroughput>
-        <MinPrecedence>0</MinPrecedence>
-        <MinDelay>0</MinDelay>
-        <MinReliability>0</MinReliability>
-        <MinPeakThroughput>0</MinPeakThroughput>
-        <MinMeanThroughput>0</MinMeanThroughput>
-        <DataCompression>FALSE</DataCompression>
-        <HeaderCompression>FALSE</HeaderCompression>
-        <AnonymousAccess>FALSE</AnonymousAccess>
-        <IfNetworks>ip</IfNetworks>
-        <AuthRetries>1</AuthRetries>
-        <EnableLCPExtension>FALSE</EnableLCPExtension>
-        <DisablePlainTextAuth>FALSE</DisablePlainTextAuth>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <GprsAccessPointType>0</GprsAccessPointType>
-        <QosWarningTimeout>0</QosWarningTimeout>
-    </OutgoingGPRS>
-</OutgoingGPRSTable>
-
-<DefaultGPRSTable>
-    <DefaultGPRS operation="add">
-        <Name>Dummy Default GPRS Settings</Name>
-        <APN>Access point name</APN>
-        <PDPType>IPV6</PDPType>
-        <PDPAddress>www.wid.com</PDPAddress>
-        <Usage>1</Usage>
-        <Precedence>1</Precedence>
-        <Delay>1</Delay>
-        <Reliability>1</Reliability>
-        <PeakThroughput>1</PeakThroughput>
-        <MeanThroughput>1</MeanThroughput>
-        <MinPrecedence>1</MinPrecedence>
-        <MinDelay>1</MinDelay>
-        <MinReliability>1</MinReliability>
-        <MinPeakThroughput>1</MinPeakThroughput>
-        <MinMeanThroughput>1</MinMeanThroughput>
-        <DataCompression>TRUE</DataCompression>
-        <HeaderCompression>TRUE</HeaderCompression>
-        <GprsUseEdge>FALSE</GprsUseEdge>
-        <AnonymousAccess>TRUE</AnonymousAccess>
-    </DefaultGPRS>
-</DefaultGPRSTable>
-
-<ProxyTable>
-    <Proxy operation="add">
-        <Name>ProxyTable1</Name>
-        <ISPRef>DialOutISP.TEST Network </ISPRef>
-        <UseProxyServer>TRUE</UseProxyServer>
-        <ProtocolName>http</ProtocolName>
-        <ProxyServerName>www.dummyproxy.com</ProxyServerName>
-        <PortNumber>80</PortNumber>
-        <Exceptions>www.dummyproxy.com/exception</Exceptions>
-    </Proxy>
-</ProxyTable>
-
-<LocationTable>
-    <Location operation="template">
-        <Name>Default Location</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-        <DialOutCode>9,</DialOutCode>
-    </Location>
-        <Location operation="add">
-        <Name>Office temp</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-    </Location>
-    <Location operation="add">
-        <Name>Office Direct Dial</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>171</AreaCode>
-    </Location>
-    <Location operation="add">
-        <Name>Mobile</Name>
-        <Mobile>TRUE</Mobile>
-        <UsePulseDial>FALSE</UsePulseDial>
-        <WaitForDialTone>FALSE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>+</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-    </Location>
-    <Location operation="add">
-        <Name>Home</Name>
-        <Mobile>FALSE</Mobile>
-        <UsePulseDial>TRUE</UsePulseDial>
-        <WaitForDialTone>TRUE</WaitForDialTone>
-        <PauseAfterDialout>0</PauseAfterDialout>
-        <IntlPrefixCode>00</IntlPrefixCode>
-        <NatPrefixCode>0</NatPrefixCode>
-        <NatCode>44</NatCode>
-        <AreaCode>181</AreaCode>
-    </Location>
-</LocationTable>
-
-<SecureSocketTable>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable1</Name>
-        <ProtocolName>ssl3.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-    <SecureSocket operation="add">
-        <Name>SecureSocketTable2</Name>
-        <ProtocolName>tls1.0</ProtocolName>
-        <ProtoLibrary>ssladaptor.dll</ProtoLibrary>
-    </SecureSocket>
-</SecureSocketTable>
-
-<BTDeviceTable>
-</BTDeviceTable>
-
-<BTPersistTable>
-</BTPersistTable>
-
-<BTSecurityTable>
-</BTSecurityTable>
-
-<BTDefaultTable>
-</BTDefaultTable>
-
-<WAPAccessPointTable>
-    <WAPAccessPoint operation="template">
-        <Name>Default Dial In ISP</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-    </WAPAccessPoint>
-    <WAPAccessPoint operation="add">
-        <Name>Dummy1 WAP Settings</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-        <StartPage>www.wapstart.com</StartPage>
-    </WAPAccessPoint>    
-    <WAPAccessPoint operation="add">
-        <Name>Dummy WAP Settings</Name>
-        <CurrentBearer>WAPIPBearer</CurrentBearer>
-        <StartPage>www.wapstart.com</StartPage>
-    </WAPAccessPoint>
-</WAPAccessPointTable>
-
-<WAPIPBearerTable>
-    <WAPIPBearer operation="template">
-        <Name>WAPIPBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.-1</IAPRef>
-        <ProxyPortNumber>0</ProxyPortNumber>
-    </WAPIPBearer>
-    <WAPIPBearer operation="add">
-        <Name>WAPIPBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>www.wapgateway.com</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <IAPRef>IAP.Pipex CSD IR</IAPRef>
-        <ProxyPortNumber>1</ProxyPortNumber>
-    </WAPIPBearer>
-</WAPIPBearerTable>
-
-<WAPSMSBearerTable>
-    <WAPSMSBearer operation="template">
-        <Name>WAPSMSBearerTable1</Name>
-        <AccessPoint>WAPAccessPoint.-1</AccessPoint>
-        <WSPOption>CONNECTIONLESS</WSPOption>
-        <Security>FALSE</Security>
-    </WAPSMSBearer>
-    <WAPSMSBearer operation="add">
-        <Name>WAPSMSBearerTable2</Name>
-        <AccessPoint>WAPAccessPoint.Dummy WAP Settings</AccessPoint>
-        <GatewayAddress>+447785016005</GatewayAddress>
-        <WSPOption>CONNECTIONORIENTED</WSPOption>
-        <Security>FALSE</Security>
-        <ServiceCentreAddress>+442071234567</ServiceCentreAddress>
-    </WAPSMSBearer>
-</WAPSMSBearerTable>
-
-<VirtualBearerTable>
-</VirtualBearerTable>
-
-<VpnServiceTable>
-</VpnServiceTable>
-
-
-</CommDB:Config>

--- a/wapstack/wapmessageapi/te_wapstack/testdata/WapStackSuite_Config.ini	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-RadioBearer= CDMA
\ No newline at end of file

Binary file wapstack/wapmessageapi/te_wapstack/testdata/pushpdu.bin has changed

--- a/wapstack/wapmessageapi/traces/OstTraceDefinitions.h	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-//#define OST_TRACE_COMPILER_IN_USE
-#include <opensystemtrace.h>
-#endif

--- a/wapstack/wapmessageapi/traces/fixed_id.definitions	Tue Aug 31 16:23:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_INTERNALS=0x88
-[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETSMS_DOCANCEL_1=0x7
-[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETSMS_RUNL_1=0x4
-[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETSMS_RUNL_2=0x5
-[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETSMS_RUNL_3=0x6
-[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETUDP_DOCANCEL_1=0xb
-[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETUDP_RUNL_1=0x8
-[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETUDP_RUNL_2=0x9
-[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKETUDP_RUNL_3=0xa
-[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKET_GETREMOTEADDRESS_1=0x3
-[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKET_NEWL_1=0x43
-[TRACE]TRACE_INTERNALS[0x88]_CACTIVESOCKET_NEWL_1_1=0x1
-[TRACE]TRACE_INTERNALS[0x88]_CCLWSPPDUHANDLER_PACKWSPPDUL_1=0x10
-[TRACE]TRACE_INTERNALS[0x88]_CCLWSPPDUHANDLER_UNPACKWSPPDUL_1=0xe
-[TRACE]TRACE_INTERNALS[0x88]_CCLWSPPDUHANDLER_UNPACKWSPPDUL_2=0xf
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_1=0x44
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_1_1=0x19
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_1_2=0x1a
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_1_3=0x46
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_2=0x45
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_2_1=0x1b
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_2_2=0x1c
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_2_3=0x1d
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_2_4=0x47
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_3_1=0x1e
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_3_2=0x1f
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_3_3=0x20
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_3_4=0x21
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_CONNECT_3_5=0x48
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETBEARER_1=0x16
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETLOCALADDRESS_1=0x13
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETLOCALADDRESS_2=0x14
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETLOCALADDRESS_3=0x15
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETLOCALPORT_1=0x11
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETLOCALPORT_2=0x12
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETSERVERADDRESS_1=0x17
-[TRACE]TRACE_INTERNALS[0x88]_CWAPMESSAGEAPIAGENT_GETSERVERADDRESS_2=0x18
-[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_AWAITRECVDATASIZE_1=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_AWAITRECVDATASIZE_2=0x3b
-[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_NOTIFICATION_1=0x42
-[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_RECEIVEWDPMESSAGE_1=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_RECEIVEWDPMESSAGE_2=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_RECEIVEWDPMESSAGE_3=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_1=0x4e
-[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_1_1=0x3c
-[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_1_2=0x3d
-[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_2=0x4f
-[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_3=0x50
-[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGEAPIAGENT_SENDWDPMESSAGE_4=0x51
-[TRACE]TRACE_INTERNALS[0x88]_CWDPMESSAGERECORD_GETPDUDATA_1=0xd
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_NOTIFICATION_1=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_NOTIFICATION_2=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_NOTIFICATION_3=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_NOTIFICATION_4=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_NOTIFICATION_5=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_NOTIFICATION_6=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_RECEIVEWSPMESSAGE_1=0x2f
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_RECEIVEWSPMESSAGE_2=0x30
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1=0x49
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1_1=0x27
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1_2=0x28
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_1_3=0x29
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_2=0x4a
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_3=0x4b
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_4=0x4c
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGEAPIAGENT_SENDWSPMESSAGE_5=0x4d
-[TRACE]TRACE_INTERNALS[0x88]_CWSPMESSAGERECORD_GETWSPDATA_1=0xc

author	Pat Downey <patd@symbian.org>
	Wed, 01 Sep 2010 12:40:21 +0100
branch	RCL_3
changeset 20	07a122eea281
parent 19	630d2f34d719
child 21	4814c5a49428